From: David S. Miller <davem@davemloft.net>
Date: Mon, 2 Feb 2009 21:27:44 +0000 (-0800)
Subject: net: Fix userland breakage wrt. linux/if_tunnel.h
X-Git-Tag: v2.6.29-rc4~56^2~13
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0afd4a21ba7d75e93fa79cf05d7a21774e149c0f;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed