diff options
| author | David S. Miller <davem@davemloft.net> | 2013-01-14 18:26:41 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-01-14 18:26:41 -0500 |
| commit | 47fb3a26e2f07a734876915bedc1053021fec860 (patch) | |
| tree | 8921f299d57a6c875c835d0b9db22fcf50089032 /include | |
| parent | 5dbbaf2de89613d19a9286d4db0a535ca2735d26 (diff) | |
| parent | 5b76c4948fe6977bead2359c2054f3e6a2dcf3d0 (diff) | |
| download | linux-47fb3a26e2f07a734876915bedc1053021fec860.tar.gz linux-47fb3a26e2f07a734876915bedc1053021fec860.tar.bz2 linux-47fb3a26e2f07a734876915bedc1053021fec860.zip | |
Merge branch 'master' of git://1984.lsi.us.es/nf
Pablo Neira Ayuso says:
====================
The following patchset contains netfilter fixes for 3.8-rc3,
they are:
* fix possible BUG_ON if several netns are in use and the nf_conntrack
module is removed, initial patch from Gao feng, final patch from myself.
* fix unset return value if conntrack zone are disabled at
compile-time, reported by Borislav Petkov, fix from myself.
* fix display error message via dmesg for arp_tables, from Jan Engelhardt.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/netfilter/nf_conntrack_core.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/net/netfilter/nf_conntrack_core.h b/include/net/netfilter/nf_conntrack_core.h index d8f5b9f52169..e98aeb3da033 100644 --- a/include/net/netfilter/nf_conntrack_core.h +++ b/include/net/netfilter/nf_conntrack_core.h @@ -31,6 +31,8 @@ extern void nf_conntrack_cleanup(struct net *net); extern int nf_conntrack_proto_init(struct net *net); extern void nf_conntrack_proto_fini(struct net *net); +extern void nf_conntrack_cleanup_end(void); + extern bool nf_ct_get_tuple(const struct sk_buff *skb, unsigned int nhoff, |