@@ -98,9 +98,9 @@ static void s_v_fill_rts_head(struct vnt_private *p_device,
static void s_vgenerate_tx_parameter(struct vnt_private *p_device,
unsigned char by_pkt_type,
struct vnt_tx_fifo_head *,
- void *pvRrvTime,
+ void *pv_rrv_time,
void *pv_rts,
- void *pvCTS,
+ void *pv_cts,
unsigned int cbFrameSize,
bool bNeedACK,
unsigned int uDMAIdx,
@@ -820,7 +820,7 @@ static void s_v_fill_rts_head(struct vnt_private *p_device,
static void s_vFillCTSHead(struct vnt_private *p_device,
unsigned int uDMAIdx,
unsigned char by_pkt_type,
- void *pvCTS,
+ void *pv_cts,
unsigned int cb_frame_length,
bool b_need_ack,
bool b_dis_crc,
@@ -829,7 +829,7 @@ static void s_vFillCTSHead(struct vnt_private *p_device,
{
unsigned int uCTSFrameLen = 14;
- if (!pvCTS)
+ if (!pv_cts)
return;
if (b_dis_crc) {
@@ -844,7 +844,7 @@ static void s_vFillCTSHead(struct vnt_private *p_device,
uDMAIdx != TYPE_ATIMDMA &&
uDMAIdx != TYPE_BEACONDMA) {
/* Auto Fall back */
- struct vnt_cts_fb *buf = pvCTS;
+ struct vnt_cts_fb *buf = pv_cts;
/* Get SignalField, ServiceField & Length */
vnt_get_phy_field(p_device, uCTSFrameLen,
p_device->byTopCCKBasicRate,
@@ -886,7 +886,7 @@ static void s_vFillCTSHead(struct vnt_private *p_device,
* uDMAIdx != TYPE_ATIMDMA &&
* uDMAIdx != TYPE_BEACONDMA)
*/
- struct vnt_cts *buf = pvCTS;
+ struct vnt_cts *buf = pv_cts;
/* Get SignalField, ServiceField & Length */
vnt_get_phy_field(p_device, uCTSFrameLen,
p_device->byTopCCKBasicRate,
@@ -923,7 +923,7 @@ static void s_vFillCTSHead(struct vnt_private *p_device,
* p_device - Pointer to adapter
* pTxDataHead - Transmit Data Buffer
* pTxBufHead - pTxBufHead
- * pvRrvTime - pvRrvTime
+ * pv_rrv_time - pv_rrv_time
* pv_rts - RTS Buffer
* pCTS - CTS Buffer
* cbFrameSize - Transmit Data Length (Hdr+Payload+FCS)
@@ -940,9 +940,9 @@ static void s_vFillCTSHead(struct vnt_private *p_device,
static void s_vgenerate_tx_parameter(struct vnt_private *p_device,
unsigned char by_pkt_type,
struct vnt_tx_fifo_head *tx_buffer_head,
- void *pvRrvTime,
+ void *pv_rrv_time,
void *pv_rts,
- void *pvCTS,
+ void *pv_cts,
unsigned int cbFrameSize,
bool bNeedACK,
unsigned int uDMAIdx,
@@ -963,13 +963,13 @@ static void s_vgenerate_tx_parameter(struct vnt_private *p_device,
else if (fifo_ctl & FIFOCTL_AUTO_FB_1)
by_fb_option = AUTO_FB_1;
- if (!pvRrvTime)
+ if (!pv_rrv_time)
return;
if (by_pkt_type == PK_TYPE_11GB || by_pkt_type == PK_TYPE_11GA) {
if (pv_rts) { /* RTS_need */
/* Fill RsvTime */
- struct vnt_rrv_time_rts *buf = pvRrvTime;
+ struct vnt_rrv_time_rts *buf = pv_rrv_time;
buf->rts_rrv_time_aa = get_rtscts_time(p_device, 2, by_pkt_type,
cbFrameSize, wCurrentRate);
@@ -986,7 +986,7 @@ static void s_vgenerate_tx_parameter(struct vnt_private *p_device,
s_v_fill_rts_head(p_device, by_pkt_type, pv_rts, cbFrameSize, bNeedACK,
b_dis_crc, psEthHeader, wCurrentRate, by_fb_option);
} else {/* RTS_needless, PCF mode */
- struct vnt_rrv_time_cts *buf = pvRrvTime;
+ struct vnt_rrv_time_cts *buf = pv_rrv_time;
buf->rrv_time_a = vnt_rxtx_rsvtime_le16(p_device, by_pkt_type, cbFrameSize,
wCurrentRate, bNeedACK);
@@ -997,12 +997,12 @@ static void s_vgenerate_tx_parameter(struct vnt_private *p_device,
cbFrameSize, wCurrentRate);
/* Fill CTS */
- s_vFillCTSHead(p_device, uDMAIdx, by_pkt_type, pvCTS, cbFrameSize, bNeedACK,
- b_dis_crc, wCurrentRate, by_fb_option);
+ s_vFillCTSHead(p_device, uDMAIdx, by_pkt_type, pv_cts, cbFrameSize,
+ bNeedACK, b_dis_crc, wCurrentRate, by_fb_option);
}
} else if (by_pkt_type == PK_TYPE_11A) {
if (pv_rts) {/* RTS_need, non PCF mode */
- struct vnt_rrv_time_ab *buf = pvRrvTime;
+ struct vnt_rrv_time_ab *buf = pv_rrv_time;
buf->rts_rrv_time = get_rtscts_time(p_device, 2, by_pkt_type, cbFrameSize,
wCurrentRate);
@@ -1013,14 +1013,14 @@ static void s_vgenerate_tx_parameter(struct vnt_private *p_device,
s_v_fill_rts_head(p_device, by_pkt_type, pv_rts, cbFrameSize, bNeedACK,
b_dis_crc, psEthHeader, wCurrentRate, by_fb_option);
} else if (!pv_rts) {/* RTS_needless, non PCF mode */
- struct vnt_rrv_time_ab *buf = pvRrvTime;
+ struct vnt_rrv_time_ab *buf = pv_rrv_time;
buf->rrv_time = vnt_rxtx_rsvtime_le16(p_device, PK_TYPE_11A, cbFrameSize,
wCurrentRate, bNeedACK);
}
} else if (by_pkt_type == PK_TYPE_11B) {
if (pv_rts) {/* RTS_need, non PCF mode */
- struct vnt_rrv_time_ab *buf = pvRrvTime;
+ struct vnt_rrv_time_ab *buf = pv_rrv_time;
buf->rts_rrv_time = get_rtscts_time(p_device, 0, by_pkt_type, cbFrameSize,
wCurrentRate);
@@ -1031,7 +1031,7 @@ static void s_vgenerate_tx_parameter(struct vnt_private *p_device,
s_v_fill_rts_head(p_device, by_pkt_type, pv_rts, cbFrameSize, bNeedACK,
b_dis_crc, psEthHeader, wCurrentRate, by_fb_option);
} else { /* RTS_needless, non PCF mode */
- struct vnt_rrv_time_ab *buf = pvRrvTime;
+ struct vnt_rrv_time_ab *buf = pv_rrv_time;
buf->rrv_time = vnt_rxtx_rsvtime_le16(p_device, PK_TYPE_11B, cbFrameSize,
wCurrentRate, bNeedACK);
@@ -1065,10 +1065,10 @@ static unsigned int s_cbFillTxBufHead(struct vnt_private *p_device,
bool bRTS = (bool)(fifo_ctl & FIFOCTL_RTS);
struct vnt_tx_desc *ptdCurr;
unsigned int cbHeaderLength = 0;
- void *pvRrvTime = NULL;
+ void *pv_rrv_time = NULL;
struct vnt_mic_hdr *pMICHDR = NULL;
void *pv_rts = NULL;
- void *pvCTS = NULL;
+ void *pv_cts = NULL;
void *pvTxDataHd = NULL;
unsigned short wTxBufSize; /* FFinfo size */
unsigned char by_fb_option = AUTO_FB_NONE;
@@ -1107,12 +1107,12 @@ static unsigned int s_cbFillTxBufHead(struct vnt_private *p_device,
if (by_fb_option == AUTO_FB_NONE) {
if (bRTS) {/* RTS_need */
- pvRrvTime = (void *)(pbyTxBufferAddr + wTxBufSize);
+ pv_rrv_time = (void *)(pbyTxBufferAddr + wTxBufSize);
pMICHDR = (struct vnt_mic_hdr *)(pbyTxBufferAddr + wTxBufSize +
sizeof(struct vnt_rrv_time_rts));
pv_rts = (void *)(pbyTxBufferAddr + wTxBufSize +
sizeof(struct vnt_rrv_time_rts) + cbMICHDR);
- pvCTS = NULL;
+ pv_cts = NULL;
pvTxDataHd = (void *)(pbyTxBufferAddr + wTxBufSize +
sizeof(struct vnt_rrv_time_rts) +
cbMICHDR + sizeof(struct vnt_rts_g));
@@ -1120,11 +1120,11 @@ static unsigned int s_cbFillTxBufHead(struct vnt_private *p_device,
cbMICHDR + sizeof(struct vnt_rts_g) +
sizeof(struct vnt_tx_datahead_g);
} else { /* RTS_needless */
- pvRrvTime = (void *)(pbyTxBufferAddr + wTxBufSize);
+ pv_rrv_time = (void *)(pbyTxBufferAddr + wTxBufSize);
pMICHDR = (struct vnt_mic_hdr *)(pbyTxBufferAddr + wTxBufSize +
sizeof(struct vnt_rrv_time_cts));
pv_rts = NULL;
- pvCTS = (void *)(pbyTxBufferAddr + wTxBufSize +
+ pv_cts = (void *)(pbyTxBufferAddr + wTxBufSize +
sizeof(struct vnt_rrv_time_cts) + cbMICHDR);
pvTxDataHd = (void *)(pbyTxBufferAddr + wTxBufSize +
sizeof(struct vnt_rrv_time_cts) + cbMICHDR +
@@ -1136,12 +1136,12 @@ static unsigned int s_cbFillTxBufHead(struct vnt_private *p_device,
} else {
/* Auto Fall Back */
if (bRTS) {/* RTS_need */
- pvRrvTime = (void *)(pbyTxBufferAddr + wTxBufSize);
+ pv_rrv_time = (void *)(pbyTxBufferAddr + wTxBufSize);
pMICHDR = (struct vnt_mic_hdr *)(pbyTxBufferAddr + wTxBufSize +
sizeof(struct vnt_rrv_time_rts));
pv_rts = (void *)(pbyTxBufferAddr + wTxBufSize +
sizeof(struct vnt_rrv_time_rts) + cbMICHDR);
- pvCTS = NULL;
+ pv_cts = NULL;
pvTxDataHd = (void *)(pbyTxBufferAddr + wTxBufSize +
sizeof(struct vnt_rrv_time_rts) +
cbMICHDR + sizeof(struct vnt_rts_g_fb));
@@ -1149,11 +1149,11 @@ static unsigned int s_cbFillTxBufHead(struct vnt_private *p_device,
cbMICHDR + sizeof(struct vnt_rts_g_fb) +
sizeof(struct vnt_tx_datahead_g_fb);
} else { /* RTS_needless */
- pvRrvTime = (void *)(pbyTxBufferAddr + wTxBufSize);
+ pv_rrv_time = (void *)(pbyTxBufferAddr + wTxBufSize);
pMICHDR = (struct vnt_mic_hdr *)(pbyTxBufferAddr + wTxBufSize +
sizeof(struct vnt_rrv_time_cts));
pv_rts = NULL;
- pvCTS = (void *)(pbyTxBufferAddr + wTxBufSize +
+ pv_cts = (void *)(pbyTxBufferAddr + wTxBufSize +
sizeof(struct vnt_rrv_time_cts) + cbMICHDR);
pvTxDataHd = (void *)(pbyTxBufferAddr + wTxBufSize +
sizeof(struct vnt_rrv_time_cts) +
@@ -1167,12 +1167,12 @@ static unsigned int s_cbFillTxBufHead(struct vnt_private *p_device,
if (by_fb_option == AUTO_FB_NONE) {
if (bRTS) {
- pvRrvTime = (void *)(pbyTxBufferAddr + wTxBufSize);
+ pv_rrv_time = (void *)(pbyTxBufferAddr + wTxBufSize);
pMICHDR = (struct vnt_mic_hdr *)(pbyTxBufferAddr + wTxBufSize +
sizeof(struct vnt_rrv_time_ab));
pv_rts = (void *)(pbyTxBufferAddr + wTxBufSize +
sizeof(struct vnt_rrv_time_ab) + cbMICHDR);
- pvCTS = NULL;
+ pv_cts = NULL;
pvTxDataHd = (void *)(pbyTxBufferAddr + wTxBufSize +
sizeof(struct vnt_rrv_time_ab) + cbMICHDR +
sizeof(struct vnt_rts_ab));
@@ -1180,11 +1180,11 @@ static unsigned int s_cbFillTxBufHead(struct vnt_private *p_device,
cbMICHDR + sizeof(struct vnt_rts_ab) +
sizeof(struct vnt_tx_datahead_ab);
} else { /* RTS_needless, need MICHDR */
- pvRrvTime = (void *)(pbyTxBufferAddr + wTxBufSize);
+ pv_rrv_time = (void *)(pbyTxBufferAddr + wTxBufSize);
pMICHDR = (struct vnt_mic_hdr *)(pbyTxBufferAddr + wTxBufSize +
sizeof(struct vnt_rrv_time_ab));
pv_rts = NULL;
- pvCTS = NULL;
+ pv_cts = NULL;
pvTxDataHd = (void *)(pbyTxBufferAddr + wTxBufSize +
sizeof(struct vnt_rrv_time_ab) + cbMICHDR);
cbHeaderLength = wTxBufSize + sizeof(struct vnt_rrv_time_ab) +
@@ -1193,12 +1193,12 @@ static unsigned int s_cbFillTxBufHead(struct vnt_private *p_device,
} else {
/* Auto Fall Back */
if (bRTS) { /* RTS_need */
- pvRrvTime = (void *)(pbyTxBufferAddr + wTxBufSize);
+ pv_rrv_time = (void *)(pbyTxBufferAddr + wTxBufSize);
pMICHDR = (struct vnt_mic_hdr *)(pbyTxBufferAddr + wTxBufSize +
sizeof(struct vnt_rrv_time_ab));
pv_rts = (void *)(pbyTxBufferAddr + wTxBufSize +
sizeof(struct vnt_rrv_time_ab) + cbMICHDR);
- pvCTS = NULL;
+ pv_cts = NULL;
pvTxDataHd = (void *)(pbyTxBufferAddr + wTxBufSize +
sizeof(struct vnt_rrv_time_ab) + cbMICHDR +
sizeof(struct vnt_rts_a_fb));
@@ -1206,11 +1206,11 @@ static unsigned int s_cbFillTxBufHead(struct vnt_private *p_device,
cbMICHDR + sizeof(struct vnt_rts_a_fb) +
sizeof(struct vnt_tx_datahead_a_fb);
} else { /* RTS_needless */
- pvRrvTime = (void *)(pbyTxBufferAddr + wTxBufSize);
+ pv_rrv_time = (void *)(pbyTxBufferAddr + wTxBufSize);
pMICHDR = (struct vnt_mic_hdr *)(pbyTxBufferAddr + wTxBufSize +
sizeof(struct vnt_rrv_time_ab));
pv_rts = NULL;
- pvCTS = NULL;
+ pv_cts = NULL;
pvTxDataHd = (void *)(pbyTxBufferAddr + wTxBufSize +
sizeof(struct vnt_rrv_time_ab) + cbMICHDR);
cbHeaderLength = wTxBufSize + sizeof(struct vnt_rrv_time_ab) +
@@ -1224,7 +1224,7 @@ static unsigned int s_cbFillTxBufHead(struct vnt_private *p_device,
memset((void *)(pbyTxBufferAddr + wTxBufSize), 0, (cbHeaderLength - wTxBufSize));
/* Fill FIFO,RrvTime,RTS,and CTS */
- s_vgenerate_tx_parameter(p_device, by_pkt_type, tx_buffer_head, pvRrvTime, pv_rts, pvCTS,
+ s_vgenerate_tx_parameter(p_device, by_pkt_type, tx_buffer_head, pv_rrv_time, pv_rts, pv_cts,
cbFrameSize, bNeedACK, uDMAIdx, hdr, p_device->wCurrentRate);
/* Fill DataHead */
uDuration = s_uFillDataHead(p_device, by_pkt_type, pvTxDataHd, cbFrameSize, uDMAIdx,