aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
authorMalcolm Priestley <tvboxspy@gmail.com>2015-04-01 17:32:51 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-04-03 09:12:54 -0400
commitdf18480650df1d9dc94188bc7dd7e47b5c888d05 (patch)
treef06720285128c953acdd3dbd9c46d3279a4da1b7 /drivers/staging
parentd049c7f8191440d881bf2224af8ed0de74d8d9a3 (diff)
staging: vt6655: s_vGenerateTxParameter Replace PSTxBufHead with struct vnt_tx_fifo_head
With endian correction on fifo_ctl and current_rate. Removing pTxBufHead, pFifoHead and wFifoCtl Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/vt6655/rxtx.c17
1 files changed, 7 insertions, 10 deletions
diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c
index 5b869d1f9e40..195dcc9b471c 100644
--- a/drivers/staging/vt6655/rxtx.c
+++ b/drivers/staging/vt6655/rxtx.c
@@ -116,7 +116,7 @@ void
116s_vGenerateTxParameter( 116s_vGenerateTxParameter(
117 struct vnt_private *pDevice, 117 struct vnt_private *pDevice,
118 unsigned char byPktType, 118 unsigned char byPktType,
119 void *pTxBufHead, 119 struct vnt_tx_fifo_head *,
120 void *pvRrvTime, 120 void *pvRrvTime,
121 void *pvRTS, 121 void *pvRTS,
122 void *pvCTS, 122 void *pvCTS,
@@ -944,7 +944,7 @@ void
944s_vGenerateTxParameter( 944s_vGenerateTxParameter(
945 struct vnt_private *pDevice, 945 struct vnt_private *pDevice,
946 unsigned char byPktType, 946 unsigned char byPktType,
947 void *pTxBufHead, 947 struct vnt_tx_fifo_head *tx_buffer_head,
948 void *pvRrvTime, 948 void *pvRrvTime,
949 void *pvRTS, 949 void *pvRTS,
950 void *pvCTS, 950 void *pvCTS,
@@ -955,21 +955,18 @@ s_vGenerateTxParameter(
955 unsigned short wCurrentRate 955 unsigned short wCurrentRate
956) 956)
957{ 957{
958 unsigned short wFifoCtl; 958 u16 fifo_ctl = le16_to_cpu(tx_buffer_head->fifo_ctl);
959 bool bDisCRC = false; 959 bool bDisCRC = false;
960 unsigned char byFBOption = AUTO_FB_NONE; 960 unsigned char byFBOption = AUTO_FB_NONE;
961 961
962 PSTxBufHead pFifoHead = (PSTxBufHead)pTxBufHead; 962 tx_buffer_head->current_rate = cpu_to_le16(wCurrentRate);
963
964 pFifoHead->wReserved = wCurrentRate;
965 wFifoCtl = pFifoHead->wFIFOCtl;
966 963
967 if (wFifoCtl & FIFOCTL_CRCDIS) 964 if (fifo_ctl & FIFOCTL_CRCDIS)
968 bDisCRC = true; 965 bDisCRC = true;
969 966
970 if (wFifoCtl & FIFOCTL_AUTO_FB_0) 967 if (fifo_ctl & FIFOCTL_AUTO_FB_0)
971 byFBOption = AUTO_FB_0; 968 byFBOption = AUTO_FB_0;
972 else if (wFifoCtl & FIFOCTL_AUTO_FB_1) 969 else if (fifo_ctl & FIFOCTL_AUTO_FB_1)
973 byFBOption = AUTO_FB_1; 970 byFBOption = AUTO_FB_1;
974 971
975 if (!pvRrvTime) 972 if (!pvRrvTime)