Remove set_intra_bss() driver_ops
[mech_eap.git] / wpa_supplicant / driver_i.h
index bfc5b74..b959962 100644 (file)
@@ -79,6 +79,23 @@ static inline int wpa_drv_scan(struct wpa_supplicant *wpa_s,
        return -1;
 }
 
+static inline int wpa_drv_sched_scan(struct wpa_supplicant *wpa_s,
+                                    struct wpa_driver_scan_params *params,
+                                    u32 interval)
+{
+       if (wpa_s->driver->sched_scan)
+               return wpa_s->driver->sched_scan(wpa_s->drv_priv,
+                                                params, interval);
+       return -1;
+}
+
+static inline int wpa_drv_stop_sched_scan(struct wpa_supplicant *wpa_s)
+{
+       if (wpa_s->driver->stop_sched_scan)
+               return wpa_s->driver->stop_sched_scan(wpa_s->drv_priv);
+       return -1;
+}
+
 static inline struct wpa_scan_results * wpa_drv_get_scan_results2(
        struct wpa_supplicant *wpa_s)
 {
@@ -320,15 +337,11 @@ static inline int wpa_drv_send_ft_action(struct wpa_supplicant *wpa_s,
        return -1;
 }
 
-static inline int wpa_drv_set_beacon(struct wpa_supplicant *wpa_s,
-                                    const u8 *head, size_t head_len,
-                                    const u8 *tail, size_t tail_len,
-                                    int dtim_period, int beacon_int)
+static inline int wpa_drv_set_ap(struct wpa_supplicant *wpa_s,
+                                struct wpa_driver_ap_params *params)
 {
-       if (wpa_s->driver->set_beacon)
-               return wpa_s->driver->set_beacon(wpa_s->drv_priv, head,
-                                                head_len, tail, tail_len,
-                                                dtim_period, beacon_int);
+       if (wpa_s->driver->set_ap)
+               return wpa_s->driver->set_ap(wpa_s->drv_priv, params);
        return -1;
 }
 
@@ -351,12 +364,12 @@ static inline int wpa_drv_sta_remove(struct wpa_supplicant *wpa_s,
 static inline int wpa_drv_hapd_send_eapol(struct wpa_supplicant *wpa_s,
                                          const u8 *addr, const u8 *data,
                                          size_t data_len, int encrypt,
-                                         const u8 *own_addr)
+                                         const u8 *own_addr, u32 flags)
 {
        if (wpa_s->driver->hapd_send_eapol)
                return wpa_s->driver->hapd_send_eapol(wpa_s->drv_priv, addr,
                                                      data, data_len, encrypt,
-                                                     own_addr);
+                                                     own_addr, flags);
        return -1;
 }
 
@@ -383,17 +396,24 @@ static inline int wpa_drv_set_supp_port(struct wpa_supplicant *wpa_s,
 
 static inline int wpa_drv_send_action(struct wpa_supplicant *wpa_s,
                                      unsigned int freq,
+                                     unsigned int wait,
                                      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);
+                                                 wait, dst, src, bssid,
+                                                 data, data_len);
        return -1;
 }
 
+static inline void wpa_drv_send_action_cancel_wait(struct wpa_supplicant *wpa_s)
+{
+       if (wpa_s->driver->send_action_cancel_wait)
+               wpa_s->driver->send_action_cancel_wait(wpa_s->drv_priv);
+}
+
 static inline int wpa_drv_set_freq(struct wpa_supplicant *wpa_s,
                                   struct hostapd_freq_params *freq)
 {
@@ -406,12 +426,12 @@ 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)
+                                u8 *if_addr, const char *bridge)
 {
        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);
+                                            if_addr, bridge);
        return -1;
 }
 
@@ -489,14 +509,23 @@ static inline int wpa_drv_signal_monitor(struct wpa_supplicant *wpa_s,
        return -1;
 }
 
+static inline int wpa_drv_signal_poll(struct wpa_supplicant *wpa_s,
+                                     struct wpa_signal_info *si)
+{
+       if (wpa_s->driver->signal_poll)
+               return wpa_s->driver->signal_poll(wpa_s->drv_priv, si);
+       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 *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);
+                                           proberesp, assocresp);
 }
 
 static inline int wpa_drv_shared_freq(struct wpa_supplicant *wpa_s)
@@ -531,4 +560,162 @@ static inline int wpa_drv_ampdu(struct wpa_supplicant *wpa_s, int ampdu)
        return wpa_s->driver->ampdu(wpa_s->drv_priv, ampdu);
 }
 
