---

yaml --- r: 351726 b: refs/heads/master c: 74f53cd h: refs/heads/master v: v3
git-mirror · Jan 3, 2013 · 2f51a6f · 2f51a6f
1 parent 1bdae45
commit 2f51a6f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 82f20856304319d5a931846e0269eb911d52a905
+refs/heads/master: 74f53cd8d4474f9ba91c7309feabebae80a60089
diff --git a/trunk/net/wireless/reg.c b/trunk/net/wireless/reg.c
@@ -608,12 +608,7 @@ static struct ieee80211_regdomain *regdom_intersect(
 	struct ieee80211_reg_rule *intersected_rule;
 	struct ieee80211_regdomain *rd;
 	/* This is just a dummy holder to help us count */
-	struct ieee80211_reg_rule irule;
-
-	/* Uses the stack temporarily for counter arithmetic */
-	intersected_rule = &irule;
-
-	memset(intersected_rule, 0, sizeof(struct ieee80211_reg_rule));
+	struct ieee80211_reg_rule dummy_rule;
 
 	if (!rd1 || !rd2)
 		return NULL;
@@ -630,11 +625,8 @@ static struct ieee80211_regdomain *regdom_intersect(
 		rule1 = &rd1->reg_rules[x];
 		for (y = 0; y < rd2->n_reg_rules; y++) {
 			rule2 = &rd2->reg_rules[y];
-			if (!reg_rules_intersect(rule1, rule2,
-					intersected_rule))
+			if (!reg_rules_intersect(rule1, rule2, &dummy_rule))
 				num_rules++;
-			memset(intersected_rule, 0,
-					sizeof(struct ieee80211_reg_rule));
 		}
 	}