Merge branch 'flavour/stock-v4.19' into flavour/edge-v4.19

This change tracks the upstream UDM Pro kernel for firmware version 1.11.4.
fabianishere · Mar 9, 2022 · 560241d · 560241d
2 parents e34517e + d1308bb
commit 560241d
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/.github/config/config.stock.udm b/.github/config/config.stock.udm
@@ -19,7 +19,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
 #
 CONFIG_INIT_ENV_ARG_LIMIT=32
 # CONFIG_COMPILE_TEST is not set
-CONFIG_LOCALVERSION="-v1.11.0.3921-f2e3fac"
+CONFIG_LOCALVERSION="-v1.11.4.3940-e66d85f"
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_BUILD_SALT=""
 CONFIG_DEFAULT_HOSTNAME="(none)"

diff --git a/drivers/net/phy/swconfig_ubnt.c b/drivers/net/phy/swconfig_ubnt.c
@@ -106,7 +106,11 @@ static struct uext_arl_cache_entry *uext_arl_proc_cache_entry_next(struct uext_a
 				}
 
 				if (time_is_before_jiffies(entry->last_seen +
-							   (cache->age_time * HZ))) {
+							   (cache->age_time * HZ))
+#ifdef CONFIG_SWCONFIG_UBNT_EXT_SYNC_ARL
+					|| entry->flag == UEXT_ARL_CACHE_DELETABLE
+#endif
+					) {
 					list_del(it->np);
 					kfree(entry);
 				} else {
@@ -413,16 +417,17 @@ static inline void swconfig_uext_arl_cache_sync(struct uext_arl_cache *cache)
 		list_for_each_safe (c, n, &cache->table[i].list) {
 			entry_c = list_entry(c, struct uext_arl_cache_entry, list);
 
-			if (entry_c->flag == UEXT_ARL_CACHE_DELETABLE) {
-				list_del(c);
-				kfree(entry_c);
-				continue;
-			}
+			switch (entry_c->flag) {
+				case (UEXT_ARL_CACHE_ALIVE):
+					entry_c->flag = UEXT_ARL_CACHE_NOT_FOUND;
+					break;
 
-			if (entry_c->flag == UEXT_ARL_CACHE_NOT_FOUND) {
-				entry_c->flag = UEXT_ARL_CACHE_DELETABLE;
-			} else {
-				entry_c->flag = UEXT_ARL_CACHE_NOT_FOUND;
+				case (UEXT_ARL_CACHE_NOT_FOUND):
+					entry_c->flag = UEXT_ARL_CACHE_DELETABLE;
+					break;
+
+				default:
+					continue;
 			}
 		}
 	}