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

Commit e42e4ba0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

igb: fix anoying type mismatch warning on rx/tx queue sizing 



When using "min()", the types of both sides should match.  With the cpu
mask changes, the type of num_online_cpus() will now depend on config
options. Use "min_t()" with an explicit type instead.

And make the rx/tx case look the same too, just for sanity.

Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 7a1fcd5f

drivers/net/igb/igb_main.c

+2 −2
Original line number Diff line number Diff line
@@ -1457,8 +1457,8 @@ static int __devinit igb_sw_init(struct igb_adapter *adapter) 


	/* Number of supported queues. */

	/* Having more queues than CPUs doesn't make sense. */

	adapter->num_rx_queues = min((u32)IGB_MAX_RX_QUEUES, (u32)num_online_cpus());

	adapter->num_tx_queues = min(IGB_MAX_TX_QUEUES, num_online_cpus());

	adapter->num_rx_queues = min_t(u32, IGB_MAX_RX_QUEUES, num_online_cpus());

	adapter->num_tx_queues = min_t(u32, IGB_MAX_TX_QUEUES, num_online_cpus());



	/* This call may decrease the number of queues depending on

	 * interrupt mode. */