diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2014-10-20 16:41:33 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2014-10-20 21:39:29 +0200 |
| commit | 8fa74e3aa6398ffef3c52147c969c0f5f0a1244e (patch) | |
| tree | 01b6138e17581a27d62e71a013bb85638abd9a7a /net/mac80211/cfg.c | |
| parent | mac80211: fix change flags variable signedness (diff) | |
| parent | mac80211: minstrels: fix buffer overflow in HT debugfs rc_stats (diff) | |
| download | linux-8fa74e3aa6398ffef3c52147c969c0f5f0a1244e.tar.xz linux-8fa74e3aa6398ffef3c52147c969c0f5f0a1244e.zip | |
Merge branch 'mac80211' into mac80211-next
This was needed to avoid conflicts in the minstrel changes.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/cfg.c')
| -rw-r--r-- | net/mac80211/cfg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index acebf2c5bb0c..64deb9aa0f81 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -3522,7 +3522,7 @@ static int ieee80211_cfg_get_channel(struct wiphy *wiphy, rcu_read_lock(); chanctx_conf = rcu_dereference(sdata->vif.chanctx_conf); if (chanctx_conf) { - *chandef = chanctx_conf->def; + *chandef = sdata->vif.bss_conf.chandef; ret = 0; } else if (local->open_count > 0 && local->open_count == local->monitors && |