From 9e94fbd91d9b5bea72bd477dcbfff79e3becf981 Mon Sep 17 00:00:00 2001
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Date: Wed, 5 Dec 2012 03:08:11 -0500
Subject: [PATCH] --- yaml --- r: 341998 b: refs/heads/master c:
 8df0f1e5cbd4ff1e2059a1e11bd89b35aa5ed004 h: refs/heads/master v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/net/wireless/ipw2x00/ipw2200.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 2ba256078eb5..53297d561acd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9304a1c7430590a7ee8ded5fc401ef483123de66
+refs/heads/master: 8df0f1e5cbd4ff1e2059a1e11bd89b35aa5ed004
diff --git a/trunk/drivers/net/wireless/ipw2x00/ipw2200.c b/trunk/drivers/net/wireless/ipw2x00/ipw2200.c
index 482f505f3f35..b0879adcd441 100644
--- a/trunk/drivers/net/wireless/ipw2x00/ipw2200.c
+++ b/trunk/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];