From patchwork Fri Mar 4 19:07:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phil Sutter X-Patchwork-Id: 592188 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 654CD1402D8 for ; Sat, 5 Mar 2016 06:07:50 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759487AbcCDTHl (ORCPT ); Fri, 4 Mar 2016 14:07:41 -0500 Received: from orbyte.nwl.cc ([151.80.46.58]:52089 "EHLO mail.nwl.cc" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758710AbcCDTHk (ORCPT ); Fri, 4 Mar 2016 14:07:40 -0500 Received: from mail.nwl.cc (orbyte.nwl.cc [127.0.0.1]) by mail.nwl.cc (Postfix) with ESMTP id 2FFED6739B; Fri, 4 Mar 2016 20:07:39 +0100 (CET) Received: from xsao (localhost [IPv6:::1]) by mail.nwl.cc (Postfix) with ESMTP id 0F0236020E; Fri, 4 Mar 2016 20:07:39 +0100 (CET) From: Phil Sutter To: Stephen Hemminger Cc: netdev@vger.kernel.org Subject: [iproute PATCH 2/2] ipneigh: List all nud states in help output Date: Fri, 4 Mar 2016 20:07:21 +0100 Message-Id: <1457118441-15349-3-git-send-email-phil@nwl.cc> X-Mailer: git-send-email 2.7.2 In-Reply-To: <1457118441-15349-1-git-send-email-phil@nwl.cc> References: <1457118441-15349-1-git-send-email-phil@nwl.cc> X-Virus-Scanned: ClamAV using ClamSMTP Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org To not make the output overly confusing, list them in a definition of the STATE placeholder which is already used in the show/flush syntax but wasn't explained before. Signed-off-by: Phil Sutter --- ip/ipneigh.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ip/ipneigh.c b/ip/ipneigh.c index 9b1499b08b060..48cca196fa7a8 100644 --- a/ip/ipneigh.c +++ b/ip/ipneigh.c @@ -46,10 +46,11 @@ static void usage(void) __attribute__((noreturn)); static void usage(void) { - fprintf(stderr, "Usage: ip neigh { add | del | change | replace } { ADDR [ lladdr LLADDR ]\n" - " [ nud { permanent | noarp | stale | reachable } ]\n" - " | proxy ADDR } [ dev DEV ]\n"); - fprintf(stderr, " ip neigh { show | flush } [ proxy ] [ to PREFIX ] [ dev DEV ] [ nud STATE ]\n"); + fprintf(stderr, "Usage: ip neigh { add | del | change | replace }\n" + " { ADDR [ lladdr LLADDR ] [ nud STATE ] | proxy ADDR } [ dev DEV ]\n"); + fprintf(stderr, " ip neigh { show | flush } [ proxy ] [ to PREFIX ] [ dev DEV ] [ nud STATE ]\n\n"); + fprintf(stderr, "STATE := { permanent | noarp | stale | reachable | none |\n" + " incomplete | delay | probe | failed }\n"); exit(-1); }