aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/neterion/s2io.c
diff options
context:
space:
mode:
authorRick Jones <rick.jones2@hp.com>2011-10-07 19:13:28 -0400
committerDavid S. Miller <davem@davemloft.net>2011-10-07 19:13:28 -0400
commit8b0c11679fd37522d8d34a76101319a085d80912 (patch)
treeb4cd7e2d2e623df5107554e58ea20bd18dcf88fa /drivers/net/ethernet/neterion/s2io.c
parent1d0861acfb24d0ca0661ff5a156b992b2c589458 (diff)
net: Remove unnecessary driver assignments of ethtool_ringparam fields to zero
Per comments from Ben Hutchings on a previous patch, sweep the floors a little removing unnecessary assignments of zero to fields of struct ethtool_ringparam in driver code supporting ethtool -g. Signed-off-by: Rick Jones <rick.jones2@hp.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/neterion/s2io.c')
-rw-r--r--drivers/net/ethernet/neterion/s2io.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/ethernet/neterion/s2io.c b/drivers/net/ethernet/neterion/s2io.c
index 4ec7e3f46cc6..bdd3e6a330cd 100644
--- a/drivers/net/ethernet/neterion/s2io.c
+++ b/drivers/net/ethernet/neterion/s2io.c
@@ -5522,14 +5522,12 @@ static void s2io_ethtool_gringparam(struct net_device *dev,
5522 ering->rx_jumbo_max_pending = MAX_RX_DESC_2; 5522 ering->rx_jumbo_max_pending = MAX_RX_DESC_2;
5523 } 5523 }
5524 5524
5525 ering->rx_mini_max_pending = 0;
5526 ering->tx_max_pending = MAX_TX_DESC; 5525 ering->tx_max_pending = MAX_TX_DESC;
5527 5526
5528 for (i = 0; i < sp->config.rx_ring_num; i++) 5527 for (i = 0; i < sp->config.rx_ring_num; i++)
5529 rx_desc_count += sp->config.rx_cfg[i].num_rxd; 5528 rx_desc_count += sp->config.rx_cfg[i].num_rxd;
5530 ering->rx_pending = rx_desc_count; 5529 ering->rx_pending = rx_desc_count;
5531 ering->rx_jumbo_pending = rx_desc_count; 5530 ering->rx_jumbo_pending = rx_desc_count;
5532 ering->rx_mini_pending = 0;
5533 5531
5534 for (i = 0; i < sp->config.tx_fifo_num; i++) 5532 for (i = 0; i < sp->config.tx_fifo_num; i++)
5535 tx_desc_count += sp->config.tx_cfg[i].fifo_len; 5533 tx_desc_count += sp->config.tx_cfg[i].fifo_len;