Merge pull request #955 from Telecominfraproject/main

Merge from main for 4.1.1 release

feeds/ipq807x_v5.4/hostapd/patches/800-multi-psk-roaming-vlan.patch

@@ -1,55 +0,0 @@
---- a/src/ap/ap_config.h
-+++ b/src/ap/ap_config.h
-@@ -153,6 +153,7 @@ struct hostapd_sta_wpa_psk_short {
- 	unsigned int is_passphrase:1;
- 	u8 psk[PMK_LEN];
- 	char passphrase[MAX_PASSPHRASE_LEN + 1];
-+	int vlan_id;
- 	int ref; /* (number of references held) - 1 */
- };
- 
---- a/src/ap/ieee802_11.c
-+++ b/src/ap/ieee802_11.c
-@@ -2404,6 +2404,42 @@ int ieee802_11_set_radius_info(struct ho
- 			       vlan_id->tagged[0] ? "+" : "");
- 		return -1;
- 	}
-+
-+	/* Store VLAN ID with cached PSK for MPSK roaming support */
-+	if (hapd->conf->ssid.dynamic_vlan && psk && vlan_id->notempty &&
-+	    vlan_id->untagged > 0) {
-+		struct hostapd_sta_wpa_psk_short *psk_entry;
-+
-+		for (psk_entry = psk; psk_entry; psk_entry = psk_entry->next) {
-+			psk_entry->vlan_id = vlan_id->untagged;
-+			wpa_printf(MSG_DEBUG,
-+				   "RADIUS MPSK: Stored VLAN %d with PSK for "
-+				   MACSTR, vlan_id->untagged,
-+				   MAC2STR(sta->addr));
-+		}
-+	}
-+
-+	/* Restore VLAN from cached PSK if not provided by RADIUS */
-+	if (hapd->conf->ssid.dynamic_vlan && !vlan_id->notempty && sta->psk) {
-+		struct hostapd_sta_wpa_psk_short *psk_entry;
-+		int cached_vlan = 0;
-+
-+		for (psk_entry = sta->psk; psk_entry; psk_entry = psk_entry->next) {
-+			if (psk_entry->vlan_id > 0) {
-+				cached_vlan = psk_entry->vlan_id;
-+				break;
-+			}
-+		}
-+
-+		if (cached_vlan > 0) {
-+			vlan_id->notempty = 1;
-+			vlan_id->untagged = cached_vlan;
-+			wpa_printf(MSG_DEBUG,
-+				   "RADIUS MPSK: Restored VLAN %d from cached PSK for " MACSTR,
-+				   cached_vlan, MAC2STR(sta->addr));
-+		}
-+	}
-+
- 	if (ap_sta_set_vlan(hapd, sta, vlan_id) < 0)
- 		return -1;
- 	if (sta->vlan_id)

feeds/qca-wifi-7/ipq53xx/config-6.1

@@ -1180,7 +1180,7 @@ CONFIG_QTI_LICENSE_MANAGER=y
 # CONFIG_SYMBOLIC_ERRNAME is not set
 # CONFIG_LEDS_BRIGHTNESS_HW_CHANGED is not set
 # CONFIG_LEDS_CLASS_MULTICOLOR is not set
-# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
+CONFIG_LEDS_TRIGGER_HEARTBEAT=y 
 # CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY is not set
 # CONFIG_PINCTRL_SINGLE is not set
 # CONFIG_RANDOM_TRUST_BOOTLOADER is not set