diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-08-09 21:06:28 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-08-09 21:06:28 +0200 |
| commit | 4f0544489215fc78cccb96f8e3d0f078ae965297 (patch) | |
| tree | 69e71db0cf005a68ab1b70f33ae0462fd94152fc /drivers/net/wireless/mwifiex/join.c | |
| parent | ath9k: Add more PCI IDs for WB225 cards (diff) | |
| parent | cw1200: Fix spurious BUG_ON() trigger when starting AP mode. (diff) | |
| download | linux-4f0544489215fc78cccb96f8e3d0f078ae965297.tar.xz linux-4f0544489215fc78cccb96f8e3d0f078ae965297.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'drivers/net/wireless/mwifiex/join.c')
| -rw-r--r-- | drivers/net/wireless/mwifiex/join.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/wireless/mwifiex/join.c b/drivers/net/wireless/mwifiex/join.c index ba043ca2a34a..9d7c0e6c4fc7 100644 --- a/drivers/net/wireless/mwifiex/join.c +++ b/drivers/net/wireless/mwifiex/join.c @@ -1291,8 +1291,10 @@ int mwifiex_associate(struct mwifiex_private *priv, { u8 current_bssid[ETH_ALEN]; - /* Return error if the adapter or table entry is not marked as infra */ - if ((priv->bss_mode != NL80211_IFTYPE_STATION) || + /* Return error if the adapter is not STA role or table entry + * is not marked as infra. + */ + if ((GET_BSS_ROLE(priv) != MWIFIEX_BSS_ROLE_STA) || (bss_desc->bss_mode != NL80211_IFTYPE_STATION)) return -1; |