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

Commit 42ec1f82 authored by Eliad Peller's avatar Eliad Peller Committed by Luciano Coelho
Browse files

wlcore: specify correct supported_rates 



The supported_rates field should contain all our supported
rates, even if the remote peer doesn't support them.

(rename CONF_TX_AP_ENABLED_RATES to CONF_TX_ENABLED_RATES,
as we now use it for both ap and sta)

Signed-off-by: default avatarEliad Peller <eliad@wizery.com>
Reviewed-by: default avatarArik Nemtsov <arik@wizery.com>
Signed-off-by: default avatarLuciano Coelho <coelho@ti.com>
parent 6c7b5194

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

+10 −2
Original line number Diff line number Diff line
@@ -441,6 +441,7 @@ int wl12xx_cmd_role_start_sta(struct wl1271 *wl, struct wl12xx_vif *wlvif) 
{

	struct ieee80211_vif *vif = wl12xx_wlvif_to_vif(wlvif);

	struct wl12xx_cmd_role_start *cmd;

	u32 supported_rates;

	int ret;



	cmd = kzalloc(sizeof(*cmd), GFP_KERNEL);
@@ -461,7 +462,14 @@ int wl12xx_cmd_role_start_sta(struct wl1271 *wl, struct wl12xx_vif *wlvif) 
	cmd->sta.ssid_len = wlvif->ssid_len;

	memcpy(cmd->sta.ssid, wlvif->ssid, wlvif->ssid_len);

	memcpy(cmd->sta.bssid, vif->bss_conf.bssid, ETH_ALEN);

	cmd->sta.local_rates = cpu_to_le32(wlvif->rate_set);



	supported_rates = CONF_TX_ENABLED_RATES | CONF_TX_MCS_RATES |

			  wlcore_hw_sta_get_ap_rate_mask(wl, wlvif);

	if (wlvif->p2p)

		supported_rates &= ~CONF_TX_CCK_RATES;



	cmd->sta.local_rates = cpu_to_le32(supported_rates);



	cmd->channel_type = wlcore_get_native_channel_type(wlvif->channel_type);



	if (wlvif->sta.hlid == WL12XX_INVALID_LINK_ID) {
@@ -601,7 +609,7 @@ int wl12xx_cmd_role_start_ap(struct wl1271 *wl, struct wl12xx_vif *wlvif) 
		memcpy(cmd->ap.ssid, bss_conf->ssid, bss_conf->ssid_len);

	}



	supported_rates = CONF_TX_AP_ENABLED_RATES | CONF_TX_MCS_RATES |

	supported_rates = CONF_TX_ENABLED_RATES | CONF_TX_MCS_RATES |

		wlcore_hw_ap_get_mimo_wide_rate_mask(wl, wlvif);



	wl1271_debug(DEBUG_CMD, "cmd role start ap with supported_rates 0x%08x",

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

+2 −2
Original line number Diff line number Diff line
@@ -415,11 +415,11 @@ struct conf_rx_settings { 
#define CONF_TX_RATE_MASK_BASIC_P2P    CONF_HW_BIT_RATE_6MBPS



/*

 * Rates supported for data packets when operating as AP. Note the absence

 * Rates supported for data packets when operating as STA/AP. Note the absence

 * of the 22Mbps rate. There is a FW limitation on 12 rates so we must drop

 * one. The rate dropped is not mandatory under any operating mode.

 */

#define CONF_TX_AP_ENABLED_RATES       (CONF_HW_BIT_RATE_1MBPS | \

#define CONF_TX_ENABLED_RATES       (CONF_HW_BIT_RATE_1MBPS |    \

	CONF_HW_BIT_RATE_2MBPS | CONF_HW_BIT_RATE_5_5MBPS |      \

	CONF_HW_BIT_RATE_6MBPS | CONF_HW_BIT_RATE_9MBPS |        \

	CONF_HW_BIT_RATE_11MBPS | CONF_HW_BIT_RATE_12MBPS |      \

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

+1 −1
Original line number Diff line number Diff line
@@ -463,7 +463,7 @@ int wl1271_init_ap_rates(struct wl1271 *wl, struct wl12xx_vif *wlvif) 
	if ((wlvif->basic_rate_set & CONF_TX_OFDM_RATES))

		supported_rates = CONF_TX_OFDM_RATES;

	else

		supported_rates = CONF_TX_AP_ENABLED_RATES;

		supported_rates = CONF_TX_ENABLED_RATES;



	/* unconditionally enable HT rates */

	supported_rates |= CONF_TX_MCS_RATES;

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

+3 −3
Original line number Diff line number Diff line
@@ -2035,15 +2035,15 @@ static int wl12xx_init_vif_data(struct wl1271 *wl, struct ieee80211_vif *vif) 
		for (i = 0; i < CONF_TX_MAX_AC_COUNT; i++)

			wl12xx_allocate_rate_policy(wl,

						&wlvif->ap.ucast_rate_idx[i]);

		wlvif->basic_rate_set = CONF_TX_AP_ENABLED_RATES;

		wlvif->basic_rate_set = CONF_TX_ENABLED_RATES;

		/*

		 * TODO: check if basic_rate shouldn't be

		 * wl1271_tx_min_rate_get(wl, wlvif->basic_rate_set);

		 * instead (the same thing for STA above).

		*/

		wlvif->basic_rate = CONF_TX_AP_ENABLED_RATES;

		wlvif->basic_rate = CONF_TX_ENABLED_RATES;

		/* TODO: this seems to be used only for STA, check it */

		wlvif->rate_set = CONF_TX_AP_ENABLED_RATES;

		wlvif->rate_set = CONF_TX_ENABLED_RATES;

	}



	wlvif->bitrate_masks[IEEE80211_BAND_2GHZ] = wl->conf.tx.basic_rate;