Skip to content
Commit 0afd4a21 authored by David S. Miller's avatar David S. Miller
Browse files

net: Fix userland breakage wrt. linux/if_tunnel.h

Reported by Andrew Walrond <andrew@walrond.org>

Changeset c19e654d


("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: default avatarDavid S. Miller <davem@davemloft.net>
parent f9e69345
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment