Commit 210098a5 authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman

staging: vt6656: Clean up and remove camel case INTnsProcessData.

Camel Case changes
pDevice -> priv
pINTData -> int_data
pStats -> stats
Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 864ace8c
...@@ -75,112 +75,111 @@ void INTvWorkItem(struct vnt_private *pDevice) ...@@ -75,112 +75,111 @@ void INTvWorkItem(struct vnt_private *pDevice)
spin_unlock_irq(&pDevice->lock); spin_unlock_irq(&pDevice->lock);
} }
void INTnsProcessData(struct vnt_private *pDevice) void INTnsProcessData(struct vnt_private *priv)
{ {
struct vnt_interrupt_data *pINTData; struct vnt_interrupt_data *int_data;
struct vnt_manager *pMgmt = &pDevice->vnt_mgmt; struct vnt_manager *mgmt = &priv->vnt_mgmt;
struct net_device_stats *pStats = &pDevice->stats; struct net_device_stats *stats = &priv->stats;
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"---->s_nsInterruptProcessData\n"); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"---->s_nsInterruptProcessData\n");
pINTData = (struct vnt_interrupt_data *)pDevice->intBuf.pDataBuf; int_data = (struct vnt_interrupt_data *)priv->intBuf.pDataBuf;
if (pINTData->tsr0 & TSR_VALID) {
if (pINTData->tsr0 & (TSR_TMO | TSR_RETRYTMO)) if (int_data->tsr0 & TSR_VALID) {
pDevice->wstats.discard.retries++; if (int_data->tsr0 & (TSR_TMO | TSR_RETRYTMO))
priv->wstats.discard.retries++;
else else
pStats->tx_packets++; stats->tx_packets++;
BSSvUpdateNodeTxCounter(pDevice, BSSvUpdateNodeTxCounter(priv,
pINTData->tsr0, int_data->tsr0,
pINTData->pkt0); int_data->pkt0);
} }
if (pINTData->tsr1 & TSR_VALID) {
if (pINTData->tsr1 & (TSR_TMO | TSR_RETRYTMO)) if (int_data->tsr1 & TSR_VALID) {
pDevice->wstats.discard.retries++; if (int_data->tsr1 & (TSR_TMO | TSR_RETRYTMO))
priv->wstats.discard.retries++;
else else
pStats->tx_packets++; stats->tx_packets++;
BSSvUpdateNodeTxCounter(pDevice, BSSvUpdateNodeTxCounter(priv,
pINTData->tsr1, int_data->tsr1,
pINTData->pkt1); int_data->pkt1);
} }
if (pINTData->tsr2 & TSR_VALID) {
if (pINTData->tsr2 & (TSR_TMO | TSR_RETRYTMO)) if (int_data->tsr2 & TSR_VALID) {
pDevice->wstats.discard.retries++; if (int_data->tsr2 & (TSR_TMO | TSR_RETRYTMO))
priv->wstats.discard.retries++;
else else
pStats->tx_packets++; stats->tx_packets++;
BSSvUpdateNodeTxCounter(pDevice, BSSvUpdateNodeTxCounter(priv,
pINTData->tsr2, int_data->tsr2,
pINTData->pkt2); int_data->pkt2);
/*DBG_PRN_GRP01(("TSR2 %02x\n", pINTData->byTSR2));*/
} }
if (pINTData->tsr3 & TSR_VALID) {
if (pINTData->tsr3 & (TSR_TMO | TSR_RETRYTMO)) if (int_data->tsr3 & TSR_VALID) {
pDevice->wstats.discard.retries++; if (int_data->tsr3 & (TSR_TMO | TSR_RETRYTMO))
priv->wstats.discard.retries++;
else else
pStats->tx_packets++; stats->tx_packets++;
BSSvUpdateNodeTxCounter(pDevice, BSSvUpdateNodeTxCounter(priv,
pINTData->tsr3, int_data->tsr3,
pINTData->pkt3); int_data->pkt3);
/*DBG_PRN_GRP01(("TSR3 %02x\n", pINTData->byTSR3));*/
} }
if (pINTData->isr0 != 0) {
if (pINTData->isr0 & ISR_BNTX) { if (int_data->isr0 != 0) {
if (pDevice->op_mode == NL80211_IFTYPE_AP) { if (int_data->isr0 & ISR_BNTX) {
if (pMgmt->byDTIMCount > 0) { if (priv->op_mode == NL80211_IFTYPE_AP) {
pMgmt->byDTIMCount--; if (mgmt->byDTIMCount > 0) {
pMgmt->sNodeDBTable[0].bRxPSPoll = mgmt->byDTIMCount--;
mgmt->sNodeDBTable[0].bRxPSPoll =
false; false;
} else if (pMgmt->byDTIMCount == 0) { } else if (mgmt->byDTIMCount == 0) {
/* check if multicast tx buffering */ /* check if multicast tx buffering */
pMgmt->byDTIMCount = mgmt->byDTIMCount =
pMgmt->byDTIMPeriod-1; mgmt->byDTIMPeriod-1;
pMgmt->sNodeDBTable[0].bRxPSPoll = true; mgmt->sNodeDBTable[0].bRxPSPoll = true;
if (pMgmt->sNodeDBTable[0].bPSEnable) if (mgmt->sNodeDBTable[0].bPSEnable)
bScheduleCommand((void *) pDevice, bScheduleCommand((void *) priv,
WLAN_CMD_RX_PSPOLL, WLAN_CMD_RX_PSPOLL,
NULL); NULL);
} }
bScheduleCommand((void *) pDevice, bScheduleCommand((void *) priv,
WLAN_CMD_BECON_SEND, WLAN_CMD_BECON_SEND,
NULL); NULL);
} }
pDevice->bBeaconSent = true; priv->bBeaconSent = true;
} else { } else {
pDevice->bBeaconSent = false; priv->bBeaconSent = false;
} }
if (pINTData->isr0 & ISR_TBTT) {
if (pDevice->bEnablePSMode) if (int_data->isr0 & ISR_TBTT) {
bScheduleCommand((void *) pDevice, if (priv->bEnablePSMode)
bScheduleCommand((void *) priv,
WLAN_CMD_TBTT_WAKEUP, WLAN_CMD_TBTT_WAKEUP,
NULL); NULL);
if (pDevice->bChannelSwitch) { if (priv->bChannelSwitch) {
pDevice->byChannelSwitchCount--; priv->byChannelSwitchCount--;
if (pDevice->byChannelSwitchCount == 0) if (priv->byChannelSwitchCount == 0)
bScheduleCommand((void *) pDevice, bScheduleCommand((void *) priv,
WLAN_CMD_11H_CHSW, WLAN_CMD_11H_CHSW,
NULL); NULL);
} }
} }
pDevice->qwCurrTSF = le64_to_cpu(pINTData->tsf); priv->qwCurrTSF = le64_to_cpu(int_data->tsf);
/*DBG_PRN_GRP01(("ISR0 = %02x ,
LoTsf = %08x,
HiTsf = %08x\n",
pINTData->byISR0,
pINTData->dwLoTSF,
pINTData->dwHiTSF)); */
} }
if (pINTData->isr1 != 0)
if (pINTData->isr1 & ISR_GPIO3) if (int_data->isr1 != 0)
bScheduleCommand((void *) pDevice, if (int_data->isr1 & ISR_GPIO3)
bScheduleCommand((void *) priv,
WLAN_CMD_RADIO, WLAN_CMD_RADIO,
NULL); NULL);
pDevice->intBuf.uDataLen = 0; priv->intBuf.uDataLen = 0;
pDevice->intBuf.bInUse = false; priv->intBuf.bInUse = false;
pStats->tx_errors = pDevice->wstats.discard.retries; stats->tx_errors = priv->wstats.discard.retries;
pStats->tx_dropped = pDevice->wstats.discard.retries; stats->tx_dropped = priv->wstats.discard.retries;
} }
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