am 18493732: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge

[android-x86/external-wpa_supplicant_8.git] / wpa_supplicant / driver_i.h

diff --git a/wpa_supplicant/driver_i.h b/wpa_supplicant/driver_i.h
index f968251..9922e07 100644 (file)
--- a/wpa_supplicant/driver_i.h
+++ b/wpa_supplicant/driver_i.h
@@ -129,22 +129,22 @@ static inline int wpa_drv_set_key(struct wpa_supplicant *wpa_s,
        return -1;
 }
 
-static inline int wpa_drv_deauthenticate(struct wpa_supplicant *wpa_s,
-                                        const u8 *addr, int reason_code)
+static inline int wpa_drv_sta_deauth(struct wpa_supplicant *wpa_s,
+                                    const u8 *addr, int reason_code)
 {
-       if (wpa_s->driver->deauthenticate) {
-               return wpa_s->driver->deauthenticate(wpa_s->drv_priv, addr,
-                                                    reason_code);
+       if (wpa_s->driver->sta_deauth) {
+               return wpa_s->driver->sta_deauth(wpa_s->drv_priv, NULL, addr,
+                                                reason_code);
        }
        return -1;
 }
 
-static inline int wpa_drv_disassociate(struct wpa_supplicant *wpa_s,
-                                      const u8 *addr, int reason_code)
+static inline int wpa_drv_deauthenticate(struct wpa_supplicant *wpa_s,
+                                        const u8 *addr, int reason_code)
 {
-       if (wpa_s->driver->disassociate) {
-               return wpa_s->driver->disassociate(wpa_s->drv_priv, addr,
-                                                  reason_code);
+       if (wpa_s->driver->deauthenticate) {
+               return wpa_s->driver->deauthenticate(wpa_s->drv_priv, addr,
+                                                    reason_code);
        }
        return -1;
 }
@@ -463,6 +463,15 @@ static inline int wpa_drv_signal_poll(struct wpa_supplicant *wpa_s,
        return -1;
 }
 
+static inline int wpa_drv_pktcnt_poll(struct wpa_supplicant *wpa_s,
+                                     struct hostap_sta_driver_data *sta)
+{
+       if (wpa_s->driver->read_sta_data)
+               return wpa_s->driver->read_sta_data(wpa_s->drv_priv, sta,
+                                                   wpa_s->bssid);
+       return -1;
+}
+
 static inline int wpa_drv_set_ap_wps_ie(struct wpa_supplicant *wpa_s,
                                        const struct wpabuf *beacon,
                                        const struct wpabuf *proberesp,
@@ -690,4 +699,14 @@ static inline int wpa_drv_switch_channel(struct wpa_supplicant *wpa_s,
        return wpa_s->driver->switch_channel(wpa_s->drv_priv, freq);
 }
 
+static inline int wpa_drv_wnm_oper(struct wpa_supplicant *wpa_s,
+                                  enum wnm_oper oper, const u8 *peer,
+                                  u8 *buf, u16 *buf_len)
+{
+       if (!wpa_s->driver->wnm_oper)
+               return -1;
+       return wpa_s->driver->wnm_oper(wpa_s->drv_priv, oper, peer, buf,
+                                      buf_len);
+}
+
 #endif /* DRIVER_I_H */