]> git.karo-electronics.de Git - karo-tx-linux.git/commit
net: Fix userland breakage wrt. linux/if_tunnel.h
authorDavid S. Miller <davem@davemloft.net>
Mon, 2 Feb 2009 21:27:44 +0000 (13:27 -0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 2 Feb 2009 21:27:44 +0000 (13:27 -0800)
commit0afd4a21ba7d75e93fa79cf05d7a21774e149c0f
treea8b724ce55da03c5c1ea1152a57d7bb6c6b22ee6
parentf9e6934502e46c363100245f137ddf0f4b1cb574
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>
include/linux/Kbuild
include/linux/if_tunnel.h