mediatek: Fix image upgrade fail for EMPLUS WAP588M

Signed-off-by: cpchangemplu <cp.chang@emplustech.com>

.github/workflows/build-dev.yml

@@ -21,7 +21,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        target: [ 'cig_wf189h', 'cig_wf189w', 'cig_wf660a', 'cig_wf672', 'cig_wf186h', 'cig_wf186w', 'cig_wf188n', 'cig_wf189', 'cig_wf196', 'cig_wf196', 'cybertan_eww631-a1', 'cybertan_eww631-b1', 'sonicfi_rap630w-312g', 'sonicfi_rap63xc-211g', 'sonicfi_rap630c-311g', 'sonicfi_rap630w-311g', 'sonicfi_rap630w-211g', 'sonicfi_rap650c', 'sonicfi_rap7110c-341x', 'sonicfi_rap750e-h', 'sonicfi_rap750e-s', 'sonicfi_rap750w-311a', 'edgecore_eap101', 'edgecore_eap102', 'edgecore_eap104', 'edgecore_eap105', 'edgecore_eap111', 'edgecore_eap112', 'edgecore_oap101', 'edgecore_oap101-6e', 'edgecore_oap101e', 'edgecore_oap101e-6e', 'edgecore_oap103', 'hfcl_ion4xe', 'hfcl_ion4xi', 'hfcl_ion4x', 'hfcl_ion4x_2', 'hfcl_ion4x_3', 'hfcl_ion4xi_w', 'hfcl_ion4x_w', 'indio_um-305ax', 'senao_iap4300m', 'senao_iap2300m', 'senao_jeap6500', 'udaya_a6-id2', 'udaya_a6-od2', 'yuncore_ax820', 'yuncore_ax840', 'yuncore_fap640', 'yuncore_fap650', 'yuncore_fap655', 'emplus_wap588m', 'zyxel_nwa130be', 'sercomm_ap72tip-v4' ]
+        target: [ 'cig_wf189h', 'cig_wf189w', 'cig_wf672', 'cig_wf186h', 'cig_wf186w', 'cig_wf188n', 'cig_wf189', 'cig_wf196', 'cig_wf196', 'cybertan_eww631-a1', 'cybertan_eww631-b1', 'sonicfi_rap630w-312g', 'sonicfi_rap63xc-211g', 'sonicfi_rap630c-311g', 'sonicfi_rap630w-311g', 'sonicfi_rap630w-211g', 'sonicfi_rap650c', 'sonicfi_rap7110c-341x', 'sonicfi_rap750e-h', 'sonicfi_rap750e-s', 'sonicfi_rap750w-311a', 'edgecore_eap101', 'edgecore_eap102', 'edgecore_eap104', 'edgecore_eap105', 'edgecore_eap111', 'edgecore_eap112', 'edgecore_oap101', 'edgecore_oap101-6e', 'edgecore_oap101e', 'edgecore_oap101e-6e', 'edgecore_oap103', 'hfcl_ion4xe', 'hfcl_ion4xi', 'hfcl_ion4x', 'hfcl_ion4x_2', 'hfcl_ion4x_3', 'hfcl_ion4xi_w', 'hfcl_ion4x_w', 'indio_um-305ax', 'senao_iap4300m', 'senao_iap2300m', 'senao_jeap6500', 'udaya_a6-id2', 'udaya_a6-od2', 'yuncore_ax820', 'yuncore_ax840', 'yuncore_fap640', 'yuncore_fap650', 'yuncore_fap655', 'emplus_wap588m', 'zyxel_nwa130be', 'sercomm_ap72tip-v4' ]
     steps:
     - uses: actions/checkout@v3
 

feeds/hostapd/hostapd/files/hostapd.sh

