diff options
| author | Andreas Roeseler <andreas.a.roeseler@gmail.com> | 2021-06-03 16:22:11 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-06-03 15:31:34 -0700 |
| commit | e32ea44c7ae476f4c90e35ab0a29dc8ff082bc11 (patch) | |
| tree | e847afbcaba2e60a79a4dbd1a5301e57097b1a37 /include/uapi/linux/icmp.h | |
| parent | 118de6106735cfeb04daf9de1d5a9f953ac034ba (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>
Diffstat (limited to 'include/uapi/linux/icmp.h')
| -rw-r--r-- | include/uapi/linux/icmp.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/uapi/linux/icmp.h b/include/uapi/linux/icmp.h index c1da8244c5e1..163c0998aec9 100644 --- a/include/uapi/linux/icmp.h +++ b/include/uapi/linux/icmp.h @@ -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; |