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

Commit fa9ffc74 authored by Kyeyoon Park's avatar Kyeyoon Park Committed by Johannes Berg
Browse files

cfg80211: Add support for QoS mapping 



This allows QoS mapping from external networks to be implemented as
defined in IEEE Std 802.11-2012, 10.24.9. APs can use this to advertise
DSCP ranges and exceptions for mapping frames to a specific UP over
Wi-Fi.

The payload of the QoS Map Set element (IEEE Std 802.11-2012, 8.4.2.97)
is sent to the driver through the new NL80211_ATTR_QOS_MAP attribute to
configure the local behavior either on the AP (based on local
configuration) or on a station (based on information received from the
AP).

Signed-off-by: default avatarKyeyoon Park <kyeyoonp@qca.qualcomm.com>
Signed-off-by: default avatarJouni Malinen <jouni@qca.qualcomm.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 567ffc35

drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c

+1 −1
Original line number Diff line number Diff line
@@ -1873,7 +1873,7 @@ int brcmf_fws_process_skb(struct brcmf_if *ifp, struct sk_buff *skb) 
	brcmf_dbg(DATA, "tx proto=0x%X\n", ntohs(eh->h_proto));

	/* determine the priority */

	if (!skb->priority)

		skb->priority = cfg80211_classify8021d(skb);

		skb->priority = cfg80211_classify8021d(skb, NULL);



	drvr->tx_multicast += !!multicast;

	if (pae)

drivers/net/wireless/mwifiex/main.c

+1 −1
Original line number Diff line number Diff line
@@ -749,7 +749,7 @@ static struct net_device_stats *mwifiex_get_stats(struct net_device *dev) 
static u16

mwifiex_netdev_select_wmm_queue(struct net_device *dev, struct sk_buff *skb)

{

	skb->priority = cfg80211_classify8021d(skb);

	skb->priority = cfg80211_classify8021d(skb, NULL);

	return mwifiex_1d_to_wmm_queue[skb->priority];

}

include/net/cfg80211.h

+52 −1
Original line number Diff line number Diff line
@@ -1971,6 +1971,50 @@ struct cfg80211_mgmt_tx_params { 
	bool dont_wait_for_ack;

};



/**

 * struct cfg80211_dscp_exception - DSCP exception

 *

 * @dscp: DSCP value that does not adhere to the user priority range definition

 * @up: user priority value to which the corresponding DSCP value belongs

 */

struct cfg80211_dscp_exception {

	u8 dscp;

	u8 up;

};



/**

 * struct cfg80211_dscp_range - DSCP range definition for user priority

 *

 * @low: lowest DSCP value of this user priority range, inclusive

 * @high: highest DSCP value of this user priority range, inclusive

 */

struct cfg80211_dscp_range {

	u8 low;

	u8 high;

};



/* QoS Map Set element length defined in IEEE Std 802.11-2012, 8.4.2.97 */

#define IEEE80211_QOS_MAP_MAX_EX	21

#define IEEE80211_QOS_MAP_LEN_MIN	16

#define IEEE80211_QOS_MAP_LEN_MAX \

	(IEEE80211_QOS_MAP_LEN_MIN + 2 * IEEE80211_QOS_MAP_MAX_EX)



/**

 * struct cfg80211_qos_map - QoS Map Information

 *

 * This struct defines the Interworking QoS map setting for DSCP values

 *

 * @num_des: number of DSCP exceptions (0..21)

 * @dscp_exception: optionally up to maximum of 21 DSCP exceptions from

 *	the user priority DSCP range definition

 * @up: DSCP range definition for a particular user priority

 */

struct cfg80211_qos_map {

	u8 num_des;

	struct cfg80211_dscp_exception dscp_exception[IEEE80211_QOS_MAP_MAX_EX];

	struct cfg80211_dscp_range up[8];

};



