lua: remove an unnecessary check and replace switch (GET_OPCODE(i)) as well (thx...

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

diff --git a/package/ppp/files/pppoe.sh b/package/ppp/files/pppoe.sh
index f263caa..e1c9a20 100644 (file)
--- a/package/ppp/files/pppoe.sh
+++ b/package/ppp/files/pppoe.sh
@@ -6,16 +6,19 @@ setup_interface_pppoe() {
        local iface="$1"
        local config="$2"
        
        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
 
        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
+       set_interface_ifname "$config" "$ifname"
+

        config_get mtu "$cfg" mtu
        config_get mtu "$cfg" mtu

-       mtu=${mtu:-1480}
+       mtu=${mtu:-1492}

        start_pppd "$config" \
                plugin rp-pppoe.so \
                mtu $mtu mru $mtu \
        start_pppd "$config" \
                plugin rp-pppoe.so \
                mtu $mtu mru $mtu \

-               "nic-$device"
+               "nic-$iface"

 }
 }