---

yaml --- r: 262448 b: refs/heads/master c: a08af81 h: refs/heads/master v: v3
git-mirror · Aug 2, 2011 · 21a5ad2 · 21a5ad2
1 parent 162ad03
commit 21a5ad2
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git 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
@@ -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);