Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 186518
b: refs/heads/master
c: 6c7aeb6
h: refs/heads/master
v: v3
  • Loading branch information
kirjanov@gmail.com authored and Greg Kroah-Hartman committed Mar 4, 2010
1 parent 60d9901 commit 89ff9aa
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 14 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d9c057ab0b19e4995884f412b7d15b6c08b1b54e
refs/heads/master: 6c7aeb654d0d7f6d3b8de864c60868aa61f1e283
25 changes: 12 additions & 13 deletions trunk/drivers/staging/slicoss/slicoss.c
Original file line number Diff line number Diff line change
Expand Up @@ -1230,21 +1230,20 @@ static void slic_init_cleanup(struct adapter *adapter)
static struct net_device_stats *slic_get_stats(struct net_device *dev)
{
struct adapter *adapter = netdev_priv(dev);
struct net_device_stats *stats;

ASSERT(adapter);
stats = &adapter->stats;
stats->collisions = adapter->slic_stats.iface.xmit_collisions;
stats->rx_errors = adapter->slic_stats.iface.rcv_errors;
stats->tx_errors = adapter->slic_stats.iface.xmt_errors;
stats->rx_missed_errors = adapter->slic_stats.iface.rcv_discards;
stats->tx_heartbeat_errors = 0;
stats->tx_aborted_errors = 0;
stats->tx_window_errors = 0;
stats->tx_fifo_errors = 0;
stats->rx_frame_errors = 0;
stats->rx_length_errors = 0;
return &adapter->stats;
dev->stats.collisions = adapter->slic_stats.iface.xmit_collisions;
dev->stats.rx_errors = adapter->slic_stats.iface.rcv_errors;
dev->stats.tx_errors = adapter->slic_stats.iface.xmt_errors;
dev->stats.rx_missed_errors = adapter->slic_stats.iface.rcv_discards;
dev->stats.tx_heartbeat_errors = 0;
dev->stats.tx_aborted_errors = 0;
dev->stats.tx_window_errors = 0;
dev->stats.tx_fifo_errors = 0;
dev->stats.rx_frame_errors = 0;
dev->stats.rx_length_errors = 0;

return &dev->stats;
}

/*
Expand Down

0 comments on commit 89ff9aa

Please sign in to comment.