From c46cd218f0bd477aac68ce8bc497e877a3f44207 Mon Sep 17 00:00:00 2001
From: juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Mon, 7 Nov 2011 21:44:03 +0000
Subject: [PATCH] ar71xx: create TL-WR{841N-v1,941ND} network config from
 uci-defaults

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28824 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 .../etc/defconfig/tl-wr841n-v1/network        | 20 -------------------
 .../etc/defconfig/tl-wr941nd/network          | 20 -------------------
 .../base-files/etc/uci-defaults/network       | 17 ++++++++++++++++
 3 files changed, 17 insertions(+), 40 deletions(-)
 delete mode 100644 target/linux/ar71xx/base-files/etc/defconfig/tl-wr841n-v1/network
 delete mode 100644 target/linux/ar71xx/base-files/etc/defconfig/tl-wr941nd/network

diff --git a/target/linux/ar71xx/base-files/etc/defconfig/tl-wr841n-v1/network b/target/linux/ar71xx/base-files/etc/defconfig/tl-wr841n-v1/network
deleted file mode 100644
index 780fdb764..000000000
--- a/target/linux/ar71xx/base-files/etc/defconfig/tl-wr841n-v1/network
+++ /dev/null
@@ -1,20 +0,0 @@
-config interface loopback
-	option ifname	lo
-	option proto	static
-	option ipaddr	127.0.0.1
-	option netmask	255.0.0.0
-
-config interface mac0
-	option ifname	eth0
-	option proto	none
-
-config interface lan
-	option ifname	"lan1 lan2 lan3 lan4"
-	option type	bridge
-	option proto	static
-	option ipaddr	192.168.1.1
-	option netmask	255.255.255.0
-
-config interface wan
-	option ifname	wan
-	option proto	dhcp
diff --git a/target/linux/ar71xx/base-files/etc/defconfig/tl-wr941nd/network b/target/linux/ar71xx/base-files/etc/defconfig/tl-wr941nd/network
deleted file mode 100644
index cb741fbea..000000000
--- a/target/linux/ar71xx/base-files/etc/defconfig/tl-wr941nd/network
+++ /dev/null
@@ -1,20 +0,0 @@
-config interface loopback
-	option ifname	lo
-	option proto	static
-	option ipaddr	127.0.0.1
-	option netmask	255.0.0.0
-
-config interface eth
-	option ifname	eth0
-	option proto	none
-
-config interface lan
-	option ifname	"lan1 lan2 lan3 lan4"
-	option type	bridge
-	option proto	static
-	option ipaddr	192.168.1.1
-	option netmask	255.255.255.0
-
-config interface wan
-	option ifname	wan
-	option proto	dhcp
diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/network b/target/linux/ar71xx/base-files/etc/uci-defaults/network
index 2f2525bb0..5cf80796c 100755
--- a/target/linux/ar71xx/base-files/etc/uci-defaults/network
+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/network
@@ -13,6 +13,17 @@ set network.loopback.netmask='255.0.0.0'
 EOF
 }
 
+set_interface_raw() {
+	local cfg=$1
+	local ifname=$2
+
+	uci batch <<EOF
+set network.$cfg='interface'
+set network.$cfg.ifname='$ifname'
+set network.$cfg.proto='none'
+EOF
+}
+
 set_interface_lan() {
 	local ifname=$1
 
@@ -99,6 +110,12 @@ routerstation-pro)
 	add_switch_vlan "switch0" "1" "0 1 2 3 4"
 	;;
 
+tl-wr841n-v1|\
+tl-wr941nd)
+	set_interface_raw "eth" "eth0"
+	set_interfaces_lan_wan "lan1 lan2 lan3 lan4" "wan"
+	;;
+
 aw-nr580 |\
 bullet-m |\
 eap7660d |\