aboutsummaryrefslogtreecommitdiff
path: root/net/atm
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2007-03-19 15:29:16 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2007-04-25 22:24:24 -0700
commitc8fb7948dc1aeff0515b2912b564d4236f6c0ebd (patch)
treeb9134494f009f037fbcfe0ae17ea02d5eec2e253 /net/atm
parentc1a4b86e396b6870b420d23e4d49c7b685aef0a4 (diff)
downloadlinux-2.6.38-lt-ux500-c8fb7948dc1aeff0515b2912b564d4236f6c0ebd.tar.gz
[TR]: Make tr_type_trans set skb->dev
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/atm')
-rw-r--r--net/atm/lec.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/atm/lec.c b/net/atm/lec.c
index 3d804d61f65..e5ed878c882 100644
--- a/net/atm/lec.c
+++ b/net/atm/lec.c
@@ -825,14 +825,16 @@ static void lec_push(struct atm_vcc *vcc, struct sk_buff *skb)
if (!hlist_empty(&priv->lec_arp_empty_ones)) {
lec_arp_check_empties(priv, vcc, skb);
}
- skb->dev = dev;
skb_pull(skb, 2); /* skip lec_id */
#ifdef CONFIG_TR
if (priv->is_trdev)
skb->protocol = tr_type_trans(skb, dev);
else
#endif
+ {
+ skb->dev = dev;
skb->protocol = eth_type_trans(skb, dev);
+ }
priv->stats.rx_packets++;
priv->stats.rx_bytes += skb->len;
memset(ATM_SKB(skb), 0, sizeof(struct atm_skb_data));