From patchwork Fri Apr 21 18:14:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Craig Gallek X-Patchwork-Id: 753508 X-Patchwork-Delegate: shemminger@vyatta.com Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3w8kf15Hw5z9s78 for ; Sat, 22 Apr 2017 04:24:09 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1423666AbdDUSXy (ORCPT ); Fri, 21 Apr 2017 14:23:54 -0400 Received: from mail-qk0-f172.google.com ([209.85.220.172]:33938 "EHLO mail-qk0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1423660AbdDUSXu (ORCPT ); Fri, 21 Apr 2017 14:23:50 -0400 Received: by mail-qk0-f172.google.com with SMTP id y63so48182581qkd.1 for ; Fri, 21 Apr 2017 11:23:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=wkRbjY7OA5RZuAzf5wcsEo8ZDOtj55N01ZYI4Tvly8g=; b=EuZPPv49J/uoW9805XIffDAJ73QlxNV3w1Ce/GOBNJw/Fi68wmF329aQMRjGaj+LVF berMjXvull5gm7s/45vjrIZBjPj5C/mVcgYw+RrCh57ZdPwV517X0Lz6DdVshQw18+JT HGTIPOc0qLrSIvQDVWSGQafZwKdxIHG1/JH0TlfNuMfMO8aRqtq+Uk35qLKCI12oljco yBHMVKwupitZsf5GsiPmtiJp/juHSQP63o+5dbDMJqrVxe2NQtMXChryP4Bfjh41Vs4c Vyu6LZ1i/UkqdWr3zP1YT2JNFqJeC6M+MX0tbchhkD8T/Sc+qeM50vhs01C0Owb4/QuH +3RQ== X-Gm-Message-State: AN3rC/7vWOARDx0mvfxIVBgmDMjdRoyBd9Ed6x5hqLE7AV2lu72GuUg3 ZqpBEe9yL1B/dWSt X-Received: by 10.55.42.90 with SMTP id q87mr8435967qkh.273.1492798466340; Fri, 21 Apr 2017 11:14:26 -0700 (PDT) Received: from monkey.nyc.corp.google.com ([172.26.104.74]) by smtp.gmail.com with ESMTPSA id y33sm6799274qtc.51.2017.04.21.11.14.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 21 Apr 2017 11:14:25 -0700 (PDT) From: Craig Gallek To: stephen@networkplumber.org Cc: netdev@vger.kernel.org Subject: [PATCH iproute2] gre6: fix copy/paste bugs in GREv6 attribute manipulation Date: Fri, 21 Apr 2017 14:14:25 -0400 Message-Id: <20170421181425.166260-1-kraigatgoog@gmail.com> X-Mailer: git-send-email 2.12.2.816.g2cccc81164-goog Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Craig Gallek Fixes: af89576d7a8c("iproute2: GRE over IPv6 tunnel support.") Signed-off-by: Craig Gallek --- ip/link_gre6.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ip/link_gre6.c b/ip/link_gre6.c index a91f635760fa..1b4fb051b37f 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;