diff options
| author | David S. Miller <davem@davemloft.net> | 2017-06-23 14:48:28 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-06-23 14:48:28 -0400 |
| commit | 92cc8a5105e1236584e92288595ddbd2149bb6cf (patch) | |
| tree | e41c847ec1c2f797403d296ae53adbf44dd9d0ca /drivers/net/ethernet/broadcom/bnxt/bnxt.h | |
| parent | db9d8b29d19d2801793e4419f4c6272bf8951c62 (diff) | |
| parent | 2270bc5da34979454e6f2eb133d800b635156174 (diff) | |
| download | linux-92cc8a5105e1236584e92288595ddbd2149bb6cf.tar.gz linux-92cc8a5105e1236584e92288595ddbd2149bb6cf.tar.bz2 linux-92cc8a5105e1236584e92288595ddbd2149bb6cf.zip | |
Merge branch 'bnxt_en-fixes'
Michael Chan says:
====================
bnxt_en: Error handling and netpoll fixes.
Add missing error handling and fix netpoll handling. The current code
handles RX and TX events in netpoll mode and is causing lots of warnings
and errors in the RX code path in netpoll mode. The fix is to only handle
TX events in netpoll mode.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom/bnxt/bnxt.h')
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnxt/bnxt.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h b/drivers/net/ethernet/broadcom/bnxt/bnxt.h index 3ef42dbc6327..d46a85041083 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.h +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.h @@ -374,12 +374,16 @@ struct rx_tpa_end_cmp_ext { __le32 rx_tpa_end_cmp_errors_v2; #define RX_TPA_END_CMP_V2 (0x1 << 0) - #define RX_TPA_END_CMP_ERRORS (0x7fff << 1) + #define RX_TPA_END_CMP_ERRORS (0x3 << 1) #define RX_TPA_END_CMPL_ERRORS_SHIFT 1 u32 rx_tpa_end_cmp_start_opaque; }; +#define TPA_END_ERRORS(rx_tpa_end_ext) \ + ((rx_tpa_end_ext)->rx_tpa_end_cmp_errors_v2 & \ + cpu_to_le32(RX_TPA_END_CMP_ERRORS)) + #define DB_IDX_MASK 0xffffff #define DB_IDX_VALID (0x1 << 26) #define DB_IRQ_DIS (0x1 << 27) |