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

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

staging: vt6656: rxtx Replace struct vnt_tx_fifo_head wTimeStamp 



Replace with time_stamp with base type __le16

In s_bPacketToWirelessUsb endian correct DEFAULT_MSDU_LIFETIME_RES_64us

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

drivers/staging/vt6656/rxtx.c

+3 −3
Original line number Diff line number Diff line
@@ -1008,7 +1008,7 @@ static int s_bPacketToWirelessUsb(struct vnt_private *pDevice, u8 byPktType, 
		pTxBufHead->wFIFOCtl |= FIFOCTL_NEEDACK;

	}



    pTxBufHead->wTimeStamp = DEFAULT_MSDU_LIFETIME_RES_64us;

    pTxBufHead->time_stamp = cpu_to_le16(DEFAULT_MSDU_LIFETIME_RES_64us);



    //Set FRAGCTL_MACHDCNT

	cbMACHdLen = WLAN_HDR_ADDR3_LEN;
@@ -1431,7 +1431,7 @@ CMD_STATUS csMgmt_xmit(struct vnt_private *pDevice, 
    }



    pTxBufHead->wFIFOCtl |= FIFOCTL_TMOEN;

    pTxBufHead->wTimeStamp = cpu_to_le16(DEFAULT_MGN_LIFETIME_RES_64us);

    pTxBufHead->time_stamp = cpu_to_le16(DEFAULT_MGN_LIFETIME_RES_64us);



    if (is_multicast_ether_addr(pPacket->p80211Header->sA3.abyAddr1)) {

        bNeedACK = false;
@@ -1800,7 +1800,7 @@ void vDMA0_tx_80211(struct vnt_private *pDevice, struct sk_buff *skb) 
    }



    pTxBufHead->wFIFOCtl |= FIFOCTL_TMOEN;

    pTxBufHead->wTimeStamp = cpu_to_le16(DEFAULT_MGN_LIFETIME_RES_64us);

    pTxBufHead->time_stamp = cpu_to_le16(DEFAULT_MGN_LIFETIME_RES_64us);



    if (is_multicast_ether_addr(p80211Header->sA3.abyAddr1)) {

        bNeedACK = false;

drivers/staging/vt6656/rxtx.h

+1 −1
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ union vnt_tx_head { 
struct vnt_tx_fifo_head {

	u32 adwTxKey[4];

	u16 wFIFOCtl;

	u16 wTimeStamp;

	__le16 time_stamp;

	u16 wFragCtl;

	u16 wReserved;

} __packed;