Earlier cca_modes and cca_opts were printed separately but these two patches now prints them together so cca_opts are only printed when the specified mode is (3). Output for "current" mode (only one line is printed for each wpan): cca_mode: 1, energy above threshold. cca_mode: 2, carrier sense only. cca_mode: 3, carrier sense with energy above threshold (logical operator is 'and'). cca_mode: 3, carrier sense with energy above threshold (logical operator is 'or'). cca_mode: 3, carrier sense with energy above threshold (logical operator is unknown). cca_mode: 4, ALOHA. cca_mode: 5, UWB preamble sense based on the SHR of a frame. cca_mode: 6, UWB preamble sense based on the packet with the multiplexed preamble. capabilities: ... cca_modes: (1) energy above threshold (2) carrier sense only (3, cca_opt: 0) carrier sense with energy above threshold (logical operator is 'and') (3, cca_opt: 1) carrier sense with energy above threshold (logical operator is 'or') Christoffer Holmstedt (2): info: add cca mode descriptive text to output info: remove old cca options capabilities output src/info.c | 99 +++++++++++++++++++++++++++++++++++++------------------------- 1 file changed, 60 insertions(+), 39 deletions(-) -- 1.9.1 -- Christoffer Holmstedt -- 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