@@ -117,6 +117,8 @@ hostapd_common_add_device_config() {
 	config_add_boolean legacy_rates
 	config_add_int cell_density
 	config_add_int rts_threshold
+	config_add_int rssi_reject_assoc_rssi
+	config_add_int rssi_ignore_probe_request
 	config_add_int maxassoc
 	config_add_boolean maxassoc_ignore_probe
 
@@ -160,7 +162,7 @@ hostapd_prepare_device_config() {
 
 	json_get_vars country country3 country_ie beacon_int:100 dtim_period:2 doth require_mode legacy_rates \
 		acs_chan_bias local_pwr_constraint spectrum_mgmt_required airtime_mode cell_density \
-		rts_threshold beacon_rate maxassoc \
+		rts_threshold beacon_rate rssi_reject_assoc_rssi rssi_ignore_probe_request maxassoc \
 		multiple_bssid he_co_locate rnr_beacon ema acs_exclude_dfs \
 		maxassoc_ignore_probe band
 
@@ -259,6 +261,8 @@ hostapd_prepare_device_config() {
 		hostapd_add_rate brlist "$br"
 	done
 
+	[ -n "$rssi_reject_assoc_rssi" ] && append base_cfg "rssi_reject_assoc_rssi=$rssi_reject_assoc_rssi" "$N"
+	[ -n "$rssi_ignore_probe_request" ] && append base_cfg "rssi_ignore_probe_request=$rssi_ignore_probe_request" "$N"
 	[ -n "$beacon_rate" ] && append base_cfg "beacon_rate=$beacon_rate" "$N"
 	[ -n "$rlist" ] && append base_cfg "supported_rates=$rlist" "$N"
 	[ -n "$brlist" ] && append base_cfg "basic_rates=$brlist" "$N"
@@ -467,9 +471,6 @@ hostapd_common_add_bss_config() {
 	config_add_string uci_section
 
 	config_add_boolean dynamic_probe_resp
-
-	config_add_int rssi_reject_assoc_rssi
-	config_add_int rssi_ignore_probe_request
 }
 
 hostapd_set_vlan_file() {
@@ -723,8 +724,7 @@ hostapd_set_bss_options() {
 		airtime_bss_weight airtime_bss_limit airtime_sta_weight \
 		multicast_to_unicast_all proxy_arp per_sta_vif \
 		eap_server eap_user_file ca_cert server_cert private_key private_key_passwd server_id \
-		vendor_elements fils uci_section dynamic_probe_resp \
-		rssi_reject_assoc_rssi rssi_ignore_probe_request 
+		vendor_elements fils uci_section dynamic_probe_resp
 
 	set_default fils 0
 	set_default isolate 0
@@ -778,8 +778,6 @@ hostapd_set_bss_options() {
 	append bss_conf "uapsd_advertisement_enabled=$uapsd" "$N"
 	append bss_conf "utf8_ssid=$utf8_ssid" "$N"
 	append bss_conf "multi_ap=$multi_ap" "$N"
-	[ -n "$rssi_reject_assoc_rssi" ] && append bss_conf "rssi_reject_assoc_rssi=$rssi_reject_assoc_rssi" "$N"
-	[ -n "$rssi_ignore_probe_request" ] && append bss_conf "rssi_ignore_probe_request=$rssi_ignore_probe_request" "$N"
 	[ -n "$vendor_elements" ] && append bss_conf "vendor_elements=$vendor_elements" "$N"
 
 	[ "$tdls_prohibit" -gt 0 ] && append bss_conf "tdls_prohibit=$tdls_prohibit" "$N"

feeds/hostapd/hostapd/patches/zzz-ignore-probe-event.patch

@@ -1,14 +0,0 @@
---- a/src/ap/beacon.c
-+++ b/src/ap/beacon.c
-@@ -934,8 +934,10 @@ void handle_probe_req(struct hostapd_dat
- 	int ubus_response;
- 
- 	if (hapd->iconf->rssi_ignore_probe_request && ssi_signal &&
--	    ssi_signal < hapd->iconf->rssi_ignore_probe_request)
-+	    ssi_signal < hapd->iconf->rssi_ignore_probe_request) {
-+		hostapd_ubus_notify_rssi(hapd, "rssi-ignore-probe", mgmt->sa, ssi_signal);
- 		return;
-+	}
- 
- 	if (len < IEEE80211_HDRLEN)
- 		return;

feeds/hostapd/hostapd/src/src/ap/ubus.c

@@ -1944,21 +1944,6 @@ void hostapd_ubus_notify(struct hostapd_data *hapd, const char *type, const u8 *
 	ubus_notify(ctx, &hapd->ubus.obj, type, b.head, -1);
 }
 
-void hostapd_ubus_notify_rssi(struct hostapd_data *hapd, const char *type, const u8 *addr, int rssi)
-{
-	if (!hapd->ubus.obj.has_subscribers)
-		return;
-
-	if (!addr)
-		return;
-
-	blob_buf_init(&b, 0);
-	blobmsg_add_macaddr(&b, "address", addr);
-	blobmsg_add_u32(&b, "rssi", rssi);
-
-	ubus_notify(ctx, &hapd->ubus.obj, type, b.head, -1);
-}
-
 void hostapd_ubus_notify_csa(struct hostapd_data *hapd, int freq)
 {
 	if (!hapd->ubus.obj.has_subscribers)

feeds/hostapd/hostapd/src/src/ap/ubus.h

@@ -56,7 +56,6 @@ void hostapd_ubus_notify_beacon_report(struct hostapd_data *hapd,
 				       size_t len);
 void hostapd_ubus_notify_radar_detected(struct hostapd_iface *iface, int frequency,
 					int chan_width, int cf1, int cf2);
-void hostapd_ubus_notify_rssi(struct hostapd_data *hapd, const char *type, const u8 *addr, int rssi);
 
 void hostapd_ubus_notify_bss_transition_response(
 	struct hostapd_data *hapd, const u8 *addr, u8 dialog_token, u8 status_code,

feeds/ipq807x_v5.4/ath11k-wifi/Makefile

@@ -41,8 +41,6 @@ ALLWIFIBOARDS:= \
 	edgecore-oap102 \
 	edgecore-oap103 \
 	edgecore-eap104 \
-	emplus-wap385c \
-	emplus-wap386v2 \
 	liteon-wpx8324 \
 	indio-um-310ax-v1 \
 	indio-um-510axp-v1 \
@@ -406,8 +404,6 @@ $(eval $(call generate-ath11k-wifi-package,edgecore-eap102,Edgecore EAP102))
 $(eval $(call generate-ath11k-wifi-package,edgecore-oap102,Edgecore OAP102))
 $(eval $(call generate-ath11k-wifi-package,edgecore-oap103,Edgecore OAP103))
 $(eval $(call generate-ath11k-wifi-package,edgecore-eap104,Edgecore EAP104))
-$(eval $(call generate-ath11k-wifi-package,emplus-wap385c,Emplus WAP385C))
-$(eval $(call generate-ath11k-wifi-package,emplus-wap386v2,Emplus WAP386 V2))
 $(eval $(call generate-ath11k-wifi-package,liteon-wpx8324,Liteon WPX8324))
 $(eval $(call generate-ath11k-wifi-package,indio-um-310ax-v1,Indio UM-310AX V1))
 $(eval $(call generate-ath11k-wifi-package,indio-um-510axp-v1,Indio UM-510AXP V1))

feeds/ipq807x_v5.4/cooling/files/cooling.init

@@ -18,11 +18,9 @@ start() {
 	[ "$enabled" -gt 0 ] || return 1
 
 	case "$board" in
-		sonicfi,rap630c-311g)
-		service_start /usr/sbin/cooling -c /etc/cooling/sonicfi-rap630c-311g-cooling.conf
-		;;
-		sonicfi,rap630w-311g)
-		service_start /usr/sbin/cooling -c /etc/cooling/sonicfi-rap630w-311g-cooling.conf
+	sonicfi,rap630c-311g|\
+	sonicfi,rap630w-311g)
+        service_start /usr/sbin/cooling
 		;;
 	esac
 

feeds/ipq807x_v5.4/cooling/src/cooling.c

@@ -28,270 +28,143 @@
 
 #define CUR_STATE_PATH "/sys/devices/virtual/thermal/cooling_device%i/cur_state"
 #define TEMPER_PATH "/sys/devices/virtual/thermal/thermal_zone%i/temp"
-#define CPU_FREQ_PATH "/sys/devices/system/cpu/cpu0/cpufreq/%s"
 
 #define PATH_MAX 256
-#define BUF_MAX 32
+#define BUF_MAX 8
+#define THERSHOLD_MAX 20
 #define PHY0 0
 #define PHY1 1
-#define NUM_VALUES 4
-
-int load_config_file=0;
-
-//#define ULOG_INFO(fmt, ...) ulog(LOG_INFO, fmt, ## __VA_ARGS__)
 
 typedef unsigned char	u8;
-typedef unsigned long	u32;
 
 u8 w2g_threshold_level=0;
 u8 w5g_threshold_level=0;
 u8 w2g_cur_temper=0;
 u8 w5g_cur_temper=0;
-u32 level_cpu_freq=1008000;
 
-/* default value of wifi thresholds*/
+
 #ifdef PLATFORM_RAP630C_311G
-u8 level_2g_high[4]={105, 110, 115, 120};
-u8 level_2g_low[4]={0, 105, 110, 115};
-u8 level_2g_mitigation[4]={0, 35, 50, 70};
-u8 level_5g_high[4]={105, 110, 115, 120};
-u8 level_5g_low[4]={0, 105, 110, 115};
-u8 level_5g_mitigation[4]={0, 20, 30, 50};
-u32 level_cpu_frequency[4]={1008000, 800000, 800000, 800000};
+u8 level_2g_lo[4]={0, 105, 110, 115};
+u8 level_2g_hi[4]={105, 110, 115, 120};
+u8 level_2g_limit[4]={0, 35, 50, 70};
+u8 level_5g_lo[4]={0, 105, 110, 115};
+u8 level_5g_hi[4]={105, 110, 115, 120};
+u8 level_5g_limit[4]={0, 20, 30, 50};
 #endif
 
 #ifdef PLATFORM_RAP630W_311G
-u8 level_2g_high[4]={105, 110, 115, 120};
-u8 level_2g_low[4]={0, 105, 110, 115};
-u8 level_2g_mitigation[4]={0, 20, 50, 70};
-u8 level_5g_high[4]={105, 110, 115, 120};
-u8 level_5g_low[4]={0, 105, 110, 115};
-u8 level_5g_mitigation[4]={0, 20, 50, 70};
-u32 level_cpu_frequency[4]={1008000, 800000, 800000, 800000};
+u8 level_2g_lo[4]={0, 105, 110, 115};
+u8 level_2g_hi[4]={105, 110, 115, 120};
+u8 level_2g_limit[4]={0, 20, 50, 70};
+u8 level_5g_lo[4]={0, 105, 110, 115};
+u8 level_5g_hi[4]={105, 110, 115, 120};
+u8 level_5g_limit[4]={0, 20, 50, 70};
 #endif
 
 static char *config_file = NULL;
+char temp[4][BUF_MAX];
 
-typedef struct {
-    int thresholds_high[NUM_VALUES];
-    int thresholds_low[NUM_VALUES];
-    int mitigation[NUM_VALUES];
-    int cpu_freq[NUM_VALUES];
-} WifiConfig;
+#define ULOG_DBG(fmt, ...) ulog(LOG_DEBUG, fmt, ## __VA_ARGS__)
 
-WifiConfig wifi2g = {0}, wifi5g = {0};
-
-static void set_cpu_freq (int freq) {
-	FILE * fp;
-	char filename[PATH_MAX];
-
-	snprintf(filename, PATH_MAX, CPU_FREQ_PATH, "scaling_governor");
-
-	fp = fopen(filename, "w");
-	if (!fp) {
-		ULOG_ERR("open scaling_governor error\n");
-	}
-	fprintf(fp, "%s", "userspace");
-	fclose(fp);
-
-	snprintf(filename, PATH_MAX, CPU_FREQ_PATH, "scaling_setspeed");
-
-	fp = fopen(filename, "w");
-	if (!fp) {
-		ULOG_ERR("open scaling_setspeed error\n");
-	}
-	fprintf(fp, "%d", freq);
-	fclose(fp);
-}
-
-void parse_line(const char* line, const char* key, int* array) {
-	char label[64];
-	int values[NUM_VALUES];
-	int i;
-
-	if (sscanf(line, "%s %d %d %d %d %d", label, &values[0], &values[1], &values[2], &values[3], &values[4]) == 5) {
-		for (i = 0; i < NUM_VALUES; ++i) {
-			array[i] = values[i];
-		}
-	}
-}
-
-int load_config() {
-	FILE * fp = fopen(config_file, "r");
-	if (!fp) {
-		ULOG_ERR("open config file error\n");
-		return 1;
-	}
-
-	WifiConfig* current_config = NULL;
-	char line[256];
-
-	while (fgets(line, sizeof(line), fp)) {
-		if (strstr(line, "[wifi2g]")) {
-			current_config = &wifi2g;
-		} else if (strstr(line, "[wifi5g]")) {
-			current_config = &wifi5g;
-		} else if (current_config) {
-			if (strstr(line, "thresholds_high")) {
-				parse_line(line, "thresholds_high", current_config->thresholds_high);
-			} else if (strstr(line, "thresholds_low")) {
-				parse_line(line, "thresholds_low", current_config->thresholds_low);
-			} else if (strstr(line, "mitigation")) {
-				parse_line(line, "mitigation", current_config->mitigation);
-			} else if (strstr(line, "CPU_freq")) {
-				parse_line(line, "CPU_freq", current_config->cpu_freq);
-			}
-		}
-	}
-
-	fclose(fp);
-	set_cpu_freq(wifi5g.cpu_freq[0]);
-
-	return 0;
-}
-
-int load_default_config(){
-	int i=0;
-
-	set_cpu_freq(1008000);
-	for (i = 0; i < NUM_VALUES; i++) {
-		wifi2g.thresholds_high[i]=level_2g_high[i];
-		wifi2g.thresholds_low[i]=level_2g_low[i];
-		wifi2g.mitigation[i]=level_2g_mitigation[i];
-		wifi2g.cpu_freq[i]=level_cpu_frequency[i];
-		wifi5g.thresholds_high[i]=level_5g_high[i];
-		wifi5g.thresholds_low[i]=level_5g_low[i];
-		wifi5g.mitigation[i]=level_5g_mitigation[i];
-		wifi5g.cpu_freq[i]=level_cpu_frequency[i];
-	}
-	return 0;
-
-}
-
-static void write_cur_state (const char *filename, int state) {
+static void write_cur_state (char *filename, int state) {
 	FILE * fp;
 
+	ULOG_DBG("write_cur_state filename=[%s] [%d]\n", filename, state);
 	fp = fopen(filename, "w");
 	if (!fp){
-		ULOG_ERR("open %s file error\n",filename);
+		ULOG_ERR("some kind of error write cur_state\n");
 	}
 	fprintf(fp, "%d", state);
 	fclose(fp);
 }
 
-int read_cur_state(const char *filename, char *buf, size_t buffer) {
-	FILE *fp;
-	
+static void read_cur_state (char *filename, char *buffer) {
+	FILE * fp;
+
 	fp = fopen(filename, "r");
-	if (!fp) {
-		ULOG_ERR("open %s file error\n",filename);
-		return -1;
+	if (!fp){
+		ULOG_ERR("some kind of error write cur_state\n");
 	}
-	if (!fgets(buf, buffer, fp)) {
-		ULOG_ERR("Failed to read %s file\n", filename);
-		fclose(fp);
-		return -1;
+	if (0 == fread(buffer, sizeof(char), 3, fp)) {
+		ULOG_ERR("some kind of error read value\n");
 	}
 	fclose(fp);
-	return 0;
 }
 
-
 static void wifi_get_temperature() {
 	char filename[PATH_MAX];
-	char buffer[BUF_MAX];
+	FILE * fp;
 	int i = 0;
-
-//	ULOG_INFO("=================================\n");
-
-	/* read cpuinfo_cur_freq*/
-	snprintf(filename, PATH_MAX, CPU_FREQ_PATH, "cpuinfo_cur_freq");
-
-	memset(buffer, 0, BUF_MAX);
-	read_cur_state(filename, buffer, sizeof(buffer));
-//	ULOG_INFO("CPU current frequency: %s\n", buffer);
+	char buffer[BUF_MAX];
 
 	/* get current phy cooling state*/
-	for (i=0; i <= 1; i++) {
+	for (i=0 ; i <= 1; i++ ) {
 		memset(buffer, 0, BUF_MAX);
 		snprintf(filename, PATH_MAX, CUR_STATE_PATH, i);
-		read_cur_state(filename, buffer, sizeof(buffer));
-//		ULOG_INFO("Phy%i cur_state is: %s\n", i, buffer);
+		read_cur_state(filename, buffer);
+		ULOG_DBG("read from Phy%i cur_state is %s\n", i, buffer);
 	}
 
-	for (i=0; i <= 3; i++) {
-		memset(buffer, 0, BUF_MAX);
+	for (i=0 ; i <= 3; i++ ) {
 		snprintf(filename, PATH_MAX, TEMPER_PATH, i);
-		read_cur_state(filename, buffer, sizeof(buffer));
-//		ULOG_INFO("thermal_zone%i cur_temp is: %s\n", i, buffer);
-
-		if (i == 0)
-			w2g_cur_temper=atoi(buffer);
-		else if (i == 3)
-			w5g_cur_temper=atoi(buffer);
-	}
-
-	if (w5g_cur_temper >= 120)
-	{
-		ULOG_ERR("!! Temperature is over %d degree, system will reboot\n", w5g_cur_temper);
-		sync();
-		if ( -1 != system("reboot &") ){
-			printf("sysyem reboot...\n");
+		fp = fopen(filename, "r");
+		if (!fp) {
+			ULOG_ERR("some kind of error open value\n");
 		}
+		memset(temp[i], 0, BUF_MAX);
+		if (0 == fread(temp[i], sizeof(char), 3, fp)) {
+			ULOG_ERR("some kind of error read value\n");
+		}
+		fclose(fp);
+		ULOG_DBG("thermal_zone%i cur_temp is %s\n", i, temp[i]);
 	}
+
+	w2g_cur_temper=atoi(temp[0]);
+	w5g_cur_temper=atoi(temp[3]);
 }
 
 static void wifi_set_cooling() {
 	char filename[PATH_MAX];
 	int level;
 
-	for (level = 0; level <= 3; level++) {
-		if (w2g_cur_temper >= wifi2g.thresholds_low[level] && w2g_cur_temper < wifi2g.thresholds_high[level]) {
-//			ULOG_INFO("2G at level %d , %d degree\n" ,level, w2g_cur_temper);
+	for (level=0 ; level<=3 ; level++) {
+		if (w2g_cur_temper >= level_2g_lo[level] && w2g_cur_temper < level_2g_hi[level]) {
+			ULOG_DBG("2G at level %d , %d degree\n" ,level, w2g_cur_temper);
 			if (w2g_threshold_level != level) {
-//				ULOG_INFO("setting 2G reduce %d percent\n" ,wifi2g.mitigation[level]);
+				ULOG_DBG("setting 2G reduce %d percent\n" ,level_2g_limit[level]);
 				snprintf(filename, PATH_MAX, CUR_STATE_PATH, PHY0);
-				write_cur_state(filename, wifi2g.mitigation[level]);
+				write_cur_state(filename, level_2g_limit[level]);
 				w2g_threshold_level = level;
 			}
 		}
-		if (w5g_cur_temper >= wifi5g.thresholds_low[level] && w5g_cur_temper < wifi5g.thresholds_high[level]) {
-//			ULOG_INFO("5G at level %d , %d degree\n" ,level, w5g_cur_temper);
+		if (w5g_cur_temper >= level_5g_lo[level] && w5g_cur_temper < level_5g_hi[level]) {
+			ULOG_DBG("5G at level %d , %d degree\n" ,level, w5g_cur_temper);
 			if (w5g_threshold_level != level) {
-//				ULOG_INFO("setting 5G reduce %d percent\n" ,wifi5g.mitigation[level]);
+				ULOG_DBG("setting 5G reduce %d percent\n" ,level_5g_limit[level]);
 				snprintf(filename, PATH_MAX, CUR_STATE_PATH, PHY1);
-				write_cur_state(filename, wifi5g.mitigation[level]);
+				write_cur_state(filename, level_5g_limit[level]);
 				w5g_threshold_level = level;
-				set_cpu_freq(wifi5g.cpu_freq[level]);
 			}
 		}
 	}
-
 }
 
-
 static void cooling_init() {
-	char filename[PATH_MAX];
-	int i,result=0;
+	char filename[256];
+	int i;
 
 	for (i=0 ; i <= 1; i++) {
 		snprintf(filename, PATH_MAX, CUR_STATE_PATH, i);
 		write_cur_state(filename, 0);
 	}
-
-	if(load_config_file)
-		result = load_config();
-
-	if (result == 1 || load_config_file == 0)
-		load_default_config();
 }
 
 void print_usage(void)
 {
 	printf("\nWifi-cooling daemon usage\n");
 	printf("Optional arguments:\n");
-	printf("  -c <file>        setting with config file\n");
-	printf("  -d               default setting\n");
+	printf("  -c <file>        config file\n");
+	printf("  -d               debug output\n");
 	printf("  -h               this usage screen\n");
 }
 
@@ -312,18 +185,17 @@ int main(int argc, char *argv[])
 	setpriority(PRIO_PROCESS, getpid(), -20);
 
 	ulog_open(ULOG_STDIO | ULOG_SYSLOG, LOG_DAEMON, "cooling");
-	ulog_threshold(LOG_ERR);
-//	ulog_threshold(LOG_INFO);
+	ulog_threshold(LOG_INFO);
 
- 	while ((ch = getopt(argc, argv, "c:dh")) != -1) {
+	while ((ch = getopt(argc, argv, "c:dh")) != -1) {
 		switch (ch) {
 		case 'c':
 			printf("wifi-cooling load configuration file %s\n", optarg);
 			config_file = optarg;
-			load_config_file=1;
 			break;
 		case 'd':
-			printf("wifi-cooling set to default value\n");
+			printf("wifi-cooling ulog_threshold set to debug level\n");
+			ulog_threshold(LOG_DEBUG);
 			break;
 		case 'h':
 		default:
@@ -340,4 +212,4 @@ int main(int argc, char *argv[])
 	uloop_done();
 
 	return 0;
-}
+}

feeds/ipq807x_v5.4/cooling/src/sonicfi-rap630c-311g-cooling.conf

@@ -1,11 +1,15 @@
-[wifi2g]
-thresholds_high     105         110         115         120
-thresholds_low      0           105         110         115
-mitigation          0           35          50          70
-CPU_freq            1008000     800000      800000      800000
+sampling 5000
 
-[wifi5g]
-thresholds_high     105         110         115         120
-thresholds_low      0           105         110         115
-mitigation          0           20          30          50
-CPU_freq            1008000     800000      800000      800000
+[tsens_tz_sensor1]
+sampling 	5000
+thresholds 			105			110			115			119			120
+thresholds_clr 		0			100			105			110			115
+actions 			cooling		cooling	 	cooling		cooling		shutdown
+action_info 		0			35	 		50			70			800000
+
+[tsens_tz_sensor4]
+sampling 	5000
+thresholds 			105			110			115			119			120
+thresholds_clr 		0			100			105			110			115
+actions 			cooling		cooling		cooling		cooling		shutdown
+action_info 		0			20			30	 		50			800000

feeds/ipq807x_v5.4/cooling/src/sonicfi-rap630w-311g-cooling.conf

@@ -1,11 +1,15 @@
-[wifi2g]
-thresholds_high     105         110         115         120
-thresholds_low      0           105         110         115
-mitigation          0           20          50          70
-CPU_freq            1008000     800000      800000      800000
+sampling 5000
 
-[wifi5g]
-thresholds_high     105         110         115         120
-thresholds_low      0           105         110         115
-mitigation          0           20          50          70
-CPU_freq            1008000     800000      800000      800000
+[tsens_tz_sensor1]
+sampling 	5000
+thresholds 			105			115			119			125
+thresholds_clr 		0			105			110			120
+actions 			cooling		cooling	 	cooling		cooling
+action_info 		0			20	 		50			70
+
+[tsens_tz_sensor4]
+sampling 	5000
+thresholds 			105			115			119			125
+thresholds_clr 		0			105			110			120
+actions 			cooling		cooling		cooling		cooling
+action_info 		0			20			50	 		70

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

@@ -117,6 +117,8 @@ hostapd_common_add_device_config() {
 	config_add_boolean legacy_rates
 	config_add_int cell_density
 	config_add_int rts_threshold
+	config_add_int rssi_reject_assoc_rssi
+	config_add_int rssi_ignore_probe_request
 	config_add_int maxassoc
 	config_add_boolean maxassoc_ignore_probe
 
@@ -160,7 +162,7 @@ hostapd_prepare_device_config() {
 
 	json_get_vars country country3 country_ie beacon_int:100 dtim_period:2 doth require_mode legacy_rates \
 		acs_chan_bias local_pwr_constraint spectrum_mgmt_required airtime_mode cell_density \
-		rts_threshold beacon_rate maxassoc \
+		rts_threshold beacon_rate rssi_reject_assoc_rssi rssi_ignore_probe_request maxassoc \
 		multiple_bssid he_co_locate rnr_beacon ema acs_exclude_dfs \
 		maxassoc_ignore_probe band
 
@@ -259,6 +261,8 @@ hostapd_prepare_device_config() {
 		hostapd_add_rate brlist "$br"
 	done
 
+	[ -n "$rssi_reject_assoc_rssi" ] && append base_cfg "rssi_reject_assoc_rssi=$rssi_reject_assoc_rssi" "$N"
+	[ -n "$rssi_ignore_probe_request" ] && append base_cfg "rssi_ignore_probe_request=$rssi_ignore_probe_request" "$N"
 	[ -n "$beacon_rate" ] && append base_cfg "beacon_rate=$beacon_rate" "$N"
 	[ -n "$rlist" ] && append base_cfg "supported_rates=$rlist" "$N"
 	[ -n "$brlist" ] && append base_cfg "basic_rates=$brlist" "$N"
@@ -468,9 +472,6 @@ hostapd_common_add_bss_config() {
 	config_add_string uci_section
 
 	config_add_boolean dynamic_probe_resp
-
-	config_add_int rssi_reject_assoc_rssi
-	config_add_int rssi_ignore_probe_request
 }
 
 hostapd_set_vlan_file() {
@@ -724,8 +725,7 @@ hostapd_set_bss_options() {
 		airtime_bss_weight airtime_bss_limit airtime_sta_weight \
 		multicast_to_unicast_all proxy_arp per_sta_vif \
 		eap_server eap_user_file ca_cert server_cert private_key private_key_passwd server_id \
-		vendor_elements fils uci_section dynamic_probe_resp multi_psk \
-		rssi_reject_assoc_rssi rssi_ignore_probe_request
+		vendor_elements fils uci_section dynamic_probe_resp multi_psk
 
 	set_default fils 0
 	set_default isolate 0
@@ -780,8 +780,6 @@ hostapd_set_bss_options() {
 	append bss_conf "uapsd_advertisement_enabled=$uapsd" "$N"
 	append bss_conf "utf8_ssid=$utf8_ssid" "$N"
 	append bss_conf "multi_ap=$multi_ap" "$N"
-	[ -n "$rssi_reject_assoc_rssi" ] && append bss_conf "rssi_reject_assoc_rssi=$rssi_reject_assoc_rssi" "$N"
-	[ -n "$rssi_ignore_probe_request" ] && append bss_conf "rssi_ignore_probe_request=$rssi_ignore_probe_request" "$N"
 	[ -n "$vendor_elements" ] && append bss_conf "vendor_elements=$vendor_elements" "$N"
 
 	[ "$tdls_prohibit" -gt 0 ] && append bss_conf "tdls_prohibit=$tdls_prohibit" "$N"

feeds/ipq807x_v5.4/hostapd/files/mpskd

@@ -144,7 +144,7 @@ function netifd_reload() {
 
 			push(ssid.interfaces, iface.ifname);
 			ssid.bands[band] = iface.ifname;
-			ssid.mpsk = ssid?.mpsk ? true : config.multi_psk;
+			ssid.mpsk = config.multi_psk;
 			for (let sta in iface.stations) {
 				let stacfg = sta.config;
 
@@ -308,18 +308,18 @@ function sta_auth_cache(ifname, addr, idx, phrase) {
 function auth_cb(msg) {
 	let data = msg.data;
 
+	if (!is_ssid_mpsk(data.iface))
+		return;
+
 	printf(`Event ${msg.type}: ${msg.data}\n`);
 	switch (msg.type) {
 	case 'sta_auth':
-		if (!is_ssid_mpsk(data.iface))
-			return;
-
 		return {
 			psk: sta_auth_psk(data.iface, data.sta),
 			force_psk: true,
 		};
 	case 'sta_connected':
-		if (data.psk_idx == null || !is_ssid_mpsk(data.iface))
+		if (data.psk_idx == null)
 			return;
 		return sta_auth_cache(data.iface, data.sta, data.psk_idx, data.psk);
 	case 'reload':

feeds/ipq807x_v5.4/hostapd/patches/zzz-ignore-probe-event.patch

@@ -1,14 +0,0 @@
---- a/src/ap/beacon.c
-+++ b/src/ap/beacon.c
-@@ -934,8 +934,10 @@ void handle_probe_req(struct hostapd_dat
- 	int ubus_response;
- 
- 	if (hapd->iconf->rssi_ignore_probe_request && ssi_signal &&
--	    ssi_signal < hapd->iconf->rssi_ignore_probe_request)
-+	    ssi_signal < hapd->iconf->rssi_ignore_probe_request) {
-+		hostapd_ubus_notify_rssi(hapd, "rssi-ignore-probe", mgmt->sa, ssi_signal);
- 		return;
-+	}
- 
- 	if (len < IEEE80211_HDRLEN)
- 		return;

feeds/ipq807x_v5.4/hostapd/src/src/ap/ubus.c

@@ -1944,21 +1944,6 @@ void hostapd_ubus_notify(struct hostapd_data *hapd, const char *type, const u8 *
 	ubus_notify(ctx, &hapd->ubus.obj, type, b.head, -1);
 }
 
-void hostapd_ubus_notify_rssi(struct hostapd_data *hapd, const char *type, const u8 *addr, int rssi)
-{
-	if (!hapd->ubus.obj.has_subscribers)
-		return;
-
-	if (!addr)
-		return;
-
-	blob_buf_init(&b, 0);
-	blobmsg_add_macaddr(&b, "address", addr);
-	blobmsg_add_u32(&b, "rssi", rssi);
-
-	ubus_notify(ctx, &hapd->ubus.obj, type, b.head, -1);
-}
-
 void hostapd_ubus_notify_csa(struct hostapd_data *hapd, int freq)
 {
 	if (!hapd->ubus.obj.has_subscribers)

feeds/ipq807x_v5.4/hostapd/src/src/ap/ubus.h

@@ -56,7 +56,6 @@ void hostapd_ubus_notify_beacon_report(struct hostapd_data *hapd,
 				       size_t len);
 void hostapd_ubus_notify_radar_detected(struct hostapd_iface *iface, int frequency,
 					int chan_width, int cf1, int cf2);
-void hostapd_ubus_notify_rssi(struct hostapd_data *hapd, const char *type, const u8 *addr, int rssi);
 
 void hostapd_ubus_notify_bss_transition_response(
 	struct hostapd_data *hapd, const u8 *addr, u8 dialog_token, u8 status_code,

feeds/ipq807x_v5.4/ipq50xx/base-files/etc/board.d/01_leds

@@ -40,11 +40,6 @@ edgecore,oap101e-6e)
 	ucidef_set_led_netdev "wan" "wan" "red:ethernet" "eth1"
         ucidef_set_led_default "power" "POWER" "blue:management" "on"
 	;;
-emplus,wap385c)
-	ucidef_set_led_default "ledr" "LEDR" "sys:red" "on"
-	ucidef_set_led_default "ledg" "LEDG" "sys:green" "on"
-	ucidef_set_led_default "ledb" "LEDB" "sys:blue" "on"
-	;;
 hfcl,ion4x_w|\
 hfcl,ion4xi_w)
 	ucidef_set_led_wlan "wlan5g" "WLAN5G" "blue:wifi5" "phy0tpt"

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

@@ -48,7 +48,6 @@ qcom_setup_interfaces()
 		ucidef_add_switch "switch1" \
 			"6u@eth1" "1:lan" "2:lan" "3:lan" "4:lan"
 		;;
-	emplus,wap385c|\
 	hfcl,ion4x_w|\
 	hfcl,ion4xi_w)
 		ucidef_set_interface_wan "eth0"

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

@@ -129,7 +129,6 @@ ath11k/IPQ5018/hw1.0/caldata.bin)
 	edgecore,oap101-6e|\
 	edgecore,oap101e|\
 	edgecore,oap101e-6e|\
-	emplus,wap385c|\
 	hfcl,ion4x_w|\
 	hfcl,ion4xi_w|\
 	optimcloud,d60|\
@@ -158,7 +157,6 @@ ath11k/qcn6122/hw1.0/caldata_1.bin)
 	edgecore,oap101-6e|\
 	edgecore,oap101e|\
 	edgecore,oap101e-6e|\
-	emplus,wap385c|\
 	udaya,a6-id2|\
 	udaya,a6-od2|\
 	hfcl,ion4xi_w|\

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

@@ -76,7 +76,6 @@ platform_check_image() {
 	cybertan,eww631-a1|\
 	cybertan,eww631-b1|\
 	edgecore,eap104|\
-	emplus,wap385c|\
 	wallys,dr5018|\
 	hfcl,ion4x_w|\
 	hfcl,ion4xi_w|\
@@ -130,7 +129,6 @@ platform_do_upgrade() {
                 ;;
 	cig,wf186w|\
 	cig,wf186h|\
-	emplus,wap385c|\
 	udaya,a6-id2|\
 	udaya,a6-od2|\
 	wallys,dr5018|\

feeds/ipq807x_v5.4/ipq50xx/files/arch/arm64/boot/dts/qcom/qcom-ipq5018-emplus-wap385c.dts

@@ -1,760 +0,0 @@
-/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"
-#include <dt-bindings/input/input.h>
-
-/ {
-	#address-cells = <0x2>;
-	#size-cells = <0x2>;
-	model = "Emplus WAP385C";
-	compatible = "emplus,wap385c", "qcom,ipq5018-mp03.3", "qcom,ipq5018";
-	interrupt-parent = <&intc>;
-
-	aliases {
-		sdhc1 = &sdhc_1; /* SDC1 eMMC slot */
-		serial0 = &blsp1_uart1;
-		serial1 = &blsp1_uart2;
-		ethernet1 = "/soc/dp1";
-
-		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>;
-		};
-	#endif
-	};
-
-	soc {
-		serial@78af000 {
-			status = "ok";
-		};
-
-		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 23 0>;
-
-			ethernet-phy@0 {
-				reg = <24>;
-			};
-		};
-
-		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 = <0x18>;
-						mdiobus = <&mdio1>;
-						port_mac_sel = "QGMAC_PORT";
-					};
-				};
-				led_source@0 {
-					source = <0>;
-					mode = "normal";
-					speed = "all";
-					blink_en = "enable";
-					active = "high";
-				};
-			};
-		};
-
-		wifi0: wifi@c000000 {
-			status = "ok";
-		};
-
-		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";
-		};
-
-		nss-macsec1 {
-			compatible = "qcom,nss-macsec";
-			phy_addr = <0x18>;
-			mdiobus = <&mdio1>;
-		};
-
-		lpass: lpass@0xA000000{
-			status = "disabled";
-		};
-
-		pcm_lb: pcm_lb@0 {
-			status = "disabled";
-		};
-	};
-
-	qcom,test@0 {
-		status = "ok";
-	};
-
-	thermal-zones {
-		status = "ok";
-	};
-};
-
-&tlmm {
-	pinctrl-0 = <&blsp0_uart_pins>;
-	pinctrl-names = "default";
-
-	blsp0_uart_pins: uart_pins {
-		blsp0_uart_rx_tx {
-			pins = "gpio20", "gpio21";
-			function = "blsp0_uart0";
-			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;
-		};
-	};
-
-	poe_dc_pins: poe_dc_pins {
-		T2P_DET {
-			pins = "gpio31";
-			function = "gpio";
-			drive-strength = <8>;
-			bias-disable;
-		};
-
-		12V_DET {
-			pins = "gpio32";
-			function = "gpio";
-			drive-strength = <8>;
-			bias-disable;
-		};
-	};
-
-	button_pins: button_pins {
-		reset_button {
-			pins = "gpio27";
-			function = "gpio";
-			drive-strength = <8>;
-			bias-pull-up;
-		};
-	};
-
-	leds_pins: leds_pinmux {
-		linux,phandle = <0x4d>;
-		phandle = <0x4d>;
-
-		led_G {
-			pins = "gpio24";
-			function = "gpio";
-			bias-pull-down;
-			drive-strength = <0x08>;
-		};
-
-		led_B {
-			pins = "gpio28";
-			function = "gpio";
-			bias-pull-down;
-			drive-strength = <0x08>;
-		};
-
-		led_R {
-			pins = "gpio38";
-			function = "gpio";
-			bias-pull-down;
-			drive-strength = <0x08>;
-		};
-	};
-};
-
-&soc {
-	gpio_keys {
-		compatible = "gpio-keys";
-		pinctrl-0 = <&button_pins>;
-		pinctrl-names = "default";
-
-		button@1 {
-			label = "reset";
-			linux,code = <KEY_RESTART>;
-			gpios = <&tlmm 27 GPIO_ACTIVE_LOW>;
-			linux,input-type = <1>;
-			debounce-interval = <60>;
-		};
-	};
-
-	leds {
-		compatible = "gpio-leds";
-		pinctrl-0 = <&leds_pins>;
-		pinctrl-names = "default";
-
-		led@24 {
-			label = "sys:green";
-			gpios = <&tlmm 24 GPIO_ACTIVE_HIGH>;
-			default-state = "on";
-		};
-
-		led@28 {
-			label = "sys:blue";
-			gpios = <&tlmm 28 GPIO_ACTIVE_HIGH>;
-			default-state = "on";
-		};
-
-		led_power: led@38 {
-			label = "sys:red";
-			gpios = <&tlmm 38 GPIO_ACTIVE_HIGH>;
-			linux,default-trigger = "wap385c:sys:red";
-			default-state = "on";
-		};
-	};
-
-};
-
-&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
-
-	};
-};
-
-&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 = <0x24>;
-#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";
-};
-
-&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 >;
-	};
-};
-
-&qfprom {
-	status = "ok";
-};
-
-&tsens {
-	status = "ok";
-};

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

@@ -154,15 +154,6 @@ define Device/edgecore_oap101e_6e
 endef
 TARGET_DEVICES += edgecore_oap101e_6e
 
-define Device/emplus_wap385c
-  DEVICE_TITLE := Emplus WAP385C
-  DEVICE_DTS := qcom-ipq5018-emplus-wap385c
-  SUPPORTED_DEVICES := emplus,wap385c
-  DEVICE_PACKAGES := ath11k-wifi-emplus-wap385c ath11k-firmware-ipq50xx-map-spruce
-  DEVICE_DTS_CONFIG := config@mp03.3
-endef
-TARGET_DEVICES += emplus_wap385c
-
 define Device/hfcl_ion4x_w
   DEVICE_TITLE := HFCL ION4x_w
   DEVICE_DTS := qcom-ipq5018-hfcl-ion4x_w

feeds/ipq807x_v5.4/ipq60xx/base-files/etc/board.d/01_leds

@@ -26,12 +26,6 @@ edgecore,eap101)
 	ucidef_set_led_netdev "poe" "poe" "green:wan" "eth0"
         ucidef_set_led_default "power" "POWER" "green:led_pwr" "on"
 	;;
-emplus,wap386v2)
-	ucidef_set_led_default "power" "POWER" "red:power" "on"
-	ucidef_set_led_netdev "wan" "WAN" "blue:wan" "eth0" "tx rx link"
-	ucidef_set_led_wlan "wlan2g" "WLAN2G" "blue:wifi2" "phy1tpt"
-	ucidef_set_led_wlan "wlan5g" "WLAN5G" "blue:wifi5" "phy0tpt"
-	;;
 hfcl,ion4xi|\
 hfcl,ion4x|\
 hfcl,ion4x_2|\

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

@@ -34,10 +34,10 @@ qcom_setup_interfaces()
 		ucidef_set_interface_lan "eth1"
 		ucidef_set_interface_wan "eth0"
 		;;
-	cig,wf660a|\
-	emplus,wap386v2)
+       cig,wf660a)
 		ucidef_set_interface_wan "eth0"		
 		;;
+
 	yuncore,fap650)
 		ucidef_set_interface_lan "eth3 eth2 eth1 eth0"
 		ucidef_set_interface_wan "eth4"
@@ -76,9 +76,6 @@ qcom_setup_macs()
 		ucidef_set_network_device_mac eth0 $wan_mac
 		ip link set eth0 address $wan_mac
 		;;
-	emplus,wap386v2)
-		wan_mac=$(cat /sys/class/net/eth0/address)
-		;;
 	yuncore,ax840)
 		wan_mac=$(cat /sys/class/net/eth1/address)
 		lan_mac=$(macaddr_add "$wan_mac" 1)

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

@@ -76,7 +76,6 @@ case "$FIRMWARE" in
 	cig,wf188n|\
 	cig,wf660a|\
 	edgecore,eap101|\
-	emplus,wap386v2|\
 	hfcl,ion4xi|\
 	hfcl,ion4x|\
 	hfcl,ion4x_2|\
@@ -110,8 +109,7 @@ ath11k-macs)
 	edgecore,eap101)
 		ath11k_generate_macs_eap101
 		;;
-	cig,wf188n|\
-	emplus,wap386v2)
+	cig,wf188n)
 		ath11k_generate_macs
 		;;
 	cig,wf660a)

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

@@ -122,7 +122,6 @@ platform_check_image() {
 	wallys,dr6018|\
 	wallys,dr6018-v4|\
 	edgecore,eap101|\
-	emplus,wap386v2|\
 	hfcl,ion4xi|\
 	hfcl,ion4x|\
 	hfcl,ion4x_2|\
@@ -146,8 +145,7 @@ platform_do_upgrade() {
 	cig,wf660a)
 		spi_nor_emmc_do_upgrade_bootconfig $1
 		;;
-	cig,wf188n|\
-	emplus,wap386v2)
+	cig,wf188n)
 		[ -f /proc/boot_info/rootfs/upgradepartition ] && {
 			CI_UBIPART="$(cat /proc/boot_info/rootfs/upgradepartition)"
 			CI_BOOTCFG=1

feeds/ipq807x_v5.4/ipq60xx/files/arch/arm64/boot/dts/qcom/qcom-ipq6018-emplus-wap386v2.dts

@@ -1,356 +0,0 @@
-/*
- * Copyright (c) 2019-2021, The Linux Foundation. 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.
- */
-
-/dts-v1/;
-
-#include "ipq6018.dtsi"
-#include "ipq6018-cpr-regulator.dtsi"
-#include <dt-bindings/input/input.h>
-
-/ {
-	model = "Emplus WAP386 v2";
-	compatible = "emplus,wap386v2", "qcom,ipq6018-cp03", "qcom,ipq6018";
-
-	aliases {
-		/*
-		 * Aliases as required by u-boot
-		 * to patch MAC addresses
-		 */
-		ethernet0 = "/soc/dp1";
-
-		led-boot = &led_power;
-		led-failsafe = &led_power;
-		led-running = &led_power;
-		led-upgrade = &led_power;
-	};
-
-	chosen {
-		stdout-path = "serial0:115200n8";
-		bootargs-append = " swiotlb=1 coherent_pool=2M";
-	};
-
-	/*
-	 * +=========+==============+========================+
-	 * |        |              |                         |
-	 * | Region | Start Offset |          Size           |
-	 * |        |              |                         |
-	 * +--------+--------------+-------------------------+
-	 * |        |              |                         |
-	 * |        |              |                         |
-	 * |        |              |                         |
-	 * |        |              |                         |
-	 * | Linux  |  0x41000000  |         139MB           |
-	 * |        |              |                         |
-	 * |        |              |                         |
-	 * |        |              |                         |
-	 * +--------+--------------+-------------------------+
-	 * | TZ App |  0x49B00000  |           6MB           |
-	 * +--------+--------------+-------------------------+
-	 *
-	 * From the available 145 MB for Linux in the first 256 MB,
-	 * we are reserving 6 MB for TZAPP.
-	 *
-	 * Refer arch/arm64/boot/dts/qcom/qcom-ipq6018-memory.dtsi
-	 * for memory layout.
-	 */
-
-/* TZAPP is enabled only in default memory profile */
-#if !defined(__IPQ_MEM_PROFILE_256_MB__) && !defined(__IPQ_MEM_PROFILE_512_MB__)
-	reserved-memory {
-		tzapp:tzapp@49B00000 {	/* TZAPPS */
-			no-map;
-			reg = <0x0 0x49B00000 0x0 0x00600000>;
-		};
-	};
-#endif
-};
-
-&tlmm {
-	gpio-reserved-ranges = <20 1>;
-
-	uart_pins: uart_pins {
-		mux {
-			pins = "gpio44", "gpio45";
-			function = "blsp2_uart";
-			drive-strength = <8>;
-			bias-pull-down;
-		};
-	};
-
-	spi_0_pins: spi_0_pins {
-		mux {
-			pins = "gpio38", "gpio39", "gpio40", "gpio41";
-			function = "blsp0_spi";
-			drive-strength = <8>;
-			bias-pull-down;
-		};
-	};
-
-	button_pins: button_pins {
-		reset_button {
-			pins = "gpio9";
-			function = "gpio";
-			drive-strength = <8>;
-			bias-pull-down;
-		};
-	};
-
-	mdio_pins: mdio_pinmux {
-		mux_0 {
-			pins = "gpio64";
-			function = "mdc";
-			drive-strength = <8>;
-			bias-pull-up;
-		};
-		mux_1 {
-			pins = "gpio65";
-			function = "mdio";
-			drive-strength = <8>;
-			bias-pull-up;
-		};
-		mux_2 {
-			pins = "gpio75";
-			function = "gpio";
-			bias-pull-up;
-		};
-	};
-
-	leds_pins: leds_pins {
-		led_5g {
-			pins = "gpio31";
-			function = "gpio";
-			drive-strength = <8>;
-			bias-pull-down;
-		};
-		led_2g {
-			pins = "gpio30";
-			function = "gpio";
-			drive-strength = <8>;
-			bias-pull-down;
-		};
-	};
-};
-
-&soc {
-	mdio@90000 {
-		pinctrl-0 = <&mdio_pins>;
-		pinctrl-names = "default";
-		phy-reset-gpio = <&tlmm 75 0>;
-		status = "ok";
-		phy0: ethernet-phy@0 {
-			reg = <3>;
-		};
-		phy1: ethernet-phy@1 {
-			reg = <4>;
-		};
-	};
-
-	ess-switch@3a000000 {
-		switch_cpu_bmp = <0x1>;  /* cpu port bitmap */
-		switch_lan_bmp = <0x08>; /* lan port bitmap */
-		switch_wan_bmp = <0x10>; /* wan port bitmap */
-		switch_inner_bmp = <0xc0>; /*inner port bitmap*/
-		switch_mac_mode = <0x0>; /* mac mode for uniphy instance0*/
-		switch_mac_mode1 = <0xff>; /* mac mode for uniphy instance1*/
-		switch_mac_mode2 = <0xff>; /* mac mode for uniphy instance2*/
-		qcom,port_phyinfo {
-			port@0 {
-				port_id = <2>;
-				phy_address = <3>;
-			};
-			port@1 {
-				port_id = <3>;
-				phy_address = <4>;
-			};
-		};
-	};
-
-	dp1 {
-		device_type = "network";
-		compatible = "qcom,nss-dp";
-		qcom,id = <3>;
-		reg = <0x3a001400 0x200>;
-		qcom,mactype = <0>;
-		local-mac-address = [000000000000];
-		qcom,link-poll = <1>;
-		qcom,phy-mdio-addr = <4>;
-		phy-mode = "sgmii";
-	};
-
-	gpio_keys {
-		compatible = "gpio-keys";
-		pinctrl-0 = <&button_pins>;
-		pinctrl-names = "default";
-
-		button@9 {
-			label = "reset";
-			linux,code = <KEY_RESTART>;
-			gpios = <&tlmm 9 GPIO_ACTIVE_LOW>;
-			linux,input-type = <1>;
-			debounce-interval = <60>;
-		};
-	};
-
-	leds {
-		compatible = "gpio-leds";
-		pinctrl-0 = <&leds_pins>;
-		pinctrl-names = "default";
-
-		led_power: led@28 {
-			label = "red:power";
-			gpios = <&tlmm 28 GPIO_ACTIVE_HIGH>;
-			linux,default-trigger = "wap386v2:red:power";
-			default-state = "on";
-		};
-		led@29 {
-			label = "blue:wan";
-			gpios = <&tlmm 29 GPIO_ACTIVE_HIGH>;
-			linux,default-trigger = "wap386v2:blue:eth";
-			default-state = "on";
-		};
-		led@30 {
-			label = "blue:wifi2";
-			gpios = <&tlmm 30 GPIO_ACTIVE_HIGH>;
-			linux,default-trigger = "wap386v2:blue:2g";
-			default-state = "on";
-		};
-		led@31 {
-			label = "blue:wifi5";
-			gpios = <&tlmm 31 GPIO_ACTIVE_HIGH>;
-			linux,default-trigger = "wap386v2:blue:5g";
-			default-state = "on";
-		};
-	};
-};
-
-&blsp1_uart3 {
-	pinctrl-0 = <&uart_pins>;
-	pinctrl-names = "default";
-	status = "ok";
-};
-
-&spi_0 {
-	pinctrl-0 = <&spi_0_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;
-	};
-};
-
-&wifi0 {
-	qcom,board_id = <0x30>;
-};
-
-&pcie_phy {
-	status = "ok";
-};
-
-&pcie0 {
-#if defined(__CNSS2__)
-	status = "ok";
-#endif
-};
-
-&qpic_bam {
-	status = "ok";
-};
-
-&qpic_nand {
-	status = "ok";
-
-	nand@0 {
-		reg = <0>;
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		nand-ecc-strength = <4>;
-		nand-ecc-step-size = <512>;
-		nand-bus-width = <8>;
-	};
-};
-
-&ssphy_0 {
-	status = "ok";
-};
-
-&nss_crypto {
-	status = "ok";
-};
-
-&CPU0 {
-	operating-points = <
-		/* kHz   uV (fixed) */
-		864000   1100000
-		1056000  1100000
-		1320000  1100000
-		1440000  1100000
-		1608000  1100000
-		1800000  1100000
-	>;
-	clock-latency = <200000>;
-};
-
-&CPU1 {
-	operating-points = <
-		/* kHz   uV (fixed) */
-		864000   1100000
-		1056000  1100000
-		1320000  1100000
-		1440000  1100000
-		1608000  1100000
-		1800000  1100000
-	>;
-	clock-latency = <200000>;
-};
-
-&CPU2 {
-	operating-points = <
-		/* kHz   uV (fixed) */
-		864000   1100000
-		1056000  1100000
-		1320000  1100000
-		1440000  1100000
-		1608000  1100000
-		1800000  1100000
-	>;
-	clock-latency = <200000>;
-};
-
-&CPU3 {
-	operating-points = <
-		/* kHz   uV (fixed) */
-		864000   1100000
-		1056000  1100000
-		1320000  1100000
-		1440000  1100000
-		1608000  1100000
-		1800000  1100000
-	>;
-	clock-latency = <200000>;
-};
-
-&rpm_glink {
-	status = "disabled";
-};

feeds/ipq807x_v5.4/ipq60xx/image/ipq60xx.mk

@@ -76,15 +76,6 @@ define Device/edgecore_eap101
 endef
 TARGET_DEVICES += edgecore_eap101
 
-define Device/emplus_wap386v2
-  DEVICE_TITLE := Emplus WAP386v2
-  DEVICE_DTS := qcom-ipq6018-emplus-wap386v2
-  DEVICE_DTS_CONFIG := config@cp03-c1
-  SUPPORTED_DEVICES := emplus,wap386v2
-  DEVICE_PACKAGES := ath11k-wifi-qcom-ipq6018 uboot-env
-endef
-TARGET_DEVICES += emplus_wap386v2
-
 define Device/indio_um-310ax-v1
   DEVICE_TITLE := Indio UM-310AX V1
   DEVICE_DTS := qcom-ipq6018-indio-um-310ax-v1

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

@@ -16,14 +16,14 @@ ath11k_generate_macs() {
 	echo -ne \\x${mac3//:/\\x} >> /lib/firmware/ath11k-macs
 }
 
-ath11k_generate_macs_rap650c() {
+ath11k_generate_macs_sonicfi() {
 	mac=$(fw_printenv -n BaseMacAddress)
 	[ -z "$mac" ] && return;
 
 	touch /lib/firmware/ath11k-macs
 	eth=$(macaddr_canonicalize $mac)
-	mac1=$(macaddr_add $eth 3)
-	mac2=$(macaddr_add $eth 2)
+	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
@@ -112,8 +112,8 @@ ath11k-macs)
 	cig,wf196)
 		ath11k_generate_macs_wf196
 		;;
-	sonicfi,rap650c)
-		ath11k_generate_macs_rap650c
+	sonicfi*)
+		ath11k_generate_macs_sonicfi
 		;;
 	esac
 	;;

