2012-12-05 08:08:12

by Wei Yongjun

Subject: [PATCH -next v2] ipw2200: return error code on error in ipw_wx_get_auth()

From: Wei Yongjun <[email protected]>

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 <[email protected]>
---
drivers/net/wireless/ipw2x00/ipw2200.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c
index 482f505..b0879ad 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];

2012-12-05 09:44:52

by Stanislav Yakovlev

Subject: Re: [PATCH -next v2] ipw2200: return error code on error in ipw_wx_get_auth()

On 5 December 2012 00:08, Wei Yongjun <[email protected]> wrote:
> From: Wei Yongjun <[email protected]>
>
> 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 <[email protected]>

Looks fine, thanks.

Stanislav.

> ---
> drivers/net/wireless/ipw2x00/ipw2200.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c
> index 482f505..b0879ad 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];
>
>