Patchwork [v4,15/25] VLAN: Use new VLAN data type in wpa_supplicant

login
register
mail settings
Submitter michael-dev@fami-braun.de
Date July 27, 2013, 7:55 p.m.
Message ID <20130727195542.17627.17143.stgit@ray-controller>
Download mbox | patch
Permalink /patch/262517/
State Superseded
Headers show

Comments

michael-dev@fami-braun.de - July 27, 2013, 7:55 p.m.
Signed-hostap: Michael Braun <michael-dev@fami-braun.de>
---
 wpa_supplicant/ibss_rsn.c        |    2 +-
 wpa_supplicant/tests/link_test.c |    5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

Patch

diff --git a/wpa_supplicant/ibss_rsn.c b/wpa_supplicant/ibss_rsn.c
index 62d68b8..6491d1c 100644
--- a/wpa_supplicant/ibss_rsn.c
+++ b/wpa_supplicant/ibss_rsn.c
@@ -262,7 +262,7 @@  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,
+static int auth_set_key(void *ctx, vlan_t vlan_id, enum wpa_alg alg,
 			const u8 *addr, int idx, u8 *key, size_t key_len)
 {
 	struct ibss_rsn *ibss_rsn = ctx;
diff --git a/wpa_supplicant/tests/link_test.c b/wpa_supplicant/tests/link_test.c
index 3bfbed5..a772586 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)
+		     vlan_t 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,
+                                        vlan_t vlan_id)
 {
 	return NULL;
 }