From: Malcolm Priestley Date: Tue, 18 Mar 2014 19:24:59 +0000 (+0000) Subject: staging: vt6656: rxtx: Replace wCTSDuration* X-Git-Tag: MMI-PSA29.97-13-9~12500^2~71 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7fd5747f31275e391a43a5ecb1a5d3a78fb9027e;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git staging: vt6656: rxtx: Replace wCTSDuration* Fix base type to __le16 and remove camel case. Camel case changes wCTSDuration* -> cts_duration* Signed-off-by: Malcolm Priestley Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c index 9846c901e65f..fb8b2fc9df29 100644 --- a/drivers/staging/vt6656/rxtx.c +++ b/drivers/staging/vt6656/rxtx.c @@ -732,11 +732,11 @@ static u16 s_vFillCTSHead(struct vnt_private *pDevice, u32 uDMAIdx, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption); /* Get CTSDuration_ba_f0 */ - pBuf->wCTSDuration_ba_f0 = s_uGetRTSCTSDuration(pDevice, + pBuf->cts_duration_ba_f0 = s_uGetRTSCTSDuration(pDevice, CTSDUR_BA_F0, cbFrameLength, byPktType, pDevice->tx_rate_fb0, bNeedAck, byFBOption); /* Get CTSDuration_ba_f1 */ - pBuf->wCTSDuration_ba_f1 = s_uGetRTSCTSDuration(pDevice, + pBuf->cts_duration_ba_f1 = s_uGetRTSCTSDuration(pDevice, CTSDUR_BA_F1, cbFrameLength, byPktType, pDevice->tx_rate_fb1, bNeedAck, byFBOption); /* Get CTS Frame body */ diff --git a/drivers/staging/vt6656/rxtx.h b/drivers/staging/vt6656/rxtx.h index f0ab2a3d70c9..2f65a6f57b28 100644 --- a/drivers/staging/vt6656/rxtx.h +++ b/drivers/staging/vt6656/rxtx.h @@ -167,8 +167,8 @@ struct vnt_cts_fb { struct vnt_phy_field b; __le16 duration_ba; u16 wReserved; - u16 wCTSDuration_ba_f0; - u16 wCTSDuration_ba_f1; + __le16 cts_duration_ba_f0; + __le16 cts_duration_ba_f1; struct ieee80211_cts data; u16 reserved2; struct vnt_tx_datahead_g_fb data_head;