diff options
| author | David S. Miller <davem@davemloft.net> | 2019-10-02 13:23:13 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-10-02 13:23:13 -0700 |
| commit | 4fbb97bac1be4fb5a4b8030e2b247b81504fe694 (patch) | |
| tree | 9e99af325a5daf37bb2e28d1f5eff9a61cd96872 /net/xfrm/xfrm_output.c | |
| parent | db34a4714c013b644eec2de0ec81b1f0373b8b93 (diff) | |
| parent | 34a4c95abd25ab41fb390b985a08a651b1fa0b0f (diff) | |
| download | linux-next-4fbb97bac1be4fb5a4b8030e2b247b81504fe694.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
Pablo Neira Ayuso says:
====================
Netfilter fixes for net
The following patchset contains Netfilter fixes for net:
1) Remove the skb_ext_del from nf_reset, and renames it to a more
fitting nf_reset_ct(). Patch from Florian Westphal.
2) Fix deadlock in nft_connlimit between packet path updates and
the garbage collector.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/xfrm/xfrm_output.c')
| -rw-r--r-- | net/xfrm/xfrm_output.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/xfrm/xfrm_output.c b/net/xfrm/xfrm_output.c index 9499b35feb92..b1db55b50ba1 100644 --- a/net/xfrm/xfrm_output.c +++ b/net/xfrm/xfrm_output.c @@ -502,7 +502,7 @@ int xfrm_output_resume(struct sk_buff *skb, int err) struct net *net = xs_net(skb_dst(skb)->xfrm); while (likely((err = xfrm_output_one(skb, err)) == 0)) { - nf_reset(skb); + nf_reset_ct(skb); err = skb_dst(skb)->ops->local_out(net, skb->sk, skb); if (unlikely(err != 1)) |