add better default config for ar7, add br2684ctl init script, add a missing setting for pppoa

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7024 3c298f89-4303-0410-b956-a3cf2f4a3e73

4 files changed, 76 insertions, 1 deletions

diff --git a/package/br2684ctl/Makefile b/package/br2684ctl/Makefile
index 7c75c9499e..223f6f7c5f 100644
--- a/package/br2684ctl/Makefile
+++ b/package/br2684ctl/Makefile
@@ -31,6 +31,8 @@ endef
 MAKE_FLAGS += CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_LDFLAGS)"
 
 define Package/$(PKG_NAME)/install
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/br2684ctl $(1)/etc/init.d/
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/sbin/
 endef
diff --git a/package/br2684ctl/files/br2684ctl b/package/br2684ctl/files/br2684ctl
new file mode 100755
index 0000000000..b3ea34efcd
--- /dev/null
+++ b/package/br2684ctl/files/br2684ctl
@@ -0,0 +1,26 @@
+#!/bin/sh /etc/rc.common
+stop() {
+	killall br2684ctl 2>/dev/null >/dev/null
+	sleep 1
+	rmmod br2684
+}
+
+start_daemon() {
+	local cfg="$1"
+	config_get atmdev "$cfg" atmdev
+	config_get unit "$cfg" unit
+	config_get vpi "$cfg" vpi
+	config_get vci "$cfg" vci
+	config_get encaps "$cfg" encaps
+	case "$encaps" in
+		1|vc) encaps=1;;
+		*) encaps=0;;
+	esac
+	br2684ctl -b -c "$unit" -e "$encaps" -a "${atmdev:+$atmdev.}${vpi:-8}.${vci:-35}"
+}
+
+start() {
+	insmod br2684 >/dev/null 2>/dev/null
+	config_load network
+	config_foreach start_daemon atm-bridge
+}
diff --git a/package/ppp/files/pppoa.sh b/package/ppp/files/pppoa.sh
index 9b8a919ac5..8c66250da5 100644
--- a/package/ppp/files/pppoa.sh
+++ b/package/ppp/files/pppoa.sh
@@ -13,10 +13,16 @@ setup_interface_pppoa() {
 	for module in slhc ppp_generic pppoatm; do
 		/sbin/insmod $module 2>&- >&-
 	done
+	
+	config_get encaps "$config" encaps
+	case "$encaps" in
+		1|vc) ENCAPS="vc-encaps" ;;
+		*) ENCAPS="llc-encaps" ;;
+	esac
 
 	config_get mtu "$cfg" mtu
 	mtu=${mtu:-1500}
 	start_pppd "$config" \
-		plugin pppoatm.so ${vpi:-8}.${vci:-35} \
+		plugin pppoatm.so ${vpi:-8}.${vci:-35} ${ENCAPS} \
 		mtu $mtu mru $mtu
 }
diff --git a/target/linux/ar7-2.6/base-files/default/etc/config/network b/target/linux/ar7-2.6/base-files/default/etc/config/network
new file mode 100644
index 0000000000..5fa112cc6e
--- /dev/null
+++ b/target/linux/ar7-2.6/base-files/default/etc/config/network
@@ -0,0 +1,41 @@
+# Copyright (C) 2006 OpenWrt.org
+
+config interface loopback
+	option ifname	lo
+	option proto	static
+	option ipaddr	127.0.0.1
+	option netmask	255.0.0.0
+
+config interface lan
+	option ifname	eth0
+	option proto	static
+	option ipaddr	192.168.1.1
+	option netmask	255.255.255.0
+
+
+
+## Example for ATM bridging.
+## Useful for PPPoE or IP over ATM. Will create 'nas${unit}'
+#
+# config atm-bridge
+#	option unit 	0
+#	option encaps	llc
+#	option vpi  	8
+#	option vci  	35
+
+
+# config interface wan
+##	PPPoE:
+#	option ifname	nas0
+#	option proto	pppoe
+
+##	PPPoA:
+#	option ifname	atm0
+#	option proto	pppoa
+#	option encaps	llc
+#	option vpi  	8
+#	option vci  	35
+
+##	Both:
+#	option username "my_username"
+#	option password	"my_password"