MAC: Moved MAC filters in data ind callback

artokin · Apr 16, 2019 · 30bce91 · 30bce91
1 parent b961948
commit 30bce91
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/source/MAC/IEEE802_15_4/mac_mcps_sap.c b/source/MAC/IEEE802_15_4/mac_mcps_sap.c
@@ -980,11 +980,6 @@ static void mac_data_interface_frame_handler(mac_pre_parsed_frame_t *buf)
  mcps_sap_pre_parsed_frame_buffer_free(buf);
  return;
  }
-
- if (mac_filter_modify_link_quality(rf_mac_setup->mac_interface_id, buf) == 1) {
- mcps_sap_pre_parsed_frame_buffer_free(buf);
- return;
- }
  /* push data to stack if sniffer mode is enabled */
  if (rf_mac_setup->macProminousMode) {
  mac_nap_tun_data_handler(buf, rf_mac_setup);

diff --git a/source/MAC/IEEE802_15_4/mac_pd_sap.c b/source/MAC/IEEE802_15_4/mac_pd_sap.c
@@ -786,6 +786,9 @@ int8_t mac_pd_sap_data_cb(void *identifier, arm_phy_sap_msg_t *message)
  const uint8_t *ptr = mac_header_parse_fcf_dsn(&fcf_read, pd_data_ind->data_ptr);
 
  mac_pre_parsed_frame_t *buffer = mac_pd_sap_allocate_receive_buffer(rf_ptr, fcf_read, pd_data_ind);
+ if (buffer && mac_filter_modify_link_quality(rf_ptr->mac_interface_id, buffer) == 1) {
+ goto ERROR_HANDLER;
+ }
  if (!rf_ptr->macProminousMode) {
  if (mac_pd_sap_validate_fcf(rf_ptr, fcf_read, pd_data_ind)) {
  goto ERROR_HANDLER;

diff --git a/test/nanostack/unittest/mac/mac_pd_sap/Makefile b/test/nanostack/unittest/mac/mac_pd_sap/Makefile
@@ -19,6 +19,7 @@ TEST_SRC_FILES = \
  ../../stub/mac_mcps_sap_stub.c \
  ../../stub/mac_header_helper_functions_stub.c \
  ../../stub/mac_timer_stub.c \
+ ../../stub/mac_filter_stub.c \
  ../../stub/protocol_core_stub.c \
  ../../stub/randLIB_stub.c \
  ../../stub/mac_mlme_stub.c \