From patchwork Thu Nov 6 00:49:38 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Herbert X-Patchwork-Id: 407219 X-Patchwork-Delegate: davem@davemloft.net 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 2BAFB14008C for ; Thu, 6 Nov 2014 11:49:57 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751394AbaKFAtw (ORCPT ); Wed, 5 Nov 2014 19:49:52 -0500 Received: from mail-ig0-f169.google.com ([209.85.213.169]:47235 "EHLO mail-ig0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750990AbaKFAtv (ORCPT ); Wed, 5 Nov 2014 19:49:51 -0500 Received: by mail-ig0-f169.google.com with SMTP id hn18so9344797igb.4 for ; Wed, 05 Nov 2014 16:49:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:subject:date:message-id; bh=Ohrg8Ok6R8o1Ar1SEuKI1jUdCwuAdkYcW4GNdAZgjJ0=; b=QOOKLzr6kjLaq/TKX9BvaYEWwpiokEzsQrMkFchG2Rs+TRPznQXO3+/I6NTt+w1Z2q Hnfmdwi1JxGtOdzSs0M70wBR0W8LbfInCg0MuCEOVbnKiFUjfgnraiHV2aVFVnVixnn8 7Y7N9B7PMDttOTrnyBPPvHviQ11ld2WpkNFbYnZIEJ/HIHo2hKYfzCyGL4vHR/Lvy458 7LMUnteBWlUnmnRW3Sa26jshQJsHRLRj38ZM3LS3C49SK5EemcKhK2L9zIPZiDIh014i AOOeyLAWjWOhxF3/L/YjAy820idHJF7LRg6/Rnk0Cl5qPlzSfLNUnlYdzQiz6HsRJFbA pbgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id; bh=Ohrg8Ok6R8o1Ar1SEuKI1jUdCwuAdkYcW4GNdAZgjJ0=; b=PY1aiRaSvoRnrPptGJR/uq1qnqIEz+DELAI5jJJ9QPGlHeKBEXwaE2+7TSdgIa7l5b YJ9DDEc/R6CMDfmp7dEAlfEZ9T6gJMj5t4qzqf+ViEJImuVeaUiLCnWGrtueF3l9+bmR rMe4zsa/YuEDVDZAgWoWm6ONZCswP6MWxOFYRkmDNMqR4yt6Kt8uLZ8UMEEBmTeQeiEd t3zx6Boso4xHxIcBsNFlIuue0vc6enKlmensV0O3tnPkcUCg6ZAL2j8nV9S4uh3TW1kA XeUwrF/zT1aVr8sKwu9CVyUe6WK6uS6J7Jdkrk5jnIfrfvb+r9u598FjJ8hhhqJt8xSn KcSA== X-Gm-Message-State: ALoCoQml3xi4dVX/03UG79xPZXpglq6ZIYCIfAx6L3Vu01TCPqbkjRcfeMLbBNsd1pdJB3q/UImy X-Received: by 10.43.87.79 with SMTP id av15mr8193665icc.44.1415234991068; Wed, 05 Nov 2014 16:49:51 -0800 (PST) Received: from tomh.mtv.corp.google.com ([172.18.117.126]) by mx.google.com with ESMTPSA id f20sm2424668igz.13.2014.11.05.16.49.50 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 05 Nov 2014 16:49:50 -0800 (PST) From: Tom Herbert To: davem@davemloft.net, netdev@vger.kernel.org Subject: [PATCH net-next] fou: Fix typo in returning flags in netlink Date: Wed, 5 Nov 2014 16:49:38 -0800 Message-Id: <1415234978-31931-1-git-send-email-therbert@google.com> X-Mailer: git-send-email 2.1.0.rc2.206.gedb03e5 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org When filling netlink info, dport is being returned as flags. Fix instances to return correct value. Signed-off-by: Tom Herbert --- net/ipv4/ip_gre.c | 2 +- net/ipv4/ipip.c | 2 +- net/ipv6/sit.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c index 12055fd..ac84912 100644 --- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c @@ -789,7 +789,7 @@ static int ipgre_fill_info(struct sk_buff *skb, const struct net_device *dev) nla_put_u16(skb, IFLA_GRE_ENCAP_DPORT, t->encap.dport) || nla_put_u16(skb, IFLA_GRE_ENCAP_FLAGS, - t->encap.dport)) + t->encap.flags)) goto nla_put_failure; return 0; diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c index 37096d6..40403114 100644 --- a/net/ipv4/ipip.c +++ b/net/ipv4/ipip.c @@ -465,7 +465,7 @@ static int ipip_fill_info(struct sk_buff *skb, const struct net_device *dev) nla_put_u16(skb, IFLA_IPTUN_ENCAP_DPORT, tunnel->encap.dport) || nla_put_u16(skb, IFLA_IPTUN_ENCAP_FLAGS, - tunnel->encap.dport)) + tunnel->encap.flags)) goto nla_put_failure; return 0; diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c index 58e5b47..45ad924 100644 --- a/net/ipv6/sit.c +++ b/net/ipv6/sit.c @@ -1714,7 +1714,7 @@ static int ipip6_fill_info(struct sk_buff *skb, const struct net_device *dev) nla_put_u16(skb, IFLA_IPTUN_ENCAP_DPORT, tunnel->encap.dport) || nla_put_u16(skb, IFLA_IPTUN_ENCAP_FLAGS, - tunnel->encap.dport)) + tunnel->encap.flags)) goto nla_put_failure; return 0;