/**

 * struct cfg80211_ops - backend description for wireless configuration

 *
@@ -2213,6 +2257,8 @@ struct cfg80211_mgmt_tx_params { 
 * @set_coalesce: Set coalesce parameters.

 *

 * @channel_switch: initiate channel-switch procedure (with CSA)

 *

 * @set_qos_map: Set QoS mapping information to the driver

 */

struct cfg80211_ops {

	int	(*suspend)(struct wiphy *wiphy, struct cfg80211_wowlan *wow);
@@ -2454,6 +2500,9 @@ struct cfg80211_ops { 
	int	(*channel_switch)(struct wiphy *wiphy,

				  struct net_device *dev,

				  struct cfg80211_csa_settings *params);

	int     (*set_qos_map)(struct wiphy *wiphy,

			       struct net_device *dev,

			       struct cfg80211_qos_map *qos_map);

};



/*
@@ -3432,9 +3481,11 @@ void ieee80211_amsdu_to_8023s(struct sk_buff *skb, struct sk_buff_head *list, 
/**

 * cfg80211_classify8021d - determine the 802.1p/1d tag for a data frame

 * @skb: the data frame

 * @qos_map: Interworking QoS mapping or %NULL if not in use

 * Return: The 802.1p/1d tag.

 */

unsigned int cfg80211_classify8021d(struct sk_buff *skb);

unsigned int cfg80211_classify8021d(struct sk_buff *skb,

				    struct cfg80211_qos_map *qos_map);



/**

 * cfg80211_find_ie - find information element in data

include/uapi/linux/nl80211.h

+14 −0
Original line number Diff line number Diff line
@@ -702,6 +702,12 @@ 
 *	(&struct nl80211_vendor_cmd_info) of the supported vendor commands.

 *	This may also be sent as an event with the same attributes.

 *

 * @NL80211_CMD_SET_QOS_MAP: Set Interworking QoS mapping for IP DSCP values.

 *	The QoS mapping information is included in %NL80211_ATTR_QOS_MAP. If

 *	that attribute is not included, QoS mapping is disabled. Since this

 *	QoS mapping is relevant for IP packets, it is only valid during an

 *	association. This is cleared on disassociation and AP restart.

 *

 * @NL80211_CMD_MAX: highest used command number

 * @__NL80211_CMD_AFTER_LAST: internal use

 */
@@ -871,6 +877,8 @@ enum nl80211_commands { 


	NL80211_CMD_VENDOR,



	NL80211_CMD_SET_QOS_MAP,



	/* add new commands above here */



	/* used to define NL80211_CMD_MAX below */
@@ -1543,6 +1551,10 @@ enum nl80211_commands { 
 * @NL80211_ATTR_VENDOR_EVENTS: used for event list advertising in the wiphy

 *	info, containing a nested array of possible events

 *

 * @NL80211_ATTR_QOS_MAP: IP DSCP mapping for Interworking QoS mapping. This

 *	data is in the format defined for the payload of the QoS Map Set element

 *	in IEEE Std 802.11-2012, 8.4.2.97.

 *

 * @NL80211_ATTR_MAX: highest attribute number currently defined

 * @__NL80211_ATTR_AFTER_LAST: internal use

 */
@@ -1869,6 +1881,8 @@ enum nl80211_attrs { 
	NL80211_ATTR_VENDOR_DATA,

	NL80211_ATTR_VENDOR_EVENTS,



	NL80211_ATTR_QOS_MAP,



	/* add attributes here, update the policy in nl80211.c */



	__NL80211_ATTR_AFTER_LAST,

net/mac80211/wme.c

+1 −1
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ u16 ieee80211_select_queue(struct ieee80211_sub_if_data *sdata, 


	/* use the data classifier to determine what 802.1d tag the

	 * data frame has */

	skb->priority = cfg80211_classify8021d(skb);

	skb->priority = cfg80211_classify8021d(skb, NULL);



	return ieee80211_downgrade_queue(sdata, skb);

}