[nrf fromtree] Bluetooth: Mesh: Fix missing clear dup cache

LingaoM · nordicjm · commit cbe3b8fe8b05 · 2022-10-31T15:33:55.000Z
When lpn reject message, should clear dup cache to avoid dup check next mesh message. Signed-off-by: Lingao Meng <menglingao@xiaomi.com> (cherry picked from commit 5867492)
diff --git a/subsys/bluetooth/mesh/net.c b/subsys/bluetooth/mesh/net.c
@@ -125,8 +125,8 @@ static bool check_dup(struct net_buf_simple *data)
 		}
 	}
 
-	dup_cache[dup_cache_next++] = val;
 	dup_cache_next %= ARRAY_SIZE(dup_cache);
+	dup_cache[dup_cache_next++] = val;
 
 	return false;
 }
@@ -850,6 +850,7 @@ void bt_mesh_net_recv(struct net_buf_simple *data, int8_t rssi,
 		BT_WARN("Removing rejected message from Network Message Cache");
 		/* Rewind the next index now that we're not using this entry */
 		msg_cache[--msg_cache_next].src = BT_MESH_ADDR_UNASSIGNED;
+		dup_cache[--dup_cache_next] = 0;
 	}
 
 	/* Relay if this was a group/virtual address, or if the destination

Original file line number	Diff line number	Diff line change
`@@ -125,8 +125,8 @@ static bool check_dup(struct net_buf_simple *data)`
`125`	`125`	`}`
`126`	`126`	`}`
`127`	`127`
`128`		`- dup_cache[dup_cache_next++] = val;`
`129`	`128`	`dup_cache_next %= ARRAY_SIZE(dup_cache);`
	`129`	`+ dup_cache[dup_cache_next++] = val;`
`130`	`130`
`131`	`131`	`return false;`
`132`	`132`	`}`
`@@ -850,6 +850,7 @@ void bt_mesh_net_recv(struct net_buf_simple *data, int8_t rssi,`
`850`	`850`	`BT_WARN("Removing rejected message from Network Message Cache");`
`851`	`851`	`/* Rewind the next index now that we're not using this entry */`
`852`	`852`	`msg_cache[--msg_cache_next].src = BT_MESH_ADDR_UNASSIGNED;`
	`853`	`+ dup_cache[--dup_cache_next] = 0;`
`853`	`854`	`}`
`854`	`855`
`855`	`856`	`/* Relay if this was a group/virtual address, or if the destination`