From 824647c4b6a9c8202b36bc4ec4fdd85b3a47bfc2 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Thu, 6 Dec 2012 17:03:17 +0100 Subject: [PATCH] --- yaml --- r: 351724 b: refs/heads/master c: 8a57fff0c178febbe28669a0ef68a8e3460a7589 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/wireless/reg.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 10df09000bbe..2a0b03e8e2c9 100644 --- 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 index 6e5308998e30..40646e823d5d 100644 --- 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