diff options
Diffstat (limited to 'drivers/staging/vt6655')
-rw-r--r-- | drivers/staging/vt6655/Makefile | 4 | ||||
-rw-r--r-- | drivers/staging/vt6655/device_main.c | 3 | ||||
-rw-r--r-- | drivers/staging/vt6655/iocmd.h | 4 | ||||
-rw-r--r-- | drivers/staging/vt6655/iwctl.c | 6 | ||||
-rw-r--r-- | drivers/staging/vt6655/ttype.h | 7 | ||||
-rw-r--r-- | drivers/staging/vt6655/vntwifi.c | 6 |
6 files changed, 8 insertions, 22 deletions
diff --git a/drivers/staging/vt6655/Makefile b/drivers/staging/vt6655/Makefile index 824c971..f7544a6 100644 --- a/drivers/staging/vt6655/Makefile +++ b/drivers/staging/vt6655/Makefile @@ -1,6 +1,6 @@ # TODO: all of these should be removed -EXTRA_CFLAGS += -DLINUX -D__KERNEL__ -D__NO_VERSION__ -EXTRA_CFLAGS += -DHOSTAP +ccflags-y := -DLINUX -D__KERNEL__ -D__NO_VERSION__ +ccflags-y += -DHOSTAP vt6655_stage-y += device_main.o \ card.o \ diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index 4d6b66a4..f5028d9 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -955,12 +955,13 @@ vt6655_probe(struct pci_dev *pcid, const struct pci_device_id *ent) pDevice->dev = dev; pDevice->next_module = root_device_dev; root_device_dev = dev; - dev->irq = pcid->irq; if (pci_enable_device(pcid)) { device_free_info(pDevice); return -ENODEV; } + dev->irq = pcid->irq; + #ifdef DEBUG printk("Before get pci_info memaddr is %x\n",pDevice->memaddr); #endif diff --git a/drivers/staging/vt6655/iocmd.h b/drivers/staging/vt6655/iocmd.h index 53c50c0..166351b 100644 --- a/drivers/staging/vt6655/iocmd.h +++ b/drivers/staging/vt6655/iocmd.h @@ -33,10 +33,6 @@ /*--------------------- Export Definitions -------------------------*/ -#if !defined(DEF) -#define DEF -#endif - //typedef uint32_t u32; //typedef uint16_t u16; //typedef uint8_t u8; diff --git a/drivers/staging/vt6655/iwctl.c b/drivers/staging/vt6655/iwctl.c index 4322761..92e3399 100644 --- a/drivers/staging/vt6655/iwctl.c +++ b/drivers/staging/vt6655/iwctl.c @@ -1900,7 +1900,7 @@ int iwctl_siwgenie(struct net_device *dev, } out://not completely ...not necessary in wpa_supplicant 0.5.8 - return 0; + return ret; } int iwctl_giwgenie(struct net_device *dev, @@ -2018,9 +2018,7 @@ param->u.wpa_key.seq_len = seq_len; #if 0 printk("param->u.wpa_key.alg_name =%d\n",param->u.wpa_key.alg_name); -printk("param->addr=%02x:%02x:%02x:%02x:%02x:%02x\n", - param->addr[0],param->addr[1],param->addr[2], - param->addr[3],param->addr[4],param->addr[5]); +printk(KERN_DEBUG "param->addr=%pM\n", param->addr); printk("param->u.wpa_key.set_tx =%d\n",param->u.wpa_key.set_tx); printk("param->u.wpa_key.key_index =%d\n",param->u.wpa_key.key_index); printk("param->u.wpa_key.key_len =%d\n",param->u.wpa_key.key_len); diff --git a/drivers/staging/vt6655/ttype.h b/drivers/staging/vt6655/ttype.h index 37c8fba..be223bd 100644 --- a/drivers/staging/vt6655/ttype.h +++ b/drivers/staging/vt6655/ttype.h @@ -37,13 +37,6 @@ #define TxInSleep #endif -//2007-0809-01<Add>by MikeLiu -#ifndef update_BssList -#define update_BssList -#endif - - - #ifndef WPA_SM_Transtatus #define WPA_SM_Transtatus #endif diff --git a/drivers/staging/vt6655/vntwifi.c b/drivers/staging/vt6655/vntwifi.c index fcf26ab..0491d0b 100644 --- a/drivers/staging/vt6655/vntwifi.c +++ b/drivers/staging/vt6655/vntwifi.c @@ -565,10 +565,8 @@ VNTWIFIvGetTxRate( wTxDataRate = (pMgmt->sNodeDBTable[0].wTxDataRate); #ifdef PLICE_DEBUG - printk("GetTxRate:AP MAC is %02x:%02x:%02x:%02x:%02x:%02x,TxRate is %d\n", - pMgmt->sNodeDBTable[0].abyMACAddr[0],pMgmt->sNodeDBTable[0].abyMACAddr[1], - pMgmt->sNodeDBTable[0].abyMACAddr[2],pMgmt->sNodeDBTable[0].abyMACAddr[3], - pMgmt->sNodeDBTable[0].abyMACAddr[4],pMgmt->sNodeDBTable[0].abyMACAddr[5],wTxDataRate); + printk(KERN_DEBUG "GetTxRate:AP MAC is %pM,TxRate is %d\n", + pMgmt->sNodeDBTable[0].abyMACAddr, wTxDataRate); #endif |