diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-08-16 20:40:44 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-08-16 20:40:44 +0200 |
| commit | 9714d315d28aef77a097fe905b25cc273c3d72ad (patch) | |
| tree | 0ae1150b0723e925785ce774c3554f29fda050f6 /net/wireless | |
| parent | b43: move hwrng registration driver to wireless core initialization (diff) | |
| parent | ath5k: disable ASPM L0s for all cards (diff) | |
| download | linux-9714d315d28aef77a097fe905b25cc273c3d72ad.tar.xz linux-9714d315d28aef77a097fe905b25cc273c3d72ad.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net/wireless')
| -rw-r--r-- | net/wireless/mlme.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/net/wireless/mlme.c b/net/wireless/mlme.c index e74a1a2119d3..d1a3fb99fdf2 100644 --- a/net/wireless/mlme.c +++ b/net/wireless/mlme.c @@ -843,13 +843,19 @@ int cfg80211_mlme_action(struct cfg80211_registered_device *rdev, return -EINVAL; if (mgmt->u.action.category != WLAN_CATEGORY_PUBLIC) { /* Verify that we are associated with the destination AP */ + wdev_lock(wdev); + if (!wdev->current_bss || memcmp(wdev->current_bss->pub.bssid, mgmt->bssid, ETH_ALEN) != 0 || (wdev->iftype == NL80211_IFTYPE_STATION && memcmp(wdev->current_bss->pub.bssid, mgmt->da, - ETH_ALEN) != 0)) + ETH_ALEN) != 0)) { + wdev_unlock(wdev); return -ENOTCONN; + } + + wdev_unlock(wdev); } if (memcmp(mgmt->sa, dev->dev_addr, ETH_ALEN) != 0) |