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 <lucien.xin@gmail.com>
Acked-by: William Tu <u9012063@gmail.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>

diff --git a/ip/link_gre.c b/ip/link_gre.c
index 15beb737217e878b6d34550311e73c66a9008287..e42f21ae4556ce712e88df77de3b14b9076f030f 100644 (file)
--- 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 9d1741bff8a161dc930b9737d30eac4d03038608..94a4ee700431cac46af5be0ff4b10732551dd48e 100644 (file)
--- 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;