diff options
author | Jan Engelhardt <jengelh@computergmbh.de> | 2008-02-19 20:19:44 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-02-19 20:19:44 -0500 |
commit | 7d9904c2604ce091c97c225b5e2f92f3e7cc2e3a (patch) | |
tree | b14eb64e39855157975b0b2169861fd42fba4b40 | |
parent | 651acc9893f2cd036e9485ce782d0c4cffbc27f5 (diff) |
[NETFILTER]: xt_hashlimit: remove unneeded struct member
By allocating ->hinfo, we already have the needed indirection to cope
with the per-cpu xtables struct match_entry.
[Patrick: do this now before the revision 1 struct is used by userspace]
Signed-off-by: Jan Engelhardt <jengelh@computergmbh.de>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | include/linux/netfilter/xt_hashlimit.h | 1 | ||||
-rw-r--r-- | net/netfilter/xt_hashlimit.c | 3 |
2 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/netfilter/xt_hashlimit.h b/include/linux/netfilter/xt_hashlimit.h index 58b818ee41ca..51b18d83b477 100644 --- a/include/linux/netfilter/xt_hashlimit.h +++ b/include/linux/netfilter/xt_hashlimit.h | |||
@@ -61,7 +61,6 @@ struct xt_hashlimit_mtinfo1 { | |||
61 | 61 | ||
62 | /* Used internally by the kernel */ | 62 | /* Used internally by the kernel */ |
63 | struct xt_hashlimit_htable *hinfo __attribute__((aligned(8))); | 63 | struct xt_hashlimit_htable *hinfo __attribute__((aligned(8))); |
64 | struct xt_hashlimit_mtinfo1 *master __attribute__((aligned(8))); | ||
65 | }; | 64 | }; |
66 | 65 | ||
67 | #endif /*_XT_HASHLIMIT_H*/ | 66 | #endif /*_XT_HASHLIMIT_H*/ |
diff --git a/net/netfilter/xt_hashlimit.c b/net/netfilter/xt_hashlimit.c index 744c7f2ab0b1..5418ce59ac3a 100644 --- a/net/netfilter/xt_hashlimit.c +++ b/net/netfilter/xt_hashlimit.c | |||
@@ -774,9 +774,6 @@ hashlimit_mt_check(const char *tablename, const void *inf, | |||
774 | return false; | 774 | return false; |
775 | } | 775 | } |
776 | mutex_unlock(&hlimit_mutex); | 776 | mutex_unlock(&hlimit_mutex); |
777 | |||
778 | /* Ugly hack: For SMP, we only want to use one set */ | ||
779 | info->master = info; | ||
780 | return true; | 777 | return true; |
781 | } | 778 | } |
782 | 779 | ||