---

yaml
---
r: 135487
b: refs/heads/master
c: 28337ff
h: refs/heads/master
i:
  135485: fffa73c
  135483: 1b2d188
  135479: b7f371d
  135471: 9d9dbc6
  135455: 3536bc1
  135423: e6f456c
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d060ffc1840e37100628f520e66600c5ae483b44
+refs/heads/master: 28337ff5438a640afa713d874d076e3a8a9150da

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;
 }