mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-11-01 17:08:10 +00:00
Code Issues Releases Wiki Activity

staging: vt6656: struct vnt_private remove camel case IFS names

Browse source 
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>
This commit is contained in:
Malcolm Priestley 2014-07-19 12:30:18 +01:00 committed by Greg Kroah-Hartman
parent 995c91e0c2
commit ff5fee2229
3 changed files with 34 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
drivers/staging/vt6656/card.c
View file

@ -366,27 +366,27 @@ void vnt_update_ifs(struct vnt_private *priv)
u8 data[4]; u8 data[4];
if (priv->byPacketType == PK_TYPE_11A) { if (priv->byPacketType == PK_TYPE_11A) {
priv->uSlot = C_SLOT_SHORT; priv->slot = C_SLOT_SHORT;
priv->uSIFS = C_SIFS_A; priv->sifs = C_SIFS_A;
priv->uDIFS = C_SIFS_A + 2 * C_SLOT_SHORT; priv->difs = C_SIFS_A + 2 * C_SLOT_SHORT;
max_min = 4; max_min = 4;
} else if (priv->byPacketType == PK_TYPE_11B) { } else if (priv->byPacketType == PK_TYPE_11B) {
priv->uSlot = C_SLOT_LONG; priv->slot = C_SLOT_LONG;
priv->uSIFS = C_SIFS_BG; priv->sifs = C_SIFS_BG;
priv->uDIFS = C_SIFS_BG + 2 * C_SLOT_LONG; priv->difs = C_SIFS_BG + 2 * C_SLOT_LONG;
max_min = 5; max_min = 5;
} else {/* PK_TYPE_11GA & PK_TYPE_11GB */ } else {/* PK_TYPE_11GA & PK_TYPE_11GB */
bool ofdm_rate = false; bool ofdm_rate = false;
unsigned int ii = 0; unsigned int ii = 0;
priv->uSIFS = C_SIFS_BG; priv->sifs = C_SIFS_BG;
if (priv->bShortSlotTime) if (priv->bShortSlotTime)
priv->uSlot = C_SLOT_SHORT; priv->slot = C_SLOT_SHORT;
else 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--) { for (ii = RATE_54M; ii >= RATE_6M; ii--) {
if (priv->wBasicRate & ((u32)(0x1 << ii))) { if (priv->wBasicRate & ((u32)(0x1 << ii))) {
@ -401,13 +401,13 @@ void vnt_update_ifs(struct vnt_private *priv)
max_min = 5; max_min = 5;
} }
priv->uEIFS = C_EIFS; priv->eifs = C_EIFS;
switch (priv->rf_type) { switch (priv->rf_type) {
case RF_VT3226D0: case RF_VT3226D0:
if (priv->byBBType != BB_TYPE_11B) { if (priv->byBBType != BB_TYPE_11B) {
priv->uSIFS -= 1; priv->sifs -= 1;
priv->uDIFS -= 1; priv->difs -= 1;
break; break;
} }
case RF_AIROHA7230: case RF_AIROHA7230:
@ -418,25 +418,25 @@ void vnt_update_ifs(struct vnt_private *priv)
case RF_RFMD2959: case RF_RFMD2959:
case RF_VT3226: case RF_VT3226:
case RF_VT3342A0: case RF_VT3342A0:
priv->uSIFS -= 3; priv->sifs -= 3;
priv->uDIFS -= 3; priv->difs -= 3;
break; break;
case RF_MAXIM2829: case RF_MAXIM2829:
if (priv->byBBType == BB_TYPE_11A) { if (priv->byBBType == BB_TYPE_11A) {
priv->uSIFS -= 5; priv->sifs -= 5;
priv->uDIFS -= 5; priv->difs -= 5;
} else { } else {
priv->uSIFS -= 2; priv->sifs -= 2;
priv->uDIFS -= 2; priv->difs -= 2;
} }
break; break;
} }
data[0] = (u8)priv->uSIFS; data[0] = (u8)priv->sifs;
data[1] = (u8)priv->uDIFS; data[1] = (u8)priv->difs;
data[2] = (u8)priv->uEIFS; data[2] = (u8)priv->eifs;
data[3] = (u8)priv->uSlot; data[3] = (u8)priv->slot;
vnt_control_out(priv, MESSAGE_TYPE_WRITE, MAC_REG_SIFS, vnt_control_out(priv, MESSAGE_TYPE_WRITE, MAC_REG_SIFS,
MESSAGE_REQUEST_MACREG, 4, &data[0]); MESSAGE_REQUEST_MACREG, 4, &data[0]);

8
drivers/staging/vt6656/device.h
View file

@ -324,10 +324,10 @@ struct vnt_private {
u8 radio_ctl; u8 radio_ctl;
/* IFS & Cw */ /* IFS & Cw */
u32 uSIFS; /* Current SIFS */ u32 sifs; /* Current SIFS */
u32 uDIFS; /* Current DIFS */ u32 difs; /* Current DIFS */
u32 uEIFS; /* Current EIFS */ u32 eifs; /* Current EIFS */
u32 uSlot; /* Current SlotTime */ u32 slot; /* Current SlotTime */
/* Rate */ /* Rate */
u8 byBBType; /* 0: 11A, 1:11B, 2:11G */ u8 byBBType; /* 0: 11A, 1:11B, 2:11G */

14
drivers/staging/vt6656/rxtx.c
View file

@ -125,7 +125,7 @@ static u32 vnt_get_rsvtime(struct vnt_private *priv, u8 pkt_type,
14, (u16)priv->byTopOFDMBasicRate); 14, (u16)priv->byTopOFDMBasicRate);
if (need_ack) if (need_ack)
return data_time + priv->uSIFS + ack_time; return data_time + priv->sifs + ack_time;
return data_time; return data_time;
} }
@ -170,12 +170,12 @@ static __le16 vnt_get_rtscts_rsvtime_le(struct vnt_private *priv,
ack_time = vnt_get_frame_time(priv->byPreambleType, pkt_type, ack_time = vnt_get_frame_time(priv->byPreambleType, pkt_type,
14, priv->byTopOFDMBasicRate); 14, priv->byTopOFDMBasicRate);
rrv_time = cts_time + ack_time + data_time + 2 * priv->uSIFS; rrv_time = cts_time + ack_time + data_time + 2 * priv->sifs;
return cpu_to_le16((u16)rrv_time); return cpu_to_le16((u16)rrv_time);
} }
rrv_time = rts_time + cts_time + ack_time + data_time + 3 * priv->uSIFS; rrv_time = rts_time + cts_time + ack_time + data_time + 3 * priv->sifs;
return cpu_to_le16((u16)rrv_time); return cpu_to_le16((u16)rrv_time);
} }
@ -193,7 +193,7 @@ static __le16 vnt_get_duration_le(struct vnt_private *piv,
ack_time = vnt_get_frame_time(piv->byPreambleType, ack_time = vnt_get_frame_time(piv->byPreambleType,
pkt_type, 14, piv->byTopOFDMBasicRate); pkt_type, 14, piv->byTopOFDMBasicRate);
return cpu_to_le16((u16)(piv->uSIFS + ack_time)); return cpu_to_le16((u16)(piv->sifs + ack_time));
} }
return 0; return 0;
@ -211,7 +211,7 @@ static __le16 vnt_get_rtscts_duration_le(struct vnt_private *priv, u8 dur_type,
case RTSDUR_BA_F1: case RTSDUR_BA_F1:
cts_time = vnt_get_frame_time(priv->byPreambleType, cts_time = vnt_get_frame_time(priv->byPreambleType,
pkt_type, 14, priv->byTopCCKBasicRate); pkt_type, 14, priv->byTopCCKBasicRate);
dur_time = cts_time + 2 * priv->uSIFS + dur_time = cts_time + 2 * priv->sifs +
vnt_get_rsvtime(priv, pkt_type, vnt_get_rsvtime(priv, pkt_type,
frame_length, rate, need_ack); frame_length, rate, need_ack);
break; break;
@ -221,7 +221,7 @@ static __le16 vnt_get_rtscts_duration_le(struct vnt_private *priv, u8 dur_type,
case RTSDUR_AA_F1: case RTSDUR_AA_F1:
cts_time = vnt_get_frame_time(priv->byPreambleType, cts_time = vnt_get_frame_time(priv->byPreambleType,
pkt_type, 14, priv->byTopOFDMBasicRate); pkt_type, 14, priv->byTopOFDMBasicRate);
dur_time = cts_time + 2 * priv->uSIFS + dur_time = cts_time + 2 * priv->sifs +
vnt_get_rsvtime(priv, pkt_type, vnt_get_rsvtime(priv, pkt_type,
frame_length, rate, need_ack); frame_length, rate, need_ack);
break; break;
@ -229,7 +229,7 @@ static __le16 vnt_get_rtscts_duration_le(struct vnt_private *priv, u8 dur_type,
case CTSDUR_BA: case CTSDUR_BA:
case CTSDUR_BA_F0: case CTSDUR_BA_F0:
case CTSDUR_BA_F1: case CTSDUR_BA_F1:
dur_time = priv->uSIFS + vnt_get_rsvtime(priv, dur_time = priv->sifs + vnt_get_rsvtime(priv,
pkt_type, frame_length, rate, need_ack); pkt_type, frame_length, rate, need_ack);
break; break;