Merge wireless_event_{,de}init() into {,de}init() driver op

[wpasupplicant] / hostapd / hw_features.h

diff --git a/hostapd/hw_features.h b/hostapd/hw_features.h
index 9caa339..0871eba 100644 (file)
--- a/hostapd/hw_features.h
+++ b/hostapd/hw_features.h
@@ -25,6 +25,7 @@ struct hostapd_channel_data {
        short chan; /* channel number (IEEE 802.11) */
        short freq; /* frequency in MHz */
        int flag; /* flag for hostapd use (HOSTAPD_CHAN_*) */
+       u8 max_tx_power; /* maximum transmit power in dBm */
 };
 
 #define HOSTAPD_RATE_ERP 0x00000001
@@ -46,17 +47,44 @@ struct hostapd_hw_modes {
        struct hostapd_channel_data *channels;
        int num_rates;
        struct hostapd_rate_data *rates;
+       u16 ht_capab;
 };
 
 
+#ifdef NEED_MLME
 void hostapd_free_hw_features(struct hostapd_hw_modes *hw_features,
                              size_t num_hw_features);
 int hostapd_get_hw_features(struct hostapd_iface *iface);
-int hostapd_select_hw_mode_start(struct hostapd_iface *iface,
-                                hostapd_iface_cb cb);
-int hostapd_select_hw_mode_stop(struct hostapd_iface *iface);
+int hostapd_select_hw_mode(struct hostapd_iface *iface);
 const char * hostapd_hw_mode_txt(int mode);
 int hostapd_hw_get_freq(struct hostapd_data *hapd, int chan);
 int hostapd_hw_get_channel(struct hostapd_data *hapd, int freq);
+#else /* NEED_MLME */
+static inline void
+hostapd_free_hw_features(struct hostapd_hw_modes *hw_features,
+                        size_t num_hw_features)
+{
+}
+
+static inline int hostapd_get_hw_features(struct hostapd_iface *iface)
+{
+       return -1;
+}
+
+static inline int hostapd_select_hw_mode(struct hostapd_iface *iface)
+{
+       return -1;
+}
+
+static inline const char * hostapd_hw_mode_txt(int mode)
+{
+       return NULL;
+}
+
+static inline int hostapd_hw_get_freq(struct hostapd_data *hapd, int chan)
+{
+       return -1;
+}
+#endif /* NEED_MLME */
 
 #endif /* HW_FEATURES_H */