diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 20:44:56 +0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 20:44:56 +0400 |
commit | e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7 (patch) | |
tree | ea51b391f7d74ca695dcb9f5e46eb02688a92ed9 /drivers/staging/rt2860 | |
parent | 81280572ca6f54009edfa4deee563e8678784218 (diff) | |
parent | a4ac0d847af9dd34d5953a5e264400326144b6b2 (diff) | |
download | linux-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.tar.xz |
Merge 'staging-next' to Linus's tree
This merges the staging-next tree to Linus's tree and resolves
some conflicts that were present due to changes in other trees that were
affected by files here.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rt2860')
-rw-r--r-- | drivers/staging/rt2860/Makefile | 10 | ||||
-rw-r--r-- | drivers/staging/rt2860/ap.h | 20 | ||||
-rw-r--r-- | drivers/staging/rt2860/common/ba_action.c | 5 | ||||
-rw-r--r-- | drivers/staging/rt2860/common/cmm_mac_usb.c | 5 | ||||
-rw-r--r-- | drivers/staging/rt2860/common/cmm_wpa.c | 4 | ||||
-rw-r--r-- | drivers/staging/rt2860/common/mlme.c | 7 | ||||
-rw-r--r-- | drivers/staging/rt2860/common/rtmp_init.c | 20 | ||||
-rw-r--r-- | drivers/staging/rt2860/eeprom.h | 4 | ||||
-rw-r--r-- | drivers/staging/rt2860/iface/rtmp_pci.h | 42 | ||||
-rw-r--r-- | drivers/staging/rt2860/iface/rtmp_usb.h | 110 | ||||
-rw-r--r-- | drivers/staging/rt2860/oid.h | 2 | ||||
-rw-r--r-- | drivers/staging/rt2860/rt_linux.c | 7 | ||||
-rw-r--r-- | drivers/staging/rt2860/rt_linux.h | 3 | ||||
-rw-r--r-- | drivers/staging/rt2860/rtmp.h | 26 | ||||
-rw-r--r-- | drivers/staging/rt2860/sta/assoc.c | 7 | ||||
-rw-r--r-- | drivers/staging/rt2860/sta/connect.c | 24 | ||||
-rw-r--r-- | drivers/staging/rt2860/sta/rtmp_data.c | 5 | ||||
-rw-r--r-- | drivers/staging/rt2860/sta/sync.c | 12 | ||||
-rw-r--r-- | drivers/staging/rt2860/sta_ioctl.c | 11 |
19 files changed, 148 insertions, 176 deletions
diff --git a/drivers/staging/rt2860/Makefile b/drivers/staging/rt2860/Makefile index 23ae07f00ead..6dd0aa5d0791 100644 --- a/drivers/staging/rt2860/Makefile +++ b/drivers/staging/rt2860/Makefile @@ -1,12 +1,12 @@ obj-$(CONFIG_RT2860) += rt2860sta.o # TODO: all of these should be removed -EXTRA_CFLAGS += -DLINUX -DAGGREGATION_SUPPORT -DPIGGYBACK_SUPPORT -DWMM_SUPPORT -EXTRA_CFLAGS += -DRTMP_MAC_PCI -DRTMP_PCI_SUPPORT -DRT2860 -EXTRA_CFLAGS += -DRTMP_RF_RW_SUPPORT -DRTMP_EFUSE_SUPPORT -DRT30xx -DRT3090 -EXTRA_CFLAGS += -DDBG +ccflags-y := -DLINUX -DAGGREGATION_SUPPORT -DPIGGYBACK_SUPPORT -DWMM_SUPPORT +ccflags-y += -DRTMP_MAC_PCI -DRTMP_PCI_SUPPORT -DRT2860 +ccflags-y += -DRTMP_RF_RW_SUPPORT -DRTMP_EFUSE_SUPPORT -DRT30xx -DRT3090 +ccflags-y += -DDBG -rt2860sta-objs := \ +rt2860sta-y := \ common/crypt_md5.o \ common/crypt_sha2.o \ common/crypt_hmac.o \ diff --git a/drivers/staging/rt2860/ap.h b/drivers/staging/rt2860/ap.h index faac85d931d1..2737c0c022f9 100644 --- a/drivers/staging/rt2860/ap.h +++ b/drivers/staging/rt2860/ap.h @@ -24,18 +24,18 @@ * * ************************************************************************* - Module Name: - ap.h +Module Name: +ap.h - Abstract: - Miniport generic portion header file +Abstract: +Miniport generic portion header file - Revision History: - Who When What - -------- ---------- ---------------------------------------------- - Paul Lin 08-01-2002 created - James Tan 09-06-2002 modified (Revise NTCRegTable) - John Chang 12-22-2004 modified for RT2561/2661. merge with STA driver +Revision History: +Who When What +-------- ---------- ---------------------------------------------- +Paul Lin 08-01-2002 created +James Tan 09-06-2002 modified (Revise NTCRegTable) +John Chang 12-22-2004 modified for RT2561/2661. merge with STA driver */ #ifndef __AP_H__ #define __AP_H__ diff --git a/drivers/staging/rt2860/common/ba_action.c b/drivers/staging/rt2860/common/ba_action.c index 174f2a73a1bb..8eef82d92621 100644 --- a/drivers/staging/rt2860/common/ba_action.c +++ b/drivers/staging/rt2860/common/ba_action.c @@ -26,6 +26,7 @@ */ #include "../rt_config.h" +#include <linux/kernel.h> #define BA_ORI_INIT_SEQ (pEntry->TxSeq[TID]) /*1 // inital sequence number of BA session */ @@ -654,8 +655,8 @@ BOOLEAN BARecSessionAdd(struct rt_rtmp_adapter *pAd, } else { Status = FALSE; DBGPRINT(RT_DEBUG_TRACE, - ("Can't Accept ADDBA for %02x:%02x:%02x:%02x:%02x:%02x TID = %d\n", - PRINT_MAC(pEntry->Addr), TID)); + ("Can't Accept ADDBA for %pM TID = %d\n", + pEntry->Addr, TID)); } return (Status); } diff --git a/drivers/staging/rt2860/common/cmm_mac_usb.c b/drivers/staging/rt2860/common/cmm_mac_usb.c index 8aec70fc20d6..72731cbb81df 100644 --- a/drivers/staging/rt2860/common/cmm_mac_usb.c +++ b/drivers/staging/rt2860/common/cmm_mac_usb.c @@ -663,10 +663,7 @@ int RTUSBWriteHWMACAddress(struct rt_rtmp_adapter *pAd) StaMacReg1.field.Byte5 = pAd->CurrentAddress[5]; StaMacReg1.field.U2MeMask = 0xff; DBGPRINT_RAW(RT_DEBUG_TRACE, - ("Local MAC = %02x:%02x:%02x:%02x:%02x:%02x\n", - pAd->CurrentAddress[0], pAd->CurrentAddress[1], - pAd->CurrentAddress[2], pAd->CurrentAddress[3], - pAd->CurrentAddress[4], pAd->CurrentAddress[5])); + ("Local MAC = %pM\n", pAd->CurrentAddress)); RTUSBWriteMACRegister(pAd, MAC_ADDR_DW0, StaMacReg0.word); RTUSBWriteMACRegister(pAd, MAC_ADDR_DW1, StaMacReg1.word); diff --git a/drivers/staging/rt2860/common/cmm_wpa.c b/drivers/staging/rt2860/common/cmm_wpa.c index 9414aa344375..e37b64b6a608 100644 --- a/drivers/staging/rt2860/common/cmm_wpa.c +++ b/drivers/staging/rt2860/common/cmm_wpa.c @@ -221,8 +221,8 @@ void WpaEAPOLKeyAction(struct rt_rtmp_adapter *pAd, struct rt_mlme_queue_elem *E break; DBGPRINT(RT_DEBUG_TRACE, - ("Receive EAPoL-Key frame from STA %02X-%02X-%02X-%02X-%02X-%02X\n", - PRINT_MAC(pEntry->Addr))); + ("Receive EAPoL-Key frame from STA %pMF\n", + pEntry->Addr)); if (((pEapol_packet->ProVer != EAPOL_VER) && (pEapol_packet->ProVer != EAPOL_VER2)) diff --git a/drivers/staging/rt2860/common/mlme.c b/drivers/staging/rt2860/common/mlme.c index 9fc34a8f2180..7300c6e9c175 100644 --- a/drivers/staging/rt2860/common/mlme.c +++ b/drivers/staging/rt2860/common/mlme.c @@ -38,6 +38,7 @@ #include "../rt_config.h" #include <stdarg.h> +#include <linux/kernel.h> u8 CISCO_OUI[] = { 0x00, 0x40, 0x96 }; @@ -1536,10 +1537,8 @@ void MlmeAutoReconnectLastSSID(struct rt_rtmp_adapter *pAd) { if (pAd->StaCfg.bAutoConnectByBssid) { DBGPRINT(RT_DEBUG_TRACE, - ("Driver auto reconnect to last OID_802_11_BSSID setting - %02X:%02X:%02X:%02X:%02X:%02X\n", - pAd->MlmeAux.Bssid[0], pAd->MlmeAux.Bssid[1], - pAd->MlmeAux.Bssid[2], pAd->MlmeAux.Bssid[3], - pAd->MlmeAux.Bssid[4], pAd->MlmeAux.Bssid[5])); + ("Driver auto reconnect to last OID_802_11_BSSID " + "setting - %pM\n", pAd->MlmeAux.Bssid)); pAd->MlmeAux.Channel = pAd->CommonCfg.Channel; MlmeEnqueue(pAd, diff --git a/drivers/staging/rt2860/common/rtmp_init.c b/drivers/staging/rt2860/common/rtmp_init.c index a09038542f26..3628e85802e3 100644 --- a/drivers/staging/rt2860/common/rtmp_init.c +++ b/drivers/staging/rt2860/common/rtmp_init.c @@ -704,7 +704,7 @@ void NICReadEEPROMParameters(struct rt_rtmp_adapter *pAd, u8 *mac_addr) DBGPRINT(RT_DEBUG_TRACE, ("--> EEPROMAddressNum = %d\n", pAd->EEPROMAddressNum)); - /* RT2860 MAC no longer auto load MAC address from E2PROM. Driver has to intialize */ + /* RT2860 MAC no longer auto load MAC address from E2PROM. Driver has to initialize */ /* MAC address registers according to E2PROM setting */ if (mac_addr == NULL || strlen((char *)mac_addr) != 17 || @@ -749,13 +749,7 @@ void NICReadEEPROMParameters(struct rt_rtmp_adapter *pAd, u8 *mac_addr) /* pAd->PermanentAddress[5] = RandomByte(pAd)&0xf8; */ DBGPRINT_RAW(RT_DEBUG_TRACE, - ("E2PROM MAC: =%02x:%02x:%02x:%02x:%02x:%02x\n", - pAd->PermanentAddress[0], - pAd->PermanentAddress[1], - pAd->PermanentAddress[2], - pAd->PermanentAddress[3], - pAd->PermanentAddress[4], - pAd->PermanentAddress[5])); + ("E2PROM MAC: =%pM\n", pAd->PermanentAddress)); if (pAd->bLocalAdminMAC == FALSE) { MAC_DW0_STRUC csr2; MAC_DW1_STRUC csr3; @@ -772,8 +766,8 @@ void NICReadEEPROMParameters(struct rt_rtmp_adapter *pAd, u8 *mac_addr) csr3.field.U2MeMask = 0xff; RTMP_IO_WRITE32(pAd, MAC_ADDR_DW1, csr3.word); DBGPRINT_RAW(RT_DEBUG_TRACE, - ("E2PROM MAC: =%02x:%02x:%02x:%02x:%02x:%02x\n", - PRINT_MAC(pAd->PermanentAddress))); + ("E2PROM MAC: =%pM\n", + pAd->PermanentAddress)); } } @@ -2507,7 +2501,7 @@ void UserCfgInit(struct rt_rtmp_adapter *pAd) DBGPRINT(RT_DEBUG_TRACE, ("--> UserCfgInit\n")); /* */ - /* part I. intialize common configuration */ + /* part I. initialize common configuration */ /* */ #ifdef RTMP_MAC_USB pAd->BulkOutReq = 0; @@ -2646,7 +2640,7 @@ void UserCfgInit(struct rt_rtmp_adapter *pAd) pAd->CommonCfg.BeaconPeriod = 100; /* in mSec */ /* */ - /* part II. intialize STA specific configuration */ + /* part II. initialize STA specific configuration */ /* */ { RX_FILTER_SET_FLAG(pAd, fRX_FILTER_ACCEPT_DIRECT); @@ -3509,7 +3503,7 @@ int RtmpRaDevCtrlInit(struct rt_rtmp_adapter *pAd, IN RTMP_INF_TYPE infType) ("STA Driver version-%s\n", STA_DRIVER_VERSION)); #ifdef RTMP_MAC_USB - init_MUTEX(&(pAd->UsbVendorReq_semaphore)); + sema_init(&(pAd->UsbVendorReq_semaphore), 1); os_alloc_mem(pAd, (u8 **) & pAd->UsbVendorReqBuf, MAX_PARAM_BUFFER_SIZE - 1); if (pAd->UsbVendorReqBuf == NULL) { diff --git a/drivers/staging/rt2860/eeprom.h b/drivers/staging/rt2860/eeprom.h index 039801a97099..72c8fb941655 100644 --- a/drivers/staging/rt2860/eeprom.h +++ b/drivers/staging/rt2860/eeprom.h @@ -42,7 +42,7 @@ * Public function declarations for prom-based chipset ************************************************************************/ int rtmp_ee_prom_read16(struct rt_rtmp_adapter *pAd, - u16 Offset, u16 * pValue); + u16 Offset, u16 *pValue); #endif /* RTMP_PCI_SUPPORT // */ #ifdef RTMP_USB_SUPPORT /************************************************************************* @@ -55,7 +55,7 @@ int RTUSBReadEEPROM16(struct rt_rtmp_adapter *pAd, #ifdef RT30xx #ifdef RTMP_EFUSE_SUPPORT int rtmp_ee_efuse_read16(struct rt_rtmp_adapter *pAd, - u16 Offset, u16 * pValue); + u16 Offset, u16 *pValue); #endif /* RTMP_EFUSE_SUPPORT // */ #endif /* RT30xx // */ diff --git a/drivers/staging/rt2860/iface/rtmp_pci.h b/drivers/staging/rt2860/iface/rtmp_pci.h index 7759d56a3043..3d66e386bd8a 100644 --- a/drivers/staging/rt2860/iface/rtmp_pci.h +++ b/drivers/staging/rt2860/iface/rtmp_pci.h @@ -32,7 +32,7 @@ ((struct os_cookie *)handle)->pci_dev = dev_p; #ifdef LINUX -// set driver data +/* set driver data */ #define RT28XX_DRVDATA_SET(_a) pci_set_drvdata(_a, net_dev); #define RT28XX_PUT_DEVICE(dev_p) @@ -42,7 +42,8 @@ #ifdef PCI_MSI_SUPPORT #define RTMP_MSI_ENABLE(_pAd) \ { struct os_cookie *_pObj = (struct os_cookie *)(_pAd->OS_Cookie); \ - (_pAd)->HaveMsi = pci_enable_msi(_pObj->pci_dev) == 0 ? TRUE : FALSE; \ + (_pAd)->HaveMsi = pci_enable_msi(_pObj->pci_dev) \ + == 0 ? TRUE : FALSE; \ } #define RTMP_MSI_DISABLE(_pAd) \ @@ -52,27 +53,28 @@ _pAd->HaveMsi = FALSE; \ } #else -#define RTMP_MSI_ENABLE(_pAd) do{}while(0) -#define RTMP_MSI_DISABLE(_pAd) do{}while(0) -#endif // PCI_MSI_SUPPORT // +#define RTMP_MSI_ENABLE(_pAd) do {} while (0) +#define RTMP_MSI_DISABLE(_pAd) do {} while (0) +#endif /* PCI_MSI_SUPPORT */ -#define RTMP_PCI_DEV_UNMAP() \ -{ if (net_dev->base_addr) { \ - iounmap((void *)(net_dev->base_addr)); \ +#define RTMP_PCI_DEV_UNMAP() \ +{ if (net_dev->base_addr) { \ + iounmap((void *)(net_dev->base_addr)); \ release_mem_region(pci_resource_start(dev_p, 0), \ - pci_resource_len(dev_p, 0)); } \ - if (net_dev->irq) pci_release_regions(dev_p); } + pci_resource_len(dev_p, 0)); } \ + if (net_dev->irq) \ + pci_release_regions(dev_p); } -#define PCI_REG_READ_WORD(pci_dev, offset, Configuration) \ - if (pci_read_config_word(pci_dev, offset, ®16) == 0) \ - Configuration = le2cpu16(reg16); \ - else \ - Configuration = 0; +#define PCI_REG_READ_WORD(pci_dev, offset, Configuration) {\ + if (pci_read_config_word(pci_dev, offset, ®16) == 0) \ + Configuration = le2cpu16(reg16); \ + else \ + Configuration = 0; } -#define PCI_REG_WIRTE_WORD(pci_dev, offset, Configuration) \ - reg16 = cpu2le16(Configuration); \ - pci_write_config_word(pci_dev, offset, reg16); +#define PCI_REG_WIRTE_WORD(pci_dev, offset, Configuration) {\ + reg16 = cpu2le16(Configuration); \ + pci_write_config_word(pci_dev, offset, reg16); } -#endif // LINUX // +#endif /* LINUX */ -#endif // __RTMP_PCI_H__ // +#endif /* __RTMP_PCI_H__ */ diff --git a/drivers/staging/rt2860/iface/rtmp_usb.h b/drivers/staging/rt2860/iface/rtmp_usb.h index 33479cc443a5..571289637973 100644 --- a/drivers/staging/rt2860/iface/rtmp_usb.h +++ b/drivers/staging/rt2860/iface/rtmp_usb.h @@ -32,41 +32,40 @@ #ifdef LINUX #include <linux/usb.h> -#endif // LINUX // +#endif /* LINUX */ extern u8 EpToQueue[6]; #define RXBULKAGGRE_ZISE 12 -#define MAX_TXBULK_LIMIT (LOCAL_TXBUF_SIZE*(BULKAGGRE_ZISE-1)) -#define MAX_TXBULK_SIZE (LOCAL_TXBUF_SIZE*BULKAGGRE_ZISE) -#define MAX_RXBULK_SIZE (LOCAL_TXBUF_SIZE*RXBULKAGGRE_ZISE) +#define MAX_TXBULK_LIMIT (LOCAL_TXBUF_SIZE*(BULKAGGRE_ZISE-1)) +#define MAX_TXBULK_SIZE (LOCAL_TXBUF_SIZE*BULKAGGRE_ZISE) +#define MAX_RXBULK_SIZE (LOCAL_TXBUF_SIZE*RXBULKAGGRE_ZISE) #define MAX_MLME_HANDLER_MEMORY 20 -// Flags for Bulkflags control for bulk out data -// +/* Flags for Bulkflags control for bulk out data */ #define fRTUSB_BULK_OUT_DATA_NULL 0x00000001 -#define fRTUSB_BULK_OUT_RTS 0x00000002 -#define fRTUSB_BULK_OUT_MLME 0x00000004 +#define fRTUSB_BULK_OUT_RTS 0x00000002 +#define fRTUSB_BULK_OUT_MLME 0x00000004 -#define fRTUSB_BULK_OUT_PSPOLL 0x00000010 +#define fRTUSB_BULK_OUT_PSPOLL 0x00000010 #define fRTUSB_BULK_OUT_DATA_FRAG 0x00000020 -#define fRTUSB_BULK_OUT_DATA_FRAG_2 0x00000040 -#define fRTUSB_BULK_OUT_DATA_FRAG_3 0x00000080 -#define fRTUSB_BULK_OUT_DATA_FRAG_4 0x00000100 +#define fRTUSB_BULK_OUT_DATA_FRAG_2 0x00000040 +#define fRTUSB_BULK_OUT_DATA_FRAG_3 0x00000080 +#define fRTUSB_BULK_OUT_DATA_FRAG_4 0x00000100 -#define fRTUSB_BULK_OUT_DATA_NORMAL 0x00010000 +#define fRTUSB_BULK_OUT_DATA_NORMAL 0x00010000 #define fRTUSB_BULK_OUT_DATA_NORMAL_2 0x00020000 #define fRTUSB_BULK_OUT_DATA_NORMAL_3 0x00040000 #define fRTUSB_BULK_OUT_DATA_NORMAL_4 0x00080000 -// TODO:move to ./ate/include/iface/ate_usb.h +/* TODO:move to ./ate/include/iface/ate_usb.h */ #define FREE_HTTX_RING(_pCookie, _pipeId, _txContext) \ -{ \ - if ((_txContext)->ENextBulkOutPosition == (_txContext)->CurWritePosition) \ - { \ +{ \ + if ((_txContext)->ENextBulkOutPosition == \ + (_txContext)->CurWritePosition) {\ (_txContext)->bRingEmpty = TRUE; \ - } \ + } \ /*NdisInterlockedDecrement(&(_p)->TxCount); */\ } @@ -77,16 +76,32 @@ extern u8 EpToQueue[6]; ******************************************************************************/ #ifdef LINUX -#define BULKAGGRE_ZISE 100 -#define RT28XX_PUT_DEVICE usb_put_dev -#define RTUSB_ALLOC_URB(iso) usb_alloc_urb(iso, GFP_ATOMIC) -#define RTUSB_SUBMIT_URB(pUrb) usb_submit_urb(pUrb, GFP_ATOMIC) -#define RTUSB_URB_ALLOC_BUFFER(pUsb_Dev, BufSize, pDma_addr) usb_alloc_coherent(pUsb_Dev, BufSize, GFP_ATOMIC, pDma_addr) -#define RTUSB_URB_FREE_BUFFER(pUsb_Dev, BufSize, pTransferBuf, Dma_addr) usb_free_coherent(pUsb_Dev, BufSize, pTransferBuf, Dma_addr) +#define BULKAGGRE_ZISE 100 +#define RT28XX_PUT_DEVICE usb_put_dev +#define RTUSB_ALLOC_URB(iso) usb_alloc_urb(iso, GFP_ATOMIC) +#define RTUSB_SUBMIT_URB(pUrb) usb_submit_urb(pUrb, \ + GFP_ATOMIC) +#define RTUSB_URB_ALLOC_BUFFER(pUsb_Dev, \ + BufSize, \ + pDma_addr) \ + usb_alloc_coherent(\ + pUsb_Dev, \ + BufSize, \ + GFP_ATOMIC, \ + pDma_addr) +#define RTUSB_URB_FREE_BUFFER(pUsb_Dev, \ + BufSize, \ + pTransferBuf, \ + Dma_addr) \ + usb_free_coherent( \ + pUsb_Dev, \ + BufSize, \ + pTransferBuf, \ + Dma_addr) #define RTUSB_FREE_URB(pUrb) usb_free_urb(pUrb) -// unlink urb +/* unlink urb */ #define RTUSB_UNLINK_URB(pUrb) usb_kill_urb(pUrb) extern void dump_urb(struct urb *purb); @@ -97,9 +112,9 @@ extern void dump_urb(struct urb *purb); #define NdisInterlockedDecrement atomic_dec #define InterlockedExchange atomic_set -#endif // LINUX // +#endif /* LINUX */ -#define NT_SUCCESS(status) (((status) >=0) ? (TRUE):(FALSE)) +#define NT_SUCCESS(status) (((status) >= 0) ? (TRUE) : (FALSE)) #define USBD_TRANSFER_DIRECTION_OUT 0 #define USBD_TRANSFER_DIRECTION_IN 0 @@ -112,8 +127,8 @@ extern void dump_urb(struct urb *purb); #define USB_ST_NOERROR 0 #endif -// vendor-specific control operations -#define CONTROL_TIMEOUT_JIFFIES ( (100 * OS_HZ) / 1000) +/* vendor-specific control operations */ +#define CONTROL_TIMEOUT_JIFFIES ((100 * OS_HZ) / 1000) #define UNLINK_TIMEOUT_MS 3 void RTUSBBulkOutDataPacketComplete(struct urb *purb, struct pt_regs *pt_regs); @@ -125,50 +140,49 @@ void RTUSBBulkRxComplete(struct urb *pUrb, struct pt_regs *pt_regs); #ifdef KTHREAD_SUPPORT #define RTUSBMlmeUp(pAd) \ - do{ \ + do { \ struct rt_rtmp_os_task *_pTask = &((pAd)->mlmeTask);\ - if (_pTask->kthread_task) \ - { \ + if (_pTask->kthread_task) {\ _pTask->kthread_running = TRUE; \ - wake_up(&_pTask->kthread_q); \ + wake_up(&_pTask->kthread_q); \ } \ - }while(0) + } while (0) #else #define RTUSBMlmeUp(pAd) \ - do{ \ + do { \ struct rt_rtmp_os_task *_pTask = &((pAd)->mlmeTask);\ CHECK_PID_LEGALITY(_pTask->taskPID) \ { \ RTMP_SEM_EVENT_UP(&(_pTask->taskSema)); \ - }\ - }while(0) + } \ + } while (0) #endif #ifdef KTHREAD_SUPPORT #define RTUSBCMDUp(pAd) \ - do{ \ + do { \ struct rt_rtmp_os_task *_pTask = &((pAd)->cmdQTask); \ { \ _pTask->kthread_running = TRUE; \ - wake_up(&_pTask->kthread_q); \ + wake_up(&_pTask->kthread_q); \ } \ - }while(0) + } while (0) #else #define RTUSBCMDUp(pAd) \ - do{ \ + do { \ struct rt_rtmp_os_task *_pTask = &((pAd)->cmdQTask); \ CHECK_PID_LEGALITY(_pTask->taskPID) \ {\ RTMP_SEM_EVENT_UP(&(_pTask->taskSema)); \ - }\ - }while(0) + } \ + } while (0) #endif #define DEVICE_VENDOR_REQUEST_OUT 0x40 #define DEVICE_VENDOR_REQUEST_IN 0xc0 -//#define INTERFACE_VENDOR_REQUEST_OUT 0x41 -//#define INTERFACE_VENDOR_REQUEST_IN 0xc1 +/*#define INTERFACE_VENDOR_REQUEST_OUT 0x41*/ +/*#define INTERFACE_VENDOR_REQUEST_IN 0xc1*/ #define BULKOUT_MGMT_RESET_FLAG 0x80 @@ -176,7 +190,7 @@ void RTUSBBulkRxComplete(struct urb *pUrb, struct pt_regs *pt_regs); #define RTUSB_CLEAR_BULK_FLAG(_M, _F) ((_M)->BulkFlags &= ~(_F)) #define RTUSB_TEST_BULK_FLAG(_M, _F) (((_M)->BulkFlags & (_F)) != 0) -#define RTMP_IRQ_REQUEST(net_dev) do{}while(0) -#define RTMP_IRQ_RELEASE(net_dev) do{}while(0) +#define RTMP_IRQ_REQUEST(net_dev) do {} while (0) +#define RTMP_IRQ_RELEASE(net_dev) do {} while (0) -#endif // __RTMP_USB_H__ // +#endif /* __RTMP_USB_H__ */ diff --git a/drivers/staging/rt2860/oid.h b/drivers/staging/rt2860/oid.h index fd1c14192451..1704c27b2736 100644 --- a/drivers/staging/rt2860/oid.h +++ b/drivers/staging/rt2860/oid.h @@ -701,7 +701,7 @@ struct PACKED rt_rt_802_11_acl { struct rt_802_11_wds { unsigned long Num; - NDIS_802_11_MAC_ADDRESS Entry[24 /*MAX_NUM_OF_WDS_LINK */ ]; + NDIS_802_11_MAC_ADDRESS Entry[24 /*MAX_NUM_OF_WDS_LINK */]; unsigned long KeyLength; u8 KeyMaterial[32]; }; diff --git a/drivers/staging/rt2860/rt_linux.c b/drivers/staging/rt2860/rt_linux.c index 6536965df3f3..abfeea11721d 100644 --- a/drivers/staging/rt2860/rt_linux.c +++ b/drivers/staging/rt2860/rt_linux.c @@ -682,9 +682,7 @@ void RTMPSendWirelessEvent(struct rt_rtmp_adapter *pAd, if (pAddr) pBufPtr += - sprintf(pBufPtr, - "(RT2860) STA(%02x:%02x:%02x:%02x:%02x:%02x) ", - PRINT_MAC(pAddr)); + sprintf(pBufPtr, "(RT2860) STA(%pM) ", pAddr); else if (BssIdx < MAX_MBSSID_NUM) pBufPtr += sprintf(pBufPtr, "(RT2860) BSS(wlan%d) ", BssIdx); @@ -1313,9 +1311,8 @@ int RtmpOSNetDevAttach(struct net_device *pNetDev, /* OS specific flags, here we used to indicate if we are virtual interface */ pNetDev->priv_flags = pDevOpHook->priv_flags; - if (pAd->OpMode == OPMODE_STA) { + if (pAd->OpMode == OPMODE_STA) pNetDev->wireless_handlers = &rt28xx_iw_handler_def; - } /* copy the net device mac address to the net_device structure. */ NdisMoveMemory(pNetDev->dev_addr, &pDevOpHook->devAddr[0], diff --git a/drivers/staging/rt2860/rt_linux.h b/drivers/staging/rt2860/rt_linux.h index b370fb21e423..5acedf18b1ab 100644 --- a/drivers/staging/rt2860/rt_linux.h +++ b/drivers/staging/rt2860/rt_linux.h @@ -409,9 +409,6 @@ struct os_cookie { /*********************************************************************************** * OS debugging and printing related definitions and data structure ***********************************************************************************/ -#define PRINT_MAC(addr) \ - addr[0], addr[1], addr[2], addr[3], addr[4], addr[5] - #ifdef DBG extern unsigned long RTDebugLevel; diff --git a/drivers/staging/rt2860/rtmp.h b/drivers/staging/rt2860/rtmp.h index 282935caba2c..ca54e53b6603 100644 --- a/drivers/staging/rt2860/rtmp.h +++ b/drivers/staging/rt2860/rtmp.h @@ -324,14 +324,6 @@ struct rt_rtmp_sg_list { /* */ /* Some utility macros */ /* */ -#ifndef min -#define min(_a, _b) (((_a) < (_b)) ? (_a) : (_b)) -#endif - -#ifndef max -#define max(_a, _b) (((_a) > (_b)) ? (_a) : (_b)) -#endif - #define GET_LNA_GAIN(_pAd) ((_pAd->LatchRfRegs.Channel <= 14) ? (_pAd->BLNAGain) : ((_pAd->LatchRfRegs.Channel <= 64) ? (_pAd->ALNAGain0) : ((_pAd->LatchRfRegs.Channel <= 128) ? (_pAd->ALNAGain1) : (_pAd->ALNAGain2)))) #define INC_COUNTER64(Val) (Val.QuadPart++) @@ -2239,15 +2231,15 @@ struct rt_tx_blk { unsigned long Priv; /* Hardware specific value saved in here. */ }; -#define fTX_bRtsRequired 0x0001 /* Indicate if need send RTS frame for protection. Not used in RT2860/RT2870. */ -#define fTX_bAckRequired 0x0002 /* the packet need ack response */ -#define fTX_bPiggyBack 0x0004 /* Legacy device use Piggback or not */ -#define fTX_bHTRate 0x0008 /* allow to use HT rate */ -#define fTX_bForceNonQoS 0x0010 /* force to transmit frame without WMM-QoS in HT mode */ -#define fTX_bAllowFrag 0x0020 /* allow to fragment the packet, A-MPDU, A-MSDU, A-Ralink is not allowed to fragment */ -#define fTX_bMoreData 0x0040 /* there are more data packets in PowerSave Queue */ -#define fTX_bWMM 0x0080 /* QOS Data */ -#define fTX_bClearEAPFrame 0x0100 +#define fTX_bRtsRequired 0x0001 /* Indicate if need send RTS frame for protection. Not used in RT2860/RT2870. */ +#define fTX_bAckRequired 0x0002 /* the packet need ack response */ +#define fTX_bPiggyBack 0x0004 /* Legacy device use Piggback or not */ +#define fTX_bHTRate 0x0008 /* allow to use HT rate */ +#define fTX_bForceNonQoS 0x0010 /* force to transmit frame without WMM-QoS in HT mode */ +#define fTX_bAllowFrag 0x0020 /* allow to fragment the packet, A-MPDU, A-MSDU, A-Ralink is not allowed to fragment */ +#define fTX_bMoreData 0x0040 /* there are more data packets in PowerSave Queue */ +#define fTX_bWMM 0x0080 /* QOS Data */ +#define fTX_bClearEAPFrame 0x0100 #define TX_BLK_SET_FLAG(_pTxBlk, _flag) (_pTxBlk->Flags |= _flag) #define TX_BLK_TEST_FLAG(_pTxBlk, _flag) (((_pTxBlk->Flags & _flag) == _flag) ? 1 : 0) diff --git a/drivers/staging/rt2860/sta/assoc.c b/drivers/staging/rt2860/sta/assoc.c index 6e85d5e6554b..b7efb0b6b3f0 100644 --- a/drivers/staging/rt2860/sta/assoc.c +++ b/drivers/staging/rt2860/sta/assoc.c @@ -794,11 +794,8 @@ void MlmeDisassocReqAction(struct rt_rtmp_adapter *pAd, struct rt_mlme_queue_ele RTMPCancelTimer(&pAd->MlmeAux.DisassocTimer, &TimerCancelled); DBGPRINT(RT_DEBUG_TRACE, - ("ASSOC - Send DISASSOC request[BSSID::%02x:%02x:%02x:%02x:%02x:%02x (Reason=%d)\n", - pDisassocReq->Addr[0], pDisassocReq->Addr[1], - pDisassocReq->Addr[2], pDisassocReq->Addr[3], - pDisassocReq->Addr[4], pDisassocReq->Addr[5], - pDisassocReq->Reason)); + ("ASSOC - Send DISASSOC request[BSSID::%pM (Reason=%d)\n", + pDisassocReq->Addr, pDisassocReq->Reason)); MgtMacHeaderInit(pAd, &DisassocHdr, SUBTYPE_DISASSOC, 0, pDisassocReq->Addr, pDisassocReq->Addr); /* patch peap ttls switching issue */ MakeOutgoingFrame(pOutBuffer, &FrameLen, sizeof(struct rt_header_802_11), &DisassocHdr, diff --git a/drivers/staging/rt2860/sta/connect.c b/drivers/staging/rt2860/sta/connect.c index 55732b10062d..c380551c0354 100644 --- a/drivers/staging/rt2860/sta/connect.c +++ b/drivers/staging/rt2860/sta/connect.c @@ -653,10 +653,8 @@ void CntlOidRTBssidProc(struct rt_rtmp_adapter *pAd, struct rt_mlme_queue_elem * RTMPMakeRSNIE(pAd, pAd->StaCfg.AuthMode, pAd->StaCfg.WepStatus, 0); } */ /* No active association, join the BSS immediately */ - DBGPRINT(RT_DEBUG_TRACE, - ("CNTL - joining %02x:%02x:%02x:%02x:%02x:%02x ...\n", - pOidBssid[0], pOidBssid[1], pOidBssid[2], - pOidBssid[3], pOidBssid[4], pOidBssid[5])); + DBGPRINT(RT_DEBUG_TRACE, ("CNTL - joining %pM ...\n", + pOidBssid)); JoinParmFill(pAd, &JoinReq, pAd->MlmeAux.BssIdx); MlmeEnqueue(pAd, SYNC_STATE_MACHINE, MT2_MLME_JOIN_REQ, @@ -778,13 +776,8 @@ void CntlWaitJoinProc(struct rt_rtmp_adapter *pAd, struct rt_mlme_queue_elem *El LinkUp(pAd, BSS_ADHOC); pAd->Mlme.CntlMachine.CurrState = CNTL_IDLE; DBGPRINT(RT_DEBUG_TRACE, - ("CNTL - join the IBSS = %02x:%02x:%02x:%02x:%02x:%02x ...\n", - pAd->CommonCfg.Bssid[0], - pAd->CommonCfg.Bssid[1], - pAd->CommonCfg.Bssid[2], - pAd->CommonCfg.Bssid[3], - pAd->CommonCfg.Bssid[4], - pAd->CommonCfg.Bssid[5])); + ("CNTL - join the IBSS = %pM ...\n", + pAd->CommonCfg.Bssid)); pAd->IndicateMediaState = NdisMediaStateConnected; @@ -902,13 +895,8 @@ void CntlWaitStartProc(struct rt_rtmp_adapter *pAd, struct rt_mlme_queue_elem *E } DBGPRINT(RT_DEBUG_TRACE, - ("CNTL - start a new IBSS = %02x:%02x:%02x:%02x:%02x:%02x ...\n", - pAd->CommonCfg.Bssid[0], - pAd->CommonCfg.Bssid[1], - pAd->CommonCfg.Bssid[2], - pAd->CommonCfg.Bssid[3], - pAd->CommonCfg.Bssid[4], - pAd->CommonCfg.Bssid[5])); + ("CNTL - start a new IBSS = %pM ...\n", + pAd->CommonCfg.Bssid)); } else { DBGPRINT(RT_DEBUG_TRACE, ("CNTL - Start IBSS fail. BUG!\n")); diff --git a/drivers/staging/rt2860/sta/rtmp_data.c b/drivers/staging/rt2860/sta/rtmp_data.c index 5d348e9d9b79..23879b7cd49a 100644 --- a/drivers/staging/rt2860/sta/rtmp_data.c +++ b/drivers/staging/rt2860/sta/rtmp_data.c @@ -35,6 +35,7 @@ -------- ---------- ---------------------------------------------- */ #include "../rt_config.h" +#include <linux/kernel.h> void STARxEAPOLFrameIndicate(struct rt_rtmp_adapter *pAd, struct rt_mac_table_entry *pEntry, @@ -976,8 +977,8 @@ int STASendPacket(struct rt_rtmp_adapter *pAd, void *pPacket) if (!pEntry) { DBGPRINT(RT_DEBUG_ERROR, - ("STASendPacket->Cannot find pEntry(%2x:%2x:%2x:%2x:%2x:%2x) in MacTab!\n", - PRINT_MAC(pSrcBufVA))); + ("STASendPacket->Cannot find pEntry(%pM) in MacTab!\n", + pSrcBufVA)); /* Resourece is low, system did not allocate virtual address */ /* return NDIS_STATUS_FAILURE directly to upper layer */ RELEASE_NDIS_PACKET(pAd, pPacket, NDIS_STATUS_FAILURE); diff --git a/drivers/staging/rt2860/sta/sync.c b/drivers/staging/rt2860/sta/sync.c index cbe90a6496d2..747d3c6d1851 100644 --- a/drivers/staging/rt2860/sta/sync.c +++ b/drivers/staging/rt2860/sta/sync.c @@ -424,9 +424,8 @@ void MlmeJoinReqAction(struct rt_rtmp_adapter *pAd, struct rt_mlme_queue_elem *E } while (FALSE); DBGPRINT(RT_DEBUG_TRACE, - ("SYNC - Switch to ch %d, Wait BEACON from %02x:%02x:%02x:%02x:%02x:%02x\n", - pBss->Channel, pBss->Bssid[0], pBss->Bssid[1], pBss->Bssid[2], - pBss->Bssid[3], pBss->Bssid[4], pBss->Bssid[5])); + ("SYNC - Switch to ch %d, Wait BEACON from %pM\n", + pBss->Channel, pBss->Bssid)); pAd->Mlme.SyncMachine.CurrState = JOIN_WAIT_BEACON; } @@ -1225,10 +1224,9 @@ void PeerBeacon(struct rt_rtmp_adapter *pAd, struct rt_mlme_queue_elem *Elem) for (i = 0; i < 6; i++) { if (Bssid[i] > pAd->CommonCfg.Bssid[i]) { DBGPRINT(RT_DEBUG_TRACE, - ("SYNC - merge to the IBSS with bigger BSSID=%02x:%02x:%02x:%02x:%02x:%02x\n", - Bssid[0], Bssid[1], Bssid[2], - Bssid[3], Bssid[4], - Bssid[5])); + ("SYNC - merge to the IBSS " + "with bigger BSSID=" + "%pM\n", Bssid)); AsicDisableSync(pAd); COPY_MAC_ADDR(pAd->CommonCfg.Bssid, Bssid); diff --git a/drivers/staging/rt2860/sta_ioctl.c b/drivers/staging/rt2860/sta_ioctl.c index 6b8268d3dc75..e095a44cbc0e 100644 --- a/drivers/staging/rt2860/sta_ioctl.c +++ b/drivers/staging/rt2860/sta_ioctl.c @@ -614,9 +614,7 @@ int rt_ioctl_siwap(struct net_device *dev, OID_802_11_BSSID, sizeof(NDIS_802_11_MAC_ADDRESS), (void *) & Bssid); - DBGPRINT(RT_DEBUG_TRACE, - ("IOCTL::SIOCSIWAP %02x:%02x:%02x:%02x:%02x:%02x\n", Bssid[0], - Bssid[1], Bssid[2], Bssid[3], Bssid[4], Bssid[5])); + DBGPRINT(RT_DEBUG_TRACE, ("IOCTL::SIOCSIWAP %pM\n", Bssid)); return 0; } @@ -1513,11 +1511,8 @@ void getBaInfo(struct rt_rtmp_adapter *pAd, char *pOutBuf) if (((pEntry->ValidAsCLI || pEntry->ValidAsApCli) && (pEntry->Sst == SST_ASSOC)) || (pEntry->ValidAsWDS) || (pEntry->ValidAsMesh)) { - sprintf(pOutBuf + strlen(pOutBuf), - "\n%02X:%02X:%02X:%02X:%02X:%02X (Aid = %d) (AP) -\n", - pEntry->Addr[0], pEntry->Addr[1], - pEntry->Addr[2], pEntry->Addr[3], - pEntry->Addr[4], pEntry->Addr[5], pEntry->Aid); + sprintf(pOutBuf + strlen(pOutBuf), "\n%pM (Aid = %d) " + "(AP) -\n", pEntry->Addr, pEntry->Aid); sprintf(pOutBuf, "%s[Recipient]\n", pOutBuf); for (j = 0; j < NUM_OF_TID; j++) { |