diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-05-17 08:53:46 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-05-17 08:53:46 -0700 |
| commit | b80d0b474e8feacbcc641c5ac4fcc9aff02361c5 (patch) | |
| tree | 19bb9fd18b710f1084bdff57f768c754388bce49 | |
| parent | 1cb4f9dc82ebe617c64100f94879e77211696564 (diff) | |
| parent | 227af8519c9600c1063bcedf88cf601c9793cc9f (diff) | |
Merge "qcacld-2.0: Fix monitor mode fail when enable 5/10M manual switch" into wlan-cld2.driver.lnx.1.0-dev
| -rw-r--r-- | CORE/HDD/src/wlan_hdd_wext.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/CORE/HDD/src/wlan_hdd_wext.c b/CORE/HDD/src/wlan_hdd_wext.c index 974dc8bc7ed0..9ab2d1335428 100644 --- a/CORE/HDD/src/wlan_hdd_wext.c +++ b/CORE/HDD/src/wlan_hdd_wext.c @@ -11329,6 +11329,8 @@ static int __iw_set_two_ints_getnone(struct net_device *dev, tHalHandle hal_hdl = hdd_ctx->hHal; tCsrBssid bssid = {0}; tCsrRoamProfile roam_profile; + uint8_t ini_sub_20_ch_width = + hdd_ctx->cfg_ini->sub_20_channel_width; hddLog(LOG1, "Set monitor mode Channel %d", value[1]); hdd_select_mon_cbmode(pAdapter, value[1], &vht_channel_width); @@ -11338,8 +11340,10 @@ static int __iw_set_two_ints_getnone(struct net_device *dev, roam_profile.ChannelInfo.numOfChannels = 1; roam_profile.vht_channel_width = ch_info->channel_width; roam_profile.phyMode = ch_info->phy_mode; - roam_profile.sub20_channelwidth = - (hdd_ctx->cfg_ini->sub_20_channel_width & 0x3); + if (ini_sub_20_ch_width < CFG_SUB_20_CHANNEL_WIDTH_DYN_5MHZ && + ini_sub_20_ch_width > CFG_SUB_20_CHANNEL_WIDTH_DYN_ALL) + roam_profile.sub20_channelwidth = + hdd_ctx->cfg_ini->sub_20_channel_width; vos_mem_copy(bssid, pAdapter->macAddressCurrent.bytes, VOS_MAC_ADDR_SIZE); |