diff options
author | Stephen Hemminger <shemminger@vyatta.com> | 2009-03-20 15:36:38 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-03-22 01:55:31 -0400 |
commit | ce55cbaf3a4498719bdb5a022a45d256b84749f5 (patch) | |
tree | 601a6ee55bb364a4e8769291e689f00659f003cb /drivers/net/wireless/ipw2x00/libipw_tx.c | |
parent | f02abf1010dfb9fa7f56788fb28bc63b0ea34968 (diff) |
ipw2x00: convert to internal net_device_stats
Replace struct in ieee with current net_device_stats, so no longer
need get_stats hook
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/ipw2x00/libipw_tx.c')
-rw-r--r-- | drivers/net/wireless/ipw2x00/libipw_tx.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/wireless/ipw2x00/libipw_tx.c b/drivers/net/wireless/ipw2x00/libipw_tx.c index a874e9091919..0da4a0a73a4a 100644 --- a/drivers/net/wireless/ipw2x00/libipw_tx.c +++ b/drivers/net/wireless/ipw2x00/libipw_tx.c | |||
@@ -260,7 +260,6 @@ int ieee80211_xmit(struct sk_buff *skb, struct net_device *dev) | |||
260 | int i, bytes_per_frag, nr_frags, bytes_last_frag, frag_size, | 260 | int i, bytes_per_frag, nr_frags, bytes_last_frag, frag_size, |
261 | rts_required; | 261 | rts_required; |
262 | unsigned long flags; | 262 | unsigned long flags; |
263 | struct net_device_stats *stats = &ieee->stats; | ||
264 | int encrypt, host_encrypt, host_encrypt_msdu, host_build_iv; | 263 | int encrypt, host_encrypt, host_encrypt_msdu, host_build_iv; |
265 | __be16 ether_type; | 264 | __be16 ether_type; |
266 | int bytes, fc, hdr_len; | 265 | int bytes, fc, hdr_len; |
@@ -306,7 +305,7 @@ int ieee80211_xmit(struct sk_buff *skb, struct net_device *dev) | |||
306 | 305 | ||
307 | if (!encrypt && ieee->ieee802_1x && | 306 | if (!encrypt && ieee->ieee802_1x && |
308 | ieee->drop_unencrypted && ether_type != htons(ETH_P_PAE)) { | 307 | ieee->drop_unencrypted && ether_type != htons(ETH_P_PAE)) { |
309 | stats->tx_dropped++; | 308 | dev->stats.tx_dropped++; |
310 | goto success; | 309 | goto success; |
311 | } | 310 | } |
312 | 311 | ||
@@ -526,8 +525,8 @@ int ieee80211_xmit(struct sk_buff *skb, struct net_device *dev) | |||
526 | if (txb) { | 525 | if (txb) { |
527 | int ret = (*ieee->hard_start_xmit) (txb, dev, priority); | 526 | int ret = (*ieee->hard_start_xmit) (txb, dev, priority); |
528 | if (ret == 0) { | 527 | if (ret == 0) { |
529 | stats->tx_packets++; | 528 | dev->stats.tx_packets++; |
530 | stats->tx_bytes += txb->payload_size; | 529 | dev->stats.tx_bytes += txb->payload_size; |
531 | return 0; | 530 | return 0; |
532 | } | 531 | } |
533 | 532 | ||
@@ -539,7 +538,7 @@ int ieee80211_xmit(struct sk_buff *skb, struct net_device *dev) | |||
539 | failed: | 538 | failed: |
540 | spin_unlock_irqrestore(&ieee->lock, flags); | 539 | spin_unlock_irqrestore(&ieee->lock, flags); |
541 | netif_stop_queue(dev); | 540 | netif_stop_queue(dev); |
542 | stats->tx_errors++; | 541 | dev->stats.tx_errors++; |
543 | return 1; | 542 | return 1; |
544 | } | 543 | } |
545 | 544 | ||