jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Remove unused driver_ops client MLME functions

Browse source 
These driver_ops functions set_channel, set_ssid, set_bssid,
mlme_add_sta, and mlme_remove_sta were used with the user space
MLME implementation in wpa_supplicant. That was only for testing
purposes and was removed, but these driver_ops were forgotten.
Remove them now to remove confusing driver_ops definitions.
This commit is contained in:
Jouni Malinen 2011-10-23 20:07:57 +03:00
parent e1e8cae3c7
commit edc3a7c414
4 changed files with 0 additions and 167 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
src/drivers/driver.h
View file

@ -1268,43 +1268,6 @@ struct wpa_driver_ops {
u16 *num_modes, u16 *num_modes,
u16 *flags); u16 *flags);
/**
* set_channel - Set channel
* @priv: Private driver interface data
* @phymode: HOSTAPD_MODE_IEEE80211B, ..
* @chan: IEEE 802.11 channel number
* @freq: Frequency of the channel in MHz
* Returns: 0 on success, -1 on failure
*
* This function is only needed for drivers that export MLME
* (management frame processing) to wpa_supplicant.
*/
int (*set_channel)(void *priv, enum hostapd_hw_mode phymode, int chan,
int freq);
/**
* set_ssid - Set SSID
* @priv: Private driver interface data
* @ssid: SSID
* @ssid_len: SSID length
* Returns: 0 on success, -1 on failure
*
* This function is only needed for drivers that export MLME
* (management frame processing) to wpa_supplicant.
*/
int (*set_ssid)(void *priv, const u8 *ssid, size_t ssid_len);
/**
* set_bssid - Set BSSID
* @priv: Private driver interface data
* @bssid: BSSID
* Returns: 0 on success, -1 on failure
*
* This function is only needed for drivers that export MLME
* (management frame processing) to wpa_supplicant.
*/
int (*set_bssid)(void *priv, const u8 *bssid);
/** /**
* send_mlme - Send management frame from MLME * send_mlme - Send management frame from MLME
* @priv: Private driver interface data * @priv: Private driver interface data
@ -1314,35 +1277,6 @@ struct wpa_driver_ops {
*/ */
int (*send_mlme)(void *priv, const u8 *data, size_t data_len); int (*send_mlme)(void *priv, const u8 *data, size_t data_len);
/**
* mlme_add_sta - Add a STA entry into the driver/netstack
* @priv: Private driver interface data
* @addr: MAC address of the STA (e.g., BSSID of the AP)
* @supp_rates: Supported rate set (from (Re)AssocResp); in IEEE 802.11
* format (one octet per rate, 1 = 0.5 Mbps)
* @supp_rates_len: Number of entries in supp_rates
* Returns: 0 on success, -1 on failure
*
* This function is only needed for drivers that export MLME
* (management frame processing) to wpa_supplicant. When the MLME code
* completes association with an AP, this function is called to
* configure the driver/netstack with a STA entry for data frame
* processing (TX rate control, encryption/decryption).
*/
int (*mlme_add_sta)(void *priv, const u8 *addr, const u8 *supp_rates,
size_t supp_rates_len);
/**
* mlme_remove_sta - Remove a STA entry from the driver/netstack
* @priv: Private driver interface data
* @addr: MAC address of the STA (e.g., BSSID of the AP)
* Returns: 0 on success, -1 on failure
*
* This function is only needed for drivers that export MLME
* (management frame processing) to wpa_supplicant.
*/
int (*mlme_remove_sta)(void *priv, const u8 *addr);
/** /**
* update_ft_ies - Update FT (IEEE 802.11r) IEs * update_ft_ies - Update FT (IEEE 802.11r) IEs
* @priv: Private driver interface data * @priv: Private driver interface data

5
src/drivers/driver_ndis.c
View file

@ -3237,12 +3237,7 @@ const struct wpa_driver_ops wpa_driver_ndis_ops = {
NULL /* set_operstate */, NULL /* set_operstate */,
NULL /* mlme_setprotection */, NULL /* mlme_setprotection */,
NULL /* get_hw_feature_data */, NULL /* get_hw_feature_data */,
NULL /* set_channel */,
NULL /* set_ssid */,
NULL /* set_bssid */,
NULL /* send_mlme */, NULL /* send_mlme */,
NULL /* mlme_add_sta */,
NULL /* mlme_remove_sta */,
NULL /* update_ft_ies */, NULL /* update_ft_ies */,
NULL /* send_ft_action */, NULL /* send_ft_action */,
wpa_driver_ndis_get_scan_results, wpa_driver_ndis_get_scan_results,

49
src/drivers/driver_test.c
View file

