summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-09-21 12:26:07 -0700
committerDavid S. Miller <davem@davemloft.net>2010-09-21 12:26:07 -0700
commit2d813760d75150db437e40d340ae0e06ddd54a34 (patch)
treeb52e8df51dec523f833d5145589b86ac1703b96e
parenta4d258036ed9b2a1811c3670c6099203a0f284a0 (diff)
parentdf6d02300f7c2fbd0fbe626d819c8e5237d72c62 (diff)
downloadlinux-3.10-2d813760d75150db437e40d340ae0e06ddd54a34.tar.gz
linux-3.10-2d813760d75150db437e40d340ae0e06ddd54a34.tar.bz2
linux-3.10-2d813760d75150db437e40d340ae0e06ddd54a34.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-core.c5
-rw-r--r--net/wireless/wext-priv.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c
index 07dbc279644..e23c4060a0f 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;
diff --git a/net/wireless/wext-priv.c b/net/wireless/wext-priv.c
index 3feb28e41c5..674d426a9d2 100644
--- a/net/wireless/wext-priv.c
+++ b/net/wireless/wext-priv.c
@@ -152,7 +152,7 @@ static int ioctl_private_iw_point(struct iw_point *iwp, unsigned int cmd,
} else if (!iwp->pointer)
return -EFAULT;
- extra = kmalloc(extra_size, GFP_KERNEL);
+ extra = kzalloc(extra_size, GFP_KERNEL);
if (!extra)
return -ENOMEM;