diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2007-03-19 15:29:16 -0700 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-25 22:24:24 -0700 |
| commit | c8fb7948dc1aeff0515b2912b564d4236f6c0ebd (patch) | |
| tree | b9134494f009f037fbcfe0ae17ea02d5eec2e253 /net | |
| parent | c1a4b86e396b6870b420d23e4d49c7b685aef0a4 (diff) | |
| download | blackbird-op-linux-c8fb7948dc1aeff0515b2912b564d4236f6c0ebd.tar.gz blackbird-op-linux-c8fb7948dc1aeff0515b2912b564d4236f6c0ebd.zip | |
[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')
| -rw-r--r-- | net/802/tr.c | 1 | ||||
| -rw-r--r-- | net/atm/lec.c | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/net/802/tr.c b/net/802/tr.c index a6a6d46e708c..987d91559bcc 100644 --- a/net/802/tr.c +++ b/net/802/tr.c @@ -193,6 +193,7 @@ __be16 tr_type_trans(struct sk_buff *skb, struct net_device *dev) struct trllc *trllc; unsigned riflen=0; + skb->dev = dev; skb->mac.raw = skb->data; trh = tr_hdr(skb); diff --git a/net/atm/lec.c b/net/atm/lec.c index 3d804d61f656..e5ed878c8825 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)); |
