| Message ID | CAPgLHd_AN+Tr5EQFBZMH0FZCp6ESHVURZHvd9SuW=a2PYkPoXw@mail.gmail.com |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | David Miller |
| Headers | show |
On 5 December 2012 00:08, Wei Yongjun <weiyj.lk@gmail.com> wrote: > From: Wei Yongjun <yongjun_wei@trendmicro.com.cn> > > 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> 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]; > > -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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];