staging: ks7010: Replace local frame type constants with kernel constants.

This driver defined constants FRAME_TYPE_* to represent frame control
field codes; however, these constants are already defined in the header
'linux/ieee80211.h' as  IEEE80211_STYPE_*.  This change removes the locally
defined constants and substitutes the kernel's constants.

Signed-off-by: Quytelda Kahja <quytelda@tamalin.org>
Reviewed-by: Tobin C. Harding <me@tobin.cc>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/ks7010/ks_hostif.c b/drivers/staging/ks7010/ks_hostif.c
index f425975fbcbcf7b73e41fb966bbd0d036d19614c..7935ba56bb1d168b40f0de3dc3c9eab71146b96a 100644 (file)
--- a/drivers/staging/ks7010/ks_hostif.c
+++ b/drivers/staging/ks7010/ks_hostif.c
@@ -847,7 +847,7 @@ void hostif_scan_indication(struct ks_wlan_private *priv)
                                   priv->aplist.ap[i].bssid, ETH_ALEN) != 0)
                                continue;
 
-                       if (ap_info->frame_type == FRAME_TYPE_PROBE_RESP)
+                       if (ap_info->frame_type == IEEE80211_STYPE_PROBE_RESP)
                                get_ap_information(priv, ap_info,
                                                   &priv->aplist.ap[i]);
                        return;

diff --git a/drivers/staging/ks7010/ks_hostif.h b/drivers/staging/ks7010/ks_hostif.h
index 8f08e1e58991a375508f7b0de8577526505f04c6..166d83e4885c9fc90ce09bd0833801c2f92ed914 100644 (file)
--- a/drivers/staging/ks7010/ks_hostif.h
+++ b/drivers/staging/ks7010/ks_hostif.h
@@ -286,8 +286,6 @@ struct ap_info_t {
        __le16 capability;      /* +12 */
        u8 frame_type;  /* +14 */
        u8 ch_info;     /* +15 */
-#define FRAME_TYPE_BEACON      0x80
-#define FRAME_TYPE_PROBE_RESP  0x50
        __le16 body_size;       /* +16 */
        u8 body[1024];  /* +18 */
        /* +1032 */
@@ -465,8 +463,6 @@ struct last_associate_t {
 
 struct association_request_t {
        u8 type;
-#define FRAME_TYPE_ASSOC_REQ   0x00
-#define FRAME_TYPE_REASSOC_REQ 0x20
        u8 pad;
        __le16 capability;
        __le16 listen_interval;
@@ -476,8 +472,6 @@ struct association_request_t {
 
 struct association_response_t {
        u8 type;
-#define FRAME_TYPE_ASSOC_RESP  0x10
-#define FRAME_TYPE_REASSOC_RESP        0x30
        u8 pad;
        __le16 capability;
        __le16 status;