[backfire] merge r21188

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

diff --git a/package/ppp/files/pppoa.sh b/package/ppp/files/pppoa.sh
index e6530b073ef0f5731a63f2afb1e3e464c18a0496..65c5c2db3319438e3ae93a962dbe6cc1468eb0ba 100644 (file)
--- a/package/ppp/files/pppoa.sh
+++ b/package/ppp/files/pppoa.sh
@@ -7,14 +7,22 @@ setup_interface_pppoa() {
        local config="$2"
        
        config_get device "$config" device
+       config_get vpi "$config" vpi
+       config_get vci "$config" vci
 
        for module in slhc ppp_generic pppoatm; do
                /sbin/insmod $module 2>&- >&-
        done
+       
+       config_get encaps "$config" encaps
+       case "$encaps" in
+               1|vc) ENCAPS="vc-encaps" ;;
+               *) ENCAPS="llc-encaps" ;;
+       esac
 
-       config_get mtu "$cfg" mtu
-       mtu=${mtu:-1492}
+       config_get mtu "$config" mtu
+       mtu=${mtu:-1500}
        start_pppd "$config" \
-               plugin pppoatm.so ${atm_vpi:-8}.${atm_vci:-35} \
+               plugin pppoatm.so ${vpi:-8}.${vci:-35} ${ENCAPS} \
                mtu $mtu mru $mtu
 }