[nrf fromlist] wifi: Fix duplication

Use a common set of events and then add specific ones as per the
configuration.

Upstream PR: zephyrproject-rtos/zephyr#67015

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit 0646c56)
Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
(cherry picked from commit c0ea30d)

subsys/net/l2/wifi/wifi_shell.c

@@ -29,19 +29,17 @@ LOG_MODULE_REGISTER(net_wifi_shell, LOG_LEVEL_INF);
 
 #define WIFI_SHELL_MODULE "wifi"
 
+#define WIFI_SHELL_MGMT_EVENTS_COMMON (NET_EVENT_WIFI_SCAN_DONE   |\
+				NET_EVENT_WIFI_CONNECT_RESULT     |\
+				NET_EVENT_WIFI_DISCONNECT_RESULT  |  \
+				NET_EVENT_WIFI_TWT                |\
+				NET_EVENT_WIFI_RAW_SCAN_RESULT)
+
 #ifdef CONFIG_WIFI_MGMT_RAW_SCAN_RESULTS_ONLY
-#define WIFI_SHELL_MGMT_EVENTS (NET_EVENT_WIFI_RAW_SCAN_RESULT |        \
-				NET_EVENT_WIFI_SCAN_DONE |              \
-				NET_EVENT_WIFI_CONNECT_RESULT |         \
-				NET_EVENT_WIFI_DISCONNECT_RESULT |  \
-				NET_EVENT_WIFI_TWT)
+#define WIFI_SHELL_MGMT_EVENTS (WIFI_SHELL_MGMT_EVENTS_COMMON)
 #else
-#define WIFI_SHELL_MGMT_EVENTS (NET_EVENT_WIFI_SCAN_RESULT |		\
-				NET_EVENT_WIFI_SCAN_DONE |		\
-				NET_EVENT_WIFI_CONNECT_RESULT |		\
-				NET_EVENT_WIFI_DISCONNECT_RESULT |  \
-				NET_EVENT_WIFI_TWT |		\
-				NET_EVENT_WIFI_RAW_SCAN_RESULT)
+#define WIFI_SHELL_MGMT_EVENTS (WIFI_SHELL_MGMT_EVENTS_COMMON |\
+				NET_EVENT_WIFI_SCAN_RESULT)
 #endif /* CONFIG_WIFI_MGMT_RAW_SCAN_RESULTS_ONLY */
 
 static struct {