Hello,
commit a08af810cdc29d2ca930e8a869d3d01744c392d8 in 3.0-rc1 fixes a bug
introduced in 2.6.26. Please add this patch to the -stable and -longterm
trees. Thanks.

(There is a typo in br2684 in the subject but I suppose it should be
kept for consistency with the original patch)

------------------

From: Chas Williams <c...@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 <pas...@plouf.fr.eu.org>
Signed-off-by: Chas Williams <c...@cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <da...@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);

_______________________________________________
stable mailing list
stable@linux.kernel.org
http://linux.kernel.org/mailman/listinfo/stable

Reply via email to