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

[SPIDERNET] spider_net_ethtool: Keep up with recent netdev stats changes

drivers/net/spider_net_ethtool.c: In function 'spider_net_get_ethtool_stats':
drivers/net/spider_net_ethtool.c:160: error: structure has no member named 'netdev_stats'
drivers/net/spider_net_ethtool.c:161: error: structure has no member named 'netdev_stats'
drivers/net/spider_net_ethtool.c:162: error: structure has no member named 'netdev_stats'
drivers/net/spider_net_ethtool.c:163: error: structure has no member named 'netdev_stats'
drivers/net/spider_net_ethtool.c:164: error: structure has no member named 'netdev_stats'
drivers/net/spider_net_ethtool.c:165: error: structure has no member named 'netdev_stats'
drivers/net/spider_net_ethtool.c:166: error: structure has no member named 'netdev_stats'
make[2]: *** [drivers/net/spider_net_ethtool.o] Error 1

Also do another ARRAY_SIZE() cleanup while at it.

Signed-off-by: Satyam Sharma <satyam@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Satyam Sharma and committed by
David S. Miller
7a876fae 0aa4f333

+8 -10
+8 -10
drivers/net/spider_net_ethtool.c
··· 28 28 #include "spider_net.h" 29 29 30 30 31 - #define SPIDER_NET_NUM_STATS 13 32 - 33 31 static struct { 34 32 const char str[ETH_GSTRING_LEN]; 35 33 } ethtool_stats_keys[] = { ··· 149 151 { 150 152 switch (sset) { 151 153 case ETH_SS_STATS: 152 - return SPIDER_NET_NUM_STATS; 154 + return ARRAY_SIZE(ethtool_stats_keys); 153 155 default: 154 156 return -EOPNOTSUPP; 155 157 } ··· 160 162 { 161 163 struct spider_net_card *card = netdev->priv; 162 164 163 - data[0] = card->netdev_stats.tx_packets; 164 - data[1] = card->netdev_stats.tx_bytes; 165 - data[2] = card->netdev_stats.rx_packets; 166 - data[3] = card->netdev_stats.rx_bytes; 167 - data[4] = card->netdev_stats.tx_errors; 168 - data[5] = card->netdev_stats.tx_dropped; 169 - data[6] = card->netdev_stats.rx_dropped; 165 + data[0] = netdev->stats.tx_packets; 166 + data[1] = netdev->stats.tx_bytes; 167 + data[2] = netdev->stats.rx_packets; 168 + data[3] = netdev->stats.rx_bytes; 169 + data[4] = netdev->stats.tx_errors; 170 + data[5] = netdev->stats.tx_dropped; 171 + data[6] = netdev->stats.rx_dropped; 170 172 data[7] = card->spider_stats.rx_desc_error; 171 173 data[8] = card->spider_stats.tx_timeouts; 172 174 data[9] = card->spider_stats.alloc_rx_skb_error;