[PATCH v5 13/22] VLAN: Use new VLAN data type in wpa_supplicant

Michael Braun michael-dev
Tue Nov 19 11:47:45 PST 2013


Signed-hostap: Michael Braun <michael-dev at fami-braun.de>
---
 wpa_supplicant/ibss_rsn.c        |    5 +++--
 wpa_supplicant/tests/link_test.c |    5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/wpa_supplicant/ibss_rsn.c b/wpa_supplicant/ibss_rsn.c
index 47ef35e..0d6e11e 100644
--- a/wpa_supplicant/ibss_rsn.c
+++ b/wpa_supplicant/ibss_rsn.c
@@ -287,8 +287,9 @@ static int auth_send_eapol(void *ctx, const u8 *addr, const u8 *data,
 }
 
 
-static int auth_set_key(void *ctx, int vlan_id, enum wpa_alg alg,
-			const u8 *addr, int idx, u8 *key, size_t key_len)
+static int auth_set_key(void *ctx, struct vlan_description vlan_id,
+                        enum wpa_alg alg, const u8 *addr, int idx, u8 *key,
+                        size_t key_len)
 {
 	struct ibss_rsn *ibss_rsn = ctx;
 	u8 seq[6];
diff --git a/wpa_supplicant/tests/link_test.c b/wpa_supplicant/tests/link_test.c
index 3bfbed5..2b2f24c 100644
--- a/wpa_supplicant/tests/link_test.c
+++ b/wpa_supplicant/tests/link_test.c
@@ -40,7 +40,7 @@ void ap_sta_session_timeout(struct hostapd_data *hapd, struct sta_info *sta,
 
 
 int ap_sta_bind_vlan(struct hostapd_data *hapd, struct sta_info *sta,
-		     int old_vlanid)
+		     struct vlan_description old_vlanid)
 {
 	return 0;
 }
@@ -77,7 +77,8 @@ hostapd_get_eap_user(const struct hostapd_bss_config *conf, const u8 *identity,
 }
 
 
-const char * hostapd_get_vlan_id_ifname(struct hostapd_vlan *vlan, int vlan_id)
+const char * hostapd_get_vlan_id_ifname(struct hostapd_vlan *vlan,
+                                        struct vlan_description vlan_id)
 {
 	return NULL;
 }




More information about the Hostap mailing list