Remove unnecessary ifname parameter to sta_set_flags() driver op

diff --git a/src/ap/ap_drv_ops.c b/src/ap/ap_drv_ops.c
index 2261cdf210c05cad01f6dbb577d57f795a04a92f..75c74a7868b3c16480ca992d56b72dfb68764c2b 100644 (file)
--- a/src/ap/ap_drv_ops.c
+++ b/src/ap/ap_drv_ops.c
@@ -487,7 +487,7 @@ int hostapd_sta_set_flags(struct hostapd_data *hapd, u8 *addr,
 {
        if (hapd->driver == NULL || hapd->driver->sta_set_flags == NULL)
                return 0;
-       return hapd->driver->sta_set_flags(hapd->conf->iface, hapd->drv_priv, addr, total_flags,
+       return hapd->driver->sta_set_flags(hapd->drv_priv, addr, total_flags,
                                           flags_or, flags_and);
 }
 

diff --git a/src/drivers/driver.h b/src/drivers/driver.h
index c146bf05c7420dd7446dce45863ee981dfbb5786..0d3567f3de9b2f157e89a4bc0a34bf917625945a 100644 (file)
--- a/src/drivers/driver.h
+++ b/src/drivers/driver.h
@@ -1411,7 +1411,6 @@ struct wpa_driver_ops {
 
        /**
         * sta_set_flags - Set station flags (AP only)
-        * @ifname: Interface name (for multi-SSID/VLAN support)
         * @priv: Private driver interface data
         * @addr: Station address
         * @total_flags: Bitmap of all WPA_STA_* flags currently set
@@ -1419,7 +1418,7 @@ struct wpa_driver_ops {
         * @flags_and: Bitmap of WPA_STA_* flags to us as a mask
         * Returns: 0 on success, -1 on failure
         */
-       int (*sta_set_flags)(const char *ifname, void *priv, const u8 *addr,
+       int (*sta_set_flags)(void *priv, const u8 *addr,
                             int total_flags, int flags_or, int flags_and);
 
        /**

diff --git a/src/drivers/driver_atheros.c b/src/drivers/driver_atheros.c
index ba21de30f3dd523453f77aa50ee515a782878c1c..2b45f66af58afb455575db372772848ef7003fc4 100644 (file)
--- a/src/drivers/driver_atheros.c
+++ b/src/drivers/driver_atheros.c
@@ -339,7 +339,7 @@ madwifi_set_sta_authorized(void *priv, const u8 *addr, int authorized)
 }
 
 static int
-madwifi_sta_set_flags(const char *ifname, void *priv, const u8 *addr,
+madwifi_sta_set_flags(void *priv, const u8 *addr,
                      int total_flags, int flags_or, int flags_and)
 {
        /* For now, only support setting Authorized flag */

diff --git a/src/drivers/driver_bsd.c b/src/drivers/driver_bsd.c
index 941db5176532f0206563f51e662321c3d0690892..47acbb91adccfdf06e4e51eb4ab591d119a029c7 100644 (file)
--- a/src/drivers/driver_bsd.c
+++ b/src/drivers/driver_bsd.c
@@ -468,7 +468,7 @@ bsd_set_ieee8021x(void *priv, struct wpa_bss_params *params)
 }
 
 static int
-bsd_set_sta_authorized(const char *ifname, void *priv, const u8 *addr,
+bsd_set_sta_authorized(void *priv, const u8 *addr,
                       int total_flags, int flags_or, int flags_and)
 {
        int authorized = -1;

diff --git a/src/drivers/driver_hostap.c b/src/drivers/driver_hostap.c
index 476cba5f994569171bc10b5e5744defc953fa6a0..b568bfd1dd04e8d8473609b087a301ae089ad099 100644 (file)
--- a/src/drivers/driver_hostap.c
+++ b/src/drivers/driver_hostap.c
@@ -333,7 +333,7 @@ static int hostap_send_eapol(void *priv, const u8 *addr, const u8 *data,
 }
 
 
-static int hostap_sta_set_flags(const char *ifname, void *priv, const u8 *addr,
+static int hostap_sta_set_flags(void *priv, const u8 *addr,
                                int total_flags, int flags_or, int flags_and)
 {
        struct hostap_driver_data *drv = priv;
@@ -662,8 +662,7 @@ static int hostap_sta_remove(void *priv, const u8 *addr)
        struct hostap_driver_data *drv = priv;
        struct prism2_hostapd_param param;
 
-       hostap_sta_set_flags(drv->iface, drv, addr, 0, 0,
-                            ~WPA_STA_AUTHORIZED);
+       hostap_sta_set_flags(drv, addr, 0, 0, ~WPA_STA_AUTHORIZED);
 
        memset(&param, 0, sizeof(param));
        param.cmd = PRISM2_HOSTAPD_REMOVE_STA;

diff --git a/src/drivers/driver_madwifi.c b/src/drivers/driver_madwifi.c
index 40abdb5e1a7275f3a07460167a1dc2c9dca03317..08ca54fc5a5c2469e6ca4f4112ca923ea70c51e3 100644 (file)
--- a/src/drivers/driver_madwifi.c
+++ b/src/drivers/driver_madwifi.c
@@ -384,7 +384,7 @@ madwifi_set_sta_authorized(void *priv, const u8 *addr, int authorized)
 }
 
 static int
-madwifi_sta_set_flags(const char *ifname, void *priv, const u8 *addr,
+madwifi_sta_set_flags(void *priv, const u8 *addr,
                      int total_flags, int flags_or, int flags_and)
 {
        /* For now, only support setting Authorized flag */

diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
index e5667037210bfdb3dc723a213c8e745a9efe23c7..ac30562b967751ad4838917abd7a049b5290245d 100644 (file)
--- a/src/drivers/driver_nl80211.c
+++ b/src/drivers/driver_nl80211.c
@@ -3404,8 +3404,8 @@ static u32 sta_flags_nl80211(int flags)
 }
 
 
-static int wpa_driver_nl80211_sta_set_flags(const char *ifname, void *priv,
-                                           const u8 *addr, int total_flags,
+static int wpa_driver_nl80211_sta_set_flags(void *priv, const u8 *addr,
+                                           int total_flags,
                                            int flags_or, int flags_and)
 {
        struct i802_bss *bss = priv;
@@ -3427,7 +3427,7 @@ static int wpa_driver_nl80211_sta_set_flags(const char *ifname, void *priv,
                    0, NL80211_CMD_SET_STATION, 0);
 
        NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX,
-                   if_nametoindex(ifname));
+                   if_nametoindex(bss->ifname));
        NLA_PUT(msg, NL80211_ATTR_MAC, ETH_ALEN, addr);
 
        /*

diff --git a/wpa_supplicant/driver_i.h b/wpa_supplicant/driver_i.h
index d92a7341722a8c4fc864cd594b8987884f0d8912..8b312a4d0753193964cb6a7d4a042e9e58b74ac7 100644 (file)
--- a/wpa_supplicant/driver_i.h
+++ b/wpa_supplicant/driver_i.h
@@ -365,8 +365,7 @@ static inline int wpa_drv_sta_set_flags(struct wpa_supplicant *wpa_s,
                                        int flags_or, int flags_and)
 {
        if (wpa_s->driver->sta_set_flags)
-               return wpa_s->driver->sta_set_flags(wpa_s->ifname,
-                                                   wpa_s->drv_priv, addr,
+               return wpa_s->driver->sta_set_flags(wpa_s->drv_priv, addr,
                                                    total_flags, flags_or,
                                                    flags_and);
        return -1;