aboutsummaryrefslogtreecommitdiffstats
path: root/hostapd
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2010-11-09 14:12:42 (GMT)
committerJouni Malinen <j@w1.fi>2010-11-09 14:12:42 (GMT)
commitd38ae2ea85d7f67062c04f91b33fc045f9e792b5 (patch)
tree32109ef7a5ceaf5892f7d6930b805dd3099003bb /hostapd
parent4a8c72959e3f889d4611660b1d9764515c815d86 (diff)
downloadhostap-d38ae2ea85d7f67062c04f91b33fc045f9e792b5.zip
hostap-d38ae2ea85d7f67062c04f91b33fc045f9e792b5.tar.gz
hostap-d38ae2ea85d7f67062c04f91b33fc045f9e792b5.tar.bz2
Add bridge handling for WDS STA interfaces
By default, add them to the configured bridge of the AP interface (if present), but allow the user to specify a separate bridge.
Diffstat (limited to 'hostapd')
-rw-r--r--hostapd/config_file.c3
-rw-r--r--hostapd/hostapd.conf5
2 files changed, 8 insertions, 0 deletions
diff --git a/hostapd/config_file.c b/hostapd/config_file.c
index ac69f24..c2083f6 100644
--- a/hostapd/config_file.c
+++ b/hostapd/config_file.c
@@ -1208,6 +1208,9 @@ struct hostapd_config * hostapd_config_read(const char *fname)
sizeof(conf->bss[0].iface));
} else if (os_strcmp(buf, "bridge") == 0) {
os_strlcpy(bss->bridge, pos, sizeof(bss->bridge));
+ } else if (os_strcmp(buf, "wds_bridge") == 0) {
+ os_strlcpy(bss->wds_bridge, pos,
+ sizeof(bss->wds_bridge));
} else if (os_strcmp(buf, "driver") == 0) {
int j;
/* clear to get error below if setting is invalid */
diff --git a/hostapd/hostapd.conf b/hostapd/hostapd.conf
index a9cd023..afeb206 100644
--- a/hostapd/hostapd.conf
+++ b/hostapd/hostapd.conf
@@ -352,6 +352,11 @@ wmm_ac_vo_acm=0
# bridging to be used.
#wds_sta=1
+# If bridge parameter is set, the WDS STA interface will be added to the same
+# bridge by default. This can be overridden with the wds_bridge parameter to
+# use a separate bridge.
+#wds_bridge=wds-br0
+
##### IEEE 802.11n related configuration ######################################
# ieee80211n: Whether IEEE 802.11n (HT) is enabled