diff options
-rw-r--r-- | net/can/bcm.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/net/can/bcm.c b/net/can/bcm.c index d6c8ae5b2e6a..c9cdb8d78e70 100644 --- a/net/can/bcm.c +++ b/net/can/bcm.c | |||
@@ -365,9 +365,6 @@ static void bcm_tx_timeout_tsklet(unsigned long data) | |||
365 | 365 | ||
366 | bcm_send_to_user(op, &msg_head, NULL, 0); | 366 | bcm_send_to_user(op, &msg_head, NULL, 0); |
367 | } | 367 | } |
368 | } | ||
369 | |||
370 | if (op->kt_ival1.tv64 && (op->count > 0)) { | ||
371 | 368 | ||
372 | /* send (next) frame */ | 369 | /* send (next) frame */ |
373 | bcm_can_tx(op); | 370 | bcm_can_tx(op); |
@@ -970,8 +967,9 @@ static int bcm_tx_setup(struct bcm_msg_head *msg_head, struct msghdr *msg, | |||
970 | /* spec: send can_frame when starting timer */ | 967 | /* spec: send can_frame when starting timer */ |
971 | op->flags |= TX_ANNOUNCE; | 968 | op->flags |= TX_ANNOUNCE; |
972 | 969 | ||
973 | if (op->kt_ival1.tv64 && (op->count > 0)) { | 970 | /* only start timer when having more frames than sent below */ |
974 | /* op->count-- is done in bcm_tx_timeout_handler */ | 971 | if (op->kt_ival1.tv64 && (op->count > 1)) { |
972 | /* op->count-- is done in bcm_tx_timeout_tsklet */ | ||
975 | hrtimer_start(&op->timer, op->kt_ival1, | 973 | hrtimer_start(&op->timer, op->kt_ival1, |
976 | HRTIMER_MODE_REL); | 974 | HRTIMER_MODE_REL); |
977 | } else | 975 | } else |
@@ -979,8 +977,11 @@ static int bcm_tx_setup(struct bcm_msg_head *msg_head, struct msghdr *msg, | |||
979 | HRTIMER_MODE_REL); | 977 | HRTIMER_MODE_REL); |
980 | } | 978 | } |
981 | 979 | ||
982 | if (op->flags & TX_ANNOUNCE) | 980 | if (op->flags & TX_ANNOUNCE) { |
983 | bcm_can_tx(op); | 981 | bcm_can_tx(op); |
982 | if (op->kt_ival1.tv64 && (op->count > 0)) | ||
983 | op->count--; | ||
984 | } | ||
984 | 985 | ||
985 | return msg_head->nframes * CFSIZ + MHSIZ; | 986 | return msg_head->nframes * CFSIZ + MHSIZ; |
986 | } | 987 | } |