Merge pull request #675 from Telecominfraproject/main

latest changes for 3.1.0

.github/workflows/build-dev.yml

@@ -21,7 +21,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        target: [ 'cig_wf186h', 'cig_wf186w', 'cig_wf188n', 'cig_wf196', 'cig_wf189', 'cybertan_eww631-a1', 'cybertan_eww631-b1', 'edgecore_eap101', 'edgecore_eap102', 'edgecore_eap104', 'edgecore_eap111', 'edgecore_ecw5211', 'edgecore_oap101', 'edgecore_oap101-6e', 'edgecore_oap101e', 'edgecore_oap101e-6e', 'hfcl_ion4', 'hfcl_ion4xe', 'hfcl_ion4xi', 'hfcl_ion4x', 'hfcl_ion4x_2', 'hfcl_ion4x_3', 'hfcl_ion4xi_w', 'hfcl_ion4x_w', 'indio_um-305ax', 'indio_um-325ac', 'indio_um-510ac-v3', 'indio_um-550ac', 'sercomm_ap72tip', 'udaya_a5-id2', 'wallys_dr40x9', 'wallys_dr6018', 'wallys_dr6018-v4', 'yuncore_ax820', 'yuncore_ax840', 'yuncore_fap640', 'yuncore_fap650', 'yuncore_fap655' ]
+        target: [ 'cig_wf186h', 'cig_wf186w', 'cig_wf188n', 'cig_wf196', 'cig_wf189', 'cybertan_eww631-a1', 'cybertan_eww631-b1', 'edgecore_eap101', 'edgecore_eap102', 'edgecore_eap104', 'edgecore_eap105', 'edgecore_eap111', 'edgecore_ecw5211', 'edgecore_oap101', 'edgecore_oap101-6e', 'edgecore_oap101e', 'edgecore_oap101e-6e', 'hfcl_ion4', 'hfcl_ion4xe', 'hfcl_ion4xi', 'hfcl_ion4x', 'hfcl_ion4x_2', 'hfcl_ion4x_3', 'hfcl_ion4xi_w', 'hfcl_ion4x_w', 'indio_um-305ax', 'indio_um-325ac', 'indio_um-510ac-v3', 'indio_um-550ac', 'sercomm_ap72tip', 'udaya_a5-id2', 'udaya_a6-id2', 'wallys_dr40x9', 'wallys_dr6018', 'wallys_dr6018-v4', 'yuncore_ax820', 'yuncore_ax840', 'yuncore_fap640', 'yuncore_fap650', 'yuncore_fap655' ]
 
     steps:
     - uses: actions/checkout@v3

feeds/ipq807x_v5.4/ath11k-wifi/Makefile

@@ -52,6 +52,7 @@ ALLWIFIBOARDS:= \
 	yuncore-ax840 \
 	yuncore-fap650 \
 	yuncore-fap655 \
+	udaya-a6-id2 \
 	meshpp-s618
 
 ALLWIFIPACKAGES:=$(foreach BOARD,$(ALLWIFIBOARDS),ath11k-wifi-$(BOARD))
@@ -393,6 +394,7 @@ $(eval $(call generate-ath11k-wifi-package,meshpp-s618,Mesh++ S618))
 $(eval $(call generate-ath11k-wifi-package,muxi-ap3220l,MUXI AP3220L))
 $(eval $(call generate-ath11k-wifi-package,yuncore-fap650,YunCore FAP650))
 $(eval $(call generate-ath11k-wifi-package,yuncore-fap655,YunCore FAP655))
+$(eval $(call generate-ath11k-wifi-package,udaya-a6-id2,Udaya A6-ID2))
 
 $(foreach PACKAGE,$(ALLWIFIPACKAGES),$(eval $(call BuildPackage,$(PACKAGE))))
 $(eval $(call BuildPackage,ath11k-wifi-qcom-ipq5018))

feeds/ipq807x_v5.4/hostapd/files/afcd.init

@@ -11,10 +11,11 @@ add_afc() {
 
 	config_get url "$1" url
 	config_get cert "$1" cert
-	[ -n "$cert" -a -n "$url" ] || return
+	[ -n "$url" ] || return
 
 	procd_open_instance afcd
-	procd_set_param command /usr/bin/ucode /usr/share/hostap/afcd.uc -u "$url" -c "$cert"
+	procd_set_param command /usr/bin/ucode /usr/share/hostap/afcd.uc -u "$url"
+	[ -n "$cert" ] && procd_append_param command -c "$cert" 
 	procd_set_param respawn
 	procd_close_instance
 }

feeds/ipq807x_v5.4/hostapd/files/afcd.uc

@@ -72,7 +72,7 @@ function handle_request(req)
 
 	let cl = uclient.new(opts.url, null, cb);
 
