From: Robert P. J. Day <rpjday@mindspring.com>
Date: Tue, 17 Jul 2007 01:31:24 +0000 (-0700)
Subject: [ATM]: Eliminate dead config variable CONFIG_BR2684_FAST_TRANS.
X-Git-Tag: v2.6.23-rc1~496^2~17
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b5492c4ed7a3fbbfa1a62db54e4934fd0b6a45ac;p=linux-2.6

[ATM]: Eliminate dead config variable CONFIG_BR2684_FAST_TRANS.

Signed-off-by: chas williams <chas@cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/atm/br2684.c b/net/atm/br2684.c
index faa6aaf675..c0f6861eef 100644
--- a/net/atm/br2684.c
+++ b/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);