diff options
| author |   Sabrina Dubroca <sd@queasysnail.net> | 2017-04-27 12:03:37 +0200 |
|---|---|---|
| committer |   Steffen Klassert <steffen.klassert@secunet.com> | 2017-04-27 12:20:19 +0200 |
| commit | cfcf99f987ba321a3d122580716beb9b08d52eb8 (patch) | |
| tree | b8ef77d6f016f3107fcd1bb718a935e5f2a2e25c /net/xfrm/xfrm_input.c | |
| parent | xfrm: do the garbage collection after flushing policy (diff) | |
| download | linux-dev-cfcf99f987ba321a3d122580716beb9b08d52eb8.tar.xz linux-dev-cfcf99f987ba321a3d122580716beb9b08d52eb8.zip | |
xfrm: fix GRO for !CONFIG_NETFILTER
In xfrm_input() when called from GRO, async == 0, and we end up
skipping the processing in xfrm4_transport_finish(). GRO path will
always skip the NF_HOOK, so we don't need the special-case for
!NETFILTER during GRO processing.
Fixes: 7785bba299a8 ("esp: Add a software GRO codepath")
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Diffstat (limited to 'net/xfrm/xfrm_input.c')
| -rw-r--r-- | net/xfrm/xfrm_input.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/xfrm/xfrm_input.c b/net/xfrm/xfrm_input.c index 46bdb4fbed0b..e23570b647ae 100644 --- a/net/xfrm/xfrm_input.c +++ b/net/xfrm/xfrm_input.c @@ -395,7 +395,7 @@ resume: if (xo) xfrm_gro = xo->flags & XFRM_GRO; - err = x->inner_mode->afinfo->transport_finish(skb, async); + err = x->inner_mode->afinfo->transport_finish(skb, xfrm_gro || async); if (xfrm_gro) { skb_dst_drop(skb); gro_cells_receive(&gro_cells, skb); |