[Intel-wired-lan] [PATCH ipsec-next 3/5] xfrm: rely on XFRM offload

[Leon Romanovsky]

From: Leon Romanovsky <leo...@nvidia.com>

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

Signed-off-by: Leon Romanovsky <leo...@nvidia.com>
---
 net/xfrm/xfrm_device.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/net/xfrm/xfrm_device.c b/net/xfrm/xfrm_device.c
index e01a7f5a4c75..c3c170953bf9 100644
--- a/net/xfrm/xfrm_device.c
+++ b/net/xfrm/xfrm_device.c
@@ -420,13 +420,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;
@@ -438,8 +436,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;
 }
-- 
2.48.1