From patchwork Sat Dec 15 16:21:08 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhiyong Wu X-Patchwork-Id: 206624 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 27D732C00A7 for ; Sun, 16 Dec 2012 03:21:37 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753946Ab2LOQVS (ORCPT ); Sat, 15 Dec 2012 11:21:18 -0500 Received: from e9.ny.us.ibm.com ([32.97.182.139]:47363 "EHLO e9.ny.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752961Ab2LOQVR (ORCPT ); Sat, 15 Dec 2012 11:21:17 -0500 Received: from /spool/local by e9.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Sat, 15 Dec 2012 11:21:16 -0500 Received: from d01dlp02.pok.ibm.com (9.56.250.167) by e9.ny.us.ibm.com (192.168.1.109) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Sat, 15 Dec 2012 11:21:15 -0500 Received: from d01relay07.pok.ibm.com (d01relay07.pok.ibm.com [9.56.227.147]) by d01dlp02.pok.ibm.com (Postfix) with ESMTP id B87786E803A; Sat, 15 Dec 2012 11:21:13 -0500 (EST) Received: from d01av03.pok.ibm.com (d01av03.pok.ibm.com [9.56.224.217]) by d01relay07.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id qBFGLDTt66781256; Sat, 15 Dec 2012 11:21:14 -0500 Received: from d01av03.pok.ibm.com (loopback [127.0.0.1]) by d01av03.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id qBFGLDQ0017066; Sat, 15 Dec 2012 14:21:13 -0200 Received: from us.ibm.com ([9.115.122.117]) by d01av03.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with SMTP id qBFGLAaH016932; Sat, 15 Dec 2012 14:21:11 -0200 Received: by us.ibm.com (sSMTP sendmail emulation); Sun, 16 Dec 2012 00:21:09 +0800 From: zwu.kernel@gmail.com To: shemminger@vyatta.com Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Zhi Yong Wu Subject: [PATCH] ip: add the type 'vxlan' in the output of "ip link help" Date: Sun, 16 Dec 2012 00:21:08 +0800 Message-Id: <1355588468-4964-1-git-send-email-zwu.kernel@gmail.com> X-Mailer: git-send-email 1.7.6.5 X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12121516-7182-0000-0000-000003D094A0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Zhi Yong Wu The new type 'vxlan' is added in the output of "ip link help" Signed-off-by: Zhi Yong Wu --- ip/iplink.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ip/iplink.c b/ip/iplink.c index d73c705..5ff8f85 100644 --- a/ip/iplink.c +++ b/ip/iplink.c @@ -84,7 +84,7 @@ void iplink_usage(void) if (iplink_have_newlink()) { fprintf(stderr, "\n"); fprintf(stderr, "TYPE := { vlan | veth | vcan | dummy | ifb | macvlan | can |\n"); - fprintf(stderr, " bridge | ipoib | ip6tnl | ipip | sit }\n"); + fprintf(stderr, " bridge | ipoib | ip6tnl | ipip | sit | vxlan }\n"); } exit(-1); }