summaryrefslogtreecommitdiffstats
path: root/net/mac80211/util.c
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2014-07-22 19:49:34 +0200
committerJohn W. Linville <linville@tuxdriver.com>2014-07-22 19:49:34 +0200
commita006827a152c3f4d09324157096c8f89cf7ddca3 (patch)
tree3590601aa271f8def4ef6fdc701eb0004a05f925 /net/mac80211/util.c
parentmwifiex: remove redundant timestamps in debug prints (diff)
parentmac80211: add support for Rx reordering offloading (diff)
downloadlinux-a006827a152c3f4d09324157096c8f89cf7ddca3.tar.xz
linux-a006827a152c3f4d09324157096c8f89cf7ddca3.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Diffstat (limited to 'net/mac80211/util.c')
-rw-r--r--net/mac80211/util.c15
1 files changed, 15 insertions, 0 deletions
diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index df1bb7e16cfe..725af7a468d2 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -3083,3 +3083,18 @@ int ieee80211_max_num_channels(struct ieee80211_local *local)
return max_num_different_channels;
}
+
+u8 *ieee80211_add_wmm_info_ie(u8 *buf, u8 qosinfo)
+{
+ *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 */
+
+ return buf;
+}