diff options
Diffstat (limited to 'drivers/staging/rt2860/common')
-rw-r--r-- | drivers/staging/rt2860/common/ba_action.c | 2 | ||||
-rw-r--r-- | drivers/staging/rt2860/common/cmm_mac_usb.c | 2 | ||||
-rw-r--r-- | drivers/staging/rt2860/common/cmm_wpa.c | 2 | ||||
-rw-r--r-- | drivers/staging/rt2860/common/mlme.c | 3 | ||||
-rw-r--r-- | drivers/staging/rt2860/common/rtmp_init.c | 4 |
5 files changed, 6 insertions, 7 deletions
diff --git a/drivers/staging/rt2860/common/ba_action.c b/drivers/staging/rt2860/common/ba_action.c index 3f71c502855..1befe9919d0 100644 --- a/drivers/staging/rt2860/common/ba_action.c +++ b/drivers/staging/rt2860/common/ba_action.c @@ -655,7 +655,7 @@ BOOLEAN BARecSessionAdd(struct rt_rtmp_adapter *pAd, Status = FALSE; DBGPRINT(RT_DEBUG_TRACE, ("Can't Accept ADDBA for %pM TID = %d\n", - &pEntry->Addr[0], TID)); + 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 d08abf794c8..72731cbb81d 100644 --- a/drivers/staging/rt2860/common/cmm_mac_usb.c +++ b/drivers/staging/rt2860/common/cmm_mac_usb.c @@ -663,7 +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 = %pM\n", &pAd->CurrentAddress[0])); + ("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 78ca4ed46d9..e37b64b6a60 100644 --- a/drivers/staging/rt2860/common/cmm_wpa.c +++ b/drivers/staging/rt2860/common/cmm_wpa.c @@ -222,7 +222,7 @@ void WpaEAPOLKeyAction(struct rt_rtmp_adapter *pAd, struct rt_mlme_queue_elem *E DBGPRINT(RT_DEBUG_TRACE, ("Receive EAPoL-Key frame from STA %pMF\n", - &pEntry->Addr[0])); + 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 e51403315fe..3558f65c9c1 100644 --- a/drivers/staging/rt2860/common/mlme.c +++ b/drivers/staging/rt2860/common/mlme.c @@ -1537,8 +1537,7 @@ 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 - %pM\n", - &pAd->MlmeAux.Bssid[0])); + "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 afeb5282074..3628e85802e 100644 --- a/drivers/staging/rt2860/common/rtmp_init.c +++ b/drivers/staging/rt2860/common/rtmp_init.c @@ -749,7 +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: =%pM\n", &pAd->PermanentAddress[0])); + ("E2PROM MAC: =%pM\n", pAd->PermanentAddress)); if (pAd->bLocalAdminMAC == FALSE) { MAC_DW0_STRUC csr2; MAC_DW1_STRUC csr3; @@ -767,7 +767,7 @@ void NICReadEEPROMParameters(struct rt_rtmp_adapter *pAd, u8 *mac_addr) RTMP_IO_WRITE32(pAd, MAC_ADDR_DW1, csr3.word); DBGPRINT_RAW(RT_DEBUG_TRACE, ("E2PROM MAC: =%pM\n", - &pAd->PermanentAddress[0])); + pAd->PermanentAddress)); } } |