Bluetooth: Controller: Fix inter-operability when BT_PHY_UPDATE=n

Fix inter-operability, when BT_PHY_UPDATE=n the feature bits
contained 2M and Coded PHY when Advertising Extensions where
enabled, and Central devices did not progress with any data
packet transfers when PHY_REQ was rejected as unknown PDU.

Signed-off-by: Vinayak Kariappa Chettimada <[email protected]>

Author: cvinayak

subsys/bluetooth/controller/include/ll_feat.h

@@ -63,11 +63,11 @@
 #define LL_FEAT_BIT_EXT_SCAN 0
 #endif /* !CONFIG_BT_CTLR_EXT_SCAN_FP */
 
-#if defined(CONFIG_BT_CTLR_PHY_2M)
+#if defined(CONFIG_BT_CTLR_PHY) && defined(CONFIG_BT_CTLR_PHY_2M)
 #define LL_FEAT_BIT_PHY_2M BIT64(BT_LE_FEAT_BIT_PHY_2M)
-#else /* !CONFIG_BT_CTLR_PHY_2M */
+#else /* !CONFIG_BT_CTLR_PHY || !CONFIG_BT_CTLR_PHY_2M */
 #define LL_FEAT_BIT_PHY_2M 0
-#endif /* !CONFIG_BT_CTLR_PHY_2M */
+#endif /* !CONFIG_BT_CTLR_PHY || !CONFIG_BT_CTLR_PHY_2M */
 
 #if defined(CONFIG_BT_CTLR_SMI_TX)
 #if defined(CONFIG_BT_CTLR_SMI_TX_SETTING)
@@ -86,11 +86,11 @@
 #define LL_FEAT_BIT_SMI_RX 0
 #endif /* !CONFIG_BT_CTLR_SMI_RX */
 
-#if defined(CONFIG_BT_CTLR_PHY_CODED)
+#if defined(CONFIG_BT_CTLR_PHY) && defined(CONFIG_BT_CTLR_PHY_CODED)
 #define LL_FEAT_BIT_PHY_CODED BIT64(BT_LE_FEAT_BIT_PHY_CODED)
-#else /* !CONFIG_BT_CTLR_PHY_CODED */
+#else /* !CONFIG_BT_CTLR_PHY || !CONFIG_BT_CTLR_PHY_CODED */
 #define LL_FEAT_BIT_PHY_CODED 0
-#endif /* !CONFIG_BT_CTLR_PHY_CODED */
+#endif /* !CONFIG_BT_CTLR_PHY || !CONFIG_BT_CTLR_PHY_CODED */
 
 #if defined(CONFIG_BT_CTLR_ADV_EXT)
 #define LL_FEAT_BIT_EXT_ADV BIT64(BT_LE_FEAT_BIT_EXT_ADV)