diff options
Diffstat (limited to 'drivers/staging/rt2860/common')
-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 |
5 files changed, 16 insertions, 25 deletions
diff --git a/drivers/staging/rt2860/common/ba_action.c b/drivers/staging/rt2860/common/ba_action.c index 174f2a73..8eef82d 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 8aec70f..72731cb 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 9414aa3..e37b64b 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 9fc34a8..7300c6e 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 a090385..3628e85 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) { |