Commit 74f53cd8 authored by Johannes Berg's avatar Johannes Berg

regulatory: clean up regdom_intersect

As the dummy_rule (also renamed from irule) is only
used for output by the reg_rules_intersect() function
there's no need to clear it at all, remove that.
Acked-by: default avatarLuis R. Rodriguez <mcgrof@do-not-panic.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 82f20856
...@@ -608,12 +608,7 @@ static struct ieee80211_regdomain *regdom_intersect( ...@@ -608,12 +608,7 @@ static struct ieee80211_regdomain *regdom_intersect(
struct ieee80211_reg_rule *intersected_rule; struct ieee80211_reg_rule *intersected_rule;
struct ieee80211_regdomain *rd; struct ieee80211_regdomain *rd;
/* This is just a dummy holder to help us count */ /* This is just a dummy holder to help us count */
struct ieee80211_reg_rule irule; struct ieee80211_reg_rule dummy_rule;
/* Uses the stack temporarily for counter arithmetic */
intersected_rule = &irule;
memset(intersected_rule, 0, sizeof(struct ieee80211_reg_rule));
if (!rd1 || !rd2) if (!rd1 || !rd2)
return NULL; return NULL;
...@@ -630,11 +625,8 @@ static struct ieee80211_regdomain *regdom_intersect( ...@@ -630,11 +625,8 @@ static struct ieee80211_regdomain *regdom_intersect(
rule1 = &rd1->reg_rules[x]; rule1 = &rd1->reg_rules[x];
for (y = 0; y < rd2->n_reg_rules; y++) { for (y = 0; y < rd2->n_reg_rules; y++) {
rule2 = &rd2->reg_rules[y]; rule2 = &rd2->reg_rules[y];
if (!reg_rules_intersect(rule1, rule2, if (!reg_rules_intersect(rule1, rule2, &dummy_rule))
intersected_rule))
num_rules++; num_rules++;
memset(intersected_rule, 0,
sizeof(struct ieee80211_reg_rule));
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment