| Message ID | 0719e2437448261ef83bf5d4e902481cad1a8e46.1581997820.git.lucien.xin@gmail.com |
|---|---|
| State | Accepted |
| Delegated to: | stephen hemminger |
| Headers | show |
| Series | [PATCHv3,iproute2] erspan: set erspan_ver to 1 by default | expand |
On Mon, Feb 17, 2020 at 7:50 PM Xin Long <lucien.xin@gmail.com> wrote: > > 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. > > v1->v2: > - no change. > v2->v3: > - add the same fix for v6. > > Fixes: 289763626721 ("erspan: add erspan version II support") > Signed-off-by: Xin Long <lucien.xin@gmail.com> LGTM. Thanks! Acked-by: William Tu <u9012063@gmail.com> > --- > ip/link_gre.c | 2 +- > 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 15beb73..e42f21a 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 9d1741b..94a4ee7 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; > > -- > 2.1.0 >
diff --git a/ip/link_gre.c b/ip/link_gre.c index 15beb73..e42f21a 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 9d1741b..94a4ee7 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;
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. v1->v2: - no change. v2->v3: - add the same fix for v6. Fixes: 289763626721 ("erspan: add erspan version II support") Signed-off-by: Xin Long <lucien.xin@gmail.com> --- ip/link_gre.c | 2 +- ip/link_gre6.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)