openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

wlcore: allow using dfs channels 

Since we are going to support dfs channels, there
is no reason to mark them as NO_IR (having
the DFS flag is enough anyway).

Additionally, when setting the regdomain configuration,
enable usable dfs channels.

Signed-off-by: Eliad Peller <eliad@wizery.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
This commit is contained in:
Eliad Peller 2014-12-29 08:24:11 +02:00 committed by Kalle Valo
parent 830513abc6
commit 4ce9fad35a
2 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/net/wireless/ti/wlcore/cmd.c
View File

@ -1687,9 +1687,7 @@ int wlcore_cmd_regdomain_config_locked(struct wl1271 *wl)
{ {
struct wl12xx_cmd_regdomain_dfs_config *cmd = NULL; struct wl12xx_cmd_regdomain_dfs_config *cmd = NULL;
int ret = 0, i, b, ch_bit_idx; int ret = 0, i, b, ch_bit_idx;
struct ieee80211_channel *channel;
u32 tmp_ch_bitmap[2]; u32 tmp_ch_bitmap[2];
u16 ch;
struct wiphy *wiphy = wl->hw->wiphy; struct wiphy *wiphy = wl->hw->wiphy;
struct ieee80211_supported_band *band; struct ieee80211_supported_band *band;
bool timeout = false; bool timeout = false;
@ -1704,12 +1702,16 @@ int wlcore_cmd_regdomain_config_locked(struct wl1271 *wl)
for (b = IEEE80211_BAND_2GHZ; b <= IEEE80211_BAND_5GHZ; b++) { for (b = IEEE80211_BAND_2GHZ; b <= IEEE80211_BAND_5GHZ; b++) {
band = wiphy->bands[b]; band = wiphy->bands[b];
for (i = 0; i < band->n_channels; i++) { for (i = 0; i < band->n_channels; i++) {
channel = &band->channels[i]; struct ieee80211_channel *channel = &band->channels[i];
ch = channel->hw_value; u16 ch = channel->hw_value;
u32 flags = channel->flags;
if (channel->flags & (IEEE80211_CHAN_DISABLED | if (flags & (IEEE80211_CHAN_DISABLED |
IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IR))
IEEE80211_CHAN_NO_IR)) continue;
if ((flags & IEEE80211_CHAN_RADAR) &&
channel->dfs_state != NL80211_DFS_AVAILABLE)
continue; continue;
ch_bit_idx = wlcore_get_reg_conf_ch_idx(b, ch); ch_bit_idx = wlcore_get_reg_conf_ch_idx(b, ch);

14
drivers/net/wireless/ti/wlcore/main.c
View File

@ -79,23 +79,9 @@ static int wl12xx_set_authorized(struct wl1271 *wl, struct wl12xx_vif *wlvif)
static void wl1271_reg_notify(struct wiphy *wiphy, static void wl1271_reg_notify(struct wiphy *wiphy,
struct regulatory_request *request) struct regulatory_request *request)
{ {
struct ieee80211_supported_band *band;
struct ieee80211_channel *ch;
int i;
struct ieee80211_hw *hw = wiphy_to_ieee80211_hw(wiphy); struct ieee80211_hw *hw = wiphy_to_ieee80211_hw(wiphy);
struct wl1271 *wl = hw->priv; struct wl1271 *wl = hw->priv;
band = wiphy->bands[IEEE80211_BAND_5GHZ];
for (i = 0; i < band->n_channels; i++) {
ch = &band->channels[i];
if (ch->flags & IEEE80211_CHAN_DISABLED)
continue;
if (ch->flags & IEEE80211_CHAN_RADAR)
ch->flags |= IEEE80211_CHAN_NO_IR;
}
wlcore_regdomain_config(wl); wlcore_regdomain_config(wl);
} }