Skip to contentSkip to conversation

station: check disabled band configuration in station_init

PATCH Applied James Prestwood 2 participants 2 messages Oct 2, 2023 – Oct 3, 2023

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 station: check disabled band configuration in station_init

For IWD to work correctly either 2.4GHz or 5GHz bands must be enabled (even for 6GHz to work). Check this and don't allow IWD to initialize if both 2.4 and 5GHz is disabled.

---
 src/station.c | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)
src/station.c +13 -7
index a34d8ce3..f24b9aca 100644
@@ -5203,6 +5203,19 @@ static void station_known_networks_changed(enum known_networks_event event,
 
 static int station_init(void)
 {
+	if (scan_get_band_rank_modifier(BAND_FREQ_2_4_GHZ))
+		allowed_bands |= BAND_FREQ_2_4_GHZ;
+	if (scan_get_band_rank_modifier(BAND_FREQ_5_GHZ))
+		allowed_bands |= BAND_FREQ_5_GHZ;
+	if (scan_get_band_rank_modifier(BAND_FREQ_6_GHZ))
+		allowed_bands |= BAND_FREQ_6_GHZ;
+
+	if (!(allowed_bands & (BAND_FREQ_2_4_GHZ | BAND_FREQ_5_GHZ))) {
+		l_error("At least 2.4GHz and 5GHz bands must be enabled for "
+			"IWD to start, check [Rank].BandModifier* setting");
+		return -ENOTSUP;
+	}
+
 	station_list = l_queue_new();
 	netdev_watch = netdev_watch_add(station_netdev_watch, NULL, NULL);
 	l_dbus_register_interface(dbus_get_bus(), IWD_STATION_INTERFACE,
@@ -5259,13 +5272,6 @@ static int station_init(void)
 						station_known_networks_changed,
 						NULL, NULL);
 
-	if (scan_get_band_rank_modifier(BAND_FREQ_2_4_GHZ))
-		allowed_bands |= BAND_FREQ_2_4_GHZ;
-	if (scan_get_band_rank_modifier(BAND_FREQ_5_GHZ))
-		allowed_bands |= BAND_FREQ_5_GHZ;
-	if (scan_get_band_rank_modifier(BAND_FREQ_6_GHZ))
-		allowed_bands |= BAND_FREQ_6_GHZ;
-
 	return 0;
 }
 
Signature · 1 line
2.25.1
#1 lore raw

Hi James,

Quoted 7 lines · James Prestwood

For IWD to work correctly either 2.4GHz or 5GHz bands must be enabled (even for 6GHz to work). Check this and don't allow IWD to initialize if both 2.4 and 5GHz is disabled.

---
  src/station.c | 20 +++++++++++++-------
  1 file changed, 13 insertions(+), 7 deletions(-)

Applied, thanks.

Regards,
-Denis