can bcm: fix tx_setup off-by-one errors

[socketcan-devel.git] / kernel / 2.6 / net / can / bcm-prior-2-6-22.c

diff --git a/kernel/2.6/net/can/bcm-prior-2-6-22.c b/kernel/2.6/net/can/bcm-prior-2-6-22.c
index bc58c79e433a02a9fba219069a853e91f21b83ee..1254675b1729ab82ed3e6c969277e41ddf9219f4 100644 (file)
--- a/kernel/2.6/net/can/bcm-prior-2-6-22.c
+++ b/kernel/2.6/net/can/bcm-prior-2-6-22.c
@@ -416,9 +416,6 @@ static void bcm_tx_timeout_handler(unsigned long data)
 
                        bcm_send_to_user(op, &msg_head, NULL, 0);
                }
-       }
-
-       if (op->j_ival1 && (op->count > 0)) {
 
                /* send (next) frame */
                bcm_can_tx(op);
@@ -958,15 +955,19 @@ static int bcm_tx_setup(struct bcm_msg_head *msg_head, struct msghdr *msg,
                /* spec: send can_frame when starting timer */
                op->flags |= TX_ANNOUNCE;
 
-               if (op->j_ival1 && (op->count > 0)) {
+               /* only start timer when having more frames than sent below */
+               if (op->j_ival1 && (op->count > 1)) {
                        /* op->count-- is done in bcm_tx_timeout_handler */
                        mod_timer(&op->timer, jiffies + op->j_ival1);
                } else
                        mod_timer(&op->timer, jiffies + op->j_ival2);
        }
 
-       if (op->flags & TX_ANNOUNCE)
+       if (op->flags & TX_ANNOUNCE) {
                bcm_can_tx(op);
+               if (op->j_ival1 && (op->count > 0))
+                       op->count--;
+       }
 
        return msg_head->nframes * CFSIZ + MHSIZ;
 }
@@ -1573,7 +1574,7 @@ static struct proto bcm_proto __read_mostly = {
        .init       = bcm_init,
 };
 
-static struct can_proto bcm_can_proto __read_mostly = {
+static const struct can_proto bcm_can_proto = {
        .type       = SOCK_DGRAM,
        .protocol   = CAN_BCM,
        .capability = -1,
@@ -1581,7 +1582,7 @@ static struct can_proto bcm_can_proto __read_mostly = {
        .prot       = &bcm_proto,
 };
 #else
-static struct can_proto bcm_can_proto __read_mostly = {
+static const struct can_proto bcm_can_proto = {
        .type       = SOCK_DGRAM,
        .protocol   = CAN_BCM,
        .capability = -1,