[backfire] merge r28366

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@28367 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/ppp/files/pppoe.sh b/package/ppp/files/pppoe.sh
index 99409f3f08b74c532cf20210641b5641f4b32dd1..cd6f1db5c88cdeed48ec60b4e73344991d13f8d1 100644 (file)
--- a/package/ppp/files/pppoe.sh
+++ b/package/ppp/files/pppoe.sh
@@ -5,15 +5,26 @@ stop_interface_pppoe() {
 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" \
+               ${ac:+rp_pppoe_ac "$ac"} \
+               ${service:+rp_pppoe_service "$service"} \
                plugin rp-pppoe.so \
                mtu $mtu mru $mtu
 }