diff options
author | Andy Shevchenko <andy.shevchenko@gmail.com> | 2010-09-11 10:17:04 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-09-16 15:26:10 -0400 |
commit | aa4d282cba3b358bab1507895910d872f8fa7baf (patch) | |
tree | c6384da415be8a210e4daac8dcd1649077478f99 /drivers | |
parent | ef6c3c6e53ba4286140ea7d582d81f08d43dc7d2 (diff) |
staging: rt2860: change plain format of mac address to %pM in *printf()
There are many locations where MAC or BSSID is printed. The plain format
is used in such places. *printf() in kernel recognizes
%pM, %pMF and %pm format parameters to print out 6-byte array as MAC
address. This patch changes plain format to custom %pM which is widely
used in kernel.
Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/staging/rt2860/common/ba_action.c | 4 | ||||
-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 | 12 | ||||
-rw-r--r-- | drivers/staging/rt2860/rt_linux.c | 4 | ||||
-rw-r--r-- | drivers/staging/rt2860/rt_linux.h | 3 | ||||
-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 | 4 | ||||
-rw-r--r-- | drivers/staging/rt2860/sta/sync.c | 12 | ||||
-rw-r--r-- | drivers/staging/rt2860/sta_ioctl.c | 11 |
12 files changed, 30 insertions, 67 deletions
diff --git a/drivers/staging/rt2860/common/ba_action.c b/drivers/staging/rt2860/common/ba_action.c index 174f2a73a1b..3f71c502855 100644 --- a/drivers/staging/rt2860/common/ba_action.c +++ b/drivers/staging/rt2860/common/ba_action.c | |||
@@ -654,8 +654,8 @@ BOOLEAN BARecSessionAdd(struct rt_rtmp_adapter *pAd, | |||
654 | } else { | 654 | } else { |
655 | Status = FALSE; | 655 | Status = FALSE; |
656 | DBGPRINT(RT_DEBUG_TRACE, | 656 | DBGPRINT(RT_DEBUG_TRACE, |
657 | ("Can't Accept ADDBA for %02x:%02x:%02x:%02x:%02x:%02x TID = %d\n", | 657 | ("Can't Accept ADDBA for %pM TID = %d\n", |
658 | PRINT_MAC(pEntry->Addr), TID)); | 658 | &pEntry->Addr[0], TID)); |
659 | } | 659 | } |
660 | return (Status); | 660 | return (Status); |
661 | } | 661 | } |
diff --git a/drivers/staging/rt2860/common/cmm_mac_usb.c b/drivers/staging/rt2860/common/cmm_mac_usb.c index 8aec70fc20d..d08abf794c8 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) | |||
663 | StaMacReg1.field.Byte5 = pAd->CurrentAddress[5]; | 663 | StaMacReg1.field.Byte5 = pAd->CurrentAddress[5]; |
664 | StaMacReg1.field.U2MeMask = 0xff; | 664 | StaMacReg1.field.U2MeMask = 0xff; |
665 | DBGPRINT_RAW(RT_DEBUG_TRACE, | 665 | DBGPRINT_RAW(RT_DEBUG_TRACE, |
666 | ("Local MAC = %02x:%02x:%02x:%02x:%02x:%02x\n", | 666 | ("Local MAC = %pM\n", &pAd->CurrentAddress[0])); |
667 | pAd->CurrentAddress[0], pAd->CurrentAddress[1], | ||
668 | pAd->CurrentAddress[2], pAd->CurrentAddress[3], | ||
669 | pAd->CurrentAddress[4], pAd->CurrentAddress[5])); | ||
670 | 667 | ||
671 | RTUSBWriteMACRegister(pAd, MAC_ADDR_DW0, StaMacReg0.word); | 668 | RTUSBWriteMACRegister(pAd, MAC_ADDR_DW0, StaMacReg0.word); |
672 | RTUSBWriteMACRegister(pAd, MAC_ADDR_DW1, StaMacReg1.word); | 669 | 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 9414aa34437..78ca4ed46d9 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 | |||
221 | break; | 221 | break; |
222 | 222 | ||
223 | DBGPRINT(RT_DEBUG_TRACE, | 223 | DBGPRINT(RT_DEBUG_TRACE, |
224 | ("Receive EAPoL-Key frame from STA %02X-%02X-%02X-%02X-%02X-%02X\n", | 224 | ("Receive EAPoL-Key frame from STA %pMF\n", |
225 | PRINT_MAC(pEntry->Addr))); | 225 | &pEntry->Addr[0])); |
226 | 226 | ||
227 | if (((pEapol_packet->ProVer != EAPOL_VER) | 227 | if (((pEapol_packet->ProVer != EAPOL_VER) |
228 | && (pEapol_packet->ProVer != EAPOL_VER2)) | 228 | && (pEapol_packet->ProVer != EAPOL_VER2)) |
diff --git a/drivers/staging/rt2860/common/mlme.c b/drivers/staging/rt2860/common/mlme.c index 9fc34a8f218..e51403315fe 100644 --- a/drivers/staging/rt2860/common/mlme.c +++ b/drivers/staging/rt2860/common/mlme.c | |||
@@ -1536,10 +1536,9 @@ void MlmeAutoReconnectLastSSID(struct rt_rtmp_adapter *pAd) | |||
1536 | { | 1536 | { |
1537 | if (pAd->StaCfg.bAutoConnectByBssid) { | 1537 | if (pAd->StaCfg.bAutoConnectByBssid) { |
1538 | DBGPRINT(RT_DEBUG_TRACE, | 1538 | DBGPRINT(RT_DEBUG_TRACE, |
1539 | ("Driver auto reconnect to last OID_802_11_BSSID setting - %02X:%02X:%02X:%02X:%02X:%02X\n", | 1539 | ("Driver auto reconnect to last OID_802_11_BSSID " |
1540 | pAd->MlmeAux.Bssid[0], pAd->MlmeAux.Bssid[1], | 1540 | "setting - %pM\n", |
1541 | pAd->MlmeAux.Bssid[2], pAd->MlmeAux.Bssid[3], | 1541 | &pAd->MlmeAux.Bssid[0])); |
1542 | pAd->MlmeAux.Bssid[4], pAd->MlmeAux.Bssid[5])); | ||
1543 | 1542 | ||
1544 | pAd->MlmeAux.Channel = pAd->CommonCfg.Channel; | 1543 | pAd->MlmeAux.Channel = pAd->CommonCfg.Channel; |
1545 | MlmeEnqueue(pAd, | 1544 | MlmeEnqueue(pAd, |
diff --git a/drivers/staging/rt2860/common/rtmp_init.c b/drivers/staging/rt2860/common/rtmp_init.c index ff9f87c6be7..afeb5282074 100644 --- a/drivers/staging/rt2860/common/rtmp_init.c +++ b/drivers/staging/rt2860/common/rtmp_init.c | |||
@@ -749,13 +749,7 @@ void NICReadEEPROMParameters(struct rt_rtmp_adapter *pAd, u8 *mac_addr) | |||
749 | /* pAd->PermanentAddress[5] = RandomByte(pAd)&0xf8; */ | 749 | /* pAd->PermanentAddress[5] = RandomByte(pAd)&0xf8; */ |
750 | 750 | ||
751 | DBGPRINT_RAW(RT_DEBUG_TRACE, | 751 | DBGPRINT_RAW(RT_DEBUG_TRACE, |
752 | ("E2PROM MAC: =%02x:%02x:%02x:%02x:%02x:%02x\n", | 752 | ("E2PROM MAC: =%pM\n", &pAd->PermanentAddress[0])); |
753 | pAd->PermanentAddress[0], | ||
754 | pAd->PermanentAddress[1], | ||
755 | pAd->PermanentAddress[2], | ||
756 | pAd->PermanentAddress[3], | ||
757 | pAd->PermanentAddress[4], | ||
758 | pAd->PermanentAddress[5])); | ||
759 | if (pAd->bLocalAdminMAC == FALSE) { | 753 | if (pAd->bLocalAdminMAC == FALSE) { |
760 | MAC_DW0_STRUC csr2; | 754 | MAC_DW0_STRUC csr2; |
761 | MAC_DW1_STRUC csr3; | 755 | MAC_DW1_STRUC csr3; |
@@ -772,8 +766,8 @@ void NICReadEEPROMParameters(struct rt_rtmp_adapter *pAd, u8 *mac_addr) | |||
772 | csr3.field.U2MeMask = 0xff; | 766 | csr3.field.U2MeMask = 0xff; |
773 | RTMP_IO_WRITE32(pAd, MAC_ADDR_DW1, csr3.word); | 767 | RTMP_IO_WRITE32(pAd, MAC_ADDR_DW1, csr3.word); |
774 | DBGPRINT_RAW(RT_DEBUG_TRACE, | 768 | DBGPRINT_RAW(RT_DEBUG_TRACE, |
775 | ("E2PROM MAC: =%02x:%02x:%02x:%02x:%02x:%02x\n", | 769 | ("E2PROM MAC: =%pM\n", |
776 | PRINT_MAC(pAd->PermanentAddress))); | 770 | &pAd->PermanentAddress[0])); |
777 | } | 771 | } |
778 | } | 772 | } |
779 | 773 | ||
diff --git a/drivers/staging/rt2860/rt_linux.c b/drivers/staging/rt2860/rt_linux.c index 5b79f655bb0..abfeea11721 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, | |||
682 | 682 | ||
683 | if (pAddr) | 683 | if (pAddr) |
684 | pBufPtr += | 684 | pBufPtr += |
685 | sprintf(pBufPtr, | 685 | sprintf(pBufPtr, "(RT2860) STA(%pM) ", pAddr); |
686 | "(RT2860) STA(%02x:%02x:%02x:%02x:%02x:%02x) ", | ||
687 | PRINT_MAC(pAddr)); | ||
688 | else if (BssIdx < MAX_MBSSID_NUM) | 686 | else if (BssIdx < MAX_MBSSID_NUM) |
689 | pBufPtr += | 687 | pBufPtr += |
690 | sprintf(pBufPtr, "(RT2860) BSS(wlan%d) ", BssIdx); | 688 | sprintf(pBufPtr, "(RT2860) BSS(wlan%d) ", BssIdx); |
diff --git a/drivers/staging/rt2860/rt_linux.h b/drivers/staging/rt2860/rt_linux.h index b370fb21e42..5acedf18b1a 100644 --- a/drivers/staging/rt2860/rt_linux.h +++ b/drivers/staging/rt2860/rt_linux.h | |||
@@ -409,9 +409,6 @@ struct os_cookie { | |||
409 | /*********************************************************************************** | 409 | /*********************************************************************************** |
410 | * OS debugging and printing related definitions and data structure | 410 | * OS debugging and printing related definitions and data structure |
411 | ***********************************************************************************/ | 411 | ***********************************************************************************/ |
412 | #define PRINT_MAC(addr) \ | ||
413 | addr[0], addr[1], addr[2], addr[3], addr[4], addr[5] | ||
414 | |||
415 | #ifdef DBG | 412 | #ifdef DBG |
416 | extern unsigned long RTDebugLevel; | 413 | extern unsigned long RTDebugLevel; |
417 | 414 | ||
diff --git a/drivers/staging/rt2860/sta/assoc.c b/drivers/staging/rt2860/sta/assoc.c index 6e85d5e6554..1efd75b88fa 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 | |||
794 | RTMPCancelTimer(&pAd->MlmeAux.DisassocTimer, &TimerCancelled); | 794 | RTMPCancelTimer(&pAd->MlmeAux.DisassocTimer, &TimerCancelled); |
795 | 795 | ||
796 | DBGPRINT(RT_DEBUG_TRACE, | 796 | DBGPRINT(RT_DEBUG_TRACE, |
797 | ("ASSOC - Send DISASSOC request[BSSID::%02x:%02x:%02x:%02x:%02x:%02x (Reason=%d)\n", | 797 | ("ASSOC - Send DISASSOC request[BSSID::%pM (Reason=%d)\n", |
798 | pDisassocReq->Addr[0], pDisassocReq->Addr[1], | 798 | &pDisassocReq->Addr[0], pDisassocReq->Reason)); |
799 | pDisassocReq->Addr[2], pDisassocReq->Addr[3], | ||
800 | pDisassocReq->Addr[4], pDisassocReq->Addr[5], | ||
801 | pDisassocReq->Reason)); | ||
802 | MgtMacHeaderInit(pAd, &DisassocHdr, SUBTYPE_DISASSOC, 0, pDisassocReq->Addr, pDisassocReq->Addr); /* patch peap ttls switching issue */ | 799 | MgtMacHeaderInit(pAd, &DisassocHdr, SUBTYPE_DISASSOC, 0, pDisassocReq->Addr, pDisassocReq->Addr); /* patch peap ttls switching issue */ |
803 | MakeOutgoingFrame(pOutBuffer, &FrameLen, | 800 | MakeOutgoingFrame(pOutBuffer, &FrameLen, |
804 | sizeof(struct rt_header_802_11), &DisassocHdr, | 801 | sizeof(struct rt_header_802_11), &DisassocHdr, |
diff --git a/drivers/staging/rt2860/sta/connect.c b/drivers/staging/rt2860/sta/connect.c index 55732b10062..05b4af6c3e8 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 * | |||
653 | RTMPMakeRSNIE(pAd, pAd->StaCfg.AuthMode, pAd->StaCfg.WepStatus, 0); | 653 | RTMPMakeRSNIE(pAd, pAd->StaCfg.AuthMode, pAd->StaCfg.WepStatus, 0); |
654 | } */ | 654 | } */ |
655 | /* No active association, join the BSS immediately */ | 655 | /* No active association, join the BSS immediately */ |
656 | DBGPRINT(RT_DEBUG_TRACE, | 656 | DBGPRINT(RT_DEBUG_TRACE, ("CNTL - joining %pM ...\n", |
657 | ("CNTL - joining %02x:%02x:%02x:%02x:%02x:%02x ...\n", | 657 | &pOidBssid[0])); |
658 | pOidBssid[0], pOidBssid[1], pOidBssid[2], | ||
659 | pOidBssid[3], pOidBssid[4], pOidBssid[5])); | ||
660 | 658 | ||
661 | JoinParmFill(pAd, &JoinReq, pAd->MlmeAux.BssIdx); | 659 | JoinParmFill(pAd, &JoinReq, pAd->MlmeAux.BssIdx); |
662 | MlmeEnqueue(pAd, SYNC_STATE_MACHINE, MT2_MLME_JOIN_REQ, | 660 | 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 | |||
778 | LinkUp(pAd, BSS_ADHOC); | 776 | LinkUp(pAd, BSS_ADHOC); |
779 | pAd->Mlme.CntlMachine.CurrState = CNTL_IDLE; | 777 | pAd->Mlme.CntlMachine.CurrState = CNTL_IDLE; |
780 | DBGPRINT(RT_DEBUG_TRACE, | 778 | DBGPRINT(RT_DEBUG_TRACE, |
781 | ("CNTL - join the IBSS = %02x:%02x:%02x:%02x:%02x:%02x ...\n", | 779 | ("CNTL - join the IBSS = %pM ...\n", |
782 | pAd->CommonCfg.Bssid[0], | 780 | &pAd->CommonCfg.Bssid[0])); |
783 | pAd->CommonCfg.Bssid[1], | ||
784 | pAd->CommonCfg.Bssid[2], | ||
785 | pAd->CommonCfg.Bssid[3], | ||
786 | pAd->CommonCfg.Bssid[4], | ||
787 | pAd->CommonCfg.Bssid[5])); | ||
788 | 781 | ||
789 | pAd->IndicateMediaState = | 782 | pAd->IndicateMediaState = |
790 | NdisMediaStateConnected; | 783 | NdisMediaStateConnected; |
@@ -902,13 +895,8 @@ void CntlWaitStartProc(struct rt_rtmp_adapter *pAd, struct rt_mlme_queue_elem *E | |||
902 | } | 895 | } |
903 | 896 | ||
904 | DBGPRINT(RT_DEBUG_TRACE, | 897 | DBGPRINT(RT_DEBUG_TRACE, |
905 | ("CNTL - start a new IBSS = %02x:%02x:%02x:%02x:%02x:%02x ...\n", | 898 | ("CNTL - start a new IBSS = %pM ...\n", |
906 | pAd->CommonCfg.Bssid[0], | 899 | &pAd->CommonCfg.Bssid[0])); |
907 | pAd->CommonCfg.Bssid[1], | ||
908 | pAd->CommonCfg.Bssid[2], | ||
909 | pAd->CommonCfg.Bssid[3], | ||
910 | pAd->CommonCfg.Bssid[4], | ||
911 | pAd->CommonCfg.Bssid[5])); | ||
912 | } else { | 900 | } else { |
913 | DBGPRINT(RT_DEBUG_TRACE, | 901 | DBGPRINT(RT_DEBUG_TRACE, |
914 | ("CNTL - Start IBSS fail. BUG!\n")); | 902 | ("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 5d348e9d9b7..fbe903c530b 100644 --- a/drivers/staging/rt2860/sta/rtmp_data.c +++ b/drivers/staging/rt2860/sta/rtmp_data.c | |||
@@ -976,8 +976,8 @@ int STASendPacket(struct rt_rtmp_adapter *pAd, void *pPacket) | |||
976 | 976 | ||
977 | if (!pEntry) { | 977 | if (!pEntry) { |
978 | DBGPRINT(RT_DEBUG_ERROR, | 978 | DBGPRINT(RT_DEBUG_ERROR, |
979 | ("STASendPacket->Cannot find pEntry(%2x:%2x:%2x:%2x:%2x:%2x) in MacTab!\n", | 979 | ("STASendPacket->Cannot find pEntry(%pM) in MacTab!\n", |
980 | PRINT_MAC(pSrcBufVA))); | 980 | pSrcBufVA)); |
981 | /* Resourece is low, system did not allocate virtual address */ | 981 | /* Resourece is low, system did not allocate virtual address */ |
982 | /* return NDIS_STATUS_FAILURE directly to upper layer */ | 982 | /* return NDIS_STATUS_FAILURE directly to upper layer */ |
983 | RELEASE_NDIS_PACKET(pAd, pPacket, NDIS_STATUS_FAILURE); | 983 | 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 cbe90a6496d..3abc3629111 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 | |||
424 | } while (FALSE); | 424 | } while (FALSE); |
425 | 425 | ||
426 | DBGPRINT(RT_DEBUG_TRACE, | 426 | DBGPRINT(RT_DEBUG_TRACE, |
427 | ("SYNC - Switch to ch %d, Wait BEACON from %02x:%02x:%02x:%02x:%02x:%02x\n", | 427 | ("SYNC - Switch to ch %d, Wait BEACON from %pM\n", |
428 | pBss->Channel, pBss->Bssid[0], pBss->Bssid[1], pBss->Bssid[2], | 428 | pBss->Channel, &pBss->Bssid[0])); |
429 | pBss->Bssid[3], pBss->Bssid[4], pBss->Bssid[5])); | ||
430 | 429 | ||
431 | pAd->Mlme.SyncMachine.CurrState = JOIN_WAIT_BEACON; | 430 | pAd->Mlme.SyncMachine.CurrState = JOIN_WAIT_BEACON; |
432 | } | 431 | } |
@@ -1225,10 +1224,9 @@ void PeerBeacon(struct rt_rtmp_adapter *pAd, struct rt_mlme_queue_elem *Elem) | |||
1225 | for (i = 0; i < 6; i++) { | 1224 | for (i = 0; i < 6; i++) { |
1226 | if (Bssid[i] > pAd->CommonCfg.Bssid[i]) { | 1225 | if (Bssid[i] > pAd->CommonCfg.Bssid[i]) { |
1227 | DBGPRINT(RT_DEBUG_TRACE, | 1226 | DBGPRINT(RT_DEBUG_TRACE, |
1228 | ("SYNC - merge to the IBSS with bigger BSSID=%02x:%02x:%02x:%02x:%02x:%02x\n", | 1227 | ("SYNC - merge to the IBSS " |
1229 | Bssid[0], Bssid[1], Bssid[2], | 1228 | "with bigger BSSID=" |
1230 | Bssid[3], Bssid[4], | 1229 | "%pM\n", &Bssid[0])); |
1231 | Bssid[5])); | ||
1232 | AsicDisableSync(pAd); | 1230 | AsicDisableSync(pAd); |
1233 | COPY_MAC_ADDR(pAd->CommonCfg.Bssid, | 1231 | COPY_MAC_ADDR(pAd->CommonCfg.Bssid, |
1234 | Bssid); | 1232 | Bssid); |
diff --git a/drivers/staging/rt2860/sta_ioctl.c b/drivers/staging/rt2860/sta_ioctl.c index 6b8268d3dc7..bff7b0b6398 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, | |||
614 | OID_802_11_BSSID, | 614 | OID_802_11_BSSID, |
615 | sizeof(NDIS_802_11_MAC_ADDRESS), (void *) & Bssid); | 615 | sizeof(NDIS_802_11_MAC_ADDRESS), (void *) & Bssid); |
616 | 616 | ||
617 | DBGPRINT(RT_DEBUG_TRACE, | 617 | DBGPRINT(RT_DEBUG_TRACE, ("IOCTL::SIOCSIWAP %pM\n", &Bssid[0])); |
618 | ("IOCTL::SIOCSIWAP %02x:%02x:%02x:%02x:%02x:%02x\n", Bssid[0], | ||
619 | Bssid[1], Bssid[2], Bssid[3], Bssid[4], Bssid[5])); | ||
620 | 618 | ||
621 | return 0; | 619 | return 0; |
622 | } | 620 | } |
@@ -1513,11 +1511,8 @@ void getBaInfo(struct rt_rtmp_adapter *pAd, char *pOutBuf) | |||
1513 | if (((pEntry->ValidAsCLI || pEntry->ValidAsApCli) | 1511 | if (((pEntry->ValidAsCLI || pEntry->ValidAsApCli) |
1514 | && (pEntry->Sst == SST_ASSOC)) | 1512 | && (pEntry->Sst == SST_ASSOC)) |
1515 | || (pEntry->ValidAsWDS) || (pEntry->ValidAsMesh)) { | 1513 | || (pEntry->ValidAsWDS) || (pEntry->ValidAsMesh)) { |
1516 | sprintf(pOutBuf + strlen(pOutBuf), | 1514 | sprintf(pOutBuf + strlen(pOutBuf), "\n%pM (Aid = %d) " |
1517 | "\n%02X:%02X:%02X:%02X:%02X:%02X (Aid = %d) (AP) -\n", | 1515 | "(AP) -\n", &pEntry->Addr[0], pEntry->Aid); |
1518 | pEntry->Addr[0], pEntry->Addr[1], | ||
1519 | pEntry->Addr[2], pEntry->Addr[3], | ||
1520 | pEntry->Addr[4], pEntry->Addr[5], pEntry->Aid); | ||
1521 | 1516 | ||
1522 | sprintf(pOutBuf, "%s[Recipient]\n", pOutBuf); | 1517 | sprintf(pOutBuf, "%s[Recipient]\n", pOutBuf); |
1523 | for (j = 0; j < NUM_OF_TID; j++) { | 1518 | for (j = 0; j < NUM_OF_TID; j++) { |