SOURCES (LINUX_2_6): linux-2.6-sk98lin-8.23.1.3.patch - updated fo...
pluto
pluto at pld-linux.org
Sat Oct 1 00:56:45 CEST 2005
Author: pluto Date: Fri Sep 30 22:56:45 2005 GMT
Module: SOURCES Tag: LINUX_2_6
---- Log message:
- updated for 2.6.14.
---- Files affected:
SOURCES:
linux-2.6-sk98lin-8.23.1.3.patch (1.1.2.1 -> 1.1.2.2)
---- Diffs:
================================================================
Index: SOURCES/linux-2.6-sk98lin-8.23.1.3.patch
diff -u SOURCES/linux-2.6-sk98lin-8.23.1.3.patch:1.1.2.1 SOURCES/linux-2.6-sk98lin-8.23.1.3.patch:1.1.2.2
--- SOURCES/linux-2.6-sk98lin-8.23.1.3.patch:1.1.2.1 Thu Sep 15 13:05:32 2005
+++ SOURCES/linux-2.6-sk98lin-8.23.1.3.patch Sat Oct 1 00:56:40 2005
@@ -1,7 +1,7 @@
-diff -uNr linux-2.6.13.1/drivers/net.orig/Kconfig linux-2.6.13.1/drivers/net/Kconfig
---- linux-2.6.13.1/drivers/net.orig/Kconfig 2005-09-15 12:23:03.000000000 +0200
-+++ linux-2.6.13.1/drivers/net/Kconfig 2005-09-15 12:55:24.276763250 +0200
-@@ -2065,6 +2065,22 @@
+diff -uNr linux-2.6.14-rc2/drivers/net.orig/Kconfig linux-2.6.14-rc2/drivers/net/Kconfig
+--- linux-2.6.14-rc2/drivers/net.orig/Kconfig 2005-09-30 22:51:07.000000000 +0000
++++ linux-2.6.14-rc2/drivers/net/Kconfig 2005-09-30 22:52:24.946686368 +0000
+@@ -2096,6 +2096,22 @@
by this driver:
- 3Com 3C940 Gigabit LOM Ethernet Adapter
- 3Com 3C941 Gigabit LOM Ethernet Adapter
@@ -24,7 +24,7 @@
- Allied Telesyn AT-2970LX Gigabit Ethernet Adapter
- Allied Telesyn AT-2970LX/2SC Gigabit Ethernet Adapter
- Allied Telesyn AT-2970SX Gigabit Ethernet Adapter
-@@ -2075,31 +2091,79 @@
+@@ -2106,31 +2122,79 @@
- Allied Telesyn AT-2971T Gigabit Ethernet Adapter
- Belkin Gigabit Desktop Card 10/100/1000Base-T Adapter, Copper RJ-45
- DGE-530T Gigabit Ethernet Adapter
@@ -117,7 +117,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
-@@ -2119,21 +2183,36 @@
+@@ -2150,21 +2214,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)
@@ -158,9 +158,111 @@
config VIA_VELOCITY
tristate "VIA Velocity support"
-diff -uNr linux-2.6.13.1/drivers/net.orig/sk98lin/h/lm80.h linux-2.6.13.1/drivers/net/sk98lin/h/lm80.h
---- linux-2.6.13.1/drivers/net.orig/sk98lin/h/lm80.h 2005-09-10 04:42:58.000000000 +0200
-+++ linux-2.6.13.1/drivers/net/sk98lin/h/lm80.h 2005-06-20 10:50:16.000000000 +0200
+diff -uNr linux-2.6.14-rc2/drivers/net.orig/sk98lin/Makefile linux-2.6.14-rc2/drivers/net/sk98lin/Makefile
+--- linux-2.6.14-rc2/drivers/net.orig/sk98lin/Makefile 2005-09-20 03:00:41.000000000 +0000
++++ linux-2.6.14-rc2/drivers/net/sk98lin/Makefile 2005-09-30 22:52:25.035672840 +0000
+@@ -1,6 +1,59 @@
++#******************************************************************************
+ #
+-# Makefile for the SysKonnect SK-98xx device driver.
++# Name: skge.c
++# Project: GEnesis, PCI Gigabit Ethernet Adapter
++# Version: $Revision$
++# Date: $Date$
++# Purpose: The main driver source module
+ #
++#******************************************************************************
++
++#******************************************************************************
++#
++# (C)Copyright 1998-2002 SysKonnect GmbH.
++# (C)Copyright 2002-2005 Marvell.
++#
++# Makefile for Marvell Yukon chipset and SysKonnect Gigabit Ethernet
++# Server Adapter driver. (Kernel 2.6)
++#
++# Author: Mirko Lindner (mlindner at syskonnect.de)
++# Ralph Roesler (rroesler at syskonnect.de)
++#
++# Address all question to: linux at syskonnect.de
++#
++# 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
++# (at your option) any later version.
++#
++# The information in this file is provided "AS IS" without warranty.
++#
++#******************************************************************************
++
++#******************************************************************************
++#
++# History:
++#
++# $Log$
++# Revision 1.1.2.2 2005/09/30 22:56:40 pluto
++# - updated for 2.6.14.
++#
++# Revision 1.9.2.1 2005/04/11 09:01:18 mlindner
++# Fix: Copyright year changed
++#
++# Revision 1.9 2004/07/13 15:54:50 rroesler
++# Add: file skethtool.c
++# Fix: corrected header regarding copyright
++# Fix: minor typos corrected
++#
++# Revision 1.8 2004/06/08 08:39:38 mlindner
++# Fix: Add CONFIG_SK98LIN_ZEROCOPY as default
++#
++# Revision 1.7 2004/06/03 16:06:56 mlindner
++# Fix: Added compile flag SK_DIAG_SUPPORT
++#
++# Revision 1.6 2004/06/02 08:02:59 mlindner
++# Add: Changed header information and inserted a GPL statement
++#
++#
++#******************************************************************************
+
+
+ #
+@@ -13,14 +66,16 @@
+ obj-$(CONFIG_SK98LIN) += sk98lin.o
+ sk98lin-objs := \
+ skge.o \
++ sky2.o \
+ skethtool.o \
++ sky2le.o \
+ skdim.o \
+ skaddr.o \
+ skgehwt.o \
+ skgeinit.o \
+ skgepnmi.o \
+ skgesirq.o \
+- ski2c.o \
++ sktwsi.o \
+ sklm80.o \
+ skqueue.o \
+ skrlmt.o \
+@@ -77,13 +132,11 @@
+ # SK_DBGCAT_DRV_INT_SRC 0x04000000 interrupts sources
+ # SK_DBGCAT_DRV_EVENT 0x08000000 driver events
+
+-EXTRA_CFLAGS += -Idrivers/net/sk98lin -DSK_DIAG_SUPPORT -DSK_USE_CSUM -DGENESIS -DYUKON $(DBGDEF) $(SKPARAM)
++EXTRA_CFLAGS += -Idrivers/net/sk98lin -DSK_USE_CSUM -DSK_DIAG_SUPPORT \
++ -DGENESIS -DYUKON -DYUK2 -DCONFIG_SK98LIN_ZEROCOPY \
++ $(DBGDEF) $(SKPARAM)
+
+ clean:
+ rm -f core *.o *.a *.s
+
+
+-
+-
+-
+-
+diff -uNr linux-2.6.14-rc2/drivers/net.orig/sk98lin/h/lm80.h linux-2.6.14-rc2/drivers/net/sk98lin/h/lm80.h
+--- linux-2.6.14-rc2/drivers/net.orig/sk98lin/h/lm80.h 2005-09-20 03:00:41.000000000 +0000
++++ linux-2.6.14-rc2/drivers/net/sk98lin/h/lm80.h 2005-09-30 22:52:24.947686216 +0000
@@ -2,8 +2,8 @@
*
* Name: lm80.h
@@ -172,9 +274,9 @@
* Purpose: Contains all defines for the LM80 Chip
* (National Semiconductor).
*
-diff -uNr linux-2.6.13.1/drivers/net.orig/sk98lin/h/skaddr.h linux-2.6.13.1/drivers/net/sk98lin/h/skaddr.h
---- linux-2.6.13.1/drivers/net.orig/sk98lin/h/skaddr.h 2005-09-10 04:42:58.000000000 +0200
-+++ linux-2.6.13.1/drivers/net/sk98lin/h/skaddr.h 2005-06-20 10:50:16.000000000 +0200
+diff -uNr linux-2.6.14-rc2/drivers/net.orig/sk98lin/h/skaddr.h linux-2.6.14-rc2/drivers/net/sk98lin/h/skaddr.h
+--- linux-2.6.14-rc2/drivers/net.orig/sk98lin/h/skaddr.h 2005-09-20 03:00:41.000000000 +0000
++++ linux-2.6.14-rc2/drivers/net/sk98lin/h/skaddr.h 2005-09-30 22:52:24.947686216 +0000
@@ -2,8 +2,8 @@
*
* Name: skaddr.h
@@ -186,9 +288,9 @@
* Purpose: Header file for Address Management (MC, UC, Prom).
*
******************************************************************************/
-diff -uNr linux-2.6.13.1/drivers/net.orig/sk98lin/h/skcsum.h linux-2.6.13.1/drivers/net/sk98lin/h/skcsum.h
---- linux-2.6.13.1/drivers/net.orig/sk98lin/h/skcsum.h 2005-09-10 04:42:58.000000000 +0200
-+++ linux-2.6.13.1/drivers/net/sk98lin/h/skcsum.h 2005-06-20 10:50:16.000000000 +0200
+diff -uNr linux-2.6.14-rc2/drivers/net.orig/sk98lin/h/skcsum.h linux-2.6.14-rc2/drivers/net/sk98lin/h/skcsum.h
+--- linux-2.6.14-rc2/drivers/net.orig/sk98lin/h/skcsum.h 2005-09-20 03:00:41.000000000 +0000
++++ linux-2.6.14-rc2/drivers/net/sk98lin/h/skcsum.h 2005-09-30 22:52:24.948686064 +0000
@@ -2,8 +2,8 @@
*
* Name: skcsum.h
@@ -210,9 +312,9 @@
/* The protocol statistics structure; one per supported protocol. */
SKCS_PROTO_STATS ProtoStats[SK_MAX_NETS][SKCS_NUM_PROTOCOLS];
-diff -uNr linux-2.6.13.1/drivers/net.orig/sk98lin/h/skdebug.h linux-2.6.13.1/drivers/net/sk98lin/h/skdebug.h
---- linux-2.6.13.1/drivers/net.orig/sk98lin/h/skdebug.h 2005-09-10 04:42:58.000000000 +0200
-+++ linux-2.6.13.1/drivers/net/sk98lin/h/skdebug.h 2005-06-20 10:50:16.000000000 +0200
+diff -uNr linux-2.6.14-rc2/drivers/net.orig/sk98lin/h/skdebug.h linux-2.6.14-rc2/drivers/net/sk98lin/h/skdebug.h
+--- linux-2.6.14-rc2/drivers/net.orig/sk98lin/h/skdebug.h 2005-09-20 03:00:41.000000000 +0000
++++ linux-2.6.14-rc2/drivers/net/sk98lin/h/skdebug.h 2005-09-30 22:52:24.949685912 +0000
@@ -2,8 +2,8 @@
*
* Name: skdebug.h
@@ -266,9 +368,9 @@
/* Debug events */
-diff -uNr linux-2.6.13.1/drivers/net.orig/sk98lin/h/skdrv1st.h linux-2.6.13.1/drivers/net/sk98lin/h/skdrv1st.h
---- linux-2.6.13.1/drivers/net.orig/sk98lin/h/skdrv1st.h 2005-09-10 04:42:58.000000000 +0200
-+++ linux-2.6.13.1/drivers/net/sk98lin/h/skdrv1st.h 2005-06-20 10:50:17.000000000 +0200
+diff -uNr linux-2.6.14-rc2/drivers/net.orig/sk98lin/h/skdrv1st.h linux-2.6.14-rc2/drivers/net/sk98lin/h/skdrv1st.h
+--- linux-2.6.14-rc2/drivers/net.orig/sk98lin/h/skdrv1st.h 2005-09-20 03:00:41.000000000 +0000
++++ linux-2.6.14-rc2/drivers/net/sk98lin/h/skdrv1st.h 2005-09-30 22:52:24.950685760 +0000
@@ -2,8 +2,8 @@
*
* Name: skdrv1st.h
@@ -374,9 +476,9 @@
+ * End of file
+ *
+ ******************************************************************************/
-diff -uNr linux-2.6.13.1/drivers/net.orig/sk98lin/h/skdrv2nd.h linux-2.6.13.1/drivers/net/sk98lin/h/skdrv2nd.h
---- linux-2.6.13.1/drivers/net.orig/sk98lin/h/skdrv2nd.h 2005-09-10 04:42:58.000000000 +0200
-+++ linux-2.6.13.1/drivers/net/sk98lin/h/skdrv2nd.h 2005-09-15 13:00:28.547779000 +0200
+diff -uNr linux-2.6.14-rc2/drivers/net.orig/sk98lin/h/skdrv2nd.h linux-2.6.14-rc2/drivers/net/sk98lin/h/skdrv2nd.h
+--- linux-2.6.14-rc2/drivers/net.orig/sk98lin/h/skdrv2nd.h 2005-09-20 03:00:41.000000000 +0000
++++ linux-2.6.14-rc2/drivers/net/sk98lin/h/skdrv2nd.h 2005-09-30 22:52:24.960684240 +0000
@@ -1,17 +1,17 @@
/******************************************************************************
*
@@ -1484,9 +1586,9 @@
+ * End of file
+ *
+ ******************************************************************************/
-diff -uNr linux-2.6.13.1/drivers/net.orig/sk98lin/h/skerror.h linux-2.6.13.1/drivers/net/sk98lin/h/skerror.h
---- linux-2.6.13.1/drivers/net.orig/sk98lin/h/skerror.h 2005-09-10 04:42:58.000000000 +0200
-+++ linux-2.6.13.1/drivers/net/sk98lin/h/skerror.h 2005-06-20 10:50:16.000000000 +0200
+diff -uNr linux-2.6.14-rc2/drivers/net.orig/sk98lin/h/skerror.h linux-2.6.14-rc2/drivers/net/sk98lin/h/skerror.h
+--- linux-2.6.14-rc2/drivers/net.orig/sk98lin/h/skerror.h 2005-09-20 03:00:41.000000000 +0000
++++ linux-2.6.14-rc2/drivers/net/sk98lin/h/skerror.h 2005-09-30 22:52:24.961684088 +0000
@@ -2,8 +2,8 @@
*
* Name: skerror.h
@@ -1532,9 +1634,9 @@
#endif /* _INC_SKERROR_H_ */
+
-diff -uNr linux-2.6.13.1/drivers/net.orig/sk98lin/h/skgedrv.h linux-2.6.13.1/drivers/net/sk98lin/h/skgedrv.h
---- linux-2.6.13.1/drivers/net.orig/sk98lin/h/skgedrv.h 2005-09-10 04:42:58.000000000 +0200
-+++ linux-2.6.13.1/drivers/net/sk98lin/h/skgedrv.h 2005-06-20 10:50:16.000000000 +0200
+diff -uNr linux-2.6.14-rc2/drivers/net.orig/sk98lin/h/skgedrv.h linux-2.6.14-rc2/drivers/net/sk98lin/h/skgedrv.h
+--- linux-2.6.14-rc2/drivers/net.orig/sk98lin/h/skgedrv.h 2005-09-20 03:00:41.000000000 +0000
++++ linux-2.6.14-rc2/drivers/net/sk98lin/h/skgedrv.h 2005-09-30 22:52:24.961684088 +0000
@@ -2,8 +2,8 @@
*
* Name: skgedrv.h
@@ -1546,9 +1648,9 @@
* Purpose: Interface with the driver
*
******************************************************************************/
-diff -uNr linux-2.6.13.1/drivers/net.orig/sk98lin/h/skgehw.h linux-2.6.13.1/drivers/net/sk98lin/h/skgehw.h
---- linux-2.6.13.1/drivers/net.orig/sk98lin/h/skgehw.h 2005-09-10 04:42:58.000000000 +0200
-+++ linux-2.6.13.1/drivers/net/sk98lin/h/skgehw.h 2005-06-20 10:50:16.000000000 +0200
+diff -uNr linux-2.6.14-rc2/drivers/net.orig/sk98lin/h/skgehw.h linux-2.6.14-rc2/drivers/net/sk98lin/h/skgehw.h
+--- linux-2.6.14-rc2/drivers/net.orig/sk98lin/h/skgehw.h 2005-09-20 03:00:41.000000000 +0000
++++ linux-2.6.14-rc2/drivers/net/sk98lin/h/skgehw.h 2005-09-30 22:52:24.982680896 +0000
@@ -2,8 +2,8 @@
*
* Name: skgehw.h
@@ -3708,9 +3810,9 @@
#endif /* __INC_SKGEHW_H */
+
-diff -uNr linux-2.6.13.1/drivers/net.orig/sk98lin/h/skgehwt.h linux-2.6.13.1/drivers/net/sk98lin/h/skgehwt.h
---- linux-2.6.13.1/drivers/net.orig/sk98lin/h/skgehwt.h 2005-09-10 04:42:58.000000000 +0200
-+++ linux-2.6.13.1/drivers/net/sk98lin/h/skgehwt.h 2005-06-20 10:50:16.000000000 +0200
+diff -uNr linux-2.6.14-rc2/drivers/net.orig/sk98lin/h/skgehwt.h linux-2.6.14-rc2/drivers/net/sk98lin/h/skgehwt.h
+--- linux-2.6.14-rc2/drivers/net.orig/sk98lin/h/skgehwt.h 2005-09-20 03:00:41.000000000 +0000
++++ linux-2.6.14-rc2/drivers/net/sk98lin/h/skgehwt.h 2005-09-30 22:52:24.983680744 +0000
@@ -2,8 +2,8 @@
*
* Name: skhwt.h
@@ -3722,9 +3824,9 @@
* Purpose: Defines for the hardware timer functions
*
******************************************************************************/
-diff -uNr linux-2.6.13.1/drivers/net.orig/sk98lin/h/skgei2c.h linux-2.6.13.1/drivers/net/sk98lin/h/skgei2c.h
---- linux-2.6.13.1/drivers/net.orig/sk98lin/h/skgei2c.h 2005-09-10 04:42:58.000000000 +0200
-+++ linux-2.6.13.1/drivers/net/sk98lin/h/skgei2c.h 1970-01-01 01:00:00.000000000 +0100
+diff -uNr linux-2.6.14-rc2/drivers/net.orig/sk98lin/h/skgei2c.h linux-2.6.14-rc2/drivers/net/sk98lin/h/skgei2c.h
+--- linux-2.6.14-rc2/drivers/net.orig/sk98lin/h/skgei2c.h 2005-09-20 03:00:41.000000000 +0000
++++ linux-2.6.14-rc2/drivers/net/sk98lin/h/skgei2c.h 1970-01-01 00:00:00.000000000 +0000
@@ -1,210 +0,0 @@
-/******************************************************************************
- *
@@ -3936,9 +4038,9 @@
-
-extern int SkLm80ReadSensor(SK_AC *pAC, SK_IOC IoC, SK_SENSOR *pSen);
-#endif /* n_INC_SKGEI2C_H */
-diff -uNr linux-2.6.13.1/drivers/net.orig/sk98lin/h/skgeinit.h linux-2.6.13.1/drivers/net/sk98lin/h/skgeinit.h
---- linux-2.6.13.1/drivers/net.orig/sk98lin/h/skgeinit.h 2005-09-10 04:42:58.000000000 +0200
-+++ linux-2.6.13.1/drivers/net/sk98lin/h/skgeinit.h 2005-06-20 10:50:16.000000000 +0200
+diff -uNr linux-2.6.14-rc2/drivers/net.orig/sk98lin/h/skgeinit.h linux-2.6.14-rc2/drivers/net/sk98lin/h/skgeinit.h
+--- linux-2.6.14-rc2/drivers/net.orig/sk98lin/h/skgeinit.h 2005-09-20 03:00:41.000000000 +0000
++++ linux-2.6.14-rc2/drivers/net/sk98lin/h/skgeinit.h 2005-09-30 22:52:24.998678464 +0000
@@ -2,8 +2,8 @@
*
* Name: skgeinit.h
@@ -4611,9 +4713,9 @@
#endif /* __INC_SKGEINIT_H_ */
+
-diff -uNr linux-2.6.13.1/drivers/net.orig/sk98lin/h/skgepnm2.h linux-2.6.13.1/drivers/net/sk98lin/h/skgepnm2.h
---- linux-2.6.13.1/drivers/net.orig/sk98lin/h/skgepnm2.h 2005-09-10 04:42:58.000000000 +0200
-+++ linux-2.6.13.1/drivers/net/sk98lin/h/skgepnm2.h 2005-06-20 10:50:16.000000000 +0200
+diff -uNr linux-2.6.14-rc2/drivers/net.orig/sk98lin/h/skgepnm2.h linux-2.6.14-rc2/drivers/net/sk98lin/h/skgepnm2.h
+--- linux-2.6.14-rc2/drivers/net.orig/sk98lin/h/skgepnm2.h 2005-09-20 03:00:41.000000000 +0000
++++ linux-2.6.14-rc2/drivers/net/sk98lin/h/skgepnm2.h 2005-09-30 22:52:24.999678312 +0000
@@ -2,8 +2,8 @@
*
* Name: skgepnm2.h
@@ -4663,9 +4765,9 @@
#else /* !DEBUG */
-diff -uNr linux-2.6.13.1/drivers/net.orig/sk98lin/h/skgepnmi.h linux-2.6.13.1/drivers/net/sk98lin/h/skgepnmi.h
---- linux-2.6.13.1/drivers/net.orig/sk98lin/h/skgepnmi.h 2005-09-10 04:42:58.000000000 +0200
-+++ linux-2.6.13.1/drivers/net/sk98lin/h/skgepnmi.h 2005-06-20 10:50:16.000000000 +0200
+diff -uNr linux-2.6.14-rc2/drivers/net.orig/sk98lin/h/skgepnmi.h linux-2.6.14-rc2/drivers/net/sk98lin/h/skgepnmi.h
+--- linux-2.6.14-rc2/drivers/net.orig/sk98lin/h/skgepnmi.h 2005-09-20 03:00:41.000000000 +0000
++++ linux-2.6.14-rc2/drivers/net/sk98lin/h/skgepnmi.h 2005-09-30 22:52:25.002677856 +0000
@@ -1,9 +1,9 @@
/*****************************************************************************
*
@@ -4950,9 +5052,9 @@
#ifdef SK_DIAG_SUPPORT
SK_U32 DiagAttached;
#endif /* SK_DIAG_SUPPORT */
-diff -uNr linux-2.6.13.1/drivers/net.orig/sk98lin/h/skgesirq.h linux-2.6.13.1/drivers/net/sk98lin/h/skgesirq.h
---- linux-2.6.13.1/drivers/net.orig/sk98lin/h/skgesirq.h 2005-09-10 04:42:58.000000000 +0200
-+++ linux-2.6.13.1/drivers/net/sk98lin/h/skgesirq.h 2005-06-20 10:50:16.000000000 +0200
+diff -uNr linux-2.6.14-rc2/drivers/net.orig/sk98lin/h/skgesirq.h linux-2.6.14-rc2/drivers/net/sk98lin/h/skgesirq.h
+--- linux-2.6.14-rc2/drivers/net.orig/sk98lin/h/skgesirq.h 2005-09-20 03:00:41.000000000 +0000
++++ linux-2.6.14-rc2/drivers/net/sk98lin/h/skgesirq.h 2005-09-30 22:52:25.003677704 +0000
@@ -2,22 +2,21 @@
*
* Name: skgesirq.h
@@ -5030,9 +5132,9 @@
#endif /* _INC_SKGESIRQ_H_ */
+
-diff -uNr linux-2.6.13.1/drivers/net.orig/sk98lin/h/skgetwsi.h linux-2.6.13.1/drivers/net/sk98lin/h/skgetwsi.h
---- linux-2.6.13.1/drivers/net.orig/sk98lin/h/skgetwsi.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.13.1/drivers/net/sk98lin/h/skgetwsi.h 2005-06-20 10:50:16.000000000 +0200
+diff -uNr linux-2.6.14-rc2/drivers/net.orig/sk98lin/h/skgetwsi.h linux-2.6.14-rc2/drivers/net/sk98lin/h/skgetwsi.h
+--- linux-2.6.14-rc2/drivers/net.orig/sk98lin/h/skgetwsi.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.14-rc2/drivers/net/sk98lin/h/skgetwsi.h 2005-09-30 22:52:25.006677248 +0000
@@ -0,0 +1,241 @@
+/******************************************************************************
+ *
@@ -5275,9 +5377,9 @@
+extern int SkLm80ReadSensor(SK_AC *pAC, SK_IOC IoC, SK_SENSOR *pSen);
+#endif /* n_INC_SKGETWSI_H */
+
-diff -uNr linux-2.6.13.1/drivers/net.orig/sk98lin/h/ski2c.h linux-2.6.13.1/drivers/net/sk98lin/h/ski2c.h
---- linux-2.6.13.1/drivers/net.orig/sk98lin/h/ski2c.h 2005-09-10 04:42:58.000000000 +0200
-+++ linux-2.6.13.1/drivers/net/sk98lin/h/ski2c.h 1970-01-01 01:00:00.000000000 +0100
+diff -uNr linux-2.6.14-rc2/drivers/net.orig/sk98lin/h/ski2c.h linux-2.6.14-rc2/drivers/net/sk98lin/h/ski2c.h
+--- linux-2.6.14-rc2/drivers/net.orig/sk98lin/h/ski2c.h 2005-09-20 03:00:41.000000000 +0000
++++ linux-2.6.14-rc2/drivers/net/sk98lin/h/ski2c.h 1970-01-01 00:00:00.000000000 +0000
@@ -1,177 +0,0 @@
-/******************************************************************************
- *
@@ -5456,9 +5558,9 @@
-#endif /* !SK_DIAG */
-#endif /* n_SKI2C_H */
-
-diff -uNr linux-2.6.13.1/drivers/net.orig/sk98lin/h/skqueue.h linux-2.6.13.1/drivers/net/sk98lin/h/skqueue.h
---- linux-2.6.13.1/drivers/net.orig/sk98lin/h/skqueue.h 2005-09-10 04:42:58.000000000 +0200
-+++ linux-2.6.13.1/drivers/net/sk98lin/h/skqueue.h 2005-06-20 10:50:16.000000000 +0200
+diff -uNr linux-2.6.14-rc2/drivers/net.orig/sk98lin/h/skqueue.h linux-2.6.14-rc2/drivers/net/sk98lin/h/skqueue.h
+--- linux-2.6.14-rc2/drivers/net.orig/sk98lin/h/skqueue.h 2005-09-20 03:00:41.000000000 +0000
++++ linux-2.6.14-rc2/drivers/net/sk98lin/h/skqueue.h 2005-09-30 22:52:25.008676944 +0000
@@ -2,8 +2,8 @@
*
* Name: skqueue.h
@@ -5492,9 +5594,9 @@
+#define SKERR_Q_E005MSG "Event scheduler called in Init Level 0 or 1"
#endif /* _SKQUEUE_H_ */
-diff -uNr linux-2.6.13.1/drivers/net.orig/sk98lin/h/skrlmt.h linux-2.6.13.1/drivers/net/sk98lin/h/skrlmt.h
---- linux-2.6.13.1/drivers/net.orig/sk98lin/h/skrlmt.h 2005-09-10 04:42:58.000000000 +0200
-+++ linux-2.6.13.1/drivers/net/sk98lin/h/skrlmt.h 2005-06-20 10:50:16.000000000 +0200
+diff -uNr linux-2.6.14-rc2/drivers/net.orig/sk98lin/h/skrlmt.h linux-2.6.14-rc2/drivers/net/sk98lin/h/skrlmt.h
+--- linux-2.6.14-rc2/drivers/net.orig/sk98lin/h/skrlmt.h 2005-09-20 03:00:41.000000000 +0000
++++ linux-2.6.14-rc2/drivers/net/sk98lin/h/skrlmt.h 2005-09-30 22:52:25.009676792 +0000
@@ -2,8 +2,8 @@
*
* Name: skrlmt.h
@@ -5506,9 +5608,9 @@
* Purpose: Header file for Redundant Link ManagemenT.
*
******************************************************************************/
-diff -uNr linux-2.6.13.1/drivers/net.orig/sk98lin/h/sktimer.h linux-2.6.13.1/drivers/net/sk98lin/h/sktimer.h
---- linux-2.6.13.1/drivers/net.orig/sk98lin/h/sktimer.h 2005-09-10 04:42:58.000000000 +0200
-+++ linux-2.6.13.1/drivers/net/sk98lin/h/sktimer.h 2005-06-20 10:50:16.000000000 +0200
+diff -uNr linux-2.6.14-rc2/drivers/net.orig/sk98lin/h/sktimer.h linux-2.6.14-rc2/drivers/net/sk98lin/h/sktimer.h
+--- linux-2.6.14-rc2/drivers/net.orig/sk98lin/h/sktimer.h 2005-09-20 03:00:41.000000000 +0000
++++ linux-2.6.14-rc2/drivers/net/sk98lin/h/sktimer.h 2005-09-30 22:52:25.009676792 +0000
@@ -2,8 +2,8 @@
*
* Name: sktimer.h
@@ -5520,9 +5622,9 @@
* Purpose: Defines for the timer functions
*
******************************************************************************/
-diff -uNr linux-2.6.13.1/drivers/net.orig/sk98lin/h/sktwsi.h linux-2.6.13.1/drivers/net/sk98lin/h/sktwsi.h
---- linux-2.6.13.1/drivers/net.orig/sk98lin/h/sktwsi.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.13.1/drivers/net/sk98lin/h/sktwsi.h 2005-06-20 10:50:16.000000000 +0200
+diff -uNr linux-2.6.14-rc2/drivers/net.orig/sk98lin/h/sktwsi.h linux-2.6.14-rc2/drivers/net/sk98lin/h/sktwsi.h
+--- linux-2.6.14-rc2/drivers/net.orig/sk98lin/h/sktwsi.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.14-rc2/drivers/net/sk98lin/h/sktwsi.h 2005-09-30 22:52:25.011676488 +0000
@@ -0,0 +1,177 @@
+/******************************************************************************
+ *
@@ -5701,9 +5803,9 @@
+#endif /* !SK_DIAG */
+#endif /* n_SKTWSI_H */
+
-diff -uNr linux-2.6.13.1/drivers/net.orig/sk98lin/h/sktypes.h linux-2.6.13.1/drivers/net/sk98lin/h/sktypes.h
---- linux-2.6.13.1/drivers/net.orig/sk98lin/h/sktypes.h 2005-09-10 04:42:58.000000000 +0200
-+++ linux-2.6.13.1/drivers/net/sk98lin/h/sktypes.h 2005-06-20 10:50:16.000000000 +0200
+diff -uNr linux-2.6.14-rc2/drivers/net.orig/sk98lin/h/sktypes.h linux-2.6.14-rc2/drivers/net/sk98lin/h/sktypes.h
+--- linux-2.6.14-rc2/drivers/net.orig/sk98lin/h/sktypes.h 2005-09-20 03:00:41.000000000 +0000
++++ linux-2.6.14-rc2/drivers/net/sk98lin/h/sktypes.h 2005-09-30 22:52:25.012676336 +0000
@@ -2,8 +2,8 @@
*
* Name: sktypes.h
@@ -5793,9 +5895,9 @@
+ * End of file
+ *
+ ******************************************************************************/
-diff -uNr linux-2.6.13.1/drivers/net.orig/sk98lin/h/skversion.h linux-2.6.13.1/drivers/net/sk98lin/h/skversion.h
---- linux-2.6.13.1/drivers/net.orig/sk98lin/h/skversion.h 2005-09-10 04:42:58.000000000 +0200
-+++ linux-2.6.13.1/drivers/net/sk98lin/h/skversion.h 2005-06-20 10:50:16.000000000 +0200
+diff -uNr linux-2.6.14-rc2/drivers/net.orig/sk98lin/h/skversion.h linux-2.6.14-rc2/drivers/net/sk98lin/h/skversion.h
+--- linux-2.6.14-rc2/drivers/net.orig/sk98lin/h/skversion.h 2005-09-20 03:00:41.000000000 +0000
++++ linux-2.6.14-rc2/drivers/net/sk98lin/h/skversion.h 2005-09-30 22:52:25.013676184 +0000
@@ -1,17 +1,17 @@
/******************************************************************************
*
@@ -5848,9 +5950,9 @@
+ * End of file
+ *
+ ******************************************************************************/
-diff -uNr linux-2.6.13.1/drivers/net.orig/sk98lin/h/skvpd.h linux-2.6.13.1/drivers/net/sk98lin/h/skvpd.h
---- linux-2.6.13.1/drivers/net.orig/sk98lin/h/skvpd.h 2005-09-10 04:42:58.000000000 +0200
-+++ linux-2.6.13.1/drivers/net/sk98lin/h/skvpd.h 2005-06-20 10:50:16.000000000 +0200
+diff -uNr linux-2.6.14-rc2/drivers/net.orig/sk98lin/h/skvpd.h linux-2.6.14-rc2/drivers/net/sk98lin/h/skvpd.h
+--- linux-2.6.14-rc2/drivers/net.orig/sk98lin/h/skvpd.h 2005-09-20 03:00:41.000000000 +0000
++++ linux-2.6.14-rc2/drivers/net/sk98lin/h/skvpd.h 2005-09-30 22:52:25.015675880 +0000
@@ -1,22 +1,22 @@
/******************************************************************************
*
@@ -6061,9 +6163,9 @@
#endif /* __INC_SKVPD_H_ */
+
-diff -uNr linux-2.6.13.1/drivers/net.orig/sk98lin/h/sky2le.h linux-2.6.13.1/drivers/net/sk98lin/h/sky2le.h
---- linux-2.6.13.1/drivers/net.orig/sk98lin/h/sky2le.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.13.1/drivers/net/sk98lin/h/sky2le.h 2005-06-20 10:50:16.000000000 +0200
+diff -uNr linux-2.6.14-rc2/drivers/net.orig/sk98lin/h/sky2le.h linux-2.6.14-rc2/drivers/net/sk98lin/h/sky2le.h
+--- linux-2.6.14-rc2/drivers/net.orig/sk98lin/h/sky2le.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.14-rc2/drivers/net/sk98lin/h/sky2le.h 2005-09-30 22:52:25.022674816 +0000
@@ -0,0 +1,891 @@
+/******************************************************************************
+ *
@@ -6956,9 +7058,9 @@
+
+#endif /* __INC_SKY2LE_H */
+
-diff -uNr linux-2.6.13.1/drivers/net.orig/sk98lin/h/xmac_ii.h linux-2.6.13.1/drivers/net/sk98lin/h/xmac_ii.h
---- linux-2.6.13.1/drivers/net.orig/sk98lin/h/xmac_ii.h 2005-09-10 04:42:58.000000000 +0200
-+++ linux-2.6.13.1/drivers/net/sk98lin/h/xmac_ii.h 2005-06-20 10:50:16.000000000 +0200
+diff -uNr linux-2.6.14-rc2/drivers/net.orig/sk98lin/h/xmac_ii.h linux-2.6.14-rc2/drivers/net/sk98lin/h/xmac_ii.h
+--- linux-2.6.14-rc2/drivers/net.orig/sk98lin/h/xmac_ii.h 2005-09-20 03:00:41.000000000 +0000
++++ linux-2.6.14-rc2/drivers/net/sk98lin/h/xmac_ii.h 2005-09-30 22:52:25.033673144 +0000
@@ -2,8 +2,8 @@
*
* Name: xmac_ii.h
@@ -7875,111 +7977,9 @@
/* typedefs *******************************************************************/
-diff -uNr linux-2.6.13.1/drivers/net.orig/sk98lin/Makefile linux-2.6.13.1/drivers/net/sk98lin/Makefile
---- linux-2.6.13.1/drivers/net.orig/sk98lin/Makefile 2005-09-10 04:42:58.000000000 +0200
-+++ linux-2.6.13.1/drivers/net/sk98lin/Makefile 2005-06-20 10:50:16.000000000 +0200
-@@ -1,6 +1,59 @@
-+#******************************************************************************
- #
--# Makefile for the SysKonnect SK-98xx device driver.
-+# Name: skge.c
-+# Project: GEnesis, PCI Gigabit Ethernet Adapter
-+# Version: $Revision$
-+# Date: $Date$
-+# Purpose: The main driver source module
- #
-+#******************************************************************************
-+
-+#******************************************************************************
-+#
-+# (C)Copyright 1998-2002 SysKonnect GmbH.
-+# (C)Copyright 2002-2005 Marvell.
-+#
-+# Makefile for Marvell Yukon chipset and SysKonnect Gigabit Ethernet
-+# Server Adapter driver. (Kernel 2.6)
-+#
-+# Author: Mirko Lindner (mlindner at syskonnect.de)
-+# Ralph Roesler (rroesler at syskonnect.de)
-+#
-+# Address all question to: linux at syskonnect.de
-+#
-+# 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
-+# (at your option) any later version.
-+#
-+# The information in this file is provided "AS IS" without warranty.
-+#
-+#******************************************************************************
-+
-+#******************************************************************************
-+#
-+# History:
-+#
-+# $Log$
-+# Revision 1.1.2.1 2005/09/15 11:05:32 pluto
-+# - updated.
-+#
-+# Revision 1.9.2.1 2005/04/11 09:01:18 mlindner
-+# Fix: Copyright year changed
-+#
-+# Revision 1.9 2004/07/13 15:54:50 rroesler
-+# Add: file skethtool.c
-+# Fix: corrected header regarding copyright
-+# Fix: minor typos corrected
-+#
-+# Revision 1.8 2004/06/08 08:39:38 mlindner
-+# Fix: Add CONFIG_SK98LIN_ZEROCOPY as default
-+#
-+# Revision 1.7 2004/06/03 16:06:56 mlindner
-+# Fix: Added compile flag SK_DIAG_SUPPORT
-+#
-+# Revision 1.6 2004/06/02 08:02:59 mlindner
-+# Add: Changed header information and inserted a GPL statement
-+#
-+#
-+#******************************************************************************
-
-
- #
-@@ -13,14 +66,16 @@
- obj-$(CONFIG_SK98LIN) += sk98lin.o
- sk98lin-objs := \
- skge.o \
-+ sky2.o \
- skethtool.o \
-+ sky2le.o \
- skdim.o \
- skaddr.o \
- skgehwt.o \
- skgeinit.o \
- skgepnmi.o \
- skgesirq.o \
-- ski2c.o \
-+ sktwsi.o \
- sklm80.o \
- skqueue.o \
- skrlmt.o \
-@@ -77,13 +132,11 @@
- # SK_DBGCAT_DRV_INT_SRC 0x04000000 interrupts sources
- # SK_DBGCAT_DRV_EVENT 0x08000000 driver events
-
--EXTRA_CFLAGS += -Idrivers/net/sk98lin -DSK_DIAG_SUPPORT -DSK_USE_CSUM -DGENESIS -DYUKON $(DBGDEF) $(SKPARAM)
-+EXTRA_CFLAGS += -Idrivers/net/sk98lin -DSK_USE_CSUM -DSK_DIAG_SUPPORT \
-+ -DGENESIS -DYUKON -DYUK2 -DCONFIG_SK98LIN_ZEROCOPY \
-+ $(DBGDEF) $(SKPARAM)
-
- clean:
- rm -f core *.o *.a *.s
-
-
--
--
--
--
-diff -uNr linux-2.6.13.1/drivers/net.orig/sk98lin/skaddr.c linux-2.6.13.1/drivers/net/sk98lin/skaddr.c
---- linux-2.6.13.1/drivers/net.orig/sk98lin/skaddr.c 2005-09-10 04:42:58.000000000 +0200
-+++ linux-2.6.13.1/drivers/net/sk98lin/skaddr.c 2005-06-20 10:50:16.000000000 +0200
+diff -uNr linux-2.6.14-rc2/drivers/net.orig/sk98lin/skaddr.c linux-2.6.14-rc2/drivers/net/sk98lin/skaddr.c
+--- linux-2.6.14-rc2/drivers/net.orig/sk98lin/skaddr.c 2005-09-20 03:00:41.000000000 +0000
++++ linux-2.6.14-rc2/drivers/net/sk98lin/skaddr.c 2005-09-30 22:52:25.039672232 +0000
@@ -2,8 +2,8 @@
*
* Name: skaddr.c
@@ -8373,9 +8373,9 @@
#if (!defined(SK_SLIM) || defined(DEBUG))
if (PortNumber >= (SK_U32) pAC->GIni.GIMacsFound) {
return (SK_ADDR_ILLEGAL_PORT);
-diff -uNr linux-2.6.13.1/drivers/net.orig/sk98lin/skcsum.c linux-2.6.13.1/drivers/net/sk98lin/skcsum.c
---- linux-2.6.13.1/drivers/net.orig/sk98lin/skcsum.c 2005-09-10 04:42:58.000000000 +0200
-+++ linux-2.6.13.1/drivers/net/sk98lin/skcsum.c 2005-06-20 10:50:16.000000000 +0200
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/linux-2.6-sk98lin-8.23.1.3.patch?r1=1.1.2.1&r2=1.1.2.2&f=u
More information about the pld-cvs-commit
mailing list