Author: pluto Date: Wed Jun 22 14:11:29 2005 GMT
Module: SOURCES Tag: LINUX_2_6
---- Log message:
- updated for 2.6.12.
---- Files affected:
SOURCES:
linux-2.6-sk98lin-8.18.2.2.patch (1.1.2.1 -> 1.1.2.2)
---- Diffs:
================================================================
Index: SOURCES/linux-2.6-sk98lin-8.18.2.2.patch
diff -u SOURCES/linux-2.6-sk98lin-8.18.2.2.patch:1.1.2.1
SOURCES/linux-2.6-sk98lin-8.18.2.2.patch:1.1.2.2
--- SOURCES/linux-2.6-sk98lin-8.18.2.2.patch:1.1.2.1 Mon May 16 00:18:03 2005
+++ SOURCES/linux-2.6-sk98lin-8.18.2.2.patch Wed Jun 22 16:11:24 2005
@@ -32,14 +32,14 @@
sk98lin/skaddr.c | 79 -
sk98lin/skcsum.c | 6
sk98lin/skdim.c | 1027 ++++---------
- sk98lin/skethtool.c | 1383 ++++++++++++++----
- sk98lin/skge.c | 3819
+++++++++++++++++++++++++++++++-------------------
+ sk98lin/skethtool.c | 1380 ++++++++++++++----
+ sk98lin/skge.c | 3797
+++++++++++++++++++++++++++++++-------------------
sk98lin/skgehwt.c | 52
- sk98lin/skgeinit.c | 1683 +++++++++++++++-------
+ sk98lin/skgeinit.c | 1683 ++++++++++++++++------
sk98lin/skgemib.c | 186 ++
- sk98lin/skgepnmi.c | 2282 ++++++++++++++---------------
+ sk98lin/skgepnmi.c | 2282 ++++++++++++++----------------
sk98lin/skgesirq.c | 1244 ++++++++++------
- sk98lin/ski2c.c | 1296 ----------------
+ sk98lin/ski2c.c | 1296 -----------------
sk98lin/sklm80.c | 10
sk98lin/skproc.c | 587 +++++--
sk98lin/skqueue.c | 103 +
@@ -48,14 +48,14 @@
sk98lin/sktwsi.c | 1355 +++++++++++++++++
sk98lin/skvpd.c | 195 +-
sk98lin/skxmac2.c | 2275 ++++++++++++++++++-----------
- sk98lin/sky2.c | 2739 +++++++++++++++++++++++++++++++++++
+ sk98lin/sky2.c | 2739 ++++++++++++++++++++++++++++++++++++
sk98lin/sky2le.c | 510 ++++++
- 52 files changed, 20041 insertions(+), 8751 deletions(-)
+ 52 files changed, 20029 insertions(+), 8738 deletions(-)
-diff -uNr linux-2.6.11.9/drivers/net.orig/Kconfig
linux-2.6.11.9/drivers/net/Kconfig
---- linux-2.6.11.9/drivers/net.orig/Kconfig 2005-05-16 00:07:55.000000000
+0200
-+++ linux-2.6.11.9/drivers/net/Kconfig 2005-05-16 00:11:54.000000000 +0200
-@@ -2125,6 +2125,22 @@
+diff -uNr linux-2.6.12/drivers/net.orig/Kconfig
linux-2.6.12/drivers/net/Kconfig
+--- linux-2.6.12/drivers/net.orig/Kconfig 2005-06-22 16:04:21.000000000
+0200
++++ linux-2.6.12/drivers/net/Kconfig 2005-06-22 16:04:47.000000000 +0200
+@@ -2076,6 +2076,22 @@
by this driver:
- 3Com 3C940 Gigabit LOM Ethernet Adapter
- 3Com 3C941 Gigabit LOM Ethernet Adapter
@@ -78,7 +78,7 @@
- Allied Telesyn AT-2970LX Gigabit Ethernet Adapter
- Allied Telesyn AT-2970LX/2SC Gigabit Ethernet Adapter
- Allied Telesyn AT-2970SX Gigabit Ethernet Adapter
-@@ -2135,31 +2151,78 @@
+@@ -2086,31 +2102,78 @@
- Allied Telesyn AT-2971T Gigabit Ethernet Adapter
- Belkin Gigabit Desktop Card 10/100/1000Base-T Adapter, Copper
RJ-45
- DGE-530T Gigabit Ethernet Adapter
@@ -170,7 +170,7 @@
- N-Way PCI-Bus Giga-Card 1000/100/10Mbps(L)
- SK-9521 10/100/1000Base-T Adapter
- SK-9521 V2.0 10/100/1000Base-T Adapter
-@@ -2179,21 +2242,36 @@
+@@ -2130,21 +2193,36 @@
- SK-9871 Gigabit Ethernet Server Adapter (SK-NET GE-ZX)
- SK-9871 V2.0 Gigabit Ethernet 1000Base-ZX Adapter
- SK-9872 Gigabit Ethernet Server Adapter (SK-NET GE-ZX dual link)
@@ -211,9 +211,9 @@
config VIA_VELOCITY
tristate "VIA Velocity support"
-diff -uNr linux-2.6.11.9/drivers/net.orig/sk98lin/h/lm80.h
linux-2.6.11.9/drivers/net/sk98lin/h/lm80.h
---- linux-2.6.11.9/drivers/net.orig/sk98lin/h/lm80.h 2005-05-12
00:42:56.000000000 +0200
-+++ linux-2.6.11.9/drivers/net/sk98lin/h/lm80.h 2005-04-25
16:06:58.000000000 +0200
+diff -uNr linux-2.6.12/drivers/net.orig/sk98lin/h/lm80.h
linux-2.6.12/drivers/net/sk98lin/h/lm80.h
+--- linux-2.6.12/drivers/net.orig/sk98lin/h/lm80.h 2005-06-17
21:48:29.000000000 +0200
++++ linux-2.6.12/drivers/net/sk98lin/h/lm80.h 2005-06-22 16:04:47.000000000
+0200
@@ -2,8 +2,8 @@
*
* Name: lm80.h
@@ -225,9 +225,9 @@
* Purpose: Contains all defines for the LM80 Chip
* (National Semiconductor).
*
-diff -uNr linux-2.6.11.9/drivers/net.orig/sk98lin/h/skaddr.h
linux-2.6.11.9/drivers/net/sk98lin/h/skaddr.h
---- linux-2.6.11.9/drivers/net.orig/sk98lin/h/skaddr.h 2005-05-12
00:42:07.000000000 +0200
-+++ linux-2.6.11.9/drivers/net/sk98lin/h/skaddr.h 2005-04-25
16:06:58.000000000 +0200
+diff -uNr linux-2.6.12/drivers/net.orig/sk98lin/h/skaddr.h
linux-2.6.12/drivers/net/sk98lin/h/skaddr.h
+--- linux-2.6.12/drivers/net.orig/sk98lin/h/skaddr.h 2005-06-17
21:48:29.000000000 +0200
++++ linux-2.6.12/drivers/net/sk98lin/h/skaddr.h 2005-06-22
16:04:47.000000000 +0200
@@ -2,8 +2,8 @@
*
* Name: skaddr.h
@@ -239,9 +239,9 @@
* Purpose: Header file for Address Management (MC, UC, Prom).
*
******************************************************************************/
-diff -uNr linux-2.6.11.9/drivers/net.orig/sk98lin/h/skcsum.h
linux-2.6.11.9/drivers/net/sk98lin/h/skcsum.h
---- linux-2.6.11.9/drivers/net.orig/sk98lin/h/skcsum.h 2005-05-12
00:41:11.000000000 +0200
-+++ linux-2.6.11.9/drivers/net/sk98lin/h/skcsum.h 2005-04-25
16:06:58.000000000 +0200
+diff -uNr linux-2.6.12/drivers/net.orig/sk98lin/h/skcsum.h
linux-2.6.12/drivers/net/sk98lin/h/skcsum.h
+--- linux-2.6.12/drivers/net.orig/sk98lin/h/skcsum.h 2005-06-17
21:48:29.000000000 +0200
++++ linux-2.6.12/drivers/net/sk98lin/h/skcsum.h 2005-06-22
16:04:47.000000000 +0200
@@ -2,8 +2,8 @@
*
* Name: skcsum.h
@@ -263,9 +263,9 @@
/* The protocol statistics structure; one per supported protocol. */
SKCS_PROTO_STATS ProtoStats[SK_MAX_NETS][SKCS_NUM_PROTOCOLS];
-diff -uNr linux-2.6.11.9/drivers/net.orig/sk98lin/h/skdebug.h
linux-2.6.11.9/drivers/net/sk98lin/h/skdebug.h
---- linux-2.6.11.9/drivers/net.orig/sk98lin/h/skdebug.h 2005-05-12
00:42:04.000000000 +0200
-+++ linux-2.6.11.9/drivers/net/sk98lin/h/skdebug.h 2005-04-25
16:06:58.000000000 +0200
+diff -uNr linux-2.6.12/drivers/net.orig/sk98lin/h/skdebug.h
linux-2.6.12/drivers/net/sk98lin/h/skdebug.h
+--- linux-2.6.12/drivers/net.orig/sk98lin/h/skdebug.h 2005-06-17
21:48:29.000000000 +0200
++++ linux-2.6.12/drivers/net/sk98lin/h/skdebug.h 2005-06-22
16:04:47.000000000 +0200
@@ -2,8 +2,8 @@
*
* Name: skdebug.h
@@ -319,9 +319,9 @@
/* Debug events */
-diff -uNr linux-2.6.11.9/drivers/net.orig/sk98lin/h/skdrv1st.h
linux-2.6.11.9/drivers/net/sk98lin/h/skdrv1st.h
---- linux-2.6.11.9/drivers/net.orig/sk98lin/h/skdrv1st.h 2005-05-12
00:41:09.000000000 +0200
-+++ linux-2.6.11.9/drivers/net/sk98lin/h/skdrv1st.h 2005-04-25
16:06:59.000000000 +0200
+diff -uNr linux-2.6.12/drivers/net.orig/sk98lin/h/skdrv1st.h
linux-2.6.12/drivers/net/sk98lin/h/skdrv1st.h
+--- linux-2.6.12/drivers/net.orig/sk98lin/h/skdrv1st.h 2005-06-17
21:48:29.000000000 +0200
++++ linux-2.6.12/drivers/net/sk98lin/h/skdrv1st.h 2005-06-22
16:04:47.000000000 +0200
@@ -2,8 +2,8 @@
*
* Name: skdrv1st.h
@@ -381,9 +381,9 @@
#include <asm/byteorder.h>
+#include <asm/bitops.h>
#include <asm/io.h>
+ #include <asm/irq.h>
#include <linux/netdevice.h>
- #include <linux/etherdevice.h>
-@@ -78,11 +67,7 @@
+@@ -79,11 +68,7 @@
#include <net/checksum.h>
#define SK_CS_CALCULATE_CHECKSUM
@@ -396,7 +396,7 @@
#include "h/sktypes.h"
#include "h/skerror.h"
-@@ -90,6 +75,10 @@
+@@ -91,6 +76,10 @@
#include "h/lm80.h"
#include "h/xmac_ii.h"
@@ -407,7 +407,7 @@
#ifdef __LITTLE_ENDIAN
#define SK_LITTLE_ENDIAN
#else
-@@ -109,7 +98,7 @@
+@@ -110,7 +99,7 @@
#define SK_MAX_MACS 2
#define SK_MAX_NETS 2
@@ -416,7 +416,7 @@
typedef struct s_DrvRlmtMbuf SK_MBUF;
-@@ -188,3 +177,8 @@
+@@ -189,3 +178,8 @@
#endif
@@ -425,9 +425,9 @@
+ * End of file
+ *
+
******************************************************************************/
-diff -uNr linux-2.6.11.9/drivers/net.orig/sk98lin/h/skdrv2nd.h
linux-2.6.11.9/drivers/net/sk98lin/h/skdrv2nd.h
---- linux-2.6.11.9/drivers/net.orig/sk98lin/h/skdrv2nd.h 2005-05-12
00:43:15.000000000 +0200
-+++ linux-2.6.11.9/drivers/net/sk98lin/h/skdrv2nd.h 2005-04-25
16:06:59.000000000 +0200
+diff -uNr linux-2.6.12/drivers/net.orig/sk98lin/h/skdrv2nd.h
linux-2.6.12/drivers/net/sk98lin/h/skdrv2nd.h
+--- linux-2.6.12/drivers/net.orig/sk98lin/h/skdrv2nd.h 2005-06-17
21:48:29.000000000 +0200
++++ linux-2.6.12/drivers/net/sk98lin/h/skdrv2nd.h 2005-06-22
16:04:47.000000000 +0200
@@ -1,17 +1,17 @@
/******************************************************************************
*
@@ -1522,9 +1522,9 @@
+ * End of file
+ *
+
******************************************************************************/
-diff -uNr linux-2.6.11.9/drivers/net.orig/sk98lin/h/skerror.h
linux-2.6.11.9/drivers/net/sk98lin/h/skerror.h
---- linux-2.6.11.9/drivers/net.orig/sk98lin/h/skerror.h 2005-05-12
00:42:00.000000000 +0200
-+++ linux-2.6.11.9/drivers/net/sk98lin/h/skerror.h 2005-04-25
16:06:58.000000000 +0200
+diff -uNr linux-2.6.12/drivers/net.orig/sk98lin/h/skerror.h
linux-2.6.12/drivers/net/sk98lin/h/skerror.h
+--- linux-2.6.12/drivers/net.orig/sk98lin/h/skerror.h 2005-06-17
21:48:29.000000000 +0200
++++ linux-2.6.12/drivers/net/sk98lin/h/skerror.h 2005-06-22
16:04:47.000000000 +0200
@@ -2,8 +2,8 @@
*
* Name: skerror.h
@@ -1570,9 +1570,9 @@
#endif /* _INC_SKERROR_H_ */
+
-diff -uNr linux-2.6.11.9/drivers/net.orig/sk98lin/h/skgedrv.h
linux-2.6.11.9/drivers/net/sk98lin/h/skgedrv.h
---- linux-2.6.11.9/drivers/net.orig/sk98lin/h/skgedrv.h 2005-05-12
00:42:23.000000000 +0200
-+++ linux-2.6.11.9/drivers/net/sk98lin/h/skgedrv.h 2005-04-25
16:06:58.000000000 +0200
+diff -uNr linux-2.6.12/drivers/net.orig/sk98lin/h/skgedrv.h
linux-2.6.12/drivers/net/sk98lin/h/skgedrv.h
+--- linux-2.6.12/drivers/net.orig/sk98lin/h/skgedrv.h 2005-06-17
21:48:29.000000000 +0200
++++ linux-2.6.12/drivers/net/sk98lin/h/skgedrv.h 2005-06-22
16:04:47.000000000 +0200
@@ -2,8 +2,8 @@
*
* Name: skgedrv.h
@@ -1584,9 +1584,9 @@
* Purpose: Interface with the driver
*
******************************************************************************/
-diff -uNr linux-2.6.11.9/drivers/net.orig/sk98lin/h/skgehw.h
linux-2.6.11.9/drivers/net/sk98lin/h/skgehw.h
---- linux-2.6.11.9/drivers/net.orig/sk98lin/h/skgehw.h 2005-05-12
00:43:07.000000000 +0200
-+++ linux-2.6.11.9/drivers/net/sk98lin/h/skgehw.h 2005-04-25
16:06:58.000000000 +0200
+diff -uNr linux-2.6.12/drivers/net.orig/sk98lin/h/skgehw.h
linux-2.6.12/drivers/net/sk98lin/h/skgehw.h
+--- linux-2.6.12/drivers/net.orig/sk98lin/h/skgehw.h 2005-06-17
21:48:29.000000000 +0200
++++ linux-2.6.12/drivers/net/sk98lin/h/skgehw.h 2005-06-22
16:04:47.000000000 +0200
@@ -2,8 +2,8 @@
*
* Name: skgehw.h
@@ -3746,9 +3746,9 @@
#endif /* __INC_SKGEHW_H */
+
-diff -uNr linux-2.6.11.9/drivers/net.orig/sk98lin/h/skgehwt.h
linux-2.6.11.9/drivers/net/sk98lin/h/skgehwt.h
---- linux-2.6.11.9/drivers/net.orig/sk98lin/h/skgehwt.h 2005-05-12
00:41:39.000000000 +0200
-+++ linux-2.6.11.9/drivers/net/sk98lin/h/skgehwt.h 2005-04-25
16:06:58.000000000 +0200
+diff -uNr linux-2.6.12/drivers/net.orig/sk98lin/h/skgehwt.h
linux-2.6.12/drivers/net/sk98lin/h/skgehwt.h
+--- linux-2.6.12/drivers/net.orig/sk98lin/h/skgehwt.h 2005-06-17
21:48:29.000000000 +0200
++++ linux-2.6.12/drivers/net/sk98lin/h/skgehwt.h 2005-06-22
16:04:47.000000000 +0200
@@ -2,8 +2,8 @@
*
* Name: skhwt.h
@@ -3760,9 +3760,9 @@
* Purpose: Defines for the hardware timer functions
*
******************************************************************************/
-diff -uNr linux-2.6.11.9/drivers/net.orig/sk98lin/h/skgei2c.h
linux-2.6.11.9/drivers/net/sk98lin/h/skgei2c.h
---- linux-2.6.11.9/drivers/net.orig/sk98lin/h/skgei2c.h 2005-05-12
00:43:47.000000000 +0200
-+++ linux-2.6.11.9/drivers/net/sk98lin/h/skgei2c.h 1970-01-01
01:00:00.000000000 +0100
+diff -uNr linux-2.6.12/drivers/net.orig/sk98lin/h/skgei2c.h
linux-2.6.12/drivers/net/sk98lin/h/skgei2c.h
+--- linux-2.6.12/drivers/net.orig/sk98lin/h/skgei2c.h 2005-06-17
21:48:29.000000000 +0200
++++ linux-2.6.12/drivers/net/sk98lin/h/skgei2c.h 1970-01-01
01:00:00.000000000 +0100
@@ -1,210 +0,0 @@
-/******************************************************************************
- *
@@ -3974,9 +3974,9 @@
-
-extern int SkLm80ReadSensor(SK_AC *pAC, SK_IOC IoC, SK_SENSOR *pSen);
-#endif /* n_INC_SKGEI2C_H */
-diff -uNr linux-2.6.11.9/drivers/net.orig/sk98lin/h/skgeinit.h
linux-2.6.11.9/drivers/net/sk98lin/h/skgeinit.h
---- linux-2.6.11.9/drivers/net.orig/sk98lin/h/skgeinit.h 2005-05-12
00:43:47.000000000 +0200
-+++ linux-2.6.11.9/drivers/net/sk98lin/h/skgeinit.h 2005-04-25
16:06:58.000000000 +0200
+diff -uNr linux-2.6.12/drivers/net.orig/sk98lin/h/skgeinit.h
linux-2.6.12/drivers/net/sk98lin/h/skgeinit.h
+--- linux-2.6.12/drivers/net.orig/sk98lin/h/skgeinit.h 2005-06-17
21:48:29.000000000 +0200
++++ linux-2.6.12/drivers/net/sk98lin/h/skgeinit.h 2005-06-22
16:04:47.000000000 +0200
@@ -2,8 +2,8 @@
*
* Name: skgeinit.h
@@ -4621,9 +4621,9 @@
#endif /* __INC_SKGEINIT_H_ */
+
-diff -uNr linux-2.6.11.9/drivers/net.orig/sk98lin/h/skgepnm2.h
linux-2.6.11.9/drivers/net/sk98lin/h/skgepnm2.h
---- linux-2.6.11.9/drivers/net.orig/sk98lin/h/skgepnm2.h 2005-05-12
00:42:25.000000000 +0200
-+++ linux-2.6.11.9/drivers/net/sk98lin/h/skgepnm2.h 2005-04-25
16:06:58.000000000 +0200
+diff -uNr linux-2.6.12/drivers/net.orig/sk98lin/h/skgepnm2.h
linux-2.6.12/drivers/net/sk98lin/h/skgepnm2.h
+--- linux-2.6.12/drivers/net.orig/sk98lin/h/skgepnm2.h 2005-06-17
21:48:29.000000000 +0200
++++ linux-2.6.12/drivers/net/sk98lin/h/skgepnm2.h 2005-06-22
16:04:47.000000000 +0200
@@ -2,8 +2,8 @@
*
* Name: skgepnm2.h
@@ -4657,9 +4657,9 @@
#else /* !DEBUG */
-diff -uNr linux-2.6.11.9/drivers/net.orig/sk98lin/h/skgepnmi.h
linux-2.6.11.9/drivers/net/sk98lin/h/skgepnmi.h
---- linux-2.6.11.9/drivers/net.orig/sk98lin/h/skgepnmi.h 2005-05-12
00:41:11.000000000 +0200
-+++ linux-2.6.11.9/drivers/net/sk98lin/h/skgepnmi.h 2005-04-25
16:06:58.000000000 +0200
+diff -uNr linux-2.6.12/drivers/net.orig/sk98lin/h/skgepnmi.h
linux-2.6.12/drivers/net/sk98lin/h/skgepnmi.h
+--- linux-2.6.12/drivers/net.orig/sk98lin/h/skgepnmi.h 2005-06-17
21:48:29.000000000 +0200
++++ linux-2.6.12/drivers/net/sk98lin/h/skgepnmi.h 2005-06-22
16:04:47.000000000 +0200
@@ -1,9 +1,9 @@
/*****************************************************************************
*
@@ -4944,9 +4944,9 @@
#ifdef SK_DIAG_SUPPORT
SK_U32 DiagAttached;
#endif /* SK_DIAG_SUPPORT */
-diff -uNr linux-2.6.11.9/drivers/net.orig/sk98lin/h/skgesirq.h
linux-2.6.11.9/drivers/net/sk98lin/h/skgesirq.h
---- linux-2.6.11.9/drivers/net.orig/sk98lin/h/skgesirq.h 2005-05-12
00:43:02.000000000 +0200
-+++ linux-2.6.11.9/drivers/net/sk98lin/h/skgesirq.h 2005-04-25
16:06:58.000000000 +0200
+diff -uNr linux-2.6.12/drivers/net.orig/sk98lin/h/skgesirq.h
linux-2.6.12/drivers/net/sk98lin/h/skgesirq.h
+--- linux-2.6.12/drivers/net.orig/sk98lin/h/skgesirq.h 2005-06-17
21:48:29.000000000 +0200
++++ linux-2.6.12/drivers/net/sk98lin/h/skgesirq.h 2005-06-22
16:04:47.000000000 +0200
@@ -2,22 +2,21 @@
*
* Name: skgesirq.h
@@ -5024,9 +5024,9 @@
#endif /* _INC_SKGESIRQ_H_ */
+
-diff -uNr linux-2.6.11.9/drivers/net.orig/sk98lin/h/skgetwsi.h
linux-2.6.11.9/drivers/net/sk98lin/h/skgetwsi.h
---- linux-2.6.11.9/drivers/net.orig/sk98lin/h/skgetwsi.h 1970-01-01
01:00:00.000000000 +0100
-+++ linux-2.6.11.9/drivers/net/sk98lin/h/skgetwsi.h 2005-04-25
16:06:58.000000000 +0200
+diff -uNr linux-2.6.12/drivers/net.orig/sk98lin/h/skgetwsi.h
linux-2.6.12/drivers/net/sk98lin/h/skgetwsi.h
+--- linux-2.6.12/drivers/net.orig/sk98lin/h/skgetwsi.h 1970-01-01
01:00:00.000000000 +0100
++++ linux-2.6.12/drivers/net/sk98lin/h/skgetwsi.h 2005-06-22
16:04:47.000000000 +0200
@@ -0,0 +1,241 @@
+/******************************************************************************
+ *
@@ -5269,9 +5269,9 @@
+extern int SkLm80ReadSensor(SK_AC *pAC, SK_IOC IoC, SK_SENSOR *pSen);
+#endif /* n_INC_SKGETWSI_H */
+
-diff -uNr linux-2.6.11.9/drivers/net.orig/sk98lin/h/ski2c.h
linux-2.6.11.9/drivers/net/sk98lin/h/ski2c.h
---- linux-2.6.11.9/drivers/net.orig/sk98lin/h/ski2c.h 2005-05-12
00:41:29.000000000 +0200
-+++ linux-2.6.11.9/drivers/net/sk98lin/h/ski2c.h 1970-01-01
01:00:00.000000000 +0100
+diff -uNr linux-2.6.12/drivers/net.orig/sk98lin/h/ski2c.h
linux-2.6.12/drivers/net/sk98lin/h/ski2c.h
+--- linux-2.6.12/drivers/net.orig/sk98lin/h/ski2c.h 2005-06-17
21:48:29.000000000 +0200
++++ linux-2.6.12/drivers/net/sk98lin/h/ski2c.h 1970-01-01 01:00:00.000000000
+0100
@@ -1,177 +0,0 @@
-/******************************************************************************
- *
@@ -5450,9 +5450,9 @@
-#endif /* !SK_DIAG */
-#endif /* n_SKI2C_H */
-
-diff -uNr linux-2.6.11.9/drivers/net.orig/sk98lin/h/skqueue.h
linux-2.6.11.9/drivers/net/sk98lin/h/skqueue.h
---- linux-2.6.11.9/drivers/net.orig/sk98lin/h/skqueue.h 2005-05-12
00:43:48.000000000 +0200
-+++ linux-2.6.11.9/drivers/net/sk98lin/h/skqueue.h 2005-04-25
16:06:58.000000000 +0200
+diff -uNr linux-2.6.12/drivers/net.orig/sk98lin/h/skqueue.h
linux-2.6.12/drivers/net/sk98lin/h/skqueue.h
+--- linux-2.6.12/drivers/net.orig/sk98lin/h/skqueue.h 2005-06-17
21:48:29.000000000 +0200
++++ linux-2.6.12/drivers/net/sk98lin/h/skqueue.h 2005-06-22
16:04:47.000000000 +0200
@@ -2,8 +2,8 @@
*
* Name: skqueue.h
@@ -5486,9 +5486,9 @@
+#define SKERR_Q_E005MSG "Event scheduler called in Init Level 0 or 1"
#endif /* _SKQUEUE_H_ */
-diff -uNr linux-2.6.11.9/drivers/net.orig/sk98lin/h/skrlmt.h
linux-2.6.11.9/drivers/net/sk98lin/h/skrlmt.h
---- linux-2.6.11.9/drivers/net.orig/sk98lin/h/skrlmt.h 2005-05-12
00:43:24.000000000 +0200
-+++ linux-2.6.11.9/drivers/net/sk98lin/h/skrlmt.h 2005-04-25
16:06:58.000000000 +0200
+diff -uNr linux-2.6.12/drivers/net.orig/sk98lin/h/skrlmt.h
linux-2.6.12/drivers/net/sk98lin/h/skrlmt.h
+--- linux-2.6.12/drivers/net.orig/sk98lin/h/skrlmt.h 2005-06-17
21:48:29.000000000 +0200
++++ linux-2.6.12/drivers/net/sk98lin/h/skrlmt.h 2005-06-22
16:04:47.000000000 +0200
@@ -2,8 +2,8 @@
*
* Name: skrlmt.h
@@ -5500,9 +5500,9 @@
* Purpose: Header file for Redundant Link ManagemenT.
*
******************************************************************************/
-diff -uNr linux-2.6.11.9/drivers/net.orig/sk98lin/h/sktimer.h
linux-2.6.11.9/drivers/net/sk98lin/h/sktimer.h
---- linux-2.6.11.9/drivers/net.orig/sk98lin/h/sktimer.h 2005-05-12
00:41:14.000000000 +0200
-+++ linux-2.6.11.9/drivers/net/sk98lin/h/sktimer.h 2005-04-25
16:06:58.000000000 +0200
+diff -uNr linux-2.6.12/drivers/net.orig/sk98lin/h/sktimer.h
linux-2.6.12/drivers/net/sk98lin/h/sktimer.h
+--- linux-2.6.12/drivers/net.orig/sk98lin/h/sktimer.h 2005-06-17
21:48:29.000000000 +0200
++++ linux-2.6.12/drivers/net/sk98lin/h/sktimer.h 2005-06-22
16:04:47.000000000 +0200
@@ -2,8 +2,8 @@
*
* Name: sktimer.h
@@ -5514,9 +5514,9 @@
* Purpose: Defines for the timer functions
*
******************************************************************************/
-diff -uNr linux-2.6.11.9/drivers/net.orig/sk98lin/h/sktwsi.h
linux-2.6.11.9/drivers/net/sk98lin/h/sktwsi.h
---- linux-2.6.11.9/drivers/net.orig/sk98lin/h/sktwsi.h 1970-01-01
01:00:00.000000000 +0100
-+++ linux-2.6.11.9/drivers/net/sk98lin/h/sktwsi.h 2005-04-25
16:06:58.000000000 +0200
+diff -uNr linux-2.6.12/drivers/net.orig/sk98lin/h/sktwsi.h
linux-2.6.12/drivers/net/sk98lin/h/sktwsi.h
+--- linux-2.6.12/drivers/net.orig/sk98lin/h/sktwsi.h 1970-01-01
01:00:00.000000000 +0100
++++ linux-2.6.12/drivers/net/sk98lin/h/sktwsi.h 2005-06-22
16:04:47.000000000 +0200
@@ -0,0 +1,177 @@
+/******************************************************************************
+ *
@@ -5695,9 +5695,9 @@
+#endif /* !SK_DIAG */
+#endif /* n_SKTWSI_H */
+
-diff -uNr linux-2.6.11.9/drivers/net.orig/sk98lin/h/sktypes.h
linux-2.6.11.9/drivers/net/sk98lin/h/sktypes.h
---- linux-2.6.11.9/drivers/net.orig/sk98lin/h/sktypes.h 2005-05-12
00:43:19.000000000 +0200
-+++ linux-2.6.11.9/drivers/net/sk98lin/h/sktypes.h 2005-04-25
16:06:58.000000000 +0200
+diff -uNr linux-2.6.12/drivers/net.orig/sk98lin/h/sktypes.h
linux-2.6.12/drivers/net/sk98lin/h/sktypes.h
+--- linux-2.6.12/drivers/net.orig/sk98lin/h/sktypes.h 2005-06-17
21:48:29.000000000 +0200
++++ linux-2.6.12/drivers/net/sk98lin/h/sktypes.h 2005-06-22
16:04:47.000000000 +0200
@@ -2,8 +2,8 @@
*
* Name: sktypes.h
@@ -5787,9 +5787,9 @@
+ * End of file
+ *
+
******************************************************************************/
-diff -uNr linux-2.6.11.9/drivers/net.orig/sk98lin/h/skversion.h
linux-2.6.11.9/drivers/net/sk98lin/h/skversion.h
---- linux-2.6.11.9/drivers/net.orig/sk98lin/h/skversion.h 2005-05-12
00:42:13.000000000 +0200
-+++ linux-2.6.11.9/drivers/net/sk98lin/h/skversion.h 2005-04-25
16:06:58.000000000 +0200
+diff -uNr linux-2.6.12/drivers/net.orig/sk98lin/h/skversion.h
linux-2.6.12/drivers/net/sk98lin/h/skversion.h
+--- linux-2.6.12/drivers/net.orig/sk98lin/h/skversion.h 2005-06-17
21:48:29.000000000 +0200
++++ linux-2.6.12/drivers/net/sk98lin/h/skversion.h 2005-06-22
16:04:47.000000000 +0200
@@ -1,17 +1,17 @@
/******************************************************************************
*
@@ -5842,9 +5842,9 @@
+ * End of file
+ *
+
******************************************************************************/
-diff -uNr linux-2.6.11.9/drivers/net.orig/sk98lin/h/skvpd.h
linux-2.6.11.9/drivers/net/sk98lin/h/skvpd.h
---- linux-2.6.11.9/drivers/net.orig/sk98lin/h/skvpd.h 2005-05-12
00:41:32.000000000 +0200
-+++ linux-2.6.11.9/drivers/net/sk98lin/h/skvpd.h 2005-04-25
16:06:58.000000000 +0200
+diff -uNr linux-2.6.12/drivers/net.orig/sk98lin/h/skvpd.h
linux-2.6.12/drivers/net/sk98lin/h/skvpd.h
+--- linux-2.6.12/drivers/net.orig/sk98lin/h/skvpd.h 2005-06-17
21:48:29.000000000 +0200
++++ linux-2.6.12/drivers/net/sk98lin/h/skvpd.h 2005-06-22 16:04:47.000000000
+0200
@@ -1,22 +1,22 @@
/******************************************************************************
*
@@ -6055,9 +6055,9 @@
#endif /* __INC_SKVPD_H_ */
+
-diff -uNr linux-2.6.11.9/drivers/net.orig/sk98lin/h/sky2le.h
linux-2.6.11.9/drivers/net/sk98lin/h/sky2le.h
---- linux-2.6.11.9/drivers/net.orig/sk98lin/h/sky2le.h 1970-01-01
01:00:00.000000000 +0100
-+++ linux-2.6.11.9/drivers/net/sk98lin/h/sky2le.h 2005-04-25
16:06:58.000000000 +0200
+diff -uNr linux-2.6.12/drivers/net.orig/sk98lin/h/sky2le.h
linux-2.6.12/drivers/net/sk98lin/h/sky2le.h
+--- linux-2.6.12/drivers/net.orig/sk98lin/h/sky2le.h 1970-01-01
01:00:00.000000000 +0100
++++ linux-2.6.12/drivers/net/sk98lin/h/sky2le.h 2005-06-22
16:04:47.000000000 +0200
@@ -0,0 +1,891 @@
+/******************************************************************************
+ *
@@ -6950,9 +6950,9 @@
+
+#endif /* __INC_SKY2LE_H */
+
-diff -uNr linux-2.6.11.9/drivers/net.orig/sk98lin/h/xmac_ii.h
linux-2.6.11.9/drivers/net/sk98lin/h/xmac_ii.h
---- linux-2.6.11.9/drivers/net.orig/sk98lin/h/xmac_ii.h 2005-05-12
00:42:52.000000000 +0200
-+++ linux-2.6.11.9/drivers/net/sk98lin/h/xmac_ii.h 2005-04-25
16:06:58.000000000 +0200
+diff -uNr linux-2.6.12/drivers/net.orig/sk98lin/h/xmac_ii.h
linux-2.6.12/drivers/net/sk98lin/h/xmac_ii.h
+--- linux-2.6.12/drivers/net.orig/sk98lin/h/xmac_ii.h 2005-06-17
21:48:29.000000000 +0200
++++ linux-2.6.12/drivers/net/sk98lin/h/xmac_ii.h 2005-06-22
16:04:47.000000000 +0200
@@ -2,8 +2,8 @@
*
* Name: xmac_ii.h
@@ -7869,9 +7869,9 @@
/* typedefs
*******************************************************************/
-diff -uNr linux-2.6.11.9/drivers/net.orig/sk98lin/Makefile
linux-2.6.11.9/drivers/net/sk98lin/Makefile
---- linux-2.6.11.9/drivers/net.orig/sk98lin/Makefile 2005-05-12
00:41:08.000000000 +0200
-+++ linux-2.6.11.9/drivers/net/sk98lin/Makefile 2005-04-25
16:06:58.000000000 +0200
+diff -uNr linux-2.6.12/drivers/net.orig/sk98lin/Makefile
linux-2.6.12/drivers/net/sk98lin/Makefile
+--- linux-2.6.12/drivers/net.orig/sk98lin/Makefile 2005-06-17
21:48:29.000000000 +0200
++++ linux-2.6.12/drivers/net/sk98lin/Makefile 2005-06-22 16:04:47.000000000
+0200
@@ -1,6 +1,59 @@
+#******************************************************************************
#
@@ -7911,8 +7911,8 @@
+# History:
+#
+# $Log$
-+# Revision 1.1.2.1 2005/05/15 22:18:03 pluto
-+# - 8.18.2.2 beta.
++# Revision 1.1.2.2 2005/06/22 14:11:24 pluto
++# - updated for 2.6.12.
+#
+# Revision 1.9.2.1 2005/04/11 09:01:18 mlindner
+# Fix: Copyright year changed
@@ -7971,9 +7971,9 @@
-
-
-
-diff -uNr linux-2.6.11.9/drivers/net.orig/sk98lin/sk98lin.4
linux-2.6.11.9/drivers/net/sk98lin/sk98lin.4
---- linux-2.6.11.9/drivers/net.orig/sk98lin/sk98lin.4 1970-01-01
01:00:00.000000000 +0100
-+++ linux-2.6.11.9/drivers/net/sk98lin/sk98lin.4 2005-04-25
16:06:58.000000000 +0200
+diff -uNr linux-2.6.12/drivers/net.orig/sk98lin/sk98lin.4
linux-2.6.12/drivers/net/sk98lin/sk98lin.4
+--- linux-2.6.12/drivers/net.orig/sk98lin/sk98lin.4 1970-01-01
01:00:00.000000000 +0100
++++ linux-2.6.12/drivers/net/sk98lin/sk98lin.4 2005-06-22 16:04:47.000000000
+0200
@@ -0,0 +1,470 @@
+.\" (C)Copyright 1999-2005 Marvell(R). -- [EMAIL PROTECTED]
+.\" sk98lin.4 1.1 2005/04/25 15:13:26
@@ -8445,9 +8445,9 @@
+Mirko Lindner \- [EMAIL PROTECTED]
+.SH "SEE ALSO"
+modprobe(8), insmod(8), ifconfig(8).
-diff -uNr linux-2.6.11.9/drivers/net.orig/sk98lin/sk98lin.htm
linux-2.6.11.9/drivers/net/sk98lin/sk98lin.htm
---- linux-2.6.11.9/drivers/net.orig/sk98lin/sk98lin.htm 1970-01-01
01:00:00.000000000 +0100
-+++ linux-2.6.11.9/drivers/net/sk98lin/sk98lin.htm 2005-04-25
16:06:58.000000000 +0200
+diff -uNr linux-2.6.12/drivers/net.orig/sk98lin/sk98lin.htm
linux-2.6.12/drivers/net/sk98lin/sk98lin.htm
+--- linux-2.6.12/drivers/net.orig/sk98lin/sk98lin.htm 1970-01-01
01:00:00.000000000 +0100
++++ linux-2.6.12/drivers/net/sk98lin/sk98lin.htm 2005-06-22
16:04:47.000000000 +0200
@@ -0,0 +1,772 @@
+<HTML>
+<HEAD>
@@ -9221,9 +9221,9 @@
+</PRE>
+</BODY>
+</HTML>
-diff -uNr linux-2.6.11.9/drivers/net.orig/sk98lin/sk98lin.txt
linux-2.6.11.9/drivers/net/sk98lin/sk98lin.txt
---- linux-2.6.11.9/drivers/net.orig/sk98lin/sk98lin.txt 1970-01-01
01:00:00.000000000 +0100
-+++ linux-2.6.11.9/drivers/net/sk98lin/sk98lin.txt 2005-04-25
16:06:58.000000000 +0200
+diff -uNr linux-2.6.12/drivers/net.orig/sk98lin/sk98lin.txt
linux-2.6.12/drivers/net/sk98lin/sk98lin.txt
+--- linux-2.6.12/drivers/net.orig/sk98lin/sk98lin.txt 1970-01-01
01:00:00.000000000 +0100
++++ linux-2.6.12/drivers/net/sk98lin/sk98lin.txt 2005-06-22
16:04:47.000000000 +0200
@@ -0,0 +1,681 @@
+(C)Copyright 1999-2005 Marvell(R).
+All rights reserved.
@@ -9906,9 +9906,9 @@
+
+
+***End of Readme File***
-diff -uNr linux-2.6.11.9/drivers/net.orig/sk98lin/skaddr.c
linux-2.6.11.9/drivers/net/sk98lin/skaddr.c
---- linux-2.6.11.9/drivers/net.orig/sk98lin/skaddr.c 2005-05-12
00:42:16.000000000 +0200
-+++ linux-2.6.11.9/drivers/net/sk98lin/skaddr.c 2005-04-25
16:06:58.000000000 +0200
+diff -uNr linux-2.6.12/drivers/net.orig/sk98lin/skaddr.c
linux-2.6.12/drivers/net/sk98lin/skaddr.c
+--- linux-2.6.12/drivers/net.orig/sk98lin/skaddr.c 2005-06-17
21:48:29.000000000 +0200
++++ linux-2.6.12/drivers/net/sk98lin/skaddr.c 2005-06-22 16:04:47.000000000
+0200
@@ -2,8 +2,8 @@
*
* Name: skaddr.c
@@ -10232,9 +10232,9 @@
#if (!defined(SK_SLIM) || defined(DEBUG))
if (PortNumber >= (SK_U32) pAC->GIni.GIMacsFound) {
return (SK_ADDR_ILLEGAL_PORT);
-diff -uNr linux-2.6.11.9/drivers/net.orig/sk98lin/skcsum.c
linux-2.6.11.9/drivers/net/sk98lin/skcsum.c
---- linux-2.6.11.9/drivers/net.orig/sk98lin/skcsum.c 2005-05-12
00:41:10.000000000 +0200
-+++ linux-2.6.11.9/drivers/net/sk98lin/skcsum.c 2005-04-25
16:06:58.000000000 +0200
+diff -uNr linux-2.6.12/drivers/net.orig/sk98lin/skcsum.c
linux-2.6.12/drivers/net/sk98lin/skcsum.c
+--- linux-2.6.12/drivers/net.orig/sk98lin/skcsum.c 2005-06-17
21:48:29.000000000 +0200
++++ linux-2.6.12/drivers/net/sk98lin/skcsum.c 2005-06-22 16:04:47.000000000
+0200
@@ -2,8 +2,8 @@
*
* Name: skcsum.c
@@ -10255,9 +10255,9 @@
#endif /* !lint */
/******************************************************************************
-diff -uNr linux-2.6.11.9/drivers/net.orig/sk98lin/skdim.c
linux-2.6.11.9/drivers/net/sk98lin/skdim.c
---- linux-2.6.11.9/drivers/net.orig/sk98lin/skdim.c 2005-05-12
00:41:25.000000000 +0200
-+++ linux-2.6.11.9/drivers/net/sk98lin/skdim.c 2005-04-25 16:06:58.000000000
+0200
+diff -uNr linux-2.6.12/drivers/net.orig/sk98lin/skdim.c
linux-2.6.12/drivers/net/sk98lin/skdim.c
+--- linux-2.6.12/drivers/net.orig/sk98lin/skdim.c 2005-06-17
21:48:29.000000000 +0200
++++ linux-2.6.12/drivers/net/sk98lin/skdim.c 2005-06-22 16:04:47.000000000
+0200
@@ -1,18 +1,29 @@
/******************************************************************************
*
@@ -11342,9 +11342,9 @@
+ * End of file
+ *
+
******************************************************************************/
-diff -uNr linux-2.6.11.9/drivers/net.orig/sk98lin/skethtool.c
linux-2.6.11.9/drivers/net/sk98lin/skethtool.c
---- linux-2.6.11.9/drivers/net.orig/sk98lin/skethtool.c 2005-05-12
00:43:45.000000000 +0200
-+++ linux-2.6.11.9/drivers/net/sk98lin/skethtool.c 2005-04-25
16:06:59.000000000 +0200
+diff -uNr linux-2.6.12/drivers/net.orig/sk98lin/skethtool.c
linux-2.6.12/drivers/net/sk98lin/skethtool.c
+--- linux-2.6.12/drivers/net.orig/sk98lin/skethtool.c 2005-06-17
21:48:29.000000000 +0200
++++ linux-2.6.12/drivers/net/sk98lin/skethtool.c 2005-06-22
16:05:34.000000000 +0200
@@ -2,8 +2,8 @@
*
* Name: skethtool.c
@@ -12082,7 +12082,7 @@
- strlcpy(info->driver, DRIVER_FILE_NAME, sizeof(info->driver));
- strcpy(info->version, vers);
- strcpy(info->fw_version, "N/A");
-- strlcpy(info->bus_info, pAC->PciDev->slot_name, ETHTOOL_BUSINFO_LEN);
+- strlcpy(info->bus_info, pci_name(pAC->PciDev), ETHTOOL_BUSINFO_LEN);
-}
-
-/*
@@ -12641,7 +12641,7 @@
*
* Description:
* This function is used if the user want to locate a particular NIC.
-@@ -425,131 +1159,178 @@
+@@ -425,128 +1159,178 @@
* !=0: one locateNIC test runs already
*
*/
@@ -12670,9 +12670,6 @@
- pAC->LedsOn = 0;
- mod_timer(&pAC->BlinkTimer, jiffies);
- msleep_interruptible(data * 1000);
--
-- set_current_state(TASK_INTERRUPTIBLE);
-- schedule_timeout(data * HZ);
- del_timer_sync(&pAC->BlinkTimer);
- toggleLeds(pNet, 0);
+ if (netif_running(pAC->dev[port])) {
@@ -12918,9 +12915,9 @@
+ * End of file
+ *
+
******************************************************************************/
-diff -uNr linux-2.6.11.9/drivers/net.orig/sk98lin/skge.c
linux-2.6.11.9/drivers/net/sk98lin/skge.c
---- linux-2.6.11.9/drivers/net.orig/sk98lin/skge.c 2005-05-12
00:41:12.000000000 +0200
-+++ linux-2.6.11.9/drivers/net/sk98lin/skge.c 2005-04-25 16:06:59.000000000
+0200
+diff -uNr linux-2.6.12/drivers/net.orig/sk98lin/skge.c
linux-2.6.12/drivers/net/sk98lin/skge.c
+--- linux-2.6.12/drivers/net.orig/sk98lin/skge.c 2005-06-17
21:48:29.000000000 +0200
++++ linux-2.6.12/drivers/net/sk98lin/skge.c 2005-06-22 16:05:40.000000000
+0200
@@ -1,25 +1,23 @@
/******************************************************************************
*
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/linux-2.6-sk98lin-8.18.2.2.patch?r1=1.1.2.1&r2=1.1.2.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
