diff options
Diffstat (limited to 'net/mac80211/tdls.c')
-rw-r--r-- | net/mac80211/tdls.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/net/mac80211/tdls.c b/net/mac80211/tdls.c index 1b21050be174..4ea25dec0698 100644 --- a/net/mac80211/tdls.c +++ b/net/mac80211/tdls.c | |||
@@ -3,6 +3,7 @@ | |||
3 | * | 3 | * |
4 | * Copyright 2006-2010 Johannes Berg <johannes@sipsolutions.net> | 4 | * Copyright 2006-2010 Johannes Berg <johannes@sipsolutions.net> |
5 | * Copyright 2014, Intel Corporation | 5 | * Copyright 2014, Intel Corporation |
6 | * Copyright 2014 Intel Mobile Communications GmbH | ||
6 | * | 7 | * |
7 | * This file is GPLv2 as found in COPYING. | 8 | * This file is GPLv2 as found in COPYING. |
8 | */ | 9 | */ |
@@ -316,8 +317,7 @@ ieee80211_tdls_add_setup_cfm_ies(struct ieee80211_sub_if_data *sdata, | |||
316 | } | 317 | } |
317 | 318 | ||
318 | /* add the QoS param IE if both the peer and we support it */ | 319 | /* add the QoS param IE if both the peer and we support it */ |
319 | if (local->hw.queues >= IEEE80211_NUM_ACS && | 320 | if (local->hw.queues >= IEEE80211_NUM_ACS && sta->sta.wme) |
320 | test_sta_flag(sta, WLAN_STA_WME)) | ||
321 | ieee80211_tdls_add_wmm_param_ie(sdata, skb); | 321 | ieee80211_tdls_add_wmm_param_ie(sdata, skb); |
322 | 322 | ||
323 | /* add any custom IEs that go before HT operation */ | 323 | /* add any custom IEs that go before HT operation */ |
@@ -412,6 +412,9 @@ ieee80211_prep_tdls_encap_data(struct wiphy *wiphy, struct net_device *dev, | |||
412 | tf->ether_type = cpu_to_be16(ETH_P_TDLS); | 412 | tf->ether_type = cpu_to_be16(ETH_P_TDLS); |
413 | tf->payload_type = WLAN_TDLS_SNAP_RFTYPE; | 413 | tf->payload_type = WLAN_TDLS_SNAP_RFTYPE; |
414 | 414 | ||
415 | /* network header is after the ethernet header */ | ||
416 | skb_set_network_header(skb, ETH_HLEN); | ||
417 | |||
415 | switch (action_code) { | 418 | switch (action_code) { |
416 | case WLAN_TDLS_SETUP_REQUEST: | 419 | case WLAN_TDLS_SETUP_REQUEST: |
417 | tf->category = WLAN_CATEGORY_TDLS; | 420 | tf->category = WLAN_CATEGORY_TDLS; |