aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ipw2x00/libipw_rx.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/ipw2x00/libipw_rx.c')
-rw-r--r--drivers/net/wireless/ipw2x00/libipw_rx.c17
1 files changed, 7 insertions, 10 deletions
diff --git a/drivers/net/wireless/ipw2x00/libipw_rx.c b/drivers/net/wireless/ipw2x00/libipw_rx.c
index 079007936d8a..dae4b8e4d8e9 100644
--- a/drivers/net/wireless/ipw2x00/libipw_rx.c
+++ b/drivers/net/wireless/ipw2x00/libipw_rx.c
@@ -335,7 +335,6 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
335 struct ieee80211_hdr_4addr *hdr; 335 struct ieee80211_hdr_4addr *hdr;
336 size_t hdrlen; 336 size_t hdrlen;
337 u16 fc, type, stype, sc; 337 u16 fc, type, stype, sc;
338 struct net_device_stats *stats;
339 unsigned int frag; 338 unsigned int frag;
340 u8 *payload; 339 u8 *payload;
341 u16 ethertype; 340 u16 ethertype;
@@ -354,8 +353,6 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
354 int can_be_decrypted = 0; 353 int can_be_decrypted = 0;
355 354
356 hdr = (struct ieee80211_hdr_4addr *)skb->data; 355 hdr = (struct ieee80211_hdr_4addr *)skb->data;
357 stats = &ieee->stats;
358
359 if (skb->len < 10) { 356 if (skb->len < 10) {
360 printk(KERN_INFO "%s: SKB length < 10\n", dev->name); 357 printk(KERN_INFO "%s: SKB length < 10\n", dev->name);
361 goto rx_dropped; 358 goto rx_dropped;
@@ -412,8 +409,8 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
412#endif 409#endif
413 410
414 if (ieee->iw_mode == IW_MODE_MONITOR) { 411 if (ieee->iw_mode == IW_MODE_MONITOR) {
415 stats->rx_packets++; 412 dev->stats.rx_packets++;
416 stats->rx_bytes += skb->len; 413 dev->stats.rx_bytes += skb->len;
417 ieee80211_monitor_rx(ieee, skb, rx_stats); 414 ieee80211_monitor_rx(ieee, skb, rx_stats);
418 return 1; 415 return 1;
419 } 416 }
@@ -769,8 +766,8 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
769 } 766 }
770#endif 767#endif
771 768
772 stats->rx_packets++; 769 dev->stats.rx_packets++;
773 stats->rx_bytes += skb->len; 770 dev->stats.rx_bytes += skb->len;
774 771
775#ifdef NOT_YET 772#ifdef NOT_YET
776 if (ieee->iw_mode == IW_MODE_MASTER && !wds && ieee->ap->bridge_packets) { 773 if (ieee->iw_mode == IW_MODE_MASTER && !wds && ieee->ap->bridge_packets) {
@@ -812,7 +809,7 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
812 * in our stats. */ 809 * in our stats. */
813 IEEE80211_DEBUG_DROP 810 IEEE80211_DEBUG_DROP
814 ("RX: netif_rx dropped the packet\n"); 811 ("RX: netif_rx dropped the packet\n");
815 stats->rx_dropped++; 812 dev->stats.rx_dropped++;
816 } 813 }
817 } 814 }
818 815
@@ -824,7 +821,7 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
824 return 1; 821 return 1;
825 822
826 rx_dropped: 823 rx_dropped:
827 stats->rx_dropped++; 824 dev->stats.rx_dropped++;
828 825
829 /* Returning 0 indicates to caller that we have not handled the SKB-- 826 /* Returning 0 indicates to caller that we have not handled the SKB--
830 * so it is still allocated and can be used again by underlying 827 * so it is still allocated and can be used again by underlying
@@ -919,7 +916,7 @@ void ieee80211_rx_any(struct ieee80211_device *ieee,
919 916
920drop_free: 917drop_free:
921 dev_kfree_skb_irq(skb); 918 dev_kfree_skb_irq(skb);
922 ieee->stats.rx_dropped++; 919 ieee->dev->stats.rx_dropped++;
923 return; 920 return;
924} 921}
925 922