This patch updates nl802154 enum to match the one in bluetooth-next tree from commit d446278c408b ("nl802154: fix misspelled enum"). Signed-off-by: Christoffer Holmstedt <christoffer@xxxxxxxxxxxxxxxxxxxxxxx> --- src/info.c | 2 +- src/nl802154.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/info.c b/src/info.c index e70f33da8997..21b7e9e9f64c 100644 --- a/src/info.c +++ b/src/info.c @@ -173,7 +173,7 @@ const char *print_cca_mode_handler(enum nl802154_cca_modes cca_mode, return "ALOHA"; case NL802154_CCA_UWB_SHR: return "UWB preamble sense based on the SHR of a frame"; - case NL802154_CCA_UWB_MULTIPEXED: + case NL802154_CCA_UWB_MULTIPLEXED: return "UWB preamble sense based on the packet with the multiplexed preamble"; default: sprintf(cca_mode_buf, "Unknown CCA mode (%d)", cca_mode); diff --git a/src/nl802154.h b/src/nl802154.h index 6fc231e60920..b0ab530d28cd 100644 --- a/src/nl802154.h +++ b/src/nl802154.h @@ -187,7 +187,7 @@ enum nl802154_wpan_phy_capability_attr { * @NL802154_CCA_ENERGY_CARRIER: Carrier sense with energy above threshold * @NL802154_CCA_ALOHA: CCA shall always report an idle medium * @NL802154_CCA_UWB_SHR: UWB preamble sense based on the SHR of a frame - * @NL802154_CCA_UWB_MULTIPEXED: UWB preamble sense based on the packet with + * @NL802154_CCA_UWB_MULTIPLEXED: UWB preamble sense based on the packet with * the multiplexed preamble * @__NL802154_CCA_ATTR_AFTER_LAST: Internal * @NL802154_CCA_ATTR_MAX: Maximum CCA attribute number @@ -199,7 +199,7 @@ enum nl802154_cca_modes { NL802154_CCA_ENERGY_CARRIER, NL802154_CCA_ALOHA, NL802154_CCA_UWB_SHR, - NL802154_CCA_UWB_MULTIPEXED, + NL802154_CCA_UWB_MULTIPLEXED, /* keep last */ __NL802154_CCA_ATTR_AFTER_LAST, -- 2.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-wpan" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html