move ppp ifname fixup from pppoe.sh to ppp.sh, so that it applies to all other ppp...

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

diff --git a/package/ppp/files/pppoe.sh b/package/ppp/files/pppoe.sh
index ba6a8768daec33884591fe964c41c216ea9460c5..74f1a8579c5e8b81a520ef1f97eb0e63158f8140 100644 (file)
--- a/package/ppp/files/pppoe.sh
+++ b/package/ppp/files/pppoe.sh
@@ -6,21 +6,14 @@ 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"
-
-       config_get mtu "$cfg" mtu
+       config_get mtu "$config" mtu
        mtu=${mtu:-1492}
        start_pppd "$config" \
                plugin rp-pppoe.so \
                mtu $mtu mru $mtu \
-               "nic-$device"
+               "nic-$iface"
 }