diff options
| -rw-r--r-- | CORE/HDD/inc/wlan_hdd_main.h | 1 | ||||
| -rw-r--r-- | CORE/HDD/src/wlan_hdd_cfg80211.c | 35 | ||||
| -rw-r--r-- | CORE/VOSS/inc/vos_nvitem.h | 5 | ||||
| -rw-r--r-- | CORE/VOSS/src/vos_nvitem.c | 5 |
4 files changed, 5 insertions, 41 deletions
diff --git a/CORE/HDD/inc/wlan_hdd_main.h b/CORE/HDD/inc/wlan_hdd_main.h index 598dd4389393..a3b03a816729 100644 --- a/CORE/HDD/inc/wlan_hdd_main.h +++ b/CORE/HDD/inc/wlan_hdd_main.h @@ -1609,7 +1609,6 @@ VOS_STATUS hdd_disable_bmps_imps(hdd_context_t *pHddCtx, tANI_U8 session_type); void wlan_hdd_cfg80211_update_wiphy_caps(struct wiphy *wiphy); VOS_STATUS hdd_setIbssPowerSaveParams(hdd_adapter_t *pAdapter); -void wlan_hdd_cfg80211_update_reg_info(struct wiphy *wiphy); VOS_STATUS wlan_hdd_restart_driver(hdd_context_t *pHddCtx); void hdd_exchange_version_and_caps(hdd_context_t *pHddCtx); void hdd_set_pwrparams(hdd_context_t *pHddCtx); diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c index 79dd633b2752..ca4ea04753df 100644 --- a/CORE/HDD/src/wlan_hdd_cfg80211.c +++ b/CORE/HDD/src/wlan_hdd_cfg80211.c @@ -5716,41 +5716,6 @@ void wlan_hdd_cfg80211_update_wiphy_caps(struct wiphy *wiphy) #endif } -/* - * In this function we are updating channel list when, - * regulatory domain is FCC and country code is US. - * Here In FCC standard 5GHz UNII-1 Bands are indoor only. - * As per FCC smart phone is not a indoor device. - * GO should not operate on indoor channels. - */ -void wlan_hdd_cfg80211_update_reg_info(struct wiphy *wiphy) -{ - int j; - hdd_context_t *pHddCtx = wiphy_priv(wiphy); - tANI_U8 defaultCountryCode[3] = SME_INVALID_COUNTRY_CODE; - /* Default country code from NV at the time of wiphy initialization. */ - if (eHAL_STATUS_SUCCESS != sme_GetDefaultCountryCodeFrmNv(pHddCtx->hHal, - &defaultCountryCode[0])) - { - hddLog(LOGE, FL("Failed to get default country code from NV")); - } - if ((defaultCountryCode[0]== 'U') && (defaultCountryCode[1]=='S')) - { - if (NULL == wiphy->bands[IEEE80211_BAND_5GHZ]) - { - hddLog(VOS_TRACE_LEVEL_ERROR,"%s: wiphy->bands[IEEE80211_BAND_5GHZ] is NULL",__func__ ); - return; - } - for (j = 0; j < wiphy->bands[IEEE80211_BAND_5GHZ]->n_channels; j++) - { - struct ieee80211_supported_band *band = wiphy->bands[IEEE80211_BAND_5GHZ]; - // Mark UNII -1 band channel as passive - if (WLAN_HDD_CHANNEL_IN_UNII_1_BAND(band->channels[j].center_freq)) - band->channels[j].flags |= IEEE80211_CHAN_PASSIVE_SCAN; - } - } -} - /* This function registers for all frame which supplicant is interested in */ void wlan_hdd_cfg80211_register_frames(hdd_adapter_t* pAdapter) { diff --git a/CORE/VOSS/inc/vos_nvitem.h b/CORE/VOSS/inc/vos_nvitem.h index bc0bbb89c581..9b33deb52799 100644 --- a/CORE/VOSS/inc/vos_nvitem.h +++ b/CORE/VOSS/inc/vos_nvitem.h @@ -51,11 +51,6 @@ #define VOS_COUNTRY_CODE_LEN 2 #define VOS_MAC_ADDRESS_LEN 6 -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) || defined(WITH_BACKPORTS) -#define IEEE80211_CHAN_PASSIVE_SCAN IEEE80211_CHAN_NO_IR -#define IEEE80211_CHAN_NO_IBSS IEEE80211_CHAN_NO_IR -#endif - /*-------------------------------------------------------------------------- Type declarations ------------------------------------------------------------------------*/ diff --git a/CORE/VOSS/src/vos_nvitem.c b/CORE/VOSS/src/vos_nvitem.c index 8537023c8bc0..7ef24691e9d3 100644 --- a/CORE/VOSS/src/vos_nvitem.c +++ b/CORE/VOSS/src/vos_nvitem.c @@ -57,6 +57,11 @@ #define IEEE80211_CHAN_NO_80MHZ 1<<7 #endif +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) +#define IEEE80211_CHAN_PASSIVE_SCAN IEEE80211_CHAN_NO_IR +#define IEEE80211_CHAN_NO_IBSS IEEE80211_CHAN_NO_IR +#endif + static v_REGDOMAIN_t cur_reg_domain = REGDOMAIN_COUNT; static char linux_reg_cc[2] = {0, 0}; static v_REGDOMAIN_t temp_reg_domain = REGDOMAIN_COUNT; |