Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df184806 authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman
Browse files

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: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d049c7f8

drivers/staging/vt6655/rxtx.c

+7 −10
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ void 
s_vGenerateTxParameter(

	struct vnt_private *pDevice,

	unsigned char byPktType,

	void *pTxBufHead,

	struct vnt_tx_fifo_head *,

	void *pvRrvTime,

	void *pvRTS,

	void *pvCTS,
@@ -944,7 +944,7 @@ void 
s_vGenerateTxParameter(

	struct vnt_private *pDevice,

	unsigned char byPktType,

	void *pTxBufHead,

	struct vnt_tx_fifo_head *tx_buffer_head,

	void *pvRrvTime,

	void *pvRTS,

	void *pvCTS,
@@ -955,21 +955,18 @@ s_vGenerateTxParameter( 
	unsigned short wCurrentRate

)

{

	unsigned short wFifoCtl;

	u16 fifo_ctl = le16_to_cpu(tx_buffer_head->fifo_ctl);

	bool bDisCRC = false;

	unsigned char byFBOption = AUTO_FB_NONE;



	PSTxBufHead pFifoHead = (PSTxBufHead)pTxBufHead;



	pFifoHead->wReserved = wCurrentRate;

	wFifoCtl = pFifoHead->wFIFOCtl;

	tx_buffer_head->current_rate = cpu_to_le16(wCurrentRate);



	if (wFifoCtl & FIFOCTL_CRCDIS)

	if (fifo_ctl & FIFOCTL_CRCDIS)

		bDisCRC = true;



	if (wFifoCtl & FIFOCTL_AUTO_FB_0)

	if (fifo_ctl & FIFOCTL_AUTO_FB_0)

		byFBOption = AUTO_FB_0;

	else if (wFifoCtl & FIFOCTL_AUTO_FB_1)

	else if (fifo_ctl & FIFOCTL_AUTO_FB_1)

		byFBOption = AUTO_FB_1;



	if (!pvRrvTime)