p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

wlcore: add dfs region to reg domain update cmd 

Add dfs region to the reg domain channel update command.

Signed-off-by: Guy Mishol <guym@ti.com>
Signed-off-by: Eliad Peller <eliad@wizery.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
This commit is contained in:
Guy Mishol 2014-12-29 08:24:12 +02:00 committed by Kalle Valo
parent 4ce9fad35a
commit 1cd91b2c4d
4 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1736,6 +1736,7 @@ int wlcore_cmd_regdomain_config_locked(struct wl1271 *wl)
cmd->ch_bit_map1 = cpu_to_le32(tmp_ch_bitmap[0]); cmd->ch_bit_map1 = cpu_to_le32(tmp_ch_bitmap[0]);
cmd->ch_bit_map2 = cpu_to_le32(tmp_ch_bitmap[1]); cmd->ch_bit_map2 = cpu_to_le32(tmp_ch_bitmap[1]);
cmd->dfs_region = wl->dfs_region;
wl1271_debug(DEBUG_CMD, wl1271_debug(DEBUG_CMD,
"cmd reg domain bitmap1: 0x%08x, bitmap2: 0x%08x", "cmd reg domain bitmap1: 0x%08x, bitmap2: 0x%08x",

2
drivers/net/wireless/ti/wlcore/cmd.h
View File

@ -648,6 +648,8 @@ struct wl12xx_cmd_regdomain_dfs_config {
__le32 ch_bit_map1; __le32 ch_bit_map1;
__le32 ch_bit_map2; __le32 ch_bit_map2;
u8 dfs_region;
u8 padding[3];
} __packed; } __packed;
struct wl12xx_cmd_config_fwlog { struct wl12xx_cmd_config_fwlog {

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

@ -82,6 +82,10 @@ static void wl1271_reg_notify(struct wiphy *wiphy,
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;
/* copy the current dfs region */
if (request)
wl->dfs_region = request->dfs_region;
wlcore_regdomain_config(wl); wlcore_regdomain_config(wl);
} }

3
drivers/net/wireless/ti/wlcore/wlcore.h
View File

@ -465,6 +465,9 @@ struct wl1271 {
/* HW HT (11n) capabilities */ /* HW HT (11n) capabilities */
struct ieee80211_sta_ht_cap ht_cap[WLCORE_NUM_BANDS]; struct ieee80211_sta_ht_cap ht_cap[WLCORE_NUM_BANDS];
/* the current dfs region */
enum nl80211_dfs_regions dfs_region;
/* size of the private FW status data */ /* size of the private FW status data */
size_t fw_status_len; size_t fw_status_len;
size_t fw_status_priv_len; size_t fw_status_priv_len;