2019-06-01 16:08:46 +08:00
|
|
|
// SPDX-License-Identifier: GPL-2.0-only
|
2014-05-01 15:17:28 +08:00
|
|
|
/*
|
|
|
|
* mac80211 TDLS handling code
|
|
|
|
*
|
|
|
|
* Copyright 2006-2010 Johannes Berg <johannes@sipsolutions.net>
|
|
|
|
* Copyright 2014, Intel Corporation
|
2014-09-03 20:24:57 +08:00
|
|
|
* Copyright 2014 Intel Mobile Communications GmbH
|
2016-03-03 05:28:32 +08:00
|
|
|
* Copyright 2015 - 2016 Intel Deutschland GmbH
|
wifi: mac80211: move some future per-link data to bss_conf
To add MLD, reuse the bss_conf structure later for per-link
information, so move some things into it that are per link.
Most transformations were done with the following spatch:
@@
expression sdata;
identifier var = { chanctx_conf, mu_mimo_owner, csa_active, color_change_active, color_change_color };
@@
-sdata->vif.var
+sdata->vif.bss_conf.var
@@
struct ieee80211_vif *vif;
identifier var = { chanctx_conf, mu_mimo_owner, csa_active, color_change_active, color_change_color };
@@
-vif->var
+vif->bss_conf.var
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2022-05-10 19:26:44 +08:00
|
|
|
* Copyright (C) 2019, 2021-2022 Intel Corporation
|
2014-05-01 15:17:28 +08:00
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/ieee80211.h>
|
2014-07-17 22:14:24 +08:00
|
|
|
#include <linux/log2.h>
|
2014-06-11 22:18:25 +08:00
|
|
|
#include <net/cfg80211.h>
|
2015-07-08 20:41:45 +08:00
|
|
|
#include <linux/rtnetlink.h>
|
2014-05-01 15:17:28 +08:00
|
|
|
#include "ieee80211_i.h"
|
2014-06-11 22:18:27 +08:00
|
|
|
#include "driver-ops.h"
|
2016-03-03 05:28:32 +08:00
|
|
|
#include "rate.h"
|
2018-09-05 19:34:02 +08:00
|
|
|
#include "wme.h"
|
2014-05-01 15:17:28 +08:00
|
|
|
|
2014-06-11 22:18:20 +08:00
|
|
|
/* give usermode some time for retries in setting up the TDLS session */
|
|
|
|
#define TDLS_PEER_SETUP_TIMEOUT (15 * HZ)
|
|
|
|
|
|
|
|
void ieee80211_tdls_peer_del_work(struct work_struct *wk)
|
|
|
|
{
|
|
|
|
struct ieee80211_sub_if_data *sdata;
|
|
|
|
struct ieee80211_local *local;
|
|
|
|
|
|
|
|
sdata = container_of(wk, struct ieee80211_sub_if_data,
|
2014-07-17 22:14:25 +08:00
|
|
|
u.mgd.tdls_peer_del_work.work);
|
2014-06-11 22:18:20 +08:00
|
|
|
local = sdata->local;
|
|
|
|
|
|
|
|
mutex_lock(&local->mtx);
|
2014-07-17 22:14:25 +08:00
|
|
|
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);
|
2014-06-11 22:18:20 +08:00
|
|
|
}
|
|
|
|
mutex_unlock(&local->mtx);
|
|
|
|
}
|
|
|
|
|
2015-06-11 01:42:59 +08:00
|
|
|
static void ieee80211_tdls_add_ext_capab(struct ieee80211_sub_if_data *sdata,
|
2014-11-10 00:50:14 +08:00
|
|
|
struct sk_buff *skb)
|
2014-05-01 15:17:28 +08:00
|
|
|
{
|
2015-06-11 01:42:59 +08:00
|
|
|
struct ieee80211_local *local = sdata->local;
|
2015-08-16 03:39:46 +08:00
|
|
|
struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
|
2014-11-10 00:50:14 +08:00
|
|
|
bool chan_switch = local->hw.wiphy->features &
|
|
|
|
NL80211_FEATURE_TDLS_CHANNEL_SWITCH;
|
2015-08-16 03:39:46 +08:00
|
|
|
bool wider_band = ieee80211_hw_check(&local->hw, TDLS_WIDER_BW) &&
|
|
|
|
!ifmgd->tdls_wider_bw_prohibited;
|
2017-10-24 16:51:10 +08:00
|
|
|
bool buffer_sta = ieee80211_hw_check(&local->hw,
|
|
|
|
SUPPORTS_TDLS_BUFFER_STA);
|
2017-04-27 15:15:38 +08:00
|
|
|
struct ieee80211_supported_band *sband = ieee80211_get_sband(sdata);
|
2015-06-11 01:42:59 +08:00
|
|
|
bool vht = sband && sband->vht_cap.vht_supported;
|
networking: make skb_put & friends return void pointers
It seems like a historic accident that these return unsigned char *,
and in many places that means casts are required, more often than not.
Make these functions (skb_put, __skb_put and pskb_put) return void *
and remove all the casts across the tree, adding a (u8 *) cast only
where the unsigned char pointer was used directly, all done with the
following spatch:
@@
expression SKB, LEN;
typedef u8;
identifier fn = { skb_put, __skb_put };
@@
- *(fn(SKB, LEN))
+ *(u8 *)fn(SKB, LEN)
@@
expression E, SKB, LEN;
identifier fn = { skb_put, __skb_put };
type T;
@@
- E = ((T *)(fn(SKB, LEN)))
+ E = fn(SKB, LEN)
which actually doesn't cover pskb_put since there are only three
users overall.
A handful of stragglers were converted manually, notably a macro in
drivers/isdn/i4l/isdn_bsdcomp.c and, oddly enough, one of the many
instances in net/bluetooth/hci_sock.c. In the former file, I also
had to fix one whitespace problem spatch introduced.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-06-16 20:29:21 +08:00
|
|
|
u8 *pos = skb_put(skb, 10);
|
2014-05-01 15:17:28 +08:00
|
|
|
|
|
|
|
*pos++ = WLAN_EID_EXT_CAPABILITY;
|
2015-06-11 01:42:59 +08:00
|
|
|
*pos++ = 8; /* len */
|
2014-05-01 15:17:28 +08:00
|
|
|
*pos++ = 0x0;
|
|
|
|
*pos++ = 0x0;
|
|
|
|
*pos++ = 0x0;
|
2017-10-24 16:51:10 +08:00
|
|
|
*pos++ = (chan_switch ? WLAN_EXT_CAPA4_TDLS_CHAN_SWITCH : 0) |
|
|
|
|
(buffer_sta ? WLAN_EXT_CAPA4_TDLS_BUFFER_STA : 0);
|
2014-05-01 15:17:28 +08:00
|
|
|
*pos++ = WLAN_EXT_CAPA5_TDLS_ENABLED;
|
2015-06-11 01:42:59 +08:00
|
|
|
*pos++ = 0;
|
|
|
|
*pos++ = 0;
|
|
|
|
*pos++ = (vht && wider_band) ? WLAN_EXT_CAPA8_TDLS_WIDE_BW_ENABLED : 0;
|
2014-05-01 15:17:28 +08:00
|
|
|
}
|
|
|
|
|
2014-11-10 00:50:12 +08:00
|
|
|
static u8
|
|
|
|
ieee80211_tdls_add_subband(struct ieee80211_sub_if_data *sdata,
|
|
|
|
struct sk_buff *skb, u16 start, u16 end,
|
|
|
|
u16 spacing)
|
|
|
|
{
|
|
|
|
u8 subband_cnt = 0, ch_cnt = 0;
|
|
|
|
struct ieee80211_channel *ch;
|
|
|
|
struct cfg80211_chan_def chandef;
|
|
|
|
int i, subband_start;
|
2015-07-08 20:41:44 +08:00
|
|
|
struct wiphy *wiphy = sdata->local->hw.wiphy;
|
2014-11-10 00:50:12 +08:00
|
|
|
|
|
|
|
for (i = start; i <= end; i += spacing) {
|
|
|
|
if (!ch_cnt)
|
|
|
|
subband_start = i;
|
|
|
|
|
|
|
|
ch = ieee80211_get_channel(sdata->local->hw.wiphy, i);
|
|
|
|
if (ch) {
|
|
|
|
/* we will be active on the channel */
|
|
|
|
cfg80211_chandef_create(&chandef, ch,
|
2015-01-07 22:45:07 +08:00
|
|
|
NL80211_CHAN_NO_HT);
|
2015-07-08 20:41:44 +08:00
|
|
|
if (cfg80211_reg_can_beacon_relax(wiphy, &chandef,
|
|
|
|
sdata->wdev.iftype)) {
|
2014-11-10 00:50:12 +08:00
|
|
|
ch_cnt++;
|
2015-01-07 22:45:07 +08:00
|
|
|
/*
|
|
|
|
* check if the next channel is also part of
|
|
|
|
* this allowed range
|
|
|
|
*/
|
2014-11-10 00:50:12 +08:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-01-07 22:45:07 +08:00
|
|
|
/*
|
|
|
|
* we've reached the end of a range, with allowed channels
|
|
|
|
* found
|
|
|
|
*/
|
2014-11-10 00:50:12 +08:00
|
|
|
if (ch_cnt) {
|
|
|
|
u8 *pos = skb_put(skb, 2);
|
|
|
|
*pos++ = ieee80211_frequency_to_channel(subband_start);
|
|
|
|
*pos++ = ch_cnt;
|
|
|
|
|
|
|
|
subband_cnt++;
|
|
|
|
ch_cnt = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-01-07 22:45:07 +08:00
|
|
|
/* all channels in the requested range are allowed - add them here */
|
|
|
|
if (ch_cnt) {
|
|
|
|
u8 *pos = skb_put(skb, 2);
|
|
|
|
*pos++ = ieee80211_frequency_to_channel(subband_start);
|
|
|
|
*pos++ = ch_cnt;
|
|
|
|
|
|
|
|
subband_cnt++;
|
|
|
|
}
|
|
|
|
|
2014-11-10 00:50:12 +08:00
|
|
|
return subband_cnt;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
ieee80211_tdls_add_supp_channels(struct ieee80211_sub_if_data *sdata,
|
|
|
|
struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
* Add possible channels for TDLS. These are channels that are allowed
|
|
|
|
* to be active.
|
|
|
|
*/
|
|
|
|
u8 subband_cnt;
|
|
|
|
u8 *pos = skb_put(skb, 2);
|
|
|
|
|
|
|
|
*pos++ = WLAN_EID_SUPPORTED_CHANNELS;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* 5GHz and 2GHz channels numbers can overlap. Ignore this for now, as
|
|
|
|
* this doesn't happen in real world scenarios.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* 2GHz, with 5MHz spacing */
|
|
|
|
subband_cnt = ieee80211_tdls_add_subband(sdata, skb, 2412, 2472, 5);
|
|
|
|
|
|
|
|
/* 5GHz, with 20MHz spacing */
|
|
|
|
subband_cnt += ieee80211_tdls_add_subband(sdata, skb, 5000, 5825, 20);
|
|
|
|
|
|
|
|
/* length */
|
|
|
|
*pos = 2 * subband_cnt;
|
|
|
|
}
|
|
|
|
|
2015-03-18 14:46:08 +08:00
|
|
|
static void ieee80211_tdls_add_oper_classes(struct ieee80211_sub_if_data *sdata,
|
|
|
|
struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
u8 *pos;
|
|
|
|
u8 op_class;
|
|
|
|
|
|
|
|
if (!ieee80211_chandef_to_operating_class(&sdata->vif.bss_conf.chandef,
|
|
|
|
&op_class))
|
|
|
|
return;
|
|
|
|
|
|
|
|
pos = skb_put(skb, 4);
|
|
|
|
*pos++ = WLAN_EID_SUPPORTED_REGULATORY_CLASSES;
|
|
|
|
*pos++ = 2; /* len */
|
|
|
|
|
|
|
|
*pos++ = op_class;
|
|
|
|
*pos++ = op_class; /* give current operating class as alternate too */
|
|
|
|
}
|
|
|
|
|
2014-11-10 00:50:13 +08:00
|
|
|
static void ieee80211_tdls_add_bss_coex_ie(struct sk_buff *skb)
|
|
|
|
{
|
networking: make skb_put & friends return void pointers
It seems like a historic accident that these return unsigned char *,
and in many places that means casts are required, more often than not.
Make these functions (skb_put, __skb_put and pskb_put) return void *
and remove all the casts across the tree, adding a (u8 *) cast only
where the unsigned char pointer was used directly, all done with the
following spatch:
@@
expression SKB, LEN;
typedef u8;
identifier fn = { skb_put, __skb_put };
@@
- *(fn(SKB, LEN))
+ *(u8 *)fn(SKB, LEN)
@@
expression E, SKB, LEN;
identifier fn = { skb_put, __skb_put };
type T;
@@
- E = ((T *)(fn(SKB, LEN)))
+ E = fn(SKB, LEN)
which actually doesn't cover pskb_put since there are only three
users overall.
A handful of stragglers were converted manually, notably a macro in
drivers/isdn/i4l/isdn_bsdcomp.c and, oddly enough, one of the many
instances in net/bluetooth/hci_sock.c. In the former file, I also
had to fix one whitespace problem spatch introduced.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-06-16 20:29:21 +08:00
|
|
|
u8 *pos = skb_put(skb, 3);
|
2014-11-10 00:50:13 +08:00
|
|
|
|
|
|
|
*pos++ = WLAN_EID_BSS_COEX_2040;
|
|
|
|
*pos++ = 1; /* len */
|
|
|
|
|
|
|
|
*pos++ = WLAN_BSS_COEX_INFORMATION_REQUEST;
|
|
|
|
}
|
|
|
|
|
2014-07-17 22:14:22 +08:00
|
|
|
static u16 ieee80211_get_tdls_sta_capab(struct ieee80211_sub_if_data *sdata,
|
|
|
|
u16 status_code)
|
2014-05-01 15:17:28 +08:00
|
|
|
{
|
2017-04-27 15:15:38 +08:00
|
|
|
struct ieee80211_supported_band *sband;
|
|
|
|
|
2014-07-17 22:14:22 +08:00
|
|
|
/* The capability will be 0 when sending a failure code */
|
|
|
|
if (status_code != 0)
|
|
|
|
return 0;
|
|
|
|
|
2017-04-27 15:15:38 +08:00
|
|
|
sband = ieee80211_get_sband(sdata);
|
|
|
|
if (sband && sband->band == NL80211_BAND_2GHZ) {
|
2015-06-03 02:15:49 +08:00
|
|
|
return WLAN_CAPABILITY_SHORT_SLOT_TIME |
|
|
|
|
WLAN_CAPABILITY_SHORT_PREAMBLE;
|
|
|
|
}
|
2014-05-01 15:17:28 +08:00
|
|
|
|
2015-06-03 02:15:49 +08:00
|
|
|
return 0;
|
2014-05-01 15:17:28 +08:00
|
|
|
}
|
|
|
|
|
2014-07-17 22:14:21 +08:00
|
|
|
static void ieee80211_tdls_add_link_ie(struct ieee80211_sub_if_data *sdata,
|
|
|
|
struct sk_buff *skb, const u8 *peer,
|
|
|
|
bool initiator)
|
2014-05-01 15:17:28 +08:00
|
|
|
{
|
|
|
|
struct ieee80211_tdls_lnkie *lnkid;
|
2014-07-17 22:14:21 +08:00
|
|
|
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;
|
|
|
|
}
|
2014-05-01 15:17:28 +08:00
|
|
|
|
networking: make skb_put & friends return void pointers
It seems like a historic accident that these return unsigned char *,
and in many places that means casts are required, more often than not.
Make these functions (skb_put, __skb_put and pskb_put) return void *
and remove all the casts across the tree, adding a (u8 *) cast only
where the unsigned char pointer was used directly, all done with the
following spatch:
@@
expression SKB, LEN;
typedef u8;
identifier fn = { skb_put, __skb_put };
@@
- *(fn(SKB, LEN))
+ *(u8 *)fn(SKB, LEN)
@@
expression E, SKB, LEN;
identifier fn = { skb_put, __skb_put };
type T;
@@
- E = ((T *)(fn(SKB, LEN)))
+ E = fn(SKB, LEN)
which actually doesn't cover pskb_put since there are only three
users overall.
A handful of stragglers were converted manually, notably a macro in
drivers/isdn/i4l/isdn_bsdcomp.c and, oddly enough, one of the many
instances in net/bluetooth/hci_sock.c. In the former file, I also
had to fix one whitespace problem spatch introduced.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-06-16 20:29:21 +08:00
|
|
|
lnkid = skb_put(skb, sizeof(struct ieee80211_tdls_lnkie));
|
2014-05-01 15:17:28 +08:00
|
|
|
|
|
|
|
lnkid->ie_type = WLAN_EID_LINK_ID;
|
|
|
|
lnkid->ie_len = sizeof(struct ieee80211_tdls_lnkie) - 2;
|
|
|
|
|
2022-05-16 21:00:15 +08:00
|
|
|
memcpy(lnkid->bssid, sdata->deflink.u.mgd.bssid, ETH_ALEN);
|
2014-07-17 22:14:21 +08:00
|
|
|
memcpy(lnkid->init_sta, init_addr, ETH_ALEN);
|
|
|
|
memcpy(lnkid->resp_sta, rsp_addr, ETH_ALEN);
|
2014-05-01 15:17:28 +08:00
|
|
|
}
|
|
|
|
|
2015-03-01 15:10:02 +08:00
|
|
|
static void
|
|
|
|
ieee80211_tdls_add_aid(struct ieee80211_sub_if_data *sdata, struct sk_buff *skb)
|
|
|
|
{
|
networking: make skb_put & friends return void pointers
It seems like a historic accident that these return unsigned char *,
and in many places that means casts are required, more often than not.
Make these functions (skb_put, __skb_put and pskb_put) return void *
and remove all the casts across the tree, adding a (u8 *) cast only
where the unsigned char pointer was used directly, all done with the
following spatch:
@@
expression SKB, LEN;
typedef u8;
identifier fn = { skb_put, __skb_put };
@@
- *(fn(SKB, LEN))
+ *(u8 *)fn(SKB, LEN)
@@
expression E, SKB, LEN;
identifier fn = { skb_put, __skb_put };
type T;
@@
- E = ((T *)(fn(SKB, LEN)))
+ E = fn(SKB, LEN)
which actually doesn't cover pskb_put since there are only three
users overall.
A handful of stragglers were converted manually, notably a macro in
drivers/isdn/i4l/isdn_bsdcomp.c and, oddly enough, one of the many
instances in net/bluetooth/hci_sock.c. In the former file, I also
had to fix one whitespace problem spatch introduced.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-06-16 20:29:21 +08:00
|
|
|
u8 *pos = skb_put(skb, 4);
|
2015-03-01 15:10:02 +08:00
|
|
|
|
|
|
|
*pos++ = WLAN_EID_AID;
|
|
|
|
*pos++ = 2; /* len */
|
wifi: mac80211: move interface config to new struct
We'll use bss_conf for per-link configuration later, so
move out all the non-link-specific data out into a new
struct ieee80211_vif_cfg used in the vif.
Some adjustments were done with the following spatch:
@@
expression sdata;
struct ieee80211_vif *vifp;
identifier var = { assoc, ibss_joined, aid, arp_addr_list, arp_addr_cnt, ssid, ssid_len, s1g, ibss_creator };
@@
(
-sdata->vif.bss_conf.var
+sdata->vif.cfg.var
|
-vifp->bss_conf.var
+vifp->cfg.var
)
@bss_conf@
struct ieee80211_bss_conf *bss_conf;
identifier var = { assoc, ibss_joined, aid, arp_addr_list, arp_addr_cnt, ssid, ssid_len, s1g, ibss_creator };
@@
-bss_conf->var
+vif_cfg->var
(though more manual fixups were needed, e.g. replacing
"vif_cfg->" by "vif->cfg." in many files.)
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2022-05-10 23:05:04 +08:00
|
|
|
put_unaligned_le16(sdata->vif.cfg.aid, pos);
|
2015-03-01 15:10:02 +08:00
|
|
|
}
|
|
|
|
|
2014-07-17 22:14:24 +08:00
|
|
|
/* 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);
|
2020-07-08 04:45:48 +08:00
|
|
|
fallthrough;
|
2014-07-17 22:14:24 +08:00
|
|
|
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;
|
|
|
|
|
networking: convert many more places to skb_put_zero()
There were many places that my previous spatch didn't find,
as pointed out by yuan linyu in various patches.
The following spatch found many more and also removes the
now unnecessary casts:
@@
identifier p, p2;
expression len;
expression skb;
type t, t2;
@@
(
-p = skb_put(skb, len);
+p = skb_put_zero(skb, len);
|
-p = (t)skb_put(skb, len);
+p = skb_put_zero(skb, len);
)
... when != p
(
p2 = (t2)p;
-memset(p2, 0, len);
|
-memset(p, 0, len);
)
@@
type t, t2;
identifier p, p2;
expression skb;
@@
t *p;
...
(
-p = skb_put(skb, sizeof(t));
+p = skb_put_zero(skb, sizeof(t));
|
-p = (t *)skb_put(skb, sizeof(t));
+p = skb_put_zero(skb, sizeof(t));
)
... when != p
(
p2 = (t2)p;
-memset(p2, 0, sizeof(*p));
|
-memset(p, 0, sizeof(*p));
)
@@
expression skb, len;
@@
-memset(skb_put(skb, len), 0, len);
+skb_put_zero(skb, len);
Apply it to the tree (with one manual fixup to keep the
comment in vxlan.c, which spatch removed.)
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-06-16 20:29:19 +08:00
|
|
|
wmm = skb_put_zero(skb, sizeof(*wmm));
|
2014-07-17 22:14:24 +08:00
|
|
|
|
|
|
|
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++) {
|
2022-06-24 21:40:11 +08:00
|
|
|
txq = &sdata->deflink.tx_conf[ieee80211_ac_from_wmm(i)];
|
2014-07-17 22:14:24 +08:00
|
|
|
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);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-06-11 01:41:23 +08:00
|
|
|
static void
|
|
|
|
ieee80211_tdls_chandef_vht_upgrade(struct ieee80211_sub_if_data *sdata,
|
|
|
|
struct sta_info *sta)
|
|
|
|
{
|
|
|
|
/* IEEE802.11ac-2013 Table E-4 */
|
|
|
|
u16 centers_80mhz[] = { 5210, 5290, 5530, 5610, 5690, 5775 };
|
|
|
|
struct cfg80211_chan_def uc = sta->tdls_chandef;
|
2022-06-15 15:20:45 +08:00
|
|
|
enum nl80211_chan_width max_width =
|
|
|
|
ieee80211_sta_cap_chan_bw(&sta->deflink);
|
2015-06-11 01:41:23 +08:00
|
|
|
int i;
|
|
|
|
|
|
|
|
/* only support upgrading non-narrow channels up to 80Mhz */
|
|
|
|
if (max_width == NL80211_CHAN_WIDTH_5 ||
|
|
|
|
max_width == NL80211_CHAN_WIDTH_10)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (max_width > NL80211_CHAN_WIDTH_80)
|
|
|
|
max_width = NL80211_CHAN_WIDTH_80;
|
|
|
|
|
2016-03-08 19:35:31 +08:00
|
|
|
if (uc.width >= max_width)
|
2015-06-11 01:41:23 +08:00
|
|
|
return;
|
|
|
|
/*
|
|
|
|
* Channel usage constrains in the IEEE802.11ac-2013 specification only
|
|
|
|
* allow expanding a 20MHz channel to 80MHz in a single way. In
|
|
|
|
* addition, there are no 40MHz allowed channels that are not part of
|
|
|
|
* the allowed 80MHz range in the 5GHz spectrum (the relevant one here).
|
|
|
|
*/
|
|
|
|
for (i = 0; i < ARRAY_SIZE(centers_80mhz); i++)
|
|
|
|
if (abs(uc.chan->center_freq - centers_80mhz[i]) <= 30) {
|
|
|
|
uc.center_freq1 = centers_80mhz[i];
|
2016-03-08 19:35:31 +08:00
|
|
|
uc.center_freq2 = 0;
|
2015-06-11 01:41:23 +08:00
|
|
|
uc.width = NL80211_CHAN_WIDTH_80;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!uc.center_freq1)
|
|
|
|
return;
|
|
|
|
|
2016-08-29 17:37:35 +08:00
|
|
|
/* proceed to downgrade the chandef until usable or the same as AP BW */
|
2016-03-03 05:28:31 +08:00
|
|
|
while (uc.width > max_width ||
|
2016-08-29 17:37:35 +08:00
|
|
|
(uc.width > sta->tdls_chandef.width &&
|
|
|
|
!cfg80211_reg_can_beacon_relax(sdata->local->hw.wiphy, &uc,
|
|
|
|
sdata->wdev.iftype)))
|
2015-06-11 01:41:23 +08:00
|
|
|
ieee80211_chandef_downgrade(&uc);
|
|
|
|
|
|
|
|
if (!cfg80211_chandef_identical(&uc, &sta->tdls_chandef)) {
|
|
|
|
tdls_dbg(sdata, "TDLS ch width upgraded %d -> %d\n",
|
|
|
|
sta->tdls_chandef.width, uc.width);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* the station is not yet authorized when BW upgrade is done,
|
|
|
|
* locking is not required
|
|
|
|
*/
|
|
|
|
sta->tdls_chandef = uc;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-07-17 22:14:20 +08:00
|
|
|
static void
|
|
|
|
ieee80211_tdls_add_setup_start_ies(struct ieee80211_sub_if_data *sdata,
|
|
|
|
struct sk_buff *skb, const u8 *peer,
|
2014-07-17 22:14:21 +08:00
|
|
|
u8 action_code, bool initiator,
|
|
|
|
const u8 *extra_ies, size_t extra_ies_len)
|
2014-07-17 22:14:20 +08:00
|
|
|
{
|
2014-07-17 22:14:26 +08:00
|
|
|
struct ieee80211_supported_band *sband;
|
2017-04-27 15:15:38 +08:00
|
|
|
struct ieee80211_local *local = sdata->local;
|
2014-07-17 22:14:26 +08:00
|
|
|
struct ieee80211_sta_ht_cap ht_cap;
|
2015-03-01 15:10:02 +08:00
|
|
|
struct ieee80211_sta_vht_cap vht_cap;
|
2014-07-17 22:14:26 +08:00
|
|
|
struct sta_info *sta = NULL;
|
2014-07-17 22:14:20 +08:00
|
|
|
size_t offset = 0, noffset;
|
|
|
|
u8 *pos;
|
|
|
|
|
2017-04-27 15:15:38 +08:00
|
|
|
sband = ieee80211_get_sband(sdata);
|
|
|
|
if (!sband)
|
|
|
|
return;
|
|
|
|
|
|
|
|
ieee80211_add_srates_ie(sdata, skb, false, sband->band);
|
|
|
|
ieee80211_add_ext_srates_ie(sdata, skb, false, sband->band);
|
2014-11-10 00:50:12 +08:00
|
|
|
ieee80211_tdls_add_supp_channels(sdata, skb);
|
2014-07-17 22:14:20 +08:00
|
|
|
|
|
|
|
/* 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);
|
2017-06-18 22:52:04 +08:00
|
|
|
skb_put_data(skb, extra_ies + offset, noffset - offset);
|
2014-07-17 22:14:20 +08:00
|
|
|
offset = noffset;
|
|
|
|
}
|
|
|
|
|
2015-06-11 01:42:59 +08:00
|
|
|
ieee80211_tdls_add_ext_capab(sdata, skb);
|
2014-07-17 22:14:20 +08:00
|
|
|
|
2014-07-17 22:14:23 +08:00
|
|
|
/* 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 */
|
|
|
|
|
2014-07-17 22:14:20 +08:00
|
|
|
/* 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);
|
2017-06-18 22:52:04 +08:00
|
|
|
skb_put_data(skb, extra_ies + offset, noffset - offset);
|
2014-07-17 22:14:20 +08:00
|
|
|
offset = noffset;
|
|
|
|
}
|
|
|
|
|
2015-06-11 01:41:23 +08:00
|
|
|
mutex_lock(&local->sta_mtx);
|
2015-03-01 15:10:09 +08:00
|
|
|
|
|
|
|
/* 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)) {
|
2015-06-11 01:41:23 +08:00
|
|
|
mutex_unlock(&local->sta_mtx);
|
2015-03-01 15:10:09 +08:00
|
|
|
return;
|
|
|
|
}
|
2015-06-11 01:41:23 +08:00
|
|
|
|
|
|
|
sta->tdls_chandef = sdata->vif.bss_conf.chandef;
|
2015-03-01 15:10:09 +08:00
|
|
|
}
|
|
|
|
|
2015-03-18 14:46:08 +08:00
|
|
|
ieee80211_tdls_add_oper_classes(sdata, skb);
|
|
|
|
|
2014-07-17 22:14:26 +08:00
|
|
|
/*
|
|
|
|
* 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.
|
|
|
|
*/
|
|
|
|
memcpy(&ht_cap, &sband->ht_cap, sizeof(ht_cap));
|
2015-01-23 18:42:14 +08:00
|
|
|
|
2015-03-30 16:16:23 +08:00
|
|
|
if ((action_code == WLAN_TDLS_SETUP_REQUEST ||
|
|
|
|
action_code == WLAN_PUB_ACTION_TDLS_DISCOVER_RES) &&
|
|
|
|
ht_cap.ht_supported) {
|
2015-01-23 18:42:14 +08:00
|
|
|
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;
|
|
|
|
|
|
|
|
pos = skb_put(skb, sizeof(struct ieee80211_ht_cap) + 2);
|
|
|
|
ieee80211_ie_build_ht_cap(pos, &ht_cap, ht_cap.cap);
|
|
|
|
} else if (action_code == WLAN_TDLS_SETUP_RESPONSE &&
|
mac80211: prepare sta handling for MLO support
Currently in mac80211 each STA object is represented
using sta_info datastructure with the associated
STA specific information and drivers access ieee80211_sta
part of it.
With MLO (Multi Link Operation) support being added
in 802.11be standard, though the association is logically
with a single Multi Link capable STA, at the physical level
communication can happen via different advertised
links (uniquely identified by Channel, operating class,
BSSID) and hence the need to handle multiple link
STA parameters within a composite sta_info object
called the MLD STA. The different link STA part of
MLD STA are identified using the link address which can
be same or different as the MLD STA address and unique
link id based on the link vif.
To support extension of such a model, the sta_info
datastructure is modified to hold multiple link STA
objects with link specific params currently within
sta_info moved to this new structure. Similarly this is
done for ieee80211_sta as well which will be accessed
within mac80211 as well as by drivers, hence trivial
driver changes are expected to support this.
For current non MLO supported drivers, only one link STA
is present and link information is accessed via 'deflink'
member.
For MLO drivers, we still need to define the APIs etc. to
get the correct link ID and access the correct part of
the station info.
Currently in mac80211, all link STA info are accessed directly
via deflink. These will be updated to access via link pointers
indexed by link id with MLO support patches, with link id
being 0 for non MLO supported cases.
Except for couple of macro related changes, below spatch takes
care of updating mac80211 and driver code to access to the
link STA info via deflink.
@ieee80211_sta@
struct ieee80211_sta *s;
struct sta_info *si;
identifier var = {supp_rates, ht_cap, vht_cap, he_cap, he_6ghz_capa, eht_cap, rx_nss, bandwidth, txpwr};
@@
(
s->
- var
+ deflink.var
|
si->sta.
- var
+ deflink.var
)
@sta_info@
struct sta_info *si;
identifier var = {gtk, pcpu_rx_stats, rx_stats, rx_stats_avg, status_stats, tx_stats, cur_max_bandwidth};
@@
(
si->
- var
+ deflink.var
)
Signed-off-by: Sriram R <quic_srirrama@quicinc.com>
Link: https://lore.kernel.org/r/1649086883-13246-1-git-send-email-quic_srirrama@quicinc.com
[remove MLO-drivers notes from commit message, not clear yet; run spatch]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2022-04-04 23:41:23 +08:00
|
|
|
ht_cap.ht_supported && sta->sta.deflink.ht_cap.ht_supported) {
|
2015-01-23 18:42:14 +08:00
|
|
|
/* the peer caps are already intersected with our own */
|
mac80211: prepare sta handling for MLO support
Currently in mac80211 each STA object is represented
using sta_info datastructure with the associated
STA specific information and drivers access ieee80211_sta
part of it.
With MLO (Multi Link Operation) support being added
in 802.11be standard, though the association is logically
with a single Multi Link capable STA, at the physical level
communication can happen via different advertised
links (uniquely identified by Channel, operating class,
BSSID) and hence the need to handle multiple link
STA parameters within a composite sta_info object
called the MLD STA. The different link STA part of
MLD STA are identified using the link address which can
be same or different as the MLD STA address and unique
link id based on the link vif.
To support extension of such a model, the sta_info
datastructure is modified to hold multiple link STA
objects with link specific params currently within
sta_info moved to this new structure. Similarly this is
done for ieee80211_sta as well which will be accessed
within mac80211 as well as by drivers, hence trivial
driver changes are expected to support this.
For current non MLO supported drivers, only one link STA
is present and link information is accessed via 'deflink'
member.
For MLO drivers, we still need to define the APIs etc. to
get the correct link ID and access the correct part of
the station info.
Currently in mac80211, all link STA info are accessed directly
via deflink. These will be updated to access via link pointers
indexed by link id with MLO support patches, with link id
being 0 for non MLO supported cases.
Except for couple of macro related changes, below spatch takes
care of updating mac80211 and driver code to access to the
link STA info via deflink.
@ieee80211_sta@
struct ieee80211_sta *s;
struct sta_info *si;
identifier var = {supp_rates, ht_cap, vht_cap, he_cap, he_6ghz_capa, eht_cap, rx_nss, bandwidth, txpwr};
@@
(
s->
- var
+ deflink.var
|
si->sta.
- var
+ deflink.var
)
@sta_info@
struct sta_info *si;
identifier var = {gtk, pcpu_rx_stats, rx_stats, rx_stats_avg, status_stats, tx_stats, cur_max_bandwidth};
@@
(
si->
- var
+ deflink.var
)
Signed-off-by: Sriram R <quic_srirrama@quicinc.com>
Link: https://lore.kernel.org/r/1649086883-13246-1-git-send-email-quic_srirrama@quicinc.com
[remove MLO-drivers notes from commit message, not clear yet; run spatch]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2022-04-04 23:41:23 +08:00
|
|
|
memcpy(&ht_cap, &sta->sta.deflink.ht_cap, sizeof(ht_cap));
|
2014-07-17 22:14:26 +08:00
|
|
|
|
|
|
|
pos = skb_put(skb, sizeof(struct ieee80211_ht_cap) + 2);
|
|
|
|
ieee80211_ie_build_ht_cap(pos, &ht_cap, ht_cap.cap);
|
|
|
|
}
|
|
|
|
|
2014-11-10 00:50:13 +08:00
|
|
|
if (ht_cap.ht_supported &&
|
|
|
|
(ht_cap.cap & IEEE80211_HT_CAP_SUP_WIDTH_20_40))
|
|
|
|
ieee80211_tdls_add_bss_coex_ie(skb);
|
|
|
|
|
2015-03-01 15:10:02 +08:00
|
|
|
ieee80211_tdls_add_link_ie(sdata, skb, peer, initiator);
|
|
|
|
|
|
|
|
/* add any custom IEs that go before VHT capabilities */
|
|
|
|
if (extra_ies_len) {
|
|
|
|
static const u8 before_vht_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,
|
|
|
|
WLAN_EID_MULTI_BAND,
|
|
|
|
};
|
|
|
|
noffset = ieee80211_ie_split(extra_ies, extra_ies_len,
|
|
|
|
before_vht_cap,
|
|
|
|
ARRAY_SIZE(before_vht_cap),
|
|
|
|
offset);
|
2017-06-18 22:52:04 +08:00
|
|
|
skb_put_data(skb, extra_ies + offset, noffset - offset);
|
2015-03-01 15:10:02 +08:00
|
|
|
offset = noffset;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* build the VHT-cap similarly to the HT-cap */
|
|
|
|
memcpy(&vht_cap, &sband->vht_cap, sizeof(vht_cap));
|
2015-03-30 16:16:23 +08:00
|
|
|
if ((action_code == WLAN_TDLS_SETUP_REQUEST ||
|
|
|
|
action_code == WLAN_PUB_ACTION_TDLS_DISCOVER_RES) &&
|
|
|
|
vht_cap.vht_supported) {
|
2015-03-01 15:10:02 +08:00
|
|
|
ieee80211_apply_vhtcap_overrides(sdata, &vht_cap);
|
|
|
|
|
|
|
|
/* the AID is present only when VHT is implemented */
|
2015-03-30 16:16:23 +08:00
|
|
|
if (action_code == WLAN_TDLS_SETUP_REQUEST)
|
|
|
|
ieee80211_tdls_add_aid(sdata, skb);
|
2015-03-01 15:10:02 +08:00
|
|
|
|
|
|
|
pos = skb_put(skb, sizeof(struct ieee80211_vht_cap) + 2);
|
|
|
|
ieee80211_ie_build_vht_cap(pos, &vht_cap, vht_cap.cap);
|
|
|
|
} else if (action_code == WLAN_TDLS_SETUP_RESPONSE &&
|
mac80211: prepare sta handling for MLO support
Currently in mac80211 each STA object is represented
using sta_info datastructure with the associated
STA specific information and drivers access ieee80211_sta
part of it.
With MLO (Multi Link Operation) support being added
in 802.11be standard, though the association is logically
with a single Multi Link capable STA, at the physical level
communication can happen via different advertised
links (uniquely identified by Channel, operating class,
BSSID) and hence the need to handle multiple link
STA parameters within a composite sta_info object
called the MLD STA. The different link STA part of
MLD STA are identified using the link address which can
be same or different as the MLD STA address and unique
link id based on the link vif.
To support extension of such a model, the sta_info
datastructure is modified to hold multiple link STA
objects with link specific params currently within
sta_info moved to this new structure. Similarly this is
done for ieee80211_sta as well which will be accessed
within mac80211 as well as by drivers, hence trivial
driver changes are expected to support this.
For current non MLO supported drivers, only one link STA
is present and link information is accessed via 'deflink'
member.
For MLO drivers, we still need to define the APIs etc. to
get the correct link ID and access the correct part of
the station info.
Currently in mac80211, all link STA info are accessed directly
via deflink. These will be updated to access via link pointers
indexed by link id with MLO support patches, with link id
being 0 for non MLO supported cases.
Except for couple of macro related changes, below spatch takes
care of updating mac80211 and driver code to access to the
link STA info via deflink.
@ieee80211_sta@
struct ieee80211_sta *s;
struct sta_info *si;
identifier var = {supp_rates, ht_cap, vht_cap, he_cap, he_6ghz_capa, eht_cap, rx_nss, bandwidth, txpwr};
@@
(
s->
- var
+ deflink.var
|
si->sta.
- var
+ deflink.var
)
@sta_info@
struct sta_info *si;
identifier var = {gtk, pcpu_rx_stats, rx_stats, rx_stats_avg, status_stats, tx_stats, cur_max_bandwidth};
@@
(
si->
- var
+ deflink.var
)
Signed-off-by: Sriram R <quic_srirrama@quicinc.com>
Link: https://lore.kernel.org/r/1649086883-13246-1-git-send-email-quic_srirrama@quicinc.com
[remove MLO-drivers notes from commit message, not clear yet; run spatch]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2022-04-04 23:41:23 +08:00
|
|
|
vht_cap.vht_supported && sta->sta.deflink.vht_cap.vht_supported) {
|
2015-03-01 15:10:02 +08:00
|
|
|
/* the peer caps are already intersected with our own */
|
mac80211: prepare sta handling for MLO support
Currently in mac80211 each STA object is represented
using sta_info datastructure with the associated
STA specific information and drivers access ieee80211_sta
part of it.
With MLO (Multi Link Operation) support being added
in 802.11be standard, though the association is logically
with a single Multi Link capable STA, at the physical level
communication can happen via different advertised
links (uniquely identified by Channel, operating class,
BSSID) and hence the need to handle multiple link
STA parameters within a composite sta_info object
called the MLD STA. The different link STA part of
MLD STA are identified using the link address which can
be same or different as the MLD STA address and unique
link id based on the link vif.
To support extension of such a model, the sta_info
datastructure is modified to hold multiple link STA
objects with link specific params currently within
sta_info moved to this new structure. Similarly this is
done for ieee80211_sta as well which will be accessed
within mac80211 as well as by drivers, hence trivial
driver changes are expected to support this.
For current non MLO supported drivers, only one link STA
is present and link information is accessed via 'deflink'
member.
For MLO drivers, we still need to define the APIs etc. to
get the correct link ID and access the correct part of
the station info.
Currently in mac80211, all link STA info are accessed directly
via deflink. These will be updated to access via link pointers
indexed by link id with MLO support patches, with link id
being 0 for non MLO supported cases.
Except for couple of macro related changes, below spatch takes
care of updating mac80211 and driver code to access to the
link STA info via deflink.
@ieee80211_sta@
struct ieee80211_sta *s;
struct sta_info *si;
identifier var = {supp_rates, ht_cap, vht_cap, he_cap, he_6ghz_capa, eht_cap, rx_nss, bandwidth, txpwr};
@@
(
s->
- var
+ deflink.var
|
si->sta.
- var
+ deflink.var
)
@sta_info@
struct sta_info *si;
identifier var = {gtk, pcpu_rx_stats, rx_stats, rx_stats_avg, status_stats, tx_stats, cur_max_bandwidth};
@@
(
si->
- var
+ deflink.var
)
Signed-off-by: Sriram R <quic_srirrama@quicinc.com>
Link: https://lore.kernel.org/r/1649086883-13246-1-git-send-email-quic_srirrama@quicinc.com
[remove MLO-drivers notes from commit message, not clear yet; run spatch]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2022-04-04 23:41:23 +08:00
|
|
|
memcpy(&vht_cap, &sta->sta.deflink.vht_cap, sizeof(vht_cap));
|
2015-03-01 15:10:02 +08:00
|
|
|
|
|
|
|
/* the AID is present only when VHT is implemented */
|
|
|
|
ieee80211_tdls_add_aid(sdata, skb);
|
|
|
|
|
|
|
|
pos = skb_put(skb, sizeof(struct ieee80211_vht_cap) + 2);
|
|
|
|
ieee80211_ie_build_vht_cap(pos, &vht_cap, vht_cap.cap);
|
2015-06-11 01:41:23 +08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* if both peers support WIDER_BW, we can expand the chandef to
|
|
|
|
* a wider compatible one, up to 80MHz
|
|
|
|
*/
|
|
|
|
if (test_sta_flag(sta, WLAN_STA_TDLS_WIDER_BW))
|
|
|
|
ieee80211_tdls_chandef_vht_upgrade(sdata, sta);
|
2015-03-01 15:10:02 +08:00
|
|
|
}
|
|
|
|
|
2015-06-11 01:41:23 +08:00
|
|
|
mutex_unlock(&local->sta_mtx);
|
2015-03-01 15:10:02 +08:00
|
|
|
|
2014-07-17 22:14:20 +08:00
|
|
|
/* add any remaining IEs */
|
|
|
|
if (extra_ies_len) {
|
|
|
|
noffset = extra_ies_len;
|
2017-06-18 22:52:04 +08:00
|
|
|
skb_put_data(skb, extra_ies + offset, noffset - offset);
|
2014-07-17 22:14:20 +08:00
|
|
|
}
|
2014-07-17 22:14:21 +08:00
|
|
|
|
2014-07-17 22:14:20 +08:00
|
|
|
}
|
|
|
|
|
2014-07-17 22:14:24 +08:00
|
|
|
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;
|
|
|
|
size_t offset = 0, noffset;
|
2014-07-17 22:14:26 +08:00
|
|
|
struct sta_info *sta, *ap_sta;
|
2017-04-27 15:15:38 +08:00
|
|
|
struct ieee80211_supported_band *sband;
|
2014-07-17 22:14:24 +08:00
|
|
|
u8 *pos;
|
|
|
|
|
2017-04-27 15:15:38 +08:00
|
|
|
sband = ieee80211_get_sband(sdata);
|
|
|
|
if (!sband)
|
|
|
|
return;
|
|
|
|
|
2015-06-11 01:41:23 +08:00
|
|
|
mutex_lock(&local->sta_mtx);
|
2014-07-17 22:14:24 +08:00
|
|
|
|
|
|
|
sta = sta_info_get(sdata, peer);
|
2022-05-16 21:00:15 +08:00
|
|
|
ap_sta = sta_info_get(sdata, sdata->deflink.u.mgd.bssid);
|
2014-07-17 22:14:26 +08:00
|
|
|
if (WARN_ON_ONCE(!sta || !ap_sta)) {
|
2015-06-11 01:41:23 +08:00
|
|
|
mutex_unlock(&local->sta_mtx);
|
2014-07-17 22:14:24 +08:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2015-06-11 01:41:23 +08:00
|
|
|
sta->tdls_chandef = sdata->vif.bss_conf.chandef;
|
|
|
|
|
2014-07-17 22:14:24 +08:00
|
|
|
/* 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);
|
2017-06-18 22:52:04 +08:00
|
|
|
skb_put_data(skb, extra_ies + offset, noffset - offset);
|
2014-07-17 22:14:24 +08:00
|
|
|
offset = noffset;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* add the QoS param IE if both the peer and we support it */
|
2014-07-22 20:50:47 +08:00
|
|
|
if (local->hw.queues >= IEEE80211_NUM_ACS && sta->sta.wme)
|
2014-07-17 22:14:24 +08:00
|
|
|
ieee80211_tdls_add_wmm_param_ie(sdata, skb);
|
|
|
|
|
2014-07-17 22:14:26 +08:00
|
|
|
/* 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);
|
2017-06-18 22:52:04 +08:00
|
|
|
skb_put_data(skb, extra_ies + offset, noffset - offset);
|
2014-07-17 22:14:26 +08:00
|
|
|
offset = noffset;
|
|
|
|
}
|
|
|
|
|
2015-10-25 16:59:34 +08:00
|
|
|
/*
|
|
|
|
* if HT support is only added in TDLS, we need an HT-operation IE.
|
|
|
|
* add the IE as required by IEEE802.11-2012 9.23.3.2.
|
|
|
|
*/
|
mac80211: prepare sta handling for MLO support
Currently in mac80211 each STA object is represented
using sta_info datastructure with the associated
STA specific information and drivers access ieee80211_sta
part of it.
With MLO (Multi Link Operation) support being added
in 802.11be standard, though the association is logically
with a single Multi Link capable STA, at the physical level
communication can happen via different advertised
links (uniquely identified by Channel, operating class,
BSSID) and hence the need to handle multiple link
STA parameters within a composite sta_info object
called the MLD STA. The different link STA part of
MLD STA are identified using the link address which can
be same or different as the MLD STA address and unique
link id based on the link vif.
To support extension of such a model, the sta_info
datastructure is modified to hold multiple link STA
objects with link specific params currently within
sta_info moved to this new structure. Similarly this is
done for ieee80211_sta as well which will be accessed
within mac80211 as well as by drivers, hence trivial
driver changes are expected to support this.
For current non MLO supported drivers, only one link STA
is present and link information is accessed via 'deflink'
member.
For MLO drivers, we still need to define the APIs etc. to
get the correct link ID and access the correct part of
the station info.
Currently in mac80211, all link STA info are accessed directly
via deflink. These will be updated to access via link pointers
indexed by link id with MLO support patches, with link id
being 0 for non MLO supported cases.
Except for couple of macro related changes, below spatch takes
care of updating mac80211 and driver code to access to the
link STA info via deflink.
@ieee80211_sta@
struct ieee80211_sta *s;
struct sta_info *si;
identifier var = {supp_rates, ht_cap, vht_cap, he_cap, he_6ghz_capa, eht_cap, rx_nss, bandwidth, txpwr};
@@
(
s->
- var
+ deflink.var
|
si->sta.
- var
+ deflink.var
)
@sta_info@
struct sta_info *si;
identifier var = {gtk, pcpu_rx_stats, rx_stats, rx_stats_avg, status_stats, tx_stats, cur_max_bandwidth};
@@
(
si->
- var
+ deflink.var
)
Signed-off-by: Sriram R <quic_srirrama@quicinc.com>
Link: https://lore.kernel.org/r/1649086883-13246-1-git-send-email-quic_srirrama@quicinc.com
[remove MLO-drivers notes from commit message, not clear yet; run spatch]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2022-04-04 23:41:23 +08:00
|
|
|
if (!ap_sta->sta.deflink.ht_cap.ht_supported && sta->sta.deflink.ht_cap.ht_supported) {
|
2015-10-25 16:59:34 +08:00
|
|
|
u16 prot = IEEE80211_HT_OP_MODE_PROTECTION_NONHT_MIXED |
|
|
|
|
IEEE80211_HT_OP_MODE_NON_GF_STA_PRSNT |
|
|
|
|
IEEE80211_HT_OP_MODE_NON_HT_STA_PRSNT;
|
|
|
|
|
2015-05-07 20:30:41 +08:00
|
|
|
pos = skb_put(skb, 2 + sizeof(struct ieee80211_ht_operation));
|
mac80211: prepare sta handling for MLO support
Currently in mac80211 each STA object is represented
using sta_info datastructure with the associated
STA specific information and drivers access ieee80211_sta
part of it.
With MLO (Multi Link Operation) support being added
in 802.11be standard, though the association is logically
with a single Multi Link capable STA, at the physical level
communication can happen via different advertised
links (uniquely identified by Channel, operating class,
BSSID) and hence the need to handle multiple link
STA parameters within a composite sta_info object
called the MLD STA. The different link STA part of
MLD STA are identified using the link address which can
be same or different as the MLD STA address and unique
link id based on the link vif.
To support extension of such a model, the sta_info
datastructure is modified to hold multiple link STA
objects with link specific params currently within
sta_info moved to this new structure. Similarly this is
done for ieee80211_sta as well which will be accessed
within mac80211 as well as by drivers, hence trivial
driver changes are expected to support this.
For current non MLO supported drivers, only one link STA
is present and link information is accessed via 'deflink'
member.
For MLO drivers, we still need to define the APIs etc. to
get the correct link ID and access the correct part of
the station info.
Currently in mac80211, all link STA info are accessed directly
via deflink. These will be updated to access via link pointers
indexed by link id with MLO support patches, with link id
being 0 for non MLO supported cases.
Except for couple of macro related changes, below spatch takes
care of updating mac80211 and driver code to access to the
link STA info via deflink.
@ieee80211_sta@
struct ieee80211_sta *s;
struct sta_info *si;
identifier var = {supp_rates, ht_cap, vht_cap, he_cap, he_6ghz_capa, eht_cap, rx_nss, bandwidth, txpwr};
@@
(
s->
- var
+ deflink.var
|
si->sta.
- var
+ deflink.var
)
@sta_info@
struct sta_info *si;
identifier var = {gtk, pcpu_rx_stats, rx_stats, rx_stats_avg, status_stats, tx_stats, cur_max_bandwidth};
@@
(
si->
- var
+ deflink.var
)
Signed-off-by: Sriram R <quic_srirrama@quicinc.com>
Link: https://lore.kernel.org/r/1649086883-13246-1-git-send-email-quic_srirrama@quicinc.com
[remove MLO-drivers notes from commit message, not clear yet; run spatch]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2022-04-04 23:41:23 +08:00
|
|
|
ieee80211_ie_build_ht_oper(pos, &sta->sta.deflink.ht_cap,
|
2015-10-25 16:59:34 +08:00
|
|
|
&sdata->vif.bss_conf.chandef, prot,
|
|
|
|
true);
|
2014-07-17 22:14:26 +08:00
|
|
|
}
|
|
|
|
|
2015-03-01 15:10:02 +08:00
|
|
|
ieee80211_tdls_add_link_ie(sdata, skb, peer, initiator);
|
|
|
|
|
|
|
|
/* only include VHT-operation if not on the 2.4GHz band */
|
2017-04-27 15:15:38 +08:00
|
|
|
if (sband->band != NL80211_BAND_2GHZ &&
|
mac80211: prepare sta handling for MLO support
Currently in mac80211 each STA object is represented
using sta_info datastructure with the associated
STA specific information and drivers access ieee80211_sta
part of it.
With MLO (Multi Link Operation) support being added
in 802.11be standard, though the association is logically
with a single Multi Link capable STA, at the physical level
communication can happen via different advertised
links (uniquely identified by Channel, operating class,
BSSID) and hence the need to handle multiple link
STA parameters within a composite sta_info object
called the MLD STA. The different link STA part of
MLD STA are identified using the link address which can
be same or different as the MLD STA address and unique
link id based on the link vif.
To support extension of such a model, the sta_info
datastructure is modified to hold multiple link STA
objects with link specific params currently within
sta_info moved to this new structure. Similarly this is
done for ieee80211_sta as well which will be accessed
within mac80211 as well as by drivers, hence trivial
driver changes are expected to support this.
For current non MLO supported drivers, only one link STA
is present and link information is accessed via 'deflink'
member.
For MLO drivers, we still need to define the APIs etc. to
get the correct link ID and access the correct part of
the station info.
Currently in mac80211, all link STA info are accessed directly
via deflink. These will be updated to access via link pointers
indexed by link id with MLO support patches, with link id
being 0 for non MLO supported cases.
Except for couple of macro related changes, below spatch takes
care of updating mac80211 and driver code to access to the
link STA info via deflink.
@ieee80211_sta@
struct ieee80211_sta *s;
struct sta_info *si;
identifier var = {supp_rates, ht_cap, vht_cap, he_cap, he_6ghz_capa, eht_cap, rx_nss, bandwidth, txpwr};
@@
(
s->
- var
+ deflink.var
|
si->sta.
- var
+ deflink.var
)
@sta_info@
struct sta_info *si;
identifier var = {gtk, pcpu_rx_stats, rx_stats, rx_stats_avg, status_stats, tx_stats, cur_max_bandwidth};
@@
(
si->
- var
+ deflink.var
)
Signed-off-by: Sriram R <quic_srirrama@quicinc.com>
Link: https://lore.kernel.org/r/1649086883-13246-1-git-send-email-quic_srirrama@quicinc.com
[remove MLO-drivers notes from commit message, not clear yet; run spatch]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2022-04-04 23:41:23 +08:00
|
|
|
sta->sta.deflink.vht_cap.vht_supported) {
|
2015-06-11 01:41:23 +08:00
|
|
|
/*
|
|
|
|
* if both peers support WIDER_BW, we can expand the chandef to
|
|
|
|
* a wider compatible one, up to 80MHz
|
|
|
|
*/
|
|
|
|
if (test_sta_flag(sta, WLAN_STA_TDLS_WIDER_BW))
|
|
|
|
ieee80211_tdls_chandef_vht_upgrade(sdata, sta);
|
|
|
|
|
2015-05-07 20:30:41 +08:00
|
|
|
pos = skb_put(skb, 2 + sizeof(struct ieee80211_vht_operation));
|
mac80211: prepare sta handling for MLO support
Currently in mac80211 each STA object is represented
using sta_info datastructure with the associated
STA specific information and drivers access ieee80211_sta
part of it.
With MLO (Multi Link Operation) support being added
in 802.11be standard, though the association is logically
with a single Multi Link capable STA, at the physical level
communication can happen via different advertised
links (uniquely identified by Channel, operating class,
BSSID) and hence the need to handle multiple link
STA parameters within a composite sta_info object
called the MLD STA. The different link STA part of
MLD STA are identified using the link address which can
be same or different as the MLD STA address and unique
link id based on the link vif.
To support extension of such a model, the sta_info
datastructure is modified to hold multiple link STA
objects with link specific params currently within
sta_info moved to this new structure. Similarly this is
done for ieee80211_sta as well which will be accessed
within mac80211 as well as by drivers, hence trivial
driver changes are expected to support this.
For current non MLO supported drivers, only one link STA
is present and link information is accessed via 'deflink'
member.
For MLO drivers, we still need to define the APIs etc. to
get the correct link ID and access the correct part of
the station info.
Currently in mac80211, all link STA info are accessed directly
via deflink. These will be updated to access via link pointers
indexed by link id with MLO support patches, with link id
being 0 for non MLO supported cases.
Except for couple of macro related changes, below spatch takes
care of updating mac80211 and driver code to access to the
link STA info via deflink.
@ieee80211_sta@
struct ieee80211_sta *s;
struct sta_info *si;
identifier var = {supp_rates, ht_cap, vht_cap, he_cap, he_6ghz_capa, eht_cap, rx_nss, bandwidth, txpwr};
@@
(
s->
- var
+ deflink.var
|
si->sta.
- var
+ deflink.var
)
@sta_info@
struct sta_info *si;
identifier var = {gtk, pcpu_rx_stats, rx_stats, rx_stats_avg, status_stats, tx_stats, cur_max_bandwidth};
@@
(
si->
- var
+ deflink.var
)
Signed-off-by: Sriram R <quic_srirrama@quicinc.com>
Link: https://lore.kernel.org/r/1649086883-13246-1-git-send-email-quic_srirrama@quicinc.com
[remove MLO-drivers notes from commit message, not clear yet; run spatch]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2022-04-04 23:41:23 +08:00
|
|
|
ieee80211_ie_build_vht_oper(pos, &sta->sta.deflink.vht_cap,
|
2015-06-11 01:41:23 +08:00
|
|
|
&sta->tdls_chandef);
|
2015-03-01 15:10:02 +08:00
|
|
|
}
|
|
|
|
|
2015-06-11 01:41:23 +08:00
|
|
|
mutex_unlock(&local->sta_mtx);
|
2014-07-17 22:14:26 +08:00
|
|
|
|
2014-07-17 22:14:24 +08:00
|
|
|
/* add any remaining IEs */
|
|
|
|
if (extra_ies_len) {
|
|
|
|
noffset = extra_ies_len;
|
2017-06-18 22:52:04 +08:00
|
|
|
skb_put_data(skb, extra_ies + offset, noffset - offset);
|
2014-07-17 22:14:24 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-11-10 00:50:19 +08:00
|
|
|
static void
|
|
|
|
ieee80211_tdls_add_chan_switch_req_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, u8 oper_class,
|
|
|
|
struct cfg80211_chan_def *chandef)
|
|
|
|
{
|
|
|
|
struct ieee80211_tdls_data *tf;
|
|
|
|
size_t offset = 0, noffset;
|
|
|
|
|
|
|
|
if (WARN_ON_ONCE(!chandef))
|
|
|
|
return;
|
|
|
|
|
|
|
|
tf = (void *)skb->data;
|
|
|
|
tf->u.chan_switch_req.target_channel =
|
|
|
|
ieee80211_frequency_to_channel(chandef->chan->center_freq);
|
|
|
|
tf->u.chan_switch_req.oper_class = oper_class;
|
|
|
|
|
|
|
|
if (extra_ies_len) {
|
|
|
|
static const u8 before_lnkie[] = {
|
|
|
|
WLAN_EID_SECONDARY_CHANNEL_OFFSET,
|
|
|
|
};
|
|
|
|
noffset = ieee80211_ie_split(extra_ies, extra_ies_len,
|
|
|
|
before_lnkie,
|
|
|
|
ARRAY_SIZE(before_lnkie),
|
|
|
|
offset);
|
2017-06-18 22:52:04 +08:00
|
|
|
skb_put_data(skb, extra_ies + offset, noffset - offset);
|
2014-11-10 00:50:19 +08:00
|
|
|
offset = noffset;
|
|
|
|
}
|
|
|
|
|
|
|
|
ieee80211_tdls_add_link_ie(sdata, skb, peer, initiator);
|
|
|
|
|
|
|
|
/* add any remaining IEs */
|
|
|
|
if (extra_ies_len) {
|
|
|
|
noffset = extra_ies_len;
|
2017-06-18 22:52:04 +08:00
|
|
|
skb_put_data(skb, extra_ies + offset, noffset - offset);
|
2014-11-10 00:50:19 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-11-10 00:50:20 +08:00
|
|
|
static void
|
|
|
|
ieee80211_tdls_add_chan_switch_resp_ies(struct ieee80211_sub_if_data *sdata,
|
|
|
|
struct sk_buff *skb, const u8 *peer,
|
|
|
|
u16 status_code, bool initiator,
|
|
|
|
const u8 *extra_ies,
|
|
|
|
size_t extra_ies_len)
|
|
|
|
{
|
|
|
|
if (status_code == 0)
|
|
|
|
ieee80211_tdls_add_link_ie(sdata, skb, peer, initiator);
|
|
|
|
|
|
|
|
if (extra_ies_len)
|
networking: introduce and use skb_put_data()
A common pattern with skb_put() is to just want to memcpy()
some data into the new space, introduce skb_put_data() for
this.
An spatch similar to the one for skb_put_zero() converts many
of the places using it:
@@
identifier p, p2;
expression len, skb, data;
type t, t2;
@@
(
-p = skb_put(skb, len);
+p = skb_put_data(skb, data, len);
|
-p = (t)skb_put(skb, len);
+p = skb_put_data(skb, data, len);
)
(
p2 = (t2)p;
-memcpy(p2, data, len);
|
-memcpy(p, data, len);
)
@@
type t, t2;
identifier p, p2;
expression skb, data;
@@
t *p;
...
(
-p = skb_put(skb, sizeof(t));
+p = skb_put_data(skb, data, sizeof(t));
|
-p = (t *)skb_put(skb, sizeof(t));
+p = skb_put_data(skb, data, sizeof(t));
)
(
p2 = (t2)p;
-memcpy(p2, data, sizeof(*p));
|
-memcpy(p, data, sizeof(*p));
)
@@
expression skb, len, data;
@@
-memcpy(skb_put(skb, len), data, len);
+skb_put_data(skb, data, len);
(again, manually post-processed to retain some comments)
Reviewed-by: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-06-16 20:29:20 +08:00
|
|
|
skb_put_data(skb, extra_ies, extra_ies_len);
|
2014-11-10 00:50:20 +08:00
|
|
|
}
|
|
|
|
|
2014-07-17 22:14:19 +08:00
|
|
|
static void ieee80211_tdls_add_ies(struct ieee80211_sub_if_data *sdata,
|
|
|
|
struct sk_buff *skb, const u8 *peer,
|
2014-07-17 22:14:21 +08:00
|
|
|
u8 action_code, u16 status_code,
|
|
|
|
bool initiator, const u8 *extra_ies,
|
2014-11-10 00:50:16 +08:00
|
|
|
size_t extra_ies_len, u8 oper_class,
|
|
|
|
struct cfg80211_chan_def *chandef)
|
2014-07-17 22:14:19 +08:00
|
|
|
{
|
|
|
|
switch (action_code) {
|
|
|
|
case WLAN_TDLS_SETUP_REQUEST:
|
|
|
|
case WLAN_TDLS_SETUP_RESPONSE:
|
|
|
|
case WLAN_PUB_ACTION_TDLS_DISCOVER_RES:
|
2014-07-17 22:14:21 +08:00
|
|
|
if (status_code == 0)
|
|
|
|
ieee80211_tdls_add_setup_start_ies(sdata, skb, peer,
|
|
|
|
action_code,
|
|
|
|
initiator,
|
|
|
|
extra_ies,
|
|
|
|
extra_ies_len);
|
2014-07-17 22:14:19 +08:00
|
|
|
break;
|
|
|
|
case WLAN_TDLS_SETUP_CONFIRM:
|
2014-07-17 22:14:24 +08:00
|
|
|
if (status_code == 0)
|
|
|
|
ieee80211_tdls_add_setup_cfm_ies(sdata, skb, peer,
|
|
|
|
initiator, extra_ies,
|
|
|
|
extra_ies_len);
|
|
|
|
break;
|
2014-07-17 22:14:19 +08:00
|
|
|
case WLAN_TDLS_TEARDOWN:
|
|
|
|
case WLAN_TDLS_DISCOVERY_REQUEST:
|
2014-07-17 22:14:20 +08:00
|
|
|
if (extra_ies_len)
|
networking: introduce and use skb_put_data()
A common pattern with skb_put() is to just want to memcpy()
some data into the new space, introduce skb_put_data() for
this.
An spatch similar to the one for skb_put_zero() converts many
of the places using it:
@@
identifier p, p2;
expression len, skb, data;
type t, t2;
@@
(
-p = skb_put(skb, len);
+p = skb_put_data(skb, data, len);
|
-p = (t)skb_put(skb, len);
+p = skb_put_data(skb, data, len);
)
(
p2 = (t2)p;
-memcpy(p2, data, len);
|
-memcpy(p, data, len);
)
@@
type t, t2;
identifier p, p2;
expression skb, data;
@@
t *p;
...
(
-p = skb_put(skb, sizeof(t));
+p = skb_put_data(skb, data, sizeof(t));
|
-p = (t *)skb_put(skb, sizeof(t));
+p = skb_put_data(skb, data, sizeof(t));
)
(
p2 = (t2)p;
-memcpy(p2, data, sizeof(*p));
|
-memcpy(p, data, sizeof(*p));
)
@@
expression skb, len, data;
@@
-memcpy(skb_put(skb, len), data, len);
+skb_put_data(skb, data, len);
(again, manually post-processed to retain some comments)
Reviewed-by: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-06-16 20:29:20 +08:00
|
|
|
skb_put_data(skb, extra_ies, extra_ies_len);
|
2014-07-17 22:14:21 +08:00
|
|
|
if (status_code == 0 || action_code == WLAN_TDLS_TEARDOWN)
|
|
|
|
ieee80211_tdls_add_link_ie(sdata, skb, peer, initiator);
|
2014-07-17 22:14:19 +08:00
|
|
|
break;
|
2014-11-10 00:50:19 +08:00
|
|
|
case WLAN_TDLS_CHANNEL_SWITCH_REQUEST:
|
|
|
|
ieee80211_tdls_add_chan_switch_req_ies(sdata, skb, peer,
|
|
|
|
initiator, extra_ies,
|
|
|
|
extra_ies_len,
|
|
|
|
oper_class, chandef);
|
|
|
|
break;
|
2014-11-10 00:50:20 +08:00
|
|
|
case WLAN_TDLS_CHANNEL_SWITCH_RESPONSE:
|
|
|
|
ieee80211_tdls_add_chan_switch_resp_ies(sdata, skb, peer,
|
|
|
|
status_code,
|
|
|
|
initiator, extra_ies,
|
|
|
|
extra_ies_len);
|
|
|
|
break;
|
2014-07-17 22:14:19 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
2014-05-01 15:17:28 +08:00
|
|
|
static int
|
|
|
|
ieee80211_prep_tdls_encap_data(struct wiphy *wiphy, struct net_device *dev,
|
2014-05-19 23:19:31 +08:00
|
|
|
const u8 *peer, u8 action_code, u8 dialog_token,
|
2014-05-01 15:17:28 +08:00
|
|
|
u16 status_code, struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
|
|
|
|
struct ieee80211_tdls_data *tf;
|
|
|
|
|
networking: make skb_put & friends return void pointers
It seems like a historic accident that these return unsigned char *,
and in many places that means casts are required, more often than not.
Make these functions (skb_put, __skb_put and pskb_put) return void *
and remove all the casts across the tree, adding a (u8 *) cast only
where the unsigned char pointer was used directly, all done with the
following spatch:
@@
expression SKB, LEN;
typedef u8;
identifier fn = { skb_put, __skb_put };
@@
- *(fn(SKB, LEN))
+ *(u8 *)fn(SKB, LEN)
@@
expression E, SKB, LEN;
identifier fn = { skb_put, __skb_put };
type T;
@@
- E = ((T *)(fn(SKB, LEN)))
+ E = fn(SKB, LEN)
which actually doesn't cover pskb_put since there are only three
users overall.
A handful of stragglers were converted manually, notably a macro in
drivers/isdn/i4l/isdn_bsdcomp.c and, oddly enough, one of the many
instances in net/bluetooth/hci_sock.c. In the former file, I also
had to fix one whitespace problem spatch introduced.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-06-16 20:29:21 +08:00
|
|
|
tf = skb_put(skb, offsetof(struct ieee80211_tdls_data, u));
|
2014-05-01 15:17:28 +08:00
|
|
|
|
|
|
|
memcpy(tf->da, peer, ETH_ALEN);
|
|
|
|
memcpy(tf->sa, sdata->vif.addr, ETH_ALEN);
|
|
|
|
tf->ether_type = cpu_to_be16(ETH_P_TDLS);
|
|
|
|
tf->payload_type = WLAN_TDLS_SNAP_RFTYPE;
|
|
|
|
|
2014-09-09 22:11:02 +08:00
|
|
|
/* network header is after the ethernet header */
|
|
|
|
skb_set_network_header(skb, ETH_HLEN);
|
|
|
|
|
2014-05-01 15:17:28 +08:00
|
|
|
switch (action_code) {
|
|
|
|
case WLAN_TDLS_SETUP_REQUEST:
|
|
|
|
tf->category = WLAN_CATEGORY_TDLS;
|
|
|
|
tf->action_code = WLAN_TDLS_SETUP_REQUEST;
|
|
|
|
|
|
|
|
skb_put(skb, sizeof(tf->u.setup_req));
|
|
|
|
tf->u.setup_req.dialog_token = dialog_token;
|
|
|
|
tf->u.setup_req.capability =
|
2014-07-17 22:14:22 +08:00
|
|
|
cpu_to_le16(ieee80211_get_tdls_sta_capab(sdata,
|
|
|
|
status_code));
|
2014-05-01 15:17:28 +08:00
|
|
|
break;
|
|
|
|
case WLAN_TDLS_SETUP_RESPONSE:
|
|
|
|
tf->category = WLAN_CATEGORY_TDLS;
|
|
|
|
tf->action_code = WLAN_TDLS_SETUP_RESPONSE;
|
|
|
|
|
|
|
|
skb_put(skb, sizeof(tf->u.setup_resp));
|
|
|
|
tf->u.setup_resp.status_code = cpu_to_le16(status_code);
|
|
|
|
tf->u.setup_resp.dialog_token = dialog_token;
|
|
|
|
tf->u.setup_resp.capability =
|
2014-07-17 22:14:22 +08:00
|
|
|
cpu_to_le16(ieee80211_get_tdls_sta_capab(sdata,
|
|
|
|
status_code));
|
2014-05-01 15:17:28 +08:00
|
|
|
break;
|
|
|
|
case WLAN_TDLS_SETUP_CONFIRM:
|
|
|
|
tf->category = WLAN_CATEGORY_TDLS;
|
|
|
|
tf->action_code = WLAN_TDLS_SETUP_CONFIRM;
|
|
|
|
|
|
|
|
skb_put(skb, sizeof(tf->u.setup_cfm));
|
|
|
|
tf->u.setup_cfm.status_code = cpu_to_le16(status_code);
|
|
|
|
tf->u.setup_cfm.dialog_token = dialog_token;
|
|
|
|
break;
|
|
|
|
case WLAN_TDLS_TEARDOWN:
|
|
|
|
tf->category = WLAN_CATEGORY_TDLS;
|
|
|
|
tf->action_code = WLAN_TDLS_TEARDOWN;
|
|
|
|
|
|
|
|
skb_put(skb, sizeof(tf->u.teardown));
|
|
|
|
tf->u.teardown.reason_code = cpu_to_le16(status_code);
|
|
|
|
break;
|
|
|
|
case WLAN_TDLS_DISCOVERY_REQUEST:
|
|
|
|
tf->category = WLAN_CATEGORY_TDLS;
|
|
|
|
tf->action_code = WLAN_TDLS_DISCOVERY_REQUEST;
|
|
|
|
|
|
|
|
skb_put(skb, sizeof(tf->u.discover_req));
|
|
|
|
tf->u.discover_req.dialog_token = dialog_token;
|
|
|
|
break;
|
2014-11-10 00:50:19 +08:00
|
|
|
case WLAN_TDLS_CHANNEL_SWITCH_REQUEST:
|
|
|
|
tf->category = WLAN_CATEGORY_TDLS;
|
|
|
|
tf->action_code = WLAN_TDLS_CHANNEL_SWITCH_REQUEST;
|
|
|
|
|
|
|
|
skb_put(skb, sizeof(tf->u.chan_switch_req));
|
|
|
|
break;
|
2014-11-10 00:50:20 +08:00
|
|
|
case WLAN_TDLS_CHANNEL_SWITCH_RESPONSE:
|
|
|
|
tf->category = WLAN_CATEGORY_TDLS;
|
|
|
|
tf->action_code = WLAN_TDLS_CHANNEL_SWITCH_RESPONSE;
|
|
|
|
|
|
|
|
skb_put(skb, sizeof(tf->u.chan_switch_resp));
|
|
|
|
tf->u.chan_switch_resp.status_code = cpu_to_le16(status_code);
|
|
|
|
break;
|
2014-05-01 15:17:28 +08:00
|
|
|
default:
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
ieee80211_prep_tdls_direct(struct wiphy *wiphy, struct net_device *dev,
|
2014-05-19 23:19:31 +08:00
|
|
|
const u8 *peer, u8 action_code, u8 dialog_token,
|
2014-05-01 15:17:28 +08:00
|
|
|
u16 status_code, struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
|
|
|
|
struct ieee80211_mgmt *mgmt;
|
|
|
|
|
networking: convert many more places to skb_put_zero()
There were many places that my previous spatch didn't find,
as pointed out by yuan linyu in various patches.
The following spatch found many more and also removes the
now unnecessary casts:
@@
identifier p, p2;
expression len;
expression skb;
type t, t2;
@@
(
-p = skb_put(skb, len);
+p = skb_put_zero(skb, len);
|
-p = (t)skb_put(skb, len);
+p = skb_put_zero(skb, len);
)
... when != p
(
p2 = (t2)p;
-memset(p2, 0, len);
|
-memset(p, 0, len);
)
@@
type t, t2;
identifier p, p2;
expression skb;
@@
t *p;
...
(
-p = skb_put(skb, sizeof(t));
+p = skb_put_zero(skb, sizeof(t));
|
-p = (t *)skb_put(skb, sizeof(t));
+p = skb_put_zero(skb, sizeof(t));
)
... when != p
(
p2 = (t2)p;
-memset(p2, 0, sizeof(*p));
|
-memset(p, 0, sizeof(*p));
)
@@
expression skb, len;
@@
-memset(skb_put(skb, len), 0, len);
+skb_put_zero(skb, len);
Apply it to the tree (with one manual fixup to keep the
comment in vxlan.c, which spatch removed.)
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-06-16 20:29:19 +08:00
|
|
|
mgmt = skb_put_zero(skb, 24);
|
2014-05-01 15:17:28 +08:00
|
|
|
memcpy(mgmt->da, peer, ETH_ALEN);
|
|
|
|
memcpy(mgmt->sa, sdata->vif.addr, ETH_ALEN);
|
2022-05-16 21:00:15 +08:00
|
|
|
memcpy(mgmt->bssid, sdata->deflink.u.mgd.bssid, ETH_ALEN);
|
2014-05-01 15:17:28 +08:00
|
|
|
|
|
|
|
mgmt->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |
|
|
|
|
IEEE80211_STYPE_ACTION);
|
|
|
|
|
|
|
|
switch (action_code) {
|
|
|
|
case WLAN_PUB_ACTION_TDLS_DISCOVER_RES:
|
|
|
|
skb_put(skb, 1 + sizeof(mgmt->u.action.u.tdls_discover_resp));
|
|
|
|
mgmt->u.action.category = WLAN_CATEGORY_PUBLIC;
|
|
|
|
mgmt->u.action.u.tdls_discover_resp.action_code =
|
|
|
|
WLAN_PUB_ACTION_TDLS_DISCOVER_RES;
|
|
|
|
mgmt->u.action.u.tdls_discover_resp.dialog_token =
|
|
|
|
dialog_token;
|
|
|
|
mgmt->u.action.u.tdls_discover_resp.capability =
|
2014-07-17 22:14:22 +08:00
|
|
|
cpu_to_le16(ieee80211_get_tdls_sta_capab(sdata,
|
|
|
|
status_code));
|
2014-05-01 15:17:28 +08:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2014-11-10 00:50:16 +08:00
|
|
|
static struct sk_buff *
|
|
|
|
ieee80211_tdls_build_mgmt_packet_data(struct ieee80211_sub_if_data *sdata,
|
|
|
|
const u8 *peer, u8 action_code,
|
|
|
|
u8 dialog_token, u16 status_code,
|
|
|
|
bool initiator, const u8 *extra_ies,
|
|
|
|
size_t extra_ies_len, u8 oper_class,
|
|
|
|
struct cfg80211_chan_def *chandef)
|
2014-05-01 15:17:28 +08:00
|
|
|
{
|
|
|
|
struct ieee80211_local *local = sdata->local;
|
2014-11-10 00:50:16 +08:00
|
|
|
struct sk_buff *skb;
|
2014-05-01 15:17:28 +08:00
|
|
|
int ret;
|
|
|
|
|
2014-11-10 00:50:16 +08:00
|
|
|
skb = netdev_alloc_skb(sdata->dev,
|
2014-11-10 00:50:08 +08:00
|
|
|
local->hw.extra_tx_headroom +
|
|
|
|
max(sizeof(struct ieee80211_mgmt),
|
|
|
|
sizeof(struct ieee80211_tdls_data)) +
|
|
|
|
50 + /* supported rates */
|
2015-06-11 01:42:59 +08:00
|
|
|
10 + /* ext capab */
|
2014-11-10 00:50:08 +08:00
|
|
|
26 + /* max(WMM-info, WMM-param) */
|
|
|
|
2 + max(sizeof(struct ieee80211_ht_cap),
|
|
|
|
sizeof(struct ieee80211_ht_operation)) +
|
2015-03-01 15:10:02 +08:00
|
|
|
2 + max(sizeof(struct ieee80211_vht_cap),
|
|
|
|
sizeof(struct ieee80211_vht_operation)) +
|
2014-11-10 00:50:12 +08:00
|
|
|
50 + /* supported channels */
|
2014-11-10 00:50:13 +08:00
|
|
|
3 + /* 40/20 BSS coex */
|
2015-03-01 15:10:02 +08:00
|
|
|
4 + /* AID */
|
2015-03-18 14:46:08 +08:00
|
|
|
4 + /* oper classes */
|
2014-11-10 00:50:08 +08:00
|
|
|
extra_ies_len +
|
|
|
|
sizeof(struct ieee80211_tdls_lnkie));
|
2014-05-01 15:17:28 +08:00
|
|
|
if (!skb)
|
2014-11-10 00:50:16 +08:00
|
|
|
return NULL;
|
2014-05-01 15:17:28 +08:00
|
|
|
|
|
|
|
skb_reserve(skb, local->hw.extra_tx_headroom);
|
|
|
|
|
|
|
|
switch (action_code) {
|
|
|
|
case WLAN_TDLS_SETUP_REQUEST:
|
|
|
|
case WLAN_TDLS_SETUP_RESPONSE:
|
|
|
|
case WLAN_TDLS_SETUP_CONFIRM:
|
|
|
|
case WLAN_TDLS_TEARDOWN:
|
|
|
|
case WLAN_TDLS_DISCOVERY_REQUEST:
|
2014-11-10 00:50:19 +08:00
|
|
|
case WLAN_TDLS_CHANNEL_SWITCH_REQUEST:
|
2014-11-10 00:50:20 +08:00
|
|
|
case WLAN_TDLS_CHANNEL_SWITCH_RESPONSE:
|
2014-11-10 00:50:16 +08:00
|
|
|
ret = ieee80211_prep_tdls_encap_data(local->hw.wiphy,
|
|
|
|
sdata->dev, peer,
|
2014-05-01 15:17:28 +08:00
|
|
|
action_code, dialog_token,
|
|
|
|
status_code, skb);
|
|
|
|
break;
|
|
|
|
case WLAN_PUB_ACTION_TDLS_DISCOVER_RES:
|
2014-11-10 00:50:16 +08:00
|
|
|
ret = ieee80211_prep_tdls_direct(local->hw.wiphy, sdata->dev,
|
|
|
|
peer, action_code,
|
2014-05-01 15:17:28 +08:00
|
|
|
dialog_token, status_code,
|
|
|
|
skb);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
ret = -ENOTSUPP;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ret < 0)
|
|
|
|
goto fail;
|
|
|
|
|
2014-11-10 00:50:16 +08:00
|
|
|
ieee80211_tdls_add_ies(sdata, skb, peer, action_code, status_code,
|
|
|
|
initiator, extra_ies, extra_ies_len, oper_class,
|
|
|
|
chandef);
|
|
|
|
return skb;
|
|
|
|
|
|
|
|
fail:
|
|
|
|
dev_kfree_skb(skb);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
ieee80211_tdls_prep_mgmt_packet(struct wiphy *wiphy, struct net_device *dev,
|
|
|
|
const u8 *peer, u8 action_code, u8 dialog_token,
|
|
|
|
u16 status_code, u32 peer_capability,
|
|
|
|
bool initiator, const u8 *extra_ies,
|
|
|
|
size_t extra_ies_len, u8 oper_class,
|
|
|
|
struct cfg80211_chan_def *chandef)
|
|
|
|
{
|
|
|
|
struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
|
|
|
|
struct sk_buff *skb = NULL;
|
|
|
|
struct sta_info *sta;
|
|
|
|
u32 flags = 0;
|
|
|
|
int ret = 0;
|
|
|
|
|
2014-07-17 22:14:17 +08:00
|
|
|
rcu_read_lock();
|
|
|
|
sta = sta_info_get(sdata, peer);
|
|
|
|
|
|
|
|
/* infer the initiator if we can, to support old userspace */
|
2014-05-01 15:17:28 +08:00
|
|
|
switch (action_code) {
|
|
|
|
case WLAN_TDLS_SETUP_REQUEST:
|
2014-10-22 17:32:48 +08:00
|
|
|
if (sta) {
|
2014-07-17 22:14:17 +08:00
|
|
|
set_sta_flag(sta, WLAN_STA_TDLS_INITIATOR);
|
2014-10-22 17:32:48 +08:00
|
|
|
sta->sta.tdls_initiator = false;
|
|
|
|
}
|
2020-07-08 04:45:48 +08:00
|
|
|
fallthrough;
|
2014-05-01 15:17:28 +08:00
|
|
|
case WLAN_TDLS_SETUP_CONFIRM:
|
|
|
|
case WLAN_TDLS_DISCOVERY_REQUEST:
|
2014-07-17 22:14:17 +08:00
|
|
|
initiator = true;
|
2014-05-01 15:17:28 +08:00
|
|
|
break;
|
|
|
|
case WLAN_TDLS_SETUP_RESPONSE:
|
2014-07-17 22:14:17 +08:00
|
|
|
/*
|
|
|
|
* In some testing scenarios, we send a request and response.
|
|
|
|
* Make the last packet sent take effect for the initiator
|
|
|
|
* value.
|
|
|
|
*/
|
2014-10-22 17:32:48 +08:00
|
|
|
if (sta) {
|
2014-07-17 22:14:17 +08:00
|
|
|
clear_sta_flag(sta, WLAN_STA_TDLS_INITIATOR);
|
2014-10-22 17:32:48 +08:00
|
|
|
sta->sta.tdls_initiator = true;
|
|
|
|
}
|
2020-07-08 04:45:48 +08:00
|
|
|
fallthrough;
|
2014-05-01 15:17:28 +08:00
|
|
|
case WLAN_PUB_ACTION_TDLS_DISCOVER_RES:
|
2014-07-17 22:14:17 +08:00
|
|
|
initiator = false;
|
2014-06-11 22:18:22 +08:00
|
|
|
break;
|
|
|
|
case WLAN_TDLS_TEARDOWN:
|
2014-11-10 00:50:19 +08:00
|
|
|
case WLAN_TDLS_CHANNEL_SWITCH_REQUEST:
|
2014-11-10 00:50:20 +08:00
|
|
|
case WLAN_TDLS_CHANNEL_SWITCH_RESPONSE:
|
2014-06-11 22:18:22 +08:00
|
|
|
/* any value is ok */
|
2014-05-01 15:17:28 +08:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
ret = -ENOTSUPP;
|
2014-07-17 22:14:17 +08:00
|
|
|
break;
|
2014-05-01 15:17:28 +08:00
|
|
|
}
|
|
|
|
|
2014-07-17 22:14:19 +08:00
|
|
|
if (sta && test_sta_flag(sta, WLAN_STA_TDLS_INITIATOR))
|
|
|
|
initiator = true;
|
2014-06-11 22:18:22 +08:00
|
|
|
|
2014-07-17 22:14:17 +08:00
|
|
|
rcu_read_unlock();
|
|
|
|
if (ret < 0)
|
|
|
|
goto fail;
|
|
|
|
|
2014-11-10 00:50:16 +08:00
|
|
|
skb = ieee80211_tdls_build_mgmt_packet_data(sdata, peer, action_code,
|
|
|
|
dialog_token, status_code,
|
|
|
|
initiator, extra_ies,
|
|
|
|
extra_ies_len, oper_class,
|
|
|
|
chandef);
|
|
|
|
if (!skb) {
|
|
|
|
ret = -EINVAL;
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (action_code == WLAN_PUB_ACTION_TDLS_DISCOVER_RES) {
|
2014-05-01 15:17:28 +08:00
|
|
|
ieee80211_tx_skb(sdata, skb);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* According to 802.11z: Setup req/resp are sent in AC_BK, otherwise
|
|
|
|
* we should default to AC_VI.
|
|
|
|
*/
|
|
|
|
switch (action_code) {
|
|
|
|
case WLAN_TDLS_SETUP_REQUEST:
|
|
|
|
case WLAN_TDLS_SETUP_RESPONSE:
|
2018-09-05 19:34:02 +08:00
|
|
|
skb->priority = 256 + 2;
|
2014-05-01 15:17:28 +08:00
|
|
|
break;
|
|
|
|
default:
|
2018-09-05 19:34:02 +08:00
|
|
|
skb->priority = 256 + 5;
|
2014-05-01 15:17:28 +08:00
|
|
|
break;
|
|
|
|
}
|
2018-09-05 19:34:02 +08:00
|
|
|
skb_set_queue_mapping(skb, ieee80211_select_queue(sdata, skb));
|
2014-05-01 15:17:28 +08:00
|
|
|
|
2014-11-10 00:50:08 +08:00
|
|
|
/*
|
|
|
|
* Set the WLAN_TDLS_TEARDOWN flag to indicate a teardown in progress.
|
|
|
|
* Later, if no ACK is returned from peer, we will re-send the teardown
|
|
|
|
* packet through the AP.
|
|
|
|
*/
|
|
|
|
if ((action_code == WLAN_TDLS_TEARDOWN) &&
|
2015-06-03 03:39:54 +08:00
|
|
|
ieee80211_hw_check(&sdata->local->hw, REPORTS_TX_ACK_STATUS)) {
|
2014-11-10 00:50:08 +08:00
|
|
|
bool try_resend; /* Should we keep skb for possible resend */
|
|
|
|
|
|
|
|
/* If not sending directly to peer - no point in keeping skb */
|
|
|
|
rcu_read_lock();
|
|
|
|
sta = sta_info_get(sdata, peer);
|
|
|
|
try_resend = sta && test_sta_flag(sta, WLAN_STA_TDLS_PEER_AUTH);
|
|
|
|
rcu_read_unlock();
|
|
|
|
|
|
|
|
spin_lock_bh(&sdata->u.mgd.teardown_lock);
|
|
|
|
if (try_resend && !sdata->u.mgd.teardown_skb) {
|
|
|
|
/* Mark it as requiring TX status callback */
|
|
|
|
flags |= IEEE80211_TX_CTL_REQ_TX_STATUS |
|
|
|
|
IEEE80211_TX_INTFL_MLME_CONN_TX;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* skb is copied since mac80211 will later set
|
|
|
|
* properties that might not be the same as the AP,
|
|
|
|
* such as encryption, QoS, addresses, etc.
|
|
|
|
*
|
|
|
|
* No problem if skb_copy() fails, so no need to check.
|
|
|
|
*/
|
|
|
|
sdata->u.mgd.teardown_skb = skb_copy(skb, GFP_ATOMIC);
|
|
|
|
sdata->u.mgd.orig_teardown_skb = skb;
|
|
|
|
}
|
|
|
|
spin_unlock_bh(&sdata->u.mgd.teardown_lock);
|
|
|
|
}
|
|
|
|
|
2014-05-01 15:17:28 +08:00
|
|
|
/* disable bottom halves when entering the Tx path */
|
|
|
|
local_bh_disable();
|
2020-05-28 00:03:34 +08:00
|
|
|
__ieee80211_subif_start_xmit(skb, dev, flags, 0, NULL);
|
2014-05-01 15:17:28 +08:00
|
|
|
local_bh_enable();
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
fail:
|
|
|
|
dev_kfree_skb(skb);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2014-06-11 22:18:23 +08:00
|
|
|
static int
|
|
|
|
ieee80211_tdls_mgmt_setup(struct wiphy *wiphy, struct net_device *dev,
|
|
|
|
const u8 *peer, u8 action_code, u8 dialog_token,
|
|
|
|
u16 status_code, u32 peer_capability, bool initiator,
|
|
|
|
const u8 *extra_ies, size_t extra_ies_len)
|
2014-06-11 22:18:20 +08:00
|
|
|
{
|
|
|
|
struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
|
|
|
|
struct ieee80211_local *local = sdata->local;
|
2022-05-16 21:00:15 +08:00
|
|
|
enum ieee80211_smps_mode smps_mode =
|
|
|
|
sdata->deflink.u.mgd.driver_smps_mode;
|
2014-06-11 22:18:20 +08:00
|
|
|
int ret;
|
|
|
|
|
2015-06-14 21:53:46 +08:00
|
|
|
/* don't support setup with forced SMPS mode that's not off */
|
|
|
|
if (smps_mode != IEEE80211_SMPS_AUTOMATIC &&
|
|
|
|
smps_mode != IEEE80211_SMPS_OFF) {
|
|
|
|
tdls_dbg(sdata, "Aborting TDLS setup due to SMPS mode %d\n",
|
|
|
|
smps_mode);
|
|
|
|
return -ENOTSUPP;
|
|
|
|
}
|
|
|
|
|
2014-06-11 22:18:20 +08:00
|
|
|
mutex_lock(&local->mtx);
|
|
|
|
|
|
|
|
/* we don't support concurrent TDLS peer setups */
|
2014-07-17 22:14:25 +08:00
|
|
|
if (!is_zero_ether_addr(sdata->u.mgd.tdls_peer) &&
|
|
|
|
!ether_addr_equal(sdata->u.mgd.tdls_peer, peer)) {
|
2014-06-11 22:18:20 +08:00
|
|
|
ret = -EBUSY;
|
2015-03-01 15:10:09 +08:00
|
|
|
goto out_unlock;
|
2014-06-11 22:18:20 +08:00
|
|
|
}
|
|
|
|
|
2014-06-11 22:18:26 +08:00
|
|
|
/*
|
|
|
|
* 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
|
2014-07-17 22:14:18 +08:00
|
|
|
* during setup through the AP path.
|
|
|
|
* Allow error packets to be sent - sometimes we don't even add a STA
|
|
|
|
* before failing the setup.
|
2014-06-11 22:18:26 +08:00
|
|
|
*/
|
2014-07-17 22:14:18 +08:00
|
|
|
if (status_code == 0) {
|
|
|
|
rcu_read_lock();
|
|
|
|
if (!sta_info_get(sdata, peer)) {
|
|
|
|
rcu_read_unlock();
|
|
|
|
ret = -ENOLINK;
|
2015-03-01 15:10:09 +08:00
|
|
|
goto out_unlock;
|
2014-07-17 22:14:18 +08:00
|
|
|
}
|
2014-06-11 22:18:26 +08:00
|
|
|
rcu_read_unlock();
|
|
|
|
}
|
|
|
|
|
2015-01-07 21:42:39 +08:00
|
|
|
ieee80211_flush_queues(local, sdata, false);
|
2015-03-01 15:10:09 +08:00
|
|
|
memcpy(sdata->u.mgd.tdls_peer, peer, ETH_ALEN);
|
|
|
|
mutex_unlock(&local->mtx);
|
2014-06-11 22:18:24 +08:00
|
|
|
|
2015-03-01 15:10:09 +08:00
|
|
|
/* we cannot take the mutex while preparing the setup packet */
|
2014-06-11 22:18:20 +08:00
|
|
|
ret = ieee80211_tdls_prep_mgmt_packet(wiphy, dev, peer, action_code,
|
|
|
|
dialog_token, status_code,
|
2014-06-11 22:18:22 +08:00
|
|
|
peer_capability, initiator,
|
2014-11-10 00:50:16 +08:00
|
|
|
extra_ies, extra_ies_len, 0,
|
|
|
|
NULL);
|
2015-03-01 15:10:09 +08:00
|
|
|
if (ret < 0) {
|
|
|
|
mutex_lock(&local->mtx);
|
|
|
|
eth_zero_addr(sdata->u.mgd.tdls_peer);
|
|
|
|
mutex_unlock(&local->mtx);
|
|
|
|
return ret;
|
|
|
|
}
|
2014-06-11 22:18:20 +08:00
|
|
|
|
2014-06-11 22:18:23 +08:00
|
|
|
ieee80211_queue_delayed_work(&sdata->local->hw,
|
2014-07-17 22:14:25 +08:00
|
|
|
&sdata->u.mgd.tdls_peer_del_work,
|
2014-06-11 22:18:23 +08:00
|
|
|
TDLS_PEER_SETUP_TIMEOUT);
|
2015-03-01 15:10:09 +08:00
|
|
|
return 0;
|
2014-06-11 22:18:20 +08:00
|
|
|
|
2015-03-01 15:10:09 +08:00
|
|
|
out_unlock:
|
2014-06-11 22:18:20 +08:00
|
|
|
mutex_unlock(&local->mtx);
|
2014-06-11 22:18:23 +08:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2014-06-11 22:18:24 +08:00
|
|
|
static int
|
|
|
|
ieee80211_tdls_mgmt_teardown(struct wiphy *wiphy, struct net_device *dev,
|
|
|
|
const u8 *peer, u8 action_code, u8 dialog_token,
|
|
|
|
u16 status_code, u32 peer_capability,
|
|
|
|
bool initiator, const u8 *extra_ies,
|
|
|
|
size_t extra_ies_len)
|
|
|
|
{
|
|
|
|
struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
|
|
|
|
struct ieee80211_local *local = sdata->local;
|
|
|
|
struct sta_info *sta;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* No packets can be transmitted to the peer via the AP during setup -
|
|
|
|
* the STA is set as a TDLS peer, but is not authorized.
|
|
|
|
* During teardown, we prevent direct transmissions by stopping the
|
|
|
|
* queues and flushing all direct packets.
|
|
|
|
*/
|
|
|
|
ieee80211_stop_vif_queues(local, sdata,
|
|
|
|
IEEE80211_QUEUE_STOP_REASON_TDLS_TEARDOWN);
|
2015-01-07 21:42:39 +08:00
|
|
|
ieee80211_flush_queues(local, sdata, false);
|
2014-06-11 22:18:24 +08:00
|
|
|
|
|
|
|
ret = ieee80211_tdls_prep_mgmt_packet(wiphy, dev, peer, action_code,
|
|
|
|
dialog_token, status_code,
|
|
|
|
peer_capability, initiator,
|
2014-11-10 00:50:16 +08:00
|
|
|
extra_ies, extra_ies_len, 0,
|
|
|
|
NULL);
|
2014-06-11 22:18:24 +08:00
|
|
|
if (ret < 0)
|
|
|
|
sdata_err(sdata, "Failed sending TDLS teardown packet %d\n",
|
|
|
|
ret);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Remove the STA AUTH flag to force further traffic through the AP. If
|
|
|
|
* the STA was unreachable, it was already removed.
|
|
|
|
*/
|
|
|
|
rcu_read_lock();
|
|
|
|
sta = sta_info_get(sdata, peer);
|
|
|
|
if (sta)
|
|
|
|
clear_sta_flag(sta, WLAN_STA_TDLS_PEER_AUTH);
|
|
|
|
rcu_read_unlock();
|
|
|
|
|
|
|
|
ieee80211_wake_vif_queues(local, sdata,
|
|
|
|
IEEE80211_QUEUE_STOP_REASON_TDLS_TEARDOWN);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2014-06-11 22:18:23 +08:00
|
|
|
int ieee80211_tdls_mgmt(struct wiphy *wiphy, struct net_device *dev,
|
|
|
|
const u8 *peer, u8 action_code, u8 dialog_token,
|
|
|
|
u16 status_code, u32 peer_capability,
|
|
|
|
bool initiator, const u8 *extra_ies,
|
|
|
|
size_t extra_ies_len)
|
|
|
|
{
|
|
|
|
struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
if (!(wiphy->flags & WIPHY_FLAG_SUPPORTS_TDLS))
|
|
|
|
return -ENOTSUPP;
|
|
|
|
|
|
|
|
/* make sure we are in managed mode, and associated */
|
|
|
|
if (sdata->vif.type != NL80211_IFTYPE_STATION ||
|
|
|
|
!sdata->u.mgd.associated)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
switch (action_code) {
|
|
|
|
case WLAN_TDLS_SETUP_REQUEST:
|
|
|
|
case WLAN_TDLS_SETUP_RESPONSE:
|
|
|
|
ret = ieee80211_tdls_mgmt_setup(wiphy, dev, peer, action_code,
|
|
|
|
dialog_token, status_code,
|
|
|
|
peer_capability, initiator,
|
|
|
|
extra_ies, extra_ies_len);
|
|
|
|
break;
|
|
|
|
case WLAN_TDLS_TEARDOWN:
|
2014-06-11 22:18:24 +08:00
|
|
|
ret = ieee80211_tdls_mgmt_teardown(wiphy, dev, peer,
|
|
|
|
action_code, dialog_token,
|
|
|
|
status_code,
|
|
|
|
peer_capability, initiator,
|
|
|
|
extra_ies, extra_ies_len);
|
|
|
|
break;
|
2014-06-11 22:18:23 +08:00
|
|
|
case WLAN_TDLS_DISCOVERY_REQUEST:
|
2014-06-11 22:18:27 +08:00
|
|
|
/*
|
|
|
|
* Protect the discovery so we can hear the TDLS discovery
|
|
|
|
* response frame. It is transmitted directly and not buffered
|
|
|
|
* by the AP.
|
|
|
|
*/
|
|
|
|
drv_mgd_protect_tdls_discover(sdata->local, sdata);
|
2020-07-08 04:45:48 +08:00
|
|
|
fallthrough;
|
2014-06-11 22:18:27 +08:00
|
|
|
case WLAN_TDLS_SETUP_CONFIRM:
|
2014-06-11 22:18:23 +08:00
|
|
|
case WLAN_PUB_ACTION_TDLS_DISCOVER_RES:
|
|
|
|
/* no special handling */
|
|
|
|
ret = ieee80211_tdls_prep_mgmt_packet(wiphy, dev, peer,
|
|
|
|
action_code,
|
|
|
|
dialog_token,
|
|
|
|
status_code,
|
|
|
|
peer_capability,
|
|
|
|
initiator, extra_ies,
|
2014-11-10 00:50:16 +08:00
|
|
|
extra_ies_len, 0, NULL);
|
2014-06-11 22:18:23 +08:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
ret = -EOPNOTSUPP;
|
|
|
|
break;
|
|
|
|
}
|
2014-06-11 22:18:20 +08:00
|
|
|
|
|
|
|
tdls_dbg(sdata, "TDLS mgmt action %d peer %pM status %d\n",
|
|
|
|
action_code, peer, ret);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2016-03-03 05:28:32 +08:00
|
|
|
static void iee80211_tdls_recalc_chanctx(struct ieee80211_sub_if_data *sdata,
|
|
|
|
struct sta_info *sta)
|
2015-06-11 01:41:23 +08:00
|
|
|
{
|
|
|
|
struct ieee80211_local *local = sdata->local;
|
|
|
|
struct ieee80211_chanctx_conf *conf;
|
|
|
|
struct ieee80211_chanctx *ctx;
|
2016-03-03 05:28:32 +08:00
|
|
|
enum nl80211_chan_width width;
|
|
|
|
struct ieee80211_supported_band *sband;
|
2015-06-11 01:41:23 +08:00
|
|
|
|
|
|
|
mutex_lock(&local->chanctx_mtx);
|
wifi: mac80211: move some future per-link data to bss_conf
To add MLD, reuse the bss_conf structure later for per-link
information, so move some things into it that are per link.
Most transformations were done with the following spatch:
@@
expression sdata;
identifier var = { chanctx_conf, mu_mimo_owner, csa_active, color_change_active, color_change_color };
@@
-sdata->vif.var
+sdata->vif.bss_conf.var
@@
struct ieee80211_vif *vif;
identifier var = { chanctx_conf, mu_mimo_owner, csa_active, color_change_active, color_change_color };
@@
-vif->var
+vif->bss_conf.var
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2022-05-10 19:26:44 +08:00
|
|
|
conf = rcu_dereference_protected(sdata->vif.bss_conf.chanctx_conf,
|
2015-06-11 01:41:23 +08:00
|
|
|
lockdep_is_held(&local->chanctx_mtx));
|
|
|
|
if (conf) {
|
2016-03-03 05:28:32 +08:00
|
|
|
width = conf->def.width;
|
|
|
|
sband = local->hw.wiphy->bands[conf->def.chan->band];
|
2015-06-11 01:41:23 +08:00
|
|
|
ctx = container_of(conf, struct ieee80211_chanctx, conf);
|
|
|
|
ieee80211_recalc_chanctx_chantype(local, ctx);
|
2016-03-03 05:28:32 +08:00
|
|
|
|
|
|
|
/* if width changed and a peer is given, update its BW */
|
|
|
|
if (width != conf->def.width && sta &&
|
|
|
|
test_sta_flag(sta, WLAN_STA_TDLS_WIDER_BW)) {
|
|
|
|
enum ieee80211_sta_rx_bandwidth bw;
|
|
|
|
|
|
|
|
bw = ieee80211_chan_width_to_rx_bw(conf->def.width);
|
2022-06-15 15:20:45 +08:00
|
|
|
bw = min(bw, ieee80211_sta_cap_rx_bw(&sta->deflink));
|
mac80211: prepare sta handling for MLO support
Currently in mac80211 each STA object is represented
using sta_info datastructure with the associated
STA specific information and drivers access ieee80211_sta
part of it.
With MLO (Multi Link Operation) support being added
in 802.11be standard, though the association is logically
with a single Multi Link capable STA, at the physical level
communication can happen via different advertised
links (uniquely identified by Channel, operating class,
BSSID) and hence the need to handle multiple link
STA parameters within a composite sta_info object
called the MLD STA. The different link STA part of
MLD STA are identified using the link address which can
be same or different as the MLD STA address and unique
link id based on the link vif.
To support extension of such a model, the sta_info
datastructure is modified to hold multiple link STA
objects with link specific params currently within
sta_info moved to this new structure. Similarly this is
done for ieee80211_sta as well which will be accessed
within mac80211 as well as by drivers, hence trivial
driver changes are expected to support this.
For current non MLO supported drivers, only one link STA
is present and link information is accessed via 'deflink'
member.
For MLO drivers, we still need to define the APIs etc. to
get the correct link ID and access the correct part of
the station info.
Currently in mac80211, all link STA info are accessed directly
via deflink. These will be updated to access via link pointers
indexed by link id with MLO support patches, with link id
being 0 for non MLO supported cases.
Except for couple of macro related changes, below spatch takes
care of updating mac80211 and driver code to access to the
link STA info via deflink.
@ieee80211_sta@
struct ieee80211_sta *s;
struct sta_info *si;
identifier var = {supp_rates, ht_cap, vht_cap, he_cap, he_6ghz_capa, eht_cap, rx_nss, bandwidth, txpwr};
@@
(
s->
- var
+ deflink.var
|
si->sta.
- var
+ deflink.var
)
@sta_info@
struct sta_info *si;
identifier var = {gtk, pcpu_rx_stats, rx_stats, rx_stats_avg, status_stats, tx_stats, cur_max_bandwidth};
@@
(
si->
- var
+ deflink.var
)
Signed-off-by: Sriram R <quic_srirrama@quicinc.com>
Link: https://lore.kernel.org/r/1649086883-13246-1-git-send-email-quic_srirrama@quicinc.com
[remove MLO-drivers notes from commit message, not clear yet; run spatch]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2022-04-04 23:41:23 +08:00
|
|
|
if (bw != sta->sta.deflink.bandwidth) {
|
|
|
|
sta->sta.deflink.bandwidth = bw;
|
2022-05-31 00:35:23 +08:00
|
|
|
rate_control_rate_update(local, sband, sta, 0,
|
2016-03-03 05:28:32 +08:00
|
|
|
IEEE80211_RC_BW_CHANGED);
|
|
|
|
/*
|
|
|
|
* if a TDLS peer BW was updated, we need to
|
|
|
|
* recalc the chandef width again, to get the
|
|
|
|
* correct chanctx min_def
|
|
|
|
*/
|
|
|
|
ieee80211_recalc_chanctx_chantype(local, ctx);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-06-11 01:41:23 +08:00
|
|
|
}
|
|
|
|
mutex_unlock(&local->chanctx_mtx);
|
|
|
|
}
|
|
|
|
|
2015-08-18 21:52:07 +08:00
|
|
|
static int iee80211_tdls_have_ht_peers(struct ieee80211_sub_if_data *sdata)
|
|
|
|
{
|
|
|
|
struct sta_info *sta;
|
|
|
|
bool result = false;
|
|
|
|
|
|
|
|
rcu_read_lock();
|
|
|
|
list_for_each_entry_rcu(sta, &sdata->local->sta_list, list) {
|
|
|
|
if (!sta->sta.tdls || sta->sdata != sdata || !sta->uploaded ||
|
|
|
|
!test_sta_flag(sta, WLAN_STA_AUTHORIZED) ||
|
|
|
|
!test_sta_flag(sta, WLAN_STA_TDLS_PEER_AUTH) ||
|
mac80211: prepare sta handling for MLO support
Currently in mac80211 each STA object is represented
using sta_info datastructure with the associated
STA specific information and drivers access ieee80211_sta
part of it.
With MLO (Multi Link Operation) support being added
in 802.11be standard, though the association is logically
with a single Multi Link capable STA, at the physical level
communication can happen via different advertised
links (uniquely identified by Channel, operating class,
BSSID) and hence the need to handle multiple link
STA parameters within a composite sta_info object
called the MLD STA. The different link STA part of
MLD STA are identified using the link address which can
be same or different as the MLD STA address and unique
link id based on the link vif.
To support extension of such a model, the sta_info
datastructure is modified to hold multiple link STA
objects with link specific params currently within
sta_info moved to this new structure. Similarly this is
done for ieee80211_sta as well which will be accessed
within mac80211 as well as by drivers, hence trivial
driver changes are expected to support this.
For current non MLO supported drivers, only one link STA
is present and link information is accessed via 'deflink'
member.
For MLO drivers, we still need to define the APIs etc. to
get the correct link ID and access the correct part of
the station info.
Currently in mac80211, all link STA info are accessed directly
via deflink. These will be updated to access via link pointers
indexed by link id with MLO support patches, with link id
being 0 for non MLO supported cases.
Except for couple of macro related changes, below spatch takes
care of updating mac80211 and driver code to access to the
link STA info via deflink.
@ieee80211_sta@
struct ieee80211_sta *s;
struct sta_info *si;
identifier var = {supp_rates, ht_cap, vht_cap, he_cap, he_6ghz_capa, eht_cap, rx_nss, bandwidth, txpwr};
@@
(
s->
- var
+ deflink.var
|
si->sta.
- var
+ deflink.var
)
@sta_info@
struct sta_info *si;
identifier var = {gtk, pcpu_rx_stats, rx_stats, rx_stats_avg, status_stats, tx_stats, cur_max_bandwidth};
@@
(
si->
- var
+ deflink.var
)
Signed-off-by: Sriram R <quic_srirrama@quicinc.com>
Link: https://lore.kernel.org/r/1649086883-13246-1-git-send-email-quic_srirrama@quicinc.com
[remove MLO-drivers notes from commit message, not clear yet; run spatch]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2022-04-04 23:41:23 +08:00
|
|
|
!sta->sta.deflink.ht_cap.ht_supported)
|
2015-08-18 21:52:07 +08:00
|
|
|
continue;
|
|
|
|
result = true;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
rcu_read_unlock();
|
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
iee80211_tdls_recalc_ht_protection(struct ieee80211_sub_if_data *sdata,
|
|
|
|
struct sta_info *sta)
|
|
|
|
{
|
|
|
|
bool tdls_ht;
|
|
|
|
u16 protection = IEEE80211_HT_OP_MODE_PROTECTION_NONHT_MIXED |
|
|
|
|
IEEE80211_HT_OP_MODE_NON_GF_STA_PRSNT |
|
|
|
|
IEEE80211_HT_OP_MODE_NON_HT_STA_PRSNT;
|
|
|
|
u16 opmode;
|
|
|
|
|
|
|
|
/* Nothing to do if the BSS connection uses HT */
|
2022-06-23 18:04:55 +08:00
|
|
|
if (!(sdata->deflink.u.mgd.conn_flags & IEEE80211_CONN_DISABLE_HT))
|
2015-08-18 21:52:07 +08:00
|
|
|
return;
|
|
|
|
|
mac80211: prepare sta handling for MLO support
Currently in mac80211 each STA object is represented
using sta_info datastructure with the associated
STA specific information and drivers access ieee80211_sta
part of it.
With MLO (Multi Link Operation) support being added
in 802.11be standard, though the association is logically
with a single Multi Link capable STA, at the physical level
communication can happen via different advertised
links (uniquely identified by Channel, operating class,
BSSID) and hence the need to handle multiple link
STA parameters within a composite sta_info object
called the MLD STA. The different link STA part of
MLD STA are identified using the link address which can
be same or different as the MLD STA address and unique
link id based on the link vif.
To support extension of such a model, the sta_info
datastructure is modified to hold multiple link STA
objects with link specific params currently within
sta_info moved to this new structure. Similarly this is
done for ieee80211_sta as well which will be accessed
within mac80211 as well as by drivers, hence trivial
driver changes are expected to support this.
For current non MLO supported drivers, only one link STA
is present and link information is accessed via 'deflink'
member.
For MLO drivers, we still need to define the APIs etc. to
get the correct link ID and access the correct part of
the station info.
Currently in mac80211, all link STA info are accessed directly
via deflink. These will be updated to access via link pointers
indexed by link id with MLO support patches, with link id
being 0 for non MLO supported cases.
Except for couple of macro related changes, below spatch takes
care of updating mac80211 and driver code to access to the
link STA info via deflink.
@ieee80211_sta@
struct ieee80211_sta *s;
struct sta_info *si;
identifier var = {supp_rates, ht_cap, vht_cap, he_cap, he_6ghz_capa, eht_cap, rx_nss, bandwidth, txpwr};
@@
(
s->
- var
+ deflink.var
|
si->sta.
- var
+ deflink.var
)
@sta_info@
struct sta_info *si;
identifier var = {gtk, pcpu_rx_stats, rx_stats, rx_stats_avg, status_stats, tx_stats, cur_max_bandwidth};
@@
(
si->
- var
+ deflink.var
)
Signed-off-by: Sriram R <quic_srirrama@quicinc.com>
Link: https://lore.kernel.org/r/1649086883-13246-1-git-send-email-quic_srirrama@quicinc.com
[remove MLO-drivers notes from commit message, not clear yet; run spatch]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2022-04-04 23:41:23 +08:00
|
|
|
tdls_ht = (sta && sta->sta.deflink.ht_cap.ht_supported) ||
|
2015-08-18 21:52:07 +08:00
|
|
|
iee80211_tdls_have_ht_peers(sdata);
|
|
|
|
|
|
|
|
opmode = sdata->vif.bss_conf.ht_operation_mode;
|
|
|
|
|
|
|
|
if (tdls_ht)
|
|
|
|
opmode |= protection;
|
|
|
|
else
|
|
|
|
opmode &= ~protection;
|
|
|
|
|
|
|
|
if (opmode == sdata->vif.bss_conf.ht_operation_mode)
|
|
|
|
return;
|
|
|
|
|
|
|
|
sdata->vif.bss_conf.ht_operation_mode = opmode;
|
2022-06-18 04:36:37 +08:00
|
|
|
ieee80211_link_info_change_notify(sdata, &sdata->deflink,
|
|
|
|
BSS_CHANGED_HT);
|
2015-08-18 21:52:07 +08:00
|
|
|
}
|
|
|
|
|
2014-05-01 15:17:28 +08:00
|
|
|
int ieee80211_tdls_oper(struct wiphy *wiphy, struct net_device *dev,
|
2014-05-19 23:19:31 +08:00
|
|
|
const u8 *peer, enum nl80211_tdls_operation oper)
|
2014-05-01 15:17:28 +08:00
|
|
|
{
|
|
|
|
struct sta_info *sta;
|
|
|
|
struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
|
2014-06-11 22:18:20 +08:00
|
|
|
struct ieee80211_local *local = sdata->local;
|
|
|
|
int ret;
|
2014-05-01 15:17:28 +08:00
|
|
|
|
|
|
|
if (!(wiphy->flags & WIPHY_FLAG_SUPPORTS_TDLS))
|
|
|
|
return -ENOTSUPP;
|
|
|
|
|
|
|
|
if (sdata->vif.type != NL80211_IFTYPE_STATION)
|
|
|
|
return -EINVAL;
|
|
|
|
|
2014-06-11 22:18:20 +08:00
|
|
|
switch (oper) {
|
|
|
|
case NL80211_TDLS_ENABLE_LINK:
|
|
|
|
case NL80211_TDLS_DISABLE_LINK:
|
|
|
|
break;
|
|
|
|
case NL80211_TDLS_TEARDOWN:
|
|
|
|
case NL80211_TDLS_SETUP:
|
|
|
|
case NL80211_TDLS_DISCOVERY_REQ:
|
|
|
|
/* We don't support in-driver setup/teardown/discovery */
|
|
|
|
return -ENOTSUPP;
|
|
|
|
}
|
|
|
|
|
2015-08-18 21:52:07 +08:00
|
|
|
/* protect possible bss_conf changes and avoid concurrency in
|
|
|
|
* ieee80211_bss_info_change_notify()
|
|
|
|
*/
|
|
|
|
sdata_lock(sdata);
|
2014-06-11 22:18:20 +08:00
|
|
|
mutex_lock(&local->mtx);
|
2014-05-01 15:17:28 +08:00
|
|
|
tdls_dbg(sdata, "TDLS oper %d peer %pM\n", oper, peer);
|
|
|
|
|
|
|
|
switch (oper) {
|
|
|
|
case NL80211_TDLS_ENABLE_LINK:
|
wifi: mac80211: move some future per-link data to bss_conf
To add MLD, reuse the bss_conf structure later for per-link
information, so move some things into it that are per link.
Most transformations were done with the following spatch:
@@
expression sdata;
identifier var = { chanctx_conf, mu_mimo_owner, csa_active, color_change_active, color_change_color };
@@
-sdata->vif.var
+sdata->vif.bss_conf.var
@@
struct ieee80211_vif *vif;
identifier var = { chanctx_conf, mu_mimo_owner, csa_active, color_change_active, color_change_color };
@@
-vif->var
+vif->bss_conf.var
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2022-05-10 19:26:44 +08:00
|
|
|
if (sdata->vif.bss_conf.csa_active) {
|
2015-05-19 19:36:48 +08:00
|
|
|
tdls_dbg(sdata, "TDLS: disallow link during CSA\n");
|
|
|
|
ret = -EBUSY;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2015-08-18 21:52:07 +08:00
|
|
|
mutex_lock(&local->sta_mtx);
|
2014-05-01 15:17:28 +08:00
|
|
|
sta = sta_info_get(sdata, peer);
|
|
|
|
if (!sta) {
|
2015-08-18 21:52:07 +08:00
|
|
|
mutex_unlock(&local->sta_mtx);
|
2014-06-11 22:18:20 +08:00
|
|
|
ret = -ENOLINK;
|
|
|
|
break;
|
2014-05-01 15:17:28 +08:00
|
|
|
}
|
|
|
|
|
2016-03-03 05:28:32 +08:00
|
|
|
iee80211_tdls_recalc_chanctx(sdata, sta);
|
2015-08-18 21:52:07 +08:00
|
|
|
iee80211_tdls_recalc_ht_protection(sdata, sta);
|
|
|
|
|
2014-05-01 15:17:28 +08:00
|
|
|
set_sta_flag(sta, WLAN_STA_TDLS_PEER_AUTH);
|
2015-08-18 21:52:07 +08:00
|
|
|
mutex_unlock(&local->sta_mtx);
|
2014-06-11 22:18:20 +08:00
|
|
|
|
2014-07-17 22:14:25 +08:00
|
|
|
WARN_ON_ONCE(is_zero_ether_addr(sdata->u.mgd.tdls_peer) ||
|
|
|
|
!ether_addr_equal(sdata->u.mgd.tdls_peer, peer));
|
2014-06-11 22:18:20 +08:00
|
|
|
ret = 0;
|
2014-05-01 15:17:28 +08:00
|
|
|
break;
|
|
|
|
case NL80211_TDLS_DISABLE_LINK:
|
2014-07-17 22:14:31 +08:00
|
|
|
/*
|
|
|
|
* 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);
|
2014-06-11 22:18:24 +08:00
|
|
|
/* flush a potentially queued teardown packet */
|
2015-01-07 21:42:39 +08:00
|
|
|
ieee80211_flush_queues(local, sdata, false);
|
2014-06-11 22:18:24 +08:00
|
|
|
|
2014-06-11 22:18:20 +08:00
|
|
|
ret = sta_info_destroy_addr(sdata, peer);
|
2015-08-18 21:52:07 +08:00
|
|
|
|
|
|
|
mutex_lock(&local->sta_mtx);
|
|
|
|
iee80211_tdls_recalc_ht_protection(sdata, NULL);
|
|
|
|
mutex_unlock(&local->sta_mtx);
|
|
|
|
|
2016-03-03 05:28:32 +08:00
|
|
|
iee80211_tdls_recalc_chanctx(sdata, NULL);
|
2014-06-11 22:18:20 +08:00
|
|
|
break;
|
2014-05-01 15:17:28 +08:00
|
|
|
default:
|
2014-06-11 22:18:20 +08:00
|
|
|
ret = -ENOTSUPP;
|
|
|
|
break;
|
2014-05-01 15:17:28 +08:00
|
|
|
}
|
|
|
|
|
2014-07-17 22:14:25 +08:00
|
|
|
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);
|
2014-06-11 22:18:20 +08:00
|
|
|
}
|
|
|
|
|
2015-06-14 21:53:46 +08:00
|
|
|
if (ret == 0)
|
|
|
|
ieee80211_queue_work(&sdata->local->hw,
|
2022-05-16 21:00:15 +08:00
|
|
|
&sdata->deflink.u.mgd.request_smps_work);
|
2015-06-14 21:53:46 +08:00
|
|
|
|
2014-06-11 22:18:20 +08:00
|
|
|
mutex_unlock(&local->mtx);
|
2015-08-18 21:52:07 +08:00
|
|
|
sdata_unlock(sdata);
|
2014-06-11 22:18:20 +08:00
|
|
|
return ret;
|
2014-05-01 15:17:28 +08:00
|
|
|
}
|
2014-06-11 22:18:25 +08:00
|
|
|
|
|
|
|
void ieee80211_tdls_oper_request(struct ieee80211_vif *vif, const u8 *peer,
|
|
|
|
enum nl80211_tdls_operation oper,
|
|
|
|
u16 reason_code, gfp_t gfp)
|
|
|
|
{
|
|
|
|
struct ieee80211_sub_if_data *sdata = vif_to_sdata(vif);
|
|
|
|
|
wifi: mac80211: move interface config to new struct
We'll use bss_conf for per-link configuration later, so
move out all the non-link-specific data out into a new
struct ieee80211_vif_cfg used in the vif.
Some adjustments were done with the following spatch:
@@
expression sdata;
struct ieee80211_vif *vifp;
identifier var = { assoc, ibss_joined, aid, arp_addr_list, arp_addr_cnt, ssid, ssid_len, s1g, ibss_creator };
@@
(
-sdata->vif.bss_conf.var
+sdata->vif.cfg.var
|
-vifp->bss_conf.var
+vifp->cfg.var
)
@bss_conf@
struct ieee80211_bss_conf *bss_conf;
identifier var = { assoc, ibss_joined, aid, arp_addr_list, arp_addr_cnt, ssid, ssid_len, s1g, ibss_creator };
@@
-bss_conf->var
+vif_cfg->var
(though more manual fixups were needed, e.g. replacing
"vif_cfg->" by "vif->cfg." in many files.)
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2022-05-10 23:05:04 +08:00
|
|
|
if (vif->type != NL80211_IFTYPE_STATION || !vif->cfg.assoc) {
|
2014-06-11 22:18:25 +08:00
|
|
|
sdata_err(sdata, "Discarding TDLS oper %d - not STA or disconnected\n",
|
|
|
|
oper);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
cfg80211_tdls_oper_request(sdata->dev, peer, oper, reason_code, gfp);
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(ieee80211_tdls_oper_request);
|
2014-11-10 00:50:19 +08:00
|
|
|
|
|
|
|
static void
|
|
|
|
iee80211_tdls_add_ch_switch_timing(u8 *buf, u16 switch_time, u16 switch_timeout)
|
|
|
|
{
|
|
|
|
struct ieee80211_ch_switch_timing *ch_sw;
|
|
|
|
|
|
|
|
*buf++ = WLAN_EID_CHAN_SWITCH_TIMING;
|
|
|
|
*buf++ = sizeof(struct ieee80211_ch_switch_timing);
|
|
|
|
|
|
|
|
ch_sw = (void *)buf;
|
|
|
|
ch_sw->switch_time = cpu_to_le16(switch_time);
|
|
|
|
ch_sw->switch_timeout = cpu_to_le16(switch_timeout);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* find switch timing IE in SKB ready for Tx */
|
|
|
|
static const u8 *ieee80211_tdls_find_sw_timing_ie(struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
struct ieee80211_tdls_data *tf;
|
|
|
|
const u8 *ie_start;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Get the offset for the new location of the switch timing IE.
|
|
|
|
* The SKB network header will now point to the "payload_type"
|
|
|
|
* element of the TDLS data frame struct.
|
|
|
|
*/
|
|
|
|
tf = container_of(skb->data + skb_network_offset(skb),
|
|
|
|
struct ieee80211_tdls_data, payload_type);
|
|
|
|
ie_start = tf->u.chan_switch_req.variable;
|
|
|
|
return cfg80211_find_ie(WLAN_EID_CHAN_SWITCH_TIMING, ie_start,
|
|
|
|
skb->len - (ie_start - skb->data));
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct sk_buff *
|
|
|
|
ieee80211_tdls_ch_sw_tmpl_get(struct sta_info *sta, u8 oper_class,
|
|
|
|
struct cfg80211_chan_def *chandef,
|
|
|
|
u32 *ch_sw_tm_ie_offset)
|
|
|
|
{
|
|
|
|
struct ieee80211_sub_if_data *sdata = sta->sdata;
|
|
|
|
u8 extra_ies[2 + sizeof(struct ieee80211_sec_chan_offs_ie) +
|
|
|
|
2 + sizeof(struct ieee80211_ch_switch_timing)];
|
|
|
|
int extra_ies_len = 2 + sizeof(struct ieee80211_ch_switch_timing);
|
|
|
|
u8 *pos = extra_ies;
|
|
|
|
struct sk_buff *skb;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* if chandef points to a wide channel add a Secondary-Channel
|
|
|
|
* Offset information element
|
|
|
|
*/
|
|
|
|
if (chandef->width == NL80211_CHAN_WIDTH_40) {
|
|
|
|
struct ieee80211_sec_chan_offs_ie *sec_chan_ie;
|
|
|
|
bool ht40plus;
|
|
|
|
|
|
|
|
*pos++ = WLAN_EID_SECONDARY_CHANNEL_OFFSET;
|
|
|
|
*pos++ = sizeof(*sec_chan_ie);
|
|
|
|
sec_chan_ie = (void *)pos;
|
|
|
|
|
|
|
|
ht40plus = cfg80211_get_chandef_type(chandef) ==
|
|
|
|
NL80211_CHAN_HT40PLUS;
|
|
|
|
sec_chan_ie->sec_chan_offs = ht40plus ?
|
|
|
|
IEEE80211_HT_PARAM_CHA_SEC_ABOVE :
|
|
|
|
IEEE80211_HT_PARAM_CHA_SEC_BELOW;
|
|
|
|
pos += sizeof(*sec_chan_ie);
|
|
|
|
|
|
|
|
extra_ies_len += 2 + sizeof(struct ieee80211_sec_chan_offs_ie);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* just set the values to 0, this is a template */
|
|
|
|
iee80211_tdls_add_ch_switch_timing(pos, 0, 0);
|
|
|
|
|
|
|
|
skb = ieee80211_tdls_build_mgmt_packet_data(sdata, sta->sta.addr,
|
|
|
|
WLAN_TDLS_CHANNEL_SWITCH_REQUEST,
|
|
|
|
0, 0, !sta->sta.tdls_initiator,
|
|
|
|
extra_ies, extra_ies_len,
|
|
|
|
oper_class, chandef);
|
|
|
|
if (!skb)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
skb = ieee80211_build_data_template(sdata, skb, 0);
|
|
|
|
if (IS_ERR(skb)) {
|
|
|
|
tdls_dbg(sdata, "Failed building TDLS channel switch frame\n");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ch_sw_tm_ie_offset) {
|
|
|
|
const u8 *tm_ie = ieee80211_tdls_find_sw_timing_ie(skb);
|
|
|
|
|
|
|
|
if (!tm_ie) {
|
|
|
|
tdls_dbg(sdata, "No switch timing IE in TDLS switch\n");
|
|
|
|
dev_kfree_skb_any(skb);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
*ch_sw_tm_ie_offset = tm_ie - skb->data;
|
|
|
|
}
|
|
|
|
|
|
|
|
tdls_dbg(sdata,
|
|
|
|
"TDLS channel switch request template for %pM ch %d width %d\n",
|
|
|
|
sta->sta.addr, chandef->chan->center_freq, chandef->width);
|
|
|
|
return skb;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
ieee80211_tdls_channel_switch(struct wiphy *wiphy, struct net_device *dev,
|
|
|
|
const u8 *addr, u8 oper_class,
|
|
|
|
struct cfg80211_chan_def *chandef)
|
|
|
|
{
|
|
|
|
struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
|
|
|
|
struct ieee80211_local *local = sdata->local;
|
|
|
|
struct sta_info *sta;
|
|
|
|
struct sk_buff *skb = NULL;
|
|
|
|
u32 ch_sw_tm_ie;
|
|
|
|
int ret;
|
|
|
|
|
2020-04-02 09:18:04 +08:00
|
|
|
if (chandef->chan->freq_offset)
|
|
|
|
/* this may work, but is untested */
|
|
|
|
return -EOPNOTSUPP;
|
|
|
|
|
2014-11-10 00:50:19 +08:00
|
|
|
mutex_lock(&local->sta_mtx);
|
|
|
|
sta = sta_info_get(sdata, addr);
|
|
|
|
if (!sta) {
|
|
|
|
tdls_dbg(sdata,
|
|
|
|
"Invalid TDLS peer %pM for channel switch request\n",
|
|
|
|
addr);
|
|
|
|
ret = -ENOENT;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!test_sta_flag(sta, WLAN_STA_TDLS_CHAN_SWITCH)) {
|
|
|
|
tdls_dbg(sdata, "TDLS channel switch unsupported by %pM\n",
|
|
|
|
addr);
|
|
|
|
ret = -ENOTSUPP;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
skb = ieee80211_tdls_ch_sw_tmpl_get(sta, oper_class, chandef,
|
|
|
|
&ch_sw_tm_ie);
|
|
|
|
if (!skb) {
|
|
|
|
ret = -ENOENT;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = drv_tdls_channel_switch(local, sdata, &sta->sta, oper_class,
|
|
|
|
chandef, skb, ch_sw_tm_ie);
|
|
|
|
if (!ret)
|
|
|
|
set_sta_flag(sta, WLAN_STA_TDLS_OFF_CHANNEL);
|
|
|
|
|
|
|
|
out:
|
|
|
|
mutex_unlock(&local->sta_mtx);
|
|
|
|
dev_kfree_skb_any(skb);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
ieee80211_tdls_cancel_channel_switch(struct wiphy *wiphy,
|
|
|
|
struct net_device *dev,
|
|
|
|
const u8 *addr)
|
|
|
|
{
|
|
|
|
struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
|
|
|
|
struct ieee80211_local *local = sdata->local;
|
|
|
|
struct sta_info *sta;
|
|
|
|
|
|
|
|
mutex_lock(&local->sta_mtx);
|
|
|
|
sta = sta_info_get(sdata, addr);
|
|
|
|
if (!sta) {
|
|
|
|
tdls_dbg(sdata,
|
|
|
|
"Invalid TDLS peer %pM for channel switch cancel\n",
|
|
|
|
addr);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!test_sta_flag(sta, WLAN_STA_TDLS_OFF_CHANNEL)) {
|
|
|
|
tdls_dbg(sdata, "TDLS channel switch not initiated by %pM\n",
|
|
|
|
addr);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
drv_tdls_cancel_channel_switch(local, sdata, &sta->sta);
|
|
|
|
clear_sta_flag(sta, WLAN_STA_TDLS_OFF_CHANNEL);
|
|
|
|
|
|
|
|
out:
|
|
|
|
mutex_unlock(&local->sta_mtx);
|
|
|
|
}
|
2014-11-10 00:50:20 +08:00
|
|
|
|
|
|
|
static struct sk_buff *
|
|
|
|
ieee80211_tdls_ch_sw_resp_tmpl_get(struct sta_info *sta,
|
|
|
|
u32 *ch_sw_tm_ie_offset)
|
|
|
|
{
|
|
|
|
struct ieee80211_sub_if_data *sdata = sta->sdata;
|
|
|
|
struct sk_buff *skb;
|
|
|
|
u8 extra_ies[2 + sizeof(struct ieee80211_ch_switch_timing)];
|
|
|
|
|
|
|
|
/* initial timing are always zero in the template */
|
|
|
|
iee80211_tdls_add_ch_switch_timing(extra_ies, 0, 0);
|
|
|
|
|
|
|
|
skb = ieee80211_tdls_build_mgmt_packet_data(sdata, sta->sta.addr,
|
|
|
|
WLAN_TDLS_CHANNEL_SWITCH_RESPONSE,
|
|
|
|
0, 0, !sta->sta.tdls_initiator,
|
|
|
|
extra_ies, sizeof(extra_ies), 0, NULL);
|
|
|
|
if (!skb)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
skb = ieee80211_build_data_template(sdata, skb, 0);
|
|
|
|
if (IS_ERR(skb)) {
|
|
|
|
tdls_dbg(sdata,
|
|
|
|
"Failed building TDLS channel switch resp frame\n");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ch_sw_tm_ie_offset) {
|
|
|
|
const u8 *tm_ie = ieee80211_tdls_find_sw_timing_ie(skb);
|
|
|
|
|
|
|
|
if (!tm_ie) {
|
|
|
|
tdls_dbg(sdata,
|
|
|
|
"No switch timing IE in TDLS switch resp\n");
|
|
|
|
dev_kfree_skb_any(skb);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
*ch_sw_tm_ie_offset = tm_ie - skb->data;
|
|
|
|
}
|
|
|
|
|
|
|
|
tdls_dbg(sdata, "TDLS get channel switch response template for %pM\n",
|
|
|
|
sta->sta.addr);
|
|
|
|
return skb;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
ieee80211_process_tdls_channel_switch_resp(struct ieee80211_sub_if_data *sdata,
|
|
|
|
struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
struct ieee80211_local *local = sdata->local;
|
mac80211: always allocate struct ieee802_11_elems
As the 802.11 spec evolves, we need to parse more and more
elements. This is causing the struct to grow, and we can no
longer get away with putting it on the stack.
Change the API to always dynamically allocate and return an
allocated pointer that must be kfree()d later.
As an alternative, I contemplated a scheme whereby we'd say
in the code which elements we needed, e.g.
DECLARE_ELEMENT_PARSER(elems,
SUPPORTED_CHANNELS,
CHANNEL_SWITCH,
EXT(KEY_DELIVERY));
ieee802_11_parse_elems(..., &elems, ...);
and while I think this is possible and will save us a lot
since most individual places only care about a small subset
of the elements, it ended up being a bit more work since a
lot of places do the parsing and then pass the struct to
other functions, sometimes with multiple levels.
Link: https://lore.kernel.org/r/20210920154009.26caff6b5998.I05ae58768e990e611aee8eca8abefd9d7bc15e05@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2021-09-20 21:40:10 +08:00
|
|
|
struct ieee802_11_elems *elems = NULL;
|
2014-11-10 00:50:20 +08:00
|
|
|
struct sta_info *sta;
|
|
|
|
struct ieee80211_tdls_data *tf = (void *)skb->data;
|
|
|
|
bool local_initiator;
|
|
|
|
struct ieee80211_rx_status *rx_status = IEEE80211_SKB_RXCB(skb);
|
|
|
|
int baselen = offsetof(typeof(*tf), u.chan_switch_resp.variable);
|
|
|
|
struct ieee80211_tdls_ch_sw_params params = {};
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
params.action_code = WLAN_TDLS_CHANNEL_SWITCH_RESPONSE;
|
|
|
|
params.timestamp = rx_status->device_timestamp;
|
|
|
|
|
|
|
|
if (skb->len < baselen) {
|
|
|
|
tdls_dbg(sdata, "TDLS channel switch resp too short: %d\n",
|
|
|
|
skb->len);
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
mutex_lock(&local->sta_mtx);
|
|
|
|
sta = sta_info_get(sdata, tf->sa);
|
|
|
|
if (!sta || !test_sta_flag(sta, WLAN_STA_TDLS_PEER_AUTH)) {
|
|
|
|
tdls_dbg(sdata, "TDLS chan switch from non-peer sta %pM\n",
|
|
|
|
tf->sa);
|
|
|
|
ret = -EINVAL;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
params.sta = &sta->sta;
|
|
|
|
params.status = le16_to_cpu(tf->u.chan_switch_resp.status_code);
|
|
|
|
if (params.status != 0) {
|
|
|
|
ret = 0;
|
|
|
|
goto call_drv;
|
|
|
|
}
|
|
|
|
|
mac80211: always allocate struct ieee802_11_elems
As the 802.11 spec evolves, we need to parse more and more
elements. This is causing the struct to grow, and we can no
longer get away with putting it on the stack.
Change the API to always dynamically allocate and return an
allocated pointer that must be kfree()d later.
As an alternative, I contemplated a scheme whereby we'd say
in the code which elements we needed, e.g.
DECLARE_ELEMENT_PARSER(elems,
SUPPORTED_CHANNELS,
CHANNEL_SWITCH,
EXT(KEY_DELIVERY));
ieee802_11_parse_elems(..., &elems, ...);
and while I think this is possible and will save us a lot
since most individual places only care about a small subset
of the elements, it ended up being a bit more work since a
lot of places do the parsing and then pass the struct to
other functions, sometimes with multiple levels.
Link: https://lore.kernel.org/r/20210920154009.26caff6b5998.I05ae58768e990e611aee8eca8abefd9d7bc15e05@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2021-09-20 21:40:10 +08:00
|
|
|
elems = ieee802_11_parse_elems(tf->u.chan_switch_resp.variable,
|
2022-06-29 19:29:05 +08:00
|
|
|
skb->len - baselen, false, NULL);
|
mac80211: always allocate struct ieee802_11_elems
As the 802.11 spec evolves, we need to parse more and more
elements. This is causing the struct to grow, and we can no
longer get away with putting it on the stack.
Change the API to always dynamically allocate and return an
allocated pointer that must be kfree()d later.
As an alternative, I contemplated a scheme whereby we'd say
in the code which elements we needed, e.g.
DECLARE_ELEMENT_PARSER(elems,
SUPPORTED_CHANNELS,
CHANNEL_SWITCH,
EXT(KEY_DELIVERY));
ieee802_11_parse_elems(..., &elems, ...);
and while I think this is possible and will save us a lot
since most individual places only care about a small subset
of the elements, it ended up being a bit more work since a
lot of places do the parsing and then pass the struct to
other functions, sometimes with multiple levels.
Link: https://lore.kernel.org/r/20210920154009.26caff6b5998.I05ae58768e990e611aee8eca8abefd9d7bc15e05@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2021-09-20 21:40:10 +08:00
|
|
|
if (!elems) {
|
|
|
|
ret = -ENOMEM;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (elems->parse_error) {
|
2014-11-10 00:50:20 +08:00
|
|
|
tdls_dbg(sdata, "Invalid IEs in TDLS channel switch resp\n");
|
|
|
|
ret = -EINVAL;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
mac80211: always allocate struct ieee802_11_elems
As the 802.11 spec evolves, we need to parse more and more
elements. This is causing the struct to grow, and we can no
longer get away with putting it on the stack.
Change the API to always dynamically allocate and return an
allocated pointer that must be kfree()d later.
As an alternative, I contemplated a scheme whereby we'd say
in the code which elements we needed, e.g.
DECLARE_ELEMENT_PARSER(elems,
SUPPORTED_CHANNELS,
CHANNEL_SWITCH,
EXT(KEY_DELIVERY));
ieee802_11_parse_elems(..., &elems, ...);
and while I think this is possible and will save us a lot
since most individual places only care about a small subset
of the elements, it ended up being a bit more work since a
lot of places do the parsing and then pass the struct to
other functions, sometimes with multiple levels.
Link: https://lore.kernel.org/r/20210920154009.26caff6b5998.I05ae58768e990e611aee8eca8abefd9d7bc15e05@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2021-09-20 21:40:10 +08:00
|
|
|
if (!elems->ch_sw_timing || !elems->lnk_id) {
|
2014-11-10 00:50:20 +08:00
|
|
|
tdls_dbg(sdata, "TDLS channel switch resp - missing IEs\n");
|
|
|
|
ret = -EINVAL;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* validate the initiator is set correctly */
|
|
|
|
local_initiator =
|
mac80211: always allocate struct ieee802_11_elems
As the 802.11 spec evolves, we need to parse more and more
elements. This is causing the struct to grow, and we can no
longer get away with putting it on the stack.
Change the API to always dynamically allocate and return an
allocated pointer that must be kfree()d later.
As an alternative, I contemplated a scheme whereby we'd say
in the code which elements we needed, e.g.
DECLARE_ELEMENT_PARSER(elems,
SUPPORTED_CHANNELS,
CHANNEL_SWITCH,
EXT(KEY_DELIVERY));
ieee802_11_parse_elems(..., &elems, ...);
and while I think this is possible and will save us a lot
since most individual places only care about a small subset
of the elements, it ended up being a bit more work since a
lot of places do the parsing and then pass the struct to
other functions, sometimes with multiple levels.
Link: https://lore.kernel.org/r/20210920154009.26caff6b5998.I05ae58768e990e611aee8eca8abefd9d7bc15e05@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2021-09-20 21:40:10 +08:00
|
|
|
!memcmp(elems->lnk_id->init_sta, sdata->vif.addr, ETH_ALEN);
|
2014-11-10 00:50:20 +08:00
|
|
|
if (local_initiator == sta->sta.tdls_initiator) {
|
|
|
|
tdls_dbg(sdata, "TDLS chan switch invalid lnk-id initiator\n");
|
|
|
|
ret = -EINVAL;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
mac80211: always allocate struct ieee802_11_elems
As the 802.11 spec evolves, we need to parse more and more
elements. This is causing the struct to grow, and we can no
longer get away with putting it on the stack.
Change the API to always dynamically allocate and return an
allocated pointer that must be kfree()d later.
As an alternative, I contemplated a scheme whereby we'd say
in the code which elements we needed, e.g.
DECLARE_ELEMENT_PARSER(elems,
SUPPORTED_CHANNELS,
CHANNEL_SWITCH,
EXT(KEY_DELIVERY));
ieee802_11_parse_elems(..., &elems, ...);
and while I think this is possible and will save us a lot
since most individual places only care about a small subset
of the elements, it ended up being a bit more work since a
lot of places do the parsing and then pass the struct to
other functions, sometimes with multiple levels.
Link: https://lore.kernel.org/r/20210920154009.26caff6b5998.I05ae58768e990e611aee8eca8abefd9d7bc15e05@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2021-09-20 21:40:10 +08:00
|
|
|
params.switch_time = le16_to_cpu(elems->ch_sw_timing->switch_time);
|
|
|
|
params.switch_timeout = le16_to_cpu(elems->ch_sw_timing->switch_timeout);
|
2014-11-10 00:50:20 +08:00
|
|
|
|
|
|
|
params.tmpl_skb =
|
|
|
|
ieee80211_tdls_ch_sw_resp_tmpl_get(sta, ¶ms.ch_sw_tm_ie);
|
|
|
|
if (!params.tmpl_skb) {
|
|
|
|
ret = -ENOENT;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2016-06-27 22:31:18 +08:00
|
|
|
ret = 0;
|
2014-11-10 00:50:20 +08:00
|
|
|
call_drv:
|
|
|
|
drv_tdls_recv_channel_switch(sdata->local, sdata, ¶ms);
|
|
|
|
|
|
|
|
tdls_dbg(sdata,
|
|
|
|
"TDLS channel switch response received from %pM status %d\n",
|
|
|
|
tf->sa, params.status);
|
|
|
|
|
|
|
|
out:
|
|
|
|
mutex_unlock(&local->sta_mtx);
|
|
|
|
dev_kfree_skb_any(params.tmpl_skb);
|
mac80211: always allocate struct ieee802_11_elems
As the 802.11 spec evolves, we need to parse more and more
elements. This is causing the struct to grow, and we can no
longer get away with putting it on the stack.
Change the API to always dynamically allocate and return an
allocated pointer that must be kfree()d later.
As an alternative, I contemplated a scheme whereby we'd say
in the code which elements we needed, e.g.
DECLARE_ELEMENT_PARSER(elems,
SUPPORTED_CHANNELS,
CHANNEL_SWITCH,
EXT(KEY_DELIVERY));
ieee802_11_parse_elems(..., &elems, ...);
and while I think this is possible and will save us a lot
since most individual places only care about a small subset
of the elements, it ended up being a bit more work since a
lot of places do the parsing and then pass the struct to
other functions, sometimes with multiple levels.
Link: https://lore.kernel.org/r/20210920154009.26caff6b5998.I05ae58768e990e611aee8eca8abefd9d7bc15e05@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2021-09-20 21:40:10 +08:00
|
|
|
kfree(elems);
|
2014-11-10 00:50:20 +08:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
ieee80211_process_tdls_channel_switch_req(struct ieee80211_sub_if_data *sdata,
|
|
|
|
struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
struct ieee80211_local *local = sdata->local;
|
mac80211: always allocate struct ieee802_11_elems
As the 802.11 spec evolves, we need to parse more and more
elements. This is causing the struct to grow, and we can no
longer get away with putting it on the stack.
Change the API to always dynamically allocate and return an
allocated pointer that must be kfree()d later.
As an alternative, I contemplated a scheme whereby we'd say
in the code which elements we needed, e.g.
DECLARE_ELEMENT_PARSER(elems,
SUPPORTED_CHANNELS,
CHANNEL_SWITCH,
EXT(KEY_DELIVERY));
ieee802_11_parse_elems(..., &elems, ...);
and while I think this is possible and will save us a lot
since most individual places only care about a small subset
of the elements, it ended up being a bit more work since a
lot of places do the parsing and then pass the struct to
other functions, sometimes with multiple levels.
Link: https://lore.kernel.org/r/20210920154009.26caff6b5998.I05ae58768e990e611aee8eca8abefd9d7bc15e05@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2021-09-20 21:40:10 +08:00
|
|
|
struct ieee802_11_elems *elems;
|
2014-11-10 00:50:20 +08:00
|
|
|
struct cfg80211_chan_def chandef;
|
|
|
|
struct ieee80211_channel *chan;
|
|
|
|
enum nl80211_channel_type chan_type;
|
|
|
|
int freq;
|
|
|
|
u8 target_channel, oper_class;
|
|
|
|
bool local_initiator;
|
|
|
|
struct sta_info *sta;
|
2016-04-12 21:56:15 +08:00
|
|
|
enum nl80211_band band;
|
2014-11-10 00:50:20 +08:00
|
|
|
struct ieee80211_tdls_data *tf = (void *)skb->data;
|
|
|
|
struct ieee80211_rx_status *rx_status = IEEE80211_SKB_RXCB(skb);
|
|
|
|
int baselen = offsetof(typeof(*tf), u.chan_switch_req.variable);
|
|
|
|
struct ieee80211_tdls_ch_sw_params params = {};
|
|
|
|
int ret = 0;
|
|
|
|
|
|
|
|
params.action_code = WLAN_TDLS_CHANNEL_SWITCH_REQUEST;
|
|
|
|
params.timestamp = rx_status->device_timestamp;
|
|
|
|
|
|
|
|
if (skb->len < baselen) {
|
|
|
|
tdls_dbg(sdata, "TDLS channel switch req too short: %d\n",
|
|
|
|
skb->len);
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
target_channel = tf->u.chan_switch_req.target_channel;
|
|
|
|
oper_class = tf->u.chan_switch_req.oper_class;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* We can't easily infer the channel band. The operating class is
|
|
|
|
* ambiguous - there are multiple tables (US/Europe/JP/Global). The
|
|
|
|
* solution here is to treat channels with number >14 as 5GHz ones,
|
|
|
|
* and specifically check for the (oper_class, channel) combinations
|
|
|
|
* where this doesn't hold. These are thankfully unique according to
|
|
|
|
* IEEE802.11-2012.
|
|
|
|
* We consider only the 2GHz and 5GHz bands and 20MHz+ channels as
|
|
|
|
* valid here.
|
|
|
|
*/
|
|
|
|
if ((oper_class == 112 || oper_class == 2 || oper_class == 3 ||
|
|
|
|
oper_class == 4 || oper_class == 5 || oper_class == 6) &&
|
|
|
|
target_channel < 14)
|
2016-04-12 21:56:15 +08:00
|
|
|
band = NL80211_BAND_5GHZ;
|
2014-11-10 00:50:20 +08:00
|
|
|
else
|
2016-04-12 21:56:15 +08:00
|
|
|
band = target_channel < 14 ? NL80211_BAND_2GHZ :
|
|
|
|
NL80211_BAND_5GHZ;
|
2014-11-10 00:50:20 +08:00
|
|
|
|
|
|
|
freq = ieee80211_channel_to_frequency(target_channel, band);
|
|
|
|
if (freq == 0) {
|
|
|
|
tdls_dbg(sdata, "Invalid channel in TDLS chan switch: %d\n",
|
|
|
|
target_channel);
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
chan = ieee80211_get_channel(sdata->local->hw.wiphy, freq);
|
|
|
|
if (!chan) {
|
|
|
|
tdls_dbg(sdata,
|
|
|
|
"Unsupported channel for TDLS chan switch: %d\n",
|
|
|
|
target_channel);
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
mac80211: always allocate struct ieee802_11_elems
As the 802.11 spec evolves, we need to parse more and more
elements. This is causing the struct to grow, and we can no
longer get away with putting it on the stack.
Change the API to always dynamically allocate and return an
allocated pointer that must be kfree()d later.
As an alternative, I contemplated a scheme whereby we'd say
in the code which elements we needed, e.g.
DECLARE_ELEMENT_PARSER(elems,
SUPPORTED_CHANNELS,
CHANNEL_SWITCH,
EXT(KEY_DELIVERY));
ieee802_11_parse_elems(..., &elems, ...);
and while I think this is possible and will save us a lot
since most individual places only care about a small subset
of the elements, it ended up being a bit more work since a
lot of places do the parsing and then pass the struct to
other functions, sometimes with multiple levels.
Link: https://lore.kernel.org/r/20210920154009.26caff6b5998.I05ae58768e990e611aee8eca8abefd9d7bc15e05@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2021-09-20 21:40:10 +08:00
|
|
|
elems = ieee802_11_parse_elems(tf->u.chan_switch_req.variable,
|
2022-06-29 19:29:05 +08:00
|
|
|
skb->len - baselen, false, NULL);
|
mac80211: always allocate struct ieee802_11_elems
As the 802.11 spec evolves, we need to parse more and more
elements. This is causing the struct to grow, and we can no
longer get away with putting it on the stack.
Change the API to always dynamically allocate and return an
allocated pointer that must be kfree()d later.
As an alternative, I contemplated a scheme whereby we'd say
in the code which elements we needed, e.g.
DECLARE_ELEMENT_PARSER(elems,
SUPPORTED_CHANNELS,
CHANNEL_SWITCH,
EXT(KEY_DELIVERY));
ieee802_11_parse_elems(..., &elems, ...);
and while I think this is possible and will save us a lot
since most individual places only care about a small subset
of the elements, it ended up being a bit more work since a
lot of places do the parsing and then pass the struct to
other functions, sometimes with multiple levels.
Link: https://lore.kernel.org/r/20210920154009.26caff6b5998.I05ae58768e990e611aee8eca8abefd9d7bc15e05@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2021-09-20 21:40:10 +08:00
|
|
|
if (!elems)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
if (elems->parse_error) {
|
2014-11-10 00:50:20 +08:00
|
|
|
tdls_dbg(sdata, "Invalid IEs in TDLS channel switch req\n");
|
mac80211: always allocate struct ieee802_11_elems
As the 802.11 spec evolves, we need to parse more and more
elements. This is causing the struct to grow, and we can no
longer get away with putting it on the stack.
Change the API to always dynamically allocate and return an
allocated pointer that must be kfree()d later.
As an alternative, I contemplated a scheme whereby we'd say
in the code which elements we needed, e.g.
DECLARE_ELEMENT_PARSER(elems,
SUPPORTED_CHANNELS,
CHANNEL_SWITCH,
EXT(KEY_DELIVERY));
ieee802_11_parse_elems(..., &elems, ...);
and while I think this is possible and will save us a lot
since most individual places only care about a small subset
of the elements, it ended up being a bit more work since a
lot of places do the parsing and then pass the struct to
other functions, sometimes with multiple levels.
Link: https://lore.kernel.org/r/20210920154009.26caff6b5998.I05ae58768e990e611aee8eca8abefd9d7bc15e05@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2021-09-20 21:40:10 +08:00
|
|
|
ret = -EINVAL;
|
|
|
|
goto free;
|
2014-11-10 00:50:20 +08:00
|
|
|
}
|
|
|
|
|
mac80211: always allocate struct ieee802_11_elems
As the 802.11 spec evolves, we need to parse more and more
elements. This is causing the struct to grow, and we can no
longer get away with putting it on the stack.
Change the API to always dynamically allocate and return an
allocated pointer that must be kfree()d later.
As an alternative, I contemplated a scheme whereby we'd say
in the code which elements we needed, e.g.
DECLARE_ELEMENT_PARSER(elems,
SUPPORTED_CHANNELS,
CHANNEL_SWITCH,
EXT(KEY_DELIVERY));
ieee802_11_parse_elems(..., &elems, ...);
and while I think this is possible and will save us a lot
since most individual places only care about a small subset
of the elements, it ended up being a bit more work since a
lot of places do the parsing and then pass the struct to
other functions, sometimes with multiple levels.
Link: https://lore.kernel.org/r/20210920154009.26caff6b5998.I05ae58768e990e611aee8eca8abefd9d7bc15e05@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2021-09-20 21:40:10 +08:00
|
|
|
if (!elems->ch_sw_timing || !elems->lnk_id) {
|
2014-11-10 00:50:20 +08:00
|
|
|
tdls_dbg(sdata, "TDLS channel switch req - missing IEs\n");
|
mac80211: always allocate struct ieee802_11_elems
As the 802.11 spec evolves, we need to parse more and more
elements. This is causing the struct to grow, and we can no
longer get away with putting it on the stack.
Change the API to always dynamically allocate and return an
allocated pointer that must be kfree()d later.
As an alternative, I contemplated a scheme whereby we'd say
in the code which elements we needed, e.g.
DECLARE_ELEMENT_PARSER(elems,
SUPPORTED_CHANNELS,
CHANNEL_SWITCH,
EXT(KEY_DELIVERY));
ieee802_11_parse_elems(..., &elems, ...);
and while I think this is possible and will save us a lot
since most individual places only care about a small subset
of the elements, it ended up being a bit more work since a
lot of places do the parsing and then pass the struct to
other functions, sometimes with multiple levels.
Link: https://lore.kernel.org/r/20210920154009.26caff6b5998.I05ae58768e990e611aee8eca8abefd9d7bc15e05@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2021-09-20 21:40:10 +08:00
|
|
|
ret = -EINVAL;
|
|
|
|
goto free;
|
2014-11-10 00:50:20 +08:00
|
|
|
}
|
|
|
|
|
mac80211: always allocate struct ieee802_11_elems
As the 802.11 spec evolves, we need to parse more and more
elements. This is causing the struct to grow, and we can no
longer get away with putting it on the stack.
Change the API to always dynamically allocate and return an
allocated pointer that must be kfree()d later.
As an alternative, I contemplated a scheme whereby we'd say
in the code which elements we needed, e.g.
DECLARE_ELEMENT_PARSER(elems,
SUPPORTED_CHANNELS,
CHANNEL_SWITCH,
EXT(KEY_DELIVERY));
ieee802_11_parse_elems(..., &elems, ...);
and while I think this is possible and will save us a lot
since most individual places only care about a small subset
of the elements, it ended up being a bit more work since a
lot of places do the parsing and then pass the struct to
other functions, sometimes with multiple levels.
Link: https://lore.kernel.org/r/20210920154009.26caff6b5998.I05ae58768e990e611aee8eca8abefd9d7bc15e05@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2021-09-20 21:40:10 +08:00
|
|
|
if (!elems->sec_chan_offs) {
|
2015-07-08 20:41:46 +08:00
|
|
|
chan_type = NL80211_CHAN_HT20;
|
|
|
|
} else {
|
mac80211: always allocate struct ieee802_11_elems
As the 802.11 spec evolves, we need to parse more and more
elements. This is causing the struct to grow, and we can no
longer get away with putting it on the stack.
Change the API to always dynamically allocate and return an
allocated pointer that must be kfree()d later.
As an alternative, I contemplated a scheme whereby we'd say
in the code which elements we needed, e.g.
DECLARE_ELEMENT_PARSER(elems,
SUPPORTED_CHANNELS,
CHANNEL_SWITCH,
EXT(KEY_DELIVERY));
ieee802_11_parse_elems(..., &elems, ...);
and while I think this is possible and will save us a lot
since most individual places only care about a small subset
of the elements, it ended up being a bit more work since a
lot of places do the parsing and then pass the struct to
other functions, sometimes with multiple levels.
Link: https://lore.kernel.org/r/20210920154009.26caff6b5998.I05ae58768e990e611aee8eca8abefd9d7bc15e05@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2021-09-20 21:40:10 +08:00
|
|
|
switch (elems->sec_chan_offs->sec_chan_offs) {
|
2015-07-08 20:41:46 +08:00
|
|
|
case IEEE80211_HT_PARAM_CHA_SEC_ABOVE:
|
|
|
|
chan_type = NL80211_CHAN_HT40PLUS;
|
|
|
|
break;
|
|
|
|
case IEEE80211_HT_PARAM_CHA_SEC_BELOW:
|
|
|
|
chan_type = NL80211_CHAN_HT40MINUS;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
chan_type = NL80211_CHAN_HT20;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
cfg80211_chandef_create(&chandef, chan, chan_type);
|
|
|
|
|
|
|
|
/* we will be active on the TDLS link */
|
|
|
|
if (!cfg80211_reg_can_beacon_relax(sdata->local->hw.wiphy, &chandef,
|
|
|
|
sdata->wdev.iftype)) {
|
|
|
|
tdls_dbg(sdata, "TDLS chan switch to forbidden channel\n");
|
mac80211: always allocate struct ieee802_11_elems
As the 802.11 spec evolves, we need to parse more and more
elements. This is causing the struct to grow, and we can no
longer get away with putting it on the stack.
Change the API to always dynamically allocate and return an
allocated pointer that must be kfree()d later.
As an alternative, I contemplated a scheme whereby we'd say
in the code which elements we needed, e.g.
DECLARE_ELEMENT_PARSER(elems,
SUPPORTED_CHANNELS,
CHANNEL_SWITCH,
EXT(KEY_DELIVERY));
ieee802_11_parse_elems(..., &elems, ...);
and while I think this is possible and will save us a lot
since most individual places only care about a small subset
of the elements, it ended up being a bit more work since a
lot of places do the parsing and then pass the struct to
other functions, sometimes with multiple levels.
Link: https://lore.kernel.org/r/20210920154009.26caff6b5998.I05ae58768e990e611aee8eca8abefd9d7bc15e05@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2021-09-20 21:40:10 +08:00
|
|
|
ret = -EINVAL;
|
|
|
|
goto free;
|
2015-07-08 20:41:46 +08:00
|
|
|
}
|
|
|
|
|
2014-11-10 00:50:20 +08:00
|
|
|
mutex_lock(&local->sta_mtx);
|
|
|
|
sta = sta_info_get(sdata, tf->sa);
|
|
|
|
if (!sta || !test_sta_flag(sta, WLAN_STA_TDLS_PEER_AUTH)) {
|
|
|
|
tdls_dbg(sdata, "TDLS chan switch from non-peer sta %pM\n",
|
|
|
|
tf->sa);
|
|
|
|
ret = -EINVAL;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
params.sta = &sta->sta;
|
|
|
|
|
|
|
|
/* validate the initiator is set correctly */
|
|
|
|
local_initiator =
|
mac80211: always allocate struct ieee802_11_elems
As the 802.11 spec evolves, we need to parse more and more
elements. This is causing the struct to grow, and we can no
longer get away with putting it on the stack.
Change the API to always dynamically allocate and return an
allocated pointer that must be kfree()d later.
As an alternative, I contemplated a scheme whereby we'd say
in the code which elements we needed, e.g.
DECLARE_ELEMENT_PARSER(elems,
SUPPORTED_CHANNELS,
CHANNEL_SWITCH,
EXT(KEY_DELIVERY));
ieee802_11_parse_elems(..., &elems, ...);
and while I think this is possible and will save us a lot
since most individual places only care about a small subset
of the elements, it ended up being a bit more work since a
lot of places do the parsing and then pass the struct to
other functions, sometimes with multiple levels.
Link: https://lore.kernel.org/r/20210920154009.26caff6b5998.I05ae58768e990e611aee8eca8abefd9d7bc15e05@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2021-09-20 21:40:10 +08:00
|
|
|
!memcmp(elems->lnk_id->init_sta, sdata->vif.addr, ETH_ALEN);
|
2014-11-10 00:50:20 +08:00
|
|
|
if (local_initiator == sta->sta.tdls_initiator) {
|
|
|
|
tdls_dbg(sdata, "TDLS chan switch invalid lnk-id initiator\n");
|
|
|
|
ret = -EINVAL;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2015-07-08 20:41:46 +08:00
|
|
|
/* peer should have known better */
|
mac80211: prepare sta handling for MLO support
Currently in mac80211 each STA object is represented
using sta_info datastructure with the associated
STA specific information and drivers access ieee80211_sta
part of it.
With MLO (Multi Link Operation) support being added
in 802.11be standard, though the association is logically
with a single Multi Link capable STA, at the physical level
communication can happen via different advertised
links (uniquely identified by Channel, operating class,
BSSID) and hence the need to handle multiple link
STA parameters within a composite sta_info object
called the MLD STA. The different link STA part of
MLD STA are identified using the link address which can
be same or different as the MLD STA address and unique
link id based on the link vif.
To support extension of such a model, the sta_info
datastructure is modified to hold multiple link STA
objects with link specific params currently within
sta_info moved to this new structure. Similarly this is
done for ieee80211_sta as well which will be accessed
within mac80211 as well as by drivers, hence trivial
driver changes are expected to support this.
For current non MLO supported drivers, only one link STA
is present and link information is accessed via 'deflink'
member.
For MLO drivers, we still need to define the APIs etc. to
get the correct link ID and access the correct part of
the station info.
Currently in mac80211, all link STA info are accessed directly
via deflink. These will be updated to access via link pointers
indexed by link id with MLO support patches, with link id
being 0 for non MLO supported cases.
Except for couple of macro related changes, below spatch takes
care of updating mac80211 and driver code to access to the
link STA info via deflink.
@ieee80211_sta@
struct ieee80211_sta *s;
struct sta_info *si;
identifier var = {supp_rates, ht_cap, vht_cap, he_cap, he_6ghz_capa, eht_cap, rx_nss, bandwidth, txpwr};
@@
(
s->
- var
+ deflink.var
|
si->sta.
- var
+ deflink.var
)
@sta_info@
struct sta_info *si;
identifier var = {gtk, pcpu_rx_stats, rx_stats, rx_stats_avg, status_stats, tx_stats, cur_max_bandwidth};
@@
(
si->
- var
+ deflink.var
)
Signed-off-by: Sriram R <quic_srirrama@quicinc.com>
Link: https://lore.kernel.org/r/1649086883-13246-1-git-send-email-quic_srirrama@quicinc.com
[remove MLO-drivers notes from commit message, not clear yet; run spatch]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2022-04-04 23:41:23 +08:00
|
|
|
if (!sta->sta.deflink.ht_cap.ht_supported && elems->sec_chan_offs &&
|
mac80211: always allocate struct ieee802_11_elems
As the 802.11 spec evolves, we need to parse more and more
elements. This is causing the struct to grow, and we can no
longer get away with putting it on the stack.
Change the API to always dynamically allocate and return an
allocated pointer that must be kfree()d later.
As an alternative, I contemplated a scheme whereby we'd say
in the code which elements we needed, e.g.
DECLARE_ELEMENT_PARSER(elems,
SUPPORTED_CHANNELS,
CHANNEL_SWITCH,
EXT(KEY_DELIVERY));
ieee802_11_parse_elems(..., &elems, ...);
and while I think this is possible and will save us a lot
since most individual places only care about a small subset
of the elements, it ended up being a bit more work since a
lot of places do the parsing and then pass the struct to
other functions, sometimes with multiple levels.
Link: https://lore.kernel.org/r/20210920154009.26caff6b5998.I05ae58768e990e611aee8eca8abefd9d7bc15e05@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2021-09-20 21:40:10 +08:00
|
|
|
elems->sec_chan_offs->sec_chan_offs) {
|
2015-07-08 20:41:46 +08:00
|
|
|
tdls_dbg(sdata, "TDLS chan switch - wide chan unsupported\n");
|
|
|
|
ret = -ENOTSUPP;
|
|
|
|
goto out;
|
2014-11-10 00:50:20 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
params.chandef = &chandef;
|
mac80211: always allocate struct ieee802_11_elems
As the 802.11 spec evolves, we need to parse more and more
elements. This is causing the struct to grow, and we can no
longer get away with putting it on the stack.
Change the API to always dynamically allocate and return an
allocated pointer that must be kfree()d later.
As an alternative, I contemplated a scheme whereby we'd say
in the code which elements we needed, e.g.
DECLARE_ELEMENT_PARSER(elems,
SUPPORTED_CHANNELS,
CHANNEL_SWITCH,
EXT(KEY_DELIVERY));
ieee802_11_parse_elems(..., &elems, ...);
and while I think this is possible and will save us a lot
since most individual places only care about a small subset
of the elements, it ended up being a bit more work since a
lot of places do the parsing and then pass the struct to
other functions, sometimes with multiple levels.
Link: https://lore.kernel.org/r/20210920154009.26caff6b5998.I05ae58768e990e611aee8eca8abefd9d7bc15e05@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2021-09-20 21:40:10 +08:00
|
|
|
params.switch_time = le16_to_cpu(elems->ch_sw_timing->switch_time);
|
|
|
|
params.switch_timeout = le16_to_cpu(elems->ch_sw_timing->switch_timeout);
|
2014-11-10 00:50:20 +08:00
|
|
|
|
|
|
|
params.tmpl_skb =
|
|
|
|
ieee80211_tdls_ch_sw_resp_tmpl_get(sta,
|
|
|
|
¶ms.ch_sw_tm_ie);
|
|
|
|
if (!params.tmpl_skb) {
|
|
|
|
ret = -ENOENT;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
drv_tdls_recv_channel_switch(sdata->local, sdata, ¶ms);
|
|
|
|
|
|
|
|
tdls_dbg(sdata,
|
|
|
|
"TDLS ch switch request received from %pM ch %d width %d\n",
|
|
|
|
tf->sa, params.chandef->chan->center_freq,
|
|
|
|
params.chandef->width);
|
|
|
|
out:
|
|
|
|
mutex_unlock(&local->sta_mtx);
|
|
|
|
dev_kfree_skb_any(params.tmpl_skb);
|
mac80211: always allocate struct ieee802_11_elems
As the 802.11 spec evolves, we need to parse more and more
elements. This is causing the struct to grow, and we can no
longer get away with putting it on the stack.
Change the API to always dynamically allocate and return an
allocated pointer that must be kfree()d later.
As an alternative, I contemplated a scheme whereby we'd say
in the code which elements we needed, e.g.
DECLARE_ELEMENT_PARSER(elems,
SUPPORTED_CHANNELS,
CHANNEL_SWITCH,
EXT(KEY_DELIVERY));
ieee802_11_parse_elems(..., &elems, ...);
and while I think this is possible and will save us a lot
since most individual places only care about a small subset
of the elements, it ended up being a bit more work since a
lot of places do the parsing and then pass the struct to
other functions, sometimes with multiple levels.
Link: https://lore.kernel.org/r/20210920154009.26caff6b5998.I05ae58768e990e611aee8eca8abefd9d7bc15e05@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2021-09-20 21:40:10 +08:00
|
|
|
free:
|
|
|
|
kfree(elems);
|
2014-11-10 00:50:20 +08:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2021-05-18 05:07:56 +08:00
|
|
|
void
|
2015-07-08 20:41:45 +08:00
|
|
|
ieee80211_process_tdls_channel_switch(struct ieee80211_sub_if_data *sdata,
|
|
|
|
struct sk_buff *skb)
|
2014-11-10 00:50:20 +08:00
|
|
|
{
|
|
|
|
struct ieee80211_tdls_data *tf = (void *)skb->data;
|
|
|
|
struct wiphy *wiphy = sdata->local->hw.wiphy;
|
|
|
|
|
2021-01-22 23:19:43 +08:00
|
|
|
lockdep_assert_wiphy(wiphy);
|
2015-07-08 20:41:45 +08:00
|
|
|
|
2014-11-10 00:50:20 +08:00
|
|
|
/* make sure the driver supports it */
|
|
|
|
if (!(wiphy->features & NL80211_FEATURE_TDLS_CHANNEL_SWITCH))
|
|
|
|
return;
|
|
|
|
|
|
|
|
/* we want to access the entire packet */
|
|
|
|
if (skb_linearize(skb))
|
|
|
|
return;
|
|
|
|
/*
|
|
|
|
* The packet/size was already validated by mac80211 Rx path, only look
|
|
|
|
* at the action type.
|
|
|
|
*/
|
|
|
|
switch (tf->action_code) {
|
|
|
|
case WLAN_TDLS_CHANNEL_SWITCH_REQUEST:
|
|
|
|
ieee80211_process_tdls_channel_switch_req(sdata, skb);
|
|
|
|
break;
|
|
|
|
case WLAN_TDLS_CHANNEL_SWITCH_RESPONSE:
|
|
|
|
ieee80211_process_tdls_channel_switch_resp(sdata, skb);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
WARN_ON_ONCE(1);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
2015-06-14 21:53:46 +08:00
|
|
|
|
|
|
|
void ieee80211_teardown_tdls_peers(struct ieee80211_sub_if_data *sdata)
|
|
|
|
{
|
|
|
|
struct sta_info *sta;
|
|
|
|
u16 reason = WLAN_REASON_TDLS_TEARDOWN_UNSPECIFIED;
|
|
|
|
|
|
|
|
rcu_read_lock();
|
|
|
|
list_for_each_entry_rcu(sta, &sdata->local->sta_list, list) {
|
|
|
|
if (!sta->sta.tdls || sta->sdata != sdata || !sta->uploaded ||
|
|
|
|
!test_sta_flag(sta, WLAN_STA_AUTHORIZED))
|
|
|
|
continue;
|
|
|
|
|
|
|
|
ieee80211_tdls_oper_request(&sdata->vif, sta->sta.addr,
|
|
|
|
NL80211_TDLS_TEARDOWN, reason,
|
|
|
|
GFP_ATOMIC);
|
|
|
|
}
|
|
|
|
rcu_read_unlock();
|
|
|
|
}
|
2015-07-08 20:41:45 +08:00
|
|
|
|
mac80211: handle deauthentication/disassociation from TDLS peer
When receiving a deauthentication/disassociation frame from a TDLS
peer, a station should not disconnect the current AP, but only
disable the current TDLS link if it's enabled.
Without this change, a TDLS issue can be reproduced by following the
steps as below:
1. STA-1 and STA-2 are connected to AP, bidirection traffic is running
between STA-1 and STA-2.
2. Set up TDLS link between STA-1 and STA-2, stay for a while, then
teardown TDLS link.
3. Repeat step #2 and monitor the connection between STA and AP.
During the test, one STA may send a deauthentication/disassociation
frame to another, after TDLS teardown, with reason code 6/7, which
means: Class 2/3 frame received from nonassociated STA.
On receive this frame, the receiver STA will disconnect the current
AP and then reconnect. It's not a expected behavior, purpose of this
frame should be disabling the TDLS link, not the link with AP.
Cc: stable@vger.kernel.org
Signed-off-by: Yu Wang <yyuwang@codeaurora.org>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2019-05-10 17:04:52 +08:00
|
|
|
void ieee80211_tdls_handle_disconnect(struct ieee80211_sub_if_data *sdata,
|
|
|
|
const u8 *peer, u16 reason)
|
|
|
|
{
|
|
|
|
struct ieee80211_sta *sta;
|
|
|
|
|
|
|
|
rcu_read_lock();
|
|
|
|
sta = ieee80211_find_sta(&sdata->vif, peer);
|
|
|
|
if (!sta || !sta->tdls) {
|
|
|
|
rcu_read_unlock();
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
rcu_read_unlock();
|
|
|
|
|
|
|
|
tdls_dbg(sdata, "disconnected from TDLS peer %pM (Reason: %u=%s)\n",
|
|
|
|
peer, reason,
|
|
|
|
ieee80211_get_reason_code_string(reason));
|
|
|
|
|
|
|
|
ieee80211_tdls_oper_request(&sdata->vif, peer,
|
|
|
|
NL80211_TDLS_TEARDOWN,
|
|
|
|
WLAN_REASON_TDLS_TEARDOWN_UNREACHABLE,
|
|
|
|
GFP_ATOMIC);
|
|
|
|
}
|