diff options
| author | Michael Chan <mchan@broadcom.com> | 2008-01-21 20:06:41 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-28 18:10:14 -0500 |
| commit | 1097f5e92107ca3950fabf5e1d724faa80c91e7f (patch) | |
| tree | 7088f4b9ab0d0481d43e2fc3d6a998d44c006dc2 /drivers/net | |
| parent | 2dd201d7b735f252df1a915a3f2e6a71910a3d87 (diff) | |
[BNX2]: Fix minor bug in bnx2_has_work().
It is more correct to get the status block from the bnx2_napi struct
instead of the bnx2 struct. It happens that they are the same in this
case because we are using the first MSIX vector.
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/bnx2.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c index 44734613ab37..18ed8068dc2d 100644 --- a/drivers/net/bnx2.c +++ b/drivers/net/bnx2.c | |||
| @@ -2903,8 +2903,7 @@ bnx2_tx_msix(int irq, void *dev_instance) | |||
| 2903 | static inline int | 2903 | static inline int |
| 2904 | bnx2_has_work(struct bnx2_napi *bnapi) | 2904 | bnx2_has_work(struct bnx2_napi *bnapi) |
| 2905 | { | 2905 | { |
| 2906 | struct bnx2 *bp = bnapi->bp; | 2906 | struct status_block *sblk = bnapi->status_blk; |
| 2907 | struct status_block *sblk = bp->status_blk; | ||
| 2908 | 2907 | ||
| 2909 | if ((bnx2_get_hw_rx_cons(bnapi) != bnapi->rx_cons) || | 2908 | if ((bnx2_get_hw_rx_cons(bnapi) != bnapi->rx_cons) || |
| 2910 | (bnx2_get_hw_tx_cons(bnapi) != bnapi->hw_tx_cons)) | 2909 | (bnx2_get_hw_tx_cons(bnapi) != bnapi->hw_tx_cons)) |