Merge pull request #2181 from ARMmbed/IOTTHD-3530_2

Jarkko Paso · web-flow · commit 443f03f576a8 · 2019-09-10T09:06:39.000+03:00
MAC: Update frame counter for asynch frames
diff --git a/source/MAC/IEEE802_15_4/mac_mcps_sap.c b/source/MAC/IEEE802_15_4/mac_mcps_sap.c
@@ -1524,7 +1524,7 @@ static int8_t mcps_generic_packet_build(protocol_interface_rf_mac_setup_s *rf_pt
         //Remember to update security counter here!
         uint32_t new_frameCounter = mac_mlme_framecounter_get(rf_ptr);
         // If buffer frame counter is set, this is FHSS channel retry, update frame counter only if something was sent after failure
-        if ((buffer->aux_header.frameCounter == 0xffffffff) || ((new_frameCounter - buffer->aux_header.frameCounter) > 1)) {
+        if ((buffer->aux_header.frameCounter == 0xffffffff) || buffer->asynch_request || ((new_frameCounter - buffer->aux_header.frameCounter) > 1)) {
             buffer->aux_header.frameCounter = new_frameCounter;
             increment_framecounter = true;
         }

Original file line number	Diff line number	Diff line change
`@@ -1524,7 +1524,7 @@ static int8_t mcps_generic_packet_build(protocol_interface_rf_mac_setup_s *rf_pt`
`1524`	`1524`	`//Remember to update security counter here!`
`1525`	`1525`	`uint32_t new_frameCounter = mac_mlme_framecounter_get(rf_ptr);`
`1526`	`1526`	`// If buffer frame counter is set, this is FHSS channel retry, update frame counter only if something was sent after failure`
`1527`		`- if ((buffer->aux_header.frameCounter == 0xffffffff) \|\| ((new_frameCounter - buffer->aux_header.frameCounter) > 1)) {`
	`1527`	`+ if ((buffer->aux_header.frameCounter == 0xffffffff) \|\| buffer->asynch_request \|\| ((new_frameCounter - buffer->aux_header.frameCounter) > 1)) {`
`1528`	`1528`	`buffer->aux_header.frameCounter = new_frameCounter;`
`1529`	`1529`	`increment_framecounter = true;`
`1530`	`1530`	`}`