Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec...

[mirror_ubuntu-eoan-kernel.git] / net / ipv4 / esp4_offload.c

diff --git a/net/ipv4/esp4_offload.c b/net/ipv4/esp4_offload.c
index bbeecd13e53477ce21c4c77f876f6e84966e1cb0..58834a10c0be77b3d301169f505dcdc7896dd3f4 100644 (file)
--- a/net/ipv4/esp4_offload.c
+++ b/net/ipv4/esp4_offload.c
@@ -135,8 +135,7 @@ static struct sk_buff *esp4_gso_segment(struct sk_buff *skb,
 
        skb->encap_hdr_csum = 1;
 
-       if (!(features & NETIF_F_HW_ESP) || !x->xso.offload_handle ||
-           (x->xso.dev != skb->dev))
+       if (!(features & NETIF_F_HW_ESP) || x->xso.dev != skb->dev)
                esp_features = features & ~(NETIF_F_SG | NETIF_F_CSUM_MASK);
        else if (!(features & NETIF_F_HW_ESP_TX_CSUM))
                esp_features = features & ~NETIF_F_CSUM_MASK;
@@ -179,8 +178,7 @@ static int esp_xmit(struct xfrm_state *x, struct sk_buff *skb,  netdev_features_
        if (!xo)
                return -EINVAL;
 
-       if (!(features & NETIF_F_HW_ESP) || !x->xso.offload_handle ||
-           (x->xso.dev != skb->dev)) {
+       if (!(features & NETIF_F_HW_ESP) || x->xso.dev != skb->dev) {
                xo->flags |= CRYPTO_FALLBACK;
                hw_offload = false;
        }