Fixed channel mask usage with OFDM configurations (ARMmbed#2633)

* Fixed channel mask usage with OFDM configurations

* Updated change log

Author: Jarkko Paso

CHANGELOG.md

@@ -14,6 +14,7 @@
 ### Bug fixes
 * Added ignoring of retry messages from RADIUS server when waiting EAP-TLS
 * Removed empty EAPOL-key message send after 4WH completion to nodes on relay
+* Fixed channel mask usage with OFDM configurations
 
 
 ## Release v13.0.0 (15-04-2021)

source/6LoWPAN/ws/ws_common.c

@@ -75,13 +75,6 @@ int8_t ws_generate_channel_list(uint32_t *channel_mask, uint16_t number_of_chann
         channel_mask[0 + (i / 32)] |= (1 << (i % 32));
     }
     // Disable unsupported channels per regional frequency bands
-    if (regulatory_domain == REG_DOMAIN_NA) {
-        if (channel_plan_id == 1) {
-            ws_disable_channels_in_range(channel_mask, number_of_channels, 1, 7);
-        } else if (channel_plan_id == 5) {
-            ws_disable_channels_in_range(channel_mask, number_of_channels, 5, 7);
-        }
-    }
     if (regulatory_domain == REG_DOMAIN_BZ) {
         if (channel_plan_id == 255) {
             if (operating_class == 1) {
@@ -93,17 +86,11 @@ int8_t ws_generate_channel_list(uint32_t *channel_mask, uint16_t number_of_chann
             }
         } else {
             if (channel_plan_id == 1) {
-                ws_disable_channels_in_range(channel_mask, number_of_channels, 1, 7);
-                ws_disable_channels_in_range(channel_mask, number_of_channels, 64, 64);
-                ws_disable_channels_in_range(channel_mask, number_of_channels, 72, 103);
-                ws_disable_channels_in_range(channel_mask, number_of_channels, 106, 111);
+                ws_disable_channels_in_range(channel_mask, number_of_channels, 26, 64);
             } else if (channel_plan_id == 2) {
-                ws_disable_channels_in_range(channel_mask, number_of_channels, 24, 24);
-                ws_disable_channels_in_range(channel_mask, number_of_channels, 32, 47);
-                ws_disable_channels_in_range(channel_mask, number_of_channels, 52, 55);
+                ws_disable_channels_in_range(channel_mask, number_of_channels, 12, 32);
             } else if (channel_plan_id == 5) {
-                ws_disable_channels_in_range(channel_mask, number_of_channels, 5, 10);
-                ws_disable_channels_in_range(channel_mask, number_of_channels, 19, 23);
+                ws_disable_channels_in_range(channel_mask, number_of_channels, 3, 10);
             }
         }
     }
@@ -424,11 +411,11 @@ uint16_t ws_common_channel_number_calc(uint8_t regulatory_domain, uint8_t operat
             }
         } else {
             if (channel_plan_id == 1) {
-                return 136;
+                return 129;
             } else if (channel_plan_id == 2) {
                 return 64;
             } else if (channel_plan_id == 5) {
-                return 24;
+                return 21;
             }
         }
     } else if (regulatory_domain == REG_DOMAIN_JP) {
@@ -450,11 +437,11 @@ uint16_t ws_common_channel_number_calc(uint8_t regulatory_domain, uint8_t operat
             }
         } else {
             if (channel_plan_id == 1) {
-                return 136;
+                return 129;
             } else if (channel_plan_id == 2) {
                 return 64;
             } else if (channel_plan_id == 5) {
-                return 24;
+                return 21;
             }
         }
     } else if (regulatory_domain == REG_DOMAIN_WW) {