2010-03-09 21:16:32 +00:00
|
|
|
--- a/src/drivers/driver_nl80211.c
|
|
|
|
|
+++ b/src/drivers/driver_nl80211.c
|
|
|
|
|
@@ -4435,9 +4435,11 @@ static int i802_set_wds_sta(void *priv,
|
|
|
|
|
wpa_printf(MSG_DEBUG, "nl80211: Set WDS STA addr=" MACSTR
|
|
|
|
|
" aid=%d val=%d name=%s", MAC2STR(addr), aid, val, name);
|
|
|
|
|
if (val) {
|
|
|
|
|
- if (nl80211_create_iface(drv, name, NL80211_IFTYPE_AP_VLAN,
|
|
|
|
|
+ if (!if_nametoindex(name)) {
|
|
|
|
|
+ if (nl80211_create_iface(drv, name, NL80211_IFTYPE_AP_VLAN,
|
|
|
|
|
NULL, 1) < 0)
|
|
|
|
|
- return -1;
|
|
|
|
|
+ return -1;
|
|
|
|
|
+ }
|
|
|
|
|
linux_set_iface_flags(drv->ioctl_sock, name, 1);
|
|
|
|
|
return i802_set_sta_vlan(priv, addr, name, 0);
|
|
|
|
|
} else {
|
2010-03-09 21:33:24 +00:00
|
|
|
--- a/src/ap/ieee802_11.c
|
|
|
|
|
+++ b/src/ap/ieee802_11.c
|
|
|
|
|
@@ -1559,6 +1559,9 @@ static void handle_assoc_cb(struct hosta
|
|
|
|
|
"Could not add STA to kernel driver");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
+ if (sta->flags & WLAN_STA_WDS)
|
|
|
|
|
+ hapd->drv.set_wds_sta(hapd, sta->addr, sta->aid, 1);
|
|
|
|
|
+
|
|
|
|
|
if (sta->eapol_sm == NULL) {
|
|
|
|
|
/*
|
|
|
|
|
* This STA does not use RADIUS server for EAP authentication,
|
