From ca5dd3ffa2c78bdca6a1bae90065bd484a91c5ad Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 19 Feb 2008 17:19:44 -0800 Subject: [PATCH] --- yaml --- r: 86274 b: refs/heads/master c: 7d9904c2604ce091c97c225b5e2f92f3e7cc2e3a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/netfilter/xt_hashlimit.h | 1 - trunk/net/netfilter/xt_hashlimit.c | 3 --- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 508db7230ab3..1195ae904bba 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 651acc9893f2cd036e9485ce782d0c4cffbc27f5 +refs/heads/master: 7d9904c2604ce091c97c225b5e2f92f3e7cc2e3a diff --git a/trunk/include/linux/netfilter/xt_hashlimit.h b/trunk/include/linux/netfilter/xt_hashlimit.h index 58b818ee41ca..51b18d83b477 100644 --- a/trunk/include/linux/netfilter/xt_hashlimit.h +++ b/trunk/include/linux/netfilter/xt_hashlimit.h @@ -61,7 +61,6 @@ struct xt_hashlimit_mtinfo1 { /* Used internally by the kernel */ struct xt_hashlimit_htable *hinfo __attribute__((aligned(8))); - struct xt_hashlimit_mtinfo1 *master __attribute__((aligned(8))); }; #endif /*_XT_HASHLIMIT_H*/ diff --git a/trunk/net/netfilter/xt_hashlimit.c b/trunk/net/netfilter/xt_hashlimit.c index 744c7f2ab0b1..5418ce59ac3a 100644 --- a/trunk/net/netfilter/xt_hashlimit.c +++ b/trunk/net/netfilter/xt_hashlimit.c @@ -774,9 +774,6 @@ hashlimit_mt_check(const char *tablename, const void *inf, return false; } mutex_unlock(&hlimit_mutex); - - /* Ugly hack: For SMP, we only want to use one set */ - info->master = info; return true; }