+static inline int wpa_drv_p2p_find(struct wpa_supplicant *wpa_s,
+                                  unsigned int timeout, int type)
+{
+       if (!wpa_s->driver->p2p_find)
+               return -1;
+       return wpa_s->driver->p2p_find(wpa_s->drv_priv, timeout, type);
+}
+
+static inline int wpa_drv_p2p_stop_find(struct wpa_supplicant *wpa_s)
+{
+       if (!wpa_s->driver->p2p_stop_find)
+               return -1;
+       return wpa_s->driver->p2p_stop_find(wpa_s->drv_priv);
+}
+
+static inline int wpa_drv_p2p_listen(struct wpa_supplicant *wpa_s,
+                                    unsigned int timeout)
+{
+       if (!wpa_s->driver->p2p_listen)
+               return -1;
+       return wpa_s->driver->p2p_listen(wpa_s->drv_priv, timeout);
+}
+
+static inline int wpa_drv_p2p_connect(struct wpa_supplicant *wpa_s,
+                                     const u8 *peer_addr, int wps_method,
+                                     int go_intent,
+                                     const u8 *own_interface_addr,
+                                     unsigned int force_freq,
+                                     int persistent_group)
+{
+       if (!wpa_s->driver->p2p_connect)
+               return -1;
+       return wpa_s->driver->p2p_connect(wpa_s->drv_priv, peer_addr,
+                                         wps_method, go_intent,
+                                         own_interface_addr, force_freq,
+                                         persistent_group);
+}
+
+static inline int wpa_drv_wps_success_cb(struct wpa_supplicant *wpa_s,
+                                        const u8 *peer_addr)
+{
+       if (!wpa_s->driver->wps_success_cb)
+               return -1;
+       return wpa_s->driver->wps_success_cb(wpa_s->drv_priv, peer_addr);
+}
+
+static inline int
+wpa_drv_p2p_group_formation_failed(struct wpa_supplicant *wpa_s)
+{
+       if (!wpa_s->driver->p2p_group_formation_failed)
+               return -1;
+       return wpa_s->driver->p2p_group_formation_failed(wpa_s->drv_priv);
+}
+
+static inline int wpa_drv_p2p_set_params(struct wpa_supplicant *wpa_s,
+                                        const struct p2p_params *params)
+{
+       if (!wpa_s->driver->p2p_set_params)
+               return -1;
+       return wpa_s->driver->p2p_set_params(wpa_s->drv_priv, params);
+}
+
+static inline int wpa_drv_p2p_prov_disc_req(struct wpa_supplicant *wpa_s,
+                                           const u8 *peer_addr,
+                                           u16 config_methods)
+{
+       if (!wpa_s->driver->p2p_prov_disc_req)
+               return -1;
+       return wpa_s->driver->p2p_prov_disc_req(wpa_s->drv_priv, peer_addr,
+                                               config_methods);
+}
+
+static inline u64 wpa_drv_p2p_sd_request(struct wpa_supplicant *wpa_s,
+                                        const u8 *dst,
+                                        const struct wpabuf *tlvs)
+{
+       if (!wpa_s->driver->p2p_sd_request)
+               return 0;
+       return wpa_s->driver->p2p_sd_request(wpa_s->drv_priv, dst, tlvs);
+}
+
+static inline int wpa_drv_p2p_sd_cancel_request(struct wpa_supplicant *wpa_s,
+                                               u64 req)
+{
+       if (!wpa_s->driver->p2p_sd_cancel_request)
+               return -1;
+       return wpa_s->driver->p2p_sd_cancel_request(wpa_s->drv_priv, req);
+}
+
+static inline int wpa_drv_p2p_sd_response(struct wpa_supplicant *wpa_s,
+                                         int freq, const u8 *dst,
+                                         u8 dialog_token,
+                                         const struct wpabuf *resp_tlvs)
+{
+       if (!wpa_s->driver->p2p_sd_response)
+               return -1;
+       return wpa_s->driver->p2p_sd_response(wpa_s->drv_priv, freq, dst,
+                                             dialog_token, resp_tlvs);
+}
+
+static inline int wpa_drv_p2p_service_update(struct wpa_supplicant *wpa_s)
+{
+       if (!wpa_s->driver->p2p_service_update)
+               return -1;
+       return wpa_s->driver->p2p_service_update(wpa_s->drv_priv);
+}
+
+static inline int wpa_drv_p2p_reject(struct wpa_supplicant *wpa_s,
+                                    const u8 *addr)
+{
+       if (!wpa_s->driver->p2p_reject)
+               return -1;
+       return wpa_s->driver->p2p_reject(wpa_s->drv_priv, addr);
+}
+
+static inline int wpa_drv_p2p_invite(struct wpa_supplicant *wpa_s,
+                                    const u8 *peer, int role, const u8 *bssid,
+                                    const u8 *ssid, size_t ssid_len,
+                                    const u8 *go_dev_addr,
+                                    int persistent_group)
+{
+       if (!wpa_s->driver->p2p_invite)
+               return -1;
+       return wpa_s->driver->p2p_invite(wpa_s->drv_priv, peer, role, bssid,
+                                        ssid, ssid_len, go_dev_addr,
+                                        persistent_group);
+}
+
+static inline int wpa_drv_send_tdls_mgmt(struct wpa_supplicant *wpa_s,
+                                        const u8 *dst, u8 action_code,
+                                        u8 dialog_token, u16 status_code,
+                                        const u8 *buf, size_t len)
+{
+       if (wpa_s->driver->send_tdls_mgmt) {
+               return wpa_s->driver->send_tdls_mgmt(wpa_s->drv_priv, dst,
+                                                    action_code, dialog_token,
+                                                    status_code, buf, len);
+       }
+       return -1;
+}
+
+static inline int wpa_drv_tdls_oper(struct wpa_supplicant *wpa_s,
+                                   enum tdls_oper oper, const u8 *peer)
+{
+       if (!wpa_s->driver->tdls_oper)
+               return -1;
+       return wpa_s->driver->tdls_oper(wpa_s->drv_priv, oper, peer);
+}
+
+static inline void wpa_drv_set_rekey_info(struct wpa_supplicant *wpa_s,
+                                         const u8 *kek, const u8 *kck,
+                                         const u8 *replay_ctr)
+{
+       if (!wpa_s->driver->set_rekey_info)
+               return;
+       wpa_s->driver->set_rekey_info(wpa_s->drv_priv, kek, kck, replay_ctr);
+}
+
 #endif /* DRIVER_I_H */