Remove unused valid_bss_mask driver_ops

diff --git a/src/ap/ap_drv_ops.c b/src/ap/ap_drv_ops.c
index 31a8ee6..733c917 100644 (file)
--- a/src/ap/ap_drv_ops.c
+++ b/src/ap/ap_drv_ops.c
@@ -504,15 +504,6 @@ int hostapd_set_tx_queue_params(struct hostapd_data *hapd, int queue, int aifs,
 }
 
 
-int hostapd_valid_bss_mask(struct hostapd_data *hapd, const u8 *addr,
-                          const u8 *mask)
-{
-       if (hapd->driver == NULL || hapd->driver->valid_bss_mask == NULL)
-               return 1;
-       return hapd->driver->valid_bss_mask(hapd->drv_priv, addr, mask);
-}
-
-
 struct hostapd_hw_modes *
 hostapd_get_hw_feature_data(struct hostapd_data *hapd, u16 *num_modes,
                            u16 *flags)

diff --git a/src/ap/ap_drv_ops.h b/src/ap/ap_drv_ops.h
index ebb6eff..66e2cb8 100644 (file)
--- a/src/ap/ap_drv_ops.h
+++ b/src/ap/ap_drv_ops.h
@@ -71,8 +71,6 @@ int hostapd_set_rate_sets(struct hostapd_data *hapd, int *supp_rates,
 int hostapd_set_country(struct hostapd_data *hapd, const char *country);
 int hostapd_set_tx_queue_params(struct hostapd_data *hapd, int queue, int aifs,
                                int cw_min, int cw_max, int burst_time);
-int hostapd_valid_bss_mask(struct hostapd_data *hapd, const u8 *addr,
-                          const u8 *mask);
 struct hostapd_hw_modes *
 hostapd_get_hw_feature_data(struct hostapd_data *hapd, u16 *num_modes,
                            u16 *flags);

diff --git a/src/ap/hostapd.c b/src/ap/hostapd.c
index 23c8b1a..e180a08 100644 (file)
--- a/src/ap/hostapd.c
+++ b/src/ap/hostapd.c
@@ -371,7 +371,6 @@ static int hostapd_validate_bssid_configuration(struct hostapd_iface *iface)
        u8 mask[ETH_ALEN] = { 0 };
        struct hostapd_data *hapd = iface->bss[0];
        unsigned int i = iface->conf->num_bss, bits = 0, j;
-       int res;
        int auto_addr = 0;
 
        if (hostapd_drv_none(hapd))
@@ -435,17 +434,6 @@ skip_mask_ext:
        wpa_printf(MSG_DEBUG, "BSS count %lu, BSSID mask " MACSTR " (%d bits)",
                   (unsigned long) iface->conf->num_bss, MAC2STR(mask), bits);
 
-       res = hostapd_valid_bss_mask(hapd, hapd->own_addr, mask);
-       if (res == 0)
-               return 0;
-
-       if (res < 0) {
-               wpa_printf(MSG_ERROR, "Driver did not accept BSSID mask "
-                          MACSTR " for start address " MACSTR ".",
-                          MAC2STR(mask), MAC2STR(hapd->own_addr));
-               return -1;
-       }
-
        if (!auto_addr)
                return 0;
 

diff --git a/src/drivers/driver.h b/src/drivers/driver.h
index 5d61481..a41d890 100644 (file)
--- a/src/drivers/driver.h
+++ b/src/drivers/driver.h
@@ -1706,17 +1706,6 @@ struct wpa_driver_ops {
                                   int cw_max, int burst_time);
 
        /**
-        * valid_bss_mask - Validate BSSID mask
-        * @priv: Private driver interface data
-        * @addr: Address
-        * @mask: Mask
-        * Returns: 0 if mask is valid, -1 if mask is not valid, 1 if mask can
-        * be used, but the main interface address must be the first address in
-        * the block if mask is applied
-        */
-       int (*valid_bss_mask)(void *priv, const u8 *addr, const u8 *mask);
-
-       /**
         * if_add - Add a virtual interface
         * @priv: Private driver interface data
         * @type: Interface type

diff --git a/src/drivers/driver_ndis.c b/src/drivers/driver_ndis.c
index 515a6de..7e845b9 100644 (file)
--- a/src/drivers/driver_ndis.c
+++ b/src/drivers/driver_ndis.c
@@ -3273,7 +3273,6 @@ const struct wpa_driver_ops wpa_driver_ndis_ops = {
        NULL /* sta_set_flags */,
        NULL /* set_rate_sets */,
        NULL /* set_tx_queue_params */,
-       NULL /* valid_bss_mask */,
        NULL /* if_add */,
        NULL /* if_remove */,
        NULL /* set_sta_vlan */,

diff --git a/src/drivers/driver_test.c b/src/drivers/driver_test.c
index 897178e..3e8e7a6 100644 (file)
--- a/src/drivers/driver_test.c
+++ b/src/drivers/driver_test.c
@@ -1101,13 +1101,6 @@ static int test_driver_if_remove(void *priv, enum wpa_driver_if_type type,
 }
 
 
-static int test_driver_valid_bss_mask(void *priv, const u8 *addr,
-                                     const u8 *mask)
-{
-       return 0;
-}
-
-
 static int test_driver_set_ssid(void *priv, const u8 *buf, int len)
 {
        struct test_driver_bss *bss = priv;
@@ -3294,7 +3287,6 @@ const struct wpa_driver_ops wpa_driver_test_ops = {
        .get_hw_feature_data = wpa_driver_test_get_hw_feature_data,
        .if_add = test_driver_if_add,
        .if_remove = test_driver_if_remove,
-       .valid_bss_mask = test_driver_valid_bss_mask,
        .hapd_set_ssid = test_driver_set_ssid,
        .set_privacy = test_driver_set_privacy,
        .set_sta_vlan = test_driver_set_sta_vlan,