WIFI-2416 Auto redirector bug fix (re-enable webserver, manage Maverick)

Signed-off-by: Rick Sommerville <rick.sommerville@netexperience.com>

feeds/wifi-ax/hostapd/files/hostapd.sh

@@ -47,15 +47,6 @@ hostapd_append_wpa_key_mgmt() {
 			[ "${ieee80211w:-0}" -gt 0 ] && append wpa_key_mgmt "WPA-${auth_type_l}-SHA256"
 			[ "${ieee80211ai:-0}" -gt 0 ] && append wpa_key_mgmt "FILS-SHA256"
 		;;
-		eap-only)
-			append wpa_key_mgmt "WPA-EAP-SHA256"
-			[ "${ieee80211r:-0}" -gt 0 ] && append wpa_key_mgmt "FT-EAP"
-		;;
-		eap-transition)
-			append wpa_key_mgmt "WPA-EAP"
-			append wpa_key_mgmt "WPA-EAP-SHA256"
-			[ "${ieee80211r:-0}" -gt 0 ] && append wpa_key_mgmt "FT-EAP"
-		;;
 		eap192)
 			append wpa_key_mgmt "WPA-EAP-SUITE-B-192"
 			[ "${ieee80211w:-0}" -gt 0 ] && append wpa_key_mgmt "WPA-EAP-SHA256"
@@ -321,15 +312,14 @@ hostapd_common_add_bss_config() {
 	config_add_string osu_ssid hs20_wan_metrics hs20_operating_class hs20_t_c_filename hs20_t_c_timestamp
 
 	config_add_boolean interworking internet
-	config_add_int access_network_type asra esr uesa venue_group venue_type  \
+	config_add_int access_network_type asra esr uesa venue_group venue_type ipaddr_type_availability \
 		gas_address3
-	config_add_string hessid network_auth_type ipaddr_type_availability \
+	config_add_string hessid network_auth_type \
 		anqp_3gpp_cell_net anqp_elem domain_name qos_map_set hs20_t_c_server_url
 
 	config_add_array airtime_sta_weight
 	config_add_int airtime_bss_weight airtime_bss_limit
 	config_add_int rts_threshold
-	config_add_boolean multicast_to_unicast proxy_arp
 }
 
 hostapd_set_vlan_file() {
@@ -496,8 +486,7 @@ hostapd_set_bss_options() {
 		bss_load_update_period chan_util_avg_period sae_require_mfp \
 		multi_ap multi_ap_backhaul_ssid multi_ap_backhaul_key \
 		airtime_bss_weight airtime_bss_limit airtime_sta_weight \
-		rssi_reject_assoc_rssi rssi_ignore_probe_request rts_threshold \
-		proxy_arp multicast_to_unicast
+		rssi_reject_assoc_rssi rssi_ignore_probe_request rts_threshold 
 
 	set_default isolate 0
 	set_default maxassoc 0
@@ -520,8 +509,7 @@ hostapd_set_bss_options() {
 	set_default rssi_reject_assoc_rssi 0
 	set_default rssi_ignore_probe_request 0
 	set_default rts_threshold -1
-	set_default proxy_arp 0
-	set_default multicast_to_unicast 0
+
 	append bss_conf "ctrl_interface=/var/run/hostapd"
 	if [ "$isolate" -gt 0 ]; then
 		append bss_conf "ap_isolate=$isolate" "$N"
@@ -550,9 +538,6 @@ hostapd_set_bss_options() {
 	append bss_conf "rssi_ignore_probe_request=$rssi_ignore_probe_request" "$N"
 	append bss_conf "rts_threshold=$rts_threshold" "$N"
 
-	[ -n "$proxy_arp" ] && append bss_conf "proxy_arp=$proxy_arp" "$N"
-	[ -n "$multicast_to_unicast" ] && append bss_conf "multicast_to_unicast=$multicast_to_unicast" "$N"
-
 	[ "$tdls_prohibit" -gt 0 ] && append bss_conf "tdls_prohibit=$tdls_prohibit" "$N"
 
 	[ "$wpa" -gt 0 ] && {
@@ -573,11 +558,11 @@ hostapd_set_bss_options() {
 	}
 
 	case "$auth_type" in
-		sae|owe|eap192|eap-eap192|eap-only)
+		sae|owe|eap192|eap-eap192)
 			set_default ieee80211w 2
 			set_default sae_require_mfp 1
 		;;
-		psk-sae|eap-transition)
+		psk-sae)
 			set_default ieee80211w 1
 			set_default sae_require_mfp 1
 		;;
@@ -619,7 +604,7 @@ hostapd_set_bss_options() {
 			vlan_possible=1
 			wps_possible=1
 		;;
-		eap|eap192|eap-eap192|eap-only|eap-transition)
+		eap|eap192|eap-eap192)
 			json_get_vars \
 				auth_server auth_secret auth_port \
 				dae_client dae_secret dae_port \
@@ -956,6 +941,7 @@ hostapd_set_bss_options() {
 	set_default access_network_type 0
 	set_default venue_group 0
 	set_default venue_type 0
+	set_default ipaddr_type_availability 0
 	set_default gas_address3 0
 	set_default hs20_deauth_req_timeout 60
 	if [ "$hs20" = "1" ]; then
@@ -987,7 +973,7 @@ hostapd_set_bss_options() {
 		[ "$uesa" -gt 0 ] && append bss_conf "uesa=$uesa" "$N"
 		[ "$venue_group" -gt 0 ] && append bss_conf "venue_group=$venue_group" "$N"
 		[ "$venue_type" -gt 0 ] && append bss_conf "venue_type=$venue_type" "$N"
-		[ -n "$ipaddr_type_availability" ] && append bss_conf "ipaddr_type_availability=$ipaddr_type_availability" "$N"
+		[ "$ipaddr_type_availability" -gt 0 ] && append bss_conf "ipaddr_type_availability=$ipaddr_type_availability" "$N"
 		[ "$gas_address3" -gt 0 ] && append bss_conf "gas_address3=$gas_address3" "$N"
 		[ -n "$hessid" ] && append bss_conf "hessid=$hessid" "$N"
 		[ -n "$network_auth_type" ] && append bss_conf "network_auth_type=$network_auth_type" "$N"

feeds/wifi-trunk/hostapd/files/hostapd.sh

@@ -47,15 +47,6 @@ hostapd_append_wpa_key_mgmt() {
 			[ "${ieee80211w:-0}" -gt 0 ] && append wpa_key_mgmt "WPA-${auth_type_l}-SHA256"
 			[ "${ieee80211ai:-0}" -gt 0 ] && append wpa_key_mgmt "FILS-SHA256"
 		;;
-		eap-only)
-			append wpa_key_mgmt "WPA-EAP-SHA256"
-			[ "${ieee80211r:-0}" -gt 0 ] && append wpa_key_mgmt "FT-EAP"
-		;;
-		eap-transition)
-			append wpa_key_mgmt "WPA-EAP"
-			append wpa_key_mgmt "WPA-EAP-SHA256"
-			[ "${ieee80211r:-0}" -gt 0 ] && append wpa_key_mgmt "FT-EAP"
-		;;
 		eap192)
 			append wpa_key_mgmt "WPA-EAP-SUITE-B-192"
 			[ "${ieee80211w:-0}" -gt 0 ] && append wpa_key_mgmt "WPA-EAP-SHA256"
@@ -304,17 +295,15 @@ hostapd_common_add_bss_config() {
 	config_add_string osu_ssid hs20_wan_metrics hs20_operating_class hs20_t_c_filename hs20_t_c_timestamp
 
 	config_add_boolean interworking internet
-	config_add_int access_network_type asra esr uesa venue_group venue_type \
+	config_add_int access_network_type asra esr uesa venue_group venue_type ipaddr_type_availability \
 		gas_address3
-	config_add_string hessid network_auth_type ipaddr_type_availability \
+	config_add_string hessid network_auth_type \
 		anqp_3gpp_cell_net anqp_elem domain_name qos_map_set hs20_t_c_server_url
 
 	config_add_int airtime_bss_weight airtime_bss_limit
 	config_add_int rts_threshold
 	config_add_array radius_auth_req_attr
 	config_add_array radius_acct_req_attr
-
-	config_add_boolean multicast_to_unicast proxy_arp
 }
 
 hostapd_set_vlan_file() {
@@ -458,8 +447,7 @@ hostapd_set_bss_options() {
 		bss_load_update_period chan_util_avg_period sae_require_mfp \
 		multi_ap multi_ap_backhaul_ssid multi_ap_backhaul_key \
 		airtime_bss_weight airtime_bss_limit \
-		rssi_reject_assoc_rssi rssi_ignore_probe_request rts_threshold \
-		proxy_arp multicast_to_unicast
+		rssi_reject_assoc_rssi rssi_ignore_probe_request rts_threshold 
 
 	set_default isolate 0
 	set_default maxassoc 0
@@ -487,9 +475,6 @@ hostapd_set_bss_options() {
 	set_default signal_poll_time 5
 	set_default signal_drop_reason 3
 	set_default signal_strikes 3
-	set_default proxy_arp 0
-	set_default multicast_to_unicast 0
-
 
 	append bss_conf "ctrl_interface=/var/run/hostapd"
 	if [ "$isolate" -gt 0 ]; then
@@ -523,9 +508,6 @@ hostapd_set_bss_options() {
 	append bss_conf "signal_strikes=$signal_strikes" "$N"
 	append bss_conf "signal_drop_reason=$signal_drop_reason" "$N"
 
-	[ -n "$proxy_arp" ] && append bss_conf "proxy_arp=$proxy_arp" "$N"
-	[ -n "$multicast_to_unicast" ] && append bss_conf "multicast_to_unicast=$multicast_to_unicast" "$N"
-
 	[ "$tdls_prohibit" -gt 0 ] && append bss_conf "tdls_prohibit=$tdls_prohibit" "$N"
 
 	[ "$wpa" -gt 0 ] && {
@@ -548,11 +530,11 @@ hostapd_set_bss_options() {
 	}
 
 	case "$auth_type" in
-		sae|owe|eap192|eap-eap192|eap-only)
+		sae|owe|eap192|eap-eap192)
 			set_default ieee80211w 2
 			set_default sae_require_mfp 1
 		;;
-		psk-sae|eap-transition)
+		psk-sae)
 			set_default ieee80211w 1
 			set_default sae_require_mfp 1
 		;;
@@ -594,7 +576,7 @@ hostapd_set_bss_options() {
 			vlan_possible=1
 			wps_possible=1
 		;;
-		eap|eap192|eap-eap192|eap-only|eap-transition)
+		eap|eap192|eap-eap192)
 			json_get_vars \
 				auth_server auth_secret auth_port \
 				dae_client dae_secret dae_port \
