[backfire] backport r28364

[openwrt-10.03/.git] / package / ppp / files / pppoe.sh

diff --git a/package/ppp/files/pppoe.sh b/package/ppp/files/pppoe.sh
index f33d37a1a84a54b7e018d28da82e0db0eb7247d6..99409f3f08b74c532cf20210641b5641f4b32dd1 100644 (file)
--- a/package/ppp/files/pppoe.sh
+++ b/package/ppp/files/pppoe.sh
@@ -1,5 +1,5 @@
-scan_pppoe() {
-       scan_ppp "$@"
+stop_interface_pppoe() {
+       stop_interface_ppp "$1"
 }
 
 setup_interface_pppoe() {
@@ -10,15 +10,10 @@ setup_interface_pppoe() {
                /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"
-
-       config_get mtu "$cfg" mtu
+       config_get mtu "$config" mtu
        mtu=${mtu:-1492}
        start_pppd "$config" \
+               "nic-$iface" \
                plugin rp-pppoe.so \
-               mtu $mtu mru $mtu \
-               "nic-$iface"
+               mtu $mtu mru $mtu
 }