Fixed LAN/WAN port bugs on the tpe-r1100 target and set more sane

defaults for WIFI/default LAN IP. LAN IP : 192.168.10.1 and wifi
is now enabled by default : ESSID: libreCMC Passwd: librecmc Enc: WPA2-PSK2

diff --git a/trunk/package/base-files/files/etc/config/network b/trunk/package/base-files/files/etc/config/network
index d3cd3c613a18c148955c344051a924aaeedbaa5c..2240420ad1d275420aad75ab744da0206ed72ee8 100644 (file)
--- a/trunk/package/base-files/files/etc/config/network
+++ b/trunk/package/base-files/files/etc/config/network
@@ -10,7 +10,7 @@ config interface lan
        option ifname   eth0
        option type     bridge
        option proto    static
-       option ipaddr   192.168.1.1
+       option ipaddr   192.168.10.1
        option netmask  255.255.255.0
        option ip6assign 60
 

diff --git a/trunk/package/base-files/files/etc/config/system b/trunk/package/base-files/files/etc/config/system
index 918ec319d186d542011586c5a91cc7dc9709d996..e9efd42f3f174c3f01e246a35524e7e1361cbf28 100644 (file)
--- a/trunk/package/base-files/files/etc/config/system
+++ b/trunk/package/base-files/files/etc/config/system
@@ -3,9 +3,9 @@ config system
        option timezone UTC
 
 config timeserver ntp
-       list server     0.librecmc.pool.ntp.org
-       list server     1.librecmc.pool.ntp.org
-       list server     2.librecmc.pool.ntp.org
-       list server     3.librecmc.pool.ntp.org
+       list server     0.pool.ntp.org
+       list server     1.pool.ntp.org
+       list server     2.pool.ntp.org
+       list server     3.pool.ntp.org
        option enabled 1
        option enable_server 0

diff --git a/trunk/package/base-files/files/lib/functions/uci-defaults.sh b/trunk/package/base-files/files/lib/functions/uci-defaults.sh
index 5a8809d68c89ac0431919f15dad5f5c33351bbf2..54a635a3988f2c574357b0983bbcaf4de2318bc2 100644 (file)
--- a/trunk/package/base-files/files/lib/functions/uci-defaults.sh
+++ b/trunk/package/base-files/files/lib/functions/uci-defaults.sh
@@ -213,7 +213,7 @@ set network.lan.ifname='$ifname'
 set network.lan.force_link=1
 set network.lan.type='bridge'
 set network.lan.proto='static'
-set network.lan.ipaddr='192.168.1.1'
+set network.lan.ipaddr='192.168.10.1'
 set network.lan.netmask='255.255.255.0'
 set network.lan.ip6assign='60'
 EOF

diff --git a/trunk/package/kernel/mac80211/files/lib/wifi/mac80211.sh b/trunk/package/kernel/mac80211/files/lib/wifi/mac80211.sh
index 83630aa1489eaa1b85e9ffb0f2f2004393d7742a..6f84d09732890b432338bb0c0d392cafe816dedb 100644 (file)
--- a/trunk/package/kernel/mac80211/files/lib/wifi/mac80211.sh
+++ b/trunk/package/kernel/mac80211/files/lib/wifi/mac80211.sh
@@ -115,14 +115,15 @@ config wifi-device  radio$devidx
 $dev_id
 $ht_capab
        # REMOVE THIS LINE TO ENABLE WIFI:
-       option disabled 1
+       option disabled 0
 
 config wifi-iface
        option device   radio$devidx
        option network  lan
        option mode     ap
        option ssid     libreCMC
-       option encryption none
+       option encryption 'psk2'
+       option key 'librecmc'
 
 EOF
        devidx=$(($devidx + 1))

diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tpe-r1100.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tpe-r1100.c
index c64e47558d96725e678f8ef71b1637efda73e72a..4532364a97e19070ee453e3eb2002b9cb7ab91f9 100644 (file)
--- a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tpe-r1100.c
+++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tpe-r1100.c
@@ -110,11 +110,11 @@ static void __init tpe_r1100_setup(void)
        ath79_register_usb();
 
        /* register eth0 as WAN, eth1 as LAN */
-       ath79_init_mac(ath79_eth1_data.mac_addr, art+TPE_R1100_MAC1_OFFSET, 0);
-       ath79_init_mac(ath79_eth0_data.mac_addr, art+TPE_R1100_MAC0_OFFSET, 0);
+       ath79_init_mac(ath79_eth0_data.mac_addr, art+TPE_R1100_MAC1_OFFSET, 0);
+       ath79_init_mac(ath79_eth1_data.mac_addr, art+TPE_R1100_MAC0_OFFSET, 0);
        ath79_register_mdio(0, 0x0);
-       ath79_register_eth(1);
        ath79_register_eth(0);
+       ath79_register_eth(1);
 
        /* register wireless mac with cal data */
        ath79_register_wmac(art + TPE_R1100_CALDATA_OFFSET, art + TPE_R1100_WMAC_MAC_OFFSET);