From patchwork Thu Feb 19 06:36:33 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srivats P X-Patchwork-Id: 23413 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 1B93ADDDFF for ; Thu, 19 Feb 2009 17:54:07 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755470AbZBSGxo (ORCPT ); Thu, 19 Feb 2009 01:53:44 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754985AbZBSGxo (ORCPT ); Thu, 19 Feb 2009 01:53:44 -0500 Received: from cnxtsmtp4.conexant.com ([198.62.9.251]:41214 "EHLO cnxtsmtp4.conexant.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751896AbZBSGxn convert rfc822-to-8bit (ORCPT ); Thu, 19 Feb 2009 01:53:43 -0500 X-Greylist: delayed 1054 seconds by postgrey-1.27 at vger.kernel.org; Thu, 19 Feb 2009 01:53:43 EST X-WSS-ID: 0KFAVOD-01-29O-03 X-M-MSG: Received: from CPS (wsmx1.nb.conexant.com [157.152.185.16]) (using TLSv1 with cipher RC4-MD5 ( 128/128 bits)) (No client certificate requested) by cnxtsmtp4.conexant.com (Tumbleweed MailGate 3.6.1) with ESMTP id 2DE89197F05E for ; Wed, 18 Feb 2009 22:36:12 -0800 ( PST) Received: from CPS ([127.0.0.1]) by CPS with Microsoft SMTPSVC(6.0.3790.3959); Wed, 18 Feb 2009 22:21:16 -0500 Received: from cnxthub2.bbnet.ad ([157.152.180.132]) by CPS over TLS secured channel with Microsoft SMTPSVC(6.0.3790.3959); Wed, 18 Feb 2009 22:21:16 -0500 Received: from noidahub1.bbnet.ad (172.26.63.140) by cnxthub2.bbnet.ad (157.152.180.132) with Microsoft SMTP Server (TLS) id 8.1.311.2; Wed, 18 Feb 2009 22:36:38 -0800 Received: from NDMBX01.bbnet.ad ([fe80:0000:0000:0000:7402:77d2:236.57.29.251]) by noidahub1.bbnet.ad ([172.26.63.140]) with mapi; Thu, 19 Feb 2009 12:06:34 +0530 From: "Srivats P" To: "Stephen Hemminger" cc: "netdev@vger.kernel.org" Date: Thu, 19 Feb 2009 12:06:33 +0530 Subject: [PATCH] iproute2: Fix no default display of ip4ip6 tunnels Thread-Topic: [PATCH] iproute2: Fix no default display of ip4ip6 tunnels Thread-Index: AcmSXGgh6tZTB1ULSOSyOMKvteqVSA== Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US MIME-Version: 1.0 X-OriginalArrivalTime: 19 Feb 2009 03:21:16.0531 (UTC) FILETIME=[20116430:01C99241] Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Srivats P. "ip -6 tunnel show" displays only ip6ip6 tunnels not ip4ip6 tunnels - it should display all irrespective of proto. This is because the default tunnel proto is initialized to IPPROTO_IPV6 in ip6_tnl_parm_init() which is fine for a 'add' command but not for 'show'. This patch overrides proto with 0 signifying 'mode any' as the default in case of a 'show'. Signed-off-by: Srivats P. --- Conexant E-mail Firewall (Conexant.Com) made the following annotations --------------------------------------------------------------------- ********************** Legal Disclaimer **************************** "This email may contain confidential and privileged material for the sole use of the intended recipient. Any unauthorized review, use or distribution by others is strictly prohibited. If you have received the message in error, please advise the sender by reply email and delete the message. Thank you." ********************************************************************** --------------------------------------------------------------------- -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/ip/ip6tunnel.c b/ip/ip6tunnel.c index 8421983..0122974 100644 --- a/ip/ip6tunnel.c +++ b/ip/ip6tunnel.c @@ -335,6 +335,7 @@ static int do_show(int argc, char **argv) struct ip6_tnl_parm p; ip6_tnl_parm_init(&p, 0); + p.proto = 0; if (parse_args(argc, argv, &p) < 0) return -1;