From 21a5ad214e55ca65831e016880567fe3fc2cc508 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: [PATCH] --- yaml --- r: 262448 b: refs/heads/master c:
 a08af810cdc29d2ca930e8a869d3d01744c392d8 h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/net/atm/br2684.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index ca922abb6c29..6485b2df57e9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e1738bd9cecc5c867b0e2996470c1ff20f66ba79
+refs/heads/master: a08af810cdc29d2ca930e8a869d3d01744c392d8
diff --git a/trunk/net/atm/br2684.c b/trunk/net/atm/br2684.c
index 2252c2085dac..52cfd0c3ea71 100644
--- a/trunk/net/atm/br2684.c
+++ b/trunk/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);