Skip to content

Commit b8e6c91

Browse files
torvaldstorvalds
committed
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: bnx2x: Version update bnx2x: Multi Queue bnx2x: NAPI and interrupts enable/disable bnx2x: NIC load failure cleanup bnx2x: Initialization structure bnx2x: HW lock timeout bnx2x: Minimize lock time bnx2x: Fan failure mechanism on additional design bnx2x: Rx work check ipv6: sysctl fixes ipv4: sysctl fixes sctp: add verification checks to SCTP_AUTH_KEY option
2 parents e5778ec + c2d4254 commit b8e6c91

File tree

6 files changed

+144
-113
lines changed

6 files changed

+144
-113
lines changed

‎drivers/net/bnx2x.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ struct bnx2x_fastpath {
271271
(fp->tx_pkt_prod != fp->tx_pkt_cons))
272272

273273
#define BNX2X_HAS_RX_WORK(fp) \
274-
(fp->rx_comp_cons != le16_to_cpu(*fp->rx_cons_sb))
274+
(fp->rx_comp_cons != rx_cons_sb)
275275

276276
#define BNX2X_HAS_WORK(fp) (BNX2X_HAS_RX_WORK(fp) || BNX2X_HAS_TX_WORK(fp))
277277

0 commit comments

Comments
 (0)