Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next...

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 <davem@davemloft.net>

diff --cc drivers/net/ethernet/intel/ice/ice_ethtool.c
Simple merge

diff --cc drivers/net/ethernet/intel/ice/ice_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/ice/ice_txrx.c
Simple merge

diff --cc drivers/net/ethernet/intel/ice/ice_txrx.h
index 466253ac2ee146d2f37220f6cc9de5b8008ec57b,e79ad2850a620e3911eeb3ccd53936135dbe0838..cead3eb149bd5eb4b7bc21a6ca748fb0cbc9caf8
--- 1/drivers/net/ethernet/intel/ice/ice_txrx.h
--- 2/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;

diff --cc drivers/net/ethernet/intel/ice/ice_txrx_lib.c
Simple merge

diff --cc drivers/net/ethernet/intel/ice/ice_xsk.c
Simple merge