@ -2535,50 +2535,6 @@ static int wpa_driver_test_mlme_setprotection(void *priv, const u8 *addr,
} }
static int wpa_driver_test_set_channel(void *priv,
enum hostapd_hw_mode phymode,
int chan, int freq)
{
struct test_driver_bss *dbss = priv;
struct wpa_driver_test_data *drv = dbss->drv;
wpa_printf(MSG_DEBUG, "%s: phymode=%d chan=%d freq=%d",
__func__, phymode, chan, freq);
drv->current_freq = freq;
return 0;
}
static int wpa_driver_test_mlme_add_sta(void *priv, const u8 *addr,
const u8 *supp_rates,
size_t supp_rates_len)
{
wpa_printf(MSG_DEBUG, "%s: addr=" MACSTR, __func__, MAC2STR(addr));
return 0;
}
static int wpa_driver_test_mlme_remove_sta(void *priv, const u8 *addr)
{
wpa_printf(MSG_DEBUG, "%s: addr=" MACSTR, __func__, MAC2STR(addr));
return 0;
}
static int wpa_driver_test_set_ssid(void *priv, const u8 *ssid,
size_t ssid_len)
{
wpa_printf(MSG_DEBUG, "%s", __func__);
return 0;
}
static int wpa_driver_test_set_bssid(void *priv, const u8 *bssid)
{
wpa_printf(MSG_DEBUG, "%s: bssid=" MACSTR, __func__, MAC2STR(bssid));
return 0;
}
static void * wpa_driver_test_global_init(void) static void * wpa_driver_test_global_init(void)
{ {
struct wpa_driver_test_global *global; struct wpa_driver_test_global *global;
@ -3357,11 +3313,6 @@ const struct wpa_driver_ops wpa_driver_test_ops = {
.get_mac_addr = wpa_driver_test_get_mac_addr, .get_mac_addr = wpa_driver_test_get_mac_addr,
.send_eapol = wpa_driver_test_send_eapol, .send_eapol = wpa_driver_test_send_eapol,
.mlme_setprotection = wpa_driver_test_mlme_setprotection, .mlme_setprotection = wpa_driver_test_mlme_setprotection,
.set_channel = wpa_driver_test_set_channel,
.set_ssid = wpa_driver_test_set_ssid,
.set_bssid = wpa_driver_test_set_bssid,
.mlme_add_sta = wpa_driver_test_mlme_add_sta,
.mlme_remove_sta = wpa_driver_test_mlme_remove_sta,
.get_scan_results2 = wpa_driver_test_get_scan_results2, .get_scan_results2 = wpa_driver_test_get_scan_results2,
.global_init = wpa_driver_test_global_init, .global_init = wpa_driver_test_global_init,
.global_deinit = wpa_driver_test_global_deinit, .global_deinit = wpa_driver_test_global_deinit,

47
wpa_supplicant/driver_i.h
View file

@ -253,35 +253,6 @@ wpa_drv_get_hw_feature_data(struct wpa_supplicant *wpa_s, u16 *num_modes,
return NULL; return NULL;
} }
static inline int wpa_drv_set_channel(struct wpa_supplicant *wpa_s,
enum hostapd_hw_mode phymode, int chan,
int freq)
{
if (wpa_s->driver->set_channel)
return wpa_s->driver->set_channel(wpa_s->drv_priv, phymode,
chan, freq);
return -1;
}
static inline int wpa_drv_set_ssid(struct wpa_supplicant *wpa_s,
const u8 *ssid, size_t ssid_len)
{
if (wpa_s->driver->set_ssid) {
return wpa_s->driver->set_ssid(wpa_s->drv_priv, ssid,
ssid_len);
}
return -1;
}
static inline int wpa_drv_set_bssid(struct wpa_supplicant *wpa_s,
const u8 *bssid)
{
if (wpa_s->driver->set_bssid) {
return wpa_s->driver->set_bssid(wpa_s->drv_priv, bssid);
}
return -1;
}
static inline int wpa_drv_set_country(struct wpa_supplicant *wpa_s, static inline int wpa_drv_set_country(struct wpa_supplicant *wpa_s,
const char *alpha2) const char *alpha2)
{ {
@ -299,24 +270,6 @@ static inline int wpa_drv_send_mlme(struct wpa_supplicant *wpa_s,
return -1; return -1;
} }
static inline int wpa_drv_mlme_add_sta(struct wpa_supplicant *wpa_s,
const u8 *addr, const u8 *supp_rates,
size_t supp_rates_len)
{
if (wpa_s->driver->mlme_add_sta)
return wpa_s->driver->mlme_add_sta(wpa_s->drv_priv, addr,
supp_rates, supp_rates_len);
return -1;
}
static inline int wpa_drv_mlme_remove_sta(struct wpa_supplicant *wpa_s,
const u8 *addr)
{
if (wpa_s->driver->mlme_remove_sta)
return wpa_s->driver->mlme_remove_sta(wpa_s->drv_priv, addr);
return -1;
}
static inline int wpa_drv_update_ft_ies(struct wpa_supplicant *wpa_s, static inline int wpa_drv_update_ft_ies(struct wpa_supplicant *wpa_s,
const u8 *md, const u8 *md,
const u8 *ies, size_t ies_len) const u8 *ies, size_t ies_len)