MAC: Do not increment framecounter if security param init fails

Author: Jarkko Paso

source/MAC/IEEE802_15_4/mac_mcps_sap.c

@@ -1519,17 +1519,20 @@ static int8_t mcps_generic_packet_build(protocol_interface_rf_mac_setup_s *rf_pt
     mcps_generic_sequence_number_allocate(rf_ptr, buffer);
 
     if (buffer->fcf_dsn.securityEnabled) {
+        bool increment_framecounter = false;
         //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 || ((new_frameCounter - buffer->aux_header.frameCounter) > 1)) {
             buffer->aux_header.frameCounter = new_frameCounter;
-            //Increment security counter
-            mac_mlme_framecounter_increment(rf_ptr);
+            increment_framecounter = true;
         }
         if (!mac_frame_security_parameters_init(&ccm_ptr, rf_ptr, buffer)) {
             return -2;
         }
+        if (increment_framecounter) {
+            mac_mlme_framecounter_increment(rf_ptr);
+        }
     }
 
     //Calculate Payload length here with IE extension