]> rtime.felk.cvut.cz Git - socketcan-devel.git/commitdiff
Cosmetics.
authorhartkopp <hartkopp@030b6a49-0b11-0410-94ab-b0dab22257f2>
Thu, 15 Nov 2007 14:14:07 +0000 (14:14 +0000)
committerhartkopp <hartkopp@030b6a49-0b11-0410-94ab-b0dab22257f2>
Thu, 15 Nov 2007 14:14:07 +0000 (14:14 +0000)
git-svn-id: svn://svn.berlios.de//socketcan/trunk@549 030b6a49-0b11-0410-94ab-b0dab22257f2

kernel/2.6/net/can/bcm.c

index c7041238b63113b73554c98b025f4d771a7720f5..38273d09efee4f443d1102da7ba41f3aac8e72c1 100644 (file)
@@ -682,8 +682,7 @@ static void bcm_rx_handler(struct sk_buff *skb, void *data)
                return;
 
        if (op->flags & RX_RTR_FRAME) {
-               /* send reply for RTR-request */
-               /* send op->frames[0] to CAN device */
+               /* send reply for RTR-request (placed in op->frames[0]) */
                bcm_can_tx(op);
                return;
        }
@@ -1001,8 +1000,8 @@ static int bcm_tx_setup(struct bcm_msg_head *msg_head, struct msghdr *msg,
                op->flags |= TX_ANNOUNCE;
 
                if (op->j_ival1 && (op->count > 0)) {
-                       op->timer.expires = jiffies + op->j_ival1;
                        /* op->count-- is done in bcm_tx_timeout_handler */
+                       op->timer.expires = jiffies + op->j_ival1;
                } else
                        op->timer.expires = jiffies + op->j_ival2;