On Tue, Apr 01, 2014 at 09:52:13AM -0300, Guido Martínez wrote:
> @@ -624,13 +622,10 @@ device_receive_frame(
>
> // Data frame Handle
>
> - if (pDevice->bEnablePSMode) {
> - if (!IS_FC_MOREDATA((skb->data+4))) {
> + if (pDevice->bEnablePSMode)
> + if (!IS_FC_MOREDATA((skb->data+4)))
> if (pDevice->pMgmt->bInTIMWake == true)
> pDevice->pMgmt->bInTIMWake = false;
> - }
> - }
> - }
Use braces for multi-line indents for readability.
> @@ -1502,26 +1501,26 @@ int iwctl_siwauth(struct net_device *dev,
> break;
> case IW_AUTH_CIPHER_PAIRWISE:
> pairwise = wrq->value;
> - if (pairwise == IW_AUTH_CIPHER_CCMP) {
> + if (pairwise == IW_AUTH_CIPHER_CCMP)
> pDevice->eEncryptionStatus =
> Ndis802_11Encryption3Enabled;
> - } else if (pairwise == IW_AUTH_CIPHER_TKIP) {
> + else if (pairwise == IW_AUTH_CIPHER_TKIP)
> pDevice->eEncryptionStatus =
> Ndis802_11Encryption2Enabled;
> - } else if (pairwise == IW_AUTH_CIPHER_WEP40 || pairwise ==
> IW_AUTH_CIPHER_WEP104) {
> + else if (pairwise == IW_AUTH_CIPHER_WEP40 || pairwise ==
> IW_AUTH_CIPHER_WEP104)
> pDevice->eEncryptionStatus =
> Ndis802_11Encryption1Enabled;
> - } else if (pairwise == IW_AUTH_CIPHER_NONE) {
> - //do nothing,einsn liu
> - } else pDevice->eEncryptionStatus =
> Ndis802_11EncryptionDisabled;
> + else if (pairwise == IW_AUTH_CIPHER_NONE)
> + ; //do nothing,einsn liu
> + else
> + pDevice->eEncryptionStatus = Ndis802_11EncryptionDisabled;
>
The indenting is messed up on the last else statement.
> @@ -276,24 +276,20 @@ PSbSendNullPacket(
> PSMgmtObject pMgmt = pDevice->pMgmt;
> unsigned int uIdx;
>
> - if (!pDevice->bLinkPass) {
> + if (!pDevice->bLinkPass)
> return false;
> - }
> +
> #ifdef TxInSleep
> - if (!pDevice->bEnablePSMode && !pDevice->fTxDataInSleep) {
> + if (!pDevice->bEnablePSMode && !pDevice->fTxDataInSleep)
> return false;
> - }
> #else
> - if (!pDevice->bEnablePSMode) {
> + if (!pDevice->bEnablePSMode)
> return false;
> - }
> #endif
> - if (pDevice->bEnablePSMode) {
> - for (uIdx = 0; uIdx < TYPE_MAXTD; uIdx++) {
> + if (pDevice->bEnablePSMode)
> + for (uIdx = 0; uIdx < TYPE_MAXTD; uIdx++)
> if (pDevice->iTDUsed[uIdx] != 0)
> return false;
> - }
> - }
Multi-line indent.
> @@ -4285,14 +4252,9 @@ vMgrRxManagePacket(
>
> case WLAN_FSTYPE_BEACON:
> // Frame Clase = 0
> -<<<<<<< HEAD
> - //DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "rx beacon\n");
> - if (pMgmt->eScanState != WMAC_NO_SCANNING) {
> -=======
> if (pMgmt->eScanState != WMAC_NO_SCANNING)
> ->>>>>>> f3c59ed... staging: vt6655: remove dead code
> bInScan = true;
> - }
> +
> s_vMgrRxBeacon(pDevice, pMgmt, pRxPacket, bInScan);
> break;
>
> @@ -4357,16 +4319,11 @@ bMgrPrepareBeaconToSend(
> PSDevice pDevice = (PSDevice)hDeviceContext;
> PSTxMgmtPacket pTxPacket;
>
> -<<<<<<< HEAD
> -// pDevice->bBeaconBufReady = false;
> - if (pDevice->bEncryptionEnable || pDevice->bEnable8021x) {
> -=======
> if (pDevice->bEncryptionEnable || pDevice->bEnable8021x)
> ->>>>>>> f3c59ed... staging: vt6655: remove dead code
> pMgmt->wCurrCapInfo |= WLAN_SET_CAP_INFO_PRIVACY(1);
> - } else {
> + else
> pMgmt->wCurrCapInfo &= ~WLAN_SET_CAP_INFO_PRIVACY(1);
> - }
> +
Wat?
regards,
dan carpenter
_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