@@ -890,6 +872,7 @@ hostapd_set_bss_options() {
 	set_default access_network_type 0
 	set_default venue_group 0
 	set_default venue_type 0
+	set_default ipaddr_type_availability 0
 	set_default gas_address3 0
 	set_default hs20_deauth_req_timeout 60
 	if [ "$hs20" = "1" ]; then
@@ -921,7 +904,7 @@ hostapd_set_bss_options() {
 		[ "$uesa" -gt 0 ] && append bss_conf "uesa=$uesa" "$N"
 		[ "$venue_group" -gt 0 ] && append bss_conf "venue_group=$venue_group" "$N"
 		[ "$venue_type" -gt 0 ] && append bss_conf "venue_type=$venue_type" "$N"
-		[ -n "$ipaddr_type_availability" ] && append bss_conf "ipaddr_type_availability=$ipaddr_type_availability" "$N"
+		[ "$ipaddr_type_availability" -gt 0 ] && append bss_conf "ipaddr_type_availability=$ipaddr_type_availability" "$N"
 		[ "$gas_address3" -gt 0 ] && append bss_conf "gas_address3=$gas_address3" "$N"
 		[ -n "$hessid" ] && append bss_conf "hessid=$hessid" "$N"
 		[ -n "$network_auth_type" ] && append bss_conf "network_auth_type=$network_auth_type" "$N"

feeds/wlan-ap/apc/src/src/apc_main.c

@@ -253,10 +253,6 @@ static void check_timer_handler(struct uloop_timeout *timeout)
 		if (CheckIp && (MyIpAddr != CheckIp))
 		{
 			printf("IP address changed from %x to %x - restart APC election\n", MyIpAddr, CheckIp);
-			system("/usr/opensync/bin/ovsh u APC_State dr_addr:=0.0.0.0 bdr_addr:=0.0.0.0 enabled:=false mode:=NC");
-			uloop_done();
-			ubus_done();
-			interap_rcv_close();
 			exit(0);
 		}
 		
@@ -270,9 +266,6 @@ static void check_timer_handler(struct uloop_timeout *timeout)
 
 static void handle_signal(int signo)
 {
-	uloop_done();
-	ubus_done();
-	interap_rcv_close();
 	system("/usr/opensync/bin/ovsh u APC_State dr_addr:=0.0.0.0 bdr_addr:=0.0.0.0 enabled:=false mode:=NC");
 }
 
@@ -334,10 +327,8 @@ int main(int argc, char *const* argv)
 	callback cb = receive_from_socket;
 
 	if (interap_recv(IAC_APC_ELECTION_PORT, cb, 1000,
-			 NULL, NULL) < 0) {
+			 NULL, NULL) < 0)
 		printf("Error: Failed InterAP receive");
-		return 1;
-	}
 
 
 	memset(Timers, 0, sizeof(Timers));
@@ -360,7 +351,6 @@ int main(int argc, char *const* argv)
 	uloop_run();
 	uloop_done();
 	ubus_done();
-	interap_rcv_close();
 
 	return(1);
 }

feeds/wlan-ap/apc/src/src/hello.c

@@ -189,11 +189,8 @@ void apc_send_hello(struct apc_iface * ifa, int kind )
 			else
 				ApcSpec.FloatIp = ApcSpecSaved.FloatIp;
 		}
-		else if (ApcSpec.IsApc == I_AM_BAPC )
+		else
 		{
-			ifa->priority = 0x12;
-		}
-		else {
 			ifa->priority = 0x11;
 			if ((ApcSpecSaved.IsApc == I_AM_APC) || BackingUpRadius )
 			{

feeds/wlan-ap/apc/src/src/neighbor.c

@@ -482,13 +482,10 @@ static void inactivity_timer_hook(struct _timer * tmr)
 			n_neigh += 1;
 			//Radius stuff
 			BackingUpRadius = 1;
-			apc_ifa->priority = 0x33;
 		}
-		else
-			apc_ifa->priority = 0x11;
-
 
 		apc_ifa->drip = MyIpAddr;
+		apc_ifa->priority = 0x11;
 		apc_ifa->bdrip = 0;
 		memset(&ApcSpec, 0, sizeof(struct apc_spec));
 		WaitingToReelect = 12;

feeds/wlan-ap/apc/src/src/ubus.c

@@ -17,7 +17,7 @@ static struct blob_buf nb;
 static const char *ubus_path;
 timer *notify_timer;
 extern struct apc_iface * apc_ifa;
-#define APC_NOTIFY_INTERVAL 10
+#define APC_NOTIFY_INTERVAL 30
 
 struct apc_state {
 	char mode[4];
@@ -94,7 +94,7 @@ apc_info_handle(struct ubus_context *ctx, struct ubus_object *obj,
 	return 0;
 }
 
-static char apc_mode[APC_MAX_MODE][8] = {"DOWN", "LOOP", "WT", "PTP", "OR", "BDR", "DR"};
+static char apc_mode[APC_MAX_MODE][8] = {"DOWN", "LOOP", "WAITING", "PTP", "OR", "BDR", "DR"};
 void apc_update_state()
 {
 	struct in_addr dr_addr;
@@ -112,12 +112,8 @@ void apc_update_state()
 			 "%s", inet_ntoa(dr_addr));
 		snprintf(state.bdr_addr, sizeof(state.bdr_addr),
 			 "%s", inet_ntoa(bdr_addr));
-	} else if (apc_ifa->state == APC_IS_WAITING) {
-		snprintf(state.mode, sizeof(state.mode), "%s",
-			 &apc_mode[apc_ifa->state][0]);
-		snprintf(state.dr_addr, sizeof(state.dr_addr), "0.0.0.0");
-		snprintf(state.bdr_addr, sizeof(state.bdr_addr), "0.0.0.0");
-	} else {
+	}
+	else {
 		snprintf(state.mode, sizeof(state.mode), "NC");
 		snprintf(state.dr_addr, sizeof(state.dr_addr), "0.0.0.0");
 		snprintf(state.bdr_addr, sizeof(state.bdr_addr), "0.0.0.0");

feeds/wlan-ap/interAPcomm/Makefile

@@ -30,8 +30,5 @@ endef
 define Package/libinterapcomm/install
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libinterapcomm.so $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/interap.init $(1)/etc/init.d/interap
-
 endef
 $(eval $(call BuildPackage,libinterapcomm))

feeds/wlan-ap/interAPcomm/files/interap.init

@@ -1,35 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=12
-STOP=12
-
-start() {
-	apc=`cat /etc/config/firewall | grep Allow-APC`
-	ucc=`cat /etc/config/firewall | grep Allow-UCC`
-
-	if [ -z "$apc" ]; then
-		uci add firewall rule
-		uci set firewall.@rule[-1].name='Allow-APC'
-		uci set firewall.@rule[-1].src='wan'
-		uci set firewall.@rule[-1].proto='udp'
-		uci set firewall.@rule[-1].dst_port='50010'
-		uci set firewall.@rule[-1].target='ACCEPT'
-		uci set firewall.@rule[-1].family='ipv4'
-		uci commit firewall
-	fi
-
-	if [ -z "$ucc" ]; then
-		uci add firewall rule
-		uci set firewall.@rule[-1].name='Allow-UCC'
-		uci set firewall.@rule[-1].src='wan'
-		uci set firewall.@rule[-1].proto='udp'
-		uci set firewall.@rule[-1].dst_port='50000'
-		uci set firewall.@rule[-1].target='ACCEPT'
-		uci set firewall.@rule[-1].family='ipv4'
-		uci commit firewall
-	fi
-}
-
-stop() {
-	echo stop
-}

feeds/wlan-ap/interAPcomm/src/include/interAPcomm.h

@@ -5,7 +5,6 @@ int interap_send(unsigned short port, char *dst_ip,
 int interap_recv(unsigned short port, int (*recv_cb)(void *, ssize_t),
 		 unsigned int len, struct ev_loop *loop,
 		 ev_io *io);
-void interap_rcv_close(void);
 
 typedef int (*callback)(void *, ssize_t);
 typedef struct recv_arg {

feeds/wlan-ap/interAPcomm/src/src/interAPcomm.c

@@ -22,10 +22,8 @@ static void receive_data_uloop(struct uloop_fd *fd, unsigned int events)
 	recv_data = malloc(ra.len);
 	memset(recv_data, 0, ra.len);
 	if ((recv_data_len = recvfrom(recv_sock, recv_data, ra.len,
-				      0, NULL, 0)) < 0) {
+				      0, NULL, 0)) < 0)
 		printf("recvfrom() failed");
-		return;
-	}
 
 	ra.cb(recv_data, recv_data_len);
 	free(recv_data);
@@ -101,11 +99,6 @@ int interap_recv(unsigned short port, int (*recv_cb)(void *, ssize_t),
 	return 0;
 }
 
-void interap_rcv_close(void)
-{
-	close(recv_sock);
-}
-
 int interap_send(unsigned short port, char *dst_ip, void *data,
 		 unsigned int len)
 {

feeds/wlan-ap/opensync/files/bin/wlan_ap_factory_reset.sh

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+tar czf /sysupgrade.tgz /usr/opensync/certs/
+jffs2reset -r -y -k

feeds/wlan-ap/opensync/files/bin/wlan_ap_redirector.sh

@@ -1,12 +1,49 @@
 #!/bin/sh
 
-if [ $# -ne 1 ] ; then
-	echo "Usage: $0 <redirector address>" >&2
+AP_PRIVATE_KEY_FILE="/usr/opensync/certs/client_dec.key"
+AP_CERTIFICATE_FILE="/usr/opensync/certs/client.pem"
+AP_DEVICE_ID_FILE="/usr/opensync/certs/client_deviceid.txt"
+DIGICERT_API_URI="clientauth.one.digicert.com"
+
+if [ "$1" = "-h" ]; then
+  echo "Usage: $0 [redirector address]" >&2
   exit 1
 fi
 
-redirector_addr=$1
+# Query DigiCert's API if redirector wasn't specified
+if [ -z "$1" ]; then
+  if [ ! -f "$AP_DEVICE_ID_FILE" ]; then
+      echo "Device ID file $AP_DEVICE_ID_FILE does not exist. Make sure to create it or specify the redirector address manually."
+      exit 1
+  fi
 
+  digicert_device_id=`cat ${AP_DEVICE_ID_FILE}`
+  device_data=`curl -s \
+    --retry 5 \
+    --show-error \
+    --key "${AP_PRIVATE_KEY_FILE}" \
+    --cert "${AP_CERTIFICATE_FILE}" \
+    "https://${DIGICERT_API_URI}/iot/api/v2/device/${digicert_device_id}"`
+
+  controller_url=`echo ${device_data} | jsonfilter -e '@.fields[@.name="Redirector"].value'`
+  if [ -z "$controller_url" ]; then
+    echo "No redirector found for this device"
+    exit 1
+  fi
+  controller_port=`echo ${controller_url} | cut -s -d ":" -f2)`
+  if [ -z "$controller_port" ]; then
+    redirector_addr="ssl:${controller_url}:6643"
+  else
+    redirector_addr="ssl:${controller_url}"
+  fi
+else
+  redirector_addr=$1
+fi
+
+echo "${redirector_addr}" > /usr/opensync/certs/redirector.txt
+/etc/init.d/uhttpd enable
+/etc/init.d/uhttpd start
 uci set system.tip.redirector="${redirector_addr}"
+uci set system.tip.deployed=0
 uci commit system
 /etc/init.d/opensync restart

feeds/wlan-ap/opensync/patches/33-add-apc-radsecproxy-schema.patch

@@ -2,7 +2,7 @@ Index: opensync-2.0.5.0/interfaces/opensync.ovsschema
 ===================================================================
 --- opensync-2.0.5.0.orig/interfaces/opensync.ovsschema
 +++ opensync-2.0.5.0/interfaces/opensync.ovsschema
-@@ -9368,6 +9368,69 @@
+@@ -9368,6 +9368,68 @@
              }
         },
        "isRoot": true
@@ -57,7 +57,6 @@ Index: opensync-2.0.5.0/interfaces/opensync.ovsschema
 +                  "DR",
 +                  "BDR",
 +                  "OR",
-+                  "WT",
 +                  "NC"
 +                ]
 +              ]

