Commit 78d6bb58 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'batadv-next-pullrequest-20201204' of git://git.open-mesh.org/linux-merge 

Simon Wunderlich says:

====================
This cleanup patchset includes the following patches:

 - bump version strings, by Simon Wunderlich

 - update include for min/max helpers, by Sven Eckelmann

 - add infrastructure and netlink functions for routing algo selection,
   by Sven Eckelmann (2 patches)

 - drop deprecated debugfs and sysfs support and obsoleted
   functionality, by Sven Eckelmann (3 patches)

 - drop unused include in fragmentation.c, by Simon Wunderlich

* tag 'batadv-next-pullrequest-20201204' of git://git.open-mesh.org/linux-merge:
  batman-adv: Drop unused soft-interface.h include in fragmentation.c
  batman-adv: Drop legacy code for auto deleting mesh interfaces
  batman-adv: Drop deprecated debugfs support
  batman-adv: Drop deprecated sysfs support
  batman-adv: Allow selection of routing algorithm over rtnetlink
  batman-adv: Prepare infrastructure for newlink settings
  batman-adv: Add new include for min/max helpers
  batman-adv: Start new development cycle
====================

Link: https://lore.kernel.org/r/20201204154631.21063-1-sw@simonwunderlich.de


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 4560b2a3 34a14c2e

Documentation/ABI/obsolete/sysfs-class-net-batman-adv

deleted100644 → 0
+0 −32
Original line number Diff line number Diff line 
This ABI is deprecated and will be removed after 2021. It is

replaced with the batadv generic netlink family.



What:           /sys/class/net/<iface>/batman-adv/elp_interval

Date:           Feb 2014

Contact:        Linus Lüssing <linus.luessing@web.de>

Description:

                Defines the interval in milliseconds in which batman

                emits probing packets for neighbor sensing (ELP).



What:           /sys/class/net/<iface>/batman-adv/iface_status

Date:           May 2010

Contact:        Marek Lindner <mareklindner@neomailbox.ch>

Description:

                Indicates the status of <iface> as it is seen by batman.



What:           /sys/class/net/<iface>/batman-adv/mesh_iface

Date:           May 2010

Contact:        Marek Lindner <mareklindner@neomailbox.ch>

Description:

                The /sys/class/net/<iface>/batman-adv/mesh_iface file

                displays the batman mesh interface this <iface>

                currently is associated with.



What:           /sys/class/net/<iface>/batman-adv/throughput_override

Date:           Feb 2014

Contact:        Antonio Quartulli <a@unstable.cc>

description:

                Defines the throughput value to be used by B.A.T.M.A.N. V

                when estimating the link throughput using this interface.

                If the value is set to 0 then batman-adv will try to

                estimate the throughput by itself.

Documentation/ABI/obsolete/sysfs-class-net-mesh

deleted100644 → 0
+0 −110
Original line number Diff line number Diff line 
This ABI is deprecated and will be removed after 2021. It is

replaced with the batadv generic netlink family.



What:           /sys/class/net/<mesh_iface>/mesh/aggregated_ogms

Date:           May 2010

Contact:        Marek Lindner <mareklindner@neomailbox.ch>

Description:

                Indicates whether the batman protocol messages of the

                mesh <mesh_iface> shall be aggregated or not.



What:           /sys/class/net/<mesh_iface>/mesh/<vlan_subdir>/ap_isolation

Date:           May 2011

Contact:        Antonio Quartulli <a@unstable.cc>

Description:

                Indicates whether the data traffic going from a

                wireless client to another wireless client will be

                silently dropped. <vlan_subdir> is empty when referring

		to the untagged lan.



What:           /sys/class/net/<mesh_iface>/mesh/bonding

Date:           June 2010

Contact:        Simon Wunderlich <sw@simonwunderlich.de>

Description:

                Indicates whether the data traffic going through the

                mesh will be sent using multiple interfaces at the

                same time (if available).



What:           /sys/class/net/<mesh_iface>/mesh/bridge_loop_avoidance

Date:           November 2011

Contact:        Simon Wunderlich <sw@simonwunderlich.de>

Description:

                Indicates whether the bridge loop avoidance feature

                is enabled. This feature detects and avoids loops

                between the mesh and devices bridged with the soft

                interface <mesh_iface>.



What:           /sys/class/net/<mesh_iface>/mesh/fragmentation

Date:           October 2010

Contact:        Andreas Langer <an.langer@gmx.de>

Description:

                Indicates whether the data traffic going through the

                mesh will be fragmented or silently discarded if the

                packet size exceeds the outgoing interface MTU.



What:           /sys/class/net/<mesh_iface>/mesh/gw_bandwidth

Date:           October 2010

Contact:        Marek Lindner <mareklindner@neomailbox.ch>

Description:

                Defines the bandwidth which is propagated by this

                node if gw_mode was set to 'server'.



What:           /sys/class/net/<mesh_iface>/mesh/gw_mode

Date:           October 2010

Contact:        Marek Lindner <mareklindner@neomailbox.ch>

Description:

                Defines the state of the gateway features. Can be

                either 'off', 'client' or 'server'.



What:           /sys/class/net/<mesh_iface>/mesh/gw_sel_class

