---

yaml --- r: 61192 b: refs/heads/master c: b5492c4 h: refs/heads/master v: v3
git-mirror · Jul 18, 2007 · 9a9fddb · 9a9fddb
1 parent 8afd2c6
commit 9a9fddb
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 782f7956891c95e54c5b008b24ebf9e82fd84796
+refs/heads/master: b5492c4ed7a3fbbfa1a62db54e4934fd0b6a45ac
diff --git a/trunk/net/atm/br2684.c b/trunk/net/atm/br2684.c
@@ -460,11 +460,7 @@ static void br2684_push(struct atm_vcc *atmvcc, struct sk_buff *skb)
 	skb_pull(skb, plen);
 	skb_set_mac_header(skb, -ETH_HLEN);
 	skb->pkt_type = PACKET_HOST;
-#ifdef CONFIG_BR2684_FAST_TRANS
-	skb->protocol = ((u16 *) skb->data)[-1];
-#else				/* some protocols might require this: */
 	skb->protocol = br_type_trans(skb, net_dev);
-#endif /* CONFIG_BR2684_FAST_TRANS */
 #else
 	skb_pull(skb, plen - ETH_HLEN);
 	skb->protocol = eth_type_trans(skb, net_dev);