diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-10-15 13:05:21 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-10-15 13:05:21 -0400 |
| commit | 39c253ed7817bf477189a132b114303c9aa2c2d2 (patch) | |
| tree | 194492ef6dd74a87e074698368cb1817624783fc /net/mac80211/cfg.c | |
| parent | e9e4ea74f06635f2ffc1dffe5ef40c854faa0a90 (diff) | |
| parent | 9612bd1ee3e3136e4748d7175bb6e7551482cc2e (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
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 2e7855a1b10..629dee7ec9b 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -3518,7 +3518,7 @@ static int ieee80211_probe_client(struct wiphy *wiphy, struct net_device *dev, return -EINVAL; } band = chanctx_conf->def.chan->band; - sta = sta_info_get(sdata, peer); + sta = sta_info_get_bss(sdata, peer); if (sta) { qos = test_sta_flag(sta, WLAN_STA_WME); } else { |