Commit 65f079a6 authored by Sabrina Dubroca's avatar Sabrina Dubroca Committed by Steffen Klassert
Browse files

xfrm: bring back device check in validate_xmit_xfrm 



This is partial revert of commit d53dda29.

This change causes traffic using GSO with SW crypto running through a
NIC capable of HW offload to no longer get segmented during
validate_xmit_xfrm, and is unrelated to the bonding use case mentioned
in the commit.

Fixes: d53dda29 ("xfrm: Remove unneeded device check from validate_xmit_xfrm")
Signed-off-by: default avatarSabrina Dubroca <sd@queasysnail.net>
Reviewed-by: default avatarCosmin Ratiu <cratiu@nvidia.com>
Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
parent 234d1eff

net/xfrm/xfrm_device.c

+2 −1
Original line number Diff line number Diff line
@@ -155,7 +155,8 @@ struct sk_buff *validate_xmit_xfrm(struct sk_buff *skb, netdev_features_t featur 
		return skb;

	}



	if (skb_is_gso(skb) && unlikely(xmit_xfrm_check_overflow(skb))) {

	if (skb_is_gso(skb) && (unlikely(x->xso.dev != dev) ||

				unlikely(xmit_xfrm_check_overflow(skb)))) {

		struct sk_buff *segs;



		/* Packet got rerouted, fixup features and segment it. */