Bluetooth: Host: avoid runtime warning in bt_enable

martintv · carlescufi · commit 0d4f685dbdb5 · 2021-11-17T12:40:20.000+01:00
Avoid runtime warning in bt_enable when CONFIG_BT_SETTINGS and CONFIG_BT_DEVICE_NAME_DYNAMIC is not set. This warning was intoroduced in commit d76bba4 ("Bluetooth: host: Device name handling of invalid length") Signed-off-by: Martin Tverdal <martin.tverdal@nordicsemi.no>
diff --git a/subsys/bluetooth/host/hci_core.c b/subsys/bluetooth/host/hci_core.c
@@ -3564,7 +3564,7 @@ int bt_enable(bt_ready_cb_t cb)
 		if (err) {
 			return err;
 		}
-	} else {
+	} else if (IS_ENABLED(CONFIG_BT_DEVICE_NAME_DYNAMIC)) {
 		err = bt_set_name(CONFIG_BT_DEVICE_NAME);
 		if (err) {
 			BT_WARN("Failed to set device name (%d)", err);

Original file line number	Diff line number	Diff line change
`@@ -3564,7 +3564,7 @@ int bt_enable(bt_ready_cb_t cb)`
`3564`	`3564`	`if (err) {`
`3565`	`3565`	`return err;`
`3566`	`3566`	`}`
`3567`		`- } else {`
	`3567`	`+ } else if (IS_ENABLED(CONFIG_BT_DEVICE_NAME_DYNAMIC)) {`
`3568`	`3568`	`err = bt_set_name(CONFIG_BT_DEVICE_NAME);`
`3569`	`3569`	`if (err) {`
`3570`	`3570`	`BT_WARN("Failed to set device name (%d)", err);`