diff options
author | Patrick McHardy <kaber@trash.net> | 2010-06-15 19:31:06 +0400 |
---|---|---|
committer | Patrick McHardy <kaber@trash.net> | 2010-06-15 19:31:06 +0400 |
commit | f9181f4ffc71d7b7dd1906c9a11d51d6659220ae (patch) | |
tree | 194f22e8216a1b9ee2c0dd019142202d73a7dc87 /include/net/netfilter/xt_rateest.h | |
parent | 0902b469bd25065aa0688c3cee6f11744c817e7c (diff) | |
parent | 1ab6c163dee279559e3a62d774af7e4c4c9b4c67 (diff) | |
download | linux-f9181f4ffc71d7b7dd1906c9a11d51d6659220ae.tar.xz |
Merge branch 'master' of /repos/git/net-next-2.6
Conflicts:
include/net/netfilter/xt_rateest.h
net/bridge/br_netfilter.c
net/netfilter/nf_conntrack_core.c
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'include/net/netfilter/xt_rateest.h')
-rw-r--r-- | include/net/netfilter/xt_rateest.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/netfilter/xt_rateest.h b/include/net/netfilter/xt_rateest.h index b1d780e21ce3..5a2978d1cb22 100644 --- a/include/net/netfilter/xt_rateest.h +++ b/include/net/netfilter/xt_rateest.h @@ -13,6 +13,7 @@ struct xt_rateest { char name[IFNAMSIZ]; unsigned int refcnt; struct gnet_estimator params; + struct rcu_head rcu; }; extern struct xt_rateest *xt_rateest_lookup(const char *name); |