diff options
| author | David S. Miller <davem@davemloft.net> | 2021-02-09 20:23:41 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-02-09 20:23:41 +0100 |
| commit | fc1a8db3d560f01e63eb9731ead2b0383349a386 (patch) | |
| tree | d110323c66a0003f7c9296fb4d303ba8c57b8f03 /net/ipv6 | |
| parent | Documentation: networking: ip-sysctl: Document src_valid_mark sysctl (diff) | |
| parent | xfrm: Return the correct errno code (diff) | |
| download | linux-fc1a8db3d560f01e63eb9731ead2b0383349a386.tar.xz linux-fc1a8db3d560f01e63eb9731ead2b0383349a386.zip | |
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/ipv6')
| -rw-r--r-- | net/ipv6/esp6.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/esp6.c b/net/ipv6/esp6.c index 2b804fcebcc6..153ad103ba74 100644 --- a/net/ipv6/esp6.c +++ b/net/ipv6/esp6.c @@ -788,7 +788,7 @@ int esp6_input_done2(struct sk_buff *skb, int err) int hlen = sizeof(struct ip_esp_hdr) + crypto_aead_ivsize(aead); int hdr_len = skb_network_header_len(skb); - if (!xo || (xo && !(xo->flags & CRYPTO_DONE))) + if (!xo || !(xo->flags & CRYPTO_DONE)) kfree(ESP_SKB_CB(skb)->tmp); if (unlikely(err)) |