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 | |
| 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>
| -rw-r--r-- | include/linux/Kbuild | 2 | ||||
| -rw-r--r-- | include/linux/if_tunnel.h | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/Kbuild b/include/linux/Kbuild index 3a025d9d2a87..d066bbcf7980 100644 --- a/include/linux/Kbuild +++ b/include/linux/Kbuild @@ -92,7 +92,6 @@ header-y += if_ppp.h header-y += if_slip.h header-y += if_strip.h header-y += if_tun.h -header-y += if_tunnel.h header-y += in_route.h header-y += ioctl.h header-y += ip6_tunnel.h @@ -241,6 +240,7 @@ unifdef-y += if_phonet.h unifdef-y += if_pppol2tp.h unifdef-y += if_pppox.h unifdef-y += if_tr.h +unifdef-y += if_tunnel.h unifdef-y += if_vlan.h unifdef-y += igmp.h unifdef-y += inet_diag.h diff --git a/include/linux/if_tunnel.h b/include/linux/if_tunnel.h index aeab2cb32a9c..82c43624c067 100644 --- a/include/linux/if_tunnel.h +++ b/include/linux/if_tunnel.h @@ -2,7 +2,10 @@ #define _IF_TUNNEL_H_ #include <linux/types.h> + +#ifdef __KERNEL__ #include <linux/ip.h> +#endif #define SIOCGETTUNNEL (SIOCDEVPRIVATE + 0) #define SIOCADDTUNNEL (SIOCDEVPRIVATE + 1) |