Merge branch 'feat/add_support_multi_scan' into 'master'

fix(nimble): Added change to stop adv before starting new adv

Closes BLERP-2984

See merge request espressif/esp-idf!51125

components/bt/host/nimble/Kconfig.in

@@ -1365,6 +1365,14 @@ menu "Extra Features"
             instead of DRAM (.iram.text/.text in internal RAM). Suitable for low-speed
             GAP/GATT operations to reduce RAM usage.
 
+    config BT_NIMBLE_GAP_ALLOW_ADV_RESTART
+        bool "Allow restarting ongoing advertising"
+        default n
+        help
+            If enabled, stop ongoing advertising before starting it again with
+            new parameters,if any. If disabled, starting advertising while it is already
+            active returns BLE_HS_EALREADY.
+
 endmenu
 
 menu "NimBLE Mesh"

components/bt/host/nimble/port/include/esp_nimble_cfg.h

@@ -2476,5 +2476,12 @@
 #endif
 #endif
 
+#ifndef MYNEWT_VAL_BLE_GAP_ALLOW_ADV_RESTART
+#ifdef CONFIG_BT_NIMBLE_GAP_ALLOW_ADV_RESTART
+#define MYNEWT_VAL_BLE_GAP_ALLOW_ADV_RESTART CONFIG_BT_NIMBLE_GAP_ALLOW_ADV_RESTART
+#else
+#define MYNEWT_VAL_BLE_GAP_ALLOW_ADV_RESTART (0)
+#endif
+#endif
 
 #endif