diff options
| author | Guy Mishol <guym@ti.com> | 2014-12-29 08:24:12 +0200 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2015-01-09 15:48:03 +0200 |
| commit | 1cd91b2c4d8a5ebe9ba7874fcd45ee2b9b444b04 (patch) | |
| tree | 0539f0e9f85ec39425aa7178dff5ca5376bc1296 /drivers/net/wireless/ti | |
| parent | 4ce9fad35a4ae21c393a89001b8ef33fa8c2033b (diff) | |
| download | op-kernel-dev-1cd91b2c4d8a5ebe9ba7874fcd45ee2b9b444b04.zip op-kernel-dev-1cd91b2c4d8a5ebe9ba7874fcd45ee2b9b444b04.tar.gz | |
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>
Diffstat (limited to 'drivers/net/wireless/ti')
| -rw-r--r-- | drivers/net/wireless/ti/wlcore/cmd.c | 1 | ||||
| -rw-r--r-- | drivers/net/wireless/ti/wlcore/cmd.h | 2 | ||||
| -rw-r--r-- | drivers/net/wireless/ti/wlcore/main.c | 4 | ||||
| -rw-r--r-- | drivers/net/wireless/ti/wlcore/wlcore.h | 3 |
4 files changed, 10 insertions, 0 deletions
diff --git a/drivers/net/wireless/ti/wlcore/cmd.c b/drivers/net/wireless/ti/wlcore/cmd.c index 50ca10c..c26fc21 100644 --- a/drivers/net/wireless/ti/wlcore/cmd.c +++ b/drivers/net/wireless/ti/wlcore/cmd.c @@ -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_map2 = cpu_to_le32(tmp_ch_bitmap[1]); + cmd->dfs_region = wl->dfs_region; wl1271_debug(DEBUG_CMD, "cmd reg domain bitmap1: 0x%08x, bitmap2: 0x%08x", diff --git a/drivers/net/wireless/ti/wlcore/cmd.h b/drivers/net/wireless/ti/wlcore/cmd.h index 06bdee2..e14cd40 100644 --- a/drivers/net/wireless/ti/wlcore/cmd.h +++ b/drivers/net/wireless/ti/wlcore/cmd.h @@ -648,6 +648,8 @@ struct wl12xx_cmd_regdomain_dfs_config { __le32 ch_bit_map1; __le32 ch_bit_map2; + u8 dfs_region; + u8 padding[3]; } __packed; struct wl12xx_cmd_config_fwlog { diff --git a/drivers/net/wireless/ti/wlcore/main.c b/drivers/net/wireless/ti/wlcore/main.c index a393ae8fa..e90fb78 100644 --- a/drivers/net/wireless/ti/wlcore/main.c +++ b/drivers/net/wireless/ti/wlcore/main.c @@ -82,6 +82,10 @@ static void wl1271_reg_notify(struct wiphy *wiphy, struct ieee80211_hw *hw = wiphy_to_ieee80211_hw(wiphy); struct wl1271 *wl = hw->priv; + /* copy the current dfs region */ + if (request) + wl->dfs_region = request->dfs_region; + wlcore_regdomain_config(wl); } diff --git a/drivers/net/wireless/ti/wlcore/wlcore.h b/drivers/net/wireless/ti/wlcore/wlcore.h index 581c479..d599c86 100644 --- a/drivers/net/wireless/ti/wlcore/wlcore.h +++ b/drivers/net/wireless/ti/wlcore/wlcore.h @@ -465,6 +465,9 @@ struct wl1271 { /* HW HT (11n) capabilities */ 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_t fw_status_len; size_t fw_status_priv_len; |
