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

Commit 61f845f4 authored by Eliad Peller's avatar Eliad Peller Committed by Luciano Coelho
Browse files

wl12xx: add channel field to wlvif 



add channel into the per-interface data.

mac80211 configures some values (e.g. band, channel)
globally, while we configure them per-interface.

In order to make it easier to keep track of the
configured value for each value while keeping sync
with mac80211, save these values both globally
and per-vif.

Signed-off-by: default avatarEliad Peller <eliad@wizery.com>
Signed-off-by: default avatarLuciano Coelho <coelho@ti.com>
parent 1b92f15e

drivers/net/wireless/wl12xx/cmd.c

+6 −6
Original line number Diff line number Diff line
@@ -483,7 +483,7 @@ int wl12xx_cmd_role_start_dev(struct wl1271 *wl, struct wl12xx_vif *wlvif) 
	cmd->role_id = wlvif->dev_role_id;

	if (wlvif->band == IEEE80211_BAND_5GHZ)

		cmd->band = WL12XX_BAND_5GHZ;

	cmd->channel = wl->channel;

	cmd->channel = wlvif->channel;



	if (wlvif->dev_hlid == WL12XX_INVALID_LINK_ID) {

		ret = wl12xx_allocate_link(wl, wlvif, &wlvif->dev_hlid);
@@ -573,7 +573,7 @@ int wl12xx_cmd_role_start_sta(struct wl1271 *wl, struct wl12xx_vif *wlvif) 
	cmd->role_id = wlvif->role_id;

	if (wlvif->band == IEEE80211_BAND_5GHZ)

		cmd->band = WL12XX_BAND_5GHZ;

	cmd->channel = wl->channel;

	cmd->channel = wlvif->channel;

	cmd->sta.basic_rate_set = cpu_to_le32(wlvif->basic_rate_set);

	cmd->sta.beacon_interval = cpu_to_le16(wlvif->beacon_int);

	cmd->sta.ssid_type = WL12XX_SSID_TYPE_ANY;
@@ -689,7 +689,7 @@ int wl12xx_cmd_role_start_ap(struct wl1271 *wl, struct wl12xx_vif *wlvif) 
	cmd->ap.beacon_interval = cpu_to_le16(wlvif->beacon_int);

	cmd->ap.dtim_interval = bss_conf->dtim_period;

	cmd->ap.beacon_expiry = WL1271_AP_DEF_BEACON_EXP;

	cmd->channel = wl->channel;

	cmd->channel = wlvif->channel;



	if (!bss_conf->hidden_ssid) {

		/* take the SSID from the beacon for backward compatibility */
@@ -787,7 +787,7 @@ int wl12xx_cmd_role_start_ibss(struct wl1271 *wl, struct wl12xx_vif *wlvif) 
	cmd->role_id = wlvif->role_id;

	if (wlvif->band == IEEE80211_BAND_5GHZ)

		cmd->band = WL12XX_BAND_5GHZ;

	cmd->channel = wl->channel;

	cmd->channel = wlvif->channel;

	cmd->ibss.basic_rate_set = cpu_to_le32(wlvif->basic_rate_set);

	cmd->ibss.beacon_interval = cpu_to_le16(wlvif->beacon_int);

	cmd->ibss.dtim_interval = bss_conf->dtim_period;
@@ -1608,7 +1608,7 @@ static int wl12xx_cmd_roc(struct wl1271 *wl, struct wl12xx_vif *wlvif, 
	struct wl12xx_cmd_roc *cmd;

	int ret = 0;



	wl1271_debug(DEBUG_CMD, "cmd roc %d (%d)", wl->channel, role_id);

	wl1271_debug(DEBUG_CMD, "cmd roc %d (%d)", wlvif->channel, role_id);



	if (WARN_ON(role_id == WL12XX_INVALID_ROLE_ID))

		return -EINVAL;
@@ -1620,7 +1620,7 @@ static int wl12xx_cmd_roc(struct wl1271 *wl, struct wl12xx_vif *wlvif, 
	}



	cmd->role_id = role_id;

	cmd->channel = wl->channel;

	cmd->channel = wlvif->channel;

	switch (wlvif->band) {

	case IEEE80211_BAND_2GHZ:

		cmd->band = RADIO_BAND_2_4GHZ;

drivers/net/wireless/wl12xx/main.c

+4 −2
Original line number Diff line number Diff line
@@ -1973,6 +1973,7 @@ static int wl12xx_init_vif_data(struct wl1271 *wl, struct ieee80211_vif *vif) 
	 * per-interface. thus, on init, we have to copy them from wl

	 */

	wlvif->band = wl->band;

	wlvif->channel = wl->channel;



	INIT_WORK(&wlvif->rx_streaming_enable_work,

		  wl1271_rx_streaming_enable_work);
@@ -2458,12 +2459,13 @@ static int wl1271_op_config(struct ieee80211_hw *hw, u32 changed) 
	/* if the channel changes while joined, join again */

	if (changed & IEEE80211_CONF_CHANGE_CHANNEL &&

	    ((wlvif->band != conf->channel->band) ||

	     (wl->channel != channel))) {

	     (wlvif->channel != channel))) {

		/* send all pending packets */

		wl1271_tx_work_locked(wl);

		wl->band = conf->channel->band;

		wlvif->band = conf->channel->band;

		wl->channel = channel;

		wlvif->band = conf->channel->band;

		wlvif->channel = channel;



		if (!is_ap) {

			/*

drivers/net/wireless/wl12xx/wl12xx.h

+1 −0
Original line number Diff line number Diff line
@@ -593,6 +593,7 @@ struct wl12xx_vif { 


	/* The current band */

	enum ieee80211_band band;

	int channel;



	u32 bitrate_masks[IEEE80211_NUM_BANDS];

	u32 basic_rate_set;