vserver 1.9.5.x5
[linux-2.6.git] / drivers / net / sk98lin / skge.c
index 53da481..5eb7bc1 100644 (file)
@@ -72,8 +72,8 @@
  *             <linux/slab.h>
  *             <linux/interrupt.h>
  *             <linux/pci.h>
+ *             <linux/bitops.h>
  *             <asm/byteorder.h>
- *             <asm/bitops.h>
  *             <asm/io.h>
  *             <linux/netdevice.h>
  *             <linux/etherdevice.h>
 #include       "h/skversion.h"
 
 #include       <linux/module.h>
+#include       <linux/moduleparam.h>
 #include       <linux/init.h>
-
-#ifdef CONFIG_PROC_FS
 #include       <linux/proc_fs.h>
-#endif
 
 #include       "h/skdrv1st.h"
 #include       "h/skdrv2nd.h"
@@ -236,17 +234,33 @@ static int      SkDrvDeInitAdapter(SK_AC *pAC, int devNbr);
  * Extern Function Prototypes
  *
  ******************************************************************************/
-
-#ifdef CONFIG_PROC_FS
-static const char      SK_Root_Dir_entry[] = "sk98lin";
-static struct          proc_dir_entry *pSkRootDir = NULL;
+static const char      SKRootName[] = "sk98lin";
+static struct          proc_dir_entry *pSkRootDir;
 extern struct  file_operations sk_proc_fops;
-#endif
+
+static inline void SkGeProcCreate(struct net_device *dev)
+{
+       struct proc_dir_entry *pe;
+
+       if (pSkRootDir && 
+           (pe = create_proc_entry(dev->name, S_IRUGO, pSkRootDir))) {
+               pe->proc_fops = &sk_proc_fops;
+               pe->data = dev;
+               pe->owner = THIS_MODULE;
+       }
+}
+static inline void SkGeProcRemove(struct net_device *dev)
+{
+       if (pSkRootDir)
+               remove_proc_entry(dev->name, pSkRootDir);
+}
 
 extern void SkDimEnableModerationIfNeeded(SK_AC *pAC); 
 extern void SkDimDisplayModerationSettings(SK_AC *pAC);
 extern void SkDimStartModerationTimer(SK_AC *pAC);
 extern void SkDimModerate(SK_AC *pAC);
+extern void SkGeBlinkTimer(unsigned long data);
 
 #ifdef DEBUG
 static void    DumpMsg(struct sk_buff*, char*);
@@ -255,303 +269,13 @@ static void      DumpLong(char*, int);
 #endif
 
 /* global variables *********************************************************/
-static const char *BootString = BOOT_STRING;
-struct SK_NET_DEVICE *SkGeRootDev = NULL;
-static int probed __initdata = 0;
 static SK_BOOL DoPrintInterfaceChange = SK_TRUE;
+extern  struct ethtool_ops SkGeEthtoolOps;
 
 /* local variables **********************************************************/
 static uintptr_t TxQueueAddr[SK_MAX_MACS][2] = {{0x680, 0x600},{0x780, 0x700}};
 static uintptr_t RxQueueAddr[SK_MAX_MACS] = {0x400, 0x480};
 
