[PATCH] AP: reuse existing multicast_to_unicast option

[Anthony Refuerzo]

Remove the redundant bridge_multicast_to_unicast option and
extend the existing multicast_to_unicast option to also toggle
bridge-level mcast-to-ucast conversion. This functionality
is available through setting bit 1 (2).

Signed-off-by: Anthony Refuerzo <anthony96922 at gmail.com>
---
 hostapd/config_file.c | 2 --
 src/ap/ap_config.h    | 1 -
 src/ap/beacon.c       | 2 +-
 src/ap/hostapd.c      | 2 +-
 4 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/hostapd/config_file.c b/hostapd/config_file.c
index 8e179d151..214929650 100644
--- a/hostapd/config_file.c
+++ b/hostapd/config_file.c
@@ -4469,8 +4469,6 @@ static int hostapd_config_fill(struct hostapd_config *conf,
 #endif /* CONFIG_FILS */
 	} else if (os_strcmp(buf, "multicast_to_unicast") == 0) {
 		bss->multicast_to_unicast = atoi(pos);
-	} else if (os_strcmp(buf, "bridge_multicast_to_unicast") == 0) {
-		bss->bridge_multicast_to_unicast = atoi(pos);
 	} else if (os_strcmp(buf, "broadcast_deauth") == 0) {
 		bss->broadcast_deauth = atoi(pos);
 	} else if (os_strcmp(buf, "notify_mgmt_frames") == 0) {
diff --git a/src/ap/ap_config.h b/src/ap/ap_config.h
index 8598602b1..2cabe8842 100644
--- a/src/ap/ap_config.h
+++ b/src/ap/ap_config.h
@@ -749,7 +749,6 @@ struct hostapd_bss_config {
 #endif /* CONFIG_FILS */
 
 	int multicast_to_unicast;
-	int bridge_multicast_to_unicast;
 
 	int broadcast_deauth;
 
diff --git a/src/ap/beacon.c b/src/ap/beacon.c
index c25a5bbc3..655712bfa 100644
--- a/src/ap/beacon.c
+++ b/src/ap/beacon.c
@@ -1996,7 +1996,7 @@ int ieee802_11_build_ap_params(struct hostapd_data *hapd,
 		params->osen = 1;
 	}
 #endif /* CONFIG_HS20 */
-	params->multicast_to_unicast = hapd->conf->multicast_to_unicast;
+	params->multicast_to_unicast = hapd->conf->multicast_to_unicast & 1;
 	params->pbss = hapd->conf->pbss;
 
 	if (hapd->conf->ftm_responder) {
diff --git a/src/ap/hostapd.c b/src/ap/hostapd.c
index 8b3fb404d..9cb21a020 100644
--- a/src/ap/hostapd.c
+++ b/src/ap/hostapd.c
@@ -1441,7 +1441,7 @@ static int hostapd_setup_bss(struct hostapd_data *hapd, int first,
 		 * bridge. */
 
 		/* multicast to unicast on bridge ports */
-		if (conf->bridge_multicast_to_unicast)
+		if (conf->multicast_to_unicast & 2)
 			hostapd_drv_br_port_set_attr(
 				hapd, DRV_BR_PORT_ATTR_MCAST2UCAST, 1);
 
-- 
2.30.2