brcm47xx: run ssb_pcicore_fix_sprom_core_index just for ssb bus on pci

[openwrt.git] / package / 6to4 / files / 6to4.sh

diff --git a/package/6to4/files/6to4.sh b/package/6to4/files/6to4.sh
index 6e85914..5505d06 100755 (executable)
--- a/package/6to4/files/6to4.sh
+++ b/package/6to4/files/6to4.sh
@@ -30,6 +30,7 @@ test_6to4_rfc1918()
 set_6to4_radvd_interface() {
        local cfgid="$1"
        local lanif="${2:-lan}"
 set_6to4_radvd_interface() {
        local cfgid="$1"
        local lanif="${2:-lan}"

+       local ifmtu="${3:-1280}"

        local ifsection=""
 
        find_ifsection() {
        local ifsection=""
 
        find_ifsection() {


@@ -55,6 +56,7 @@ set_6to4_radvd_interface() {
        uci_set_state radvd "$ifsection" IgnoreIfMissing   1
        uci_set_state radvd "$ifsection" AdvSendAdvert     1
        uci_set_state radvd "$ifsection" MaxRtrAdvInterval 30
        uci_set_state radvd "$ifsection" IgnoreIfMissing   1
        uci_set_state radvd "$ifsection" AdvSendAdvert     1
        uci_set_state radvd "$ifsection" MaxRtrAdvInterval 30

+       uci_set_state radvd "$ifsection" AdvLinkMTU        "$ifmtu"

 }
 
 set_6to4_radvd_prefix() {
 }
 
 set_6to4_radvd_prefix() {


@@ -62,6 +64,8 @@ set_6to4_radvd_prefix() {
        local lanif="${2:-lan}"
        local wanif="${3:-wan}"
        local prefix="${4:-0:0:0:1::/64}"
        local lanif="${2:-lan}"
        local wanif="${3:-wan}"
        local prefix="${4:-0:0:0:1::/64}"

+       local vlt="${5:-300}"
+       local plt="${6:-120}"

        local pfxsection=""
 
        find_pfxsection() {
        local pfxsection=""
 
        find_pfxsection() {


@@ -86,8 +90,8 @@ set_6to4_radvd_prefix() {
                uci_set_state radvd "$pfxsection" prefix               "$prefix"
                uci_set_state radvd "$pfxsection" AdvOnLink            1
                uci_set_state radvd "$pfxsection" AdvAutonomous        1
                uci_set_state radvd "$pfxsection" prefix               "$prefix"
                uci_set_state radvd "$pfxsection" AdvOnLink            1
                uci_set_state radvd "$pfxsection" AdvAutonomous        1

-               uci_set_state radvd "$pfxsection" AdvValidLifetime     300
-               uci_set_state radvd "$pfxsection" AdvPreferredLifetime 120
+               uci_set_state radvd "$pfxsection" AdvValidLifetime     "$vlt"
+               uci_set_state radvd "$pfxsection" AdvPreferredLifetime "$plt"

                uci_set_state radvd "$pfxsection" Base6to4Interface    "$wanif"
        }
 }
                uci_set_state radvd "$pfxsection" Base6to4Interface    "$wanif"
        }
 }


@@ -198,14 +202,19 @@ setup_interface_6to4() {
                                config_get adv_ifname "${adv_interface:-lan}" ifname
 
                                grep -qs "^ *$adv_ifname:" /proc/net/dev && {
                                config_get adv_ifname "${adv_interface:-lan}" ifname
 
                                grep -qs "^ *$adv_ifname:" /proc/net/dev && {

+                                       local adv_valid_lifetime adv_preferred_lifetime
+                                       config_get adv_valid_lifetime     "${adv_interface:-lan}" adv_valid_lifetime
+                                       config_get adv_preferred_lifetime "${adv_interface:-lan}" adv_preferred_lifetime
+

                                        local subnet6="$(printf "%s:%x::1/64" "$prefix6" $adv_subnet)"
 
                                        logger -t "$link" " * Advertising IPv6 subnet $subnet6 on ${adv_interface:-lan} ($adv_ifname)"
                                        ip -6 addr add $subnet6 dev $adv_ifname
 
                                        local subnet6="$(printf "%s:%x::1/64" "$prefix6" $adv_subnet)"
 
                                        logger -t "$link" " * Advertising IPv6 subnet $subnet6 on ${adv_interface:-lan} ($adv_ifname)"
                                        ip -6 addr add $subnet6 dev $adv_ifname
 

-                                       set_6to4_radvd_interface "$sid" "$adv_interface"
+                                       set_6to4_radvd_interface "$sid" "$adv_interface" "$mtu"

                                        set_6to4_radvd_prefix    "$sid" "$adv_interface" \
                                        set_6to4_radvd_prefix    "$sid" "$adv_interface" \

-                                               "$wancfg" "$(printf "0:0:0:%x::/64" $adv_subnet)"
+                                               "$wancfg" "$(printf "0:0:0:%x::/64" $adv_subnet)" \
+                                               "$adv_valid_lifetime" "$adv_preferred_lifetime"

 
                                        adv_subnets="${adv_subnets:+$adv_subnets }$adv_ifname:$subnet6"
                                        adv_subnet=$(($adv_subnet + 1))
 
                                        adv_subnets="${adv_subnets:+$adv_subnets }$adv_ifname:$subnet6"
                                        adv_subnet=$(($adv_subnet + 1))


@@ -252,9 +261,8 @@ stop_interface_6to4() {
                        done
                }
 
                        done
                }
 

-               [ "$defaultroute" = "1" ] && {
-                       ip -6 route del ::/0 via ::192.88.99.1 dev $link metric 1
-               }
+               [ "$defaultroute" = "1" ] && \
+                       ip -6 route del ::/0 via ::192.88.99.1 dev $link

 
                ip addr del $local6 dev $link
                ip link set $link down
 
                ip addr del $local6 dev $link
                ip link set $link down