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

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

staging: vt6656: rxtx struct vnt_tx_buffer Replace wTxByteCount 



Replace with tx_byte_count with base type __le16.

In nsDMA_tx_packet and bRelayPacketSend provide endian correction.

Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5846251d

drivers/staging/vt6656/rxtx.c

+4 −4
Original line number Diff line number Diff line
@@ -1605,7 +1605,7 @@ CMD_STATUS csMgmt_xmit(struct vnt_private *pDevice, 
	}

    }



    pTX_Buffer->wTxByteCount = cpu_to_le16((u16)(cbReqCount));

    pTX_Buffer->tx_byte_count = cpu_to_le16((u16)(cbReqCount));

    pTX_Buffer->byPKTNO = (u8) (((wCurrentRate<<4) &0x00F0) | ((pDevice->wSeqCounter - 1) & 0x000F));

    pTX_Buffer->byType = 0x00;
@@ -2045,7 +2045,7 @@ void vDMA0_tx_80211(struct vnt_private *pDevice, struct sk_buff *skb) 
	}

    }



    pTX_Buffer->wTxByteCount = cpu_to_le16((u16)(cbReqCount));

    pTX_Buffer->tx_byte_count = cpu_to_le16((u16)(cbReqCount));

    pTX_Buffer->byPKTNO = (u8) (((wCurrentRate<<4) &0x00F0) | ((pDevice->wSeqCounter - 1) & 0x000F));

    pTX_Buffer->byType = 0x00;
@@ -2437,7 +2437,7 @@ int nsDMA_tx_packet(struct vnt_private *pDevice, 
    }



    pTX_Buffer->byPKTNO = (u8) (((pDevice->wCurrentRate<<4) &0x00F0) | ((pDevice->wSeqCounter - 1) & 0x000F));

    pTX_Buffer->wTxByteCount = (u16)BytesToWrite;

    pTX_Buffer->tx_byte_count = cpu_to_le16((u16)BytesToWrite);



    pContext->pPacket = skb;

    pContext->type = CONTEXT_DATA_PACKET;
@@ -2591,7 +2591,7 @@ int bRelayPacketSend(struct vnt_private *pDevice, u8 *pbySkbData, u32 uDataLen, 
    }



    pTX_Buffer->byPKTNO = (u8) (((pDevice->wCurrentRate<<4) &0x00F0) | ((pDevice->wSeqCounter - 1) & 0x000F));

    pTX_Buffer->wTxByteCount = (u16)BytesToWrite;

    pTX_Buffer->tx_byte_count = cpu_to_le16((u16)BytesToWrite);



    pContext->pPacket = NULL;

    pContext->type = CONTEXT_DATA_PACKET;

drivers/staging/vt6656/rxtx.h

+1 −1
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ struct vnt_tx_fifo_head { 
struct vnt_tx_buffer {

	u8 byType;

	u8 byPKTNO;

	u16 wTxByteCount;

	__le16 tx_byte_count;

	struct vnt_tx_fifo_head fifo_head;

	union vnt_tx_head tx_head;

} __packed;