|
@@ -112,9 +112,10 @@ uint32_t cds_get_vendor_reg_flags(struct wlan_objmgr_pdev *pdev,
|
|
|
else
|
|
|
sec_freq = 0;
|
|
|
|
|
|
- if (wlan_reg_get_bonded_channel_state_for_freq(pdev, freq,
|
|
|
- bandwidth,
|
|
|
- sec_freq) !=
|
|
|
+ if (wlan_reg_get_bonded_channel_state_for_pwrmode(
|
|
|
+ pdev, freq,
|
|
|
+ bandwidth, sec_freq,
|
|
|
+ REG_CURRENT_PWR_MODE) !=
|
|
|
CHANNEL_STATE_INVALID) {
|
|
|
if (ch_params.sec_ch_offset == LOW_PRIMARY_CH) {
|
|
|
flags |= IEEE80211_CHAN_HT40PLUS;
|
|
@@ -137,18 +138,20 @@ uint32_t cds_get_vendor_reg_flags(struct wlan_objmgr_pdev *pdev,
|
|
|
bandwidth = CH_WIDTH_10MHZ;
|
|
|
fallthrough;
|
|
|
case CH_WIDTH_10MHZ:
|
|
|
- if (wlan_reg_get_bonded_channel_state_for_freq(pdev, freq,
|
|
|
- bandwidth,
|
|
|
- 0) !=
|
|
|
+ if (wlan_reg_get_bonded_channel_state_for_pwrmode(
|
|
|
+ pdev, freq,
|
|
|
+ bandwidth, 0,
|
|
|
+ REG_CURRENT_PWR_MODE) !=
|
|
|
CHANNEL_STATE_INVALID &&
|
|
|
sub_20_channel_width == WLAN_SUB_20_CH_WIDTH_10)
|
|
|
flags |= IEEE80211_CHAN_HALF;
|
|
|
bandwidth = CH_WIDTH_5MHZ;
|
|
|
fallthrough;
|
|
|
case CH_WIDTH_5MHZ:
|
|
|
- if (wlan_reg_get_bonded_channel_state_for_freq(pdev, freq,
|
|
|
- bandwidth,
|
|
|
- 0) !=
|
|
|
+ if (wlan_reg_get_bonded_channel_state_for_pwrmode(
|
|
|
+ pdev, freq,
|
|
|
+ bandwidth, 0,
|
|
|
+ REG_CURRENT_PWR_MODE) !=
|
|
|
CHANNEL_STATE_INVALID &&
|
|
|
sub_20_channel_width == WLAN_SUB_20_CH_WIDTH_5)
|
|
|
flags |= IEEE80211_CHAN_QUARTER;
|