summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2019-10-02 13:23:13 -0700
committerDavid S. Miller <davem@davemloft.net>2019-10-02 13:23:13 -0700
commit4fbb97bac1be4fb5a4b8030e2b247b81504fe694 (patch)
tree9e99af325a5daf37bb2e28d1f5eff9a61cd96872 /include
parentdb34a4714c013b644eec2de0ec81b1f0373b8b93 (diff)
parent34a4c95abd25ab41fb390b985a08a651b1fa0b0f (diff)
downloadlinux-stable-4fbb97bac1be4fb5a4b8030e2b247b81504fe694.tar.gz
linux-stable-4fbb97bac1be4fb5a4b8030e2b247b81504fe694.tar.bz2
linux-stable-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 'include')
-rw-r--r--include/linux/skbuff.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index e7d3b1a513ef..4351577b14d7 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -4160,15 +4160,12 @@ static inline void __skb_ext_copy(struct sk_buff *d, const struct sk_buff *s) {}
static inline void skb_ext_copy(struct sk_buff *dst, const struct sk_buff *s) {}
#endif /* CONFIG_SKB_EXTENSIONS */
-static inline void nf_reset(struct sk_buff *skb)
+static inline void nf_reset_ct(struct sk_buff *skb)
{
#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
nf_conntrack_put(skb_nfct(skb));
skb->_nfct = 0;
#endif
-#if IS_ENABLED(CONFIG_BRIDGE_NETFILTER)
- skb_ext_del(skb, SKB_EXT_BRIDGE_NF);
-#endif
}
static inline void nf_reset_trace(struct sk_buff *skb)