diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/atm/lec.c | 3 | ||||
-rw-r--r-- | net/bluetooth/bnep/core.c | 1 | ||||
-rw-r--r-- | net/ethernet/eth.c | 1 | ||||
-rw-r--r-- | net/ieee80211/ieee80211_rx.c | 1 | ||||
-rw-r--r-- | net/irda/irlan/irlan_eth.c | 3 |
5 files changed, 2 insertions, 7 deletions
diff --git a/net/atm/lec.c b/net/atm/lec.c index e5ed878c8825..d339645dc796 100644 --- a/net/atm/lec.c +++ b/net/atm/lec.c | |||
@@ -831,10 +831,7 @@ static void lec_push(struct atm_vcc *vcc, struct sk_buff *skb) | |||
831 | skb->protocol = tr_type_trans(skb, dev); | 831 | skb->protocol = tr_type_trans(skb, dev); |
832 | else | 832 | else |
833 | #endif | 833 | #endif |
834 | { | ||
835 | skb->dev = dev; | ||
836 | skb->protocol = eth_type_trans(skb, dev); | 834 | skb->protocol = eth_type_trans(skb, dev); |
837 | } | ||
838 | priv->stats.rx_packets++; | 835 | priv->stats.rx_packets++; |
839 | priv->stats.rx_bytes += skb->len; | 836 | priv->stats.rx_bytes += skb->len; |
840 | memset(ATM_SKB(skb), 0, sizeof(struct atm_skb_data)); | 837 | memset(ATM_SKB(skb), 0, sizeof(struct atm_skb_data)); |
diff --git a/net/bluetooth/bnep/core.c b/net/bluetooth/bnep/core.c index b85d1492c357..f7ade186bf93 100644 --- a/net/bluetooth/bnep/core.c +++ b/net/bluetooth/bnep/core.c | |||
@@ -383,7 +383,6 @@ static inline int bnep_rx_frame(struct bnep_session *s, struct sk_buff *skb) | |||
383 | kfree_skb(skb); | 383 | kfree_skb(skb); |
384 | 384 | ||
385 | s->stats.rx_packets++; | 385 | s->stats.rx_packets++; |
386 | nskb->dev = dev; | ||
387 | nskb->ip_summed = CHECKSUM_NONE; | 386 | nskb->ip_summed = CHECKSUM_NONE; |
388 | nskb->protocol = eth_type_trans(nskb, dev); | 387 | nskb->protocol = eth_type_trans(nskb, dev); |
389 | netif_rx_ni(nskb); | 388 | netif_rx_ni(nskb); |
diff --git a/net/ethernet/eth.c b/net/ethernet/eth.c index 41c5065f4a87..01ecbe42b1e7 100644 --- a/net/ethernet/eth.c +++ b/net/ethernet/eth.c | |||
@@ -156,6 +156,7 @@ __be16 eth_type_trans(struct sk_buff *skb, struct net_device *dev) | |||
156 | struct ethhdr *eth; | 156 | struct ethhdr *eth; |
157 | unsigned char *rawp; | 157 | unsigned char *rawp; |
158 | 158 | ||
159 | skb->dev = dev; | ||
159 | skb->mac.raw = skb->data; | 160 | skb->mac.raw = skb->data; |
160 | skb_pull(skb, ETH_HLEN); | 161 | skb_pull(skb, ETH_HLEN); |
161 | eth = eth_hdr(skb); | 162 | eth = eth_hdr(skb); |
diff --git a/net/ieee80211/ieee80211_rx.c b/net/ieee80211/ieee80211_rx.c index 4084909f6f92..d5f5c6616689 100644 --- a/net/ieee80211/ieee80211_rx.c +++ b/net/ieee80211/ieee80211_rx.c | |||
@@ -800,7 +800,6 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb, | |||
800 | if (skb) { | 800 | if (skb) { |
801 | skb->protocol = eth_type_trans(skb, dev); | 801 | skb->protocol = eth_type_trans(skb, dev); |
802 | memset(skb->cb, 0, sizeof(skb->cb)); | 802 | memset(skb->cb, 0, sizeof(skb->cb)); |
803 | skb->dev = dev; | ||
804 | skb->ip_summed = CHECKSUM_NONE; /* 802.11 crc not sufficient */ | 803 | skb->ip_summed = CHECKSUM_NONE; /* 802.11 crc not sufficient */ |
805 | if (netif_rx(skb) == NET_RX_DROP) { | 804 | if (netif_rx(skb) == NET_RX_DROP) { |
806 | /* netif_rx always succeeds, but it might drop | 805 | /* netif_rx always succeeds, but it might drop |
diff --git a/net/irda/irlan/irlan_eth.c b/net/irda/irlan/irlan_eth.c index 672ab3f69033..c421521c0a99 100644 --- a/net/irda/irlan/irlan_eth.c +++ b/net/irda/irlan/irlan_eth.c | |||
@@ -234,8 +234,7 @@ int irlan_eth_receive(void *instance, void *sap, struct sk_buff *skb) | |||
234 | * might have been previously set by the low level IrDA network | 234 | * might have been previously set by the low level IrDA network |
235 | * device driver | 235 | * device driver |
236 | */ | 236 | */ |
237 | skb->dev = self->dev; | 237 | skb->protocol = eth_type_trans(skb, self->dev); /* Remove eth header */ |
238 | skb->protocol=eth_type_trans(skb, skb->dev); /* Remove eth header */ | ||
239 | 238 | ||
240 | self->stats.rx_packets++; | 239 | self->stats.rx_packets++; |
241 | self->stats.rx_bytes += skb->len; | 240 | self->stats.rx_bytes += skb->len; |