Commit 7d0445d6 authored by Michal Schmidt's avatar Michal Schmidt Committed by David S. Miller

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: default avatarMichal Schmidt <mschmidt@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8e165e20
...@@ -61,10 +61,9 @@ static void bnx2x_add_all_napi(struct bnx2x *bp) ...@@ -61,10 +61,9 @@ static void bnx2x_add_all_napi(struct bnx2x *bp)
static int bnx2x_calc_num_queues(struct bnx2x *bp) static int bnx2x_calc_num_queues(struct bnx2x *bp)
{ {
return bnx2x_num_queues ? int nq = bnx2x_num_queues ? : netif_get_num_default_rss_queues();
min_t(int, bnx2x_num_queues, BNX2X_MAX_QUEUES(bp)) : nq = clamp(nq, 1, BNX2X_MAX_QUEUES(bp));
min_t(int, netif_get_num_default_rss_queues(), return nq;
BNX2X_MAX_QUEUES(bp));
} }
/** /**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment