diff options
| author | David S. Miller <davem@davemloft.net> | 2016-08-18 18:45:34 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-08-18 18:45:34 -0700 |
| commit | 53409afd3e6341d128e5120d3c202cf9a0b11dd2 (patch) | |
| tree | 827159c1611c940347b2a0e470ce4a2d02304e25 /include/linux | |
| parent | 184ca823481c99dadd7d946e5afd4bb921eab30d (diff) | |
| parent | b75911b66ad508a3c3f006ce37d9f9ebee34da43 (diff) | |
| download | linux-53409afd3e6341d128e5120d3c202cf9a0b11dd2.tar.gz linux-53409afd3e6341d128e5120d3c202cf9a0b11dd2.tar.bz2 linux-53409afd3e6341d128e5120d3c202cf9a0b11dd2.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 updates for your net tree,
they are:
1) Dump only conntrack that belong to this namespace via /proc file.
This is some fallout from the conversion to single conntrack table
for all netns, patch from Liping Zhang.
2) Missing MODULE_ALIAS_NF_LOGGER() for the ARP family that prevents
module autoloading, also from Liping Zhang.
3) Report overquota event to the right netnamespace, again from Liping.
4) Fix tproxy listener sk refcount that leads to crash, from
Eric Dumazet.
5) Fix racy refcounting on object deletion from nfnetlink and rule
removal both for nfacct and cttimeout, from Liping Zhang.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/netfilter/nfnetlink_acct.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/netfilter/nfnetlink_acct.h b/include/linux/netfilter/nfnetlink_acct.h index 80ca889b164e..664da0048625 100644 --- a/include/linux/netfilter/nfnetlink_acct.h +++ b/include/linux/netfilter/nfnetlink_acct.h @@ -15,6 +15,6 @@ struct nf_acct; struct nf_acct *nfnl_acct_find_get(struct net *net, const char *filter_name); void nfnl_acct_put(struct nf_acct *acct); void nfnl_acct_update(const struct sk_buff *skb, struct nf_acct *nfacct); -extern int nfnl_acct_overquota(const struct sk_buff *skb, - struct nf_acct *nfacct); +int nfnl_acct_overquota(struct net *net, const struct sk_buff *skb, + struct nf_acct *nfacct); #endif /* _NFNL_ACCT_H */ |