feeds/ipq807x_v5.4/mac80211/patches/pending/999-remove-kernel-warn-msg-abnormal-he-nss-value.patch

@@ -6,7 +6,7 @@
  		return 0;
 -	if (WARN_ON_ONCE(rate->nss < 1 || rate->nss > 8))
 +	if (rate->nss < 1 || rate->nss > 8) {
-+		printk_once(KERN_WARNING "cfg80211_calculate_bitrate_he: invalid rate->nss: %d\n", rate->nss);
++		printk_once(1, "invalid rate->nss: %d\n", rate->nss);
  		return 0;
 -
 +	}

feeds/ipq807x_v5.4/mac80211/patches/pending/a-003-fix-roaming-firmware-crash.patch

@@ -1,119 +0,0 @@
---- a/drivers/net/wireless/ath/ath11k/peer.c
-+++ b/drivers/net/wireless/ath/ath11k/peer.c
-@@ -819,10 +819,7 @@ int ath11k_peer_delete(struct ath11k *ar
- #ifdef CPTCFG_ATH11K_NSS_SUPPORT
- 		mutex_unlock(&ar->ab->base_ast_lock);
- #endif
--		ath11k_warn(ar->ab,
--			    "failed to find peer vdev_id %d addr %pM in delete\n",
--			    vdev_id, addr);
--		return -EINVAL;
-+		return 0;
-         }
- 
- #ifdef CPTCFG_ATH11K_NSS_SUPPORT
-@@ -883,6 +880,7 @@ int ath11k_peer_create(struct ath11k *ar
- 	struct ieee80211_vif *vif = arvif->vif;
- 	struct ath11k_sta *arsta;
- 	int ret, fbret;
-+	u8 vdev_id = 0;
- 
- 	lockdep_assert_held(&ar->conf_mutex);
- 
-@@ -891,20 +889,21 @@ int ath11k_peer_create(struct ath11k *ar
- 			    "failed to create peer due to insufficient peer entry resource in firmware\n");
- 		return -ENOBUFS;
- 	}
-+
- 	mutex_lock(&ar->ab->tbl_mtx_lock);
- 	spin_lock_bh(&ar->ab->base_lock);
- 	peer = ath11k_peer_find_by_addr(ar->ab, param->peer_addr);
-+	if (peer)
-+		vdev_id = peer->vdev_id;
-+	spin_unlock_bh(&ar->ab->base_lock);
-+	mutex_unlock(&ar->ab->tbl_mtx_lock);
-+
- 	if (peer) {
--		if (peer->vdev_id == param->vdev_id) {
--			spin_unlock_bh(&ar->ab->base_lock);
--			mutex_unlock(&ar->ab->tbl_mtx_lock);
-+		if (vdev_id == param->vdev_id)
- 			return -EINVAL;
--		}
--		ath11k_peer_rhash_delete(ar->ab, peer);
--	}
- 
--	spin_unlock_bh(&ar->ab->base_lock);
--	mutex_unlock(&ar->ab->tbl_mtx_lock);
-+		ath11k_peer_delete(ar, vdev_id, param->peer_addr);
-+	}
- 
- 	ret = ath11k_wmi_send_peer_create_cmd(ar, param);
- 	if (ret) {
---- a/drivers/net/wireless/ath/ath11k/dp.c
-+++ b/drivers/net/wireless/ath/ath11k/dp.c
-@@ -28,7 +28,7 @@ void ath11k_dp_peer_cleanup(struct ath11
- 	spin_lock_bh(&ab->base_lock);
- 	peer = ath11k_peer_find(ab, vdev_id, addr);
- 	if (!peer) {
--		ath11k_warn(ab, "failed to lookup peer %pM on vdev %d\n",
-+		ath11k_dbg(ab, ATH11K_DBG_MAC, "failed to lookup peer %pM on vdev %d\n",
- 			    addr, vdev_id);
- 		spin_unlock_bh(&ab->base_lock);
- 		return;
---- a/drivers/net/wireless/ath/ath11k/dp_rx.c
-+++ b/drivers/net/wireless/ath/ath11k/dp_rx.c
-@@ -1204,9 +1204,9 @@ int ath11k_dp_rx_ampdu_stop(struct ath11
- 
- 	peer = ath11k_peer_find(ab, vdev_id, params->sta->addr);
- 	if (!peer) {
--		ath11k_warn(ab, "failed to find the peer to stop rx aggregation\n");
-+		ath11k_dbg(ab, ATH11K_DBG_MAC, "failed to find the peer to stop rx aggregation\n");
- 		spin_unlock_bh(&ab->base_lock);
--		return -ENOENT;
-+		return 0;
- 	}
- 
- 	paddr = peer->rx_tid[params->tid].paddr;
---- a/drivers/net/wireless/ath/ath11k/mac.c
-+++ b/drivers/net/wireless/ath/ath11k/mac.c
-@@ -4075,7 +4075,7 @@ static int ath11k_clear_peer_keys(struct
- 	peer = ath11k_peer_find(ab, arvif->vdev_id, addr);
- 	if (!peer) {
- 		spin_unlock_bh(&ab->base_lock);
--		return -ENOENT;
-+		return 0;
- 	}
- 	for (i = 0; i < ARRAY_SIZE(keys); i++) {
- 		keys[i]= peer->keys[i];
-@@ -4325,6 +4325,10 @@ static int ath11k_mac_op_set_key(struct
- 
- 	spin_lock_bh(&ab->base_lock);
- 	peer = ath11k_peer_find(ab, arvif->vdev_id, peer_addr);
-+	if (!peer && cmd == DISABLE_KEY) {
-+		ret = 0;
-+		goto unlock;
-+	}
- 
- 	/* TODO: Check if vdev specific security cfg is mandatory */
- 	ret = ath11k_nss_vdev_set_cmd(arvif, ATH11K_NSS_WIFI_VDEV_SECURITY_TYPE_CMD, key->cipher);
-@@ -5961,7 +5965,7 @@ static void ath11k_mac_op_sta_rc_update(
- 	peer = ath11k_peer_find(ar->ab, arvif->vdev_id, sta->addr);
- 	if (!peer) {
- 		spin_unlock_bh(&ar->ab->base_lock);
--		ath11k_warn(ar->ab, "mac sta rc update failed to find peer %pM on vdev %i\n",
-+		ath11k_dbg(ar->ab, ATH11K_DBG_MAC, "mac sta rc update failed to find peer %pM on vdev %i\n",
- 			    sta->addr, arvif->vdev_id);
- 		return;
- 	}
---- a/drivers/net/wireless/ath/ath11k/wmi.c
-+++ b/drivers/net/wireless/ath/ath11k/wmi.c
-@@ -8425,7 +8425,7 @@ static void ath11k_peer_sta_kickout_even
- 	peer = ath11k_peer_find_by_addr(ab, arg.mac_addr);
- 	if (!peer) {
- 		spin_unlock_bh(&ab->base_lock);
--		ath11k_warn(ab, "peer not found %pM\n",
-+		ath11k_dbg(ab, ATH11K_DBG_WMI, "peer not found %pM\n",
- 			    arg.mac_addr);
- 		goto exit;
- 	}

feeds/mediatek-sdk/mediatek/mt7981/base-files/etc/init.d/bootcount

@@ -8,9 +8,6 @@ boot() {
 	edgecore,eap112)
 		bootcount=$(fw_printenv -n bootcount)
 		[ "$bootcount" != 0 ] && fw_setenv bootcount 0
-		# enable dualboot
-		avail=$(fw_printenv -n upgrade_available)
-		[ ${avail} -eq 0 ] && fw_setenv upgrade_available 1
 		;;
 	esac
 }

feeds/mediatek-sdk/mt76/Makefile

@@ -493,22 +493,10 @@ define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR)/tools
 endef
 
-
 define Build/Install
 	:
 endef
 
-ifdef CONFIG_TARGET_PROFILE
-TARGET_PROFILE=$(subst ",,$(CONFIG_TARGET_PROFILE))
-PATCH_PROFILE_NAME=patches-$(subst DEVICE_,,$(TARGET_PROFILE))
-endif
-
-define Build/Patch
-	$(Build/Patch/Default)
-	$(call PatchDir,$(PKG_BUILD_DIR),$(PATCH_PROFILE_NAME)/,profile/)
-endef
-
-
 define Package/kmod-mt76/install
 	true
 endef

feeds/mediatek-sdk/mt76/patches-emplus_wap588m/3000-wifi-mt76-mt7915-emplus-wap588m-thermal-protech.patch

@@ -1,26 +0,0 @@
-Index: mt76-2024-04-03-1e336a85/mt7915/mt7915.h
-===================================================================
---- mt76-2024-04-03-1e336a85.orig/mt7915/mt7915.h
-+++ mt76-2024-04-03-1e336a85/mt7915/mt7915.h
-@@ -71,8 +71,8 @@
- #define MT7915_CFEND_RATE_DEFAULT	0x49	/* OFDM 24M */
- #define MT7915_CFEND_RATE_11B		0x03	/* 11B LP, 11M */
- 
--#define MT7915_THERMAL_THROTTLE_MAX	100
--#define MT7915_CDEV_THROTTLE_MAX	99
-+#define MT7915_THERMAL_THROTTLE_MAX	80
-+#define MT7915_CDEV_THROTTLE_MAX	79
- 
- #define MT7915_SKU_RATE_NUM		161
- #define MT7915_SKU_PATH_NUM		185
-@@ -86,8 +86,8 @@
- 
- #define MT7915_CRIT_TEMP_IDX		0
- #define MT7915_MAX_TEMP_IDX		1
--#define MT7915_CRIT_TEMP		110
--#define MT7915_MAX_TEMP			120
-+#define MT7915_CRIT_TEMP		103
-+#define MT7915_MAX_TEMP			118
- 
- struct mt7915_vif;
- struct mt7915_sta;

feeds/qca-wifi-7/hostapd/files/hostapd.sh

@@ -121,6 +121,8 @@ hostapd_common_add_device_config() {
 	config_add_boolean legacy_rates
 	config_add_int cell_density
 	config_add_int rts_threshold
+	config_add_int rssi_reject_assoc_rssi
+	config_add_int rssi_ignore_probe_request
 	config_add_int maxassoc
 	config_add_int reg_power_type
 	config_add_boolean stationary_ap
@@ -145,7 +147,7 @@ hostapd_prepare_device_config() {
 
 	json_get_vars country country3 country_ie beacon_int:100 dtim_period:2 doth require_mode legacy_rates \
 		acs_chan_bias local_pwr_constraint spectrum_mgmt_required airtime_mode cell_density \
-		rts_threshold beacon_rate maxassoc \
+		rts_threshold beacon_rate rssi_reject_assoc_rssi rssi_ignore_probe_request maxassoc \
 		rnr_beacon mbssid:0 band reg_power_type stationary_ap acs_exclude_dfs\
 		maxassoc_ignore_probe band
 
@@ -242,6 +244,8 @@ hostapd_prepare_device_config() {
 		hostapd_add_rate brlist "$br"
 	done
 
+	[ -n "$rssi_reject_assoc_rssi" ] && append base_cfg "rssi_reject_assoc_rssi=$rssi_reject_assoc_rssi" "$N"
+	[ -n "$rssi_ignore_probe_request" ] && append base_cfg "rssi_ignore_probe_request=$rssi_ignore_probe_request" "$N"
 	[ -n "$beacon_rate" ] && append base_cfg "beacon_rate=$beacon_rate" "$N"
 	[ -n "$rlist" ] && append base_cfg "supported_rates=$rlist" "$N"
 	[ -n "$brlist" ] && append base_cfg "basic_rates=$brlist" "$N"
@@ -423,9 +427,6 @@ hostapd_common_add_bss_config() {
 
 	config_add_boolean apup
 	config_add_string apup_peer_ifname_prefix
-
-	config_add_int rssi_reject_assoc_rssi
-	config_add_int rssi_ignore_probe_request
 }
 
 hostapd_set_vlan_file() {
@@ -679,8 +680,7 @@ hostapd_set_bss_options() {
 		ppsk airtime_bss_weight airtime_bss_limit airtime_sta_weight \
 		multicast_to_unicast_all proxy_arp per_sta_vif \
 		eap_server eap_user_file ca_cert server_cert private_key private_key_passwd server_id radius_server_clients radius_server_auth_port \
-		vendor_elements fils ocv apup uci_section dynamic_probe_resp multi_psk \
-		rssi_reject_assoc_rssi rssi_ignore_probe_request
+		vendor_elements fils ocv apup uci_section dynamic_probe_resp multi_psk
 
 	set_default fils 0
 	set_default isolate 0
@@ -737,8 +737,6 @@ hostapd_set_bss_options() {
 	append bss_conf "uapsd_advertisement_enabled=$uapsd" "$N"
 	append bss_conf "utf8_ssid=$utf8_ssid" "$N"
 	append bss_conf "multi_ap=$multi_ap" "$N"
-	[ -n "$rssi_reject_assoc_rssi" ] && append bss_conf "rssi_reject_assoc_rssi=$rssi_reject_assoc_rssi" "$N"
-	[ -n "$rssi_ignore_probe_request" ] && append bss_conf "rssi_ignore_probe_request=$rssi_ignore_probe_request" "$N"
 	[ -n "$vendor_elements" ] && append bss_conf "vendor_elements=$vendor_elements" "$N"
 
 	[ "$tdls_prohibit" -gt 0 ] && append bss_conf "tdls_prohibit=$tdls_prohibit" "$N"
@@ -777,16 +775,11 @@ hostapd_set_bss_options() {
 			set_default sae_require_mfp 1
 			[ "$ppsk" -eq 0 ] && set_default sae_pwe 2
 		;;
-		psk-sae|eap-eap2)
+		psk-sae|psk2-radius|eap-eap2)
 			set_default ieee80211w 1
 			set_default sae_require_mfp 1
 			[ "$ppsk" -eq 0 ] && set_default sae_pwe 2
 		;;
-                psk2-radius)
-			set_default ieee80211w 1
-			set_default sae_require_mfp 0
-			[ "$ppsk" -eq 0 ] && set_default sae_pwe 4
-                ;;
 	esac
 	[ -n "$sae_require_mfp" ] && append bss_conf "sae_require_mfp=$sae_require_mfp" "$N"
 	[ -n "$sae_pwe" ] && append bss_conf "sae_pwe=$sae_pwe" "$N"

feeds/qca-wifi-7/hostapd/files/mpskd

@@ -144,7 +144,7 @@ function netifd_reload() {
 
 			push(ssid.interfaces, iface.ifname);
 			ssid.bands[band] = iface.ifname;
-			ssid.mpsk = ssid?.mpsk ? true : config.multi_psk;
+			ssid.mpsk = config.multi_psk;
 			for (let sta in iface.stations) {
 				let stacfg = sta.config;
 
@@ -308,18 +308,18 @@ function sta_auth_cache(ifname, addr, idx, phrase) {
 function auth_cb(msg) {
 	let data = msg.data;
 
+	if (!is_ssid_mpsk(data.iface))
+		return;
+
 	printf(`Event ${msg.type}: ${msg.data}\n`);
 	switch (msg.type) {
 	case 'sta_auth':
-		if (!is_ssid_mpsk(data.iface))
-			return;
-
 		return {
 			psk: sta_auth_psk(data.iface, data.sta),
 			force_psk: true,
 		};
 	case 'sta_connected':
-		if (data.psk_idx == null || !is_ssid_mpsk(data.iface))
+		if (data.psk_idx == null)
 			return;
 		return sta_auth_cache(data.iface, data.sta, data.psk_idx, data.psk);
 	case 'reload':

feeds/qca-wifi-7/hostapd/patches/zzz-ignore-probe-event.patch

@@ -1,14 +0,0 @@
---- a/src/ap/beacon.c
-+++ b/src/ap/beacon.c
-@@ -934,8 +934,10 @@ void handle_probe_req(struct hostapd_dat
- 	int ubus_response;
- 
- 	if (hapd->iconf->rssi_ignore_probe_request && ssi_signal &&
--	    ssi_signal < hapd->iconf->rssi_ignore_probe_request)
-+	    ssi_signal < hapd->iconf->rssi_ignore_probe_request) {
-+		hostapd_ubus_notify_rssi(hapd, "rssi-ignore-probe", mgmt->sa, ssi_signal);
- 		return;
-+	}
- 
- 	if (len < IEEE80211_HDRLEN)
- 		return;

feeds/qca-wifi-7/hostapd/src/src/ap/ubus.c

@@ -1923,21 +1923,6 @@ void hostapd_ubus_notify(struct hostapd_data *hapd, const char *type, const u8 *
 	ubus_notify(ctx, &hapd->ubus.obj, type, b.head, -1);
 }
 
-void hostapd_ubus_notify_rssi(struct hostapd_data *hapd, const char *type, const u8 *addr, int rssi)
-{
-	if (!hapd->ubus.obj.has_subscribers)
-		return;
-
-	if (!addr)
-		return;
-
-	blob_buf_init(&b, 0);
-	blobmsg_add_macaddr(&b, "address", addr);
-	blobmsg_add_u32(&b, "rssi", rssi);
-
-	ubus_notify(ctx, &hapd->ubus.obj, type, b.head, -1);
-}
-
 void hostapd_ubus_notify_csa(struct hostapd_data *hapd, int freq)
 {
 	if (!hapd->ubus.obj.has_subscribers)

feeds/qca-wifi-7/hostapd/src/src/ap/ubus.h

@@ -56,7 +56,6 @@ void hostapd_ubus_notify_beacon_report(struct hostapd_data *hapd,
 				       size_t len);
 void hostapd_ubus_notify_radar_detected(struct hostapd_iface *iface, int frequency,
 					int chan_width, int cf1, int cf2);
-void hostapd_ubus_notify_rssi(struct hostapd_data *hapd, const char *type, const u8 *addr, int rssi);
 
 void hostapd_ubus_notify_bss_transition_response(
 	struct hostapd_data *hapd, const u8 *addr, u8 dialog_token, u8 status_code,

feeds/qca-wifi-7/ipq53xx/base-files/etc/board.d/01_leds

@@ -19,6 +19,15 @@ sonicfi,rap750e-s|\
 sonicfi,rap750w-311a)
 	ucidef_set_led_default "power" "POWER" "pwm:blue" "on"
 	;;
+zyxel,nwa130be)
+	#eth0: APPE: phyaddr 4  green:2.5G  orange:others
+	ssdk_sh debug phy set 4 0x40078074 0x670
+	ssdk_sh debug phy set 4 0x40078078 0x8600
+
+	#eth1:  MHT: phyaddr 3  green:2.5G orange:others
+	ssdk_sh debug phy set 3 0x40078074 0x670
+	ssdk_sh debug phy set 3 0x40078078 0x8600
+	;;
 esac
 
 board_config_flush

feeds/qca-wifi-7/ipq53xx/base-files/etc/board.d/02_network

@@ -95,7 +95,7 @@ qcom_setup_macs()
                 wan_mac=$(cat /sys/class/net/eth0/address)
                 ucidef_set_wireless_macaddr_base 2g $(macaddr_add "$wan_mac" 1)
                 ucidef_set_wireless_macaddr_base 5g $(macaddr_add "$wan_mac" 2)
-                [ "$board" = "sonicfi,rap7110c-341x" ] &&
+                [ "$board" = "sonicfi,rap7110c-34x" ] &&
                     ucidef_set_wireless_macaddr_base 6g $(macaddr_add "$wan_mac" 3)
                 ;;
         sonicfi,rap750w-311a)

feeds/qca-wifi-7/ipq53xx/base-files/etc/init.d/phy_quirks

@@ -1,22 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=99
-
-boot() {
-	. /lib/functions.sh
-
-	case "$(board_name)" in
-	edgecore,eap105)
-		ssdk_sh debug phy set 0x1 0x601FD032 0xff
-		;;
-	zyxel,nwa130be)
-		#eth0: APPE: phyaddr 4  green:2.5G  orange:others
-		ssdk_sh debug phy set 4 0x40078074 0x670
-		ssdk_sh debug phy set 4 0x40078078 0x8600
-
-		#eth1:  MHT: phyaddr 3  green:2.5G orange:others
-		ssdk_sh debug phy set 3 0x40078074 0x670
-		ssdk_sh debug phy set 3 0x40078078 0x8600
-		;;
-	esac
-}

feeds/qca-wifi-7/iwinfo/files-iwinfo/usr/share/ucode/iwinfo.uc

@@ -397,7 +397,7 @@ export function info(name) {
 			mode: data.mode,
 			channel: format_channel(data.wiphy_freq),
 			freq: format_frequency(data.wiphy_freq),
-			htmode: data?.radio?.htmode,
+			htmode: data.radio.htmode,
 			center_freq1: format_channel(data.center_freq1) || 'unknown',
 			center_freq2: format_channel(data.center_freq2) || 'unknown',
 			txpower: data.wiphy_tx_power_level / 100,

feeds/tip/certificates/files/etc/init.d/early_boot

@@ -5,10 +5,12 @@ START=09
 copy_certificates() {
 	[ -f /certificates/key.pem ] || return
 
-	cp /certificates/cert.pem /certificates/key.pem /certificates/operational.* /etc/ucentral/
-	chown root.network /etc/ucentral/*.pem /etc/ucentral/*.ca
-	chmod 0440 root.network /etc/ucentral/*.pem /etc/ucentral/*.ca
+	cp /certificates/*.pem /etc/ucentral/
+	chown root.network /etc/ucentral/*.pem
+	chmod 0440 root.network /etc/ucentral/*.pem
 	[ -f /certificates/gateway.json ] && cp /certificates/gateway.json /etc/ucentral/gateway.flash
+	[ -f /certificates/dev-id ] && cp /certificates/dev-id /etc/ucentral/
+	[ -f /etc/ucentral/dev-id ] && chmod 0400 /etc/ucentral/dev-id
 	[ -f /certificates/restrictions.json ] && cp /certificates/restrictions.json /etc/ucentral/
 	[ -f /certificates/sign_pubkey.pem ] && cp /certificates/sign_pubkey.pem /etc/ucentral/
 	country=`cat /certificates/ucentral.defaults | jsonfilter -e '@.country'`

feeds/tip/certificates/files/etc/uci-defaults/99-tip-certificates.sh

@@ -2,5 +2,5 @@
 
 uci add system certificates
 uci set system.@certificates[-1].key=/etc/ucentral/key.pem
-uci set system.@certificates[-1].cert=/etc/ucentral/operational.pem
-uci set system.@certificates[-1].ca=/etc/ucentral/operational.ca
+uci set system.@certificates[-1].cert=/etc/ucentral/cert.pem
+uci set system.@certificates[-1].ca=/etc/ucentral/cas.pem

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

@@ -1,22 +1,25 @@
 #!/bin/sh
 
 check_certificates() {
-	[ -f /certificates/cert.pem -a -f /certificates/key.pem ] && exit 0
+	[ -f /certificates/cas.pem -a -f /certificates/cert.pem -a -f /certificates/key.pem ] && exit 0
 }
 
 check_certificates
 
-bootconfig_lookup() {
-	case "$(fw_printenv -n cert_part)" in
-	0)	echo "0:BOOTCONFIG"
-		;;
-	1)	echo "0:BOOTCONFIG1"
-		;;
-	esac
-}
-
 . /lib/functions.sh
 mkdir -p /certificates /etc/ucentral/
+mtd=$(find_mtd_index certificates)
+
+if [ "$(head -c 4 /dev/mtd$mtd)" == "hsqs" ]; then
+	mount -t squashfs /dev/mtdblock$mtd /certificates
+else
+	[ -n "$mtd" -a -f /sys/class/mtd/mtd$mtd/oobsize ] && ubiattach -p /dev/mtd$mtd
+	if [ -n "$(ubinfo -a | grep certificates)" ]; then
+		[ -e /dev/ubi0 ] && mount -t ubifs ubi0:certificates /certificates
+		[ -e /dev/ubi1 ] && mount -t ubifs ubi1:certificates /certificates
+	fi
+fi
+
 case "$(board_name)" in
 cig,wf660a)
 	mmc_dev=$(echo $(find_mmc_part "0:ETHPHYFW") | sed 's/^.\{5\}//')
@@ -28,28 +31,8 @@ cig,wf672)
 	;;
 sonicfi,rap7110c-341x)
 	mmc_dev=$(echo $(find_mmc_part "certificates") | sed 's/^.\{5\}//')
-	[ -n "$mmc_dev" ] && mount -t squashfs /dev/$mmc_dev /mnt
-	bootconfig=$(bootconfig_lookup)
-	if [ -n "$bootconfig" ]; then
-		mmc_dev=$(echo $(find_mmc_part "$bootconfig") | sed 's/^.\{5\}//')
-		[ -n "$mmc_dev" ] && tar xf /dev/$mmc_dev -C /certificates
-	else
-		cp /mnt/* /certificates/
-		umount /mnt
-	fi
+	[ -n "$mmc_dev" ] && mount -t squashfs /dev/$mmc_dev /certificates
 	;;
-*)
-	mtd=$(find_mtd_index certificates)
-
-	if [ "$(head -c 4 /dev/mtd$mtd)" == "hsqs" ]; then
-		mount -t squashfs /dev/mtdblock$mtd /certificates
-	else
-		[ -n "$mtd" -a -f /sys/class/mtd/mtd$mtd/oobsize ] && ubiattach -p /dev/mtd$mtd
-		if [ -n "$(ubinfo -a | grep certificates)" ]; then
-			[ -e /dev/ubi0 ] && mount -t ubifs ubi0:certificates /certificates
-			[ -e /dev/ubi1 ] && mount -t ubifs ubi1:certificates /certificates
-		fi
-	fi
 esac
 
 check_certificates
@@ -105,8 +88,6 @@ cig,wf189h|\
 cig,wf186h|\
 cig,wf196|\
 cig,wf188n|\
-emplus,wap385c|\
-emplus,wap386v2|\
 yuncore,ax840|\
 yuncore,fap655)
 	PART_NAME=rootfs_1

feeds/tip/certificates/files/usr/bin/store_certs

@@ -1,25 +0,0 @@
-#!/bin/sh
-
-bootconfig_lookup() {
-	bootconfig="$(fw_printenv -n cert_part)"
-	case "$(fw_printenv -n cert_part)" in
-	0)	echo "0:BOOTCONFIG1"
-		bootconfig=1
-		;;
-	*)	echo "0:BOOTCONFIG"
-		bootconfig=0
-		;;
-	esac
-	fw_setenv cert_part $bootconfig
-}
-
-. /lib/functions.sh
-case "$(board_name)" in
-sonicfi,rap7110c-341x)
-	cd /certificates
-	tar cf /tmp/certs.tar
-	bootconfig=$(bootconfig_lookup)
-	mmc_dev=$(echo $(find_mmc_part $bootconfig) | sed 's/^.\{5\}//')
-	dd if=/tmp/certs.tar of=/dev/$bootconfig
-	;;
-esac

feeds/tip/cloud_discovery/Makefile

@@ -12,7 +12,6 @@ define Package/cloud_discovery
   SECTION:=ucentral
   CATEGORY:=uCentral
   TITLE:=TIP cloud_discovery
-  DEPENDS:=+certificates
 endef
 
 Build/Compile=

feeds/tip/cloud_discovery/files/etc/init.d/cloud_discover

@@ -22,6 +22,13 @@ start_service() {
 	[ "$valid" == "true" ] || 
 		/usr/share/ucentral/ucentral.uc /etc/ucentral/ucentral.cfg.0000000001 > /dev/null
 
+	[ "$(fw_printenv -n pki2)" -eq 1 ] || {
+		/etc/init.d/cloud_discover disable
+		return
+	}
+
+	/etc/init.d/firstcontact disable
+
 	procd_open_instance
 	procd_set_param command "$PROG"
 	procd_set_param respawn

feeds/tip/cloud_discovery/files/usr/bin/cloud_discovery

@@ -80,7 +80,7 @@ function gateway_write(data) {
 	gateway ??= {};
 	let new = {};
 	let changed = false;
-	for (let key in [ 'server', 'port', 'valid', 'hostname_validate' ]) {
+	for (let key in [ 'server', 'port', 'valid' ]) {
 		if (exists(data, key))
 			new[key] = data[key];
 		else if (exists(gateway, key))
@@ -144,7 +144,7 @@ function set_state(set) {
 function discover_dhcp() {
 	let dhcp = readjsonfile('/tmp/cloud.json');
 	if (dhcp?.dhcp_server && dhcp?.dhcp_port) {
-		if (gateway_write({ server: dhcp.dhcp_server, port:dhcp.dhcp_port, valid: false, hostname_validate: dhcp.no_validation ? 0 : 1 })) {
+		if (gateway_write({ server: dhcp.dhcp_server, port:dhcp.dhcp_port, valid: false })) {
 			ulog(LOG_INFO, `Discovered cloud via DHCP ${dhcp.dhcp_server}:${dhcp.dhcp_port}\n`);
 			client_start();
 			set_state(VALIDATING);
@@ -160,30 +160,27 @@ function redirector_lookup() {
 	let serial = uci.get('system', '@system[-1]', 'mac');
 
 	fs.unlink(path);
-	system(`curl -k --cert /etc/ucentral/operational.pem --key /etc/ucentral/key.pem --cacert /etc/ucentral/operational.ca https://openlan.keys.tip.build/v1/devices/${serial} --output /tmp/ucentral.redirector`);
+	system(`curl -k --cert /etc/ucentral/cert.pem --key /etc/ucentral/key.pem --cacert /etc/ucentral/cas.pem https://openlan.keys.tip.build/v1/devices/${serial} --output /tmp/ucentral.redirector`);
 	if (!fs.stat(path))
 		return;
 	let redir = readjsonfile(path);
 	if (redir?.controller_endpoint) {
 		let controller_endpoint = split(redir.controller_endpoint, ':');
-		if (gateway_write({ server: controller_endpoint[0], port: controller_endpoint[1] || 15002, valid: false, hostname_validate: 1 })) {
-			ulog(LOG_INFO, `Discovered cloud via lookup service ${controller_endpoint[0]}:${controller_endpoint[1] || 15002}\n`);
+		if (gateway_write({ server: controller_endpoint[0], port: controller_endpoint[1] || 15002, valid: false })) {
+			ulog(LOG_INFO, `Discovered cloud via lookup service ${redir.server}:${redir.port}\n`);
                         client_start();
                 	set_state(VALIDATING);
 		}
-	} else {
-		ulog(LOG_INFO, 'Failed to discover cloud endpoint\n');
 	}
 }
 
 function discover_flash() {
 	if (!fs.stat('/etc/ucentral/gateway.flash'))
-		return 1;
+		return false;
 	ulog(LOG_INFO, 'Using pre-populated cloud information\n');
 	fs.writefile('/etc/ucentral/gateway.json', fs.readfile('/etc/ucentral/gateway.flash'));
 	client_start();
 	set_state(VALIDATING);
-	return 0;
 }
 
 function time_is_valid() {
@@ -213,10 +210,7 @@ function interval_handler() {
 		if (discover_dhcp())
 			return;
 
-		if (system('/usr/bin/est_client enroll'))
-			return;
-
-		if (!discover_flash())
+		if (discover_flash())
 			return;
 
 		redirector_lookup();
@@ -293,25 +287,6 @@ let ubus_methods = {
 
 		}
 	},
-	status: {
-		call: function(req) {
-			const names = [ 'discover', 'validate', 'online', 'offline', 'orphan' ];
-			let ret = { state: names[state] };
-			switch(state){
-			case OFFLINE:
-				ret.since = time() - offline_time;
-				break;
-			case ORPHAN:
-				ret.since = time() - orphan_time;
-				break;
-			case VALIDATING:
-				ret.since = time() - validate_time;;
-				break;
-			}
-			return ret;
-		},
-		args: {},
-	},
 };
 
 if (gateway_available()) {

feeds/tip/cloud_discovery/files/usr/bin/est_client

@@ -1,172 +0,0 @@
-#!/usr/bin/ucode
-
-'use strict';
-
-import { ulog_open, ulog, ULOG_SYSLOG, ULOG_STDIO, LOG_DAEMON, LOG_INFO } from 'log';
-import * as fs from 'fs';
-
-
-ulog_open(ULOG_SYSLOG | ULOG_STDIO, LOG_DAEMON, "est_client");
-
-function generate_csr(cert) {
-	if (!fs.stat('/tmp/csr.nohdr.p10')) {
-		let pipe = fs.popen(`openssl x509 -in ${cert} -noout -subject`);
-		let subject = pipe.read("all");
-		pipe.close();
-		subject = rtrim(subject);
-		subject = replace(subject, 'subject=', '/');
-		subject = replace(subject, ' = ', '=');
-		subject = replace(subject, ', ', '/');
-
-		let ret = system(`openssl req -subj "${subject}" -new -key /etc/ucentral/key.pem -out /tmp/csr.p10`);
-		if (ret) {
-			ulog(LOG_INFO, 'Failed to generate CSR\n');
-			return 1;
-		}
-
-		let input = fs.open('/tmp/csr.p10', 'r');
-		let output = fs.open('/tmp/csr.nohdr.p10', 'w');
-		let line;
-		while (line = input.read('line')) {
-		        if (substr(line, 0, 4) == '----')
-		                continue;
-			output.write(line);
-		}
-		input.close();
-		output.close();
-		ulog(LOG_INFO, 'Generated CSR\n');
-	}
-	return 0;
-}
-
-function store_operational_cert(path, target) {
-	system('mount_certs');
-	system(`cp ${path} /certificates/${target}`);
-	system('store_certs');
-
-	ulog(LOG_INFO, `Persistently stored ${target}\n`);
-}
-
-function p7_too_pem(src, dst) {
-	let input = fs.readfile(src);
-	let output = fs.open('/tmp/convert.p7', 'w');
-	output.write('-----BEGIN PKCS #7 SIGNED DATA-----\n');
-	output.write(`${input}\n-----END PKCS #7 SIGNED DATA-----`);
-	output.close();
-
-	let ret = system(`openssl pkcs7 -outform PEM -print_certs -in /tmp/convert.p7 -out ${dst}`);
-	if (ret) {
-		ulog(LOG_INFO, 'Failed to convert P7 to PEM\n');
-		return 1;
-	}
-	
-	ulog(LOG_INFO, 'Converted P7 to PEM\n');
-	
-	return 0;
-}
-
-function call_est_server(cert, target) {
-	if (generate_csr(cert))
-		return 1;
-
-	let ret = system('curl -X POST https://qaest.certificates.open-lan.org:8001/.well-known/est/simpleenroll -d @/tmp/csr.nohdr.p10 -H "Content-Type: application/pkcs10" --cert /etc/ucentral/cert.pem --key /etc/ucentral/key.pem --cacert /etc/ucentral/insta.pem -o /tmp/operational.nohdr.p7');
-	if (ret) {
-		ulog(LOG_INFO, 'Failed to request operational certificate\n');
-		return 1;
-	}
-	ulog(LOG_INFO, 'EST succeeded\n');
-
-	return p7_too_pem('/tmp/operational.nohdr.p7', target);
-}
-
-
-function simpleenroll() {
-	if (fs.stat('/etc/ucentral/operational.pem')) {
-		ulog(LOG_INFO, 'Operational certificate is present\n');
-		return 0;
-	}
-
-	if (call_est_server('/etc/ucentral/cert.pem', '/etc/ucentral/operational.pem'))
-		return 1; 
-	
-	ulog(LOG_INFO, 'Operational cert acquired\n');
-	store_operational_cert('/etc/ucentral/operational.pem', 'operational.pem');
-	return 0;
-}
-
-function simplereenroll() {
-	if (!fs.stat('/etc/ucentral/operational.pem')) {
-		ulog(LOG_INFO, 'Operational certificate was not found\n');
-		return 0;
-	}
-
-	if (call_est_server('/etc/ucentral/operational.pem', '/tmp/operational.pem'))
-		return 1;
-	
-	ulog(LOG_INFO, 'Operational cert updated\n');
-	store_operational_cert('/tmp/operational.pem', 'operational.pem');
-
-	return 0;
-}
-
-function load_operational_ca() {
-	if (fs.stat('/etc/ucentral/operational.ca')) {
-		ulog(LOG_INFO, 'Operational CA is present\n');
-		return 0;
-	}
-	let ret = system('curl -X GET https://qaest.certificates.open-lan.org:8001/.well-known/est/cacerts --cert /etc/ucentral/cert.pem --key /etc/ucentral/key.pem --cacert /etc/ucentral/insta.pem -o /tmp/operational.ca.nohdr.p7');
-	if (!ret)
-		ret = p7_too_pem('/tmp/operational.ca.nohdr.p7', '/etc/ucentral/operational.ca');
-	if (ret) {
-		ulog(LOG_INFO, 'Failed to load CA\n');
-		return 1;
-	}
-	system('cat /etc/ucentral/openlan.pem >> /etc/ucentral/operational.ca');
-	ulog(LOG_INFO, 'Acquired CA\n');
-	store_operational_cert('/etc/ucentral/operational.ca', 'operational.ca');
-	return 0;
-}
-
-function fwtool() {
-	let pipe = fs.popen(`openssl x509 -in /etc/ucentral/cert.pem -noout -issuer`);
-	let issuer = pipe.read("all");
-	pipe.close();
-
-	if (!(match(issuer, /OpenLAN/) && match(issuer, /Birth CA/)))
-		return 0;
-
-	ulog(LOG_INFO, 'The issuer is insta\n');
-
-	let metadata = fs.readfile('/tmp/sysupgrade.meta');
-	if (metadata)
-		metadata = json(metadata);
-	if (!metadata)
-		return 0;
-
-	if (!metadata.est_supported) {
-		ulog(LOG_INFO, 'The image does not support EST\n');
-		return 1;
-	}
-	ulog(LOG_INFO, 'The image supports EST\n');
-
-	return 0;
-}
-
-switch(ARGV[0]) {
-case 'enroll':
-	if (simpleenroll())
-		exit(1);
-
-	if (load_operational_ca())
-		exit(1);
-
-	exit(0);
-
-case 'reenroll':
-	if (simplereenroll())
-		exit(1);
-	exit(0);
-
-case 'fwtool':
-	exit(fwtool());
-}

feeds/tip/cloud_discovery/files/usr/share/ucentral/cloud_discovery.uc

@@ -5,7 +5,6 @@ import * as fs from 'fs';
 
 let cmd = ARGV[0];
 let ifname = getenv("interface");
-let opt224 = getenv("opt138");
 let opt224 = getenv("opt224");
 
 if (cmd != 'bound' && cmd != 'renew')
@@ -22,13 +21,6 @@ if (file.server && file.port && file.valid)
 let cloud = {
 	lease: true,
 };
-if (opt138) {
-	let dhcp = hexdec(opt138);
-	dhcp = split(dhcp, ':');
-	cloud.dhcp_server = dhcp[0];
-	cloud.dhcp_port = dhcp[1] ?? 15002;
-	cloud.no_validation = true;
-}
 if (opt224) {
 	let dhcp = hexdec(opt224);
 	dhcp = split(dhcp, ':');
@@ -37,7 +29,7 @@ if (opt224) {
 }
 fs.writefile('/tmp/cloud.json', cloud);
 
-if ((opt138 || opt224) && cmd == 'renew') {
+if (opt224 && cmd == 'renew') {
 	let ubus = libubus.connect();
 	ubus.call('cloud', 'renew');
 }

feeds/tip/firstcontact/Makefile

@@ -0,0 +1,25 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=firstcontact
+PKG_RELEASE:=1
+
+PKG_LICENSE:=BSD-3-Clause
+PKG_MAINTAINER:=John Crispin <john@phrozen.org>
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
+
+define Package/firstcontact
+  SECTION:=ucentral
+  CATEGORY:=uCentral
+  TITLE:=TIP DigiCert firstcontact
+  DEPENDS:=+libubox +libcurl +libopenssl +certificates
+endef
+
+define Package/firstcontact/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/digicert $(1)/usr/sbin/
+	$(CP) ./files/* $(1)
+endef
+
+$(eval $(call BuildPackage,firstcontact))

feeds/tip/firstcontact/files/etc/init.d/firstcontact

@@ -0,0 +1,12 @@
+#!/bin/sh /etc/rc.common
+
+START=99
+USE_PROCD=1
+PROG=/usr/bin/ucode
+
+start_service() {
+	procd_open_instance
+	procd_set_param command "$PROG" -l uci -l fs /usr/share/ucentral/firstcontact.uc
+	procd_set_param respawn 1 10 0
+	procd_close_instance
+}

feeds/tip/firstcontact/files/etc/uci-defaults/zzz-firstcontact

@@ -0,0 +1,3 @@
+#!/bin/sh
+[ -f "/etc/ucentral/gateway.json" ] && /etc/init.d/firstcontact disable
+[ -f "/etc/ucentral/gateway.json" ] || /etc/init.d/ucentral disable

feeds/tip/firstcontact/files/usr/share/ucentral/firstcontact.uc

@@ -0,0 +1,83 @@
+let config = {};
+
+function store_config() {
+	let redir = split(config.Redirector, ":");
+	let gw = {
+		server: redir[0],
+		port: redir[1] || 15002
+	};
+	fs.writefile('/etc/ucentral/gateway.json', gw);
+}
+
+function store_config_uci(path) {
+        let cursor = uci.cursor(path);
+        let redir = split(config.Redirector, ":");
+
+        cursor.load("ucentral");
+        cursor.set("ucentral", "config", "server", redir[0]);
+        cursor.set("ucentral", "config", "port", redir[1] || 15002);
+        cursor.commit();
+}
+
+function digicert() {
+	let devid;
+	let fd = fs.open("/etc/ucentral/dev-id", "r");
+	if (!fd) {
+		warn("firstcontact: failed to find device id");
+		exit(1);
+	}
+	devid = fd.read("all");
+	fd.close();
+
+	ret = system(sprintf('/usr/sbin/digicert -i %s', devid));
+	if (ret) {
+		warn("firstcontact failed to contact redirector, check DHCP option\n");
+		let fd = fs.open("/tmp/capwap/dhcp_opt.txt", "r");
+		if (!fd) {
+			warn("No redirector found\n");
+			exit(1);
+		} else {
+			config.Redirector = fd.read("all");
+			fd.close();
+		}
+	} else {
+		let redirector = { };
+		let fd = fs.open("/etc/ucentral/redirector.json", "r");
+		if (fd) {
+			let data = fd.read("all");
+			fd.close();
+
+			try {
+				redirector = json(data);
+			}
+			catch (e) {
+				warn("firstcontact: Unable to parse JSON data in %s: %s", path, e);
+
+				exit(1);
+			}
+		}
+
+		for (let r in redirector.fields)
+			if (r.name && r.value)
+				config[r.name] = r.value;
+		if (!config.Redirector) {
+			warn("Reply is missing Redirector field\n");
+			exit(1);
+		}
+
+	}
+}
+
+if (!fs.stat('/etc/ucentral/gateway.json')) {
+	digicert();
+	store_config();
+	store_config_uci();
+	store_config_uci("/etc/config-shadow/");
+	warn("firstcontact: managed to look up redirector\n");
+}
+
+system("/etc/init.d/ucentral enable");
+system("/etc/init.d/firstcontact disable");
+system("reload_config");
+system("/etc/init.d/ucentral start");
+system("/etc/init.d/firstcontact stop");

feeds/tip/firstcontact/src/CMakeLists.txt

@@ -0,0 +1,13 @@
+cmake_minimum_required(VERSION 2.6)
+
+PROJECT(digicert C)
+INCLUDE(GNUInstallDirs)
+ADD_DEFINITIONS(-Os -ggdb -Wall -Werror --std=gnu99 -Wmissing-declarations)
+
+SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "")
+
+ADD_EXECUTABLE(digicert digicert.c)
+TARGET_LINK_LIBRARIES(digicert curl crypto ssl ubox)
+INSTALL(TARGETS digicert
+	RUNTIME DESTINATION ${CMAKE_INSTALL_SBINDIR}
+)

feeds/tip/firstcontact/src/digicert.c

@@ -0,0 +1,104 @@
+#define _GNU_SOURCE
+#include <stdio.h>
+#include <unistd.h>
+#include <getopt.h>
+
+#include <curl/curl.h>
+
+#include <libubox/ulog.h>
+
+static const char *file_cert = "/etc/ucentral/cert.pem";
+static const char *file_key  = "/etc/ucentral/key.pem";
+static const char *file_json = "/etc/ucentral/redirector.json";
+static const char *file_dbg  = "/tmp/digicert.hdr";
+
+int main(int argc, char **argv)
+{
+	FILE *fp_json;
+	FILE *fp_dbg;
+	CURLcode res;
+	CURL *curl;
+	char *devid = NULL;
+	char *url;
+
+	alarm(15);
+
+	while (1) {
+		int option = getopt(argc, argv, "k:c:o:hi:");
+
+		if (option == -1)
+			break;
+
+		switch (option) {
+		case 'k':
+			file_key = optarg;
+			break;
+		case 'c':
+			file_cert = optarg;
+			break;
+		case 'o':
+			file_json = optarg;
+			break;
+		case 'i':
+			devid = optarg;
+			break;
+		default:
+		case 'h':
+			printf("Usage: digicert OPTIONS\n"
+			       "  -k <keyfile>\n"
+			       "  -c <certfile>\n"
+			       "  -o <outfile>\n"
+			       "  -i <devid>\n");
+			return -1;
+		}
+	}
+
+	if (!devid) {
+		fprintf(stderr, "missing devid\n");
+		return -1;
+	}
+
+	ulog_open(ULOG_SYSLOG | ULOG_STDIO, LOG_DAEMON, "digicert");
+	ULOG_INFO("attempting first contact\n");
+
+	fp_dbg = fopen(file_dbg, "wb");
+	fp_json = fopen(file_json, "wb");
+	if (!fp_json) {
+		ULOG_ERR("failed to create %s\n", file_json);
+		return -1;
+	}
+
+	curl_global_init(CURL_GLOBAL_DEFAULT);
+	curl = curl_easy_init();
+	if (!curl) {
+		ULOG_ERR("curl_easy_init failed\n");
+		return -1;
+	}
+
+	if (asprintf(&url, "https://clientauth.one.digicert.com/iot/api/v2/device/%s", devid) < 0) {
+		ULOG_ERR("failed to assemble url\n");
+		return -1;
+	}
+
+	curl_easy_setopt(curl, CURLOPT_URL, url);
+	curl_easy_setopt(curl, CURLOPT_WRITEDATA, fp_json);
+	curl_easy_setopt(curl, CURLOPT_HEADERDATA, fp_dbg);
+	curl_easy_setopt(curl, CURLOPT_SSLCERTTYPE, "PEM");
+	curl_easy_setopt(curl, CURLOPT_SSLCERT, file_cert);
+	curl_easy_setopt(curl, CURLOPT_SSLKEYTYPE, "PEM");
+	curl_easy_setopt(curl, CURLOPT_SSLKEY, file_key);
+	curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 1L);
+	curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, 10L);
+
+	res = curl_easy_perform(curl);
+	if (res != CURLE_OK)
+		ULOG_ERR("curl_easy_perform() failed: %s\n", curl_easy_strerror(res));
+	else
+		ULOG_INFO("downloaded first contact data\n");
+	curl_easy_cleanup(curl);
+	curl_global_cleanup();
+
+	ulog_close();
+
+	return (res != CURLE_OK);
+}

feeds/tip/luci/luci-mod-ucentral/root/sbin/certupdate

@@ -17,16 +17,14 @@ mkdir -p /tmp/certs
 tar x -C /tmp/certs -f /tmp/certs.tar
 
 # make sure the required files exist
-[ -f /tmp/certs/key.pem -a -f /tmp/certs/cert.pem ] || exit 1
+[ -f /tmp/certs/cas.pem -a -f /tmp/certs/key.pem -a -f /tmp/certs/cert.pem ] || exit 1
+[ -f /tmp/certs/gateway.json -o -f /tmp/certs/dev-id ] || exit 1
 
 # copy the certificates to /etc
 cp /tmp/certs/*.pem /certificates
 
-# remove old operational certs
-rm /certificates/operational.*
-
 # copy dev-id or gateway.json
-for a in gateway.json; do
+for a in dev-id gateway.json; do
 	if [ -f /tmp/certs/$a ]; then
 		cp /tmp/certs/$a /certificates
 	else

feeds/tip/tip-defaults/files/etc/ucentral/insta.pem

@@ -1,6 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFajCCA1KgAwIBAgICDnowDQYJKoZIhvcNAQELBQAwHzEdMBsGA1UEAwwUT3BlbkxBTiBEZW1vIFJvb3QgQ0EwHhcNMjUwMjIxMTUwMDAwWhcNMjYwMjIxMTUwMDAwWjAgMR4wHAYDVQQDExVPcGVuTEFOIERlbW8gQmlydGggQ0EwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDVWIyySul6Fv4wl1O+DQpaLRa0p+Az5L/jcqTpdVf6w+8tlmeIY9C28uDQoDjewrIkvf3lcfK86nshs02s9ehqZUnEP8+GvKM19x3JbWxeTvWwFirjHir4x897iQ606bAMbrHHtntI9ZyBZyXDGeElGJxJQNX+0d50SFq609cB3yxpBPJ67ag+4Oq0uHgROHjEQMrfwLwlAune0c1fjQDrN14PDNjMZHvvhc/pkAHxR1PP6LOFNV5NuQ58tC5N7R2EqqFbIJ8VZgcagrGRYuAuFFTaV+D7RIt9xGTuWlCyxHI7VkRBJ1mRoEr4GOrP9QFjBD8NzNK+/wnR/fZwhpEnRsgHiI33wKHBDg+l3r8tvRzuB5X6Gl/SfuAeaoCuDHMncTjQg1zGhyEwjQhUe4RY3w+yHAjeeOE6c5spOMDDdaBibkzLmSjXztuLeAdzsUcD3fvGeOvh9vG14TKEmF8puNkqEcc0W8NyUWKFdr9umdJEMbaRSSsMGtp8bDj3Ddh4PhEJrIFeo89+HwXhU6sk+wzE9BULTohahsfwOV/08t1cZ3Q04Oj1KI+4YWu8BJns5gX35rQ8GIbkXQwfvFMwqmbg+ij2o9HWdkSL4bcqW/83Ho+31ce210rVGPK9cav0CjA2Eexgxi45cbgnfoade74Qa5zXboJEBmp7rbo4swIDAQABo4GuMIGrMB8GA1UdIwQYMBaAFDzIg8eyTI3xc4A2R60f8HanhBZDMB0GA1UdDgQWBBS5xC3inqLQl+vxzn9PsjNzlZ5hYDAOBgNVHQ8BAf8EBAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBADBFBgNVHR8EPjA8MDqgOKA2hjRodHRwOi8vZGVtby5jZXJ0aWZpY2F0ZS5maS9jcmwvT3BlbkxBTkRlbW9Sb290Q0EuY3JsMA0GCSqGSIb3DQEBCwUAA4ICAQA9DJEjsDLqtSFkF0XTWfzbebXA+X8++Qmiukrw0s2LRx798ce0mVITRAFDLf78BeUYF0B+PQ8hgq4fWyFsXRgZVrITd1BszT3LJ2r/6xWQJVpVHzLqKgIlW/PY/uTUz+xqR0Ev6hYrmrjfya0K0XEZZqxkmrTrcECaA3RCFkWQl9ZUlb9BClmdhayO8x1XpJplIYAMKVuoPL9IUQH6HUPFnzlPNQHIK9gcFACtgPVWCJg3IAvSLa41KpRxTDwGFvlrNKtkBlGRYhFGCHWXXZn8fdQHW9vykkkfPOaPR/AVyuRzfAT6wbtVWSy38BurSdqSCuNQPQBfF2vMeUGwNbD/7B4tYrWVtnIbgxRPKvX0o3mZkKry6BJf2m/AKWA16W+i4ojnPRORLTTq9cEZ0WL6NRHCgMrbWaCs/+ADTErqK6cv7GhoOVEiqugvnz93dit2IXg4zdDJ4hF9ZSlicwgZKVvMqnNQ1iiXezIQBehgYcWwXRIfdrRPe88HgkySuDZ2lkKYdc+oTc6e7upRh4Kh2ZSipcRb6ehPan533jnQJyU8A9vFAJiQfZZ4lD3tcsqlsDnlu5YEDYSjcfnkyOH/Mlx5VVTWYGvqNNVKRDw2slSxKwVCobkcF/2dAxP9DqOaGaCnMeOaR7kMaBm5d1fwb+bCl9usQAELjZBv2vAH8g==
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIIFIDCCAwigAwIBAgICDnkwDQYJKoZIhvcNAQELBQAwHzEdMBsGA1UEAwwUT3BlbkxBTiBEZW1vIFJvb3QgQ0EwHhcNMjUwMjIxMTUwMDAwWhcNMjYwMjIxMTUwMDAwWjAfMR0wGwYDVQQDDBRPcGVuTEFOIERlbW8gUm9vdCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMjExylKdJWoJu9mOHPJ6yZFXKe1lE467G65acpS2FKIWnPVFjNCmATMpkMOIFzEFwyFdbQjzOidtiL+73zlE52lOJpXCfOcxDFqDYDJJ8//J1/gQWsBaKpSvgLiHU/0awkQg+yJYZpj8YZa4NkFe+zTjQScSfOsqPPb3rZ7DOQ2BKAhjVShKmVbtNil0iO0zm8vE8DNkktTNMREp2pzb8MbCAgfOkwlrby6T+rV3TvmjThGdFUb5lWDFxWtlF8W0SUII9qj7p5TdGpryeLsO0nZTBtS4HxZNdvmKOHfgcRHmSZIJigB2NzKLNrXF9JBW0WnUSwZJZAG2C1RTx6lADILPueuusyfR/hZ3koKi4PHnSiTwQghzia9K9QjNHq5z9R9ZoCnhBg1VyU4LKmp862L0sIp2vgnOYunEIi9aCYBaDwo+0FuVjZuXyDIatwVuA7TN5IWPHA6XLdOt1mmkeYy1Ldr4XHjdondhtOyeei1UFXmyyLm2+kmRYfTm91TqYmNzRgbRV2NHO50AmsnBknX4Rv3gishGe0+dV5yFcUwZud0z2rSCkuoai5tKrPT+6Y6NqkT9u9HFifIBXnLwEzVUqHRtW6SuWj2DClVQIXIUZtFnhY4GuTuf6DlzgnXO58oDVCZmCW4ULIpbqGeRsvBHR8Sw5JXP/1+TMUYhE8TAgMBAAGjZjBkMB8GA1UdIwQYMBaAFDzIg8eyTI3xc4A2R60f8HanhBZDMB0GA1UdDgQWBBQ8yIPHskyN8XOANketH/B2p4QWQzAOBgNVHQ8BAf8EBAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBATANBgkqhkiG9w0BAQsFAAOCAgEAkHZ5KR8IOrdfMFy+iOvauvZxfQ84LL6TpB2FQKDjneJUdd7c29UJJFNW/0mp4Gc6jKZab6J8Dx/pNnbH0RqFjGjeRGtJ4Sk0G7gf9zw1S7qut5WJDcisM9l/wXC+zy/KSKKPQmbt0grWOtU7+NNPh1YU76hIrInq/u2sVZyKH8SXQ957fbJk6BX6JTKyNEn05AB6rNSrbOWo8sy2MlcJ7bBsrWYI1t6GcWFh4b36bLu7/dKJWpyFNXXIkKJsgMEDpEQae56+fSSDo0KRNtYB82fNZDIQlGK81rGJWNzAahM+3GD1tgk/3ZVugfaJhcBpoHHKNOGqZAvtirLAIDocno7AzqoeIz974Rh2Olsl2/arApYPyyfi8PMYuFe/d4h+Wie8n+jh5n48lZ2Ve4PK+j+QHD6tTZS4f0bGnPL1puMxzQloltuQWgLDeVfEgrc3snLvjOg8aDzWm/es85lP8XcyW54U4t3JmrNUC2C7v+Uafx7cL7eDeunhs+BRhtGV+IUmjub2IrpqZp3zZqn+LVRdYJIy/qHhjS5+ImckXkFojOmeWhfmEmYSuNP8Oa6cGuXp829qnbxLh9Qzi3TfXV883KLse4kL5Zl7gBA/4hz2hVMyGJ8fY+VvzbaTuOXyvKJ+rGZCTcRSeotBLnIevVMiL7SqOEwN0j4Mfbznfq8=
------END CERTIFICATE-----

feeds/ucentral/ucentral-client/Makefile

@@ -4,10 +4,10 @@ PKG_NAME:=ucentral-client
 PKG_RELEASE:=1
 
 PKG_SOURCE_URL=https://github.com/Telecominfraproject/wlan-ucentral-client.git
-PKG_MIRROR_HASH:=c266b7126cb1388da83c3f35613ed4821046a021e36880b37be38976a81dac9b
+PKG_MIRROR_HASH:=20d0573e5460ae9780307ab9d54234bb75d3b98fb36806f896819918087b14df
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_DATE:=2024-10-20
-PKG_SOURCE_VERSION:=4d01f3ee74cd08cb894f372c8cc185d299f977a7
+PKG_SOURCE_VERSION:=8c45f965c30d1cf11e3a5a625a5e2baf3178697f
 
 PKG_LICENSE:=BSD-3-Clause
 PKG_MAINTAINER:=John Crispin <john@phrozen.org>

feeds/ucentral/ucentral-client/files/etc/init.d/cpm

@@ -1,14 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=90
-STOP=01
-
-boot() {
-    mkdir -p /tmp/cpm/ || { logger -t init "Failed to create /tmp/cpm"; exit 1; }
-    opkg list-installed > /tmp/packages.state || { logger -t init "Failed to list packages"; exit 1; }
-    if [ -x /usr/share/ucentral/package_list.uc ]; then
-        /usr/share/ucentral/package_list.uc || { logger -t init "Failed to execute package_list.uc"; exit 1; }
-    else
-        logger -t init "package_list.uc not found or not executable"
-    fi
-}

feeds/ucentral/ucentral-client/files/etc/init.d/ucentral

@@ -14,7 +14,6 @@ reload_service() {
 }
 
 start_service() {
-	[ -f /etc/ucentral/operational.ca -a -f /etc/ucentral/operational.pem ] || return
 	[ -s /etc/ucentral/capabilities.json ] || rm /etc/ucentral/capabilities.json
 	[ -f /etc/ucentral/capabilities.json ] || /usr/share/ucentral/capabilities.uc
 
@@ -45,7 +44,6 @@ start_service() {
 
 	server=$(cat /etc/ucentral/gateway.json | jsonfilter -e '@["server"]')
 	port=$(cat /etc/ucentral/gateway.json | jsonfilter -e '@["port"]')
-	hostname_validate=$(cat /etc/ucentral/gateway.json | jsonfilter -e '@["hostname_validate"]')
 
 	boot_cause=$(cat /tmp/pstore | jsonfilter -e '@["pstore"][-1]'.boot_cause)
 	[ -z $boot_cause ] && boot_cause=coldboot
@@ -54,7 +52,6 @@ start_service() {
 	[ -n "$serial" ] && procd_append_param command -S $serial
 	[ -n "$server" ] && procd_append_param command -s $server
 	[ -n "$port" ] && procd_append_param command -P $port
-	[ "$hostname_validate" -eq 0 ] || procd_append_param command -h
 	[ "$debug" -eq 0 ] || procd_append_param command -d
 	[ "$insecure" -eq 0 ] || procd_append_param command -i
 	[ -z "$(mount | grep 'tmpfs on / type tmpfs')" ] || procd_append_param command -r

feeds/ucentral/ucentral-client/files/etc/ucentral/version.json

@@ -1,5 +1,5 @@
 {
 	"major": 4,
-	"minor": 1,
+	"minor": 0,
 	"patch": 0
 }

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:=aac8731d564f4ccd85a366417b9a02c1d3de9b6533d1474b58768249c50707f1
+PKG_MIRROR_HASH:=ee5d5073bd9ae88590e419f94eb6c59f04a2fc0c3117be435bcb885e0ea28bf1
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_DATE:=2025-06-27
-PKG_SOURCE_VERSION:=125a148764c9ef7a02086b6fadccd7b96bfdf591
+PKG_SOURCE_DATE:=2025-01-27
+PKG_SOURCE_VERSION:=b4cfdc6a1caa279ae8c6c42b6932620fb2aed9c1
 PKG_MAINTAINER:=John Crispin <john@phrozen.org>
 PKG_LICENSE:=BSD-3-Clause
 

feeds/ucentral/ucentral-schema/files/etc/ucentral/examples/crypto-enterprise.json

@@ -37,8 +37,8 @@
 						"ieee80211w": "optional"
 					},
 					"certificates": {
-						"ca-certificate": "/etc/ucentral/operational.ca",
-						"certificate": "/etc/ucentral/operational.pem",
+						"ca-certificate": "/etc/ucentral/cas.pem",
+						"certificate": "/etc/ucentral/cert.pem",
 						"private-key": "/etc/ucentral/key.pem"
 					},
 					"radius": {
@@ -64,8 +64,8 @@
 						"ieee80211w": "optional"
 					},
 					"certificates": {
-						"ca-certificate": "/etc/ucentral/operational.ca",
-						"certificate": "/etc/ucentral/operational.pem",
+						"ca-certificate": "/etc/ucentral/cas.pem",
+						"certificate": "/etc/ucentral/cert.pem",
 						"private-key": "/etc/ucentral/key.pem"
 					},
 					"radius": {
@@ -91,8 +91,8 @@
 						"ieee80211w": "optional"
 					},
 					"certificates": {
-						"ca-certificate": "/etc/ucentral/operational.ca",
-						"certificate": "/etc/ucentral/operational.pem",
+						"ca-certificate": "/etc/ucentral/cas.pem",
+						"certificate": "/etc/ucentral/cert.pem",
 						"private-key": "/etc/ucentral/key.pem"
 					},
 					"radius": {
@@ -118,8 +118,8 @@
 						"ieee80211w": "optional"
 					},
 					"certificates": {
-						"ca-certificate": "/etc/ucentral/operational.ca",
-						"certificate": "/etc/ucentral/operational.pem",
+						"ca-certificate": "/etc/ucentral/cas.pem",
+						"certificate": "/etc/ucentral/cert.pem",
 						"private-key": "/etc/ucentral/key.pem"
 					},
 					"radius": {
@@ -145,8 +145,8 @@
 						"ieee80211w": "optional"
 					},
 					"certificates": {
-						"ca-certificate": "/etc/ucentral/operational.ca",
-						"certificate": "/etc/ucentral/operational.pem",
+						"ca-certificate": "/etc/ucentral/cas.pem",
+						"certificate": "/etc/ucentral/cert.pem",
 						"private-key": "/etc/ucentral/key.pem"
 					},
 					"radius": {

feeds/ucentral/ucentral-schema/files/etc/ucentral/examples/eap_local.json

@@ -37,8 +37,8 @@
 						"ieee80211w": "optional"
 					},
 					"certificates": {
-						"ca-certificate": "/etc/ucentral/operational.ca",
-						"certificate": "/etc/ucentral/operational.pem",
+						"ca-certificate": "/etc/ucentral/cas.pem",
+						"certificate": "/etc/ucentral/cert.pem",
 						"private-key": "/etc/ucentral/key.pem"
 					},
 					"radius": {

patches/0029-netifd-Support-DHCP-option-138-and-store-values-in-t.patch

@@ -0,0 +1,93 @@
+From e4ad9777fae3bb3a71988fa738f16cb8d6884d7e Mon Sep 17 00:00:00 2001
+From: Tanya Singh <tanya_singh@accton.com>
+Date: Tue, 28 Jun 2022 17:11:52 +0800
+Subject: [PATCH 29/68] netifd: Support DHCP option 138 and store values in
+ /tmp/capwap/dhcp_opt.txt
+
+Signed-off-by: Tanya Singh <tanya_singh@accton.com>
+---
+ .../netifd/files/lib/netifd/dhcp.script       | 22 +++++++++++++++++++
+ .../netifd/files/lib/netifd/proto/dhcp.sh     |  1 +
+ .../busybox/patches/531-dhcp_opt_capwap.patch | 18 +++++++++++++++
+ 3 files changed, 41 insertions(+)
+ create mode 100644 package/utils/busybox/patches/531-dhcp_opt_capwap.patch
+
+diff --git a/package/network/config/netifd/files/lib/netifd/dhcp.script b/package/network/config/netifd/files/lib/netifd/dhcp.script
+index 6fcf139beb..29de85f221 100755
+--- a/package/network/config/netifd/files/lib/netifd/dhcp.script
++++ b/package/network/config/netifd/files/lib/netifd/dhcp.script
+@@ -4,6 +4,24 @@
+ . /lib/functions.sh
+ . /lib/netifd/netifd-proto.sh
+ 
++WORKING_PATH=/tmp/capwap
++DHCP_OPT_FILE=${WORKING_PATH}/dhcp_opt.txt
++DHCP_OPT_FILE_TMP=${WORKING_PATH}/dhcp_opt_tmp.txt
++
++set_capwap_ip()
++{
++	local ip
++	if [ ! -d "${WORKING_PATH}" ]; then
++		mkdir -p ${WORKING_PATH}
++	fi
++	for ip in ${capwap}; do
++		echo -n ${ip} >> ${DHCP_OPT_FILE_TMP}
++	done
++	if ! cmp -s "${DHCP_OPT_FILE}" "${DHCP_OPT_FILE_TMP}"; then
++		mv ${DHCP_OPT_FILE_TMP} ${DHCP_OPT_FILE}
++	fi
++}
++
+ set_classless_routes() {
+ 	local max=128
+ 	while [ -n "$1" -a -n "$2" -a $max -gt 0 ]; do
+@@ -111,6 +129,10 @@ case "$1" in
+ 	;;
+ esac
+ 
++if [ -n "${capwap}" ]; then
++	set_capwap_ip
++fi
++
+ # user rules
+ [ -f /etc/udhcpc.user ] && . /etc/udhcpc.user "$@"
+ for f in /etc/udhcpc.user.d/*; do
+diff --git a/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh b/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh
+index 636b4654ff..18a9aaf2a3 100755
+--- a/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh
++++ b/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh
+@@ -61,6 +61,7 @@ proto_dhcp_setup() {
+ 	[ "$delegate" = "0" ] && proto_export "IFACE6RD_DELEGATE=0"
+ 	# Request classless route option (see RFC 3442) by default
+ 	[ "$classlessroute" = "0" ] || append dhcpopts "-O 121"
++	append dhcpopts "-O 138"
+ 
+ 	proto_export "INTERFACE=$config"
+ 	proto_run_command "$config" udhcpc \
+diff --git a/package/utils/busybox/patches/531-dhcp_opt_capwap.patch b/package/utils/busybox/patches/531-dhcp_opt_capwap.patch
+new file mode 100644
+index 0000000000..6c60159555
+--- /dev/null
++++ b/package/utils/busybox/patches/531-dhcp_opt_capwap.patch
+@@ -0,0 +1,18 @@
++--- a/networking/udhcp/common.c	2022-06-28 09:32:48.853072914 +0800
+++++ b/networking/udhcp/common.c	2022-06-28 09:39:28.000000000 +0800
++@@ -54,6 +54,7 @@
++ 	{ OPTION_STRING                           , 0x43 }, /* DHCP_BOOT_FILE     */
++ //TODO: not a string, but a set of LASCII strings:
++ //	{ OPTION_STRING                           , 0x4D }, /* DHCP_USER_CLASS    */
+++	{ OPTION_IP	| OPTION_LIST				  , 0x8A }, /* DHCP_CAPWAP       */
++ 	{ OPTION_STRING                           , 0x64 }, /* DHCP_PCODE         */
++ 	{ OPTION_STRING                           , 0x65 }, /* DHCP_TCODE         */
++ #if ENABLE_FEATURE_UDHCP_RFC3397
++@@ -123,6 +124,7 @@
++ 	"tftp" "\0"             /* DHCP_TFTP_SERVER_NAME*/
++ 	"bootfile" "\0"         /* DHCP_BOOT_FILE       */
++ //	"userclass" "\0"        /* DHCP_USER_CLASS      */
+++	"capwap" "\0"      		/* DHCP_CAPWAP		*/
++ 	"tzstr" "\0"            /* DHCP_PCODE           */
++ 	"tzdbstr" "\0"          /* DHCP_TCODE           */
++ #if ENABLE_FEATURE_UDHCP_RFC3397
+-- 
+2.34.1
+

patches/0090-netifd-add-gcmp-256-as-a-cipher-suite-when-SAE-is-en.patch

@@ -1,59 +0,0 @@
-From 6866492b26cf59d5557d1ea0fdae24834410afff Mon Sep 17 00:00:00 2001
-From: John Crispin <john@phrozen.org>
-Date: Wed, 11 Jun 2025 14:24:48 +0200
-Subject: [PATCH] netifd: add gcmp-256 as a cipher suite when SAE is enabled on
- HE/EHT
-
-Fixes: WIFI-14594
-Signed-off-by: John Crispin <john@phrozen.org>
----
- .../config/netifd/patches/200-gcmp-256.patch  | 37 +++++++++++++++++++
- 1 file changed, 37 insertions(+)
- create mode 100644 package/network/config/netifd/patches/200-gcmp-256.patch
-
-diff --git a/package/network/config/netifd/patches/200-gcmp-256.patch b/package/network/config/netifd/patches/200-gcmp-256.patch
-new file mode 100644
-index 0000000000..defe66a816
---- /dev/null
-+++ b/package/network/config/netifd/patches/200-gcmp-256.patch
-@@ -0,0 +1,37 @@
-+--- a/scripts/netifd-wireless.sh
-++++ b/scripts/netifd-wireless.sh
-+@@ -39,11 +39,10 @@ prepare_key_wep() {
-+ }
-+ 
-+ _wdev_prepare_channel() {
-+-	json_get_vars channel band hwmode
-++	json_get_vars channel band hwmode htmode
-+ 
-+ 	auto_channel=0
-+ 	enable_ht=0
-+-	htmode=
-+ 	hwmode="${hwmode##11}"
-+ 
-+ 	case "$channel" in
-+@@ -80,6 +79,11 @@ _wdev_prepare_channel() {
-+ 			esac
-+ 		;;
-+ 	esac
-++
-++	case "$htmode" in
-++		HE*|EHT*) wpa3_cipher="GCMP-256 ";;
-++		*) wpa3_cipher="";;
-++	esac
-+ }
-+ 
-+ _wdev_handler() {
-+@@ -216,6 +220,9 @@ wireless_vif_parse_encryption() {
-+ 		wpa_cipher="GCMP"
-+ 	else
-+ 		wpa_cipher="CCMP"
-++		case "$encryption" in
-++			sae*|wpa3*|psk3*|owe) wpa_cipher="${wpa3_cipher}$wpa_cipher";;
-++		esac
-+ 	fi
-+ 
-+ 	case "$encryption" in
--- 
-2.34.1
-

patches/0091-fwtool-check-for-EST-support-if-the-cert-was-issued-.patch

@@ -1,43 +0,0 @@
-From 8e70ae7c71fb0a31b3b95f156b2d865ba8a07ae8 Mon Sep 17 00:00:00 2001
-From: John Crispin <john@phrozen.org>
-Date: Fri, 13 Jun 2025 12:06:48 +0200
-Subject: [PATCH] fwtool: check for EST support if the cert was issued by insta
-
-Signed-off-by: John Crispin <john@phrozen.org>
----
- include/image-commands.mk                      | 3 ++-
- package/base-files/files/lib/upgrade/fwtool.sh | 4 ++++
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/include/image-commands.mk b/include/image-commands.mk
-index d3c9cea293..b7a0d98d3d 100644
---- a/include/image-commands.mk
-+++ b/include/image-commands.mk
-@@ -85,7 +85,8 @@ metadata_json = \
- 			"revision": "$(call json_quote,$(REVISION))", \
- 			"target": "$(call json_quote,$(TARGETID))", \
- 			"board": "$(call json_quote,$(if $(BOARD_NAME),$(BOARD_NAME),$(DEVICE_NAME)))" \
--		} \
-+		}, \
-+		"est_supported": 1 \
- 	}'
- 
- define Build/append-metadata
-diff --git a/package/base-files/files/lib/upgrade/fwtool.sh b/package/base-files/files/lib/upgrade/fwtool.sh
-index 8bd00a3332..a84eb96baf 100644
---- a/package/base-files/files/lib/upgrade/fwtool.sh
-+++ b/package/base-files/files/lib/upgrade/fwtool.sh
-@@ -51,6 +51,10 @@ fwtool_check_image() {
- 	json_get_var compatmessage compat_message
- 	[ -n "$imagecompat" ] || imagecompat="1.0"
- 
-+	if ! est_client fwtool; then
-+		return 1
-+	fi
-+
- 	# select correct supported list based on compat_version
- 	# (using this ensures that compatibility check works for devices
- 	#  not knowing about compat-version)
--- 
-2.34.1
-

profiles/emplus_wap385c.yml

@@ -1,26 +0,0 @@
----
-profile: emplus_wap385c
-target: ipq50xx
-subtarget: generic
-description: Build image for Emplus WAP385C
-image: bin/targets/ipq50xx/generic/openwrt-ipq50xx-emplus_wap385c-squashfs-sysupgrade.tar
-feeds:
-  - name: ipq807x
-    path: ../../feeds/ipq807x_v5.4
-include:
-  - ucentral-ap
-packages:
-  - ipq50xx
-  - iperf3
-  - lscpu
-  - tree
-diffconfig: |
-  CONFIG_KERNEL_IPQ_MEM_PROFILE=512
-  CONFIG_BUSYBOX_CUSTOM=y
-  CONFIG_BUSYBOX_CONFIG_TFTP=y
-  CONFIG_BUSYBOX_CONFIG_FEATURE_TFTP_GET=y
-  CONFIG_BUSYBOX_CONFIG_FEATURE_TFTP_PUT=y
-  CONFIG_BUSYBOX_CONFIG_FEATURE_TFTP_BLOCKSIZE=y
-  CONFIG_BUSYBOX_CONFIG_FEATURE_TFTP_PROGRESS_BAR=y
-  CONFIG_BUSYBOX_CONFIG_MPSTAT=y
-  CONFIG_BUSYBOX_CONFIG_PSTREE=y

profiles/emplus_wap386v2.yml

@@ -1,24 +0,0 @@
----
-profile: emplus_wap386v2
-target: ipq60xx
-subtarget: generic
-description: Build image for the EMPLUS WAP386V2
-image: bin/targets/ipq60xx/generic/openwrt-ipq60xx-emplus_wap386v2-squashfs-sysupgrade.tar
-feeds:
-  - name: ipq807x
-    path: ../../feeds/ipq807x_v5.4
-include:
-  - ucentral-ap
-packages:
-  - ipq60xx
-  - iperf3
-diffconfig: |
-  CONFIG_BUSYBOX_CUSTOM=y
-  CONFIG_BUSYBOX_CONFIG_TFTP=y
-  CONFIG_BUSYBOX_CONFIG_FEATURE_TFTP_PROGRESS_BAR=y
-  CONFIG_BUSYBOX_CONFIG_FEATURE_TFTP_HPA_COMPAT=y
-  CONFIG_BUSYBOX_CONFIG_FEATURE_TFTP_GET=y
-  CONFIG_BUSYBOX_CONFIG_FEATURE_TFTP_PUT=y
-  CONFIG_BUSYBOX_CONFIG_LSOF=y
-  CONFIG_BUSYBOX_CONFIG_MPSTAT=y
-  CONFIG_BUSYBOX_CONFIG_PSTREE=y