Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 197393
b: refs/heads/master
c: 830a619
h: refs/heads/master
i:
  197391: 76f2de8
v: v3
  • Loading branch information
Charles Clément authored and Greg Kroah-Hartman committed May 11, 2010
1 parent cf8ee0e commit 46833fa
Show file tree
Hide file tree
Showing 21 changed files with 255 additions and 262 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 6b35b7b3798b652a57fbce480f350aac851431c4
refs/heads/master: 830a619c02a53d52c86534f7d857b2e8d0ba893f
6 changes: 3 additions & 3 deletions trunk/drivers/staging/vt6655/IEEE11h.c
Original file line number Diff line number Diff line change
Expand Up @@ -203,8 +203,8 @@ static BOOL s_bRxTPCReq(PSMgmtObject pMgmt, PWLAN_FRAME_TPCREQ pTPCReq, BYTE byR
-*/
BOOL
IEEE11hbMgrRxAction (
IN PVOID pMgmtHandle,
IN PVOID pRxPacket
IN void *pMgmtHandle,
IN void *pRxPacket
)
{
PSMgmtObject pMgmt = (PSMgmtObject) pMgmtHandle;
Expand Down Expand Up @@ -265,7 +265,7 @@ IEEE11hbMgrRxAction (


BOOL IEEE11hbMSRRepTx (
IN PVOID pMgmtHandle
IN void *pMgmtHandle
)
{
PSMgmtObject pMgmt = (PSMgmtObject) pMgmtHandle;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/vt6655/IEEE11h.h
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
/*--------------------- Export Functions --------------------------*/

BOOL IEEE11hbMSRRepTx (
IN PVOID pMgmtHandle
IN void *pMgmtHandle
);

#endif // __IEEE11h_H__
14 changes: 7 additions & 7 deletions trunk/drivers/staging/vt6655/bssdb.c
Original file line number Diff line number Diff line change
Expand Up @@ -764,7 +764,7 @@ BSSbUpdateToBSSList (

BOOL
BSSDBbIsSTAInNodeDB(
IN PVOID pMgmtObject,
IN void *pMgmtObject,
IN PBYTE abyDstAddr,
OUT PUINT puNodeIndex
)
Expand Down Expand Up @@ -919,7 +919,7 @@ BSSvUpdateAPNode(
pMgmt->abyCurrExtSuppRates[1] = RATEuSetIE((PWLAN_IE_SUPP_RATES)pExtSuppRates,
(PWLAN_IE_SUPP_RATES)pMgmt->abyCurrExtSuppRates,
uRateLen);
RATEvParseMaxRate((PVOID) pDevice,
RATEvParseMaxRate((void *)pDevice,
(PWLAN_IE_SUPP_RATES)pMgmt->abyCurrSuppRates,
(PWLAN_IE_SUPP_RATES)pMgmt->abyCurrExtSuppRates,
TRUE,
Expand Down Expand Up @@ -972,7 +972,7 @@ BSSvAddMulticastNode(
pMgmt->sNodeDBTable[0].bActive = TRUE;
pMgmt->sNodeDBTable[0].bPSEnable = FALSE;
skb_queue_head_init(&pMgmt->sNodeDBTable[0].sTxPSQueue);
RATEvParseMaxRate((PVOID) pDevice,
RATEvParseMaxRate((void *)pDevice,
(PWLAN_IE_SUPP_RATES)pMgmt->abyCurrSuppRates,
(PWLAN_IE_SUPP_RATES)pMgmt->abyCurrExtSuppRates,
TRUE,
Expand Down Expand Up @@ -1162,15 +1162,15 @@ CARDbRadioPowerOn(pDevice);
*/
if (ii > 0) {
// ii = 0 for multicast node (AP & Adhoc)
RATEvTxRateFallBack((PVOID)pDevice, &(pMgmt->sNodeDBTable[ii]));
RATEvTxRateFallBack((void *)pDevice, &(pMgmt->sNodeDBTable[ii]));
}
else {
// ii = 0 reserved for unicast AP node (Infra STA)
if (pMgmt->eCurrMode == WMAC_MODE_ESS_STA)
#ifdef PLICE_DEBUG
printk("SecondCallback:Before:TxDataRate is %d\n",pMgmt->sNodeDBTable[0].wTxDataRate);
#endif
RATEvTxRateFallBack((PVOID)pDevice, &(pMgmt->sNodeDBTable[ii]));
RATEvTxRateFallBack((void *)pDevice, &(pMgmt->sNodeDBTable[ii]));
#ifdef PLICE_DEBUG
printk("SecondCallback:After:TxDataRate is %d\n",pMgmt->sNodeDBTable[0].wTxDataRate);
#endif
Expand Down Expand Up @@ -1215,14 +1215,14 @@ CARDbRadioPowerOn(pDevice);
if (pDevice->bShortSlotTime) {
pDevice->bShortSlotTime = FALSE;
BBvSetShortSlotTime(pDevice);
vUpdateIFS((PVOID)pDevice);
vUpdateIFS((void *)pDevice);
}
}
else {
if (!pDevice->bShortSlotTime) {
pDevice->bShortSlotTime = TRUE;
BBvSetShortSlotTime(pDevice);
vUpdateIFS((PVOID)pDevice);
vUpdateIFS((void *)pDevice);
}
}

Expand Down
Loading

0 comments on commit 46833fa

Please sign in to comment.