-
-#ifdef CONFIG_PROC_FS
-static struct proc_dir_entry   *pSkRootDir;
-#endif
-
-
-
-/*****************************************************************************
- *
- *     skge_probe - find all SK-98xx adapters
- *
- * Description:
- *     This function scans the PCI bus for SK-98xx adapters. Resources for
- *     each adapter are allocated and the adapter is brought into Init 1
- *     state.
- *
- * Returns:
- *     0, if everything is ok
- *     !=0, on error
- */
-static int __init skge_probe (void)
-{
-       int                     boards_found = 0;
-       int                     vendor_flag = SK_FALSE;
-       SK_AC                   *pAC;
-       DEV_NET                 *pNet = NULL;
-       struct pci_dev  *pdev = NULL;
-       struct SK_NET_DEVICE *dev = NULL;
-       SK_BOOL DeviceFound = SK_FALSE;
-       SK_BOOL BootStringCount = SK_FALSE;
-       int                     retval;
-#ifdef CONFIG_PROC_FS
-       struct proc_dir_entry   *pProcFile;
-#endif
-
-       if (probed)
-               return -ENODEV;
-       probed++;
-
-
-       while((pdev = pci_find_class(PCI_CLASS_NETWORK_ETHERNET << 8, pdev))) {
-
-                if (pci_enable_device(pdev)) {
-                        continue;
-                }
-               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)
-                       continue;
-
-               /* Configure DMA attributes. */
-               if (pci_set_dma_mask(pdev, (u64) 0xffffffffffffffffULL) &&
-                       pci_set_dma_mask(pdev, (u64) 0xffffffff))
-                       continue;
-
-
-               if ((dev = alloc_etherdev(sizeof(DEV_NET))) == NULL) {
-                       printk(KERN_ERR "Unable to allocate etherdev "
-                              "structure!\n");
-                       break;
-               }
-
-               pNet = dev->priv;
-               pNet->pAC = kmalloc(sizeof(SK_AC), GFP_KERNEL);
-               if (pNet->pAC == NULL){
-                       free_netdev(dev);
-                       printk(KERN_ERR "Unable to allocate adapter "
-                              "structure!\n");
-                       break;
-               }
-
-               /* Print message */
-               if (!BootStringCount) {
-                       /* set display flag to TRUE so that */
-                       /* we only display this string ONCE */
-                       BootStringCount = SK_TRUE;
-                       printk("%s\n", BootString);
-               }
-
-               memset(pNet->pAC, 0, sizeof(SK_AC));
-               pAC = pNet->pAC;
-               pAC->PciDev = pdev;
-               pAC->PciDevId = pdev->device;
-               pAC->dev[0] = dev;
-               pAC->dev[1] = dev;
-               sprintf(pAC->Name, "SysKonnect SK-98xx");
-               pAC->CheckQueue = SK_FALSE;
-
-               pNet->Mtu = 1500;
-               pNet->Up = 0;
-               dev->irq = pdev->irq;
-               retval = SkGeInitPCI(pAC);
-               if (retval) {
-                       printk("SKGE: PCI setup failed: %i\n", retval);
-                       free_netdev(dev);
-                       continue;
-               }
-
-               SET_MODULE_OWNER(dev);
-               dev->open =             &SkGeOpen;
-               dev->stop =             &SkGeClose;
-               dev->hard_start_xmit =  &SkGeXmit;
-               dev->get_stats =        &SkGeStats;
-               dev->last_stats =       &SkGeStats;
-               dev->set_multicast_list = &SkGeSetRxMode;
-               dev->set_mac_address =  &SkGeSetMacAddr;
-               dev->do_ioctl =         &SkGeIoctl;
-               dev->change_mtu =       &SkGeChangeMtu;
-               dev->flags &=           ~IFF_RUNNING;
-               SET_NETDEV_DEV(dev, &pdev->dev);
-
-#ifdef SK_ZEROCOPY
-#ifdef USE_SK_TX_CHECKSUM
-
-               if (pAC->ChipsetType) {
-                       /* Use only if yukon hardware */
-                       /* SK and ZEROCOPY - fly baby... */
-                       dev->features |= NETIF_F_SG | NETIF_F_IP_CSUM;
-               }
-#endif
-#endif
-
-               pAC->Index = boards_found;
-
-               if (SkGeBoardInit(dev, pAC)) {
-                       free_netdev(dev);
-                       continue;
-               }
-
-               /* Register net device */
-               if (register_netdev(dev)) {
-                       printk(KERN_ERR "SKGE: Could not register device.\n");
-                       FreeResources(dev);
-                       free_netdev(dev);
-                       continue;
-               }
-
-               /* Print adapter specific string from vpd */
-               ProductStr(pAC);
-               printk("%s: %s\n", dev->name, pAC->DeviceStr);
-
-               /* Print configuration settings */
-               printk("      PrefPort:%c  RlmtMode:%s\n",
-                       'A' + pAC->Rlmt.Net[0].Port[pAC->Rlmt.Net[0].PrefPort]->PortNumber,
-                       (pAC->RlmtMode==0)  ? "Check Link State" :
-                       ((pAC->RlmtMode==1) ? "Check Link State" :
-                       ((pAC->RlmtMode==3) ? "Check Local Port" :
-                       ((pAC->RlmtMode==7) ? "Check Segmentation" :
-                       ((pAC->RlmtMode==17) ? "Dual Check Link State" :"Error")))));
-
-               SkGeYellowLED(pAC, pAC->IoBase, 1);
-
-
-               memcpy((caddr_t) &dev->dev_addr,
-                       (caddr_t) &pAC->Addr.Net[0].CurrentMacAddress, 6);
-
-               /* First adapter... Create proc and print message */
-#ifdef CONFIG_PROC_FS
-               if (!DeviceFound) {
-                       DeviceFound = SK_TRUE;
-                       SK_MEMCPY(&SK_Root_Dir_entry, BootString,
-                               sizeof(SK_Root_Dir_entry) - 1);
-
-                       /*Create proc (directory)*/
-                       if(!pSkRootDir) {
-                               pSkRootDir = proc_mkdir(SK_Root_Dir_entry, proc_net);
-                               if (!pSkRootDir) {
-                                       printk(KERN_WARNING "%s: Unable to create /proc/net/%s",
-                                               dev->name, SK_Root_Dir_entry);
-                               } else {
-                                       pSkRootDir->owner = THIS_MODULE;
-                               }
-                       }
-               }
-
-               /* Create proc file */
-               if (pSkRootDir && 
-                       (pProcFile = create_proc_entry(dev->name, S_IRUGO,
-                               pSkRootDir))) {
-                       pProcFile->proc_fops = &sk_proc_fops;
-                       pProcFile->data      = dev;
-               }
-
-#endif
-
-               pNet->PortNr = 0;
-               pNet->NetNr  = 0;
-
-               boards_found++;
-
-               /* More then one port found */
-               if ((pAC->GIni.GIMacsFound == 2 ) && (pAC->RlmtNets == 2)) {
-                       if ((dev = alloc_etherdev(sizeof(DEV_NET))) == 0) {
-                               printk(KERN_ERR "Unable to allocate etherdev "
-                                       "structure!\n");
-                               break;
-                       }
-
-                       pAC->dev[1]   = dev;
-                       pNet          = dev->priv;
-                       pNet->PortNr  = 1;
-                       pNet->NetNr   = 1;
-                       pNet->pAC     = pAC;
-                       pNet->Mtu     = 1500;
-                       pNet->Up      = 0;
-
-                       dev->open               = &SkGeOpen;
-                       dev->stop               = &SkGeClose;
-                       dev->hard_start_xmit    = &SkGeXmit;
-                       dev->get_stats          = &SkGeStats;
-                       dev->last_stats         = &SkGeStats;
-                       dev->set_multicast_list = &SkGeSetRxMode;
-                       dev->set_mac_address    = &SkGeSetMacAddr;
-                       dev->do_ioctl           = &SkGeIoctl;
-                       dev->change_mtu         = &SkGeChangeMtu;
-                       dev->flags             &= ~IFF_RUNNING;
-
-#ifdef SK_ZEROCOPY
-#ifdef USE_SK_TX_CHECKSUM
-                       if (pAC->ChipsetType) {
-                               /* SG and ZEROCOPY - fly baby... */
-                               dev->features |= NETIF_F_SG | NETIF_F_IP_CSUM;
-                       }
-#endif
-#endif
-
-                       if (register_netdev(dev)) {
-                               printk(KERN_ERR "SKGE: Could not register device.\n");
-                               free_netdev(dev);
-                               pAC->dev[1] = pAC->dev[0];
-                       } else {
-#ifdef CONFIG_PROC_FS
-                               if (pSkRootDir 
-                                   && (pProcFile = create_proc_entry(dev->name, 
-                                                               S_IRUGO, pSkRootDir))) {
-                                       pProcFile->proc_fops = &sk_proc_fops;
-                                       pProcFile->data      = dev;
-                               }
-#endif
-
-                       memcpy((caddr_t) &dev->dev_addr,
-                       (caddr_t) &pAC->Addr.Net[1].CurrentMacAddress, 6);
-       
-                       printk("%s: %s\n", dev->name, pAC->DeviceStr);
-                       printk("      PrefPort:B  RlmtMode:Dual Check Link State\n");
-                       }
-               }
-
-               /* Save the hardware revision */
-               pAC->HWRevision = (((pAC->GIni.GIPciHwRev >> 4) & 0x0F)*10) +
-                       (pAC->GIni.GIPciHwRev & 0x0F);
-
-               /* Set driver globals */
-               pAC->Pnmi.pDriverFileName    = DRIVER_FILE_NAME;
-               pAC->Pnmi.pDriverReleaseDate = DRIVER_REL_DATE;
-
-               SK_MEMSET(&(pAC->PnmiBackup), 0, sizeof(SK_PNMI_STRUCT_DATA));
-               SK_MEMCPY(&(pAC->PnmiBackup), &(pAC->PnmiStruct), 
-                               sizeof(SK_PNMI_STRUCT_DATA));
-
-               /*
-                * This is bollocks, but we need to tell the net-init
-                * code that it shall go for the next device.
-                */
-#ifndef MODULE
-               dev->base_addr = 0;
-#endif
-       }
-
-       /*
-        * If we're at this point we're going through skge_probe() for
-        * the first time.  Return success (0) if we've initialized 1
-        * or more boards. Otherwise, return failure (-ENODEV).
-        */
-
-       return boards_found;
-} /* skge_probe */
-
-
 /*****************************************************************************
  *
  *     SkGeInitPCI - Init the PCI resources
@@ -596,7 +320,7 @@ int SkGeInitPCI(SK_AC *pAC)
        /*
         * Remap the regs into kernel space.
         */
