aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/marvell
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/marvell
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/marvell')
-rw-r--r--drivers/net/ethernet/marvell/mv643xx_eth.c4
-rw-r--r--drivers/net/ethernet/marvell/skge.c4
-rw-r--r--drivers/net/ethernet/marvell/sky2.c4
3 files changed, 0 insertions, 12 deletions
diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c
index 7325737fe93b..f6821aa5ffbf 100644
--- a/drivers/net/ethernet/marvell/mv643xx_eth.c
+++ b/drivers/net/ethernet/marvell/mv643xx_eth.c
@@ -1547,13 +1547,9 @@ mv643xx_eth_get_ringparam(struct net_device *dev, struct ethtool_ringparam *er)
1547 1547
1548 er->rx_max_pending = 4096; 1548 er->rx_max_pending = 4096;
1549 er->tx_max_pending = 4096; 1549 er->tx_max_pending = 4096;
1550 er->rx_mini_max_pending = 0;
1551 er->rx_jumbo_max_pending = 0;
1552 1550
1553 er->rx_pending = mp->rx_ring_size; 1551 er->rx_pending = mp->rx_ring_size;
1554 er->tx_pending = mp->tx_ring_size; 1552 er->tx_pending = mp->tx_ring_size;
1555 er->rx_mini_pending = 0;
1556 er->rx_jumbo_pending = 0;
1557} 1553}
1558 1554
1559static int 1555static int
diff --git a/drivers/net/ethernet/marvell/skge.c b/drivers/net/ethernet/marvell/skge.c
index 32db4c877ff1..297730359b79 100644
--- a/drivers/net/ethernet/marvell/skge.c
+++ b/drivers/net/ethernet/marvell/skge.c
@@ -497,13 +497,9 @@ static void skge_get_ring_param(struct net_device *dev,
497 497
498 p->rx_max_pending = MAX_RX_RING_SIZE; 498 p->rx_max_pending = MAX_RX_RING_SIZE;
499 p->tx_max_pending = MAX_TX_RING_SIZE; 499 p->tx_max_pending = MAX_TX_RING_SIZE;
500 p->rx_mini_max_pending = 0;
501 p->rx_jumbo_max_pending = 0;
502 500
503 p->rx_pending = skge->rx_ring.count; 501 p->rx_pending = skge->rx_ring.count;
504 p->tx_pending = skge->tx_ring.count; 502 p->tx_pending = skge->tx_ring.count;
505 p->rx_mini_pending = 0;
506 p->rx_jumbo_pending = 0;
507} 503}
508 504
509static int skge_set_ring_param(struct net_device *dev, 505static int skge_set_ring_param(struct net_device *dev,
diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c
index a3ce9b6d36af..6895e3be260c 100644
--- a/drivers/net/ethernet/marvell/sky2.c
+++ b/drivers/net/ethernet/marvell/sky2.c
@@ -4088,13 +4088,9 @@ static void sky2_get_ringparam(struct net_device *dev,
4088 struct sky2_port *sky2 = netdev_priv(dev); 4088 struct sky2_port *sky2 = netdev_priv(dev);
4089 4089
4090 ering->rx_max_pending = RX_MAX_PENDING; 4090 ering->rx_max_pending = RX_MAX_PENDING;
4091 ering->rx_mini_max_pending = 0;
4092 ering->rx_jumbo_max_pending = 0;
4093 ering->tx_max_pending = TX_MAX_PENDING; 4091 ering->tx_max_pending = TX_MAX_PENDING;
4094 4092
4095 ering->rx_pending = sky2->rx_pending; 4093 ering->rx_pending = sky2->rx_pending;
4096 ering->rx_mini_pending = 0;
4097 ering->rx_jumbo_pending = 0;
4098 ering->tx_pending = sky2->tx_pending; 4094 ering->tx_pending = sky2->tx_pending;
4099} 4095}
4100 4096