enable usb-storage of EAP101

Signed-off-by: John Crispin <john@phrozen.org>

Makefile

@@ -3,6 +3,9 @@
 all:
 	./dock-run.sh ./build.sh  $(TARGET)
 
+dock-env:
+	./dock-run.sh bash 
+
 opensync:
 	./dock-run.sh make -j$(nproc) V=s -C openwrt package/feeds/opensync/opensync/clean
 	./dock-run.sh make -j$(nproc) V=s -C openwrt package/feeds/opensync/opensync/compile TARGET=$(TARGET) OPENSYNC_SRC=$(shell pwd)

build.sh

@@ -45,6 +45,10 @@ EAP102)
 	TARGET=eap102
 	WIFI=wifi-ax
 	;;
+EAP106)
+	TARGET=eap106
+	WIFI=wifi-ax
+	;;
 EX227)
 	TARGET=ex227
 	WIFI=wifi-ax
@@ -61,6 +65,14 @@ WF194C)
 	TARGET=wf194c
 	WIFI=wifi-ax
 	;;
+HAWKEYE)
+	TARGET=hawkeye
+	WIFI=wifi-ax
+	;;
+WALLABY)
+	TARGET=wallaby
+	WIFI=wifi-ax
+	;;
 WF610D)
 	TARGET=wf610d
 	;;

dock-run.sh

@@ -6,4 +6,4 @@ params="-v ${PWD}:${PWD} --rm -w ${PWD} -u"$(id -u):$(id -g)" $groups -v/etc/pas
 
 docker build --tag=${tag} docker
 
-docker run $params $@
+docker run -it $params $@

docker/Dockerfile

@@ -11,3 +11,4 @@ RUN apt-get update \
 RUN git config --global user.email "you@example.com"
 RUN git config --global user.name "Your Name"
 RUN pip3 install kconfiglib
+RUN apt-get install -y libncursesw5

feeds/ipq807x/qca-ssdk/patches/101-aq-111c.patch

