Merge pull request ARMmbed#1846 from ARMmbed/IOTTHD-2824

Jarkko Paso · web-flow · commit caf53d16b24a · 2018-10-09T11:35:45.000+03:00
MAC: set new MAC channel only if RF returns success
diff --git a/source/MAC/IEEE802_15_4/mac_mlme.c b/source/MAC/IEEE802_15_4/mac_mlme.c
@@ -1512,8 +1512,9 @@ int8_t mac_mlme_rf_channel_change(protocol_interface_rf_mac_setup_s *rf_mac_setu
         return 0;
     }
     platform_enter_critical();
-    rf_mac_setup->mac_channel = new_channel;
-    rf_mac_setup->dev_driver->phy_driver->extension(PHY_EXTENSION_SET_CHANNEL, &rf_mac_setup->mac_channel);
+    if (rf_mac_setup->dev_driver->phy_driver->extension(PHY_EXTENSION_SET_CHANNEL, &new_channel) == 0) {
+        rf_mac_setup->mac_channel = new_channel;
+    }
     platform_exit_critical();
     return 0;
 }

Original file line number	Diff line number	Diff line change
`@@ -1512,8 +1512,9 @@ int8_t mac_mlme_rf_channel_change(protocol_interface_rf_mac_setup_s *rf_mac_setu`
`1512`	`1512`	`return 0;`
`1513`	`1513`	`}`
`1514`	`1514`	`platform_enter_critical();`
`1515`		`- rf_mac_setup->mac_channel = new_channel;`
`1516`		`- rf_mac_setup->dev_driver->phy_driver->extension(PHY_EXTENSION_SET_CHANNEL, &rf_mac_setup->mac_channel);`
	`1515`	`+ if (rf_mac_setup->dev_driver->phy_driver->extension(PHY_EXTENSION_SET_CHANNEL, &new_channel) == 0) {`
	`1516`	`+ rf_mac_setup->mac_channel = new_channel;`
	`1517`	`+ }`
`1517`	`1518`	`platform_exit_critical();`
`1518`	`1519`	`return 0;`
`1519`	`1520`	`}`