Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2137aec0 authored by Shannon Nelson's avatar Shannon Nelson Committed by Jeff Kirsher
Browse files

ixgbe: no need for ipsec csum feature check



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: default avatarShannon Nelson <shannon.nelson@oracle.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 9bf1e20f
Loading
Loading
Loading
Loading
+0 −6
Original line number Original line Diff line number Diff line
@@ -9917,12 +9917,6 @@ ixgbe_features_check(struct sk_buff *skb, struct net_device *dev,
	if (skb->encapsulation && !(features & NETIF_F_TSO_MANGLEID))
	if (skb->encapsulation && !(features & NETIF_F_TSO_MANGLEID))
		features &= ~NETIF_F_TSO;
		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;
	return features;
}
}