Merge branch 'GREoIPV6-followups'

[deliverable/linux.git] / drivers / net / ethernet / intel / ixgbe / ixgbe_main.c

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 69452c379cbcbb76bbf37eb37f6c5efd82875d03..088c47cf27d97d0f5a8a40992c95ec7c7a761947 100644 (file)
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -9483,6 +9483,7 @@ skip_sriov:
 #define IXGBE_GSO_PARTIAL_FEATURES (NETIF_F_GSO_GRE | \
                                    NETIF_F_GSO_GRE_CSUM | \
                                    NETIF_F_GSO_IPXIP4 | \
+                                   NETIF_F_GSO_IPXIP6 | \
                                    NETIF_F_GSO_UDP_TUNNEL | \
                                    NETIF_F_GSO_UDP_TUNNEL_CSUM)