evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: vt6656: rxtx.c s_vFillRTSHead Parse out struct vnt_rts_g_fb to new function.

Browse source 
Parse out vnt_rts_g_fb code to new function vnt_rxtx_rts_g_fb_head.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Malcolm Priestley 2013-08-26 11:07:46 +01:00 • committed by Greg Kroah-Hartman
parent 5e67ee4956
commit ec91713a29
1 changed files with 38 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -639,6 +639,41 @@ static int vnt_rxtx_rts_g_head(struct vnt_private *priv,
return 0; return 0;
} }
static int vnt_rxtx_rts_g_fb_head(struct vnt_private *priv,
struct vnt_rts_g_fb *buf, struct ethhdr *eth_hdr,
u8 pkt_type, u32 frame_len, int need_ack,
u16 current_rate, u8 fb_option)
{
u16 rts_frame_len = 20;
BBvCalculateParameter(priv, rts_frame_len, priv->byTopCCKBasicRate,
PK_TYPE_11B, &buf->b);
BBvCalculateParameter(priv, rts_frame_len,
priv->byTopOFDMBasicRate, pkt_type, &buf->a);
buf->wDuration_bb = s_uGetRTSCTSDuration(priv, RTSDUR_BB, frame_len,
PK_TYPE_11B, priv->byTopCCKBasicRate, need_ack, fb_option);
buf->wDuration_aa = s_uGetRTSCTSDuration(priv, RTSDUR_AA, frame_len,
pkt_type, current_rate, need_ack, fb_option);
buf->wDuration_ba = s_uGetRTSCTSDuration(priv, RTSDUR_BA, frame_len,
pkt_type, current_rate, need_ack, fb_option);
buf->wRTSDuration_ba_f0 = s_uGetRTSCTSDuration(priv, RTSDUR_BA_F0,
frame_len, pkt_type, current_rate, need_ack, fb_option);
buf->wRTSDuration_aa_f0 = s_uGetRTSCTSDuration(priv, RTSDUR_AA_F0,
frame_len, pkt_type, current_rate, need_ack, fb_option);
buf->wRTSDuration_ba_f1 = s_uGetRTSCTSDuration(priv, RTSDUR_BA_F1,
frame_len, pkt_type, current_rate, need_ack, fb_option);
buf->wRTSDuration_aa_f1 = s_uGetRTSCTSDuration(priv, RTSDUR_AA_F1,
frame_len, pkt_type, current_rate, need_ack, fb_option);
vnt_fill_ieee80211_rts(priv, &buf->data, eth_hdr, buf->wDuration_aa);
return 0;
}
static void s_vFillRTSHead(struct vnt_private *pDevice, u8 byPktType, static void s_vFillRTSHead(struct vnt_private *pDevice, u8 byPktType,
void *pvRTS, u32 cbFrameLength, int bNeedAck, void *pvRTS, u32 cbFrameLength, int bNeedAck,
struct ethhdr *psEthHeader, u16 wCurrentRate, u8 byFBOption) struct ethhdr *psEthHeader, u16 wCurrentRate, u8 byFBOption)
@ -660,47 +695,10 @@ static void s_vFillRTSHead(struct vnt_private *pDevice, u8 byPktType,
} }
else { else {
struct vnt_rts_g_fb *pBuf = (struct vnt_rts_g_fb *)pvRTS; struct vnt_rts_g_fb *pBuf = (struct vnt_rts_g_fb *)pvRTS;
//Get SignalField,ServiceField,Length
BBvCalculateParameter(pDevice, uRTSFrameLen,
pDevice->byTopCCKBasicRate, PK_TYPE_11B, &pBuf->b);
BBvCalculateParameter(pDevice, uRTSFrameLen,
pDevice->byTopOFDMBasicRate, byPktType, &pBuf->a);
//Get Duration
pBuf->wDuration_bb = s_uGetRTSCTSDuration(pDevice, RTSDUR_BB,
cbFrameLength, PK_TYPE_11B,
pDevice->byTopCCKBasicRate, bNeedAck, byFBOption);
pBuf->wDuration_aa = s_uGetRTSCTSDuration(pDevice, RTSDUR_AA,
cbFrameLength, byPktType,
wCurrentRate, bNeedAck, byFBOption);
pBuf->wDuration_ba = s_uGetRTSCTSDuration(pDevice, RTSDUR_BA,
cbFrameLength, byPktType,
wCurrentRate, bNeedAck, byFBOption);
pBuf->wRTSDuration_ba_f0 = s_uGetRTSCTSDuration(pDevice,
RTSDUR_BA_F0, cbFrameLength, byPktType, wCurrentRate,
bNeedAck, byFBOption);
pBuf->wRTSDuration_aa_f0 = s_uGetRTSCTSDuration(pDevice,
RTSDUR_AA_F0, cbFrameLength, byPktType,
wCurrentRate, bNeedAck, byFBOption);
pBuf->wRTSDuration_ba_f1 = s_uGetRTSCTSDuration(pDevice,
RTSDUR_BA_F1, cbFrameLength, byPktType, wCurrentRate,
bNeedAck, byFBOption);
pBuf->wRTSDuration_aa_f1 = s_uGetRTSCTSDuration(pDevice,
RTSDUR_AA_F1, cbFrameLength, byPktType, wCurrentRate,
bNeedAck, byFBOption);
pBuf->data.duration = pBuf->wDuration_aa;
/*Get RTS Frame body*/
pBuf->data.frame_control = TYPE_CTL_RTS;
if (pDevice->eOPMode == OP_MODE_ADHOC || vnt_rxtx_rts_g_fb_head(pDevice, pBuf,
pDevice->eOPMode == OP_MODE_AP) psEthHeader, byPktType, cbFrameLength,
memcpy(pBuf->data.ra, psEthHeader->h_dest, ETH_ALEN); bNeedAck, wCurrentRate, byFBOption);
else
memcpy(pBuf->data.ra, pDevice->abyBSSID, ETH_ALEN);
if (pDevice->eOPMode == OP_MODE_AP)
memcpy(pBuf->data.ta, pDevice->abyBSSID, ETH_ALEN);
else
memcpy(pBuf->data.ta, psEthHeader->h_source, ETH_ALEN);
} // if (byFBOption == AUTO_FB_NONE) } // if (byFBOption == AUTO_FB_NONE)
} }
else if (byPktType == PK_TYPE_11A) { else if (byPktType == PK_TYPE_11A) {