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

staging, vt6656/wpactl.c: A basic style cleanup 



This patch cleans up the coding style in
drivers/staging/vt6656/wpactl.c to closer match the generally accepted
kernel CodingStyle. It is by no means a "make it perfect" patch, but
it does get the file a fair bit closer to matching the accepted style
(whomever was involved in the evolution of this file seriously need to
configure their editors to maintain a consistent style - it was a
mess).

Besides pure style cleanups I also took the liberty of removing some
pointless parens, some unneeded casts and removing some commented out code
(it was obviously not used and git has it if it's ever needed in the
future).

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

drivers/staging/vt6656/wpactl.c

+418 −518
Original line number Diff line number Diff line
@@ -46,23 +46,18 @@ 


#define VIAWGET_WPA_MAX_BUF_SIZE 1024







static const int frequency_list[] = {

	2412, 2417, 2422, 2427, 2432, 2437, 2442,

	2447, 2452, 2457, 2462, 2467, 2472, 2484

};



/*---------------------  Static Classes  ----------------------------*/



/*---------------------  Static Variables  --------------------------*/

//static int          msglevel                =MSG_LEVEL_DEBUG;

static int msglevel = MSG_LEVEL_INFO;



/*---------------------  Static Functions  --------------------------*/









/*---------------------  Export Variables  --------------------------*/

static void wpadev_setup(struct net_device *dev)

