From 0f812c993b61e981801d2ace13e66d311999e96b Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Sat, 1 Nov 2014 19:27:48 +0200 Subject: [PATCH] Remove unused EVENT_FT_RRB_RX This was used in hostapd driver_test.c, but that driver wrapper has been removed and there are no remaining or expected users for EVENT_FT_RRB_RX. Signed-off-by: Jouni Malinen --- src/ap/drv_callbacks.c | 6 ------ src/drivers/driver.h | 14 -------------- src/drivers/driver_common.c | 1 - 3 files changed, 21 deletions(-) diff --git a/src/ap/drv_callbacks.c b/src/ap/drv_callbacks.c index 7153bb8df..94df01931 100644 --- a/src/ap/drv_callbacks.c +++ b/src/ap/drv_callbacks.c @@ -1023,12 +1023,6 @@ void wpa_supplicant_event(void *ctx, enum wpa_event_type event, if (hapd->iface->scan_cb) hapd->iface->scan_cb(hapd->iface); break; -#ifdef CONFIG_IEEE80211R - case EVENT_FT_RRB_RX: - wpa_ft_rrb_rx(hapd->wpa_auth, data->ft_rrb_rx.src, - data->ft_rrb_rx.data, data->ft_rrb_rx.data_len); - break; -#endif /* CONFIG_IEEE80211R */ case EVENT_WPS_BUTTON_PUSHED: hostapd_wps_button_pushed(hapd, NULL); break; diff --git a/src/drivers/driver.h b/src/drivers/driver.h index 4645e9a04..348618b4c 100644 --- a/src/drivers/driver.h +++ b/src/drivers/driver.h @@ -3333,11 +3333,6 @@ enum wpa_event_type { */ EVENT_ASSOC_TIMED_OUT, - /** - * EVENT_FT_RRB_RX - FT (IEEE 802.11r) RRB frame received - */ - EVENT_FT_RRB_RX, - /** * EVENT_WPS_BUTTON_PUSHED - Report hardware push button press for WPS */ @@ -4006,15 +4001,6 @@ union wpa_event_data { u8 addr[ETH_ALEN]; } timeout_event; - /** - * struct ft_rrb_rx - Data for EVENT_FT_RRB_RX events - */ - struct ft_rrb_rx { - const u8 *src; - const u8 *data; - size_t data_len; - } ft_rrb_rx; - /** * struct tx_status - Data for EVENT_TX_STATUS events */ diff --git a/src/drivers/driver_common.c b/src/drivers/driver_common.c index eabeb80e2..e678b07c2 100644 --- a/src/drivers/driver_common.c +++ b/src/drivers/driver_common.c @@ -44,7 +44,6 @@ const char * event_to_string(enum wpa_event_type event) E2S(ASSOC_REJECT); E2S(AUTH_TIMED_OUT); E2S(ASSOC_TIMED_OUT); - E2S(FT_RRB_RX); E2S(WPS_BUTTON_PUSHED); E2S(TX_STATUS); E2S(RX_FROM_UNKNOWN);