[linux-next] LinuxNextTracking branch, master, updated. next-20160111

batman at open-mesh.org batman at open-mesh.org
Tue Jan 12 00:15:47 CET 2016

The following commit has been merged in the master branch:
commit cc69d3dbbbfa134df2a7e7a72da6484c5d34fb0d
Author: Sven Eckelmann <sven at narfation.org>
Date:   Wed Oct 28 10:58:00 2015 +0100

    batman-adv: Change ifconfig examples to iproute2
    Signed-off-by: Sven Eckelmann <sven at narfation.org>
    Signed-off-by: Marek Lindner <mareklindner at neomailbox.ch>
    Signed-off-by: Antonio Quartulli <a at unstable.cc>

diff --git a/Documentation/networking/batman-adv.txt b/Documentation/networking/batman-adv.txt
index 58e4904..ff23b75 100644
--- a/Documentation/networking/batman-adv.txt
+++ b/Documentation/networking/batman-adv.txt
@@ -115,14 +115,17 @@ The "bat0" interface can be used like any  other  regular  inter-
 face.  It needs an IP address which can be either statically con-
 figured or dynamically (by using DHCP or similar services):
-# NodeA: ifconfig bat0
-# NodeB: ifconfig bat0
+# NodeA: ip link set up dev bat0
+# NodeA: ip addr add dev bat0
+# NodeB: ip link set up dev bat0
+# NodeB: ip addr add dev bat0
 # NodeB: ping
 Note:  In  order to avoid problems remove all IP addresses previ-
 ously assigned to interfaces now used by batman advanced, e.g.
-# ifconfig eth0
+# ip addr flush dev eth0


More information about the linux-merge mailing list