diff options
| author | Ingo Molnar | 2010-08-31 09:45:21 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2010-08-31 09:45:46 +0200 |
| commit | daab7fc734a53fdeaf844b7c03053118ad1769da (patch) | |
| tree | 575deb3cdcc6dda562acaed6f7c29bc81ae01cf2 /drivers/staging/vt6656/ioctl.c | |
| parent | x86: Remove old bootmem code (diff) | |
| parent | Linux 2.6.36-rc3 (diff) | |
| download | kernel-qcow2-linux-daab7fc734a53fdeaf844b7c03053118ad1769da.tar.gz kernel-qcow2-linux-daab7fc734a53fdeaf844b7c03053118ad1769da.tar.xz kernel-qcow2-linux-daab7fc734a53fdeaf844b7c03053118ad1769da.zip | |
Merge commit 'v2.6.36-rc3' into x86/memblock
Conflicts:
arch/x86/kernel/trampoline.c
mm/memblock.c
Merge reason: Resolve the conflicts, update to latest upstream.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/staging/vt6656/ioctl.c')
| -rw-r--r-- | drivers/staging/vt6656/ioctl.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/staging/vt6656/ioctl.c b/drivers/staging/vt6656/ioctl.c index 19a84b66b097..d532618639bc 100644 --- a/drivers/staging/vt6656/ioctl.c +++ b/drivers/staging/vt6656/ioctl.c @@ -48,9 +48,7 @@ //static int msglevel =MSG_LEVEL_DEBUG; static int msglevel =MSG_LEVEL_INFO; -#ifdef WPA_SM_Transtatus SWPAResult wpa_Result; -#endif /*--------------------- Static Functions --------------------------*/ @@ -232,10 +230,10 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) { pDevice->bEncryptionEnable = FALSE; pDevice->eEncryptionStatus = Ndis802_11EncryptionDisabled; spin_lock_irq(&pDevice->lock); - for(uu=0;uu<MAX_KEY_TABLE;uu++) - MACvDisableKeyEntry(pDevice,uu); + for (uu = 0; uu < MAX_KEY_TABLE; uu++) + MACvDisableKeyEntry(pDevice, uu); spin_unlock_irq(&pDevice->lock); - DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "WEP function disable. \n"); + DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "WEP function disable.\n"); break; } @@ -656,7 +654,6 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) { pReq->wResult = 0; break; -#ifdef WPA_SM_Transtatus case 0xFF: memset(wpa_Result.ifname,0,sizeof(wpa_Result.ifname)); wpa_Result.proto = 0; @@ -676,7 +673,6 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) { //DavidWang if(wpa_Result.authenticated==TRUE) { - #ifdef SndEvt_ToAPI { union iwreq_data wrqu; @@ -687,7 +683,6 @@ if(wpa_Result.authenticated==TRUE) { wrqu.data.length =pItemSSID->len; wireless_send_event(pDevice->dev, IWEVCUSTOM, &wrqu, pItemSSID->abySSID); } - #endif pDevice->fWPA_Authened = TRUE; //is successful peer to wpa_Result.authenticated? } @@ -700,7 +695,6 @@ if(wpa_Result.authenticated==TRUE) { pReq->wResult = 0; break; -#endif default: DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Private command not support..\n"); |