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

Commit fa7930af authored by Arik Nemtsov's avatar Arik Nemtsov Committed by Luciano Coelho
Browse files

wlcore/wl12xx: add hw op to get rate-mask for AP-link in STA mode 



In some chip-families, there are operating modes where we must mask-out
certain Tx rates, and/or tweak the rate-mask with special HW-specific
bits.

Signed-off-by: default avatarArik Nemtsov <arik@wizery.com>
Signed-off-by: default avatarLuciano Coelho <coelho@ti.com>
parent 5453dc10

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

+7 −0
Original line number Original line Diff line number Diff line
@@ -1192,6 +1192,12 @@ out: 
	return ret;

	return ret;

}

}





static u32 wl12xx_sta_get_ap_rate_mask(struct wl1271 *wl,

				       struct wl12xx_vif *wlvif)

{

	return wlvif->rate_set;

}



static void wl12xx_conf_init(struct wl1271 *wl)

static void wl12xx_conf_init(struct wl1271 *wl)

{

{

	struct wl12xx_priv *priv = wl->priv;

	struct wl12xx_priv *priv = wl->priv;
@@ -1280,6 +1286,7 @@ static struct wlcore_ops wl12xx_ops = { 
	.tx_delayed_compl	= wl12xx_tx_delayed_compl,

	.tx_delayed_compl	= wl12xx_tx_delayed_compl,

	.hw_init		= wl12xx_hw_init,

	.hw_init		= wl12xx_hw_init,

	.init_vif		= NULL,

	.init_vif		= NULL,

	.sta_get_ap_rate_mask	= wl12xx_sta_get_ap_rate_mask,

	.get_pg_ver		= wl12xx_get_pg_ver,

	.get_pg_ver		= wl12xx_get_pg_ver,

	.get_mac		= wl12xx_get_mac,

	.get_mac		= wl12xx_get_mac,

};

};

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

+5 −1
Original line number Original line Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include "debug.h"

#include "debug.h"

#include "wl12xx_80211.h"

#include "wl12xx_80211.h"

#include "ps.h"

#include "ps.h"

#include "hw_ops.h"





int wl1271_acx_wake_up_conditions(struct wl1271 *wl, struct wl12xx_vif *wlvif,

int wl1271_acx_wake_up_conditions(struct wl1271 *wl, struct wl12xx_vif *wlvif,

				  u8 wake_up_event, u8 listen_interval)

				  u8 wake_up_event, u8 listen_interval)
@@ -756,7 +757,10 @@ int wl1271_acx_sta_rate_policies(struct wl1271 *wl, struct wl12xx_vif *wlvif) 




	/* configure one AP supported rate class */

	/* configure one AP supported rate class */

	acx->rate_policy_idx = cpu_to_le32(wlvif->sta.ap_rate_idx);

	acx->rate_policy_idx = cpu_to_le32(wlvif->sta.ap_rate_idx);

	acx->rate_policy.enabled_rates = cpu_to_le32(wlvif->rate_set);



	/* the AP policy is HW specific */

	acx->rate_policy.enabled_rates =

		cpu_to_le32(wlcore_hw_sta_get_ap_rate_mask(wl, wlvif));

	acx->rate_policy.short_retry_limit = c->short_retry_limit;

	acx->rate_policy.short_retry_limit = c->short_retry_limit;

	acx->rate_policy.long_retry_limit = c->long_retry_limit;

	acx->rate_policy.long_retry_limit = c->long_retry_limit;

	acx->rate_policy.aflags = c->aflags;

	acx->rate_policy.aflags = c->aflags;

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

+9 −0
Original line number Original line Diff line number Diff line
@@ -102,4 +102,13 @@ wlcore_hw_init_vif(struct wl1271 *wl, struct wl12xx_vif *wlvif) 
	return 0;

	return 0;

}

}





static inline u32

wlcore_hw_sta_get_ap_rate_mask(struct wl1271 *wl, struct wl12xx_vif *wlvif)

{

	if (!wl->ops->sta_get_ap_rate_mask)

		BUG_ON(1);



	return wl->ops->sta_get_ap_rate_mask(wl, wlvif);

}



#endif
 
#endif

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -56,6 +56,8 @@ struct wlcore_ops { 
	void (*tx_immediate_compl)(struct wl1271 *wl);

	void (*tx_immediate_compl)(struct wl1271 *wl);

	int (*hw_init)(struct wl1271 *wl);

	int (*hw_init)(struct wl1271 *wl);

	int (*init_vif)(struct wl1271 *wl, struct wl12xx_vif *wlvif);

	int (*init_vif)(struct wl1271 *wl, struct wl12xx_vif *wlvif);

	u32 (*sta_get_ap_rate_mask)(struct wl1271 *wl,

				    struct wl12xx_vif *wlvif);

	s8 (*get_pg_ver)(struct wl1271 *wl);

	s8 (*get_pg_ver)(struct wl1271 *wl);

	void (*get_mac)(struct wl1271 *wl);

	void (*get_mac)(struct wl1271 *wl);

};

};