aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/rt2860/sta/sync.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/staging/rt2860/sta/sync.c')
-rw-r--r--drivers/staging/rt2860/sta/sync.c12
1 files changed, 5 insertions, 7 deletions
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);