diff options
| author | Michal Schmidt <mschmidt@redhat.com> | 2013-03-15 05:27:54 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-28 12:17:20 -0700 |
| commit | 0bf2c46258b0ace08dc5e27b732d24606adc3b2e (patch) | |
| tree | 2a51b1f0c3ebfef1652c2d1e8ab13a2082d8c821 /drivers | |
| parent | 04188f3010f64ddf2c75c3f4953eee9bdb4f5cc1 (diff) | |
| download | linux-stable-0bf2c46258b0ace08dc5e27b732d24606adc3b2e.tar.gz linux-stable-0bf2c46258b0ace08dc5e27b732d24606adc3b2e.tar.bz2 linux-stable-0bf2c46258b0ace08dc5e27b732d24606adc3b2e.zip | |
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 <mschmidt@redhat.com>
Acked-by: Dmitry Kravkov <dmitry@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -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 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: |