From: Craig Gallek Date: Fri, 21 Apr 2017 18:14:25 +0000 (-0400) Subject: gre6: fix copy/paste bugs in GREv6 attribute manipulation X-Git-Tag: v4.11.0~14 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=35893864c87bb87884e75d39fe9a3d24584f70a0;p=thirdparty%2Fiproute2.git gre6: fix copy/paste bugs in GREv6 attribute manipulation Fixes: af89576d7a8c("iproute2: GRE over IPv6 tunnel support.") Signed-off-by: Craig Gallek --- diff --git a/ip/link_gre6.c b/ip/link_gre6.c index a91f63576..1b4fb051b 100644 --- a/ip/link_gre6.c +++ b/ip/link_gre6.c @@ -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;