lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cfg80211: remove code about country IE support with OLD_REG

Browse Source 
We had left in code to allow interested developers to add
support for parsing country IEs when OLD_REG was enabled.
This never happened and since we're going to remove OLD_REG
lets just remove these comments and code for it.

This code path was never being entered so this has no
functional change.

Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Luis R. Rodriguez
2009-03-20 23:53:07 -04:00
committed by John W. Linville
parent 6ee7d33056
commit 86f04680df
1 changed files with 11 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
net/wireless/reg.c
View File

@@ -1420,16 +1420,6 @@ new_request:
return r; return r;
} }
/*
* Note: When CONFIG_WIRELESS_OLD_REGULATORY is enabled
* AND if CRDA is NOT present nothing will happen, if someone
* wants to bother with 11d with OLD_REG you can add a timer.
* If after x amount of time nothing happens you can call:
*
* return set_regdom(country_ie_regdomain);
*
* to intersect with the static rd
*/
return call_crda(last_request->alpha2); return call_crda(last_request->alpha2);
} }
@@ -2033,8 +2023,8 @@ static int __set_regdom(const struct ieee80211_regdomain *rd)
*/ */
BUG_ON(!country_ie_regdomain); BUG_ON(!country_ie_regdomain);
BUG_ON(rd == country_ie_regdomain);
if (rd != country_ie_regdomain) {
/* /*
* Intersect what CRDA returned and our what we * Intersect what CRDA returned and our what we
* had built from the Country IE received * had built from the Country IE received
@@ -2042,19 +2032,12 @@ static int __set_regdom(const struct ieee80211_regdomain *rd)
intersected_rd = regdom_intersect(rd, country_ie_regdomain); intersected_rd = regdom_intersect(rd, country_ie_regdomain);
reg_country_ie_process_debug(rd, country_ie_regdomain, reg_country_ie_process_debug(rd,
country_ie_regdomain,
intersected_rd); intersected_rd);
kfree(country_ie_regdomain); kfree(country_ie_regdomain);
country_ie_regdomain = NULL; country_ie_regdomain = NULL;
} else {
/*
* This would happen when CRDA was not present and
* OLD_REGULATORY was enabled. We intersect our Country
* IE rd and what was set on cfg80211 originally
*/
intersected_rd = regdom_intersect(rd, cfg80211_regdomain);
}
if (!intersected_rd) if (!intersected_rd)
return -EINVAL; return -EINVAL;