-       pAC->IoBase = (char*)ioremap_nocache(dev->mem_start, 0x4000);
+       pAC->IoBase = ioremap_nocache(dev->mem_start, 0x4000);
 
        if (!pAC->IoBase){
                retval = 3;
@@ -630,22 +354,20 @@ SK_U32 AllocFlag;
 DEV_NET                *pNet;
 SK_AC          *pAC;
 
-       if (dev->priv) {
-               pNet = (DEV_NET*) dev->priv;
-               pAC = pNet->pAC;
-               AllocFlag = pAC->AllocFlag;
-               if (pAC->PciDev) {
-                       pci_release_regions(pAC->PciDev);
-               }
-               if (AllocFlag & SK_ALLOC_IRQ) {
-                       free_irq(dev->irq, dev);
-               }
-               if (pAC->IoBase) {
-                       iounmap(pAC->IoBase);
-               }
-               if (pAC->pDescrMem) {
-                       BoardFreeMem(pAC);
-               }
+       pNet = netdev_priv(dev);
+       pAC = pNet->pAC;
+       AllocFlag = pAC->AllocFlag;
+       if (pAC->PciDev) {
+               pci_release_regions(pAC->PciDev);
+       }
+       if (AllocFlag & SK_ALLOC_IRQ) {
+               free_irq(dev->irq, dev);
+       }
+       if (pAC->IoBase) {
+               iounmap(pAC->IoBase);
+       }
+       if (pAC->pDescrMem) {
+               BoardFreeMem(pAC);
        }
        
 } /* FreeResources */
@@ -653,29 +375,6 @@ SK_AC              *pAC;
 MODULE_AUTHOR("Mirko Lindner <mlindner@syskonnect.de>");
 MODULE_DESCRIPTION("SysKonnect SK-NET Gigabit Ethernet SK-98xx driver");
 MODULE_LICENSE("GPL");
-MODULE_PARM(Speed_A,    "1-" __MODULE_STRING(SK_MAX_CARD_PARAM) "s");
-MODULE_PARM(Speed_B,    "1-" __MODULE_STRING(SK_MAX_CARD_PARAM) "s");
-MODULE_PARM(AutoNeg_A,  "1-" __MODULE_STRING(SK_MAX_CARD_PARAM) "s");
-MODULE_PARM(AutoNeg_B,  "1-" __MODULE_STRING(SK_MAX_CARD_PARAM) "s");
-MODULE_PARM(DupCap_A,   "1-" __MODULE_STRING(SK_MAX_CARD_PARAM) "s");
-MODULE_PARM(DupCap_B,   "1-" __MODULE_STRING(SK_MAX_CARD_PARAM) "s");
-MODULE_PARM(FlowCtrl_A, "1-" __MODULE_STRING(SK_MAX_CARD_PARAM) "s");
-MODULE_PARM(FlowCtrl_B, "1-" __MODULE_STRING(SK_MAX_CARD_PARAM) "s");
-MODULE_PARM(Role_A,    "1-" __MODULE_STRING(SK_MAX_CARD_PARAM) "s");
-MODULE_PARM(Role_B,    "1-" __MODULE_STRING(SK_MAX_CARD_PARAM) "s");
-MODULE_PARM(ConType,   "1-" __MODULE_STRING(SK_MAX_CARD_PARAM) "s");
-MODULE_PARM(PrefPort,   "1-" __MODULE_STRING(SK_MAX_CARD_PARAM) "s");
-MODULE_PARM(RlmtMode,   "1-" __MODULE_STRING(SK_MAX_CARD_PARAM) "s");
-/* not used, just there because every driver should have them: */
-MODULE_PARM(options,    "1-" __MODULE_STRING(SK_MAX_CARD_PARAM) "i");
-MODULE_PARM(debug,      "i");
-/* used for interrupt moderation */
-MODULE_PARM(IntsPerSec,     "1-" __MODULE_STRING(SK_MAX_CARD_PARAM) "i");
-MODULE_PARM(Moderation,     "1-" __MODULE_STRING(SK_MAX_CARD_PARAM) "s");
-MODULE_PARM(Stats,          "1-" __MODULE_STRING(SK_MAX_CARD_PARAM) "s");
-MODULE_PARM(ModerationMask, "1-" __MODULE_STRING(SK_MAX_CARD_PARAM) "s");
-MODULE_PARM(AutoSizing,     "1-" __MODULE_STRING(SK_MAX_CARD_PARAM) "s");
-
 
 #ifdef LINK_SPEED_A
 static char *Speed_A[SK_MAX_CARD_PARAM] = LINK_SPEED;
@@ -755,122 +454,31 @@ static char *RlmtMode[SK_MAX_CARD_PARAM] = RLMT_MODE;
 static char *RlmtMode[SK_MAX_CARD_PARAM] = {"", };
 #endif
 
-static int debug = 0; /* not used */
-static int options[SK_MAX_CARD_PARAM] = {0, }; /* not used */
-
 static int   IntsPerSec[SK_MAX_CARD_PARAM];
 static char *Moderation[SK_MAX_CARD_PARAM];
 static char *ModerationMask[SK_MAX_CARD_PARAM];
 static char *AutoSizing[SK_MAX_CARD_PARAM];
 static char *Stats[SK_MAX_CARD_PARAM];
 
-
-/*****************************************************************************
- *
- *     skge_init_module - module initialization function
- *
- * Description:
- *     Very simple, only call skge_probe and return approriate result.
- *
- * Returns:
- *     0, if everything is ok
- *     !=0, on error
- */
-static int __init skge_init_module(void)
-{
-       int cards;
-       SkGeRootDev = NULL;
-       
-       /* just to avoid warnings ... */
-       debug = 0;
-       options[0] = 0;
-
-       cards = skge_probe();
-       if (cards == 0) {
-               printk("sk98lin: No adapter found.\n");
-       }
-       return cards ? 0 : -ENODEV;
-} /* skge_init_module */
-
-
-/*****************************************************************************
- *
- *     skge_cleanup_module - module unload function
- *
- * Description:
- *     Disable adapter if it is still running, free resources,
- *     free device struct.
- *
- * Returns: N/A
- */
-static void __exit skge_cleanup_module(void)
-{
-DEV_NET                *pNet;
-SK_AC          *pAC;
-struct SK_NET_DEVICE *next;
-unsigned long Flags;
-SK_EVPARA EvPara;
-
-       while (SkGeRootDev) {
-               pNet = (DEV_NET*) SkGeRootDev->priv;
-               pAC = pNet->pAC;
-               next = pAC->Next;
-
-               netif_stop_queue(SkGeRootDev);
-               SkGeYellowLED(pAC, pAC->IoBase, 0);
-
-               if(pAC->BoardLevel == SK_INIT_RUN) {
-                       /* board is still alive */
-                       spin_lock_irqsave(&pAC->SlowPathLock, Flags);
-                       EvPara.Para32[0] = 0;
-                       EvPara.Para32[1] = -1;
-                       SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_STOP, EvPara);
-                       EvPara.Para32[0] = 1;
-                       EvPara.Para32[1] = -1;
-                       SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_STOP, EvPara);
-                       SkEventDispatcher(pAC, pAC->IoBase);
-                       /* disable interrupts */
-                       SK_OUT32(pAC->IoBase, B0_IMSK, 0);
-                       SkGeDeInit(pAC, pAC->IoBase);
-                       spin_unlock_irqrestore(&pAC->SlowPathLock, Flags);
-                       pAC->BoardLevel = SK_INIT_DATA;
-                       /* We do NOT check here, if IRQ was pending, of course*/
-               }
-
-               if(pAC->BoardLevel == SK_INIT_IO) {
-                       /* board is still alive */
-                       SkGeDeInit(pAC, pAC->IoBase);
-                       pAC->BoardLevel = SK_INIT_DATA;
-               }
-
-               if ((pAC->GIni.GIMacsFound == 2) && pAC->RlmtNets == 2){
-                       unregister_netdev(pAC->dev[1]);
-                       free_netdev(pAC->dev[1]);
-               }
-
-               FreeResources(SkGeRootDev);
-
-               SkGeRootDev->get_stats = NULL;
-               /*
-                * otherwise unregister_netdev calls get_stats with
-                * invalid IO ...  :-(
-                */
-               unregister_netdev(SkGeRootDev);
-               free_netdev(SkGeRootDev);
-               kfree(pAC);
-               SkGeRootDev = next;
-       }
-
-#ifdef CONFIG_PROC_FS
-       /* clear proc-dir */
-       remove_proc_entry(pSkRootDir->name, proc_net);
-#endif
-
-} /* skge_cleanup_module */
-
-module_init(skge_init_module);
-module_exit(skge_cleanup_module);
-
+module_param_array(Speed_A, charp, NULL, 0);
+module_param_array(Speed_B, charp, NULL, 0);
+module_param_array(AutoNeg_A, charp, NULL, 0);
+module_param_array(AutoNeg_B, charp, NULL, 0);
+module_param_array(DupCap_A, charp, NULL, 0);
+module_param_array(DupCap_B, charp, NULL, 0);
+module_param_array(FlowCtrl_A, charp, NULL, 0);
+module_param_array(FlowCtrl_B, charp, NULL, 0);
+module_param_array(Role_A, charp, NULL, 0);
+module_param_array(Role_B, charp, NULL, 0);
+module_param_array(ConType, charp, NULL, 0);
+module_param_array(PrefPort, charp, NULL, 0);
+module_param_array(RlmtMode, charp, NULL, 0);
+/* used for interrupt moderation */
+module_param_array(IntsPerSec, int, NULL, 0);
+module_param_array(Moderation, charp, NULL, 0);
+module_param_array(Stats, charp, NULL, 0);
+module_param_array(ModerationMask, charp, NULL, 0);
+module_param_array(AutoSizing, charp, NULL, 0);
 
 /*****************************************************************************
  *
@@ -910,6 +518,11 @@ SK_BOOL    DualNet;
        }
        spin_lock_init(&pAC->SlowPathLock);
 
+       /* setup phy_id blink timer */
+       pAC->BlinkTimer.function = SkGeBlinkTimer;
+       pAC->BlinkTimer.data = (unsigned long) dev;
+       init_timer(&pAC->BlinkTimer);
+
        /* level 0 init common modules here */
        
        spin_lock_irqsave(&pAC->SlowPathLock, Flags);
