From: Xin Long Date: Tue, 18 Feb 2020 03:50:20 +0000 (+0800) Subject: erspan: set erspan_ver to 1 by default X-Git-Tag: v5.6.0~12 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=83c543af872e38654326671f6b504257d98c4489;p=thirdparty%2Fiproute2.git erspan: set erspan_ver to 1 by default Commit 289763626721 ("erspan: add erspan version II support") breaks the command: # ip link add erspan1 type erspan key 1 seq erspan 123 \ local 10.1.0.2 remote 10.1.0.1 as erspan_ver is set to 0 by default, then IFLA_GRE_ERSPAN_INDEX won't be set in gre_parse_opt(). # ip -d link show erspan1 ... erspan remote 10.1.0.1 local 10.1.0.2 ... erspan_index 0 erspan_ver 1 ^^^^^^^^^^^^^^ This patch is to change to set erspan_ver to 1 by default. Fixes: 289763626721 ("erspan: add erspan version II support") Signed-off-by: Xin Long Acked-by: William Tu Signed-off-by: Stephen Hemminger --- diff --git a/ip/link_gre.c b/ip/link_gre.c index 15beb7372..e42f21ae4 100644 --- a/ip/link_gre.c +++ b/ip/link_gre.c @@ -94,7 +94,7 @@ static int gre_parse_opt(struct link_util *lu, int argc, char **argv, __u8 metadata = 0; __u32 fwmark = 0; __u32 erspan_idx = 0; - __u8 erspan_ver = 0; + __u8 erspan_ver = 1; __u8 erspan_dir = 0; __u16 erspan_hwid = 0; diff --git a/ip/link_gre6.c b/ip/link_gre6.c index 9d1741bff..94a4ee700 100644 --- a/ip/link_gre6.c +++ b/ip/link_gre6.c @@ -106,7 +106,7 @@ static int gre_parse_opt(struct link_util *lu, int argc, char **argv, __u8 metadata = 0; __u32 fwmark = 0; __u32 erspan_idx = 0; - __u8 erspan_ver = 0; + __u8 erspan_ver = 1; __u8 erspan_dir = 0; __u16 erspan_hwid = 0;