android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

usbnet: Use netdev stats structure

Browse Source 
Now that netdev has its own stats structure we should use that
instead.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Herbert Xu 2009-06-29 16:53:28 +00:00 committed by David S. Miller
parent 80667ac13a
commit 7963837f93
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/net/usb/usbnet.c
View File

@ -234,8 +234,8 @@ void usbnet_skb_return (struct usbnet *dev, struct sk_buff *skb)
int status; int status;
skb->protocol = eth_type_trans (skb, dev->net); skb->protocol = eth_type_trans (skb, dev->net);
dev->stats.rx_packets++; dev->net->stats.rx_packets++;
dev->stats.rx_bytes += skb->len; dev->net->stats.rx_bytes += skb->len;
if (netif_msg_rx_status (dev)) if (netif_msg_rx_status (dev))
devdbg (dev, "< rx, len %zu, type 0x%x", devdbg (dev, "< rx, len %zu, type 0x%x",
@ -397,7 +397,7 @@ static inline void rx_process (struct usbnet *dev, struct sk_buff *skb)
if (netif_msg_rx_err (dev)) if (netif_msg_rx_err (dev))
devdbg (dev, "drop"); devdbg (dev, "drop");
error: error:
dev->stats.rx_errors++; dev->net->stats.rx_errors++;
skb_queue_tail (&dev->done, skb); skb_queue_tail (&dev->done, skb);
} }
} }
@ -420,8 +420,8 @@ static void rx_complete (struct urb *urb)
case 0: case 0:
if (skb->len < dev->net->hard_header_len) { if (skb->len < dev->net->hard_header_len) {
entry->state = rx_cleanup; entry->state = rx_cleanup;
dev->stats.rx_errors++; dev->net->stats.rx_errors++;
dev->stats.rx_length_errors++; dev->net->stats.rx_length_errors++;
if (netif_msg_rx_err (dev)) if (netif_msg_rx_err (dev))
devdbg (dev, "rx length %d", skb->len); devdbg (dev, "rx length %d", skb->len);
} }
@ -433,7 +433,7 @@ static void rx_complete (struct urb *urb)
* storm, recovering as needed. * storm, recovering as needed.
*/ */
case -EPIPE: case -EPIPE:
dev->stats.rx_errors++; dev->net->stats.rx_errors++;
usbnet_defer_kevent (dev, EVENT_RX_HALT); usbnet_defer_kevent (dev, EVENT_RX_HALT);
// FALLTHROUGH // FALLTHROUGH
@ -451,7 +451,7 @@ static void rx_complete (struct urb *urb)
case -EPROTO: case -EPROTO:
case -ETIME: case -ETIME:
case -EILSEQ: case -EILSEQ:
dev->stats.rx_errors++; dev->net->stats.rx_errors++;
if (!timer_pending (&dev->delay)) { if (!timer_pending (&dev->delay)) {
mod_timer (&dev->delay, jiffies + THROTTLE_JIFFIES); mod_timer (&dev->delay, jiffies + THROTTLE_JIFFIES);
if (netif_msg_link (dev)) if (netif_msg_link (dev))
@ -465,12 +465,12 @@ static void rx_complete (struct urb *urb)
/* data overrun ... flush fifo? */ /* data overrun ... flush fifo? */
case -EOVERFLOW: case -EOVERFLOW:
dev->stats.rx_over_errors++; dev->net->stats.rx_over_errors++;
// FALLTHROUGH // FALLTHROUGH
default: default:
entry->state = rx_cleanup; entry->state = rx_cleanup;
dev->stats.rx_errors++; dev->net->stats.rx_errors++;
if (netif_msg_rx_err (dev)) if (netif_msg_rx_err (dev))
devdbg (dev, "rx status %d", urb_status); devdbg (dev, "rx status %d", urb_status);
break; break;
@ -583,8 +583,8 @@ int usbnet_stop (struct net_device *net)
if (netif_msg_ifdown (dev)) if (netif_msg_ifdown (dev))
devinfo (dev, "stop stats: rx/tx %ld/%ld, errs %ld/%ld", devinfo (dev, "stop stats: rx/tx %ld/%ld, errs %ld/%ld",
dev->stats.rx_packets, dev->stats.tx_packets, net->stats.rx_packets, net->stats.tx_packets,
dev->stats.rx_errors, dev->stats.tx_errors net->stats.rx_errors, net->stats.tx_errors
); );
// ensure there are no more active urbs // ensure there are no more active urbs
@ -891,10 +891,10 @@ static void tx_complete (struct urb *urb)
struct usbnet *dev = entry->dev; struct usbnet *dev = entry->dev;
if (urb->status == 0) { if (urb->status == 0) {
dev->stats.tx_packets++; dev->net->stats.tx_packets++;
dev->stats.tx_bytes += entry->length; dev->net->stats.tx_bytes += entry->length;
} else { } else {
dev->stats.tx_errors++; dev->net->stats.tx_errors++;
switch (urb->status) { switch (urb->status) {
case -EPIPE: case -EPIPE:
@ -1020,7 +1020,7 @@ int usbnet_start_xmit (struct sk_buff *skb, struct net_device *net)
devdbg (dev, "drop, code %d", retval); devdbg (dev, "drop, code %d", retval);
drop: drop:
retval = NET_XMIT_SUCCESS; retval = NET_XMIT_SUCCESS;
dev->stats.tx_dropped++; dev->net->stats.tx_dropped++;
if (skb) if (skb)
dev_kfree_skb_any (skb); dev_kfree_skb_any (skb);
usb_free_urb (urb); usb_free_urb (urb);