linux-kernel - [PATCH 08/14] staging: vt6656: iwctl: remove unneeded scope block in iwctl

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <alpine.LNX.2.00.1206250151290.30361@swampdragon.chaosbits.net>
Date:	Mon, 25 Jun 2012 01:57:07 +0200 (CEST)
From:	Jesper Juhl <jj@...osbits.net>
To:	Greg Kroah-Hartman <gregkh@...uxfoundation.org>
cc:	Dan Carpenter <dan.carpenter@...cle.com>,
	Forest Bond <forest@...ttletooquiet.net>,
	Marcos Paulo de Souza <marcos.mage@...il.com>,
	devel@...verdev.osuosl.org, linux-kernel@...r.kernel.org
Subject: [PATCH 08/14] staging: vt6656: iwctl: remove unneeded scope block
 in iwctl_siwessid()

Reduce indentation by removing completely redundant scope block in the
iwctl_siwessid() function.

Signed-off-by: Jesper Juhl <jj@...osbits.net>
---
 drivers/staging/vt6656/iwctl.c | 71 ++++++++++++++++++++----------------------
 1 file changed, 34 insertions(+), 37 deletions(-)

diff --git a/drivers/staging/vt6656/iwctl.c b/drivers/staging/vt6656/iwctl.c
index eeaee59..3249a01 100644
--- a/drivers/staging/vt6656/iwctl.c
+++ b/drivers/staging/vt6656/iwctl.c
@@ -748,23 +748,41 @@ int iwctl_siwessid(struct net_device *dev, struct iw_request_info *info,
 		//so here need not associate??
 		if(pDevice->bWPASuppWextEnabled == TRUE)  {
 			/*******search if  in hidden ssid mode ****/
-			{
-				PKnownBSS pCurr = NULL;
-				BYTE abyTmpDesireSSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1];
-				unsigned ii;
-				unsigned uSameBssidNum = 0;
-
-				memcpy(abyTmpDesireSSID,pMgmt->abyDesireSSID,sizeof(abyTmpDesireSSID));
-				pCurr = BSSpSearchBSSList(pDevice,
-							NULL,
-							abyTmpDesireSSID,
-							pDevice->eConfigPHYMode
-					);
-
-				if (pCurr == NULL){
-					PRINT_K("SIOCSIWESSID:hidden ssid site survey before associate.......\n");
+			PKnownBSS pCurr = NULL;
+			BYTE abyTmpDesireSSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1];
+			unsigned ii;
+			unsigned uSameBssidNum = 0;
+
+			memcpy(abyTmpDesireSSID,pMgmt->abyDesireSSID,sizeof(abyTmpDesireSSID));
+			pCurr = BSSpSearchBSSList(pDevice, NULL,
+						abyTmpDesireSSID,
+						pDevice->eConfigPHYMode
+				);
+
+			if (pCurr == NULL){
+				PRINT_K("SIOCSIWESSID:hidden ssid site survey before associate.......\n");
+				vResetCommandTimer((void *) pDevice);
+				pMgmt->eScanType = WMAC_SCAN_ACTIVE;
+				bScheduleCommand((void *) pDevice,
+						WLAN_CMD_BSSID_SCAN,
+						pMgmt->abyDesireSSID);
+				bScheduleCommand((void *) pDevice,
+						WLAN_CMD_SSID,
+						pMgmt->abyDesireSSID);
+			}
+			else {  //mike:to find out if that desired SSID is a hidden-ssid AP ,
+				//         by means of judging if there are two same BSSID exist in list ?
+				for (ii = 0; ii < MAX_BSS_NUM; ii++) {
+					if (pMgmt->sBSSList[ii].bActive &&
+						!compare_ether_addr(pMgmt->sBSSList[ii].abyBSSID,
+								pCurr->abyBSSID)) {
+						uSameBssidNum++;
+					}
+				}
+				if(uSameBssidNum >= 2) {  //hit: desired AP is in hidden ssid mode!!!
+					PRINT_K("SIOCSIWESSID:hidden ssid directly associate.......\n");
 					vResetCommandTimer((void *) pDevice);
-					pMgmt->eScanType = WMAC_SCAN_ACTIVE;
+					pMgmt->eScanType = WMAC_SCAN_PASSIVE;          //this scan type,you'll submit scan result!
 					bScheduleCommand((void *) pDevice,
 							WLAN_CMD_BSSID_SCAN,
 							pMgmt->abyDesireSSID);
@@ -772,27 +790,6 @@ int iwctl_siwessid(struct net_device *dev, struct iw_request_info *info,
 							WLAN_CMD_SSID,
 							pMgmt->abyDesireSSID);
 				}
-				else {  //mike:to find out if that desired SSID is a hidden-ssid AP ,
-					//         by means of judging if there are two same BSSID exist in list ?
-					for (ii = 0; ii < MAX_BSS_NUM; ii++) {
-						if (pMgmt->sBSSList[ii].bActive &&
-							!compare_ether_addr(pMgmt->sBSSList[ii].abyBSSID,
-									pCurr->abyBSSID)) {
-							uSameBssidNum++;
-						}
-					}
-					if(uSameBssidNum >= 2) {  //hit: desired AP is in hidden ssid mode!!!
-						PRINT_K("SIOCSIWESSID:hidden ssid directly associate.......\n");
-						vResetCommandTimer((void *) pDevice);
-						pMgmt->eScanType = WMAC_SCAN_PASSIVE;          //this scan type,you'll submit scan result!
-						bScheduleCommand((void *) pDevice,
-								WLAN_CMD_BSSID_SCAN,
-								pMgmt->abyDesireSSID);
-						bScheduleCommand((void *) pDevice,
-								WLAN_CMD_SSID,
-								pMgmt->abyDesireSSID);
-					}
-				}
 			}
 			return 0;
 		}
-- 
1.7.11


-- 
Jesper Juhl <jj@...osbits.net>       http://www.chaosbits.net/
Don't top-post http://www.catb.org/jargon/html/T/top-post.html
Plain text mails only, please.

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/