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/ipv6/esp6_offload.c | |
| parent | 216f78ea8cf6fae5140aeb55657ebdab71a05502 (diff) | |
| parent | 6ad2dd6c14d3989b44cdc17f1e7258bf613dd070 (diff) | |
| download | linux-8c1186be3f1b02ec85db003506b1aa71d5dc5a1b.tar.bz2 | |
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/ipv6/esp6_offload.c')
| -rw-r--r-- | net/ipv6/esp6_offload.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/esp6_offload.c b/net/ipv6/esp6_offload.c index 4af56affaafd..40ed4fcf1cf4 100644 --- a/net/ipv6/esp6_offload.c +++ b/net/ipv6/esp6_offload.c @@ -318,7 +318,7 @@ static int esp6_xmit(struct xfrm_state *x, struct sk_buff *skb, netdev_features esp.plen = esp.clen - skb->len - esp.tfclen; esp.tailen = esp.tfclen + esp.plen + alen; - if (!hw_offload || (hw_offload && !skb_is_gso(skb))) { + if (!hw_offload || !skb_is_gso(skb)) { esp.nfrags = esp6_output_head(x, skb, &esp); if (esp.nfrags < 0) return esp.nfrags; |