bnx2x: add missing napi deletion in error path
authorMichal Schmidt <mschmidt@redhat.com>
Fri, 15 Mar 2013 05:27:54 +0000 (05:27 +0000)
committerDavid S. Miller <davem@davemloft.net>
Sun, 17 Mar 2013 16:26:52 +0000 (12:26 -0400)
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 <mschmidt@redhat.com>
Acked-by: Dmitry Kravkov <dmitry@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c

index a923bc4d5a1f5540704423215a8f772bd3a8831a..4046f97378c29fa737d7123347ba1e940bd8e46d 100644 (file)
@@ -2760,6 +2760,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 */
        if (IS_PF(bp))