Browse Source

package/libteam: bump to v1.32

- Drop backported patches
 - Add necessary runner to kernel

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
[yann.morin.1998@free.fr: update .checkpackageignore]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Joachim Wiberg 1 year ago
parent
commit
046872a1f8

+ 0 - 3
.checkpackageignore

@@ -780,9 +780,6 @@ package/libsvgtiny/0002-Remove-Werror.patch Upstream
 package/libsvgtiny/0003-Hopefully-silence-warnings-about-inlines-and-non-inlines-calling-one.patch Upstream
 package/libsvgtiny/0004-Build-Include-gperf-generated-code-directly.patch Upstream
 package/libtalloc/0001-buildtools-wafsamba-add-disable-stack-protector-opti.patch Upstream
-package/libteam/0001-revert-disregard-current-state.patch Upstream
-package/libteam/0002-fix-build-on-openwrt-musl-libc.patch Upstream
-package/libteam/0003-increase-wait-time-for-daemon-kill.patch Upstream
 package/libtelnet/0001-fix-compilation-without-zlib.patch Upstream
 package/libtheora/0001-link-libtheoradec.patch Upstream
 package/libtheora/0002-fix-autoreconf.patch Upstream

+ 0 - 51
package/libteam/0001-revert-disregard-current-state.patch

