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

staging: vt6656: s_vFillCTSHead remove camel case

Camel case changes
byPktType -> pkt_type
cbFrameLength -> frame_len
bNeedAck -> need_ack
pDevice -> priv
uCTSFrameLen -> cts_frame_len
Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9ec7f2d8
...@@ -520,60 +520,60 @@ static u16 vnt_rxtx_rts_a_fb_head(struct vnt_usb_send_context *tx_context, ...@@ -520,60 +520,60 @@ static u16 vnt_rxtx_rts_a_fb_head(struct vnt_usb_send_context *tx_context,
} }
static u16 s_vFillCTSHead(struct vnt_usb_send_context *tx_context, static u16 s_vFillCTSHead(struct vnt_usb_send_context *tx_context,
u8 byPktType, union vnt_tx_data_head *head, u32 cbFrameLength, u8 pkt_type, union vnt_tx_data_head *head, u32 frame_len,
int bNeedAck, u16 wCurrentRate) int need_ack, u16 current_rate)
{ {
struct vnt_private *pDevice = tx_context->priv; struct vnt_private *priv = tx_context->priv;
u32 uCTSFrameLen = 14; u32 cts_frame_len = 14;
if (!head) if (!head)
return 0; return 0;
if (tx_context->fb_option) { if (tx_context->fb_option) {
/* Auto Fall back */ /* Auto Fall back */
struct vnt_cts_fb *pBuf = &head->cts_g_fb; struct vnt_cts_fb *buf = &head->cts_g_fb;
/* Get SignalField,ServiceField,Length */ /* Get SignalField,ServiceField,Length */
vnt_get_phy_field(pDevice, uCTSFrameLen, vnt_get_phy_field(priv, cts_frame_len,
pDevice->byTopCCKBasicRate, PK_TYPE_11B, &pBuf->b); priv->byTopCCKBasicRate, PK_TYPE_11B, &buf->b);
pBuf->duration_ba = s_uGetRTSCTSDuration(pDevice, CTSDUR_BA, buf->duration_ba = s_uGetRTSCTSDuration(priv, CTSDUR_BA,
cbFrameLength, byPktType, frame_len, pkt_type,
wCurrentRate, bNeedAck); current_rate, need_ack);
/* Get CTSDuration_ba_f0 */ /* Get CTSDuration_ba_f0 */
pBuf->cts_duration_ba_f0 = s_uGetRTSCTSDuration(pDevice, buf->cts_duration_ba_f0 = s_uGetRTSCTSDuration(priv,
CTSDUR_BA_F0, cbFrameLength, byPktType, CTSDUR_BA_F0, frame_len, pkt_type,
pDevice->tx_rate_fb0, bNeedAck); priv->tx_rate_fb0, need_ack);
/* Get CTSDuration_ba_f1 */ /* Get CTSDuration_ba_f1 */
pBuf->cts_duration_ba_f1 = s_uGetRTSCTSDuration(pDevice, buf->cts_duration_ba_f1 = s_uGetRTSCTSDuration(priv,
CTSDUR_BA_F1, cbFrameLength, byPktType, CTSDUR_BA_F1, frame_len, pkt_type,
pDevice->tx_rate_fb1, bNeedAck); priv->tx_rate_fb1, need_ack);
/* Get CTS Frame body */ /* Get CTS Frame body */
pBuf->data.duration = pBuf->duration_ba; buf->data.duration = buf->duration_ba;
pBuf->data.frame_control = buf->data.frame_control =
cpu_to_le16(IEEE80211_FTYPE_CTL | IEEE80211_STYPE_CTS); cpu_to_le16(IEEE80211_FTYPE_CTL | IEEE80211_STYPE_CTS);
memcpy(pBuf->data.ra, pDevice->abyCurrentNetAddr, ETH_ALEN); memcpy(buf->data.ra, priv->abyCurrentNetAddr, ETH_ALEN);
return vnt_rxtx_datahead_g_fb(tx_context, byPktType, return vnt_rxtx_datahead_g_fb(tx_context, pkt_type,
wCurrentRate, &pBuf->data_head, cbFrameLength, current_rate, &buf->data_head, frame_len,
bNeedAck); need_ack);
} else { } else {
struct vnt_cts *pBuf = &head->cts_g; struct vnt_cts *buf = &head->cts_g;
/* Get SignalField,ServiceField,Length */ /* Get SignalField,ServiceField,Length */
vnt_get_phy_field(pDevice, uCTSFrameLen, vnt_get_phy_field(priv, cts_frame_len,
pDevice->byTopCCKBasicRate, PK_TYPE_11B, &pBuf->b); priv->byTopCCKBasicRate, PK_TYPE_11B, &buf->b);
/* Get CTSDuration_ba */ /* Get CTSDuration_ba */
pBuf->duration_ba = s_uGetRTSCTSDuration(pDevice, buf->duration_ba = s_uGetRTSCTSDuration(priv,
CTSDUR_BA, cbFrameLength, byPktType, CTSDUR_BA, frame_len, pkt_type,
wCurrentRate, bNeedAck); current_rate, need_ack);
/*Get CTS Frame body*/ /*Get CTS Frame body*/
pBuf->data.duration = pBuf->duration_ba; buf->data.duration = buf->duration_ba;
pBuf->data.frame_control = buf->data.frame_control =
cpu_to_le16(IEEE80211_FTYPE_CTL | IEEE80211_STYPE_CTS); cpu_to_le16(IEEE80211_FTYPE_CTL | IEEE80211_STYPE_CTS);
memcpy(pBuf->data.ra, pDevice->abyCurrentNetAddr, ETH_ALEN); memcpy(buf->data.ra, priv->abyCurrentNetAddr, ETH_ALEN);
return vnt_rxtx_datahead_g(tx_context, byPktType, wCurrentRate, return vnt_rxtx_datahead_g(tx_context, pkt_type, current_rate,
&pBuf->data_head, cbFrameLength, bNeedAck); &buf->data_head, frame_len, need_ack);
} }
return 0; return 0;
......
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