From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Sat, 13 Aug 2011 23:02:38 +0000 (-0700)
Subject: 3.0 patches
X-Git-Tag: v3.0.2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8bf6a33640bc5adfd16886da50dff67e2022242c;p=thirdparty%2Fkernel%2Fstable-queue.git

3.0 patches
---

diff --git a/queue-3.0/atm-br2864-sent-packets-truncated-in-vc-routed-mode.patch b/queue-3.0/atm-br2864-sent-packets-truncated-in-vc-routed-mode.patch
new file mode 100644
index 00000000000..c440ce4d3c2
--- /dev/null
+++ b/queue-3.0/atm-br2864-sent-packets-truncated-in-vc-routed-mode.patch
@@ -0,0 +1,29 @@
+From a08af810cdc29d2ca930e8a869d3d01744c392d8 Mon Sep 17 00:00:00 2001
+From: Chas Williams <chas@cmf.nrl.navy.mil>
+Date: Mon, 1 Aug 2011 17:56:14 -0700
+Subject: atm: br2864: sent packets truncated in VC routed mode
+
+From: Chas Williams <chas@cmf.nrl.navy.mil>
+
+commit a08af810cdc29d2ca930e8a869d3d01744c392d8 upstream.
+
+Reported-by: Pascal Hambourg <pascal@plouf.fr.eu.org>
+Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ net/atm/br2684.c |    2 --
+ 1 file changed, 2 deletions(-)
+
+--- a/net/atm/br2684.c
++++ b/net/atm/br2684.c
+@@ -242,8 +242,6 @@ static int br2684_xmit_vcc(struct sk_buf
+ 		if (brdev->payload == p_bridged) {
+ 			skb_push(skb, 2);
+ 			memset(skb->data, 0, 2);
+-		} else { /* p_routed */
+-			skb_pull(skb, ETH_HLEN);
+ 		}
+ 	}
+ 	skb_debug(skb);
diff --git a/queue-3.0/series b/queue-3.0/series
index bf8abfd1cb7..e5f00343c6a 100644
--- a/queue-3.0/series
+++ b/queue-3.0/series
@@ -11,3 +11,4 @@ usb-option-driver-add-pid-for-vodafone-huawei-k3770.patch
 usb-option-driver-add-pid-for-vodafone-huawei-k3771.patch
 usb-option-driver-add-pid-for-vodafone-huawei-k4510.patch
 usb-option-driver-add-pid-for-vodafone-huawei-k4511.patch
+atm-br2864-sent-packets-truncated-in-vc-routed-mode.patch