Return-path: Received: from mail-qc0-f174.google.com ([209.85.216.174]:48575 "EHLO mail-qc0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751643Ab2LEIIL (ORCPT ); Wed, 5 Dec 2012 03:08:11 -0500 Received: by mail-qc0-f174.google.com with SMTP id o22so2569147qcr.19 for ; Wed, 05 Dec 2012 00:08:10 -0800 (PST) MIME-Version: 1.0 In-Reply-To: References: Date: Wed, 5 Dec 2012 03:08:10 -0500 Message-ID: (sfid-20121205_090814_885340_C7B0448C) Subject: Re: [PATCH -next] ipw2200: return error code on error in ipw_wx_get_auth() From: Wei Yongjun To: stas.yakovlev@gmail.com Cc: linville@tuxdriver.com, yongjun_wei@trendmicro.com.cn, linux-wireless@vger.kernel.org Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-wireless-owner@vger.kernel.org List-ID: On 12/05/2012 02:55 PM, Stanislav Yakovlev wrote: > Hello, Wei, > > On 3 December 2012 22:03, Wei Yongjun wrote: >> From: Wei Yongjun >> >> 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 >> --- >> 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