Replace src/ap/driver_i.h with non-inlined functions in ap_drv_ops.c

diff --git a/src/ap/ap_drv_ops.c b/src/ap/ap_drv_ops.c
index 381a3a7..8fb9913 100644 (file)
--- a/src/ap/ap_drv_ops.c
+++ b/src/ap/ap_drv_ops.c
@@ -15,11 +15,11 @@
 #include "utils/includes.h"
 
 #include "utils/common.h"
+#include "drivers/driver.h"
 #include "hostapd.h"
 #include "ieee802_11.h"
 #include "sta_info.h"
 #include "ap_config.h"
-#include "driver_i.h"
 #include "ap_drv_ops.h"
 
 
@@ -423,3 +423,192 @@ int hostapd_if_remove(struct hostapd_data *hapd, enum wpa_driver_if_type type,
                return -1;
        return hapd->driver->if_remove(hapd->drv_priv, type, ifname);
 }
+
+
+int hostapd_set_ieee8021x(struct hostapd_data *hapd,
+                         struct wpa_bss_params *params)
+{
+       if (hapd->driver == NULL || hapd->driver->set_ieee8021x == NULL)
+               return 0;
+       return hapd->driver->set_ieee8021x(hapd->drv_priv, params);
+}
+
+
+int hostapd_get_seqnum(const char *ifname, struct hostapd_data *hapd,
+                      const u8 *addr, int idx, u8 *seq)
+{
+       if (hapd->driver == NULL || hapd->driver->get_seqnum == NULL)
+               return 0;
+       return hapd->driver->get_seqnum(ifname, hapd->drv_priv, addr, idx,
+                                       seq);
+}
+
+
+int hostapd_flush(struct hostapd_data *hapd)
+{
+       if (hapd->driver == NULL || hapd->driver->flush == NULL)
+               return 0;
+       return hapd->driver->flush(hapd->drv_priv);
+}
+
+
+int hostapd_set_freq(struct hostapd_data *hapd, int mode, int freq,
+                    int channel, int ht_enabled, int sec_channel_offset)
+{
+       struct hostapd_freq_params data;
+       if (hapd->driver == NULL)
+               return 0;
+       if (hapd->driver->set_freq == NULL)
+               return 0;
+       os_memset(&data, 0, sizeof(data));
+       data.mode = mode;
+       data.freq = freq;
+       data.channel = channel;
+       data.ht_enabled = ht_enabled;
+       data.sec_channel_offset = sec_channel_offset;
+       return hapd->driver->set_freq(hapd->drv_priv, &data);
+}
+
+int hostapd_set_rts(struct hostapd_data *hapd, int rts)
+{
+       if (hapd->driver == NULL || hapd->driver->set_rts == NULL)
+               return 0;
+       return hapd->driver->set_rts(hapd->drv_priv, rts);
+}
+
+
+int hostapd_set_frag(struct hostapd_data *hapd, int frag)
+{
+       if (hapd->driver == NULL || hapd->driver->set_frag == NULL)
+               return 0;
+       return hapd->driver->set_frag(hapd->drv_priv, frag);
+}
+
+
+int hostapd_sta_set_flags(struct hostapd_data *hapd, u8 *addr,
+                         int total_flags, int flags_or, int flags_and)
+{
+       if (hapd->driver == NULL || hapd->driver->sta_set_flags == NULL)
+               return 0;
+       return hapd->driver->sta_set_flags(hapd->drv_priv, addr, total_flags,
+                                          flags_or, flags_and);
+}
+
+
+int hostapd_set_rate_sets(struct hostapd_data *hapd, int *supp_rates,
+                         int *basic_rates, int mode)
+{
+       if (hapd->driver == NULL || hapd->driver->set_rate_sets == NULL)
+               return 0;
+       return hapd->driver->set_rate_sets(hapd->drv_priv, supp_rates,
+                                          basic_rates, mode);
+}
+
+
+int hostapd_set_country(struct hostapd_data *hapd, const char *country)
+{
+       if (hapd->driver == NULL ||
+           hapd->driver->set_country == NULL)
+               return 0;
+       return hapd->driver->set_country(hapd->drv_priv, country);
+}
+
+
+int hostapd_set_cts_protect(struct hostapd_data *hapd, int value)
+{
+       if (hapd->driver == NULL || hapd->driver->set_cts_protect == NULL)
+               return 0;
+       return hapd->driver->set_cts_protect(hapd->drv_priv, value);
+}
+
+
+int hostapd_set_preamble(struct hostapd_data *hapd, int value)
+{
+       if (hapd->driver == NULL || hapd->driver->set_preamble == NULL)
+               return 0;
+       return hapd->driver->set_preamble(hapd->drv_priv, value);
+}
+
+
+int hostapd_set_short_slot_time(struct hostapd_data *hapd, int value)
+{
+       if (hapd->driver == NULL || hapd->driver->set_short_slot_time == NULL)
+               return 0;
+       return hapd->driver->set_short_slot_time(hapd->drv_priv, value);
+}
+
+
+int hostapd_set_tx_queue_params(struct hostapd_data *hapd, int queue, int aifs,
+                               int cw_min, int cw_max, int burst_time)
+{
+       if (hapd->driver == NULL || hapd->driver->set_tx_queue_params == NULL)
+               return 0;
+       return hapd->driver->set_tx_queue_params(hapd->drv_priv, queue, aifs,
+                                                cw_min, cw_max, burst_time);
+}
+
+
+int hostapd_valid_bss_mask(struct hostapd_data *hapd, const u8 *addr,
+                          const u8 *mask)
+{
+       if (hapd->driver == NULL || hapd->driver->valid_bss_mask == NULL)
+               return 1;
+       return hapd->driver->valid_bss_mask(hapd->drv_priv, addr, mask);
+}
+
+
+struct hostapd_hw_modes *
+hostapd_get_hw_feature_data(struct hostapd_data *hapd, u16 *num_modes,
+                           u16 *flags)
+{
+       if (hapd->driver == NULL ||
+           hapd->driver->get_hw_feature_data == NULL)
+               return NULL;
+       return hapd->driver->get_hw_feature_data(hapd->drv_priv, num_modes,
+                                                flags);
+}
+
+
+int hostapd_driver_commit(struct hostapd_data *hapd)
+{
+       if (hapd->driver == NULL || hapd->driver->commit == NULL)
+               return 0;
+       return hapd->driver->commit(hapd->drv_priv);
+}
+
+
+int hostapd_set_ht_params(const char *ifname, struct hostapd_data *hapd,
+                         const u8 *ht_capab, size_t ht_capab_len,
+                         const u8 *ht_oper, size_t ht_oper_len)
+{
+       if (hapd->driver == NULL || hapd->driver->set_ht_params == NULL ||
+           ht_capab == NULL || ht_oper == NULL)
+               return 0;
+       return hapd->driver->set_ht_params(
+               ifname, hapd->drv_priv, ht_capab, ht_capab_len,
+               ht_oper, ht_oper_len);
+}
+
+
+int hostapd_drv_none(struct hostapd_data *hapd)
+{
+       return hapd->driver && os_strcmp(hapd->driver->name, "none") == 0;
+}
+
+
+int hostapd_driver_scan(struct hostapd_data *hapd,
+                       struct wpa_driver_scan_params *params)
+{
+       if (hapd->driver && hapd->driver->scan2)
+               return hapd->driver->scan2(hapd->drv_priv, params);
+       return -1;
+}
+
+
+struct wpa_scan_results * hostapd_driver_get_scan_results(
+       struct hostapd_data *hapd)
+{
+       if (hapd->driver && hapd->driver->get_scan_results2)
+               return hapd->driver->get_scan_results2(hapd->drv_priv);
+       return NULL;
+}

