diff options
| author |   David S. Miller <davem@davemloft.net> | 2019-03-20 11:12:50 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-03-20 11:12:50 -0700 |
| commit | 0b963ef20c5624c4cc6c4ef408b301a24b26b96b (patch) | |
| tree | 075caa501251a9754f098c1cce93006f50c157d1 /drivers/net/ethernet/qlogic/qed/qed.h | |
| parent | macvlan: pass get_ts_info and SIOC[SG]HWTSTAMP ioctl to real device (diff) | |
| parent | qed: Define new MF bit for no_vlan config (diff) | |
| download | linux-dev-0b963ef20c5624c4cc6c4ef408b301a24b26b96b.tar.xz linux-dev-0b963ef20c5624c4cc6c4ef408b301a24b26b96b.zip | |
Merge branch 'qed-next'
Sudarsana Reddy Kalluru says:
====================
qed* enhancements.
The patch series adds couple of enhancements for qed/qede drivers.
Please consider applying it to 'net-next' tree.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/qlogic/qed/qed.h')
| -rw-r--r-- | drivers/net/ethernet/qlogic/qed/qed.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/ethernet/qlogic/qed/qed.h b/drivers/net/ethernet/qlogic/qed/qed.h index 43a57ec296fd..512186adab00 100644 --- a/drivers/net/ethernet/qlogic/qed/qed.h +++ b/drivers/net/ethernet/qlogic/qed/qed.h @@ -492,6 +492,9 @@ enum qed_mf_mode_bit { /* Allow DSCP to TC mapping */ QED_MF_DSCP_TO_TC_MAP, + + /* Do not insert a vlan tag with id 0 */ + QED_MF_DONT_ADD_VLAN0_TAG, }; enum qed_ufp_mode { |