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

Remove disable_11b_rates() driver_ops

Browse source 
This function was used unconditionally if wpa_supplicant build
includes CONFIG_P2P=y. Adding a separate driver_ops for such use
is not really useful since the driver wrappers can do the same
internally. Remove this driver_ops and move matching functionality
into driver_nl80211.c which was the only driver wrapper using
this driver_ops callback.

Signed-hostap: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2011-10-29 22:25:28 +03:00
parent 1dea5882be
commit 97bcd562eb
5 changed files with 11 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

9
wpa_supplicant/driver_i.h
View file

@ -426,15 +426,6 @@ static inline int wpa_drv_probe_req_report(struct wpa_supplicant *wpa_s,
return -1;
}
static inline int wpa_drv_disable_11b_rates(struct wpa_supplicant *wpa_s,
int disabled)
{
if (wpa_s->driver->disable_11b_rates)
return wpa_s->driver->disable_11b_rates(wpa_s->drv_priv,
disabled);
return -1;
}
static inline int wpa_drv_deinit_ap(struct wpa_supplicant *wpa_s)
{
if (wpa_s->driver->deinit_ap)

5
wpa_supplicant/p2p_supplicant.c
View file

@ -2134,11 +2134,6 @@ int wpas_p2p_init(struct wpa_global *global, struct wpa_supplicant *wpa_s)
if (!(wpa_s->drv_flags & WPA_DRIVER_FLAGS_P2P_CAPABLE))
return 0;
if (wpa_drv_disable_11b_rates(wpa_s, 1) < 0) {
wpa_printf(MSG_DEBUG, "P2P: Failed to disable 11b rates");
/* Continue anyway; this is not really a fatal error */
}
if (global->p2p)
return 0;