diff --git a/src/ap/ap_drv_ops.h b/src/ap/ap_drv_ops.h
index e0762d6..0efde28 100644 (file)
--- a/src/ap/ap_drv_ops.h
+++ b/src/ap/ap_drv_ops.h
@@ -15,6 +15,10 @@
 #ifndef AP_DRV_OPS
 #define AP_DRV_OPS
 
+enum wpa_driver_if_type;
+struct wpa_bss_params;
+struct wpa_driver_scan_params;
+
 void hostapd_set_driver_ops(struct hostapd_driver_ops *ops);
 int hostapd_set_privacy(struct hostapd_data *hapd, int enabled);
 int hostapd_set_generic_elem(struct hostapd_data *hapd, const u8 *elem,
@@ -25,5 +29,38 @@ int hostapd_if_add(struct hostapd_data *hapd, enum wpa_driver_if_type type,
                   const char *ifname, const u8 *addr, void *bss_ctx);
 int hostapd_if_remove(struct hostapd_data *hapd, enum wpa_driver_if_type type,
                      const char *ifname);
+int hostapd_set_ieee8021x(struct hostapd_data *hapd,
+                         struct wpa_bss_params *params);
+int hostapd_get_seqnum(const char *ifname, struct hostapd_data *hapd,
+                      const u8 *addr, int idx, u8 *seq);
+int hostapd_flush(struct hostapd_data *hapd);
+int hostapd_set_freq(struct hostapd_data *hapd, int mode, int freq,
+                    int channel, int ht_enabled, int sec_channel_offset);
+int hostapd_set_rts(struct hostapd_data *hapd, int rts);
+int hostapd_set_frag(struct hostapd_data *hapd, int frag);
+int hostapd_sta_set_flags(struct hostapd_data *hapd, u8 *addr,
+                         int total_flags, int flags_or, int flags_and);
+int hostapd_set_rate_sets(struct hostapd_data *hapd, int *supp_rates,
+                         int *basic_rates, int mode);
+int hostapd_set_country(struct hostapd_data *hapd, const char *country);
+int hostapd_set_cts_protect(struct hostapd_data *hapd, int value);
+int hostapd_set_preamble(struct hostapd_data *hapd, int value);
+int hostapd_set_short_slot_time(struct hostapd_data *hapd, int value);
+int hostapd_set_tx_queue_params(struct hostapd_data *hapd, int queue, int aifs,
+                               int cw_min, int cw_max, int burst_time);
+int hostapd_valid_bss_mask(struct hostapd_data *hapd, const u8 *addr,
+                          const u8 *mask);
+struct hostapd_hw_modes *
+hostapd_get_hw_feature_data(struct hostapd_data *hapd, u16 *num_modes,
+                           u16 *flags);
+int hostapd_driver_commit(struct hostapd_data *hapd);
+int hostapd_set_ht_params(const char *ifname, struct hostapd_data *hapd,
+                         const u8 *ht_capab, size_t ht_capab_len,
+                         const u8 *ht_oper, size_t ht_oper_len);
+int hostapd_drv_none(struct hostapd_data *hapd);
+int hostapd_driver_scan(struct hostapd_data *hapd,
+                       struct wpa_driver_scan_params *params);
+struct wpa_scan_results * hostapd_driver_get_scan_results(
+       struct hostapd_data *hapd);
 
 #endif /* AP_DRV_OPS */

diff --git a/src/ap/driver_i.h b/src/ap/driver_i.h
deleted file mode 100644 (file)
index ff0e1e6..0000000
--- a/src/ap/driver_i.h
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
- * hostapd - internal driver interface wrappers
- * 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 DRIVER_I_H
-#define DRIVER_I_H
-
-#include "drivers/driver.h"
-
-static inline int
-hostapd_set_ieee8021x(struct hostapd_data *hapd, struct wpa_bss_params *params)
-{
-       if (hapd->driver == NULL || hapd->driver->set_ieee8021x == NULL)
-               return 0;
-       return hapd->driver->set_ieee8021x(hapd->drv_priv, params);
-}
-
-static inline int
-hostapd_get_seqnum(const char *ifname, struct hostapd_data *hapd,
-                  const u8 *addr, int idx, u8 *seq)
-{
-       if (hapd->driver == NULL || hapd->driver->get_seqnum == NULL)
-               return 0;
-       return hapd->driver->get_seqnum(ifname, hapd->drv_priv, addr, idx,
-                                       seq);
-}
-
-static inline int
-hostapd_flush(struct hostapd_data *hapd)
-{
-       if (hapd->driver == NULL || hapd->driver->flush == NULL)
-               return 0;
-       return hapd->driver->flush(hapd->drv_priv);
-}
-
-static inline int
-hostapd_set_freq(struct hostapd_data *hapd, int mode, int freq, int channel,
-                int ht_enabled, int sec_channel_offset)
-{
-       struct hostapd_freq_params data;
-       if (hapd->driver == NULL)
-               return 0;
-       if (hapd->driver->set_freq == NULL)
-               return 0;
-       os_memset(&data, 0, sizeof(data));
-       data.mode = mode;
-       data.freq = freq;
-       data.channel = channel;
-       data.ht_enabled = ht_enabled;
-       data.sec_channel_offset = sec_channel_offset;
-       return hapd->driver->set_freq(hapd->drv_priv, &data);
-}
-
-static inline int
-hostapd_set_rts(struct hostapd_data *hapd, int rts)
-{
-       if (hapd->driver == NULL || hapd->driver->set_rts == NULL)
-               return 0;
-       return hapd->driver->set_rts(hapd->drv_priv, rts);
-}
-
-static inline int
-hostapd_set_frag(struct hostapd_data *hapd, int frag)
-{
-       if (hapd->driver == NULL || hapd->driver->set_frag == NULL)
-               return 0;
-       return hapd->driver->set_frag(hapd->drv_priv, frag);
-}
-
-static inline int
-hostapd_sta_set_flags(struct hostapd_data *hapd, u8 *addr,
-                     int total_flags, int flags_or, int flags_and)
-{
-       if (hapd->driver == NULL || hapd->driver->sta_set_flags == NULL)
-               return 0;
-       return hapd->driver->sta_set_flags(hapd->drv_priv, addr, total_flags,
-                                          flags_or, flags_and);
-}
-
-static inline int
-hostapd_set_rate_sets(struct hostapd_data *hapd, int *supp_rates,
-                     int *basic_rates, int mode)
-{
-       if (hapd->driver == NULL || hapd->driver->set_rate_sets == NULL)
-               return 0;
-       return hapd->driver->set_rate_sets(hapd->drv_priv, supp_rates,
-                                          basic_rates, mode);
-}
-
-static inline int
-hostapd_set_country(struct hostapd_data *hapd, const char *country)
-{
-       if (hapd->driver == NULL ||
-           hapd->driver->set_country == NULL)
-               return 0;
-       return hapd->driver->set_country(hapd->drv_priv, country);
-}
-
-static inline int
-hostapd_set_cts_protect(struct hostapd_data *hapd, int value)
-{
-       if (hapd->driver == NULL || hapd->driver->set_cts_protect == NULL)
-               return 0;
-       return hapd->driver->set_cts_protect(hapd->drv_priv, value);
-}
-
-static inline int
-hostapd_set_preamble(struct hostapd_data *hapd, int value)
-{
-       if (hapd->driver == NULL || hapd->driver->set_preamble == NULL)
-               return 0;
-       return hapd->driver->set_preamble(hapd->drv_priv, value);
-}
-
-static inline int
-hostapd_set_short_slot_time(struct hostapd_data *hapd, int value)
-{
-       if (hapd->driver == NULL || hapd->driver->set_short_slot_time == NULL)
-               return 0;
-       return hapd->driver->set_short_slot_time(hapd->drv_priv, value);
-}
-
-static inline int
-hostapd_set_tx_queue_params(struct hostapd_data *hapd, int queue, int aifs,
-                           int cw_min, int cw_max, int burst_time)
-{
-       if (hapd->driver == NULL || hapd->driver->set_tx_queue_params == NULL)
-               return 0;
-       return hapd->driver->set_tx_queue_params(hapd->drv_priv, queue, aifs,
-                                                cw_min, cw_max, burst_time);
-}
-
-static inline int
-hostapd_valid_bss_mask(struct hostapd_data *hapd, const u8 *addr,
-                      const u8 *mask)
-{
-       if (hapd->driver == NULL || hapd->driver->valid_bss_mask == NULL)
-               return 1;
-       return hapd->driver->valid_bss_mask(hapd->drv_priv, addr, mask);
-}
-
-static inline struct hostapd_hw_modes *
-hostapd_get_hw_feature_data(struct hostapd_data *hapd, u16 *num_modes,
-                           u16 *flags)
-{
-       if (hapd->driver == NULL ||
-           hapd->driver->get_hw_feature_data == NULL)
-               return NULL;
-       return hapd->driver->get_hw_feature_data(hapd->drv_priv, num_modes,
-                                                flags);
-}
-
-static inline int
-hostapd_driver_commit(struct hostapd_data *hapd)
-{
-       if (hapd->driver == NULL || hapd->driver->commit == NULL)
-               return 0;
-       return hapd->driver->commit(hapd->drv_priv);
-}
-
-static inline int
-hostapd_set_ht_params(const char *ifname, struct hostapd_data *hapd,
-                     const u8 *ht_capab, size_t ht_capab_len,
-                     const u8 *ht_oper, size_t ht_oper_len)
-{
-       if (hapd->driver == NULL || hapd->driver->set_ht_params == NULL ||
-           ht_capab == NULL || ht_oper == NULL)
-               return 0;
-       return hapd->driver->set_ht_params(
-               ifname, hapd->drv_priv, ht_capab, ht_capab_len,
-               ht_oper, ht_oper_len);
-}
-
-static inline int
-hostapd_drv_none(struct hostapd_data *hapd)
-{
-       return hapd->driver && os_strcmp(hapd->driver->name, "none") == 0;
-}
-
-static inline int hostapd_driver_scan(struct hostapd_data *hapd,
-                                     struct wpa_driver_scan_params *params)
-{
-       if (hapd->driver && hapd->driver->scan2)
-               return hapd->driver->scan2(hapd->drv_priv, params);
-       return -1;
-}
-
-static inline struct wpa_scan_results * hostapd_driver_get_scan_results(
-       struct hostapd_data *hapd)
-{
-       if (hapd->driver && hapd->driver->get_scan_results2)
-               return hapd->driver->get_scan_results2(hapd->drv_priv);
-       return NULL;
-}
-
-#endif /* DRIVER_I_H */

diff --git a/src/ap/drv_callbacks.c b/src/ap/drv_callbacks.c
index fd7a366..26c7a0d 100644 (file)
--- a/src/ap/drv_callbacks.c
+++ b/src/ap/drv_callbacks.c
@@ -16,6 +16,7 @@
 
 #include "utils/common.h"
 #include "radius/radius.h"
+#include "drivers/driver.h"
 #include "hostapd.h"
 #include "ieee802_11.h"
 #include "sta_info.h"
@@ -27,7 +28,6 @@
 #include "wmm.h"
 #include "wps_hostapd.h"
 #include "ap_config.h"
-#include "driver_i.h"
 
 
 int hostapd_notif_new_sta(struct hostapd_data *hapd, const u8 *addr)

diff --git a/src/ap/hostapd.c b/src/ap/hostapd.c
index b77ff27..492c6a5 100644 (file)
--- a/src/ap/hostapd.c
+++ b/src/ap/hostapd.c
@@ -18,6 +18,7 @@
 #include "utils/eloop.h"
 #include "common/ieee802_11_defs.h"
 #include "radius/radius_client.h"
+#include "drivers/driver.h"
 #include "hostapd.h"
 #include "authsrv.h"
 #include "sta_info.h"
@@ -31,7 +32,6 @@
 #include "wpa_auth.h"
 #include "wps_hostapd.h"
 #include "hw_features.h"
-#include "driver_i.h"
 #include "wpa_auth_glue.h"
 #include "ap_drv_ops.h"
 #include "ap_config.h"

diff --git a/src/ap/hw_features.c b/src/ap/hw_features.c
index f4081cf..9f00e7f 100644 (file)
--- a/src/ap/hw_features.c
+++ b/src/ap/hw_features.c
@@ -20,9 +20,10 @@
 #include "utils/eloop.h"
 #include "common/ieee802_11_defs.h"
 #include "common/ieee802_11_common.h"
+#include "drivers/driver.h"
 #include "hostapd.h"
 #include "ap_config.h"
-#include "driver_i.h"
+#include "ap_drv_ops.h"
 #include "hw_features.h"
 
 

diff --git a/src/ap/wpa_auth_glue.c b/src/ap/wpa_auth_glue.c
index a8284b5..8a6ee83 100644 (file)
--- a/src/ap/wpa_auth_glue.c
+++ b/src/ap/wpa_auth_glue.c
@@ -20,12 +20,12 @@
 #include "eapol_auth/eapol_auth_sm_i.h"
 #include "eap_server/eap.h"
 #include "l2_packet/l2_packet.h"
+#include "drivers/driver.h"
 #include "hostapd.h"
 #include "ieee802_1x.h"
 #include "preauth_auth.h"
 #include "sta_info.h"
 #include "tkip_countermeasures.h"
-#include "driver_i.h"
 #include "ap_drv_ops.h"
 #include "ap_config.h"
 #include "wpa_auth.h"