Commit cfcf99f9 authored Apr 27, 2017 by Sabrina Dubroca Committed by Steffen Klassert Apr 27, 2017

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: 7785bba2 ("esp: Add a software GRO codepath")
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>

parent 35db0691

net/xfrm/xfrm_input.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -395,7 +395,7 @@ int xfrm_input(struct sk_buff *skb, int nexthdr, __be32 spi, int encap_type)
	if (xo)		if (xo)
	xfrm_gro = xo->flags & XFRM_GRO;		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) {		if (xfrm_gro) {
	skb_dst_drop(skb);		skb_dst_drop(skb);
	gro_cells_receive(&gro_cells, skb);		gro_cells_receive(&gro_cells, skb);