SOURCES (Titanium): linux-2.6.25-sk98lin.patch - backported 2.6.24...

[hawk]

Author: hawk                         Date: Fri Apr 25 15:59:07 2008 GMT
Module: SOURCES                       Tag: Titanium
---- Log message:
- backported 2.6.24 fixes

---- Files affected:
SOURCES:
   linux-2.6.25-sk98lin.patch (1.1.2.1 -> 1.1.2.2) 

---- Diffs:

================================================================
Index: SOURCES/linux-2.6.25-sk98lin.patch
diff -u SOURCES/linux-2.6.25-sk98lin.patch:1.1.2.1 SOURCES/linux-2.6.25-sk98lin.patch:1.1.2.2
--- SOURCES/linux-2.6.25-sk98lin.patch:1.1.2.1	Fri Apr 25 15:27:27 2008
+++ SOURCES/linux-2.6.25-sk98lin.patch	Fri Apr 25 17:59:01 2008
@@ -18327,8 +18327,8 @@
 +# History:
 +#
 +#	$Log$
-+#	Revision 1.1.2.1  2008-04-25 13:27:27  hawk
-+#	- vendor driver for Marvell Yukon gigabit adapters, v10.50.1.3
++#	Revision 1.1.2.2  2008-04-25 15:59:01  hawk
++#	- backported 2.6.24 fixes
 +#
 +#	Revision 1.1.4.3  2006/12/14 15:23:13  mlindner
 +#	Add: Enable Yukon Extreme. Define SK_EXTREME enabled
@@ -32850,7 +32850,7 @@
   *	This program is free software; you can redistribute it and/or modify
   *	it under the terms of the GNU General Public License as published by
   *	the Free Software Foundation; either version 2 of the License, or
-@@ -38,86 +32,62 @@
+@@ -38,86 +32,66 @@
  
  /******************************************************************************
   *
@@ -32978,6 +32978,10 @@
 +#endif
 +
 +#define ENABLE_FUTURE_ETH
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)
++#define		proc_net	init_net.proc_net
++#endif
  
  /*******************************************************************************
   *
@@ -33204,7 +33208,7 @@
  
  #ifdef DEBUG
  static void	DumpMsg(struct sk_buff*, char*);
-@@ -249,33 +263,409 @@
+@@ -249,33 +263,408 @@
  #endif
  
  /* global variables *********************************************************/
@@ -33389,7 +33393,6 @@
 +		return -ENODEV;
 +	}
 +
-+	SET_MODULE_OWNER(dev);
 +#ifdef ENABLE_FUTURE_ETH
 +	SET_ETHTOOL_OPS(dev, &sk98lin_ethtool_ops);
 +#endif
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/linux-2.6.25-sk98lin.patch?r1=1.1.2.1&r2=1.1.2.2&f=u