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

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

staging: vt6656: vnt_fill_ieee80211_rts replace TYPE_CTL_RTS macro 



Replace with IEEE80211_FTYPE_CTL | IEEE80211_STYPE_RTS from linux/ieee80211.h
to get value of TYPE_CTL_RTS 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 03a9cf34

drivers/staging/vt6656/rxtx.c

+2 −1
Original line number Diff line number Diff line
@@ -551,7 +551,8 @@ static int vnt_fill_ieee80211_rts(struct vnt_private *priv, 
		__le16 duration)

{

	rts->duration = duration;

	rts->frame_control = TYPE_CTL_RTS;

	rts->frame_control =

		cpu_to_le16(IEEE80211_FTYPE_CTL | IEEE80211_STYPE_RTS);



	if (priv->op_mode == NL80211_IFTYPE_ADHOC ||

				priv->op_mode == NL80211_IFTYPE_AP)

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_RTS        0xb400

#define TYPE_CTL_CTS        0xc400

#define TYPE_CTL_ACK        0xd400
@@ -91,7 +90,6 @@ 
#define TYPE_DATE_NULL      0x0048



#define TYPE_CTL_PSPOLL     0x00a4

#define TYPE_CTL_RTS        0x00b4

#define TYPE_CTL_CTS        0x00c4

#define TYPE_CTL_ACK        0x00d4