WIFI-3244-WF610D-Config-Reset-Over-Sysupgrade

This patch will fix configuration restore problem over sysupgrade
on WF610D
Even though there is a configuration data in the /dev/mtdblock12, it is getting erased while reading it beacuse of JFFS2 empty bitmask code. So I added a condition to check whether the datatype available is JFFS2 or not, and making sure it is not empty before returning the JFFS2 flag to restore the configuration.

Signed-off-by: Nagendrababu <nagendrababu.bonkuri@connectus.ai>

feeds/wlan-ap/opensync/patches/42-sm_dbg_log.patch

@@ -0,0 +1,44 @@
+Index: opensync-2.0.5.0/src/sm/src/sm_scan_schedule.c
+===================================================================
+--- opensync-2.0.5.0.orig/src/sm/src/sm_scan_schedule.c
++++ opensync-2.0.5.0/src/sm/src/sm_scan_schedule.c
+@@ -155,6 +155,12 @@ clean:
+ 
+     /* Remove processed context */
+     ds_dlist_remove_head(&g_scan_ctx_list);
++    LOG(DEBUG, "sm_scan_schedule_cb. Scan done. Deleting scan_ctx. %p. %s %s %d\n",
++		scan_ctx,
++		radio_get_name_from_type(scan_ctx->scan_request.radio_cfg->type),
++		radio_get_scan_name_from_type(scan_ctx->scan_request.scan_type),
++		scan_ctx->scan_request.chan_list[0]);
++
+     sm_scan_ctx_free(scan_ctx);
+     scan_ctx = NULL;
+ 
+@@ -163,6 +169,13 @@ clean:
+     if (scan_ctx)
+     {
+         scan_status = true;
++
++	LOG(DEBUG, "sm_scan_schedule_cb. Schedule next scan request. %p. %s %s %d\n",
++		scan_ctx,
++		radio_get_name_from_type(scan_ctx->scan_request.radio_cfg->type),
++		radio_get_scan_name_from_type(scan_ctx->scan_request.scan_type),
++		scan_ctx->scan_request.chan_list[0]);
++
+         rc =
+             sm_scan_schedule_process (
+                     scan_ctx);
+@@ -303,6 +316,12 @@ bool sm_scan_schedule(
+ 
+     if (NULL == scan_in_progress) {
+         /* Trigger the scan and wait for results */
++	LOG(DEBUG, "sm_scan_schedule. Schedule scan request. %p. %s %s %d\n",
++		scan_ctx,
++		radio_get_name_from_type(scan_ctx->scan_request.radio_cfg->type),
++		radio_get_scan_name_from_type(scan_ctx->scan_request.scan_type),
++		scan_ctx->scan_request.chan_list[0]);
++
+         rc =
+             sm_scan_schedule_process(
+                     scan_ctx);

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

@@ -54,6 +54,8 @@ struct nl80211_scan {
 
 static struct avl_tree nl80211_scan_tree = AVL_TREE_INIT(nl80211_scan_tree, avl_strcmp, false, NULL);
 
+static void nl80211_scan_del(struct nl80211_scan *nl80211_scan);
+
 static int nl80211_chainmask_recv(struct nl_msg *msg, void *arg)
 {
 	struct genlmsghdr *gnlh = nlmsg_data(nlmsg_hdr(msg));
@@ -383,16 +385,17 @@ static int nl80211_scan_add(char *name, target_scan_cb_t *scan_cb, void *scan_ct
 {
 	struct nl80211_scan *nl80211_scan = avl_find_element(&nl80211_scan_tree, name, nl80211_scan, avl);
 
-	if (!nl80211_scan) {
-		nl80211_scan = malloc(sizeof(*nl80211_scan));
-		if (!nl80211_scan)
-			return -1;
-		memset(nl80211_scan, 0, sizeof(*nl80211_scan));
-		strncpy(nl80211_scan->name, name, IF_NAMESIZE);
-		nl80211_scan->avl.key = nl80211_scan->name;
-		avl_insert(&nl80211_scan_tree, &nl80211_scan->avl);
-		LOGD("%s: added scan context", name);
-	}
+	if (nl80211_scan)
+		nl80211_scan_del(nl80211_scan);
+
+	nl80211_scan = malloc(sizeof(*nl80211_scan));
+	if (!nl80211_scan)
+		return -1;
+	memset(nl80211_scan, 0, sizeof(*nl80211_scan));
+	strncpy(nl80211_scan->name, name, IF_NAMESIZE);
+	nl80211_scan->avl.key = nl80211_scan->name;
+	avl_insert(&nl80211_scan_tree, &nl80211_scan->avl);
+	LOGD("%s: added scan context", name);
 
 	nl80211_scan->scan_cb = scan_cb;
 	nl80211_scan->scan_ctx = scan_ctx;
@@ -414,7 +417,6 @@ static void nl80211_scan_finish(char *name, bool state)
 	if (nl80211_scan) {
 		LOGD("%s: calling context cb", nl80211_scan->name);
 		(*nl80211_scan->scan_cb)(nl80211_scan->scan_ctx, state);
-		nl80211_scan_del(nl80211_scan);
 	}
 }
 

patches/0060-wifi-3244-wf610d-config-reset-over-sysupgrade.patch

@@ -0,0 +1,37 @@
+From 87af8ae014551b73a51c30a0c30da2a2c666e548 Mon Sep 17 00:00:00 2001
+From: Nagendrababu <nagendrababu.bonkuri@connectus.ai>
+Date: Fri, 13 Aug 2021 11:41:25 -0400
+Subject: [PATCH] WIFI-3244-config-reset-over-sysupgrade
+
+This patch will fix configuration restore problem over sysupgrade
+on WF610D
+Even though there is a configuration data in the /dev/mtdblock12, it is getting erased while reading it beacuse of JFFS2 empty bitmask code. So I added a condition to check whether the datatype available is JFFS2 or not, and making sure it is not empty before returning the JFFS2 flag to restore the configuration.
+
+Signed-off-by: Nagendrababu <nagendrababu.bonkuri@connectus.ai>
+---
+ .../system/fstools/patches/002-wf610d-config-reset  | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+ create mode 100644 package/system/fstools/patches/002-wf610d-config-reset
+
+diff --git a/package/system/fstools/patches/002-wf610d-config-reset b/package/system/fstools/patches/002-wf610d-config-reset
+new file mode 100644
+index 0000000000..6e18f8669c
+--- /dev/null
++++ b/package/system/fstools/patches/002-wf610d-config-reset
+@@ -0,0 +1,13 @@
++Index: fstools-2020-05-12-84269037/libfstools/mtd.c
++===================================================================
++--- fstools-2020-05-12-84269037.orig/libfstools/mtd.c
+++++ fstools-2020-05-12-84269037/libfstools/mtd.c
++@@ -226,6 +226,8 @@ static int mtd_volume_identify(struct vo
++ 	if (v->type == UBIVOLUME && deadc0de == 0xffffffff) {
++ 		return FS_JFFS2;
++ 	}
+++	if (v->type == FS_JFFS2 && v->size && deadc0de == 0xffffffff)
+++		return FS_JFFS2;
++ 
++ 	return FS_NONE;
++ }
+-- 
+2.25.1
+