diff options
-rw-r--r-- | drivers/staging/vt6656/rxtx.c | 10 | ||||
-rw-r--r-- | drivers/staging/vt6656/rxtx.h | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c index 1a29251edf01..51aa77c581ab 100644 --- a/drivers/staging/vt6656/rxtx.c +++ b/drivers/staging/vt6656/rxtx.c | |||
@@ -816,11 +816,11 @@ static u16 s_vGenerateTxParameter(struct vnt_private *pDevice, | |||
816 | struct vnt_rrv_time_rts *pBuf = | 816 | struct vnt_rrv_time_rts *pBuf = |
817 | &tx_buffer->tx_head.tx_rts.rts; | 817 | &tx_buffer->tx_head.tx_rts.rts; |
818 | 818 | ||
819 | pBuf->wRTSTxRrvTime_aa = s_uGetRTSCTSRsvTime(pDevice, 2, | 819 | pBuf->rts_rrv_time_aa = s_uGetRTSCTSRsvTime(pDevice, 2, |
820 | byPktType, cbFrameSize, wCurrentRate); | 820 | byPktType, cbFrameSize, wCurrentRate); |
821 | pBuf->wRTSTxRrvTime_ba = s_uGetRTSCTSRsvTime(pDevice, 1, | 821 | pBuf->rts_rrv_time_ba = s_uGetRTSCTSRsvTime(pDevice, 1, |
822 | byPktType, cbFrameSize, wCurrentRate); | 822 | byPktType, cbFrameSize, wCurrentRate); |
823 | pBuf->wRTSTxRrvTime_bb = s_uGetRTSCTSRsvTime(pDevice, 0, | 823 | pBuf->rts_rrv_time_bb = s_uGetRTSCTSRsvTime(pDevice, 0, |
824 | byPktType, cbFrameSize, wCurrentRate); | 824 | byPktType, cbFrameSize, wCurrentRate); |
825 | 825 | ||
826 | pBuf->wTxRrvTime_a = vnt_rxtx_rsvtime_le16(pDevice, | 826 | pBuf->wTxRrvTime_a = vnt_rxtx_rsvtime_le16(pDevice, |
@@ -880,7 +880,7 @@ static u16 s_vGenerateTxParameter(struct vnt_private *pDevice, | |||
880 | struct vnt_rrv_time_ab *pBuf = &tx_buffer-> | 880 | struct vnt_rrv_time_ab *pBuf = &tx_buffer-> |
881 | tx_head.tx_ab.ab; | 881 | tx_head.tx_ab.ab; |
882 | 882 | ||
883 | pBuf->wRTSTxRrvTime = s_uGetRTSCTSRsvTime(pDevice, 2, | 883 | pBuf->rts_rrv_time = s_uGetRTSCTSRsvTime(pDevice, 2, |
884 | byPktType, cbFrameSize, wCurrentRate); | 884 | byPktType, cbFrameSize, wCurrentRate); |
885 | 885 | ||
886 | pBuf->wTxRrvTime = vnt_rxtx_rsvtime_le16(pDevice, | 886 | pBuf->wTxRrvTime = vnt_rxtx_rsvtime_le16(pDevice, |
@@ -914,7 +914,7 @@ static u16 s_vGenerateTxParameter(struct vnt_private *pDevice, | |||
914 | struct vnt_rrv_time_ab *pBuf = &tx_buffer-> | 914 | struct vnt_rrv_time_ab *pBuf = &tx_buffer-> |
915 | tx_head.tx_ab.ab; | 915 | tx_head.tx_ab.ab; |
916 | 916 | ||
917 | pBuf->wRTSTxRrvTime = s_uGetRTSCTSRsvTime(pDevice, 0, | 917 | pBuf->rts_rrv_time = s_uGetRTSCTSRsvTime(pDevice, 0, |
918 | byPktType, cbFrameSize, wCurrentRate); | 918 | byPktType, cbFrameSize, wCurrentRate); |
919 | 919 | ||
920 | pBuf->wTxRrvTime = vnt_rxtx_rsvtime_le16(pDevice, | 920 | pBuf->wTxRrvTime = vnt_rxtx_rsvtime_le16(pDevice, |
diff --git a/drivers/staging/vt6656/rxtx.h b/drivers/staging/vt6656/rxtx.h index bb2d0ce4c7bd..1e8f5e2c071f 100644 --- a/drivers/staging/vt6656/rxtx.h +++ b/drivers/staging/vt6656/rxtx.h | |||
@@ -53,9 +53,9 @@ struct vnt_mic_hdr { | |||
53 | 53 | ||
54 | /* RsvTime buffer header */ | 54 | /* RsvTime buffer header */ |
55 | struct vnt_rrv_time_rts { | 55 | struct vnt_rrv_time_rts { |
56 | u16 wRTSTxRrvTime_ba; | 56 | __le16 rts_rrv_time_ba; |
57 | u16 wRTSTxRrvTime_aa; | 57 | __le16 rts_rrv_time_aa; |
58 | u16 wRTSTxRrvTime_bb; | 58 | __le16 rts_rrv_time_bb; |
59 | u16 wReserved; | 59 | u16 wReserved; |
60 | u16 wTxRrvTime_b; | 60 | u16 wTxRrvTime_b; |
61 | u16 wTxRrvTime_a; | 61 | u16 wTxRrvTime_a; |
@@ -69,7 +69,7 @@ struct vnt_rrv_time_cts { | |||
69 | } __packed; | 69 | } __packed; |
70 | 70 | ||
71 | struct vnt_rrv_time_ab { | 71 | struct vnt_rrv_time_ab { |
72 | u16 wRTSTxRrvTime; | 72 | __le16 rts_rrv_time; |
73 | u16 wTxRrvTime; | 73 | u16 wTxRrvTime; |
74 | } __packed; | 74 | } __packed; |
75 | 75 | ||