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

Commit 16fa5e65 authored by Avinash Patil's avatar Avinash Patil Committed by John W. Linville
Browse files

mwifiex: wmm support for TDLS link 



This patch adds WMM support for TDLS link. Patch
add WMM info IE for TDLS setup request/response frames
while WMM parameter for TDLS confirm frame.

Signed-off-by: default avatarAvinash Patil <patila@marvell.com>
Signed-off-by: default avatarCathy Luo <cluo@marvell.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 2848977f

drivers/net/wireless/mwifiex/tdls.c

+55 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#define TDLS_REQ_FIX_LEN      6

#define TDLS_RESP_FIX_LEN     8

#define TDLS_CONFIRM_FIX_LEN  6

#define MWIFIEX_TDLS_WMM_INFO_SIZE 7



static void mwifiex_restore_tdls_packets(struct mwifiex_private *priv,

					 const u8 *mac, u8 status)
@@ -367,6 +368,55 @@ static void mwifiex_tdls_add_qos_capab(struct sk_buff *skb) 
	*pos++ = MWIFIEX_TDLS_DEF_QOS_CAPAB;

}



static void

mwifiex_tdls_add_wmm_param_ie(struct mwifiex_private *priv, struct sk_buff *skb)

{

	struct ieee80211_wmm_param_ie *wmm;

	u8 ac_vi[] = {0x42, 0x43, 0x5e, 0x00};

	u8 ac_vo[] = {0x62, 0x32, 0x2f, 0x00};

	u8 ac_be[] = {0x03, 0xa4, 0x00, 0x00};

	u8 ac_bk[] = {0x27, 0xa4, 0x00, 0x00};



	wmm = (void *)skb_put(skb, sizeof(*wmm));

	memset(wmm, 0, sizeof(*wmm));



	wmm->element_id = WLAN_EID_VENDOR_SPECIFIC;

	wmm->len = sizeof(*wmm) - 2;

	wmm->oui[0] = 0x00; /* Microsoft OUI 00:50:F2 */

	wmm->oui[1] = 0x50;

	wmm->oui[2] = 0xf2;

	wmm->oui_type = 2; /* WME */

	wmm->oui_subtype = 1; /* WME param */

	wmm->version = 1; /* WME ver */

	wmm->qos_info = 0; /* U-APSD not in use */



	/* use default WMM AC parameters for TDLS link*/

	memcpy(&wmm->ac[0], ac_be, sizeof(ac_be));

	memcpy(&wmm->ac[1], ac_bk, sizeof(ac_bk));

	memcpy(&wmm->ac[2], ac_vi, sizeof(ac_vi));

	memcpy(&wmm->ac[3], ac_vo, sizeof(ac_vo));

}



static void

mwifiex_add_wmm_info_ie(struct mwifiex_private *priv, struct sk_buff *skb,

			u8 qosinfo)

{

	u8 *buf;



	buf = (void *)skb_put(skb, MWIFIEX_TDLS_WMM_INFO_SIZE +

			      sizeof(struct ieee_types_header));



	*buf++ = WLAN_EID_VENDOR_SPECIFIC;

	*buf++ = 7; /* len */

	*buf++ = 0x00; /* Microsoft OUI 00:50:F2 */

	*buf++ = 0x50;

	*buf++ = 0xf2;

	*buf++ = 2; /* WME */

	*buf++ = 0; /* WME info */

	*buf++ = 1; /* WME ver */

	*buf++ = qosinfo; /* U-APSD no in use */

}



static int mwifiex_prep_tdls_encap_data(struct mwifiex_private *priv,

					const u8 *peer, u8 action_code,

					u8 dialog_token,
@@ -421,6 +471,7 @@ static int mwifiex_prep_tdls_encap_data(struct mwifiex_private *priv, 


		mwifiex_tdls_add_ext_capab(priv, skb);

		mwifiex_tdls_add_qos_capab(skb);

		mwifiex_add_wmm_info_ie(priv, skb, 0);

		break;



	case WLAN_TDLS_SETUP_RESPONSE:
@@ -458,6 +509,7 @@ static int mwifiex_prep_tdls_encap_data(struct mwifiex_private *priv, 


		mwifiex_tdls_add_ext_capab(priv, skb);

		mwifiex_tdls_add_qos_capab(skb);

		mwifiex_add_wmm_info_ie(priv, skb, 0);

		break;



	case WLAN_TDLS_SETUP_CONFIRM:
@@ -466,6 +518,8 @@ static int mwifiex_prep_tdls_encap_data(struct mwifiex_private *priv, 
		skb_put(skb, sizeof(tf->u.setup_cfm));

		tf->u.setup_cfm.status_code = cpu_to_le16(status_code);

		tf->u.setup_cfm.dialog_token = dialog_token;



		mwifiex_tdls_add_wmm_param_ie(priv, skb);

		if (priv->adapter->is_hw_11ac_capable) {

			ret = mwifiex_tdls_add_vht_oper(priv, peer, skb);

			if (ret) {
@@ -544,6 +598,7 @@ int mwifiex_send_tdls_data_frame(struct mwifiex_private *priv, const u8 *peer, 
		  sizeof(struct ieee_types_bss_co_2040) +

		  sizeof(struct ieee80211_ht_operation) +

		  sizeof(struct ieee80211_tdls_lnkie) +

		  sizeof(struct ieee80211_wmm_param_ie) +

		  extra_ies_len;



	if (priv->adapter->is_hw_11ac_capable)