@@ -1008,12 +621,6 @@ SK_BOOL   DualNet;
                return(-EAGAIN);
        }
 
-       /*
-        * Register the device here
-        */
-       pAC->Next = SkGeRootDev;
-       SkGeRootDev = dev;
-
        return (0);
 } /* SkGeBoardInit */
 
@@ -1294,7 +901,7 @@ DEV_NET            *pNet;
 SK_AC          *pAC;
 SK_U32         IntSrc;         /* interrupts source register contents */       
 
-       pNet = (DEV_NET*) dev->priv;
+       pNet = netdev_priv(dev);
        pAC = pNet->pAC;
        
        /*
@@ -1443,7 +1050,7 @@ DEV_NET           *pNet;
 SK_AC          *pAC;
 SK_U32         IntSrc;         /* interrupts source register contents */       
 
-       pNet = (DEV_NET*) dev->priv;
+       pNet = netdev_priv(dev);
        pAC = pNet->pAC;
        
        /*
@@ -1533,6 +1140,24 @@ SK_U32           IntSrc;         /* interrupts source register contents */
                return SkIsrRetHandled;
 } /* SkGeIsrOnePort */
 
+#ifdef CONFIG_NET_POLL_CONTROLLER
+/****************************************************************************
+ *
+ *     SkGePollController - polling receive, for netconsole
+ *
+ * Description:
+ *     Polling receive - used by netconsole and other diagnostic tools
+ *     to allow network i/o with interrupts disabled.
+ *
+ * Returns: N/A
+ */
+static void SkGePollController(struct net_device *dev)
+{
+       disable_irq(dev->irq);
+       SkGeIsr(dev->irq, dev, NULL);
+       enable_irq(dev->irq);
+}
+#endif
 
 /****************************************************************************
  *
@@ -1559,7 +1184,7 @@ struct SK_NET_DEVICE      *dev)
        int                             i;
        SK_EVPARA               EvPara;         /* an event parameter union */
 
