|
 |
049c96 |
From ee76da8edee35ab8c6b69dbb2376a93ee736e7ed Mon Sep 17 00:00:00 2001
|
|
|
049c96 |
From: Phil Sutter <psutter@redhat.com>
|
|
|
049c96 |
Date: Tue, 23 Feb 2016 18:26:25 +0100
|
|
|
049c96 |
Subject: [PATCH] ip: add nlmon as a device type to help message
|
|
|
049c96 |
|
|
|
049c96 |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1269528
|
|
|
049c96 |
Upstream Status: iproute2.git commit 7968262df6fe7
|
|
|
049c96 |
|
|
|
049c96 |
commit 7968262df6fe7103352105e222bc98ac1ba7a821
|
|
|
049c96 |
Author: Masatake YAMATO <yamato@redhat.com>
|
|
|
049c96 |
Date: Thu Jun 12 04:08:38 2014 +0900
|
|
|
049c96 |
|
|
|
049c96 |
ip: add nlmon as a device type to help message
|
|
|
049c96 |
|
|
|
049c96 |
Though nlmon device can be added, it was not listed
|
|
|
049c96 |
in the output of "ip link help".
|
|
|
049c96 |
|
|
|
049c96 |
Signed-off-by: Masatake YAMATO <yamato@redhat.com>
|
|
|
049c96 |
Acked-by: Daniel Borkmann <dborkman@redhat.com>
|
|
|
049c96 |
---
|
|
|
049c96 |
ip/iplink.c | 2 +-
|
|
|
049c96 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
049c96 |
|
|
|
049c96 |
diff --git a/ip/iplink.c b/ip/iplink.c
|
|
|
049c96 |
index 7e6d992..2f8bbf9 100644
|
|
|
049c96 |
--- a/ip/iplink.c
|
|
|
049c96 |
+++ b/ip/iplink.c
|
|
|
049c96 |
@@ -92,7 +92,7 @@ void iplink_usage(void)
|
|
|
049c96 |
fprintf(stderr, "\n");
|
|
|
049c96 |
fprintf(stderr, "TYPE := { vlan | veth | vcan | dummy | ifb | macvlan | macvtap |\n");
|
|
|
049c96 |
fprintf(stderr, " bridge | bond | ipoib | ip6tnl | ipip | sit | vxlan |\n");
|
|
|
049c96 |
- fprintf(stderr, " gre | gretap | ip6gre | ip6gretap | vti }\n");
|
|
|
049c96 |
+ fprintf(stderr, " gre | gretap | ip6gre | ip6gretap | vti | nlmon }\n");
|
|
|
049c96 |
}
|
|
|
049c96 |
exit(-1);
|
|
|
049c96 |
}
|
|
|
049c96 |
--
|
|
|
049c96 |
1.8.3.1
|
|
|
049c96 |
|