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: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c
index 2b67b1bdd90ba0edf9a7f3043890b959192c1243..ac60999bc06764a5747e64137e9da695b1550bd7 100644 (file)
--- a/drivers/staging/vt6656/rxtx.c
+++ b/drivers/staging/vt6656/rxtx.c
@@ -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)

diff --git a/drivers/staging/vt6656/tether.h b/drivers/staging/vt6656/tether.h
index aec6b568a4a926b109441ef474296b4acb7f556c..f42eddae7bb5a81e0cf4c2d0f5d947a39531a77a 100644 (file)
--- a/drivers/staging/vt6656/tether.h
+++ b/drivers/staging/vt6656/tether.h
@@ -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