Remove direct driver calls from vlan_init.c

[libeap.git] / hostapd / wpa.h

diff --git a/hostapd/wpa.h b/hostapd/wpa.h
index d353844..55d4ec2 100644 (file)
--- a/hostapd/wpa.h
+++ b/hostapd/wpa.h
@@ -15,8 +15,9 @@
 #ifndef WPA_AUTH_H
 #define WPA_AUTH_H
 
-#include "eapol_common.h"
-#include "wpa_common.h"
+#include "common/defs.h"
+#include "common/eapol_common.h"
+#include "common/wpa_common.h"
 
 #ifdef _MSC_VER
 #pragma pack(push, 1)
@@ -44,10 +45,6 @@ struct ft_rrb_frame {
 #define FT_PACKET_R0KH_R1KH_RESP 201
 #define FT_PACKET_R0KH_R1KH_PUSH 202
 
-#ifndef ETH_P_RRB
-#define ETH_P_RRB 0x890D
-#endif /* ETH_P_RRB */
-
 #define FT_R0KH_R1KH_PULL_DATA_LEN 44
 #define FT_R0KH_R1KH_RESP_DATA_LEN 76
 #define FT_R0KH_R1KH_PUSH_DATA_LEN 80
@@ -141,7 +138,7 @@ struct wpa_auth_config {
        int rsn_preauth;
        int eapol_version;
        int peerkey;
-       int wme_enabled;
+       int wmm_enabled;
        int okc;
 #ifdef CONFIG_IEEE80211W
        enum {
@@ -187,10 +184,9 @@ struct wpa_auth_callbacks {
        int (*get_eapol)(void *ctx, const u8 *addr, wpa_eapol_variable var);
        const u8 * (*get_psk)(void *ctx, const u8 *addr, const u8 *prev_psk);
        int (*get_msk)(void *ctx, const u8 *addr, u8 *msk, size_t *len);
-       int (*set_key)(void *ctx, int vlan_id, const char *alg, const u8 *addr,
+       int (*set_key)(void *ctx, int vlan_id, wpa_alg alg, const u8 *addr,
                       int idx, u8 *key, size_t key_len);
        int (*get_seqnum)(void *ctx, const u8 *addr, int idx, u8 *seq);
-       int (*get_seqnum_igtk)(void *ctx, const u8 *addr, int idx, u8 *seq);
        int (*send_eapol)(void *ctx, const u8 *addr, const u8 *data,
                          size_t data_len, int encrypt);
        int (*for_each_sta)(void *ctx, int (*cb)(struct wpa_state_machine *sm,
@@ -266,7 +262,8 @@ int wpa_auth_sta_set_vlan(struct wpa_state_machine *sm, int vlan_id);
 
 #ifdef CONFIG_IEEE80211R
 u8 * wpa_sm_write_assoc_resp_ies(struct wpa_state_machine *sm, u8 *pos,
-                                size_t max_len, int auth_alg);
+                                size_t max_len, int auth_alg,
+                                const u8 *req_ies, size_t req_ies_len);
 void wpa_ft_process_auth(struct wpa_state_machine *sm, const u8 *bssid,
                         u16 auth_transaction, const u8 *ies, size_t ies_len,
                         void (*cb)(void *ctx, const u8 *dst, const u8 *bssid,