DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

driver: Remove unused send_ether() driver op

Browse source 
This was used only for FT RRB sending with driver_test.c and
driver_test.c was removed more than five years ago, so there is no point
in continuing to maintain this driver op.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2020-01-05 18:32:10 +02:00
parent 754cd71bf4
commit ccaabeaa03
3 changed files with 1 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/ap/wpa_auth_glue.c
View file

@ -639,10 +639,6 @@ static int hostapd_wpa_auth_send_ether(void *ctx, const u8 *dst, u16 proto,
} }
#endif /* CONFIG_IEEE80211R_AP */ #endif /* CONFIG_IEEE80211R_AP */
if (hapd->driver && hapd->driver->send_ether)
return hapd->driver->send_ether(hapd->drv_priv, dst,
hapd->own_addr, proto,
data, data_len);
if (hapd->l2 == NULL) if (hapd->l2 == NULL)
return -1; return -1;
@ -1398,9 +1394,7 @@ int hostapd_setup_wpa(struct hostapd_data *hapd)
hapd->conf->iface; hapd->conf->iface;
hapd->l2 = l2_packet_init(ft_iface, NULL, ETH_P_RRB, hapd->l2 = l2_packet_init(ft_iface, NULL, ETH_P_RRB,
hostapd_rrb_receive, hapd, 1); hostapd_rrb_receive, hapd, 1);
if (hapd->l2 == NULL && if (!hapd->l2) {
(hapd->driver == NULL ||
hapd->driver->send_ether == NULL)) {
wpa_printf(MSG_ERROR, "Failed to open l2_packet " wpa_printf(MSG_ERROR, "Failed to open l2_packet "
"interface"); "interface");
return -1; return -1;

13
src/drivers/driver.h
View file

@ -3114,19 +3114,6 @@ struct wpa_driver_ops {
*/ */
int (*commit)(void *priv); int (*commit)(void *priv);
/**
* send_ether - Send an ethernet packet (AP only)
* @priv: private driver interface data
* @dst: Destination MAC address
* @src: Source MAC address
* @proto: Ethertype
* @data: EAPOL packet starting with IEEE 802.1X header
* @data_len: Length of the EAPOL packet in octets
* Returns: 0 on success, -1 on failure
*/
int (*send_ether)(void *priv, const u8 *dst, const u8 *src, u16 proto,
const u8 *data, size_t data_len);
/** /**
* set_radius_acl_auth - Notification of RADIUS ACL change * set_radius_acl_auth - Notification of RADIUS ACL change
* @priv: Private driver interface data * @priv: Private driver interface data

8
src/drivers/driver_none.c
View file

@ -43,13 +43,6 @@ static void none_driver_hapd_deinit(void *priv)
} }
static int none_driver_send_ether(void *priv, const u8 *dst, const u8 *src,
u16 proto, const u8 *data, size_t data_len)
{
return 0;
}
static void * none_driver_init(void *ctx, const char *ifname) static void * none_driver_init(void *ctx, const char *ifname)
{ {
struct none_driver_data *drv; struct none_driver_data *drv;
@ -79,7 +72,6 @@ const struct wpa_driver_ops wpa_driver_none_ops = {
.desc = "no driver (RADIUS server/WPS ER)", .desc = "no driver (RADIUS server/WPS ER)",
.hapd_init = none_driver_hapd_init, .hapd_init = none_driver_hapd_init,
.hapd_deinit = none_driver_hapd_deinit, .hapd_deinit = none_driver_hapd_deinit,
.send_ether = none_driver_send_ether,
.init = none_driver_init, .init = none_driver_init,
.deinit = none_driver_deinit, .deinit = none_driver_deinit,
}; };