diff options
Diffstat (limited to 'drivers/staging/rt2860/sta')
-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 |
4 files changed, 16 insertions, 32 deletions
diff --git a/drivers/staging/rt2860/sta/assoc.c b/drivers/staging/rt2860/sta/assoc.c index 6e85d5e..b7efb0b 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 55732b1..c380551 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 5d348e9..23879b7 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 cbe90a6..747d3c6 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); |