@@ -0,0 +1,24 @@
+Index: qca-ssdk/include/hsl/phy/hsl_phy.h
+===================================================================
+--- qca-ssdk.orig/include/hsl/phy/hsl_phy.h
++++ qca-ssdk/include/hsl/phy/hsl_phy.h
+@@ -577,6 +577,7 @@ typedef struct {
+ #define AQUANTIA_PHY_109        0x03a1b502
+ #define AQUANTIA_PHY_111        0x03a1b610
+ #define AQUANTIA_PHY_111B0      0x03a1b612
++#define AQUANTIA_PHY_111C       0x03a1b7e2
+ #define AQUANTIA_PHY_112        0x03a1b660
+ #define AQUANTIA_PHY_113C_A0    0x31c31C10
+ #define AQUANTIA_PHY_113C_A1    0x31c31C11
+Index: qca-ssdk/src/hsl/phy/hsl_phy.c
+===================================================================
+--- qca-ssdk.orig/src/hsl/phy/hsl_phy.c
++++ qca-ssdk/src/hsl/phy/hsl_phy.c
+@@ -233,6 +233,7 @@ phy_type_t hsl_phytype_get_by_phyid(a_ui
+ 		case AQUANTIA_PHY_111:
+ 		case AQUANTIA_PHY_114C:
+ 		case AQUANTIA_PHY_111B0:
++		case AQUANTIA_PHY_111C:
+ 		case AQUANTIA_PHY_112:
+ 		case AQUANTIA_PHY_113C_A0:
+ 		case AQUANTIA_PHY_113C_A1:

feeds/wifi-ax/ath11k-wifi/Makefile

@@ -30,6 +30,7 @@ ALLWIFIBOARDS:= \
 	edgecore-eap101 \
 	sercomm-wallaby \
 	edgecore-eap102 \
+	edgecore-eap106 \
 	tplink-ex227 \
 	tplink-ex447
 
@@ -112,6 +113,7 @@ $(eval $(call generate-ath11k-wifi-package,cig-wf194c,Cigtech WF194c))
 $(eval $(call generate-ath11k-wifi-package,sercomm-wallaby,Sercomm Kiwi))
 $(eval $(call generate-ath11k-wifi-package,edgecore-eap101,EdgeCore EAP101))
 $(eval $(call generate-ath11k-wifi-package,edgecore-eap102,Edgecore EAP102))
+$(eval $(call generate-ath11k-wifi-package,edgecore-eap106,Edgecore EAP106))
 $(eval $(call generate-ath11k-wifi-package,tplink-ex227,TP-Link EX227))
 $(eval $(call generate-ath11k-wifi-package,tplink-ex447,TP-Link EX447))
 

feeds/wifi-ax/hostapd/patches/f00-013-hapd-del_sta_before_add_if_sta_already_exist.patch

@@ -0,0 +1,28 @@
+Index: hostapd-2020-06-08-5a8b3662/src/ap/ieee802_11.c
+===================================================================
+--- hostapd-2020-06-08-5a8b3662.orig/src/ap/ieee802_11.c
++++ hostapd-2020-06-08-5a8b3662/src/ap/ieee802_11.c
+@@ -3675,6 +3675,13 @@ static int add_associated_sta(struct hos
+ 	 * drivers to accept the STA parameter configuration. Since this is
+ 	 * after a new FT-over-DS exchange, a new TK has been derived, so key
+ 	 * reinstallation is not a concern for this case.
++	 *
++	 * If the STA was associated and authorized earlier, but came for a new
++	 * connection (!added_unassoc + !reassoc), remove the existing STA entry
++	 * so that it can be re-added. This case is rarely seen when the AP could
++	 * not receive the deauth/disassoc frame from the STA. And the STA comes
++	 * back with new connection within a short period or before the inactive
++	 * STA entry is removed from the list.
+ 	 */
+ 	wpa_printf(MSG_DEBUG, "Add associated STA " MACSTR
+ 		   " (added_unassoc=%d auth_alg=%u ft_over_ds=%u reassoc=%d authorized=%d ft_tk=%d fils_tk=%d)",
+@@ -3688,7 +3695,8 @@ static int add_associated_sta(struct hos
+ 	    (!(sta->flags & WLAN_STA_AUTHORIZED) ||
+ 	     (reassoc && sta->ft_over_ds && sta->auth_alg == WLAN_AUTH_FT) ||
+ 	     (!wpa_auth_sta_ft_tk_already_set(sta->wpa_sm) &&
+-	      !wpa_auth_sta_fils_tk_already_set(sta->wpa_sm)))) {
++	      !wpa_auth_sta_fils_tk_already_set(sta->wpa_sm)) ||
++	     (!reassoc && (sta->flags & WLAN_STA_AUTHORIZED)))) {
+ 		hostapd_drv_sta_remove(hapd, sta->addr);
+ 		wpa_auth_sm_event(sta->wpa_sm, WPA_DRV_STA_REMOVED);
+ 		set = 0;

feeds/wifi-trunk/hostapd/patches/903-hapd-del_sta_before_add_if_sta_already_exist.patch

@@ -0,0 +1,28 @@
+Index: hostapd-2020-06-08-5a8b3662/src/ap/ieee802_11.c
+===================================================================
+--- hostapd-2020-06-08-5a8b3662.orig/src/ap/ieee802_11.c
++++ hostapd-2020-06-08-5a8b3662/src/ap/ieee802_11.c
+@@ -3675,6 +3675,13 @@ static int add_associated_sta(struct hos
+ 	 * drivers to accept the STA parameter configuration. Since this is
+ 	 * after a new FT-over-DS exchange, a new TK has been derived, so key
+ 	 * reinstallation is not a concern for this case.
++	 *
++	 * If the STA was associated and authorized earlier, but came for a new
++	 * connection (!added_unassoc + !reassoc), remove the existing STA entry
++	 * so that it can be re-added. This case is rarely seen when the AP could
++	 * not receive the deauth/disassoc frame from the STA. And the STA comes
++	 * back with new connection within a short period or before the inactive
++	 * STA entry is removed from the list.
+ 	 */
+ 	wpa_printf(MSG_DEBUG, "Add associated STA " MACSTR
+ 		   " (added_unassoc=%d auth_alg=%u ft_over_ds=%u reassoc=%d authorized=%d ft_tk=%d fils_tk=%d)",
+@@ -3688,7 +3695,8 @@ static int add_associated_sta(struct hos
+ 	    (!(sta->flags & WLAN_STA_AUTHORIZED) ||
+ 	     (reassoc && sta->ft_over_ds && sta->auth_alg == WLAN_AUTH_FT) ||
+ 	     (!wpa_auth_sta_ft_tk_already_set(sta->wpa_sm) &&
+-	      !wpa_auth_sta_fils_tk_already_set(sta->wpa_sm)))) {
++	      !wpa_auth_sta_fils_tk_already_set(sta->wpa_sm)) ||
++	     (!reassoc && (sta->flags & WLAN_STA_AUTHORIZED)))) {
+ 		hostapd_drv_sta_remove(hapd, sta->addr);
+ 		wpa_auth_sm_event(sta->wpa_sm, WPA_DRV_STA_REMOVED);
+ 		set = 0;

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

@@ -168,7 +168,7 @@ void apc_iface_new( void )
 	ifa->priority = 0x11;
 	ifa->drip = MyIpAddr;
 	ifa->helloint = 4;
-	ifa->deadint = 16;
+	ifa->deadint = 12;
 	ifa->waitint = 16;
 	
 	ifa->type = APC_IT_BCAST;

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

@@ -491,7 +491,8 @@ static void inactivity_timer_hook(struct _timer * tmr)
 		apc_ifa->drip = MyIpAddr;
 		apc_ifa->bdrip = 0;
 		memset(&ApcSpec, 0, sizeof(struct apc_spec));
-		WaitingToReelect = 12;
+		WaitingToReelect = 3;
+
 		return;
 	}
 	printf("Inactivity timer expired for nbr %x on %s", n->rid, 

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

@@ -14,10 +14,16 @@
 struct ubus_context *ubus_ctx = NULL;
 static struct blob_buf b;
 static struct blob_buf nb;
-static const char *ubus_path;
 timer *notify_timer;
 extern struct apc_iface * apc_ifa;
+/* Mandatorily Notify APC_State period */
 #define APC_NOTIFY_INTERVAL 10
+/* Check if any change in APC State and notify period */
+#define APC_NOTIFY_CHECK 1
+static ip_addr old_drip;
+static ip_addr old_bdrip;
+static u8 old_state;
+static unsigned int ucount = 0;
 
 struct apc_state {
 	char mode[4];
@@ -95,26 +101,44 @@ apc_info_handle(struct ubus_context *ctx, struct ubus_object *obj,
 }
 
 static char apc_mode[APC_MAX_MODE][8] = {"DOWN", "LOOP", "WT", "PTP", "OR", "BDR", "DR"};
-void apc_update_state()
+int apc_update_state(void)
 {
 	struct in_addr dr_addr;
 	struct in_addr bdr_addr;
-	dr_addr.s_addr = htonl(apc_ifa->drip);
-	bdr_addr.s_addr = htonl(apc_ifa->bdrip);
+	ip_addr cur_drip;
+	ip_addr cur_bdrip;
+	u8 cur_state;
+
+	cur_drip = apc_ifa->drip;
+	cur_bdrip = apc_ifa->bdrip;
+	cur_state = apc_ifa->state;
+	ucount++;
+
+	if (cur_drip == old_drip &&
+	    cur_bdrip == old_bdrip &&
+	    cur_state == old_state && ucount < APC_NOTIFY_INTERVAL) {
+		return -1;
+	}
+
+	printf("APC State update %u", ucount);
+	ucount = 0;
+
+	dr_addr.s_addr = htonl(cur_drip);
+	bdr_addr.s_addr = htonl(cur_bdrip);
 
 	state.enabled = true;
-	if ((apc_ifa->state == APC_IS_DR) ||
-	    (apc_ifa->state == APC_IS_BACKUP) ||
-	    (apc_ifa->state == APC_IS_DROTHER)) {
+	if ((cur_state == APC_IS_DR) ||
+	    (cur_state == APC_IS_BACKUP) ||
+	    (cur_state == APC_IS_DROTHER)) {
 		snprintf(state.mode, sizeof(state.mode), "%s",
-			 &apc_mode[apc_ifa->state][0]);
+			 &apc_mode[cur_state][0]);
 		snprintf(state.dr_addr, sizeof(state.dr_addr),
 			 "%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]);
+			 &apc_mode[cur_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 {
@@ -122,11 +146,21 @@ void apc_update_state()
 		snprintf(state.dr_addr, sizeof(state.dr_addr), "0.0.0.0");
 		snprintf(state.bdr_addr, sizeof(state.bdr_addr), "0.0.0.0");
 	}
+
+	old_drip = cur_drip;
+	old_bdrip = cur_bdrip;
+	old_state = cur_state;
+
+	return 0;
 }
 
 void apc_send_notification(struct _timer * tmr)
 {
-	apc_update_state();
+	int ustate = 0;
+
+	ustate = apc_update_state();
+	if(ustate != 0)
+		return;
 
 	printf("APC send ubus notification\n");
 	blob_buf_init(&nb, 0);
@@ -159,10 +193,10 @@ ubus_init(void) {
 #endif
 	add_object(&apc_object);
 	notify_timer = tm_new_set(apc_send_notification, NULL,
-				  0, APC_NOTIFY_INTERVAL);
+				  0, APC_NOTIFY_CHECK);
 	if (notify_timer) {
-		printf("APC Start notify timer\n");
-		tm_start(notify_timer, APC_NOTIFY_INTERVAL);
+		printf("APC Start state check and notify timer\n");
+		tm_start(notify_timer, APC_NOTIFY_CHECK);
 	}
 
 	ubus_ctx->connection_lost = ubus_connection_lost;

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

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+if="$(uci get network.wan.ifname)"
+[ "$(cat /sys/class/net/"${if}"/carrier)" = 0 ] && {
+	return 0
+}
+return 1

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
-	exit 1
+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/files/etc/logrotate.d/ovsdb.conf

@@ -0,0 +1,10 @@
+/tmp/log/openvswitch/*.log {
+    daily
+    rotate 5
+    size 1M
+    compress
+    delaycompress
+    dateext
+    dateformat -%s
+    notifempty
+}

feeds/wlan-ap/opensync/files/usr/opensync/certs/ca.pem

@@ -0,0 +1,75 @@
+-----BEGIN CERTIFICATE-----
+MIIEcTCCA1mgAwIBAgIUJFhIMlIJHJ7hW4gEzZuLBUaWjNcwDQYJKoZIhvcNAQEL
+BQAwbDELMAkGA1UEBhMCVVMxJDAiBgNVBAoTG1RlbGVjb20gSW5mcmEgUHJvamVj
+dCwgSW5jLjEMMAoGA1UECxMDVElQMSkwJwYDVQQDEyBUZWxlY29tIEluZnJhIFBy
+b2plY3QgSXNzdWluZyBDQTAeFw0yMTA0MjUyMDMzNTRaFw0yNjA0MTMyMjM4NDZa
+MCMxITAfBgNVBAMTGGNhY2VydHMub25lLmRpZ2ljZXJ0LmNvbTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAJwKRHdkdEQkp32bNi9TdgN4FNRG0nRppguQ
+mdCysJHA6/SuyAXNwKSbENysjFrcBkfYTlALjvIMqSu4d26ix6Mv4HnVxLjDzapV
+TZhOhfxIbRQa3HNieNup2vMi8jJvgwLcK/4CwhBJsbEMkB5lbyL8UnCBxzW9GGbM
+IvurvDFkUDUpUmiFg47nTpjub79KME6NqK38DxKzlUHvJge1TKFM73kZ3YkfWExQ
+yRQPRiU5KxMi/Wkr30FOf/rMTx4XNacOgyTJvzcStGwrlr0iGr8eLC1/XVXoOQz3
+0lyOeUzTB+HPU1Z2JrbPW5PnGxcQ0f7v/3qkWV1B2wuvFcQk+D0CAwEAAaOCAVIw
+ggFOMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFIj2Mhdk10e46DeI+aEZKSSK8Hj+
+MB8GA1UdIwQYMBaAFLMbVLjgR6s98ziA5Dzl/QBhbdHoMA4GA1UdDwEB/wQEAwIE
+8DAWBgNVHSUBAf8EDDAKBggrBgEFBQcDAjCBhgYIKwYBBQUHAQEEejB4MCgGCCsG
+AQUFBzABhhxodHRwOi8vb2NzcC5vbmUuZGlnaWNlcnQuY29tMEwGCCsGAQUFBzAC
+hkBodHRwOi8vY2FjZXJ0cy5vbmUuZGlnaWNlcnQuY29tL1RlbGVjb21JbmZyYVBy
+b2plY3RJc3N1aW5nQ0EuY3J0ME0GA1UdHwRGMEQwQqBAoD6GPGh0dHA6Ly9jcmwu
+b25lLmRpZ2ljZXJ0LmNvbS9UZWxlY29tSW5mcmFQcm9qZWN0SXNzdWluZ0NBLmNy
+bDANBgkqhkiG9w0BAQsFAAOCAQEADlFwshNPkeI2Gl6ooIauZL9d+6k+RWa5RTle
+JWziYL23XVEBT11+dvp4IB9HwVw5dByl3XAfTd1r4qyncwgXQpc6j2X8e45E8izI
+z2S1zhLMe1bA2lOiZz/sdpbonvxIHdiISyQI7q3mWQsvNkpkbjivjxLAJTcGPmOS
+gc/95YL+2xqPV45XAnPcl5qkLThtmb57Xst1sLWiSS2fUId6HMVuCgZa5su+aAl9
+iMXv9YfHcvyfwXBaOtoBlItyMGl60uy0E/Fr5uEhEWi53EIqhty6KQckQBB7wdjQ
+eiXNI5Ox5cf+TFdesuKPaoEn3WNpFL9PCA3S5nGegJlZQ4N9Eg==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIEnDCCA4SgAwIBAgIUVpyCUx1MUeUwxg+7I1BvGFTz7HkwDQYJKoZIhvcNAQEL
+BQAwaTELMAkGA1UEBhMCVVMxJDAiBgNVBAoTG1RlbGVjb20gSW5mcmEgUHJvamVj
+dCwgSW5jLjEMMAoGA1UECxMDVElQMSYwJAYDVQQDEx1UZWxlY29tIEluZnJhIFBy
+b2plY3QgUm9vdCBDQTAeFw0yMTA0MTMyMjUxMjZaFw0yNjA0MTMyMjM4NDZaMGwx
+CzAJBgNVBAYTAlVTMSQwIgYDVQQKExtUZWxlY29tIEluZnJhIFByb2plY3QsIElu
+Yy4xDDAKBgNVBAsTA1RJUDEpMCcGA1UEAxMgVGVsZWNvbSBJbmZyYSBQcm9qZWN0
+IElzc3VpbmcgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDtKBrq
+qd2aKVSk25KfL5xHu8X7/8rJrz3IvyPuVKWhk/N1zabot3suBcGaYNKjnRHxg78R
+yKwKzajKYWtiQFqztu24g16LQeAnoUxZnF6a0z3JkkRPsz14A2y8TUhdEe1tx+UU
+4VGsk3n+FMmOQHL+79FO57zQC1LwylgfLSltrI6mF3jowVUQvnwzKhUzT87AJ6EO
+ndK/q0T/Bgi+aI39zfVOjJjsTJwghvrmYW3iarP1THSKxeib2s02bZKrvvHa5HL4
+UI8+LvREpVZl4mzt1z6Nl344Y6f+UeJlYa/Ci0jJqaXJmyVnUbAz+c0i5JfwAVn3
+YQzfC4eLnZCmdF8zAgMBAAGjggE3MIIBMzAPBgNVHRMBAf8EBTADAQH/MB0GA1Ud
+DgQWBBSzG1S44EerPfM4gOQ85f0AYW3R6DAfBgNVHSMEGDAWgBQCRpZgebFT9qny
+98WfIUDk6ZEB+jAOBgNVHQ8BAf8EBAMCAYYwgYMGCCsGAQUFBwEBBHcwdTAoBggr
+BgEFBQcwAYYcaHR0cDovL29jc3Aub25lLmRpZ2ljZXJ0LmNvbTBJBggrBgEFBQcw
+AoY9aHR0cDovL2NhY2VydHMub25lLmRpZ2ljZXJ0LmNvbS9UZWxlY29tSW5mcmFQ
+cm9qZWN0Um9vdENBLmNydDBKBgNVHR8EQzBBMD+gPaA7hjlodHRwOi8vY3JsLm9u
+ZS5kaWdpY2VydC5jb20vVGVsZWNvbUluZnJhUHJvamVjdFJvb3RDQS5jcmwwDQYJ
+KoZIhvcNAQELBQADggEBAFbz+K94bHIkBMJqps0dApniUmOn0pO6Q6cGh47UP/kX
+IiPIsnYgG+hqYD/qtsiqJhaWi0hixRWn38UmvZxMRk27aSTGE/TWx0JTC3qDGsSe
+XkUagumbSfmS0ZyiTwMPeGAjXwyzGorqZWeA95eKfImntMiOf3E7//GK0K7HpCx8
+IPCnLZsZD2q/mLyBsduImFIRQJbLAhwIxpcd1qYJk+BlGFL+HtBpEbq6JxW2Xy+v
+DpNWc2WIsUTle0rTc9JNJrLX4ChUJmKqf8obKHap3Xh3//qw/jDB9pOAinA33FLJ
+EmCnwBvQr9mfNmPBGMYZVU8cPruDQJ57GjmmvdisbJY=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDojCCAoqgAwIBAgIUPVYBpqNbcLYygF6Mx+qxSWwQyFowDQYJKoZIhvcNAQEL
+BQAwaTELMAkGA1UEBhMCVVMxJDAiBgNVBAoTG1RlbGVjb20gSW5mcmEgUHJvamVj
+dCwgSW5jLjEMMAoGA1UECxMDVElQMSYwJAYDVQQDEx1UZWxlY29tIEluZnJhIFBy
+b2plY3QgUm9vdCBDQTAeFw0yMTA0MTMyMjQyNDRaFw0zMTA0MTMyMjM4NDZaMGkx
+CzAJBgNVBAYTAlVTMSQwIgYDVQQKExtUZWxlY29tIEluZnJhIFByb2plY3QsIElu
+Yy4xDDAKBgNVBAsTA1RJUDEmMCQGA1UEAxMdVGVsZWNvbSBJbmZyYSBQcm9qZWN0
+IFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDIGCibwf5u
+AAwZ+1H8U0e3u2V+0d2gSctucoK86XwUmfe1V2a/qlCYZd29r80IuN1IIeB0naIm
+KnK/MzXW87clF6tFd1+HzEvmlY/W4KyIXalVCTEzirFSvBEG2oZpM0yC3AefytAO
+aOpA00LaM3xTfTqMKIRhJBuLy0I4ANUVG6ixVebbGuc78IodleqiLoWy2Q9QHyEO
+t/7hZndJhiVogh0PveRhho45EbsACu7ymDY+JhlIleevqwlE3iQoq0YcmYADHno6
+Eq8vcwLpZFxihupUafkd1T3WJYQAJf9coCjBu2qIhNgrcrGD8R9fGswwNRzMRMpX
+720+GjcDW3bJAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFAJG
+lmB5sVP2qfL3xZ8hQOTpkQH6MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsF
+AAOCAQEAVjl9dm4epG9NUYnagT9sg7scVQEPfz3Lt6w1NXJXgD8mAUlK0jXmEyvM
+dCPD4514n+8+lM7US8fh+nxc7jO//LwK17Wm9FblgjNFR7+anv0Q99T9fP19DLlF
+PSNHL2emogy1bl1lLTAoj8nxg2wVKPDSHBGviQ5LR9fsWUIJDv9Bs5k0qWugWYSj
+19S6qnHeskRDB8MqRLhKMG82oDVLerSnhD0P6HjySBHgTTU7/tYS/OZr1jI6MPbG
+L+/DtiR5fDVMNdBSGU89UNTi0wHY9+RFuNlIuvZC+x/swF0V9R5mN+ywquTPtDLA
+5IOM7ItsRmen6u3qu+JXros54e4juQ==
+-----END CERTIFICATE-----

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/lib/target/inc/vif.h

@@ -37,5 +37,6 @@ void vif_hs20_update(struct schema_Hotspot20_Config *hs2conf);
 void vif_hs20_osu_update(struct schema_Hotspot20_OSU_Providers *hs2osuconf);
 void vif_hs20_icon_update(struct schema_Hotspot20_Icon_Config *hs2iconconf);
 void vif_section_del(char *section_name);
+void vif_check_radius_proxy(void);
 
 #endif

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

@@ -525,7 +525,6 @@ void opennds_section_del(char *section_name)
 	uci_commit(nds_ctx, &opennds, false);
 	uci_unload(nds_ctx, opennds);
 	uci_free_context(nds_ctx);
-	reload_config = 1;
 }
 
 void vif_captive_portal_set(const struct schema_Wifi_VIF_Config *vconf, char *ifname)

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

@@ -31,10 +31,12 @@
 ovsdb_table_t table_Hotspot20_Config;
 ovsdb_table_t table_Hotspot20_OSU_Providers;
 ovsdb_table_t table_Hotspot20_Icon_Config;
+ovsdb_table_t table_Radius_Proxy_Config;
 
 ovsdb_table_t table_APC_Config;
 ovsdb_table_t table_APC_State;
 unsigned int radproxy_apc = 0;
+extern json_t* ovsdb_table_where(ovsdb_table_t *table, void *record);
 
 static struct uci_package *wireless;
 struct uci_context *uci;
@@ -77,7 +79,7 @@ static const struct blobmsg_policy wifi_device_policy[__WDEV_ATTR_MAX] = {
 	[WDEV_ATTR_RX_ANTENNA] = { .name = "rxantenna", .type = BLOBMSG_TYPE_INT32 },
 	[WDEV_ATTR_FREQ_BAND] = { .name = "freq_band", .type = BLOBMSG_TYPE_STRING },
 	[WDEV_AATR_CHANNELS] = {.name = "channels", .type = BLOBMSG_TYPE_ARRAY},
-        [WDEV_ATTR_DISABLE_B_RATES] = { .name = "legacy_rates", .type = BLOBMSG_TYPE_BOOL },
+	[WDEV_ATTR_DISABLE_B_RATES] = { .name = "legacy_rates", .type = BLOBMSG_TYPE_BOOL },
 	[WDEV_ATTR_MAXASSOC_CLIENTS] = { .name = "maxassoc", .type = BLOBMSG_TYPE_INT32 },
 	[WDEV_ATTR_LOCAL_PWR_CONSTRAINT] = { .name = "local_pwr_constraint", .type = BLOBMSG_TYPE_INT32 },
 };
@@ -462,7 +464,7 @@ static void periodic_task(void *arg)
 	}
 
 	if (reload_config) {
-		LOGT("periodic: reload config");
+		LOGD("periodic: reload_config");
 		reload_config = 0;
 		uci_commit_all(uci);
 		sync();
@@ -742,6 +744,10 @@ static void callback_APC_State(ovsdb_update_monitor_t *mon,
 		radproxy_apc = 0;
 		system("ubus call service event '{\"type\": \"config.change\", \"data\": { \"package\": \"wireless\" }}'");
 	}
+
+	/* APC changed: start / stop radius proxy service if needed */
+	vif_check_radius_proxy();
+
 }
 
 struct schema_APC_State apc_state;
@@ -775,12 +781,12 @@ void apc_state_set(struct blob_attr *msg)
 			       blobmsg_get_string(tb[APC_ATTR_MODE]));
 	}
 	if (tb[APC_ATTR_DR_ADDR]) {
-		LOGD("APC br-addr: %s", blobmsg_get_string(tb[APC_ATTR_DR_ADDR]));
+		LOGD("APC dr-addr: %s", blobmsg_get_string(tb[APC_ATTR_DR_ADDR]));
 		SCHEMA_SET_STR(apc_state.dr_addr,
 			       blobmsg_get_string(tb[APC_ATTR_DR_ADDR]));
 	}
 	if (tb[APC_ATTR_BDR_ADDR]) {
-		LOGD("APC dbr-addr: %s", blobmsg_get_string(tb[APC_ATTR_BDR_ADDR]));
+		LOGD("APC bdr-addr: %s", blobmsg_get_string(tb[APC_ATTR_BDR_ADDR]));
 		SCHEMA_SET_STR(apc_state.bdr_addr,
 			       blobmsg_get_string(tb[APC_ATTR_BDR_ADDR]));
 	}
@@ -794,21 +800,120 @@ void apc_state_set(struct blob_attr *msg)
 		}
 	}
 
-	LOGD("APC_state Updating");
+	LOGI("APC_state Updating: mode: %s, dr-addr: %s bdr-addr: %s", 
+	     apc_state.mode, apc_state.dr_addr, apc_state.bdr_addr);
+
 	if (!ovsdb_table_update(&table_APC_State, &apc_state))
 		LOG(ERR, "APC_state: failed to update");
+
 }
 
+static ovsdb_table_t table_Manager;
+static int conn_since = 0;
+#define APC_CLOUD_MON_PERIOD 60
+
+static void apc_enable(bool flag) {
+
+	SCHEMA_SET_INT(apc_conf.enabled, flag);
+	if (!ovsdb_table_update(&table_APC_Config, &apc_conf)) {
+		LOG(ERR, "%s:APC_Config: failed to update", __func__);
+		return;
+	}
+	LOGI("APC %s: %s APC", __func__, flag?"enable":"disable");
+
+}
+
+static void
+apc_cld_mon_cb(struct schema_Manager *mgr)
+{
+	int i = 0;
+	conn_since = 0;
+	struct schema_APC_State apc_state;
+	json_t *where;
+	int ret = 0;
+	int link = 1;
+
+	where = ovsdb_table_where(&table_APC_State, &apc_state);
+	if (false == ovsdb_table_select_one_where(&table_APC_State,
+						  where, &apc_state)) {
+		LOG(ERR, "%s: APC_State read failed", __func__);
+		return;
+	}
+
+
+	/*Checks if wan ethernet port is down and disables apc*/
+	ret = system("/bin/check_wan_link.sh");
+	if (WIFEXITED(ret)) {
+		LOGI("The return value: %d\n", WEXITSTATUS(ret));
+		link = WEXITSTATUS(ret);
+		if (link == 0) {
+			apc_enable(false);
+			return;
+		}
+	}
+
+	/*if cloud conn is false then disable apc*/
+	if (mgr->is_connected == false) {
+			apc_enable(false);
+	}
+	else {
+		for(i=0; i < mgr->status_len; i++) {
+			if(!strncmp(mgr->status_keys[i] , "sec_since_connect",
+					       strlen("sec_since_connect"))) {
+				conn_since = atoi(mgr->status[i]);
+				LOGI("conn_since: %d", conn_since);
+				break;
+			}
+		}
+
+		/*if the APC was stopped earlier, start it if connection good
+		 * for atleast 60 secs*/
+		if (!apc_state.enabled && conn_since > APC_CLOUD_MON_PERIOD) {
+			apc_enable(true);
+		}
+	}
+}
+
+/*Monitor the cloud connection*/
+static void callback_Manager(ovsdb_update_monitor_t *mon,
+			     struct schema_Manager *old,
+			     struct schema_Manager *conf)
+{
+	switch (mon->mon_type)
+	{
+	case OVSDB_UPDATE_NEW:
+	case OVSDB_UPDATE_MODIFY:
+		apc_cld_mon_cb(conf);
+		break;
+
+	case OVSDB_UPDATE_DEL:
+		apc_enable(false);
+		break;
+
+	default:
+		break;
+	}
+	return;
+}
+
+void cloud_disconn_mon(void)
+{
+	OVSDB_TABLE_INIT_NO_KEY(Manager);
+	OVSDB_TABLE_MONITOR(Manager, false);
+}
 
 void apc_init()
 {
 	/* APC Config */
-	OVSDB_TABLE_INIT(APC_Config, _uuid);
+	OVSDB_TABLE_INIT_NO_KEY(APC_Config);
 	OVSDB_TABLE_MONITOR(APC_Config, false);
-	SCHEMA_SET_INT(apc_conf.enabled, true);
+	/* Disable APC by default, enable when cloud connected*/
+	SCHEMA_SET_INT(apc_conf.enabled, false);
 	LOGI("APC state/config Initialize");
-	if (!ovsdb_table_insert(&table_APC_Config, &apc_conf))
+	if (!ovsdb_table_insert(&table_APC_Config, &apc_conf)) {
 		LOG(ERR, "APC_Config: failed to initialize");
+		return;
+	}
 
 	/* APC State */
 	OVSDB_TABLE_INIT_NO_KEY(APC_State);
@@ -817,8 +922,16 @@ void apc_init()
 	SCHEMA_SET_STR(apc_state.dr_addr, "0.0.0.0");
 	SCHEMA_SET_STR(apc_state.bdr_addr, "0.0.0.0");
 	SCHEMA_SET_INT(apc_state.enabled, false);
-	if (!ovsdb_table_insert(&table_APC_State, &apc_state))
+	if (!ovsdb_table_insert(&table_APC_State, &apc_state)) {
 		LOG(ERR, "APC_state: failed to initialize");
+		return;
+	}
+
+	/* Cloud connection monitor - if cloud unreachable
+	 * for certain time, disable APC and enable after the
+	 * cloud connection becomes stable. */
+	cloud_disconn_mon();
+
 }
 
 bool target_radio_init(const struct target_radio_ops *ops)
@@ -849,12 +962,12 @@ bool target_radio_init(const struct target_radio_ops *ops)
 	OVSDB_TABLE_INIT(Radius_Proxy_Config, _uuid);
 	OVSDB_TABLE_MONITOR(Radius_Proxy_Config, false);
 
-	apc_init();
 
 	evsched_task(&periodic_task, NULL, EVSCHED_SEC(5));
 
 	radio_nl80211_init();
 	radio_ubus_init();
+	apc_init();
 
 	clock_gettime(CLOCK_MONOTONIC, &startup_time);
 

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

@@ -50,7 +50,8 @@
 extern struct ev_loop *wifihal_evloop;
 extern ovsdb_table_t table_Wifi_VIF_State;
 extern ovsdb_table_t table_Wifi_Associated_Clients;
-static struct unl unl;
+static struct unl unl_req;
+static struct unl unl_notify;
 static ev_io unl_io;
 
 static int avl_addrcmp(const void *k1, const void *k2, void *ptr)
@@ -471,10 +472,10 @@ int nl80211_channel_get(char *name, unsigned int *chan)
 	if (!idx)
 		return -1;
 
-	msg = unl_genl_msg(&unl, NL80211_CMD_GET_INTERFACE, true);
+	msg = unl_genl_msg(&unl_req, NL80211_CMD_GET_INTERFACE, true);
 	nla_put_u32(msg, NL80211_ATTR_IFINDEX, idx);
 
-	unl_genl_request(&unl, msg, nl80211_channel_recv, chan);
+	unl_genl_request(&unl_req, msg, nl80211_channel_recv, chan);
 
 	phy->current_channel = *chan;
 
@@ -562,7 +563,7 @@ static void nl80211_ev(struct ev_loop *ev, struct ev_io *io, int event)
 	nl_cb_set(cb, NL_CB_FINISH, NL_CB_CUSTOM, finish_handler, NULL);
 	nl_cb_set(cb, NL_CB_SEQ_CHECK, NL_CB_CUSTOM, no_seq_check, NULL);
 	nl_cb_set(cb, NL_CB_VALID, NL_CB_CUSTOM, nl80211_recv, NULL);
-	nl_recvmsgs(unl.sock, cb);
+	nl_recvmsgs(unl_notify.sock, cb);
 	nl_cb_put(cb);
 }
 
@@ -580,24 +581,33 @@ int radio_nl80211_init(void)
 {
 	struct nl_msg *msg;
 
-	if (unl_genl_init(&unl, "nl80211") < 0) {
+	if (unl_genl_init(&unl_req, "nl80211") < 0) {
 		syslog(0, "nl80211: failed to connect\n");
 		return -1;
 	}
 
-	msg = unl_genl_msg(&unl, NL80211_CMD_GET_WIPHY, true);
-	unl_genl_request(&unl, msg, nl80211_recv, NULL);
-	msg = unl_genl_msg(&unl, NL80211_CMD_GET_INTERFACE, true);
-	unl_genl_request(&unl, msg, nl80211_recv, NULL);
+	if (unl_genl_init(&unl_notify, "nl80211") < 0) {
+		syslog(0, "nl80211: failed to connect\n");
+		return -1;
+	}
 
-	unl_genl_subscribe(&unl, "config");
-	unl_genl_subscribe(&unl, "mlme");
-	unl_genl_subscribe(&unl, "vendor");
+	msg = unl_genl_msg(&unl_req, NL80211_CMD_GET_WIPHY, true);
+	unl_genl_request(&unl_req, msg, nl80211_recv, NULL);
+	msg = unl_genl_msg(&unl_req, NL80211_CMD_GET_INTERFACE, true);
+	unl_genl_request(&unl_req, msg, nl80211_recv, NULL);
 
-	if (nl_socket_set_buffer_size(unl.sock, 262144, 0) < 0)
+	unl_genl_subscribe(&unl_notify, "config");
+	unl_genl_subscribe(&unl_notify, "mlme");
+	unl_genl_subscribe(&unl_notify, "vendor");
+
+
+	if (nl_socket_set_buffer_size(unl_notify.sock, 262144, 0) < 0)
 		LOGE("radio_nl80211: Failed to set nl socket buffer size");
 
-	ev_io_init(&unl_io, nl80211_ev, unl.sock->s_fd, EV_READ);
+	if (nl_socket_set_nonblocking(unl_notify.sock))
+		LOGE("radio_nl80211: Failed to set socket in the non blocking mode");
+
+	ev_io_init(&unl_io, nl80211_ev, unl_notify.sock->s_fd, EV_READ);
         ev_io_start(wifihal_evloop, &unl_io);
 	evsched_task(&vif_poll_stations, NULL, EVSCHED_SEC(5));
 

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

@@ -27,7 +27,6 @@
 #include "utils.h"
 #include "radius_proxy.h"
 
-ovsdb_table_t table_Radius_Proxy_Config;
 struct blob_buf uci_buf = {};
 struct blob_attr *n;
 extern ovsdb_table_t table_APC_State;
@@ -35,11 +34,13 @@ extern json_t* ovsdb_table_where(ovsdb_table_t *table, void *record);
 
 enum {
 	RADIUS_PROXY_OPTIONS_LISTEN_UDP,
+	RADIUS_PROXY_OPTIONS_NAME,
 	__RADIUS_PROXY_OPTIONS_MAX
 };
 
 enum {
 	RADIUS_PROXY_CLIENT_NAME,
+	RADIUS_PROXY_CLIENT_HOST,
 	RADIUS_PROXY_CLIENT_TYPE,
 	RADIUS_PROXY_CLIENT_SECRET,
 	__RADIUS_PROXY_CLIENT_MAX
@@ -76,10 +77,12 @@ enum {
 
 static const struct blobmsg_policy radius_proxy_options_policy[__RADIUS_PROXY_OPTIONS_MAX] = {
 		[RADIUS_PROXY_OPTIONS_LISTEN_UDP] = { .name = "ListenUDP", BLOBMSG_TYPE_ARRAY },
+		[RADIUS_PROXY_OPTIONS_NAME] = { .name = "name", BLOBMSG_TYPE_STRING },
 };
 
 static const struct blobmsg_policy radius_proxy_client_policy[__RADIUS_PROXY_CLIENT_MAX] = {
 		[RADIUS_PROXY_CLIENT_NAME] = { .name = "name", BLOBMSG_TYPE_STRING },
+		[RADIUS_PROXY_CLIENT_HOST] = { .name = "host", BLOBMSG_TYPE_STRING },
 		[RADIUS_PROXY_CLIENT_TYPE] = { .name = "type", BLOBMSG_TYPE_STRING },
 		[RADIUS_PROXY_CLIENT_SECRET] = { .name = "secret", BLOBMSG_TYPE_STRING },
 };
@@ -209,9 +212,9 @@ static bool radsec_download_cert(char *cert_name, char *dir_name, char *cert_url
 	return true;
 }
 
-static bool radius_proxy_config_set(struct schema_Radius_Proxy_Config *conf )
+static bool radius_proxy_config_set(struct schema_Radius_Proxy_Config *conf)
 {
-	int i=0;
+	int i = 0;
 	char path[200];
 	char name[256];
 	char server_name[256] = {};
@@ -219,7 +222,6 @@ static bool radius_proxy_config_set(struct schema_Radius_Proxy_Config *conf )
 	char tls_name[256] = {};
 	struct schema_APC_State apc_conf;
 
-	/* Configure only if APC selects this as master AP (DR) */
 	json_t *where = ovsdb_table_where(&table_APC_State, &apc_conf);
 	if (false == ovsdb_table_select_one_where(&table_APC_State,
 			where, &apc_conf)) {
@@ -227,27 +229,26 @@ static bool radius_proxy_config_set(struct schema_Radius_Proxy_Config *conf )
 		return false;
 	}
 
-	if (!strncmp(apc_conf.mode, "OR", 2) || !strncmp(apc_conf.mode, "BDR", 2))
-		return false;
-
 	/* Configure options block */
 	blob_buf_init(&uci_buf, 0);
 	n = blobmsg_open_array(&uci_buf,"ListenUDP");
-	blobmsg_add_string(&uci_buf, NULL, "127.0.0.1:1812");
-	blobmsg_add_string(&uci_buf, NULL, "127.0.0.1:1813");
+	blobmsg_add_string(&uci_buf, NULL, "*:1812");
+	blobmsg_add_string(&uci_buf, NULL, "*:1813");
 	blobmsg_close_array(&uci_buf, n);
 	memset(name, '\0', sizeof(name));
 	sprintf(name, "%s%s", conf->radius_config_name, "options");
+	blobmsg_add_string(&uci_buf, "name", name);
 	blob_to_uci_section(uci, "radsecproxy", name, "options",
 			uci_buf.head, &radius_proxy_options_param, NULL);
 
 	/* Configure client block */
 	blob_buf_init(&uci_buf, 0);
-	blobmsg_add_string(&uci_buf, "name", "localhost");
+	blobmsg_add_string(&uci_buf, "host", "0.0.0.0/0");
 	blobmsg_add_string(&uci_buf, "type", "udp");
 	blobmsg_add_string(&uci_buf, "secret", "secret");
 	memset(name, '\0', sizeof(name));
 	sprintf(name, "%s%s", conf->radius_config_name, "client");
+	blobmsg_add_string(&uci_buf, "name", name);
 	blob_to_uci_section(uci, "radsecproxy", name, "client",
 			uci_buf.head, &radius_proxy_client_param, NULL);
 
@@ -397,11 +398,12 @@ void callback_Radius_Proxy_Config(ovsdb_update_monitor_t *self,
 	case OVSDB_UPDATE_NEW:
 	case OVSDB_UPDATE_MODIFY:
 		(void) radius_proxy_config_set(conf);
+		vif_check_radius_proxy();
 		break;
 
 	case OVSDB_UPDATE_DEL:
 		(void) radius_proxy_config_delete();
-		(void) radius_proxy_config_set(conf);
+		vif_check_radius_proxy();
 		break;
 
 	default:

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/vif.c

@@ -32,6 +32,7 @@
 
 extern ovsdb_table_t table_Wifi_VIF_Config;
 extern ovsdb_table_t table_Hotspot20_Icon_Config;
+extern ovsdb_table_t table_Radius_Proxy_Config;
 
 extern struct blob_buf b;
 extern struct blob_buf del;
@@ -1047,14 +1048,11 @@ void vif_section_del(char *section_name)
 	reload_config = 1;
 }
 
-static void vif_check_radius_proxy()
+void vif_check_radius_proxy()
 {
-	struct uci_context *uci_ctx;
-	struct uci_package *wireless;
 	struct schema_APC_State apc_conf;
-	struct uci_element *e = NULL, *tmp = NULL;
-	char *buf = NULL;
-	int rc = 0;
+	int n = 0;
+	void *buf = NULL;
 
 	json_t *where = ovsdb_table_where(&table_APC_State, &apc_conf);
 	if (false == ovsdb_table_select_one_where(&table_APC_State, where, &apc_conf))
@@ -1063,49 +1061,29 @@ static void vif_check_radius_proxy()
 		return;
 	}
 
-	uci_ctx = uci_alloc_context();
-	rc = uci_load(uci_ctx, "wireless", &wireless);
-
-	if (rc) {
-		LOGE("%s: uci_load() failed with rc %d", __func__, rc);
-		goto free;
-	}
-
-	uci_foreach_element_safe(&wireless->sections, tmp, e)
+	buf = ovsdb_table_select_where(&table_Radius_Proxy_Config, NULL, &n);
+	if (!buf)
 	{
-		struct blob_attr *tb[__WIF_ATTR_MAX];
-		struct uci_section *s = uci_to_section(e);
-		if ((s == NULL) || (s->type == NULL))
-			continue;
+		LOGI("Radius_Proxy_Config table doesn't exist.  Stop radsecproxy service.");
+		system("/etc/init.d/radsecproxy stop");
+		return;
+	}
+	else if (!strcmp(apc_conf.mode, "DR"))
+	{
+		if (!system("pidof radsecproxy"))
+			goto out;
 
-		if (strcmp(s->type, "wifi-iface"))
-			continue;
-
-		blob_buf_init(&b, 0);
-		uci_to_blob(&b, s, &wifi_iface_param);
-		blobmsg_parse(wifi_iface_policy, __WIF_ATTR_MAX, tb, blob_data(b.head), blob_len(b.head));
-
-		if (tb[WIF_ATTR_RADPROXY])
-		{
-			buf = blobmsg_get_string(tb[WIF_ATTR_RADPROXY]);
-
-			if (!strcmp(buf, "1") && !strcmp(apc_conf.mode, "DR"))
-			{
-				if (!system("pidof radsecproxy"))
-					goto free;
-
-				system("/etc/init.d/radsecproxy start");
-
-				goto free;
-			}
-		}
+		LOGI("Start radsecproxy service.");
+		system("/etc/init.d/radsecproxy start");
+	}
+	else
+	{
+		LOGI("Not DR. Stop radsecproxy service.");
+		system("/etc/init.d/radsecproxy stop");
 	}
 
-	system("/etc/init.d/radsecproxy stop");
-
-free:
-	uci_unload(uci_ctx, wireless);
-	uci_free_context(uci_ctx);
+out:
+	free(buf);
 	return;
 }
 
@@ -1660,9 +1638,6 @@ static int ap_vif_config_set(const struct schema_Wifi_Radio_Config *rconf,
 		vif_dhcp_opennds_allowlist_set(vconf,(char*)vconf->if_name);
 	}
 
-	if (changed->custom_options)
-		vif_check_radius_proxy();
-
 	reload_config = 1;
 	return 0;
 }

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

@@ -249,48 +249,28 @@ int main(int argc, char ** argv)
 	backtrace_init();
 
 	json_memdbg_init(loop);
-#if 0
-	if (!dpp_init())
-	{
-        	LOG(ERR,
-            	"Initializing SM "
-            	"(Failed to init DPP library)");
-		return -1;
-	}
 
-	if (!uccm_mqtt_init())
-	{
-		LOG(ERR,
-		"Initializing SM "
-		"(Failed to start MQTT)");
-		return -1;
-	}
-#endif
 	if (!ovsdb_init_loop(loop, "UCCM")) {
 		LOGEM("Initializing UCCM (Failed to initialize OVSDB)");
 		return -1;
 	}
-	evsched_init(loop);
 
 	callback cb = recv_process;
 	LOGI("Call interap_recv");
 	if( interap_recv(IAC_VOIP_PORT, cb, sizeof(struct voip_session),
 			 loop, &iac_io) < 0) {
+		interap_rcv_close();
 		LOGI("Error: Failed InterAP receive");
 		return 1;
 	}
 
-//	task_init();
+	evsched_init(loop);
 	netlink_listen(loop);
-//	command_ubus_init(loop);
 
 	ev_run(loop, 0);
 
 	if (!ovsdb_stop_loop(loop))
 		LOGE("Stopping UCCM (Failed to stop OVSDB");
-#if 0
-	uccm_mqtt_stop();
-#endif
 	ev_default_destroy();
 
 	interap_rcv_close();

feeds/wlan-ap/wlan-ap-config/files/etc/hotplug.d/iface/40-fix-lan-wan-ip-conflict

@@ -0,0 +1,25 @@
+#!/bin/sh
+
+[ "$ACTION" = ifup -o "$ACTION" = ifupdate ] || exit 0
+[ "$INTERFACE" = wan ] || exit 0
+
+conflict=0
+wan_ipaddr="$(ubus call network.interface.wan status | grep \"address\" | grep -oE '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}')"
+lan_ipaddr="$(ubus call network.interface.lan status | grep \"address\" | grep -oE '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}')"
+logger -t hotplug "$ACTION of $INTERFACE ($DEVICE) $wan_ipaddr"
+
+[ "$wan_ipaddr" = "192.168.1" ] && [ "$lan_ipaddr" = "192.168.1" ] && {
+    conflict=1
+    dest_ip="192.168.0.1"
+}
+[ "$wan_ipaddr" = "192.168.0" ] && [ "$lan_ipaddr" = "192.168.0" ] && {
+    conflict=1
+    dest_ip="192.168.1.1"
+}
+[ $conflict = 1 ] && {
+    logger -t hotplug "IP conflict with br-wan.  Switch br-lan to $dest_ip"
+    uci set network.lan.ipaddr="$dest_ip"
+    uci_commit
+    reload_config
+}
+exit 0

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

@@ -2,6 +2,8 @@
 
 uci set network.wan.type=bridge
 uci set network.wan6.ifname=@wan
+uci set network.wan.metric=1
+uci set network.lan.metric=10
 uci set network.wan.vlan_filtering=1
 uci set network.lan.vlan_filtering=1
 exit 0

patches/0027-ipq807x-add-the-Qualcomm-AX-target-support.patch

@@ -12281,14 +12281,14 @@ index 0000000000..6b0eb2f831
 ++		pinctrl-names = "default";
 ++
 ++		led@25 {
-++			label = "wifi5g";
-++			gpios = <&tlmm 35 GPIO_ACTIVE_HIGH>;
+++			label = "green:wifi5";
+++			gpios = <&tlmm 35 GPIO_ACTIVE_LOW>;
 ++			linux,default-trigger = "wf188:green:5g";
 ++			default-state = "off";
 ++		};
 ++		led@24 {
-++			label = "wifi2g";
-++			gpios = <&tlmm 37 GPIO_ACTIVE_HIGH>;
+++			label = "green:wifi2";
+++			gpios = <&tlmm 37 GPIO_ACTIVE_LOW>;
 ++			linux,default-trigger = "wf188:green:2g";
 ++			default-state = "off";
 ++		};

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/0054-ipq807x-add-edgecore-eap106-support.patch

@@ -0,0 +1,872 @@
+From 6c4680359a5e164570e5d8e0b75c4dafbb1abccd Mon Sep 17 00:00:00 2001
+From: "peter.chiu" <peter.chiu@4ipnet.com>
+Date: Thu, 24 Jun 2021 17:16:48 +0800
+Subject: [PATCH] ipq807x: add edgecore eap106 support
+
+---
+ .../linux/ipq807x/base-files/etc/board.d/01_leds   |   4 +
+ .../ipq807x/base-files/etc/board.d/02_network      |   1 +
+ .../etc/hotplug.d/firmware/10-ath11k-caldata       |   2 +
+ target/linux/ipq807x/base-files/etc/init.d/aq_phy  |   1 +
+ target/linux/ipq807x/image/ipq807x.mk              |  10 +
+ target/linux/ipq807x/patches/111-eap106.patch      | 765 +++++++++++++++++++++
+ 6 files changed, 783 insertions(+)
+ mode change 100644 => 100755 target/linux/ipq807x/image/ipq807x.mk
+ create mode 100644 target/linux/ipq807x/patches/111-eap106.patch
+
+diff --git a/target/linux/ipq807x/base-files/etc/board.d/01_leds b/target/linux/ipq807x/base-files/etc/board.d/01_leds
+index 1402a74..7225667 100755
+--- a/target/linux/ipq807x/base-files/etc/board.d/01_leds
++++ b/target/linux/ipq807x/base-files/etc/board.d/01_leds
+@@ -20,6 +20,10 @@ edgecore,eap102)
+         ucidef_set_led_wlan "wlan5g" "WLAN5G" "green:wifi5" "phy0tx"
+         ucidef_set_led_wlan "wlan2g" "WLAN2G" "green:wifi2" "phy1tx"
+ 	;;
++edgecore,eap106)
++	ucidef_set_led_netdev "wan" "WAN" "led1_yellow" "br-wan" "tx rx link"
++	ucidef_set_led_netdev "lan" "LAN" "led2_amber" "br-lan" "tx rx link"
++	;;
+ esac
+ 
+ board_config_flush
+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 e90a73f..72ba9e0 100755
+--- a/target/linux/ipq807x/base-files/etc/board.d/02_network
++++ b/target/linux/ipq807x/base-files/etc/board.d/02_network
+@@ -29,6 +29,7 @@ qcom_setup_interfaces()
+                 ;;
+ 	cig,wf194c|\
+ 	edgecore,eap102|\
++	edgecore,eap106|\
+ 	sercomm,wallaby)
+ 		ucidef_set_interface_lan "eth0"
+ 		ucidef_set_interface_wan "eth1"
+diff --git a/target/linux/ipq807x/base-files/etc/hotplug.d/firmware/10-ath11k-caldata b/target/linux/ipq807x/base-files/etc/hotplug.d/firmware/10-ath11k-caldata
+index 25b2288..2c35c06 100755
+--- a/target/linux/ipq807x/base-files/etc/hotplug.d/firmware/10-ath11k-caldata
++++ b/target/linux/ipq807x/base-files/etc/hotplug.d/firmware/10-ath11k-caldata
+@@ -49,6 +49,7 @@ case "$FIRMWARE" in
+ 	case "$board" in
+ 	cig,wf194c|\
+ 	edgecore,eap102 |\
++	edgecore,eap106 |\
+ 	qcom,ipq807x-hk01|\
+ 	qcom,ipq807x-hk14|\
+ 	tplink,ex227|\
+@@ -85,6 +86,7 @@ ath11k/qcn9000/hw1.0/caldata_2.bin)
+ ath11k-macs)
+ 	case "$board" in
+ 	edgecore,eap102|\
++	edgecore,eap106|\
+ 	cig,wf188n)
+ 		ath11k_generate_macs
+ 		;;
+diff --git a/target/linux/ipq807x/base-files/etc/init.d/aq_phy b/target/linux/ipq807x/base-files/etc/init.d/aq_phy
+index 41a52cc..5ff174d 100755
+--- a/target/linux/ipq807x/base-files/etc/init.d/aq_phy
++++ b/target/linux/ipq807x/base-files/etc/init.d/aq_phy
+@@ -6,6 +6,7 @@ boot() {
+ 	. /lib/functions.sh
+ 
+ 	case "$(board_name)" in
++	edgecore,eap106|\
+ 	cig,wf194c)
+ 		aq-fw-download /lib/firmware/AQR-G4_v5.4.B-AQR_CIG_WIFI_ID44715_VER1673.cld miireg 0 > /dev/null
+ 		sleep 1
+diff --git a/target/linux/ipq807x/image/ipq807x.mk b/target/linux/ipq807x/image/ipq807x.mk
+old mode 100644
+new mode 100755
+index 000d279..55c344b
+--- a/target/linux/ipq807x/image/ipq807x.mk
++++ b/target/linux/ipq807x/image/ipq807x.mk
+@@ -44,6 +44,16 @@ define Device/edgecore_eap102
+   DEVICE_PACKAGES := ath11k-wifi-edgecore-eap102 kmod-usb2 uboot-envtools
+ endef
+ TARGET_DEVICES += edgecore_eap102
++
++define Device/edgecore_eap106
++  DEVICE_TITLE := Edgecore EAP106
++  DEVICE_DTS := qcom-ipq807x-eap106
++  DEVICE_DTS_CONFIG=config@hk02
++  SUPPORTED_DEVICES := edgecore,eap106
++  DEVICE_PACKAGES := ath11k-wifi-edgecore-eap106 aq-fw-download uboot-envtools kmod-usb3 kmod-usb2
++endef
++TARGET_DEVICES += edgecore_eap106
++
+ define Device/tplink_ex227
+   DEVICE_TITLE := TP-Link EX227
+   DEVICE_DTS := qcom-ipq807x-ex227
+diff --git a/target/linux/ipq807x/patches/111-eap106.patch b/target/linux/ipq807x/patches/111-eap106.patch
+new file mode 100644
+index 0000000..632a688
+--- /dev/null
++++ b/target/linux/ipq807x/patches/111-eap106.patch
+@@ -0,0 +1,765 @@
++Index: linux-4.4.60-qsdk-10fd7d14853b7020b804acae690c8acec5d954ce/arch/arm64/boot/dts/qcom/qcom-ipq807x-eap106.dts
++===================================================================
++--- /dev/null
+++++ linux-4.4.60-qsdk-10fd7d14853b7020b804acae690c8acec5d954ce/arch/arm64/boot/dts/qcom/qcom-ipq807x-eap106.dts
++@@ -0,0 +1,716 @@
+++/dts-v1/;
+++/*
+++ * Copyright (c) 2017-2018, 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.
+++ */
+++#include "qcom-ipq807x-soc.dtsi"
+++#include "qcom-ipq807x-hk-cpu.dtsi"
+++
+++/ {
+++	#address-cells = <0x2>;
+++	#size-cells = <0x2>;
+++	model = "Qualcomm Technologies, Inc. IPQ807x/AP-HK02";
+++	compatible = "qcom,ipq807x-hk02", "qcom,ipq807x";
+++	qcom,msm-id = <0x143 0x0>;
+++	interrupt-parent = <&intc>;
+++	qcom,board-id = <0x8 0x0>;
+++	qcom,pmic-id = <0x0 0x0 0x0 0x0>;
+++
+++	aliases {
+++		/*
+++		 * Aliases as required by u-boot
+++		 * to patch MAC addresses
+++		 */
+++		ethernet0 = "/soc/dp1";
+++		ethernet1 = "/soc/dp2";
+++	};
+++	chosen {
+++		bootargs = "console=ttyMSM0,115200,n8 root=/dev/ram0 rw init=/init";
+++		#ifdef __IPQ_MEM_PROFILE_256_MB__
+++			bootargs-append = " swiotlb=1";
+++		#else
+++			bootargs-append = " swiotlb=1 coherent_pool=2M";
+++		#endif
+++	};
+++};
+++
+++&tlmm {
+++	leds_pins: leds_pinmux {
+++
+++		led1_yellow {
+++			pins = "gpio25";
+++			function = "gpio";
+++			drive-strength = <8>;
+++			bias-pull-down;
+++		};
+++		led1_green {
+++			pins = "gpio28";
+++			function = "gpio";
+++			drive-strength = <8>;
+++			bias-pull-down;
+++		};
+++		led2_amber {
+++			pins = "gpio29";
+++			function = "gpio";
+++			drive-strength = <8>;
+++			bias-pull-down;
+++		};
+++		led2_blue {
+++			pins = "gpio32";
+++			function = "gpio";
+++			drive-strength = <8>;
+++			bias-pull-down;
+++		};
+++	};
+++
+++	mdio_pins: mdio_pinmux {
+++		mux_0 {
+++			pins = "gpio68";
+++			function = "mdc";
+++			drive-strength = <8>;
+++			bias-pull-up;
+++		};
+++		mux_1 {
+++			pins = "gpio69";
+++			function = "mdio";
+++			drive-strength = <8>;
+++			bias-pull-up;
+++		};
+++	};
+++
+++	uart_pins: uart_pins {
+++		mux {
+++			pins = "gpio23", "gpio24";
+++			function = "blsp4_uart1";
+++			drive-strength = <8>;
+++			bias-disable;
+++		};
+++	};
+++
+++	i2c_0_pins: i2c_0_pinmux {
+++		mux {
+++			pins = "gpio42", "gpio43";
+++			function = "blsp1_i2c";
+++			drive-strength = <8>;
+++			bias-disable;
+++		};
+++	};
+++
+++	spi_0_pins: spi_0_pins {
+++		mux {
+++			pins = "gpio38", "gpio39", "gpio40", "gpio41";
+++			function = "blsp0_spi";
+++			drive-strength = <8>;
+++			bias-disable;
+++		};
+++	};
+++
+++	qpic_pins: qpic_pins {
+++		data_0 {
+++			pins = "gpio15";
+++			function = "qpic_pad0";
+++			drive-strength = <8>;
+++			bias-disable;
+++		};
+++		data_1 {
+++			pins = "gpio12";
+++			function = "qpic_pad1";
+++			drive-strength = <8>;
+++			bias-disable;
+++		};
+++		data_2 {
+++			pins = "gpio13";
+++			function = "qpic_pad2";
+++			drive-strength = <8>;
+++			bias-disable;
+++		};
+++		data_3 {
+++			pins = "gpio14";
+++			function = "qpic_pad3";
+++			drive-strength = <8>;
+++			bias-disable;
+++		};
+++		data_4 {
+++			pins = "gpio5";
+++			function = "qpic_pad4";
+++			drive-strength = <8>;
+++			bias-disable;
+++		};
+++		data_5 {
+++			pins = "gpio6";
+++			function = "qpic_pad5";
+++			drive-strength = <8>;
+++			bias-disable;
+++		};
+++		data_6 {
+++			pins = "gpio7";
+++			function = "qpic_pad6";
+++			drive-strength = <8>;
+++			bias-disable;
+++		};
+++		data_7 {
+++			pins = "gpio8";
+++			function = "qpic_pad7";
+++			drive-strength = <8>;
+++			bias-disable;
+++		};
+++		data_8 {
+++			pins = "gpio16";
+++			function = "qpic_pad8";
+++			drive-strength = <8>;
+++			bias-disable;
+++		};
+++		qpic_pad {
+++			pins = "gpio0", "gpio1", "gpio2", "gpio3", "gpio4",
+++			       "gpio9", "gpio10", "gpio11", "gpio17";
+++			function = "qpic_pad";
+++			drive-strength = <8>;
+++			bias-disable;
+++		};
+++	};
+++
+++	hsuart_pins: hsuart_pins {
+++		mux {
+++			pins = "gpio46", "gpio47", "gpio48", "gpio49";
+++			function = "blsp2_uart";
+++			drive-strength = <8>;
+++			bias-disable;
+++			output-low;
+++		};
+++		mux_1 {
+++			pins = "gpio51";
+++			function = "gpio";
+++			drive-strength = <8>;
+++			bias-disable;
+++			output-high;
+++		};
+++	};
+++
+++	button_pins: button_pins {
+++		wps_button {
+++			pins = "gpio57";
+++			function = "gpio";
+++			drive-strength = <8>;
+++			bias-pull-up;
+++		};
+++	};
+++
+++	uniphy_pins: uniphy_pinmux {
+++		mux {
+++			pins = "gpio60";
+++			function = "rx2";
+++			bias-disable;
+++		};
+++	};
+++	cnss_wlan_en_active: cnss_wlan_en_active {
+++		mux {
+++			pins = "gpio57";
+++			function = "gpio";
+++			drive-strength = <16>;
+++			output-high;
+++			bias-pull-up;
+++		};
+++	};
+++
+++	cnss_wlan_en_sleep: cnss_wlan_en_sleep {
+++		mux {
+++			pins = "gpio57";
+++			function = "gpio";
+++			drive-strength = <2>;
+++			output-low;
+++			bias-pull-down;
+++		};
+++	};
+++};
+++
+++&soc {
+++	gpio_keys {
+++		compatible = "gpio-keys";
+++		pinctrl-0 = <&button_pins>;
+++		pinctrl-names = "default";
+++
+++		button@1 {
+++			label = "wps";
+++			linux,code = <KEY_WPS_BUTTON>;
+++			gpios = <&tlmm 57 GPIO_ACTIVE_LOW>;
+++			linux,input-type = <1>;
+++			debounce-interval = <60>;
+++		};
+++	};
+++
+++	leds {
+++		compatible = "gpio-leds";
+++		pinctrl-0 = <&leds_pins>;
+++		pinctrl-names = "default";
+++
+++		led@25 {
+++			label = "led1_yellow";
+++			gpios = <&tlmm 25 GPIO_ACTIVE_HIGH>;
+++			linux,default-trigger = "led1_yellow";
+++			default-state = "off";
+++		};
+++
+++		led@28 {
+++			label = "led1_green";
+++			gpios = <&tlmm 28 GPIO_ACTIVE_HIGH>;
+++			linux,default-trigger = "led1_green";
+++			default-state = "off";
+++		};
+++
+++		led@29 {
+++			label = "led2_amber";
+++			gpios = <&tlmm 29 GPIO_ACTIVE_HIGH>;
+++			linux,default-trigger = "led2_amber";
+++			default-state = "off";
+++		};
+++
+++		led@32 {
+++			label = "led2_blue";
+++			gpio = <&tlmm 32 GPIO_ACTIVE_HIGH>;
+++			linux,default-trigger = "led2_blue";
+++			default-state = "off";
+++		};
+++	};
+++
+++	mdio@90000 {
+++		pinctrl-0 = <&mdio_pins>;
+++		pinctrl-names = "default";
+++		phy-reset-gpio = <&tlmm 37 0>;
+++		phy0: ethernet-phy@0 {
+++			reg = <0>;
+++		};
+++		phy1: ethernet-phy@1 {
+++			reg = <1>;
+++		};
+++		phy2: ethernet-phy@2 {
+++			reg = <2>;
+++		};
+++		phy3: ethernet-phy@3 {
+++			reg = <3>;
+++		};
+++		phy4: ethernet-phy@4 {
+++			reg = <4>;
+++		};
+++		phy5: ethernet-phy@5 {
+++			compatible ="ethernet-phy-ieee802.3-c45";
+++			reg = <8>;
+++		};
+++	};
+++
+++	ess-switch@3a000000 {
+++		pinctrl-0 = <&uniphy_pins>;
+++		pinctrl-names = "default";
+++		switch_cpu_bmp = <0x1>;  /* cpu port bitmap */
+++		switch_lan_bmp = <0x30>; /* lan port bitmap */
+++		switch_wan_bmp = <0x40>; /* wan port bitmap */
+++		switch_mac_mode = <0x0>; /* mac mode for uniphy instance0*/
+++		switch_mac_mode1 = <0xff>; /* mac mode for uniphy instance1*/
+++		switch_mac_mode2 = <0xd>; /* mac mode for uniphy instance2*/
+++		bm_tick_mode = <0>; /* bm tick mode */
+++		tm_tick_mode = <0>; /* tm tick mode */
+++		port_scheduler_resource {
+++			port@0 {
+++				port_id = <0>;
+++				ucast_queue = <0 143>;
+++				mcast_queue = <256 271>;
+++				l0sp = <0 35>;
+++				l0cdrr = <0 47>;
+++				l0edrr = <0 47>;
+++				l1cdrr = <0 7>;
+++				l1edrr = <0 7>;
+++			};
+++			port@1 {
+++				port_id = <1>;
+++				ucast_queue = <144 159>;
+++				mcast_queue = <272 275>;
+++				l0sp = <36 39>;
+++				l0cdrr = <48 63>;
+++				l0edrr = <48 63>;
+++				l1cdrr = <8 11>;
+++				l1edrr = <8 11>;
+++			};
+++			port@2 {
+++				port_id = <2>;
+++				ucast_queue = <160 175>;
+++				mcast_queue = <276 279>;
+++				l0sp = <40 43>;
+++				l0cdrr = <64 79>;
+++				l0edrr = <64 79>;
+++				l1cdrr = <12 15>;
+++				l1edrr = <12 15>;
+++			};
+++			port@3 {
+++				port_id = <3>;
+++				ucast_queue = <176 191>;
+++				mcast_queue = <280 283>;
+++				l0sp = <44 47>;
+++				l0cdrr = <80 95>;
+++				l0edrr = <80 95>;
+++				l1cdrr = <16 19>;
+++				l1edrr = <16 19>;
+++			};
+++			port@4 {
+++				port_id = <4>;
+++				ucast_queue = <192 207>;
+++				mcast_queue = <284 287>;
+++				l0sp = <48 51>;
+++				l0cdrr = <96 111>;
+++				l0edrr = <96 111>;
+++				l1cdrr = <20 23>;
+++				l1edrr = <20 23>;
+++			};
+++			port@5 {
+++				port_id = <5>;
+++				ucast_queue = <208 223>;
+++				mcast_queue = <288 291>;
+++				l0sp = <52 55>;
+++				l0cdrr = <112 127>;
+++				l0edrr = <112 127>;
+++				l1cdrr = <24 27>;
+++				l1edrr = <24 27>;
+++			};
+++			port@6 {
+++				port_id = <6>;
+++				ucast_queue = <224 239>;
+++				mcast_queue = <292 295>;
+++				l0sp = <56 59>;
+++				l0cdrr = <128 143>;
+++				l0edrr = <128 143>;
+++				l1cdrr = <28 31>;
+++				l1edrr = <28 31>;
+++			};
+++			port@7 {
+++				port_id = <7>;
+++				ucast_queue = <240 255>;
+++				mcast_queue = <296 299>;
+++				l0sp = <60 63>;
+++				l0cdrr = <144 159>;
+++				l0edrr = <144 159>;
+++				l1cdrr = <32 35>;
+++				l1edrr = <32 35>;
+++			};
+++		};
+++		port_scheduler_config {
+++			port@0 {
+++				port_id = <0>;
+++				l1scheduler {
+++					group@0 {
+++						sp = <0 1>; /*L0 SPs*/
+++						/*cpri cdrr epri edrr*/
+++						cfg = <0 0 0 0>;
+++					};
+++				};
+++				l0scheduler {
+++					group@0 {
+++						/*unicast queues*/
+++						ucast_queue = <0 4 8>;
+++						/*multicast queues*/
+++						mcast_queue = <256 260>;
+++						/*sp cpri cdrr epri edrr*/
+++						cfg = <0 0 0 0 0>;
+++					};
+++					group@1 {
+++						ucast_queue = <1 5 9>;
+++						mcast_queue = <257 261>;
+++						cfg = <0 1 1 1 1>;
+++					};
+++					group@2 {
+++						ucast_queue = <2 6 10>;
+++						mcast_queue = <258 262>;
+++						cfg = <0 2 2 2 2>;
+++					};
+++					group@3 {
+++						ucast_queue = <3 7 11>;
+++						mcast_queue = <259 263>;
+++						cfg = <0 3 3 3 3>;
+++					};
+++				};
+++			};
+++			port@1 {
+++				port_id = <1>;
+++				l1scheduler {
+++					group@0 {
+++						sp = <36>;
+++						cfg = <0 8 0 8>;
+++					};
+++					group@1 {
+++						sp = <37>;
+++						cfg = <1 9 1 9>;
+++					};
+++				};
+++				l0scheduler {
+++					group@0 {
+++						ucast_queue = <144>;
+++						ucast_loop_pri = <16>;
+++						mcast_queue = <272>;
+++						mcast_loop_pri = <4>;
+++						cfg = <36 0 48 0 48>;
+++					};
+++				};
+++			};
+++			port@2 {
+++				port_id = <2>;
+++				l1scheduler {
+++					group@0 {
+++						sp = <40>;
+++						cfg = <0 12 0 12>;
+++					};
+++					group@1 {
+++						sp = <41>;
+++						cfg = <1 13 1 13>;
+++					};
+++				};
+++				l0scheduler {
+++					group@0 {
+++						ucast_queue = <160>;
+++						ucast_loop_pri = <16>;
+++						mcast_queue = <276>;
+++						mcast_loop_pri = <4>;
+++						cfg = <40 0 64 0 64>;
+++					};
+++				};
+++			};
+++			port@3 {
+++				port_id = <3>;
+++				l1scheduler {
+++					group@0 {
+++						sp = <44>;
+++						cfg = <0 16 0 16>;
+++					};
+++					group@1 {
+++						sp = <45>;
+++						cfg = <1 17 1 17>;
+++					};
+++				};
+++				l0scheduler {
+++					group@0 {
+++						ucast_queue = <176>;
+++						ucast_loop_pri = <16>;
+++						mcast_queue = <280>;
+++						mcast_loop_pri = <4>;
+++						cfg = <44 0 80 0 80>;
+++					};
+++				};
+++			};
+++			port@4 {
+++				port_id = <4>;
+++				l1scheduler {
+++					group@0 {
+++						sp = <48>;
+++						cfg = <0 20 0 20>;
+++					};
+++					group@1 {
+++						sp = <49>;
+++						cfg = <1 21 1 21>;
+++					};
+++				};
+++				l0scheduler {
+++					group@0 {
+++						ucast_queue = <192>;
+++						ucast_loop_pri = <16>;
+++						mcast_queue = <284>;
+++						mcast_loop_pri = <4>;
+++						cfg = <48 0 96 0 96>;
+++					};
+++				};
+++			};
+++			port@5 {
+++				port_id = <5>;
+++				l1scheduler {
+++					group@0 {
+++						sp = <52>;
+++						cfg = <0 24 0 24>;
+++					};
+++					group@1 {
+++						sp = <53>;
+++						cfg = <1 25 1 25>;
+++					};
+++				};
+++				l0scheduler {
+++					group@0 {
+++						ucast_queue = <208>;
+++						ucast_loop_pri = <16>;
+++						mcast_queue = <288>;
+++						mcast_loop_pri = <4>;
+++						cfg = <52 0 112 0 112>;
+++					};
+++				};
+++			};
+++			port@6 {
+++				port_id = <6>;
+++				l1scheduler {
+++					group@0 {
+++						sp = <56>;
+++						cfg = <0 28 0 28>;
+++					};
+++					group@1 {
+++						sp = <57>;
+++						cfg = <1 29 1 29>;
+++					};
+++				};
+++				l0scheduler {
+++					group@0 {
+++						ucast_queue = <224>;
+++						ucast_loop_pri = <16>;
+++						mcast_queue = <292>;
+++						mcast_loop_pri = <4>;
+++						cfg = <56 0 128 0 128>;
+++					};
+++				};
+++			};
+++			port@7 {
+++				port_id = <7>;
+++				l1scheduler {
+++					group@0 {
+++						sp = <60>;
+++						cfg = <0 32 0 32>;
+++					};
+++					group@1 {
+++						sp = <61>;
+++						cfg = <1 33 1 33>;
+++					};
+++				};
+++				l0scheduler {
+++					group@0 {
+++						ucast_queue = <240>;
+++						ucast_loop_pri = <16>;
+++						mcast_queue = <296>;
+++						cfg = <60 0 144 0 144>;
+++					};
+++				};
+++			};
+++		};
+++	};
+++
+++	dp1 {
+++		device_type = "network";
+++		compatible = "qcom,nss-dp";
+++		qcom,id = <4>;
+++		reg = <0x3a001600 0x200>;
+++		qcom,mactype = <0>;
+++		local-mac-address = [000000000000];
+++		qcom,link-poll = <1>;
+++		qcom,phy-mdio-addr = <3>;
+++		phy-mode = "sgmii";
+++	};
+++
+++	dp2 {
+++		device_type = "network";
+++		compatible = "qcom,nss-dp";
+++		qcom,id = <6>;
+++		reg = <0x3a007000 0x3fff>;
+++		qcom,mactype = <1>;
+++		local-mac-address = [000000000000];
+++		qcom,link-poll = <1>;
+++		qcom,phy-mdio-addr = <8>;
+++		phy-mode = "sgmii";
+++	};
+++	wifi3: wifi3@f00000 {
+++		compatible  = "qcom,cnss-qcn9000";
+++		wlan-en-gpio = <&tlmm 57 0>;
+++		pinctrl-names = "wlan_en_active", "wlan_en_sleep";
+++		pinctrl-0 = <&cnss_wlan_en_active>;
+++		pinctrl-1 = <&cnss_wlan_en_sleep>;
+++		status = "disabled";
+++	};
+++};
+++
+++&serial_blsp4 {
+++       pinctrl-0 = <&uart_pins>;
+++       pinctrl-names = "default";
+++       status = "ok";
+++};
+++
+++&spi_0 { /* BLSP1 QUP1 */
+++	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;
+++	};
+++};
+++
+++&serial_blsp2 {
+++	pinctrl-0 = <&hsuart_pins>;
+++	pinctrl-names = "default";
+++	status = "ok";
+++};
+++
+++&msm_imem {
+++	status = "disabled";
+++};
+++
+++&ssphy_0 {
+++	status = "ok";
+++};
+++
+++&qusb_phy_0 {
+++	status = "ok";
+++};
+++
+++&ssphy_1 {
+++	status = "ok";
+++};
+++
+++&qusb_phy_1 {
+++	status = "ok";
+++};
+++
+++&usb3_0 {
+++	status = "ok";
+++};
+++
+++&usb3_1 {
+++	status = "ok";
+++};
+++
+++&cryptobam {
+++	status = "ok";
+++};
+++
+++&crypto {
+++	status = "ok";
+++};
+++
+++&i2c_0 {
+++	pinctrl-0 = <&i2c_0_pins>;
+++	pinctrl-names = "default";
+++	status = "ok";
+++};
+++
+++&i2c_1 {
+++	status = "disabled";
+++};
+++
+++&qpic_bam {
+++	status = "ok";
+++};
+++
+++&nand {
+++	pinctrl-0 = <&qpic_pins>;
+++	pinctrl-names = "default";
+++	status = "ok";
+++};
+++
+++&pcie0 {
+++	status = "disabled";
+++};
++Index: linux-4.4.60-qsdk-10fd7d14853b7020b804acae690c8acec5d954ce/drivers/net/phy/aquantia.c
++===================================================================
++--- linux-4.4.60-qsdk-10fd7d14853b7020b804acae690c8acec5d954ce.orig/drivers/net/phy/aquantia.c
+++++ linux-4.4.60-qsdk-10fd7d14853b7020b804acae690c8acec5d954ce/drivers/net/phy/aquantia.c
++@@ -29,6 +29,7 @@
++ #define PHY_ID_AQR109	0x03a1b502
++ #define PHY_ID_AQR111	0x03a1b610
++ #define PHY_ID_AQR111B0	0x03a1b612
+++#define PHY_ID_AQR111C	0x03a1b7e2
++ #define PHY_ID_AQR112	0x03a1b660
++ #define PHY_ID_AQR113C	0x31c31C10
++ #define PHY_ID_AQR112C	0x03a1b792
++@@ -701,6 +702,23 @@ static struct phy_driver aquantia_driver
++ 	.driver         = { .owner = THIS_MODULE,},
++ },
++ {
+++	.phy_id         = PHY_ID_AQR111C,
+++	.phy_id_mask    = 0xfffffff0,
+++	.name           = "Aquantia AQR111C",
+++	.features       = PHY_AQUANTIA_FEATURES,
+++	.flags          = PHY_HAS_INTERRUPT,
+++	.probe          = aquantia_phy_probe,
+++	.soft_reset     = aquantia_soft_reset,
+++	.config_init    = aquantia_config_init,
+++	.aneg_done      = aquantia_aneg_done,
+++	.config_aneg    = aquantia_config_aneg,
+++	.config_intr    = aquantia_config_intr,
+++	.ack_interrupt  = aquantia_ack_interrupt,
+++	.read_status    = aquantia_read_status,
+++	.update_link    = aquantia_update_link,
+++	.driver         = { .owner = THIS_MODULE,},
+++},
+++{
++ 	.phy_id		= PHY_ID_AQR112,
++ 	.phy_id_mask	= 0xfffffff0,
++ 	.name		= "Aquantia AQR112",
++@@ -790,6 +808,7 @@ static struct mdio_device_id __maybe_unu
++ 	{ PHY_ID_AQR109, 0xfffffff0 },
++ 	{ PHY_ID_AQR111, 0xfffffff0 },
++ 	{ PHY_ID_AQR111B0, 0xfffffff0 },
+++	{ PHY_ID_AQR111C, 0xfffffff0 },
++ 	{ PHY_ID_AQR112, 0xfffffff0 },
++ 	{ PHY_ID_AQR113C, 0xfffffff0 },
++ 	{ PHY_ID_AQR112C, 0xfffffff0 },
+-- 
+2.7.4
+

patches/0055-add-target-linux-ipq807x-files-arch-arm-boot-dts-qco.patch

@@ -0,0 +1,46 @@
+From 623c02020c07a3f94f6c9eed2d0e5c899e1f6b83 Mon Sep 17 00:00:00 2001
+From: "peter.chiu" <peter.chiu@4ipnet.com>
+Date: Thu, 24 Jun 2021 18:13:05 +0800
+Subject: [PATCH] add
+ target/linux/ipq807x/files/arch/arm/boot/dts/qcom-ipq807x-eap106.dts
+
+---
+ .../arch/arm/boot/dts/qcom-ipq807x-eap106.dts      | 26 ++++++++++++++++++++++
+ 1 file changed, 26 insertions(+)
+ create mode 100644 target/linux/ipq807x/files/arch/arm/boot/dts/qcom-ipq807x-eap106.dts
+
+diff --git a/target/linux/ipq807x/files/arch/arm/boot/dts/qcom-ipq807x-eap106.dts b/target/linux/ipq807x/files/arch/arm/boot/dts/qcom-ipq807x-eap106.dts
+new file mode 100644
+index 0000000..1527f81
+--- /dev/null
++++ b/target/linux/ipq807x/files/arch/arm/boot/dts/qcom-ipq807x-eap106.dts
+@@ -0,0 +1,26 @@
++/*
++ * Copyright (c) 2017, 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.
++ */
++#include "../../../arm64/boot/dts/qcom/qcom-ipq807x-eap106.dts"
++
++/ {
++	soc {
++		pmu {
++			compatible = "arm,cortex-a7-pmu";
++			interrupts = <GIC_PPI 7 (GIC_CPU_MASK_SIMPLE(4) |
++					IRQ_TYPE_LEVEL_HIGH)>;
++		};
++	};
++};
+-- 
+2.7.4
+

patches/0055-enable-kmod-dwc3-qcom.patch

@@ -0,0 +1,32 @@
+From fa75fce4b170bba40c0f6f756bda06757c0d2377 Mon Sep 17 00:00:00 2001
+From: "peter.chiu" <peter.chiu@4ipnet.com>
+Date: Wed, 30 Jun 2021 17:12:59 +0800
+Subject: [PATCH] enable kmod-dwc3-qcom
+
+---
+ package/kernel/linux/modules/usb.mk | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+ mode change 100644 => 100755 package/kernel/linux/modules/usb.mk
+
+diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk
+old mode 100644
+new mode 100755
+index a88b8df..14ddce2
+--- a/package/kernel/linux/modules/usb.mk
++++ b/package/kernel/linux/modules/usb.mk
+@@ -499,9 +499,10 @@ $(eval $(call KernelPackage,usb-dwc3-of-simple))
+ 
+ define KernelPackage/usb-dwc3-qcom
+   TITLE:=DWC3 Qualcomm USB driver
+-  DEPENDS:=@LINUX_4_19 @(TARGET_ipq40xx||TARGET_ipq806x) +kmod-usb-dwc3
++  DEPENDS:=@!LINUX_4_19 @(TARGET_ipq40xx||TARGET_ipq806x||TARGET_ipq807x) +kmod-usb-dwc3
+   KCONFIG:= CONFIG_USB_DWC3_QCOM
+-  FILES:= $(LINUX_DIR)/drivers/usb/dwc3/dwc3-qcom.ko
++  FILES:= $(LINUX_DIR)/drivers/usb/dwc3/dwc3-qcom.ko \
++            $(LINUX_DIR)/drivers/usb/dwc3/dbm.ko@le4.4
+   AUTOLOAD:=$(call AutoLoad,53,dwc3-qcom,1)
+   $(call AddDepends/usb)
+ endef
+-- 
+2.7.4
+

profiles-20.x/wlan-ap.yml

@@ -60,6 +60,7 @@ packages:
   - kmod-ip6-tunnel
   - kmod-iptunnel
   - kmod-iptunnel6
+  - logrotate
 
 diffconfig: |
   CONFIG_OPENSSL_ENGINE=y

profiles/eap101.yml

@@ -6,5 +6,13 @@ description: Build image for the EdgeCore EAP101
 feeds:
   - name: ipq807x
     path: ../../feeds/ipq807x
-
-
+packages:
+    - kmod-usb-dwc3-qcom
+    - kmod-fs-ext4 
+    - kmod-usb-storage 
+    - kmod-usb2 
+    - kmod-usb3
+    - block-mount 
+    - e2fsprogs
+diffconfig: |
+  CONFIG_PACKAGE_kmod-usb-dwc3-of-simple=n

profiles/eap106.yml

@@ -0,0 +1,10 @@
+---
+profile: edgecore_eap106
+target: ipq807x
+subtarget: ipq807x
+description: Build image for the Edgecore EAP106
+feeds:
+  - name: ipq807x
+    path: ../../feeds/ipq807x
+
+

profiles/wlan-ap.yml

@@ -80,6 +80,7 @@ packages:
   - eapol-test
   - apc
   - radsecproxy
+  - logrotate
 
 diffconfig: |
   CONFIG_OPENSSL_ENGINE=y