diff options
| author | David S. Miller <davem@davemloft.net> | 2021-04-14 13:15:12 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-04-14 13:15:12 -0700 |
| commit | 8c1186be3f1b02ec85db003506b1aa71d5dc5a1b (patch) | |
| tree | 1a374ad45e0cab42cacf3f9936a903269cd7ed03 /net/ipv4 | |
| parent | 216f78ea8cf6fae5140aeb55657ebdab71a05502 (diff) | |
| parent | 6ad2dd6c14d3989b44cdc17f1e7258bf613dd070 (diff) | |
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-04-14
Not much this time:
1) Simplification of some variable calculations in esp4 and esp6.
From Jiapeng Chong and Junlin Yang.
2) Fix a clang Wformat warning in esp6 and ah6.
From Arnd Bergmann.
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c index dd1c752ea122..35803ab7ac80 100644 --- a/net/ipv4/esp4.c +++ b/net/ipv4/esp4.c @@ -754,7 +754,7 @@ int esp_input_done2(struct sk_buff *skb, int err) int hlen = sizeof(struct ip_esp_hdr) + crypto_aead_ivsize(aead); int ihl; - if (!xo || (xo && !(xo->flags & CRYPTO_DONE))) + if (!xo || !(xo->flags & CRYPTO_DONE)) kfree(ESP_SKB_CB(skb)->tmp); if (unlikely(err)) |