--- hostapd-0.5.7.orig/madwifi.conf.orig	2008-08-06 15:36:19.000000000 +0200
+++ hostapd-0.5.7/madwifi.conf	2008-08-06 15:37:19.000000000 +0200
@@ -8,7 +8,7 @@
 # In case of madwifi driver, an additional configuration parameter, bridge,
 # must be used to notify hostapd if the interface is included in a bridge. This
 # parameter is not used with Host AP driver.
-bridge=br0
+#bridge=br-lan
 
 # Driver interface type (hostap/wired/madwifi; default: hostap)
 driver=madwifi
@@ -49,7 +49,7 @@
 ##### IEEE 802.11 related configuration #######################################
 
 # SSID to be used in IEEE 802.11 management frames
-ssid=wpa-test
+ssid=pisa-relay2
 
 ##### IEEE 802.1X-REV related configuration ###################################
 
@@ -217,7 +217,7 @@
 # and/or WPA2 (full IEEE 802.11i/RSN):
 # bit0 = WPA
 # bit1 = IEEE 802.11i/RSN (WPA2) (dot11RSNAEnabled)
-#wpa=1
+wpa=1
 
 # WPA pre-shared keys for WPA-PSK. This can be either entered as a 256-bit
 # secret in hex format (64 hex digits), wpa_psk, or as an ASCII passphrase
@@ -225,8 +225,8 @@
 # so the PSK changes when ASCII passphrase is used and the SSID is changed.
 # wpa_psk (dot11RSNAConfigPSKValue)
 # wpa_passphrase (dot11RSNAConfigPSKPassPhrase)
-#wpa_psk=0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef
-#wpa_passphrase=secret passphrase
+#wpa_psk=0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef
+wpa_passphrase=yummy45yummy21.
 
 # Optionally, WPA PSKs can be read from a separate text file (containing list
 # of (PSK,MAC address) pairs. This allows more than one PSK to be configured.
@@ -237,7 +237,7 @@
 # Set of accepted key management algorithms (WPA-PSK, WPA-EAP, or both). The
 # entries are separated with a space.
 # (dot11RSNAConfigAuthenticationSuitesTable)
-#wpa_key_mgmt=WPA-PSK WPA-EAP
+wpa_key_mgmt=WPA-PSK WPA-EAP
 
 # Set of accepted cipher suites (encryption algorithms) for pairwise keys
 # (unicast packets). This is a space separated list of algorithms:
@@ -249,6 +249,7 @@
 # TKIP will be used as the group cipher.
 # (dot11RSNAConfigPairwiseCiphersTable)
 #wpa_pairwise=TKIP CCMP
+wpa_pairwise=TKIP CCMP
 
 # Time interval for rekeying GTK (broadcast/multicast encryption keys) in
 # seconds. (dot11RSNAConfigGroupRekeyTime)