diff options
| author | Swaroop Golti <sgolti@qti.qualcomm.com> | 2014-03-26 22:58:29 -0700 |
|---|---|---|
| committer | Akash Patel <c_akashp@qca.qualcomm.com> | 2014-04-10 07:12:45 -0700 |
| commit | b58b90d3ba7cbb000fffcd7c0106149fc3889f88 (patch) | |
| tree | a1782f1ddcf454450a424568b5d3b47a63ce197e | |
| parent | 55151a61183c9b3b2efb4edbad33744bb3fc44e5 (diff) | |
wlan: Fix 11d regulatory issue
For all countries whose reg domain is FCC, UNII-1 band channels
should be blocked for GO operation.Add check to block these channels
for all countries whose REGDOMAIN maps to FCC
Change-Id: I4e7eab6552fe758edca04266c4534bbf1302d098
CRs-Fixed: 598545
| -rw-r--r-- | CORE/VOSS/src/vos_nvitem.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/CORE/VOSS/src/vos_nvitem.c b/CORE/VOSS/src/vos_nvitem.c index 7afa186d5332..149920553564 100644 --- a/CORE/VOSS/src/vos_nvitem.c +++ b/CORE/VOSS/src/vos_nvitem.c @@ -4014,7 +4014,8 @@ int wlan_hdd_crda_reg_notifier(struct wiphy *wiphy, wiphy->bands[IEEE80211_BAND_5GHZ]->channels[j].center_freq == 5200 || wiphy->bands[IEEE80211_BAND_5GHZ]->channels[j].center_freq == 5220 || wiphy->bands[IEEE80211_BAND_5GHZ]->channels[j].center_freq == 5240) && - ((ccode[0]== 'U'&& ccode[1]=='S') && pHddCtx->nEnableStrictRegulatoryForFCC)) + ((domainIdCurrent == REGDOMAIN_FCC) && + pHddCtx->nEnableStrictRegulatoryForFCC)) { wiphy->bands[IEEE80211_BAND_5GHZ]->channels[j].flags |= IEEE80211_CHAN_PASSIVE_SCAN; } @@ -4022,7 +4023,8 @@ int wlan_hdd_crda_reg_notifier(struct wiphy *wiphy, wiphy->bands[IEEE80211_BAND_5GHZ]->channels[j].center_freq == 5200 || wiphy->bands[IEEE80211_BAND_5GHZ]->channels[j].center_freq == 5220 || wiphy->bands[IEEE80211_BAND_5GHZ]->channels[j].center_freq == 5240) && - ((ccode[0]!= 'U'&& ccode[1]!='S') || !pHddCtx->nEnableStrictRegulatoryForFCC)) + ((domainIdCurrent != REGDOMAIN_FCC) || + !pHddCtx->nEnableStrictRegulatoryForFCC)) { wiphy->bands[IEEE80211_BAND_5GHZ]->channels[j].flags &= ~IEEE80211_CHAN_PASSIVE_SCAN; } |