From: Michal Schmidt Date: Fri, 15 Mar 2013 05:27:54 +0000 (+0000) Subject: bnx2x: add missing napi deletion in error path X-Git-Tag: v3.8.5~81 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=0bf2c46258b0ace08dc5e27b732d24606adc3b2e;p=karo-tx-linux.git bnx2x: add missing napi deletion in error path [ Upstream commit 722c6f585088a2c392b4c5d01b87a584bb8fb73f ] If the hardware initialization fails in bnx2x_nic_load() after adding napi objects, they would not be deleted. A subsequent attempt to unload the bnx2x module detects a corruption in the napi list. Add the missing napi deletion to the error path. Signed-off-by: Michal Schmidt Acked-by: Dmitry Kravkov Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c index a5edac8df67b..3a73bb95a950 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c @@ -2523,6 +2523,7 @@ load_error2: bp->port.pmf = 0; load_error1: bnx2x_napi_disable(bp); + bnx2x_del_all_napi(bp); /* clear pf_load status, as it was already set */ bnx2x_clear_pf_load(bp); load_error0: