Commit 7d0445d6 authored Feb 25, 2014 by Michal Schmidt Committed by David S. Miller Feb 26, 2014

bnx2x: clamp num_queues to prevent passing a negative value

Use the clamp() macro to make the calculation of the number of queues
slightly easier to understand. It also avoids a crash when someone
accidentally passes a negative value in num_queues= module parameter.

Signed-off-by: Michal Schmidt <mschmidt@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 8e165e20

drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c

+3 −4

Original line number	Diff line number	Diff line
		@@ -61,10 +61,9 @@ static void bnx2x_add_all_napi(struct bnx2x *bp)

		static int bnx2x_calc_num_queues(struct bnx2x *bp)
		{
		return bnx2x_num_queues ?
		min_t(int, bnx2x_num_queues, BNX2X_MAX_QUEUES(bp)) :
		min_t(int, netif_get_num_default_rss_queues(),
		BNX2X_MAX_QUEUES(bp));
		int nq = bnx2x_num_queues ? : netif_get_num_default_rss_queues();
		nq = clamp(nq, 1, BNX2X_MAX_QUEUES(bp));
		return nq;
		}

		/**