diff options
| author | David S. Miller <davem@davemloft.net> | 2009-02-02 13:27:44 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-02-17 09:28:55 -0800 |
| commit | d6283a8094509991b9d72ec8cdea1d6236dd09c6 (patch) | |
| tree | f507155d8f5f68f6e557c6c4ecac7c49130eaf6d /include/asm-m68k | |
| parent | a027928cd7b8a16bdbfb3fc42f3eecf469d3249b (diff) | |
net: Fix userland breakage wrt. linux/if_tunnel.h
[ Upstream commit 0afd4a21ba7d75e93fa79cf05d7a21774e149c0f ]
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include/asm-m68k')
0 files changed, 0 insertions, 0 deletions