diff options
Diffstat (limited to 'drivers/net/e1000/e1000_ethtool.c')
-rw-r--r-- | drivers/net/e1000/e1000_ethtool.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/e1000/e1000_ethtool.c b/drivers/net/e1000/e1000_ethtool.c index 54ae8805e79f..fa9a4659369a 100644 --- a/drivers/net/e1000/e1000_ethtool.c +++ b/drivers/net/e1000/e1000_ethtool.c | |||
@@ -614,8 +614,8 @@ e1000_set_ringparam(struct net_device *netdev, | |||
614 | struct e1000_rx_ring *rxdr, *rx_old, *rx_new; | 614 | struct e1000_rx_ring *rxdr, *rx_old, *rx_new; |
615 | int i, err, tx_ring_size, rx_ring_size; | 615 | int i, err, tx_ring_size, rx_ring_size; |
616 | 616 | ||
617 | tx_ring_size = sizeof(struct e1000_tx_ring) * adapter->num_queues; | 617 | tx_ring_size = sizeof(struct e1000_tx_ring) * adapter->num_tx_queues; |
618 | rx_ring_size = sizeof(struct e1000_rx_ring) * adapter->num_queues; | 618 | rx_ring_size = sizeof(struct e1000_rx_ring) * adapter->num_rx_queues; |
619 | 619 | ||
620 | if (netif_running(adapter->netdev)) | 620 | if (netif_running(adapter->netdev)) |
621 | e1000_down(adapter); | 621 | e1000_down(adapter); |
@@ -654,10 +654,10 @@ e1000_set_ringparam(struct net_device *netdev, | |||
654 | E1000_MAX_TXD : E1000_MAX_82544_TXD)); | 654 | E1000_MAX_TXD : E1000_MAX_82544_TXD)); |
655 | E1000_ROUNDUP(txdr->count, REQ_TX_DESCRIPTOR_MULTIPLE); | 655 | E1000_ROUNDUP(txdr->count, REQ_TX_DESCRIPTOR_MULTIPLE); |
656 | 656 | ||
657 | for (i = 0; i < adapter->num_queues; i++) { | 657 | for (i = 0; i < adapter->num_tx_queues; i++) |
658 | txdr[i].count = txdr->count; | 658 | txdr[i].count = txdr->count; |
659 | for (i = 0; i < adapter->num_rx_queues; i++) | ||
659 | rxdr[i].count = rxdr->count; | 660 | rxdr[i].count = rxdr->count; |
660 | } | ||
661 | 661 | ||
662 | if(netif_running(adapter->netdev)) { | 662 | if(netif_running(adapter->netdev)) { |
663 | /* Try to get new resources before deleting old */ | 663 | /* Try to get new resources before deleting old */ |