From: David S. Miller Date: Thu, 10 Feb 2022 11:00:13 +0000 (+0000) Subject: Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next... X-Git-Url: https://repo.jachan.dev/J-linux.git/commitdiff_plain/adc27288f22967dff4b4f12c25589b935b123ef2 Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue Tony Nguyen says: ==================== 100GbE Intel Wired LAN Driver Updates 2022-02-09 This series contains updates to ice driver only. Brett adds support for QinQ. This begins with code refactoring and re-organization of VLAN configuration functions to allow for introduction of VSI VLAN ops to enable setting and calling of respective operations based on device support of single or double VLANs. Implementations are added for outer VLAN support. To support QinQ, the device must be set to double VLAN mode (DVM). In order for this to occur, the DDP package and NVM must also support DVM. Functions to determine compatibility and properly configure the device are added as well as setting the proper bits to advertise and utilize the proper offloads. Support for VIRTCHNL_VF_OFFLOAD_VLAN_V2 is also included to allow for VF to negotiate and utilize this functionality. ==================== Signed-off-by: David S. Miller --- adc27288f22967dff4b4f12c25589b935b123ef2 diff --cc drivers/net/ethernet/intel/ice/ice_txrx.h index 466253ac2ee1,e79ad2850a62..cead3eb149bd --- a/drivers/net/ethernet/intel/ice/ice_txrx.h +++ b/drivers/net/ethernet/intel/ice/ice_txrx.h @@@ -332,9 -333,9 +333,11 @@@ struct ice_tx_ring struct ice_ptp_tx *tx_tstamps; spinlock_t tx_lock; u32 txq_teid; /* Added Tx queue TEID */ + /* CL4 - 4th cacheline starts here */ + u16 xdp_tx_active; #define ICE_TX_FLAGS_RING_XDP BIT(0) + #define ICE_TX_FLAGS_RING_VLAN_L2TAG1 BIT(1) + #define ICE_TX_FLAGS_RING_VLAN_L2TAG2 BIT(2) u8 flags; u8 dcb_tc; /* Traffic class of ring */ u8 ptp_tx;