Remove unused disassociate() driver_ops

Commits 07783eaaa05c07e2c0071780ed3ebf7d0abfe4b5 and
3da372fae8b25a4aec12245b05680646f3bd0ccd removed the only users of the
disassociate() driver operation, so these driver wrapper functions can
also be removed now.

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>

diff --git a/src/drivers/driver.h b/src/drivers/driver.h
index e07df86a40da46f10d3d18fbbbd2ade13f45c1ed..ccc5a0e038a710fca5b89336120224cd8cc36614 100644 (file)
--- a/src/drivers/driver.h
+++ b/src/drivers/driver.h
@@ -1200,17 +1200,6 @@ struct wpa_driver_ops {
         */
        int (*deauthenticate)(void *priv, const u8 *addr, int reason_code);
 
-       /**
-        * disassociate - Request driver to disassociate
-        * @priv: private driver interface data
-        * @addr: peer address (BSSID of the AP)
-        * @reason_code: 16-bit reason code to be sent in the disassociation
-        *      frame
-        *
-        * Returns: 0 on success, -1 on failure
-        */
-       int (*disassociate)(void *priv, const u8 *addr, int reason_code);
-
        /**
         * associate - Request driver to associate
         * @priv: private driver interface data

diff --git a/src/drivers/driver_bsd.c b/src/drivers/driver_bsd.c
index a2b34c1289460bebad43a5d22168e26e4e052a7a..9d869b1517a597d5d26a22f0e88e5ae622e57ccf 100644 (file)
--- a/src/drivers/driver_bsd.c
+++ b/src/drivers/driver_bsd.c
@@ -972,13 +972,6 @@ wpa_driver_bsd_deauthenticate(void *priv, const u8 *addr, int reason_code)
                                   addr);
 }
 
-static int
-wpa_driver_bsd_disassociate(void *priv, const u8 *addr, int reason_code)
-{
-       return bsd_send_mlme_param(priv, IEEE80211_MLME_DISASSOC, reason_code,
-                                  addr);
-}
-
 static int
 wpa_driver_bsd_set_auth_alg(void *priv, int auth_alg)
 {
@@ -1564,7 +1557,6 @@ const struct wpa_driver_ops wpa_driver_bsd_ops = {
        .scan2                  = wpa_driver_bsd_scan,
        .get_scan_results2      = wpa_driver_bsd_get_scan_results2,
        .deauthenticate         = wpa_driver_bsd_deauthenticate,
-       .disassociate           = wpa_driver_bsd_disassociate,
        .associate              = wpa_driver_bsd_associate,
        .get_capa               = wpa_driver_bsd_get_capa,
 #endif /* HOSTAPD */

diff --git a/src/drivers/driver_ndis.c b/src/drivers/driver_ndis.c
index b9e096c459523b87df36647ec2b19b3ce2b6292b..7af3317775ab6a3bb78285151b5924e67697e866 100644 (file)
--- a/src/drivers/driver_ndis.c
+++ b/src/drivers/driver_ndis.c
@@ -725,14 +725,6 @@ static int wpa_driver_ndis_deauthenticate(void *priv, const u8 *addr,
 }
 
 
-static int wpa_driver_ndis_disassociate(void *priv, const u8 *addr,
-                                       int reason_code)
-{
-       struct wpa_driver_ndis_data *drv = priv;
-       return wpa_driver_ndis_disconnect(drv);
-}
-
-
 static void wpa_driver_ndis_scan_timeout(void *eloop_ctx, void *timeout_ctx)
 {
        wpa_printf(MSG_DEBUG, "Scan timeout - try to get results");
@@ -3223,7 +3215,6 @@ void driver_ndis_init_ops(void)
        wpa_driver_ndis_ops.init = wpa_driver_ndis_init;
        wpa_driver_ndis_ops.deinit = wpa_driver_ndis_deinit;
        wpa_driver_ndis_ops.deauthenticate = wpa_driver_ndis_deauthenticate;
-       wpa_driver_ndis_ops.disassociate = wpa_driver_ndis_disassociate;
        wpa_driver_ndis_ops.associate = wpa_driver_ndis_associate;
        wpa_driver_ndis_ops.add_pmkid = wpa_driver_ndis_add_pmkid;
        wpa_driver_ndis_ops.remove_pmkid = wpa_driver_ndis_remove_pmkid;

diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
index b86bc5abfc08777d35345824821bd4b753f29679..7376cd84786af389e1c4f3c16522075c82bdb269 100644 (file)
--- a/src/drivers/driver_nl80211.c
+++ b/src/drivers/driver_nl80211.c
@@ -4547,20 +4547,6 @@ static int wpa_driver_nl80211_deauthenticate(void *priv, const u8 *addr,
 }
 
 
-static int wpa_driver_nl80211_disassociate(void *priv, const u8 *addr,
-                                          int reason_code)
-{
-       struct i802_bss *bss = priv;
-       struct wpa_driver_nl80211_data *drv = bss->drv;
-       if (!(drv->capa.flags & WPA_DRIVER_FLAGS_SME))
-               return wpa_driver_nl80211_disconnect(drv, reason_code);
-       wpa_printf(MSG_DEBUG, "%s", __func__);
-       drv->associated = 0;
-       return wpa_driver_nl80211_mlme(drv, addr, NL80211_CMD_DISASSOCIATE,
-                                      reason_code, 0);
-}
-
-
 static void nl80211_copy_auth_params(struct wpa_driver_nl80211_data *drv,
                                     struct wpa_driver_auth_params *params)
 {
@@ -9177,7 +9163,6 @@ const struct wpa_driver_ops wpa_driver_nl80211_ops = {
        .stop_sched_scan = wpa_driver_nl80211_stop_sched_scan,
        .get_scan_results2 = wpa_driver_nl80211_get_scan_results,
        .deauthenticate = wpa_driver_nl80211_deauthenticate,
-       .disassociate = wpa_driver_nl80211_disassociate,
        .authenticate = wpa_driver_nl80211_authenticate,
        .associate = wpa_driver_nl80211_associate,
        .global_init = nl80211_global_init,

diff --git a/src/drivers/driver_privsep.c b/src/drivers/driver_privsep.c
index 9481cbf8a056059ae58fd6573de8fde175c228a8..ed88e71c3a77cd465055a77f5b1acbf579d39c4c 100644 (file)
--- a/src/drivers/driver_privsep.c
+++ b/src/drivers/driver_privsep.c
@@ -304,17 +304,6 @@ static int wpa_driver_privsep_deauthenticate(void *priv, const u8 *addr,
 }
 
 
-static int wpa_driver_privsep_disassociate(void *priv, const u8 *addr,
-                                       int reason_code)
-{
-       //struct wpa_driver_privsep_data *drv = priv;
-       wpa_printf(MSG_DEBUG, "%s addr=" MACSTR " reason_code=%d",
-                  __func__, MAC2STR(addr), reason_code);
-       wpa_printf(MSG_DEBUG, "%s - TODO", __func__);
-       return 0;
-}
-
-
 static void wpa_driver_privsep_event_assoc(void *ctx,
                                           enum wpa_event_type event,
                                           u8 *buf, size_t len)
@@ -736,7 +725,6 @@ struct wpa_driver_ops wpa_driver_privsep_ops = {
        .set_param = wpa_driver_privsep_set_param,
        .scan2 = wpa_driver_privsep_scan,
        .deauthenticate = wpa_driver_privsep_deauthenticate,
-       .disassociate = wpa_driver_privsep_disassociate,
        .associate = wpa_driver_privsep_associate,
        .get_capa = wpa_driver_privsep_get_capa,
        .get_mac_addr = wpa_driver_privsep_get_mac_addr,

diff --git a/src/drivers/driver_test.c b/src/drivers/driver_test.c
index dd3a57f7be484cb5905fe621695f27ed56850e81..89aee7df119776c1b0bc66c35bc265115f0336de 100644 (file)
--- a/src/drivers/driver_test.c
+++ b/src/drivers/driver_test.c
@@ -1714,20 +1714,6 @@ static int wpa_driver_test_deauthenticate(void *priv, const u8 *addr,
 }
 
 
-static int wpa_driver_test_disassociate(void *priv, const u8 *addr,
-                                       int reason_code)
-{
-       struct test_driver_bss *dbss = priv;
-       struct wpa_driver_test_data *drv = dbss->drv;
-       wpa_printf(MSG_DEBUG, "%s addr=" MACSTR " reason_code=%d",
-                  __func__, MAC2STR(addr), reason_code);
-       os_memset(dbss->bssid, 0, ETH_ALEN);
-       drv->associated = 0;
-       wpa_supplicant_event(drv->ctx, EVENT_DISASSOC, NULL);
-       return wpa_driver_test_send_disassoc(drv);
-}
-
-
 static const u8 * wpa_scan_get_ie(const struct wpa_scan_res *res, u8 ie)
 {
        const u8 *end, *pos;
@@ -3299,7 +3285,6 @@ const struct wpa_driver_ops wpa_driver_test_ops = {
        .deinit = wpa_driver_test_deinit,
        .set_param = wpa_driver_test_set_param,
        .deauthenticate = wpa_driver_test_deauthenticate,
-       .disassociate = wpa_driver_test_disassociate,
        .associate = wpa_driver_test_associate,
        .get_capa = wpa_driver_test_get_capa,
        .get_mac_addr = wpa_driver_test_get_mac_addr,

diff --git a/src/drivers/driver_wext.c b/src/drivers/driver_wext.c
index bd37ca14f8e8d60a64d52ee4107915b96780e13a..9733e015638d54ab7b129ecb8bbd17850565474a 100644 (file)
--- a/src/drivers/driver_wext.c
+++ b/src/drivers/driver_wext.c
@@ -1938,18 +1938,6 @@ static int wpa_driver_wext_deauthenticate(void *priv, const u8 *addr,
 }
 
 
-static int wpa_driver_wext_disassociate(void *priv, const u8 *addr,
-                                       int reason_code)
-{
-       struct wpa_driver_wext_data *drv = priv;
-       int ret;
-       wpa_printf(MSG_DEBUG, "%s", __FUNCTION__);
-       ret = wpa_driver_wext_mlme(drv, addr, IW_MLME_DISASSOC, reason_code);
-       wpa_driver_wext_disconnect(drv);
-       return ret;
-}
-
-
 static int wpa_driver_wext_set_gen_ie(void *priv, const u8 *ie,
                                      size_t ie_len)
 {
@@ -2485,7 +2473,6 @@ const struct wpa_driver_ops wpa_driver_wext_ops = {
        .scan2 = wpa_driver_wext_scan,
        .get_scan_results2 = wpa_driver_wext_get_scan_results,
        .deauthenticate = wpa_driver_wext_deauthenticate,
-       .disassociate = wpa_driver_wext_disassociate,
        .associate = wpa_driver_wext_associate,
        .init = wpa_driver_wext_init,
        .deinit = wpa_driver_wext_deinit,

diff --git a/wpa_supplicant/driver_i.h b/wpa_supplicant/driver_i.h
index 43fdb64b858185e94ab43a6b3022810886ad3cbf..847600d20eefdd190507d350aed3bfc436143f73 100644 (file)
--- a/wpa_supplicant/driver_i.h
+++ b/wpa_supplicant/driver_i.h
@@ -139,16 +139,6 @@ static inline int wpa_drv_deauthenticate(struct wpa_supplicant *wpa_s,
        return -1;
 }
 
-static inline int wpa_drv_disassociate(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);
-       }
-       return -1;
-}
-
 static inline int wpa_drv_add_pmkid(struct wpa_supplicant *wpa_s,
                                    const u8 *bssid, const u8 *pmkid)
 {