diff options
| author | Arik Nemtsov <arik@wizery.com> | 2014-07-17 17:14:23 +0300 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2014-07-21 12:14:04 +0200 |
| commit | 40b861a0eeb06bbfa472b456482ebf89b6886926 (patch) | |
| tree | ba907a8dd7e5f7ac8f16e4308c16afca577fc641 /net/mac80211/ibss.c | |
| parent | dd8c0b03d35be7effe20c9e5fda7e231e2c88e19 (diff) | |
| download | blackbird-op-linux-40b861a0eeb06bbfa472b456482ebf89b6886926.tar.gz blackbird-op-linux-40b861a0eeb06bbfa472b456482ebf89b6886926.zip | |
mac80211: add QoS IE during TDLS setup start
If QoS is supported by the card, add an appropriate IE to TDLS setup-
request and setup-response frames.
Consolidate the setting of the WMM info IE across mac80211.
Signed-off-by: Arik Nemtsov <arikx.nemtsov@intel.com>
Reviewed-by: Liad Kaufman <liad.kaufman@intel.com>
Reviewed-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/ibss.c')
| -rw-r--r-- | net/mac80211/ibss.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c index 713485f9effc..9713dc54ea4b 100644 --- a/net/mac80211/ibss.c +++ b/net/mac80211/ibss.c @@ -189,17 +189,8 @@ ieee80211_ibss_build_presp(struct ieee80211_sub_if_data *sdata, chandef, 0); } - if (local->hw.queues >= IEEE80211_NUM_ACS) { - *pos++ = WLAN_EID_VENDOR_SPECIFIC; - *pos++ = 7; /* len */ - *pos++ = 0x00; /* Microsoft OUI 00:50:F2 */ - *pos++ = 0x50; - *pos++ = 0xf2; - *pos++ = 2; /* WME */ - *pos++ = 0; /* WME info */ - *pos++ = 1; /* WME ver */ - *pos++ = 0; /* U-APSD no in use */ - } + if (local->hw.queues >= IEEE80211_NUM_ACS) + pos = ieee80211_add_wmm_info_ie(pos, 0); /* U-APSD not in use */ presp->head_len = pos - presp->head; if (WARN_ON(presp->head_len > frame_len)) |
