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>

diff --git a/drivers/net/wireless/prism54/islpci_dev.c b/drivers/net/wireless/prism54/islpci_dev.c
index 6e7d71c5409146845749a60d26a34b3d990878e0..166ed95846017c0463f5ab65a78acc8e5048aa49 100644 (file)
--- a/drivers/net/wireless/prism54/islpci_dev.c
+++ b/drivers/net/wireless/prism54/islpci_dev.c
@@ -43,7 +43,6 @@
 
 static int prism54_bring_down(islpci_private *);
 static int islpci_alloc_memory(islpci_private *);
-static struct net_device_stats *islpci_statistics(struct net_device *);
 
 /* Temporary dummy MAC address to use until firmware is loaded.
  * The idea there is that some tools (such as nameif) may query
@@ -614,18 +613,6 @@ islpci_reset(islpci_private *priv, int reload_firmware)
        return rc;
 }
 
-static struct net_device_stats *
-islpci_statistics(struct net_device *ndev)
-{
-       islpci_private *priv = netdev_priv(ndev);
-
-#if VERBOSE > SHOW_ERROR_MESSAGES
-       DEBUG(SHOW_FUNCTION_CALLS, "islpci_statistics\n");
-#endif
-
-       return &priv->statistics;
-}
-
 /******************************************************************************
     Network device configuration functions
 ******************************************************************************/
@@ -811,7 +798,6 @@ static const struct ethtool_ops islpci_ethtool_ops = {
 static const struct net_device_ops islpci_netdev_ops = {
        .ndo_open               = islpci_open,
        .ndo_stop               = islpci_close,
-       .ndo_get_stats          = islpci_statistics,
        .ndo_do_ioctl           = prism54_ioctl,
        .ndo_start_xmit         = islpci_eth_transmit,
        .ndo_tx_timeout         = islpci_eth_tx_timeout,

diff --git a/drivers/net/wireless/prism54/islpci_dev.h b/drivers/net/wireless/prism54/islpci_dev.h
index 8e55a5fcffaedaa2e1d181ed6ec65cc62f3b639c..c4d0f19b7cbc2036c67a9e9d4b7326bc1f29f1d8 100644 (file)
--- a/drivers/net/wireless/prism54/islpci_dev.h
+++ b/drivers/net/wireless/prism54/islpci_dev.h
@@ -158,9 +158,6 @@ typedef struct {
        dma_addr_t pci_map_tx_address[ISL38XX_CB_TX_QSIZE];
        dma_addr_t pci_map_rx_address[ISL38XX_CB_RX_QSIZE];
 
-       /* driver network interface members */
-       struct net_device_stats statistics;
-
        /* wait for a reset interrupt */
        wait_queue_head_t reset_done;
 

diff --git a/drivers/net/wireless/prism54/islpci_eth.c b/drivers/net/wireless/prism54/islpci_eth.c
index 88895bd9e495b024847ba2ed221224c79328a454..ef3ef4551b31af3c797b54dcfa4906f5bb722f9b 100644 (file)
--- 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)
 
        /* set the transmission time */
        ndev->trans_start = jiffies;
-       priv->statistics.tx_packets++;
-       priv->statistics.tx_bytes += skb->len;
+       ndev->stats.tx_packets++;
+       ndev->stats.tx_bytes += skb->len;
 
        /* trigger the device */
        islpci_trigger(priv);
@@ -243,7 +243,7 @@ islpci_eth_transmit(struct sk_buff *skb, struct net_device *ndev)
        return 0;
 
       drop_free:
-       priv->statistics.tx_dropped++;
+       ndev->stats.tx_dropped++;
        spin_unlock_irqrestore(&priv->slock, flags);
        dev_kfree_skb(skb);
        return err;
@@ -408,8 +408,8 @@ islpci_eth_receive(islpci_private *priv)
                skb->protocol = eth_type_trans(skb, ndev);
        }
        skb->ip_summed = CHECKSUM_NONE;
-       priv->statistics.rx_packets++;
-       priv->statistics.rx_bytes += size;
+       ndev->stats.rx_packets++;
+       ndev->stats.rx_bytes += size;
 
        /* deliver the skb to the network layer */
 #ifdef ISLPCI_ETH_DEBUG
@@ -497,10 +497,9 @@ void
 islpci_eth_tx_timeout(struct net_device *ndev)
 {
        islpci_private *priv = netdev_priv(ndev);
-       struct net_device_stats *statistics = &priv->statistics;
 
        /* increment the transmit error counter */
-       statistics->tx_errors++;
+       ndev->stats.tx_errors++;
 
        if (!priv->reset_task_pending) {
                printk(KERN_WARNING