feeds/wlan-ap/opensync/patches/34-radsec-schema-consts.patch

@@ -1,6 +1,6 @@
 --- a/interfaces/opensync.ovsschema
 +++ b/interfaces/opensync.ovsschema
-@@ -9492,6 +9492,137 @@
+@@ -9439,6 +9439,110 @@
        },
        "isRoot": true,
        "maxRows": 1
@@ -52,33 +52,6 @@
 +                "max": 1
 +              }
 +            },
-+            "acct_server": {
-+                "type": {
-+                "key": {
-+                  "type": "string"
-+                },
-+                "min": 0,
-+                "max": 1
-+              }
-+            },
-+            "acct_port": {
-+              "type": {
-+                "key": {
-+                  "type": "integer"
-+                },
-+                "min": 0,
-+                "max": 1
-+              }
-+            },
-+            "acct_secret": {
-+                "type": {
-+                "key": {
-+                  "type": "string"
-+                },
-+                "min": 0,
-+                "max": 1
-+              }
-+            },
 +            "ca_cert": {
 +                "type": {
 +                    "key": {

feeds/wlan-ap/opensync/patches/35-add-proxy-arp-schema.patch

@@ -1,13 +0,0 @@
-Index: opensync-2.0.5.0/src/lib/schema/inc/schema_consts.h
-===================================================================
---- opensync-2.0.5.0.orig/src/lib/schema/inc/schema_consts.h
-+++ opensync-2.0.5.0/src/lib/schema/inc/schema_consts.h
-@@ -155,6 +155,8 @@ typedef enum {
- #define SCHEMA_CONSTS_IEEE80211k	"ieee80211k"
- #define SCHEMA_CONSTS_DYNAMIC_VLAN	"dynamic_vlan"
- #define SCHEMA_CONSTS_RADPROXY	"radproxy"
-+#define SCHEMA_CONSTS_PROXY_ARP		"proxy_arp"
-+#define SCHEMA_CONSTS_MCAST_TO_UCAST	"mcast_to_ucast"
- 
- /* radio Custom options */
- #define SCHEMA_CONSTS_LOCAL_PWR_CONSTRAINT "local_pwr_constraint"

feeds/wlan-ap/opensync/patches/36-add-channel-hop-config.patch

@@ -1,66 +0,0 @@
-Index: opensync-2.0.5.0/interfaces/opensync.ovsschema
-===================================================================
---- opensync-2.0.5.0.orig/interfaces/opensync.ovsschema
-+++ opensync-2.0.5.0/interfaces/opensync.ovsschema
-@@ -8982,6 +8982,61 @@
-                     "min": 0,
-                     "max": 1
-                 }
-+            },
-+            "noise_floor_thresh": {
-+                "type": {
-+                    "key": {
-+                        "type": "integer",
-+                        "minInteger": -90,
-+                        "maxInteger": -10
-+                    },
-+                    "min": 0,
-+                    "max": 1
-+                }
-+            },
-+            "noise_floor_time": {
-+                "type": {
-+                    "key": {
-+                        "type": "integer",
-+                        "minInteger": 60,
-+                        "maxInteger": 600
-+                    },
-+                    "min": 0,
-+                    "max": 1
-+                }
-+            },
-+            "non_wifi_thresh": {
-+                "type": {
-+                    "key": {
-+                        "type": "integer",
-+                        "minInteger": 0,
-+                        "maxInteger": 100
-+                    },
-+                    "min": 0,
-+                    "max": 1
-+                }
-+            },
-+            "non_wifi_time": {
-+                "type": {
-+                    "key": {
-+                        "type": "integer",
-+                        "minInteger": 60,
-+                        "maxInteger": 600
-+                    },
-+                    "min": 0,
-+                    "max": 1
-+                }
-+            },
-+            "obss_hop_mode": {
-+                "type": {
-+                    "key": {
-+                        "type": "integer",
-+                        "minInteger": 1,
-+                        "maxInteger": 2
-+                    },
-+                    "min": 0,
-+                    "max": 1
-+                }
-             }
-         },
-         "isRoot": true

feeds/wlan-ap/opensync/src/platform/openwrt/rootfs/common/etc/init.d/opensync

@@ -37,6 +37,20 @@ start_service() {
     echo "Setting certificates"
     mkdir -p ${CERTS_DEST_PATH}
     cp ${CERTS_SRC_PATH}/* ${CERTS_DEST_PATH}/
+    echo "Checking Redirector"
+    redirector=$(uci get system.tip.redirector)
+    if [ -z "$redirector" ]; then
+        [[ -f /usr/opensync/certs/redirector.txt ]] && redirector=$(cat /usr/opensync/certs/redirector.txt | tr -d '\r\n')
+        if [ -z "$redirector" ]; then
+            logger -t opensync "Contacting DigiCert for redirector address"
+            wlan_ap_redirector.sh
+        else
+            logger -t opensync "Restoring redirector ${redirector} after factory reset"
+            wlan_ap_redirector.sh ${redirector}
+        fi
+    fi
+    [[ -f /usr/opensync/certs/redirector.txt ]] || echo "${redirector}" > /usr/opensync/certs/redirector.txt
+ 
     echo "Starting OpenSync"
     procd_set_param command ${PROG}
     procd_close_instance

feeds/wlan-ap/opensync/src/platform/openwrt/src/command/src/cmd_tcpdump.c

@@ -215,7 +215,6 @@ pid_t cmd_handler_tcpdump_wifi(struct task *task)
 	char *argv[] = { "/usr/sbin/tcpdump", "-c", "1000", "-G", duration, "-W", "1", "-w", pcap, "-i", phy, NULL };
 	char iw[128];
 	pid_t pid;
-	int ret = 0;
 
 	task->arg = SCHEMA_KEY_VAL(task->conf.payload, "wifi");
 	if (!task->arg) {
@@ -226,23 +225,15 @@ pid_t cmd_handler_tcpdump_wifi(struct task *task)
 
 	blob_buf_init(&b, 0);
 	uci = uci_alloc_context();
-
-	ret = uci_load(uci, "wireless", &p);
-	if (ret) {
-		LOGE("%s: uci_load() failed with rc %d", __func__, ret);
-		uci_free_context(uci);
-		return -1;
-	}
+	uci_load(uci, "wireless", &p);
 	s = uci_lookup_section(uci, p, task->arg);
         if (!s) {
 		task_status(task, TASK_FAILED, "unknown wifi");
-		uci_unload(uci, p);
 		uci_free_context(uci);
                 return -1;
 	}
 
         uci_to_blob(&b, s, &phy_param);
-	uci_unload(uci, p);
 	uci_free_context(uci);
 
 	blobmsg_parse(phy_policy, __PHY_ATTR_MAX, tb, blob_data(b.head), blob_len(b.head));

feeds/wlan-ap/opensync/src/platform/openwrt/src/command/src/node_config.c

@@ -88,14 +88,9 @@ static void syslog_state(int config)
 	struct uci_element *e = NULL;
 	struct uci_section *s = NULL;
 	char val[128];
-	int ret = 0;
 
 	blob_buf_init(&b, 0);
-	ret = uci_load(uci, "system", &system);
-	if (ret) {
-		LOGE("%s: uci_load() failed with rc %d", __func__, ret);
-		return;
-	}
+	uci_load(uci, "system", &system);
 	uci_foreach_element(&system->sections, e) {
 		s = uci_to_section(e);
 		if (!strcmp(s->type, "system"))
@@ -184,20 +179,14 @@ static void ntp_state(int config)
         struct uci_section *s;
 	struct blob_attr *cur = NULL;
 	char val[128] = {};
-	int first = 1, rem = 0, ret = 0;
+	int first = 1, rem = 0;
 
 	blob_buf_init(&b, 0);
-	ret = uci_load(uci, "system", &p);
-	if (ret) {
-		LOGE("%s: uci_load() failed with rc %d", __func__, ret);
-		return;
-	}
+	uci_load(uci, "system", &p);
 
 	s = uci_lookup_section(uci, p, "ntp");
-	if (!s) {
-		uci_unload(uci, p);
+	if (!s)
 		return;
-	}
 
 	uci_to_blob(&b, s, &ntp_param);
 	blobmsg_parse(ntp_policy, __NTP_ATTR_MAX, tb, blob_data(b.head), blob_len(b.head));

feeds/wlan-ap/opensync/src/platform/openwrt/src/lib/target/src/captive.c

@@ -501,30 +501,25 @@ void opennds_parameters(char *ifname)
 void opennds_section_del(char *section_name)
 {
 	struct uci_package *opennds;
-	struct uci_context *nds_ctx;
 	struct uci_element *e = NULL, *tmp = NULL;
 	int ret=0;
 
-	nds_ctx = uci_alloc_context();
-	ret = uci_load(nds_ctx, "opennds", &opennds);
+	ret= uci_load(uci, "opennds", &opennds);
 	if (ret) {
-		LOGE("%s: %s uci_load() failed with rc %d", section_name, __func__, ret);
-		uci_free_context(nds_ctx);
+		LOGD("%s: uci_load() failed with rc %d", section_name, ret);
 		return;
 	}
 	uci_foreach_element_safe(&opennds->sections, tmp, e) {
 		struct uci_section *s = uci_to_section(e);
 		if (!strcmp(s->e.name, section_name)) {
-			uci_section_del(nds_ctx, "vif", "opennds", (char *)s->e.name, section_name);
+			uci_section_del(uci, "vif", "opennds", (char *)s->e.name, section_name);
 		}
 		else {
 			continue;
 		}
 	}
-
-	uci_commit(nds_ctx, &opennds, false);
-	uci_unload(nds_ctx, opennds);
-	uci_free_context(nds_ctx);
+	uci_commit(uci, &opennds, false);
+	uci_unload(uci, opennds);
 	reload_config = 1;
 }
 

feeds/wlan-ap/opensync/src/platform/openwrt/src/lib/target/src/radio.c

@@ -34,7 +34,7 @@ ovsdb_table_t table_Hotspot20_Icon_Config;
 
 ovsdb_table_t table_APC_Config;
 ovsdb_table_t table_APC_State;
-unsigned int radproxy_apc = 0;
+unsigned int radproxy_apc;
 
 static struct uci_package *wireless;
 struct uci_context *uci;
@@ -445,7 +445,6 @@ static void periodic_task(void *arg)
 {
 	static int counter = 0;
 	struct uci_element *e = NULL, *tmp = NULL;
-	int ret = 0;
 
 	if ((counter % 15) && !reload_config)
 		goto done;
@@ -469,12 +468,9 @@ static void periodic_task(void *arg)
 		system("reload_config");
 	}
 
-	LOGD("periodic: start state update ");
-	ret = uci_load(uci, "wireless", &wireless);
-	if (ret) {
-		LOGE("%s: uci_load() failed with rc %d", __func__, ret);
-		return;
-	}
+	LOGT("periodic: start state update ");
+
+	uci_load(uci, "wireless", &wireless);
 	uci_foreach_element_safe(&wireless->sections, tmp, e) {
 		struct uci_section *s = uci_to_section(e);
 
@@ -489,7 +485,7 @@ static void periodic_task(void *arg)
 			vif_state_update(s, NULL);
 	}
 	uci_unload(uci, wireless);
-	LOGD("periodic: stop state update ");
+	LOGT("periodic: stop state update ");
 
 done:
 	counter++;
@@ -695,34 +691,43 @@ const struct uci_blob_param_list apc_param = {
 
 void APC_config_update(struct schema_APC_Config *conf)
 {
+	struct uci_package *apc;
 	struct blob_buf apcb = { };
-	struct uci_context *apc_uci;
+	int rc = 0;
 
-	apc_uci = uci_alloc_context();
+	LOGD("APC: APC_config_update");
+
+	rc = uci_load(uci, "apc", &apc);
+	if (rc)
+	{
+		LOGD("%s: uci_load failed with rc %d", __func__, rc);
+	}
 
 	blob_buf_init(&apcb, 0);
-	if (conf && conf->enabled == true) {
+
+ 	if (conf->enabled_changed) {
+		if (conf->enabled == true) {
 			blobmsg_add_bool(&apcb, "enabled", 1);
 			system("/etc/init.d/apc start");
-	} else {
+		}
+		else {
 			blobmsg_add_bool(&apcb, "enabled", 0);
 			system("/etc/init.d/apc stop");
 		}
+	}
 
-	blob_to_uci_section(apc_uci, "apc", "apc", "apc",
+        blob_to_uci_section(uci, "apc", "apc", "apc",
                             apcb.head, &apc_param, NULL);
 
-	uci_commit_all(apc_uci);
-	uci_free_context(apc_uci);
+	uci_commit(uci, &apc, false);
+	uci_unload(uci, apc);
 }
 
 static void callback_APC_Config(ovsdb_update_monitor_t *mon,
                                 struct schema_APC_Config *old,
                                 struct schema_APC_Config *conf)
 {
-	if (mon->mon_type == OVSDB_UPDATE_DEL)
-		APC_config_update(NULL);
-	else
+	if (mon->mon_type != OVSDB_UPDATE_DEL)
 		APC_config_update(conf);
 
 }

feeds/wlan-ap/opensync/src/platform/openwrt/src/lib/target/src/radius_proxy.c

@@ -47,10 +47,8 @@ enum {
 
 enum {
 	RADIUS_PROXY_SERVER_NAME,
-	RADIUS_PROXY_SERVER_HOST,
 	RADIUS_PROXY_SERVER_TYPE,
 	RADIUS_PROXY_SERVER_SECRET,
-	RADIUS_PROXY_SERVER_PORT,
 	RADIUS_PROXY_SERVER_STATUS,
 	RADIUS_PROXY_SERVER_TLS,
 	RADIUS_PROXY_SERVER_CERT_NAME_CHECK,
@@ -94,10 +92,8 @@ static const struct blobmsg_policy radius_proxy_tls_policy[__RADIUS_PROXY_TLS_MA
 
 static const struct blobmsg_policy radius_proxy_server_policy[__RADIUS_PROXY_SERVER_MAX] = {
 		[RADIUS_PROXY_SERVER_NAME] = { .name = "name", BLOBMSG_TYPE_STRING },
-		[RADIUS_PROXY_SERVER_HOST] = { .name = "host", BLOBMSG_TYPE_STRING },
 		[RADIUS_PROXY_SERVER_TYPE] = { .name = "type", BLOBMSG_TYPE_STRING },
 		[RADIUS_PROXY_SERVER_SECRET] = { .name = "secret", BLOBMSG_TYPE_STRING },
-		[RADIUS_PROXY_SERVER_PORT] = { .name = "port", BLOBMSG_TYPE_INT32 },
 		[RADIUS_PROXY_SERVER_STATUS] = { .name = "statusServer", BLOBMSG_TYPE_BOOL },
 		[RADIUS_PROXY_SERVER_TLS] = { .name = "tls", BLOBMSG_TYPE_STRING },
 		[RADIUS_PROXY_SERVER_CERT_NAME_CHECK] = { .name = "certificateNameCheck", BLOBMSG_TYPE_BOOL },
@@ -144,27 +140,17 @@ static bool radsec_download_cert(char *cert_name, char *dir_name, char *cert_url
 {
 	CURL *curl;
 	FILE *fp;
-	CURLcode curl_ret;
+	CURLcode res;
 	char path[200];
-	char dir_path[200];
 	char name[32];
 	char dir[32];
 	char *gw_clientcert = "/usr/opensync/certs/client.pem";
 	char *gw_clientkey = "/usr/opensync/certs/client_dec.key";
-	struct stat stat_buf;
 
 	strcpy(name, cert_name);
 	strcpy(dir, dir_name);
-	sprintf(dir_path, "/tmp/radsec/certs/%s", dir);
 	sprintf(path, "/tmp/radsec/certs/%s/%s", dir, name);
 
-	if (stat(dir_path, &stat_buf) == -1)
-	{
-		char cmd[200];
-		sprintf(cmd, "mkdir -p %s", dir_path);
-		system(cmd);
-	}
-
 	curl = curl_easy_init();
 	if (curl)
 	{
@@ -191,19 +177,10 @@ static bool radsec_download_cert(char *cert_name, char *dir_name, char *cert_url
 		curl_easy_setopt(curl, CURLOPT_URL, cert_url);
 		curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, file_write);
 		curl_easy_setopt(curl, CURLOPT_WRITEDATA, fp);
-		curl_ret = curl_easy_perform(curl);
-
-		if (curl_ret != CURLE_OK)
-		{
-			LOGE("radsec: certificate download failed %s", curl_easy_strerror(curl_ret));
-			curl_easy_cleanup(curl);
-			fclose(fp);
-			remove(path);
-			return false;
-		}
-
+		res = curl_easy_perform(curl);
 		curl_easy_cleanup(curl);
 		fclose(fp);
+		return res;
 	}
 
 	return true;
@@ -214,9 +191,6 @@ static bool radius_proxy_config_set(struct schema_Radius_Proxy_Config *conf )
 	int i=0;
 	char path[200];
 	char name[256];
-	char server_name[256] = {};
-	char acct_server_name[256] = {};
-	char tls_name[256] = {};
 	struct schema_APC_State apc_conf;
 
 	/* Configure only if APC selects this as master AP (DR) */
@@ -252,9 +226,6 @@ static bool radius_proxy_config_set(struct schema_Radius_Proxy_Config *conf )
 			uci_buf.head, &radius_proxy_client_param, NULL);
 
 	/* Configure TLS/non-TLS and server blocks */
-	sprintf(server_name, "%s%s", conf->radius_config_name, "server");
-	sprintf(acct_server_name, "%s%s", conf->radius_config_name, "Acctserver");
-	sprintf(tls_name, "%s%s", conf->radius_config_name, "tls");
 	if (conf->radsec)
 	{
 		blob_buf_init(&uci_buf, 0);
@@ -265,7 +236,7 @@ static bool radius_proxy_config_set(struct schema_Radius_Proxy_Config *conf )
 		radsec_download_cert("clientdec.key",
 				conf->radius_config_name, conf->client_key);
 
-		blobmsg_add_string(&uci_buf, "name", tls_name);
+		blobmsg_add_string(&uci_buf, "name", conf->server);
 
 		memset(path, '\0', sizeof(path));
 		sprintf(path, "/tmp/radsec/certs/%s/cacert.pem",
@@ -285,49 +256,34 @@ static bool radius_proxy_config_set(struct schema_Radius_Proxy_Config *conf )
 		if (strlen(conf->passphrase) > 0)
 			blobmsg_add_string(&uci_buf, "certificateKeyPassword", conf->passphrase);
 
-		blob_to_uci_section(uci, "radsecproxy", tls_name,
+		memset(name, '\0', sizeof(name));
+		sprintf(name, "%s%s", conf->radius_config_name, "tls");
+		blob_to_uci_section(uci, "radsecproxy", name,
 				"tls", uci_buf.head, &radius_proxy_tls_param, NULL);
 
 		blob_buf_init(&uci_buf, 0);
-		blobmsg_add_string(&uci_buf, "name", server_name);
-		blobmsg_add_string(&uci_buf, "host", conf->server);
+		blobmsg_add_string(&uci_buf, "name", conf->server);
 		blobmsg_add_string(&uci_buf, "type", "tls");
-		blobmsg_add_string(&uci_buf, "tls", tls_name);
-		blobmsg_add_u32(&uci_buf, "port", conf->port);
+		blobmsg_add_string(&uci_buf, "tls", conf->server);
 		blobmsg_add_string(&uci_buf, "secret", "radsec");
 		blobmsg_add_bool(&uci_buf, "statusServer", 0);
 		blobmsg_add_bool(&uci_buf, "certificateNameCheck", 0);
-		blob_to_uci_section(uci, "radsecproxy", server_name, "server",
+		memset(name, '\0', sizeof(name));
+		sprintf(name, "%s%s", conf->radius_config_name, "server");
+		blob_to_uci_section(uci, "radsecproxy", name, "server",
 				uci_buf.head, &radius_proxy_server_param, NULL);
 	}
 	else /* non-TLS block */
 	{
-		/* Authentication server */
 		blob_buf_init(&uci_buf, 0);
-		blobmsg_add_string(&uci_buf, "name", server_name);
-		blobmsg_add_string(&uci_buf, "host", conf->server);
+		blobmsg_add_string(&uci_buf, "name", conf->server);
 		blobmsg_add_string(&uci_buf, "type", "udp");
 		if (strlen(conf->secret) > 0)
 			blobmsg_add_string(&uci_buf, "secret", conf->secret);
-		if (conf->port > 0)
-			blobmsg_add_u32(&uci_buf, "port", conf->port);
-		blob_to_uci_section(uci, "radsecproxy", server_name, "server",
+		memset(name, '\0', sizeof(name));
+		sprintf(name, "%s%s", conf->radius_config_name, "server");
+		blob_to_uci_section(uci, "radsecproxy", name, "server",
 				uci_buf.head, &radius_proxy_server_param, NULL);
-
-		/* Accounting server */
-		if (strlen(conf->acct_server) > 0)
-		{
-			blob_buf_init(&uci_buf, 0);
-			blobmsg_add_string(&uci_buf, "name", acct_server_name);
-			blobmsg_add_string(&uci_buf, "host", conf->acct_server);
-			blobmsg_add_string(&uci_buf, "type", "udp");
-			if (strlen(conf->secret) > 0)
-				blobmsg_add_string(&uci_buf, "secret", conf->acct_secret);
-			if (conf->acct_port > 0)
-				blobmsg_add_u32(&uci_buf, "port", conf->acct_port);
-			blob_to_uci_section(uci, "radsecproxy", acct_server_name, "server",
-								uci_buf.head, &radius_proxy_server_param, NULL);
-		}
 	}
 
 	/* Configure realm block */
@@ -336,20 +292,11 @@ static bool radius_proxy_config_set(struct schema_Radius_Proxy_Config *conf )
 		blob_buf_init(&uci_buf, 0);
 		blobmsg_add_string(&uci_buf, "name", conf->realm[i]);
 		n = blobmsg_open_array(&uci_buf,"server");
-		blobmsg_add_string(&uci_buf, NULL, server_name);
+		blobmsg_add_string(&uci_buf, NULL, conf->server);
 		blobmsg_close_array(&uci_buf, n);
-		if (conf->radsec)
-		{ /* Accounting server same as auth server */
 		n = blobmsg_open_array(&uci_buf,"accountingServer");
-			blobmsg_add_string(&uci_buf, NULL, server_name);
+		blobmsg_add_string(&uci_buf, NULL, conf->server);
 		blobmsg_close_array(&uci_buf, n);
-		}
-		else if (strlen(conf->acct_server) > 0)
-		{ /* non-TLS case where accounting server is configured */
-			n = blobmsg_open_array(&uci_buf, "accountingServer");
-			blobmsg_add_string(&uci_buf, NULL, acct_server_name);
-			blobmsg_close_array(&uci_buf, n);
-		}
 		memset(name, '\0', sizeof(name));
 		sprintf(name, "%s%s%d", conf->radius_config_name, "realm", i);
 		blob_to_uci_section(uci, "radsecproxy", name, "realm",
@@ -363,27 +310,22 @@ static bool radius_proxy_config_set(struct schema_Radius_Proxy_Config *conf )
 static bool radius_proxy_config_delete()
 {
 	struct uci_package *radsecproxy;
-	struct uci_context *rad_uci;
 	struct uci_element *e = NULL, *tmp = NULL;
 	int ret=0;
 
-	rad_uci = uci_alloc_context();
-
-	ret = uci_load(rad_uci, "radsecproxy", &radsecproxy);
+	ret= uci_load(uci, "radsecproxy", &radsecproxy);
 	if (ret) {
-		LOGE("%s: uci_load() failed with rc %d", __func__, ret);
-		uci_free_context(rad_uci);
+		LOGD("%s: uci_load() failed with rc %d", __func__, ret);
 		return false;
 	}
 	uci_foreach_element_safe(&radsecproxy->sections, tmp, e) {
 		struct uci_section *s = uci_to_section(e);
 		if ((s == NULL) || (s->type == NULL)) continue;
-		uci_section_del(rad_uci, "radsecproxy", "radsecproxy",
+		uci_section_del(uci, "radsecproxy", "radsecproxy",
 				(char *)s->e.name, s->type);
 	}
-	uci_commit(rad_uci, &radsecproxy, false);
-	uci_unload(rad_uci, radsecproxy);
-	uci_free_context(rad_uci);
+	uci_commit(uci, &radsecproxy, false);
+	uci_unload(uci, radsecproxy);
 	reload_config = 1;
 	return true;
 }

feeds/wlan-ap/opensync/src/platform/openwrt/src/lib/target/src/rrm_config.c

@@ -47,19 +47,8 @@ void rrm_config_vif(struct blob_buf *b, struct blob_buf *del, const char * freq_
 		blobmsg_add_u32(b, "rssi_ignore_probe_request", conf.probe_resp_threshold);
 		blobmsg_add_u32(b, "signal_connect", conf.client_disconnect_threshold);
 		blobmsg_add_u32(b, "signal_stay", conf.client_disconnect_threshold);
-		blobmsg_add_u32(b, "mcast_rate", conf.mcast_rate);
-
-		if (conf.beacon_rate == 0) {
-			// Default to the lowest possible bit rate for each frequency band
-			if (!strcmp(freq_band, "2.4G")) {
-				blobmsg_add_u32(b, "bcn_rate", 10);
-			} else {
-				blobmsg_add_u32(b, "bcn_rate", 60);
-			}
-		} else {
 		blobmsg_add_u32(b, "bcn_rate", conf.beacon_rate);
-		}
-		
+		blobmsg_add_u32(b, "mcast_rate", conf.mcast_rate);
 	}
 	return;
 }

feeds/wlan-ap/opensync/src/platform/openwrt/src/lib/target/src/sysupgrade.c

@@ -291,7 +291,7 @@ static void cb_osp_start_factory_reboot(EV_P_ ev_timer *w, int events)
 	if (!strcmp(upg_url, "reboot"))
 		system("reboot");
 	else
-		system("jffs2reset -y -r");
+		system("wlan_ap_factory_reset.sh");
 
 	upg_running = false;
 

feeds/wlan-ap/opensync/src/platform/openwrt/src/lib/target/src/uci.c

@@ -210,10 +210,8 @@ int uci_section_to_blob(struct uci_context *uci, char *package, char *section,
 
 	if (uci_load(uci, package, &p))
 		p = uci_lookup_package(uci, package);
-	if (!p) {
-		uci_unload(uci, p);
+	if (!p)
 		return -1;
-	}
 	s = uci_lookup_section(uci, p, section);
 	if (!s)
 		goto out;

feeds/wlan-ap/opensync/src/platform/openwrt/src/lib/target/src/vif.c

@@ -94,7 +94,6 @@ enum {
 	WIF_ATTR_VENUE_URL,
 	WIF_ATTR_NETWORK_AUTH_TYPE,
 	WIF_ATTR_IPADDR_TYPE_AVAILABILITY,
-	WIF_ATTR_CONNECTION_CAPABILITY,
 	WIF_ATTR_DOMAIN_NAME,
 	WIF_ATTR_MCC_MNC,
 	WIF_ATTR_NAI_REALM,
@@ -133,8 +132,6 @@ enum {
 	WIF_ATTR_11R_R0KH,
 	WIF_ATTR_11R_R1KH,
 	WIF_ATTR_RADPROXY,
-	WIF_ATTR_PROXY_ARP,
-	WIF_ATTR_MCAST_TO_UCAST,
 	__WIF_ATTR_MAX,
 };
 
@@ -190,8 +187,7 @@ static const struct blobmsg_policy wifi_iface_policy[__WIF_ATTR_MAX] = {
 	[WIF_ATTR_VENUE_TYPE] = { .name = "venue_type", BLOBMSG_TYPE_INT32 },
 	[WIF_ATTR_VENUE_URL] = { .name = "venue_url", BLOBMSG_TYPE_ARRAY },
 	[WIF_ATTR_NETWORK_AUTH_TYPE] = { .name = "network_auth_type", BLOBMSG_TYPE_STRING },
-	[WIF_ATTR_IPADDR_TYPE_AVAILABILITY] = { .name = "ipaddr_type_availability", BLOBMSG_TYPE_STRING },
-	[WIF_ATTR_CONNECTION_CAPABILITY] = { .name = "hs20_conn_capab", BLOBMSG_TYPE_ARRAY },
+	[WIF_ATTR_IPADDR_TYPE_AVAILABILITY] = { .name = "ipaddr_type_availability", BLOBMSG_TYPE_INT32 },
 	[WIF_ATTR_DOMAIN_NAME] = { .name = "domain_name", BLOBMSG_TYPE_STRING },
 	[WIF_ATTR_MCC_MNC] = { .name = "anqp_3gpp_cell_net", BLOBMSG_TYPE_STRING },
 	[WIF_ATTR_NAI_REALM] = { .name = "nai_realm", BLOBMSG_TYPE_ARRAY },
@@ -230,8 +226,6 @@ static const struct blobmsg_policy wifi_iface_policy[__WIF_ATTR_MAX] = {
 	[WIF_ATTR_11R_R0KH] = { .name = "r0kh", BLOBMSG_TYPE_STRING },
 	[WIF_ATTR_11R_R1KH] = { .name = "r1kh", BLOBMSG_TYPE_STRING },
 	[WIF_ATTR_RADPROXY] = { .name = "radproxy", BLOBMSG_TYPE_STRING },
-	[WIF_ATTR_PROXY_ARP] = { .name = "proxy_arp", BLOBMSG_TYPE_BOOL },
-	[WIF_ATTR_MCAST_TO_UCAST] = { .name = "multicast_to_unicast", BLOBMSG_TYPE_BOOL },
 };
 
 const struct uci_blob_param_list wifi_iface_param = {
@@ -319,7 +313,7 @@ static struct vif_crypto {
 	{ "wpa-mixed", OVSDB_SECURITY_ENCRYPTION_WPA_EAP, OVSDB_SECURITY_MODE_MIXED, 1 },
 	{ "sae", OVSDB_SECURITY_ENCRYPTION_WPA_SAE, OVSDB_SECURITY_MODE_WPA3, 0 },
 	{ "sae-mixed", OVSDB_SECURITY_ENCRYPTION_WPA_SAE, OVSDB_SECURITY_MODE_MIXED, 0 },
-	{ "wpa3-only", OVSDB_SECURITY_ENCRYPTION_WPA3_EAP, OVSDB_SECURITY_MODE_WPA3, 1 },
+	{ "wpa3", OVSDB_SECURITY_ENCRYPTION_WPA3_EAP, OVSDB_SECURITY_MODE_WPA3, 1 },
 	{ "wpa3-mixed", OVSDB_SECURITY_ENCRYPTION_WPA3_EAP, OVSDB_SECURITY_MODE_MIXED, 1 },
 };
 
@@ -329,7 +323,7 @@ extern unsigned int radproxy_apc;
 
 /* Custom options table */
 #define SCHEMA_CUSTOM_OPT_SZ            20
-#define SCHEMA_CUSTOM_OPTS_MAX          15
+#define SCHEMA_CUSTOM_OPTS_MAX          13
 
 const char custom_options_table[SCHEMA_CUSTOM_OPTS_MAX][SCHEMA_CUSTOM_OPT_SZ] =
 {
@@ -346,8 +340,6 @@ const char custom_options_table[SCHEMA_CUSTOM_OPTS_MAX][SCHEMA_CUSTOM_OPT_SZ] =
 	SCHEMA_CONSTS_RADIUS_NAS_IP,
 	SCHEMA_CONSTS_DYNAMIC_VLAN,
 	SCHEMA_CONSTS_RADPROXY,
-	SCHEMA_CONSTS_PROXY_ARP,
-	SCHEMA_CONSTS_MCAST_TO_UCAST,
 };
 
 static bool vif_config_custom_opt_get_proxy(
@@ -662,19 +654,8 @@ static void vif_config_custom_opt_set(struct blob_buf *b, struct blob_buf *del,
 				strncpy(value, "br-wan.", 20);
 				blobmsg_add_string(del, "vlan_bridge", value);
 			}
-		} else if (strcmp(opt, "radproxy") == 0) {
+		} else if (strcmp(opt, "radproxy") == 0)
 			blobmsg_add_string(b, "radproxy", value);
-		} else if (strcmp(opt, "proxy_arp") == 0) {
-			if (strcmp(value, "1") == 0)
-				blobmsg_add_bool(b, "proxy_arp", 1);
-			else if (strcmp(value, "0") == 0)
-				blobmsg_add_bool(del, "proxy_arp", 1);
-		} else if (strcmp(opt, "mcast_to_ucast") == 0) {
-			if (strcmp(value, "1") == 0)
-				blobmsg_add_bool(b, "multicast_to_unicast", 1);
-			else if (strcmp(value, "0") == 0)
-				blobmsg_add_bool(del, "multicast_to_unicast", 1);
-		}
 	}
 
 	/* No NASID was found from blob, so use BSSID as NASID */
@@ -824,33 +805,8 @@ static void vif_state_custom_options_get(struct schema_Wifi_VIF_State *vstate,
 							custom_options_table[i],
 							buf);
 			}
+		}
 
-
-		} else if (strcmp(opt, "proxy_arp") == 0) {
-			if (tb[WIF_ATTR_PROXY_ARP]) {
-				if (blobmsg_get_bool(tb[WIF_ATTR_PROXY_ARP])) {
-					set_custom_option_state(vstate, &index,
-								custom_options_table[i],
-								"1");
-				} else {
-					set_custom_option_state(vstate, &index,
-								custom_options_table[i],
-								"0");
-				}
-			}
-		} else if (strcmp(opt, "mcast_to_ucast") == 0) {
-			if (tb[WIF_ATTR_MCAST_TO_UCAST]) {
-				if (blobmsg_get_bool(tb[WIF_ATTR_MCAST_TO_UCAST])) {
-					set_custom_option_state(vstate, &index,
-								custom_options_table[i],
-								"1");
-				} else {
-					set_custom_option_state(vstate, &index,
-								custom_options_table[i],
-								"0");
-				}
-			}
-		}
 	}
 }
 
@@ -1020,31 +976,30 @@ size_t write_file(void *ptr, size_t size, size_t nmemb, FILE *stream) {
 
 void vif_section_del(char *section_name)
 {
+
 	struct uci_package *wireless;
-	struct uci_context *sec_ctx;
 	struct uci_element *e = NULL, *tmp = NULL;
 	int ret=0;
-	sec_ctx = uci_alloc_context();
-	ret= uci_load(sec_ctx, "wireless", &wireless);
+
+	ret= uci_load(uci, "wireless", &wireless);
 	if (ret) {
-		LOGE("%s: %s uci_load() failed with rc %d", section_name, __func__, ret);
-		uci_free_context(sec_ctx);
+		LOGD("%s: uci_load() failed with rc %d", section_name, ret);
 		return;
 	}
 	uci_foreach_element_safe(&wireless->sections, tmp, e) {
 		struct uci_section *s = uci_to_section(e);
 		if ((s == NULL) || (s->type == NULL)) continue;
 		if (!strcmp(s->type, section_name)) {
-			uci_section_del(sec_ctx, "vif", "wireless", (char *)s->e.name, section_name);
+			uci_section_del(uci, "vif", "wireless", (char *)s->e.name, section_name);
 		}
 		else {
 			continue;
 		}
 	}
-	uci_commit(sec_ctx, &wireless, false);
-	uci_unload(sec_ctx, wireless);
-	uci_free_context(sec_ctx);
+	uci_commit(uci, &wireless, false);
+	uci_unload(uci, wireless);
 	reload_config = 1;
+
 }
 
 static void vif_check_radius_proxy()
@@ -1064,10 +1019,12 @@ static void vif_check_radius_proxy()
 	}
 
 	uci_ctx = uci_alloc_context();
+
 	rc = uci_load(uci_ctx, "wireless", &wireless);
 
-	if (rc) {
-		LOGE("%s: uci_load() failed with rc %d", __func__, rc);
+	if (rc)
+	{
+		LOGD("%s: uci_load() failed with rc %d", __func__, rc);
 		goto free;
 	}
 
@@ -1163,7 +1120,6 @@ static void hs20_vif_config(struct blob_buf *b,
 	int i = 0;
 	unsigned int len = 0;
 	char domain_name[256];
-	char str[3] = {};
 
 	if (hs2conf->enable) {
 		blobmsg_add_bool(b, "interworking", 1);
@@ -1276,20 +1232,6 @@ static void hs20_vif_config(struct blob_buf *b,
 	if (strlen(hs2conf->wan_metrics))
 		blobmsg_add_string(b, "hs20_wan_metrics", hs2conf->wan_metrics);
 
-	len = strlen(hs2conf->ipaddr_type_availability);
-	if (len)
-	{
-		if (len == 1)
-		{
-			snprintf(str, sizeof(str), "0%s", hs2conf->ipaddr_type_availability);
-			blobmsg_add_string(b, "ipaddr_type_availability", str);
-		}
-		else
-		{
-			blobmsg_add_string(b, "ipaddr_type_availability", hs2conf->ipaddr_type_availability);
-		}
-	}
-
 	n = blobmsg_open_array(b, "hs20_oper_friendly_name");
 	for (i = 0; i < hs2conf->operator_friendly_name_len; i++)
 	{
@@ -1306,13 +1248,6 @@ static void hs20_vif_config(struct blob_buf *b,
 		blobmsg_add_u32(b, "venue_type", venue_type);
 	}
 
-	n = blobmsg_open_array(b, "hs20_conn_capab");
-	for (i = 0; i < hs2conf->connection_capability_len; i++)
-	{
-		blobmsg_add_string(b, NULL, hs2conf->connection_capability[i]);
-	}
-	blobmsg_close_array(b, n);
-
 	if (hs2conf->operator_icons_len)
 	{
 		n = blobmsg_open_array(b, "operator_icon");
@@ -1333,17 +1268,14 @@ static void hs20_vif_config(struct blob_buf *b,
 bool target_vif_config_del(const struct schema_Wifi_VIF_Config *vconf)
 {
 	struct uci_package *wireless;
-	struct uci_context *vif_ctx;
 	struct uci_element *e = NULL, *tmp = NULL;
 	const char *ifname;
 	int ret=0;
 
 	vlan_del((char *)vconf->if_name);
-	vif_ctx = uci_alloc_context();
-	ret= uci_load(vif_ctx, "wireless", &wireless);
+	ret= uci_load(uci, "wireless", &wireless);
 	if (ret) {
-		LOGE("%s: %s uci_load() failed with rc %d", vconf->if_name, __func__, ret);
-		uci_free_context(vif_ctx);
+		LOGD("%s: uci_load() failed with rc %d", vconf->if_name, ret);
 		return false;
 	}
 	uci_foreach_element_safe(&wireless->sections, tmp, e) {
@@ -1351,15 +1283,14 @@ bool target_vif_config_del(const struct schema_Wifi_VIF_Config *vconf)
 		if ((s == NULL) || (s->type == NULL)) continue; 
 		if (strcmp(s->type, "wifi-iface")) continue;
 
-		ifname = uci_lookup_option_string( vif_ctx, s, "ifname" );
+		ifname = uci_lookup_option_string( uci, s, "ifname" );
 		if (!strcmp(ifname,vconf->if_name)) {
-			uci_section_del(vif_ctx, "vif", "wireless", (char *)s->e.name, "wifi-iface");
+			uci_section_del(uci, "vif", "wireless", (char *)s->e.name, "wifi-iface");
 			break;
 		}
 	}
-	uci_commit(vif_ctx, &wireless, false);
-	uci_unload(vif_ctx, wireless);
-	uci_free_context(vif_ctx);
+	uci_commit(uci, &wireless, false);
+	uci_unload(uci, wireless);
 	reload_config = 1;
 	return true;
 }
@@ -1552,6 +1483,7 @@ static int ap_vif_config_set(const struct schema_Wifi_Radio_Config *rconf,
 
 	blob_buf_init(&b, 0);
 	blob_buf_init(&del,0);
+
 	blobmsg_add_string(&b, "ifname", vconf->if_name);
 	blobmsg_add_string(&b, "device", rconf->if_name);
 	blobmsg_add_string(&b, "mode", "ap");

feeds/wlan-ap/opensync/src/platform/openwrt/src/ucc_detect/src/main.c

@@ -275,10 +275,8 @@ int main(int argc, char ** argv)
 	callback cb = recv_process;
 	LOGI("Call interap_recv");
 	if( interap_recv(IAC_VOIP_PORT, cb, sizeof(struct voip_session),
-			 loop, &iac_io) < 0) {
+			 loop, &iac_io) < 0)
 		LOGI("Error: Failed InterAP receive");
-		return 1;
-	}
 
 //	task_init();
 	netlink_listen(loop);
@@ -293,7 +291,6 @@ int main(int argc, char ** argv)
 #endif
 	ev_default_destroy();
 
-	interap_rcv_close();
 	LOGN("Exiting UCCM");
 
 	return 0;

feeds/wlan-ap/wlan-ap-config/files/etc/uci-defaults/99-tip-data

@@ -3,9 +3,9 @@
 . /lib/functions.sh
 
 SKU="unknown"
-MODEL=""
+MODEL="unknown"
 PLATFORM="unknown"
-SERIAL=""
+SERIAL="unknown"
 MODEL_REV="unknown"
 MODEL_DESCR="unknown"
 MANUF_NAME="unknown"
@@ -19,12 +19,9 @@ ID=""
 case "$(board_name)" in
 edgecore,ecw5211|\
 edgecore,ecw5410)
+	MODEL=$(cat /tmp/sysinfo/board_name | sed "s/edgecore,//" | tr [a-z] [A-Z])
 	PLATFORM=$(cat /tmp/sysinfo/model)
 	SERIAL=$(cat /dev/mtd5 | grep serial_number | cut -d "=" -f2)
-	MODEL=$(cat /dev/mtd5 | grep "model=" | cut -d "=" -f2)
-	if [ ! $MODEL ]; then
-		MODEL=$(cat /tmp/sysinfo/board_name | sed "s/edgecore,//" | tr [a-z] [A-Z])
-	fi
 	SKU=$(cat /dev/mtd5 | grep sku | cut -d "=" -f2)
 	CERT_REGION=$(cat /dev/mtd5 | grep certification_region | cut -d "=" -f2)
 	ID=$(cat /dev/mtd5 | grep mac_address | cut -d "=" -f2)
@@ -40,12 +37,12 @@ edgecore,ecw5410)
 	REF_DESIGN=$(cat /dev/mtd5 | grep reference_design | cut -d "=" -f2)
 	;;
 cig,wf194c)
+	MODEL=$(cat /tmp/sysinfo/board_name)
 	PLATFORM=$(cat /tmp/sysinfo/model)
 	SERIAL=$(cat /dev/mtd14 | grep serial_number | cut -d "=" -f2)
 	if [ ! $SERIAL ]; then
 		SERIAL=$(cat /dev/mtd14 | grep BaseMacAddress | cut -dx -f2)
 	fi
-	MODEL=$(cat /dev/mtd14 | grep "model=" | cut -d "=" -f2)
 	SKU=$(cat /dev/mtd14 | grep sku | cut -d "=" -f2)
 	CERT_REGION=$(cat /dev/mtd14 | grep certification_region | cut -d "=" -f2)
 	ID=$(cat /dev/mtd14 | grep mac_address | cut -d "=" -f2)
@@ -61,9 +58,9 @@ cig,wf194c)
 	REF_DESIGN=$(cat /dev/mtd14 | grep reference_design | cut -d "=" -f2)
 	;;
 cig,wf188n)
+	MODEL=$(cat /tmp/sysinfo/board_name)
 	PLATFORM=$(cat /tmp/sysinfo/model)
 	SERIAL=$(cat /dev/mtd12 | grep serial_number | cut -d "=" -f2)
-	MODEL=$(cat /dev/mtd12 | grep "model=" | cut -d "=" -f2)
 	SKU=$(cat /dev/mtd12 | grep sku | cut -d "=" -f2)
 	CERT_REGION=$(cat /dev/mtd12 | grep certification_region | cut -d "=" -f2)
 	ID=$(cat /dev/mtd12 | grep mac_address | cut -d "=" -f2)
@@ -100,9 +97,9 @@ linksys,ea8300)
 	MANUF_DATE="$DAY-$MONTH-$YEAR"
 	;;
 tp-link,ec420-g1)
+	MODEL=$(cat /tmp/sysinfo/board_name)
 	PLATFORM=$(cat /tmp/sysinfo/model)
 	SERIAL=$(cat /dev/mtd9 | grep serial_number | cut -d "=" -f2)
-	MODEL=$(cat /dev/mtd9 | grep "model=" | cut -d "=" -f2)
 	SKU=$(cat /dev/mtd9 | grep sku | cut -d "=" -f2)
 	CERT_REGION=$(cat /dev/mtd9 | grep certification_region | cut -d "=" -f2)
 	ID=$(cat /dev/mtd9 | grep mac_address | cut -d "=" -f2)
@@ -136,22 +133,11 @@ if [ ! $ID ]; then
 	ID=$(cat /sys/class/net/eth0/address)
 fi
 
-# fallback check to get the model if flash does not contain this info.
-if [ ! $MODEL ]; then
-	MODEL=$(cat /tmp/sysinfo/board_name)
-fi
-
-# Read the active firmware version info
-FIRMWARE=$(cat /usr/opensync/.versions | grep FW_IMAGE_ACTIVE | grep -o '[^-]*$')
-if [ ! $FIRMWARE ]; then
-	FIRMWARE=$(cat /usr/opensync/.versions | grep FW_VERSION | cut -d ":" -f2)
-fi
-
 uci set system.tip=tip
 uci set system.tip.serial="${SERIAL}"
 uci set system.tip.model="${MODEL}"
 uci set system.tip.platform="${PLATFORM}"
-uci set system.tip.firmware="${FIRMWARE}"
+uci set system.tip.firmware='0.1.0'
 uci set system.tip.sku_number="${SKU}"
 uci set system.tip.revision="${MODEL_REV}"
 uci set system.tip.model_description="${MODEL_DESCR}"

patches/0036-Preserve-certs-and-redirector-over-factory-reboot.patch

@@ -0,0 +1,81 @@
+From 1f9978564420818d4ce4bdbb08fce2eca7c13d8e Mon Sep 17 00:00:00 2001
+From: Rick Sommerville <rick.sommerville@netexperience.com>
+Date: Sun, 23 May 2021 14:36:03 -0400
+Subject: [PATCH] Preserve certificates and redirector over factory-reset
+
+---
+ package/base-files/files/etc/rc.button/reset  |  2 +-
+ .../patches/001-jffs2reset-keep-option        | 48 +++++++++++++++++++
+ 2 files changed, 49 insertions(+), 1 deletion(-)
+ create mode 100644 package/system/fstools/patches/001-jffs2reset-keep-option
+
+diff --git a/package/base-files/files/etc/rc.button/reset b/package/base-files/files/etc/rc.button/reset
+index 2403122ad2..56c0548ec9 100755
+--- a/package/base-files/files/etc/rc.button/reset
++++ b/package/base-files/files/etc/rc.button/reset
+@@ -23,7 +23,7 @@ released)
+ 	elif [ "$SEEN" -ge 5 -a -n "$OVERLAY" ]
+ 	then
+ 		echo "FACTORY RESET" > /dev/console
+-		jffs2reset -y && reboot &
++		wlan_ap_factory_reset.sh
+ 	fi
+ ;;
+ esac
+diff --git a/package/system/fstools/patches/001-jffs2reset-keep-option b/package/system/fstools/patches/001-jffs2reset-keep-option
+new file mode 100644
+index 0000000000..50209ea276
+--- /dev/null
++++ b/package/system/fstools/patches/001-jffs2reset-keep-option
+@@ -0,0 +1,48 @@
++--- a/jffs2reset.c
+++++ b/jffs2reset.c
++@@ -40,7 +40,7 @@ ask_user(void)
++ 	return 0;
++ }
++ 
++-static int jffs2_reset(struct volume *v, int reset)
+++static int jffs2_reset(struct volume *v, int reset, int keep)
++ {
++ 	char *mp;
++ 
++@@ -48,7 +48,7 @@ static int jffs2_reset(struct volume *v,
++ 	if (mp) {
++ 		ULOG_INFO("%s is mounted as %s, only erasing files\n", v->blk, mp);
++ 		fs_state_set("/overlay", FS_STATE_PENDING);
++-		overlay_delete(mp, false);
+++		overlay_delete(mp, keep);
++ 		mount(mp, "/", NULL, MS_REMOUNT, 0);
++ 	} else {
++ 		ULOG_INFO("%s is not mounted\n", v->blk);
++@@ -93,8 +93,8 @@ static int jffs2_mark(struct volume *v)
++ int main(int argc, char **argv)
++ {
++ 	struct volume *v;
++-	int ch, yes = 0, reset = 0;
++-	while ((ch = getopt(argc, argv, "yr")) != -1) {
+++	int ch, yes = 0, reset = 0, keep = 0;
+++	while ((ch = getopt(argc, argv, "yrk")) != -1) {
++ 		switch(ch) {
++ 		case 'y':
++ 			yes = 1;
++@@ -102,6 +102,9 @@ int main(int argc, char **argv)
++ 		case 'r':
++ 			reset = 1;
++ 			break;
+++                case 'k':
+++                        keep = 1;
+++                        break;
++ 		}
++ 
++ 	}
++@@ -128,5 +131,5 @@ int main(int argc, char **argv)
++ 	volume_init(v);
++ 	if (!strcmp(*argv, "jffs2mark"))
++ 		return jffs2_mark(v);
++-	return jffs2_reset(v, reset);
+++	return jffs2_reset(v, reset, keep);
++ }
+-- 
+2.17.1
+

patches/0052-netifd-Add-WPA3-Enterprise-modes.patch

@@ -1,39 +0,0 @@
-From dc2e1e24e5a69face7d154fea6d3ecbee6c90e45 Mon Sep 17 00:00:00 2001
-From: Arif Alam <arif.alam@netexperience.com>
-Date: Wed, 28 Apr 2021 19:29:23 -0400
-Subject: [PATCH] netifd: Add WPA3 Enterprise modes
-
-Add configuration options for:
-- WPA3 Enterprise Only mode
-- WPA3 Enterprise Transition mode
-
-Signed-off-by: Arif Alam <arif.alam@netexperience.com>
----
- .../patches/0105-add-wpa3-enterprise-modes.patch  | 15 +++++++++++++++
- 1 file changed, 15 insertions(+)
- create mode 100644 package/network/config/netifd/patches/0105-add-wpa3-enterprise-modes.patch
-
-diff --git a/package/network/config/netifd/patches/0105-add-wpa3-enterprise-modes.patch b/package/network/config/netifd/patches/0105-add-wpa3-enterprise-modes.patch
-new file mode 100644
-index 0000000000..9018365807
---- /dev/null
-+++ b/package/network/config/netifd/patches/0105-add-wpa3-enterprise-modes.patch
-@@ -0,0 +1,15 @@
-+--- a/scripts/netifd-wireless.sh
-++++ b/scripts/netifd-wireless.sh
-+@@ -244,8 +244,11 @@ wireless_vif_parse_encryption() {
-+ 		owe*)
-+ 			auth_type=owe
-+ 		;;
-++		wpa3-only*)
-++			auth_type=eap-only
-++		;;
-+ 		wpa3-mixed*)
-+-			auth_type=eap-eap192
-++			auth_type=eap-transition
-+ 		;;
-+ 		wpa3*)
-+ 			auth_type=eap192
--- 
-2.25.1
-

patches/0053-ipq807x-fix-edgecore-eap102.patch

@@ -1,156 +0,0 @@
-From 4a5ac0aa04a5e6cf9316ce7c16843f0f4a4128ce Mon Sep 17 00:00:00 2001
-From: John Crispin <john@phrozen.org>
-Date: Wed, 12 May 2021 07:00:18 +0200
-Subject: [PATCH] ipq807x: fix edgecore eap102
-
-* import the fixes for the update hardware revision
-
-Signed-off-by: John Crispin <john@phrozen.org>
----
- target/linux/ipq807x/base-files/etc/board.d/02_network    | 5 +----
- target/linux/ipq807x/base-files/etc/init.d/bootcount      | 3 ++-
- target/linux/ipq807x/base-files/lib/upgrade/platform.sh   | 4 ++--
- .../arch/arm64/boot/dts/qcom/qcom-ipq807x-eap102.dts      | 8 ++++----
- target/linux/ipq807x/image/ipq60xx.mk                     | 6 +++---
- target/linux/ipq807x/image/ipq807x.mk                     | 2 +-
- 6 files changed, 13 insertions(+), 15 deletions(-)
-
-diff --git a/target/linux/ipq807x/base-files/etc/board.d/02_network b/target/linux/ipq807x/base-files/etc/board.d/02_network
-index f23a9f3eac..e90a73f7bf 100755
---- a/target/linux/ipq807x/base-files/etc/board.d/02_network
-+++ b/target/linux/ipq807x/base-files/etc/board.d/02_network
-@@ -28,6 +28,7 @@ qcom_setup_interfaces()
-                 ucidef_set_interface_wan "eth0"
-                 ;;
- 	cig,wf194c|\
-+	edgecore,eap102|\
- 	sercomm,wallaby)
- 		ucidef_set_interface_lan "eth0"
- 		ucidef_set_interface_wan "eth1"
-@@ -36,10 +37,6 @@ qcom_setup_interfaces()
- 		ucidef_set_interface_lan "eth1 eth2"
- 		ucidef_set_interface_wan "eth0"
- 		;;
--	edgecore,eap102)
--		ucidef_set_interface_lan "eth1"
--		ucidef_set_interface_wan "eth0"
--		;;
- 	esac
- }
- 
-diff --git a/target/linux/ipq807x/base-files/etc/init.d/bootcount b/target/linux/ipq807x/base-files/etc/init.d/bootcount
-index ac345d6d4a..a24f27353e 100755
---- a/target/linux/ipq807x/base-files/etc/init.d/bootcount
-+++ b/target/linux/ipq807x/base-files/etc/init.d/bootcount
-@@ -4,7 +4,8 @@ START=99
- 
- boot() {
- 	case "$(board_name)" in
--	edgecore,eap101)
-+	edgecore,eap101|\
-+	edgecore,eap102)
- 		fw_setenv bootcount 0
- 		;;
- 	esac
-diff --git a/target/linux/ipq807x/base-files/lib/upgrade/platform.sh b/target/linux/ipq807x/base-files/lib/upgrade/platform.sh
-index 59d1578925..a520df40d7 100755
---- a/target/linux/ipq807x/base-files/lib/upgrade/platform.sh
-+++ b/target/linux/ipq807x/base-files/lib/upgrade/platform.sh
-@@ -48,7 +48,6 @@ platform_do_upgrade() {
- 		;;
- 	cig,wf188n|\
- 	cig,wf194c|\
--	edgecore,eap102|\
- 	qcom,ipq6018-cp01|\
- 	qcom,ipq807x-hk01|\
- 	sercomm,wallaby|\
-@@ -56,7 +55,8 @@ platform_do_upgrade() {
- 	tplink,ex227)
- 		nand_upgrade_tar "$1"
- 		;;
--	edgecore,eap101)
-+	edgecore,eap101|\
-+	edgecore,eap102)
- 		CI_UBIPART="rootfs1"
- 		nand_upgrade_tar "$1"
- 		;;
-diff --git a/target/linux/ipq807x/files/arch/arm64/boot/dts/qcom/qcom-ipq807x-eap102.dts b/target/linux/ipq807x/files/arch/arm64/boot/dts/qcom/qcom-ipq807x-eap102.dts
-index e8157f5514..cf822c246e 100755
---- a/target/linux/ipq807x/files/arch/arm64/boot/dts/qcom/qcom-ipq807x-eap102.dts
-+++ b/target/linux/ipq807x/files/arch/arm64/boot/dts/qcom/qcom-ipq807x-eap102.dts
-@@ -32,8 +32,8 @@
- 		 * Aliases as required by u-boot
- 		 * to patch MAC addresses
- 		 */
--		ethernet0 = "/soc/dp5";
--		ethernet1 = "/soc/dp6";
-+		ethernet0 = "/soc/dp6";
-+		ethernet1 = "/soc/dp5";
- 
- 		led-boot = &led_power;
- 		led-failsafe = &led_power;
-@@ -593,7 +593,7 @@
- 		};
- 	};
- 
--	dp1 {
-+/*	dp1 {
- 		device_type = "network";
- 		compatible = "qcom,nss-dp";
- 		qcom,id = <1>;
-@@ -639,7 +639,7 @@
- 		qcom,link-poll = <1>;
- 		qcom,phy-mdio-addr = <3>;
- 		phy-mode = "sgmii";
--	};
-+	};*/
- 
- 	dp5 {
- 		device_type = "network";
-diff --git a/target/linux/ipq807x/image/ipq60xx.mk b/target/linux/ipq807x/image/ipq60xx.mk
-index c536a174f8..201885a760 100644
---- a/target/linux/ipq807x/image/ipq60xx.mk
-+++ b/target/linux/ipq807x/image/ipq60xx.mk
-@@ -7,7 +7,7 @@ define Device/cig_wf188
-   SUPPORTED_DEVICES := cig,wf188
-   IMAGES := sysupgrade.tar
-   IMAGE/sysupgrade.tar/squashfs := append-rootfs | pad-rootfs | sysupgrade-tar rootfs=$$$$@ | append-metadata
--  DEVICE_PACKAGES := ath11k-wifi-cig-wf188 uboot-env
-+  DEVICE_PACKAGES := ath11k-wifi-cig-wf188 uboot-envtools
- endef
- TARGET_DEVICES += cig_wf188
- 
-@@ -16,7 +16,7 @@ define Device/cig_wf188n
-   DEVICE_DTS := qcom-ipq6018-cig-wf188n
-   DEVICE_DTS_CONFIG := config@cp03-c1
-   SUPPORTED_DEVICES := cig,wf188n
--  DEVICE_PACKAGES := ath11k-wifi-cig-wf188n uboot-env
-+  DEVICE_PACKAGES := ath11k-wifi-cig-wf188n uboot-envtools
- endef
- TARGET_DEVICES += cig_wf188n
- 
-@@ -25,7 +25,7 @@ define Device/edgecore_eap101
-   DEVICE_DTS := qcom-ipq6018-edgecore-eap101
-   DEVICE_DTS_CONFIG := config@cp01-c1
-   SUPPORTED_DEVICES := edgecore,eap101
--  DEVICE_PACKAGES := ath11k-wifi-edgecore-eap101 uboot-env
-+  DEVICE_PACKAGES := ath11k-wifi-edgecore-eap101 uboot-envtools
- endef
- TARGET_DEVICES += edgecore_eap101
- 
-diff --git a/target/linux/ipq807x/image/ipq807x.mk b/target/linux/ipq807x/image/ipq807x.mk
-index 7081769407..000d2793c9 100644
---- a/target/linux/ipq807x/image/ipq807x.mk
-+++ b/target/linux/ipq807x/image/ipq807x.mk
-@@ -41,7 +41,7 @@ define Device/edgecore_eap102
-   DEVICE_DTS := qcom-ipq807x-eap102
-   DEVICE_DTS_CONFIG=config@ac02
-   SUPPORTED_DEVICES := edgecore,eap102
--  DEVICE_PACKAGES := ath11k-wifi-edgecore-eap102 kmod-usb3 kmod-usb2
-+  DEVICE_PACKAGES := ath11k-wifi-edgecore-eap102 kmod-usb2 uboot-envtools
- endef
- TARGET_DEVICES += edgecore_eap102
- define Device/tplink_ex227
--- 
-2.25.1
-