selftests: pmtu: Move route installs to a new function
authorDavid Ahern <dsahern@gmail.com>
Sat, 8 Jun 2019 21:53:37 +0000 (14:53 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 10 Jun 2019 17:44:57 +0000 (10:44 -0700)
Move the route add commands to a new function called setup_routing_old.
The '_old' refers to the classic way of installing routes.

Signed-off-by: David Ahern <dsahern@gmail.com>
Reviewed-by: Stefano Brivio <sbrivio@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
tools/testing/selftests/net/pmtu.sh

index 3d6b21c..14ffcf4 100755 (executable)
@@ -448,6 +448,20 @@ setup_xfrm6() {
        setup_xfrm 6 ${veth6_a_addr} ${veth6_b_addr}
 }
 
+setup_routing_old() {
+       for i in ${routes}; do
+               [ "${ns}" = "" ]        && ns="${i}"            && continue
+               [ "${addr}" = "" ]      && addr="${i}"          && continue
+               [ "${gw}" = "" ]        && gw="${i}"
+
+               ns_name="$(nsname ${ns})"
+
+               ip -n ${ns_name} route add ${addr} via ${gw}
+
+               ns=""; addr=""; gw=""
+       done
+}
+
 setup_routing() {
        for i in ${NS_R1} ${NS_R2}; do
                ip netns exec ${i} sysctl -q net/ipv4/ip_forward=1
@@ -478,17 +492,7 @@ setup_routing() {
                ns=""; peer=""; segment=""
        done
 
-       for i in ${routes}; do
-               [ "${ns}" = "" ]        && ns="${i}"            && continue
-               [ "${addr}" = "" ]      && addr="${i}"          && continue
-               [ "${gw}" = "" ]        && gw="${i}"
-
-               ns_name="$(nsname ${ns})"
-
-               ip -n ${ns_name} route add ${addr} via ${gw}
-
-               ns=""; addr=""; gw=""
-       done
+       setup_routing_old
 }
 
 setup() {