ipv6: remove now unneeded source-dest-routing workarounds

[openwrt/openwrt.git] / package / network / ipv6 / odhcp6c / files / dhcpv6.sh

diff --git a/package/network/ipv6/odhcp6c/files/dhcpv6.sh b/package/network/ipv6/odhcp6c/files/dhcpv6.sh
index 9fb6fa342fa5540eb544f435c5ab32960bd32a2d..adcb1007a9684af6fff821be7490640ba09ffa10 100755 (executable)
--- a/package/network/ipv6/odhcp6c/files/dhcpv6.sh
+++ b/package/network/ipv6/odhcp6c/files/dhcpv6.sh
@@ -23,7 +23,6 @@ proto_dhcpv6_init_config() {
        proto_config_add_string zone_464xlat
        proto_config_add_string zone
        proto_config_add_string 'ifaceid:ip6addr'
-       proto_config_add_string 'sourcerouting:bool'
        proto_config_add_string "userclass"
        proto_config_add_string "vendorclass"
        proto_config_add_boolean delegate
@@ -35,8 +34,8 @@ proto_dhcpv6_setup() {
        local config="$1"
        local iface="$2"
 
-       local reqaddress reqprefix clientid reqopts noslaaconly forceprefix norelease ip6prefix iface_dslite iface_map iface_464xlat ifaceid sourcerouting userclass vendorclass delegate zone_dslite zone_map zone_464xlat zone soltimeout fakeroutes
-       json_get_vars reqaddress reqprefix clientid reqopts noslaaconly forceprefix norelease ip6prefix iface_dslite iface_map iface_464xlat ifaceid sourcerouting userclass vendorclass delegate zone_dslite zone_map zone_464xlat zone soltimeout fakeroutes
+       local reqaddress reqprefix clientid reqopts noslaaconly forceprefix norelease ip6prefix iface_dslite iface_map iface_464xlat ifaceid userclass vendorclass delegate zone_dslite zone_map zone_464xlat zone soltimeout fakeroutes
+       json_get_vars reqaddress reqprefix clientid reqopts noslaaconly forceprefix norelease ip6prefix iface_dslite iface_map iface_464xlat ifaceid userclass vendorclass delegate zone_dslite zone_map zone_464xlat zone soltimeout fakeroutes
 
 
        # Configure
@@ -70,7 +69,6 @@ proto_dhcpv6_setup() {
        [ -n "$iface_dslite" ] && proto_export "IFACE_DSLITE=$iface_dslite"
        [ -n "$iface_map" ] && proto_export "IFACE_MAP=$iface_map"
        [ -n "$iface_464xlat" ] && proto_export "IFACE_464XLAT=$iface_464xlat"
-       [ "$sourcerouting" != "0" ] && proto_export "SOURCE_ROUTING=1"
        [ "$delegate" = "0" ] && proto_export "IFACE_DSLITE_DELEGATE=0"
        [ "$delegate" = "0" ] && proto_export "IFACE_MAP_DELEGATE=0"
        [ -n "$zone_dslite" ] && proto_export "ZONE_DSLITE=$zone_dslite"