diff options
| author | Jouni Malinen <j@w1.fi> | 2013-12-19 09:34:00 -0800 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2014-06-12 14:07:59 -0700 |
| commit | 3e3b81fe1013768dc989a6ed719be63b3998851d (patch) | |
| tree | 4d73ba4c0e01ebf8fda2eafc44eb42ad15af2b7b | |
| parent | 5fbb9829510d867f2bd84feefb373e16724c6795 (diff) | |
| download | android_external_wpa_supplicant_8-3e3b81fe1013768dc989a6ed719be63b3998851d.tar.gz android_external_wpa_supplicant_8-3e3b81fe1013768dc989a6ed719be63b3998851d.tar.bz2 android_external_wpa_supplicant_8-3e3b81fe1013768dc989a6ed719be63b3998851d.zip | |
nl80211: Sync with mac80211-next.git
Signed-hostap: Jouni Malinen <j@w1.fi>
Git-commit: 74ddd64b26355cb45cd5e2c38266f3ac7f83c97f
Git-repo : git://w1.fi/srv/git/hostap.git
Change-Id: Id9e063163b7abbb3a1da5964afc4698f71f89a8f
CRs-Fixed: 598923
| -rw-r--r-- | src/drivers/nl80211_copy.h | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/src/drivers/nl80211_copy.h b/src/drivers/nl80211_copy.h index 1b23297d..2f9d568b 100644 --- a/src/drivers/nl80211_copy.h +++ b/src/drivers/nl80211_copy.h @@ -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 */ @@ -1540,6 +1548,12 @@ enum nl80211_commands { * @NL80211_ATTR_VENDOR_SUBCMD: vendor sub-command * @NL80211_ATTR_VENDOR_DATA: data for the vendor command, if any; this * attribute is also used for vendor command feature advertisement + * @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 @@ -1865,6 +1879,9 @@ enum nl80211_attrs { NL80211_ATTR_VENDOR_ID, NL80211_ATTR_VENDOR_SUBCMD, NL80211_ATTR_VENDOR_DATA, + NL80211_ATTR_VENDOR_EVENTS, + + NL80211_ATTR_QOS_MAP, /* add attributes here, update the policy in nl80211.c */ |