OSDN Git Service

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)
commite32ea44c7ae476f4c90e35ab0a29dc8ff082bc11
treee847afbcaba2e60a79a4dbd1a5301e57097b1a37
parent118de6106735cfeb04daf9de1d5a9f953ac034ba
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
net/ipv4/icmp.c