From 145c3183d3027e641e891b8d7598d61a6c3f8043 Mon Sep 17 00:00:00 2001
From: Katze Miau <miaukatzemiau@priveasy.de>
Date: Mon, 5 Mar 2012 19:22:48 +0000
Subject: move config for batman-adv and wireless to common


diff --git a/files/ar71xx/etc/config/batman-adv b/files/ar71xx/etc/config/batman-adv
deleted file mode 100644
index 87c0d50..0000000
--- a/files/ar71xx/etc/config/batman-adv
+++ /dev/null
@@ -1,10 +0,0 @@
-config 'mesh' 'bat0'
-        option 'interfaces' 'wlan0-1'
-        option 'orig_interval'
-        option 'log_level'
-        option 'aggregated_ogms'
-        option 'bonding'
-        option 'fragmentation'
-        option 'vis_mode'
-        option 'gw_mode' 'client'
-
diff --git a/files/ar71xx/etc/config/wireless b/files/ar71xx/etc/config/wireless
deleted file mode 100644
index 755f3ea..0000000
--- a/files/ar71xx/etc/config/wireless
+++ /dev/null
@@ -1,22 +0,0 @@
-config wifi-device  radio0
-        option type     mac80211
-        option channel  1
-	option phy	phy0
-#       option hwmode   11ng
-#       option htmode   HT20
-#       list ht_capab   SHORT-GI-40
-#       list ht_capab   TX-STBC
-#       list ht_capab   RX-STBC1
-#       list ht_capab   DSSS_CCK-40
-
-config wifi-iface
-        option device   radio0
-        option mode     adhoc
-        option ssid     batman.jena.freifunk.net
-        option bssid    12:CA:FF:EE:BA:BE
-        option hidden   1
-
-config wifi-iface
-        option device   radio0
-        option mode     ap
-        option ssid     www.freifunk-jena.de
\ No newline at end of file
diff --git a/files/common/etc/config/batman-adv b/files/common/etc/config/batman-adv
index cc8db5f..87c0d50 100644
--- a/files/common/etc/config/batman-adv
+++ b/files/common/etc/config/batman-adv
@@ -1,5 +1,5 @@
 config 'mesh' 'bat0'
-        option 'interfaces' 'ath1'
+        option 'interfaces' 'wlan0-1'
         option 'orig_interval'
         option 'log_level'
         option 'aggregated_ogms'
diff --git a/files/common/etc/config/wireless b/files/common/etc/config/wireless
index 17dd0b7..5128884 100644
--- a/files/common/etc/config/wireless
+++ b/files/common/etc/config/wireless
@@ -1,16 +1,22 @@
-config wifi-device  wifi0
-        option type     atheros
-        option channel 1
+config wifi-device  radio0
+        option type     mac80211
+        option channel  1
+	option phy	phy0
+#       option hwmode   11ng
+#       option htmode   HT20
+#       list ht_capab   SHORT-GI-40
+#       list ht_capab   TX-STBC
+#       list ht_capab   RX-STBC1
+#       list ht_capab   DSSS_CCK-40
 
 config wifi-iface
-        option device   wifi0
+        option device   radio0
         option mode     adhoc
         option ssid     batman.jena.freifunk.net
         option bssid    12:CA:FF:EE:BA:BE
         option hidden   1
 
 config wifi-iface
-        option device   wifi0
+        option device   radio0
         option mode     ap
         option ssid     www.freifunk-jena.de
-
-- 
cgit v0.10.1