From: Malcolm Priestley Date: Sat, 22 Mar 2014 09:01:31 +0000 (+0000) Subject: staging: vt6656: vnt_fill_ieee80211_rts replace TYPE_CTL_RTS macro X-Git-Tag: next-20140428~14^2~260 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f4554d3b0e46ca126a22f556cf840543d16e308b;p=karo-tx-linux.git 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 Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c index 2b67b1bdd90b..ac60999bc067 100644 --- 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 aec6b568a4a9..f42eddae7bb5 100644 --- 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