summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2012-12-05 03:08:11 -0500
committerJohn W. Linville <linville@tuxdriver.com>2012-12-06 14:58:55 -0500
commit8df0f1e5cbd4ff1e2059a1e11bd89b35aa5ed004 (patch)
tree4cff4b351b2bcdfb4d02d17832fea2f9f7bea52b
parent9304a1c7430590a7ee8ded5fc401ef483123de66 (diff)
downloadlinux-3.10-8df0f1e5cbd4ff1e2059a1e11bd89b35aa5ed004.tar.gz
linux-3.10-8df0f1e5cbd4ff1e2059a1e11bd89b35aa5ed004.tar.bz2
linux-3.10-8df0f1e5cbd4ff1e2059a1e11bd89b35aa5ed004.zip
ipw2200: return error code on error in ipw_wx_get_auth()
We have assinged error code to 'ret' when get auth from some option is not supported but never used it, but we'd better return the error code. Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/ipw2x00/ipw2200.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c
index 482f505f3f3..b0879adcd44 100644
--- a/drivers/net/wireless/ipw2x00/ipw2200.c
+++ b/drivers/net/wireless/ipw2x00/ipw2200.c
@@ -6812,7 +6812,6 @@ static int ipw_wx_get_auth(struct net_device *dev,
struct libipw_device *ieee = priv->ieee;
struct lib80211_crypt_data *crypt;
struct iw_param *param = &wrqu->param;
- int ret = 0;
switch (param->flags & IW_AUTH_INDEX) {
case IW_AUTH_WPA_VERSION:
@@ -6822,8 +6821,7 @@ static int ipw_wx_get_auth(struct net_device *dev,
/*
* wpa_supplicant will control these internally
*/
- ret = -EOPNOTSUPP;
- break;
+ return -EOPNOTSUPP;
case IW_AUTH_TKIP_COUNTERMEASURES:
crypt = priv->ieee->crypt_info.crypt[priv->ieee->crypt_info.tx_keyidx];