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

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

staging: vt6656: vnt_beacon_buffer attach mac header. 



Attach ieee80211_hdr to vnt_beacon_buffer and remove pointer arithmetic.

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

drivers/staging/vt6656/rxtx.c

+9 −10
Original line number Diff line number Diff line
@@ -1650,7 +1650,6 @@ CMD_STATUS csBeacon_xmit(struct vnt_private *pDevice, 
	u16 wCurrentRate;

	u32 cbFrameBodySize;

	u32 cbReqCount;

	u8 *pbyTxBufferAddr;

	struct vnt_usb_send_context *pContext;

	CMD_STATUS status;
@@ -1663,7 +1662,6 @@ CMD_STATUS csBeacon_xmit(struct vnt_private *pDevice, 


	pTX_Buffer = (struct vnt_beacon_buffer *)&pContext->Data[0];

	short_head = &pTX_Buffer->short_head;

	pbyTxBufferAddr = (u8 *)&short_head->fifo_ctl;



    cbFrameBodySize = pPacket->cbPayloadLen;
@@ -1697,8 +1695,9 @@ CMD_STATUS csBeacon_xmit(struct vnt_private *pDevice, 
	}





    //Generate Beacon Header

    pMACHeader = (struct ieee80211_hdr *)(pbyTxBufferAddr + cbHeaderSize);

	/* Generate Beacon Header */

	pMACHeader = &pTX_Buffer->hdr;



	memcpy(pMACHeader, pPacket->p80211Header, pPacket->cbMPDULen);



	pMACHeader->duration_id = 0;

drivers/staging/vt6656/rxtx.h

+1 −0
Original line number Diff line number Diff line
@@ -243,6 +243,7 @@ struct vnt_beacon_buffer { 
	u8 byPKTNO;

	u16 wTxByteCount;

	struct vnt_tx_short_buf_head short_head;

	struct ieee80211_hdr hdr;

} __packed;



void vDMA0_tx_80211(struct vnt_private *, struct sk_buff *skb);