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

Fix CONFIG_AP=y build after driver API changes

Browse source
This commit is contained in:
Jouni Malinen 2010-01-03 13:05:54 +02:00
parent 2a8b74163e
commit fdbe50ed98
4 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
wpa_supplicant/ap.c
View file

@ -249,11 +249,12 @@ void ap_tx_status(void *ctx, const u8 *addr,
} }
void ap_rx_from_unknown_sta(void *ctx, const struct ieee80211_hdr *hdr, void ap_rx_from_unknown_sta(void *ctx, const u8 *frame, size_t len)
size_t len)
{ {
#ifdef NEED_AP_MLME #ifdef NEED_AP_MLME
struct wpa_supplicant *wpa_s = ctx; struct wpa_supplicant *wpa_s = ctx;
const struct ieee80211_hdr *hdr =
(const struct ieee80211_hdr *) frame;
u16 fc = le_to_host16(hdr->frame_control); u16 fc = le_to_host16(hdr->frame_control);
ieee802_11_rx_from_unknown(wpa_s->ap_iface->bss[0], hdr->addr2, ieee802_11_rx_from_unknown(wpa_s->ap_iface->bss[0], hdr->addr2,
(fc & (WLAN_FC_TODS | WLAN_FC_FROMDS)) == (fc & (WLAN_FC_TODS | WLAN_FC_FROMDS)) ==

3
wpa_supplicant/ap.h
View file

@ -34,8 +34,7 @@ int ap_ctrl_iface_wpa_get_status(struct wpa_supplicant *wpa_s, char *buf,
size_t buflen, int verbose); size_t buflen, int verbose);
void ap_tx_status(void *ctx, const u8 *addr, void ap_tx_status(void *ctx, const u8 *addr,
const u8 *buf, size_t len, int ack); const u8 *buf, size_t len, int ack);
void ap_rx_from_unknown_sta(void *ctx, const struct ieee80211_hdr *hdr, void ap_rx_from_unknown_sta(void *ctx, const u8 *frame, size_t len);
size_t len);
void ap_mgmt_rx(void *ctx, struct rx_mgmt *rx_mgmt); void ap_mgmt_rx(void *ctx, struct rx_mgmt *rx_mgmt);
void ap_mgmt_tx_cb(void *ctx, const u8 *buf, size_t len, u16 stype, int ok); void ap_mgmt_tx_cb(void *ctx, const u8 *buf, size_t len, u16 stype, int ok);

2
wpa_supplicant/events.c
View file

@ -1494,7 +1494,7 @@ void wpa_supplicant_event(void *ctx, wpa_event_type event,
case EVENT_RX_FROM_UNKNOWN: case EVENT_RX_FROM_UNKNOWN:
if (wpa_s->ap_iface == NULL) if (wpa_s->ap_iface == NULL)
break; break;
ap_rx_from_unknown_sta(wpa_s, data->rx_from_unknown.hdr, ap_rx_from_unknown_sta(wpa_s, data->rx_from_unknown.frame,
data->rx_from_unknown.len); data->rx_from_unknown.len);
break; break;
case EVENT_RX_MGMT: case EVENT_RX_MGMT:

2
wpa_supplicant/sme.c
View file

@ -35,7 +35,9 @@ void sme_authenticate(struct wpa_supplicant *wpa_s,
{ {
struct wpa_driver_auth_params params; struct wpa_driver_auth_params params;
struct wpa_ssid *old_ssid; struct wpa_ssid *old_ssid;
#ifdef CONFIG_IEEE80211R
const u8 *ie; const u8 *ie;
#endif /* CONFIG_IEEE80211R */
#ifdef CONFIG_IEEE80211R #ifdef CONFIG_IEEE80211R
const u8 *md = NULL; const u8 *md = NULL;
#endif /* CONFIG_IEEE80211R */ #endif /* CONFIG_IEEE80211R */