3.0 patches

diff --git a/queue-3.0/can-bcm-fix-incomplete-tx_setup-fix.patch b/queue-3.0/can-bcm-fix-incomplete-tx_setup-fix.patch
new file mode 100644 (file)
index 0000000..3e27ce5
--- /dev/null
+++ b/queue-3.0/can-bcm-fix-incomplete-tx_setup-fix.patch
@@ -0,0 +1,105 @@
+From 12d0d0d3a7349daa95dbfd5d7df8146255bc7c67 Mon Sep 17 00:00:00 2001
+From: Oliver Hartkopp <socketcan@hartkopp.net>
+Date: Thu, 29 Sep 2011 15:33:47 -0400
+Subject: can bcm: fix incomplete tx_setup fix
+
+From: Oliver Hartkopp <socketcan@hartkopp.net>
+
+commit 12d0d0d3a7349daa95dbfd5d7df8146255bc7c67 upstream.
+
+The commit aabdcb0b553b9c9547b1a506b34d55a764745870 ("can bcm: fix tx_setup
+off-by-one errors") fixed only a part of the original problem reported by
+Andre Naujoks. It turned out that the original code needed to be re-ordered
+to reduce complexity and to finally fix the reported frame counting issues.
+
+Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ net/can/bcm.c |   48 +++++++++++++++++++++---------------------------
+ 1 file changed, 21 insertions(+), 27 deletions(-)
+
+--- a/net/can/bcm.c
++++ b/net/can/bcm.c
+@@ -343,6 +343,18 @@ static void bcm_send_to_user(struct bcm_
+       }
+ }
+ 
++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,23 +376,12 @@ static void bcm_tx_timeout_tsklet(unsign
+ 
+                       bcm_send_to_user(op, &msg_head, NULL, 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);
+ }
+ 
+ /*
+@@ -960,28 +961,21 @@ static int bcm_tx_setup(struct bcm_msg_h
+                       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;
+-
+-              /* only start timer when having more frames than sent below */
+-              if (op->kt_ival1.tv64 && (op->count > 1)) {
+-                      /* op->count-- is done in bcm_tx_timeout_tsklet */
+-                      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) {
+               bcm_can_tx(op);
+-              if (op->kt_ival1.tv64 && (op->count > 0))
++              if (op->count)
+                       op->count--;
+       }
+ 
++      if (op->flags & STARTTIMER)
++              bcm_tx_start_timer(op);
++
+       return msg_head->nframes * CFSIZ + MHSIZ;
+ }
+ 

diff --git a/queue-3.0/series b/queue-3.0/series
index 36976366ea7116d504a1cc0c52396617e745c294..15fb83bac0c3c25004b75a7f683cf4964fbb7bbe 100644 (file)
--- a/queue-3.0/series
+++ b/queue-3.0/series
@@ -181,3 +181,4 @@ usb_storage-don-t-freeze-in-usb-stor-scan.patch
 xhci-if-no-endpoints-changed-don-t-issue-bw-command.patch
 xhci-test-and-clear-rwc-bit.patch
 xhci-clear-plc-for-usb2-root-hub-ports.patch
+can-bcm-fix-incomplete-tx_setup-fix.patch