diff options
| author | David S. Miller <davem@davemloft.net> | 2013-04-04 23:41:53 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-04-04 23:41:53 +0200 |
| commit | 4f4ecd5f2a94135a8a556232aa9ddc55944d9c8f (patch) | |
| tree | 99a4808dce728bc3b7bfe6ca6a5eae4bd6eeac99 /include | |
| parent | Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/lin... (diff) | |
| parent | netfilter: ip6t_NPT: Fix translation for non-multiple of 32 prefix lengths (diff) | |
| download | linux-4f4ecd5f2a94135a8a556232aa9ddc55944d9c8f.tar.xz linux-4f4ecd5f2a94135a8a556232aa9ddc55944d9c8f.zip | |
Merge branch 'master' of git://1984.lsi.us.es/nf
Pablo Neira Ayuso says:
====================
The following patchset contains netfilter updates for your net tree,
they are:
* Fix missing the skb->trace reset in nf_reset, noticed by Gao Feng
while using the TRACE target with several net namespaces.
* Fix prefix translation in IPv6 NPT if non-multiple of 32 prefixes
are used, from Matthias Schiffer.
* Fix invalid nfacct objects with empty name, they are now rejected
with -EINVAL, spotted by Michael Zintakis, patch from myself.
* A couple of fixes for wrong return values in the error path of
nfnetlink_queue and nf_conntrack, from Wei Yongjun.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/skbuff.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 441f5bfdab8e..72b396751de7 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -2641,6 +2641,9 @@ static inline void nf_reset(struct sk_buff *skb) nf_bridge_put(skb->nf_bridge); skb->nf_bridge = NULL; #endif +#if IS_ENABLED(CONFIG_NETFILTER_XT_TARGET_TRACE) + skb->nf_trace = 0; +#endif } /* Note: This doesn't put any conntrack and bridge info in dst. */ |