X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/448734eddeebe02d11cf777a55f1507d604e25e7..744a7f439779a953cfc55dccb0d243eadbddcb5a:/package/ppp/files/pppoa.sh

diff --git a/package/ppp/files/pppoa.sh b/package/ppp/files/pppoa.sh
index 28e237b85..dbb6eb00e 100644
--- a/package/ppp/files/pppoa.sh
+++ b/package/ppp/files/pppoa.sh
@@ -1,22 +1,39 @@
 scan_pppoa() {
-	scan_ppp "$@"
+	config_set "$1" device "pppoa-$1"
+}
+
+stop_interface_pppoa() {
+	stop_interface_ppp "$1"
 }
 
 setup_interface_pppoa() {
-	local iface="$1"
 	local config="$2"
-	
-	config_get device "$config" device
+
+	local atmdev
+	config_get atmdev "$config" atmdev
+
+	local vpi
 	config_get vpi "$config" vpi
+
+	local vci
 	config_get vci "$config" vci
 
 	for module in slhc ppp_generic pppoatm; do
 		/sbin/insmod $module 2>&- >&-
 	done
 
-	config_get mtu "$cfg" mtu
-	mtu=${mtu:-1492}
+	local encaps
+	config_get encaps "$config" encaps
+
+	case "$encaps" in
+		1|vc) encaps="vc-encaps" ;;
+		*) encaps="llc-encaps" ;;
+	esac
+
+	local mtu
+	config_get mtu "$config" mtu
+
 	start_pppd "$config" \
-		plugin pppoatm.so ${vpi:-8}.${vci:-35} \
-		mtu $mtu mru $mtu
+		plugin pppoatm.so ${atmdev:+$atmdev.}${vpi:-8}.${vci:-35} \
+		${encaps} ${mtu:+mtu $mtu mru $mtu}
 }