Remove unneeded ifname parameter from set_privacy() driver op

diff --git a/src/ap/ap_drv_ops.c b/src/ap/ap_drv_ops.c
index def8db8fc0d6d8ed201c790c0317c5dfe983713a..85467175c0772ad8c306c4b09c8bd3dba9900588 100644 (file)
--- a/src/ap/ap_drv_ops.c
+++ b/src/ap/ap_drv_ops.c
@@ -373,8 +373,7 @@ int hostapd_set_privacy(struct hostapd_data *hapd, int enabled)
 {
        if (hapd->driver == NULL || hapd->driver->set_privacy == NULL)
                return 0;
-       return hapd->driver->set_privacy(hapd->conf->iface, hapd->drv_priv,
-                                        enabled);
+       return hapd->driver->set_privacy(hapd->drv_priv, enabled);
 }
 
 

diff --git a/src/drivers/driver.h b/src/drivers/driver.h
index 3cab8f580995845e753c526e57deb7af2c4be163..408573a9d8d39e03f9d679a9bbfa68ba5782db2d 100644 (file)
--- a/src/drivers/driver.h
+++ b/src/drivers/driver.h
@@ -1219,7 +1219,7 @@ struct wpa_driver_ops {
         * kernel driver for Beacon frames. This can be left undefined (set to
         * %NULL) if the driver uses the Beacon template from set_beacon().
         */
-       int (*set_privacy)(const char *ifname, void *priv, int enabled);
+       int (*set_privacy)(void *priv, int enabled);
 
        /**
         * get_seqnum - Fetch the current TSC/packet number (AP only)

diff --git a/src/drivers/driver_atheros.c b/src/drivers/driver_atheros.c
index 94e139a838b03d96b4fe5d6feff2cb892835453b..77e441868ca2b2dc9398efd3885257f572dd2286 100644 (file)
--- a/src/drivers/driver_atheros.c
+++ b/src/drivers/driver_atheros.c
@@ -304,7 +304,7 @@ madwifi_set_ieee8021x(void *priv, struct wpa_bss_params *params)
 }
 
 static int
-madwifi_set_privacy(const char *ifname, void *priv, int enabled)
+madwifi_set_privacy(void *priv, int enabled)
 {
        struct madwifi_driver_data *drv = priv;
 
@@ -1110,7 +1110,7 @@ madwifi_init(struct hostapd_data *hapd, struct wpa_init_params *params)
 
        /* mark down during setup */
        linux_set_iface_flags(drv->ioctl_sock, drv->iface, 0);
-       madwifi_set_privacy(drv->iface, drv, 0); /* default to no privacy */
+       madwifi_set_privacy(drv, 0); /* default to no privacy */
 
        madwifi_receive_probe_req(drv);
 

diff --git a/src/drivers/driver_bsd.c b/src/drivers/driver_bsd.c
index 7e060d4962f571230df29e82d9501dd54d5324cd..f85fe9dab61c9bc3debf15244af4359877d476c9 100644 (file)
--- a/src/drivers/driver_bsd.c
+++ b/src/drivers/driver_bsd.c
@@ -596,7 +596,7 @@ ether_sprintf(const u8 *addr)
 }
 
 static int
-bsd_set_privacy(const char *ifname, void *priv, int enabled)
+bsd_set_privacy(void *priv, int enabled)
 {
        wpa_printf(MSG_DEBUG, "%s: enabled=%d", __func__, enabled);
 

diff --git a/src/drivers/driver_hostap.c b/src/drivers/driver_hostap.c
index b461e96995c6d50c414a7f821f0429321b8c78e3..25fa78ad7e88678ec1437b0d53adca58602fd71c 100644 (file)
--- a/src/drivers/driver_hostap.c
+++ b/src/drivers/driver_hostap.c
@@ -541,7 +541,7 @@ static int hostap_set_ieee8021x(void *priv, struct wpa_bss_params *params)
 }
 
 
-static int hostap_set_privacy(const char *ifname, void *priv, int enabled)
+static int hostap_set_privacy(void *priv, int enabled)
 {
        struct hostap_drvier_data *drv = priv;
 

diff --git a/src/drivers/driver_madwifi.c b/src/drivers/driver_madwifi.c
index 90036cf3fc930cc2a7fc8eccc8164e4744dab2f3..b78fc29386f6f8107556f0dbb92e18aa442b4976 100644 (file)
--- a/src/drivers/driver_madwifi.c
+++ b/src/drivers/driver_madwifi.c
@@ -349,7 +349,7 @@ madwifi_set_ieee8021x(void *priv, struct wpa_bss_params *params)
 }
 
 static int
-madwifi_set_privacy(const char *ifname, void *priv, int enabled)
+madwifi_set_privacy(void *priv, int enabled)
 {
        struct madwifi_driver_data *drv = priv;
 
@@ -1180,7 +1180,7 @@ madwifi_init(struct hostapd_data *hapd, struct wpa_init_params *params)
 
        /* mark down during setup */
        linux_set_iface_flags(drv->ioctl_sock, drv->iface, 0);
-       madwifi_set_privacy(drv->iface, drv, 0); /* default to no privacy */
+       madwifi_set_privacy(drv, 0); /* default to no privacy */
 
        madwifi_receive_probe_req(drv);
 

diff --git a/src/drivers/driver_test.c b/src/drivers/driver_test.c
index 85ebd66883b525fec20dba452644adaecd1d2e0a..6b411358a200a37d52409651b020139984308a31 100644 (file)
--- a/src/drivers/driver_test.c
+++ b/src/drivers/driver_test.c
@@ -1061,13 +1061,11 @@ static int test_driver_set_ssid(const char *ifname, void *priv, const u8 *buf,
 }
 
 
-static int test_driver_set_privacy(const char *ifname, void *priv, int enabled)
+static int test_driver_set_privacy(void *priv, int enabled)
 {
        struct test_driver_bss *dbss = priv;
 
-       wpa_printf(MSG_DEBUG, "%s(ifname=%s enabled=%d)",
-                  __func__, ifname, enabled);
-
+       wpa_printf(MSG_DEBUG, "%s(enabled=%d)",  __func__, enabled);
        dbss->privacy = enabled;
 
        return 0;