Message ID | 20090202.132723.38842373.davem@davemloft.net |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
On Mon, Feb 02, 2009 at 01:27:23PM -0800, David Miller wrote: > From: David Miller <davem@davemloft.net> > Date: Mon, 02 Feb 2009 13:24:50 -0800 (PST) > > > I guess I'll put in the following hack for now: > > > > diff --git a/include/linux/if_tunnel.h b/include/linux/if_tunnel.h > > index aeab2cb..82c4362 100644 > > Need to also update linux/Kbuild, here is an updated patch: All headers are unifdeffed - so the Kbuild patch is not needed. Sam -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Sam Ravnborg <sam@ravnborg.org> Date: Tue, 3 Feb 2009 05:58:33 +0100 > On Mon, Feb 02, 2009 at 01:27:23PM -0800, David Miller wrote: > > From: David Miller <davem@davemloft.net> > > Date: Mon, 02 Feb 2009 13:24:50 -0800 (PST) > > > > > I guess I'll put in the following hack for now: > > > > > > diff --git a/include/linux/if_tunnel.h b/include/linux/if_tunnel.h > > > index aeab2cb..82c4362 100644 > > > > Need to also update linux/Kbuild, here is an updated patch: > > All headers are unifdeffed - so the Kbuild patch > is not needed. Thanks for the info but that's how I commited and pushed out the fix already, and it doesn't hurt either :-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/include/linux/Kbuild b/include/linux/Kbuild index 12e9a29..6a9bb97 100644 --- a/include/linux/Kbuild +++ b/include/linux/Kbuild @@ -89,7 +89,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 @@ -235,6 +234,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 aeab2cb..82c4362 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)