diff options
| author | Xin Long <lucien.xin@gmail.com> | 2020-02-18 11:50:20 +0800 |
|---|---|---|
| committer | Stephen Hemminger <stephen@networkplumber.org> | 2020-02-23 13:50:17 -0800 |
| commit | 83c543af872e38654326671f6b504257d98c4489 (patch) | |
| tree | a784e50704bf0614ad09f9aeb2f9954680bf2a3d | |
| parent | 0a6ea03be4fb363fe468e7e9863976e80e98a376 (diff) | |
| download | iproute2-83c543af872e38654326671f6b504257d98c4489.tar.gz | |
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>
| -rw-r--r-- | ip/link_gre.c | 2 | ||||
| -rw-r--r-- | ip/link_gre6.c | 2 |
2 files changed, 2 insertions, 2 deletions
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; |