diff options
| author | Arik Nemtsov | 2014-07-17 16:14:23 +0200 |
|---|---|---|
| committer | Johannes Berg | 2014-07-21 12:14:04 +0200 |
| commit | 40b861a0eeb06bbfa472b456482ebf89b6886926 (patch) | |
| tree | ba907a8dd7e5f7ac8f16e4308c16afca577fc641 /net/mac80211/mlme.c | |
| parent | mac80211: set TDLS capab to zero on failure frames (diff) | |
| download | kernel-qcow2-linux-40b861a0eeb06bbfa472b456482ebf89b6886926.tar.gz kernel-qcow2-linux-40b861a0eeb06bbfa472b456482ebf89b6886926.tar.xz kernel-qcow2-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/mlme.c')
| -rw-r--r-- | net/mac80211/mlme.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 931330bbe00c..d863ff8b6e41 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -830,16 +830,7 @@ static void ieee80211_send_assoc(struct ieee80211_sub_if_data *sdata) qos_info = 0; } - pos = skb_put(skb, 9); - *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++ = qos_info; + pos = ieee80211_add_wmm_info_ie(skb_put(skb, 9), qos_info); } /* add any remaining custom (i.e. vendor specific here) IEs */ |