diff --git a/src/binding/ieee80211/wifi_drivers.h b/src/binding/ieee80211/wifi_drivers.h index 2ce38b9..a9c93d6 100644 --- a/src/binding/ieee80211/wifi_drivers.h +++ b/src/binding/ieee80211/wifi_drivers.h @@ -93,7 +93,7 @@ struct device_setconfiguration_params { }; /* */ -typedef void (*send_mgmtframe_to_ac)(void* param, const struct ieee80211_header_mgmt* mgmt, int mgmtlength, int leavenativeframe); +typedef void (*send_mgmtframe_to_ac)(void* param, const struct ieee80211_header_mgmt* mgmt, int mgmtlength); struct wlan_startap_params { send_mgmtframe_to_ac send_mgmtframe; diff --git a/src/binding/ieee80211/wifi_nl80211.c b/src/binding/ieee80211/wifi_nl80211.c index a83a62f..b1c0a6d 100644 --- a/src/binding/ieee80211/wifi_nl80211.c +++ b/src/binding/ieee80211/wifi_nl80211.c @@ -692,7 +692,7 @@ static void nl80211_do_mgmt_probe_request_event(struct nl80211_wlan_handle* wlan /* If enable Split Mac send the probe request message to AC */ if (wlanhandle->macmode == CAPWAP_ADD_WLAN_MACMODE_SPLIT) { - wlanhandle->send_mgmtframe(wlanhandle->send_mgmtframe_to_ac_cbparam, mgmt, mgmtlength, 1); + wlanhandle->send_mgmtframe(wlanhandle->send_mgmtframe_to_ac_cbparam, mgmt, mgmtlength); } } @@ -782,9 +782,9 @@ static void nl80211_do_mgmt_authentication_event(struct nl80211_wlan_handle* wla wlanhandle->last_cookie = wlan_params.cookie; /* Notify authentication message also to AC */ - wlanhandle->send_mgmtframe(wlanhandle->send_mgmtframe_to_ac_cbparam, mgmt, mgmtlength, 1); + wlanhandle->send_mgmtframe(wlanhandle->send_mgmtframe_to_ac_cbparam, mgmt, mgmtlength); } else if ((wlanhandle->macmode == CAPWAP_ADD_WLAN_MACMODE_SPLIT) && (responsestatuscode == IEEE80211_STATUS_SUCCESS)) { - wlanhandle->send_mgmtframe(wlanhandle->send_mgmtframe_to_ac_cbparam, mgmt, mgmtlength, 1); + wlanhandle->send_mgmtframe(wlanhandle->send_mgmtframe_to_ac_cbparam, mgmt, mgmtlength); } } @@ -880,7 +880,7 @@ static void nl80211_do_mgmt_disassociation_event(struct nl80211_wlan_handle* wla /* TODO */ /* Notify disassociation message also to AC */ - wlanhandle->send_mgmtframe(wlanhandle->send_mgmtframe_to_ac_cbparam, mgmt, mgmtlength, 1); + wlanhandle->send_mgmtframe(wlanhandle->send_mgmtframe_to_ac_cbparam, mgmt, mgmtlength); } /* */ @@ -966,9 +966,9 @@ static void nl80211_do_mgmt_association_request_event(struct nl80211_wlan_handle wlanhandle->last_cookie = wlan_params.cookie; /* Notify association request message also to AC */ - wlanhandle->send_mgmtframe(wlanhandle->send_mgmtframe_to_ac_cbparam, mgmt, mgmtlength, 1); + wlanhandle->send_mgmtframe(wlanhandle->send_mgmtframe_to_ac_cbparam, mgmt, mgmtlength); } else if ((wlanhandle->macmode == CAPWAP_ADD_WLAN_MACMODE_SPLIT) && (resultstatuscode == IEEE80211_STATUS_SUCCESS)) { - wlanhandle->send_mgmtframe(wlanhandle->send_mgmtframe_to_ac_cbparam, mgmt, mgmtlength, 1); + wlanhandle->send_mgmtframe(wlanhandle->send_mgmtframe_to_ac_cbparam, mgmt, mgmtlength); } } @@ -995,7 +995,7 @@ static void nl80211_do_mgmt_deauthentication_event(struct nl80211_wlan_handle* w nl80211_station_delete(wlanhandle, mgmt->sa); /* Notify deauthentication message also to AC */ - wlanhandle->send_mgmtframe(wlanhandle->send_mgmtframe_to_ac_cbparam, mgmt, mgmtlength, 1); + wlanhandle->send_mgmtframe(wlanhandle->send_mgmtframe_to_ac_cbparam, mgmt, mgmtlength); } /* */ diff --git a/src/wtp/wtp_dfa_run.c b/src/wtp/wtp_dfa_run.c index 257b055..5ed10ac 100644 --- a/src/wtp/wtp_dfa_run.c +++ b/src/wtp/wtp_dfa_run.c @@ -204,7 +204,7 @@ void wtp_send_data_wireless_packet(uint8_t radioid, uint8_t wlanid, const struct /* Build packet */ capwap_header_init(&capwapheader, radioid, g_wtp.binding); - capwap_header_set_nativeframe_flag(&capwapheader, leavenativeframe); + capwap_header_set_nativeframe_flag(&capwapheader, (leavenativeframe ? 1: 0)); txmngpacket = capwap_packet_txmng_create_data_message(&capwapheader, g_wtp.mtu); /* */ diff --git a/src/wtp/wtp_radio.c b/src/wtp/wtp_radio.c index f58e209..b778784 100644 --- a/src/wtp/wtp_radio.c +++ b/src/wtp/wtp_radio.c @@ -51,7 +51,7 @@ static int wtp_radio_configure_phy(struct wtp_radio* radio) { } /* */ -static void wtp_radio_send_mgmtframe_to_ac(void* param, const struct ieee80211_header_mgmt* mgmt, int mgmtlength, int leavenativeframe) { +static void wtp_radio_send_mgmtframe_to_ac(void* param, const struct ieee80211_header_mgmt* mgmt, int mgmtlength) { struct wtp_radio_wlan* wlan = (struct wtp_radio_wlan*)param; ASSERT(param != NULL); @@ -59,7 +59,7 @@ static void wtp_radio_send_mgmtframe_to_ac(void* param, const struct ieee80211_h ASSERT(mgmtlength >= sizeof(struct ieee80211_header)); /* Send packet */ - wtp_send_data_wireless_packet(wlan->radio->radioid, wlan->wlanid, mgmt, mgmtlength, leavenativeframe); + wtp_send_data_wireless_packet(wlan->radio->radioid, wlan->wlanid, mgmt, mgmtlength, 1); } /* */