aboutsummaryrefslogtreecommitdiffstats
path: root/net/atm
diff options
context:
space:
mode:
authorRobert P. J. Day <rpjday@mindspring.com>2007-07-16 21:31:24 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-07-18 04:46:52 -0400
commitb5492c4ed7a3fbbfa1a62db54e4934fd0b6a45ac (patch)
tree87b508eea6bacf239e552072025e496b75369070 /net/atm
parent782f7956891c95e54c5b008b24ebf9e82fd84796 (diff)
[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/atm')
-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 faa6aaf67563..c0f6861eefe3 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)
460 skb_pull(skb, plen); 460 skb_pull(skb, plen);
461 skb_set_mac_header(skb, -ETH_HLEN); 461 skb_set_mac_header(skb, -ETH_HLEN);
462 skb->pkt_type = PACKET_HOST; 462 skb->pkt_type = PACKET_HOST;
463#ifdef CONFIG_BR2684_FAST_TRANS
464 skb->protocol = ((u16 *) skb->data)[-1];
465#else /* some protocols might require this: */
466 skb->protocol = br_type_trans(skb, net_dev); 463 skb->protocol = br_type_trans(skb, net_dev);
467#endif /* CONFIG_BR2684_FAST_TRANS */
468#else 464#else
469 skb_pull(skb, plen - ETH_HLEN); 465 skb_pull(skb, plen - ETH_HLEN);
470 skb->protocol = eth_type_trans(skb, net_dev); 466 skb->protocol = eth_type_trans(skb, net_dev);