diff options
author | David S. Miller <davem@davemloft.net> | 2021-02-09 22:23:41 +0300 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2021-02-09 22:23:41 +0300 |
commit | fc1a8db3d560f01e63eb9731ead2b0383349a386 (patch) | |
tree | d110323c66a0003f7c9296fb4d303ba8c57b8f03 /net/ipv4 | |
parent | 8cf5d8cc3eae2a6324ff81aa5f2f6c2f52bc5cd0 (diff) | |
parent | 4ac7a6eecbec90c7f83d5ea6f0498d9fa9c62917 (diff) | |
download | linux-fc1a8db3d560f01e63eb9731ead2b0383349a386.tar.xz |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next
Steffen Klassert says:
====================
pull request (net-next): ipsec-next 2021-02-09
1) Support TSO on xfrm interfaces.
From Eyal Birger.
2) Variable calculation simplifications in esp4/esp6.
From Jiapeng Chong / Jiapeng Zhong.
3) Fix a return code in xfrm_do_migrate.
From Zheng Yongjun.
Please pull or let me know if there are problems.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
-rw-r--r-- | net/ipv4/esp4_offload.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/esp4_offload.c b/net/ipv4/esp4_offload.c index 5bda5aeda579..601f5fbfc63f 100644 --- a/net/ipv4/esp4_offload.c +++ b/net/ipv4/esp4_offload.c @@ -285,7 +285,7 @@ static int esp_xmit(struct xfrm_state *x, struct sk_buff *skb, netdev_features_ esp.esph = ip_esp_hdr(skb); - if (!hw_offload || (hw_offload && !skb_is_gso(skb))) { + if (!hw_offload || !skb_is_gso(skb)) { esp.nfrags = esp_output_head(x, skb, &esp); if (esp.nfrags < 0) return esp.nfrags; |