Merge branch 'moonshot' of ssh://moonshot.suchdamage.org:822/srv/git/libeap into...

[libeap.git] / wpa_supplicant / driver_i.h

diff --git a/wpa_supplicant/driver_i.h b/wpa_supplicant/driver_i.h
index bd31253..af8232a 100644 (file)
--- a/wpa_supplicant/driver_i.h
+++ b/wpa_supplicant/driver_i.h
@@ -326,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;
@@ -337,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;
 }
 
@@ -396,20 +394,42 @@ static inline int wpa_drv_send_action(struct wpa_supplicant *wpa_s,
        return -1;
 }
 
-static inline int wpa_drv_alloc_interface_addr(struct wpa_supplicant *wpa_s,
-                                              u8 *addr, char *ifname)
+static inline int wpa_drv_set_freq(struct wpa_supplicant *wpa_s,
+                                  struct hostapd_freq_params *freq)
 {
-       if (wpa_s->driver->alloc_interface_addr)
-               return wpa_s->driver->alloc_interface_addr(wpa_s->drv_priv,
-                                                          addr, ifname);
+       if (wpa_s->driver->set_freq)
+               return wpa_s->driver->set_freq(wpa_s->drv_priv, freq);
        return -1;
 }
 
-static inline void wpa_drv_release_interface_addr(struct wpa_supplicant *wpa_s,
-                                                 const u8 *addr)
+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->release_interface_addr)
-               wpa_s->driver->release_interface_addr(wpa_s->drv_priv, 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,
@@ -456,4 +476,68 @@ static inline int wpa_drv_deinit_ap(struct wpa_supplicant *wpa_s)
        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 */