X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=package%2Fppp%2Ffiles%2Fpppoe.sh;h=ea3dc6cf01264239e041367f11c5f6feaf1def36;hb=b5e9c6c090f7cde79953d7ebdcd627e36d2fa838;hp=ba6a8768daec33884591fe964c41c216ea9460c5;hpb=866696c182185ed17346d2d59e2c18020f729224;p=openwrt.git

diff --git a/package/ppp/files/pppoe.sh b/package/ppp/files/pppoe.sh
index ba6a8768da..ea3dc6cf01 100644
--- a/package/ppp/files/pppoe.sh
+++ b/package/ppp/files/pppoe.sh
@@ -1,26 +1,30 @@
-scan_pppoe() {
-	scan_ppp "$@"
+stop_interface_pppoe() {
+	stop_interface_ppp "$1"
 }
 
 setup_interface_pppoe() {
 	local iface="$1"
 	local config="$2"
-	
-	config_get device "$config" device
 
 	for module in slhc ppp_generic pppox pppoe; do
 		/sbin/insmod $module 2>&- >&-
 	done
 
-	# make sure the network state references the correct ifname
-	scan_ppp "$config"
-	config_get ifname "$config" ifname
-	uci set "/var/state/network.$config.ifname=$ifname"
+	local mtu
+	config_get mtu "$config" mtu 1492
 
-	config_get mtu "$cfg" mtu
-	mtu=${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-$device"
+		${ac:+rp_pppoe_ac "$ac"} \
+		${service:+rp_pppoe_service "$service"} \
+		mtu $mtu mru $mtu
 }