Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1cd91b2c authored by Guy Mishol's avatar Guy Mishol Committed by Kalle Valo
Browse files

wlcore: add dfs region to reg domain update cmd 



Add dfs region to the reg domain channel update command.

Signed-off-by: default avatarGuy Mishol <guym@ti.com>
Signed-off-by: default avatarEliad Peller <eliad@wizery.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 4ce9fad3

drivers/net/wireless/ti/wlcore/cmd.c

+1 −0
Original line number Diff line number Diff line
@@ -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",

drivers/net/wireless/ti/wlcore/cmd.h

+2 −0
Original line number Diff line number Diff line
@@ -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 {

drivers/net/wireless/ti/wlcore/main.c

+4 −0
Original line number Diff line number Diff line
@@ -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);

}

drivers/net/wireless/ti/wlcore/wlcore.h

+3 −0
Original line number Diff line number Diff line
@@ -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;