diff options
author | Stephen Hemminger <shemminger@vyatta.com> | 2009-03-20 15:36:35 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-03-22 01:51:23 -0400 |
commit | 6456fffb09a281af2644e73fda26d1eeec325830 (patch) | |
tree | 77cb74f5dee5b94952f8b54ae9c53c15f00d0bbd /drivers/net/wireless/prism54/islpci_eth.c | |
parent | 6685254f80cdca085cb1d53c45a6d0d5d01f911e (diff) |
prism54: convert to internal net_device_stats
Also, make ethtool_ops const as it should be, and get rid
of useless cast.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/prism54/islpci_eth.c')
-rw-r--r-- | drivers/net/wireless/prism54/islpci_eth.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/net/wireless/prism54/islpci_eth.c b/drivers/net/wireless/prism54/islpci_eth.c index 88895bd9e495..ef3ef4551b31 100644 --- a/drivers/net/wireless/prism54/islpci_eth.c +++ b/drivers/net/wireless/prism54/islpci_eth.c | |||
@@ -231,8 +231,8 @@ islpci_eth_transmit(struct sk_buff *skb, struct net_device *ndev) | |||
231 | 231 | ||
232 | /* set the transmission time */ | 232 | /* set the transmission time */ |
233 | ndev->trans_start = jiffies; | 233 | ndev->trans_start = jiffies; |
234 | priv->statistics.tx_packets++; | 234 | ndev->stats.tx_packets++; |
235 | priv->statistics.tx_bytes += skb->len; | 235 | ndev->stats.tx_bytes += skb->len; |
236 | 236 | ||
237 | /* trigger the device */ | 237 | /* trigger the device */ |
238 | islpci_trigger(priv); | 238 | islpci_trigger(priv); |
@@ -243,7 +243,7 @@ islpci_eth_transmit(struct sk_buff *skb, struct net_device *ndev) | |||
243 | return 0; | 243 | return 0; |
244 | 244 | ||
245 | drop_free: | 245 | drop_free: |
246 | priv->statistics.tx_dropped++; | 246 | ndev->stats.tx_dropped++; |
247 | spin_unlock_irqrestore(&priv->slock, flags); | 247 | spin_unlock_irqrestore(&priv->slock, flags); |
248 | dev_kfree_skb(skb); | 248 | dev_kfree_skb(skb); |
249 | return err; | 249 | return err; |
@@ -408,8 +408,8 @@ islpci_eth_receive(islpci_private *priv) | |||
408 | skb->protocol = eth_type_trans(skb, ndev); | 408 | skb->protocol = eth_type_trans(skb, ndev); |
409 | } | 409 | } |
410 | skb->ip_summed = CHECKSUM_NONE; | 410 | skb->ip_summed = CHECKSUM_NONE; |
411 | priv->statistics.rx_packets++; | 411 | ndev->stats.rx_packets++; |
412 | priv->statistics.rx_bytes += size; | 412 | ndev->stats.rx_bytes += size; |
413 | 413 | ||
414 | /* deliver the skb to the network layer */ | 414 | /* deliver the skb to the network layer */ |
415 | #ifdef ISLPCI_ETH_DEBUG | 415 | #ifdef ISLPCI_ETH_DEBUG |
@@ -497,10 +497,9 @@ void | |||
497 | islpci_eth_tx_timeout(struct net_device *ndev) | 497 | islpci_eth_tx_timeout(struct net_device *ndev) |
498 | { | 498 | { |
499 | islpci_private *priv = netdev_priv(ndev); | 499 | islpci_private *priv = netdev_priv(ndev); |
500 | struct net_device_stats *statistics = &priv->statistics; | ||
501 | 500 | ||
502 | /* increment the transmit error counter */ | 501 | /* increment the transmit error counter */ |
503 | statistics->tx_errors++; | 502 | ndev->stats.tx_errors++; |
504 | 503 | ||
505 | if (!priv->reset_task_pending) { | 504 | if (!priv->reset_task_pending) { |
506 | printk(KERN_WARNING | 505 | printk(KERN_WARNING |