mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-27 17:18:59 +00:00
6262366381
Release Notes: https://lore.kernel.org/netdev/20240717090601.20b2871f@hermes.local/T/ https://lwn.net/Articles/990423/ Remove patch `401-bridge-vlan.c-bridge-vlan.c-fix-build-with-gcc-14-on.patch` because it is upstream now. Backport two patches to fix build problems in bridge/mst.c Small size increase: 38538 bin/packages/mips_24kc-old/base/devlink_6.9.0-r1_mips_24kc.ipk 7713 bin/packages/mips_24kc-old/base/genl_6.9.0-r1_mips_24kc.ipk 31875 bin/packages/mips_24kc-old/base/ip-bridge_6.9.0-r1_mips_24kc.ipk 187733 bin/packages/mips_24kc-old/base/ip-full_6.9.0-r1_mips_24kc.ipk 126538 bin/packages/mips_24kc-old/base/ip-tiny_6.9.0-r1_mips_24kc.ipk 7619 bin/packages/mips_24kc-old/base/nstat_6.9.0-r1_mips_24kc.ipk 20704 bin/packages/mips_24kc-old/base/rdma_6.9.0-r1_mips_24kc.ipk 37607 bin/packages/mips_24kc-old/base/ss_6.9.0-r1_mips_24kc.ipk 158909 bin/packages/mips_24kc-old/base/tc-bpf_6.9.0-r1_mips_24kc.ipk 160459 bin/packages/mips_24kc-old/base/tc-full_6.9.0-r1_mips_24kc.ipk 135846 bin/packages/mips_24kc-old/base/tc-tiny_6.9.0-r1_mips_24kc.ipk 38669 bin/packages/mips_24kc-new/base/devlink_6.11.0-r1_mips_24kc.ipk 7719 bin/packages/mips_24kc-new/base/genl_6.11.0-r1_mips_24kc.ipk 32676 bin/packages/mips_24kc-new/base/ip-bridge_6.11.0-r1_mips_24kc.ipk 188920 bin/packages/mips_24kc-new/base/ip-full_6.11.0-r1_mips_24kc.ipk 127313 bin/packages/mips_24kc-new/base/ip-tiny_6.11.0-r1_mips_24kc.ipk 7612 bin/packages/mips_24kc-new/base/nstat_6.11.0-r1_mips_24kc.ipk 21065 bin/packages/mips_24kc-new/base/rdma_6.11.0-r1_mips_24kc.ipk 37726 bin/packages/mips_24kc-new/base/ss_6.11.0-r1_mips_24kc.ipk 158921 bin/packages/mips_24kc-new/base/tc-bpf_6.11.0-r1_mips_24kc.ipk 160510 bin/packages/mips_24kc-new/base/tc-full_6.11.0-r1_mips_24kc.ipk 136352 bin/packages/mips_24kc-new/base/tc-tiny_6.11.0-r1_mips_24kc.ipk Link: https://github.com/openwrt/openwrt/pull/16589 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
52 lines
2.5 KiB
Diff
52 lines
2.5 KiB
Diff
From 043ef90e2fa94397eb5c85330889ca4146a6d58a Mon Sep 17 00:00:00 2001
|
|
From: Dario Binacchi <dario.binacchi@amarulasolutions.com>
|
|
Date: Sun, 22 Sep 2024 16:50:11 +0200
|
|
Subject: bridge: mst: fix a further musl build issue
|
|
|
|
This patch fixes the following build errors:
|
|
|
|
In file included from mst.c:11:
|
|
../include/json_print.h:80:30: warning: 'struct timeval' declared inside parameter list will not be visible outside of this definition or declaration
|
|
80 | _PRINT_FUNC(tv, const struct timeval *)
|
|
| ^~~~~~~
|
|
../include/json_print.h:50:37: note: in definition of macro '_PRINT_FUNC'
|
|
50 | type value); \
|
|
| ^~~~
|
|
../include/json_print.h:80:30: warning: 'struct timeval' declared inside parameter list will not be visible outside of this definition or declaration
|
|
80 | _PRINT_FUNC(tv, const struct timeval *)
|
|
| ^~~~~~~
|
|
../include/json_print.h:55:45: note: in definition of macro '_PRINT_FUNC'
|
|
55 | type value) \
|
|
| ^~~~
|
|
../include/json_print.h: In function 'print_tv':
|
|
../include/json_print.h:58:48: error: passing argument 5 of 'print_color_tv' from incompatible pointer type [-Wincompatible-pointer-types]
|
|
58 | value); \
|
|
| ^~~~~
|
|
| |
|
|
| const struct timeval *
|
|
../include/json_print.h:80:1: note: in expansion of macro '_PRINT_FUNC'
|
|
80 | _PRINT_FUNC(tv, const struct timeval *)
|
|
| ^~~~~~~~~~~
|
|
../include/json_print.h:50:42: note: expected 'const struct timeval *' but argument is of type 'const struct timeval *'
|
|
50 | type value); \
|
|
| ^
|
|
../include/json_print.h:80:1: note: in expansion of macro '_PRINT_FUNC'
|
|
80 | _PRINT_FUNC(tv, const struct timeval *)
|
|
|
|
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
|
|
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
|
|
---
|
|
bridge/mst.c | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
--- a/bridge/mst.c
|
|
+++ b/bridge/mst.c
|
|
@@ -4,6 +4,7 @@
|
|
*/
|
|
|
|
#include <stdio.h>
|
|
+#include <sys/time.h>
|
|
#include <netinet/in.h>
|
|
#include <linux/if_bridge.h>
|
|
#include <net/if.h>
|