2 files changed, 29 insertions, 32 deletions

diff --git a/net/can/af_can.c b/net/can/af_can.c
index 094fc5332d4..9b0c32a2690 100644
--- a/net/can/af_can.c
+++ b/net/can/af_can.c
@@ -58,6 +58,7 @@
 #include <linux/skbuff.h>
 #include <linux/can.h>
 #include <linux/can/core.h>
+#include <linux/ratelimit.h>
 #include <net/net_namespace.h>
 #include <net/sock.h>
 
@@ -161,8 +162,8 @@ static int can_create(struct net *net, struct socket *sock, int protocol,
                  * return the error code immediately.  Below we will
                  * return -EPROTONOSUPPORT
                  */
-                if (err && printk_ratelimit())
-                        printk(KERN_ERR "can: request_module "
+                if (err)
+                        printk_ratelimited(KERN_ERR "can: request_module "
                                "(can-proto-%d) failed.\n", protocol);
 
                 cp = can_get_proto(protocol);
@@ -856,7 +857,7 @@ static __exit void can_exit(void)
         struct net_device *dev;
 
         if (stats_timer)
-                del_timer(&can_stattimer);
+                del_timer_sync(&can_stattimer);
 
         can_remove_proc();
 
diff --git a/net/can/bcm.c b/net/can/bcm.c
index 184a6572b67..c84963d2dee 100644
--- a/net/can/bcm.c
+++ b/net/can/bcm.c
@@ -43,6 +43,7 @@
 
 #include <linux/module.h>
 #include <linux/init.h>
+#include <linux/interrupt.h>
 #include <linux/hrtimer.h>
 #include <linux/list.h>
 #include <linux/proc_fs.h>
@@ -343,6 +344,18 @@ static void bcm_send_to_user(struct bcm_op *op, struct bcm_msg_head *head,
         }
 }
 
+static void bcm_tx_start_timer(struct bcm_op *op)
+{
+        if (op->kt_ival1.tv64 && op->count)
+                hrtimer_start(&op->timer,
+                              ktime_add(ktime_get(), op->kt_ival1),
+                              HRTIMER_MODE_ABS);
+        else if (op->kt_ival2.tv64)
+                hrtimer_start(&op->timer,
+                              ktime_add(ktime_get(), op->kt_ival2),
+                              HRTIMER_MODE_ABS);
+}
+
 static void bcm_tx_timeout_tsklet(unsigned long data)
 {
         struct bcm_op *op = (struct bcm_op *)data;
@@ -364,26 +377,12 @@ static void bcm_tx_timeout_tsklet(unsigned long data)
 
                         bcm_send_to_user(op, &msg_head, NULL, 0);
                 }
-        }
-
-        if (op->kt_ival1.tv64 && (op->count > 0)) {
-
-                /* send (next) frame */
                 bcm_can_tx(op);
-                hrtimer_start(&op->timer,
-                              ktime_add(ktime_get(), op->kt_ival1),
-                              HRTIMER_MODE_ABS);
 
-        } else {
-                if (op->kt_ival2.tv64) {
+        } else if (op->kt_ival2.tv64)
+                bcm_can_tx(op);
 
-                        /* send (next) frame */
-                        bcm_can_tx(op);
-                        hrtimer_start(&op->timer,
-                                      ktime_add(ktime_get(), op->kt_ival2),
-                                      HRTIMER_MODE_ABS);
-                }
-        }
+        bcm_tx_start_timer(op);
 }
 
 /*
@@ -963,23 +962,20 @@ static int bcm_tx_setup(struct bcm_msg_head *msg_head, struct msghdr *msg,
                         hrtimer_cancel(&op->timer);
         }
 
-        if ((op->flags & STARTTIMER) &&
-            ((op->kt_ival1.tv64 && op->count) || op->kt_ival2.tv64)) {
-
+        if (op->flags & STARTTIMER) {
+                hrtimer_cancel(&op->timer);
                 /* spec: send can_frame when starting timer */
                 op->flags |= TX_ANNOUNCE;
-
-                if (op->kt_ival1.tv64 && (op->count > 0)) {
-                        /* op->count-- is done in bcm_tx_timeout_handler */
-                        hrtimer_start(&op->timer, op->kt_ival1,
-                                      HRTIMER_MODE_REL);
-                } else
-                        hrtimer_start(&op->timer, op->kt_ival2,
-                                      HRTIMER_MODE_REL);
         }
 
-        if (op->flags & TX_ANNOUNCE)
+        if (op->flags & TX_ANNOUNCE) {
                 bcm_can_tx(op);
+                if (op->count)
+                        op->count--;
+        }
+
+        if (op->flags & STARTTIMER)
+                bcm_tx_start_timer(op);
 
         return msg_head->nframes * CFSIZ + MHSIZ;
 }