{
@@ -90,7 +85,6 @@ static void wpadev_setup(struct net_device *dev) 
 * Return Value:

 *

 */



static int wpa_init_wpadev(PSDevice pDevice)

{

	PSDevice wpadev_priv;
@@ -128,7 +122,6 @@ static int wpa_init_wpadev(PSDevice pDevice) 
	return 0;

}





/*

 * Description:

 *      unregister net_device (wpadev)
@@ -141,7 +134,6 @@ static int wpa_init_wpadev(PSDevice pDevice) 
 * Return Value:

 *

 */



static int wpa_release_wpadev(PSDevice pDevice)

{

	if (pDevice->skb) {
@@ -160,10 +152,6 @@ static int wpa_release_wpadev(PSDevice pDevice) 
	return 0;

}











/*

 * Description:

 *      Set enable/disable dev for wpa supplicant deamon
@@ -177,12 +165,10 @@ static int wpa_release_wpadev(PSDevice pDevice) 
 * Return Value:

 *

 */



int wpa_set_wpadev(PSDevice pDevice, int val)

{

	if (val)

		return wpa_init_wpadev(pDevice);

	else

	return wpa_release_wpadev(pDevice);

}
@@ -199,25 +185,24 @@ int wpa_set_wpadev(PSDevice pDevice, int val) 
 * Return Value:

 *

 */



 int wpa_set_keys(PSDevice pDevice, void *ctx, BOOL  fcpfkernel)

{

	struct viawget_wpa_param *param = ctx;

    PSMgmtObject pMgmt = &(pDevice->sMgmtObj);

	PSMgmtObject pMgmt = &pDevice->sMgmtObj;

	DWORD dwKeyIndex = 0;

	BYTE abyKey[MAX_KEY_LEN];

	BYTE abySeq[MAX_KEY_LEN];

	QWORD KeyRSC;

//    NDIS_802_11_KEY_RSC KeyRSC;

	BYTE byKeyDecMode = KEY_CTL_WEP;

	int ret = 0;

	int uu, ii;



	int uu;

	int ii;



	if (param->u.wpa_key.alg_name > WPA_ALG_CCMP)

		return -EINVAL;



    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "param->u.wpa_key.alg_name = %d \n", param->u.wpa_key.alg_name);

	DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "param->u.wpa_key.alg_name = %d \n",

		param->u.wpa_key.alg_name);

	if (param->u.wpa_key.alg_name == WPA_ALG_NONE) {

		pDevice->eEncryptionStatus = Ndis802_11EncryptionDisabled;

		pDevice->bEncryptionEnable = FALSE;
@@ -235,10 +220,10 @@ int wpa_set_wpadev(PSDevice pDevice, int val) 
	spin_unlock_irq(&pDevice->lock);

	if (param->u.wpa_key.key && fcpfkernel) {

		memcpy(&abyKey[0], param->u.wpa_key.key, param->u.wpa_key.key_len);

     }

    else {

	} else {

		if (param->u.wpa_key.key &&

	    copy_from_user(&abyKey[0], param->u.wpa_key.key, param->u.wpa_key.key_len)) {

			copy_from_user(&abyKey[0], param->u.wpa_key.key,

				param->u.wpa_key.key_len)) {

			spin_lock_irq(&pDevice->lock);

			return -EINVAL;

		}
@@ -250,8 +235,7 @@ int wpa_set_wpadev(PSDevice pDevice, int val) 
	if (param->u.wpa_key.alg_name == WPA_ALG_WEP) {

		if (dwKeyIndex > 3) {

			return -EINVAL;

        }

        else {

		} else {

			if (param->u.wpa_key.set_tx) {

				pDevice->byKeyIndex = (BYTE)dwKeyIndex;

				pDevice->bTransmitKey = TRUE;
@@ -279,10 +263,10 @@ int wpa_set_wpadev(PSDevice pDevice, int val) 
	spin_unlock_irq(&pDevice->lock);

        if (param->u.wpa_key.seq && fcpfkernel) {

		memcpy(&abySeq[0], param->u.wpa_key.seq, param->u.wpa_key.seq_len);

        	}

       else {

	} else {

		if (param->u.wpa_key.seq &&

	    copy_from_user(&abySeq[0], param->u.wpa_key.seq, param->u.wpa_key.seq_len)) {

			copy_from_user(&abySeq[0], param->u.wpa_key.seq,

				param->u.wpa_key.seq_len)) {

			spin_lock_irq(&pDevice->lock);

			return -EINVAL;

		}
@@ -295,7 +279,6 @@ int wpa_set_wpadev(PSDevice pDevice, int val) 
				LODWORD(KeyRSC) |= (abySeq[ii] << (ii * 8));

			else

				HIDWORD(KeyRSC) |= (abySeq[ii] << ((ii-4) * 8));

	         //KeyRSC |= (abySeq[ii] << (ii * 8));

		}

		dwKeyIndex |= 1 << 29;

	}
@@ -343,7 +326,6 @@ int wpa_set_wpadev(PSDevice pDevice, int val) 
	if ((byKeyDecMode == KEY_CTL_TKIP) &&

		(param->u.wpa_key.key_len != MAX_KEY_LEN)) {

		// TKIP Key must be 256 bits

        //DBG_PRN_WLAN03(("return NDIS_STATUS_INVALID_DATA - TKIP Key must be 256 bits\n"));

		DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "return- TKIP Key must be 256 bits!\n");

		return -EINVAL;

    }
@@ -359,9 +341,7 @@ int wpa_set_wpadev(PSDevice pDevice, int val) 
		/* if broadcast, set the key as every key entry's group key */

		DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Groupe Key Assign.\n");



        if ((KeybSetAllGroupKey(pDevice,

                            &(pDevice->sKey),

                            dwKeyIndex,

		if ((KeybSetAllGroupKey(pDevice, &(pDevice->sKey), dwKeyIndex,

							param->u.wpa_key.key_len,

							(PQWORD) &(KeyRSC),

							(PBYTE)abyKey,
@@ -376,12 +356,9 @@ int wpa_set_wpadev(PSDevice pDevice, int val) 
					byKeyDecMode

				) == TRUE) ) {

			DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "GROUP Key Assign.\n");



		} else {

            //DBG_PRN_WLAN03(("return NDIS_STATUS_INVALID_DATA -KeybSetDefaultKey Fail.0\n"));

			return -EINVAL;

		}



	} else {

		DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Pairwise Key Assign.\n");

		// BSSID not 0xffffffffffff
@@ -390,29 +367,21 @@ int wpa_set_wpadev(PSDevice pDevice, int val) 
			DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Pairwise Key can't be WEP\n");

			return -EINVAL;

		}



		dwKeyIndex |= (1 << 30); // set pairwise key

		if (pMgmt->eConfigMode == WMAC_CONFIG_IBSS_STA) {

			//DBG_PRN_WLAN03(("return NDIS_STATUS_INVALID_DATA - WMAC_CONFIG_IBSS_STA\n"));

			return -EINVAL;

		}

        if (KeybSetKey(pDevice,

                       &(pDevice->sKey),

                       &param->addr[0],

                       dwKeyIndex,

                       param->u.wpa_key.key_len,

                       (PQWORD) &(KeyRSC),

                       (PBYTE)abyKey,

                        byKeyDecMode

		if (KeybSetKey(pDevice, &(pDevice->sKey), &param->addr[0],

				dwKeyIndex, param->u.wpa_key.key_len,

				(PQWORD) &(KeyRSC), (PBYTE)abyKey, byKeyDecMode

				) == TRUE) {

			DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Pairwise Key Set\n");



		} else {

			// Key Table Full

			if (!compare_ether_addr(&param->addr[0], pDevice->abyBSSID)) {

				//DBG_PRN_WLAN03(("return NDIS_STATUS_INVALID_DATA -Key Table Full.2\n"));

				return -EINVAL;



			} else {

				// Save Key and configure just before associate/reassociate to BSSID

				// we do not implement now
@@ -426,18 +395,7 @@ int wpa_set_wpadev(PSDevice pDevice, int val) 
	}

	pDevice->bEncryptionEnable = TRUE;



/*

    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " key=%x-%x-%x-%x-%x-xxxxx \n",

               pMgmt->sNodeDBTable[iNodeIndex].abyWepKey[byKeyIndex][0],

               pMgmt->sNodeDBTable[iNodeIndex].abyWepKey[byKeyIndex][1],

               pMgmt->sNodeDBTable[iNodeIndex].abyWepKey[byKeyIndex][2],

               pMgmt->sNodeDBTable[iNodeIndex].abyWepKey[byKeyIndex][3],

               pMgmt->sNodeDBTable[iNodeIndex].abyWepKey[byKeyIndex][4]

              );

*/



	return ret;



}
@@ -454,12 +412,9 @@ int wpa_set_wpadev(PSDevice pDevice, int val) 
 * Return Value:

 *

 */



static int wpa_set_wpa(PSDevice pDevice,

				     struct viawget_wpa_param *param)

static int wpa_set_wpa(PSDevice pDevice, struct viawget_wpa_param *param)

{



    PSMgmtObject    pMgmt = &(pDevice->sMgmtObj);

	PSMgmtObject pMgmt = &pDevice->sMgmtObj;

	int ret = 0;



	pMgmt->eAuthenMode = WMAC_AUTH_OPEN;
@@ -468,9 +423,6 @@ static int wpa_set_wpa(PSDevice pDevice, 
	return ret;

}









 /*

 * Description:

 *      set disassociate
@@ -484,11 +436,9 @@ static int wpa_set_wpa(PSDevice pDevice, 
 * Return Value:

 *

 */



static int wpa_set_disassociate(PSDevice pDevice,

				     struct viawget_wpa_param *param)

static int wpa_set_disassociate(PSDevice pDevice, struct viawget_wpa_param *param)

{

    PSMgmtObject    pMgmt = &(pDevice->sMgmtObj);

	PSMgmtObject pMgmt = &pDevice->sMgmtObj;

	int ret = 0;



	spin_lock_irq(&pDevice->lock);
@@ -501,8 +451,6 @@ static int wpa_set_disassociate(PSDevice pDevice, 
	return ret;

}







/*

 * Description:

 *      enable scan process
@@ -516,14 +464,12 @@ static int wpa_set_disassociate(PSDevice pDevice, 
 * Return Value:

 *

 */



static int wpa_set_scan(PSDevice pDevice,

			struct viawget_wpa_param *param)

static int wpa_set_scan(PSDevice pDevice, struct viawget_wpa_param *param)

{

	int ret = 0;



/**set ap_scan=1&&scan_ssid=1 under hidden ssid mode**/

        PSMgmtObject        pMgmt = &(pDevice->sMgmtObj);

        PSMgmtObject pMgmt = &pDevice->sMgmtObj;

        PWLAN_IE_SSID pItemSSID;

	printk("wpa_set_scan-->desired [ssid=%s,ssid_len=%d]\n",

		param->u.scan_req.ssid,param->u.scan_req.ssid_len);
@@ -536,17 +482,13 @@ pItemSSID->len = param->u.scan_req.ssid_len; 


	spin_lock_irq(&pDevice->lock);

	BSSvClearBSSList((void *) pDevice, pDevice->bLinkPass);

    /* bScheduleCommand((void *) pDevice, WLAN_CMD_BSSID_SCAN, NULL); */

    bScheduleCommand((void *) pDevice,

		     WLAN_CMD_BSSID_SCAN,

	bScheduleCommand((void *) pDevice, WLAN_CMD_BSSID_SCAN,

			pMgmt->abyDesireSSID);

	spin_unlock_irq(&pDevice->lock);



	return ret;

}







/*

 * Description:

 *      get bssid
@@ -560,19 +502,15 @@ pItemSSID->len = param->u.scan_req.ssid_len; 
 * Return Value:

 *

 */



static int wpa_get_bssid(PSDevice pDevice,

				     struct viawget_wpa_param *param)

static int wpa_get_bssid(PSDevice pDevice, struct viawget_wpa_param *param)

{

    PSMgmtObject        pMgmt = &(pDevice->sMgmtObj);

    PSMgmtObject pMgmt = &pDevice->sMgmtObj;

    int ret = 0;

    memcpy(param->u.wpa_associate.bssid, pMgmt->abyCurrBSSID, 6);



    return ret;



}





/*

 * Description:

 *      get bssid
@@ -586,11 +524,9 @@ static int wpa_get_bssid(PSDevice pDevice, 
 * Return Value:

 *

 */



static int wpa_get_ssid(PSDevice pDevice,

				     struct viawget_wpa_param *param)

static int wpa_get_ssid(PSDevice pDevice, struct viawget_wpa_param *param)

{

    PSMgmtObject        pMgmt = &(pDevice->sMgmtObj);

	PSMgmtObject pMgmt = &pDevice->sMgmtObj;

	PWLAN_IE_SSID pItemSSID;

	int ret = 0;
@@ -602,8 +538,6 @@ static int wpa_get_ssid(PSDevice pDevice, 
	return ret;

}







/*

 * Description:

 *      get scan results
@@ -617,62 +551,44 @@ static int wpa_get_ssid(PSDevice pDevice, 
 * Return Value:

 *

 */



static int wpa_get_scan(PSDevice pDevice,

				     struct viawget_wpa_param *param)

static int wpa_get_scan(PSDevice pDevice, struct viawget_wpa_param *param)

{

	struct viawget_scan_result *scan_buf;

    PSMgmtObject    pMgmt = &(pDevice->sMgmtObj);

	PSMgmtObject pMgmt = &pDevice->sMgmtObj;

	PWLAN_IE_SSID pItemSSID;

	PKnownBSS pBSS;

	PBYTE pBuf;

	int ret = 0;

	u16 count = 0;

	u16 ii, jj;

	u16 ii;

	u16 jj;

	long ldBm; //James //add



//******mike:bubble sort by stronger RSSI*****//



	PBYTE ptempBSS;







    ptempBSS = kmalloc(sizeof(KnownBSS), (int)GFP_ATOMIC);

	ptempBSS = kmalloc(sizeof(KnownBSS), GFP_ATOMIC);



	if (ptempBSS == NULL) {



		printk("bubble sort kmalloc memory fail@@@\n");



		ret = -ENOMEM;



		return ret;



	}



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



		for (jj = 0; jj < MAX_BSS_NUM - ii - 1; jj++) {



		if ((pMgmt->sBSSList[jj].bActive != TRUE) ||



                ((pMgmt->sBSSList[jj].uRSSI>pMgmt->sBSSList[jj+1].uRSSI) &&(pMgmt->sBSSList[jj+1].bActive!=FALSE))) {



			if ((pMgmt->sBSSList[jj].bActive != TRUE)

				|| ((pMgmt->sBSSList[jj].uRSSI > pMgmt->sBSSList[jj + 1].uRSSI)

					&& (pMgmt->sBSSList[jj + 1].bActive != FALSE))) {

				memcpy(ptempBSS,&pMgmt->sBSSList[jj], sizeof(KnownBSS));



                 memcpy(&pMgmt->sBSSList[jj],&pMgmt->sBSSList[jj+1],sizeof(KnownBSS));



				memcpy(&pMgmt->sBSSList[jj], &pMgmt->sBSSList[jj + 1],

					sizeof(KnownBSS));

				memcpy(&pMgmt->sBSSList[jj + 1], ptempBSS, sizeof(KnownBSS));



			}



		}



	}



	kfree(ptempBSS);



 // printk("bubble sort result:\n");



	count = 0;

	pBSS = &(pMgmt->sBSSList[0]);

	for (ii = 0; ii < MAX_BSS_NUM; ii++) {
@@ -682,7 +598,7 @@ static int wpa_get_scan(PSDevice pDevice, 
		count++;

	}



    pBuf = kcalloc(count, sizeof(struct viawget_scan_result), (int)GFP_ATOMIC);

	pBuf = kcalloc(count, sizeof(struct viawget_scan_result), GFP_ATOMIC);



	if (pBuf == NULL) {

		ret = -ENOMEM;
@@ -703,13 +619,12 @@ static int wpa_get_scan(PSDevice pDevice, 
			scan_buf->caps = pBSS->wCapInfo; // DavidWang for sharemode



			RFvRSSITodBm(pDevice, (BYTE)(pBSS->uRSSI), &ldBm);

			if(-ldBm<50){

			if (-ldBm < 50)

				scan_buf->qual = 100;

			}else  if(-ldBm > 90) {

			else if (-ldBm > 90)

				scan_buf->qual = 0;

			}else {

			else

				scan_buf->qual=(40-(-ldBm-50))*100/40;

			}



			//James

			//scan_buf->caps = pBSS->wCapInfo;
@@ -734,18 +649,16 @@ static int wpa_get_scan(PSDevice pDevice, 
	if (jj < count)

		count = jj;



    if (copy_to_user(param->u.scan_results.buf, pBuf, sizeof(struct viawget_scan_result) * count)) {

	if (copy_to_user(param->u.scan_results.buf, pBuf, sizeof(struct viawget_scan_result) * count))

		ret = -EFAULT;

	}



	param->u.scan_results.scan_count = count;

    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " param->u.scan_results.scan_count = %d\n", count)

	DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " param->u.scan_results.scan_count = %d\n", count);



	kfree(pBuf);

	return ret;

}







/*

 * Description:

 *      set associate with AP
@@ -759,11 +672,9 @@ static int wpa_get_scan(PSDevice pDevice, 
 * Return Value:

 *

 */



static int wpa_set_associate(PSDevice pDevice,

				     struct viawget_wpa_param *param)

static int wpa_set_associate(PSDevice pDevice, struct viawget_wpa_param *param)

{

    PSMgmtObject    pMgmt = &(pDevice->sMgmtObj);

	PSMgmtObject pMgmt = &pDevice->sMgmtObj;

	PWLAN_IE_SSID pItemSSID;

	BYTE abyNullAddr[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00};

	BYTE abyWPAIE[64];
@@ -833,7 +744,6 @@ static int wpa_set_associate(PSDevice pDevice, 
	case CIPHER_WEP104:

		pDevice->eEncryptionStatus = Ndis802_11Encryption1Enabled;

		bwepEnabled = TRUE;

	//	printk("****************wpa_set_associate:set CIPHER_WEP40_104\n");

		break;

	case CIPHER_NONE:

		if (param->u.wpa_associate.group_suite == CIPHER_CCMP)
@@ -846,18 +756,14 @@ static int wpa_set_associate(PSDevice pDevice, 
	}



	pMgmt->Roam_dbm = param->u.wpa_associate.roam_dbm;

         // if ((pMgmt->Roam_dbm > 40)&&(pMgmt->Roam_dbm<80))

         //    pDevice->bEnableRoaming = TRUE;



	if (pMgmt->eAuthenMode == WMAC_AUTH_SHAREKEY) { // @wep-sharekey

		pDevice->eEncryptionStatus = Ndis802_11Encryption1Enabled;

		pMgmt->bShareKeyAlgorithm = TRUE;

             }

	    else if (pMgmt->eAuthenMode == WMAC_AUTH_OPEN) {

	} else if (pMgmt->eAuthenMode == WMAC_AUTH_OPEN) {

		if(bwepEnabled==TRUE) { //@open-wep

			pDevice->eEncryptionStatus = Ndis802_11Encryption1Enabled;

	   	}

	      else {                                                                                                 //@only open

	   	} else {

			// @only open

			pDevice->eEncryptionStatus = Ndis802_11EncryptionDisabled;

	   	}

	}
@@ -872,10 +778,9 @@ static int wpa_set_associate(PSDevice pDevice, 
	if ((pMgmt->eAuthenMode == WMAC_AUTH_SHAREKEY) ||

		((pMgmt->eAuthenMode == WMAC_AUTH_OPEN) && (bwepEnabled==TRUE)))  {

		// mike re-comment:open-wep && sharekey-wep needn't do initial key!!



     }

 else

	} else {

		KeyvInitTable(pDevice,&pDevice->sKey);

	}



	spin_lock_irq(&pDevice->lock);

	pDevice->bLinkPass = FALSE;
@@ -908,7 +813,6 @@ static int wpa_set_associate(PSDevice pDevice, 
	return ret;

}





/*

 * Description:

 *      wpa_ioctl main function supported for wpa supplicant
@@ -922,7 +826,6 @@ static int wpa_set_associate(PSDevice pDevice, 
 * Return Value:

 *

 */



int wpa_ioctl(PSDevice pDevice, struct iw_point *p)

{

	struct viawget_wpa_param *param;
@@ -933,7 +836,7 @@ int wpa_ioctl(PSDevice pDevice, struct iw_point *p) 
		p->length > VIAWGET_WPA_MAX_BUF_SIZE || !p->pointer)

		return -EINVAL;



	param = kmalloc((int)p->length, (int)GFP_KERNEL);

	param = kmalloc((int)p->length, GFP_KERNEL);

	if (param == NULL)

		return -ENOMEM;
@@ -1000,7 +903,6 @@ int wpa_ioctl(PSDevice pDevice, struct iw_point *p) 
		DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "wpa_ioctl: unknown cmd=%d\n",

			param->cmd);

		return -EOPNOTSUPP;

		break;

	}



	if ((ret == 0) && wpa_ioctl) {
@@ -1012,7 +914,5 @@ int wpa_ioctl(PSDevice pDevice, struct iw_point *p) 


out:

	kfree(param);



	return ret;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE