projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 782f795)
[ATM]: Eliminate dead config variable CONFIG_BR2684_FAST_TRANS.
authorRobert P. J. Day <rpjday@mindspring.com>
Tue, 17 Jul 2007 01:31:24 +0000 (18:31 -0700)
committerDavid S. Miller <davem@sunset.davemloft.net>
Wed, 18 Jul 2007 08:46:52 +0000 (01:46 -0700)
Signed-off-by: chas williams <chas@cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/atm/br2684.c patch | blob | blame | history

diff --git a/net/atm/br2684.c b/net/atm/br2684.c
index faa6aaf67563ff298121518ffc192655a85be2ab..c0f6861eefe35061061d7ae39d4ecde87d8777da 100644 (file)
--- 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);