Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[mirror_ubuntu-artful-kernel.git] / drivers / net / usb / kaweth.c

diff --git a/drivers/net/usb/kaweth.c b/drivers/net/usb/kaweth.c
index 2a2c3edb6bad0b3bd257c3a101d100ad3b00cc59..37fb621fde86cb6f483151c4ffa54e76ff0bd319 100644 (file)
--- a/drivers/net/usb/kaweth.c
+++ b/drivers/net/usb/kaweth.c
@@ -245,8 +245,6 @@ struct kaweth_device
        __u16 packet_filter_bitmap;
 
        struct kaweth_ethernet_configuration configuration;
-
-       struct net_device_stats stats;
 };
 
 /****************************************************************
@@ -598,7 +596,7 @@ static void kaweth_usb_receive(struct urb *urb)
        struct sk_buff *skb;
 
        if (unlikely(status == -EPIPE)) {
-               kaweth->stats.rx_errors++;
+               net->stats.rx_errors++;
                kaweth->end = 1;
                wake_up(&kaweth->term_wait);
                dev_dbg(dev, "Status was -EPIPE.\n");
@@ -613,12 +611,12 @@ static void kaweth_usb_receive(struct urb *urb)
        }
        if (unlikely(status == -EPROTO || status == -ETIME ||
                     status == -EILSEQ)) {
-               kaweth->stats.rx_errors++;
+               net->stats.rx_errors++;
                dev_dbg(dev, "Status was -EPROTO, -ETIME, or -EILSEQ.\n");
                return;
        }
        if (unlikely(status == -EOVERFLOW)) {
-               kaweth->stats.rx_errors++;
+               net->stats.rx_errors++;
                dev_dbg(dev, "Status was -EOVERFLOW.\n");
        }
        spin_lock(&kaweth->device_lock);
@@ -663,8 +661,8 @@ static void kaweth_usb_receive(struct urb *urb)
 
                netif_rx(skb);
 
-               kaweth->stats.rx_packets++;
-               kaweth->stats.rx_bytes += pkt_len;
+               net->stats.rx_packets++;
+               net->stats.rx_bytes += pkt_len;
        }
 
        kaweth_resubmit_rx_urb(kaweth, GFP_ATOMIC);
@@ -804,7 +802,7 @@ static netdev_tx_t kaweth_start_xmit(struct sk_buff *skb,
 
        /* We now decide whether we can put our special header into the sk_buff */
        if (skb_cow_head(skb, 2)) {
-               kaweth->stats.tx_errors++;
+               net->stats.tx_errors++;
                netif_start_queue(net);
                spin_unlock_irq(&kaweth->device_lock);
                dev_kfree_skb_any(skb);
@@ -828,15 +826,15 @@ static netdev_tx_t kaweth_start_xmit(struct sk_buff *skb,
        {
                dev_warn(&net->dev, "kaweth failed tx_urb %d\n", res);
 skip:
-               kaweth->stats.tx_errors++;
+               net->stats.tx_errors++;
 
                netif_start_queue(net);
                dev_kfree_skb_irq(skb);
        }
        else
        {
-               kaweth->stats.tx_packets++;
-               kaweth->stats.tx_bytes += skb->len;
+               net->stats.tx_packets++;
+               net->stats.tx_bytes += skb->len;
        }
 
        spin_unlock_irq(&kaweth->device_lock);
@@ -905,15 +903,6 @@ static void kaweth_async_set_rx_mode(struct kaweth_device *kaweth)
        }
 }
 
-/****************************************************************
- *     kaweth_netdev_stats
- ****************************************************************/
-static struct net_device_stats *kaweth_netdev_stats(struct net_device *dev)
-{
-       struct kaweth_device *kaweth = netdev_priv(dev);
-       return &kaweth->stats;
-}
-
 /****************************************************************
  *     kaweth_tx_timeout
  ****************************************************************/
@@ -922,7 +911,7 @@ static void kaweth_tx_timeout(struct net_device *net)
        struct kaweth_device *kaweth = netdev_priv(net);
 
        dev_warn(&net->dev, "%s: Tx timed out. Resetting.\n", net->name);
-       kaweth->stats.tx_errors++;
+       net->stats.tx_errors++;
        netif_trans_update(net);
 
        usb_unlink_urb(kaweth->tx_urb);
@@ -975,7 +964,6 @@ static const struct net_device_ops kaweth_netdev_ops = {
        .ndo_start_xmit =               kaweth_start_xmit,
        .ndo_tx_timeout =               kaweth_tx_timeout,
        .ndo_set_rx_mode =              kaweth_set_rx_mode,
-       .ndo_get_stats =                kaweth_netdev_stats,
        .ndo_set_mac_address =          eth_mac_addr,
        .ndo_validate_addr =            eth_validate_addr,
 };