summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorRobert P. J. Day <rpjday@mindspring.com>2007-07-16 18:31:24 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2007-07-18 01:46:52 -0700
commitb5492c4ed7a3fbbfa1a62db54e4934fd0b6a45ac (patch)
tree87b508eea6bacf239e552072025e496b75369070 /net
parent782f7956891c95e54c5b008b24ebf9e82fd84796 (diff)
downloadop-kernel-dev-b5492c4ed7a3fbbfa1a62db54e4934fd0b6a45ac.zip
op-kernel-dev-b5492c4ed7a3fbbfa1a62db54e4934fd0b6a45ac.tar.gz
[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>
Diffstat (limited to 'net')
-rw-r--r--net/atm/br2684.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/net/atm/br2684.c b/net/atm/br2684.c
index faa6aaf..c0f6861 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);
OpenPOWER on IntegriCloud