icmp: fix lib conflict with trinity
Subsystems (3)
PATCH 1/1 icmp: fix lib conflict with trinity
Including <linux/in.h> and <netinet/in.h> in the dependencies breaks compilation of trinity due to multiple definitions. <linux/in.h> is only used in <linux/icmp.h> to provide the definition of the struct in_addr, but this can be substituted out by using the datatype __be32.
--- include/uapi/linux/icmp.h | 3 +-- net/ipv4/icmp.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-)
include/uapi/linux/icmp.h +1 -2
@@ -20,7 +20,6 @@#include <linux/types.h> #include <asm/byteorder.h> -#include <linux/in.h> #include <linux/if.h> #include <linux/in6.h>
@@ -154,7 +153,7 @@ struct icmp_ext_echo_iio {struct {struct icmp_ext_echo_ctype3_hdr ctype3_hdr;union { -struct in_addr ipv4_addr; +__be32 ipv4_addr;struct in6_addr ipv6_addr; } ip_addr; } addr;
net/ipv4/icmp.c +1 -1
@@ -1059,7 +1059,7 @@ static bool icmp_echo(struct sk_buff *skb)if (ident_len !=sizeof (iio->ident.addr.ctype3_hdr) +sizeof (struct in_addr )) goto send_mal_query; - dev =ip_dev_find (net, iio->ident.addr.ip_addr.ipv4_addr.s_addr); + dev =ip_dev_find (net, iio->ident.addr.ip_addr.ipv4_addr);break ;#if IS_ENABLED (CONFIG_IPV6 )case ICMP_AFI_IP6 :
Signature · 1 line
2.31.1
This patch was applied to netdev/net-next.git (refs/heads/master):
Hello:
This patch was applied to netdev/net-next.git (refs/heads/master):
Quoted 8 lines · On Thu, 3 Jun 2021 16:22:11 -0500 you wrote:
Including <
linux/in.h> and <netinet/in.h> in the dependencies breaks compilation of trinity due to multiple definitions. <linux/in.h> is only used in <linux/icmp.h> to provide the definition of the structin_addr, but this can be substituted out by using the datatype__be32.Signed-off-by Andreas Roeseler <[email protected]>[...]
Here is the summary with links:
- [net-next] icmp: fix lib conflict with trinity
https://git.kernel.org/netdev/net-next/c/e32ea44c7ae4
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html