Merge pull request ARMmbed#1724 from ARMmbed/IOTTHD-2537

MAC: Fixed frame length when calling FHSS TX conditions
deepakvenugopal · Jun 6, 2018 · 66636b8 · 66636b8
2 parents 2710836 + c56886f
commit 66636b8
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/source/MAC/IEEE802_15_4/mac_mcps_sap.c b/source/MAC/IEEE802_15_4/mac_mcps_sap.c
@@ -1882,9 +1882,10 @@ void mcps_sap_pd_req_queue_write(protocol_interface_rf_mac_setup_s *rf_mac_setup
             goto push_to_queue;
         }
         if (rf_mac_setup->fhss_api && (buffer->asynch_request == false)) {
+            uint16_t frame_length = buffer->mac_payload_length + buffer->headerIeLength + buffer->payloadsIeLength;
             if (rf_mac_setup->fhss_api->check_tx_conditions(rf_mac_setup->fhss_api, !mac_is_ack_request_set(buffer),
-            	buffer->msduHandle, mac_convert_frame_type_to_fhss(buffer->fcf_dsn.frametype), buffer->mac_payload_length,
-            	rf_mac_setup->dev_driver->phy_driver->phy_header_length, rf_mac_setup->dev_driver->phy_driver->phy_tail_length) == false) {
+                buffer->msduHandle, mac_convert_frame_type_to_fhss(buffer->fcf_dsn.frametype), frame_length,
+                rf_mac_setup->dev_driver->phy_driver->phy_header_length, rf_mac_setup->dev_driver->phy_driver->phy_tail_length) == false) {
                 goto push_to_queue;
             }
         }