06fa1c46fc
The following patches were removed:
010-networking-fix-uninitialized-memory-when-displaying-.patch
https://git.busybox.net/busybox/commit/?id=f2c043acfcf9dad9fd3d65821b81f89986bbe54e
030-ip-fix-problem-on-mips64-n64-big-endian-musl-systems.patch
https://git.busybox.net/busybox/commit/?id=4ab372d49a6e82b0bf097dedb96d26330c5f2d5f
204-udhcpc_src_ip_rebind.patch
https://git.busybox.net/busybox/commit/?id=abe8f7515aded80889d78c2c1c8947997918cf90
230-ntpd_delayed_resolve.patch
https://git.busybox.net/busybox/commit/?id=c8641962e4cbde48108ddfc1c105e3320778190d
https://git.busybox.net/busybox/commit/?id=e4caf1dd9ce8569371a0eeb77ccf02a572dc0f11
260-arping_missing_includes.patch
Not needed any more, still builds with musl for me.
Add in 92fd6e6f1a "busybox: fix arping applet building on musl"
The Kconfig files were updated with these commands:
cd config
../convert_menuconfig.pl .../build_dir/target-*/busybox-1.25.0
cd ..
./convert_defaults.pl < .../build_dir/target-*/busybox-1.25.0/.config > Config-defaults.in
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
23 lines
694 B
Diff
23 lines
694 B
Diff
From: Felix Fietkau <nbd@nbd.name>
|
|
Date: Sun, 7 Feb 2016 21:11:21 +0100
|
|
Subject: [PATCH] networking/libiproute: fix displaying route table for rules
|
|
|
|
r->rtm_table only supports a 8 bit table id, prefer RTA_TABLE if
|
|
present.
|
|
|
|
Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
---
|
|
|
|
--- a/networking/libiproute/iprule.c
|
|
+++ b/networking/libiproute/iprule.c
|
|
@@ -114,7 +114,9 @@ static int FAST_FUNC print_rule(const st
|
|
printf("iif %s ", (char*)RTA_DATA(tb[RTA_IIF]));
|
|
}
|
|
|
|
- if (r->rtm_table)
|
|
+ if (tb[RTA_TABLE])
|
|
+ printf("lookup %s ", rtnl_rttable_n2a(*(uint32_t*)RTA_DATA(tb[RTA_TABLE])));
|
|
+ else if (r->rtm_table)
|
|
printf("lookup %s ", rtnl_rttable_n2a(r->rtm_table));
|
|
|
|
if (tb[RTA_FLOW]) {
|