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/card.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/card.c')
| -rw-r--r-- | drivers/staging/vt6656/card.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/staging/vt6656/card.c b/drivers/staging/vt6656/card.c index 93983d941f92..7d725bb1c683 100644 --- a/drivers/staging/vt6656/card.c +++ b/drivers/staging/vt6656/card.c @@ -513,7 +513,7 @@ void vUpdateIFS(struct vnt_private *pDevice) } pDevice->uDIFS = C_SIFS_BG + 2*pDevice->uSlot; - pItemRates = (PWLAN_IE_SUPP_RATES)pDevice->sMgmtObj.abyCurrSuppRates; + pItemRates = (PWLAN_IE_SUPP_RATES)pDevice->vnt_mgmt.abyCurrSuppRates; for (ii = 0; ii < pItemRates->len; ii++) { byRate = (BYTE)(pItemRates->abyRates[ii]&0x7F); if (RATEwGetRateIdx(byRate) > RATE_11M) { @@ -522,7 +522,8 @@ void vUpdateIFS(struct vnt_private *pDevice) } } if (bOFDMRate == FALSE) { - pItemRates = (PWLAN_IE_SUPP_RATES)pDevice->sMgmtObj.abyCurrExtSuppRates; + pItemRates = (PWLAN_IE_SUPP_RATES)pDevice->vnt_mgmt + .abyCurrExtSuppRates; for (ii = 0; ii < pItemRates->len; ii++) { byRate = (BYTE)(pItemRates->abyRates[ii]&0x7F); if (RATEwGetRateIdx(byRate) > RATE_11M) { @@ -1035,12 +1036,11 @@ int CARDbChannelSwitch(struct vnt_private *pDevice, u8 byMode, { int bResult = TRUE; - if (byCount == 0) { - pDevice->sMgmtObj.uCurrChannel = byNewChannel; - CARDbSetMediaChannel(pDevice, byNewChannel); - - return bResult; - } + if (byCount == 0) { + pDevice->vnt_mgmt.uCurrChannel = byNewChannel; + CARDbSetMediaChannel(pDevice, byNewChannel); + return bResult; + } pDevice->byChannelSwitchCount = byCount; pDevice->byNewChannel = byNewChannel; pDevice->bChannelSwitch = TRUE; |