Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d6b9076f authored by David S. Miller's avatar David S. Miller
Browse files

igb: Fix warnings in igb_set_ringparam() 



drivers/net/igb/igb_ethtool.c: In function ‘igb_set_ringparam’:
drivers/net/igb/igb_ethtool.c:744: warning: comparison of distinct pointer types lacks a cast
drivers/net/igb/igb_ethtool.c:748: warning: comparison of distinct pointer types lacks a cast

Casts were to u16 on the constant, but the type of new_{r,t}x_count is
u32.  Cast to u32 instead.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 559e9c49

drivers/net/igb/igb_ethtool.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -741,11 +741,11 @@ static int igb_set_ringparam(struct net_device *netdev, 
		return -EINVAL;

		return -EINVAL;





	new_rx_count = min(ring->rx_pending, (u32)IGB_MAX_RXD);

	new_rx_count = min(ring->rx_pending, (u32)IGB_MAX_RXD);

	new_rx_count = max(new_rx_count, (u16)IGB_MIN_RXD);

	new_rx_count = max(new_rx_count, (u32)IGB_MIN_RXD);

	new_rx_count = ALIGN(new_rx_count, REQ_RX_DESCRIPTOR_MULTIPLE);

	new_rx_count = ALIGN(new_rx_count, REQ_RX_DESCRIPTOR_MULTIPLE);





	new_tx_count = min(ring->tx_pending, (u32)IGB_MAX_TXD);

	new_tx_count = min(ring->tx_pending, (u32)IGB_MAX_TXD);

	new_tx_count = max(new_tx_count, (u16)IGB_MIN_TXD);

	new_tx_count = max(new_tx_count, (u32)IGB_MIN_TXD);

	new_tx_count = ALIGN(new_tx_count, REQ_TX_DESCRIPTOR_MULTIPLE);

	new_tx_count = ALIGN(new_tx_count, REQ_TX_DESCRIPTOR_MULTIPLE);





	if ((new_tx_count == adapter->tx_ring_count) &&

	if ((new_tx_count == adapter->tx_ring_count) &&