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: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 62bf212e5648d76d88969a39b6dfda9edf8c175a..d52ffa2abc3fae25bb5c0be15c1444e9340bec54 100644 (file)
--- a/net/wireless/reg.c
+++ b/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));
                }
        }