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/l2tp/l2tp_core.c | |
parent | ptp_qoriq: Initialize the registers' spinlock before calling ptp_qoriq_settime (diff) | |
parent | netfilter: nft_connlimit: disable bh on garbage collection (diff) | |
download | linux-dev-4fbb97bac1be4fb5a4b8030e2b247b81504fe694.tar.xz linux-dev-4fbb97bac1be4fb5a4b8030e2b247b81504fe694.zip |
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/l2tp/l2tp_core.c')
-rw-r--r-- | net/l2tp/l2tp_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/l2tp/l2tp_core.c b/net/l2tp/l2tp_core.c index 105e5a7092e7..f82ea12bac37 100644 --- a/net/l2tp/l2tp_core.c +++ b/net/l2tp/l2tp_core.c @@ -1078,7 +1078,7 @@ int l2tp_xmit_skb(struct l2tp_session *session, struct sk_buff *skb, int hdr_len memset(&(IPCB(skb)->opt), 0, sizeof(IPCB(skb)->opt)); IPCB(skb)->flags &= ~(IPSKB_XFRM_TUNNEL_SIZE | IPSKB_XFRM_TRANSFORMED | IPSKB_REROUTED); - nf_reset(skb); + nf_reset_ct(skb); bh_lock_sock(sk); if (sock_owned_by_user(sk)) { |