Merge hostapd/sta_flags.h into sta_info.h

The separate header file is not needed since none of the driver wrappers
include it anymore. Move the WLAN_STA_* definitions back to be together
with struct sta_info definition.

diff --git a/hostapd/drv_callbacks.c b/hostapd/drv_callbacks.c
index de5e379..5fde249 100644 (file)
--- a/hostapd/drv_callbacks.c
+++ b/hostapd/drv_callbacks.c
@@ -19,7 +19,6 @@
 #include "driver_i.h"
 #include "ieee802_11.h"
 #include "radius/radius.h"
-#include "sta_flags.h"
 #include "sta_info.h"
 #include "accounting.h"
 #include "tkip_countermeasures.h"

diff --git a/hostapd/dump_state.c b/hostapd/dump_state.c
index dcd21bb..408ef1e 100644 (file)
--- a/hostapd/dump_state.c
+++ b/hostapd/dump_state.c
@@ -23,7 +23,6 @@
 #include "eap_server/eap.h"
 #include "hostapd.h"
 #include "config.h"
-#include "sta_flags.h"
 #include "sta_info.h"
 
 

diff --git a/hostapd/hostapd.c b/hostapd/hostapd.c
index 65886e1..0a33b09 100644 (file)
--- a/hostapd/hostapd.c
+++ b/hostapd/hostapd.c
@@ -33,7 +33,6 @@
 #include "accounting.h"
 #include "iapp.h"
 #include "ieee802_11_auth.h"
-#include "sta_flags.h"
 #include "sta_info.h"
 #include "ap_list.h"
 #include "driver_i.h"

diff --git a/hostapd/iapp.c b/hostapd/iapp.c
index 001e46e..e4db6e6 100644 (file)
--- a/hostapd/iapp.c
+++ b/hostapd/iapp.c
@@ -52,7 +52,6 @@
 #include "ieee802_11.h"
 #include "iapp.h"
 #include "eloop.h"
-#include "sta_flags.h"
 #include "sta_info.h"
 
 

diff --git a/hostapd/ieee802_11.c b/hostapd/ieee802_11.c
index b8d0443..63f1429 100644 (file)
--- a/hostapd/ieee802_11.c
+++ b/hostapd/ieee802_11.c
@@ -29,7 +29,6 @@
 #include "beacon.h"
 #include "hw_features.h"
 #include "ieee802_11_auth.h"
-#include "sta_flags.h"
 #include "sta_info.h"
 #include "ieee802_1x.h"
 #include "wpa.h"

diff --git a/hostapd/ieee802_11_ht.c b/hostapd/ieee802_11_ht.c
index 817e1e7..1cf612b 100644 (file)
--- a/hostapd/ieee802_11_ht.c
+++ b/hostapd/ieee802_11_ht.c
@@ -19,7 +19,6 @@
 #include "drivers/driver.h"
 #include "hostapd.h"
 #include "config.h"
-#include "sta_flags.h"
 #include "sta_info.h"
 #include "beacon.h"
 #include "ieee802_11.h"

diff --git a/hostapd/ieee802_1x.c b/hostapd/ieee802_1x.c
index d0f077f..813ee5e 100644 (file)
--- a/hostapd/ieee802_1x.c
+++ b/hostapd/ieee802_1x.c
@@ -27,7 +27,6 @@
 #include "hostapd.h"
 #include "ieee802_1x.h"
 #include "accounting.h"
-#include "sta_flags.h"
 #include "sta_info.h"
 #include "wpa.h"
 #include "preauth.h"

diff --git a/hostapd/mlme.c b/hostapd/mlme.c
index 127df37..adc7ce6 100644 (file)
--- a/hostapd/mlme.c
+++ b/hostapd/mlme.c
@@ -19,7 +19,6 @@
 #include "common.h"
 #include "ieee802_11.h"
 #include "wpa.h"
-#include "sta_flags.h"
 #include "sta_info.h"
 #include "mlme.h"
 

diff --git a/hostapd/preauth.c b/hostapd/preauth.c
index 9db6380..d544fc5 100644 (file)
--- a/hostapd/preauth.c
+++ b/hostapd/preauth.c
@@ -22,7 +22,6 @@
 #include "l2_packet/l2_packet.h"
 #include "ieee802_1x.h"
 #include "eloop.h"
-#include "sta_flags.h"
 #include "sta_info.h"
 #include "common/wpa_common.h"
 #include "eapol_auth/eapol_auth_sm.h"

