1 files changed, 5 insertions, 3 deletions

diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index bc71a21c1dc2..21c2688d6308 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -12249,6 +12249,8 @@ static int i40e_config_netdev(struct i40e_vsi *vsi)
                           NETIF_F_GSO_GRE               |
                           NETIF_F_GSO_GRE_CSUM          |
                           NETIF_F_GSO_PARTIAL           |
+                          NETIF_F_GSO_IPXIP4            |
+                          NETIF_F_GSO_IPXIP6            |
                           NETIF_F_GSO_UDP_TUNNEL        |
                           NETIF_F_GSO_UDP_TUNNEL_CSUM   |
                           NETIF_F_SCTP_CRC              |
@@ -12266,13 +12268,13 @@ static int i40e_config_netdev(struct i40e_vsi *vsi)
         /* record features VLANs can make use of */
         netdev->vlan_features |= hw_enc_features | NETIF_F_TSO_MANGLEID;
 
-        if (!(pf->flags & I40E_FLAG_MFP_ENABLED))
-                netdev->hw_features |= NETIF_F_NTUPLE | NETIF_F_HW_TC;
-
         hw_features = hw_enc_features           |
                       NETIF_F_HW_VLAN_CTAG_TX   |
                       NETIF_F_HW_VLAN_CTAG_RX;
 
+        if (!(pf->flags & I40E_FLAG_MFP_ENABLED))
+                hw_features |= NETIF_F_NTUPLE | NETIF_F_HW_TC;
+
         netdev->hw_features |= hw_features;
 
         netdev->features |= hw_features | NETIF_F_HW_VLAN_CTAG_FILTER;