X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/866696c182185ed17346d2d59e2c18020f729224..4eddfed4b3d2c5afc0dd10662ad7f32808804329:/package/ppp/files/pppoe.sh?ds=sidebyside diff --git a/package/ppp/files/pppoe.sh b/package/ppp/files/pppoe.sh index ba6a8768d..ea3dc6cf0 100644 --- a/package/ppp/files/pppoe.sh +++ b/package/ppp/files/pppoe.sh @@ -1,26 +1,30 @@ -scan_pppoe() { - scan_ppp "$@" +stop_interface_pppoe() { + stop_interface_ppp "$1" } 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" + local mtu + config_get mtu "$config" mtu 1492 - config_get mtu "$cfg" mtu - mtu=${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" \ plugin rp-pppoe.so \ - mtu $mtu mru $mtu \ - "nic-$device" + ${ac:+rp_pppoe_ac "$ac"} \ + ${service:+rp_pppoe_service "$service"} \ + mtu $mtu mru $mtu }