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

[wpasupplicant] / hostapd / driver.h

diff --git a/hostapd/driver.h b/hostapd/driver.h
index 6db7d37..a7b371a 100644 (file)
--- a/hostapd/driver.h
+++ b/hostapd/driver.h
@@ -47,6 +47,7 @@ struct hostapd_sta_add_params {
 struct hostapd_freq_params {
        int mode;
        int freq;
+       int channel;
        int ht_enabled;
        int sec_channel_offset; /* 0 = HT40 disabled, -1 = HT40 enabled,
                                 * secondary channel below primary, 1 = HT40
@@ -72,9 +73,6 @@ struct hapd_driver_ops {
        void * (*init_bssid)(struct hostapd_data *hapd, const u8 *bssid);
        void (*deinit)(void *priv);
 
-       int (*wireless_event_init)(void *priv);
-       void (*wireless_event_deinit)(void *priv);
-
        /**
         * set_8021x - enable/disable IEEE 802.1X support
         * @ifname: Interface name (for multi-SSID/VLAN support)
@@ -143,8 +141,8 @@ struct hapd_driver_ops {
        int (*set_country)(void *priv, const char *country);
        int (*set_ieee80211d)(void *priv, int enabled);
        int (*set_beacon)(const char *ifname, void *priv,
-                         u8 *head, size_t head_len,
-                         u8 *tail, size_t tail_len);
+                         const u8 *head, size_t head_len,
+                         const u8 *tail, size_t tail_len, int dtim_period);
 
        /* Configure internal bridge:
         * 0 = disabled, i.e., client separation is enabled (no bridging of
@@ -153,7 +151,6 @@ struct hapd_driver_ops {
         */
        int (*set_internal_bridge)(void *priv, int value);
        int (*set_beacon_int)(void *priv, int value);
-       int (*set_dtim_period)(const char *ifname, void *priv, int value);
        /* Configure broadcast SSID mode:
         * 0 = include SSID in Beacon frames and reply to Probe Request frames
         *     that use broadcast SSID
@@ -217,6 +214,8 @@ struct hapd_driver_ops {
        (*get_neighbor_bss)(void *priv, size_t *num);
 };
 
+struct sta_info;
+
 void hostapd_new_assoc_sta(struct hostapd_data *hapd, struct sta_info *sta,
                           int reassoc);
 void hostapd_tx_status(struct hostapd_data *hapd, const u8 *addr,