---

yaml --- r: 351724 b: refs/heads/master c: 8a57fff h: refs/heads/master v: v3
git-mirror · Jan 3, 2013 · 824647c · 824647c
1 parent 34158d4
commit 824647c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 10ff57f98d5fccb9bb508ba30230e5df030d67e3
+refs/heads/master: 8a57fff0c178febbe28669a0ef68a8e3460a7589
diff --git a/trunk/net/wireless/reg.c b/trunk/net/wireless/reg.c
@@ -647,9 +647,9 @@ static struct ieee80211_regdomain *regdom_intersect(
 	if (!rd)
 		return NULL;
 
-	for (x = 0; x < rd1->n_reg_rules; x++) {
+	for (x = 0; x < rd1->n_reg_rules && rule_idx < num_rules; x++) {
 		rule1 = &rd1->reg_rules[x];
-		for (y = 0; y < rd2->n_reg_rules; y++) {
+		for (y = 0; y < rd2->n_reg_rules && rule_idx < num_rules; y++) {
 			rule2 = &rd2->reg_rules[y];
 			/*
 			 * This time around instead of using the stack lets