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

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

staging: vt6656: rxtx s_vFillCTSHead replace TYPE_CTL_CTS macro 



Replace with IEEE80211_FTYPE_CTL | IEEE80211_STYPE_CTS from linux/ieee80211.h
to get value of TYPE_CTL_CTS and endian correct to frame_control.

Remove old macros in tether.h

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

drivers/staging/vt6656/rxtx.c

+6 −2
Original line number Diff line number Diff line
@@ -742,7 +742,9 @@ static u16 s_vFillCTSHead(struct vnt_private *pDevice, u32 uDMAIdx, 
			pDevice->tx_rate_fb1, bNeedAck, byFBOption);

		/* Get CTS Frame body */

		pBuf->data.duration = pBuf->duration_ba;

		pBuf->data.frame_control = TYPE_CTL_CTS;

		pBuf->data.frame_control =

			cpu_to_le16(IEEE80211_FTYPE_CTL | IEEE80211_STYPE_CTS);



		memcpy(pBuf->data.ra, pDevice->abyCurrentNetAddr, ETH_ALEN);



		return vnt_rxtx_datahead_g_fb(pDevice, byPktType, wCurrentRate,
@@ -758,7 +760,9 @@ static u16 s_vFillCTSHead(struct vnt_private *pDevice, u32 uDMAIdx, 
			wCurrentRate, bNeedAck, byFBOption);

		/*Get CTS Frame body*/

		pBuf->data.duration = pBuf->duration_ba;

		pBuf->data.frame_control = TYPE_CTL_CTS;

		pBuf->data.frame_control =

			cpu_to_le16(IEEE80211_FTYPE_CTL | IEEE80211_STYPE_CTS);



		memcpy(pBuf->data.ra, pDevice->abyCurrentNetAddr, ETH_ALEN);



		return vnt_rxtx_datahead_g(pDevice, byPktType, wCurrentRate,

drivers/staging/vt6656/tether.h

+0 −2
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ 
#define TYPE_DATE_NULL      0x4800



#define TYPE_CTL_PSPOLL     0xa400

#define TYPE_CTL_CTS        0xc400

#define TYPE_CTL_ACK        0xd400



#else //if LITTLE_ENDIAN
@@ -90,7 +89,6 @@ 
#define TYPE_DATE_NULL      0x0048



#define TYPE_CTL_PSPOLL     0x00a4

#define TYPE_CTL_CTS        0x00c4

#define TYPE_CTL_ACK        0x00d4



#endif //#ifdef __BIG_ENDIAN