diff options
| author | David S. Miller <davem@davemloft.net> | 2018-03-29 16:23:26 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-03-29 16:23:26 -0400 |
| commit | e15f20ea33b8e5074145abe464b4b48acea505d9 (patch) | |
| tree | ad173bb9facf7b0673a2cc313c2d52778b8f18ff /net/mac80211/ibss.c | |
| parent | e3e67a4f07433d0159dcbd2abe7d6bdf6e1268c8 (diff) | |
| parent | c470bdc1aaf36669e04ba65faf1092b2d1c6cabe (diff) | |
| download | op-kernel-dev-e15f20ea33b8e5074145abe464b4b48acea505d9.zip op-kernel-dev-e15f20ea33b8e5074145abe464b4b48acea505d9.tar.gz | |
Merge tag 'mac80211-next-for-davem-2018-03-29' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Johannes Berg says:
====================
We have a fair number of patches, but many of them are from the
first bullet here:
* EAPoL-over-nl80211 from Denis - this will let us fix
some long-standing issues with bridging, races with
encryption and more
* DFS offload support from the qtnfmac folks
* regulatory database changes for the new ETSI adaptivity
requirements
* various other fixes and small enhancements
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211/ibss.c')
| -rw-r--r-- | net/mac80211/ibss.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c index db07e0d..6449a1c 100644 --- a/net/mac80211/ibss.c +++ b/net/mac80211/ibss.c @@ -1839,11 +1839,12 @@ int ieee80211_ibss_join(struct ieee80211_sub_if_data *sdata, IEEE80211_HT_OP_MODE_PROTECTION_NONHT_MIXED | IEEE80211_HT_PARAM_RIFS_MODE; - changed |= BSS_CHANGED_HT; + changed |= BSS_CHANGED_HT | BSS_CHANGED_MCAST_RATE; ieee80211_bss_info_change_notify(sdata, changed); sdata->smps_mode = IEEE80211_SMPS_OFF; sdata->needed_rx_chains = local->rx_chains; + sdata->control_port_over_nl80211 = params->control_port_over_nl80211; ieee80211_queue_work(&local->hw, &sdata->work); |
