diff options
| author | David S. Miller <davem@davemloft.net> | 2009-07-30 19:26:55 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-07-30 19:26:55 -0700 |
| commit | 2f6d7c1b34403b97fa57473edcb6749d1db5ace3 (patch) | |
| tree | 97da33c077b08b72a361ff5a4542b86d190b0164 /net/wireless/mlme.c | |
| parent | df597efb5737063497f1a4f7c996cc9aec294230 (diff) | |
| parent | 1e4247d457c6a42e4a05cb7dfa4e6ea1fa65c112 (diff) | |
| download | op-kernel-dev-2f6d7c1b34403b97fa57473edcb6749d1db5ace3.zip op-kernel-dev-2f6d7c1b34403b97fa57473edcb6749d1db5ace3.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net/wireless/mlme.c')
| -rw-r--r-- | net/wireless/mlme.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/net/wireless/mlme.c b/net/wireless/mlme.c index 5b9b221..097a87d 100644 --- a/net/wireless/mlme.c +++ b/net/wireless/mlme.c @@ -8,7 +8,9 @@ #include <linux/module.h> #include <linux/netdevice.h> #include <linux/nl80211.h> +#include <linux/wireless.h> #include <net/cfg80211.h> +#include <net/iw_handler.h> #include "core.h" #include "nl80211.h" @@ -545,6 +547,12 @@ static int __cfg80211_mlme_disassoc(struct cfg80211_registered_device *rdev, ASSERT_WDEV_LOCK(wdev); + if (wdev->sme_state != CFG80211_SME_CONNECTED) + return -ENOTCONN; + + if (WARN_ON(!wdev->current_bss)) + return -ENOTCONN; + memset(&req, 0, sizeof(req)); req.reason_code = reason; req.ie = ie; |