-	if (!cl.ssl_init({ verify: true, ca_files: [ opts.cert ] })) {
+	if (!cl.ssl_init({ verify: !!opts.cert, ca_files: [ opts.cert ] })) {
 		warn(`Failed to initialize SSL\n`);
 		return false;
 	}

feeds/ipq807x_v5.4/hostapd/files/hostapd.sh

@@ -404,7 +404,7 @@ hostapd_common_add_bss_config() {
 	config_add_string lci civic
 
 	config_add_boolean ieee80211r pmk_r1_push ft_psk_generate_local ft_over_ds
-	config_add_int r0_key_lifetime reassociation_deadline
+	config_add_int r0_key_lifetime reassociation_deadline ft_l2_refresh
 	config_add_string mobility_domain r1_key_holder
 	config_add_array r0kh r1kh
 
@@ -984,10 +984,11 @@ hostapd_set_bss_options() {
 		set_default ieee80211r 0
 
 		if [ "$ieee80211r" -gt "0" ]; then
-			json_get_vars mobility_domain ft_psk_generate_local ft_over_ds reassociation_deadline
+			json_get_vars mobility_domain ft_psk_generate_local ft_over_ds reassociation_deadline ft_l2_refresh
 
 			set_default mobility_domain "$(echo "$ssid" | md5sum | head -c 4)"
 			set_default ft_over_ds 1
+			set_default ft_l2_refresh 30
 			set_default reassociation_deadline 1000
 			skip_kh_setup=0
 
@@ -1010,6 +1011,7 @@ hostapd_set_bss_options() {
 			append bss_conf "ft_psk_generate_local=$ft_psk_generate_local" "$N"
 			append bss_conf "ft_over_ds=$ft_over_ds" "$N"
 			append bss_conf "reassociation_deadline=$reassociation_deadline" "$N"
+			[ -n "$ft_l2_refresh" ] && append bss_conf "ft_l2_refresh=$ft_l2_refresh" "$N"
 
 			if [ "$skip_kh_setup" -eq "0" ]; then
 				json_get_vars r0_key_lifetime r1_key_holder pmk_r1_push

feeds/ipq807x_v5.4/hostapd/patches/601-ucode_support.patch

@@ -88,6 +88,14 @@
  void hostapd_new_assoc_sta(struct hostapd_data *hapd, struct sta_info *sta,
  			   int reassoc);
  void hostapd_interface_deinit_free(struct hostapd_iface *iface);
+@@ -662,6 +671,7 @@ hostapd_switch_channel_fallback(struct h
+ void hostapd_cleanup_cs_params(struct hostapd_data *hapd);
+ void hostapd_periodic_iface(struct hostapd_iface *iface);
+ int hostapd_owe_trans_get_info(struct hostapd_data *hapd);
++void hostapd_owe_update_trans(struct hostapd_iface *iface);
+ void hostapd_ocv_check_csa_sa_query(void *eloop_ctx, void *timeout_ctx);
+ 
+ /* utils.c */
 --- a/src/ap/hostapd.c
 +++ b/src/ap/hostapd.c
 @@ -216,6 +216,8 @@ int hostapd_reload_config(struct hostapd
@@ -132,6 +140,15 @@
  
  	return 0;
  }
+@@ -1945,7 +1950,7 @@ static int hostapd_owe_iface_iter2(struc
+ #endif /* CONFIG_OWE */
+ 
+ 
+-static void hostapd_owe_update_trans(struct hostapd_iface *iface)
++void hostapd_owe_update_trans(struct hostapd_iface *iface)
+ {
+ #ifdef CONFIG_OWE
+ 	/* Check whether the enabled BSS can complete OWE transition mode
 @@ -2090,7 +2095,7 @@ static int hostapd_setup_interface_compl
  		hapd = iface->bss[j];
  		if (j)
@@ -568,3 +585,37 @@
  	.send_mlme = driver_nl80211_send_mlme,
  	.get_hw_feature_data = nl80211_get_hw_feature_data,
  	.sta_add = wpa_driver_nl80211_sta_add,
+--- a/src/ap/ucode.c
++++ b/src/ap/ucode.c
+@@ -255,6 +255,7 @@ uc_hostapd_bss_set_config(uc_vm_t *vm, s
+ 
+ 	hostapd_setup_bss(hapd, hapd == iface->bss[0], true);
+ 	hostapd_ucode_update_interfaces();
++	hostapd_owe_update_trans(iface);
+ 
+ done:
+ 	ret = 0;
+@@ -375,6 +376,7 @@ uc_hostapd_iface_add_bss(uc_vm_t *vm, si
+ 	conf->bss[idx] = NULL;
+ 	ret = hostapd_ucode_bss_get_uval(hapd);
+ 	hostapd_ucode_update_interfaces();
++	hostapd_owe_update_trans(iface);
+ 	goto out;
+ 
+ deinit_ctrl:
+@@ -602,6 +604,7 @@ out:
+ 
+ 		ieee802_11_set_beacon(hapd);
+ 	}
++	hostapd_owe_update_trans(iface);
+ 
+ 	return ucv_boolean_new(true);
+ }
+@@ -693,6 +696,7 @@ uc_hostapd_bss_rename(uc_vm_t *vm, size_
+ 	hostapd_ubus_add_bss(hapd);
+ 
+ 	hostapd_ucode_update_interfaces();
++	hostapd_owe_update_trans(hapd->iface);
+ out:
+ 	if (interfaces->ctrl_iface_init)
+ 		interfaces->ctrl_iface_init(hapd);

feeds/ipq807x_v5.4/hostapd/patches/751-wispr-ft.patch

@@ -1,559 +0,0 @@
-Index: hostapd-2021-02-20-59e9794c/src/ap/wpa_auth.h
-===================================================================
---- hostapd-2021-02-20-59e9794c.orig/src/ap/wpa_auth.h
-+++ hostapd-2021-02-20-59e9794c/src/ap/wpa_auth.h
-@@ -15,6 +15,10 @@
- #include "common/ieee802_11_defs.h"
- 
- struct vlan_description;
-+struct rate_description {
-+	u32 rx;
-+	u32 tx;
-+};
- 
- #define MAX_OWN_IE_OVERRIDE 256
- 
-@@ -87,6 +91,7 @@ struct ft_rrb_frame {
- #define FT_RRB_IDENTITY      15
- #define FT_RRB_RADIUS_CUI    16
- #define FT_RRB_SESSION_TIMEOUT  17 /* le32 seconds */
-+#define FT_RRB_RATE_LIMIT	18
- 
- struct ft_rrb_tlv {
- 	le16 type;
-@@ -327,6 +332,10 @@ struct wpa_auth_callbacks {
- 			struct vlan_description *vlan);
- 	int (*get_vlan)(void *ctx, const u8 *sta_addr,
- 			struct vlan_description *vlan);
-+	int (*set_rate_limit)(void *ctx, const u8 *sta_addr,
-+			      struct rate_description *rate);
-+	int (*get_rate_limit)(void *ctx, const u8 *sta_addr,
-+			      struct rate_description *rate);
- 	int (*set_identity)(void *ctx, const u8 *sta_addr,
- 			    const u8 *identity, size_t identity_len);
- 	size_t (*get_identity)(void *ctx, const u8 *sta_addr, const u8 **buf);
-@@ -479,7 +488,7 @@ int wpa_ft_fetch_pmk_r1(struct wpa_authe
- 			struct vlan_description *vlan,
- 			const u8 **identity, size_t *identity_len,
- 			const u8 **radius_cui, size_t *radius_cui_len,
--			int *session_timeout);
-+			int *session_timeout, struct rate_description *rate);
- 
- #endif /* CONFIG_IEEE80211R_AP */
- 
-Index: hostapd-2021-02-20-59e9794c/src/ap/wpa_auth_glue.c
-===================================================================
---- hostapd-2021-02-20-59e9794c.orig/src/ap/wpa_auth_glue.c
-+++ hostapd-2021-02-20-59e9794c/src/ap/wpa_auth_glue.c
-@@ -1153,6 +1153,40 @@ static int hostapd_wpa_auth_get_vlan(voi
- }
- 
- 
-+static int hostapd_wpa_auth_set_rate_limit(void *ctx, const u8 *sta_addr,
-+					   struct rate_description *rate)
-+{
-+	struct hostapd_data *hapd = ctx;
-+	struct sta_info *sta;
-+
-+	sta = ap_get_sta(hapd, sta_addr);
-+	if (!sta || !sta->wpa_sm)
-+		return -1;
-+
-+	memcpy(sta->bandwidth, rate, sizeof(*rate));
-+	hostapd_logger(hapd, sta->addr, HOSTAPD_MODULE_IEEE80211,
-+		       HOSTAPD_LEVEL_INFO, "rate-limit %d %d", sta->bandwidth[0], sta->bandwidth[1]);
-+
-+	return 0;
-+}
-+
-+
-+static int hostapd_wpa_auth_get_rate_limit(void *ctx, const u8 *sta_addr,
-+					   struct rate_description *rate)
-+{
-+	struct hostapd_data *hapd = ctx;
-+	struct sta_info *sta;
-+
-+	sta = ap_get_sta(hapd, sta_addr);
-+	if (!sta)
-+		return -1;
-+
-+	memcpy(rate, sta->bandwidth, sizeof(*rate));
-+
-+	return 0;
-+}
-+
-+
- static int
- hostapd_wpa_auth_set_identity(void *ctx, const u8 *sta_addr,
- 			      const u8 *identity, size_t identity_len)
-@@ -1471,6 +1505,8 @@ int hostapd_setup_wpa(struct hostapd_dat
- 		.add_tspec = hostapd_wpa_auth_add_tspec,
- 		.set_vlan = hostapd_wpa_auth_set_vlan,
- 		.get_vlan = hostapd_wpa_auth_get_vlan,
-+		.set_rate_limit = hostapd_wpa_auth_set_rate_limit,
-+		.get_rate_limit = hostapd_wpa_auth_get_rate_limit,
- 		.set_identity = hostapd_wpa_auth_set_identity,
- 		.get_identity = hostapd_wpa_auth_get_identity,
- 		.set_radius_cui = hostapd_wpa_auth_set_radius_cui,
-Index: hostapd-2021-02-20-59e9794c/src/ap/ieee802_11.c
-===================================================================
---- hostapd-2021-02-20-59e9794c.orig/src/ap/ieee802_11.c
-+++ hostapd-2021-02-20-59e9794c/src/ap/ieee802_11.c
-@@ -3240,7 +3240,7 @@ static void handle_auth_pasn_1(struct ho
- 						  rsn_data.pmkid,
- 						  pmk_r1, &pmk_r1_len, NULL,
- 						  NULL, NULL, NULL,
--						  NULL, NULL, NULL);
-+						  NULL, NULL, NULL, NULL);
- 			if (ret) {
- 				wpa_printf(MSG_DEBUG,
- 					   "PASN: FT: Failed getting PMK-R1");
-Index: hostapd-2021-02-20-59e9794c/src/ap/wpa_auth_ft.c
-===================================================================
---- hostapd-2021-02-20-59e9794c.orig/src/ap/wpa_auth_ft.c
-+++ hostapd-2021-02-20-59e9794c/src/ap/wpa_auth_ft.c
-@@ -375,6 +375,14 @@ static size_t wpa_ft_vlan_len(const stru
- 	return tlv_len;
- }
- 
-+static size_t wpa_ft_rate_limit_len(const struct rate_description *rate)
-+{
-+	if (!rate)
-+		return 0;
-+
-+	return (sizeof(*rate));
-+}
-+
- 
- static size_t wpa_ft_vlan_lin(const struct vlan_description *vlan,
- 			      u8 *start, u8 *endpos)
-@@ -430,10 +438,47 @@ static size_t wpa_ft_vlan_lin(const stru
- }
- 
- 
-+static size_t wpa_ft_rate_limit_lin(const struct rate_description *rate,
-+				    u8 *start, u8 *endpos)
-+{
-+	size_t tlv_len;
-+	int i, len;
-+	struct ft_rrb_tlv *hdr;
-+	u8 *pos = start;
-+
-+	if (!rate)
-+		return 0;
-+
-+	tlv_len = 0;
-+	if (rate->rx || rate->tx) {
-+		tlv_len += sizeof(*hdr);
-+		if (start + tlv_len > endpos)
-+			return tlv_len;
-+		hdr = (struct ft_rrb_tlv *) pos;
-+		hdr->type = host_to_le16(FT_RRB_RATE_LIMIT);
-+		hdr->len = host_to_le16(sizeof(le16));
-+		pos = start + tlv_len;
-+
-+		tlv_len += sizeof(u32);
-+		if (start + tlv_len > endpos)
-+			return tlv_len;
-+		WPA_PUT_LE32(pos, rate->rx);
-+		tlv_len += sizeof(u32);
-+		if (start + tlv_len > endpos)
-+			return tlv_len;
-+		WPA_PUT_LE32(pos, rate->tx);
-+		pos = start + tlv_len;
-+	}
-+
-+	return tlv_len;
-+}
-+
-+
- static int wpa_ft_rrb_lin(const struct tlv_list *tlvs1,
- 			  const struct tlv_list *tlvs2,
- 			  const struct vlan_description *vlan,
--			  u8 **plain, size_t *plain_len)
-+			  u8 **plain, size_t *plain_len,
-+			  const struct rate_description *rate)
- {
- 	u8 *pos, *endpos;
- 	size_t tlv_len;
-@@ -441,6 +486,7 @@ static int wpa_ft_rrb_lin(const struct t
- 	tlv_len = wpa_ft_tlv_len(tlvs1);
- 	tlv_len += wpa_ft_tlv_len(tlvs2);
- 	tlv_len += wpa_ft_vlan_len(vlan);
-+	tlv_len += wpa_ft_rate_limit_len(rate);
- 
- 	*plain_len = tlv_len;
- 	*plain = os_zalloc(tlv_len);
-@@ -454,6 +500,7 @@ static int wpa_ft_rrb_lin(const struct t
- 	pos += wpa_ft_tlv_lin(tlvs1, pos, endpos);
- 	pos += wpa_ft_tlv_lin(tlvs2, pos, endpos);
- 	pos += wpa_ft_vlan_lin(vlan, pos, endpos);
-+	pos += wpa_ft_rate_limit_lin(rate, pos, endpos);
- 
- 	/* sanity check */
- 	if (pos != endpos) {
-@@ -522,7 +569,8 @@ static int wpa_ft_rrb_build(const u8 *ke
- 			    const struct tlv_list *tlvs_auth,
- 			    const struct vlan_description *vlan,
- 			    const u8 *src_addr, u8 type,
--			    u8 **packet, size_t *packet_len)
-+			    u8 **packet, size_t *packet_len,
-+			    const struct rate_description *rate)
- {
- 	u8 *plain = NULL, *auth = NULL, *pos, *tmp;
- 	size_t plain_len = 0, auth_len = 0;
-@@ -530,10 +578,10 @@ static int wpa_ft_rrb_build(const u8 *ke
- 	size_t pad_len = 0;
- 
- 	*packet = NULL;
--	if (wpa_ft_rrb_lin(tlvs_enc0, tlvs_enc1, vlan, &plain, &plain_len) < 0)
-+	if (wpa_ft_rrb_lin(tlvs_enc0, tlvs_enc1, vlan, &plain, &plain_len, rate) < 0)
- 		goto out;
- 
--	if (wpa_ft_rrb_lin(tlvs_auth, NULL, NULL, &auth, &auth_len) < 0)
-+	if (wpa_ft_rrb_lin(tlvs_auth, NULL, NULL, &auth, &auth_len, NULL) < 0)
- 		goto out;
- 
- 	*packet_len = sizeof(u16) + auth_len + plain_len;
-@@ -696,6 +744,24 @@ static int wpa_ft_get_vlan(struct wpa_au
- }
- 
- 
-+static int wpa_ft_get_rate_limit(struct wpa_authenticator *wpa_auth,
-+				 const u8 *sta_addr, struct rate_description *rate)
-+{
-+	if (!wpa_auth->cb->get_rate_limit)
-+		return -1;
-+	return wpa_auth->cb->get_rate_limit(wpa_auth->cb_ctx, sta_addr, rate);
-+}
-+
-+
-+static int wpa_ft_set_rate_limit(struct wpa_authenticator *wpa_auth,
-+				 const u8 *sta_addr, struct rate_description *rate)
-+{
-+	if (!wpa_auth->cb->set_rate_limit)
-+		return -1;
-+	return wpa_auth->cb->set_rate_limit(wpa_auth->cb_ctx, sta_addr, rate);
-+}
-+
-+
- static int
- wpa_ft_set_identity(struct wpa_authenticator *wpa_auth, const u8 *sta_addr,
- 		    const u8 *identity, size_t identity_len)
-@@ -991,7 +1057,7 @@ wpa_ft_rrb_seq_req(struct wpa_authentica
- 
- 	if (wpa_ft_rrb_build(key, key_len, NULL, NULL, seq_req_auth, NULL,
- 			     wpa_auth->addr, FT_PACKET_R0KH_R1KH_SEQ_REQ,
--			     &packet, &packet_len) < 0) {
-+			     &packet, &packet_len, NULL) < 0) {
- 		item = NULL; /* some other seq resp might still accept this */
- 		goto err;
- 	}
-@@ -1174,6 +1240,7 @@ struct wpa_ft_pmk_r0_sa {
- 	u8 spa[ETH_ALEN];
- 	int pairwise; /* Pairwise cipher suite, WPA_CIPHER_* */
- 	struct vlan_description *vlan;
-+	struct rate_description *rate;
- 	os_time_t expiration; /* 0 for no expiration */
- 	u8 *identity;
- 	size_t identity_len;
-@@ -1192,6 +1259,7 @@ struct wpa_ft_pmk_r1_sa {
- 	u8 spa[ETH_ALEN];
- 	int pairwise; /* Pairwise cipher suite, WPA_CIPHER_* */
- 	struct vlan_description *vlan;
-+	struct rate_description *rate;
- 	u8 *identity;
- 	size_t identity_len;
- 	u8 *radius_cui;
-@@ -1220,6 +1288,7 @@ static void wpa_ft_free_pmk_r0(struct wp
- 
- 	os_memset(r0->pmk_r0, 0, PMK_LEN_MAX);
- 	os_free(r0->vlan);
-+	os_free(r0->rate);
- 	os_free(r0->identity);
- 	os_free(r0->radius_cui);
- 	os_free(r0);
-@@ -1273,6 +1342,7 @@ static void wpa_ft_free_pmk_r1(struct wp
- 	eloop_cancel_timeout(wpa_ft_expire_pmk_r1, r1, NULL);
- 
- 	os_memset(r1->pmk_r1, 0, PMK_LEN_MAX);
-+	os_free(r1->rate);
- 	os_free(r1->vlan);
- 	os_free(r1->identity);
- 	os_free(r1->radius_cui);
-@@ -1326,7 +1396,8 @@ static int wpa_ft_store_pmk_r0(struct wp
- 			       const struct vlan_description *vlan,
- 			       int expires_in, int session_timeout,
- 			       const u8 *identity, size_t identity_len,
--			       const u8 *radius_cui, size_t radius_cui_len)
-+			       const u8 *radius_cui, size_t radius_cui_len,
-+			       struct rate_description *rate)
- {
- 	struct wpa_ft_pmk_cache *cache = wpa_auth->ft_pmk_cache;
- 	struct wpa_ft_pmk_r0_sa *r0;
-@@ -1354,6 +1425,14 @@ static int wpa_ft_store_pmk_r0(struct wp
- 		}
- 		*r0->vlan = *vlan;
- 	}
-+	if (rate) {
-+		r0->rate = os_zalloc(sizeof(*rate));
-+		if (!r0->rate) {
-+			bin_clear_free(r0, sizeof(*r0));
-+			return -1;
-+		}
-+		*r0->rate = *rate;
-+	}
- 	if (identity) {
- 		r0->identity = os_malloc(identity_len);
- 		if (r0->identity) {
-@@ -1413,7 +1492,8 @@ static int wpa_ft_store_pmk_r1(struct wp
- 			       const struct vlan_description *vlan,
- 			       int expires_in, int session_timeout,
- 			       const u8 *identity, size_t identity_len,
--			       const u8 *radius_cui, size_t radius_cui_len)
-+			       const u8 *radius_cui, size_t radius_cui_len,
-+			       struct rate_description *rate)
- {
- 	struct wpa_ft_pmk_cache *cache = wpa_auth->ft_pmk_cache;
- 	int max_expires_in = wpa_auth->conf.r1_max_key_lifetime;
-@@ -1443,6 +1523,14 @@ static int wpa_ft_store_pmk_r1(struct wp
- 		}
- 		*r1->vlan = *vlan;
- 	}
-+	if (rate) {
-+		r1->rate = os_zalloc(sizeof(*rate));
-+		if (!r1->rate) {
-+			bin_clear_free(r1, sizeof(*r1));
-+			return -1;
-+		}
-+		*r1->rate = *rate;
-+	}
- 	if (identity) {
- 		r1->identity = os_malloc(identity_len);
- 		if (r1->identity) {
-@@ -1479,7 +1567,7 @@ int wpa_ft_fetch_pmk_r1(struct wpa_authe
- 			struct vlan_description *vlan,
- 			const u8 **identity, size_t *identity_len,
- 			const u8 **radius_cui, size_t *radius_cui_len,
--			int *session_timeout)
-+			int *session_timeout, struct rate_description *rate)
- {
- 	struct wpa_ft_pmk_cache *cache = wpa_auth->ft_pmk_cache;
- 	struct wpa_ft_pmk_r1_sa *r1;
-@@ -1499,6 +1587,12 @@ int wpa_ft_fetch_pmk_r1(struct wpa_authe
- 				*vlan = *r1->vlan;
- 			if (vlan && !r1->vlan)
- 				os_memset(vlan, 0, sizeof(*vlan));
-+			if (rate) {
-+				if (r1->rate)
-+					*rate = *r1->rate;
-+				else
-+					memset(rate, 0, sizeof(*rate));
-+			}
- 			if (identity && identity_len) {
- 				*identity = r1->identity;
- 				*identity_len = r1->identity_len;
-@@ -2025,7 +2119,7 @@ static int wpa_ft_pull_pmk_r1(struct wpa
- 
- 	if (wpa_ft_rrb_build(key, key_len, req_enc, NULL, req_auth, NULL,
- 			     sm->wpa_auth->addr, FT_PACKET_R0KH_R1KH_PULL,
--			     &packet, &packet_len) < 0)
-+			     &packet, &packet_len, NULL) < 0)
- 		return -1;
- 
- 	ft_pending_req_ies = wpabuf_alloc_copy(ies, ies_len);
-@@ -2054,6 +2148,7 @@ int wpa_ft_store_pmk_fils(struct wpa_sta
- {
- 	int expires_in = sm->wpa_auth->conf.r0_key_lifetime;
- 	struct vlan_description vlan;
-+	struct rate_description rate;
- 	const u8 *identity, *radius_cui;
- 	size_t identity_len, radius_cui_len;
- 	int session_timeout;
-@@ -2065,6 +2160,7 @@ int wpa_ft_store_pmk_fils(struct wpa_sta
- 			   MAC2STR(sm->addr));
- 		return -1;
- 	}
-+	wpa_ft_get_rate_limit(sm->wpa_auth, sm->addr, &rate);
- 
- 	identity_len = wpa_ft_get_identity(sm->wpa_auth, sm->addr, &identity);
- 	radius_cui_len = wpa_ft_get_radius_cui(sm->wpa_auth, sm->addr,
-@@ -2074,7 +2170,7 @@ int wpa_ft_store_pmk_fils(struct wpa_sta
- 	return wpa_ft_store_pmk_r0(sm->wpa_auth, sm->addr, pmk_r0, pmk_r0_len,
- 				   pmk_r0_name, sm->pairwise, &vlan, expires_in,
- 				   session_timeout, identity, identity_len,
--				   radius_cui, radius_cui_len);
-+				   radius_cui, radius_cui_len, &rate);
- }
- 
- 
-@@ -2095,6 +2191,7 @@ int wpa_auth_derive_ptk_ft(struct wpa_st
- 	int psk_local = sm->wpa_auth->conf.ft_psk_generate_local;
- 	int expires_in = sm->wpa_auth->conf.r0_key_lifetime;
- 	struct vlan_description vlan;
-+	struct rate_description rate;
- 	const u8 *identity, *radius_cui;
- 	size_t identity_len, radius_cui_len;
- 	int session_timeout;
-@@ -2119,6 +2216,8 @@ int wpa_auth_derive_ptk_ft(struct wpa_st
- 		return -1;
- 	}
- 
-+	wpa_ft_get_rate_limit(sm->wpa_auth, sm->addr, &rate);
-+
- 	identity_len = wpa_ft_get_identity(sm->wpa_auth, sm->addr, &identity);
- 	radius_cui_len = wpa_ft_get_radius_cui(sm->wpa_auth, sm->addr,
- 					       &radius_cui);
-@@ -2134,7 +2233,7 @@ int wpa_auth_derive_ptk_ft(struct wpa_st
- 				    pmk_r0_name,
- 				    sm->pairwise, &vlan, expires_in,
- 				    session_timeout, identity, identity_len,
--				    radius_cui, radius_cui_len);
-+				    radius_cui, radius_cui_len, &rate);
- 
- 	if (wpa_derive_pmk_r1(pmk_r0, pmk_r0_len, pmk_r0_name, r1kh, sm->addr,
- 			      pmk_r1, sm->pmk_r1_name) < 0)
-@@ -2143,7 +2242,8 @@ int wpa_auth_derive_ptk_ft(struct wpa_st
- 		wpa_ft_store_pmk_r1(sm->wpa_auth, sm->addr, pmk_r1, pmk_r1_len,
- 				    sm->pmk_r1_name, sm->pairwise, &vlan,
- 				    expires_in, session_timeout, identity,
--				    identity_len, radius_cui, radius_cui_len);
-+				    identity_len, radius_cui, radius_cui_len,
-+				    &rate);
- 
- 	return wpa_pmk_r1_to_ptk(pmk_r1, pmk_r1_len, sm->SNonce, sm->ANonce,
- 				 sm->addr, sm->wpa_auth->addr, sm->pmk_r1_name,
-@@ -2986,7 +3086,8 @@ static int wpa_ft_local_derive_pmk_r1(st
- 				      const u8 **identity, size_t *identity_len,
- 				      const u8 **radius_cui,
- 				      size_t *radius_cui_len,
--				      int *out_session_timeout)
-+				      int *out_session_timeout,
-+				      struct rate_description *rate)
- {
- 	struct wpa_auth_config *conf = &wpa_auth->conf;
- 	const struct wpa_ft_pmk_r0_sa *r0;
-@@ -3023,7 +3124,8 @@ static int wpa_ft_local_derive_pmk_r1(st
- 			    pmk_r1_name,
- 			    sm->pairwise, r0->vlan, expires_in, session_timeout,
- 			    r0->identity, r0->identity_len,
--			    r0->radius_cui, r0->radius_cui_len);
-+			    r0->radius_cui, r0->radius_cui_len,
-+			    r0->rate);
- 
- 	*out_pairwise = sm->pairwise;
- 	if (vlan) {
-@@ -3033,6 +3135,13 @@ static int wpa_ft_local_derive_pmk_r1(st
- 			os_memset(vlan, 0, sizeof(*vlan));
- 	}
- 
-+	if (rate) {
-+		if (r0->rate)
-+			*rate = *r0->rate;
-+		else
-+			os_memset(rate, 0, sizeof(*rate));
-+	}
-+
- 	if (identity && identity_len) {
- 		*identity = r0->identity;
- 		*identity_len = r0->identity_len;
-@@ -3063,6 +3172,7 @@ static int wpa_ft_process_auth_req(struc
- 	u8 *pos, *end;
- 	int pairwise, session_timeout = 0;
- 	struct vlan_description vlan;
-+	struct rate_description rate;
- 	const u8 *identity, *radius_cui;
- 	size_t identity_len = 0, radius_cui_len = 0;
- 	int use_sha384;
-@@ -3153,7 +3263,7 @@ static int wpa_ft_process_auth_req(struc
- 	} else if (wpa_ft_fetch_pmk_r1(sm->wpa_auth, sm->addr, pmk_r1_name,
- 				       pmk_r1, &pmk_r1_len, &pairwise, &vlan,
- 				       &identity, &identity_len, &radius_cui,
--				       &radius_cui_len, &session_timeout) < 0) {
-+				       &radius_cui_len, &session_timeout, &rate) < 0) {
- 		wpa_printf(MSG_DEBUG,
- 			   "FT: No PMK-R1 available in local cache for the requested PMKR1Name");
- 		if (wpa_ft_local_derive_pmk_r1(sm->wpa_auth, sm,
-@@ -3162,7 +3272,7 @@ static int wpa_ft_process_auth_req(struc
- 					       pmk_r1_name, pmk_r1, &pairwise,
- 					       &vlan, &identity, &identity_len,
- 					       &radius_cui, &radius_cui_len,
--					       &session_timeout) == 0) {
-+					       &session_timeout, &rate) == 0) {
- 			wpa_printf(MSG_DEBUG,
- 				   "FT: Generated PMK-R1 based on local PMK-R0");
- 			goto pmk_r1_derived;
-@@ -3229,6 +3339,7 @@ pmk_r1_derived:
- 		wpa_printf(MSG_DEBUG, "FT: Failed to configure VLAN");
- 		return WLAN_STATUS_UNSPECIFIED_FAILURE;
- 	}
-+	wpa_ft_set_rate_limit(sm->wpa_auth, sm->addr, &rate);
- 	if (wpa_ft_set_identity(sm->wpa_auth, sm->addr,
- 				identity, identity_len) < 0 ||
- 	    wpa_ft_set_radius_cui(sm->wpa_auth, sm->addr,
-@@ -3801,7 +3912,7 @@ static int wpa_ft_rrb_build_r0(const u8
- 
- 	ret = wpa_ft_rrb_build(key, key_len, tlvs, sess_tlv, tlv_auth,
- 			       pmk_r0->vlan, src_addr, type,
--			       packet, packet_len);
-+			       packet, packet_len, pmk_r0->rate);
- 
- 	forced_memzero(pmk_r1, sizeof(pmk_r1));
- 
-@@ -3941,7 +4052,7 @@ static int wpa_ft_rrb_rx_pull(struct wpa
- 		ret = wpa_ft_rrb_build(key, key_len, resp, NULL, resp_auth,
- 				       NULL, wpa_auth->addr,
- 				       FT_PACKET_R0KH_R1KH_RESP,
--				       &packet, &packet_len);
-+				       &packet, &packet_len, NULL);
- 	} else {
- 		ret = wpa_ft_rrb_build_r0(key, key_len, resp, r0, f_r1kh_id,
- 					  f_s1kh_id, resp_auth, wpa_auth->addr,
-@@ -3993,11 +4104,15 @@ static int wpa_ft_rrb_rx_r1(struct wpa_a
- 	size_t f_expires_in_len;
- 	size_t f_identity_len, f_radius_cui_len;
- 	size_t f_session_timeout_len;
-+	size_t f_rate_len;
-+	const u8 *f_rate;
- 	int pairwise;
- 	int ret = -1;
- 	int expires_in;
- 	int session_timeout;
- 	struct vlan_description vlan;
-+	struct rate_description rate;
-+	int has_rate = 0;
- 	size_t pmk_r1_len;
- 
- 	RRB_GET_AUTH(FT_RRB_R0KH_ID, r0kh_id, msgtype, -1);
-@@ -4106,6 +4221,13 @@ static int wpa_ft_rrb_rx_r1(struct wpa_a
- 	wpa_printf(MSG_DEBUG, "FT: vlan %d%s",
- 		   le_to_host16(vlan.untagged), vlan.tagged[0] ? "+" : "");
- 
-+	RRB_GET_OPTIONAL(FT_RRB_RATE_LIMIT, rate, msgtype, 2 * sizeof(le32));
-+	if (f_rate) {
-+		memcpy(&rate, f_rate, sizeof(rate));
-+		rate.rx = le_to_host32(rate.rx);
-+		rate.tx = le_to_host32(rate.tx);
-+		has_rate = 1;
-+	};
- 	RRB_GET_OPTIONAL(FT_RRB_IDENTITY, identity, msgtype, -1);
- 	if (f_identity)
- 		wpa_hexdump_ascii(MSG_DEBUG, "FT: Identity", f_identity,
-@@ -4128,7 +4250,7 @@ static int wpa_ft_rrb_rx_r1(struct wpa_a
- 				f_pmk_r1_name,
- 				pairwise, &vlan, expires_in, session_timeout,
- 				f_identity, f_identity_len, f_radius_cui,
--				f_radius_cui_len) < 0)
-+				f_radius_cui_len, has_rate ? &rate : 0) < 0)
- 		goto out;
- 
- 	ret = 0;
-@@ -4441,7 +4563,7 @@ static int wpa_ft_rrb_rx_seq_req(struct
- 
- 	if (wpa_ft_rrb_build(key, key_len, NULL, NULL, seq_resp_auth, NULL,
- 			     wpa_auth->addr, FT_PACKET_R0KH_R1KH_SEQ_RESP,
--			     &packet, &packet_len) < 0)
-+			     &packet, &packet_len, NULL) < 0)
- 		goto out;
- 
- 	wpa_ft_rrb_oui_send(wpa_auth, src_addr,

feeds/ipq807x_v5.4/hostapd/patches/t00-010-ft_refresh.patch

@@ -0,0 +1,86 @@
+--- a/hostapd/config_file.c
++++ b/hostapd/config_file.c
+@@ -3152,6 +3152,8 @@ static int hostapd_config_fill(struct ho
+ 		bss->ft_over_ds = atoi(pos);
+ 	} else if (os_strcmp(buf, "ft_psk_generate_local") == 0) {
+ 		bss->ft_psk_generate_local = atoi(pos);
++	} else if (os_strcmp(buf, "ft_l2_refresh") == 0) {
++		bss->ft_l2_refresh = atoi(pos);
+ #endif /* CONFIG_IEEE80211R_AP */
+ #ifndef CONFIG_NO_CTRL_IFACE
+ 	} else if (os_strcmp(buf, "ctrl_interface") == 0) {
+--- a/src/ap/ap_config.h
++++ b/src/ap/ap_config.h
+@@ -401,6 +401,7 @@ struct hostapd_bss_config {
+ 	int pmk_r1_push;
+ 	int ft_over_ds;
+ 	int ft_psk_generate_local;
++	int ft_l2_refresh;
+ 	int r1_max_key_lifetime;
+ #endif /* CONFIG_IEEE80211R_AP */
+ 
+--- a/src/ap/wpa_auth_glue.c
++++ b/src/ap/wpa_auth_glue.c
+@@ -1495,6 +1495,28 @@ static void hostapd_request_radius_psk(v
+ #endif /* CONFIG_NO_RADIUS */
+ 
+ 
++static void wpa_ft_refresh(void *eloop_data, void *user_data)
++{
++	struct hostapd_data *hapd = eloop_data;
++	struct ft_rrb_frame *frame;
++	struct l2_ethhdr *buf;
++	size_t len;
++
++	len = sizeof(*buf) + sizeof(*frame);
++	buf = os_zalloc(len);
++	frame = (struct ft_rrb_frame *)(buf + 1);
++	frame->frame_type = RSN_REMOTE_FRAME_TYPE_FT_RRB;
++	frame->packet_type = FT_PACKET_REQUEST;
++	memset(buf->h_dest, 0xff, ETH_ALEN);
++	os_memcpy(buf->h_source, hapd->own_addr, ETH_ALEN);
++	buf->h_proto = host_to_be16(ETH_P_RRB);
++	l2_packet_send(hapd->l2, buf->h_dest, ETH_P_RRB, (u8 *) buf, len);
++	os_free(buf);
++
++	eloop_register_timeout(hapd->conf->ft_l2_refresh, 0, wpa_ft_refresh,
++			       hapd, NULL);
++}
++
+ int hostapd_setup_wpa(struct hostapd_data *hapd)
+ {
+ 	struct wpa_auth_config _conf;
+@@ -1640,6 +1662,9 @@ int hostapd_setup_wpa(struct hostapd_dat
+ 				   "Failed to open ETH_P_OUI interface");
+ 			return -1;
+ 		}
++
++		if (hapd->conf->ft_l2_refresh)
++			wpa_ft_refresh(hapd, NULL);
+ 	}
+ #endif /* CONFIG_IEEE80211R_AP */
+ 
+@@ -1655,7 +1680,6 @@ void hostapd_reconfig_wpa(struct hostapd
+ 	wpa_reconfig(hapd->wpa_auth, &wpa_auth_conf);
+ }
+ 
+-
+ void hostapd_deinit_wpa(struct hostapd_data *hapd)
+ {
+ 	ieee80211_tkip_countermeasures_deinit(hapd);
+@@ -1679,6 +1703,7 @@ void hostapd_deinit_wpa(struct hostapd_d
+ 				   "information element from interface %s",
+ 				   hapd->conf->iface);
+ 		}
++
+ 	}
+ 	ieee802_1x_deinit(hapd);
+ 
+@@ -1687,6 +1712,7 @@ void hostapd_deinit_wpa(struct hostapd_d
+ 	hostapd_wpa_ft_rrb_rx_later(hapd, NULL); /* flush without delivering */
+ 	eloop_cancel_timeout(hostapd_oui_deliver_later, hapd, ELOOP_ALL_CTX);
+ 	hostapd_oui_deliver_later(hapd, NULL); /* flush without delivering */
++	eloop_cancel_timeout(wpa_ft_refresh, hapd, ELOOP_ALL_CTX);
+ 	l2_packet_deinit(hapd->l2);
+ 	hapd->l2 = NULL;
+ 	hostapd_wpa_unregister_ft_oui(hapd);

feeds/ipq807x_v5.4/hostapd/patches/t00-011-owe_ssid_update.patch

@@ -0,0 +1,27 @@
+--- a/src/ap/hostapd.c
++++ b/src/ap/hostapd.c
+@@ -1995,6 +1995,13 @@ static int hostapd_owe_iface_iter(struct
+ 		    is_zero_ether_addr(bss->own_addr))
+ 			continue;
+ 
++		if (!os_memcmp(hapd->conf->owe_transition_bssid, bss->own_addr,
++			       ETH_ALEN) &&
++		    hapd->conf->owe_transition_ssid_len == bss->conf->ssid.ssid_len &&
++		    !os_memcmp(hapd->conf->owe_transition_ssid, bss->conf->ssid.ssid,
++			       bss->conf->ssid.ssid_len))
++			return 0;
++
+ 		os_memcpy(hapd->conf->owe_transition_bssid, bss->own_addr,
+ 			  ETH_ALEN);
+ 		os_memcpy(hapd->conf->owe_transition_ssid,
+@@ -2011,10 +2018,6 @@ static int hostapd_owe_iface_iter(struct
+ 
+ int hostapd_owe_trans_get_info(struct hostapd_data *hapd)
+ {
+-	if (hapd->conf->owe_transition_ssid_len > 0 &&
+-	    !is_zero_ether_addr(hapd->conf->owe_transition_bssid))
+-		return 0;
+-
+ 	/* Find transition mode SSID/BSSID information from a BSS operated by
+ 	 * this hostapd instance. */
+ 	if (!hapd->iface->interfaces ||

feeds/ipq807x_v5.4/ipq50xx/Makefile

@@ -3,7 +3,7 @@ include $(TOPDIR)/rules.mk
 ARCH:=aarch64
 BOARD:=ipq50xx
 BOARDNAME:=Qualcomm Technologies, Inc IPQ50xx
-FEATURES:=squashfs fpu ramdisk pcie usbgadgeti nand 
+FEATURES:=squashfs fpu ramdisk pcie usbgadget nand
 CPU_TYPE:=cortex-a53
 CPU_SUBTYPE:=neon-vfpv4
 MAINTAINER:=John Crispin <blogic@openwrt.org>

feeds/ipq807x_v5.4/ipq50xx/base-files/etc/board.d/02_network

@@ -25,6 +25,10 @@ qcom_setup_interfaces()
 	cybertan,eww631-b1)
 		ucidef_add_switch "switch1" "5:wan" "2:lan" "3:lan" "4:lan" "6@eth0"
 		;;
+	udaya,a6-id2)
+		ucidef_set_interface_wan "eth1"
+		ucidef_set_interface_lan "eth0"
+		;;
 	edgecore,oap101|\
  	edgecore,oap101-6e|\
 	edgecore,oap101e|\

feeds/ipq807x_v5.4/ipq50xx/base-files/etc/hotplug.d/firmware/10-ath11k-caldata

@@ -99,6 +99,7 @@ ath11k/IPQ5018/hw1.0/caldata.bin)
 	optimcloud,d60-5g|\
 	optimcloud,d50|\
 	optimcloud,d50-5g|\
+	udaya,a6-id2|\
 	yuncore,fap655)
 		caldata_extract "0:ART" 0x1000 0x20000  
 		;;
@@ -114,6 +115,7 @@ ath11k/qcn6122/hw1.0/caldata_1.bin)
 	edgecore,oap101-6e|\
 	edgecore,oap101e|\
 	edgecore,oap101e-6e|\
+	udaya,a6-id2|\
 	hfcl,ion4xi_w|\
 	yuncore,fap655)
 		caldata_extract "0:ART" 0x26800 0x20000  

feeds/ipq807x_v5.4/ipq50xx/base-files/etc/hotplug.d/firmware/10-ath11k-caldata.orig

@@ -1,111 +0,0 @@
-#!/bin/sh
-
-[ -e /lib/firmware/$FIRMWARE ] && exit 0
-
-. /lib/functions.sh
-. /lib/functions/system.sh
-
-ath11k_generate_macs() {
-	touch /lib/firmware/ath11k-macs
-	eth=$(cat /sys/class/net/eth0/address)
-	mac1=$(macaddr_add $eth 2)
-	mac2=$(macaddr_add $eth 3)
-	mac3=$(macaddr_add $eth 4)
-	echo -ne \\x${mac1//:/\\x} >> /lib/firmware/ath11k-macs
-	echo -ne \\x${mac2//:/\\x} >> /lib/firmware/ath11k-macs
-	echo -ne \\x${mac3//:/\\x} >> /lib/firmware/ath11k-macs
-}
-
-ath11k_generate_macs_wf186w() {
-	touch /lib/firmware/ath11k-macs
-	local dev=$(find_mtd_chardev "0:APPSBLENV")
-	mac=$(grep BaseMacAddress= $dev | cut -dx -f2)
-	eth=$(macaddr_canonicalize $mac)
-	mac1=$(macaddr_add $eth 2)
-	mac2=$(macaddr_add $eth 3)
-	mac3=$(macaddr_add $eth 4)
-	echo -ne \\x${mac1//:/\\x} >> /lib/firmware/ath11k-macs
-	echo -ne \\x${mac2//:/\\x} >> /lib/firmware/ath11k-macs
-	echo -ne \\x${mac3//:/\\x} >> /lib/firmware/ath11k-macs
-}
-
-ath11k_generate_macs_ion4x() {				     
-	touch /lib/firmware/ath11k-macs			   
-	wifimac0=$(grep WLAN0_BASEMAC= /dev/mtd13 |cut -d '=' -f2) 
-	wifimac1=$(grep WLAN1_BASEMAC= /dev/mtd13 |cut -d '=' -f2) 
-	wifimac2=00:00:00:00:00:00				 
-	echo -ne \\x${wifimac0//:/\\x} >> /lib/firmware/ath11k-macs
-	echo -ne \\x${wifimac1//:/\\x} >> /lib/firmware/ath11k-macs
-	echo -ne \\x${wifimac2//:/\\x} >> /lib/firmware/ath11k-macs
-}
-
-caldata_die() {
-	echo "caldata: " "$*"
-	exit 1
-}
-
-caldata_extract() {
-	local part=$1
-	local offset=$(($2))
-	local count=$(($3))
-	local mtd
-
-	mtd=$(find_mtd_chardev $part)
-	[ -n "$mtd" ] || caldata_die "no mtd device found for partition $part"
-
-	dd if=$mtd of=/lib/firmware/$FIRMWARE iflag=skip_bytes bs=$count skip=$offset count=1 2>/dev/null || \
-		caldata_die "failed to extract calibration data from $mtd"
-}
-
-board=$(board_name)
-
-case "$FIRMWARE" in
-ath11k/IPQ5018/hw1.0/caldata.bin)
-	case "$board" in
-	cig,wf186w|\
-	edgecore,eap104|\
-	edgecore,oap101-6e|\
-	edgecore,oap101e|\
-	hfcl,ion4xi_w|\
-	yuncore,fap655)
-		caldata_extract "0:ART" 0x1000 0x20000  
-		;;
-	esac
-	;;
-ath11k/qcn6122/hw1.0/caldata_1.bin)
-	case "$board" in
-	cig,wf186w|\
-	edgecore,oap101-6e|\
-	edgecore,oap101e|\
-	hfcl,ion4xi_w|\
-	yuncore,fap655)
-		caldata_extract "0:ART" 0x26800 0x20000  
-		;;
-	esac
-	;;
-ath11k/qcn6122/hw1.0/caldata_2.bin)
-	case "$board" in
-	edgecore,eap104|\
-	edgecore,oap101-6e)
-		caldata_extract "0:ART" 0x4c000 0x20000  
-		;;
-	esac
-	;;
-ath11k-macs)
-	case "$board" in
-	cig,wf186w)
-		ath11k_generate_macs_wf186w
-		;;
-	edgecore,eap104|\
-	yuncore,fap655)
-		ath11k_generate_macs
-		;;
-	hfcl,ion4xi_w)
-		ath11k_generate_macs_ion4x
-		;;
-	esac
-	;;
-*)
-	exit 1
-	;;
-esac

feeds/ipq807x_v5.4/ipq50xx/base-files/lib/upgrade/platform.sh

@@ -80,6 +80,7 @@ platform_check_image() {
 	optimcloud,d50|\
 	optimcloud,d50-5g|\
 	yuncore,fap655|\
+	udaya,a6-id2|\
 	edgecore,oap101|\
 	edgecore,oap101-6e|\
 	edgecore,oap101e|\
@@ -121,6 +122,7 @@ platform_do_upgrade() {
                 ;;
 	cig,wf186w|\
 	cig,wf186h|\
+	udaya,a6-id2|\
 	optimcloud,d60|\
 	optimcloud,d60-5g|\
 	optimcloud,d50|\

feeds/ipq807x_v5.4/ipq50xx/files/arch/arm64/boot/dts/qcom/qcom-ipq5018-udaya-a6-id2.dts

@@ -0,0 +1,900 @@
+/dts-v1/;
+/* Copyright (c) 2018-2021, The Linux Foundation. All rights reserved.
+ *
+ * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved.
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include "ipq5018.dtsi"
+
+/ {
+	#address-cells = <0x2>;
+	#size-cells = <0x2>;
+	model = "Udaya A6-ID2";
+	compatible = "udaya,a6-id2", "qcom,ipq5018";
+	interrupt-parent = <&intc>;
+
+	aliases {
+		sdhc1 = &sdhc_1; /* SDC1 eMMC slot */
+		serial0 = &blsp1_uart1;
+		serial1 = &blsp1_uart2;
+		ethernet0 = "/soc/dp1";
+		ethernet1 = "/soc/dp2";
+
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
+	};
+
+	chosen {
+		bootargs = "console=ttyMSM0,115200,n8 rw init=/init";
+		bootargs-append = " swiotlb=1 coherent_pool=2M";
+		stdout-path = "serial0";
+	};
+
+	reserved-memory {
+	#ifdef __IPQ_MEM_PROFILE_256_MB__
+	/*                   256 MB Profile
+	 * +==========+==============+=========================+
+	 * |          |              |                         |
+	 * |  Region  | Start Offset |          Size           |
+	 * |          |              |                         |
+	 * +----------+--------------+-------------------------+
+	 * |    NSS   |  0x40000000  |           8MB           |
+	 * +----------+--------------+-------------------------+
+	 * |   Linux  |  0x40800000  | Depends on total memory |
+	 * +----------+--------------+-------------------------+
+	 * |   uboot  |  0x4A600000  |           4MB           |
+	 * +----------+--------------+-------------------------+
+	 * |    SBL   |  0x4AA00000  |           1MB           |
+	 * +----------+--------------+-------------------------+
+	 * |   smem   |  0x4AB00000  |           1MB           |
+	 * +----------+--------------+-------------------------+
+	 * |    TZ    |  0x4AC00000  |           4MB           |
+	 * +----------+--------------+-------------------------+
+	 * |    Q6    |              |                         |
+	 * |   code/  |  0x4B000000  |          20MB           |
+	 * |   data   |              |                         |
+	 * +----------+--------------+-------------------------+
+	 * |  IPQ5018 |              |                         |
+	 * |   data   |  0x4C400000  |          13MB           |
+	 * +----------+--------------+-------------------------+
+	 * |  IPQ5018 |              |                         |
+	 * |  M3 Dump |  0x4D100000  |           1MB           |
+	 * +----------+--------------+-------------------------+
+	 * |  IPQ5018 |              |                         |
+	 * |   QDSS   |  0x4D200000  |           1MB           |
+	 * +----------+--------------+-------------------------+
+	 * | QCN6122_1|              |                         |
+	 * |   data   |  0x4D300000  |          13MB           |
+	 * +----------+--------------+-------------------------+
+	 * | QCN6122_1|              |                         |
+	 * |  M3 Dump |  0x4E000000  |           1MB           |
+	 * +----------+--------------+-------------------------+
+	 * | QCN6122_1|              |                         |
+	 * |   QDSS   |  0x4E100000  |           1MB           |
+	 * +----------+--------------+-------------------------+
+	 * | QCN6122_2|              |                         |
+	 * |   data   |  0x4E200000  |          13MB           |
+	 * +----------+--------------+-------------------------+
+	 * | QCN6122_2|              |                         |
+	 * |  M3 Dump |  0x4EF00000  |           1MB           |
+	 * +----------+--------------+-------------------------+
+	 * | QCN6122_2|              |                         |
+	 * |   QDSS   |  0x4F000000  |           1MB           |
+	 * +----------+--------------+-------------------------+
+	 * |                                                   |
+	 * |            Rest of the memory for Linux           |
+	 * |                                                   |
+	 * +===================================================+
+	 */
+		q6_mem_regions: q6_mem_regions@4B000000 {
+			no-map;
+			reg = <0x0 0x4B000000 0x0 0x4100000>;
+		};
+
+		q6_code_data: q6_code_data@4B000000 {
+			no-map;
+			reg = <0x0 0x4B000000 0x0 0x1400000>;
+		};
+
+		q6_ipq5018_data: q6_ipq5018_data@4C400000 {
+			no-map;
+			reg = <0x0 0x4C400000 0x0 0xD00000>;
+		};
+
+		m3_dump: m3_dump@4D100000 {
+			no-map;
+			reg = <0x0 0x4D100000 0x0 0x100000>;
+		};
+
+		q6_etr_region: q6_etr_dump@4D200000 {
+			no-map;
+			reg = <0x0 0x4D200000 0x0 0x100000>;
+		};
+
+		q6_qcn6122_data1: q6_qcn6122_data1@4D300000 {
+			no-map;
+			reg = <0x0 0x4D300000 0x0 0xD00000>;
+		};
+
+		m3_dump_qcn6122_1: m3_dump_qcn6122_1@4E000000 {
+			no-map;
+			reg = <0x0 0x4E000000 0x0 0x100000>;
+		};
+
+		q6_qcn6122_etr_1: q6_qcn6122_etr_1@4E100000 {
+			no-map;
+			reg = <0x0 0x4E100000 0x0 0x100000>;
+		};
+
+		q6_qcn6122_data2: q6_qcn6122_data2@4E200000 {
+			no-map;
+			reg = <0x0 0x4E200000 0x0 0xD00000>;
+		};
+
+		m3_dump_qcn6122_2: m3_dump_qcn6122_2@4EF00000 {
+			no-map;
+			reg = <0x0 0x4EF00000 0x0 0x100000>;
+		};
+
+		q6_qcn6122_etr_2: q6_qcn6122_etr_2@4F000000 {
+			no-map;
+			reg = <0x0 0x4F000000 0x0 0x100000>;
+		};
+	#else
+	/*                 512MB/1GB Profiles
+	 * +==========+==============+=========================+
+	 * |          |              |                         |
+	 * |  Region  | Start Offset |          Size           |
+	 * |          |              |                         |
+	 * +----------+--------------+-------------------------+
+	 * |    NSS   |  0x40000000  |          16MB           |
+	 * +----------+--------------+-------------------------+
+	 * |   Linux  |  0x41000000  | Depends on total memory |
+	 * +----------+--------------+-------------------------+
+	 * |   uboot  |  0x4A600000  |           4MB           |
+	 * +----------+--------------+-------------------------+
+	 * |    SBL   |  0x4AA00000  |           1MB           |
+	 * +----------+--------------+-------------------------+
+	 * |   smem   |  0x4AB00000  |           1MB           |
+	 * +----------+--------------+-------------------------+
+	 * |    TZ    |  0x4AC00000  |           4MB           |
+	 * +----------+--------------+-------------------------+
+	 * |    Q6    |              |                         |
+	 * |   code/  |  0x4B000000  |          20MB           |
+	 * |   data   |              |                         |
+	 * +----------+--------------+-------------------------+
+	 * |  IPQ5018 |              |                         |
+	 * |   data   |  0x4C400000  |          13MB           |
+	 * +----------+--------------+-------------------------+
+	 * |  IPQ5018 |              |                         |
+	 * |  M3 Dump |  0x4D100000  |           1MB           |
+	 * +----------+--------------+-------------------------+
+	 * |  IPQ5018 |              |                         |
+	 * |   QDSS   |  0x4D200000  |           1MB           |
+	 * +----------+--------------+-------------------------+
+	 * |  IPQ5018 |              |                         |
+	 * |  Caldb   |  0x4D300000  |           2MB           |
+	 * +----------+--------------+-------------------------+
+	 * | QCN6122_1|              |                         |
+	 * |   data   |  0x4D500000  |          13MB           |
+	 * +----------+--------------+-------------------------+
+	 * | QCN6122_1|              |                         |
+	 * |  M3 Dump |  0x4E200000  |           1MB           |
+	 * +----------+--------------+-------------------------+
+	 * | QCN6122_1|              |                         |
+	 * |   QDSS   |  0x4E300000  |           1MB           |
+	 * +----------+--------------+-------------------------+
+	 * | QCN6122_1|              |                         |
+	 * |  Caldb   |  0x4E400000  |           5MB           |
+	 * +----------+--------------+-------------------------+
+	 * | QCN6122_2|              |                         |
+	 * |   data   |  0x4E900000  |          13MB           |
+	 * +----------+--------------+-------------------------+
+	 * | QCN6122_2|              |                         |
+	 * |  M3 Dump |  0x4F600000  |           1MB           |
+	 * +----------+--------------+-------------------------+
+	 * | QCN6122_2|              |                         |
+	 * |   QDSS   |  0x4F700000  |           1MB           |
+	 * +----------+--------------+-------------------------+
+	 * | QCN6122_2|              |                         |
+	 * |  Caldb   |  0x4F800000  |           5MB           |
+	 * +----------+--------------+-------------------------+
+	 * |                                                   |
+	 * |            Rest of the memory for Linux           |
+	 * |                                                   |
+	 * +===================================================+
+	 */
+		q6_mem_regions: q6_mem_regions@4B000000 {
+			no-map;
+			reg = <0x0 0x4B000000 0x0 0x4D00000>;
+		};
+
+		q6_code_data: q6_code_data@4B000000 {
+			no-map;
+			reg = <0x0 0x4B000000 0x0 01400000>;
+		};
+
+		q6_ipq5018_data: q6_ipq5018_data@4C400000 {
+			no-map;
+			reg = <0x0 0x4C400000 0x0 0xD00000>;
+		};
+
+		m3_dump: m3_dump@4D100000 {
+			no-map;
+			reg = <0x0 0x4D100000 0x0 0x100000>;
+		};
+
+		q6_etr_region: q6_etr_dump@4D200000 {
+			no-map;
+			reg = <0x0 0x4D200000 0x0 0x100000>;
+		};
+
+		q6_caldb_region: q6_caldb_region@4D300000 {
+			no-map;
+			reg = <0x0 0x4D300000 0x0 0x200000>;
+		};
+
+		q6_qcn6122_data1: q6_qcn6122_data1@4D500000 {
+			no-map;
+			reg = <0x0 0x4D500000 0x0 0xD00000>;
+		};
+
+		m3_dump_qcn6122_1: m3_dump_qcn6122_1@4E200000 {
+			no-map;
+			reg = <0x0 0x4E200000 0x0 0x100000>;
+		};
+
+		q6_qcn6122_etr_1: q6_qcn6122_etr_1@4E300000 {
+			no-map;
+			reg = <0x0 0x4E300000 0x0 0x100000>;
+		};
+
+		q6_qcn6122_caldb_1: q6_qcn6122_caldb_1@4E400000 {
+			no-map;
+			reg = <0x0 0x4E400000 0x0 0x500000>;
+		};
+
+		q6_qcn6122_data2: q6_qcn6122_data2@4E900000 {
+			no-map;
+			reg = <0x0 0x4E900000 0x0 0xD00000>;
+		};
+
+		m3_dump_qcn6122_2: m3_dump_qcn6122_2@4F600000 {
+			no-map;
+			reg = <0x0 0x4F600000 0x0 0x100000>;
+		};
+
+		q6_qcn6122_etr_2: q6_qcn6122_etr_2@4F700000 {
+			no-map;
+			reg = <0x0 0x4F700000 0x0 0x100000>;
+		};
+
+		q6_qcn6122_caldb_2: q6_qcn6122_caldb_2@4F800000 {
+			no-map;
+			reg = <0x0 0x4F800000 0x0 0x500000>;
+		};
+
+	#endif
+	};
+
+	soc {
+		serial@78af000 {
+			status = "ok";
+		};
+
+		blsp1_uart2: serial@78b0000 {
+			pinctrl-0 = <&blsp1_uart_pins>;
+			pinctrl-names = "default";
+		};
+
+		qpic_bam: dma@7984000{
+			status = "ok";
+		};
+
+		nand: qpic-nand@79b0000 {
+			pinctrl-0 = <&qspi_nand_pins>;
+			pinctrl-names = "default";
+			status = "ok";
+		};
+
+		spi_0: spi@78b5000 { /* BLSP1 QUP0 */
+			pinctrl-0 = <&blsp0_spi_pins>;
+			pinctrl-names = "default";
+			cs-select = <0>;
+			status = "ok";
+
+			m25p80@0 {
+				#address-cells = <1>;
+				#size-cells = <1>;
+				reg = <0>;
+				compatible = "n25q128a11";
+				linux,modalias = "m25p80", "n25q128a11";
+				spi-max-frequency = <50000000>;
+				use-default-sizes;
+			};
+		};
+
+		mdio0: mdio@88000 {
+			status = "ok";
+
+			ethernet-phy@0 {
+				reg = <7>;
+			};
+		};
+
+		mdio1: mdio@90000 {
+			status = "ok";
+			pinctrl-0 = <&mdio1_pins>;
+			pinctrl-names = "default";
+			phy-reset-gpio = <&tlmm 39 0>;
+
+			ethernet-phy@0 {
+				reg = <28>;
+			};
+		};
+
+		ess-instance {
+			num_devices = <0x1>;
+			ess-switch@0x39c00000 {
+				switch_mac_mode = <0xf>; /* mac mode for uniphy instance*/
+				cmnblk_clk = "internal_96MHz"; /* cmnblk clk*/
+				qcom,port_phyinfo {
+					port@0 {
+						port_id = <1>;
+						phy_address = <7>;
+						mdiobus = <&mdio0>;
+					};
+					port@1 {
+						port_id = <2>;
+						phy_address = <0x1c>;
+						mdiobus = <&mdio1>;
+						port_mac_sel = "QGMAC_PORT";
+					};
+				};
+				led_source@0 {
+					source = <0>;
+					mode = "normal";
+					speed = "all";
+					blink_en = "enable";
+					active = "high";
+				};
+			};
+		};
+
+		dp1 {
+			device_type = "network";
+			compatible = "qcom,nss-dp";
+			clocks = <&gcc GCC_SNOC_GMAC0_AXI_CLK>;
+			clock-names = "nss-snoc-gmac-axi-clk";
+			qcom,id = <1>;
+			reg = <0x39C00000 0x10000>;
+			interrupts = <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>;
+			qcom,mactype = <2>;
+			qcom,link-poll = <1>;
+			qcom,phy-mdio-addr = <7>;
+			mdio-bus = <&mdio0>;
+			local-mac-address = [000000000000];
+			phy-mode = "sgmii";
+			qcom,rx-page-mode = <0>;
+		};
+
+		dp2 {
+			device_type = "network";
+			compatible = "qcom,nss-dp";
+			clocks = <&gcc GCC_SNOC_GMAC1_AXI_CLK>;
+			clock-names = "nss-snoc-gmac-axi-clk";
+			qcom,id = <2>;
+			reg = <0x39D00000 0x10000>;
+			interrupts = <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>;
+			qcom,mactype = <2>;
+			qcom,link-poll = <1>;
+			qcom,phy-mdio-addr = <28>;
+			mdio-bus = <&mdio1>;
+			local-mac-address = [000000000000];
+			phy-mode = "sgmii";
+			qcom,rx-page-mode = <0>;
+		};
+
+		nss-macsec1 {
+			compatible = "qcom,nss-macsec";
+			phy_addr = <0x1c>;
+			mdiobus = <&mdio1>;
+		};
+
+		pcm: pcm@0xA3C0000{
+			pinctrl-0 = <&audio_pins>;
+			pinctrl-names = "default";
+		};
+
+		gpio_keys {
+			compatible = "gpio-keys";
+			pinctrl-0 = <&button_pins>;
+			pinctrl-names = "default";
+
+			wps {
+				label = "reset";
+				linux,code = <KEY_RESTART>;
+				gpios = <&tlmm 38 GPIO_ACTIVE_LOW>;
+				linux,input-type = <1>;
+				debounce-interval = <60>;
+			};
+		};
+
+		leds {
+			compatible = "gpio-leds";
+			pinctrl-0 = <&leds_pins>;
+			pinctrl-names = "default";
+
+			led_power: led@30 {
+				label = "green:power";
+				gpios = <&tlmm 30 GPIO_ACTIVE_HIGH>;
+				default-state = "on";
+			};
+		};
+	};
+
+	qcom,test@0 {
+		status = "ok";
+	};
+
+	thermal-zones {
+		status = "ok";
+	};
+};
+
+&tlmm {
+	pinctrl-0 = <&blsp0_uart_pins &phy_led_pins>;
+	pinctrl-names = "default";
+
+	blsp0_uart_pins: uart_pins {
+		blsp0_uart_rx_tx {
+			pins = "gpio20", "gpio21";
+			function = "blsp0_uart0";
+			bias-disable;
+		};
+	};
+
+	blsp1_uart_pins: blsp1_uart_pins {
+		blsp1_uart_rx_tx {
+			pins = "gpio23", "gpio25", "gpio24", "gpio26";
+			function = "blsp1_uart2";
+			bias-disable;
+		};
+	};
+
+	blsp0_spi_pins: blsp0_spi_pins {
+		mux {
+			pins = "gpio10", "gpio11", "gpio12", "gpio13";
+			function = "blsp0_spi";
+			drive-strength = <2>;
+			bias-disable;
+		};
+	};
+
+	qspi_nand_pins: qspi_nand_pins {
+		qspi_clock {
+			pins = "gpio9";
+			function = "qspi_clk";
+			drive-strength = <8>;
+			bias-disable;
+		};
+
+		qspi_cs {
+			pins = "gpio8";
+			function = "qspi_cs";
+			drive-strength = <8>;
+			bias-disable;
+		};
+
+		qspi_data {
+			pins = "gpio4", "gpio5", "gpio6", "gpio7";
+			function = "qspi_data";
+			drive-strength = <8>;
+			bias-disable;
+		};
+	};
+
+	mdio1_pins: mdio_pinmux {
+		mux_0 {
+			pins = "gpio36";
+			function = "mdc";
+			drive-strength = <8>;
+			bias-pull-up;
+		};
+
+		mux_1 {
+			pins = "gpio37";
+			function = "mdio";
+			drive-strength = <8>;
+			bias-pull-up;
+		};
+	};
+
+	phy_led_pins: phy_led_pins {
+		gephy_led_pin {
+			pins = "gpio46";
+			function = "led0";
+			drive-strength = <8>;
+			bias-pull-down;
+		};
+	};
+
+	i2c_pins: i2c_pins {
+		i2c_scl {
+			pins = "gpio25";
+			function = "blsp2_i2c1";
+			drive-strength = <8>;
+			bias-disable;
+		};
+
+		i2c_sda {
+			pins = "gpio26";
+			function = "blsp2_i2c1";
+			drive-strength = <8>;
+			bias-disable;
+		};
+	};
+
+	button_pins: button_pins {
+		wps_button {
+			pins = "gpio38";
+			function = "gpio";
+			drive-strength = <8>;
+			bias-pull-up;
+		};
+	};
+
+	leds_pins: leds_pins {
+		led_status {
+			pins = "gpio30";
+			function = "gpio";
+			drive-strength = <8>;
+			bias-pull-down;
+		};
+	};
+
+	audio_pins: audio_pinmux {
+		mux_1 {
+			pins = "gpio24";
+			function = "audio_rxbclk";
+			drive-strength = <8>;
+			bias-pull-down;
+		};
+
+		mux_2 {
+			pins = "gpio25";
+			function = "audio_rxfsync";
+			drive-strength = <8>;
+			bias-pull-down;
+		};
+
+		mux_3 {
+			pins = "gpio26";
+			function = "audio_rxd";
+			drive-strength = <8>;
+			bias-pull-down;
+		};
+
+		mux_4 {
+			pins = "gpio27";
+			function = "audio_txmclk";
+			drive-strength = <8>;
+			bias-pull-down;
+		};
+
+		mux_5 {
+			pins = "gpio28";
+			function = "audio_txbclk";
+			drive-strength = <8>;
+			bias-pull-down;
+		};
+
+		mux_6 {
+			pins = "gpio29";
+			function = "audio_txfsync";
+			drive-strength = <8>;
+			bias-pull-down;
+		};
+
+		mux_7 {
+			pins = "gpio30";
+			function = "audio_txd";
+			drive-strength = <8>;
+			bias-pull-down;
+		};
+	};
+};
+
+&soc {
+	gpio_keys {
+		compatible = "gpio-keys";
+		pinctrl-0 = <&button_pins>;
+		pinctrl-names = "default";
+
+		button@1 {
+			label = "wps";
+			linux,code = <KEY_WPS_BUTTON>;
+			gpios = <&tlmm 38 GPIO_ACTIVE_LOW>;
+			linux,input-type = <1>;
+			debounce-interval = <60>;
+		};
+	};
+};
+
+&q6v5_wcss {
+	compatible = "qcom,ipq5018-q6-mpd";
+	#address-cells = <1>;
+	#size-cells = <1>;
+	ranges;
+	firmware = "IPQ5018/q6_fw.mdt";
+	reg = <0x0cd00000 0x4040>,
+		<0x1938000 0x8>,
+		<0x193d204 0x4>;
+	reg-names = "qdsp6",
+			"tcsr-msip",
+			"tcsr-q6";
+	resets = <&gcc GCC_WCSSAON_RESET>,
+			<&gcc GCC_WCSS_Q6_BCR>;
+
+	reset-names = "wcss_aon_reset",
+			"wcss_q6_reset";
+
+	clocks = <&gcc GCC_Q6_AXIS_CLK>,
+		<&gcc GCC_WCSS_ECAHB_CLK>,
+		<&gcc GCC_Q6_AXIM_CLK>,
+		<&gcc GCC_Q6_AXIM2_CLK>,
+		<&gcc GCC_Q6_AHB_CLK>,
+		<&gcc GCC_Q6_AHB_S_CLK>,
+		<&gcc GCC_WCSS_AXI_S_CLK>;
+	clock-names = "gcc_q6_axis_clk",
+		"gcc_wcss_ecahb_clk",
+		"gcc_q6_axim_clk",
+		"gcc_q6_axim2_clk",
+		"gcc_q6_ahb_clk",
+		"gcc_q6_ahb_s_clk",
+		"gcc_wcss_axi_s_clk";
+
+	#ifdef __IPQ_MEM_PROFILE_256_MB__
+		memory-region = <&q6_mem_regions>, <&q6_etr_region>;
+	#else
+		memory-region = <&q6_mem_regions>, <&q6_etr_region>,
+				<&q6_caldb_region>;
+	#endif
+
+	qcom,rproc = <&q6v5_wcss>;
+	qcom,bootargs_smem = <507>;
+	boot-args = <0x1 0x4 0x3 0x0F 0x0 0x0>,
+			<0x2 0x4 0x2 0x12 0x0 0x0>;
+	status = "ok";
+	q6_wcss_pd1: remoteproc_pd1@4ab000 {
+		compatible = "qcom,ipq5018-wcss-ahb-mpd";
+		reg = <0x4ab000 0x20>;
+		reg-names = "rmb";
+		firmware = "IPQ5018/q6_fw.mdt";
+		m3_firmware = "IPQ5018/m3_fw.mdt";
+		interrupts-extended = <&wcss_smp2p_in 8 0>,
+					<&wcss_smp2p_in 9 0>,
+					<&wcss_smp2p_in 12 0>,
+					<&wcss_smp2p_in 11 0>;
+		interrupt-names = "fatal",
+					"ready",
+					"spawn-ack",
+					"stop-ack";
+
+		resets = <&gcc GCC_WCSSAON_RESET>,
+				<&gcc GCC_WCSS_BCR>,
+				<&gcc GCC_CE_BCR>;
+		reset-names = "wcss_aon_reset",
+				"wcss_reset",
+				"ce_reset";
+
+		clocks = <&gcc GCC_WCSS_AHB_S_CLK>,
+				<&gcc GCC_WCSS_ACMT_CLK>,
+				<&gcc GCC_WCSS_AXI_M_CLK>;
+		clock-names = "gcc_wcss_ahb_s_clk",
+					"gcc_wcss_acmt_clk",
+					"gcc_wcss_axi_m_clk";
+
+		qcom,halt-regs = <&tcsr_q6_block 0xa000 0xd000 0x0>;
+
+		qcom,smem-states = <&wcss_smp2p_out 8>,
+					<&wcss_smp2p_out 9>,
+					<&wcss_smp2p_out 10>;
+		qcom,smem-state-names = "shutdown",
+					"stop",
+					"spawn";
+	#ifdef __IPQ_MEM_PROFILE_256_MB__
+		memory-region = <&q6_ipq5018_data>, <&m3_dump>,
+				<&q6_etr_region>;
+	#else
+		memory-region = <&q6_ipq5018_data>, <&m3_dump>,
+				<&q6_etr_region>, <&q6_caldb_region>;
+	#endif
+
+	};
+
+	q6_wcss_pd2: remoteproc_pd2 {
+		compatible = "qcom,ipq5018-wcss-pcie-mpd";
+		firmware = "IPQ5018/q6_fw.mdt";
+		m3_firmware = "qcn6122/m3_fw.mdt";
+		interrupts-extended = <&wcss_smp2p_in 16 0>,
+					<&wcss_smp2p_in 17 0>,
+					<&wcss_smp2p_in 20 0>,
+					<&wcss_smp2p_in 19 0>;
+		interrupt-names = "fatal",
+					"ready",
+					"spawn-ack",
+					"stop-ack";
+
+		qcom,smem-states = <&wcss_smp2p_out 16>,
+					<&wcss_smp2p_out 17>,
+					<&wcss_smp2p_out 18>;
+		qcom,smem-state-names = "shutdown",
+					"stop",
+					"spawn";
+	#ifdef __IPQ_MEM_PROFILE_256_MB__
+		memory-region = <&q6_qcn6122_data1>, <&m3_dump_qcn6122_1>,
+				<&q6_qcn6122_etr_1>;
+	#else
+		memory-region = <&q6_qcn6122_data1>, <&m3_dump_qcn6122_1>,
+				<&q6_qcn6122_etr_1>, <&q6_qcn6122_caldb_1>;
+	#endif
+
+	};
+
+	q6_wcss_pd3: remoteproc_pd3 {
+		compatible = "qcom,ipq5018-wcss-pcie-mpd";
+		firmware = "IPQ5018/q6_fw.mdt";
+		interrupts-extended = <&wcss_smp2p_in 24 0>,
+					<&wcss_smp2p_in 25 0>,
+					<&wcss_smp2p_in 28 0>,
+					<&wcss_smp2p_in 27 0>;
+		interrupt-names = "fatal",
+					"ready",
+					"spawn-ack",
+					"stop-ack";
+
+		qcom,smem-states = <&wcss_smp2p_out 24>,
+					<&wcss_smp2p_out 25>,
+					<&wcss_smp2p_out 26>;
+		qcom,smem-state-names = "shutdown",
+					"stop",
+					"spawn";
+	#ifdef	__IPQ_MEM_PROFILE_256_MB__
+		memory-region = <&q6_qcn6122_data2>, <&m3_dump_qcn6122_2>,
+				<&q6_qcn6122_etr_2>;
+	#else
+		memory-region = <&q6_qcn6122_data2>, <&m3_dump_qcn6122_2>,
+				<&q6_qcn6122_etr_2>, <&q6_qcn6122_caldb_2>;
+	#endif
+	};
+};
+
+&i2c_0 {
+	pinctrl-0 = <&i2c_pins>;
+	pinctrl-names = "default";
+};
+
+&wifi0 {
+	/* IPQ5018 */
+	qcom,multipd_arch;
+	qcom,rproc = <&q6_wcss_pd1>;
+	qcom,userpd-subsys-name = "q6v5_wcss_userpd1";
+#ifdef __IPQ_MEM_PROFILE_256_MB__
+	qcom,tgt-mem-mode = <2>;
+#else
+	qcom,tgt-mem-mode = <1>;
+#endif
+	qcom,board_id = <0x23>;
+#ifdef __CNSS2__
+	qcom,bdf-addr = <0x4C400000 0x4C400000 0x4C400000 0x0 0x0>;
+	qcom,caldb-addr = <0x4D300000 0x4D300000 0 0 0>;
+	qcom,caldb-size = <0x200000>;
+	mem-region = <&q6_ipq5018_data>;
+#else
+	memory-region = <&q6_ipq5018_data>;
+#endif
+	status = "ok";
+};
+
+&wifi1 {
+	/* QCN6122 5G */
+	qcom,multipd_arch;
+	qcom,userpd-subsys-name = "q6v5_wcss_userpd2";
+	qcom,rproc = <&q6_wcss_pd2>;
+#ifdef __IPQ_MEM_PROFILE_256_MB__
+	qcom,tgt-mem-mode = <2>;
+#else
+	qcom,tgt-mem-mode = <1>;
+#endif
+	qcom,board_id = <0x60>;
+#ifdef __CNSS2__
+	qcom,bdf-addr = <0x4D500000 0x4D500000 0x4D300000 0x0 0x0>;
+	qcom,caldb-addr = <0x4E400000 0x4E400000 0 0 0>;
+	qcom,caldb-size = <0x500000>;
+	mem-region = <&q6_qcn6122_data1>;
+#else
+	memory-region = <&q6_qcn6122_data1>;
+#endif
+	status = "ok";
+};
+
+&wifi2 {
+	/* QCN6122 6G */
+	qcom,multipd_arch;
+	qcom,userpd-subsys-name = "q6v5_wcss_userpd3";
+	qcom,rproc = <&q6_wcss_pd3>;
+#ifdef __IPQ_MEM_PROFILE_256_MB__
+	qcom,tgt-mem-mode = <2>;
+#else
+	qcom,tgt-mem-mode = <1>;
+#endif
+	qcom,board_id = <0xb0>;
+#ifdef __CNSS2__
+	qcom,bdf-addr = <0x4E900000 0x4E900000 0x4E200000 0x0 0x0>;
+	qcom,caldb-addr = <0x4F800000 0x4F800000 0 0 0>;
+	qcom,caldb-size = <0x500000>;
+	mem-region = <&q6_qcn6122_data2>;
+#else
+	memory-region = <&q6_qcn6122_data2>;
+#endif
+	status = "disabled";
+};
+
+&usb3 {
+       status = "ok";
+       device-power-gpio = <&tlmm 24 1>;
+};
+
+&dwc_0 {
+       /delete-property/ #phy-cells;
+       /delete-property/ phys;
+       /delete-property/ phy-names;
+};
+
+&hs_m31phy_0 {
+       status = "ok";
+};
+
+&eud {
+	status = "ok";
+};
+
+&pcie_x1 {
+	perst-gpio = <&tlmm 18 GPIO_ACTIVE_LOW>;
+};
+
+&pcie_x2 {
+	perst-gpio = <&tlmm 15 GPIO_ACTIVE_LOW>;
+};
+
+&pcie_x1_rp {
+	status = "disabled";
+
+	mhi_0: qcom,mhi@0 {
+		reg = <0 0 0 0 0 >;
+	};
+};
+
+&pcie_x2_rp {
+	status = "disabled";
+
+	mhi_1: qcom,mhi@1 {
+		reg = <0 0 0 0 0 >;
+
+	};
+};

feeds/ipq807x_v5.4/ipq50xx/image/ipq50xx.mk

@@ -49,6 +49,15 @@ define Device/edgecore_eap104
 endef
 TARGET_DEVICES += edgecore_eap104
 
+define Device/udaya_a6_id2
+  DEVICE_TITLE := Udaya A6 - ID2
+  DEVICE_DTS := qcom-ipq5018-udaya-a6-id2
+  SUPPORTED_DEVICES := udaya,a6-id2
+  DEVICE_PACKAGES := ath11k-wifi-udaya-a6-id2 ath11k-firmware-ipq50xx-spruce ath11k-firmware-qcn6122
+  DEVICE_DTS_CONFIG := config@mp03.5-c1
+endef
+TARGET_DEVICES += udaya_a6_id2
+
 define Device/yuncore_fap655
   DEVICE_TITLE := Yuncore FAP650
   DEVICE_DTS := qcom-ipq5018-yuncore-fap655

feeds/ipq807x_v5.4/mac80211/files/lib/netifd/wireless/mac80211.sh

@@ -28,7 +28,7 @@ drv_mac80211_init_device_config() {
 	config_add_int beacon_int chanbw frag rts
 	config_add_int rxantenna txantenna antenna_gain txpower min_tx_power
 	config_add_int num_global_macaddr
-	config_add_boolean noscan ht_coex acs_exclude_dfs background_radar
+	config_add_boolean noscan ht_coex acs_exclude_dfs acs_exclude_6ghz_non_psc background_radar
 	config_add_array ht_capab
 	config_add_array channels
 	config_add_array scan_list
@@ -138,6 +138,11 @@ mac80211_hostapd_setup_base() {
 	[ -n "$acs_exclude_dfs" ] && [ "$acs_exclude_dfs" -gt 0 ] &&
 		append base_cfg "acs_exclude_dfs=1" "$N"
 
+	[ "$auto_channel" -gt 0 ] && json_get_vars acs_exclude_6ghz_non_psc
+	[ -n "$acs_exclude_6ghz_non_psc" ] && [ "$acs_exclude_6ghz_non_psc" -gt 0 ] &&
+		[ "$band" = 6g ] &&
+		append base_cfg "acs_exclude_6ghz_non_psc=1" "$N"
+
 	json_get_vars noscan ht_coex min_tx_power:0 tx_burst
 	json_get_values ht_capab_list ht_capab
 	json_get_values channel_list channels

feeds/ipq807x_v5.4/mac80211/patches/pending/330-add_peer.patch

@@ -0,0 +1,38 @@
+--- a/drivers/net/wireless/ath/ath11k/peer.c
++++ b/drivers/net/wireless/ath/ath11k/peer.c
+@@ -819,8 +819,13 @@ int ath11k_peer_delete(struct ath11k *ar
+ 				}
+ 			}
+ #endif
+-		ath11k_peer_rhash_delete(ar->ab, peer);
++		if (peer->vdev_id == vdev_id)
++			ath11k_peer_rhash_delete(ar->ab, peer);
+ 	}
++
++	if (!peer)
++		peer = ath11k_peer_find(ar->ab, vdev_id, addr);
++
+ 	spin_unlock_bh(&ar->ab->base_lock);
+ 	mutex_unlock(&ar->ab->tbl_mtx_lock);
+ #ifdef CPTCFG_ATH11K_NSS_SUPPORT
+@@ -870,8 +875,18 @@ int ath11k_peer_create(struct ath11k *ar
+ 	spin_lock_bh(&ar->ab->base_lock);
+ 	peer = ath11k_peer_find_by_addr(ar->ab, param->peer_addr);
+ 	if (peer) {
+-		spin_unlock_bh(&ar->ab->base_lock);
+-		return -EINVAL;
++		if (peer->vdev_id == param->vdev_id) {
++			spin_unlock_bh(&ar->ab->base_lock);
++			return -EINVAL;
++		}
++
++		/* Assume sta is transitioning to another band.
++		 * Remove here the peer from rhash.
++		 */
++		mutex_lock(&ar->ab->tbl_mtx_lock);
++		ath11k_peer_rhash_delete(ar->ab, peer);
++		mutex_unlock(&ar->ab->tbl_mtx_lock);
++
+ 	}
+ 	spin_unlock_bh(&ar->ab->base_lock);
+ 

feeds/mediatek-sdk/mt76/mt76/patches/a00-crash_fix.patch

@@ -0,0 +1,27 @@
+--- a/mt7915/mcu.c
++++ b/mt7915/mcu.c
+@@ -4887,7 +4887,7 @@ int mt7915_mcu_wed_wa_tx_stats(struct mt
+ 	rcu_read_lock();
+ 
+ 	wcid = rcu_dereference(dev->mt76.wcid[wlan_idx]);
+-	if (wcid) {
++	if (wcid && wcid->sta) {
+ 		struct ieee80211_vif *vif;
+ 		struct wireless_dev *wdev;
+ 
+@@ -4898,12 +4898,12 @@ int mt7915_mcu_wed_wa_tx_stats(struct mt
+ 		    !sta)
+ 			 goto unlock;
+ 
++		if (!sta->vif)
++			goto unlock;
++
+ 		vif = container_of((void *)sta->vif,
+ 				   struct ieee80211_vif,
+ 				   drv_priv);
+-		if (!vif)
+-			goto unlock;
+-
+ 		wdev = ieee80211_vif_to_wdev(vif);
+ 
+ 		if (vif->type == NL80211_IFTYPE_MONITOR)

feeds/tip/certificates/files/usr/bin/mount_certs

@@ -44,7 +44,8 @@ actiontec,web7200)
 edgecore,ecw5211|\
 edgecore,eap101|\
 edgecore,eap102|\
-edgecore,oap104)
+edgecore,oap104|\
+edgecore,eap111)
 	if grep -q rootfs1 /proc/cmdline; then
 		PART_NAME=rootfs2
 	else

feeds/ucentral/ratelimit/files/etc/init.d/ratelimit

@@ -15,6 +15,7 @@ add_rate() {
 
 reload_service() {
 	logger ratelimit reload
+	ubus call ratelimit flush
 	config_load ratelimit
 	config_foreach add_rate rate
 }

feeds/ucentral/ratelimit/files/usr/bin/ratelimit

@@ -212,6 +212,14 @@ function run_service() {
 	let uctx = ubus.connect();
 
 	uctx.publish("ratelimit", {
+		flush: {
+			call: function(req) {
+				defaults = {};
+			},
+			args: {
+
+			}
+		},
 		defaults_set: {
 			call: function(req) {
 				let r_i = req.args.rate_ingress ?? req.args.rate;

feeds/ucentral/ucentral-schema/Makefile

@@ -4,10 +4,10 @@ PKG_NAME:=ucentral-schema
 PKG_RELEASE:=1
 
 PKG_SOURCE_URL=https://github.com/Telecominfraproject/wlan-ucentral-schema.git
-PKG_MIRROR_HASH:=ffbf9ceb9dc0d485ab983cc469a3990c74cb0f8ccc4748fdf2e64f62ac57ea0d
+PKG_MIRROR_HASH:=38f54f46cd9203316bd48987088e85b40a2240ca3447d10a4275505832e8f30e
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_DATE:=2024-04-26
-PKG_SOURCE_VERSION:=8045e6c51d5d45534e1cc3b1b57abeccaebc666a
+PKG_SOURCE_VERSION:=83218cf4c560705fdcf375053678968ee569de9a
 PKG_MAINTAINER:=John Crispin <john@phrozen.org>
 PKG_LICENSE:=BSD-3-Clause
 

feeds/ucentral/ucentral-schema/files/etc/ucentral/examples/fingerprint-final-always.json

@@ -0,0 +1,111 @@
+{
+	"uuid": 2,
+	"radios": [
+		{
+			"band": "2G",
+			"country": "CA",
+			"channel-mode": "HE",
+			"channel-width": 20,
+			"channel": 1
+		}, {
+			"band": "5G",
+			"country": "CA",
+			"channel-mode": "HE",
+			"channel-width": 80,
+			"channel": 36
+		}
+	],
+
+	"interfaces": [
+		{
+			"name": "WAN",
+			"role": "upstream",
+			"services": [ "lldp" ],
+			"ethernet": [
+				{
+					"select-ports": [
+						"WAN*"
+					]
+				}
+			],
+			"ipv4": {
+				"addressing": "dynamic"
+			},
+			"ssids": [
+				{
+					"name": "OpenWifi",
+					"wifi-bands": [
+						"2G", "5G"
+					],
+					"bss-mode": "ap",
+					"encryption": {
+						"proto": "psk2",
+						"key": "OpenWifi",
+						"ieee80211w": "optional"
+					}
+				}
+			]
+		},
+		{
+			"name": "LAN",
+			"role": "downstream",
+			"services": [ "ssh", "lldp" ],
+			"ethernet": [
+				{
+					"select-ports": [
+						"LAN*"
+					]
+				}
+			],
+			"ipv4": {
+				"addressing": "static",
+				"subnet": "192.168.1.1/24",
+				"dhcp": {
+					"lease-first": 10,
+					"lease-count": 100,
+					"lease-time": "6h"
+				}
+			},
+			"ssids": [
+				{
+					"name": "OpenWifi",
+					"wifi-bands": [
+						"2G", "5G"
+					],
+					"bss-mode": "ap",
+					"encryption": {
+						"proto": "psk2",
+						"key": "OpenWifi",
+						"ieee80211w": "optional"
+					}
+				}
+			]
+
+		}
+	],
+	"metrics": {
+		"statistics": {
+			"interval": 120,
+			"types": [ "ssids", "lldp", "clients" ]
+		},
+		"health": {
+			"interval": 120
+		}
+	},
+	"services": {
+		"lldp": {
+			"describe": "uCentral",
+			"location": "universe"
+		},
+		"ssh": {
+			"port": 22
+		},
+		"fingerprint": {
+			"mode": "final",
+			"minimum-age": 60,
+			"maximum-age": 3600,
+			"periodicity": 0,
+			"allow-wan": false
+		}
+	}
+}

feeds/ucentral/ucentral-schema/files/etc/ucentral/examples/fingerprint-final-periodic.json

@@ -105,7 +105,7 @@
 			"minimum-age": 60,
 			"maximum-age": 3600,
 			"periodicity": 600,
-			"allow-wan": true
+			"allow-wan": false
 		}
 	}
 }

feeds/ucentral/ucentral-schema/files/etc/ucentral/examples/fingerprint-raw.json

@@ -0,0 +1,108 @@
+{
+	"uuid": 2,
+	"radios": [
+		{
+			"band": "2G",
+			"country": "CA",
+			"channel-mode": "HE",
+			"channel-width": 20,
+			"channel": 1
+		}, {
+			"band": "5G",
+			"country": "CA",
+			"channel-mode": "HE",
+			"channel-width": 80,
+			"channel": 36
+		}
+	],
+
+	"interfaces": [
+		{
+			"name": "WAN",
+			"role": "upstream",
+			"services": [ "lldp" ],
+			"ethernet": [
+				{
+					"select-ports": [
+						"WAN*"
+					]
+				}
+			],
+			"ipv4": {
+				"addressing": "dynamic"
+			},
+			"ssids": [
+				{
+					"name": "OpenWifi",
+					"wifi-bands": [
+						"2G", "5G"
+					],
+					"bss-mode": "ap",
+					"encryption": {
+						"proto": "psk2",
+						"key": "OpenWifi",
+						"ieee80211w": "optional"
+					}
+				}
+			]
+		},
+		{
+			"name": "LAN",
+			"role": "downstream",
+			"services": [ "ssh", "lldp" ],
+			"ethernet": [
+				{
+					"select-ports": [
+						"LAN*"
+					]
+				}
+			],
+			"ipv4": {
+				"addressing": "static",
+				"subnet": "192.168.1.1/24",
+				"dhcp": {
+					"lease-first": 10,
+					"lease-count": 100,
+					"lease-time": "6h"
+				}
+			},
+			"ssids": [
+				{
+					"name": "OpenWifi",
+					"wifi-bands": [
+						"2G", "5G"
+					],
+					"bss-mode": "ap",
+					"encryption": {
+						"proto": "psk2",
+						"key": "OpenWifi",
+						"ieee80211w": "optional"
+					}
+				}
+			]
+
+		}
+	],
+	"metrics": {
+		"statistics": {
+			"interval": 120,
+			"types": [ "ssids", "lldp", "clients" ]
+		},
+		"health": {
+			"interval": 120
+		}
+	},
+	"services": {
+		"lldp": {
+			"describe": "uCentral",
+			"location": "universe"
+		},
+		"ssh": {
+			"port": 22
+		},
+		"fingerprint": {
+			"mode": "raw-data",
+			"allow-wan": true
+		}
+	}
+}

feeds/ucentral/uspot/files/usr/share/uspot/handler-uam.uc

@@ -53,6 +53,7 @@ global.handle_request = function(env) {
 	let ctx = portal.handle_request(env, true);
 
 	switch (split(ctx.env.REQUEST_URI, '?')[0] || '') {
+	case '/login':
 	case '/logon':
 		auth_client(ctx);
 		break;

feeds/ucentral/uspot/files/usr/share/uspot/portal.uc

@@ -178,15 +178,25 @@ return {
 	// put a client back into pre-auth state
 	logoff: function(ctx, uam) {
 		this.syslog(ctx, 'logging client off');
-		if (uam)
+		if (uam) {
 			include('redir.uc', { redir_location: this.uam_url(ctx, 'logoff') });
-		else
+			ctx.ubus.call('uspot', 'client_remove', {
+				interface: ctx.spotfilter,
+				address: uc(ctx.mac),
+			});
+		} else {
 			include('logoff.uc', ctx);
+			let payload = {
+				interface: ctx.spotfilter,
+				address: uc(ctx.mac),
+			};
 
-		ctx.ubus.call('uspot', 'client_remove', {
-			interface: ctx.spotfilter,
-			address: ctx.mac,
-		});
+			if (ctx.connected.ip4addr)
+				system('conntrack -D -s ' + ctx.connected.ip4addr + ' > /dev/null');
+			if (ctx.connected.ip6addr)
+				system('conntrack -D -s ' + ctx.connected.ip6addr + ' > /dev/null');
+			ctx.ubus.call('spotfilter', 'client_remove', payload);
+		}
 	},
 
 	// generate the default radius auth payload
@@ -286,9 +296,17 @@ return {
 			include('error.uc', ctx);
 			return NULL;
 		}
-
+		ctx.connected = connected;
 		if (!uam && connected?.state) {
-			include('connected.uc', ctx);
+			switch (split(ctx.env.REQUEST_URI, '?')[0] || '') {
+			case '/logout':
+			case '/logoff':
+				this.logoff(ctx, false);
+				break;
+			default:
+				include('connected.uc', ctx);
+				break;
+			}
 			return;
 		}
 		if (!connected.data.ssid) {

patches/0073-india_regd_fix.patch

@@ -0,0 +1,31 @@
+From efd50b88a79b773d8f6489086bf210aec63ee49b Mon Sep 17 00:00:00 2001
+From: Felix Fietkau <nbd@nbd.name>
+Date: Wed, 12 Jun 2024 13:41:23 +0200
+Subject: [PATCH] wireless-regdb: add DFS region for india
+
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
+---
+ .../wireless-regdb/patches/100-india_regd_fix.patch   | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+ create mode 100644 package/firmware/wireless-regdb/patches/100-india_regd_fix.patch
+
+diff --git a/package/firmware/wireless-regdb/patches/100-india_regd_fix.patch b/package/firmware/wireless-regdb/patches/100-india_regd_fix.patch
+new file mode 100644
+index 000000000000..c113e5218c17
+--- /dev/null
++++ b/package/firmware/wireless-regdb/patches/100-india_regd_fix.patch
+@@ -0,0 +1,11 @@
++--- a/db.txt
+++++ b/db.txt
++@@ -883,7 +883,7 @@ country IL: DFS-ETSI
++ # Source:
++ # https://dot.gov.in/spectrummanagement/delicensing-24-24835-ghz-band-gsr-45-e-5150-5350-ghz-gsr-46-e-and-5725-5875-ghz
++ # https://dot.gov.in/spectrummanagement/license-exemption-5-ghz-gsr-1048e-dated-22102018
++-country IN:
+++country IN: DFS-FCC
++ 	(2402 - 2482 @ 40), (30)
++ 	(5150 - 5250 @ 80), (30)
++ 	(5250 - 5350 @ 80), (24), DFS
+-- 
+2.39.2
+

profiles/edgecore_eap105.yml

@@ -3,7 +3,7 @@ profile: edgecore_eap105
 target: ipq53xx
 subtarget: generic
 description: Build image for the edgecore eap105
-image: bin/targets/ipq53xx/generic/openwrt-ipq53xx-cig_wf189-squashfs-sysupgrade.tar
+image: bin/targets/ipq53xx/generic/openwrt-ipq53xx-edgecore_eap105-squashfs-sysupgrade.tar
 feeds:
   - name: ipq95xx
     path: ../../feeds/ipq95xx

profiles/udaya_a6-id2.yml

@@ -0,0 +1,15 @@
+---
+profile: udaya_a6_id2
+target: ipq50xx
+subtarget: generic
+description: Build image for the Udaya A6 - id2
+image: bin/targets/ipq50xx/generic/openwrt-ipq50xx-udaya_a6_id2-squashfs-sysupgrade.tar
+feeds:
+  - name: ipq807x
+    path: ../../feeds/ipq807x_v5.4
+include:
+  - ucentral-ap
+packages:
+  - ipq50xx
+diffconfig: |
+  CONFIG_KERNEL_IPQ_MEM_PROFILE=512