UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

usbnet: convert to internal net_device stats 

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Stephen Hemminger 2009-03-20 19:35:50 +00:00 committed by David S. Miller
parent 19b8f8f1a1
commit b7e41e2305
1 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/net/usb/rtl8150.c
View File

@ -155,7 +155,6 @@ struct rtl8150 {
unsigned long flags; unsigned long flags;
struct usb_device *udev; struct usb_device *udev;
struct tasklet_struct tl; struct tasklet_struct tl;
struct net_device_stats stats;
struct net_device *netdev; struct net_device *netdev;
struct urb *rx_urb, *tx_urb, *intr_urb, *ctrl_urb; struct urb *rx_urb, *tx_urb, *intr_urb, *ctrl_urb;
struct sk_buff *tx_skb, *rx_skb; struct sk_buff *tx_skb, *rx_skb;
@ -463,8 +462,8 @@ static void read_bulk_callback(struct urb *urb)
skb_put(dev->rx_skb, pkt_len); skb_put(dev->rx_skb, pkt_len);
dev->rx_skb->protocol = eth_type_trans(dev->rx_skb, netdev); dev->rx_skb->protocol = eth_type_trans(dev->rx_skb, netdev);
netif_rx(dev->rx_skb); netif_rx(dev->rx_skb);
dev->stats.rx_packets++; netdev->stats.rx_packets++;
dev->stats.rx_bytes += pkt_len; netdev->stats.rx_bytes += pkt_len;
spin_lock(&dev->rx_pool_lock); spin_lock(&dev->rx_pool_lock);
skb = pull_skb(dev); skb = pull_skb(dev);
@ -573,13 +572,13 @@ static void intr_callback(struct urb *urb)
d = urb->transfer_buffer; d = urb->transfer_buffer;
if (d[0] & TSR_ERRORS) { if (d[0] & TSR_ERRORS) {
dev->stats.tx_errors++; dev->netdev->stats.tx_errors++;
if (d[INT_TSR] & (TSR_ECOL | TSR_JBR)) if (d[INT_TSR] & (TSR_ECOL | TSR_JBR))
dev->stats.tx_aborted_errors++; dev->netdev->stats.tx_aborted_errors++;
if (d[INT_TSR] & TSR_LCOL) if (d[INT_TSR] & TSR_LCOL)
dev->stats.tx_window_errors++; dev->netdev->stats.tx_window_errors++;
if (d[INT_TSR] & TSR_LOSS_CRS) if (d[INT_TSR] & TSR_LOSS_CRS)
dev->stats.tx_carrier_errors++; dev->netdev->stats.tx_carrier_errors++;
} }
/* Report link status changes to the network stack */ /* Report link status changes to the network stack */
if ((d[INT_MSR] & MSR_LINK) == 0) { if ((d[INT_MSR] & MSR_LINK) == 0) {
@ -697,17 +696,12 @@ static void disable_net_traffic(rtl8150_t * dev)
set_registers(dev, CR, 1, &cr); set_registers(dev, CR, 1, &cr);
} }
static struct net_device_stats *rtl8150_netdev_stats(struct net_device *dev)
{
return &((rtl8150_t *)netdev_priv(dev))->stats;
}
static void rtl8150_tx_timeout(struct net_device *netdev) static void rtl8150_tx_timeout(struct net_device *netdev)
{ {
rtl8150_t *dev = netdev_priv(netdev); rtl8150_t *dev = netdev_priv(netdev);
dev_warn(&netdev->dev, "Tx timeout.\n"); dev_warn(&netdev->dev, "Tx timeout.\n");
usb_unlink_urb(dev->tx_urb); usb_unlink_urb(dev->tx_urb);
dev->stats.tx_errors++; netdev->stats.tx_errors++;
} }
static void rtl8150_set_multicast(struct net_device *netdev) static void rtl8150_set_multicast(struct net_device *netdev)
@ -747,12 +741,12 @@ static int rtl8150_start_xmit(struct sk_buff *skb, struct net_device *netdev)
netif_device_detach(dev->netdev); netif_device_detach(dev->netdev);
else { else {
dev_warn(&netdev->dev, "failed tx_urb %d\n", res); dev_warn(&netdev->dev, "failed tx_urb %d\n", res);
dev->stats.tx_errors++; netdev->stats.tx_errors++;
netif_start_queue(netdev); netif_start_queue(netdev);
} }
} else { } else {
dev->stats.tx_packets++; netdev->stats.tx_packets++;
dev->stats.tx_bytes += skb->len; netdev->stats.tx_bytes += skb->len;
netdev->trans_start = jiffies; netdev->trans_start = jiffies;
} }
@ -931,7 +925,7 @@ static int rtl8150_probe(struct usb_interface *intf,
netdev->hard_start_xmit = rtl8150_start_xmit; netdev->hard_start_xmit = rtl8150_start_xmit;
netdev->set_multicast_list = rtl8150_set_multicast; netdev->set_multicast_list = rtl8150_set_multicast;
netdev->set_mac_address = rtl8150_set_mac_address; netdev->set_mac_address = rtl8150_set_mac_address;
netdev->get_stats = rtl8150_netdev_stats;
SET_ETHTOOL_OPS(netdev, &ops); SET_ETHTOOL_OPS(netdev, &ops);
dev->intr_interval = 100; /* 100ms */ dev->intr_interval = 100; /* 100ms */