aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2007-03-19 18:29:16 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-04-26 01:24:24 -0400
commitc8fb7948dc1aeff0515b2912b564d4236f6c0ebd (patch)
treeb9134494f009f037fbcfe0ae17ea02d5eec2e253 /net
parentc1a4b86e396b6870b420d23e4d49c7b685aef0a4 (diff)
[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.c1
-rw-r--r--net/atm/lec.c4
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)
193 struct trllc *trllc; 193 struct trllc *trllc;
194 unsigned riflen=0; 194 unsigned riflen=0;
195 195
196 skb->dev = dev;
196 skb->mac.raw = skb->data; 197 skb->mac.raw = skb->data;
197 trh = tr_hdr(skb); 198 trh = tr_hdr(skb);
198 199
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)
825 if (!hlist_empty(&priv->lec_arp_empty_ones)) { 825 if (!hlist_empty(&priv->lec_arp_empty_ones)) {
826 lec_arp_check_empties(priv, vcc, skb); 826 lec_arp_check_empties(priv, vcc, skb);
827 } 827 }
828 skb->dev = dev;
829 skb_pull(skb, 2); /* skip lec_id */ 828 skb_pull(skb, 2); /* skip lec_id */
830#ifdef CONFIG_TR 829#ifdef CONFIG_TR
831 if (priv->is_trdev) 830 if (priv->is_trdev)
832 skb->protocol = tr_type_trans(skb, dev); 831 skb->protocol = tr_type_trans(skb, dev);
833 else 832 else
834#endif 833#endif
834 {
835 skb->dev = dev;
835 skb->protocol = eth_type_trans(skb, dev); 836 skb->protocol = eth_type_trans(skb, dev);
837 }
836 priv->stats.rx_packets++; 838 priv->stats.rx_packets++;
837 priv->stats.rx_bytes += skb->len; 839 priv->stats.rx_bytes += skb->len;
838 memset(ATM_SKB(skb), 0, sizeof(struct atm_skb_data)); 840 memset(ATM_SKB(skb), 0, sizeof(struct atm_skb_data));