git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bnx2x: add missing napi deletion in error path
[pandora-kernel.git]
/
drivers
/
net
/
ethernet
/
broadcom
/
bnx2x
/
bnx2x_cmn.c
diff --git
a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
index
ecac04a
..
4046f97
100644
(file)
--- 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);
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))
/* clear pf_load status, as it was already set */
if (IS_PF(bp))
@@
-3142,7
+3143,7
@@
static inline __le16 bnx2x_csum_fix(unsigned char *t_header, u16 csum, s8 fix)
tsum = ~csum_fold(csum_add((__force __wsum) csum,
csum_partial(t_header, -fix, 0)));
tsum = ~csum_fold(csum_add((__force __wsum) csum,
csum_partial(t_header, -fix, 0)));
- return bswab16(
c
sum);
+ return bswab16(
t
sum);
}
static inline u32 bnx2x_xmit_type(struct bnx2x *bp, struct sk_buff *skb)
}
static inline u32 bnx2x_xmit_type(struct bnx2x *bp, struct sk_buff *skb)