Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec (5577e679) · Commits · 戴 / test

Steffen Klassert says: ==================== pull request (net): ipsec 2017-04-28 1) Do garbage collecting after a policy flush to remove old bundles immediately. From Xin Long. 2) Fix GRO if netfilter is not defined. From Sabrina Dubroca. Please pull or let me know if there are problems. ==================== Signed-off-by:

David S. Miller <davem@davemloft.net>

net/xfrm/xfrm_input.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);

net/xfrm/xfrm_policy.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -1006,6 +1006,10 @@ int xfrm_policy_flush(struct net *net, u8 type, bool task_valid)
		err = -ESRCH;
		out:
		spin_unlock_bh(&net->xfrm.xfrm_policy_lock);

		if (cnt)
		xfrm_garbage_collect(net);

		return err;
		}
		EXPORT_SYMBOL(xfrm_policy_flush);

Admin message