@@ -1,51 +0,0 @@
-From 61efd6de2fbb8ee077863ee5a355ac3dfd9365b9 Mon Sep 17 00:00:00 2001
-From: Xin Long <lucien.xin@gmail.com>
-Date: Tue, 1 Sep 2020 13:59:27 +0800
-Subject: [PATCH] Revert "teamd: Disregard current state when considering port
- enablement"
-
-This reverts commit deadb5b715227429a1879b187f5906b39151eca9.
-
-As Patrick noticed, with that commit, teamd_port_check_enable()
-would set the team port to the new state unconditionally, which
-triggers another change message from kernel to userspace, then
-teamd_port_check_enable() is called again to set the team port
-to the new state.
-
-This would go around and around to update the team port state,
-and even cause teamd to consume 100% cpu.
-
-As the issue caused by that commit is serious, it has to be
-reverted. As for the issued fixed by that commit, I would
-propose a new fix later.
-
-Signed-off-by: Jiri Pirko <jiri@nvidia.com>
----
- teamd/teamd_per_port.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/teamd/teamd_per_port.c b/teamd/teamd_per_port.c
-index 166da57..d429753 100644
---- a/teamd/teamd_per_port.c
-+++ b/teamd/teamd_per_port.c
-@@ -442,14 +442,18 @@ int teamd_port_check_enable(struct teamd_context *ctx,
- 			    bool should_enable, bool should_disable)
- {
- 	bool new_enabled_state;
-+	bool curr_enabled_state;
- 	int err;
- 
- 	if (!teamd_port_present(ctx, tdport))
- 		return 0;
-+	err = teamd_port_enabled(ctx, tdport, &curr_enabled_state);
-+	if (err)
-+		return err;
- 
--	if (should_enable)
-+	if (!curr_enabled_state && should_enable)
- 		new_enabled_state = true;
--	else if (should_disable)
-+	else if (curr_enabled_state && should_disable)
- 		new_enabled_state = false;
- 	else
- 		return 0;

+ 0 - 41
package/libteam/0002-fix-build-on-openwrt-musl-libc.patch

@@ -1,41 +0,0 @@
-From 267f24839536234ca621d4fd0466d3b57cb6dccd Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Pavel=20=C5=A0imerda?= <code@simerda.eu>
-Date: Tue, 12 Jan 2021 04:41:56 +0100
-Subject: [PATCH] fix build on OpenWRT/musl-libc
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Pavel Šimerda <code@simerda.eu>
-Signed-off-by: Jiri Pirko <jiri@nvidia.com>
----
- teamd/teamd_runner_lacp.c | 2 --
- utils/teamnl.c            | 1 +
- 2 files changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/teamd/teamd_runner_lacp.c b/teamd/teamd_runner_lacp.c
-index 9437f05..f524be2 100644
---- a/teamd/teamd_runner_lacp.c
-+++ b/teamd/teamd_runner_lacp.c
-@@ -23,9 +23,7 @@
- #include <unistd.h>
- #include <limits.h>
- #include <sys/ioctl.h>
--#include <linux/if_ether.h>
- #include <sys/socket.h>
--#include <linux/netdevice.h>
- #include <netinet/in.h>
- #include <errno.h>
- #include <team.h>
-diff --git a/utils/teamnl.c b/utils/teamnl.c
-index c53345d..ec2b435 100644
---- a/utils/teamnl.c
-+++ b/utils/teamnl.c
-@@ -24,6 +24,7 @@
- #include <getopt.h>
- #include <errno.h>
- #include <sys/signalfd.h>
-+#include <sys/select.h>
- #include <signal.h>
- #include <unistd.h>
- #include <team.h>

+ 0 - 37
package/libteam/0003-increase-wait-time-for-daemon-kill.patch

@@ -1,37 +0,0 @@
-From 6875e6c8efb0fe86766b3d4f1d0db390af6998b7 Mon Sep 17 00:00:00 2001
-From: Hangbin Liu <liuhangbin@gmail.com>
-Date: Tue, 15 Dec 2020 19:33:17 +0800
-Subject: [PATCH] teamd: increase the waitting time for daemon killing
-
-In the current code, we wait for at most 5s when kill the daemon pid.
-But in some environment, it may need more time. Then the teamd -k will
-failed and return error "Failed to kill daemon: Timer expired".
-
-Let's increase the value to have enough time. Here is the reuslt with
-this patch:
-
-$ time libteam/teamd/teamd -k -t team0
-
-real    0m10.442s
-user    0m0.017s
-sys     0m0.016s
-
-Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
-Signed-off-by: Jiri Pirko <jiri@nvidia.com>
----
- teamd/teamd.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/teamd/teamd.c b/teamd/teamd.c
-index 9360cbf..b310140 100644
---- a/teamd/teamd.c
-+++ b/teamd/teamd.c
-@@ -1858,7 +1858,7 @@ int main(int argc, char **argv)
- 		break;
- 	case DAEMON_CMD_KILL:
- 		if (daemon_pid_file_is_running() > 0) {
--			err = daemon_pid_file_kill_wait(SIGTERM, 5);
-+			err = daemon_pid_file_kill_wait(SIGTERM, 30);
- 			if (err)
- 				teamd_log_warn("Failed to kill daemon: %s",
- 					       strerror(errno));

+ 1 - 1
package/libteam/libteam.hash

@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  c69f7cf5a98203d66db10e67b396fe325b77a5a9491d1e07e8a07cba3ba841bb  libteam-1.31.tar.gz
+sha256  7ad90555db8aecdcaf002f543d330408501600edf7065e0ca398fce9b1e64820  libteam-1.32.tar.gz
 sha256  dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  COPYING

+ 2 - 1
package/libteam/libteam.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBTEAM_VERSION = 1.31
+LIBTEAM_VERSION = 1.32
 LIBTEAM_SITE = $(call github,jpirko,libteam,v$(LIBTEAM_VERSION))
 LIBTEAM_LICENSE = LGPL-2.1+
 LIBTEAM_LICENSE_FILES = COPYING
@@ -18,6 +18,7 @@ define LIBTEAM_LINUX_CONFIG_FIXUPS
 	$(call KCONFIG_ENABLE_OPT,CONFIG_NETDEVICES)
 	$(call KCONFIG_ENABLE_OPT,CONFIG_NET_CORE)
 	$(call KCONFIG_ENABLE_OPT,CONFIG_NET_TEAM)
+	$(call KCONFIG_ENABLE_OPT,CONFIG_NET_TEAM_MODE_ROUNDROBIN)
 endef
 
 $(eval $(autotools-package))