diff options
| -rw-r--r-- | drivers/net/igb/igb_ethtool.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/igb/igb_ethtool.c b/drivers/net/igb/igb_ethtool.c index d24b902ba7de..90b89a81f669 100644 --- a/drivers/net/igb/igb_ethtool.c +++ b/drivers/net/igb/igb_ethtool.c | |||
| @@ -741,11 +741,11 @@ static int igb_set_ringparam(struct net_device *netdev, | |||
| 741 | return -EINVAL; | 741 | return -EINVAL; |
| 742 | 742 | ||
| 743 | new_rx_count = min(ring->rx_pending, (u32)IGB_MAX_RXD); | 743 | new_rx_count = min(ring->rx_pending, (u32)IGB_MAX_RXD); |
| 744 | new_rx_count = max(new_rx_count, (u16)IGB_MIN_RXD); | 744 | new_rx_count = max(new_rx_count, (u32)IGB_MIN_RXD); |
| 745 | new_rx_count = ALIGN(new_rx_count, REQ_RX_DESCRIPTOR_MULTIPLE); | 745 | new_rx_count = ALIGN(new_rx_count, REQ_RX_DESCRIPTOR_MULTIPLE); |
| 746 | 746 | ||
| 747 | new_tx_count = min(ring->tx_pending, (u32)IGB_MAX_TXD); | 747 | new_tx_count = min(ring->tx_pending, (u32)IGB_MAX_TXD); |
| 748 | new_tx_count = max(new_tx_count, (u16)IGB_MIN_TXD); | 748 | new_tx_count = max(new_tx_count, (u32)IGB_MIN_TXD); |
| 749 | new_tx_count = ALIGN(new_tx_count, REQ_TX_DESCRIPTOR_MULTIPLE); | 749 | new_tx_count = ALIGN(new_tx_count, REQ_TX_DESCRIPTOR_MULTIPLE); |
| 750 | 750 | ||
| 751 | if ((new_tx_count == adapter->tx_ring_count) && | 751 | if ((new_tx_count == adapter->tx_ring_count) && |