diff options
| author |  David S. Miller <davem@davemloft.net>
| 2016-03-01 17:02:30 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net>
| 2016-03-01 17:03:27 -0500 |
| commit | d67703fcede6696667218d29f86b4ee6ae618de6 (patch) | |
| tree | a099693d077e646848b8d9a1a5b6feae79045621 /net/mac80211/mesh.c | |
| parent | Merge branch 'bridge-mcast-tmp-router-port' (diff) | |
| parent | rfkill: Add documentation about LED triggers (diff) | |
| download | linux-d67703fcede6696667218d29f86b4ee6ae618de6.tar.gz linux-d67703fcede6696667218d29f86b4ee6ae618de6.tar.bz2 linux-d67703fcede6696667218d29f86b4ee6ae618de6.zip | |
Merge tag 'mac80211-next-for-davem-2016-02-26' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Johannes Berg says:
====================
Here's another round of updates for -next:
* big A-MSDU RX performance improvement (avoid linearize of paged RX)
* rfkill changes: cleanups, documentation, platform properties
* basic PBSS support in cfg80211
* MU-MIMO action frame processing support
* BlockAck reordering & duplicate detection offload support
* various cleanups & little fixes
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211/mesh.c')
| -rw-r--r-- | net/mac80211/mesh.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c index 6f85b6ab8e51..d32cefcb63b0 100644 --- a/net/mac80211/mesh.c +++ b/net/mac80211/mesh.c @@ -91,11 +91,10 @@ bool mesh_matches_local(struct ieee80211_sub_if_data *sdata, if (sdata->vif.bss_conf.basic_rates != basic_rates) return false; - ieee80211_ht_oper_to_chandef(sdata->vif.bss_conf.chandef.chan, - ie->ht_operation, &sta_chan_def); - - ieee80211_vht_oper_to_chandef(sdata->vif.bss_conf.chandef.chan, - ie->vht_operation, &sta_chan_def); + cfg80211_chandef_create(&sta_chan_def, sdata->vif.bss_conf.chandef.chan, + NL80211_CHAN_NO_HT); + ieee80211_chandef_ht_oper(ie->ht_operation, &sta_chan_def); + ieee80211_chandef_vht_oper(ie->vht_operation, &sta_chan_def); if (!cfg80211_chandef_compatible(&sdata->vif.bss_conf.chandef, &sta_chan_def)) |