Commit 1c919d90 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Greg Kroah-Hartman

staging: rt2860: '&pointer[0]' to 'pointer' fix

Signed-off-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 03a6cddb
...@@ -655,7 +655,7 @@ BOOLEAN BARecSessionAdd(struct rt_rtmp_adapter *pAd, ...@@ -655,7 +655,7 @@ BOOLEAN BARecSessionAdd(struct rt_rtmp_adapter *pAd,
Status = FALSE; Status = FALSE;
DBGPRINT(RT_DEBUG_TRACE, DBGPRINT(RT_DEBUG_TRACE,
("Can't Accept ADDBA for %pM TID = %d\n", ("Can't Accept ADDBA for %pM TID = %d\n",
&pEntry->Addr[0], TID)); pEntry->Addr, TID));
} }
return (Status); return (Status);
} }
......
...@@ -663,7 +663,7 @@ int RTUSBWriteHWMACAddress(struct rt_rtmp_adapter *pAd) ...@@ -663,7 +663,7 @@ int RTUSBWriteHWMACAddress(struct rt_rtmp_adapter *pAd)
StaMacReg1.field.Byte5 = pAd->CurrentAddress[5]; StaMacReg1.field.Byte5 = pAd->CurrentAddress[5];
StaMacReg1.field.U2MeMask = 0xff; StaMacReg1.field.U2MeMask = 0xff;
DBGPRINT_RAW(RT_DEBUG_TRACE, 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_DW0, StaMacReg0.word);
RTUSBWriteMACRegister(pAd, MAC_ADDR_DW1, StaMacReg1.word); RTUSBWriteMACRegister(pAd, MAC_ADDR_DW1, StaMacReg1.word);
......
...@@ -222,7 +222,7 @@ void WpaEAPOLKeyAction(struct rt_rtmp_adapter *pAd, struct rt_mlme_queue_elem *E ...@@ -222,7 +222,7 @@ void WpaEAPOLKeyAction(struct rt_rtmp_adapter *pAd, struct rt_mlme_queue_elem *E
DBGPRINT(RT_DEBUG_TRACE, DBGPRINT(RT_DEBUG_TRACE,
("Receive EAPoL-Key frame from STA %pMF\n", ("Receive EAPoL-Key frame from STA %pMF\n",
&pEntry->Addr[0])); pEntry->Addr));
if (((pEapol_packet->ProVer != EAPOL_VER) if (((pEapol_packet->ProVer != EAPOL_VER)
&& (pEapol_packet->ProVer != EAPOL_VER2)) && (pEapol_packet->ProVer != EAPOL_VER2))
......
...@@ -1537,8 +1537,7 @@ void MlmeAutoReconnectLastSSID(struct rt_rtmp_adapter *pAd) ...@@ -1537,8 +1537,7 @@ void MlmeAutoReconnectLastSSID(struct rt_rtmp_adapter *pAd)
if (pAd->StaCfg.bAutoConnectByBssid) { if (pAd->StaCfg.bAutoConnectByBssid) {
DBGPRINT(RT_DEBUG_TRACE, DBGPRINT(RT_DEBUG_TRACE,
("Driver auto reconnect to last OID_802_11_BSSID " ("Driver auto reconnect to last OID_802_11_BSSID "
"setting - %pM\n", "setting - %pM\n", pAd->MlmeAux.Bssid));
&pAd->MlmeAux.Bssid[0]));
pAd->MlmeAux.Channel = pAd->CommonCfg.Channel; pAd->MlmeAux.Channel = pAd->CommonCfg.Channel;
MlmeEnqueue(pAd, MlmeEnqueue(pAd,
......
...@@ -749,7 +749,7 @@ void NICReadEEPROMParameters(struct rt_rtmp_adapter *pAd, u8 *mac_addr) ...@@ -749,7 +749,7 @@ void NICReadEEPROMParameters(struct rt_rtmp_adapter *pAd, u8 *mac_addr)
/* pAd->PermanentAddress[5] = RandomByte(pAd)&0xf8; */ /* pAd->PermanentAddress[5] = RandomByte(pAd)&0xf8; */
DBGPRINT_RAW(RT_DEBUG_TRACE, DBGPRINT_RAW(RT_DEBUG_TRACE,
("E2PROM MAC: =%pM\n", &pAd->PermanentAddress[0])); ("E2PROM MAC: =%pM\n", pAd->PermanentAddress));
if (pAd->bLocalAdminMAC == FALSE) { if (pAd->bLocalAdminMAC == FALSE) {
MAC_DW0_STRUC csr2; MAC_DW0_STRUC csr2;
MAC_DW1_STRUC csr3; MAC_DW1_STRUC csr3;
...@@ -767,7 +767,7 @@ void NICReadEEPROMParameters(struct rt_rtmp_adapter *pAd, u8 *mac_addr) ...@@ -767,7 +767,7 @@ void NICReadEEPROMParameters(struct rt_rtmp_adapter *pAd, u8 *mac_addr)
RTMP_IO_WRITE32(pAd, MAC_ADDR_DW1, csr3.word); RTMP_IO_WRITE32(pAd, MAC_ADDR_DW1, csr3.word);
DBGPRINT_RAW(RT_DEBUG_TRACE, DBGPRINT_RAW(RT_DEBUG_TRACE,
("E2PROM MAC: =%pM\n", ("E2PROM MAC: =%pM\n",
&pAd->PermanentAddress[0])); pAd->PermanentAddress));
} }
} }
......
...@@ -795,7 +795,7 @@ void MlmeDisassocReqAction(struct rt_rtmp_adapter *pAd, struct rt_mlme_queue_ele ...@@ -795,7 +795,7 @@ void MlmeDisassocReqAction(struct rt_rtmp_adapter *pAd, struct rt_mlme_queue_ele
DBGPRINT(RT_DEBUG_TRACE, DBGPRINT(RT_DEBUG_TRACE,
("ASSOC - Send DISASSOC request[BSSID::%pM (Reason=%d)\n", ("ASSOC - Send DISASSOC request[BSSID::%pM (Reason=%d)\n",
&pDisassocReq->Addr[0], pDisassocReq->Reason)); pDisassocReq->Addr, pDisassocReq->Reason));
MgtMacHeaderInit(pAd, &DisassocHdr, SUBTYPE_DISASSOC, 0, pDisassocReq->Addr, pDisassocReq->Addr); /* patch peap ttls switching issue */ MgtMacHeaderInit(pAd, &DisassocHdr, SUBTYPE_DISASSOC, 0, pDisassocReq->Addr, pDisassocReq->Addr); /* patch peap ttls switching issue */
MakeOutgoingFrame(pOutBuffer, &FrameLen, MakeOutgoingFrame(pOutBuffer, &FrameLen,
sizeof(struct rt_header_802_11), &DisassocHdr, sizeof(struct rt_header_802_11), &DisassocHdr,
......
...@@ -654,7 +654,7 @@ void CntlOidRTBssidProc(struct rt_rtmp_adapter *pAd, struct rt_mlme_queue_elem * ...@@ -654,7 +654,7 @@ void CntlOidRTBssidProc(struct rt_rtmp_adapter *pAd, struct rt_mlme_queue_elem *
} */ } */
/* No active association, join the BSS immediately */ /* No active association, join the BSS immediately */
DBGPRINT(RT_DEBUG_TRACE, ("CNTL - joining %pM ...\n", DBGPRINT(RT_DEBUG_TRACE, ("CNTL - joining %pM ...\n",
&pOidBssid[0])); pOidBssid));
JoinParmFill(pAd, &JoinReq, pAd->MlmeAux.BssIdx); JoinParmFill(pAd, &JoinReq, pAd->MlmeAux.BssIdx);
MlmeEnqueue(pAd, SYNC_STATE_MACHINE, MT2_MLME_JOIN_REQ, MlmeEnqueue(pAd, SYNC_STATE_MACHINE, MT2_MLME_JOIN_REQ,
...@@ -777,7 +777,7 @@ void CntlWaitJoinProc(struct rt_rtmp_adapter *pAd, struct rt_mlme_queue_elem *El ...@@ -777,7 +777,7 @@ void CntlWaitJoinProc(struct rt_rtmp_adapter *pAd, struct rt_mlme_queue_elem *El
pAd->Mlme.CntlMachine.CurrState = CNTL_IDLE; pAd->Mlme.CntlMachine.CurrState = CNTL_IDLE;
DBGPRINT(RT_DEBUG_TRACE, DBGPRINT(RT_DEBUG_TRACE,
("CNTL - join the IBSS = %pM ...\n", ("CNTL - join the IBSS = %pM ...\n",
&pAd->CommonCfg.Bssid[0])); pAd->CommonCfg.Bssid));
pAd->IndicateMediaState = pAd->IndicateMediaState =
NdisMediaStateConnected; NdisMediaStateConnected;
...@@ -896,7 +896,7 @@ void CntlWaitStartProc(struct rt_rtmp_adapter *pAd, struct rt_mlme_queue_elem *E ...@@ -896,7 +896,7 @@ void CntlWaitStartProc(struct rt_rtmp_adapter *pAd, struct rt_mlme_queue_elem *E
DBGPRINT(RT_DEBUG_TRACE, DBGPRINT(RT_DEBUG_TRACE,
("CNTL - start a new IBSS = %pM ...\n", ("CNTL - start a new IBSS = %pM ...\n",
&pAd->CommonCfg.Bssid[0])); pAd->CommonCfg.Bssid));
} else { } else {
DBGPRINT(RT_DEBUG_TRACE, DBGPRINT(RT_DEBUG_TRACE,
("CNTL - Start IBSS fail. BUG!\n")); ("CNTL - Start IBSS fail. BUG!\n"));
......
...@@ -425,7 +425,7 @@ void MlmeJoinReqAction(struct rt_rtmp_adapter *pAd, struct rt_mlme_queue_elem *E ...@@ -425,7 +425,7 @@ void MlmeJoinReqAction(struct rt_rtmp_adapter *pAd, struct rt_mlme_queue_elem *E
DBGPRINT(RT_DEBUG_TRACE, DBGPRINT(RT_DEBUG_TRACE,
("SYNC - Switch to ch %d, Wait BEACON from %pM\n", ("SYNC - Switch to ch %d, Wait BEACON from %pM\n",
pBss->Channel, &pBss->Bssid[0])); pBss->Channel, pBss->Bssid));
pAd->Mlme.SyncMachine.CurrState = JOIN_WAIT_BEACON; pAd->Mlme.SyncMachine.CurrState = JOIN_WAIT_BEACON;
} }
...@@ -1226,7 +1226,7 @@ void PeerBeacon(struct rt_rtmp_adapter *pAd, struct rt_mlme_queue_elem *Elem) ...@@ -1226,7 +1226,7 @@ void PeerBeacon(struct rt_rtmp_adapter *pAd, struct rt_mlme_queue_elem *Elem)
DBGPRINT(RT_DEBUG_TRACE, DBGPRINT(RT_DEBUG_TRACE,
("SYNC - merge to the IBSS " ("SYNC - merge to the IBSS "
"with bigger BSSID=" "with bigger BSSID="
"%pM\n", &Bssid[0])); "%pM\n", Bssid));
AsicDisableSync(pAd); AsicDisableSync(pAd);
COPY_MAC_ADDR(pAd->CommonCfg.Bssid, COPY_MAC_ADDR(pAd->CommonCfg.Bssid,
Bssid); Bssid);
......
...@@ -614,7 +614,7 @@ int rt_ioctl_siwap(struct net_device *dev, ...@@ -614,7 +614,7 @@ int rt_ioctl_siwap(struct net_device *dev,
OID_802_11_BSSID, OID_802_11_BSSID,
sizeof(NDIS_802_11_MAC_ADDRESS), (void *) & Bssid); sizeof(NDIS_802_11_MAC_ADDRESS), (void *) & Bssid);
DBGPRINT(RT_DEBUG_TRACE, ("IOCTL::SIOCSIWAP %pM\n", &Bssid[0])); DBGPRINT(RT_DEBUG_TRACE, ("IOCTL::SIOCSIWAP %pM\n", Bssid));
return 0; return 0;
} }
...@@ -1512,7 +1512,7 @@ void getBaInfo(struct rt_rtmp_adapter *pAd, char *pOutBuf) ...@@ -1512,7 +1512,7 @@ void getBaInfo(struct rt_rtmp_adapter *pAd, char *pOutBuf)
&& (pEntry->Sst == SST_ASSOC)) && (pEntry->Sst == SST_ASSOC))
|| (pEntry->ValidAsWDS) || (pEntry->ValidAsMesh)) { || (pEntry->ValidAsWDS) || (pEntry->ValidAsMesh)) {
sprintf(pOutBuf + strlen(pOutBuf), "\n%pM (Aid = %d) " sprintf(pOutBuf + strlen(pOutBuf), "\n%pM (Aid = %d) "
"(AP) -\n", &pEntry->Addr[0], pEntry->Aid); "(AP) -\n", pEntry->Addr, pEntry->Aid);
sprintf(pOutBuf, "%s[Recipient]\n", pOutBuf); sprintf(pOutBuf, "%s[Recipient]\n", pOutBuf);
for (j = 0; j < NUM_OF_TID; j++) { for (j = 0; j < NUM_OF_TID; j++) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment