From a16be49be576b2f059a384c895c32ae3bd02b9dd Mon Sep 17 00:00:00 2001
From: Jerry Vonau <jvonau3@gmail.com>
Date: Wed, 15 Jan 2025 03:16:16 -0600
Subject: [PATCH 1/4] add recording of firmware selection and force
 wifi_up_down false when required

---
 roles/network/tasks/detected_network.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/roles/network/tasks/detected_network.yml b/roles/network/tasks/detected_network.yml
index aaaf06a7e..bd657010b 100644
--- a/roles/network/tasks/detected_network.yml
+++ b/roles/network/tasks/detected_network.yml
@@ -255,6 +255,11 @@
   register: current_client_channel
   when: wifi_up_down and can_be_ap and has_wifi_gateway is defined
 
+- name: Forcing wifi_up_down to False based on firmware selection "24"
+  set_fact:
+    wifi_up_down: False
+  when: rpi3bplus_rpi4_wifi_firmware == "24"
+
 - name: In VM disable LAN - needs local_vars entry to activate
   set_fact:
     iiab_lan_iface: none
@@ -313,6 +318,10 @@
       value: "{{ can_be_ap }}"
     - option: host_country_code_found
       value: "{{ host_country_code }}"
+    - option: firmware_option_1
+      value:  "{{ rpi3bplus_rpi4_wifi_firmware }}"
+    - option: firmware_option_2
+      value:  "{{ rpizerow_rpi3_wifi_firmware }}"
 
 - name: Add 'detected_network' variable 'current_client_channel_found' value if defined, to {{ iiab_ini_file }}
   ini_file:

From 3bb41e2e07fbc0d40027e1b2e0eabd38640549d1 Mon Sep 17 00:00:00 2001
From: Jerry Vonau <jvonau3@gmail.com>
Date: Wed, 15 Jan 2025 03:17:01 -0600
Subject: [PATCH 2/4] move firmware replacement

---
 roles/network/tasks/main.yml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/roles/network/tasks/main.yml b/roles/network/tasks/main.yml
index 7e2f1eabb..221ea61b6 100644
--- a/roles/network/tasks/main.yml
+++ b/roles/network/tasks/main.yml
@@ -1,8 +1,3 @@
-- name: Select RPi firmware mode
-  include_role:
-    name: firmware
-  when: rpi_model != "none"
-
 - name: detected_network
   include_tasks: detected_network.yml
 
@@ -108,6 +103,10 @@
   # end block
   when: network_installed is defined and network_enabled
 
+- name: Select RPi firmware mode
+  include_role:
+    name: firmware
+  when: rpi_model != "none"
 
 - name: Create {{ iiab_etc_path }}/install-flags/iiab-network-complete on second pass of network role.
   file:

From ca22622c7d30b4981f4ebfe679bbd6d8d1aac777 Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Thu, 16 Jan 2025 09:51:32 -0500
Subject: [PATCH 3/4] detected_network.yml: Record WiFi firmware vars (43430 &
 43455)

---
 roles/network/tasks/detected_network.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/roles/network/tasks/detected_network.yml b/roles/network/tasks/detected_network.yml
index bd657010b..ba104f5d6 100644
--- a/roles/network/tasks/detected_network.yml
+++ b/roles/network/tasks/detected_network.yml
@@ -318,10 +318,10 @@
       value: "{{ can_be_ap }}"
     - option: host_country_code_found
       value: "{{ host_country_code }}"
-    - option: firmware_option_1
-      value:  "{{ rpi3bplus_rpi4_wifi_firmware }}"
-    - option: firmware_option_2
-      value:  "{{ rpizerow_rpi3_wifi_firmware }}"
+    - option: wifi_firmware_43430
+      value: "{{ rpizerow_rpi3_wifi_firmware }}"
+    - option: wifi_firmware_43455
+      value: "{{ rpi3bplus_rpi4_wifi_firmware }}"
 
 - name: Add 'detected_network' variable 'current_client_channel_found' value if defined, to {{ iiab_ini_file }}
   ini_file:

From a5e90f65111f11d2976a861bcf43e44499460643 Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Thu, 16 Jan 2025 09:54:44 -0500
Subject: [PATCH 4/4] network/tasks/main.yml: Blank line

---
 roles/network/tasks/main.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/roles/network/tasks/main.yml b/roles/network/tasks/main.yml
index 221ea61b6..bb05482f5 100644
--- a/roles/network/tasks/main.yml
+++ b/roles/network/tasks/main.yml
@@ -108,6 +108,7 @@
     name: firmware
   when: rpi_model != "none"
 
+
 - name: Create {{ iiab_etc_path }}/install-flags/iiab-network-complete on second pass of network role.
   file:
     path: "{{ iiab_etc_path }}/install-flags/iiab-network-complete"