]> git.ipfire.org Git - thirdparty/iproute2.git/commitdiff
gre6: fix copy/paste bugs in GREv6 attribute manipulation
authorCraig Gallek <kraig@google.com>
Fri, 21 Apr 2017 18:14:25 +0000 (14:14 -0400)
committerStephen Hemminger <stephen@networkplumber.org>
Sun, 23 Apr 2017 16:13:07 +0000 (09:13 -0700)
Fixes: af89576d7a8c("iproute2: GRE over IPv6 tunnel support.")
Signed-off-by: Craig Gallek <kraig@google.com>
ip/link_gre6.c

index a91f635760faa188bc064ead7ce0d058b103c39d..1b4fb051b37f7c2dd5585b4ffbe5505357a11b78 100644 (file)
@@ -355,7 +355,7 @@ get_failed:
        addattr_l(n, 1024, IFLA_GRE_TTL, &hop_limit, 1);
        addattr_l(n, 1024, IFLA_GRE_ENCAP_LIMIT, &encap_limit, 1);
        addattr_l(n, 1024, IFLA_GRE_FLOWINFO, &flowinfo, 4);
-       addattr_l(n, 1024, IFLA_GRE_FLAGS, &flowinfo, 4);
+       addattr32(n, 1024, IFLA_GRE_FLAGS, flags);
 
        addattr16(n, 1024, IFLA_GRE_ENCAP_TYPE, encaptype);
        addattr16(n, 1024, IFLA_GRE_ENCAP_FLAGS, encapflags);
@@ -383,7 +383,7 @@ static void gre_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
                flags = rta_getattr_u32(tb[IFLA_GRE_FLAGS]);
 
        if (tb[IFLA_GRE_FLOWINFO])
-               flags = rta_getattr_u32(tb[IFLA_GRE_FLOWINFO]);
+               flowinfo = rta_getattr_u32(tb[IFLA_GRE_FLOWINFO]);
 
        if (tb[IFLA_GRE_REMOTE]) {
                struct in6_addr addr;