diff options
| author |   Michal Schmidt <mschmidt@redhat.com> | 2013-03-15 05:27:54 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2013-03-17 12:26:52 -0400 |
| commit | 722c6f585088a2c392b4c5d01b87a584bb8fb73f (patch) | |
| tree | 00ea3308b5052bdc6b4b92dd35f9ff7ac993a79c /drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | |
| parent | Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless (diff) | |
| download | linux-dev-722c6f585088a2c392b4c5d01b87a584bb8fb73f.tar.xz linux-dev-722c6f585088a2c392b4c5d01b87a584bb8fb73f.zip | |
bnx2x: add missing napi deletion in error path
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>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c index a923bc4d5a1f..4046f97378c2 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c @@ -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)) |