[nrf fromtree] bluetooth: host: Fix BT_LE_LOCAL_SUPPORTED_FEATURES_SIZE define

Fix BT_LE_LOCAL_SUPPORTED_FEATURES_SIZE define, as this was
not working correctly without brackets around
CONFIG_BT_LE_MAX_LOCAL_SUPPORTED_FEATURE_PAGE.

Also fix CONFIG_BT_LE_MAX_LOCAL_SUPPORTED_FEATURE_PAGE help,
as this was talking about remote featues, where this only
applies for local features.

Also update for new CONFIG_BT_CONN_DYNAMIC_CALLBACKS kconfig

Signed-off-by: Sean Madigan <[email protected]>
(cherry picked from commit 9bbc906)
Signed-off-by: Sean Madigan <[email protected]>

Author: sean-madigan

include/zephyr/bluetooth/bluetooth.h

@@ -77,10 +77,11 @@ extern "C" {
  * The value of 8 correspond to page 0 in the LE Controller supported features.
  * 24 bytes are required for all subsequent supported feature pages.
  */
-#define BT_LE_LOCAL_SUPPORTED_FEATURES_SIZE                                                        \
-	(BT_HCI_LE_BYTES_PAGE_0_FEATURE_PAGE +                                                     \
-	 COND_CODE_1(CONFIG_BT_LE_MAX_LOCAL_SUPPORTED_FEATURE_PAGE,                                \
-		CONFIG_BT_LE_MAX_LOCAL_SUPPORTED_FEATURE_PAGE * BT_HCI_LE_BYTES_PER_FEATURE_PAGE,  \
+#define BT_LE_LOCAL_SUPPORTED_FEATURES_SIZE                         \
+	(BT_HCI_LE_BYTES_PAGE_0_FEATURE_PAGE +                      \
+	 COND_CODE_1(CONFIG_BT_LE_MAX_LOCAL_SUPPORTED_FEATURE_PAGE, \
+		(CONFIG_BT_LE_MAX_LOCAL_SUPPORTED_FEATURE_PAGE      \
+			* BT_HCI_LE_BYTES_PER_FEATURE_PAGE),        \
 		(0U)))
 
 /** Opaque type representing an advertiser. */

subsys/bluetooth/Kconfig

@@ -121,8 +121,7 @@ config BT_LE_MAX_LOCAL_SUPPORTED_FEATURE_PAGE
 	range 0 10
 	depends on BT_LE_EXTENDED_FEAT_SET
 	help
-	  Maximum supported feature page that can be stored locally and fetched
-	  from the remote connection with the LL Extended Feature Set feature.
+	  Maximum feature page that can be stored for local supported features.
 
 config BT_LE_EXTENDED_FEAT_SET
 	bool "LL Extended Feature Set"

subsys/bluetooth/host/conn.c

@@ -3357,11 +3357,13 @@ int bt_conn_le_subrate_request(struct bt_conn *conn,
 void notify_read_all_remote_feat_complete(struct bt_conn *conn,
 					  struct bt_conn_le_read_all_remote_feat_complete *params)
 {
-	struct bt_conn_cb *callback;
+	if (IS_ENABLED(CONFIG_BT_CONN_DYNAMIC_CALLBACKS)) {
+		struct bt_conn_cb *callback;
 
-	SYS_SLIST_FOR_EACH_CONTAINER(&conn_cbs, callback, _node) {
-		if (callback->read_all_remote_feat_complete != NULL) {
-			callback->read_all_remote_feat_complete(conn, params);
+		SYS_SLIST_FOR_EACH_CONTAINER(&conn_cbs, callback, _node) {
+			if (callback->read_all_remote_feat_complete != NULL) {
+				callback->read_all_remote_feat_complete(conn, params);
+			}
 		}
 	}