Commit 9fd3238e95046b61d518ddacaa767fa09f31b0d0
Committed by
David S. Miller
David S. Miller
1 parent
48b47a5e30
Exists in
master
and in
7 other branches
ibmtr: convert to internal network_device_stats
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Showing 2 changed files with 7 additions and 24 deletions Side-by-side Diff
drivers/net/tokenring/ibmtr.c
| ... | ... | @@ -200,7 +200,6 @@ |
| 200 | 200 | static void ibmtr_reset_timer(struct timer_list*tmr,struct net_device *dev); |
| 201 | 201 | static void tok_rerun(unsigned long dev_addr); |
| 202 | 202 | static void ibmtr_readlog(struct net_device *dev); |
| 203 | -static struct net_device_stats *tok_get_stats(struct net_device *dev); | |
| 204 | 203 | static int ibmtr_change_mtu(struct net_device *dev, int mtu); |
| 205 | 204 | static void find_turbo_adapters(int *iolist); |
| 206 | 205 | |
| ... | ... | @@ -825,7 +824,6 @@ |
| 825 | 824 | dev->open = tok_open; |
| 826 | 825 | dev->stop = tok_close; |
| 827 | 826 | dev->hard_start_xmit = tok_send_packet; |
| 828 | - dev->get_stats = tok_get_stats; | |
| 829 | 827 | dev->set_multicast_list = tok_set_multicast_list; |
| 830 | 828 | dev->change_mtu = ibmtr_change_mtu; |
| 831 | 829 | |
| ... | ... | @@ -1460,7 +1458,7 @@ |
| 1460 | 1458 | "%02X\n", |
| 1461 | 1459 | (int)retcode, (int)readb(ti->ssb + 6)); |
| 1462 | 1460 | else |
| 1463 | - ti->tr_stats.tx_packets++; | |
| 1461 | + dev->stats.tx_packets++; | |
| 1464 | 1462 | break; |
| 1465 | 1463 | case XMIT_XID_CMD: |
| 1466 | 1464 | DPRINTK("xmit xid ret_code: %02X\n", |
| ... | ... | @@ -1646,7 +1644,7 @@ |
| 1646 | 1644 | break; |
| 1647 | 1645 | } |
| 1648 | 1646 | writeb(RESP_IN_ASB, ti->mmio + ACA_OFFSET + ACA_SET + ISRA_ODD); |
| 1649 | - ti->tr_stats.tx_bytes += ti->current_skb->len; | |
| 1647 | + dev->stats.tx_bytes += ti->current_skb->len; | |
| 1650 | 1648 | dev_kfree_skb_irq(ti->current_skb); |
| 1651 | 1649 | ti->current_skb = NULL; |
| 1652 | 1650 | netif_wake_queue(dev); |
| ... | ... | @@ -1722,7 +1720,7 @@ |
| 1722 | 1720 | if (readb(llc + offsetof(struct trllc, llc)) != UI_CMD) { |
| 1723 | 1721 | SET_PAGE(ti->asb_page); |
| 1724 | 1722 | writeb(DATA_LOST, ti->asb + RETCODE_OFST); |
| 1725 | - ti->tr_stats.rx_dropped++; | |
| 1723 | + dev->stats.rx_dropped++; | |
| 1726 | 1724 | writeb(RESP_IN_ASB, ti->mmio + ACA_OFFSET + ACA_SET + ISRA_ODD); |
| 1727 | 1725 | return; |
| 1728 | 1726 | } |
| ... | ... | @@ -1757,7 +1755,7 @@ |
| 1757 | 1755 | |
| 1758 | 1756 | if (!(skb = dev_alloc_skb(skb_size))) { |
| 1759 | 1757 | DPRINTK("out of memory. frame dropped.\n"); |
| 1760 | - ti->tr_stats.rx_dropped++; | |
| 1758 | + dev->stats.rx_dropped++; | |
| 1761 | 1759 | SET_PAGE(ti->asb_page); |
| 1762 | 1760 | writeb(DATA_LOST, ti->asb + offsetof(struct asb_rec, ret_code)); |
| 1763 | 1761 | writeb(RESP_IN_ASB, ti->mmio + ACA_OFFSET + ACA_SET + ISRA_ODD); |
| ... | ... | @@ -1813,8 +1811,8 @@ |
| 1813 | 1811 | |
| 1814 | 1812 | writeb(RESP_IN_ASB, ti->mmio + ACA_OFFSET + ACA_SET + ISRA_ODD); |
| 1815 | 1813 | |
| 1816 | - ti->tr_stats.rx_bytes += skb->len; | |
| 1817 | - ti->tr_stats.rx_packets++; | |
| 1814 | + dev->stats.rx_bytes += skb->len; | |
| 1815 | + dev->stats.rx_packets++; | |
| 1818 | 1816 | |
| 1819 | 1817 | skb->protocol = tr_type_trans(skb, dev); |
| 1820 | 1818 | if (IPv4_p) { |
| ... | ... | @@ -1872,21 +1870,6 @@ |
| 1872 | 1870 | |
| 1873 | 1871 | netif_stop_queue(dev); |
| 1874 | 1872 | |
| 1875 | -} | |
| 1876 | - | |
| 1877 | -/*****************************************************************************/ | |
| 1878 | - | |
| 1879 | -/* tok_get_stats(): Basically a scaffold routine which will return | |
| 1880 | - the address of the tr_statistics structure associated with | |
| 1881 | - this device -- the tr.... structure is an ethnet look-alike | |
| 1882 | - so at least for this iteration may suffice. */ | |
| 1883 | - | |
| 1884 | -static struct net_device_stats *tok_get_stats(struct net_device *dev) | |
| 1885 | -{ | |
| 1886 | - | |
| 1887 | - struct tok_info *toki; | |
| 1888 | - toki = netdev_priv(dev); | |
| 1889 | - return (struct net_device_stats *) &toki->tr_stats; | |
| 1890 | 1873 | } |
| 1891 | 1874 | |
| 1892 | 1875 | /*****************************************************************************/ |
include/linux/ibmtr.h
| ... | ... | @@ -207,7 +207,7 @@ |
| 207 | 207 | unsigned short exsap_station_id; |
| 208 | 208 | unsigned short global_int_enable; |
| 209 | 209 | struct sk_buff *current_skb; |
| 210 | - struct net_device_stats tr_stats; | |
| 210 | + | |
| 211 | 211 | unsigned char auto_speedsave; |
| 212 | 212 | open_state open_status, sap_status; |
| 213 | 213 | enum {MANUAL, AUTOMATIC} open_mode; |