* [PATCH net] xfrm: fix GRO for !CONFIG_NETFILTER
@ 2017-04-27 10:03 Sabrina Dubroca
2017-04-27 11:04 ` Steffen Klassert
0 siblings, 1 reply; 2+ messages in thread
From: Sabrina Dubroca @ 2017-04-27 10:03 UTC (permalink / raw)
To: netdev; +Cc: Sabrina Dubroca, Steffen Klassert, Herbert Xu
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>
---
net/xfrm/xfrm_input.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 @@ int xfrm_input(struct sk_buff *skb, int nexthdr, __be32 spi, int encap_type)
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);
--
2.12.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net] xfrm: fix GRO for !CONFIG_NETFILTER
2017-04-27 10:03 [PATCH net] xfrm: fix GRO for !CONFIG_NETFILTER Sabrina Dubroca
@ 2017-04-27 11:04 ` Steffen Klassert
0 siblings, 0 replies; 2+ messages in thread
From: Steffen Klassert @ 2017-04-27 11:04 UTC (permalink / raw)
To: Sabrina Dubroca; +Cc: netdev, Herbert Xu
On Thu, Apr 27, 2017 at 12:03:37PM +0200, Sabrina Dubroca wrote:
> 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>
Applied, thanks a lot Sabrina!
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-04-27 11:07 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-04-27 10:03 [PATCH net] xfrm: fix GRO for !CONFIG_NETFILTER Sabrina Dubroca
2017-04-27 11:04 ` Steffen Klassert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).