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

Commit d9d81862 authored by Yuval Mintz's avatar Yuval Mintz Committed by David S. Miller
Browse files

bnx2x: prevent masking error from cnic 



During error flows while loading cnic the return value was incorrectly replaced
by that of bnx2x_set_real_num_queues(); If that function was to finish
successfully then the cnic would have mistakenly thought the load ended
successfully, causing issues (& panics) later on.

Signed-off-by: default avatarYuval Mintz <yuvalmin@broadcom.com>
Signed-off-by: default avatarAriel Elior <ariele@broadcom.com>
Signed-off-by: default avatarEilon Greenstein <eilong@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 717fa2b9

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

+1 −2
Original line number Diff line number Diff line
@@ -2481,8 +2481,7 @@ int bnx2x_load_cnic(struct bnx2x *bp) 
load_error_cnic1:

	bnx2x_napi_disable_cnic(bp);

	/* Update the number of queues without the cnic queues */

	rc = bnx2x_set_real_num_queues(bp, 0);

	if (rc)

	if (bnx2x_set_real_num_queues(bp, 0))

		BNX2X_ERR("Unable to set real_num_queues not including cnic\n");

load_error_cnic0:

	BNX2X_ERR("CNIC-related load failed\n");