diff options
| author | Sergio Paracuellos | 2018-04-24 15:50:00 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2018-04-25 15:50:19 +0200 |
| commit | 92c1552caef3661f049c4e967550e933599e2663 (patch) | |
| tree | 4f1fb1fd70671ba1cb03c08bc5113f694c30f559 /drivers/staging/ks7010/ks_wlan.h | |
| parent | staging: ks7010: fix line exceding 80 characters in ks_wlan_get_range (diff) | |
| download | kernel-qcow2-linux-92c1552caef3661f049c4e967550e933599e2663.tar.gz kernel-qcow2-linux-92c1552caef3661f049c4e967550e933599e2663.tar.xz kernel-qcow2-linux-92c1552caef3661f049c4e967550e933599e2663.zip | |
staging: ks7010: remove WPS definition conditional code
WPS definition was defined by default in ks_wlan.h header
file. So it makes no sense to have conditional preprocessor
stuff along the code about this.
Signed-off-by: Sergio Paracuellos <sergio.paracuellos@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/ks7010/ks_wlan.h')
| -rw-r--r-- | drivers/staging/ks7010/ks_wlan.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/drivers/staging/ks7010/ks_wlan.h b/drivers/staging/ks7010/ks_wlan.h index 365001bebabc..2894b0c3816c 100644 --- a/drivers/staging/ks7010/ks_wlan.h +++ b/drivers/staging/ks7010/ks_wlan.h @@ -12,8 +12,6 @@ #ifndef _KS_WLAN_H #define _KS_WLAN_H -#define WPS - #include <linux/atomic.h> /* struct atomic_t */ #include <linux/completion.h> /* struct completion */ #include <linux/netdevice.h> /* struct net_device_stats, struct sk_buff */ @@ -122,10 +120,8 @@ enum { SME_RSN_AUTH_REQUEST, SME_RSN_ENABLED_REQUEST, SME_RSN_MODE_REQUEST, -#ifdef WPS SME_WPS_ENABLE_REQUEST, SME_WPS_PROBE_REQUEST, -#endif SME_SET_GAIN, SME_GET_GAIN, SME_SLEEP_REQUEST, @@ -198,14 +194,12 @@ struct rsn_ie { u8 body[RSN_IE_BODY_MAX]; } __packed; -#ifdef WPS #define WPS_IE_BODY_MAX 255 struct wps_ie { u8 id; /* 221 'dd <len> 00 50 F2 04' */ u8 size; /* max ? 255 ? */ u8 body[WPS_IE_BODY_MAX]; } __packed; -#endif /* WPS */ struct local_ap { u8 bssid[6]; @@ -226,9 +220,7 @@ struct local_ap { u8 noise; struct rsn_ie wpa_ie; struct rsn_ie rsn_ie; -#ifdef WPS struct wps_ie wps_ie; -#endif /* WPS */ }; #define LOCAL_APLIST_MAX 31 @@ -371,13 +363,11 @@ struct pmk_list { } pmk[PMK_LIST_MAX]; }; -#ifdef WPS struct wps_status { int wps_enabled; int ielen; u8 ie[255]; }; -#endif /* WPS */ struct ks_wlan_private { /* hardware information */ @@ -450,9 +440,7 @@ struct ks_wlan_private { u8 scan_ssid_len; u8 scan_ssid[IW_ESSID_MAX_SIZE + 1]; struct local_gain gain; -#ifdef WPS struct wps_status wps; -#endif /* WPS */ u8 sleep_mode; u8 region; |