Commit 04b7dcf9 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

wireless: unify QoS control field definitions 



Move all that mac80211 has into the generic
ieee80211.h header file and use them. At the
same time move them from mask+shift to just
bits and rename them for consistent names.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent e913d468

drivers/net/wireless/ath/carl9170/rx.c

+1 −1
Original line number Diff line number Diff line
@@ -472,7 +472,7 @@ static struct sk_buff *carl9170_rx_copy_data(u8 *buf, int len) 
		u8 *qc = ieee80211_get_qos_ctl(hdr);

		reserved += NET_IP_ALIGN;



		if (*qc & IEEE80211_QOS_CONTROL_A_MSDU_PRESENT)

		if (*qc & IEEE80211_QOS_CTL_A_MSDU_PRESENT)

			reserved += NET_IP_ALIGN;

	}

drivers/net/wireless/libertas_tf/main.c

+1 −1
Original line number Diff line number Diff line
@@ -585,7 +585,7 @@ int lbtf_rx(struct lbtf_private *priv, struct sk_buff *skb) 
	need_padding ^= ieee80211_has_a4(hdr->frame_control);

	need_padding ^= ieee80211_is_data_qos(hdr->frame_control) &&

			(*ieee80211_get_qos_ctl(hdr) &

			 IEEE80211_QOS_CONTROL_A_MSDU_PRESENT);

			 IEEE80211_QOS_CTL_A_MSDU_PRESENT);



	if (need_padding) {

		memmove(skb->data + 2, skb->data, skb->len);

include/linux/ieee80211.h

+13 −5
Original line number Diff line number Diff line
@@ -117,8 +117,19 @@ 
#define IEEE80211_MAX_MESH_ID_LEN	32



#define IEEE80211_QOS_CTL_LEN		2

#define IEEE80211_QOS_CTL_TID_MASK	0x000F

/* 1d tag mask */

#define IEEE80211_QOS_CTL_TAG1D_MASK		0x0007

/* TID mask */

#define IEEE80211_QOS_CTL_TID_MASK		0x000f

/* EOSP */

#define IEEE80211_QOS_CTL_EOSP			0x0010

/* ACK policy */

#define IEEE80211_QOS_CTL_ACK_POLICY_NORMAL	0x0000

#define IEEE80211_QOS_CTL_ACK_POLICY_NOACK	0x0020

#define IEEE80211_QOS_CTL_ACK_POLICY_NO_EXPL	0x0040

#define IEEE80211_QOS_CTL_ACK_POLICY_BLOCKACK	0x0060

/* A-MSDU 802.11n */

#define IEEE80211_QOS_CTL_A_MSDU_PRESENT	0x0080



/* U-APSD queue for WMM IEs sent by AP */

#define IEEE80211_WMM_IE_AP_QOSINFO_UAPSD	(1<<7)
@@ -1423,9 +1434,6 @@ enum ieee80211_sa_query_action { 
};





/* A-MSDU 802.11n */

#define IEEE80211_QOS_CONTROL_A_MSDU_PRESENT 0x0080



/* cipher suite selectors */

#define WLAN_CIPHER_SUITE_USE_GROUP	0x000FAC00

#define WLAN_CIPHER_SUITE_WEP40		0x000FAC01

net/mac80211/rx.c

+1 −1
Original line number Diff line number Diff line
@@ -338,7 +338,7 @@ static void ieee80211_parse_qos(struct ieee80211_rx_data *rx) 
		u8 *qc = ieee80211_get_qos_ctl(hdr);

		/* frame has qos control */

		tid = *qc & IEEE80211_QOS_CTL_TID_MASK;

		if (*qc & IEEE80211_QOS_CONTROL_A_MSDU_PRESENT)

		if (*qc & IEEE80211_QOS_CTL_A_MSDU_PRESENT)

			status->rx_flags |= IEEE80211_RX_AMSDU;

	} else {

		/*

net/mac80211/wme.c

+1 −2
Original line number Diff line number Diff line
@@ -151,8 +151,7 @@ void ieee80211_set_qos_hdr(struct ieee80211_local *local, struct sk_buff *skb) 
		tid = skb->priority & IEEE80211_QOS_CTL_TAG1D_MASK;



		if (unlikely(local->wifi_wme_noack_test))

			ack_policy |= QOS_CONTROL_ACK_POLICY_NOACK <<

					QOS_CONTROL_ACK_POLICY_SHIFT;

			ack_policy |= IEEE80211_QOS_CTL_ACK_POLICY_NOACK;

		/* qos header is 2 bytes, second reserved */

		*p++ = ack_policy | tid;

		*p = 0;