On 8/3/20 11:53 PM, Stefano Brivio wrote:
> @@ -497,12 +529,19 @@ setup_vxlan_or_geneve() {
> run_cmd ${ns_a} ip link add ${type}_a type ${type} id 1 ${opts_a}
> remote ${b_addr} ${opts} || return 1
> run_cmd ${ns_b} ip link add ${type}_b type ${type} id 1 ${opts_b}
> remote ${a_addr} ${opts}
>
> - run_cmd ${ns_a} ip addr add ${tunnel4_a_addr}/${tunnel4_mask} dev
> ${type}_a
> - run_cmd ${ns_b} ip addr add ${tunnel4_b_addr}/${tunnel4_mask} dev
> ${type}_b
> + if [ -n "${br_if_a}" ]; then
> + run_cmd ${ns_a} ip addr add ${tunnel4_a_addr}/${tunnel4_mask}
> dev ${br_if_a}
> + run_cmd ${ns_a} ip addr add ${tunnel6_a_addr}/${tunnel6_mask}
> dev ${br_if_a}
> + run_cmd ${ns_a} ip link set ${type}_a master ${br_if_a}
> + else
> + run_cmd ${ns_a} ip addr add ${tunnel4_a_addr}/${tunnel4_mask}
> dev ${type}_a
> + run_cmd ${ns_a} ip addr add ${tunnel6_a_addr}/${tunnel6_mask}
> dev ${type}_a
> + fi
>
> - run_cmd ${ns_a} ip addr add ${tunnel6_a_addr}/${tunnel6_mask} dev
> ${type}_a
> + run_cmd ${ns_b} ip addr add ${tunnel4_b_addr}/${tunnel4_mask} dev
> ${type}_b
> run_cmd ${ns_b} ip addr add ${tunnel6_b_addr}/${tunnel6_mask} dev
> ${type}_b
>
> +
extra newline snuck in
other than that:
Reviewed-by: David Ahern <[email protected]>
