From 1edb1a58b58be3fcfe612c5405d61b659b7bbb23 Mon Sep 17 00:00:00 2001
From: Sumeet Singh <sumeet.singh@espressif.com>
Date: Wed, 1 Jul 2026 16:31:29 +0530
Subject: [PATCH] fix(nimble): Add option to disable IEEE and UDI
 Characteristic in DIS

---
 components/bt/host/nimble/Kconfig.in               | 14 ++++++++++++++
 components/bt/host/nimble/nimble                   |  2 +-
 .../bt/host/nimble/port/include/esp_nimble_cfg.h   | 12 ++++++++++++
 3 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/components/bt/host/nimble/Kconfig.in b/components/bt/host/nimble/Kconfig.in
index 685a68a3fa1..1a65f19d1b0 100644
--- a/components/bt/host/nimble/Kconfig.in
+++ b/components/bt/host/nimble/Kconfig.in
@@ -1001,6 +1001,20 @@ menu "Services"
         help
             Enable the DIS PnP ID characteristic
 
+    config BT_NIMBLE_SVC_DIS_IEEE
+        depends on BT_NIMBLE_DIS_SERVICE
+        bool "IEEE"
+        default y
+        help
+            Enable the DIS IEEE characteristic
+
+    config BT_NIMBLE_SVC_DIS_UDI
+        depends on BT_NIMBLE_DIS_SERVICE
+        bool "UDI"
+        default y
+        help
+            Enable the DIS UDI characteristic
+
     config BT_NIMBLE_SVC_DIS_INCLUDED
         depends on BT_NIMBLE_DIS_SERVICE
         bool "DIS as an Included Service"
diff --git a/components/bt/host/nimble/nimble b/components/bt/host/nimble/nimble
index 05eb8804bd5..3cacd66e838 160000
--- a/components/bt/host/nimble/nimble
+++ b/components/bt/host/nimble/nimble
@@ -1 +1 @@
-Subproject commit 05eb8804bd50c7bc68c8c752ff322c8052254a39
+Subproject commit 3cacd66e838b03b84b778892b20beef4473e6cd3
diff --git a/components/bt/host/nimble/port/include/esp_nimble_cfg.h b/components/bt/host/nimble/port/include/esp_nimble_cfg.h
index e4c095ff2d5..14f7d687152 100644
--- a/components/bt/host/nimble/port/include/esp_nimble_cfg.h
+++ b/components/bt/host/nimble/port/include/esp_nimble_cfg.h
@@ -1842,6 +1842,18 @@
 #define MYNEWT_VAL_BLE_SVC_DIS_PNP_ID_READ_PERM (-1)
 #endif
 
+#if CONFIG_BT_NIMBLE_SVC_DIS_IEEE
+#define MYNEWT_VAL_BLE_SVC_DIS_IEEE_READ_PERM (0)
+#else
+#define MYNEWT_VAL_BLE_SVC_DIS_IEEE_READ_PERM (-1)
+#endif
+
+#if CONFIG_BT_NIMBLE_SVC_DIS_UDI
+#define MYNEWT_VAL_BLE_SVC_DIS_UDI_READ_PERM (0)
+#else
+#define MYNEWT_VAL_BLE_SVC_DIS_UDI_READ_PERM (-1)
+#endif
+
 #ifndef MYNEWT_VAL_BLE_SVC_DIS_INCLUDED
 #define MYNEWT_VAL_BLE_SVC_DIS_INCLUDED (CONFIG_BT_NIMBLE_SVC_DIS_INCLUDED)
 #endif