diff options
| author | David S. Miller <davem@davemloft.net> | 2010-09-21 21:26:07 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-09-21 21:26:07 +0200 |
| commit | 2d813760d75150db437e40d340ae0e06ddd54a34 (patch) | |
| tree | b52e8df51dec523f833d5145589b86ac1703b96e /drivers | |
| parent | tcp: Fix race in tcp_poll (diff) | |
| parent | wext: fix potential private ioctl memory content leak (diff) | |
| download | linux-2d813760d75150db437e40d340ae0e06ddd54a34.tar.xz linux-2d813760d75150db437e40d340ae0e06ddd54a34.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-core.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c index 07dbc2796448..e23c4060a0f0 100644 --- a/drivers/net/wireless/iwlwifi/iwl-core.c +++ b/drivers/net/wireless/iwlwifi/iwl-core.c @@ -2613,6 +2613,11 @@ int iwl_force_reset(struct iwl_priv *priv, int mode, bool external) if (test_bit(STATUS_EXIT_PENDING, &priv->status)) return -EINVAL; + if (test_bit(STATUS_SCANNING, &priv->status)) { + IWL_DEBUG_INFO(priv, "scan in progress.\n"); + return -EINVAL; + } + if (mode >= IWL_MAX_FORCE_RESET) { IWL_DEBUG_INFO(priv, "invalid reset request.\n"); return -EINVAL; |