The annotated tag, v4.19-rc8 has been created
at 9b6bcb55ef5b3293c6bb647dbbe4d14f8082dfda (tag)
tagging 35a7f35ad1b150ddf59a41dcac7b2fa32982be0e (commit)
replaces v4.19-rc7
tagged by Greg Kroah-Hartman
on Mon Oct 15 07:36:27 2018 +0200
- Shortlog ------------------------------------------------------------
This is the 4.19-rc8 release
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAlvEJ1sACgkQONu9yGCS
aT6wJA//cUSuHkkzZvzaVqhbOYfJBPqFoiKFFTB8hhFWIQT8QTRVJ5Qq1hP9Cl7v
wz5wQfigMjG1xN5fQwGAOj0LwcFAZ1DDm2PFACtSObs1U+GeugQ4YCQCQorMpMsk
Nc5Fqj+UudrTPnz4OP3vaI28EF0e4aLEV0BHrVVF2cCG+hhOWXy1FVGQkikyd4w/
B1qOKanWL0cwrgLIM5+s1VHX3q4H7fY7G1m8qEF6GyjwfktVvi91oakW6JFbFcpU
XxfZG7EYLtEtj2ze/t8bPo8LDplDCFmSybjtinqFbEG+JBJ5wOho2BYwDIBiwW51
Tp0a6xqL7Z7fG20US1SS+XJhruJEVSidwJCz83eAAlWaMtu4pIk/ySD4xWbM7xvC
vMuVGkf3fp7im+VI1MNtvYuP6qVurvkvT/ocaQav4XuhEm+JPVxmEUcBfcsEfUDQ
+WYPWoTrXUXxOmwUS6UEA5QuBDzUkUHMjNZbpjR8WJFjLxa5gddV+QrB7WL5JmFx
LwSUhA7s4h5DzIPkBkd/4HdEVcziaxiRZOg8pdS+EEwYBMTekJbcXJTT83BoUrQC
cPrxi1K0ClW+nt+ftbVSc6on0h7DNlTVNuxLGIz51TUP2AeaBgkTIdVLJhnZkTnQ
cu6WEwwbxC9XhK9E4V3CmMFuXxxRfeJl1cKJweyC6myMxU/isBs=
=QR2q
-----END PGP SIGNATURE-----
-----------------------------------------------------------------------
--
linux integration
Repository : ssh://git@open-mesh.org/openwrt-feed-devel
On branch : master
>---------------------------------------------------------------
commit 1c3a39e06a34e7959aef5311b9661dd03945af75
Author: Sven Eckelmann <sven(a)narfation.org>
Date: Sun Oct 14 17:37:29 2018 +0200
batman-adv-devel: Remove unused dependency kmod-crypto-crc32c
The translation table code from batman-adv is only using the function
crc32c which is part of kmod-lib-crc32c. The kmod-crypto-crc32c is then
only used by kmod-lib-crc32c but not batman-adv.
Signed-off-by: Sven Eckelmann <sven(a)narfation.org>
>---------------------------------------------------------------
1c3a39e06a34e7959aef5311b9661dd03945af75
batman-adv-devel/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/batman-adv-devel/Makefile b/batman-adv-devel/Makefile
index c5af589..8be9542 100644
--- a/batman-adv-devel/Makefile
+++ b/batman-adv-devel/Makefile
@@ -41,7 +41,7 @@ define KernelPackage/batman-adv-devel
URL:=https://www.open-mesh.org/
MAINTAINER:=Simon Wunderlich <sw(a)simonwunderlich.de>
SUBMENU:=Network Support
- DEPENDS:=+kmod-crypto-crc32c +kmod-lib-crc32c +kmod-cfg80211
+ DEPENDS:=+kmod-lib-crc32c +kmod-cfg80211
TITLE:=B.A.T.M.A.N. Adv devel
FILES:=$(PKG_BUILD_DIR)/net/batman-adv/batman-adv.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoProbe,batman-adv)
Repository : ssh://git@open-mesh.org/openwrt-feed-devel
On branch : master
>---------------------------------------------------------------
commit 00e9b8873cfb55ff0902920d90ef58325f81a521
Author: Sven Eckelmann <sven(a)narfation.org>
Date: Sun Oct 14 18:52:40 2018 +0200
batman-adv-devel: Provide debug messages as trace events
A private debug logging infrastructure is currently provided via
$debug_fs/batman_adv/*/log when CONFIG_BATMAN_ADV_DEBUG is enabled. This is
not well integrated in the rest of the tracing infrastructure of the
kernel.
Other components (like mac80211 or ath10k) allow to gather the debug
messages using generic trace events which are better integrated. This makes
it possible to interact with them using the existing userspace tools.
The tracepoint batadv:batadv_dbg will now be available when
CONFIG_BATMAN_ADV_DEVEL_DEBUG and CONFIG_BATMAN_ADV_DEVEL_TRACING is
activated. The log level mask is still used for filtering as usual.
A full system trace for offline parsing can be created (and read) using:
$ batctl ll all
$ trace-cmd record -e batadv:batadv_dbg
$ trace-cmd report
The same can also be done without recording to a file
$ batctl ll all
$ trace-cmd stream -e batadv:batadv_dbg
The trace infrastructure is especially helpful when tracing processes:
$ batctl ll all
$ perf trace --event "batadv:*" batctl p 10.204.32.1
0.000 batadv:batadv_dbg:batman_adv bat0 Parsing outgoing ARP REQUEST
0.045 batadv:batadv_dbg:batman_adv bat0 ARP MSG = [src: a2:64:14:53:f8:22-10.204.32.185 dst: 00:00:00:00:00:00-10.204.32.1]
0.067 batadv:batadv_dbg:batman_adv bat0 Entry updated: 10.204.32.185 a2:64:14:53:f8:22 (vid: -1)
0.099 batadv:batadv_dbg:batman_adv bat0 batadv_dat_select_candidates(): IP=10.204.32.1 hash(IP)=48902
0.757 batadv:batadv_dbg:batman_adv bat0 dat_select_candidates() 0: selected fe:2c:91:68:29:2b addr=48977 dist=65460
1.178 batadv:batadv_dbg:batman_adv bat0 dat_select_candidates() 1: selected fe:81:ab:c5:e3:03 addr=49181 dist=65256
1.809 batadv:batadv_dbg:batman_adv bat0 dat_select_candidates() 2: selected 66:25:a7:48:37:fb addr=49328 dist=65109
1.828 batadv:batadv_dbg:batman_adv bat0 DHT_SEND for 10.204.32.1
Signed-off-by: Sven Eckelmann <sven(a)narfation.org>
>---------------------------------------------------------------
00e9b8873cfb55ff0902920d90ef58325f81a521
batman-adv-devel/Config.in | 12 ++++++++++++
batman-adv-devel/Makefile | 1 +
2 files changed, 13 insertions(+)
diff --git a/batman-adv-devel/Config.in b/batman-adv-devel/Config.in
index c0a6726..9b14feb 100644
--- a/batman-adv-devel/Config.in
+++ b/batman-adv-devel/Config.in
@@ -95,3 +95,15 @@ config BATMAN_ADV_DEVEL_DEBUG
say N here. This enables compilation of support for
outputting debugging information to the kernel log. The
output is controlled via the module parameter debug.
+
+config BATMAN_ADV_DEVEL_TRACING
+ bool "B.A.T.M.A.N. tracing support"
+ depends on PACKAGE_kmod-batman-adv-devel
+ select KERNEL_FTRACE
+ select KERNEL_ENABLE_DEFAULT_TRACERS
+ 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_DEVEL_DEBUG must also be selected to get trace events for
+ batadv_dbg.
diff --git a/batman-adv-devel/Makefile b/batman-adv-devel/Makefile
index 8be9542..0995507 100644
--- a/batman-adv-devel/Makefile
+++ b/batman-adv-devel/Makefile
@@ -73,6 +73,7 @@ PKG_EXTRA_KCONFIG:= \
CONFIG_BATMAN_ADV_MCAST=$(if $(CONFIG_BATMAN_ADV_DEVEL_MCAST),y,n) \
CONFIG_BATMAN_ADV_NC=$(if $(CONFIG_BATMAN_ADV_DEVEL_NC),y,n) \
CONFIG_BATMAN_ADV_BATMAN_V=$(if $(CONFIG_BATMAN_ADV_DEVEL_BATMAN_V),y,n) \
+ CONFIG_BATMAN_ADV_TRACING=$(if $(CONFIG_BATMAN_ADV_DEVEL_TRACING),y,n) \
PKG_EXTRA_CFLAGS:= \
$(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=m,%,$(filter %=m,$(PKG_EXTRA_KCONFIG)))) \
Repository : ssh://git@open-mesh.org/openwrt-feed-devel
On branch : master
>---------------------------------------------------------------
commit f487fd9bfb0f137c29790482acca8d032f36182a
Author: Sven Eckelmann <sven(a)narfation.org>
Date: Sun Oct 14 16:24:20 2018 +0200
batman-adv-devel: Sync config options with kernel Kconfig
The kernel already provides all available kernel options for batman-adv and
even includes more verbose descriptions of each option. Importing this
Kconfig (with minor adjustments) file as Config.in allows to share most
information between kernel and OpenWrt.
Signed-off-by: Sven Eckelmann <sven(a)narfation.org>
>---------------------------------------------------------------
f487fd9bfb0f137c29790482acca8d032f36182a
batman-adv-devel/Config.in | 84 ++++++++++++++++++++++++++++++++++++++++------
batman-adv-devel/Makefile | 10 +++---
2 files changed, 79 insertions(+), 15 deletions(-)
diff --git a/batman-adv-devel/Config.in b/batman-adv-devel/Config.in
index 753bb1a..6b4f89e 100644
--- a/batman-adv-devel/Config.in
+++ b/batman-adv-devel/Config.in
@@ -1,35 +1,97 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2007-2018 B.A.T.M.A.N. contributors:
+#
+# Marek Lindner, Simon Wunderlich
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of version 2 of the GNU General Public
+# License as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+
+#
+# B.A.T.M.A.N meshing protocol
+#
config KMOD_BATMAN_ADV_DEVEL_BATMAN_V
- bool "enable batman v routing algorithm"
+ bool "B.A.T.M.A.N. V protocol"
depends on PACKAGE_kmod-batman-adv-devel
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 KMOD_BATMAN_ADV_DEVEL_BLA
- bool "enable bridge loop avoidance"
+ bool "Bridge Loop Avoidance"
depends on PACKAGE_kmod-batman-adv-devel
+ select PACKAGE_kmod-lib-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 KMOD_BATMAN_ADV_DEVEL_DAT
- bool "enable distributed arp table"
+ bool "Distributed ARP Table"
depends on PACKAGE_kmod-batman-adv-devel
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 KMOD_BATMAN_ADV_DEVEL_NC
- bool "enable network coding [requires promisc mode support]"
+ bool "Network Coding"
depends on PACKAGE_kmod-batman-adv-devel
- default n
+ 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 KMOD_BATMAN_ADV_DEVEL_MCAST
- bool "enable multicast transmission optimization"
+ bool "Multicast optimisation"
depends on PACKAGE_kmod-batman-adv-devel
+ help
+ This option enables the multicast optimisation which aims to
+ reduce the air overhead while improving the reliability of
+ multicast messages.
config KMOD_BATMAN_ADV_DEVEL_DEBUGFS
- bool "enable debugfs support"
+ bool "batman-adv debugfs entries"
depends on PACKAGE_kmod-batman-adv-devel
- default n
+ select KERNEL_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 KMOD_BATMAN_ADV_DEVEL_DEBUG_LOG
- bool "enable verbose debug logging"
- depends on PACKAGE_kmod-batman-adv-devel
+ bool "B.A.T.M.A.N. debugging"
depends on KMOD_BATMAN_ADV_DEVEL_DEBUGFS
- default n
+ 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 kernel log. The
+ output is controlled via the module parameter debug.
diff --git a/batman-adv-devel/Makefile b/batman-adv-devel/Makefile
index bb31dea..eba6a36 100644
--- a/batman-adv-devel/Makefile
+++ b/batman-adv-devel/Makefile
@@ -41,16 +41,18 @@ define KernelPackage/batman-adv-devel
URL:=https://www.open-mesh.org/
MAINTAINER:=Simon Wunderlich <sw(a)simonwunderlich.de>
SUBMENU:=Network Support
- DEPENDS:=+KMOD_BATMAN_ADV_DEVEL_BLA:kmod-lib-crc16 +kmod-crypto-crc32c +kmod-lib-crc32c +kmod-cfg80211
+ DEPENDS:=+kmod-crypto-crc32c +kmod-lib-crc32c +kmod-cfg80211
TITLE:=B.A.T.M.A.N. Adv devel
FILES:=$(PKG_BUILD_DIR)/net/batman-adv/batman-adv.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoProbe,batman-adv)
endef
define KernelPackage/batman-adv-devel/description
-B.A.T.M.A.N. advanced is a kernel module which allows to
-build layer 2 mesh networks. This package builds the latest
-development version.
+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. This package builds the latest development version.
endef
define KernelPackage/batman-adv-devel/config
Repository : ssh://git@open-mesh.org/openwrt-feed-devel
On branch : master
>---------------------------------------------------------------
commit 2d211db8411ba6c762fbd712903d0b59072b8cd1
Author: Sven Eckelmann <sven(a)narfation.org>
Date: Sun Oct 14 16:01:46 2018 +0200
batman-adv-devel: Add DEBUG_LOG -> DEBUGFS dependency
The debug log is only available when the debugfs is also enabled. This
must be reflected in Kconfig to avoid incompatible selection of batman-adv
options.
Signed-off-by: Sven Eckelmann <sven(a)narfation.org>
>---------------------------------------------------------------
2d211db8411ba6c762fbd712903d0b59072b8cd1
batman-adv-devel/Config.in | 1 +
1 file changed, 1 insertion(+)
diff --git a/batman-adv-devel/Config.in b/batman-adv-devel/Config.in
index 188a818..bcefd7c 100644
--- a/batman-adv-devel/Config.in
+++ b/batman-adv-devel/Config.in
@@ -2,6 +2,7 @@
config KMOD_BATMAN_ADV_DEVEL_DEBUG_LOG
bool "enable verbose debug logging"
depends on PACKAGE_kmod-batman-adv-devel
+ depends on KMOD_BATMAN_ADV_DEVEL_DEBUGFS
default n
config KMOD_BATMAN_ADV_DEVEL_BLA
Repository : ssh://git@open-mesh.org/openwrt-feed-devel
On branch : master
>---------------------------------------------------------------
commit 36d86d8f63d6413838aad79880291ac4246b1499
Author: Sven Eckelmann <sven(a)narfation.org>
Date: Sun Oct 14 16:40:43 2018 +0200
batman-adv-devel: Use the kernel style Kconfig symbols
Kernel modules like ath9k and ath10k are using the same Kconfig option
symbols as used in the kernel. This makes it easier to share them between
these two projects. A similar approach should be used for the batman-adv
module.
Signed-off-by: Sven Eckelmann <sven(a)narfation.org>
>---------------------------------------------------------------
36d86d8f63d6413838aad79880291ac4246b1499
batman-adv-devel/Config.in | 16 ++++++++--------
batman-adv-devel/Makefile | 20 ++++++++++----------
2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/batman-adv-devel/Config.in b/batman-adv-devel/Config.in
index 6b4f89e..c0a6726 100644
--- a/batman-adv-devel/Config.in
+++ b/batman-adv-devel/Config.in
@@ -19,7 +19,7 @@
# B.A.T.M.A.N meshing protocol
#
-config KMOD_BATMAN_ADV_DEVEL_BATMAN_V
+config BATMAN_ADV_DEVEL_BATMAN_V
bool "B.A.T.M.A.N. V protocol"
depends on PACKAGE_kmod-batman-adv-devel
default y
@@ -33,7 +33,7 @@ config KMOD_BATMAN_ADV_DEVEL_BATMAN_V
B.A.T.M.A.N. V is currently considered experimental and not
compatible to B.A.T.M.A.N. IV networks.
-config KMOD_BATMAN_ADV_DEVEL_BLA
+config BATMAN_ADV_DEVEL_BLA
bool "Bridge Loop Avoidance"
depends on PACKAGE_kmod-batman-adv-devel
select PACKAGE_kmod-lib-crc16
@@ -45,7 +45,7 @@ config KMOD_BATMAN_ADV_DEVEL_BLA
more than one mesh node in the same LAN, you can safely remove
this feature and save some space.
-config KMOD_BATMAN_ADV_DEVEL_DAT
+config BATMAN_ADV_DEVEL_DAT
bool "Distributed ARP Table"
depends on PACKAGE_kmod-batman-adv-devel
default y
@@ -55,7 +55,7 @@ config KMOD_BATMAN_ADV_DEVEL_DAT
mesh networks. If you think that your network does not need
this option you can safely remove it and save some space.
-config KMOD_BATMAN_ADV_DEVEL_NC
+config BATMAN_ADV_DEVEL_NC
bool "Network Coding"
depends on PACKAGE_kmod-batman-adv-devel
help
@@ -68,7 +68,7 @@ config KMOD_BATMAN_ADV_DEVEL_NC
If you think that your network does not need this feature you
can safely disable it and save some space.
-config KMOD_BATMAN_ADV_DEVEL_MCAST
+config BATMAN_ADV_DEVEL_MCAST
bool "Multicast optimisation"
depends on PACKAGE_kmod-batman-adv-devel
help
@@ -76,7 +76,7 @@ config KMOD_BATMAN_ADV_DEVEL_MCAST
reduce the air overhead while improving the reliability of
multicast messages.
-config KMOD_BATMAN_ADV_DEVEL_DEBUGFS
+config BATMAN_ADV_DEVEL_DEBUGFS
bool "batman-adv debugfs entries"
depends on PACKAGE_kmod-batman-adv-devel
select KERNEL_DEBUG_FS
@@ -87,9 +87,9 @@ config KMOD_BATMAN_ADV_DEVEL_DEBUGFS
If unsure, say N.
-config KMOD_BATMAN_ADV_DEVEL_DEBUG_LOG
+config BATMAN_ADV_DEVEL_DEBUG
bool "B.A.T.M.A.N. debugging"
- depends on KMOD_BATMAN_ADV_DEVEL_DEBUGFS
+ depends on BATMAN_ADV_DEVEL_DEBUGFS
help
This is an option for use by developers; most people should
say N here. This enables compilation of support for
diff --git a/batman-adv-devel/Makefile b/batman-adv-devel/Makefile
index eba6a36..c5af589 100644
--- a/batman-adv-devel/Makefile
+++ b/batman-adv-devel/Makefile
@@ -66,13 +66,13 @@ endef
PKG_EXTRA_KCONFIG:= \
CONFIG_BATMAN_ADV=m \
- CONFIG_BATMAN_ADV_DEBUG=$(if $(CONFIG_KMOD_BATMAN_ADV_DEVEL_DEBUG_LOG),y,n) \
- CONFIG_BATMAN_ADV_DEBUGFS=$(if $(CONFIG_KMOD_BATMAN_ADV_DEVEL_DEBUGFS),y,n) \
- CONFIG_BATMAN_ADV_BLA=$(if $(CONFIG_KMOD_BATMAN_ADV_DEVEL_BLA),y,n) \
- CONFIG_BATMAN_ADV_DAT=$(if $(CONFIG_KMOD_BATMAN_ADV_DEVEL_DAT),y,n) \
- CONFIG_BATMAN_ADV_MCAST=$(if $(CONFIG_KMOD_BATMAN_ADV_DEVEL_MCAST),y,n) \
- CONFIG_BATMAN_ADV_NC=$(if $(CONFIG_KMOD_BATMAN_ADV_DEVEL_NC),y,n) \
- CONFIG_BATMAN_ADV_BATMAN_V=$(if $(CONFIG_KMOD_BATMAN_ADV_DEVEL_BATMAN_V),y,n) \
+ CONFIG_BATMAN_ADV_DEBUG=$(if $(CONFIG_BATMAN_ADV_DEVEL_DEBUG),y,n) \
+ CONFIG_BATMAN_ADV_DEBUGFS=$(if $(CONFIG_BATMAN_ADV_DEVEL_DEBUGFS),y,n) \
+ CONFIG_BATMAN_ADV_BLA=$(if $(CONFIG_BATMAN_ADV_DEVEL_BLA),y,n) \
+ CONFIG_BATMAN_ADV_DAT=$(if $(CONFIG_BATMAN_ADV_DEVEL_DAT),y,n) \
+ CONFIG_BATMAN_ADV_MCAST=$(if $(CONFIG_BATMAN_ADV_DEVEL_MCAST),y,n) \
+ CONFIG_BATMAN_ADV_NC=$(if $(CONFIG_BATMAN_ADV_DEVEL_NC),y,n) \
+ CONFIG_BATMAN_ADV_BATMAN_V=$(if $(CONFIG_BATMAN_ADV_DEVEL_BATMAN_V),y,n) \
PKG_EXTRA_CFLAGS:= \
$(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=m,%,$(filter %=m,$(PKG_EXTRA_KCONFIG)))) \
@@ -90,9 +90,9 @@ NOSTDINC_FLAGS = \
-DBATADV_SOURCE_VERSION=\\\"openwrt-$(PKG_VERSION)\\\" \
COMPAT_SOURCES = \
- $(if $(CONFIG_KMOD_BATMAN_ADV_MCAST),../../compat-sources/net/core/skbuff.o,) \
- $(if $(CONFIG_KMOD_BATMAN_ADV_MCAST),../../compat-sources/net/ipv4/igmp.o,) \
- $(if $(CONFIG_KMOD_BATMAN_ADV_MCAST),../../compat-sources/net/ipv6/mcast_snoop.o,) \
+ $(if $(CONFIG_BATMAN_ADV_DEVEL_MCAST),../../compat-sources/net/core/skbuff.o,) \
+ $(if $(CONFIG_BATMAN_ADV_DEVEL_MCAST),../../compat-sources/net/ipv4/igmp.o,) \
+ $(if $(CONFIG_BATMAN_ADV_DEVEL_MCAST),../../compat-sources/net/ipv6/mcast_snoop.o,) \
define Build/Compile
+env "batman-adv-y=$(COMPAT_SOURCES)" \
Repository : ssh://git@open-mesh.org/openwrt-feed-devel
On branch : master
>---------------------------------------------------------------
commit 730595a25df410878b6493bff2c0ba340c0c931d
Author: Sven Eckelmann <sven(a)narfation.org>
Date: Sun Oct 14 16:50:23 2018 +0200
batman-adv-devel: Order Kconfig config symbols like kernel
The options in the kernel Kconfig have a different order than the one in
the OptionWrt Config.in. This makes it unnecessary hard to compare these
two files.
Signed-off-by: Sven Eckelmann <sven(a)narfation.org>
>---------------------------------------------------------------
730595a25df410878b6493bff2c0ba340c0c931d
batman-adv-devel/Config.in | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/batman-adv-devel/Config.in b/batman-adv-devel/Config.in
index bcefd7c..0d78925 100644
--- a/batman-adv-devel/Config.in
+++ b/batman-adv-devel/Config.in
@@ -1,9 +1,8 @@
-config KMOD_BATMAN_ADV_DEVEL_DEBUG_LOG
- bool "enable verbose debug logging"
+config KMOD_BATMAN_ADV_DEVEL_BATMAN_V
+ bool "enable batman v routing algorithm"
depends on PACKAGE_kmod-batman-adv-devel
- depends on KMOD_BATMAN_ADV_DEVEL_DEBUGFS
- default n
+ default y
config KMOD_BATMAN_ADV_DEVEL_BLA
bool "enable bridge loop avoidance"
@@ -15,8 +14,8 @@ config KMOD_BATMAN_ADV_DEVEL_DAT
depends on PACKAGE_kmod-batman-adv-devel
default y
-config KMOD_BATMAN_ADV_DEVEL_DEBUGFS
- bool "enable debugfs support"
+config KMOD_BATMAN_ADV_DEVEL_NC
+ bool "enable network coding [requires promisc mode support]"
depends on PACKAGE_kmod-batman-adv-devel
default n
@@ -25,12 +24,13 @@ config KMOD_BATMAN_ADV_DEVEL_MCAST
depends on PACKAGE_kmod-batman-adv-devel
default y
-config KMOD_BATMAN_ADV_DEVEL_NC
- bool "enable network coding [requires promisc mode support]"
+config KMOD_BATMAN_ADV_DEVEL_DEBUGFS
+ bool "enable debugfs support"
depends on PACKAGE_kmod-batman-adv-devel
default n
-config KMOD_BATMAN_ADV_DEVEL_BATMAN_V
- bool "enable batman v routing algorithm"
+config KMOD_BATMAN_ADV_DEVEL_DEBUG_LOG
+ bool "enable verbose debug logging"
depends on PACKAGE_kmod-batman-adv-devel
- default y
+ depends on KMOD_BATMAN_ADV_DEVEL_DEBUGFS
+ default n
Repository : ssh://git@open-mesh.org/openwrt-feed-devel
On branch : master
>---------------------------------------------------------------
commit 0ecc4ddb883a250f3b164fce749c3034c1919a50
Author: Sven Eckelmann <sven(a)narfation.org>
Date: Sun Oct 14 16:58:01 2018 +0200
batman-adv-devel: Disable MCAST during compilation
The multicast optimization compile option is disabled by default in the
Kconfig of batman-adv. The out-of-tree module should keep this setting in
sync and thus has to also disable the build of multicast optimization by
default.
Signed-off-by: Sven Eckelmann <sven(a)narfation.org>
>---------------------------------------------------------------
0ecc4ddb883a250f3b164fce749c3034c1919a50
batman-adv-devel/Config.in | 1 -
1 file changed, 1 deletion(-)
diff --git a/batman-adv-devel/Config.in b/batman-adv-devel/Config.in
index 0d78925..753bb1a 100644
--- a/batman-adv-devel/Config.in
+++ b/batman-adv-devel/Config.in
@@ -22,7 +22,6 @@ config KMOD_BATMAN_ADV_DEVEL_NC
config KMOD_BATMAN_ADV_DEVEL_MCAST
bool "enable multicast transmission optimization"
depends on PACKAGE_kmod-batman-adv-devel
- default y
config KMOD_BATMAN_ADV_DEVEL_DEBUGFS
bool "enable debugfs support"
The annotated tag, v4.19-rc7 has been created
at 8c7d64c58fc97a3db97d6f2f6c30c6a70b55cc45 (tag)
tagging 0238df646e6224016a45505d2c111a24669ebe21 (commit)
replaces v4.19-rc6
tagged by Greg Kroah-Hartman
on Sun Oct 7 17:35:13 2018 +0200
- Shortlog ------------------------------------------------------------
This is the 4.19-rc7 release
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAlu6J7EACgkQONu9yGCS
aT50lg//ZGZDhUmzWbY5UOGIZOmqdudaQ3dvL/duS8rOe/OWtudpMtfIOoeegNoF
aMU2zr7TRy+RisuGVcxc/X5iw7hrbpiymH6ioeeq4pmelJ7KZB0A2NKBIttN5l/a
8+V5+xD2tpBS8/mLSt76ourEqA/RzAWUuBphrCzoRPv7wnIPZt+5WKqUYNzOpyme
xsAQb4A0QLpFAmSY+1RloX9oecwM0whFhZ0qNQfpNbonoIRKpYSXfqRuYCjJJhK3
hAkoK+mjqMoo8HTo+y/V3Xl4/pCnLcUBSQOna6SUmnZ147zwRNXvBqJDYnLH0gww
LbKeFKNtOB3M4lLwo3nQOsMKKC+Wlx5zZ7JoR/j7QOl5zTFYoFLfWhywhd3f0KWx
tuRE4/XlOiPlaJIhMx+h2UfO/4CB3KDe439Vof5yGDXIFWcvG/+cmUhYlSKhFoHh
oU6/w4N+ap44fKz+iRP0/bpsn2/S6zU3+sM90tku4UsVki3zqZfamJXykj2JRmHr
pfo12hUBUr1uwAN6yXW/fuzVysupzEcCFM04u8pPOBNCp2mBY8lF4QgNswIC/oX6
/ClkTnncNek1W9nm5EX0WdVN0H21HcaEXadn/Bq+vWr8BsiiWWoXcF5K7FEIfSnQ
39T8Ocs6umxzz42mVeUNXxPDfrSPkfrmOObn4lhzocoYa/WOYlU=
=lDis
-----END PGP SIGNATURE-----
-----------------------------------------------------------------------
--
linux integration