From patchwork Mon Feb 2 21:27:23 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: 2.6.28 headers break kbd and net-tools userspace builds Date: Mon, 02 Feb 2009 11:27:23 -0000 From: David Miller X-Patchwork-Id: 21613 Message-Id: <20090202.132723.38842373.davem@davemloft.net> To: andrew@walrond.org Cc: jengelh@medozas.de, sam@ravnborg.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org From: David Miller 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: --- 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 + +#ifdef __KERNEL__ #include +#endif #define SIOCGETTUNNEL (SIOCDEVPRIVATE + 0) #define SIOCADDTUNNEL (SIOCDEVPRIVATE + 1)