diff --git a/[refs] b/[refs] index 766a449d6de6..67f5c1dbbdca 100644 --- 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 index faa6aaf67563..c0f6861eefe3 100644 --- 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);