tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

olympic: convert to internal network device stats

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Stephen Hemminger and committed by
David S. Miller dcc59a97 be188278

+6 -16
+6 -15
drivers/net/tokenring/olympic.c
··· 187 187 static void olympic_set_rx_mode(struct net_device *dev); 188 188 static void olympic_freemem(struct net_device *dev) ; 189 189 static irqreturn_t olympic_interrupt(int irq, void *dev_id); 190 - static struct net_device_stats * olympic_get_stats(struct net_device *dev); 191 190 static int olympic_set_mac_address(struct net_device *dev, void *addr) ; 192 191 static void olympic_arb_cmd(struct net_device *dev); 193 192 static int olympic_change_mtu(struct net_device *dev, int mtu); ··· 258 259 dev->stop=&olympic_close; 259 260 dev->do_ioctl=NULL; 260 261 dev->set_multicast_list=&olympic_set_rx_mode; 261 - dev->get_stats=&olympic_get_stats ; 262 262 dev->set_mac_address=&olympic_set_mac_address ; 263 263 SET_NETDEV_DEV(dev, &pdev->dev); 264 264 ··· 783 785 } 784 786 olympic_priv->rx_ring_last_received += i ; 785 787 olympic_priv->rx_ring_last_received &= (OLYMPIC_RX_RING_SIZE -1) ; 786 - olympic_priv->olympic_stats.rx_errors++; 788 + dev->stats.rx_errors++; 787 789 } else { 788 790 789 791 if (buffer_cnt == 1) { ··· 794 796 795 797 if (skb == NULL) { 796 798 printk(KERN_WARNING "%s: Not enough memory to copy packet to upper layers. \n",dev->name) ; 797 - olympic_priv->olympic_stats.rx_dropped++ ; 799 + dev->stats.rx_dropped++; 798 800 /* Update counters even though we don't transfer the frame */ 799 801 olympic_priv->rx_ring_last_received += i ; 800 802 olympic_priv->rx_ring_last_received &= (OLYMPIC_RX_RING_SIZE -1) ; ··· 860 862 skb->protocol = tr_type_trans(skb,dev); 861 863 netif_rx(skb) ; 862 864 } 863 - olympic_priv->olympic_stats.rx_packets++ ; 864 - olympic_priv->olympic_stats.rx_bytes += length ; 865 + dev->stats.rx_packets++ ; 866 + dev->stats.rx_bytes += length ; 865 867 } /* if skb == null */ 866 868 } /* If status & 0x3b */ 867 869 ··· 969 971 olympic_priv->tx_ring_last_status++; 970 972 olympic_priv->tx_ring_last_status &= (OLYMPIC_TX_RING_SIZE-1); 971 973 olympic_priv->free_tx_ring_entries++; 972 - olympic_priv->olympic_stats.tx_bytes += olympic_priv->tx_ring_skb[olympic_priv->tx_ring_last_status]->len; 973 - olympic_priv->olympic_stats.tx_packets++ ; 974 + dev->stats.tx_bytes += olympic_priv->tx_ring_skb[olympic_priv->tx_ring_last_status]->len; 975 + dev->stats.tx_packets++ ; 974 976 pci_unmap_single(olympic_priv->pdev, 975 977 le32_to_cpu(olympic_priv->olympic_tx_ring[olympic_priv->tx_ring_last_status].buffer), 976 978 olympic_priv->tx_ring_skb[olympic_priv->tx_ring_last_status]->len,PCI_DMA_TODEVICE); ··· 1341 1343 } /* switch srb[0] */ 1342 1344 1343 1345 } 1344 - 1345 - static struct net_device_stats * olympic_get_stats(struct net_device *dev) 1346 - { 1347 - struct olympic_private *olympic_priv ; 1348 - olympic_priv=netdev_priv(dev); 1349 - return (struct net_device_stats *) &olympic_priv->olympic_stats; 1350 - } 1351 1346 1352 1347 static int olympic_set_mac_address (struct net_device *dev, void *addr) 1353 1348 {
-1
drivers/net/tokenring/olympic.h
··· 275 275 struct sk_buff *tx_ring_skb[OLYMPIC_TX_RING_SIZE], *rx_ring_skb[OLYMPIC_RX_RING_SIZE]; 276 276 int tx_ring_free, tx_ring_last_status, rx_ring_last_received,rx_status_last_received, free_tx_ring_entries; 277 277 278 - struct net_device_stats olympic_stats ; 279 278 u16 olympic_lan_status ; 280 279 u8 olympic_ring_speed ; 281 280 u16 pkt_buf_sz ;