do not use kzalloc() in madwifi, for compatibility reasons

[openwrt.git] / package / pptp / files / pptp.sh

diff --git a/package/pptp/files/pptp.sh b/package/pptp/files/pptp.sh
index c61bdc0..f1c46c9 100644 (file)
--- a/package/pptp/files/pptp.sh
+++ b/package/pptp/files/pptp.sh
@@ -3,15 +3,27 @@ scan_pptp() {
 }
 
 setup_interface_pptp() {
-       local iface="$1"
        local config="$2"
+       local ifname
        
        config_get device "$config" device
+       config_get ipproto "$config" ipproto
 
        for module in slhc ppp_generic ppp_async ip_gre; do
                /sbin/insmod $module 2>&- >&-
        done
-       setup_interface "$iface" "$config" "dhcp"
+       sleep 1
+
+       setup_interface "$device" "$config" "${ipproto:-dhcp}"
+
+       # fix up the netmask
+       config_get netmask "$config" netmask
+       [ -z "$netmask" -o -z "$device" ] || ifconfig $device netmask $netmask
+
+       # 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 server "$cfg" server