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

Commit 1ec23f7f authored by Eliad Peller's avatar Eliad Peller Committed by Luciano Coelho
Browse files

wl12xx: declare support for WIPHY_FLAG_AP_UAPSD 



Declare support for uapsd when working as AP, and
set psd_type and sp_len whan a station is being added.

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

drivers/net/wireless/wl12xx/cmd.c

+10 −5
Original line number Diff line number Diff line
@@ -1413,7 +1413,7 @@ int wl12xx_cmd_set_peer_state(struct wl1271 *wl, u8 hlid) 
int wl12xx_cmd_add_peer(struct wl1271 *wl, struct ieee80211_sta *sta, u8 hlid)

{

	struct wl12xx_cmd_add_peer *cmd;

	int ret;

	int i, ret;

	u32 sta_rates;



	wl1271_debug(DEBUG_CMD, "cmd add peer %d", (int)hlid);
@@ -1424,15 +1424,19 @@ int wl12xx_cmd_add_peer(struct wl1271 *wl, struct ieee80211_sta *sta, u8 hlid) 
		goto out;

	}



	/* currently we don't support UAPSD */

	cmd->sp_len = 0;



	memcpy(cmd->addr, sta->addr, ETH_ALEN);

	cmd->bss_index = WL1271_AP_BSS_INDEX;

	cmd->aid = sta->aid;

	cmd->hlid = hlid;

	cmd->sp_len = sta->max_sp;

	cmd->wmm = sta->wme ? 1 : 0;



	for (i = 0; i < NUM_ACCESS_CATEGORIES_COPY; i++)

		if (sta->wme && (sta->uapsd_queues & BIT(i)))

			cmd->psd_type[i] = WL1271_PSD_UPSD_TRIGGER;

		else

			cmd->psd_type[i] = WL1271_PSD_LEGACY;



	sta_rates = sta->supp_rates[wl->band];

	if (sta->ht_cap.ht_supported)

		sta_rates |= sta->ht_cap.mcs.rx_mask[0] << HW_HT_RATES_OFFSET;
@@ -1440,7 +1444,8 @@ int wl12xx_cmd_add_peer(struct wl1271 *wl, struct ieee80211_sta *sta, u8 hlid) 
	cmd->supported_rates =

		cpu_to_le32(wl1271_tx_enabled_rates_get(wl, sta_rates));



	wl1271_debug(DEBUG_CMD, "new peer rates: 0x%x", cmd->supported_rates);

	wl1271_debug(DEBUG_CMD, "new peer rates=0x%x queues=0x%x",

		     cmd->supported_rates, sta->uapsd_queues);



	ret = wl1271_cmd_send(wl, CMD_ADD_PEER, cmd, sizeof(*cmd), 0);

	if (ret < 0) {

drivers/net/wireless/wl12xx/cmd.h

+7 −0
Original line number Diff line number Diff line
@@ -591,6 +591,13 @@ enum wl12xx_ssid_type { 
	WL12XX_SSID_TYPE_ANY = 2,

};



enum wl1271_psd_type {

	WL1271_PSD_LEGACY = 0,

	WL1271_PSD_UPSD_TRIGGER = 1,

	WL1271_PSD_LEGACY_PSPOLL = 2,

	WL1271_PSD_SAPSD = 3

};



struct wl12xx_cmd_add_peer {

	struct wl1271_cmd_header header;

drivers/net/wireless/wl12xx/main.c

+2 −0
Original line number Diff line number Diff line
@@ -4512,6 +4512,8 @@ int wl1271_init_ieee80211(struct wl1271 *wl) 
	wl->hw->wiphy->max_scan_ie_len = WL1271_CMD_TEMPL_DFLT_SIZE -

			sizeof(struct ieee80211_header);



	wl->hw->wiphy->flags |= WIPHY_FLAG_AP_UAPSD;



	/* make sure all our channels fit in the scanned_ch bitmask */

	BUILD_BUG_ON(ARRAY_SIZE(wl1271_channels) +

		     ARRAY_SIZE(wl1271_channels_5ghz) >