diff options
| author | David S. Miller <[email protected]> | 2021-06-04 14:28:32 -0700 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2021-06-04 14:28:32 -0700 |
| commit | e663886c9716f178e4927a2e91e20322590dc0c2 (patch) | |
| tree | 2c6bde1efc6b01471dca1c0ef27628e77a44790b /drivers/net/ethernet/intel/igc/igc.h | |
| parent | 0efea3c649f0a50d473a4afe2d17c2bbcee639e1 (diff) | |
| parent | 8d7449630e3450bc0546dc0cb692fbb57d1852c0 (diff) | |
Merge branch '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue
Tony Nguyen says:
====================
1GbE Intel Wired LAN Driver Updates 2021-06-04
This series contains updates to igc driver only.
Sasha utilizes the newly introduced ethtool_sprintf() function, removes
unused defines, and fixes indentation.
Muhammad adds support for hardware VLAN insertion and stripping.
====================
Signed-off-by: David S. Miller <[email protected]>
Diffstat (limited to 'drivers/net/ethernet/intel/igc/igc.h')
| -rw-r--r-- | drivers/net/ethernet/intel/igc/igc.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ethernet/intel/igc/igc.h b/drivers/net/ethernet/intel/igc/igc.h index b6d3277c6f52..9e0bbb2e55e3 100644 --- a/drivers/net/ethernet/intel/igc/igc.h +++ b/drivers/net/ethernet/intel/igc/igc.h @@ -372,6 +372,7 @@ extern char igc_driver_name[]; /* VLAN info */ #define IGC_TX_FLAGS_VLAN_MASK 0xffff0000 +#define IGC_TX_FLAGS_VLAN_SHIFT 16 /* igc_test_staterr - tests bits within Rx descriptor status and error fields */ static inline __le32 igc_test_staterr(union igc_adv_rx_desc *rx_desc, |