Merge branch 'moonshot' of ssh://moonshot.suchdamage.org:822/srv/git/libeap into...
[libeap.git] / wpa_supplicant / driver_i.h
index 12161b2..af8232a 100644 (file)
@@ -22,7 +22,8 @@ static inline void * wpa_drv_init(struct wpa_supplicant *wpa_s,
                                  const char *ifname)
 {
        if (wpa_s->driver->init2)
-               return wpa_s->driver->init2(wpa_s, ifname, wpa_s->global);
+               return wpa_s->driver->init2(wpa_s, ifname,
+                                           wpa_s->global_drv_priv);
        if (wpa_s->driver->init) {
                return wpa_s->driver->init(wpa_s, ifname);
        }
@@ -102,8 +103,9 @@ static inline int wpa_drv_get_ssid(struct wpa_supplicant *wpa_s, u8 *ssid)
        return -1;
 }
 
-static inline int wpa_drv_set_key(struct wpa_supplicant *wpa_s, wpa_alg alg,
-                                  const u8 *addr, int key_idx, int set_tx,
+static inline int wpa_drv_set_key(struct wpa_supplicant *wpa_s,
+                                 enum wpa_alg alg, const u8 *addr,
+                                 int key_idx, int set_tx,
                                   const u8 *seq, size_t seq_len,
                                   const u8 *key, size_t key_len)
 {
@@ -235,7 +237,7 @@ wpa_drv_get_hw_feature_data(struct wpa_supplicant *wpa_s, u16 *num_modes,
 }
 
 static inline int wpa_drv_set_channel(struct wpa_supplicant *wpa_s,
-                                     hostapd_hw_mode phymode, int chan,
+                                     enum hostapd_hw_mode phymode, int chan,
                                      int freq)
 {
        if (wpa_s->driver->set_channel)
@@ -324,8 +326,7 @@ static inline int wpa_drv_set_beacon(struct wpa_supplicant *wpa_s,
                                     int dtim_period, int beacon_int)
 {
        if (wpa_s->driver->set_beacon)
-               return wpa_s->driver->set_beacon(wpa_s->ifname,
-                                                wpa_s->drv_priv, head,
+               return wpa_s->driver->set_beacon(wpa_s->drv_priv, head,
                                                 head_len, tail, tail_len,
                                                 dtim_period, beacon_int);
        return -1;
@@ -335,8 +336,7 @@ static inline int wpa_drv_sta_add(struct wpa_supplicant *wpa_s,
                                  struct hostapd_sta_add_params *params)
 {
        if (wpa_s->driver->sta_add)
-               return wpa_s->driver->sta_add(wpa_s->ifname, wpa_s->drv_priv,
-                                             params);
+               return wpa_s->driver->sta_add(wpa_s->drv_priv, params);
        return -1;
 }
 
@@ -381,4 +381,163 @@ static inline int wpa_drv_set_supp_port(struct wpa_supplicant *wpa_s,
        return 0;
 }
 
+static inline int wpa_drv_send_action(struct wpa_supplicant *wpa_s,
+                                     unsigned int freq,
+                                     const u8 *dst, const u8 *src,
+                                     const u8 *bssid,
+                                     const u8 *data, size_t data_len)
+{
+       if (wpa_s->driver->send_action)
+               return wpa_s->driver->send_action(wpa_s->drv_priv, freq,
+                                                 dst, src, bssid, data,
+                                                 data_len);
+       return -1;
+}
+
+static inline int wpa_drv_set_freq(struct wpa_supplicant *wpa_s,
+                                  struct hostapd_freq_params *freq)
+{
+       if (wpa_s->driver->set_freq)
+               return wpa_s->driver->set_freq(wpa_s->drv_priv, freq);
+       return -1;
+}
+
+static inline int wpa_drv_if_add(struct wpa_supplicant *wpa_s,
+                                enum wpa_driver_if_type type,
+                                const char *ifname, const u8 *addr,
+                                void *bss_ctx, char *force_ifname,
+                                u8 *if_addr)
+{
+       if (wpa_s->driver->if_add)
+               return wpa_s->driver->if_add(wpa_s->drv_priv, type, ifname,
+                                            addr, bss_ctx, NULL, force_ifname,
+                                            if_addr);
+       return -1;
+}
+
+static inline int wpa_drv_if_remove(struct wpa_supplicant *wpa_s,
+                                   enum wpa_driver_if_type type,
+                                   const char *ifname)
+{
+       if (wpa_s->driver->if_remove)
+               return wpa_s->driver->if_remove(wpa_s->drv_priv, type, ifname);
+       return -1;
+}
+
+static inline int wpa_drv_set_intra_bss(struct wpa_supplicant *wpa_s,
+                                       int enabled)
+{
+       if (wpa_s->driver->set_intra_bss)
+               return wpa_s->driver->set_intra_bss(wpa_s->drv_priv, enabled);
+       return -1;
+}
+
+static inline int wpa_drv_remain_on_channel(struct wpa_supplicant *wpa_s,
+                                           unsigned int freq,
+                                           unsigned int duration)
+{
+       if (wpa_s->driver->remain_on_channel)
+               return wpa_s->driver->remain_on_channel(wpa_s->drv_priv, freq,
+                                                       duration);
+       return -1;
+}
+
+static inline int wpa_drv_cancel_remain_on_channel(
+       struct wpa_supplicant *wpa_s)
+{
+       if (wpa_s->driver->cancel_remain_on_channel)
+               return wpa_s->driver->cancel_remain_on_channel(
+                       wpa_s->drv_priv);
+       return -1;
+}
+
+static inline int wpa_drv_probe_req_report(struct wpa_supplicant *wpa_s,
+                                          int report)
+{
+       if (wpa_s->driver->probe_req_report)
+               return wpa_s->driver->probe_req_report(wpa_s->drv_priv,
+                                                      report);
+       return -1;
+}
+
+static inline int wpa_drv_disable_11b_rates(struct wpa_supplicant *wpa_s,
+                                           int disabled)
+{
+       if (wpa_s->driver->disable_11b_rates)
+               return wpa_s->driver->disable_11b_rates(wpa_s->drv_priv,
+                                                       disabled);
+       return -1;
+}
+
+static inline int wpa_drv_deinit_ap(struct wpa_supplicant *wpa_s)
+{
+       if (wpa_s->driver->deinit_ap)
+               return wpa_s->driver->deinit_ap(wpa_s->drv_priv);
+       return 0;
+}
+
+static inline void wpa_drv_suspend(struct wpa_supplicant *wpa_s)
+{
+       if (wpa_s->driver->suspend)
+               wpa_s->driver->suspend(wpa_s->drv_priv);
+}
+
+static inline void wpa_drv_resume(struct wpa_supplicant *wpa_s)
+{
+       if (wpa_s->driver->resume)
+               wpa_s->driver->resume(wpa_s->drv_priv);
+}
+
+static inline int wpa_drv_signal_monitor(struct wpa_supplicant *wpa_s,
+                                        int threshold, int hysteresis)
+{
+       if (wpa_s->driver->signal_monitor)
+               return wpa_s->driver->signal_monitor(wpa_s->drv_priv,
+                                                    threshold, hysteresis);
+       return -1;
+}
+
+static inline int wpa_drv_set_ap_wps_ie(struct wpa_supplicant *wpa_s,
+                                       const struct wpabuf *beacon,
+                                       const struct wpabuf *proberesp,
+                                       const struct wpabuf *assocresp)
+{
+       if (!wpa_s->driver->set_ap_wps_ie)
+               return -1;
+       return wpa_s->driver->set_ap_wps_ie(wpa_s->drv_priv, beacon,
+                                           proberesp, assocresp);
+}
+
+static inline int wpa_drv_shared_freq(struct wpa_supplicant *wpa_s)
+{
+       if (!wpa_s->driver->shared_freq)
+               return -1;
+       return wpa_s->driver->shared_freq(wpa_s->drv_priv);
+}
+
+static inline int wpa_drv_get_noa(struct wpa_supplicant *wpa_s,
+                                 u8 *buf, size_t buf_len)
+{
+       if (!wpa_s->driver->get_noa)
+               return -1;
+       return wpa_s->driver->get_noa(wpa_s->drv_priv, buf, buf_len);
+}
+
+static inline int wpa_drv_set_p2p_powersave(struct wpa_supplicant *wpa_s,
+                                           int legacy_ps, int opp_ps,
+                                           int ctwindow)
+{
+       if (!wpa_s->driver->set_p2p_powersave)
+               return -1;
+       return wpa_s->driver->set_p2p_powersave(wpa_s->drv_priv, legacy_ps,
+                                               opp_ps, ctwindow);
+}
+
+static inline int wpa_drv_ampdu(struct wpa_supplicant *wpa_s, int ampdu)
+{
+       if (!wpa_s->driver->ampdu)
+               return -1;
+       return wpa_s->driver->ampdu(wpa_s->drv_priv, ampdu);
+}
+
 #endif /* DRIVER_I_H */