scan: remove legacy "Ghz" band modifier settings

Commit Message

James Prestwood Aug. 27, 2024, 2:20 p.m. UTC

---
 src/scan.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

Comments

Denis Kenzior Aug. 28, 2024, 2:24 a.m. UTC | #1

Hi James,

On 8/27/24 9:20 AM, James Prestwood wrote:
> ---
>   src/scan.c | 8 ++------
>   1 file changed, 2 insertions(+), 6 deletions(-)
> 

Applied, thanks.

Regards,
-Denis

Patch

diff --git a/src/scan.c b/src/scan.c
index bee6c5b4..44bcfd3f 100644
--- a/src/scan.c
+++ b/src/scan.c
@@ -2544,28 +2544,24 @@  double scan_get_band_rank_modifier(enum band_freq band)
 {
 	const struct l_settings *config = iwd_get_config();
 	double modifier;
-	char *str, *str_legacy;
+	char *str;
 
 	switch (band) {
 	case BAND_FREQ_2_4_GHZ:
 		str = "BandModifier2_4GHz";
-		str_legacy = "BandModifier2_4Ghz";
 		break;
 	case BAND_FREQ_5_GHZ:
 		str = "BandModifier5GHz";
-		str_legacy = "BandModifier5Ghz";
 		break;
 	case BAND_FREQ_6_GHZ:
 		str = "BandModifier6GHz";
-		str_legacy = "BandModifier6Ghz";
 		break;
 	default:
 		l_warn("Unhandled band %u", band);
 		return 0.0;
 	}
 
-	if (!l_settings_get_double(config, "Rank", str, &modifier) &&
-		!l_settings_get_double(config, "Rank", str_legacy, &modifier))
+	if (!l_settings_get_double(config, "Rank", str, &modifier))
 		modifier = 1.0;
 
 	return modifier;