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

Tony Nguyen says:

====================
10GbE Intel Wired LAN Driver Updates 2022-06-09

Maximilian Heyne adds reporting of VF statistics on ixgbe via iproute2
interface.

Kai-Heng Feng removes duplicate defines from igb.

Jiaqing Zhao fixes typos in e1000, ixgb, and ixgbe drivers.

Julia Lawall fixes typos for fm10k, ixgbe, and ice drivers.

* '10GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue:
  drivers/net/ethernet/intel: fix typos in comments
  ixgbe: Fix typos in comments
  ixgb: Fix typos in comments
  e1000: Fix typos in comments
  igb: Remove duplicate defines
  drivers, ixgbe: export vf statistics
====================

Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Jakub Kicinski <[email protected]>

diff --combined drivers/net/ethernet/intel/ice/ice_lib.c
index 5a1e8b9b365d94719a8e7d1c138429c54163bcc9,70961c0343e7ba0af531e0172bbc56e955b97e5f..b28fb8eacffb0482f8a5ad556288d26b3352c659
--- 1/drivers/net/ethernet/intel/ice/ice_lib.c
--- 2/drivers/net/ethernet/intel/ice/ice_lib.c
+++ b/drivers/net/ethernet/intel/ice/ice_lib.c
@@@ -887,9 -887,6 +887,9 @@@ static void ice_set_dflt_vsi_ctx(struc
                        (ICE_AQ_VSI_OUTER_TAG_VLAN_8100 <<
                         ICE_AQ_VSI_OUTER_TAG_TYPE_S) &
                        ICE_AQ_VSI_OUTER_TAG_TYPE_M;
 +              ctxt->info.outer_vlan_flags |=
 +                      FIELD_PREP(ICE_AQ_VSI_OUTER_VLAN_EMODE_M,
 +                                 ICE_AQ_VSI_OUTER_VLAN_EMODE_NOTHING);
        }
        /* Have 1:1 UP mapping for both ingress/egress tables */
        table |= ICE_UP_TABLE_TRANSLATE(0, 0);
@@@ -2406,7 -2403,7 +2406,7 @@@ static void ice_set_agg_vsi(struct ice_
                                agg_id);
                        return;
                }
-               /* aggregator node is created, store the neeeded info */
+               /* aggregator node is created, store the needed info */
                agg_node->valid = true;
                agg_node->agg_id = agg_id;
        }

diff --combined drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
index d4e63f0644c366598eb435872b1c3aed5ab1866d,07b982e473b205d976009a3baa2ed74328d243e5..67e49aac50fe7a65e43237aa25808a11a19f3dcf
--- 1/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
--- 2/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
@@@ -77,7 -77,7 +77,7 @@@ static int __ixgbe_enable_sriov(struct 
        IXGBE_WRITE_REG(hw, IXGBE_PFDTXGSWC, IXGBE_PFDTXGSWC_VT_LBEN);
        adapter->bridge_mode = BRIDGE_MODE_VEB;
  
-       /* limit trafffic classes based on VFs enabled */
+       /* limit traffic classes based on VFs enabled */
        if ((adapter->hw.mac.type == ixgbe_mac_82599EB) && (num_vfs < 16)) {
                adapter->dcb_cfg.num_tcs.pg_tcs = MAX_TRAFFIC_CLASS;
                adapter->dcb_cfg.num_tcs.pfc_tcs = MAX_TRAFFIC_CLASS;
@@@ -1184,9 -1184,9 +1184,9 @@@ static int ixgbe_update_vf_xcast_mode(s
  
        switch (xcast_mode) {
        case IXGBEVF_XCAST_MODE_NONE:
 -              disable = IXGBE_VMOLR_BAM | IXGBE_VMOLR_ROMPE |
 +              disable = IXGBE_VMOLR_ROMPE |
                          IXGBE_VMOLR_MPE | IXGBE_VMOLR_UPE | IXGBE_VMOLR_VPE;
 -              enable = 0;
 +              enable = IXGBE_VMOLR_BAM;
                break;
        case IXGBEVF_XCAST_MODE_MULTI:
                disable = IXGBE_VMOLR_MPE | IXGBE_VMOLR_UPE | IXGBE_VMOLR_VPE;
@@@ -1208,9 -1208,9 +1208,9 @@@
                        return -EPERM;
                }
  
 -              disable = 0;
 +              disable = IXGBE_VMOLR_VPE;
                enable = IXGBE_VMOLR_BAM | IXGBE_VMOLR_ROMPE |
 -                       IXGBE_VMOLR_MPE | IXGBE_VMOLR_UPE | IXGBE_VMOLR_VPE;
 +                       IXGBE_VMOLR_MPE | IXGBE_VMOLR_UPE;
                break;
        default:
                return -EOPNOTSUPP;