Remove obsoleted get_scan_results() driver_ops

[mech_eap.git] / wpa_supplicant / driver_i.h

diff --git a/wpa_supplicant/driver_i.h b/wpa_supplicant/driver_i.h
index 4d1446f..12161b2 100644 (file)
--- a/wpa_supplicant/driver_i.h
+++ b/wpa_supplicant/driver_i.h
@@ -43,16 +43,6 @@ static inline int wpa_drv_set_param(struct wpa_supplicant *wpa_s,
        return 0;
 }
 
-static inline int wpa_drv_set_drop_unencrypted(struct wpa_supplicant *wpa_s,
-                                              int enabled)
-{
-       if (wpa_s->driver->set_drop_unencrypted) {
-               return wpa_s->driver->set_drop_unencrypted(wpa_s->drv_priv,
-                                                          enabled);
-       }
-       return -1;
-}
-
 static inline int wpa_drv_set_countermeasures(struct wpa_supplicant *wpa_s,
                                              int enabled)
 {
@@ -63,32 +53,6 @@ static inline int wpa_drv_set_countermeasures(struct wpa_supplicant *wpa_s,
        return -1;
 }
 
-static inline int wpa_drv_set_auth_alg(struct wpa_supplicant *wpa_s,
-                                      int auth_alg)
-{
-       if (wpa_s->driver->set_auth_alg) {
-               return wpa_s->driver->set_auth_alg(wpa_s->drv_priv,
-                                                  auth_alg);
-       }
-       return -1;
-}
-
-static inline int wpa_drv_set_wpa(struct wpa_supplicant *wpa_s, int enabled)
-{
-       if (wpa_s->driver->set_wpa) {
-               return wpa_s->driver->set_wpa(wpa_s->drv_priv, enabled);
-       }
-       return 0;
-}
-
-static inline int wpa_drv_set_mode(struct wpa_supplicant *wpa_s, int mode)
-{
-       if (wpa_s->driver->set_mode) {
-               return wpa_s->driver->set_mode(wpa_s->drv_priv, mode);
-       }
-       return 0;
-}
-
 static inline int wpa_drv_authenticate(struct wpa_supplicant *wpa_s,
                                       struct wpa_driver_auth_params *params)
 {
@@ -111,21 +75,6 @@ static inline int wpa_drv_scan(struct wpa_supplicant *wpa_s,
 {
        if (wpa_s->driver->scan2)
                return wpa_s->driver->scan2(wpa_s->drv_priv, params);
-       if (wpa_s->driver->scan)
-               return wpa_s->driver->scan(wpa_s->drv_priv,
-                                          params->ssids[0].ssid,
-                                          params->ssids[0].ssid_len);
-       return -1;
-}
-
-static inline int wpa_drv_get_scan_results(struct wpa_supplicant *wpa_s,
-                                          struct wpa_scan_result *results,
-                                          size_t max_size)
-{
-       if (wpa_s->driver->get_scan_results) {
-               return wpa_s->driver->get_scan_results(wpa_s->drv_priv,
-                                                      results, max_size);
-       }
        return -1;
 }
 
@@ -160,9 +109,9 @@ static inline int wpa_drv_set_key(struct wpa_supplicant *wpa_s, wpa_alg alg,
 {
        if (wpa_s->driver->set_key) {
                wpa_s->keys_cleared = 0;
-               return wpa_s->driver->set_key(wpa_s->drv_priv, alg, addr,
-                                             key_idx, set_tx, seq, seq_len,
-                                             key, key_len);
+               return wpa_s->driver->set_key(wpa_s->ifname, wpa_s->drv_priv,
+                                             alg, addr, key_idx, set_tx,
+                                             seq, seq_len, key, key_len);
        }
        return -1;
 }
@@ -275,7 +224,7 @@ static inline int wpa_drv_mlme_setprotection(struct wpa_supplicant *wpa_s,
        return 0;
 }
 
-static inline struct wpa_hw_modes *
+static inline struct hostapd_hw_modes *
 wpa_drv_get_hw_feature_data(struct wpa_supplicant *wpa_s, u16 *num_modes,
                            u16 *flags)
 {
@@ -286,7 +235,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,
-                                     wpa_hw_mode phymode, int chan,
+                                     hostapd_hw_mode phymode, int chan,
                                      int freq)
 {
        if (wpa_s->driver->set_channel)
@@ -369,33 +318,67 @@ static inline int wpa_drv_send_ft_action(struct wpa_supplicant *wpa_s,
        return -1;
 }
 
-static inline int wpa_drv_set_probe_req_ie(struct wpa_supplicant *wpa_s,
-                                          const u8 *ies, size_t ies_len)
-{
-       if (wpa_s->driver->set_probe_req_ie)
-               return wpa_s->driver->set_probe_req_ie(wpa_s->drv_priv, ies,
-                                                      ies_len);
-       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 dtim_period, int beacon_int)
 {
        if (wpa_s->driver->set_beacon)
-               return wpa_s->driver->set_beacon(wpa_s->drv_priv, head,
+               return wpa_s->driver->set_beacon(wpa_s->ifname,
+                                                wpa_s->drv_priv, head,
                                                 head_len, tail, tail_len,
-                                                dtim_period);
+                                                dtim_period, beacon_int);
        return -1;
 }
 
-static inline int wpa_drv_set_beacon_int(struct wpa_supplicant *wpa_s,
-                                        int value)
+static inline int wpa_drv_sta_add(struct wpa_supplicant *wpa_s,
+                                 struct hostapd_sta_add_params *params)
 {
-       if (wpa_s->driver->set_beacon_int)
-               return wpa_s->driver->set_beacon_int(wpa_s->drv_priv, value);
+       if (wpa_s->driver->sta_add)
+               return wpa_s->driver->sta_add(wpa_s->ifname, wpa_s->drv_priv,
+                                             params);
        return -1;
 }
 
+static inline int wpa_drv_sta_remove(struct wpa_supplicant *wpa_s,
+                                    const u8 *addr)
+{
+       if (wpa_s->driver->sta_remove)
+               return wpa_s->driver->sta_remove(wpa_s->drv_priv, addr);
+       return -1;
+}
+
+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)
+{
+       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);
+       return -1;
+}
+
+static inline int wpa_drv_sta_set_flags(struct wpa_supplicant *wpa_s,
+                                       const u8 *addr, int total_flags,
+                                       int flags_or, int flags_and)
+{
+       if (wpa_s->driver->sta_set_flags)
+               return wpa_s->driver->sta_set_flags(wpa_s->drv_priv, addr,
+                                                   total_flags, flags_or,
+                                                   flags_and);
+       return -1;
+}
+
+static inline int wpa_drv_set_supp_port(struct wpa_supplicant *wpa_s,
+                                       int authorized)
+{
+       if (wpa_s->driver->set_supp_port) {
+               return wpa_s->driver->set_supp_port(wpa_s->drv_priv,
+                                                   authorized);
+       }
+       return 0;
+}
+
 #endif /* DRIVER_I_H */