From: Sapan Bhatia Date: Fri, 10 Apr 2009 22:27:49 +0000 (+0000) Subject: Fix build. X-Git-Tag: linux-2.6-27-3~4 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;ds=sidebyside;h=5a746a74916be2bea6e18642dedb20eef443f4d3;p=linux-2.6.git Fix build. --- diff --git a/linux-2.6-700-egre.patch b/linux-2.6-700-egre.patch index 0b218b8ca..43e75b3cf 100644 --- a/linux-2.6-700-egre.patch +++ b/linux-2.6-700-egre.patch @@ -1,22 +1,31 @@ +diff -Nurb linux-2.6.27-660/Makefile linux-2.6.27-700/Makefile +--- linux-2.6.27-660/Makefile 2009-04-10 18:27:45.000000000 -0400 ++++ linux-2.6.27-700/Makefile 2009-04-10 18:28:43.000000000 -0400 +@@ -1,7 +1,7 @@ + VERSION = 2 + PATCHLEVEL = 6 + SUBLEVEL = 27 +-EXTRAVERSION = .14-vs2.3.0.36.4 ++EXTRAVERSION = -prep + NAME = Trembling Tortoise + + # *DOCUMENTATION* diff -Nurb linux-2.6.27-660/drivers/net/Kconfig linux-2.6.27-700/drivers/net/Kconfig ---- linux-2.6.27-660/drivers/net/Kconfig 2009-04-10 17:34:59.000000000 -0400 -+++ linux-2.6.27-700/drivers/net/Kconfig 2009-04-10 17:56:31.000000000 -0400 -@@ -39,6 +39,12 @@ +--- linux-2.6.27-660/drivers/net/Kconfig 2009-04-10 18:27:44.000000000 -0400 ++++ linux-2.6.27-700/drivers/net/Kconfig 2009-04-10 18:32:52.000000000 -0400 +@@ -39,6 +39,9 @@ 'ifb1' etc. Look at the iproute2 documentation directory for usage etc +config EGRE + tristate "EGRE module for Ethernet over GRE Tunnels" -+ ---help--- -+ This is an improvement over the GRE tunnel driver that facilitates -+ the transport of Ethernet frames over GRE tunnels. + config DUMMY tristate "Dummy net driver support" ---help--- diff -Nurb linux-2.6.27-660/drivers/net/Makefile linux-2.6.27-700/drivers/net/Makefile --- linux-2.6.27-660/drivers/net/Makefile 2008-10-09 18:13:53.000000000 -0400 -+++ linux-2.6.27-700/drivers/net/Makefile 2009-04-10 17:53:47.000000000 -0400 ++++ linux-2.6.27-700/drivers/net/Makefile 2009-04-10 18:28:43.000000000 -0400 @@ -2,6 +2,7 @@ # Makefile for the Linux network (ethercard) device drivers. # @@ -27,7 +36,7 @@ diff -Nurb linux-2.6.27-660/drivers/net/Makefile linux-2.6.27-700/drivers/net/Ma obj-$(CONFIG_IBM_NEW_EMAC) += ibm_newemac/ diff -Nurb linux-2.6.27-660/drivers/net/gre.c linux-2.6.27-700/drivers/net/gre.c --- linux-2.6.27-660/drivers/net/gre.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.27-700/drivers/net/gre.c 2009-04-10 17:35:46.000000000 -0400 ++++ linux-2.6.27-700/drivers/net/gre.c 2009-04-10 18:28:43.000000000 -0400 @@ -0,0 +1,1632 @@ +/* + * Linux NET3: GRE over IP protocol decoder. @@ -1663,7 +1672,7 @@ diff -Nurb linux-2.6.27-660/drivers/net/gre.c linux-2.6.27-700/drivers/net/gre.c +MODULE_LICENSE("GPL"); diff -Nurb linux-2.6.27-660/include/linux/if_ether.h linux-2.6.27-700/include/linux/if_ether.h --- linux-2.6.27-660/include/linux/if_ether.h 2008-10-09 18:13:53.000000000 -0400 -+++ linux-2.6.27-700/include/linux/if_ether.h 2009-04-10 17:35:46.000000000 -0400 ++++ linux-2.6.27-700/include/linux/if_ether.h 2009-04-10 18:28:43.000000000 -0400 @@ -56,6 +56,7 @@ #define ETH_P_DIAG 0x6005 /* DEC Diagnostics */ #define ETH_P_CUST 0x6006 /* DEC Customer use */ @@ -1674,7 +1683,7 @@ diff -Nurb linux-2.6.27-660/include/linux/if_ether.h linux-2.6.27-700/include/li #define ETH_P_AARP 0x80F3 /* Appletalk AARP */ diff -Nurb linux-2.6.27-660/include/linux/if_tunnel.h linux-2.6.27-700/include/linux/if_tunnel.h --- linux-2.6.27-660/include/linux/if_tunnel.h 2008-10-09 18:13:53.000000000 -0400 -+++ linux-2.6.27-700/include/linux/if_tunnel.h 2009-04-10 17:35:46.000000000 -0400 ++++ linux-2.6.27-700/include/linux/if_tunnel.h 2009-04-10 18:28:43.000000000 -0400 @@ -29,6 +29,7 @@ __be16 o_flags; __be32 i_key; @@ -1685,7 +1694,7 @@ diff -Nurb linux-2.6.27-660/include/linux/if_tunnel.h linux-2.6.27-700/include/l diff -Nurb linux-2.6.27-660/net/ipv4/ip_gre.c linux-2.6.27-700/net/ipv4/ip_gre.c --- linux-2.6.27-660/net/ipv4/ip_gre.c 2008-10-09 18:13:53.000000000 -0400 -+++ linux-2.6.27-700/net/ipv4/ip_gre.c 2009-04-10 18:20:30.000000000 -0400 ++++ linux-2.6.27-700/net/ipv4/ip_gre.c 2009-04-10 18:28:43.000000000 -0400 @@ -25,6 +25,7 @@ #include #include @@ -2170,9 +2179,3 @@ diff -Nurb linux-2.6.27-660/net/ipv4/ip_gre.c linux-2.6.27-700/net/ipv4/ip_gre.c if (!ign->fb_tunnel_dev) { err = -ENOMEM; goto err_alloc_dev; -diff -Nurb linux-2.6.27-660/rej linux-2.6.27-700/rej ---- linux-2.6.27-660/rej 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.27-700/rej 2009-04-10 17:50:33.000000000 -0400 -@@ -0,0 +1,2 @@ -+./net/ipv4/ip_gre.c.rej -+./drivers/net/Makefile.rej