From patchwork Fri Oct 10 15:54:40 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick McHardy X-Patchwork-Id: 3822 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.176.167]) by ozlabs.org (Postfix) with ESMTP id 5F142DE5FA for ; Sat, 11 Oct 2008 02:54:51 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758626AbYJJPyp (ORCPT ); Fri, 10 Oct 2008 11:54:45 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758596AbYJJPyp (ORCPT ); Fri, 10 Oct 2008 11:54:45 -0400 Received: from stinky.trash.net ([213.144.137.162]:57636 "EHLO stinky.trash.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758143AbYJJPyp (ORCPT ); Fri, 10 Oct 2008 11:54:45 -0400 Received: from [192.168.0.100] (unknown [78.42.204.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by stinky.trash.net (Postfix) with ESMTP id 15FFF948B9; Fri, 10 Oct 2008 17:54:43 +0200 (MEST) Message-ID: <48EF7AC0.6080104@trash.net> Date: Fri, 10 Oct 2008 17:54:40 +0200 From: Patrick McHardy User-Agent: Mozilla-Thunderbird 2.0.0.16 (X11/20080724) MIME-Version: 1.0 To: Herbert Xu , "David S. Miller" , Linux Netdev List Subject: gre: fix copy and paste error Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org commit c7d32967f53c4d3ded69f0e645b7c0848ac8cb1b Author: Patrick McHardy Date: Fri Oct 10 17:53:36 2008 +0200 gre: fix copy and paste error The flags are dumped twice, the keys not at all. Signed-off-by: Patrick McHardy diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c index 0d5e35b..c0755e9 100644 --- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c @@ -1539,8 +1539,8 @@ static int ipgre_fill_info(struct sk_buff *skb, const struct net_device *dev) NLA_PUT_U32(skb, IFLA_GRE_LINK, p->link); NLA_PUT_BE16(skb, IFLA_GRE_IFLAGS, p->i_flags); NLA_PUT_BE16(skb, IFLA_GRE_OFLAGS, p->o_flags); - NLA_PUT_BE32(skb, IFLA_GRE_IFLAGS, p->i_flags); - NLA_PUT_BE32(skb, IFLA_GRE_OFLAGS, p->o_flags); + NLA_PUT_BE32(skb, IFLA_GRE_IKEY, p->i_key); + NLA_PUT_BE32(skb, IFLA_GRE_OKEY, p->o_key); NLA_PUT(skb, IFLA_GRE_LOCAL, 4, &p->iph.saddr); NLA_PUT(skb, IFLA_GRE_REMOTE, 4, &p->iph.daddr); NLA_PUT_U8(skb, IFLA_GRE_TTL, p->iph.ttl);