aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/Kbuild
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-02-02 16:27:44 -0500
committerDavid S. Miller <davem@davemloft.net>2009-02-02 16:27:44 -0500
commit0afd4a21ba7d75e93fa79cf05d7a21774e149c0f (patch)
treea8b724ce55da03c5c1ea1152a57d7bb6c6b22ee6 /include/linux/Kbuild
parentf9e6934502e46c363100245f137ddf0f4b1cb574 (diff)
net: Fix userland breakage wrt. linux/if_tunnel.h
Reported by Andrew Walrond <andrew@walrond.org> Changeset c19e654ddbe3831252f61e76a74d661e1a755530 ("gre: Add netlink interface") added an include of linux/ip.h to linux/if_tunnel.h We can't really let that get exposed to userspace because this conflicts with types defined in netinet/ip.h which userland is almost certainly going to have included either explicitly or implicitly. So guard this include with a __KERNEL__ ifdef. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/Kbuild')
-rw-r--r--include/linux/Kbuild2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index 12e9a2957caf..6a9bb9753235 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -89,7 +89,6 @@ header-y += if_ppp.h
89header-y += if_slip.h 89header-y += if_slip.h
90header-y += if_strip.h 90header-y += if_strip.h
91header-y += if_tun.h 91header-y += if_tun.h
92header-y += if_tunnel.h
93header-y += in_route.h 92header-y += in_route.h
94header-y += ioctl.h 93header-y += ioctl.h
95header-y += ip6_tunnel.h 94header-y += ip6_tunnel.h
@@ -235,6 +234,7 @@ unifdef-y += if_phonet.h
235unifdef-y += if_pppol2tp.h 234unifdef-y += if_pppol2tp.h
236unifdef-y += if_pppox.h 235unifdef-y += if_pppox.h
237unifdef-y += if_tr.h 236unifdef-y += if_tr.h
237unifdef-y += if_tunnel.h
238unifdef-y += if_vlan.h 238unifdef-y += if_vlan.h
239unifdef-y += igmp.h 239unifdef-y += igmp.h
240unifdef-y += inet_diag.h 240unifdef-y += inet_diag.h