2012-12-04 06:03:13

by Wei Yongjun

Subject: [PATCH -next] 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 | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c
index 482f505..1ad72d5 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,7 +6821,7 @@ static int ipw_wx_get_auth(struct net_device *dev,
/*
* wpa_supplicant will control these internally
*/
- ret = -EOPNOTSUPP;
+ return -EOPNOTSUPP;
break;

case IW_AUTH_TKIP_COUNTERMEASURES:

2012-12-05 08:08:11

by Wei Yongjun

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

On 12/05/2012 02:55 PM, Stanislav Yakovlev wrote:
> Hello, Wei,
>
> On 3 December 2012 22:03, 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]>
>> ---
>> drivers/net/wireless/ipw2x00/ipw2200.c | 3 +--
>> 1 file changed, 1 insertion(+), 2 deletions(-)
>>
>> diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c
>> index 482f505..1ad72d5 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,7 +6821,7 @@ static int ipw_wx_get_auth(struct net_device *dev,
>> /*
>> * wpa_supplicant will control these internally
>> */
>> - ret = -EOPNOTSUPP;
>> + return -EOPNOTSUPP;
>> break;
> Could you remove this break as well?

My mistake, I will send a update patch soon.

Regards,
Yongjun Wei

2012-12-05 06:55:22

by Stanislav Yakovlev

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

Hello, Wei,

On 3 December 2012 22:03, 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]>
> ---
> drivers/net/wireless/ipw2x00/ipw2200.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c
> index 482f505..1ad72d5 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,7 +6821,7 @@ static int ipw_wx_get_auth(struct net_device *dev,
> /*
> * wpa_supplicant will control these internally
> */
> - ret = -EOPNOTSUPP;
> + return -EOPNOTSUPP;
> break;

Could you remove this break as well?

Thanks,
Stanislav.

>
> case IW_AUTH_TKIP_COUNTERMEASURES:
>
>