Skip to content

Commit

Permalink
slip: fix get_stats() method
Browse files Browse the repository at this point in the history
Use integrated net_device_stats instead of a static one, and make sure
no transient values are feeded. ndo_get_stats() can be called by
concurrent cpus.

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Eric Dumazet authored and David S. Miller committed Aug 19, 2010
1 parent dd57f97 commit 6f0bee1
Showing 1 changed file with 25 additions and 25 deletions.
50 changes: 25 additions & 25 deletions drivers/net/slip.c
Original file line number Diff line number Diff line change
Expand Up @@ -561,36 +561,36 @@ static int sl_change_mtu(struct net_device *dev, int new_mtu)
static struct net_device_stats *
sl_get_stats(struct net_device *dev)
{
static struct net_device_stats stats;
struct net_device_stats *stats = &dev->stats;
struct slip *sl = netdev_priv(dev);
unsigned long c_rx_dropped = 0;
#ifdef SL_INCLUDE_CSLIP
struct slcompress *comp;
#endif
unsigned long c_rx_fifo_errors = 0;
unsigned long c_tx_fifo_errors = 0;
unsigned long c_collisions = 0;
struct slcompress *comp = sl->slcomp;

memset(&stats, 0, sizeof(struct net_device_stats));

stats.rx_packets = sl->rx_packets;
stats.tx_packets = sl->tx_packets;
stats.rx_bytes = sl->rx_bytes;
stats.tx_bytes = sl->tx_bytes;
stats.rx_dropped = sl->rx_dropped;
stats.tx_dropped = sl->tx_dropped;
stats.tx_errors = sl->tx_errors;
stats.rx_errors = sl->rx_errors;
stats.rx_over_errors = sl->rx_over_errors;
#ifdef SL_INCLUDE_CSLIP
stats.rx_fifo_errors = sl->rx_compressed;
stats.tx_fifo_errors = sl->tx_compressed;
stats.collisions = sl->tx_misses;
comp = sl->slcomp;
if (comp) {
stats.rx_fifo_errors += comp->sls_i_compressed;
stats.rx_dropped += comp->sls_i_tossed;
stats.tx_fifo_errors += comp->sls_o_compressed;
stats.collisions += comp->sls_o_misses;
c_rx_fifo_errors = comp->sls_i_compressed;
c_rx_dropped = comp->sls_i_tossed;
c_tx_fifo_errors = comp->sls_o_compressed;
c_collisions = comp->sls_o_misses;
}
#endif /* CONFIG_INET */
return (&stats);
stats->rx_fifo_errors = sl->rx_compressed + c_rx_fifo_errors;
stats->tx_fifo_errors = sl->tx_compressed + c_tx_fifo_errors;
stats->collisions = sl->tx_misses + c_collisions;
#endif

stats->rx_packets = sl->rx_packets;
stats->tx_packets = sl->tx_packets;
stats->rx_bytes = sl->rx_bytes;
stats->tx_bytes = sl->tx_bytes;
stats->rx_dropped = sl->rx_dropped + c_rx_dropped;
stats->tx_dropped = sl->tx_dropped;
stats->tx_errors = sl->tx_errors;
stats->rx_errors = sl->rx_errors;
stats->rx_over_errors = sl->rx_over_errors;
return stats;
}

/* Netdevice register callback */
Expand Down

0 comments on commit 6f0bee1

Please sign in to comment.