diff options
| author | David S. Miller <davem@davemloft.net> | 2019-10-31 14:48:31 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-10-31 14:48:31 -0700 |
| commit | 44715423dd018e01ff31b73b130d362e95a6c59c (patch) | |
| tree | 5b80599d98d8900762647e03f65380682af55675 /drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h | |
| parent | e43ea83cc78604b4eb02d5917f50a8b8eb6c0c85 (diff) | |
| parent | 6a68749dbd777b832e1d84265bd6d8b39d1843ac (diff) | |
Merge branch 'bnxt_en-Updates-for-net-next'
Michael Chan says:
====================
bnxt_en: Updates for net-next.
This patch series adds TC Flower tunnel decap and rewrite actions in
the first 4 patches. The next 3 patches integrates the recently
added error recovery with the RDMA driver by calling the proper
hooks to stop and start.
v2: Fix pointer alignment issue in patch #1.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h')
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h b/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h index cd78453d0bf0..9895406b9830 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h @@ -64,6 +64,7 @@ struct bnxt_en_dev { #define BNXT_EN_FLAG_ROCE_CAP (BNXT_EN_FLAG_ROCEV1_CAP | \ BNXT_EN_FLAG_ROCEV2_CAP) #define BNXT_EN_FLAG_MSIX_REQUESTED 0x4 + #define BNXT_EN_FLAG_ULP_STOPPED 0x8 const struct bnxt_en_ops *en_ops; struct bnxt_ulp ulp_tbl[BNXT_MAX_ULP]; }; @@ -92,7 +93,7 @@ int bnxt_get_ulp_msix_num(struct bnxt *bp); int bnxt_get_ulp_msix_base(struct bnxt *bp); int bnxt_get_ulp_stat_ctxs(struct bnxt *bp); void bnxt_ulp_stop(struct bnxt *bp); -void bnxt_ulp_start(struct bnxt *bp); +void bnxt_ulp_start(struct bnxt *bp, int err); void bnxt_ulp_sriov_cfg(struct bnxt *bp, int num_vfs); void bnxt_ulp_shutdown(struct bnxt *bp); void bnxt_ulp_irq_stop(struct bnxt *bp); |