Merge remote-tracking branch 'origin/next' into thirteen

[people/pmueller/ipfire-2.x.git] / config / hostapd / hostapd.conf

diff --git a/config/hostapd/hostapd.conf b/config/hostapd/hostapd.conf
index 642b682a39bd94ecc50d78446e913160ba996484..e1f493f96edad90e5f12f692131b9344e7213628 100644 (file)
--- a/config/hostapd/hostapd.conf
+++ b/config/hostapd/hostapd.conf
@@ -1,15 +1,23 @@
+driver=nl80211
+######################### basic hostapd configuration ##########################
+#
 interface=blue0
-driver=madwifi
-auth_algs=3
-wpa=1
-wpa_passphrase=IPFire
-wpa_key_mgmt=WPA-PSK
-wpa_pairwise=TKIP CCMP
-debug=0
+hw_mode=g
+channel=05
 logger_syslog=-1
-logger_syslog_level=2
+logger_syslog_level=3
+logger_stdout=-1
+logger_stdout_level=4
 dump_file=/tmp/hostapd.dump
+auth_algs=3
 ctrl_interface=/var/run/hostapd
 ctrl_interface_group=0
-ssid=IPFire
 macaddr_acl=0
+ssid=IPFire
+ignore_broadcast_ssid=0
+######################### wpa hostapd configuration ############################
+#
+wpa=2
+wpa_passphrase=IPFire-2.x
+wpa_key_mgmt=WPA-PSK
+wpa_pairwise=CCMP TKIP