rpms/kernel/devel linux-2.6.11-compile-fixes.patch,1.10,1.11

[fedora-cvs-commits at redhat.com]

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13099

Modified Files:
	linux-2.6.11-compile-fixes.patch 
Log Message:
build fix


linux-2.6.11-compile-fixes.patch:
 linux-10002/include/linux/init.h |    4 ----
 linux-2.6.11/net/ipv4/route.c    |   14 +++++++-------
 2 files changed, 7 insertions(+), 11 deletions(-)

Index: linux-2.6.11-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.11-compile-fixes.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- linux-2.6.11-compile-fixes.patch	22 Mar 2005 15:01:53 -0000	1.10
+++ linux-2.6.11-compile-fixes.patch	25 Mar 2005 00:19:52 -0000	1.11
@@ -14,3 +14,33 @@
  /* For assembly routines */
  #define __INIT		.section	".init.text","ax"
 diff -urNp --exclude-from=/home/davej/.exclude linux-10001/init/Makefile linux-10002/init/Makefile
+--- linux-2.6.11/net/ipv4/route.c~	2005-03-24 19:18:24.000000000 -0500
++++ linux-2.6.11/net/ipv4/route.c	2005-03-24 19:19:39.000000000 -0500
+@@ -520,6 +520,13 @@ static inline u32 rt_score(struct rtable
+ 	return score;
+ }
+ 
++static inline int compare_keys(struct flowi *fl1, struct flowi *fl2)
++{
++	return memcmp(&fl1->nl_u.ip4_u, &fl2->nl_u.ip4_u, sizeof(fl1->nl_u.ip4_u)) == 0 &&
++	       fl1->oif     == fl2->oif &&
++	       fl1->iif     == fl2->iif;
++}
++
+ #ifdef CONFIG_IP_ROUTE_MULTIPATH_CACHED
+ static struct rtable **rt_remove_balanced_route(struct rtable **chain_head,
+ 						struct rtable *expentry,
+@@ -858,13 +865,6 @@ work_done:
+ out:	return 0;
+ }
+ 
+-static inline int compare_keys(struct flowi *fl1, struct flowi *fl2)
+-{
+-	return memcmp(&fl1->nl_u.ip4_u, &fl2->nl_u.ip4_u, sizeof(fl1->nl_u.ip4_u)) == 0 &&
+-	       fl1->oif     == fl2->oif &&
+-	       fl1->iif     == fl2->iif;
+-}
+-
+ static int rt_intern_hash(unsigned hash, struct rtable *rt, struct rtable **rp)
+ {
+ 	struct rtable	*rth, **rthp;