diff options
| author | Malcolm Priestley | 2014-07-19 13:30:18 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2014-07-21 21:11:58 +0200 |
| commit | ff5fee22294da7d60ebb8c7b0b3f24aeb1307a7b (patch) | |
| tree | 34ac0b77d9a2de4d4d143122a67fa3a1766f4476 /drivers/staging/vt6656/card.c | |
| parent | staging: vt6656: struct vnt_private remove uCwMin/uCwMax (diff) | |
| download | kernel-qcow2-linux-ff5fee22294da7d60ebb8c7b0b3f24aeb1307a7b.tar.gz kernel-qcow2-linux-ff5fee22294da7d60ebb8c7b0b3f24aeb1307a7b.tar.xz kernel-qcow2-linux-ff5fee22294da7d60ebb8c7b0b3f24aeb1307a7b.zip | |
staging: vt6656: struct vnt_private remove camel case IFS names
Camel case changes
uSIFS -> sifs
uDIFS -> difs
uEIFS -> eifs
uSlot -> slot
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 | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/drivers/staging/vt6656/card.c b/drivers/staging/vt6656/card.c index f3fd7d6bc9e9..5ce26fabdb7a 100644 --- a/drivers/staging/vt6656/card.c +++ b/drivers/staging/vt6656/card.c @@ -366,27 +366,27 @@ void vnt_update_ifs(struct vnt_private *priv) u8 data[4]; if (priv->byPacketType == PK_TYPE_11A) { - priv->uSlot = C_SLOT_SHORT; - priv->uSIFS = C_SIFS_A; - priv->uDIFS = C_SIFS_A + 2 * C_SLOT_SHORT; + priv->slot = C_SLOT_SHORT; + priv->sifs = C_SIFS_A; + priv->difs = C_SIFS_A + 2 * C_SLOT_SHORT; max_min = 4; } else if (priv->byPacketType == PK_TYPE_11B) { - priv->uSlot = C_SLOT_LONG; - priv->uSIFS = C_SIFS_BG; - priv->uDIFS = C_SIFS_BG + 2 * C_SLOT_LONG; + priv->slot = C_SLOT_LONG; + priv->sifs = C_SIFS_BG; + priv->difs = C_SIFS_BG + 2 * C_SLOT_LONG; max_min = 5; } else {/* PK_TYPE_11GA & PK_TYPE_11GB */ bool ofdm_rate = false; unsigned int ii = 0; - priv->uSIFS = C_SIFS_BG; + priv->sifs = C_SIFS_BG; if (priv->bShortSlotTime) - priv->uSlot = C_SLOT_SHORT; + priv->slot = C_SLOT_SHORT; else - priv->uSlot = C_SLOT_LONG; + priv->slot = C_SLOT_LONG; - priv->uDIFS = C_SIFS_BG + 2 * priv->uSlot; + priv->difs = C_SIFS_BG + 2 * priv->slot; for (ii = RATE_54M; ii >= RATE_6M; ii--) { if (priv->wBasicRate & ((u32)(0x1 << ii))) { @@ -401,13 +401,13 @@ void vnt_update_ifs(struct vnt_private *priv) max_min = 5; } - priv->uEIFS = C_EIFS; + priv->eifs = C_EIFS; switch (priv->rf_type) { case RF_VT3226D0: if (priv->byBBType != BB_TYPE_11B) { - priv->uSIFS -= 1; - priv->uDIFS -= 1; + priv->sifs -= 1; + priv->difs -= 1; break; } case RF_AIROHA7230: @@ -418,25 +418,25 @@ void vnt_update_ifs(struct vnt_private *priv) case RF_RFMD2959: case RF_VT3226: case RF_VT3342A0: - priv->uSIFS -= 3; - priv->uDIFS -= 3; + priv->sifs -= 3; + priv->difs -= 3; break; case RF_MAXIM2829: if (priv->byBBType == BB_TYPE_11A) { - priv->uSIFS -= 5; - priv->uDIFS -= 5; + priv->sifs -= 5; + priv->difs -= 5; } else { - priv->uSIFS -= 2; - priv->uDIFS -= 2; + priv->sifs -= 2; + priv->difs -= 2; } break; } - data[0] = (u8)priv->uSIFS; - data[1] = (u8)priv->uDIFS; - data[2] = (u8)priv->uEIFS; - data[3] = (u8)priv->uSlot; + data[0] = (u8)priv->sifs; + data[1] = (u8)priv->difs; + data[2] = (u8)priv->eifs; + data[3] = (u8)priv->slot; vnt_control_out(priv, MESSAGE_TYPE_WRITE, MAC_REG_SIFS, MESSAGE_REQUEST_MACREG, 4, &data[0]); |