-       pNet = (DEV_NET*) dev->priv;
+       pNet = netdev_priv(dev);
        pAC = pNet->pAC;
        
        SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_ENTRY,
@@ -1573,10 +1198,6 @@ struct SK_NET_DEVICE     *dev)
        }
 #endif
 
-       if (!try_module_get(THIS_MODULE)) {
-               return (-1);    /* increase of usage count not possible */
-       }
-
        /* Set blink mode */
        if ((pAC->PciDev->vendor == 0x1186) || (pAC->PciDev->vendor == 0x11ab ))
                pAC->GIni.GILedBlinkCtrl = OEM_CONFIG_VALUE;
@@ -1584,7 +1205,6 @@ struct SK_NET_DEVICE      *dev)
        if (pAC->BoardLevel == SK_INIT_DATA) {
                /* level 1 init common modules here */
                if (SkGeInit(pAC, pAC->IoBase, SK_INIT_IO) != 0) {
-                       module_put(THIS_MODULE); /* decrease usage count */
                        printk("%s: HWInit (1) failed.\n", pAC->dev[pNet->PortNr]->name);
                        return (-1);
                }
@@ -1600,7 +1220,6 @@ struct SK_NET_DEVICE      *dev)
        if (pAC->BoardLevel != SK_INIT_RUN) {
                /* tschilling: Level 2 init modules here, check return value. */
                if (SkGeInit(pAC, pAC->IoBase, SK_INIT_RUN) != 0) {
-                       module_put(THIS_MODULE); /* decrease usage count */
                        printk("%s: HWInit (2) failed.\n", pAC->dev[pNet->PortNr]->name);
                        return (-1);
                }
@@ -1686,19 +1305,18 @@ struct SK_NET_DEVICE    *dev)
        SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_ENTRY,
                ("SkGeClose: pAC=0x%lX ", (unsigned long)pAC));
 