Date:           October 2010

Contact:        Marek Lindner <mareklindner@neomailbox.ch>

Description:

                Defines the selection criteria this node will use

                to choose a gateway if gw_mode was set to 'client'.



What:           /sys/class/net/<mesh_iface>/mesh/hop_penalty

Date:           Oct 2010

Contact:        Linus Lüssing <linus.luessing@web.de>

Description:

                Defines the penalty which will be applied to an

                originator message's tq-field on every hop.



What:		/sys/class/net/<mesh_iface>/mesh/isolation_mark

Date:		Nov 2013

Contact:	Antonio Quartulli <a@unstable.cc>

Description:

		Defines the isolation mark (and its bitmask) which

		is used to classify clients as "isolated" by the

		Extended Isolation feature.



What:           /sys/class/net/<mesh_iface>/mesh/multicast_mode

Date:           Feb 2014

Contact:        Linus Lüssing <linus.luessing@web.de>

Description:

                Indicates whether multicast optimizations are enabled

                or disabled. If set to zero then all nodes in the

                mesh are going to use classic flooding for any

                multicast packet with no optimizations.



What:           /sys/class/net/<mesh_iface>/mesh/network_coding

Date:           Nov 2012

Contact:        Martin Hundeboll <martin@hundeboll.net>

Description:

                Controls whether Network Coding (using some magic

                to send fewer wifi packets but still the same

                content) is enabled or not.



What:           /sys/class/net/<mesh_iface>/mesh/orig_interval

Date:           May 2010

Contact:        Marek Lindner <mareklindner@neomailbox.ch>

Description:

                Defines the interval in milliseconds in which batman

                sends its protocol messages.



What:           /sys/class/net/<mesh_iface>/mesh/routing_algo

Date:           Dec 2011

Contact:        Marek Lindner <mareklindner@neomailbox.ch>

Description:

                Defines the routing procotol this mesh instance

                uses to find the optimal paths through the mesh.

MAINTAINERS

+0 −2
Original line number Diff line number Diff line
@@ -3111,8 +3111,6 @@ Q: https://patchwork.open-mesh.org/project/batman/list/ 
B:	https://www.open-mesh.org/projects/batman-adv/issues

C:	irc://chat.freenode.net/batman

T:	git https://git.open-mesh.org/linux-merge.git

F:	Documentation/ABI/obsolete/sysfs-class-net-batman-adv

F:	Documentation/ABI/obsolete/sysfs-class-net-mesh

F:	Documentation/networking/batman-adv.rst

F:	include/uapi/linux/batadv_packet.h

F:	include/uapi/linux/batman_adv.h

include/uapi/linux/batman_adv.h

+26 −0
Original line number Diff line number Diff line
@@ -675,4 +675,30 @@ enum batadv_tp_meter_reason { 
	BATADV_TP_REASON_TOO_MANY		= 133,

};



/**

 * enum batadv_ifla_attrs - batman-adv ifla nested attributes

 */

enum batadv_ifla_attrs {

	/**

	 * @IFLA_BATADV_UNSPEC: unspecified attribute which is not parsed by

	 *  rtnetlink

	 */

	IFLA_BATADV_UNSPEC,



	/**

	 * @IFLA_BATADV_ALGO_NAME: routing algorithm (name) which should be

	 *  used by the newly registered batadv net_device.

	 */

	IFLA_BATADV_ALGO_NAME,



	/* add attributes above here, update the policy in soft-interface.c */



	/**

	 * @__IFLA_BATADV_MAX: internal use

	 */

	__IFLA_BATADV_MAX,

};



#define IFLA_BATADV_MAX (__IFLA_BATADV_MAX - 1)



#endif /* _UAPI_LINUX_BATMAN_ADV_H_ */

net/batman-adv/Kconfig

+2 −25
Original line number Diff line number Diff line
@@ -76,37 +76,14 @@ config BATMAN_ADV_MCAST 
	  reduce the air overhead while improving the reliability of

	  multicast messages.



config BATMAN_ADV_DEBUGFS

	bool "batman-adv debugfs entries"

	depends on BATMAN_ADV

	depends on DEBUG_FS

	help

	  Enable this to export routing related debug tables via debugfs.

	  The information for each soft-interface and used hard-interface can be

	  found under batman_adv/



	  If unsure, say N.



config BATMAN_ADV_DEBUG

	bool "B.A.T.M.A.N. debugging"

	depends on BATMAN_ADV

	help

	  This is an option for use by developers; most people should

	  say N here. This enables compilation of support for

	  outputting debugging information to the debugfs log or tracing

	  buffer. The output is controlled via the batadv netdev specific

	  log_level setting.



config BATMAN_ADV_SYSFS

	bool "batman-adv sysfs entries"

	depends on BATMAN_ADV

	help

	  Say Y here if you want to enable batman-adv device configuration and

	  status interface through sysfs attributes. It is replaced by the

	  batadv generic netlink family but still used by various userspace

	  tools and scripts.



	  If unsure, say Y.

	  outputting debugging information to the tracing buffer. The output is

	  controlled via the batadv netdev specific log_level setting.



config BATMAN_ADV_TRACING

	bool "B.A.T.M.A.N. tracing support"