[kernel] r17985 - in dists/squeeze/linux-2.6/debian: . patches/bugfix/all patches/series

[Ben Hutchings]

Author: benh
Date: Mon Aug 22 02:49:30 2011
New Revision: 17985

Log:
atm: br2864: sent packets truncated in VC routed mode (Closes: #638656)

Added:
   dists/squeeze/linux-2.6/debian/patches/bugfix/all/atm-br2864-sent-packets-truncated-in-VC-routed-mode.patch
Modified:
   dists/squeeze/linux-2.6/debian/changelog
   dists/squeeze/linux-2.6/debian/patches/series/36

Modified: dists/squeeze/linux-2.6/debian/changelog
==============================================================================
--- dists/squeeze/linux-2.6/debian/changelog	Mon Aug 22 02:32:38 2011	(r17984)
+++ dists/squeeze/linux-2.6/debian/changelog	Mon Aug 22 02:49:30 2011	(r17985)
@@ -63,6 +63,7 @@
     - Add support for BCM5717, BCM5719, BCM57765
     - Add support for BCM50610M and BCM5241 PHYs
     - Fix support for BCM5755
+  * atm: br2864: sent packets truncated in VC routed mode (Closes: #638656)
 
   [ Jonathan Nieder ]
   * perf: do not look at ./config for configuration (Closes: #632923)

Added: dists/squeeze/linux-2.6/debian/patches/bugfix/all/atm-br2864-sent-packets-truncated-in-VC-routed-mode.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/bugfix/all/atm-br2864-sent-packets-truncated-in-VC-routed-mode.patch	Mon Aug 22 02:49:30 2011	(r17985)
@@ -0,0 +1,29 @@
+From: Chas Williams <chas at cmf.nrl.navy.mil>
+Date: Mon, 1 Aug 2011 17:56:14 -0700
+Subject: [PATCH] atm: br2864: sent packets truncated in VC routed mode
+
+commit a08af810cdc29d2ca930e8a869d3d01744c392d8 upstream.
+
+Reported-by: Pascal Hambourg <pascal at plouf.fr.eu.org>
+Signed-off-by: Chas Williams <chas at cmf.nrl.navy.mil>
+Signed-off-by: David S. Miller <davem at davemloft.net>
+---
+ net/atm/br2684.c |    2 --
+ 1 files changed, 0 insertions(+), 2 deletions(-)
+
+diff --git a/net/atm/br2684.c b/net/atm/br2684.c
+index 2252c20..52cfd0c 100644
+--- a/net/atm/br2684.c
++++ b/net/atm/br2684.c
+@@ -242,8 +242,6 @@ static int br2684_xmit_vcc(struct sk_buff *skb, struct net_device *dev,
+ 		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);
+-- 
+1.7.5.4
+

Modified: dists/squeeze/linux-2.6/debian/patches/series/36
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/series/36	Mon Aug 22 02:32:38 2011	(r17984)
+++ dists/squeeze/linux-2.6/debian/patches/series/36	Mon Aug 22 02:49:30 2011	(r17985)
@@ -663,3 +663,4 @@
 + features/all/tg3/0205-tg3-Fix-NVRAM-selftest.patch
 + features/all/tg3/0206-tg3-Only-allow-phy-ioctls-while-netif_running.patch
 + features/all/tg3/0207-tg3-Set-tx-bug-flags-for-more-devices.patch
++ bugfix/all/atm-br2864-sent-packets-truncated-in-VC-routed-mode.patch