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

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

wl18xx: ipmlement ap_rate_mask hw op 



Enable wide-chan or MIMO rates when appropriate.

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

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

+18 −0
Original line number Original line Diff line number Diff line
@@ -862,6 +862,23 @@ static void wl18xx_set_rx_csum(struct wl1271 *wl, 
		skb->ip_summed = CHECKSUM_UNNECESSARY;

		skb->ip_summed = CHECKSUM_UNNECESSARY;

}

}





static u32 wl18xx_sta_get_ap_rate_mask(struct wl1271 *wl,

				       struct wl12xx_vif *wlvif)

{

	u32 hw_rate_set = wlvif->rate_set;



	if (wlvif->channel_type == NL80211_CHAN_HT40MINUS ||

	    wlvif->channel_type == NL80211_CHAN_HT40PLUS) {

		wl1271_debug(DEBUG_ACX, "using wide channel rate mask");

		hw_rate_set |= CONF_TX_RATE_USE_WIDE_CHAN;



		/* we don't support MIMO in wide-channel mode */

		hw_rate_set &= ~CONF_TX_MIMO_RATES;

	}



	return hw_rate_set;

}



static void wl18xx_conf_init(struct wl1271 *wl)

static void wl18xx_conf_init(struct wl1271 *wl)

{

{

	struct wl18xx_priv *priv = wl->priv;

	struct wl18xx_priv *priv = wl->priv;
@@ -888,6 +905,7 @@ static struct wlcore_ops wl18xx_ops = { 
	.hw_init	= wl18xx_hw_init,

	.hw_init	= wl18xx_hw_init,

	.set_tx_desc_csum = wl18xx_set_tx_desc_csum,

	.set_tx_desc_csum = wl18xx_set_tx_desc_csum,

	.set_rx_csum = wl18xx_set_rx_csum,

	.set_rx_csum = wl18xx_set_rx_csum,

	.sta_get_ap_rate_mask = wl18xx_sta_get_ap_rate_mask,

};

};





int __devinit wl18xx_probe(struct platform_device *pdev)

int __devinit wl18xx_probe(struct platform_device *pdev)

drivers/net/wireless/ti/wl18xx/tx.h

+6 −0
Original line number Original line Diff line number Diff line
@@ -31,6 +31,12 @@ 
#define WL18XX_TX_STATUS_DESC_ID_MASK    0x7F

#define WL18XX_TX_STATUS_DESC_ID_MASK    0x7F

#define WL18XX_TX_STATUS_STAT_BIT_IDX    7

#define WL18XX_TX_STATUS_STAT_BIT_IDX    7





/*

 * The FW uses a special bit to indicate a wide channel should be used in

 * the rate policy.

 */

#define CONF_TX_RATE_USE_WIDE_CHAN BIT(31)



void wl18xx_tx_immediate_complete(struct wl1271 *wl);

void wl18xx_tx_immediate_complete(struct wl1271 *wl);





#endif /* __WL12XX_TX_H__ */
 
#endif /* __WL12XX_TX_H__ */

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

+6 −0
Original line number Original line Diff line number Diff line
@@ -443,6 +443,12 @@ struct conf_rx_settings { 
	CONF_HW_BIT_RATE_MCS_5 | CONF_HW_BIT_RATE_MCS_6 |        \

	CONF_HW_BIT_RATE_MCS_5 | CONF_HW_BIT_RATE_MCS_6 |        \

	CONF_HW_BIT_RATE_MCS_7)

	CONF_HW_BIT_RATE_MCS_7)





#define CONF_TX_MIMO_RATES (CONF_HW_BIT_RATE_MCS_8 |             \

	CONF_HW_BIT_RATE_MCS_9 | CONF_HW_BIT_RATE_MCS_10 |       \

	CONF_HW_BIT_RATE_MCS_11 | CONF_HW_BIT_RATE_MCS_12 |      \

	CONF_HW_BIT_RATE_MCS_13 | CONF_HW_BIT_RATE_MCS_14 |      \

	CONF_HW_BIT_RATE_MCS_15)



/*

/*

 * Default rates for management traffic when operating in AP mode. This

 * Default rates for management traffic when operating in AP mode. This

 * should be configured according to the basic rate set of the AP

 * should be configured according to the basic rate set of the AP