[Buildroot] [PATCH 2/2] musl: backport netlink macro fix
Arnout Vandecappelle
arnout at mind.be
Sat May 14 09:45:51 UTC 2022
On 10/05/2022 18:32, Petr Vorel wrote:
> 8cf87b30 ("fix incorrect parameter name in internal netlink.h RTA_OK macro")
>
> Signed-off-by: Petr Vorel <petr.vorel at gmail.com>
> ---
> ...rameter-name-in-internal-netlink.h-R.patch | 33 +++++++++++++++++++
> 1 file changed, 33 insertions(+)
> create mode 100644 dl/musl/0001-fix-incorrect-parameter-name-in-internal-netlink.h-R.patch
>
> diff --git a/dl/musl/0001-fix-incorrect-parameter-name-in-internal-netlink.h-R.patch b/dl/musl/0001-fix-incorrect-parameter-name-in-internal-netlink.h-R.patch
This should be in package/musl, not dl/musl. Also, subject should be
package/musl: ...
Applied both to master with that fixed.
Regards,
Arnout
> new file mode 100644
> index 0000000000..fa3057ff08
> --- /dev/null
> +++ b/dl/musl/0001-fix-incorrect-parameter-name-in-internal-netlink.h-R.patch
> @@ -0,0 +1,33 @@
> +From 8cf87b3027009c0acac591d9ae80262dc25daccf Mon Sep 17 00:00:00 2001
> +From: Ondrej Jirman <megous at megous.com>
> +Date: Wed, 21 Nov 2018 17:29:21 +0100
> +Subject: [PATCH] fix incorrect parameter name in internal netlink.h RTA_OK
> + macro
> +
> +the wrong name works only by accident.
> +
> +Signed-off-by: Ondrej Jirman <megous at megous.com>
> +Signed-off-by: Rich Felker <dalias at aerifal.cx>
> +Signed-off-by: Petr Vorel <petr.vorel at gmail.com>
> +
> +[ upstream status: 8cf87b3027009c0acac591d9ae80262dc25daccf ]
> +---
> + src/network/netlink.h | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/src/network/netlink.h b/src/network/netlink.h
> +index 38acb178..873fabe2 100644
> +--- a/src/network/netlink.h
> ++++ b/src/network/netlink.h
> +@@ -86,7 +86,7 @@ struct ifaddrmsg {
> + #define RTA_DATALEN(rta) ((rta)->rta_len-sizeof(struct rtattr))
> + #define RTA_DATAEND(rta) ((char*)(rta)+(rta)->rta_len)
> + #define RTA_NEXT(rta) (struct rtattr*)((char*)(rta)+NETLINK_ALIGN((rta)->rta_len))
> +-#define RTA_OK(nlh,end) ((char*)(end)-(char*)(rta) >= sizeof(struct rtattr))
> ++#define RTA_OK(rta,end) ((char*)(end)-(char*)(rta) >= sizeof(struct rtattr))
> +
> + #define NLMSG_RTA(nlh,len) ((void*)((char*)(nlh)+sizeof(struct nlmsghdr)+NETLINK_ALIGN(len)))
> + #define NLMSG_RTAOK(rta,nlh) RTA_OK(rta,NLMSG_DATAEND(nlh))
> +--
> +2.36.0
> +
More information about the buildroot
mailing list