Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

staging: vt6656: iwctl: Fix up variable declarations (whitespace and 'one-per-line') 



Ensure that we have only one variable declaration per line and for
each of those lines we have one space between type and variable name
and if there's assignment, then we have one space on each side of the
equals sign (and no more than 80 characters per line).

Signed-off-by: default avatarJesper Juhl <jj@chaosbits.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bb6ec004

drivers/staging/vt6656/iwctl.c

+109 −90
Original line number Diff line number Diff line
@@ -172,12 +172,15 @@ int iwctl_siwscan(struct net_device *dev, struct iw_request_info *info, 
int iwctl_giwscan(struct net_device *dev, struct iw_request_info *info,

		struct iw_point *wrq, char *extra)

{

	int ii, jj, kk;

	int ii;

	int jj;

	int kk;

	PSDevice pDevice = (PSDevice)netdev_priv(dev);

	PSMgmtObject pMgmt = &(pDevice->sMgmtObj);

	PKnownBSS pBSS;

	PWLAN_IE_SSID pItemSSID;

	PWLAN_IE_SUPP_RATES pSuppRates, pExtSuppRates;

	PWLAN_IE_SUPP_RATES pSuppRates;

	PWLAN_IE_SUPP_RATES pExtSuppRates;

	char *current_ev = extra;

	char *end_buf = extra + IW_SCAN_MAX_DATA;

	char *current_val = NULL;
@@ -481,8 +484,12 @@ void iwctl_giwrange(struct net_device *dev, struct iw_request_info *info, 
		struct iw_point *wrq, char *extra)

{

	struct iw_range *range = (struct iw_range *) extra;

	int		i,k;

	BYTE abySupportedRates[13]= {0x02, 0x04, 0x0B, 0x16, 0x0c, 0x12, 0x18, 0x24, 0x30, 0x48, 0x60, 0x6C, 0x90};

	int i;

	int k;

	BYTE abySupportedRates[13] = {

		0x02, 0x04, 0x0B, 0x16, 0x0c, 0x12, 0x18, 0x24, 0x30, 0x48,

		0x60, 0x6C, 0x90

	};



	DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWRANGE\n");

	if (wrq->pointer) {
@@ -596,7 +603,8 @@ int iwctl_siwap(struct net_device *dev, struct iw_request_info *info, 
		//mike add: if desired AP is hidden ssid(there are two same BSSID in list),

		//                  then ignore,because you don't known which one to be connect with??

		{

			unsigned int ii, uSameBssidNum = 0;

			unsigned ii;

			unsigned uSameBssidNum = 0;

			for (ii = 0; ii < MAX_BSS_NUM; ii++) {

				if (pMgmt->sBSSList[ii].bActive &&

					!compare_ether_addr(pMgmt->sBSSList[ii].abyBSSID,
@@ -647,7 +655,9 @@ int iwctl_giwap(struct net_device *dev, struct iw_request_info *info, 
int iwctl_giwaplist(struct net_device *dev, struct iw_request_info *info,

		struct iw_point *wrq, char *extra)

{

	int ii,jj, rc = 0;

	int ii;

	int jj;

	int rc = 0;

	struct sockaddr sock[IW_MAX_AP];

	struct iw_quality qual[IW_MAX_AP];

	PSDevice pDevice = (PSDevice)netdev_priv(dev);
@@ -741,7 +751,8 @@ int iwctl_siwessid(struct net_device *dev, struct iw_request_info *info, 
			{

				PKnownBSS pCurr = NULL;

				BYTE abyTmpDesireSSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1];

				unsigned int ii, uSameBssidNum = 0;

				unsigned ii;

				unsigned uSameBssidNum = 0;



				memcpy(abyTmpDesireSSID,pMgmt->abyDesireSSID,sizeof(abyTmpDesireSSID));

				pCurr = BSSpSearchBSSList(pDevice,
@@ -830,7 +841,10 @@ int iwctl_siwrate(struct net_device *dev, struct iw_request_info *info, 
	int rc = 0;

	u8 brate = 0;

	int i;

	BYTE abySupportedRates[13]= {0x02, 0x04, 0x0B, 0x16, 0x0c, 0x12, 0x18, 0x24, 0x30, 0x48, 0x60, 0x6C, 0x90};

	BYTE abySupportedRates[13] = {

		0x02, 0x04, 0x0B, 0x16, 0x0c, 0x12, 0x18, 0x24, 0x30, 0x48,

		0x60, 0x6C, 0x90

	};





	DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWRATE \n");
@@ -910,8 +924,12 @@ void iwctl_giwrate(struct net_device *dev, struct iw_request_info *info, 


	DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWRATE \n");

	{

		BYTE abySupportedRates[13]= {0x02, 0x04, 0x0B, 0x16, 0x0c, 0x12, 0x18, 0x24, 0x30, 0x48, 0x60, 0x6C, 0x90};

		BYTE abySupportedRates[13] = {

			0x02, 0x04, 0x0B, 0x16, 0x0c, 0x12, 0x18, 0x24, 0x30,

			0x48, 0x60, 0x6C, 0x90

		};

		int brate = 0;



		if (pDevice->uConnectionRate < 13) {

			brate = abySupportedRates[pDevice->uConnectionRate];

		}else {
@@ -1082,7 +1100,9 @@ int iwctl_siwencode(struct net_device *dev, struct iw_request_info *info, 
	PSDevice pDevice = (PSDevice)netdev_priv(dev);

	PSMgmtObject pMgmt = &(pDevice->sMgmtObj);

	DWORD dwKeyIndex = (DWORD)(wrq->flags & IW_ENCODE_INDEX);

	int ii,uu, rc = 0;

	int ii;

	int uu;

	int rc = 0;

	int index = (wrq->flags & IW_ENCODE_INDEX);



	DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWENCODE \n");
@@ -1183,7 +1203,7 @@ int iwctl_giwencode(struct net_device *dev, struct iw_request_info *info, 
	PSMgmtObject pMgmt = &(pDevice->sMgmtObj);

	char abyKey[WLAN_WEP232_KEYLEN];



	unsigned int index = (unsigned int)(wrq->flags & IW_ENCODE_INDEX);

	unsigned index = (unsigned)(wrq->flags & IW_ENCODE_INDEX);

	PSKeyItem pKey = NULL;



	DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWENCODE\n");
@@ -1498,10 +1518,12 @@ int iwctl_siwencodeext(struct net_device *dev, struct iw_request_info *info, 
//original member

	wpa_alg alg_name;

	u8 addr[6];

	int key_idx, set_tx=0;

	int key_idx;

	int set_tx=0;

	u8 seq[IW_ENCODE_SEQ_MAX_SIZE];

	u8 key[64];

	size_t seq_len=0,key_len=0;

	size_t seq_len = 0;

	size_t key_len = 0;

	u8 *buf;

	size_t blen;

	u8 key_array[64];
@@ -1647,8 +1669,7 @@ int iwctl_siwmlme(struct net_device *dev, struct iw_request_info *info, 


#endif



static const iw_handler		iwctl_handler[] =

{

static const iw_handler iwctl_handler[] = {

	(iw_handler) NULL,      /* SIOCSIWCOMMIT */

	(iw_handler) NULL,      // SIOCGIWNAME

	(iw_handler) NULL,				// SIOCSIWNWID
@@ -1707,8 +1728,7 @@ static const iw_handler iwctl_handler[] = 
	(iw_handler) NULL,				// -- hole --

};



static const iw_handler		iwctl_private_handler[] =

{

static const iw_handler iwctl_private_handler[] = {

	NULL,				// SIOCIWFIRSTPRIV

};
@@ -1718,8 +1738,7 @@ struct iw_priv_args iwctl_private_args[] = { 
	  "set"},

};



const struct iw_handler_def	iwctl_handler_def =

{

const struct iw_handler_def iwctl_handler_def = {

	.get_wireless_stats = &iwctl_get_wireless_stats,

	.num_standard	= sizeof(iwctl_handler)/sizeof(iw_handler),

	.num_private	= 0,

drivers/staging/vt6656/iwctl.h

+2 −2

File changed.

Contains only whitespace changes.