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

Commit 001e39a8 authored by Eliad Peller's avatar Eliad Peller Committed by Luciano Coelho
Browse files

wlcore: use dynamic keep-alive template ids 



Currently, all the (station) roles use the same
keep-alive template id (0). However, the klv
template ids shouldn't be shared by different
roles.

Implement a simple klv_templates bitmap, and let
each role allocate its own klv template id on
role initialization.

[Arik - remove invalidation of KLV template when getting into "idle".
This is already handled in unjoin]

Signed-off-by: default avatarEliad Peller <eliad@wizery.com>
Signed-off-by: default avatarArik Nemtsov <arik@wizery.com>
Signed-off-by: default avatarLuciano Coelho <luca@coelho.fi>
parent 4137c17c

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

+1 −1
Original line number Diff line number Diff line
@@ -993,7 +993,7 @@ int wl12xx_cmd_build_klv_null_data(struct wl1271 *wl, 


	ret = wl1271_cmd_template_set(wl, wlvif->role_id, CMD_TEMPL_KLV,

				      skb->data, skb->len,

				      CMD_TEMPL_KLV_IDX_NULL_DATA,

				      wlvif->sta.klv_template_id,

				      wlvif->basic_rate);



out:

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

+0 −5
Original line number Diff line number Diff line
@@ -157,11 +157,6 @@ enum wl1271_commands { 


#define MAX_CMD_PARAMS 572



enum {

	CMD_TEMPL_KLV_IDX_NULL_DATA = 0,

	CMD_TEMPL_KLV_IDX_MAX = 4

};



enum cmd_templ {

	CMD_TEMPL_NULL_DATA = 0,

	CMD_TEMPL_BEACON,

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

+2 −10
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ int wl1271_init_templates_config(struct wl1271 *wl) 
	if (ret < 0)

		return ret;



	for (i = 0; i < CMD_TEMPL_KLV_IDX_MAX; i++) {

	for (i = 0; i < WLCORE_MAX_KLV_TEMPLATES; i++) {

		ret = wl1271_cmd_template_set(wl, WL12XX_INVALID_ROLE_ID,

					      CMD_TEMPL_KLV, NULL,

					      sizeof(struct ieee80211_qos_hdr),
@@ -371,15 +371,7 @@ static int wl1271_sta_hw_init_post_mem(struct wl1271 *wl, 
				       struct ieee80211_vif *vif)

{

	struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);

	int ret, i;



	/* disable all keep-alive templates */

	for (i = 0; i < CMD_TEMPL_KLV_IDX_MAX; i++) {

		ret = wl1271_acx_keep_alive_config(wl, wlvif, i,

						   ACX_KEEP_ALIVE_TPL_INVALID);

		if (ret < 0)

			return ret;

	}

	int ret;



	/* disable the keep-alive feature */

	ret = wl1271_acx_keep_alive_mode(wl, wlvif, false);

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

+25 −7
Original line number Diff line number Diff line
@@ -1965,6 +1965,27 @@ static void wl12xx_free_rate_policy(struct wl1271 *wl, u8 *idx) 
	*idx = WL12XX_MAX_RATE_POLICIES;

}



static int wlcore_allocate_klv_template(struct wl1271 *wl, u8 *idx)

{

	u8 policy = find_first_zero_bit(wl->klv_templates_map,

					WLCORE_MAX_KLV_TEMPLATES);

	if (policy >= WLCORE_MAX_KLV_TEMPLATES)

		return -EBUSY;



	__set_bit(policy, wl->klv_templates_map);

	*idx = policy;

	return 0;

}



static void wlcore_free_klv_template(struct wl1271 *wl, u8 *idx)

{

	if (WARN_ON(*idx >= WLCORE_MAX_KLV_TEMPLATES))

		return;



	__clear_bit(*idx, wl->klv_templates_map);

	*idx = WLCORE_MAX_KLV_TEMPLATES;

}



static u8 wl12xx_get_role_type(struct wl1271 *wl, struct wl12xx_vif *wlvif)

{

	switch (wlvif->bss_type) {
@@ -2029,6 +2050,7 @@ static int wl12xx_init_vif_data(struct wl1271 *wl, struct ieee80211_vif *vif) 
		wl12xx_allocate_rate_policy(wl, &wlvif->sta.basic_rate_idx);

		wl12xx_allocate_rate_policy(wl, &wlvif->sta.ap_rate_idx);

		wl12xx_allocate_rate_policy(wl, &wlvif->sta.p2p_rate_idx);

		wlcore_allocate_klv_template(wl, &wlvif->sta.klv_template_id);

		wlvif->basic_rate_set = CONF_TX_RATE_MASK_BASIC;

		wlvif->basic_rate = CONF_TX_RATE_MASK_BASIC;

		wlvif->rate_set = CONF_TX_RATE_MASK_BASIC;
@@ -2360,6 +2382,7 @@ static void __wl1271_op_remove_interface(struct wl1271 *wl, 
		wl12xx_free_rate_policy(wl, &wlvif->sta.basic_rate_idx);

		wl12xx_free_rate_policy(wl, &wlvif->sta.ap_rate_idx);

		wl12xx_free_rate_policy(wl, &wlvif->sta.p2p_rate_idx);

		wlcore_free_klv_template(wl, &wlvif->sta.klv_template_id);

	} else {

		wlvif->ap.bcast_hlid = WL12XX_INVALID_LINK_ID;

		wlvif->ap.global_hlid = WL12XX_INVALID_LINK_ID;
@@ -2524,7 +2547,7 @@ static int wl1271_join(struct wl1271 *wl, struct wl12xx_vif *wlvif, 
		goto out;



	ret = wl1271_acx_keep_alive_config(wl, wlvif,

					   CMD_TEMPL_KLV_IDX_NULL_DATA,

					   wlvif->sta.klv_template_id,

					   ACX_KEEP_ALIVE_TPL_VALID);

	if (ret < 0)

		goto out;
@@ -2546,7 +2569,7 @@ static int wl1271_unjoin(struct wl1271 *wl, struct wl12xx_vif *wlvif) 


	/* invalidate keep-alive template */

	wl1271_acx_keep_alive_config(wl, wlvif,

				     CMD_TEMPL_KLV_IDX_NULL_DATA,

				     wlvif->sta.klv_template_id,

				     ACX_KEEP_ALIVE_TPL_INVALID);



	/* to stop listening to a channel, we disconnect */
@@ -2587,11 +2610,6 @@ static int wl1271_sta_handle_idle(struct wl1271 *wl, struct wl12xx_vif *wlvif, 
		wlvif->rate_set =

			wl1271_tx_min_rate_get(wl, wlvif->basic_rate_set);

		ret = wl1271_acx_sta_rate_policies(wl, wlvif);

		if (ret < 0)

			goto out;

		ret = wl1271_acx_keep_alive_config(

			wl, wlvif, CMD_TEMPL_KLV_IDX_NULL_DATA,

			ACX_KEEP_ALIVE_TPL_INVALID);

		if (ret < 0)

			goto out;

		clear_bit(WLVIF_FLAG_IN_USE, &wlvif->flags);

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

+2 −0
Original line number Diff line number Diff line
@@ -196,6 +196,8 @@ struct wl1271 { 
	unsigned long roc_map[BITS_TO_LONGS(WL12XX_MAX_ROLES)];

	unsigned long rate_policies_map[

			BITS_TO_LONGS(WL12XX_MAX_RATE_POLICIES)];

	unsigned long klv_templates_map[

			BITS_TO_LONGS(WLCORE_MAX_KLV_TEMPLATES)];



	struct list_head wlvif_list;