diff options
| author | David S. Miller <davem@davemloft.net> | 2019-10-02 23:23:13 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-10-02 23:23:13 +0300 |
| commit | 4fbb97bac1be4fb5a4b8030e2b247b81504fe694 (patch) | |
| tree | 9e99af325a5daf37bb2e28d1f5eff9a61cd96872 /net/l2tp/l2tp_eth.c | |
| parent | db34a4714c013b644eec2de0ec81b1f0373b8b93 (diff) | |
| parent | 34a4c95abd25ab41fb390b985a08a651b1fa0b0f (diff) | |
| download | linux-4fbb97bac1be4fb5a4b8030e2b247b81504fe694.tar.xz | |
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_eth.c')
| -rw-r--r-- | net/l2tp/l2tp_eth.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/l2tp/l2tp_eth.c b/net/l2tp/l2tp_eth.c index bd3f39349d40..fd5ac2788e45 100644 --- a/net/l2tp/l2tp_eth.c +++ b/net/l2tp/l2tp_eth.c @@ -151,7 +151,7 @@ static void l2tp_eth_dev_recv(struct l2tp_session *session, struct sk_buff *skb, skb->ip_summed = CHECKSUM_NONE; skb_dst_drop(skb); - nf_reset(skb); + nf_reset_ct(skb); rcu_read_lock(); dev = rcu_dereference(spriv->dev); |