]> git.baikalelectronics.ru Git - kernel.git/commit
api: fix compatibility of linux/in.h with netinet/in.h
authorStephen Hemminger <stephen@networkplumber.org>
Tue, 30 Jun 2015 00:57:48 +0000 (14:57 -1000)
committerDavid S. Miller <davem@davemloft.net>
Tue, 30 Jun 2015 01:56:21 +0000 (18:56 -0700)
commitd8769da33f83f22e72b0fb924d3934dbd0f4e667
treeaa2d32e925fa5cf4dfb0529a87c4779014963251
parent5707b53ea15cf1c28957b821c46a265c54faadbe
api: fix compatibility of linux/in.h with netinet/in.h

u
This fixes breakage to iproute2 build with recent kernel headers
caused by:
   commit 29ed60879d3a437c23986b1b7175517199c96445
   Author: Pablo Neira Ayuso <pablo@netfilter.org>
   Date:   Wed Jun 17 10:28:27 2015 -0500

   netfilter: don't pull include/linux/netfilter.h from netns headers

The issue is that definitions in linux/in.h overlap with those
in netinet/in.h. This patch solves this by introducing the same
mechanism as was used to solve the same problem with linux/in6.h

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/uapi/linux/in.h
include/uapi/linux/libc-compat.h