From 3301aac8e1c0b0f14522a6a61c012f13ce3a9ff7 Mon Sep 17 00:00:00 2001
From: Sumeet Singh <sumeet.singh@espressif.com>
Date: Mon, 13 Jul 2026 15:47:38 +0530
Subject: [PATCH] fix(nimble): Add option to disable IEEE and UDI
 Characteristic in DIS (v5.2)

---
 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 2c96fc3b8fd..6a9779d393f 100644
--- a/components/bt/host/nimble/Kconfig.in
+++ b/components/bt/host/nimble/Kconfig.in
@@ -908,6 +908,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 95de9ac1507..7b0d4a7f66a 160000
--- a/components/bt/host/nimble/nimble
+++ b/components/bt/host/nimble/nimble
@@ -1 +1 @@
-Subproject commit 95de9ac1507420fcd29b5daa5d1bc1dfdc9ce57c
+Subproject commit 7b0d4a7f66ae4cb187e3137206ef4dff64af62ec
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 7ca0f368a23..70004a98427 100644
--- a/components/bt/host/nimble/port/include/esp_nimble_cfg.h
+++ b/components/bt/host/nimble/port/include/esp_nimble_cfg.h
@@ -1833,6 +1833,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