diff options
author | Greg Kroah-Hartman | 2010-08-05 23:18:03 +0200 |
---|---|---|
committer | Greg Kroah-Hartman | 2010-08-05 23:18:03 +0200 |
commit | e9563355ac1175dd3440dc2ea5c28b27ed51a283 (patch) | |
tree | 8546d55832714b5d19ba4c7799266918ca04882e /drivers/staging/vt6656/ioctl.c | |
parent | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/pow... (diff) | |
parent | Staging: ti-st: update TODO (diff) | |
download | kernel-qcow2-linux-e9563355ac1175dd3440dc2ea5c28b27ed51a283.tar.gz kernel-qcow2-linux-e9563355ac1175dd3440dc2ea5c28b27ed51a283.tar.xz kernel-qcow2-linux-e9563355ac1175dd3440dc2ea5c28b27ed51a283.zip |
Staging: Merge staging-next into Linus's tree
Conflicts:
drivers/staging/Kconfig
drivers/staging/batman-adv/bat_sysfs.c
drivers/staging/batman-adv/device.c
drivers/staging/batman-adv/hard-interface.c
drivers/staging/cx25821/cx25821-audups11.c
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
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"); |