From d1ecd8f65f5a3e873bfd8885ab9d7540c9764bea Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Tue, 24 Feb 2009 15:30:29 +0100 Subject: [PATCH] --- yaml --- r: 135487 b: refs/heads/master c: 28337ff5438a640afa713d874d076e3a8a9150da h: refs/heads/master i: 135485: fffa73c3d087a036e4dedc65490de74481348c5c 135483: 1b2d18894d29564bd5c3ccba28c7f2380287178f 135479: b7f371dd416f1ec73b9210cb0010deb070098f0e 135471: 9d9dbc6cf967d36038f4d18a162bdaa4e79afbe6 135455: 3536bc19fff29f8f904ff752ce5eb0481bc1e466 135423: e6f456c41d3d44c8aa65b6649317af4eff4a52b3 v: v3 --- [refs] | 2 +- trunk/net/netfilter/xt_hashlimit.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 012ca5a2801c..ec6a4586e5cf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d060ffc1840e37100628f520e66600c5ae483b44 +refs/heads/master: 28337ff5438a640afa713d874d076e3a8a9150da diff --git a/trunk/net/netfilter/xt_hashlimit.c b/trunk/net/netfilter/xt_hashlimit.c index 2482055e1c56..a5b5369c30f9 100644 --- a/trunk/net/netfilter/xt_hashlimit.c +++ b/trunk/net/netfilter/xt_hashlimit.c @@ -565,8 +565,7 @@ hashlimit_init_dst(const struct xt_hashlimit_htable *hinfo, static bool hashlimit_mt_v0(const struct sk_buff *skb, const struct xt_match_param *par) { - const struct xt_hashlimit_info *r = - ((const struct xt_hashlimit_info *)par->matchinfo)->u.master; + const struct xt_hashlimit_info *r = par->matchinfo; struct xt_hashlimit_htable *hinfo = r->hinfo; unsigned long now = jiffies; struct dsthash_ent *dh; @@ -702,8 +701,6 @@ static bool hashlimit_mt_check_v0(const struct xt_mtchk_param *par) } mutex_unlock(&hlimit_mutex); - /* Ugly hack: For SMP, we only want to use one set */ - r->u.master = r; return true; }