diff options
| author | David S. Miller <davem@davemloft.net> | 2020-05-26 20:17:35 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-05-26 20:17:35 -0700 |
| commit | 745bd6f44cd3413f429ed3e2c7744c8abf8630d5 (patch) | |
| tree | 29ccc5ac8cb3faca99f132e85fcb0b382e7cdcb1 /net/mac80211/tdls.c | |
| parent | 0e3481195b155da4b9b94ad4d64bbf531ce62d16 (diff) | |
| parent | 60689de46c7f6a0028c8b37b6f03db68cbfad8ed (diff) | |
Merge tag 'mac80211-next-for-net-next-2020-04-25' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Johannes Berg says:
====================
One batch of changes, containing:
* hwsim improvements from Jouni and myself, to be able to
test more scenarios easily
* some more HE (802.11ax) support
* some initial S1G (sub 1 GHz) work for fractional MHz channels
* some (action) frame registration updates to help DPP support
* along with other various improvements/fixes
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211/tdls.c')
| -rw-r--r-- | net/mac80211/tdls.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/net/mac80211/tdls.c b/net/mac80211/tdls.c index fca1f5477396..8ad420db3766 100644 --- a/net/mac80211/tdls.c +++ b/net/mac80211/tdls.c @@ -226,12 +226,11 @@ static void ieee80211_tdls_add_link_ie(struct ieee80211_sub_if_data *sdata, static void ieee80211_tdls_add_aid(struct ieee80211_sub_if_data *sdata, struct sk_buff *skb) { - struct ieee80211_if_managed *ifmgd = &sdata->u.mgd; u8 *pos = skb_put(skb, 4); *pos++ = WLAN_EID_AID; *pos++ = 2; /* len */ - put_unaligned_le16(ifmgd->aid, pos); + put_unaligned_le16(sdata->vif.bss_conf.aid, pos); } /* translate numbering in the WMM parameter IE to the mac80211 notation */ @@ -1567,6 +1566,10 @@ ieee80211_tdls_channel_switch(struct wiphy *wiphy, struct net_device *dev, u32 ch_sw_tm_ie; int ret; + if (chandef->chan->freq_offset) + /* this may work, but is untested */ + return -EOPNOTSUPP; + mutex_lock(&local->sta_mtx); sta = sta_info_get(sdata, addr); if (!sta) { |