aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/mwifiex/scan.c
diff options
context:
space:
mode:
authorAmitkumar Karwar <akarwar@marvell.com>2012-10-05 23:21:42 -0400
committerJohn W. Linville <linville@tuxdriver.com>2012-10-08 15:06:03 -0400
commit06975884280976ba215ad0766bee1a69df612434 (patch)
tree5620139c827f069c6c2df02d5797d94d27460c9a /drivers/net/wireless/mwifiex/scan.c
parent061f2e69fedbcd7839c8e6e6b659e345acc3396f (diff)
mwifiex: update cfg80211 with correct reason code when association fails
This patch adds support to send correct reason code got from firmware when association attempt fails. Also, the error message displayed for association failure due to network incompatibility is modified. Current message "cannot find ssid.." misleads user. Signed-off-by: Amitkumar Karwar <akarwar@marvell.com> Signed-off-by: Bing Zhao <bzhao@marvell.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/mwifiex/scan.c')
-rw-r--r--drivers/net/wireless/mwifiex/scan.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/mwifiex/scan.c b/drivers/net/wireless/mwifiex/scan.c
index d9295fd8e427..00b658d3b6ec 100644
--- a/drivers/net/wireless/mwifiex/scan.c
+++ b/drivers/net/wireless/mwifiex/scan.c
@@ -1434,8 +1434,8 @@ int mwifiex_check_network_compatibility(struct mwifiex_private *priv,
1434 ret = mwifiex_is_network_compatible(priv, bss_desc, 1434 ret = mwifiex_is_network_compatible(priv, bss_desc,
1435 priv->bss_mode); 1435 priv->bss_mode);
1436 if (ret) 1436 if (ret)
1437 dev_err(priv->adapter->dev, "cannot find ssid " 1437 dev_err(priv->adapter->dev,
1438 "%s\n", bss_desc->ssid.ssid); 1438 "Incompatible network settings\n");
1439 break; 1439 break;
1440 default: 1440 default:
1441 ret = 0; 1441 ret = 0;