diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-12-04 17:29:10 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-12-04 17:29:10 +0100 |
| commit | de51f1649ab77f9ad17bdad581a326cbf6e71b49 (patch) | |
| tree | 82aa375e132b3c639afe239c4e49363636199827 /net/mac80211/iface.c | |
| parent | Merge tag 'nfc-next-3.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| parent | mac80211: add ieee80211_tx_status_noskb (diff) | |
| download | linux-de51f1649ab77f9ad17bdad581a326cbf6e71b49.tar.xz linux-de51f1649ab77f9ad17bdad581a326cbf6e71b49.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Johannes Berg <johannes@sipsolutions.net> says:
"This time I have Felix's no-status rate control work, which will allow
drivers to work better with rate control even if they don't have perfect
status reporting. In addition to this, a small hwsim fix from Patrik,
one of the regulatory patches from Arik, and a number of cleanups and
fixes I did myself.
Of note is a patch where I disable CFG80211_WEXT so that compatibility
is no longer selectable - this is intended as a wake-up call for anyone
who's still using it, and is still easily worked around (it's a one-line
patch) before we fully remove the code as well in the future."
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/iface.c')
| -rw-r--r-- | net/mac80211/iface.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index 538fe4ef5c85..417355390873 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c @@ -520,6 +520,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up) sdata->vif.cab_queue = master->vif.cab_queue; memcpy(sdata->vif.hw_queue, master->vif.hw_queue, sizeof(sdata->vif.hw_queue)); + sdata->vif.bss_conf.chandef = master->vif.bss_conf.chandef; break; } case NL80211_IFTYPE_AP: |