diff options
author | Rick Jones <rick.jones2@hp.com> | 2011-10-07 19:13:28 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-10-07 19:13:28 -0400 |
commit | 8b0c11679fd37522d8d34a76101319a085d80912 (patch) | |
tree | b4cd7e2d2e623df5107554e58ea20bd18dcf88fa | |
parent | 1d0861acfb24d0ca0661ff5a156b992b2c589458 (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>
26 files changed, 0 insertions, 90 deletions
diff --git a/drivers/net/ethernet/3com/typhoon.c b/drivers/net/ethernet/3com/typhoon.c index 607c09e3dc80..11f8858c786d 100644 --- a/drivers/net/ethernet/3com/typhoon.c +++ b/drivers/net/ethernet/3com/typhoon.c | |||
@@ -1148,13 +1148,9 @@ static void | |||
1148 | typhoon_get_ringparam(struct net_device *dev, struct ethtool_ringparam *ering) | 1148 | typhoon_get_ringparam(struct net_device *dev, struct ethtool_ringparam *ering) |
1149 | { | 1149 | { |
1150 | ering->rx_max_pending = RXENT_ENTRIES; | 1150 | ering->rx_max_pending = RXENT_ENTRIES; |
1151 | ering->rx_mini_max_pending = 0; | ||
1152 | ering->rx_jumbo_max_pending = 0; | ||
1153 | ering->tx_max_pending = TXLO_ENTRIES - 1; | 1151 | ering->tx_max_pending = TXLO_ENTRIES - 1; |
1154 | 1152 | ||
1155 | ering->rx_pending = RXENT_ENTRIES; | 1153 | ering->rx_pending = RXENT_ENTRIES; |
1156 | ering->rx_mini_pending = 0; | ||
1157 | ering->rx_jumbo_pending = 0; | ||
1158 | ering->tx_pending = TXLO_ENTRIES - 1; | 1154 | ering->tx_pending = TXLO_ENTRIES - 1; |
1159 | } | 1155 | } |
1160 | 1156 | ||
diff --git a/drivers/net/ethernet/atheros/atlx/atl1.c b/drivers/net/ethernet/atheros/atlx/atl1.c index 43511ab8dd27..7381a49fefb4 100644 --- a/drivers/net/ethernet/atheros/atlx/atl1.c +++ b/drivers/net/ethernet/atheros/atlx/atl1.c | |||
@@ -3473,12 +3473,8 @@ static void atl1_get_ringparam(struct net_device *netdev, | |||
3473 | 3473 | ||
3474 | ring->rx_max_pending = ATL1_MAX_RFD; | 3474 | ring->rx_max_pending = ATL1_MAX_RFD; |
3475 | ring->tx_max_pending = ATL1_MAX_TPD; | 3475 | ring->tx_max_pending = ATL1_MAX_TPD; |
3476 | ring->rx_mini_max_pending = 0; | ||
3477 | ring->rx_jumbo_max_pending = 0; | ||
3478 | ring->rx_pending = rxdr->count; | 3476 | ring->rx_pending = rxdr->count; |
3479 | ring->tx_pending = txdr->count; | 3477 | ring->tx_pending = txdr->count; |
3480 | ring->rx_mini_pending = 0; | ||
3481 | ring->rx_jumbo_pending = 0; | ||
3482 | } | 3478 | } |
3483 | 3479 | ||
3484 | static int atl1_set_ringparam(struct net_device *netdev, | 3480 | static int atl1_set_ringparam(struct net_device *netdev, |
diff --git a/drivers/net/ethernet/broadcom/bcm63xx_enet.c b/drivers/net/ethernet/broadcom/bcm63xx_enet.c index 05b022866076..a11a8ad94226 100644 --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c | |||
@@ -1398,8 +1398,6 @@ static void bcm_enet_get_ringparam(struct net_device *dev, | |||
1398 | /* rx/tx ring is actually only limited by memory */ | 1398 | /* rx/tx ring is actually only limited by memory */ |
1399 | ering->rx_max_pending = 8192; | 1399 | ering->rx_max_pending = 8192; |
1400 | ering->tx_max_pending = 8192; | 1400 | ering->tx_max_pending = 8192; |
1401 | ering->rx_mini_max_pending = 0; | ||
1402 | ering->rx_jumbo_max_pending = 0; | ||
1403 | ering->rx_pending = priv->rx_ring_size; | 1401 | ering->rx_pending = priv->rx_ring_size; |
1404 | ering->tx_pending = priv->tx_ring_size; | 1402 | ering->tx_pending = priv->tx_ring_size; |
1405 | } | 1403 | } |
diff --git a/drivers/net/ethernet/broadcom/bnx2.c b/drivers/net/ethernet/broadcom/bnx2.c index ad24d8c0b8a7..3c221be9d1e2 100644 --- a/drivers/net/ethernet/broadcom/bnx2.c +++ b/drivers/net/ethernet/broadcom/bnx2.c | |||
@@ -7155,11 +7155,9 @@ bnx2_get_ringparam(struct net_device *dev, struct ethtool_ringparam *ering) | |||
7155 | struct bnx2 *bp = netdev_priv(dev); | 7155 | struct bnx2 *bp = netdev_priv(dev); |
7156 | 7156 | ||
7157 | ering->rx_max_pending = MAX_TOTAL_RX_DESC_CNT; | 7157 | ering->rx_max_pending = MAX_TOTAL_RX_DESC_CNT; |
7158 | ering->rx_mini_max_pending = 0; | ||
7159 | ering->rx_jumbo_max_pending = MAX_TOTAL_RX_PG_DESC_CNT; | 7158 | ering->rx_jumbo_max_pending = MAX_TOTAL_RX_PG_DESC_CNT; |
7160 | 7159 | ||
7161 | ering->rx_pending = bp->rx_ring_size; | 7160 | ering->rx_pending = bp->rx_ring_size; |
7162 | ering->rx_mini_pending = 0; | ||
7163 | ering->rx_jumbo_pending = bp->rx_pg_ring_size; | 7161 | ering->rx_jumbo_pending = bp->rx_pg_ring_size; |
7164 | 7162 | ||
7165 | ering->tx_max_pending = MAX_TX_DESC_CNT; | 7163 | ering->tx_max_pending = MAX_TX_DESC_CNT; |
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c index a49f8cfa2dc6..1a6e37ce730c 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | |||
@@ -1344,17 +1344,12 @@ static void bnx2x_get_ringparam(struct net_device *dev, | |||
1344 | struct bnx2x *bp = netdev_priv(dev); | 1344 | struct bnx2x *bp = netdev_priv(dev); |
1345 | 1345 | ||
1346 | ering->rx_max_pending = MAX_RX_AVAIL; | 1346 | ering->rx_max_pending = MAX_RX_AVAIL; |
1347 | ering->rx_mini_max_pending = 0; | ||
1348 | ering->rx_jumbo_max_pending = 0; | ||
1349 | 1347 | ||
1350 | if (bp->rx_ring_size) | 1348 | if (bp->rx_ring_size) |
1351 | ering->rx_pending = bp->rx_ring_size; | 1349 | ering->rx_pending = bp->rx_ring_size; |
1352 | else | 1350 | else |
1353 | ering->rx_pending = MAX_RX_AVAIL; | 1351 | ering->rx_pending = MAX_RX_AVAIL; |
1354 | 1352 | ||
1355 | ering->rx_mini_pending = 0; | ||
1356 | ering->rx_jumbo_pending = 0; | ||
1357 | |||
1358 | ering->tx_max_pending = MAX_TX_AVAIL; | 1353 | ering->tx_max_pending = MAX_TX_AVAIL; |
1359 | ering->tx_pending = bp->tx_ring_size; | 1354 | ering->tx_pending = bp->tx_ring_size; |
1360 | } | 1355 | } |
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c index 9dbd1af6653c..fe712f955110 100644 --- a/drivers/net/ethernet/broadcom/tg3.c +++ b/drivers/net/ethernet/broadcom/tg3.c | |||
@@ -10514,7 +10514,6 @@ static void tg3_get_ringparam(struct net_device *dev, struct ethtool_ringparam * | |||
10514 | struct tg3 *tp = netdev_priv(dev); | 10514 | struct tg3 *tp = netdev_priv(dev); |
10515 | 10515 | ||
10516 | ering->rx_max_pending = tp->rx_std_ring_mask; | 10516 | ering->rx_max_pending = tp->rx_std_ring_mask; |
10517 | ering->rx_mini_max_pending = 0; | ||
10518 | if (tg3_flag(tp, JUMBO_RING_ENABLE)) | 10517 | if (tg3_flag(tp, JUMBO_RING_ENABLE)) |
10519 | ering->rx_jumbo_max_pending = tp->rx_jmb_ring_mask; | 10518 | ering->rx_jumbo_max_pending = tp->rx_jmb_ring_mask; |
10520 | else | 10519 | else |
@@ -10523,7 +10522,6 @@ static void tg3_get_ringparam(struct net_device *dev, struct ethtool_ringparam * | |||
10523 | ering->tx_max_pending = TG3_TX_RING_SIZE - 1; | 10522 | ering->tx_max_pending = TG3_TX_RING_SIZE - 1; |
10524 | 10523 | ||
10525 | ering->rx_pending = tp->rx_pending; | 10524 | ering->rx_pending = tp->rx_pending; |
10526 | ering->rx_mini_pending = 0; | ||
10527 | if (tg3_flag(tp, JUMBO_RING_ENABLE)) | 10525 | if (tg3_flag(tp, JUMBO_RING_ENABLE)) |
10528 | ering->rx_jumbo_pending = tp->rx_jumbo_pending; | 10526 | ering->rx_jumbo_pending = tp->rx_jumbo_pending; |
10529 | else | 10527 | else |
diff --git a/drivers/net/ethernet/brocade/bna/bnad_ethtool.c b/drivers/net/ethernet/brocade/bna/bnad_ethtool.c index ac6b49561bf0..fd3dcc1e9145 100644 --- a/drivers/net/ethernet/brocade/bna/bnad_ethtool.c +++ b/drivers/net/ethernet/brocade/bna/bnad_ethtool.c | |||
@@ -419,13 +419,9 @@ bnad_get_ringparam(struct net_device *netdev, | |||
419 | struct bnad *bnad = netdev_priv(netdev); | 419 | struct bnad *bnad = netdev_priv(netdev); |
420 | 420 | ||
421 | ringparam->rx_max_pending = BNAD_MAX_RXQ_DEPTH; | 421 | ringparam->rx_max_pending = BNAD_MAX_RXQ_DEPTH; |
422 | ringparam->rx_mini_max_pending = 0; | ||
423 | ringparam->rx_jumbo_max_pending = 0; | ||
424 | ringparam->tx_max_pending = BNAD_MAX_TXQ_DEPTH; | 422 | ringparam->tx_max_pending = BNAD_MAX_TXQ_DEPTH; |
425 | 423 | ||
426 | ringparam->rx_pending = bnad->rxq_depth; | 424 | ringparam->rx_pending = bnad->rxq_depth; |
427 | ringparam->rx_mini_max_pending = 0; | ||
428 | ringparam->rx_jumbo_max_pending = 0; | ||
429 | ringparam->tx_pending = bnad->txq_depth; | 425 | ringparam->tx_pending = bnad->txq_depth; |
430 | } | 426 | } |
431 | 427 | ||
diff --git a/drivers/net/ethernet/chelsio/cxgb/cxgb2.c b/drivers/net/ethernet/chelsio/cxgb/cxgb2.c index 9993f4f15433..ca26d97171bd 100644 --- a/drivers/net/ethernet/chelsio/cxgb/cxgb2.c +++ b/drivers/net/ethernet/chelsio/cxgb/cxgb2.c | |||
@@ -712,12 +712,10 @@ static void get_sge_param(struct net_device *dev, struct ethtool_ringparam *e) | |||
712 | int jumbo_fl = t1_is_T1B(adapter) ? 1 : 0; | 712 | int jumbo_fl = t1_is_T1B(adapter) ? 1 : 0; |
713 | 713 | ||
714 | e->rx_max_pending = MAX_RX_BUFFERS; | 714 | e->rx_max_pending = MAX_RX_BUFFERS; |
715 | e->rx_mini_max_pending = 0; | ||
716 | e->rx_jumbo_max_pending = MAX_RX_JUMBO_BUFFERS; | 715 | e->rx_jumbo_max_pending = MAX_RX_JUMBO_BUFFERS; |
717 | e->tx_max_pending = MAX_CMDQ_ENTRIES; | 716 | e->tx_max_pending = MAX_CMDQ_ENTRIES; |
718 | 717 | ||
719 | e->rx_pending = adapter->params.sge.freelQ_size[!jumbo_fl]; | 718 | e->rx_pending = adapter->params.sge.freelQ_size[!jumbo_fl]; |
720 | e->rx_mini_pending = 0; | ||
721 | e->rx_jumbo_pending = adapter->params.sge.freelQ_size[jumbo_fl]; | 719 | e->rx_jumbo_pending = adapter->params.sge.freelQ_size[jumbo_fl]; |
722 | e->tx_pending = adapter->params.sge.cmdQ_size[0]; | 720 | e->tx_pending = adapter->params.sge.cmdQ_size[0]; |
723 | } | 721 | } |
diff --git a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c index 29e0e4243231..4d15c8f99c3b 100644 --- a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c +++ b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | |||
@@ -1898,7 +1898,6 @@ static void get_sge_param(struct net_device *dev, struct ethtool_ringparam *e) | |||
1898 | const struct qset_params *q = &adapter->params.sge.qset[pi->first_qset]; | 1898 | const struct qset_params *q = &adapter->params.sge.qset[pi->first_qset]; |
1899 | 1899 | ||
1900 | e->rx_max_pending = MAX_RX_BUFFERS; | 1900 | e->rx_max_pending = MAX_RX_BUFFERS; |
1901 | e->rx_mini_max_pending = 0; | ||
1902 | e->rx_jumbo_max_pending = MAX_RX_JUMBO_BUFFERS; | 1901 | e->rx_jumbo_max_pending = MAX_RX_JUMBO_BUFFERS; |
1903 | e->tx_max_pending = MAX_TXQ_ENTRIES; | 1902 | e->tx_max_pending = MAX_TXQ_ENTRIES; |
1904 | 1903 | ||
diff --git a/drivers/net/ethernet/intel/e100.c b/drivers/net/ethernet/intel/e100.c index fe87d3eea5ed..ae17cd1a907f 100644 --- a/drivers/net/ethernet/intel/e100.c +++ b/drivers/net/ethernet/intel/e100.c | |||
@@ -2502,12 +2502,8 @@ static void e100_get_ringparam(struct net_device *netdev, | |||
2502 | 2502 | ||
2503 | ring->rx_max_pending = rfds->max; | 2503 | ring->rx_max_pending = rfds->max; |
2504 | ring->tx_max_pending = cbs->max; | 2504 | ring->tx_max_pending = cbs->max; |
2505 | ring->rx_mini_max_pending = 0; | ||
2506 | ring->rx_jumbo_max_pending = 0; | ||
2507 | ring->rx_pending = rfds->count; | 2505 | ring->rx_pending = rfds->count; |
2508 | ring->tx_pending = cbs->count; | 2506 | ring->tx_pending = cbs->count; |
2509 | ring->rx_mini_pending = 0; | ||
2510 | ring->rx_jumbo_pending = 0; | ||
2511 | } | 2507 | } |
2512 | 2508 | ||
2513 | static int e100_set_ringparam(struct net_device *netdev, | 2509 | static int e100_set_ringparam(struct net_device *netdev, |
diff --git a/drivers/net/ethernet/intel/e1000/e1000_ethtool.c b/drivers/net/ethernet/intel/e1000/e1000_ethtool.c index 5548d464261a..2b223ac99c42 100644 --- a/drivers/net/ethernet/intel/e1000/e1000_ethtool.c +++ b/drivers/net/ethernet/intel/e1000/e1000_ethtool.c | |||
@@ -540,12 +540,8 @@ static void e1000_get_ringparam(struct net_device *netdev, | |||
540 | E1000_MAX_82544_RXD; | 540 | E1000_MAX_82544_RXD; |
541 | ring->tx_max_pending = (mac_type < e1000_82544) ? E1000_MAX_TXD : | 541 | ring->tx_max_pending = (mac_type < e1000_82544) ? E1000_MAX_TXD : |
542 | E1000_MAX_82544_TXD; | 542 | E1000_MAX_82544_TXD; |
543 | ring->rx_mini_max_pending = 0; | ||
544 | ring->rx_jumbo_max_pending = 0; | ||
545 | ring->rx_pending = rxdr->count; | 543 | ring->rx_pending = rxdr->count; |
546 | ring->tx_pending = txdr->count; | 544 | ring->tx_pending = txdr->count; |
547 | ring->rx_mini_pending = 0; | ||
548 | ring->rx_jumbo_pending = 0; | ||
549 | } | 545 | } |
550 | 546 | ||
551 | static int e1000_set_ringparam(struct net_device *netdev, | 547 | static int e1000_set_ringparam(struct net_device *netdev, |
diff --git a/drivers/net/ethernet/intel/e1000e/ethtool.c b/drivers/net/ethernet/intel/e1000e/ethtool.c index d96d0b0e08cf..69c9d2199140 100644 --- a/drivers/net/ethernet/intel/e1000e/ethtool.c +++ b/drivers/net/ethernet/intel/e1000e/ethtool.c | |||
@@ -612,12 +612,8 @@ static void e1000_get_ringparam(struct net_device *netdev, | |||
612 | 612 | ||
613 | ring->rx_max_pending = E1000_MAX_RXD; | 613 | ring->rx_max_pending = E1000_MAX_RXD; |
614 | ring->tx_max_pending = E1000_MAX_TXD; | 614 | ring->tx_max_pending = E1000_MAX_TXD; |
615 | ring->rx_mini_max_pending = 0; | ||
616 | ring->rx_jumbo_max_pending = 0; | ||
617 | ring->rx_pending = rx_ring->count; | 615 | ring->rx_pending = rx_ring->count; |
618 | ring->tx_pending = tx_ring->count; | 616 | ring->tx_pending = tx_ring->count; |
619 | ring->rx_mini_pending = 0; | ||
620 | ring->rx_jumbo_pending = 0; | ||
621 | } | 617 | } |
622 | 618 | ||
623 | static int e1000_set_ringparam(struct net_device *netdev, | 619 | static int e1000_set_ringparam(struct net_device *netdev, |
diff --git a/drivers/net/ethernet/intel/igb/igb_ethtool.c b/drivers/net/ethernet/intel/igb/igb_ethtool.c index f227fc57eb11..174540f262d7 100644 --- a/drivers/net/ethernet/intel/igb/igb_ethtool.c +++ b/drivers/net/ethernet/intel/igb/igb_ethtool.c | |||
@@ -705,12 +705,8 @@ static void igb_get_ringparam(struct net_device *netdev, | |||
705 | 705 | ||
706 | ring->rx_max_pending = IGB_MAX_RXD; | 706 | ring->rx_max_pending = IGB_MAX_RXD; |
707 | ring->tx_max_pending = IGB_MAX_TXD; | 707 | ring->tx_max_pending = IGB_MAX_TXD; |
708 | ring->rx_mini_max_pending = 0; | ||
709 | ring->rx_jumbo_max_pending = 0; | ||
710 | ring->rx_pending = adapter->rx_ring_count; | 708 | ring->rx_pending = adapter->rx_ring_count; |
711 | ring->tx_pending = adapter->tx_ring_count; | 709 | ring->tx_pending = adapter->tx_ring_count; |
712 | ring->rx_mini_pending = 0; | ||
713 | ring->rx_jumbo_pending = 0; | ||
714 | } | 710 | } |
715 | 711 | ||
716 | static int igb_set_ringparam(struct net_device *netdev, | 712 | static int igb_set_ringparam(struct net_device *netdev, |
diff --git a/drivers/net/ethernet/intel/igbvf/ethtool.c b/drivers/net/ethernet/intel/igbvf/ethtool.c index b0b14d63dfbf..0ee8b6845846 100644 --- a/drivers/net/ethernet/intel/igbvf/ethtool.c +++ b/drivers/net/ethernet/intel/igbvf/ethtool.c | |||
@@ -259,12 +259,8 @@ static void igbvf_get_ringparam(struct net_device *netdev, | |||
259 | 259 | ||
260 | ring->rx_max_pending = IGBVF_MAX_RXD; | 260 | ring->rx_max_pending = IGBVF_MAX_RXD; |
261 | ring->tx_max_pending = IGBVF_MAX_TXD; | 261 | ring->tx_max_pending = IGBVF_MAX_TXD; |
262 | ring->rx_mini_max_pending = 0; | ||
263 | ring->rx_jumbo_max_pending = 0; | ||
264 | ring->rx_pending = rx_ring->count; | 262 | ring->rx_pending = rx_ring->count; |
265 | ring->tx_pending = tx_ring->count; | 263 | ring->tx_pending = tx_ring->count; |
266 | ring->rx_mini_pending = 0; | ||
267 | ring->rx_jumbo_pending = 0; | ||
268 | } | 264 | } |
269 | 265 | ||
270 | static int igbvf_set_ringparam(struct net_device *netdev, | 266 | static int igbvf_set_ringparam(struct net_device *netdev, |
diff --git a/drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c b/drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c index ab404e71f86a..9dfce7dff79b 100644 --- a/drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c +++ b/drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c | |||
@@ -492,12 +492,8 @@ ixgb_get_ringparam(struct net_device *netdev, | |||
492 | 492 | ||
493 | ring->rx_max_pending = MAX_RXD; | 493 | ring->rx_max_pending = MAX_RXD; |
494 | ring->tx_max_pending = MAX_TXD; | 494 | ring->tx_max_pending = MAX_TXD; |
495 | ring->rx_mini_max_pending = 0; | ||
496 | ring->rx_jumbo_max_pending = 0; | ||
497 | ring->rx_pending = rxdr->count; | 495 | ring->rx_pending = rxdr->count; |
498 | ring->tx_pending = txdr->count; | 496 | ring->tx_pending = txdr->count; |
499 | ring->rx_mini_pending = 0; | ||
500 | ring->rx_jumbo_pending = 0; | ||
501 | } | 497 | } |
502 | 498 | ||
503 | static int | 499 | static int |
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c index 10ea29f66405..18520cef3e94 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | |||
@@ -846,12 +846,8 @@ static void ixgbe_get_ringparam(struct net_device *netdev, | |||
846 | 846 | ||
847 | ring->rx_max_pending = IXGBE_MAX_RXD; | 847 | ring->rx_max_pending = IXGBE_MAX_RXD; |
848 | ring->tx_max_pending = IXGBE_MAX_TXD; | 848 | ring->tx_max_pending = IXGBE_MAX_TXD; |
849 | ring->rx_mini_max_pending = 0; | ||
850 | ring->rx_jumbo_max_pending = 0; | ||
851 | ring->rx_pending = rx_ring->count; | 849 | ring->rx_pending = rx_ring->count; |
852 | ring->tx_pending = tx_ring->count; | 850 | ring->tx_pending = tx_ring->count; |
853 | ring->rx_mini_pending = 0; | ||
854 | ring->rx_jumbo_pending = 0; | ||
855 | } | 851 | } |
856 | 852 | ||
857 | static int ixgbe_set_ringparam(struct net_device *netdev, | 853 | static int ixgbe_set_ringparam(struct net_device *netdev, |
diff --git a/drivers/net/ethernet/intel/ixgbevf/ethtool.c b/drivers/net/ethernet/intel/ixgbevf/ethtool.c index e1d9e3b63448..e29ba4506b74 100644 --- a/drivers/net/ethernet/intel/ixgbevf/ethtool.c +++ b/drivers/net/ethernet/intel/ixgbevf/ethtool.c | |||
@@ -281,12 +281,8 @@ static void ixgbevf_get_ringparam(struct net_device *netdev, | |||
281 | 281 | ||
282 | ring->rx_max_pending = IXGBEVF_MAX_RXD; | 282 | ring->rx_max_pending = IXGBEVF_MAX_RXD; |
283 | ring->tx_max_pending = IXGBEVF_MAX_TXD; | 283 | ring->tx_max_pending = IXGBEVF_MAX_TXD; |
284 | ring->rx_mini_max_pending = 0; | ||
285 | ring->rx_jumbo_max_pending = 0; | ||
286 | ring->rx_pending = rx_ring->count; | 284 | ring->rx_pending = rx_ring->count; |
287 | ring->tx_pending = tx_ring->count; | 285 | ring->tx_pending = tx_ring->count; |
288 | ring->rx_mini_pending = 0; | ||
289 | ring->rx_jumbo_pending = 0; | ||
290 | } | 286 | } |
291 | 287 | ||
292 | static int ixgbevf_set_ringparam(struct net_device *netdev, | 288 | static int ixgbevf_set_ringparam(struct net_device *netdev, |
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 | ||
1559 | static int | 1555 | static 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 | ||
509 | static int skge_set_ring_param(struct net_device *dev, | 505 | static 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 | ||
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; |
diff --git a/drivers/net/ethernet/nvidia/forcedeth.c b/drivers/net/ethernet/nvidia/forcedeth.c index 84baa59430bb..d7763ab841d8 100644 --- a/drivers/net/ethernet/nvidia/forcedeth.c +++ b/drivers/net/ethernet/nvidia/forcedeth.c | |||
@@ -4280,13 +4280,9 @@ static void nv_get_ringparam(struct net_device *dev, struct ethtool_ringparam* r | |||
4280 | struct fe_priv *np = netdev_priv(dev); | 4280 | struct fe_priv *np = netdev_priv(dev); |
4281 | 4281 | ||
4282 | ring->rx_max_pending = (np->desc_ver == DESC_VER_1) ? RING_MAX_DESC_VER_1 : RING_MAX_DESC_VER_2_3; | 4282 | ring->rx_max_pending = (np->desc_ver == DESC_VER_1) ? RING_MAX_DESC_VER_1 : RING_MAX_DESC_VER_2_3; |
4283 | ring->rx_mini_max_pending = 0; | ||
4284 | ring->rx_jumbo_max_pending = 0; | ||
4285 | ring->tx_max_pending = (np->desc_ver == DESC_VER_1) ? RING_MAX_DESC_VER_1 : RING_MAX_DESC_VER_2_3; | 4283 | ring->tx_max_pending = (np->desc_ver == DESC_VER_1) ? RING_MAX_DESC_VER_1 : RING_MAX_DESC_VER_2_3; |
4286 | 4284 | ||
4287 | ring->rx_pending = np->rx_ring_size; | 4285 | ring->rx_pending = np->rx_ring_size; |
4288 | ring->rx_mini_pending = 0; | ||
4289 | ring->rx_jumbo_pending = 0; | ||
4290 | ring->tx_pending = np->tx_ring_size; | 4286 | ring->tx_pending = np->tx_ring_size; |
4291 | } | 4287 | } |
4292 | 4288 | ||
diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c index ea2d8e41887a..8c8027176bef 100644 --- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c +++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c | |||
@@ -273,12 +273,8 @@ static void pch_gbe_get_ringparam(struct net_device *netdev, | |||
273 | 273 | ||
274 | ring->rx_max_pending = PCH_GBE_MAX_RXD; | 274 | ring->rx_max_pending = PCH_GBE_MAX_RXD; |
275 | ring->tx_max_pending = PCH_GBE_MAX_TXD; | 275 | ring->tx_max_pending = PCH_GBE_MAX_TXD; |
276 | ring->rx_mini_max_pending = 0; | ||
277 | ring->rx_jumbo_max_pending = 0; | ||
278 | ring->rx_pending = rxdr->count; | 276 | ring->rx_pending = rxdr->count; |
279 | ring->tx_pending = txdr->count; | 277 | ring->tx_pending = txdr->count; |
280 | ring->rx_mini_pending = 0; | ||
281 | ring->rx_jumbo_pending = 0; | ||
282 | } | 278 | } |
283 | 279 | ||
284 | /** | 280 | /** |
diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c index b34fb74d07e3..e09ea83b8c47 100644 --- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c +++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c | |||
@@ -413,9 +413,6 @@ netxen_nic_get_ringparam(struct net_device *dev, | |||
413 | } | 413 | } |
414 | 414 | ||
415 | ring->tx_max_pending = MAX_CMD_DESCRIPTORS; | 415 | ring->tx_max_pending = MAX_CMD_DESCRIPTORS; |
416 | |||
417 | ring->rx_mini_max_pending = 0; | ||
418 | ring->rx_mini_pending = 0; | ||
419 | } | 416 | } |
420 | 417 | ||
421 | static u32 | 418 | static u32 |
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c index 11f4df75e84c..5d8bec283267 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c | |||
@@ -418,9 +418,6 @@ qlcnic_get_ringparam(struct net_device *dev, | |||
418 | ring->rx_max_pending = adapter->max_rxd; | 418 | ring->rx_max_pending = adapter->max_rxd; |
419 | ring->rx_jumbo_max_pending = adapter->max_jumbo_rxd; | 419 | ring->rx_jumbo_max_pending = adapter->max_jumbo_rxd; |
420 | ring->tx_max_pending = MAX_CMD_DESCRIPTORS; | 420 | ring->tx_max_pending = MAX_CMD_DESCRIPTORS; |
421 | |||
422 | ring->rx_mini_max_pending = 0; | ||
423 | ring->rx_mini_pending = 0; | ||
424 | } | 421 | } |
425 | 422 | ||
426 | static u32 | 423 | static u32 |
diff --git a/drivers/net/ethernet/sfc/ethtool.c b/drivers/net/ethernet/sfc/ethtool.c index 9536925f5bdd..f3cd96dfa398 100644 --- a/drivers/net/ethernet/sfc/ethtool.c +++ b/drivers/net/ethernet/sfc/ethtool.c | |||
@@ -682,12 +682,8 @@ static void efx_ethtool_get_ringparam(struct net_device *net_dev, | |||
682 | 682 | ||
683 | ring->rx_max_pending = EFX_MAX_DMAQ_SIZE; | 683 | ring->rx_max_pending = EFX_MAX_DMAQ_SIZE; |
684 | ring->tx_max_pending = EFX_MAX_DMAQ_SIZE; | 684 | ring->tx_max_pending = EFX_MAX_DMAQ_SIZE; |
685 | ring->rx_mini_max_pending = 0; | ||
686 | ring->rx_jumbo_max_pending = 0; | ||
687 | ring->rx_pending = efx->rxq_entries; | 685 | ring->rx_pending = efx->rxq_entries; |
688 | ring->tx_pending = efx->txq_entries; | 686 | ring->tx_pending = efx->txq_entries; |
689 | ring->rx_mini_pending = 0; | ||
690 | ring->rx_jumbo_pending = 0; | ||
691 | } | 687 | } |
692 | 688 | ||
693 | static int efx_ethtool_set_ringparam(struct net_device *net_dev, | 689 | static int efx_ethtool_set_ringparam(struct net_device *net_dev, |