]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 9ed6d15) | patch
icmp: fix lib conflict with trinity
authorAndreas Roeseler <andreas.a.roeseler@gmail.com>
Thu, 3 Jun 2021 21:22:11 +0000 (16:22 -0500)
committerDavid S. Miller <davem@davemloft.net>
Thu, 3 Jun 2021 22:31:34 +0000 (15:31 -0700)
commit6212fab189928784ac8d3e616bb93c8abe717d2c
treee847afbcaba2e60a79a4dbd1a5301e57097b1a37tree | snapshot
parent9ed6d155ef222dc5ad7857c597e511d006acc605commit | diff
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.

Signed-off-by: Andreas Roeseler <andreas.a.roeseler@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/uapi/linux/icmp.h diff | blob | history
net/ipv4/icmp.c diff | blob | history
Linux Kernel Source Tree.