MAC: set new MAC channel only if RF returns success

Jarkko Paso · Jarkko Paso · commit 4a204bdad7b4 · 2018-10-02T12:55:38.000+03:00
diff --git a/source/MAC/IEEE802_15_4/mac_mlme.c b/source/MAC/IEEE802_15_4/mac_mlme.c
@@ -1510,8 +1510,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
`@@ -1510,8 +1510,9 @@ int8_t mac_mlme_rf_channel_change(protocol_interface_rf_mac_setup_s *rf_mac_setu`
`1510`	`1510`	`return 0;`
`1511`	`1511`	`}`
`1512`	`1512`	`platform_enter_critical();`
`1513`		`- rf_mac_setup->mac_channel = new_channel;`
`1514`		`- rf_mac_setup->dev_driver->phy_driver->extension(PHY_EXTENSION_SET_CHANNEL, &rf_mac_setup->mac_channel);`
	`1513`	`+ if (rf_mac_setup->dev_driver->phy_driver->extension(PHY_EXTENSION_SET_CHANNEL, &new_channel) == 0) {`
	`1514`	`+ rf_mac_setup->mac_channel = new_channel;`
	`1515`	`+ }`
`1515`	`1516`	`platform_exit_critical();`
`1516`	`1517`	`return 0;`
`1517`	`1518`	`}`