diff options
author | David S. Miller | 2019-08-18 22:05:01 +0200 |
---|---|---|
committer | David S. Miller | 2019-08-18 22:05:01 +0200 |
commit | 37b0a733c12137bc1d3325c44797333177607632 (patch) | |
tree | 0f6a84f04b0c9f236d5e7165b7065701c7fec3b6 /drivers/net/ethernet/broadcom/bnxt/bnxt_tc.h | |
parent | net: kalmia: fix memory leaks (diff) | |
parent | bnxt_en: Fix to include flow direction in L2 key (diff) | |
download | kernel-qcow2-linux-37b0a733c12137bc1d3325c44797333177607632.tar.gz kernel-qcow2-linux-37b0a733c12137bc1d3325c44797333177607632.tar.xz kernel-qcow2-linux-37b0a733c12137bc1d3325c44797333177607632.zip |
Merge branch 'bnxt_en-Bug-fixes'
Michael Chan says:
====================
bnxt_en: Bug fixes.
2 Bug fixes related to 57500 shutdown sequence and doorbell sequence,
2 TC Flower bug fixes related to the setting of the flow direction,
1 NVRAM update bug fix, and a minor fix to suppress an unnecessary
error message. Please queue for -stable as well. Thanks.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom/bnxt/bnxt_tc.h')
-rw-r--r-- | drivers/net/ethernet/broadcom/bnxt/bnxt_tc.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.h b/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.h index ffec57d1a5ec..4f05305052f2 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.h +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.h @@ -23,6 +23,9 @@ struct bnxt_tc_l2_key { __be16 inner_vlan_tci; __be16 ether_type; u8 num_vlans; + u8 dir; +#define BNXT_DIR_RX 1 +#define BNXT_DIR_TX 0 }; struct bnxt_tc_l3_key { @@ -98,9 +101,6 @@ struct bnxt_tc_flow { /* flow applicable to pkts ingressing on this fid */ u16 src_fid; - u8 dir; -#define BNXT_DIR_RX 1 -#define BNXT_DIR_TX 0 struct bnxt_tc_l2_key l2_key; struct bnxt_tc_l2_key l2_mask; struct bnxt_tc_l3_key l3_key; |