diff options
| author | Malcolm Priestley | 2013-01-18 00:19:37 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2013-01-18 21:39:01 +0100 |
| commit | 14c5ef57714d21ff8234aa9a756765e9cb38f837 (patch) | |
| tree | 0cadd138cdeb15c26f2aa9d8b9485dd6d5991350 /drivers/staging/vt6656/dpc.c | |
| parent | staging: vt6656: datarate/dpc/hostap/power use new structures. (diff) | |
| download | kernel-qcow2-linux-14c5ef57714d21ff8234aa9a756765e9cb38f837.tar.gz kernel-qcow2-linux-14c5ef57714d21ff8234aa9a756765e9cb38f837.tar.xz kernel-qcow2-linux-14c5ef57714d21ff8234aa9a756765e9cb38f837.zip | |
staging: vt6656: staging: vt6656 change remaining to vnt_mgmt and remove typedef.
Use
struct vnt_manager
Move vnt_manager from sMgmtObj to vnt_mgmt.
and remove typedef from structures
vnt_private
vnt_manager
vnt_rx_mgmt
vnt_tx_mgmt
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/vt6656/dpc.c')
| -rw-r--r-- | drivers/staging/vt6656/dpc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/vt6656/dpc.c b/drivers/staging/vt6656/dpc.c index b627860f53a0..6c981722b88b 100644 --- a/drivers/staging/vt6656/dpc.c +++ b/drivers/staging/vt6656/dpc.c @@ -850,9 +850,9 @@ int RXbBulkInProcessData(struct vnt_private *pDevice, PRCB pRCB, RSC += wRxTSC15_0; memcpy(&(pKey->KeyRSC), &RSC, sizeof(u64)); - if ( (pDevice->sMgmtObj.eCurrMode == WMAC_MODE_ESS_STA) && - (pDevice->sMgmtObj.eCurrState == WMAC_STATE_ASSOC)) { - // check RSC + if (pDevice->vnt_mgmt.eCurrMode == WMAC_MODE_ESS_STA && + pDevice->vnt_mgmt.eCurrState == WMAC_STATE_ASSOC) { + /* check RSC */ if ( (wRxTSC15_0 < wLocalTSC15_0) && (dwRxTSC47_16 <= dwLocalTSC47_16) && !((dwRxTSC47_16 == 0) && (dwLocalTSC47_16 == 0xFFFFFFFF))) { @@ -927,7 +927,7 @@ int RXbBulkInProcessData(struct vnt_private *pDevice, PRCB pRCB, static int s_bAPModeRxCtl(struct vnt_private *pDevice, u8 *pbyFrame, s32 iSANodeIndex) { - struct vnt_manager *pMgmt = &(pDevice->sMgmtObj); + struct vnt_manager *pMgmt = &pDevice->vnt_mgmt; PS802_11Header p802_11Header; CMD_STATUS Status; @@ -1456,7 +1456,7 @@ void RXvMngWorkItem(struct vnt_private *pDevice) } ASSERT(pRCB);// cannot be NULL pRxPacket = &(pRCB->sMngPacket); - vMgrRxManagePacket((void *) pDevice, &(pDevice->sMgmtObj), pRxPacket); + vMgrRxManagePacket(pDevice, &pDevice->vnt_mgmt, pRxPacket); pRCB->Ref--; if(pRCB->Ref == 0) { DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"RxvFreeMng %d %d\n",pDevice->NumRecvFreeList, pDevice->NumRecvMngList); |