diff --git a/hostapd/sta_flags.h b/hostapd/sta_flags.h
deleted file mode 100644 (file)
index a790039..0000000
--- a/hostapd/sta_flags.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * hostapd - driver interface definition
- * Copyright (c) 2002-2009, Jouni Malinen <j@w1.fi>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * Alternatively, this software may be distributed under the terms of BSD
- * license.
- *
- * See README and COPYING for more details.
- */
-
-#ifndef STA_FLAGS_H
-#define STA_FLAGS_H
-
-/* STA flags */
-#define WLAN_STA_AUTH BIT(0)
-#define WLAN_STA_ASSOC BIT(1)
-#define WLAN_STA_PS BIT(2)
-#define WLAN_STA_TIM BIT(3)
-#define WLAN_STA_PERM BIT(4)
-#define WLAN_STA_AUTHORIZED BIT(5)
-#define WLAN_STA_PENDING_POLL BIT(6) /* pending activity poll not ACKed */
-#define WLAN_STA_SHORT_PREAMBLE BIT(7)
-#define WLAN_STA_PREAUTH BIT(8)
-#define WLAN_STA_WMM BIT(9)
-#define WLAN_STA_MFP BIT(10)
-#define WLAN_STA_HT BIT(11)
-#define WLAN_STA_WPS BIT(12)
-#define WLAN_STA_MAYBE_WPS BIT(13)
-#define WLAN_STA_NONERP BIT(31)
-
-#endif /* STA_FLAGS_H */

diff --git a/hostapd/sta_info.c b/hostapd/sta_info.c
index dd95402..2a2d7ba 100644 (file)
--- a/hostapd/sta_info.c
+++ b/hostapd/sta_info.c
@@ -16,7 +16,6 @@
 
 #include "common.h"
 #include "hostapd.h"
-#include "sta_flags.h"
 #include "sta_info.h"
 #include "eloop.h"
 #include "accounting.h"

diff --git a/hostapd/sta_info.h b/hostapd/sta_info.h
index bd4b3e4..6a98387 100644 (file)
--- a/hostapd/sta_info.h
+++ b/hostapd/sta_info.h
@@ -1,6 +1,6 @@
 /*
  * hostapd / Station table
- * Copyright (c) 2002-2008, Jouni Malinen <j@w1.fi>
+ * Copyright (c) 2002-2009, Jouni Malinen <j@w1.fi>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -15,6 +15,23 @@
 #ifndef STA_INFO_H
 #define STA_INFO_H
 
+/* STA flags */
+#define WLAN_STA_AUTH BIT(0)
+#define WLAN_STA_ASSOC BIT(1)
+#define WLAN_STA_PS BIT(2)
+#define WLAN_STA_TIM BIT(3)
+#define WLAN_STA_PERM BIT(4)
+#define WLAN_STA_AUTHORIZED BIT(5)
+#define WLAN_STA_PENDING_POLL BIT(6) /* pending activity poll not ACKed */
+#define WLAN_STA_SHORT_PREAMBLE BIT(7)
+#define WLAN_STA_PREAUTH BIT(8)
+#define WLAN_STA_WMM BIT(9)
+#define WLAN_STA_MFP BIT(10)
+#define WLAN_STA_HT BIT(11)
+#define WLAN_STA_WPS BIT(12)
+#define WLAN_STA_MAYBE_WPS BIT(13)
+#define WLAN_STA_NONERP BIT(31)
+
 /* Maximum number of supported rates (from both Supported Rates and Extended
  * Supported Rates IEs). */
 #define WLAN_SUPP_RATES_MAX 32
@@ -25,7 +42,7 @@ struct sta_info {
        struct sta_info *hnext; /* next entry in hash table list */
        u8 addr[6];
        u16 aid; /* STA's unique AID (1 .. 2007) or 0 if not yet assigned */
-       u32 flags;
+       u32 flags; /* Bitfield of WLAN_STA_* */
        u16 capability;
        u16 listen_interval; /* or beacon_int for APs */
        u8 supported_rates[WLAN_SUPP_RATES_MAX];

diff --git a/hostapd/tkip_countermeasures.c b/hostapd/tkip_countermeasures.c
index 53747a4..8c7d82a 100644 (file)
--- a/hostapd/tkip_countermeasures.c
+++ b/hostapd/tkip_countermeasures.c
@@ -18,7 +18,6 @@
 #include "hostapd.h"
 #include "eloop.h"
 #include "driver_i.h"
-#include "sta_flags.h"
 #include "sta_info.h"
 #include "mlme.h"
 #include "wpa.h"

diff --git a/hostapd/wme.c b/hostapd/wme.c
index 818ded7..8e17a41 100644 (file)
--- a/hostapd/wme.c
+++ b/hostapd/wme.c
@@ -19,7 +19,6 @@
 #include "hostapd.h"
 #include "ieee802_11.h"
 #include "wme.h"
-#include "sta_flags.h"
 #include "sta_info.h"
 #include "driver_i.h"
 

diff --git a/hostapd/wps_hostapd.c b/hostapd/wps_hostapd.c
index da6c4a5..f0a506d 100644 (file)
--- a/hostapd/wps_hostapd.c
+++ b/hostapd/wps_hostapd.c
@@ -28,7 +28,6 @@
 #include "wps/wps_dev_attr.h"
 #include "hostapd.h"
 #include "driver_i.h"
-#include "sta_flags.h"
 #include "sta_info.h"
 #include "wps_hostapd.h"