diff options
author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2012-12-05 03:08:11 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-12-06 14:58:55 -0500 |
commit | 8df0f1e5cbd4ff1e2059a1e11bd89b35aa5ed004 (patch) | |
tree | 4cff4b351b2bcdfb4d02d17832fea2f9f7bea52b /drivers/net/wireless/ipw2x00 | |
parent | 9304a1c7430590a7ee8ded5fc401ef483123de66 (diff) |
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>
Diffstat (limited to 'drivers/net/wireless/ipw2x00')
-rw-r--r-- | drivers/net/wireless/ipw2x00/ipw2200.c | 4 |
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, | |||
6812 | struct libipw_device *ieee = priv->ieee; | 6812 | struct libipw_device *ieee = priv->ieee; |
6813 | struct lib80211_crypt_data *crypt; | 6813 | struct lib80211_crypt_data *crypt; |
6814 | struct iw_param *param = &wrqu->param; | 6814 | struct iw_param *param = &wrqu->param; |
6815 | int ret = 0; | ||
6816 | 6815 | ||
6817 | switch (param->flags & IW_AUTH_INDEX) { | 6816 | switch (param->flags & IW_AUTH_INDEX) { |
6818 | case IW_AUTH_WPA_VERSION: | 6817 | case IW_AUTH_WPA_VERSION: |
@@ -6822,8 +6821,7 @@ static int ipw_wx_get_auth(struct net_device *dev, | |||
6822 | /* | 6821 | /* |
6823 | * wpa_supplicant will control these internally | 6822 | * wpa_supplicant will control these internally |
6824 | */ | 6823 | */ |
6825 | ret = -EOPNOTSUPP; | 6824 | return -EOPNOTSUPP; |
6826 | break; | ||
6827 | 6825 | ||
6828 | case IW_AUTH_TKIP_COUNTERMEASURES: | 6826 | case IW_AUTH_TKIP_COUNTERMEASURES: |
6829 | crypt = priv->ieee->crypt_info.crypt[priv->ieee->crypt_info.tx_keyidx]; | 6827 | crypt = priv->ieee->crypt_info.crypt[priv->ieee->crypt_info.tx_keyidx]; |