|
@@ -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;
|
|
}
|
|
}
|
|
|
|
|