-       pNet = (DEV_NET*) dev->priv;
+       pNet = netdev_priv(dev);
        pAC = pNet->pAC;
 
 #ifdef SK_DIAG_SUPPORT
        if (pAC->DiagModeActive == DIAG_ACTIVE) {
                if (pAC->DiagFlowCtrl == SK_FALSE) {
-                       module_put(THIS_MODULE);
                        /* 
                        ** notify that the interface which has been closed
                        ** by operator interaction must not be started up 
                        ** again when the DIAG has finished. 
                        */
-                       newPtrNet = (DEV_NET *) pAC->dev[0]->priv;
+                       newPtrNet = netdev_priv(pAC->dev[0]);
                        if (newPtrNet == pNet) {
                                pAC->WasIfUp[0] = SK_FALSE;
                        } else {
@@ -1783,7 +1401,6 @@ struct SK_NET_DEVICE      *dev)
        pAC->MaxPorts--;
        pNet->Up = 0;
 
-       module_put(THIS_MODULE);
        return (0);
 } /* SkGeClose */
 
@@ -1809,7 +1426,7 @@ DEV_NET           *pNet;
 SK_AC          *pAC;
 int                    Rc;     /* return code of XmitFrame */
 
-       pNet = (DEV_NET*) dev->priv;
+       pNet = netdev_priv(dev);
        pAC = pNet->pAC;
 
        if ((!skb_shinfo(skb)->nr_frags) ||
@@ -1927,6 +1544,7 @@ struct sk_buff    *pMessage)      /* pointer to send-message              */
        */
        if (BytesSend < C_LEN_ETHERNET_MINSIZE) {
                if ((pMessage = skb_padto(pMessage, C_LEN_ETHERNET_MINSIZE)) == NULL) {
+                       spin_unlock_irqrestore(&pTxPort->TxDesRingLock, Flags);
                        return 0;
                }
                pMessage->len = C_LEN_ETHERNET_MINSIZE;
@@ -2904,7 +2522,7 @@ unsigned long     Flags;
 static int SkGeSetMacAddr(struct SK_NET_DEVICE *dev, void *p)
 {
 
-DEV_NET *pNet = (DEV_NET*) dev->priv;
+DEV_NET *pNet = netdev_priv(dev);
 SK_AC  *pAC = pNet->pAC;
 
 struct sockaddr        *addr = p;
@@ -2961,7 +2579,7 @@ unsigned long             Flags;
        SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_ENTRY,
                ("SkGeSetRxMode starts now... "));
 
-       pNet = (DEV_NET*) dev->priv;
+       pNet = netdev_priv(dev);
        pAC = pNet->pAC;
        if (pAC->RlmtNets == 1)
                PortIdx = pAC->ActivePort;
@@ -3033,7 +2651,7 @@ SK_EVPARA         EvPara;
        SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_ENTRY,
                ("SkGeChangeMtu starts now...\n"));
 
-       pNet = (DEV_NET*) dev->priv;
+       pNet = netdev_priv(dev);
        pAC  = pNet->pAC;
 
        if ((NewMtu < 68) || (NewMtu > SK_JUMBO_MTU)) {
@@ -3055,7 +2673,7 @@ SK_EVPARA         EvPara;
 #endif
 
        pNet->Mtu = NewMtu;
-       pOtherNet = (DEV_NET*)pAC->dev[1 - pNet->NetNr]->priv;
+       pOtherNet = netdev_priv(pAC->dev[1 - pNet->NetNr]);
        if ((pOtherNet->Mtu>1500) && (NewMtu<=1500) && (pOtherNet->Up==1)) {
                return(0);
        }
@@ -3093,8 +2711,7 @@ SK_EVPARA         EvPara;
        SkEventDispatcher(pAC, pAC->IoBase);
 
        for (i=0; i<pAC->GIni.GIMacsFound; i++) {
-               spin_lock_irqsave(
-                       &pAC->TxPort[i][TX_PRIO_LOW].TxDesRingLock, Flags);
+               spin_lock(&pAC->TxPort[i][TX_PRIO_LOW].TxDesRingLock);
                netif_stop_queue(pAC->dev[i]);
 
        }
@@ -3262,7 +2879,7 @@ SK_EVPARA         EvPara;
  */
 static struct net_device_stats *SkGeStats(struct SK_NET_DEVICE *dev)
 {
-DEV_NET *pNet = (DEV_NET*) dev->priv;
+DEV_NET *pNet = netdev_priv(dev);
 SK_AC  *pAC = pNet->pAC;
 SK_PNMI_STRUCT_DATA *pPnmiStruct;       /* structure for all Pnmi-Data */
 SK_PNMI_STAT    *pPnmiStat;             /* pointer to virtual XMAC stat. data */
@@ -3360,7 +2977,7 @@ int               HeaderLength = sizeof(SK_U32) + sizeof(SK_U32);
        SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_ENTRY,
                ("SkGeIoctl starts now...\n"));
 
-       pNet = (DEV_NET*) dev->priv;
+       pNet = netdev_priv(dev);
        pAC = pNet->pAC;
        
        if(copy_from_user(&Ioctl, rq->ifr_data, sizeof(SK_GE_IOCTL))) {
@@ -4773,12 +4390,10 @@ SK_BOOL         DualNet;
                spin_lock_irqsave(
                        &pAC->TxPort[FromPort][TX_PRIO_LOW].TxDesRingLock,
                        Flags);
-               spin_lock_irqsave(
-                       &pAC->TxPort[ToPort][TX_PRIO_LOW].TxDesRingLock, Flags);
+               spin_lock(&pAC->TxPort[ToPort][TX_PRIO_LOW].TxDesRingLock);
                SkGeStopPort(pAC, IoC, FromPort, SK_STOP_ALL, SK_SOFT_RST);
                SkGeStopPort(pAC, IoC, ToPort, SK_STOP_ALL, SK_SOFT_RST);
-               spin_unlock_irqrestore(
-                       &pAC->TxPort[ToPort][TX_PRIO_LOW].TxDesRingLock, Flags);
+               spin_unlock(&pAC->TxPort[ToPort][TX_PRIO_LOW].TxDesRingLock);
                spin_unlock_irqrestore(
                        &pAC->TxPort[FromPort][TX_PRIO_LOW].TxDesRingLock,
                        Flags);
@@ -4791,8 +4406,7 @@ SK_BOOL           DualNet;
                spin_lock_irqsave(
                        &pAC->TxPort[FromPort][TX_PRIO_LOW].TxDesRingLock,
                        Flags);
-               spin_lock_irqsave(
-                       &pAC->TxPort[ToPort][TX_PRIO_LOW].TxDesRingLock, Flags);
+               spin_lock(&pAC->TxPort[ToPort][TX_PRIO_LOW].TxDesRingLock);
                pAC->ActivePort = ToPort;
 #if 0
                SetQueueSizes(pAC);
@@ -4807,8 +4421,7 @@ SK_BOOL           DualNet;
                        pAC,
                        pAC->ActivePort,
                        DualNet)) {
-                       spin_unlock_irqrestore(
-                               &pAC->TxPort[ToPort][TX_PRIO_LOW].TxDesRingLock, Flags);
+                       spin_unlock(&pAC->TxPort[ToPort][TX_PRIO_LOW].TxDesRingLock);
                        spin_unlock_irqrestore(
                                &pAC->TxPort[FromPort][TX_PRIO_LOW].TxDesRingLock,
                                Flags);
@@ -4834,8 +4447,7 @@ SK_BOOL           DualNet;
                SkGePollTxD(pAC, IoC, ToPort, SK_TRUE);
                ClearAndStartRx(pAC, FromPort);
                ClearAndStartRx(pAC, ToPort);
-               spin_unlock_irqrestore(
-                       &pAC->TxPort[ToPort][TX_PRIO_LOW].TxDesRingLock, Flags);
+               spin_unlock(&pAC->TxPort[ToPort][TX_PRIO_LOW].TxDesRingLock);
                spin_unlock_irqrestore(
                        &pAC->TxPort[FromPort][TX_PRIO_LOW].TxDesRingLock,
                        Flags);
@@ -4951,11 +4563,8 @@ char     ClassStr[80];
 int SkDrvEnterDiagMode(
 SK_AC   *pAc)   /* pointer to adapter context */
 {
-       SK_AC   *pAC  = NULL;
-       DEV_NET *pNet = NULL;
-
-       pNet = (DEV_NET *) pAc->dev[0]->priv;
-       pAC = pNet->pAC;
+       DEV_NET *pNet = netdev_priv(pAc->dev[0]);
+       SK_AC   *pAC  = pNet->pAC;
 
        SK_MEMCPY(&(pAc->PnmiBackup), &(pAc->PnmiStruct), 
                        sizeof(SK_PNMI_STRUCT_DATA));
@@ -4970,8 +4579,8 @@ SK_AC   *pAc)   /* pointer to adapter context */
                } else {
                        pAC->WasIfUp[0] = SK_FALSE;
                }
-               if (pNet != (DEV_NET *) pAc->dev[1]->priv) {
-                       pNet = (DEV_NET *) pAc->dev[1]->priv;
+               if (pNet != netdev_priv(pAC->dev[1])) {
+                       pNet = netdev_priv(pAC->dev[1]);
                        if (pNet->Up) {
                                pAC->WasIfUp[1] = SK_TRUE;
                                pAC->DiagFlowCtrl = SK_TRUE; /* for SkGeClose */
@@ -5093,20 +4702,11 @@ int      devNbr)        /* what device is to be handled */
 
        dev = pAC->dev[devNbr];
 
-       /*
-       ** Function SkGeClose() uses MOD_DEC_USE_COUNT (2.2/2.4)
-       ** or module_put() (2.6) to decrease the number of users for
-       ** a device, but if a device is to be put under control of 
-       ** the DIAG, that count is OK already and does not need to 
-       ** be adapted! Hence the opposite MOD_INC_USE_COUNT or 
-       ** try_module_get() needs to be used again to correct that.
+       /* On Linux 2.6 the network driver does NOT mess with reference
+       ** counts.  The driver MUST be able to be unloaded at any time
+       ** due to the possibility of hotplug.
        */
-       if (!try_module_get(THIS_MODULE)) {
-               return (-1);
-       }
-
        if (SkGeClose(dev) != 0) {
-               module_put(THIS_MODULE);
                return (-1);
        }
        return (0);
@@ -5135,17 +4735,6 @@ int      devNbr) /* what device is to be handled */
 
        if (SkGeOpen(dev) != 0) {
                return (-1);
-       } else {
-               /*
-               ** Function SkGeOpen() uses MOD_INC_USE_COUNT (2.2/2.4) 
-               ** or try_module_get() (2.6) to increase the number of 
-               ** users for a device, but if a device was just under 
-               ** control of the DIAG, that count is OK already and 
-               ** does not need to be adapted! Hence the opposite 
-               ** MOD_DEC_USE_COUNT or module_put() needs to be used 
-               ** again to correct that.
-               */
-               module_put(THIS_MODULE);
        }
 
        /*
@@ -5310,8 +4899,286 @@ int     l;
 
 #endif
 
-/*******************************************************************************
- *
- * End of file
- *
- ******************************************************************************/
+static int __devinit skge_probe_one(struct pci_dev *pdev,
+               const struct pci_device_id *ent)
+{
+       SK_AC                   *pAC;
+       DEV_NET                 *pNet = NULL;
+       struct net_device       *dev = NULL;
+       static int boards_found = 0;
+       int error = -ENODEV;
+
+       if (pci_enable_device(pdev))
+               goto out;
+       /* Configure DMA attributes. */
+       if (pci_set_dma_mask(pdev, (u64) 0xffffffffffffffffULL) &&
+           pci_set_dma_mask(pdev, (u64) 0xffffffff))
+               goto out_disable_device;
+
+
+       if ((dev = alloc_etherdev(sizeof(DEV_NET))) == NULL) {
+               printk(KERN_ERR "Unable to allocate etherdev "
+                      "structure!\n");
+               goto out_disable_device;
+       }
+
+       pNet = netdev_priv(dev);
+       pNet->pAC = kmalloc(sizeof(SK_AC), GFP_KERNEL);
+       if (!pNet->pAC) {
+               printk(KERN_ERR "Unable to allocate adapter "
+                      "structure!\n");
+               goto out_free_netdev;
+       }
+
+       memset(pNet->pAC, 0, sizeof(SK_AC));
+       pAC = pNet->pAC;
+       pAC->PciDev = pdev;
+       pAC->PciDevId = pdev->device;
+       pAC->dev[0] = dev;
+       pAC->dev[1] = dev;
+       sprintf(pAC->Name, "SysKonnect SK-98xx");
+       pAC->CheckQueue = SK_FALSE;
+
+       pNet->Mtu = 1500;
+       pNet->Up = 0;
+       dev->irq = pdev->irq;
+       error = SkGeInitPCI(pAC);
+       if (error) {
+               printk("SKGE: PCI setup failed: %i\n", error);
+               goto out_free_netdev;
+       }
+
+       SET_MODULE_OWNER(dev);
+       dev->open =             &SkGeOpen;
+       dev->stop =             &SkGeClose;
+       dev->hard_start_xmit =  &SkGeXmit;
+       dev->get_stats =        &SkGeStats;
+       dev->set_multicast_list = &SkGeSetRxMode;
+       dev->set_mac_address =  &SkGeSetMacAddr;
+       dev->do_ioctl =         &SkGeIoctl;
+       dev->change_mtu =       &SkGeChangeMtu;
+#ifdef CONFIG_NET_POLL_CONTROLLER
+       dev->poll_controller =  &SkGePollController;
+#endif
+       dev->flags &=           ~IFF_RUNNING;
+       SET_NETDEV_DEV(dev, &pdev->dev);
+       SET_ETHTOOL_OPS(dev, &SkGeEthtoolOps);
+
+#ifdef SK_ZEROCOPY
+#ifdef USE_SK_TX_CHECKSUM
+       if (pAC->ChipsetType) {
+               /* Use only if yukon hardware */
+               /* SK and ZEROCOPY - fly baby... */
+               dev->features |= NETIF_F_SG | NETIF_F_IP_CSUM;
+       }
+#endif
+#endif
+
+       pAC->Index = boards_found++;
+
+       if (SkGeBoardInit(dev, pAC))
+               goto out_free_netdev;
+
+       /* Register net device */
+       if (register_netdev(dev)) {
+               printk(KERN_ERR "SKGE: Could not register device.\n");
+               goto out_free_resources;
+       }
+
+       /* Print adapter specific string from vpd */
+       ProductStr(pAC);
+       printk("%s: %s\n", dev->name, pAC->DeviceStr);
+
+       /* Print configuration settings */
+       printk("      PrefPort:%c  RlmtMode:%s\n",
+               'A' + pAC->Rlmt.Net[0].Port[pAC->Rlmt.Net[0].PrefPort]->PortNumber,
+               (pAC->RlmtMode==0)  ? "Check Link State" :
+               ((pAC->RlmtMode==1) ? "Check Link State" :
+               ((pAC->RlmtMode==3) ? "Check Local Port" :
+               ((pAC->RlmtMode==7) ? "Check Segmentation" :
+               ((pAC->RlmtMode==17) ? "Dual Check Link State" :"Error")))));
+
+       SkGeYellowLED(pAC, pAC->IoBase, 1);
+
+
+       memcpy(&dev->dev_addr, &pAC->Addr.Net[0].CurrentMacAddress, 6);
+
+       SkGeProcCreate(dev);
+
+       pNet->PortNr = 0;
+       pNet->NetNr  = 0;
+
+       boards_found++;
+
+       /* More then one port found */
+       if ((pAC->GIni.GIMacsFound == 2 ) && (pAC->RlmtNets == 2)) {
+               if ((dev = alloc_etherdev(sizeof(DEV_NET))) == 0) {
+                       printk(KERN_ERR "Unable to allocate etherdev "
+                               "structure!\n");
+                       goto out;
+               }
+
+               pAC->dev[1]   = dev;
+               pNet          = netdev_priv(dev);
+               pNet->PortNr  = 1;
+               pNet->NetNr   = 1;
+               pNet->pAC     = pAC;
+               pNet->Mtu     = 1500;
+               pNet->Up      = 0;
+
+               dev->open               = &SkGeOpen;
+               dev->stop               = &SkGeClose;
+               dev->hard_start_xmit    = &SkGeXmit;
+               dev->get_stats          = &SkGeStats;
+               dev->set_multicast_list = &SkGeSetRxMode;
+               dev->set_mac_address    = &SkGeSetMacAddr;
+               dev->do_ioctl           = &SkGeIoctl;
+               dev->change_mtu         = &SkGeChangeMtu;
+               dev->flags             &= ~IFF_RUNNING;
+               SET_NETDEV_DEV(dev, &pdev->dev);
+               SET_ETHTOOL_OPS(dev, &SkGeEthtoolOps);
+
+#ifdef SK_ZEROCOPY
+#ifdef USE_SK_TX_CHECKSUM
+               if (pAC->ChipsetType) {
+                       /* SG and ZEROCOPY - fly baby... */
+                       dev->features |= NETIF_F_SG | NETIF_F_IP_CSUM;
+               }
+#endif
+#endif
+
+               if (register_netdev(dev)) {
+                       printk(KERN_ERR "SKGE: Could not register device.\n");
+                       free_netdev(dev);
+                       pAC->dev[1] = pAC->dev[0];
+               } else {
+                       SkGeProcCreate(dev);
+                       memcpy(&dev->dev_addr,
+                                       &pAC->Addr.Net[1].CurrentMacAddress, 6);
+       
+                       printk("%s: %s\n", dev->name, pAC->DeviceStr);
+                       printk("      PrefPort:B  RlmtMode:Dual Check Link State\n");
+               }
+       }
+
+       /* Save the hardware revision */
+       pAC->HWRevision = (((pAC->GIni.GIPciHwRev >> 4) & 0x0F)*10) +
+               (pAC->GIni.GIPciHwRev & 0x0F);
+
+       /* Set driver globals */
+       pAC->Pnmi.pDriverFileName    = DRIVER_FILE_NAME;
+       pAC->Pnmi.pDriverReleaseDate = DRIVER_REL_DATE;
+
+       memset(&pAC->PnmiBackup, 0, sizeof(SK_PNMI_STRUCT_DATA));
+       memcpy(&pAC->PnmiBackup, &pAC->PnmiStruct, sizeof(SK_PNMI_STRUCT_DATA));
+
+       pci_set_drvdata(pdev, dev);
+       return 0;
+
+ out_free_resources:
+       FreeResources(dev);
+ out_free_netdev:
+       free_netdev(dev);
+ out_disable_device:
+       pci_disable_device(pdev);
+ out:
+       return error;
+}
+
+static void __devexit skge_remove_one(struct pci_dev *pdev)
+{
+       struct net_device *dev = pci_get_drvdata(pdev);
+       DEV_NET *pNet = netdev_priv(dev);
+       SK_AC *pAC = pNet->pAC;
+       struct net_device *otherdev = pAC->dev[1];
+
+       SkGeProcRemove(dev);
+       unregister_netdev(dev);
+       if (otherdev != dev)
+               SkGeProcRemove(otherdev);
+
+       SkGeYellowLED(pAC, pAC->IoBase, 0);
+
+       if (pAC->BoardLevel == SK_INIT_RUN) {
+               SK_EVPARA EvPara;
+               unsigned long Flags;
+
+               /* board is still alive */
+               spin_lock_irqsave(&pAC->SlowPathLock, Flags);
+               EvPara.Para32[0] = 0;
+               EvPara.Para32[1] = -1;
+               SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_STOP, EvPara);
+               EvPara.Para32[0] = 1;
+               EvPara.Para32[1] = -1;
+               SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_STOP, EvPara);
+               SkEventDispatcher(pAC, pAC->IoBase);
+               /* disable interrupts */
+               SK_OUT32(pAC->IoBase, B0_IMSK, 0);
+               SkGeDeInit(pAC, pAC->IoBase);
+               spin_unlock_irqrestore(&pAC->SlowPathLock, Flags);
+               pAC->BoardLevel = SK_INIT_DATA;
+               /* We do NOT check here, if IRQ was pending, of course*/
+       }
+
+       if (pAC->BoardLevel == SK_INIT_IO) {
+               /* board is still alive */
+               SkGeDeInit(pAC, pAC->IoBase);
+               pAC->BoardLevel = SK_INIT_DATA;
+       }
+
+       FreeResources(dev);
+       free_netdev(dev);
+       if (otherdev != dev)
+               free_netdev(otherdev);
+       kfree(pAC);
+}
+
+static struct pci_device_id skge_pci_tbl[] = {
+       { PCI_VENDOR_ID_3COM, 0x1700, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
+       { PCI_VENDOR_ID_3COM, 0x80eb, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
+       { PCI_VENDOR_ID_SYSKONNECT, 0x4300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
+       { PCI_VENDOR_ID_SYSKONNECT, 0x4320, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
+       { PCI_VENDOR_ID_DLINK, 0x4c00, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
+       { PCI_VENDOR_ID_MARVELL, 0x4320, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
+#if 0  /* don't handle Yukon2 cards at the moment -- mlindner@syskonnect.de */
+       { PCI_VENDOR_ID_MARVELL, 0x4360, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
+       { PCI_VENDOR_ID_MARVELL, 0x4361, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
+#endif
+       { PCI_VENDOR_ID_MARVELL, 0x5005, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
+       { PCI_VENDOR_ID_CNET, 0x434e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
+       { PCI_VENDOR_ID_LINKSYS, 0x1032, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
+       { PCI_VENDOR_ID_LINKSYS, 0x1064, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
+       { 0, }
+};
+
+static struct pci_driver skge_driver = {
+       .name           = "skge",
+       .id_table       = skge_pci_tbl,
+       .probe          = skge_probe_one,
+       .remove         = __devexit_p(skge_remove_one),
+};
+
+static int __init skge_init(void)
+{
+       int error;
+
+       pSkRootDir = proc_mkdir(SKRootName, proc_net);
+       if (pSkRootDir) 
+               pSkRootDir->owner = THIS_MODULE;
+       
+       error = pci_register_driver(&skge_driver);
+       if (error)
+               proc_net_remove(SKRootName);
+       return error;
+}
+
+static void __exit skge_exit(void)
+{
+       pci_unregister_driver(&skge_driver);
+       proc_net_remove(SKRootName);
+
+}
+
+module_init(skge_init);
+module_exit(skge_exit);