ixgbe: no need for ipsec csum feature check
authorShannon Nelson <shannon.nelson@oracle.com>
Fri, 16 Mar 2018 18:09:04 +0000 (11:09 -0700)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Fri, 23 Mar 2018 21:50:41 +0000 (14:50 -0700)
With the patch
commit f8aa2696b4af ("esp: check the NETIF_F_HW_ESP_TX_CSUM bit before segmenting")
we no longer need to protect ourself from checksum
offload requests on IPsec packets, so we can remove
the check in our .ndo_features_check callback.

Signed-off-by: Shannon Nelson <shannon.nelson@oracle.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

index faf368b..0eb45d1 100644 (file)
@@ -9917,12 +9917,6 @@ ixgbe_features_check(struct sk_buff *skb, struct net_device *dev,
        if (skb->encapsulation && !(features & NETIF_F_TSO_MANGLEID))
                features &= ~NETIF_F_TSO;
 
-#ifdef CONFIG_XFRM_OFFLOAD
-       /* IPsec offload doesn't get along well with others *yet* */
-       if (skb->sp)
-               features &= ~(NETIF_F_TSO | NETIF_F_HW_CSUM);
-#endif
-
        return features;
 }