|
|
@@ -8,6 +8,7 @@
|
|
|
*/
|
|
|
|
|
|
#include <linux/ieee80211.h>
|
|
|
+#include <linux/log2.h>
|
|
|
#include <net/cfg80211.h>
|
|
|
#include "ieee80211_i.h"
|
|
|
#include "driver-ops.h"
|
|
|
@@ -21,14 +22,14 @@ void ieee80211_tdls_peer_del_work(struct work_struct *wk)
|
|
|
struct ieee80211_local *local;
|
|
|
|
|
|
sdata = container_of(wk, struct ieee80211_sub_if_data,
|
|
|
- tdls_peer_del_work.work);
|
|
|
+ u.mgd.tdls_peer_del_work.work);
|
|
|
local = sdata->local;
|
|
|
|
|
|
mutex_lock(&local->mtx);
|
|
|
- if (!is_zero_ether_addr(sdata->tdls_peer)) {
|
|
|
- tdls_dbg(sdata, "TDLS del peer %pM\n", sdata->tdls_peer);
|
|
|
- sta_info_destroy_addr(sdata, sdata->tdls_peer);
|
|
|
- eth_zero_addr(sdata->tdls_peer);
|
|
|
+ if (!is_zero_ether_addr(sdata->u.mgd.tdls_peer)) {
|
|
|
+ tdls_dbg(sdata, "TDLS del peer %pM\n", sdata->u.mgd.tdls_peer);
|
|
|
+ sta_info_destroy_addr(sdata, sdata->u.mgd.tdls_peer);
|
|
|
+ eth_zero_addr(sdata->u.mgd.tdls_peer);
|
|
|
}
|
|
|
mutex_unlock(&local->mtx);
|
|
|
}
|
|
|
@@ -46,11 +47,16 @@ static void ieee80211_tdls_add_ext_capab(struct sk_buff *skb)
|
|
|
*pos++ = WLAN_EXT_CAPA5_TDLS_ENABLED;
|
|
|
}
|
|
|
|
|
|
-static u16 ieee80211_get_tdls_sta_capab(struct ieee80211_sub_if_data *sdata)
|
|
|
+static u16 ieee80211_get_tdls_sta_capab(struct ieee80211_sub_if_data *sdata,
|
|
|
+ u16 status_code)
|
|
|
{
|
|
|
struct ieee80211_local *local = sdata->local;
|
|
|
u16 capab;
|
|
|
|
|
|
+ /* The capability will be 0 when sending a failure code */
|
|
|
+ if (status_code != 0)
|
|
|
+ return 0;
|
|
|
+
|
|
|
capab = 0;
|
|
|
if (ieee80211_get_sdata_band(sdata) != IEEE80211_BAND_2GHZ)
|
|
|
return capab;
|
|
|
@@ -63,19 +69,332 @@ static u16 ieee80211_get_tdls_sta_capab(struct ieee80211_sub_if_data *sdata)
|
|
|
return capab;
|
|
|
}
|
|
|
|
|
|
-static void ieee80211_tdls_add_link_ie(struct sk_buff *skb, const u8 *src_addr,
|
|
|
- const u8 *peer, const u8 *bssid)
|
|
|
+static void ieee80211_tdls_add_link_ie(struct ieee80211_sub_if_data *sdata,
|
|
|
+ struct sk_buff *skb, const u8 *peer,
|
|
|
+ bool initiator)
|
|
|
{
|
|
|
struct ieee80211_tdls_lnkie *lnkid;
|
|
|
+ const u8 *init_addr, *rsp_addr;
|
|
|
+
|
|
|
+ if (initiator) {
|
|
|
+ init_addr = sdata->vif.addr;
|
|
|
+ rsp_addr = peer;
|
|
|
+ } else {
|
|
|
+ init_addr = peer;
|
|
|
+ rsp_addr = sdata->vif.addr;
|
|
|
+ }
|
|
|
|
|
|
lnkid = (void *)skb_put(skb, sizeof(struct ieee80211_tdls_lnkie));
|
|
|
|
|
|
lnkid->ie_type = WLAN_EID_LINK_ID;
|
|
|
lnkid->ie_len = sizeof(struct ieee80211_tdls_lnkie) - 2;
|
|
|
|
|
|
- memcpy(lnkid->bssid, bssid, ETH_ALEN);
|
|
|
- memcpy(lnkid->init_sta, src_addr, ETH_ALEN);
|
|
|
- memcpy(lnkid->resp_sta, peer, ETH_ALEN);
|
|
|
+ memcpy(lnkid->bssid, sdata->u.mgd.bssid, ETH_ALEN);
|
|
|
+ memcpy(lnkid->init_sta, init_addr, ETH_ALEN);
|
|
|
+ memcpy(lnkid->resp_sta, rsp_addr, ETH_ALEN);
|
|
|
+}
|
|
|
+
|
|
|
+/* translate numbering in the WMM parameter IE to the mac80211 notation */
|
|
|
+static enum ieee80211_ac_numbers ieee80211_ac_from_wmm(int ac)
|
|
|
+{
|
|
|
+ switch (ac) {
|
|
|
+ default:
|
|
|
+ WARN_ON_ONCE(1);
|
|
|
+ case 0:
|
|
|
+ return IEEE80211_AC_BE;
|
|
|
+ case 1:
|
|
|
+ return IEEE80211_AC_BK;
|
|
|
+ case 2:
|
|
|
+ return IEEE80211_AC_VI;
|
|
|
+ case 3:
|
|
|
+ return IEEE80211_AC_VO;
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
+static u8 ieee80211_wmm_aci_aifsn(int aifsn, bool acm, int aci)
|
|
|
+{
|
|
|
+ u8 ret;
|
|
|
+
|
|
|
+ ret = aifsn & 0x0f;
|
|
|
+ if (acm)
|
|
|
+ ret |= 0x10;
|
|
|
+ ret |= (aci << 5) & 0x60;
|
|
|
+ return ret;
|
|
|
+}
|
|
|
+
|
|
|
+static u8 ieee80211_wmm_ecw(u16 cw_min, u16 cw_max)
|
|
|
+{
|
|
|
+ return ((ilog2(cw_min + 1) << 0x0) & 0x0f) |
|
|
|
+ ((ilog2(cw_max + 1) << 0x4) & 0xf0);
|
|
|
+}
|
|
|
+
|
|
|
+static void ieee80211_tdls_add_wmm_param_ie(struct ieee80211_sub_if_data *sdata,
|
|
|
+ struct sk_buff *skb)
|
|
|
+{
|
|
|
+ struct ieee80211_wmm_param_ie *wmm;
|
|
|
+ struct ieee80211_tx_queue_params *txq;
|
|
|
+ int i;
|
|
|
+
|
|
|
+ wmm = (void *)skb_put(skb, sizeof(*wmm));
|
|
|
+ memset(wmm, 0, sizeof(*wmm));
|
|
|
+
|
|
|
+ wmm->element_id = WLAN_EID_VENDOR_SPECIFIC;
|
|
|
+ wmm->len = sizeof(*wmm) - 2;
|
|
|
+
|
|
|
+ wmm->oui[0] = 0x00; /* Microsoft OUI 00:50:F2 */
|
|
|
+ wmm->oui[1] = 0x50;
|
|
|
+ wmm->oui[2] = 0xf2;
|
|
|
+ wmm->oui_type = 2; /* WME */
|
|
|
+ wmm->oui_subtype = 1; /* WME param */
|
|
|
+ wmm->version = 1; /* WME ver */
|
|
|
+ wmm->qos_info = 0; /* U-APSD not in use */
|
|
|
+
|
|
|
+ /*
|
|
|
+ * Use the EDCA parameters defined for the BSS, or default if the AP
|
|
|
+ * doesn't support it, as mandated by 802.11-2012 section 10.22.4
|
|
|
+ */
|
|
|
+ for (i = 0; i < IEEE80211_NUM_ACS; i++) {
|
|
|
+ txq = &sdata->tx_conf[ieee80211_ac_from_wmm(i)];
|
|
|
+ wmm->ac[i].aci_aifsn = ieee80211_wmm_aci_aifsn(txq->aifs,
|
|
|
+ txq->acm, i);
|
|
|
+ wmm->ac[i].cw = ieee80211_wmm_ecw(txq->cw_min, txq->cw_max);
|
|
|
+ wmm->ac[i].txop_limit = cpu_to_le16(txq->txop);
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
+static void
|
|
|
+ieee80211_tdls_add_setup_start_ies(struct ieee80211_sub_if_data *sdata,
|
|
|
+ struct sk_buff *skb, const u8 *peer,
|
|
|
+ u8 action_code, bool initiator,
|
|
|
+ const u8 *extra_ies, size_t extra_ies_len)
|
|
|
+{
|
|
|
+ enum ieee80211_band band = ieee80211_get_sdata_band(sdata);
|
|
|
+ struct ieee80211_local *local = sdata->local;
|
|
|
+ struct ieee80211_supported_band *sband;
|
|
|
+ struct ieee80211_sta_ht_cap ht_cap;
|
|
|
+ struct sta_info *sta = NULL;
|
|
|
+ size_t offset = 0, noffset;
|
|
|
+ u8 *pos;
|
|
|
+
|
|
|
+ rcu_read_lock();
|
|
|
+
|
|
|
+ /* we should have the peer STA if we're already responding */
|
|
|
+ if (action_code == WLAN_TDLS_SETUP_RESPONSE) {
|
|
|
+ sta = sta_info_get(sdata, peer);
|
|
|
+ if (WARN_ON_ONCE(!sta)) {
|
|
|
+ rcu_read_unlock();
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ ieee80211_add_srates_ie(sdata, skb, false, band);
|
|
|
+ ieee80211_add_ext_srates_ie(sdata, skb, false, band);
|
|
|
+
|
|
|
+ /* add any custom IEs that go before Extended Capabilities */
|
|
|
+ if (extra_ies_len) {
|
|
|
+ static const u8 before_ext_cap[] = {
|
|
|
+ WLAN_EID_SUPP_RATES,
|
|
|
+ WLAN_EID_COUNTRY,
|
|
|
+ WLAN_EID_EXT_SUPP_RATES,
|
|
|
+ WLAN_EID_SUPPORTED_CHANNELS,
|
|
|
+ WLAN_EID_RSN,
|
|
|
+ };
|
|
|
+ noffset = ieee80211_ie_split(extra_ies, extra_ies_len,
|
|
|
+ before_ext_cap,
|
|
|
+ ARRAY_SIZE(before_ext_cap),
|
|
|
+ offset);
|
|
|
+ pos = skb_put(skb, noffset - offset);
|
|
|
+ memcpy(pos, extra_ies + offset, noffset - offset);
|
|
|
+ offset = noffset;
|
|
|
+ }
|
|
|
+
|
|
|
+ ieee80211_tdls_add_ext_capab(skb);
|
|
|
+
|
|
|
+ /* add the QoS element if we support it */
|
|
|
+ if (local->hw.queues >= IEEE80211_NUM_ACS &&
|
|
|
+ action_code != WLAN_PUB_ACTION_TDLS_DISCOVER_RES)
|
|
|
+ ieee80211_add_wmm_info_ie(skb_put(skb, 9), 0); /* no U-APSD */
|
|
|
+
|
|
|
+ /* add any custom IEs that go before HT capabilities */
|
|
|
+ if (extra_ies_len) {
|
|
|
+ static const u8 before_ht_cap[] = {
|
|
|
+ WLAN_EID_SUPP_RATES,
|
|
|
+ WLAN_EID_COUNTRY,
|
|
|
+ WLAN_EID_EXT_SUPP_RATES,
|
|
|
+ WLAN_EID_SUPPORTED_CHANNELS,
|
|
|
+ WLAN_EID_RSN,
|
|
|
+ WLAN_EID_EXT_CAPABILITY,
|
|
|
+ WLAN_EID_QOS_CAPA,
|
|
|
+ WLAN_EID_FAST_BSS_TRANSITION,
|
|
|
+ WLAN_EID_TIMEOUT_INTERVAL,
|
|
|
+ WLAN_EID_SUPPORTED_REGULATORY_CLASSES,
|
|
|
+ };
|
|
|
+ noffset = ieee80211_ie_split(extra_ies, extra_ies_len,
|
|
|
+ before_ht_cap,
|
|
|
+ ARRAY_SIZE(before_ht_cap),
|
|
|
+ offset);
|
|
|
+ pos = skb_put(skb, noffset - offset);
|
|
|
+ memcpy(pos, extra_ies + offset, noffset - offset);
|
|
|
+ offset = noffset;
|
|
|
+ }
|
|
|
+
|
|
|
+ /*
|
|
|
+ * with TDLS we can switch channels, and HT-caps are not necessarily
|
|
|
+ * the same on all bands. The specification limits the setup to a
|
|
|
+ * single HT-cap, so use the current band for now.
|
|
|
+ */
|
|
|
+ sband = local->hw.wiphy->bands[band];
|
|
|
+ memcpy(&ht_cap, &sband->ht_cap, sizeof(ht_cap));
|
|
|
+ if ((action_code == WLAN_TDLS_SETUP_REQUEST ||
|
|
|
+ action_code == WLAN_TDLS_SETUP_RESPONSE) &&
|
|
|
+ ht_cap.ht_supported && (!sta || sta->sta.ht_cap.ht_supported)) {
|
|
|
+ if (action_code == WLAN_TDLS_SETUP_REQUEST) {
|
|
|
+ ieee80211_apply_htcap_overrides(sdata, &ht_cap);
|
|
|
+
|
|
|
+ /* disable SMPS in TDLS initiator */
|
|
|
+ ht_cap.cap |= (WLAN_HT_CAP_SM_PS_DISABLED
|
|
|
+ << IEEE80211_HT_CAP_SM_PS_SHIFT);
|
|
|
+ } else {
|
|
|
+ /* disable SMPS in TDLS responder */
|
|
|
+ sta->sta.ht_cap.cap |=
|
|
|
+ (WLAN_HT_CAP_SM_PS_DISABLED
|
|
|
+ << IEEE80211_HT_CAP_SM_PS_SHIFT);
|
|
|
+
|
|
|
+ /* the peer caps are already intersected with our own */
|
|
|
+ memcpy(&ht_cap, &sta->sta.ht_cap, sizeof(ht_cap));
|
|
|
+ }
|
|
|
+
|
|
|
+ pos = skb_put(skb, sizeof(struct ieee80211_ht_cap) + 2);
|
|
|
+ ieee80211_ie_build_ht_cap(pos, &ht_cap, ht_cap.cap);
|
|
|
+ }
|
|
|
+
|
|
|
+ rcu_read_unlock();
|
|
|
+
|
|
|
+ /* add any remaining IEs */
|
|
|
+ if (extra_ies_len) {
|
|
|
+ noffset = extra_ies_len;
|
|
|
+ pos = skb_put(skb, noffset - offset);
|
|
|
+ memcpy(pos, extra_ies + offset, noffset - offset);
|
|
|
+ }
|
|
|
+
|
|
|
+ ieee80211_tdls_add_link_ie(sdata, skb, peer, initiator);
|
|
|
+}
|
|
|
+
|
|
|
+static void
|
|
|
+ieee80211_tdls_add_setup_cfm_ies(struct ieee80211_sub_if_data *sdata,
|
|
|
+ struct sk_buff *skb, const u8 *peer,
|
|
|
+ bool initiator, const u8 *extra_ies,
|
|
|
+ size_t extra_ies_len)
|
|
|
+{
|
|
|
+ struct ieee80211_local *local = sdata->local;
|
|
|
+ struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
|
|
|
+ size_t offset = 0, noffset;
|
|
|
+ struct sta_info *sta, *ap_sta;
|
|
|
+ u8 *pos;
|
|
|
+
|
|
|
+ rcu_read_lock();
|
|
|
+
|
|
|
+ sta = sta_info_get(sdata, peer);
|
|
|
+ ap_sta = sta_info_get(sdata, ifmgd->bssid);
|
|
|
+ if (WARN_ON_ONCE(!sta || !ap_sta)) {
|
|
|
+ rcu_read_unlock();
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
+ /* add any custom IEs that go before the QoS IE */
|
|
|
+ if (extra_ies_len) {
|
|
|
+ static const u8 before_qos[] = {
|
|
|
+ WLAN_EID_RSN,
|
|
|
+ };
|
|
|
+ noffset = ieee80211_ie_split(extra_ies, extra_ies_len,
|
|
|
+ before_qos,
|
|
|
+ ARRAY_SIZE(before_qos),
|
|
|
+ offset);
|
|
|
+ pos = skb_put(skb, noffset - offset);
|
|
|
+ memcpy(pos, extra_ies + offset, noffset - offset);
|
|
|
+ offset = noffset;
|
|
|
+ }
|
|
|
+
|
|
|
+ /* add the QoS param IE if both the peer and we support it */
|
|
|
+ if (local->hw.queues >= IEEE80211_NUM_ACS &&
|
|
|
+ test_sta_flag(sta, WLAN_STA_WME))
|
|
|
+ ieee80211_tdls_add_wmm_param_ie(sdata, skb);
|
|
|
+
|
|
|
+ /* add any custom IEs that go before HT operation */
|
|
|
+ if (extra_ies_len) {
|
|
|
+ static const u8 before_ht_op[] = {
|
|
|
+ WLAN_EID_RSN,
|
|
|
+ WLAN_EID_QOS_CAPA,
|
|
|
+ WLAN_EID_FAST_BSS_TRANSITION,
|
|
|
+ WLAN_EID_TIMEOUT_INTERVAL,
|
|
|
+ };
|
|
|
+ noffset = ieee80211_ie_split(extra_ies, extra_ies_len,
|
|
|
+ before_ht_op,
|
|
|
+ ARRAY_SIZE(before_ht_op),
|
|
|
+ offset);
|
|
|
+ pos = skb_put(skb, noffset - offset);
|
|
|
+ memcpy(pos, extra_ies + offset, noffset - offset);
|
|
|
+ offset = noffset;
|
|
|
+ }
|
|
|
+
|
|
|
+ /* if HT support is only added in TDLS, we need an HT-operation IE */
|
|
|
+ if (!ap_sta->sta.ht_cap.ht_supported && sta->sta.ht_cap.ht_supported) {
|
|
|
+ struct ieee80211_chanctx_conf *chanctx_conf =
|
|
|
+ rcu_dereference(sdata->vif.chanctx_conf);
|
|
|
+ if (!WARN_ON(!chanctx_conf)) {
|
|
|
+ pos = skb_put(skb, 2 +
|
|
|
+ sizeof(struct ieee80211_ht_operation));
|
|
|
+ /* send an empty HT operation IE */
|
|
|
+ ieee80211_ie_build_ht_oper(pos, &sta->sta.ht_cap,
|
|
|
+ &chanctx_conf->def, 0);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ rcu_read_unlock();
|
|
|
+
|
|
|
+ /* add any remaining IEs */
|
|
|
+ if (extra_ies_len) {
|
|
|
+ noffset = extra_ies_len;
|
|
|
+ pos = skb_put(skb, noffset - offset);
|
|
|
+ memcpy(pos, extra_ies + offset, noffset - offset);
|
|
|
+ }
|
|
|
+
|
|
|
+ ieee80211_tdls_add_link_ie(sdata, skb, peer, initiator);
|
|
|
+}
|
|
|
+
|
|
|
+static void ieee80211_tdls_add_ies(struct ieee80211_sub_if_data *sdata,
|
|
|
+ struct sk_buff *skb, const u8 *peer,
|
|
|
+ u8 action_code, u16 status_code,
|
|
|
+ bool initiator, const u8 *extra_ies,
|
|
|
+ size_t extra_ies_len)
|
|
|
+{
|
|
|
+ switch (action_code) {
|
|
|
+ case WLAN_TDLS_SETUP_REQUEST:
|
|
|
+ case WLAN_TDLS_SETUP_RESPONSE:
|
|
|
+ case WLAN_PUB_ACTION_TDLS_DISCOVER_RES:
|
|
|
+ if (status_code == 0)
|
|
|
+ ieee80211_tdls_add_setup_start_ies(sdata, skb, peer,
|
|
|
+ action_code,
|
|
|
+ initiator,
|
|
|
+ extra_ies,
|
|
|
+ extra_ies_len);
|
|
|
+ break;
|
|
|
+ case WLAN_TDLS_SETUP_CONFIRM:
|
|
|
+ if (status_code == 0)
|
|
|
+ ieee80211_tdls_add_setup_cfm_ies(sdata, skb, peer,
|
|
|
+ initiator, extra_ies,
|
|
|
+ extra_ies_len);
|
|
|
+ break;
|
|
|
+ case WLAN_TDLS_TEARDOWN:
|
|
|
+ case WLAN_TDLS_DISCOVERY_REQUEST:
|
|
|
+ if (extra_ies_len)
|
|
|
+ memcpy(skb_put(skb, extra_ies_len), extra_ies,
|
|
|
+ extra_ies_len);
|
|
|
+ if (status_code == 0 || action_code == WLAN_TDLS_TEARDOWN)
|
|
|
+ ieee80211_tdls_add_link_ie(sdata, skb, peer, initiator);
|
|
|
+ break;
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
|
|
|
static int
|
|
|
@@ -84,7 +403,6 @@ ieee80211_prep_tdls_encap_data(struct wiphy *wiphy, struct net_device *dev,
|
|
|
u16 status_code, struct sk_buff *skb)
|
|
|
{
|
|
|
struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
|
|
|
- enum ieee80211_band band = ieee80211_get_sdata_band(sdata);
|
|
|
struct ieee80211_tdls_data *tf;
|
|
|
|
|
|
tf = (void *)skb_put(skb, offsetof(struct ieee80211_tdls_data, u));
|
|
|
@@ -102,11 +420,8 @@ ieee80211_prep_tdls_encap_data(struct wiphy *wiphy, struct net_device *dev,
|
|
|
skb_put(skb, sizeof(tf->u.setup_req));
|
|
|
tf->u.setup_req.dialog_token = dialog_token;
|
|
|
tf->u.setup_req.capability =
|
|
|
- cpu_to_le16(ieee80211_get_tdls_sta_capab(sdata));
|
|
|
-
|
|
|
- ieee80211_add_srates_ie(sdata, skb, false, band);
|
|
|
- ieee80211_add_ext_srates_ie(sdata, skb, false, band);
|
|
|
- ieee80211_tdls_add_ext_capab(skb);
|
|
|
+ cpu_to_le16(ieee80211_get_tdls_sta_capab(sdata,
|
|
|
+ status_code));
|
|
|
break;
|
|
|
case WLAN_TDLS_SETUP_RESPONSE:
|
|
|
tf->category = WLAN_CATEGORY_TDLS;
|
|
|
@@ -116,11 +431,8 @@ ieee80211_prep_tdls_encap_data(struct wiphy *wiphy, struct net_device *dev,
|
|
|
tf->u.setup_resp.status_code = cpu_to_le16(status_code);
|
|
|
tf->u.setup_resp.dialog_token = dialog_token;
|
|
|
tf->u.setup_resp.capability =
|
|
|
- cpu_to_le16(ieee80211_get_tdls_sta_capab(sdata));
|
|
|
-
|
|
|
- ieee80211_add_srates_ie(sdata, skb, false, band);
|
|
|
- ieee80211_add_ext_srates_ie(sdata, skb, false, band);
|
|
|
- ieee80211_tdls_add_ext_capab(skb);
|
|
|
+ cpu_to_le16(ieee80211_get_tdls_sta_capab(sdata,
|
|
|
+ status_code));
|
|
|
break;
|
|
|
case WLAN_TDLS_SETUP_CONFIRM:
|
|
|
tf->category = WLAN_CATEGORY_TDLS;
|
|
|
@@ -157,7 +469,6 @@ ieee80211_prep_tdls_direct(struct wiphy *wiphy, struct net_device *dev,
|
|
|
u16 status_code, struct sk_buff *skb)
|
|
|
{
|
|
|
struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
|
|
|
- enum ieee80211_band band = ieee80211_get_sdata_band(sdata);
|
|
|
struct ieee80211_mgmt *mgmt;
|
|
|
|
|
|
mgmt = (void *)skb_put(skb, 24);
|
|
|
@@ -178,11 +489,8 @@ ieee80211_prep_tdls_direct(struct wiphy *wiphy, struct net_device *dev,
|
|
|
mgmt->u.action.u.tdls_discover_resp.dialog_token =
|
|
|
dialog_token;
|
|
|
mgmt->u.action.u.tdls_discover_resp.capability =
|
|
|
- cpu_to_le16(ieee80211_get_tdls_sta_capab(sdata));
|
|
|
-
|
|
|
- ieee80211_add_srates_ie(sdata, skb, false, band);
|
|
|
- ieee80211_add_ext_srates_ie(sdata, skb, false, band);
|
|
|
- ieee80211_tdls_add_ext_capab(skb);
|
|
|
+ cpu_to_le16(ieee80211_get_tdls_sta_capab(sdata,
|
|
|
+ status_code));
|
|
|
break;
|
|
|
default:
|
|
|
return -EINVAL;
|
|
|
@@ -202,7 +510,7 @@ ieee80211_tdls_prep_mgmt_packet(struct wiphy *wiphy, struct net_device *dev,
|
|
|
struct ieee80211_local *local = sdata->local;
|
|
|
struct sk_buff *skb = NULL;
|
|
|
bool send_direct;
|
|
|
- const u8 *init_addr, *rsp_addr;
|
|
|
+ struct sta_info *sta;
|
|
|
int ret;
|
|
|
|
|
|
skb = dev_alloc_skb(local->hw.extra_tx_headroom +
|
|
|
@@ -210,6 +518,9 @@ ieee80211_tdls_prep_mgmt_packet(struct wiphy *wiphy, struct net_device *dev,
|
|
|
sizeof(struct ieee80211_tdls_data)) +
|
|
|
50 + /* supported rates */
|
|
|
7 + /* ext capab */
|
|
|
+ 26 + /* max(WMM-info, WMM-param) */
|
|
|
+ 2 + max(sizeof(struct ieee80211_ht_cap),
|
|
|
+ sizeof(struct ieee80211_ht_operation)) +
|
|
|
extra_ies_len +
|
|
|
sizeof(struct ieee80211_tdls_lnkie));
|
|
|
if (!skb)
|
|
|
@@ -242,45 +553,48 @@ ieee80211_tdls_prep_mgmt_packet(struct wiphy *wiphy, struct net_device *dev,
|
|
|
if (ret < 0)
|
|
|
goto fail;
|
|
|
|
|
|
- if (extra_ies_len)
|
|
|
- memcpy(skb_put(skb, extra_ies_len), extra_ies, extra_ies_len);
|
|
|
+ rcu_read_lock();
|
|
|
+ sta = sta_info_get(sdata, peer);
|
|
|
|
|
|
- /* sanity check for initiator */
|
|
|
+ /* infer the initiator if we can, to support old userspace */
|
|
|
switch (action_code) {
|
|
|
case WLAN_TDLS_SETUP_REQUEST:
|
|
|
+ if (sta)
|
|
|
+ set_sta_flag(sta, WLAN_STA_TDLS_INITIATOR);
|
|
|
+ /* fall-through */
|
|
|
case WLAN_TDLS_SETUP_CONFIRM:
|
|
|
case WLAN_TDLS_DISCOVERY_REQUEST:
|
|
|
- if (!initiator) {
|
|
|
- ret = -EINVAL;
|
|
|
- goto fail;
|
|
|
- }
|
|
|
+ initiator = true;
|
|
|
break;
|
|
|
case WLAN_TDLS_SETUP_RESPONSE:
|
|
|
+ /*
|
|
|
+ * In some testing scenarios, we send a request and response.
|
|
|
+ * Make the last packet sent take effect for the initiator
|
|
|
+ * value.
|
|
|
+ */
|
|
|
+ if (sta)
|
|
|
+ clear_sta_flag(sta, WLAN_STA_TDLS_INITIATOR);
|
|
|
+ /* fall-through */
|
|
|
case WLAN_PUB_ACTION_TDLS_DISCOVER_RES:
|
|
|
- if (initiator) {
|
|
|
- ret = -EINVAL;
|
|
|
- goto fail;
|
|
|
- }
|
|
|
+ initiator = false;
|
|
|
break;
|
|
|
case WLAN_TDLS_TEARDOWN:
|
|
|
/* any value is ok */
|
|
|
break;
|
|
|
default:
|
|
|
ret = -ENOTSUPP;
|
|
|
- goto fail;
|
|
|
+ break;
|
|
|
}
|
|
|
|
|
|
- if (initiator) {
|
|
|
- init_addr = sdata->vif.addr;
|
|
|
- rsp_addr = peer;
|
|
|
- } else {
|
|
|
- init_addr = peer;
|
|
|
- rsp_addr = sdata->vif.addr;
|
|
|
- }
|
|
|
+ if (sta && test_sta_flag(sta, WLAN_STA_TDLS_INITIATOR))
|
|
|
+ initiator = true;
|
|
|
|
|
|
- ieee80211_tdls_add_link_ie(skb, init_addr, rsp_addr,
|
|
|
- sdata->u.mgd.bssid);
|
|
|
+ rcu_read_unlock();
|
|
|
+ if (ret < 0)
|
|
|
+ goto fail;
|
|
|
|
|
|
+ ieee80211_tdls_add_ies(sdata, skb, peer, action_code, status_code,
|
|
|
+ initiator, extra_ies, extra_ies_len);
|
|
|
if (send_direct) {
|
|
|
ieee80211_tx_skb(sdata, skb);
|
|
|
return 0;
|
|
|
@@ -327,8 +641,8 @@ ieee80211_tdls_mgmt_setup(struct wiphy *wiphy, struct net_device *dev,
|
|
|
mutex_lock(&local->mtx);
|
|
|
|
|
|
/* we don't support concurrent TDLS peer setups */
|
|
|
- if (!is_zero_ether_addr(sdata->tdls_peer) &&
|
|
|
- !ether_addr_equal(sdata->tdls_peer, peer)) {
|
|
|
+ if (!is_zero_ether_addr(sdata->u.mgd.tdls_peer) &&
|
|
|
+ !ether_addr_equal(sdata->u.mgd.tdls_peer, peer)) {
|
|
|
ret = -EBUSY;
|
|
|
goto exit;
|
|
|
}
|
|
|
@@ -336,15 +650,19 @@ ieee80211_tdls_mgmt_setup(struct wiphy *wiphy, struct net_device *dev,
|
|
|
/*
|
|
|
* make sure we have a STA representing the peer so we drop or buffer
|
|
|
* non-TDLS-setup frames to the peer. We can't send other packets
|
|
|
- * during setup through the AP path
|
|
|
+ * during setup through the AP path.
|
|
|
+ * Allow error packets to be sent - sometimes we don't even add a STA
|
|
|
+ * before failing the setup.
|
|
|
*/
|
|
|
- rcu_read_lock();
|
|
|
- if (!sta_info_get(sdata, peer)) {
|
|
|
+ if (status_code == 0) {
|
|
|
+ rcu_read_lock();
|
|
|
+ if (!sta_info_get(sdata, peer)) {
|
|
|
+ rcu_read_unlock();
|
|
|
+ ret = -ENOLINK;
|
|
|
+ goto exit;
|
|
|
+ }
|
|
|
rcu_read_unlock();
|
|
|
- ret = -ENOLINK;
|
|
|
- goto exit;
|
|
|
}
|
|
|
- rcu_read_unlock();
|
|
|
|
|
|
ieee80211_flush_queues(local, sdata);
|
|
|
|
|
|
@@ -355,9 +673,9 @@ ieee80211_tdls_mgmt_setup(struct wiphy *wiphy, struct net_device *dev,
|
|
|
if (ret < 0)
|
|
|
goto exit;
|
|
|
|
|
|
- memcpy(sdata->tdls_peer, peer, ETH_ALEN);
|
|
|
+ memcpy(sdata->u.mgd.tdls_peer, peer, ETH_ALEN);
|
|
|
ieee80211_queue_delayed_work(&sdata->local->hw,
|
|
|
- &sdata->tdls_peer_del_work,
|
|
|
+ &sdata->u.mgd.tdls_peer_del_work,
|
|
|
TDLS_PEER_SETUP_TIMEOUT);
|
|
|
|
|
|
exit:
|
|
|
@@ -513,11 +831,22 @@ int ieee80211_tdls_oper(struct wiphy *wiphy, struct net_device *dev,
|
|
|
set_sta_flag(sta, WLAN_STA_TDLS_PEER_AUTH);
|
|
|
rcu_read_unlock();
|
|
|
|
|
|
- WARN_ON_ONCE(is_zero_ether_addr(sdata->tdls_peer) ||
|
|
|
- !ether_addr_equal(sdata->tdls_peer, peer));
|
|
|
+ WARN_ON_ONCE(is_zero_ether_addr(sdata->u.mgd.tdls_peer) ||
|
|
|
+ !ether_addr_equal(sdata->u.mgd.tdls_peer, peer));
|
|
|
ret = 0;
|
|
|
break;
|
|
|
case NL80211_TDLS_DISABLE_LINK:
|
|
|
+ /*
|
|
|
+ * The teardown message in ieee80211_tdls_mgmt_teardown() was
|
|
|
+ * created while the queues were stopped, so it might still be
|
|
|
+ * pending. Before flushing the queues we need to be sure the
|
|
|
+ * message is handled by the tasklet handling pending messages,
|
|
|
+ * otherwise we might start destroying the station before
|
|
|
+ * sending the teardown packet.
|
|
|
+ * Note that this only forces the tasklet to flush pendings -
|
|
|
+ * not to stop the tasklet from rescheduling itself.
|
|
|
+ */
|
|
|
+ tasklet_kill(&local->tx_pending_tasklet);
|
|
|
/* flush a potentially queued teardown packet */
|
|
|
ieee80211_flush_queues(local, sdata);
|
|
|
|
|
|
@@ -528,9 +857,9 @@ int ieee80211_tdls_oper(struct wiphy *wiphy, struct net_device *dev,
|
|
|
break;
|
|
|
}
|
|
|
|
|
|
- if (ret == 0 && ether_addr_equal(sdata->tdls_peer, peer)) {
|
|
|
- cancel_delayed_work(&sdata->tdls_peer_del_work);
|
|
|
- eth_zero_addr(sdata->tdls_peer);
|
|
|
+ if (ret == 0 && ether_addr_equal(sdata->u.mgd.tdls_peer, peer)) {
|
|
|
+ cancel_delayed_work(&sdata->u.mgd.tdls_peer_del_work);
|
|
|
+ eth_zero_addr(sdata->u.mgd.tdls_peer);
|
|
|
}
|
|
|
|
|
|
mutex_unlock(&local->mtx);
|
John W. Linville