[PATCH] sk98lin: Added Support for Belkin adapter

Patch 1/2
[SK98LIN]: Added Support for Belkin adapter
[SK98LIN]: Don't handle Yukon2 cards at the moment

diff --git a/Documentation/networking/sk98lin.txt b/Documentation/networking/sk98lin.txt
index d25cd95fa7fd36ea25d8383245bf489bc64fc6b4..19ed48714a31b18ed9b846ec487f56f9f1cda774 100644 (file)
--- a/Documentation/networking/sk98lin.txt
+++ b/Documentation/networking/sk98lin.txt
@@ -1,10 +1,10 @@
-(C)Copyright 1999-2003 Marvell(R).
+(C)Copyright 1999-2004 Marvell(R).
 All rights reserved
 ===========================================================================
 
-sk98lin.txt created 15-Dec-2003
+sk98lin.txt created 13-Feb-2004
 
-Readme File for sk98lin v6.21
+Readme File for sk98lin v6.23
 Marvell Yukon/SysKonnect SK-98xx Gigabit Ethernet Adapter family driver for LINUX
 
 This file contains

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 8d758841cd2048d52fdb55b99d81a511059b544f..1990dad6b986fde47c553a31086738f8a0a6dd20 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1985,6 +1985,7 @@ config SK98LIN
            - Allied Telesyn AT-2970TX/2TX Gigabit Ethernet Adapter
            - Allied Telesyn AT-2971SX Gigabit Ethernet Adapter
            - Allied Telesyn AT-2971T Gigabit Ethernet Adapter
+           - Belkin Gigabit Desktop Card 10/100/1000Base-T Adapter, Copper RJ-45
            - DGE-530T Gigabit Ethernet Adapter
            - EG1032 v2 Instant Gigabit Network Adapter
            - EG1064 v2 Instant Gigabit Network Adapter
@@ -1996,6 +1997,7 @@ config SK98LIN
            - Marvell 88E8001 Gigabit LOM Ethernet Adapter (Foxconn)
            - Marvell 88E8001 Gigabit LOM Ethernet Adapter (Gigabyte)
            - Marvell 88E8001 Gigabit LOM Ethernet Adapter (Iwill)
+           - Marvell 88E8050 Gigabit LOM Ethernet Adapter (Intel)
            - Marvell RDK-8001 Adapter
            - Marvell RDK-8002 Adapter
            - Marvell RDK-8003 Adapter
@@ -2007,6 +2009,7 @@ config SK98LIN
            - Marvell RDK-8010 Adapter
            - Marvell RDK-8011 Adapter
            - Marvell RDK-8012 Adapter
+           - Marvell RDK-8052 Adapter
            - Marvell Yukon Gigabit Ethernet 10/100/1000Base-T Adapter (32 bit)
            - Marvell Yukon Gigabit Ethernet 10/100/1000Base-T Adapter (64 bit)
            - N-Way PCI-Bus Giga-Card 1000/100/10Mbps(L)

diff --git a/drivers/net/sk98lin/h/skdrv2nd.h b/drivers/net/sk98lin/h/skdrv2nd.h
index b94b65dd93f30fef5407e96d14de5c6b25237af0..e3e83ed0f246bb40685620f0b0b5536b63090c8d 100644 (file)
--- a/drivers/net/sk98lin/h/skdrv2nd.h
+++ b/drivers/net/sk98lin/h/skdrv2nd.h
@@ -2,6 +2,8 @@
  *
  * Name:       skdrv2nd.h
  * Project:    GEnesis, PCI Gigabit Ethernet Adapter
+ * Version:    $Revision: 1.10 $
+ * Date:       $Date: 2003/12/11 16:04:45 $
  * Purpose:    Second header file for driver and all other modules
  *
  ******************************************************************************/
@@ -76,7 +78,13 @@
     /* Marvell (0x11ab) */     \
     } else if (pdev->vendor == 0x11ab) {     \
         /* Gigabit Ethernet Adapter (0x4320) */     \
-        if ((pdev->device == 0x4320)) { \
+        /* Gigabit Ethernet Adapter (0x4360) */     \
+        /* Gigabit Ethernet Adapter (0x4361) */     \
+        /* Belkin (0x5005) */     \
+        if ((pdev->device == 0x4320) || \
+            (pdev->device == 0x4360) || \
+            (pdev->device == 0x4361) || \
+            (pdev->device == 0x5005)) { \
             result = SK_TRUE;     \
         }     \
     /* CNet (0x1371) */     \

diff --git a/drivers/net/sk98lin/h/skversion.h b/drivers/net/sk98lin/h/skversion.h
index 4e13c267b7977b52833a6faa35e6bcf2f96f844e..a1a7294828e5007001874bb4c3aa19bbe95f795f 100644 (file)
--- a/drivers/net/sk98lin/h/skversion.h
+++ b/drivers/net/sk98lin/h/skversion.h
@@ -2,6 +2,8 @@
  *
  * Name:       version.h
  * Project:    GEnesis, PCI Gigabit Ethernet Adapter
+ * Version:    $Revision: 1.5 $
+ * Date:       $Date: 2003/10/07 08:16:51 $
  * Purpose:    SK specific Error log support
  *
  ******************************************************************************/
@@ -23,14 +25,14 @@
 #ifdef lint
 static const char SysKonnectFileId[] = "@(#) (C) SysKonnect GmbH.";
 static const char SysKonnectBuildNumber[] =
-       "@(#)SK-BUILD: 6.22 PL: 01"; 
+       "@(#)SK-BUILD: 6.23 PL: 01"; 
 #endif /* !defined(lint) */
 
-#define BOOT_STRING    "sk98lin: Network Device Driver v6.22\n" \
+#define BOOT_STRING    "sk98lin: Network Device Driver v6.23\n" \
                        "(C)Copyright 1999-2004 Marvell(R)."
 
-#define VER_STRING     "6.22"
+#define VER_STRING     "6.23"
 #define DRIVER_FILE_NAME       "sk98lin"
-#define DRIVER_REL_DATE                "Jan-30-2004"
+#define DRIVER_REL_DATE                "Feb-13-2004"
 
 

diff --git a/drivers/net/sk98lin/skge.c b/drivers/net/sk98lin/skge.c
index 17d858e98b87b73605d5723065a0a6b2d0a6552a..9f95761509fc353b3fc8040882c5686452288234 100644 (file)
--- a/drivers/net/sk98lin/skge.c
+++ b/drivers/net/sk98lin/skge.c
@@ -2,6 +2,8 @@
  *
  * Name:       skge.c
  * Project:    GEnesis, PCI Gigabit Ethernet Adapter
+ * Version:    $Revision: 1.45 $
+ * Date:               $Date: 2004/02/12 14:41:02 $
  * Purpose:    The main driver source module
  *
  ******************************************************************************/
@@ -294,7 +296,6 @@ static int __init skge_probe (void)
        SK_BOOL BootStringCount = SK_FALSE;
        int                     retval;
 #ifdef CONFIG_PROC_FS
-       int                     proc_root_initialized = 0;
        struct proc_dir_entry   *pProcFile;
 #endif
 
@@ -311,6 +312,12 @@ static int __init skge_probe (void)
                dev = NULL;
                pNet = NULL;
 
+               /* Don't handle Yukon2 cards at the moment */
+               /* 12-feb-2004 ---- mlindner@syskonnect.de */
+               if (pdev->vendor == 0x11ab) {
+                       if ( (pdev->device == 0x4360) || (pdev->device == 0x4361) )
+                               continue;
+               }
 
                SK_PCI_ISCOMPLIANT(vendor_flag, pdev);
                if (!vendor_flag)