Commit 0c5c7901 authored by Jesper Juhl's avatar Jesper Juhl Committed by Greg Kroah-Hartman
Browse files

staging: vt6656: iwctl: Fix up a few remaining brace issues 



My previous cleanup patches missed a few cases of
redundant/missing/replaced curly braces. This should fix up the last
ones.

Signed-off-by: default avatarJesper Juhl <jj@chaosbits.net>
Acked-by : Marcos Paulo de Souza <marcos.souza.org@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4063d060

drivers/staging/vt6656/iwctl.c

+11 −12
Original line number Diff line number Diff line
@@ -140,9 +140,9 @@ int iwctl_siwscan(struct net_device *dev, struct iw_request_info *info, 
			if (pItemSSID->abySSID[req->essid_len - 1] == '\0') {

				if (req->essid_len > 0)

					pItemSSID->len = req->essid_len - 1;

			}

			else

			} else {

				pItemSSID->len = req->essid_len;

			}

			pMgmt->eScanType = WMAC_SCAN_PASSIVE;

			PRINT_K("SIOCSIWSCAN:[desired_ssid=%s,len=%d]\n", ((PWLAN_IE_SSID)abyScanSSID)->abySSID,

				((PWLAN_IE_SSID)abyScanSSID)->len);
@@ -577,9 +577,9 @@ int iwctl_siwap(struct net_device *dev, struct iw_request_info *info, 


	PRINT_K(" SIOCSIWAP \n");



	if (wrq->sa_family != ARPHRD_ETHER)

	if (wrq->sa_family != ARPHRD_ETHER) {

		rc = -EINVAL;

	else {

	} else {

		memcpy(pMgmt->abyDesireBSSID, wrq->sa_data, 6);

		// mike: add

		if ((is_broadcast_ether_addr(pMgmt->abyDesireBSSID)) ||
@@ -882,8 +882,7 @@ int iwctl_siwrate(struct net_device *dev, struct iw_request_info *info, 
			pDevice->uConnectionRate = brate;

			DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Fixed to Rate %d \n", pDevice->uConnectionRate);

		}

	}

	else {

	} else {

		pDevice->bFixRate = FALSE;

		pDevice->uConnectionRate = 13;

	}
@@ -1360,12 +1359,11 @@ int iwctl_siwauth(struct net_device *dev, struct iw_request_info *info, 
		if (wpa_version == IW_AUTH_WPA_VERSION_DISABLED)

			break;

		if (pairwise == IW_AUTH_CIPHER_NONE) {

			if (wrq->value == IW_AUTH_CIPHER_CCMP) {

			if (wrq->value == IW_AUTH_CIPHER_CCMP)

				pDevice->eEncryptionStatus = Ndis802_11Encryption3Enabled;

			}else {

			else

				pDevice->eEncryptionStatus = Ndis802_11Encryption2Enabled;

		}

		}

		break;

	case IW_AUTH_KEY_MGMT:

		PRINT_K("iwctl_siwauth(wpa_version=%d):set KEY_MGMT=%d\n", wpa_version,wrq->value);
@@ -1470,9 +1468,10 @@ int iwctl_giwgenie(struct net_device *dev, struct iw_request_info *info, 
			if (copy_to_user(extra, pMgmt->abyWPAIE, pMgmt->wWPAIELen)) {

				ret = -EFAULT;

			}

		} else

		} else {

			ret = -E2BIG;

		}

	}

	return ret;

}