mirror of
https://github.com/torvalds/linux.git
synced 2024-11-21 19:46:16 +00:00
8e57158683
of Feb 2nd (batadv-next-pullrequest-20210202) and includes the
following patches:
- Bump version strings, by Simon Wunderlich (added commit log)
- Drop publication years from copyright info, by Sven Eckelmann
(replaced the previous patch which updated copyright years, as per
our discussion)
- Avoid sizeof on flexible structure, by Sven Eckelmann (unchanged)
- Fix names for kernel-doc blocks, by Sven Eckelmann (unchanged)
-----BEGIN PGP SIGNATURE-----
iQJKBAABCgA0FiEE1ilQI7G+y+fdhnrfoSvjmEKSnqEFAmAhbUkWHHN3QHNpbW9u
d3VuZGVybGljaC5kZQAKCRChK+OYQpKeoR7yEACMhdCzMoVPJQwOYWe5p6QwgaBz
85QRT56x9gpFhV5dXCyg7DK3Qt2JRfTfBtMOeZQatFxcACYaGunZSS1L6gDVATpT
5vB+5UwQK8AW7cjkwVS6vJWW9Wmll9IwNe0/1DGvSBjEWwmU/wlRzAPa2uAT2uw5
AxrErEuXo5M3U4mDfJckVD4XA+pKkd9ylLEQ7llcZA4rOaTsr5sNAy5mbxO5EXD9
yP1vq9BoXtsf0FyZbQrMnYre6teAkxVxrvkTn6v44vsFKsi69JaxDiKQ4T7vakZR
1rIQq/8XbkH0dQXEu4C2FtWTzrg9P4KNHBPiT06b+KxlROpfYivcWhIqlofmW2FJ
5bWlumyNg3WoUmaM9kLGTFHagAp8M968W8zsI5fLi0meX0pEzFe/E1iBfkQaYyHh
R8Xpt7z1ORYUavFhVXqMw8x92WOLWmdFZjSGaW6sNyCxMFIU7qR16gYcXmucrJyU
RY6o159D9AKVOdX/GdX50mvyHjn/lC3KUEGQLUVxXMdJHpj7avn7aEiCWHUvgAxQ
jIHLOy0CRsUlCFPmzSqwGs3dAJEZeFbvqMwZjFJ/UXlKwBgPVMy76wIUk57+FWKz
3DTcg+6RIiW+bWazn/Hdbn9JXUNZnp5C6oH62GFPw7G6ywfe/yPex4qubF7feyog
T9H6ho+KW3SmRsHY5Q==
=fX7f
-----END PGP SIGNATURE-----
Merge tag 'batadv-next-pullrequest-20210208' of git://git.open-mesh.org/linux-merge
Simon Wunderlich says:
====================
This feature/cleanup patchset is an updated version of the pull request
of Feb 2nd (batadv-next-pullrequest-20210202) and includes the
following patches:
- Bump version strings, by Simon Wunderlich (added commit log)
- Drop publication years from copyright info, by Sven Eckelmann
(replaced the previous patch which updated copyright years, as per
our discussion)
- Avoid sizeof on flexible structure, by Sven Eckelmann (unchanged)
- Fix names for kernel-doc blocks, by Sven Eckelmann (unchanged)
* tag 'batadv-next-pullrequest-20210208' of git://git.open-mesh.org/linux-merge:
batman-adv: Fix names for kernel-doc blocks
batman-adv: Avoid sizeof on flexible structure
batman-adv: Drop publication years from copyright info
batman-adv: Start new development cycle
====================
Link: https://lore.kernel.org/r/20210208165938.13262-1-sw@simonwunderlich.de
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
97 lines
3.3 KiB
Plaintext
97 lines
3.3 KiB
Plaintext
# SPDX-License-Identifier: GPL-2.0
|
|
# Copyright (C) B.A.T.M.A.N. contributors:
|
|
#
|
|
# Marek Lindner, Simon Wunderlich
|
|
|
|
#
|
|
# B.A.T.M.A.N meshing protocol
|
|
#
|
|
|
|
config BATMAN_ADV
|
|
tristate "B.A.T.M.A.N. Advanced Meshing Protocol"
|
|
select LIBCRC32C
|
|
help
|
|
B.A.T.M.A.N. (better approach to mobile ad-hoc networking) is
|
|
a routing protocol for multi-hop ad-hoc mesh networks. The
|
|
networks may be wired or wireless. See
|
|
https://www.open-mesh.org/ for more information and user space
|
|
tools.
|
|
|
|
config BATMAN_ADV_BATMAN_V
|
|
bool "B.A.T.M.A.N. V protocol"
|
|
depends on BATMAN_ADV && !(CFG80211=m && BATMAN_ADV=y)
|
|
default y
|
|
help
|
|
This option enables the B.A.T.M.A.N. V protocol, the successor
|
|
of the currently used B.A.T.M.A.N. IV protocol. The main
|
|
changes include splitting of the OGM protocol into a neighbor
|
|
discovery protocol (Echo Location Protocol, ELP) and a new OGM
|
|
Protocol OGMv2 for flooding protocol information through the
|
|
network, as well as a throughput based metric.
|
|
B.A.T.M.A.N. V is currently considered experimental and not
|
|
compatible to B.A.T.M.A.N. IV networks.
|
|
|
|
config BATMAN_ADV_BLA
|
|
bool "Bridge Loop Avoidance"
|
|
depends on BATMAN_ADV && INET
|
|
select CRC16
|
|
default y
|
|
help
|
|
This option enables BLA (Bridge Loop Avoidance), a mechanism
|
|
to avoid Ethernet frames looping when mesh nodes are connected
|
|
to both the same LAN and the same mesh. If you will never use
|
|
more than one mesh node in the same LAN, you can safely remove
|
|
this feature and save some space.
|
|
|
|
config BATMAN_ADV_DAT
|
|
bool "Distributed ARP Table"
|
|
depends on BATMAN_ADV && INET
|
|
default y
|
|
help
|
|
This option enables DAT (Distributed ARP Table), a DHT based
|
|
mechanism that increases ARP reliability on sparse wireless
|
|
mesh networks. If you think that your network does not need
|
|
this option you can safely remove it and save some space.
|
|
|
|
config BATMAN_ADV_NC
|
|
bool "Network Coding"
|
|
depends on BATMAN_ADV
|
|
help
|
|
This option enables network coding, a mechanism that aims to
|
|
increase the overall network throughput by fusing multiple
|
|
packets in one transmission.
|
|
Note that interfaces controlled by batman-adv must be manually
|
|
configured to have promiscuous mode enabled in order to make
|
|
network coding work.
|
|
If you think that your network does not need this feature you
|
|
can safely disable it and save some space.
|
|
|
|
config BATMAN_ADV_MCAST
|
|
bool "Multicast optimisation"
|
|
depends on BATMAN_ADV && INET && !(BRIDGE=m && BATMAN_ADV=y)
|
|
default y
|
|
help
|
|
This option enables the multicast optimisation which aims to
|
|
reduce the air overhead while improving the reliability of
|
|
multicast messages.
|
|
|
|
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 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"
|
|
depends on BATMAN_ADV
|
|
depends on EVENT_TRACING
|
|
help
|
|
This is an option for use by developers; most people should
|
|
say N here. Select this option to gather traces like the debug
|
|
messages using the generic tracing infrastructure of the kernel.
|
|
BATMAN_ADV_DEBUG must also be selected to get trace events for
|
|
batadv_dbg.
|