Commit 49431af6 authored by Leon Romanovsky's avatar Leon Romanovsky Committed by Steffen Klassert
Browse files

xfrm: rely on XFRM offload 



After change of initialization of x->type_offload pointer to be valid
only for offloaded SAs. There is no need to rely on both x->type_offload
and x->xso.type to determine if SA is offloaded or not.

Reviewed-by: default avatarZhu Yanjun <yanjun.zhu@linux.dev>
Signed-off-by: default avatarLeon Romanovsky <leonro@nvidia.com>
Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
parent b6ccf61a

net/xfrm/xfrm_device.c

+4 −6
Original line number Diff line number Diff line
@@ -419,13 +419,11 @@ bool xfrm_dev_offload_ok(struct sk_buff *skb, struct xfrm_state *x) 
	struct xfrm_dst *xdst = (struct xfrm_dst *)dst;

	struct net_device *dev = x->xso.dev;



	if (!x->type_offload ||

	    (x->xso.type == XFRM_DEV_OFFLOAD_UNSPECIFIED && x->encap))

	if (x->xso.type == XFRM_DEV_OFFLOAD_UNSPECIFIED)

		return false;



	if (x->xso.type == XFRM_DEV_OFFLOAD_PACKET ||

	    ((!dev || (dev == xfrm_dst_path(dst)->dev)) &&

	     !xdst->child->xfrm)) {

	    ((dev == xfrm_dst_path(dst)->dev) && !xdst->child->xfrm)) {

		mtu = xfrm_state_mtu(x, xdst->child_mtu_cached);

		if (skb->len <= mtu)

			goto ok;
@@ -437,8 +435,8 @@ bool xfrm_dev_offload_ok(struct sk_buff *skb, struct xfrm_state *x) 
	return false;



ok:

	if (dev && dev->xfrmdev_ops && dev->xfrmdev_ops->xdo_dev_offload_ok)

		return x->xso.dev->xfrmdev_ops->xdo_dev_offload_ok(skb, x);

	if (dev->xfrmdev_ops->xdo_dev_offload_ok)

		return dev->xfrmdev_ops->xdo_dev_offload_ok(skb, x);



	return true;

}