X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;ds=sidebyside;f=package%2Fppp%2Ffiles%2Fpppoe.sh;h=ea3dc6cf01264239e041367f11c5f6feaf1def36;hb=b13d6daa278fee6189ad5f2c48b99f063ef18ae9;hp=74f1a8579c5e8b81a520ef1f97eb0e63158f8140;hpb=0068b99917c78f80d302624bceeeaf1ef7a4f82f;p=openwrt-10.03%2F.git

diff --git a/package/ppp/files/pppoe.sh b/package/ppp/files/pppoe.sh
index 74f1a8579..ea3dc6cf0 100644
--- a/package/ppp/files/pppoe.sh
+++ b/package/ppp/files/pppoe.sh
@@ -1,19 +1,30 @@
-scan_pppoe() {
-	scan_ppp "$@"
+stop_interface_pppoe() {
+	stop_interface_ppp "$1"
 }
 
 setup_interface_pppoe() {
 	local iface="$1"
 	local config="$2"
-	
+
 	for module in slhc ppp_generic pppox pppoe; do
 		/sbin/insmod $module 2>&- >&-
 	done
 
-	config_get mtu "$config" mtu
-	mtu=${mtu:-1492}
+	local mtu
+	config_get mtu "$config" mtu 1492
+
+	local ac
+	config_get ac "$config" ac
+
+	local service
+	config_get service "$config" service
+
+	# NB: the first nic-* argument will be moved to the
+	#     end of the argument list by start_pppd()
 	start_pppd "$config" \
+		"nic-$iface" \
 		plugin rp-pppoe.so \
-		mtu $mtu mru $mtu \
-		"nic-$iface"
+		${ac:+rp_pppoe_ac "$ac"} \
+		${service:+rp_pppoe_service "$service"} \
+		mtu $mtu mru $mtu
 }