diff options
| author | David S. Miller <davem@davemloft.net> | 2015-05-19 16:43:17 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-05-19 16:43:17 -0400 |
| commit | b7a3a8e31f6e74822939bbc5bd0e21f90eb319f9 (patch) | |
| tree | 2571cd6731602fbcf00dde1ec4466999859add2c /net/mac80211/chan.c | |
| parent | 9a03259c3d30d4b1b582072211dc571a68340054 (diff) | |
| parent | 658358cec93a7130615cfc1d6843ab07e49625e6 (diff) | |
Merge tag 'mac80211-next-for-davem-2015-05-19' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Johannes Berg says:
====================
This just has a few fixes:
* LED throughput trigger was crashing
* fast-xmit wasn't treating QoS changes in IBSS correctly
* TDLS could use the wrong channel definition
* using a reserved channel context could use the wrong channel width
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211/chan.c')
| -rw-r--r-- | net/mac80211/chan.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/mac80211/chan.c b/net/mac80211/chan.c index 7e9b62475400..f01c18a3160e 100644 --- a/net/mac80211/chan.c +++ b/net/mac80211/chan.c @@ -1010,6 +1010,8 @@ ieee80211_vif_use_reserved_reassign(struct ieee80211_sub_if_data *sdata) if (WARN_ON(!chandef)) return -EINVAL; + ieee80211_change_chanctx(local, new_ctx, chandef); + vif_chsw[0].vif = &sdata->vif; vif_chsw[0].old_ctx = &old_ctx->conf; vif_chsw[0].new_ctx = &new_ctx->conf; @@ -1083,6 +1085,8 @@ ieee80211_vif_use_reserved_assign(struct ieee80211_sub_if_data *sdata) if (WARN_ON(!chandef)) return -EINVAL; + ieee80211_change_chanctx(local, new_ctx, chandef); + list_del(&sdata->reserved_chanctx_list); sdata->reserved_chanctx = NULL; |