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

Commit 883aeecc authored by Dan Carpenter's avatar Dan Carpenter Committed by Greg Kroah-Hartman
Browse files

Staging: vt6656: whitespace cleanups in ioctl.c 



The indents on this file didn't line up so it was hard to work with.
I changed other white space issues as I came across them.  I also
deleted or changed some couple comments and the comment style.

Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 4fb544c9

drivers/staging/vt6656/ioctl.c

+483 −552
Original line number Diff line number Diff line
@@ -40,21 +40,11 @@ 
#include "rndis.h"

#include "rf.h"



/*---------------------  Static Definitions -------------------------*/



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



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

//static int          msglevel                =MSG_LEVEL_DEBUG;

static int          msglevel                =MSG_LEVEL_INFO;



SWPAResult wpa_Result;

static int msglevel = MSG_LEVEL_INFO;



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



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



int private_ioctl(PSDevice pDevice, struct ifreq *rq) {

int private_ioctl(PSDevice pDevice, struct ifreq *rq)

{



	PSCmdRequest	pReq = (PSCmdRequest)rq;

	PSMgmtObject	pMgmt = &(pDevice->sMgmtObj);
@@ -84,9 +74,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) { 
	pReq->wResult = 0;



	switch (pReq->wCmdCode) {



	case WLAN_CMD_BSS_SCAN:



		if (copy_from_user(&sScanCmd, pReq->data, sizeof(SCmdScan))) {

			result = -EFAULT;

			break;
@@ -117,7 +105,6 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) { 
		break;



	case WLAN_CMD_ZONETYPE_SET:

	//mike add :cann't support.

		result = -EOPNOTSUPP;

		break;
@@ -127,49 +114,41 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) { 
		}



		if (sZoneTypeCmd.bWrite == TRUE) {

	  //////write zonetype

			/* write zonetype */

			if (sZoneTypeCmd.ZoneType == ZoneType_USA) {

                  //set to USA

				/* set to USA */

				printk("set_ZoneType:USA\n");

		}

                else if(sZoneTypeCmd.ZoneType == ZoneType_Japan) {

                  //set to Japan

			} else if (sZoneTypeCmd.ZoneType == ZoneType_Japan) {

				/* set to Japan */

				printk("set_ZoneType:Japan\n");

		}

	       else if(sZoneTypeCmd.ZoneType == ZoneType_Europe) {

                  //set to Europe

			} else if (sZoneTypeCmd.ZoneType == ZoneType_Europe) {

				/* set to Europe */

				printk("set_ZoneType:Europe\n");

			}

            }

	else {

          ///////read zonetype

		} else {

			/* read zonetype */

			BYTE zonetype = 0;





           if(zonetype == 0x00)  { //USA

			if (zonetype == 0x00) {        /* USA */

				sZoneTypeCmd.ZoneType = ZoneType_USA;

           }

	 else if(zonetype == 0x01) { //Japan

			} else if (zonetype == 0x01) { /* Japan */

				sZoneTypeCmd.ZoneType = ZoneType_Japan;

	  }

	 else if(zonetype == 0x02) { //Europe

			} else if (zonetype == 0x02) { /* Europe */

				sZoneTypeCmd.ZoneType = ZoneType_Europe;

	 }

	 else { //Unknown ZoneType

			} else {                       /* Unknown ZoneType */

				printk("Error:ZoneType[%x] Unknown ???\n", zonetype);

				result = -EFAULT;

				break;

			}

	   if (copy_to_user(pReq->data, &sZoneTypeCmd, sizeof(SCmdZoneTypeSet))) {



			if (copy_to_user(pReq->data, &sZoneTypeCmd,

						sizeof(SCmdZoneTypeSet))) {

				result = -EFAULT;

				break;

			}

		}



		break;



	case WLAN_CMD_BSS_JOIN:



		if (copy_from_user(&sJoinCmd, pReq->data, sizeof(SCmdBSSJoin))) {

			result = -EFAULT;

			break;
@@ -181,18 +160,15 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) { 
		if (sJoinCmd.wBSSType == ADHOC) {

			pMgmt->eConfigMode = WMAC_CONFIG_IBSS_STA;

			DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "ioct set to adhoc mode\n");

	    }

	    else {

		} else {

			pMgmt->eConfigMode = WMAC_CONFIG_ESS_STA;

			DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "ioct set to STA mode\n");

		}

		if (sJoinCmd.bPSEnable == TRUE) {

			pDevice->ePSMode = WMAC_POWER_FAST;

//            pDevice->ePSMode = WMAC_POWER_MAX;

			pMgmt->wListenInterval = 2;

			DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Power Saving On\n");

        }

        else {

		} else {

			pDevice->ePSMode = WMAC_POWER_CAM;

			pMgmt->wListenInterval = 1;

			DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Power Saving Off\n");
@@ -201,11 +177,11 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) { 
		if (sJoinCmd.bShareKeyAuth == TRUE) {

			pMgmt->bShareKeyAlgorithm = TRUE;

			DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Share Key\n");

        }

        else {

		} else {

			pMgmt->bShareKeyAlgorithm = FALSE;

			DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Open System\n");

		}



		pDevice->uChannel = sJoinCmd.uChannel;

		netif_stop_queue(pDevice->dev);

		spin_lock_irq(&pDevice->lock);
@@ -240,29 +216,23 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) { 
		for (ii = 0; ii < WLAN_WEP_NKEYS; ii++) {

			if (sWEPCmd.bWepKeyAvailable[ii]) {

				if (ii == sWEPCmd.byKeyIndex)

//2006-1207-01<Modify>by Einsn Liu

//		    dwKeyIndex|= (1 << 31);

					dwKeyIndex = ii | (1 << 31);

				else

					dwKeyIndex = ii;

				spin_lock_irq(&pDevice->lock);

                KeybSetDefaultKey(  pDevice,

                                    &(pDevice->sKey),

				KeybSetDefaultKey(pDevice, &(pDevice->sKey),

						  dwKeyIndex,

						  sWEPCmd.auWepKeyLength[ii],

						  NULL,

						  (PBYTE)&sWEPCmd.abyWepKey[ii][0],

                                    KEY_CTL_WEP

                                  );

						  KEY_CTL_WEP);

				spin_unlock_irq(&pDevice->lock);



			}

		}

		pDevice->byKeyIndex = sWEPCmd.byKeyIndex;

		pDevice->bTransmitKey = TRUE;

		pDevice->bEncryptionEnable = TRUE;

		pDevice->eEncryptionStatus = Ndis802_11Encryption1Enabled;



		break;



	case WLAN_CMD_GET_LINK:
@@ -288,16 +258,15 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) { 
			memcpy(sLinkStatus.abyBSSID, pMgmt->abyCurrBSSID, WLAN_BSSID_LEN);

			sLinkStatus.uLinkRate = pMgmt->sNodeDBTable[0].wTxDataRate;

			DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Link Success!\n");

        }

        else {

		} else {

			sLinkStatus.bLink = FALSE;

			sLinkStatus.uLinkRate = 0;

		}

        if (copy_to_user(pReq->data, &sLinkStatus, sizeof(SCmdLinkStatus))) {

		if (copy_to_user(pReq->data, &sLinkStatus,

					sizeof(SCmdLinkStatus))) {

			result = -EFAULT;

			break;

		}



		break;



	case WLAN_CMD_GET_LISTLEN:
@@ -337,21 +306,19 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) { 
				pList->sBSSIDList[ii].wCapInfo = pBSS->wCapInfo;

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

				pList->sBSSIDList[ii].uRSSI = (unsigned int) ldBm;

//    		    pList->sBSSIDList[ii].uRSSI = pBSS->uRSSI;

				/* pList->sBSSIDList[ii].uRSSI = pBSS->uRSSI; */

				memcpy(pList->sBSSIDList[ii].abyBSSID, pBSS->abyBSSID, WLAN_BSSID_LEN);

				pItemSSID = (PWLAN_IE_SSID)pBSS->abySSID;

				memset(pList->sBSSIDList[ii].abySSID, 0, WLAN_SSID_MAXLEN + 1);

				memcpy(pList->sBSSIDList[ii].abySSID, pItemSSID->abySSID, pItemSSID->len);

				if (WLAN_GET_CAP_INFO_ESS(pBSS->wCapInfo)) {

					pList->sBSSIDList[ii].byNetType = INFRA;

                }

                else {

				} else {

					pList->sBSSIDList[ii].byNetType = ADHOC;

				}

				if (WLAN_GET_CAP_INFO_PRIVACY(pBSS->wCapInfo)) {

					pList->sBSSIDList[ii].bWEPOn = TRUE;

                }

                else {

				} else {

					pList->sBSSIDList[ii].bWEPOn = FALSE;

				}

				ii++;
@@ -382,9 +349,8 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) { 
		}

		break;

	case WLAN_CMD_STOP_MAC:



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

        // Todo xxxxxx

		/* Todo xxxxxx */

		netif_stop_queue(pDevice->dev);

		spin_lock_irq(&pDevice->lock);

		if (pDevice->bRadioOff == FALSE) {
@@ -394,23 +360,20 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) { 
		ControlvMaskByte(pDevice, MESSAGE_REQUEST_MACREG, MAC_REG_PAPEDELAY, LEDSTS_STS, LEDSTS_SLOW);

		memset(pMgmt->abyCurrBSSID, 0, 6);

		pMgmt->eCurrState = WMAC_STATE_IDLE;

//        del_timer(&pDevice->sTimerCommand);

//        del_timer(&pMgmt->sTimerSecondCallback);

		/* del_timer(&pDevice->sTimerCommand); */

		/* del_timer(&pMgmt->sTimerSecondCallback); */

		pDevice->bCmdRunning = FALSE;

		spin_unlock_irq(&pDevice->lock);



		break;



	case WLAN_CMD_START_MAC:



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

        // Todo xxxxxxx

		/* Todo xxxxxxx */

		if (pDevice->bRadioOff == TRUE)

			CARDbRadioPowerOn(pDevice);

		break;



	case WLAN_CMD_SET_HOSTAPD:



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



		if (copy_from_user(&sValue, pReq->data, sizeof(SCmdValue))) {
@@ -420,26 +383,21 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) { 
		if (sValue.dwValue == 1) {

			if (vt6656_hostap_set_hostapd(pDevice, 1, 1) == 0) {

				DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Enable HOSTAP\n");

            }

            else {

			} else {

				result = -EFAULT;

				break;

			}

        }

        else {

		} else {

			vt6656_hostap_set_hostapd(pDevice, 0, 1);

			DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Disable HOSTAP\n");

		}



		break;



	case WLAN_CMD_SET_HOSTAPD_STA:



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



		break;

    case WLAN_CMD_SET_802_1X:



	case WLAN_CMD_SET_802_1X:

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

		if (copy_from_user(&sValue, pReq->data, sizeof(SCmdValue))) {

			result = -EFAULT;
@@ -449,17 +407,13 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) { 
		if (sValue.dwValue == 1) {

			pDevice->bEnable8021x = TRUE;

			DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Enable 802.1x\n");

        }

        else {

		} else {

			pDevice->bEnable8021x = FALSE;

			DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Disable 802.1x\n");

		}



		break;





	case WLAN_CMD_SET_HOST_WEP:



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

		if (copy_from_user(&sValue, pReq->data, sizeof(SCmdValue))) {

			result = -EFAULT;
@@ -469,12 +423,10 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) { 
		if (sValue.dwValue == 1) {

			pDevice->bEnableHostWEP = TRUE;

			DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Enable HostWEP\n");

        }

        else {

		} else {

			pDevice->bEnableHostWEP = FALSE;

			DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Disable HostWEP\n");

		}



		break;



	case WLAN_CMD_SET_WPA:
@@ -486,20 +438,16 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) { 
		}

		if (sValue.dwValue == 1) {

			DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "up wpadev\n");

		   memcpy(pDevice->wpadev->dev_addr,

			  pDevice->dev->dev_addr,

			memcpy(pDevice->wpadev->dev_addr, pDevice->dev->dev_addr,

			       ETH_ALEN);

			pDevice->bWPADEVUp = TRUE;

        }

        else {

		} else {

			DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "close wpadev\n");

			pDevice->bWPADEVUp = FALSE;

		}



		break;



	case WLAN_CMD_AP_START:



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

		if (pDevice->bRadioOff == TRUE) {

			CARDbRadioPowerOn(pDevice);
@@ -513,21 +461,17 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) { 
		if (sStartAPCmd.wBSSType == AP) {

			pMgmt->eConfigMode = WMAC_CONFIG_AP;

			DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "ioct set to AP mode\n");

	    }

	    else {

		} else {

			DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "ioct BSS type not set to AP mode\n");

			result = -EFAULT;

			break;

		}





		if (sStartAPCmd.wBBPType == PHY80211g) {

			pMgmt->byAPBBType = PHY_TYPE_11G;

        }

        else if (sStartAPCmd.wBBPType == PHY80211a) {

		} else if (sStartAPCmd.wBBPType == PHY80211a) {

			pMgmt->byAPBBType = PHY_TYPE_11A;

        }

        else {

		} else {

			pMgmt->byAPBBType = PHY_TYPE_11B;

		}
@@ -546,8 +490,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) { 
		if (sStartAPCmd.bShareKeyAuth == TRUE) {

			pMgmt->bShareKeyAlgorithm = TRUE;

			DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Share Key\n");

        }

        else {

		} else {

			pMgmt->bShareKeyAlgorithm = FALSE;

			DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Open System\n");

		}
@@ -568,7 +511,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) { 
		} else if (sStartAPCmd.byBasicRate & BIT1) {

			pMgmt->abyIBSSSuppRates[2] |= BIT7;

		} else {

            //default 1,2M

			/* default 1,2M */

			pMgmt->abyIBSSSuppRates[2] |= BIT7;

			pMgmt->abyIBSSSuppRates[3] |= BIT7;

		}
@@ -577,8 +520,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) { 
			pMgmt->abyIBSSSuppRates[2],

			pMgmt->abyIBSSSuppRates[3],

			pMgmt->abyIBSSSuppRates[4],

                pMgmt->abyIBSSSuppRates[5]

                );

			pMgmt->abyIBSSSuppRates[5]);



		netif_stop_queue(pDevice->dev);

		spin_lock_irq(&pDevice->lock);
@@ -587,7 +529,6 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) { 
		break;



	case WLAN_CMD_GET_NODE_CNT:



		cbListCount = 0;

		pNode = &(pMgmt->sNodeDBTable[0]);

		for (ii = 0; ii < (MAX_NODE_NUM + 1); ii++) {
@@ -606,7 +547,6 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) { 
		break;



	case WLAN_CMD_GET_NODE_LIST:



		if (copy_from_user(&sNodeList, pReq->data, sizeof(SNodeList))) {

			result = -EFAULT;

			break;
@@ -636,8 +576,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) { 
					pNodeList->sNodeList[jj].abyWepKey[1],

					pNodeList->sNodeList[jj].abyWepKey[2],

					pNodeList->sNodeList[jj].abyWepKey[3],

                            pNodeList->sNodeList[jj].abyWepKey[4]

                           );

					pNodeList->sNodeList[jj].abyWepKey[4]);

				pNodeList->sNodeList[jj].bIsInFallback = pNode->bIsInFallback;

				pNodeList->sNodeList[jj].uTxFailures = pNode->uTxFailures;

				pNodeList->sNodeList[jj].uTxAttempts = pNode->uTxAttempts;
@@ -666,33 +605,25 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) { 
			result = -EFAULT;

			break;

		}

//DavidWang  for some AP maybe good authenticate

		/* for some AP maybe good authenticate */

		if (wpa_Result.key_mgmt == 0x20)

			pMgmt->Cisco_cckm = 1;

		else

			pMgmt->Cisco_cckm = 0;





		if (wpa_Result.authenticated == TRUE) {

			{

				union iwreq_data wrqu;



				pItemSSID = (PWLAN_IE_SSID)pMgmt->abyCurrSSID;



				memset(&wrqu, 0, sizeof(wrqu));

				wrqu.data.flags = RT_WPACONNECTED_EVENT_FLAG;

				wrqu.data.length = pItemSSID->len;

				wireless_send_event(pDevice->dev, IWEVCUSTOM, &wrqu, pItemSSID->abySSID);

			}

         pDevice->fWPA_Authened = TRUE;           //is successful peer to wpa_Result.authenticated?

}



        //printk("get private wpa_supplicant announce WPA SM\n");

	//printk("wpa-->ifname=%s\n",wpa_Result.ifname);

	//printk("wpa-->proto=%d\n",wpa_Result.proto);

	//printk("wpa-->key-mgmt=%d\n",wpa_Result.key_mgmt);

	//printk("wpa-->eap_type=%d\n",wpa_Result.eap_type);

	//printk("wpa-->authenticated is %s\n",(wpa_Result.authenticated==TRUE)?"TRUE":"FALSE");

			pDevice->fWPA_Authened = TRUE; /* is successful peer to wpa_Result.authenticated? */

		}



		pReq->wResult = 0;

		break;