commit-hurd
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[SCM] Debian GNU Hurd packaging branch, upstream-merged, updated. upstre


From: Samuel Thibault
Subject: [SCM] Debian GNU Hurd packaging branch, upstream-merged, updated. upstream/20130707-5-g6e7f76d
Date: Sat, 27 Jul 2013 22:25:46 +0000

The following commit has been merged in the upstream-merged branch:
commit 8de439689594bc370557179ef9ae3798a00190cb
Author: Samuel Thibault <address@hidden>
Date:   Sat Jul 27 22:18:31 2013 +0000

    drop unused source

diff --git a/dde26_test/Makeconf.local b/dde26_test/Makeconf.local
deleted file mode 100644
index d6594dc..0000000
--- a/dde26_test/Makeconf.local
+++ /dev/null
@@ -1,10 +0,0 @@
-SYSTEMS = x86-l4v2
-ARCH = x86
-SYSTEM = x86-l4v2
-
-DDEKITLIBDIR = /root/hurd/libddekit/
-DDEKITINCDIR = /root/hurd/libddekit/include
-DDE26LIBDIR = /root/hurd/libdde_linux26/lib/src
-OBJ_BASE = /root/hurd/libdde_linux26/build
-
-L4LIBDIR = .
diff --git a/dde26_test/Makefile b/dde26_test/Makefile
deleted file mode 100644
index 1d6f8b6..0000000
--- a/dde26_test/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-PKGDIR        ?= ../libdde_linux26
-L4DIR         ?= $(PKGDIR)
-
-SYSTEMS        = x86-l4v2
-
-DEFAULT_RELOC  = 0x00a00000
-
-include Makeconf.local
-
-TARGET         = dde26_test
-
-SRC_C          = main.c
-
-LIBS          += -ldde_linux26.o -ldde_linux26_block -ldde_linux26_char 
-ldde_linux26_net /root/hurd/libddekit/libddekit.a -lpciaccess -lpthread 
-lshouldbeinlibc
-CFLAGS        += -g
-
-# DDE configuration
-include $(L4DIR)/Makeconf
-
-include $(L4DIR)/mk/prog.mk
diff --git a/dde26_test/default.ld b/dde26_test/default.ld
deleted file mode 100644
index f8e4e28..0000000
--- a/dde26_test/default.ld
+++ /dev/null
@@ -1,213 +0,0 @@
-/* Script for -z combreloc: combine and sort reloc sections */
-OUTPUT_FORMAT("elf32-i386", "elf32-i386",
-             "elf32-i386")
-OUTPUT_ARCH(i386)
-ENTRY(_start)
-SEARCH_DIR("/usr/i486-gnu/lib"); SEARCH_DIR("/usr/local/lib"); 
SEARCH_DIR("/lib"); SEARCH_DIR("/usr/lib");
-SECTIONS
-{
-  /* Read-only sections, merged into text segment: */
-  PROVIDE (__executable_start = 0x08048000); . = 0x08048000 + SIZEOF_HEADERS;
-  .interp         : { *(.interp) }
-  .note.gnu.build-id : { *(.note.gnu.build-id) }
-  .hash           : { *(.hash) }
-  .gnu.hash       : { *(.gnu.hash) }
-  .dynsym         : { *(.dynsym) }
-  .dynstr         : { *(.dynstr) }
-  .gnu.version    : { *(.gnu.version) }
-  .gnu.version_d  : { *(.gnu.version_d) }
-  .gnu.version_r  : { *(.gnu.version_r) }
-  .rel.dyn        :
-    {
-      *(.rel.init)
-      *(.rel.text .rel.text.* .rel.gnu.linkonce.t.*)
-      *(.rel.fini)
-      *(.rel.rodata .rel.rodata.* .rel.gnu.linkonce.r.*)
-      *(.rel.data.rel.ro* .rel.gnu.linkonce.d.rel.ro.*)
-      *(.rel.data .rel.data.* .rel.gnu.linkonce.d.*)
-      *(.rel.tdata .rel.tdata.* .rel.gnu.linkonce.td.*)
-      *(.rel.tbss .rel.tbss.* .rel.gnu.linkonce.tb.*)
-      *(.rel.ctors)
-      *(.rel.dtors)
-      *(.rel.got)
-      *(.rel.bss .rel.bss.* .rel.gnu.linkonce.b.*)
-    }
-  .rela.dyn       :
-    {
-      *(.rela.init)
-      *(.rela.text .rela.text.* .rela.gnu.linkonce.t.*)
-      *(.rela.fini)
-      *(.rela.rodata .rela.rodata.* .rela.gnu.linkonce.r.*)
-      *(.rela.data .rela.data.* .rela.gnu.linkonce.d.*)
-      *(.rela.tdata .rela.tdata.* .rela.gnu.linkonce.td.*)
-      *(.rela.tbss .rela.tbss.* .rela.gnu.linkonce.tb.*)
-      *(.rela.ctors)
-      *(.rela.dtors)
-      *(.rela.got)
-      *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*)
-    }
-  .rel.plt        : { *(.rel.plt) }
-  .rela.plt       : { *(.rela.plt) }
-  .init           :
-  {
-    KEEP (*(.init))
-  } =0x90909090
-  .plt            : { *(.plt) }
-  .text           :
-  {
-    *(.text .stub .text.* .gnu.linkonce.t.*)
-    KEEP (*(.text.*personality*))
-    /* .gnu.warning sections are handled specially by elf32.em.  */
-    *(.gnu.warning)
-  } =0x90909090
-  .fini           :
-  {
-    KEEP (*(.fini))
-  } =0x90909090
-  PROVIDE (__etext = .);
-  PROVIDE (_etext = .);
-  PROVIDE (etext = .);
-  .rodata         : { *(.rodata .rodata.* .gnu.linkonce.r.*) }
-  .rodata1        : { *(.rodata1) }
-  .eh_frame_hdr : { *(.eh_frame_hdr) }
-  .eh_frame       : ONLY_IF_RO { KEEP (*(.eh_frame)) }
-  .gcc_except_table   : ONLY_IF_RO { *(.gcc_except_table .gcc_except_table.*) }
-  /* Adjust the address for the data segment.  We want to adjust up to
-     the same address within the page on the next page up.  */
-  . = ALIGN (CONSTANT (MAXPAGESIZE)) - ((CONSTANT (MAXPAGESIZE) - .) & 
(CONSTANT (MAXPAGESIZE) - 1)); . = DATA_SEGMENT_ALIGN (CONSTANT (MAXPAGESIZE), 
CONSTANT (COMMONPAGESIZE));
-  /* Exception handling  */
-  .eh_frame       : ONLY_IF_RW { KEEP (*(.eh_frame)) }
-  .gcc_except_table   : ONLY_IF_RW { *(.gcc_except_table .gcc_except_table.*) }
-  /* Thread Local Storage sections  */
-  .tdata         : { *(.tdata .tdata.* .gnu.linkonce.td.*) }
-  .tbss                  : { *(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon) }
-  .preinit_array     :
-  {
-    PROVIDE_HIDDEN (__preinit_array_start = .);
-    KEEP (*(.preinit_array))
-    PROVIDE_HIDDEN (__preinit_array_end = .);
-  }
-  .init_array     :
-  {
-     PROVIDE_HIDDEN (__init_array_start = .);
-     KEEP (*(SORT(.init_array.*)))
-     KEEP (*(.init_array))
-     PROVIDE_HIDDEN (__init_array_end = .);
-  }
-  .fini_array     :
-  {
-    PROVIDE_HIDDEN (__fini_array_start = .);
-    KEEP (*(.fini_array))
-    KEEP (*(SORT(.fini_array.*)))
-    PROVIDE_HIDDEN (__fini_array_end = .);
-  }
-  .ctors          :
-  {
-    /* gcc uses crtbegin.o to find the start of
-       the constructors, so we make sure it is
-       first.  Because this is a wildcard, it
-       doesn't matter if the user does not
-       actually link against crtbegin.o; the
-       linker won't look for a file to match a
-       wildcard.  The wildcard also means that it
-       doesn't matter which directory crtbegin.o
-       is in.  */
-    KEEP (*crtbegin.o(.ctors))
-    KEEP (*crtbegin?.o(.ctors))
-    /* We don't want to include the .ctor section from
-       the crtend.o file until after the sorted ctors.
-       The .ctor section from the crtend file contains the
-       end of ctors marker and it must be last */
-    KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o ) .ctors))
-
-    KEEP (*(SORT(.ctors.*)))
-    KEEP (*(.ctors))
-
-    KEEP (*(.mark_beg_l4dde_ctors))
-    KEEP (*(SORT(.l4dde_ctors.?)))
-    KEEP (*(SORT(.l4dde_ctors.??)))
-    KEEP (*(SORT(.l4dde_ctors.???)))
-    KEEP (*(SORT(.l4dde_ctors.????)))
-    KEEP (*(SORT(.l4dde_ctors.?????)))
-    KEEP (*(.l4dde_ctors))
-    KEEP (*(.mark_end_l4dde_ctors))
-  }
-  .dtors          :
-  {
-    KEEP (*crtbegin.o(.dtors))
-    KEEP (*crtbegin?.o(.dtors))
-    KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o ) .dtors))
-    KEEP (*(SORT(.dtors.*)))
-    KEEP (*(.dtors))
-  }
-  .jcr            : { KEEP (*(.jcr)) }
-  .data.rel.ro : { *(.data.rel.ro.local* .gnu.linkonce.d.rel.ro.local.*) 
*(.data.rel.ro* .gnu.linkonce.d.rel.ro.*) }
-  .dynamic        : { *(.dynamic) }
-  .got            : { *(.got) }
-  . = DATA_SEGMENT_RELRO_END (12, .);
-  .got.plt        : { *(.got.plt) }
-  .data           :
-  {
-    *(.data .data.* .gnu.linkonce.d.*)
-    KEEP (*(.gnu.linkonce.d.*personality*))
-    SORT(CONSTRUCTORS)
-  }
-  .data1          : { *(.data1) }
-  _edata = .; PROVIDE (edata = .);
-  __bss_start = .;
-  .bss            :
-  {
-   *(.dynbss)
-   *(.bss .bss.* .gnu.linkonce.b.*)
-   *(COMMON)
-   /* Align here to ensure that the .bss section occupies space up to
-      _end.  Align after .bss to ensure correct alignment even if the
-      .bss section disappears because there are no input sections.
-      FIXME: Why do we need it? When there is no .bss section, we don't
-      pad the .data section.  */
-   . = ALIGN(. != 0 ? 32 / 8 : 1);
-  }
-  . = ALIGN(32 / 8);
-  . = ALIGN(32 / 8);
-  _end = .; PROVIDE (end = .);
-  . = DATA_SEGMENT_END (.);
-  /* Stabs debugging sections.  */
-  .stab          0 : { *(.stab) }
-  .stabstr       0 : { *(.stabstr) }
-  .stab.excl     0 : { *(.stab.excl) }
-  .stab.exclstr  0 : { *(.stab.exclstr) }
-  .stab.index    0 : { *(.stab.index) }
-  .stab.indexstr 0 : { *(.stab.indexstr) }
-  .comment       0 : { *(.comment) }
-  /* DWARF debug sections.
-     Symbols in the DWARF debugging sections are relative to the beginning
-     of the section so we begin them at 0.  */
-  /* DWARF 1 */
-  .debug          0 : { *(.debug) }
-  .line           0 : { *(.line) }
-  /* GNU DWARF 1 extensions */
-  .debug_srcinfo  0 : { *(.debug_srcinfo) }
-  .debug_sfnames  0 : { *(.debug_sfnames) }
-  /* DWARF 1.1 and DWARF 2 */
-  .debug_aranges  0 : { *(.debug_aranges) }
-  .debug_pubnames 0 : { *(.debug_pubnames) }
-  /* DWARF 2 */
-  .debug_info     0 : { *(.debug_info .gnu.linkonce.wi.*) }
-  .debug_abbrev   0 : { *(.debug_abbrev) }
-  .debug_line     0 : { *(.debug_line) }
-  .debug_frame    0 : { *(.debug_frame) }
-  .debug_str      0 : { *(.debug_str) }
-  .debug_loc      0 : { *(.debug_loc) }
-  .debug_macinfo  0 : { *(.debug_macinfo) }
-  /* SGI/MIPS DWARF 2 extensions */
-  .debug_weaknames 0 : { *(.debug_weaknames) }
-  .debug_funcnames 0 : { *(.debug_funcnames) }
-  .debug_typenames 0 : { *(.debug_typenames) }
-  .debug_varnames  0 : { *(.debug_varnames) }
-  /* DWARF 3 */
-  .debug_pubtypes 0 : { *(.debug_pubtypes) }
-  .debug_ranges   0 : { *(.debug_ranges) }
-  .gnu.attributes 0 : { KEEP (*(.gnu.attributes)) }
-  /DISCARD/ : { *(.note.GNU-stack) *(.gnu_debuglink) }
-}
-
diff --git a/dde26_test/main.c b/dde26_test/main.c
deleted file mode 100644
index f96a212..0000000
--- a/dde26_test/main.c
+++ /dev/null
@@ -1,481 +0,0 @@
-/*
- * \brief   DDE for Linux 2.6 test program
- * \author  Bjoern Doebel <address@hidden>
- * \author  Christian Helmuth <address@hidden>
- * \date    2007-01-22
- */
-
-#include <asm/current.h>
-
-#include <linux/kernel.h>
-#include <linux/completion.h>
-#include <linux/init.h>
-#include <linux/delay.h>
-#include <linux/wait.h>
-#include <linux/sched.h>
-#include <linux/workqueue.h>
-#include <linux/interrupt.h>
-//#include <linux/kthread.h>
-
-#include <dde.h>
-//#include <ddekit/initcall.h>
-#include <dde26.h>
-#include <ddekit/timer.h>
-
-int using_std = 1;
-
-/* We define 4 initcalls and see if these are executed
- * in the beginning.
- */
-static __init void foo(void) { printk("foo  module_init\n"); }
-static __init void bar(void) { printk("bar  device_initcall\n"); }
-static __init void bla(void) { printk("bla  arch_initcall\n"); }
-static __init void blub(void) { printk("blub subsys_initcall\n"); }
-//module_init(foo);
-//device_initcall(bar);
-//arch_initcall(bla);
-//subsys_initcall(blub);
-
-/***********************************************************************
- ** Test 1: Check whether the current() macro works.                  **
- ***********************************************************************/
-static void current_test(void)
-{
-       struct task_struct *t = NULL;
-
-       printk("Current() test.\n");
-
-       t = current;
-       printk("\tt = %p\n", t);
-}
-
-
-/***********************************************************************
- ** Test 2: Getting complicated. Test startup of some kernel threads  **
- **         and wait for them to finish using completions.            **
- ***********************************************************************/
-#define NUM_KTHREADS   5
-static struct completion _kthread_completions_[NUM_KTHREADS];
-
-static int kernel_thread_func(void *arg)
-{
-       printk("\t\tKernel thread %d\n", (int)arg);
-       printk("\t\tcurrent = %p\n", current);
-
-       /* do some work */
-       msleep(200);
-
-       complete_and_exit( &_kthread_completions_[(int)arg], 0 );
-       return 0;
-}
-
-
-static void kernel_thread_test(void)
-{
-       int i;
-       printk("Testing kernel_thread()\n");
-       for (i=0; i < NUM_KTHREADS; i++) {
-               int j;
-               printk("\tInitializing completion for kernel thread.%x\n", i+1);
-               init_completion(&_kthread_completions_[i]);
-               printk("\tStarting kthread.%x\n", i+1);
-               j = kernel_thread(kernel_thread_func, (void *)i, 0);
-               printk("\treturn: %d\n", j);
-       }
-
-       for (i=0; i < NUM_KTHREADS; i++) {
-               printk("\tWaiting for kthread.%x to complete.\n", i+1);
-               wait_for_completion(&_kthread_completions_[i]);
-               printk("\tkthread.%x has exited.\n", i+1);
-       }
-}
-
-
-/******************************************************************************
- ** Test 3: Test kernel wait queues: start a thread incrementing wait_value, **
- **         and  sleep until wait_value is larger than 6 for the first time. **
- 
******************************************************************************/
-static DECLARE_WAIT_QUEUE_HEAD(_wq_head);
-static int wait_value = 0;
-static struct completion wq_completion;
-
-static int inc_func(void *arg)
-{
-       int i = 0;
-
-       printk("\033[33mI am counting up wait_value.\033[0m\n");
-       for (i=0; i<10; i++)
-       {
-               printk("\033[33mwait_value: %d\033[0m\n", ++wait_value);
-               wake_up(&_wq_head);
-               msleep(500);
-       }
-       complete_and_exit(&wq_completion, 0);
-}
-
-
-static void wq_test(void)
-{
-       int pid;
-       printk("\033[32mWait_queue test. I'm waiting vor wait_value to become 
>6.\033[0m\n");
-
-       init_completion(&wq_completion);
-       pid = kernel_thread(inc_func, 0, 0);
-
-       wait_event(_wq_head, wait_value > 6);
-       printk("\033[32;1mwait_value > 6 occured!\033[0m\n");
-
-       wait_for_completion(&wq_completion);
-       printk("\033[32mtest done.\033[0m\n");
-}
-
-
-/****************************************************************************
- ** Test 4: Tasklets                                                       **
- ****************************************************************************/
-static void tasklet_func(unsigned long i)
-{
-       printk("TASKLET: %d\n", i);
-}
-
-
-static DECLARE_TASKLET(low0, tasklet_func, 0);
-static DECLARE_TASKLET(low1, tasklet_func, 1);
-static DECLARE_TASKLET(low2, tasklet_func, 2);
-static DECLARE_TASKLET_DISABLED(low3, tasklet_func, 3);
-
-static DECLARE_TASKLET(hi0, tasklet_func, 10);
-static DECLARE_TASKLET(hi1, tasklet_func, 11);
-static DECLARE_TASKLET_DISABLED(hi2, tasklet_func, 12);
-
-
-static void tasklet_test(void)
-{
-       printk("BEGIN TASKLET TEST\n");
-
-       l4dde26_softirq_init();
-
-       printk("sleep 1000 msec\n");
-       msleep(1000);
-
-       printk("Scheduling tasklets 0-2 immediately. 3 is disabled for 2 
seconds.\n");
-       tasklet_schedule(&low0);
-
-       tasklet_schedule(&low1);
-       tasklet_schedule(&low2);
-       tasklet_schedule(&low3);
-       msleep(2000);
-       tasklet_enable(&low3);
-
-       msleep(1000);
-       
-       printk("Scheduling hi_tasklets 10-12, and tasklets 0-2\n");
-       tasklet_hi_schedule(&hi0);
-       tasklet_hi_schedule(&hi1);
-       tasklet_hi_schedule(&hi2);
-       tasklet_schedule(&low0);
-       tasklet_schedule(&low1);
-       tasklet_schedule(&low2);
-       tasklet_enable(&hi2);
-
-       msleep(1000);
-       printk("Scheduling (disabled) tasklet 3 twice - should only run once 
after enabling.\n");
-       tasklet_disable(&low3);
-       tasklet_schedule(&low3);
-       tasklet_schedule(&low3);
-       tasklet_enable(&low3);
-
-       msleep(1000);
-
-       printk("END TASKLET TEST\n");
-}
-
-
-/******************************************************************************
- ** Test 5: Timers                                                           **
- **                                                                          **
- ** Schedule a periodic timer printing "tick" every second. Additionally,    **
- ** schedule timers for 5, 10, 15, 20, and 25 seconds. Timer at 15s will     **
- ** deactivate the 20s timer.                                                **
- 
******************************************************************************/
-
-static struct timer_list _timer;
-static struct timer_list _timer5;
-static struct timer_list _timer10;
-static struct timer_list _timer15;
-static struct timer_list _timer20;
-static struct timer_list _timer25;
-
-static void tick_func(unsigned long d)
-{
-       printk("tick (%ld)\n", jiffies);
-       _timer.expires = jiffies + HZ;
-       add_timer(&_timer);
-}
-
-
-static void timer_func(unsigned long d)
-{
-       printk("timer_func: %lu\n", d);
-
-       if (d == 15) {
-               printk("De-scheduling 20s timer.\n");
-               del_timer(&_timer20);
-       }
-
-       if (timer_pending(&_timer20))
-               printk("timer for 20s still pending.\n");
-       else
-               printk("timer for 20s has been disabled.\n");
-}
-
-
-static void timer_test(void)
-{
-       l4dde26_init_timers();
-
-       printk("BEGIN TIMER TEST\n");
-       printk("jiffies: %ld, HZ: %ld\n", jiffies, HZ);
-
-       setup_timer(&_timer, tick_func, 0);
-       _timer.expires = jiffies + HZ;
-       add_timer(&_timer);
-
-       setup_timer(&_timer5, timer_func, 5);
-       _timer5.expires = jiffies + 5*HZ;
-       setup_timer(&_timer10, timer_func, 10); 
-       _timer10.expires = jiffies + 10*HZ;
-       setup_timer(&_timer15, timer_func, 15); 
-       _timer15.expires = jiffies + 15*HZ;
-       setup_timer(&_timer20, timer_func, 20); 
-       _timer20.expires = jiffies + 20*HZ;
-       setup_timer(&_timer25, timer_func, 25); 
-       _timer25.expires = jiffies + 25*HZ;
-
-       add_timer(&_timer5);
-       add_timer(&_timer10);
-       add_timer(&_timer15);
-       add_timer(&_timer20);
-       add_timer(&_timer25);
-
-       msleep(30000);
-
-       del_timer(&_timer);
-       printk("END TIMER TEST\n");
-}
-
-
-/******************************
- ** Test 6: Memory subsystem **
- ******************************/
-
-static void memory_kmem_cache_test(void)
-{
-       struct kmem_cache *cache0;
-       struct obj0
-       {
-               unsigned foo;
-               unsigned bar;
-       };
-       static struct obj0 *p0[1024];
-
-       struct kmem_cache *cache1;
-       struct obj1
-       {
-               char      foo[50];
-               unsigned *bar;
-       };
-       static struct obj1 *p1[256];
-
-       cache0 = kmem_cache_create("obj0", sizeof(*p0[0]), 0, 0, 0);
-       cache1 = kmem_cache_create("obj1", sizeof(*p1[0]), 0, 0, 0);
-       printk("kmem caches: %p %p\n", cache0, cache1);
-
-       unsigned i;
-       for (i = 0; i < 1024; ++i)
-               p0[i] = kmem_cache_alloc(cache0, i);
-
-       for (i = 0; i < 256; ++i)
-               p1[i] = kmem_cache_alloc(cache1, i);
-
-       for (i = 256; i > 0; --i)
-               kmem_cache_free(cache1, p1[i-1]);
-
-       for (i = 1024; i > 0; --i)
-               kmem_cache_free(cache0, p0[i-1]);
-
-       kmem_cache_destroy(cache1);
-       kmem_cache_destroy(cache0);
-       printk("Done testing kmem_cache_alloc() & co.\n");
-}
-
-
-static void memory_page_alloc_test(void)
-{
-       unsigned long p[4];
-       p[0] = __get_free_page(GFP_KERNEL);
-       p[1] = __get_free_pages(GFP_KERNEL, 1);
-       p[2] = __get_free_pages(GFP_KERNEL, 2);
-       p[3] = __get_free_pages(GFP_KERNEL, 3);
-       printk("pages: %p %p %p %p\n", p[0], p[1], p[2], p[3]);
-
-       free_pages(p[0], 0);
-       free_pages(p[1], 1);
-       free_pages(p[2], 2);
-       free_pages(p[3], 3);
-       printk("Freed pages\n");
-}
-
-
-static void memory_kmalloc_test(void)
-{
-       // XXX initialized by dde26_init()!
-//     l4dde26_kmalloc_init();
-
-       const unsigned count = 33;
-       char *p[count];
-
-       int i;
-       for (i = 0; i < count; ++i) {
-               p[i] = kmalloc(32 + i*15, GFP_KERNEL);
-               *p[i] = i;
-               printk("p[%d] = %p\n", i, p[i]);
-       }
-
-       for (i = count; i > 0; --i)
-               if (p[i-1]) kfree(p[i-1]);
-
-       for (i = 0; i < count; ++i) {
-               p[i] = kmalloc(3000 + i*20, GFP_KERNEL);
-               *p[i] = i;
-               printk("p[%d] = %p\n", i, p[i]);
-       }
-
-       for (i = count; i > 0; --i)
-               if (p[i-1]) kfree(p[i-1]);
-
-}
-
-
-static void memory_test(void)
-{
-       printk("memory test\n");
-       if (1) memory_kmem_cache_test();
-       if (1) memory_page_alloc_test();
-       if (1) memory_kmalloc_test();
-       printk("End of memory test\n");
-}
-
-
-/****************************************************************************
- ** Test 7: KThreads                                                       **
- ****************************************************************************/
-void kthread_test(void)
-{
-}
-
-
-/****************************************************************************
- ** Test 8: Work queues                                                    **
- ****************************************************************************/
-static void work_queue_func(struct work_struct *data);
-static void work_queue_func2(struct work_struct *data);
-static struct workqueue_struct *_wq;
-static DECLARE_WORK(_wobj, work_queue_func);
-static DECLARE_WORK(_wobj2, work_queue_func2);
-static int wq_cnt = 0;
-
-static void work_queue_func(struct work_struct *data)
-{
-       printk("(1) Work queue function... Do some work here...\n");
-       if (++wq_cnt < 5)
-               queue_work(_wq, &_wobj);
-}
-
-
-static void work_queue_func2(struct work_struct *data)
-{
-       printk("(2) Work queue function 2... Do some work here...\n");
-       if (++wq_cnt < 10)
-               schedule_work(&_wobj2);
-}
-
-
-static void work_queue_test(void)
-{
-       int i;
-       printk("BEGIN WQ TEST\n");
-       _wq = create_workqueue("HelloWQ");
-       BUG_ON(_wq == NULL);
-       queue_work(_wq, &_wobj);
-       schedule_work(&_wobj2);
-       printk("END WQ TEST\n");
-}
-
-
-/****************************************************************************
- ** Test 9: PCI                                                            **
- ****************************************************************************/
-
-void pci_test(void)
-{
-       l4dde26_init_pci();
-}
-
-
-/*************************************************
- ** Main routine (switch on desired tests here) **
- *************************************************/
-
-int main(int argc, const char **argv)
-{
-       int test_current = 1;
-       int test_kernel_thread = 1;
-       int test_wait = 1;
-       int test_tasklet = 1;
-       int test_timer = 1;
-       int test_memory = 1;
-       int test_kthread = 1;
-       int test_work = 1;
-       int test_pci = 1;
-
-       msleep(1000);
-       
-       l4dde26_init ();
-       l4dde26_process_init ();
-       l4dde26_do_initcalls ();
-
-       printk("DDEKit test. Carrying out tests:\n");
-       printk("\t* current()\n");
-       printk("\t* kernel_thread()\n");
-       printk("\t* wait queues\n");
-       printk("\t* tasklets\n");
-       printk("\t* timers\n");
-       printk("\t* memory management\n");
-       printk("\t* kthreads\n");
-       printk("\t* work queues\n");
-       printk("\t* PCI subsystem\n");
-
-#if 0
-       printk("l4dde26_init()\n");
-       l4dde26_init();
-       printk("l4dde26_process_init()\n");
-       l4dde26_process_init();
-       printk("l4dde26_do_initcalls()\n");
-       l4dde26_do_initcalls();
-#endif
-
-       printk("Init done. Running tests.\n");
-       if (test_current) current_test();
-       if (test_kernel_thread) kernel_thread_test();
-       if (test_wait) wq_test();
-       if (test_tasklet) tasklet_test();
-       if (test_timer) timer_test();
-       if (test_memory) memory_test();
-       if (1) kthread_test();
-       if (test_work) work_queue_test();
-//     if (test_pci) pci_test();
-       printk("Test done.\n");
-
-       return 0;
-}
diff --git a/dde_e100/.gitignore b/dde_e100/.gitignore
deleted file mode 100644
index a081f10..0000000
--- a/dde_e100/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-dde_e100
diff --git a/dde_e100/Makeconf.local b/dde_e100/Makeconf.local
deleted file mode 100644
index 130c8cc..0000000
--- a/dde_e100/Makeconf.local
+++ /dev/null
@@ -1,17 +0,0 @@
-SYSTEMS = x86-l4v2
-ARCH = x86
-SYSTEM = x86-l4v2
-
-BUILDDIR       ?= ..
-
-libmachdev_path := -L$(BUILDDIR)/libmachdev -lmachdev
-libddekit_path := -L$(BUILDDIR)/libddekit -lddekit
-libslab_path := -L$(BUILDDIR)/libhurd-slab -lhurd-slab
-libbpf_path := -L$(BUILDDIR)/libbpf -lbpf
-
-DDEKITLIBDIR = $(PKGDIR)/../libddekit/
-DDEKITINCDIR = $(PKGDIR)/../libddekit/include
-DDE26LIBDIR = $(PKGDIR)/lib/src
-OBJ_BASE = $(PKGDIR)/build
-
-L4LIBDIR = .
diff --git a/dde_e100/Makefile b/dde_e100/Makefile
deleted file mode 100644
index 1f3c4c0..0000000
--- a/dde_e100/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-PKGDIR        ?= ../libdde_linux26
-L4DIR         ?= $(PKGDIR)
-
-include Makeconf.local
-
-TARGET         = dde_e100
-
-SRC_C          = main.c e100.c
-
-LIBS          += $(libmachdev_path) -ldde_linux26.o -ldde_linux26_net 
$(libddekit_path) -lfshelp -ltrivfs -lpciaccess -lz -lpthread -lshouldbeinlibc 
-lports $(libslab_path) $(libbpf_path)
-CFLAGS        += -g -I$(PKGDIR)/include -I$(BUILDDIR)/include
-
-# DDE configuration
-include $(L4DIR)/Makeconf
-
-include $(L4DIR)/mk/prog.mk
diff --git a/dde_e100/default.ld b/dde_e100/default.ld
deleted file mode 100644
index f8e4e28..0000000
--- a/dde_e100/default.ld
+++ /dev/null
@@ -1,213 +0,0 @@
-/* Script for -z combreloc: combine and sort reloc sections */
-OUTPUT_FORMAT("elf32-i386", "elf32-i386",
-             "elf32-i386")
-OUTPUT_ARCH(i386)
-ENTRY(_start)
-SEARCH_DIR("/usr/i486-gnu/lib"); SEARCH_DIR("/usr/local/lib"); 
SEARCH_DIR("/lib"); SEARCH_DIR("/usr/lib");
-SECTIONS
-{
-  /* Read-only sections, merged into text segment: */
-  PROVIDE (__executable_start = 0x08048000); . = 0x08048000 + SIZEOF_HEADERS;
-  .interp         : { *(.interp) }
-  .note.gnu.build-id : { *(.note.gnu.build-id) }
-  .hash           : { *(.hash) }
-  .gnu.hash       : { *(.gnu.hash) }
-  .dynsym         : { *(.dynsym) }
-  .dynstr         : { *(.dynstr) }
-  .gnu.version    : { *(.gnu.version) }
-  .gnu.version_d  : { *(.gnu.version_d) }
-  .gnu.version_r  : { *(.gnu.version_r) }
-  .rel.dyn        :
-    {
-      *(.rel.init)
-      *(.rel.text .rel.text.* .rel.gnu.linkonce.t.*)
-      *(.rel.fini)
-      *(.rel.rodata .rel.rodata.* .rel.gnu.linkonce.r.*)
-      *(.rel.data.rel.ro* .rel.gnu.linkonce.d.rel.ro.*)
-      *(.rel.data .rel.data.* .rel.gnu.linkonce.d.*)
-      *(.rel.tdata .rel.tdata.* .rel.gnu.linkonce.td.*)
-      *(.rel.tbss .rel.tbss.* .rel.gnu.linkonce.tb.*)
-      *(.rel.ctors)
-      *(.rel.dtors)
-      *(.rel.got)
-      *(.rel.bss .rel.bss.* .rel.gnu.linkonce.b.*)
-    }
-  .rela.dyn       :
-    {
-      *(.rela.init)
-      *(.rela.text .rela.text.* .rela.gnu.linkonce.t.*)
-      *(.rela.fini)
-      *(.rela.rodata .rela.rodata.* .rela.gnu.linkonce.r.*)
-      *(.rela.data .rela.data.* .rela.gnu.linkonce.d.*)
-      *(.rela.tdata .rela.tdata.* .rela.gnu.linkonce.td.*)
-      *(.rela.tbss .rela.tbss.* .rela.gnu.linkonce.tb.*)
-      *(.rela.ctors)
-      *(.rela.dtors)
-      *(.rela.got)
-      *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*)
-    }
-  .rel.plt        : { *(.rel.plt) }
-  .rela.plt       : { *(.rela.plt) }
-  .init           :
-  {
-    KEEP (*(.init))
-  } =0x90909090
-  .plt            : { *(.plt) }
-  .text           :
-  {
-    *(.text .stub .text.* .gnu.linkonce.t.*)
-    KEEP (*(.text.*personality*))
-    /* .gnu.warning sections are handled specially by elf32.em.  */
-    *(.gnu.warning)
-  } =0x90909090
-  .fini           :
-  {
-    KEEP (*(.fini))
-  } =0x90909090
-  PROVIDE (__etext = .);
-  PROVIDE (_etext = .);
-  PROVIDE (etext = .);
-  .rodata         : { *(.rodata .rodata.* .gnu.linkonce.r.*) }
-  .rodata1        : { *(.rodata1) }
-  .eh_frame_hdr : { *(.eh_frame_hdr) }
-  .eh_frame       : ONLY_IF_RO { KEEP (*(.eh_frame)) }
-  .gcc_except_table   : ONLY_IF_RO { *(.gcc_except_table .gcc_except_table.*) }
-  /* Adjust the address for the data segment.  We want to adjust up to
-     the same address within the page on the next page up.  */
-  . = ALIGN (CONSTANT (MAXPAGESIZE)) - ((CONSTANT (MAXPAGESIZE) - .) & 
(CONSTANT (MAXPAGESIZE) - 1)); . = DATA_SEGMENT_ALIGN (CONSTANT (MAXPAGESIZE), 
CONSTANT (COMMONPAGESIZE));
-  /* Exception handling  */
-  .eh_frame       : ONLY_IF_RW { KEEP (*(.eh_frame)) }
-  .gcc_except_table   : ONLY_IF_RW { *(.gcc_except_table .gcc_except_table.*) }
-  /* Thread Local Storage sections  */
-  .tdata         : { *(.tdata .tdata.* .gnu.linkonce.td.*) }
-  .tbss                  : { *(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon) }
-  .preinit_array     :
-  {
-    PROVIDE_HIDDEN (__preinit_array_start = .);
-    KEEP (*(.preinit_array))
-    PROVIDE_HIDDEN (__preinit_array_end = .);
-  }
-  .init_array     :
-  {
-     PROVIDE_HIDDEN (__init_array_start = .);
-     KEEP (*(SORT(.init_array.*)))
-     KEEP (*(.init_array))
-     PROVIDE_HIDDEN (__init_array_end = .);
-  }
-  .fini_array     :
-  {
-    PROVIDE_HIDDEN (__fini_array_start = .);
-    KEEP (*(.fini_array))
-    KEEP (*(SORT(.fini_array.*)))
-    PROVIDE_HIDDEN (__fini_array_end = .);
-  }
-  .ctors          :
-  {
-    /* gcc uses crtbegin.o to find the start of
-       the constructors, so we make sure it is
-       first.  Because this is a wildcard, it
-       doesn't matter if the user does not
-       actually link against crtbegin.o; the
-       linker won't look for a file to match a
-       wildcard.  The wildcard also means that it
-       doesn't matter which directory crtbegin.o
-       is in.  */
-    KEEP (*crtbegin.o(.ctors))
-    KEEP (*crtbegin?.o(.ctors))
-    /* We don't want to include the .ctor section from
-       the crtend.o file until after the sorted ctors.
-       The .ctor section from the crtend file contains the
-       end of ctors marker and it must be last */
-    KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o ) .ctors))
-
-    KEEP (*(SORT(.ctors.*)))
-    KEEP (*(.ctors))
-
-    KEEP (*(.mark_beg_l4dde_ctors))
-    KEEP (*(SORT(.l4dde_ctors.?)))
-    KEEP (*(SORT(.l4dde_ctors.??)))
-    KEEP (*(SORT(.l4dde_ctors.???)))
-    KEEP (*(SORT(.l4dde_ctors.????)))
-    KEEP (*(SORT(.l4dde_ctors.?????)))
-    KEEP (*(.l4dde_ctors))
-    KEEP (*(.mark_end_l4dde_ctors))
-  }
-  .dtors          :
-  {
-    KEEP (*crtbegin.o(.dtors))
-    KEEP (*crtbegin?.o(.dtors))
-    KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o ) .dtors))
-    KEEP (*(SORT(.dtors.*)))
-    KEEP (*(.dtors))
-  }
-  .jcr            : { KEEP (*(.jcr)) }
-  .data.rel.ro : { *(.data.rel.ro.local* .gnu.linkonce.d.rel.ro.local.*) 
*(.data.rel.ro* .gnu.linkonce.d.rel.ro.*) }
-  .dynamic        : { *(.dynamic) }
-  .got            : { *(.got) }
-  . = DATA_SEGMENT_RELRO_END (12, .);
-  .got.plt        : { *(.got.plt) }
-  .data           :
-  {
-    *(.data .data.* .gnu.linkonce.d.*)
-    KEEP (*(.gnu.linkonce.d.*personality*))
-    SORT(CONSTRUCTORS)
-  }
-  .data1          : { *(.data1) }
-  _edata = .; PROVIDE (edata = .);
-  __bss_start = .;
-  .bss            :
-  {
-   *(.dynbss)
-   *(.bss .bss.* .gnu.linkonce.b.*)
-   *(COMMON)
-   /* Align here to ensure that the .bss section occupies space up to
-      _end.  Align after .bss to ensure correct alignment even if the
-      .bss section disappears because there are no input sections.
-      FIXME: Why do we need it? When there is no .bss section, we don't
-      pad the .data section.  */
-   . = ALIGN(. != 0 ? 32 / 8 : 1);
-  }
-  . = ALIGN(32 / 8);
-  . = ALIGN(32 / 8);
-  _end = .; PROVIDE (end = .);
-  . = DATA_SEGMENT_END (.);
-  /* Stabs debugging sections.  */
-  .stab          0 : { *(.stab) }
-  .stabstr       0 : { *(.stabstr) }
-  .stab.excl     0 : { *(.stab.excl) }
-  .stab.exclstr  0 : { *(.stab.exclstr) }
-  .stab.index    0 : { *(.stab.index) }
-  .stab.indexstr 0 : { *(.stab.indexstr) }
-  .comment       0 : { *(.comment) }
-  /* DWARF debug sections.
-     Symbols in the DWARF debugging sections are relative to the beginning
-     of the section so we begin them at 0.  */
-  /* DWARF 1 */
-  .debug          0 : { *(.debug) }
-  .line           0 : { *(.line) }
-  /* GNU DWARF 1 extensions */
-  .debug_srcinfo  0 : { *(.debug_srcinfo) }
-  .debug_sfnames  0 : { *(.debug_sfnames) }
-  /* DWARF 1.1 and DWARF 2 */
-  .debug_aranges  0 : { *(.debug_aranges) }
-  .debug_pubnames 0 : { *(.debug_pubnames) }
-  /* DWARF 2 */
-  .debug_info     0 : { *(.debug_info .gnu.linkonce.wi.*) }
-  .debug_abbrev   0 : { *(.debug_abbrev) }
-  .debug_line     0 : { *(.debug_line) }
-  .debug_frame    0 : { *(.debug_frame) }
-  .debug_str      0 : { *(.debug_str) }
-  .debug_loc      0 : { *(.debug_loc) }
-  .debug_macinfo  0 : { *(.debug_macinfo) }
-  /* SGI/MIPS DWARF 2 extensions */
-  .debug_weaknames 0 : { *(.debug_weaknames) }
-  .debug_funcnames 0 : { *(.debug_funcnames) }
-  .debug_typenames 0 : { *(.debug_typenames) }
-  .debug_varnames  0 : { *(.debug_varnames) }
-  /* DWARF 3 */
-  .debug_pubtypes 0 : { *(.debug_pubtypes) }
-  .debug_ranges   0 : { *(.debug_ranges) }
-  .gnu.attributes 0 : { KEEP (*(.gnu.attributes)) }
-  /DISCARD/ : { *(.note.GNU-stack) *(.gnu_debuglink) }
-}
-
diff --git a/dde_e100/e100.c b/dde_e100/e100.c
deleted file mode 100644
index 0a94d53..0000000
--- a/dde_e100/e100.c
+++ /dev/null
@@ -1,2846 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/100 Linux driver
-  Copyright(c) 1999 - 2006 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify it
-  under the terms and conditions of the GNU General Public License,
-  version 2, as published by the Free Software Foundation.
-
-  This program is distributed in the hope it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
-
-  You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-
-  The full GNU General Public License is included in this distribution in
-  the file called "COPYING".
-
-  Contact Information:
-  Linux NICS <address@hidden>
-  e1000-devel Mailing List <address@hidden>
-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-
-*******************************************************************************/
-
-/*
- *     e100.c: Intel(R) PRO/100 ethernet driver
- *
- *     (Re)written 2003 by address@hidden  Based loosely on
- *     original e100 driver, but better described as a munging of
- *     e100, e1000, eepro100, tg3, 8139cp, and other drivers.
- *
- *     References:
- *             Intel 8255x 10/100 Mbps Ethernet Controller Family,
- *             Open Source Software Developers Manual,
- *             http://sourceforge.net/projects/e1000
- *
- *
- *                           Theory of Operation
- *
- *     I.   General
- *
- *     The driver supports Intel(R) 10/100 Mbps PCI Fast Ethernet
- *     controller family, which includes the 82557, 82558, 82559, 82550,
- *     82551, and 82562 devices.  82558 and greater controllers
- *     integrate the Intel 82555 PHY.  The controllers are used in
- *     server and client network interface cards, as well as in
- *     LAN-On-Motherboard (LOM), CardBus, MiniPCI, and ICHx
- *     configurations.  8255x supports a 32-bit linear addressing
- *     mode and operates at 33Mhz PCI clock rate.
- *
- *     II.  Driver Operation
- *
- *     Memory-mapped mode is used exclusively to access the device's
- *     shared-memory structure, the Control/Status Registers (CSR). All
- *     setup, configuration, and control of the device, including queuing
- *     of Tx, Rx, and configuration commands is through the CSR.
- *     cmd_lock serializes accesses to the CSR command register.  cb_lock
- *     protects the shared Command Block List (CBL).
- *
- *     8255x is highly MII-compliant and all access to the PHY go
- *     through the Management Data Interface (MDI).  Consequently, the
- *     driver leverages the mii.c library shared with other MII-compliant
- *     devices.
- *
- *     Big- and Little-Endian byte order as well as 32- and 64-bit
- *     archs are supported.  Weak-ordered memory and non-cache-coherent
- *     archs are supported.
- *
- *     III. Transmit
- *
- *     A Tx skb is mapped and hangs off of a TCB.  TCBs are linked
- *     together in a fixed-size ring (CBL) thus forming the flexible mode
- *     memory structure.  A TCB marked with the suspend-bit indicates
- *     the end of the ring.  The last TCB processed suspends the
- *     controller, and the controller can be restarted by issue a CU
- *     resume command to continue from the suspend point, or a CU start
- *     command to start at a given position in the ring.
- *
- *     Non-Tx commands (config, multicast setup, etc) are linked
- *     into the CBL ring along with Tx commands.  The common structure
- *     used for both Tx and non-Tx commands is the Command Block (CB).
- *
- *     cb_to_use is the next CB to use for queuing a command; cb_to_clean
- *     is the next CB to check for completion; cb_to_send is the first
- *     CB to start on in case of a previous failure to resume.  CB clean
- *     up happens in interrupt context in response to a CU interrupt.
- *     cbs_avail keeps track of number of free CB resources available.
- *
- *     Hardware padding of short packets to minimum packet size is
- *     enabled.  82557 pads with 7Eh, while the later controllers pad
- *     with 00h.
- *
- *     IV.  Receive
- *
- *     The Receive Frame Area (RFA) comprises a ring of Receive Frame
- *     Descriptors (RFD) + data buffer, thus forming the simplified mode
- *     memory structure.  Rx skbs are allocated to contain both the RFD
- *     and the data buffer, but the RFD is pulled off before the skb is
- *     indicated.  The data buffer is aligned such that encapsulated
- *     protocol headers are u32-aligned.  Since the RFD is part of the
- *     mapped shared memory, and completion status is contained within
- *     the RFD, the RFD must be dma_sync'ed to maintain a consistent
- *     view from software and hardware.
- *
- *     In order to keep updates to the RFD link field from colliding with
- *     hardware writes to mark packets complete, we use the feature that
- *     hardware will not write to a size 0 descriptor and mark the previous
- *     packet as end-of-list (EL).   After updating the link, we remove EL
- *     and only then restore the size such that hardware may use the
- *     previous-to-end RFD.
- *
- *     Under typical operation, the  receive unit (RU) is start once,
- *     and the controller happily fills RFDs as frames arrive.  If
- *     replacement RFDs cannot be allocated, or the RU goes non-active,
- *     the RU must be restarted.  Frame arrival generates an interrupt,
- *     and Rx indication and re-allocation happen in the same context,
- *     therefore no locking is required.  A software-generated interrupt
- *     is generated from the watchdog to recover from a failed allocation
- *     scenario where all Rx resources have been indicated and none re-
- *     placed.
- *
- *     V.   Miscellaneous
- *
- *     VLAN offloading of tagging, stripping and filtering is not
- *     supported, but driver will accommodate the extra 4-byte VLAN tag
- *     for processing by upper layers.  Tx/Rx Checksum offloading is not
- *     supported.  Tx Scatter/Gather is not supported.  Jumbo Frames is
- *     not supported (hardware limitation).
- *
- *     MagicPacket(tm) WoL support is enabled/disabled via ethtool.
- *
- *     Thanks to JC (address@hidden) for helping with
- *     testing/troubleshooting the development driver.
- *
- *     TODO:
- *     o several entry points race with dev->close
- *     o check for tx-no-resources/stop Q races with tx clean/wake Q
- *
- *     FIXES:
- * 2005/12/02 - Michael O'Donnell <Michael.ODonnell at stratus dot com>
- *     - Stratus87247: protect MDI control register manipulations
- */
-
-#include <linux/module.h>
-#include <linux/moduleparam.h>
-#include <linux/kernel.h>
-#include <linux/types.h>
-#include <linux/slab.h>
-#include <linux/delay.h>
-#include <linux/init.h>
-#include <linux/pci.h>
-#include <linux/dma-mapping.h>
-#include <linux/netdevice.h>
-#include <linux/etherdevice.h>
-#include <linux/mii.h>
-#include <linux/if_vlan.h>
-#include <linux/skbuff.h>
-#include <linux/ethtool.h>
-#include <linux/string.h>
-#include <linux/firmware.h>
-#include <asm/unaligned.h>
-
-#include <ddekit/timer.h>
-
-
-#define DRV_NAME               "e100"
-#define DRV_EXT                        "-NAPI"
-#define DRV_VERSION            "3.5.23-k6"DRV_EXT
-#define DRV_DESCRIPTION                "Intel(R) PRO/100 Network Driver"
-#define DRV_COPYRIGHT          "Copyright(c) 1999-2006 Intel Corporation"
-#define PFX                    DRV_NAME ": "
-
-#define E100_WATCHDOG_PERIOD   (2 * HZ)
-#define E100_NAPI_WEIGHT       16
-
-#define FIRMWARE_D101M         "e100/d101m_ucode.bin"
-#define FIRMWARE_D101S         "e100/d101s_ucode.bin"
-#define FIRMWARE_D102E         "e100/d102e_ucode.bin"
-
-MODULE_DESCRIPTION(DRV_DESCRIPTION);
-MODULE_AUTHOR(DRV_COPYRIGHT);
-MODULE_LICENSE("GPL");
-MODULE_VERSION(DRV_VERSION);
-MODULE_FIRMWARE(FIRMWARE_D101M);
-MODULE_FIRMWARE(FIRMWARE_D101S);
-MODULE_FIRMWARE(FIRMWARE_D102E);
-
-static int debug = 3;
-static int eeprom_bad_csum_allow = 0;
-static int use_io = 0;
-module_param(debug, int, 0);
-module_param(eeprom_bad_csum_allow, int, 0);
-module_param(use_io, int, 0);
-MODULE_PARM_DESC(debug, "Debug level (0=none,...,16=all)");
-MODULE_PARM_DESC(eeprom_bad_csum_allow, "Allow bad eeprom checksums");
-MODULE_PARM_DESC(use_io, "Force use of i/o access mode");
-#define DPRINTK(nlevel, klevel, fmt, args...) \
-       (void)((NETIF_MSG_##nlevel & nic->msg_enable) && \
-       printk(KERN_##klevel PFX "%s: %s: " fmt, nic->netdev->name, \
-               __func__ , ## args))
-
-#define INTEL_8255X_ETHERNET_DEVICE(device_id, ich) {\
-       PCI_VENDOR_ID_INTEL, device_id, PCI_ANY_ID, PCI_ANY_ID, \
-       PCI_CLASS_NETWORK_ETHERNET << 8, 0xFFFF00, ich }
-static struct pci_device_id e100_id_table[] = {
-       INTEL_8255X_ETHERNET_DEVICE(0x1029, 0),
-       INTEL_8255X_ETHERNET_DEVICE(0x1030, 0),
-       INTEL_8255X_ETHERNET_DEVICE(0x1031, 3),
-       INTEL_8255X_ETHERNET_DEVICE(0x1032, 3),
-       INTEL_8255X_ETHERNET_DEVICE(0x1033, 3),
-       INTEL_8255X_ETHERNET_DEVICE(0x1034, 3),
-       INTEL_8255X_ETHERNET_DEVICE(0x1038, 3),
-       INTEL_8255X_ETHERNET_DEVICE(0x1039, 4),
-       INTEL_8255X_ETHERNET_DEVICE(0x103A, 4),
-       INTEL_8255X_ETHERNET_DEVICE(0x103B, 4),
-       INTEL_8255X_ETHERNET_DEVICE(0x103C, 4),
-       INTEL_8255X_ETHERNET_DEVICE(0x103D, 4),
-       INTEL_8255X_ETHERNET_DEVICE(0x103E, 4),
-       INTEL_8255X_ETHERNET_DEVICE(0x1050, 5),
-       INTEL_8255X_ETHERNET_DEVICE(0x1051, 5),
-       INTEL_8255X_ETHERNET_DEVICE(0x1052, 5),
-       INTEL_8255X_ETHERNET_DEVICE(0x1053, 5),
-       INTEL_8255X_ETHERNET_DEVICE(0x1054, 5),
-       INTEL_8255X_ETHERNET_DEVICE(0x1055, 5),
-       INTEL_8255X_ETHERNET_DEVICE(0x1056, 5),
-       INTEL_8255X_ETHERNET_DEVICE(0x1057, 5),
-       INTEL_8255X_ETHERNET_DEVICE(0x1059, 0),
-       INTEL_8255X_ETHERNET_DEVICE(0x1064, 6),
-       INTEL_8255X_ETHERNET_DEVICE(0x1065, 6),
-       INTEL_8255X_ETHERNET_DEVICE(0x1066, 6),
-       INTEL_8255X_ETHERNET_DEVICE(0x1067, 6),
-       INTEL_8255X_ETHERNET_DEVICE(0x1068, 6),
-       INTEL_8255X_ETHERNET_DEVICE(0x1069, 6),
-       INTEL_8255X_ETHERNET_DEVICE(0x106A, 6),
-       INTEL_8255X_ETHERNET_DEVICE(0x106B, 6),
-       INTEL_8255X_ETHERNET_DEVICE(0x1091, 7),
-       INTEL_8255X_ETHERNET_DEVICE(0x1092, 7),
-       INTEL_8255X_ETHERNET_DEVICE(0x1093, 7),
-       INTEL_8255X_ETHERNET_DEVICE(0x1094, 7),
-       INTEL_8255X_ETHERNET_DEVICE(0x1095, 7),
-       INTEL_8255X_ETHERNET_DEVICE(0x1209, 0),
-       INTEL_8255X_ETHERNET_DEVICE(0x1229, 0),
-       INTEL_8255X_ETHERNET_DEVICE(0x2449, 2),
-       INTEL_8255X_ETHERNET_DEVICE(0x2459, 2),
-       INTEL_8255X_ETHERNET_DEVICE(0x245D, 2),
-       INTEL_8255X_ETHERNET_DEVICE(0x27DC, 7),
-       { 0, }
-};
-MODULE_DEVICE_TABLE(pci, e100_id_table);
-
-enum mac {
-       mac_82557_D100_A  = 0,
-       mac_82557_D100_B  = 1,
-       mac_82557_D100_C  = 2,
-       mac_82558_D101_A4 = 4,
-       mac_82558_D101_B0 = 5,
-       mac_82559_D101M   = 8,
-       mac_82559_D101S   = 9,
-       mac_82550_D102    = 12,
-       mac_82550_D102_C  = 13,
-       mac_82551_E       = 14,
-       mac_82551_F       = 15,
-       mac_82551_10      = 16,
-       mac_unknown       = 0xFF,
-};
-
-enum phy {
-       phy_100a     = 0x000003E0,
-       phy_100c     = 0x035002A8,
-       phy_82555_tx = 0x015002A8,
-       phy_nsc_tx   = 0x5C002000,
-       phy_82562_et = 0x033002A8,
-       phy_82562_em = 0x032002A8,
-       phy_82562_ek = 0x031002A8,
-       phy_82562_eh = 0x017002A8,
-       phy_unknown  = 0xFFFFFFFF,
-};
-
-/* CSR (Control/Status Registers) */
-struct csr {
-       struct {
-               u8 status;
-               u8 stat_ack;
-               u8 cmd_lo;
-               u8 cmd_hi;
-               u32 gen_ptr;
-       } scb;
-       u32 port;
-       u16 flash_ctrl;
-       u8 eeprom_ctrl_lo;
-       u8 eeprom_ctrl_hi;
-       u32 mdi_ctrl;
-       u32 rx_dma_count;
-};
-
-enum scb_status {
-       rus_no_res       = 0x08,
-       rus_ready        = 0x10,
-       rus_mask         = 0x3C,
-};
-
-enum ru_state  {
-       RU_SUSPENDED = 0,
-       RU_RUNNING       = 1,
-       RU_UNINITIALIZED = -1,
-};
-
-enum scb_stat_ack {
-       stat_ack_not_ours    = 0x00,
-       stat_ack_sw_gen      = 0x04,
-       stat_ack_rnr         = 0x10,
-       stat_ack_cu_idle     = 0x20,
-       stat_ack_frame_rx    = 0x40,
-       stat_ack_cu_cmd_done = 0x80,
-       stat_ack_not_present = 0xFF,
-       stat_ack_rx = (stat_ack_sw_gen | stat_ack_rnr | stat_ack_frame_rx),
-       stat_ack_tx = (stat_ack_cu_idle | stat_ack_cu_cmd_done),
-};
-
-enum scb_cmd_hi {
-       irq_mask_none = 0x00,
-       irq_mask_all  = 0x01,
-       irq_sw_gen    = 0x02,
-};
-
-enum scb_cmd_lo {
-       cuc_nop        = 0x00,
-       ruc_start      = 0x01,
-       ruc_load_base  = 0x06,
-       cuc_start      = 0x10,
-       cuc_resume     = 0x20,
-       cuc_dump_addr  = 0x40,
-       cuc_dump_stats = 0x50,
-       cuc_load_base  = 0x60,
-       cuc_dump_reset = 0x70,
-};
-
-enum cuc_dump {
-       cuc_dump_complete       = 0x0000A005,
-       cuc_dump_reset_complete = 0x0000A007,
-};
-
-enum port {
-       software_reset  = 0x0000,
-       selftest        = 0x0001,
-       selective_reset = 0x0002,
-};
-
-enum eeprom_ctrl_lo {
-       eesk = 0x01,
-       eecs = 0x02,
-       eedi = 0x04,
-       eedo = 0x08,
-};
-
-enum mdi_ctrl {
-       mdi_write = 0x04000000,
-       mdi_read  = 0x08000000,
-       mdi_ready = 0x10000000,
-};
-
-enum eeprom_op {
-       op_write = 0x05,
-       op_read  = 0x06,
-       op_ewds  = 0x10,
-       op_ewen  = 0x13,
-};
-
-enum eeprom_offsets {
-       eeprom_cnfg_mdix  = 0x03,
-       eeprom_id         = 0x0A,
-       eeprom_config_asf = 0x0D,
-       eeprom_smbus_addr = 0x90,
-};
-
-enum eeprom_cnfg_mdix {
-       eeprom_mdix_enabled = 0x0080,
-};
-
-enum eeprom_id {
-       eeprom_id_wol = 0x0020,
-};
-
-enum eeprom_config_asf {
-       eeprom_asf = 0x8000,
-       eeprom_gcl = 0x4000,
-};
-
-enum cb_status {
-       cb_complete = 0x8000,
-       cb_ok       = 0x2000,
-};
-
-enum cb_command {
-       cb_nop    = 0x0000,
-       cb_iaaddr = 0x0001,
-       cb_config = 0x0002,
-       cb_multi  = 0x0003,
-       cb_tx     = 0x0004,
-       cb_ucode  = 0x0005,
-       cb_dump   = 0x0006,
-       cb_tx_sf  = 0x0008,
-       cb_cid    = 0x1f00,
-       cb_i      = 0x2000,
-       cb_s      = 0x4000,
-       cb_el     = 0x8000,
-};
-
-struct rfd {
-       __le16 status;
-       __le16 command;
-       __le32 link;
-       __le32 rbd;
-       __le16 actual_size;
-       __le16 size;
-};
-
-struct rx {
-       struct rx *next, *prev;
-       struct sk_buff *skb;
-       dma_addr_t dma_addr;
-};
-
-#if defined(__BIG_ENDIAN_BITFIELD)
-#define X(a,b) b,a
-#else
-#define X(a,b) a,b
-#endif
-struct config {
-/*0*/  u8 X(byte_count:6, pad0:2);
-/*1*/  u8 X(X(rx_fifo_limit:4, tx_fifo_limit:3), pad1:1);
-/*2*/  u8 adaptive_ifs;
-/*3*/  u8 X(X(X(X(mwi_enable:1, type_enable:1), read_align_enable:1),
-          term_write_cache_line:1), pad3:4);
-/*4*/  u8 X(rx_dma_max_count:7, pad4:1);
-/*5*/  u8 X(tx_dma_max_count:7, dma_max_count_enable:1);
-/*6*/  u8 X(X(X(X(X(X(X(late_scb_update:1, direct_rx_dma:1),
-          tno_intr:1), cna_intr:1), standard_tcb:1), standard_stat_counter:1),
-          rx_discard_overruns:1), rx_save_bad_frames:1);
-/*7*/  u8 X(X(X(X(X(rx_discard_short_frames:1, tx_underrun_retry:2),
-          pad7:2), rx_extended_rfd:1), tx_two_frames_in_fifo:1),
-          tx_dynamic_tbd:1);
-/*8*/  u8 X(X(mii_mode:1, pad8:6), csma_disabled:1);
-/*9*/  u8 X(X(X(X(X(rx_tcpudp_checksum:1, pad9:3), vlan_arp_tco:1),
-          link_status_wake:1), arp_wake:1), mcmatch_wake:1);
-/*10*/ u8 X(X(X(pad10:3, no_source_addr_insertion:1), preamble_length:2),
-          loopback:2);
-/*11*/ u8 X(linear_priority:3, pad11:5);
-/*12*/ u8 X(X(linear_priority_mode:1, pad12:3), ifs:4);
-/*13*/ u8 ip_addr_lo;
-/*14*/ u8 ip_addr_hi;
-/*15*/ u8 X(X(X(X(X(X(X(promiscuous_mode:1, broadcast_disabled:1),
-          wait_after_win:1), pad15_1:1), ignore_ul_bit:1), crc_16_bit:1),
-          pad15_2:1), crs_or_cdt:1);
-/*16*/ u8 fc_delay_lo;
-/*17*/ u8 fc_delay_hi;
-/*18*/ u8 X(X(X(X(X(rx_stripping:1, tx_padding:1), rx_crc_transfer:1),
-          rx_long_ok:1), fc_priority_threshold:3), pad18:1);
-/*19*/ u8 X(X(X(X(X(X(X(addr_wake:1, magic_packet_disable:1),
-          fc_disable:1), fc_restop:1), fc_restart:1), fc_reject:1),
-          full_duplex_force:1), full_duplex_pin:1);
-/*20*/ u8 X(X(X(pad20_1:5, fc_priority_location:1), multi_ia:1), pad20_2:1);
-/*21*/ u8 X(X(pad21_1:3, multicast_all:1), pad21_2:4);
-/*22*/ u8 X(X(rx_d102_mode:1, rx_vlan_drop:1), pad22:6);
-       u8 pad_d102[9];
-};
-
-#define E100_MAX_MULTICAST_ADDRS       64
-struct multi {
-       __le16 count;
-       u8 addr[E100_MAX_MULTICAST_ADDRS * ETH_ALEN + 2/*pad*/];
-};
-
-/* Important: keep total struct u32-aligned */
-#define UCODE_SIZE                     134
-struct cb {
-       __le16 status;
-       __le16 command;
-       __le32 link;
-       union {
-               u8 iaaddr[ETH_ALEN];
-               __le32 ucode[UCODE_SIZE];
-               struct config config;
-               struct multi multi;
-               struct {
-                       u32 tbd_array;
-                       u16 tcb_byte_count;
-                       u8 threshold;
-                       u8 tbd_count;
-                       struct {
-                               __le32 buf_addr;
-                               __le16 size;
-                               u16 eol;
-                       } tbd;
-               } tcb;
-               __le32 dump_buffer_addr;
-       } u;
-       struct cb *next, *prev;
-       dma_addr_t dma_addr;
-       struct sk_buff *skb;
-};
-
-enum loopback {
-       lb_none = 0, lb_mac = 1, lb_phy = 3,
-};
-
-struct stats {
-       __le32 tx_good_frames, tx_max_collisions, tx_late_collisions,
-               tx_underruns, tx_lost_crs, tx_deferred, tx_single_collisions,
-               tx_multiple_collisions, tx_total_collisions;
-       __le32 rx_good_frames, rx_crc_errors, rx_alignment_errors,
-               rx_resource_errors, rx_overrun_errors, rx_cdt_errors,
-               rx_short_frame_errors;
-       __le32 fc_xmt_pause, fc_rcv_pause, fc_rcv_unsupported;
-       __le16 xmt_tco_frames, rcv_tco_frames;
-       __le32 complete;
-};
-
-struct mem {
-       struct {
-               u32 signature;
-               u32 result;
-       } selftest;
-       struct stats stats;
-       u8 dump_buf[596];
-};
-
-struct param_range {
-       u32 min;
-       u32 max;
-       u32 count;
-};
-
-struct params {
-       struct param_range rfds;
-       struct param_range cbs;
-};
-
-struct nic {
-       /* Begin: frequently used values: keep adjacent for cache effect */
-       u32 msg_enable                          ____cacheline_aligned;
-       struct net_device *netdev;
-       struct pci_dev *pdev;
-
-       struct rx *rxs                          ____cacheline_aligned;
-       struct rx *rx_to_use;
-       struct rx *rx_to_clean;
-       struct rfd blank_rfd;
-       enum ru_state ru_running;
-
-       spinlock_t cb_lock                      ____cacheline_aligned;
-       spinlock_t cmd_lock;
-       struct csr __iomem *csr;
-       enum scb_cmd_lo cuc_cmd;
-       unsigned int cbs_avail;
-       struct napi_struct napi;
-       struct cb *cbs;
-       struct cb *cb_to_use;
-       struct cb *cb_to_send;
-       struct cb *cb_to_clean;
-       __le16 tx_command;
-       /* End: frequently used values: keep adjacent for cache effect */
-
-       enum {
-               ich                = (1 << 0),
-               promiscuous        = (1 << 1),
-               multicast_all      = (1 << 2),
-               wol_magic          = (1 << 3),
-               ich_10h_workaround = (1 << 4),
-       } flags                                 ____cacheline_aligned;
-
-       enum mac mac;
-       enum phy phy;
-       struct params params;
-       struct timer_list watchdog;
-       struct timer_list blink_timer;
-       struct mii_if_info mii;
-       struct work_struct tx_timeout_task;
-       enum loopback loopback;
-
-       struct mem *mem;
-       dma_addr_t dma_addr;
-
-       dma_addr_t cbs_dma_addr;
-       u8 adaptive_ifs;
-       u8 tx_threshold;
-       u32 tx_frames;
-       u32 tx_collisions;
-       u32 tx_deferred;
-       u32 tx_single_collisions;
-       u32 tx_multiple_collisions;
-       u32 tx_fc_pause;
-       u32 tx_tco_frames;
-
-       u32 rx_fc_pause;
-       u32 rx_fc_unsupported;
-       u32 rx_tco_frames;
-       u32 rx_over_length_errors;
-
-       u16 leds;
-       u16 eeprom_wc;
-       __le16 eeprom[256];
-       spinlock_t mdio_lock;
-};
-
-static inline void e100_write_flush(struct nic *nic)
-{
-       /* Flush previous PCI writes through intermediate bridges
-        * by doing a benign read */
-       (void)ioread8(&nic->csr->scb.status);
-}
-
-static void e100_enable_irq(struct nic *nic)
-{
-       unsigned long flags;
-
-       spin_lock_irqsave(&nic->cmd_lock, flags);
-       iowrite8(irq_mask_none, &nic->csr->scb.cmd_hi);
-       e100_write_flush(nic);
-       spin_unlock_irqrestore(&nic->cmd_lock, flags);
-}
-
-static void e100_disable_irq(struct nic *nic)
-{
-       unsigned long flags;
-
-       spin_lock_irqsave(&nic->cmd_lock, flags);
-       iowrite8(irq_mask_all, &nic->csr->scb.cmd_hi);
-       e100_write_flush(nic);
-       spin_unlock_irqrestore(&nic->cmd_lock, flags);
-}
-
-static void e100_hw_reset(struct nic *nic)
-{
-       /* Put CU and RU into idle with a selective reset to get
-        * device off of PCI bus */
-       iowrite32(selective_reset, &nic->csr->port);
-       e100_write_flush(nic); udelay(20);
-
-       /* Now fully reset device */
-       iowrite32(software_reset, &nic->csr->port);
-       e100_write_flush(nic); udelay(20);
-
-       /* Mask off our interrupt line - it's unmasked after reset */
-       e100_disable_irq(nic);
-}
-
-static int e100_self_test(struct nic *nic)
-{
-       u32 dma_addr = nic->dma_addr + offsetof(struct mem, selftest);
-
-       /* Passing the self-test is a pretty good indication
-        * that the device can DMA to/from host memory */
-
-       nic->mem->selftest.signature = 0;
-       nic->mem->selftest.result = 0xFFFFFFFF;
-
-       iowrite32(selftest | dma_addr, &nic->csr->port);
-       e100_write_flush(nic);
-       /* Wait 10 msec for self-test to complete */
-       msleep(10);
-
-       /* Interrupts are enabled after self-test */
-       e100_disable_irq(nic);
-
-       /* Check results of self-test */
-       if (nic->mem->selftest.result != 0) {
-               DPRINTK(HW, ERR, "Self-test failed: result=0x%08X\n",
-                       nic->mem->selftest.result);
-               return -ETIMEDOUT;
-       }
-       if (nic->mem->selftest.signature == 0) {
-               DPRINTK(HW, ERR, "Self-test failed: timed out\n");
-               return -ETIMEDOUT;
-       }
-
-       return 0;
-}
-
-static void e100_eeprom_write(struct nic *nic, u16 addr_len, u16 addr, __le16 
data)
-{
-       u32 cmd_addr_data[3];
-       u8 ctrl;
-       int i, j;
-
-       /* Three cmds: write/erase enable, write data, write/erase disable */
-       cmd_addr_data[0] = op_ewen << (addr_len - 2);
-       cmd_addr_data[1] = (((op_write << addr_len) | addr) << 16) |
-               le16_to_cpu(data);
-       cmd_addr_data[2] = op_ewds << (addr_len - 2);
-
-       /* Bit-bang cmds to write word to eeprom */
-       for (j = 0; j < 3; j++) {
-
-               /* Chip select */
-               iowrite8(eecs | eesk, &nic->csr->eeprom_ctrl_lo);
-               e100_write_flush(nic); udelay(4);
-
-               for (i = 31; i >= 0; i--) {
-                       ctrl = (cmd_addr_data[j] & (1 << i)) ?
-                               eecs | eedi : eecs;
-                       iowrite8(ctrl, &nic->csr->eeprom_ctrl_lo);
-                       e100_write_flush(nic); udelay(4);
-
-                       iowrite8(ctrl | eesk, &nic->csr->eeprom_ctrl_lo);
-                       e100_write_flush(nic); udelay(4);
-               }
-               /* Wait 10 msec for cmd to complete */
-               msleep(10);
-
-               /* Chip deselect */
-               iowrite8(0, &nic->csr->eeprom_ctrl_lo);
-               e100_write_flush(nic); udelay(4);
-       }
-};
-
-/* General technique stolen from the eepro100 driver - very clever */
-static __le16 e100_eeprom_read(struct nic *nic, u16 *addr_len, u16 addr)
-{
-       u32 cmd_addr_data;
-       u16 data = 0;
-       u8 ctrl;
-       int i;
-
-       cmd_addr_data = ((op_read << *addr_len) | addr) << 16;
-
-       /* Chip select */
-       iowrite8(eecs | eesk, &nic->csr->eeprom_ctrl_lo);
-       e100_write_flush(nic); udelay(4);
-
-       /* Bit-bang to read word from eeprom */
-       for (i = 31; i >= 0; i--) {
-               ctrl = (cmd_addr_data & (1 << i)) ? eecs | eedi : eecs;
-               iowrite8(ctrl, &nic->csr->eeprom_ctrl_lo);
-               e100_write_flush(nic); udelay(4);
-
-               iowrite8(ctrl | eesk, &nic->csr->eeprom_ctrl_lo);
-               e100_write_flush(nic); udelay(4);
-
-               /* Eeprom drives a dummy zero to EEDO after receiving
-                * complete address.  Use this to adjust addr_len. */
-               ctrl = ioread8(&nic->csr->eeprom_ctrl_lo);
-               if (!(ctrl & eedo) && i > 16) {
-                       *addr_len -= (i - 16);
-                       i = 17;
-               }
-
-               data = (data << 1) | (ctrl & eedo ? 1 : 0);
-       }
-
-       /* Chip deselect */
-       iowrite8(0, &nic->csr->eeprom_ctrl_lo);
-       e100_write_flush(nic); udelay(4);
-
-       return cpu_to_le16(data);
-};
-
-/* Load entire EEPROM image into driver cache and validate checksum */
-static int e100_eeprom_load(struct nic *nic)
-{
-       u16 addr, addr_len = 8, checksum = 0;
-
-       /* Try reading with an 8-bit addr len to discover actual addr len */
-       e100_eeprom_read(nic, &addr_len, 0);
-       nic->eeprom_wc = 1 << addr_len;
-
-       for (addr = 0; addr < nic->eeprom_wc; addr++) {
-               nic->eeprom[addr] = e100_eeprom_read(nic, &addr_len, addr);
-               if (addr < nic->eeprom_wc - 1)
-                       checksum += le16_to_cpu(nic->eeprom[addr]);
-       }
-
-       /* The checksum, stored in the last word, is calculated such that
-        * the sum of words should be 0xBABA */
-       if (cpu_to_le16(0xBABA - checksum) != nic->eeprom[nic->eeprom_wc - 1]) {
-               DPRINTK(PROBE, ERR, "EEPROM corrupted\n");
-               if (!eeprom_bad_csum_allow)
-                       return -EAGAIN;
-       }
-
-       return 0;
-}
-
-/* Save (portion of) driver EEPROM cache to device and update checksum */
-static int e100_eeprom_save(struct nic *nic, u16 start, u16 count)
-{
-       u16 addr, addr_len = 8, checksum = 0;
-
-       /* Try reading with an 8-bit addr len to discover actual addr len */
-       e100_eeprom_read(nic, &addr_len, 0);
-       nic->eeprom_wc = 1 << addr_len;
-
-       if (start + count >= nic->eeprom_wc)
-               return -EINVAL;
-
-       for (addr = start; addr < start + count; addr++)
-               e100_eeprom_write(nic, addr_len, addr, nic->eeprom[addr]);
-
-       /* The checksum, stored in the last word, is calculated such that
-        * the sum of words should be 0xBABA */
-       for (addr = 0; addr < nic->eeprom_wc - 1; addr++)
-               checksum += le16_to_cpu(nic->eeprom[addr]);
-       nic->eeprom[nic->eeprom_wc - 1] = cpu_to_le16(0xBABA - checksum);
-       e100_eeprom_write(nic, addr_len, nic->eeprom_wc - 1,
-               nic->eeprom[nic->eeprom_wc - 1]);
-
-       return 0;
-}
-
-#define E100_WAIT_SCB_TIMEOUT 20000 /* we might have to wait 100ms!!! */
-#define E100_WAIT_SCB_FAST 20       /* delay like the old code */
-static int e100_exec_cmd(struct nic *nic, u8 cmd, dma_addr_t dma_addr)
-{
-       unsigned long flags;
-       unsigned int i;
-       int err = 0;
-
-       spin_lock_irqsave(&nic->cmd_lock, flags);
-
-       /* Previous command is accepted when SCB clears */
-       for (i = 0; i < E100_WAIT_SCB_TIMEOUT; i++) {
-               if (likely(!ioread8(&nic->csr->scb.cmd_lo)))
-                       break;
-               cpu_relax();
-               if (unlikely(i > E100_WAIT_SCB_FAST))
-                       udelay(5);
-       }
-       if (unlikely(i == E100_WAIT_SCB_TIMEOUT)) {
-               err = -EAGAIN;
-               goto err_unlock;
-       }
-
-       if (unlikely(cmd != cuc_resume))
-               iowrite32(dma_addr, &nic->csr->scb.gen_ptr);
-       iowrite8(cmd, &nic->csr->scb.cmd_lo);
-
-err_unlock:
-       spin_unlock_irqrestore(&nic->cmd_lock, flags);
-
-       return err;
-}
-
-static int e100_exec_cb(struct nic *nic, struct sk_buff *skb,
-       void (*cb_prepare)(struct nic *, struct cb *, struct sk_buff *))
-{
-       struct cb *cb;
-       unsigned long flags;
-       int err = 0;
-
-       spin_lock_irqsave(&nic->cb_lock, flags);
-
-       if (unlikely(!nic->cbs_avail)) {
-               err = -ENOMEM;
-               goto err_unlock;
-       }
-
-       cb = nic->cb_to_use;
-       nic->cb_to_use = cb->next;
-       nic->cbs_avail--;
-       cb->skb = skb;
-
-       if (unlikely(!nic->cbs_avail))
-               err = -ENOSPC;
-
-       cb_prepare(nic, cb, skb);
-
-       /* Order is important otherwise we'll be in a race with h/w:
-        * set S-bit in current first, then clear S-bit in previous. */
-       cb->command |= cpu_to_le16(cb_s);
-       wmb();
-       cb->prev->command &= cpu_to_le16(~cb_s);
-
-       while (nic->cb_to_send != nic->cb_to_use) {
-               if (unlikely(e100_exec_cmd(nic, nic->cuc_cmd,
-                       nic->cb_to_send->dma_addr))) {
-                       /* Ok, here's where things get sticky.  It's
-                        * possible that we can't schedule the command
-                        * because the controller is too busy, so
-                        * let's just queue the command and try again
-                        * when another command is scheduled. */
-                       if (err == -ENOSPC) {
-                               //request a reset
-                               schedule_work(&nic->tx_timeout_task);
-                       }
-                       break;
-               } else {
-                       nic->cuc_cmd = cuc_resume;
-                       nic->cb_to_send = nic->cb_to_send->next;
-               }
-       }
-
-err_unlock:
-       spin_unlock_irqrestore(&nic->cb_lock, flags);
-
-       return err;
-}
-
-static u16 mdio_ctrl(struct nic *nic, u32 addr, u32 dir, u32 reg, u16 data)
-{
-       u32 data_out = 0;
-       unsigned int i;
-       unsigned long flags;
-
-
-       /*
-        * Stratus87247: we shouldn't be writing the MDI control
-        * register until the Ready bit shows True.  Also, since
-        * manipulation of the MDI control registers is a multi-step
-        * procedure it should be done under lock.
-        */
-       spin_lock_irqsave(&nic->mdio_lock, flags);
-       for (i = 100; i; --i) {
-               if (ioread32(&nic->csr->mdi_ctrl) & mdi_ready)
-                       break;
-               udelay(20);
-       }
-       if (unlikely(!i)) {
-               printk("e100.mdio_ctrl(%s) won't go Ready\n",
-                       nic->netdev->name );
-               spin_unlock_irqrestore(&nic->mdio_lock, flags);
-               return 0;               /* No way to indicate timeout error */
-       }
-       iowrite32((reg << 16) | (addr << 21) | dir | data, &nic->csr->mdi_ctrl);
-
-       for (i = 0; i < 100; i++) {
-               udelay(20);
-               if ((data_out = ioread32(&nic->csr->mdi_ctrl)) & mdi_ready)
-                       break;
-       }
-       spin_unlock_irqrestore(&nic->mdio_lock, flags);
-       DPRINTK(HW, DEBUG,
-               "%s:addr=%d, reg=%d, data_in=0x%04X, data_out=0x%04X\n",
-               dir == mdi_read ? "READ" : "WRITE", addr, reg, data, data_out);
-       return (u16)data_out;
-}
-
-static int mdio_read(struct net_device *netdev, int addr, int reg)
-{
-       return mdio_ctrl(netdev_priv(netdev), addr, mdi_read, reg, 0);
-}
-
-static void mdio_write(struct net_device *netdev, int addr, int reg, int data)
-{
-       mdio_ctrl(netdev_priv(netdev), addr, mdi_write, reg, data);
-}
-
-static void e100_get_defaults(struct nic *nic)
-{
-       struct param_range rfds = { .min = 16, .max = 256, .count = 256 };
-       struct param_range cbs  = { .min = 64, .max = 256, .count = 128 };
-
-       /* MAC type is encoded as rev ID; exception: ICH is treated as 82559 */
-       nic->mac = (nic->flags & ich) ? mac_82559_D101M : nic->pdev->revision;
-       if (nic->mac == mac_unknown)
-               nic->mac = mac_82557_D100_A;
-
-       nic->params.rfds = rfds;
-       nic->params.cbs = cbs;
-
-       /* Quadwords to DMA into FIFO before starting frame transmit */
-       nic->tx_threshold = 0xE0;
-
-       /* no interrupt for every tx completion, delay = 256us if not 557 */
-       nic->tx_command = cpu_to_le16(cb_tx | cb_tx_sf |
-               ((nic->mac >= mac_82558_D101_A4) ? cb_cid : cb_i));
-
-       /* Template for a freshly allocated RFD */
-       nic->blank_rfd.command = 0;
-       nic->blank_rfd.rbd = cpu_to_le32(0xFFFFFFFF);
-       nic->blank_rfd.size = cpu_to_le16(VLAN_ETH_FRAME_LEN);
-
-       /* MII setup */
-       nic->mii.phy_id_mask = 0x1F;
-       nic->mii.reg_num_mask = 0x1F;
-       nic->mii.dev = nic->netdev;
-       nic->mii.mdio_read = mdio_read;
-       nic->mii.mdio_write = mdio_write;
-}
-
-static void e100_configure(struct nic *nic, struct cb *cb, struct sk_buff *skb)
-{
-       struct config *config = &cb->u.config;
-       u8 *c = (u8 *)config;
-
-       cb->command = cpu_to_le16(cb_config);
-
-       memset(config, 0, sizeof(struct config));
-
-       config->byte_count = 0x16;              /* bytes in this struct */
-       config->rx_fifo_limit = 0x8;            /* bytes in FIFO before DMA */
-       config->direct_rx_dma = 0x1;            /* reserved */
-       config->standard_tcb = 0x1;             /* 1=standard, 0=extended */
-       config->standard_stat_counter = 0x1;    /* 1=standard, 0=extended */
-       config->rx_discard_short_frames = 0x1;  /* 1=discard, 0=pass */
-       config->tx_underrun_retry = 0x3;        /* # of underrun retries */
-       config->mii_mode = 0x1;                 /* 1=MII mode, 0=503 mode */
-       config->pad10 = 0x6;
-       config->no_source_addr_insertion = 0x1; /* 1=no, 0=yes */
-       config->preamble_length = 0x2;          /* 0=1, 1=3, 2=7, 3=15 bytes */
-       config->ifs = 0x6;                      /* x16 = inter frame spacing */
-       config->ip_addr_hi = 0xF2;              /* ARP IP filter - not used */
-       config->pad15_1 = 0x1;
-       config->pad15_2 = 0x1;
-       config->crs_or_cdt = 0x0;               /* 0=CRS only, 1=CRS or CDT */
-       config->fc_delay_hi = 0x40;             /* time delay for fc frame */
-       config->tx_padding = 0x1;               /* 1=pad short frames */
-       config->fc_priority_threshold = 0x7;    /* 7=priority fc disabled */
-       config->pad18 = 0x1;
-       config->full_duplex_pin = 0x1;          /* 1=examine FDX# pin */
-       config->pad20_1 = 0x1F;
-       config->fc_priority_location = 0x1;     /* 1=byte#31, 0=byte#19 */
-       config->pad21_1 = 0x5;
-
-       config->adaptive_ifs = nic->adaptive_ifs;
-       config->loopback = nic->loopback;
-
-       if (nic->mii.force_media && nic->mii.full_duplex)
-               config->full_duplex_force = 0x1;        /* 1=force, 0=auto */
-
-       if (nic->flags & promiscuous || nic->loopback) {
-               config->rx_save_bad_frames = 0x1;       /* 1=save, 0=discard */
-               config->rx_discard_short_frames = 0x0;  /* 1=discard, 0=save */
-               config->promiscuous_mode = 0x1;         /* 1=on, 0=off */
-       }
-
-       if (nic->flags & multicast_all)
-               config->multicast_all = 0x1;            /* 1=accept, 0=no */
-
-       /* disable WoL when up */
-       if (netif_running(nic->netdev) || !(nic->flags & wol_magic))
-               config->magic_packet_disable = 0x1;     /* 1=off, 0=on */
-
-       if (nic->mac >= mac_82558_D101_A4) {
-               config->fc_disable = 0x1;       /* 1=Tx fc off, 0=Tx fc on */
-               config->mwi_enable = 0x1;       /* 1=enable, 0=disable */
-               config->standard_tcb = 0x0;     /* 1=standard, 0=extended */
-               config->rx_long_ok = 0x1;       /* 1=VLANs ok, 0=standard */
-               if (nic->mac >= mac_82559_D101M) {
-                       config->tno_intr = 0x1;         /* TCO stats enable */
-                       /* Enable TCO in extended config */
-                       if (nic->mac >= mac_82551_10) {
-                               config->byte_count = 0x20; /* extended bytes */
-                               config->rx_d102_mode = 0x1; /* GMRC for TCO */
-                       }
-               } else {
-                       config->standard_stat_counter = 0x0;
-               }
-       }
-
-       DPRINTK(HW, DEBUG, "[00-07]=%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X\n",
-               c[0], c[1], c[2], c[3], c[4], c[5], c[6], c[7]);
-       DPRINTK(HW, DEBUG, "[08-15]=%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X\n",
-               c[8], c[9], c[10], c[11], c[12], c[13], c[14], c[15]);
-       DPRINTK(HW, DEBUG, "[16-23]=%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X\n",
-               c[16], c[17], c[18], c[19], c[20], c[21], c[22], c[23]);
-}
-
-/*************************************************************************
-*  CPUSaver parameters
-*
-*  All CPUSaver parameters are 16-bit literals that are part of a
-*  "move immediate value" instruction.  By changing the value of
-*  the literal in the instruction before the code is loaded, the
-*  driver can change the algorithm.
-*
-*  INTDELAY - This loads the dead-man timer with its initial value.
-*    When this timer expires the interrupt is asserted, and the
-*    timer is reset each time a new packet is received.  (see
-*    BUNDLEMAX below to set the limit on number of chained packets)
-*    The current default is 0x600 or 1536.  Experiments show that
-*    the value should probably stay within the 0x200 - 0x1000.
-*
-*  BUNDLEMAX -
-*    This sets the maximum number of frames that will be bundled.  In
-*    some situations, such as the TCP windowing algorithm, it may be
-*    better to limit the growth of the bundle size than let it go as
-*    high as it can, because that could cause too much added latency.
-*    The default is six, because this is the number of packets in the
-*    default TCP window size.  A value of 1 would make CPUSaver indicate
-*    an interrupt for every frame received.  If you do not want to put
-*    a limit on the bundle size, set this value to xFFFF.
-*
-*  BUNDLESMALL -
-*    This contains a bit-mask describing the minimum size frame that
-*    will be bundled.  The default masks the lower 7 bits, which means
-*    that any frame less than 128 bytes in length will not be bundled,
-*    but will instead immediately generate an interrupt.  This does
-*    not affect the current bundle in any way.  Any frame that is 128
-*    bytes or large will be bundled normally.  This feature is meant
-*    to provide immediate indication of ACK frames in a TCP environment.
-*    Customers were seeing poor performance when a machine with CPUSaver
-*    enabled was sending but not receiving.  The delay introduced when
-*    the ACKs were received was enough to reduce total throughput, because
-*    the sender would sit idle until the ACK was finally seen.
-*
-*    The current default is 0xFF80, which masks out the lower 7 bits.
-*    This means that any frame which is x7F (127) bytes or smaller
-*    will cause an immediate interrupt.  Because this value must be a
-*    bit mask, there are only a few valid values that can be used.  To
-*    turn this feature off, the driver can write the value xFFFF to the
-*    lower word of this instruction (in the same way that the other
-*    parameters are used).  Likewise, a value of 0xF800 (2047) would
-*    cause an interrupt to be generated for every frame, because all
-*    standard Ethernet frames are <= 2047 bytes in length.
-*************************************************************************/
-
-/* if you wish to disable the ucode functionality, while maintaining the
- * workarounds it provides, set the following defines to:
- * BUNDLESMALL 0
- * BUNDLEMAX 1
- * INTDELAY 1
- */
-#define BUNDLESMALL 1
-#define BUNDLEMAX (u16)6
-#define INTDELAY (u16)1536 /* 0x600 */
-
-/* Initialize firmware */
-static const struct firmware *e100_request_firmware(struct nic *nic)
-{
-       const char *fw_name;
-       const struct firmware *fw;
-       u8 timer, bundle, min_size;
-       int err;
-
-       /* do not load u-code for ICH devices */
-       if (nic->flags & ich)
-               return NULL;
-
-       /* Search for ucode match against h/w revision */
-       if (nic->mac == mac_82559_D101M)
-               fw_name = FIRMWARE_D101M;
-       else if (nic->mac == mac_82559_D101S)
-               fw_name = FIRMWARE_D101S;
-       else if (nic->mac == mac_82551_F || nic->mac == mac_82551_10)
-               fw_name = FIRMWARE_D102E;
-       else /* No ucode on other devices */
-               return NULL;
-
-       err = request_firmware(&fw, fw_name, &nic->pdev->dev);
-       if (err) {
-               DPRINTK(PROBE, ERR, "Failed to load firmware \"%s\": %d\n",
-                       fw_name, err);
-               return ERR_PTR(err);
-       }
-       /* Firmware should be precisely UCODE_SIZE (words) plus three bytes
-          indicating the offsets for BUNDLESMALL, BUNDLEMAX, INTDELAY */
-       if (fw->size != UCODE_SIZE * 4 + 3) {
-               DPRINTK(PROBE, ERR, "Firmware \"%s\" has wrong size %zu\n",
-                       fw_name, fw->size);
-               release_firmware(fw);
-               return ERR_PTR(-EINVAL);
-       }
-
-       /* Read timer, bundle and min_size from end of firmware blob */
-       timer = fw->data[UCODE_SIZE * 4];
-       bundle = fw->data[UCODE_SIZE * 4 + 1];
-       min_size = fw->data[UCODE_SIZE * 4 + 2];
-
-       if (timer >= UCODE_SIZE || bundle >= UCODE_SIZE ||
-           min_size >= UCODE_SIZE) {
-               DPRINTK(PROBE, ERR,
-                       "\"%s\" has bogus offset values (0x%x,0x%x,0x%x)\n",
-                       fw_name, timer, bundle, min_size);
-               release_firmware(fw);
-               return ERR_PTR(-EINVAL);
-       }
-       /* OK, firmware is validated and ready to use... */
-       return fw;
-}
-
-static void e100_setup_ucode(struct nic *nic, struct cb *cb,
-                            struct sk_buff *skb)
-{
-       const struct firmware *fw = (void *)skb;
-       u8 timer, bundle, min_size;
-
-       /* It's not a real skb; we just abused the fact that e100_exec_cb
-          will pass it through to here... */
-       cb->skb = NULL;
-
-       /* firmware is stored as little endian already */
-       memcpy(cb->u.ucode, fw->data, UCODE_SIZE * 4);
-
-       /* Read timer, bundle and min_size from end of firmware blob */
-       timer = fw->data[UCODE_SIZE * 4];
-       bundle = fw->data[UCODE_SIZE * 4 + 1];
-       min_size = fw->data[UCODE_SIZE * 4 + 2];
-
-       /* Insert user-tunable settings in cb->u.ucode */
-       cb->u.ucode[timer] &= cpu_to_le32(0xFFFF0000);
-       cb->u.ucode[timer] |= cpu_to_le32(INTDELAY);
-       cb->u.ucode[bundle] &= cpu_to_le32(0xFFFF0000);
-       cb->u.ucode[bundle] |= cpu_to_le32(BUNDLEMAX);
-       cb->u.ucode[min_size] &= cpu_to_le32(0xFFFF0000);
-       cb->u.ucode[min_size] |= cpu_to_le32((BUNDLESMALL) ? 0xFFFF : 0xFF80);
-
-       cb->command = cpu_to_le16(cb_ucode | cb_el);
-}
-
-static inline int e100_load_ucode_wait(struct nic *nic)
-{
-       const struct firmware *fw;
-       int err = 0, counter = 50;
-       struct cb *cb = nic->cb_to_clean;
-
-       fw = e100_request_firmware(nic);
-       /* If it's NULL, then no ucode is required */
-       if (!fw || IS_ERR(fw))
-               return PTR_ERR(fw);
-
-       if ((err = e100_exec_cb(nic, (void *)fw, e100_setup_ucode)))
-               DPRINTK(PROBE,ERR, "ucode cmd failed with error %d\n", err);
-
-       /* must restart cuc */
-       nic->cuc_cmd = cuc_start;
-
-       /* wait for completion */
-       e100_write_flush(nic);
-       udelay(10);
-
-       /* wait for possibly (ouch) 500ms */
-       while (!(cb->status & cpu_to_le16(cb_complete))) {
-               msleep(10);
-               if (!--counter) break;
-       }
-
-       /* ack any interrupts, something could have been set */
-       iowrite8(~0, &nic->csr->scb.stat_ack);
-
-       /* if the command failed, or is not OK, notify and return */
-       if (!counter || !(cb->status & cpu_to_le16(cb_ok))) {
-               DPRINTK(PROBE,ERR, "ucode load failed\n");
-               err = -EPERM;
-       }
-
-       return err;
-}
-
-static void e100_setup_iaaddr(struct nic *nic, struct cb *cb,
-       struct sk_buff *skb)
-{
-       cb->command = cpu_to_le16(cb_iaaddr);
-       memcpy(cb->u.iaaddr, nic->netdev->dev_addr, ETH_ALEN);
-}
-
-static void e100_dump(struct nic *nic, struct cb *cb, struct sk_buff *skb)
-{
-       cb->command = cpu_to_le16(cb_dump);
-       cb->u.dump_buffer_addr = cpu_to_le32(nic->dma_addr +
-               offsetof(struct mem, dump_buf));
-}
-
-#define NCONFIG_AUTO_SWITCH    0x0080
-#define MII_NSC_CONG           MII_RESV1
-#define NSC_CONG_ENABLE                0x0100
-#define NSC_CONG_TXREADY       0x0400
-#define ADVERTISE_FC_SUPPORTED 0x0400
-static int e100_phy_init(struct nic *nic)
-{
-       struct net_device *netdev = nic->netdev;
-       u32 addr;
-       u16 bmcr, stat, id_lo, id_hi, cong;
-
-       /* Discover phy addr by searching addrs in order {1,0,2,..., 31} */
-       for (addr = 0; addr < 32; addr++) {
-               nic->mii.phy_id = (addr == 0) ? 1 : (addr == 1) ? 0 : addr;
-               bmcr = mdio_read(netdev, nic->mii.phy_id, MII_BMCR);
-               stat = mdio_read(netdev, nic->mii.phy_id, MII_BMSR);
-               stat = mdio_read(netdev, nic->mii.phy_id, MII_BMSR);
-               if (!((bmcr == 0xFFFF) || ((stat == 0) && (bmcr == 0))))
-                       break;
-       }
-       DPRINTK(HW, DEBUG, "phy_addr = %d\n", nic->mii.phy_id);
-       if (addr == 32)
-               return -EAGAIN;
-
-       /* Selected the phy and isolate the rest */
-       for (addr = 0; addr < 32; addr++) {
-               if (addr != nic->mii.phy_id) {
-                       mdio_write(netdev, addr, MII_BMCR, BMCR_ISOLATE);
-               } else {
-                       bmcr = mdio_read(netdev, addr, MII_BMCR);
-                       mdio_write(netdev, addr, MII_BMCR,
-                               bmcr & ~BMCR_ISOLATE);
-               }
-       }
-
-       /* Get phy ID */
-       id_lo = mdio_read(netdev, nic->mii.phy_id, MII_PHYSID1);
-       id_hi = mdio_read(netdev, nic->mii.phy_id, MII_PHYSID2);
-       nic->phy = (u32)id_hi << 16 | (u32)id_lo;
-       DPRINTK(HW, DEBUG, "phy ID = 0x%08X\n", nic->phy);
-
-       /* Handle National tx phys */
-#define NCS_PHY_MODEL_MASK     0xFFF0FFFF
-       if ((nic->phy & NCS_PHY_MODEL_MASK) == phy_nsc_tx) {
-               /* Disable congestion control */
-               cong = mdio_read(netdev, nic->mii.phy_id, MII_NSC_CONG);
-               cong |= NSC_CONG_TXREADY;
-               cong &= ~NSC_CONG_ENABLE;
-               mdio_write(netdev, nic->mii.phy_id, MII_NSC_CONG, cong);
-       }
-
-       if ((nic->mac >= mac_82550_D102) || ((nic->flags & ich) &&
-          (mdio_read(netdev, nic->mii.phy_id, MII_TPISTATUS) & 0x8000) &&
-               !(nic->eeprom[eeprom_cnfg_mdix] & eeprom_mdix_enabled))) {
-               /* enable/disable MDI/MDI-X auto-switching. */
-               mdio_write(netdev, nic->mii.phy_id, MII_NCONFIG,
-                               nic->mii.force_media ? 0 : NCONFIG_AUTO_SWITCH);
-       }
-
-       return 0;
-}
-
-static int e100_hw_init(struct nic *nic)
-{
-       int err;
-
-       e100_hw_reset(nic);
-
-       DPRINTK(HW, ERR, "e100_hw_init\n");
-       if (!in_interrupt() && (err = e100_self_test(nic)))
-               return err;
-
-       if ((err = e100_phy_init(nic)))
-               return err;
-       if ((err = e100_exec_cmd(nic, cuc_load_base, 0)))
-               return err;
-       if ((err = e100_exec_cmd(nic, ruc_load_base, 0)))
-               return err;
-       if ((err = e100_load_ucode_wait(nic)))
-               return err;
-       if ((err = e100_exec_cb(nic, NULL, e100_configure)))
-               return err;
-       if ((err = e100_exec_cb(nic, NULL, e100_setup_iaaddr)))
-               return err;
-       if ((err = e100_exec_cmd(nic, cuc_dump_addr,
-               nic->dma_addr + offsetof(struct mem, stats))))
-               return err;
-       if ((err = e100_exec_cmd(nic, cuc_dump_reset, 0)))
-               return err;
-
-       e100_disable_irq(nic);
-
-       return 0;
-}
-
-static void e100_multi(struct nic *nic, struct cb *cb, struct sk_buff *skb)
-{
-       struct net_device *netdev = nic->netdev;
-       struct dev_mc_list *list = netdev->mc_list;
-       u16 i, count = min(netdev->mc_count, E100_MAX_MULTICAST_ADDRS);
-
-       cb->command = cpu_to_le16(cb_multi);
-       cb->u.multi.count = cpu_to_le16(count * ETH_ALEN);
-       for (i = 0; list && i < count; i++, list = list->next)
-               memcpy(&cb->u.multi.addr[i*ETH_ALEN], &list->dmi_addr,
-                       ETH_ALEN);
-}
-
-static void e100_set_multicast_list(struct net_device *netdev)
-{
-       struct nic *nic = netdev_priv(netdev);
-
-       DPRINTK(HW, DEBUG, "mc_count=%d, flags=0x%04X\n",
-               netdev->mc_count, netdev->flags);
-
-       if (netdev->flags & IFF_PROMISC)
-               nic->flags |= promiscuous;
-       else
-               nic->flags &= ~promiscuous;
-
-       if (netdev->flags & IFF_ALLMULTI ||
-               netdev->mc_count > E100_MAX_MULTICAST_ADDRS)
-               nic->flags |= multicast_all;
-       else
-               nic->flags &= ~multicast_all;
-
-       e100_exec_cb(nic, NULL, e100_configure);
-       e100_exec_cb(nic, NULL, e100_multi);
-}
-
-static void e100_update_stats(struct nic *nic)
-{
-       struct net_device *dev = nic->netdev;
-       struct net_device_stats *ns = &dev->stats;
-       struct stats *s = &nic->mem->stats;
-       __le32 *complete = (nic->mac < mac_82558_D101_A4) ? &s->fc_xmt_pause :
-               (nic->mac < mac_82559_D101M) ? (__le32 *)&s->xmt_tco_frames :
-               &s->complete;
-
-       /* Device's stats reporting may take several microseconds to
-        * complete, so we're always waiting for results of the
-        * previous command. */
-
-       if (*complete == cpu_to_le32(cuc_dump_reset_complete)) {
-               *complete = 0;
-               nic->tx_frames = le32_to_cpu(s->tx_good_frames);
-               nic->tx_collisions = le32_to_cpu(s->tx_total_collisions);
-               ns->tx_aborted_errors += le32_to_cpu(s->tx_max_collisions);
-               ns->tx_window_errors += le32_to_cpu(s->tx_late_collisions);
-               ns->tx_carrier_errors += le32_to_cpu(s->tx_lost_crs);
-               ns->tx_fifo_errors += le32_to_cpu(s->tx_underruns);
-               ns->collisions += nic->tx_collisions;
-               ns->tx_errors += le32_to_cpu(s->tx_max_collisions) +
-                       le32_to_cpu(s->tx_lost_crs);
-               ns->rx_length_errors += le32_to_cpu(s->rx_short_frame_errors) +
-                       nic->rx_over_length_errors;
-               ns->rx_crc_errors += le32_to_cpu(s->rx_crc_errors);
-               ns->rx_frame_errors += le32_to_cpu(s->rx_alignment_errors);
-               ns->rx_over_errors += le32_to_cpu(s->rx_overrun_errors);
-               ns->rx_fifo_errors += le32_to_cpu(s->rx_overrun_errors);
-               ns->rx_missed_errors += le32_to_cpu(s->rx_resource_errors);
-               ns->rx_errors += le32_to_cpu(s->rx_crc_errors) +
-                       le32_to_cpu(s->rx_alignment_errors) +
-                       le32_to_cpu(s->rx_short_frame_errors) +
-                       le32_to_cpu(s->rx_cdt_errors);
-               nic->tx_deferred += le32_to_cpu(s->tx_deferred);
-               nic->tx_single_collisions +=
-                       le32_to_cpu(s->tx_single_collisions);
-               nic->tx_multiple_collisions +=
-                       le32_to_cpu(s->tx_multiple_collisions);
-               if (nic->mac >= mac_82558_D101_A4) {
-                       nic->tx_fc_pause += le32_to_cpu(s->fc_xmt_pause);
-                       nic->rx_fc_pause += le32_to_cpu(s->fc_rcv_pause);
-                       nic->rx_fc_unsupported +=
-                               le32_to_cpu(s->fc_rcv_unsupported);
-                       if (nic->mac >= mac_82559_D101M) {
-                               nic->tx_tco_frames +=
-                                       le16_to_cpu(s->xmt_tco_frames);
-                               nic->rx_tco_frames +=
-                                       le16_to_cpu(s->rcv_tco_frames);
-                       }
-               }
-       }
-
-
-       if (e100_exec_cmd(nic, cuc_dump_reset, 0))
-               DPRINTK(TX_ERR, DEBUG, "exec cuc_dump_reset failed\n");
-}
-
-static void e100_adjust_adaptive_ifs(struct nic *nic, int speed, int duplex)
-{
-       /* Adjust inter-frame-spacing (IFS) between two transmits if
-        * we're getting collisions on a half-duplex connection. */
-
-       if (duplex == DUPLEX_HALF) {
-               u32 prev = nic->adaptive_ifs;
-               u32 min_frames = (speed == SPEED_100) ? 1000 : 100;
-
-               if ((nic->tx_frames / 32 < nic->tx_collisions) &&
-                  (nic->tx_frames > min_frames)) {
-                       if (nic->adaptive_ifs < 60)
-                               nic->adaptive_ifs += 5;
-               } else if (nic->tx_frames < min_frames) {
-                       if (nic->adaptive_ifs >= 5)
-                               nic->adaptive_ifs -= 5;
-               }
-               if (nic->adaptive_ifs != prev)
-                       e100_exec_cb(nic, NULL, e100_configure);
-       }
-}
-
-static void e100_watchdog(unsigned long data)
-{
-       struct nic *nic = (struct nic *)data;
-       struct ethtool_cmd cmd;
-
-       DPRINTK(TIMER, DEBUG, "right now = %ld\n", jiffies);
-
-       /* mii library handles link maintenance tasks */
-
-       mii_ethtool_gset(&nic->mii, &cmd);
-
-       if (mii_link_ok(&nic->mii) && !netif_carrier_ok(nic->netdev)) {
-               printk(KERN_INFO "e100: %s NIC Link is Up %s Mbps %s Duplex\n",
-                      nic->netdev->name,
-                      cmd.speed == SPEED_100 ? "100" : "10",
-                      cmd.duplex == DUPLEX_FULL ? "Full" : "Half");
-       } else if (!mii_link_ok(&nic->mii) && netif_carrier_ok(nic->netdev)) {
-               printk(KERN_INFO "e100: %s NIC Link is Down\n",
-                      nic->netdev->name);
-       }
-
-       mii_check_link(&nic->mii);
-
-       /* Software generated interrupt to recover from (rare) Rx
-        * allocation failure.
-        * Unfortunately have to use a spinlock to not re-enable interrupts
-        * accidentally, due to hardware that shares a register between the
-        * interrupt mask bit and the SW Interrupt generation bit */
-       spin_lock_irq(&nic->cmd_lock);
-       iowrite8(ioread8(&nic->csr->scb.cmd_hi) | 
irq_sw_gen,&nic->csr->scb.cmd_hi);
-       e100_write_flush(nic);
-       spin_unlock_irq(&nic->cmd_lock);
-
-       e100_update_stats(nic);
-       e100_adjust_adaptive_ifs(nic, cmd.speed, cmd.duplex);
-
-       if (nic->mac <= mac_82557_D100_C)
-               /* Issue a multicast command to workaround a 557 lock up */
-               e100_set_multicast_list(nic->netdev);
-
-       if (nic->flags & ich && cmd.speed==SPEED_10 && cmd.duplex==DUPLEX_HALF)
-               /* Need SW workaround for ICH[x] 10Mbps/half duplex Tx hang. */
-               nic->flags |= ich_10h_workaround;
-       else
-               nic->flags &= ~ich_10h_workaround;
-
-       mod_timer(&nic->watchdog,
-                 round_jiffies(jiffies + E100_WATCHDOG_PERIOD));
-}
-
-static void e100_xmit_prepare(struct nic *nic, struct cb *cb,
-       struct sk_buff *skb)
-{
-       cb->command = nic->tx_command;
-       /* interrupt every 16 packets regardless of delay */
-       if ((nic->cbs_avail & ~15) == nic->cbs_avail)
-               cb->command |= cpu_to_le16(cb_i);
-       cb->u.tcb.tbd_array = cb->dma_addr + offsetof(struct cb, u.tcb.tbd);
-       cb->u.tcb.tcb_byte_count = 0;
-       cb->u.tcb.threshold = nic->tx_threshold;
-       cb->u.tcb.tbd_count = 1;
-       cb->u.tcb.tbd.buf_addr = cpu_to_le32(pci_map_single(nic->pdev,
-               skb->data, skb->len, PCI_DMA_TODEVICE));
-       /* check for mapping failure? */
-       cb->u.tcb.tbd.size = cpu_to_le16(skb->len);
-}
-
-static int e100_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
-{
-       struct nic *nic = netdev_priv(netdev);
-       int err;
-
-       if (nic->flags & ich_10h_workaround) {
-               /* SW workaround for ICH[x] 10Mbps/half duplex Tx hang.
-                  Issue a NOP command followed by a 1us delay before
-                  issuing the Tx command. */
-               if (e100_exec_cmd(nic, cuc_nop, 0))
-                       DPRINTK(TX_ERR, DEBUG, "exec cuc_nop failed\n");
-               udelay(1);
-       }
-
-       err = e100_exec_cb(nic, skb, e100_xmit_prepare);
-
-       switch (err) {
-       case -ENOSPC:
-               /* We queued the skb, but now we're out of space. */
-               DPRINTK(TX_ERR, DEBUG, "No space for CB\n");
-               netif_stop_queue(netdev);
-               break;
-       case -ENOMEM:
-               /* This is a hard error - log it. */
-               DPRINTK(TX_ERR, DEBUG, "Out of Tx resources, returning skb\n");
-               netif_stop_queue(netdev);
-               return 1;
-       }
-
-       netdev->trans_start = jiffies;
-       return 0;
-}
-
-static int e100_tx_clean(struct nic *nic)
-{
-       struct net_device *dev = nic->netdev;
-       struct cb *cb;
-       int tx_cleaned = 0;
-
-       spin_lock(&nic->cb_lock);
-
-       /* Clean CBs marked complete */
-       for (cb = nic->cb_to_clean;
-           cb->status & cpu_to_le16(cb_complete);
-           cb = nic->cb_to_clean = cb->next) {
-               DPRINTK(TX_DONE, DEBUG, "cb[%d]->status = 0x%04X\n",
-                       (int)(((void*)cb - (void*)nic->cbs)/sizeof(struct cb)),
-                       cb->status);
-
-               if (likely(cb->skb != NULL)) {
-                       dev->stats.tx_packets++;
-                       dev->stats.tx_bytes += cb->skb->len;
-
-                       pci_unmap_single(nic->pdev,
-                               le32_to_cpu(cb->u.tcb.tbd.buf_addr),
-                               le16_to_cpu(cb->u.tcb.tbd.size),
-                               PCI_DMA_TODEVICE);
-                       dev_kfree_skb_any(cb->skb);
-                       cb->skb = NULL;
-                       tx_cleaned = 1;
-               }
-               cb->status = 0;
-               nic->cbs_avail++;
-       }
-
-       spin_unlock(&nic->cb_lock);
-
-       /* Recover from running out of Tx resources in xmit_frame */
-       if (unlikely(tx_cleaned && netif_queue_stopped(nic->netdev)))
-               netif_wake_queue(nic->netdev);
-
-       return tx_cleaned;
-}
-
-static void e100_clean_cbs(struct nic *nic)
-{
-       if (nic->cbs) {
-               while (nic->cbs_avail != nic->params.cbs.count) {
-                       struct cb *cb = nic->cb_to_clean;
-                       if (cb->skb) {
-                               pci_unmap_single(nic->pdev,
-                                       le32_to_cpu(cb->u.tcb.tbd.buf_addr),
-                                       le16_to_cpu(cb->u.tcb.tbd.size),
-                                       PCI_DMA_TODEVICE);
-                               dev_kfree_skb(cb->skb);
-                       }
-                       nic->cb_to_clean = nic->cb_to_clean->next;
-                       nic->cbs_avail++;
-               }
-               pci_free_consistent(nic->pdev,
-                       sizeof(struct cb) * nic->params.cbs.count,
-                       nic->cbs, nic->cbs_dma_addr);
-               nic->cbs = NULL;
-               nic->cbs_avail = 0;
-       }
-       nic->cuc_cmd = cuc_start;
-       nic->cb_to_use = nic->cb_to_send = nic->cb_to_clean =
-               nic->cbs;
-}
-
-static int e100_alloc_cbs(struct nic *nic)
-{
-       struct cb *cb;
-       unsigned int i, count = nic->params.cbs.count;
-
-       nic->cuc_cmd = cuc_start;
-       nic->cb_to_use = nic->cb_to_send = nic->cb_to_clean = NULL;
-       nic->cbs_avail = 0;
-
-       nic->cbs = pci_alloc_consistent(nic->pdev,
-               sizeof(struct cb) * count, &nic->cbs_dma_addr);
-       if (!nic->cbs)
-               return -ENOMEM;
-
-       for (cb = nic->cbs, i = 0; i < count; cb++, i++) {
-               cb->next = (i + 1 < count) ? cb + 1 : nic->cbs;
-               cb->prev = (i == 0) ? nic->cbs + count - 1 : cb - 1;
-
-               cb->dma_addr = nic->cbs_dma_addr + i * sizeof(struct cb);
-               cb->link = cpu_to_le32(nic->cbs_dma_addr +
-                       ((i+1) % count) * sizeof(struct cb));
-               cb->skb = NULL;
-       }
-
-       nic->cb_to_use = nic->cb_to_send = nic->cb_to_clean = nic->cbs;
-       nic->cbs_avail = count;
-
-       return 0;
-}
-
-static inline void e100_start_receiver(struct nic *nic, struct rx *rx)
-{
-       if (!nic->rxs) return;
-       if (RU_SUSPENDED != nic->ru_running) return;
-
-       /* handle init time starts */
-       if (!rx) rx = nic->rxs;
-
-       /* (Re)start RU if suspended or idle and RFA is non-NULL */
-       if (rx->skb) {
-               e100_exec_cmd(nic, ruc_start, rx->dma_addr);
-               nic->ru_running = RU_RUNNING;
-       }
-}
-
-#define RFD_BUF_LEN (sizeof(struct rfd) + VLAN_ETH_FRAME_LEN)
-static int e100_rx_alloc_skb(struct nic *nic, struct rx *rx)
-{
-       if (!(rx->skb = netdev_alloc_skb(nic->netdev, RFD_BUF_LEN + 
NET_IP_ALIGN)))
-               return -ENOMEM;
-
-       /* Align, init, and map the RFD. */
-       skb_reserve(rx->skb, NET_IP_ALIGN);
-       skb_copy_to_linear_data(rx->skb, &nic->blank_rfd, sizeof(struct rfd));
-       rx->dma_addr = pci_map_single(nic->pdev, rx->skb->data,
-               RFD_BUF_LEN, PCI_DMA_BIDIRECTIONAL);
-
-       if (pci_dma_mapping_error(nic->pdev, rx->dma_addr)) {
-               dev_kfree_skb_any(rx->skb);
-               rx->skb = NULL;
-               rx->dma_addr = 0;
-               return -ENOMEM;
-       }
-
-       /* Link the RFD to end of RFA by linking previous RFD to
-        * this one.  We are safe to touch the previous RFD because
-        * it is protected by the before last buffer's el bit being set */
-       if (rx->prev->skb) {
-               struct rfd *prev_rfd = (struct rfd *)rx->prev->skb->data;
-               put_unaligned_le32(rx->dma_addr, &prev_rfd->link);
-               pci_dma_sync_single_for_device(nic->pdev, rx->prev->dma_addr,
-                       sizeof(struct rfd), PCI_DMA_BIDIRECTIONAL);
-       }
-
-       return 0;
-}
-
-static int e100_rx_indicate(struct nic *nic, struct rx *rx,
-       unsigned int *work_done, unsigned int work_to_do)
-{
-       struct net_device *dev = nic->netdev;
-       struct sk_buff *skb = rx->skb;
-       struct rfd *rfd = (struct rfd *)skb->data;
-       u16 rfd_status, actual_size;
-
-       if (unlikely(work_done && *work_done >= work_to_do))
-               return -EAGAIN;
-
-       /* Need to sync before taking a peek at cb_complete bit */
-       pci_dma_sync_single_for_cpu(nic->pdev, rx->dma_addr,
-               sizeof(struct rfd), PCI_DMA_BIDIRECTIONAL);
-       rfd_status = le16_to_cpu(rfd->status);
-
-       DPRINTK(RX_STATUS, DEBUG, "status=0x%04X\n", rfd_status);
-
-       /* If data isn't ready, nothing to indicate */
-       if (unlikely(!(rfd_status & cb_complete))) {
-               /* If the next buffer has the el bit, but we think the receiver
-                * is still running, check to see if it really stopped while
-                * we had interrupts off.
-                * This allows for a fast restart without re-enabling
-                * interrupts */
-               if ((le16_to_cpu(rfd->command) & cb_el) &&
-                   (RU_RUNNING == nic->ru_running))
-
-                       if (ioread8(&nic->csr->scb.status) & rus_no_res)
-                               nic->ru_running = RU_SUSPENDED;
-               return -ENODATA;
-       }
-
-       /* Get actual data size */
-       actual_size = le16_to_cpu(rfd->actual_size) & 0x3FFF;
-       if (unlikely(actual_size > RFD_BUF_LEN - sizeof(struct rfd)))
-               actual_size = RFD_BUF_LEN - sizeof(struct rfd);
-
-       /* Get data */
-       pci_unmap_single(nic->pdev, rx->dma_addr,
-               RFD_BUF_LEN, PCI_DMA_BIDIRECTIONAL);
-
-       /* If this buffer has the el bit, but we think the receiver
-        * is still running, check to see if it really stopped while
-        * we had interrupts off.
-        * This allows for a fast restart without re-enabling interrupts.
-        * This can happen when the RU sees the size change but also sees
-        * the el bit set. */
-       if ((le16_to_cpu(rfd->command) & cb_el) &&
-           (RU_RUNNING == nic->ru_running)) {
-
-           if (ioread8(&nic->csr->scb.status) & rus_no_res)
-               nic->ru_running = RU_SUSPENDED;
-       }
-
-       /* Pull off the RFD and put the actual data (minus eth hdr) */
-       skb_reserve(skb, sizeof(struct rfd));
-       skb_put(skb, actual_size);
-       skb->protocol = eth_type_trans(skb, nic->netdev);
-
-       if (unlikely(!(rfd_status & cb_ok))) {
-               /* Don't indicate if hardware indicates errors */
-               dev_kfree_skb_any(skb);
-       } else if (actual_size > ETH_DATA_LEN + VLAN_ETH_HLEN) {
-               /* Don't indicate oversized frames */
-               nic->rx_over_length_errors++;
-               dev_kfree_skb_any(skb);
-       } else {
-               dev->stats.rx_packets++;
-               dev->stats.rx_bytes += actual_size;
-               netif_receive_skb(skb);
-               if (work_done)
-                       (*work_done)++;
-       }
-
-       rx->skb = NULL;
-
-       return 0;
-}
-
-static void e100_rx_clean(struct nic *nic, unsigned int *work_done,
-       unsigned int work_to_do)
-{
-       struct rx *rx;
-       int restart_required = 0, err = 0;
-       struct rx *old_before_last_rx, *new_before_last_rx;
-       struct rfd *old_before_last_rfd, *new_before_last_rfd;
-
-       /* Indicate newly arrived packets */
-       for (rx = nic->rx_to_clean; rx->skb; rx = nic->rx_to_clean = rx->next) {
-               err = e100_rx_indicate(nic, rx, work_done, work_to_do);
-               /* Hit quota or no more to clean */
-               if (-EAGAIN == err || -ENODATA == err)
-                       break;
-       }
-
-
-       /* On EAGAIN, hit quota so have more work to do, restart once
-        * cleanup is complete.
-        * Else, are we already rnr? then pay attention!!! this ensures that
-        * the state machine progression never allows a start with a
-        * partially cleaned list, avoiding a race between hardware
-        * and rx_to_clean when in NAPI mode */
-       if (-EAGAIN != err && RU_SUSPENDED == nic->ru_running)
-               restart_required = 1;
-
-       old_before_last_rx = nic->rx_to_use->prev->prev;
-       old_before_last_rfd = (struct rfd *)old_before_last_rx->skb->data;
-
-       /* Alloc new skbs to refill list */
-       for (rx = nic->rx_to_use; !rx->skb; rx = nic->rx_to_use = rx->next) {
-               if (unlikely(e100_rx_alloc_skb(nic, rx)))
-                       break; /* Better luck next time (see watchdog) */
-       }
-
-       new_before_last_rx = nic->rx_to_use->prev->prev;
-       if (new_before_last_rx != old_before_last_rx) {
-               /* Set the el-bit on the buffer that is before the last buffer.
-                * This lets us update the next pointer on the last buffer
-                * without worrying about hardware touching it.
-                * We set the size to 0 to prevent hardware from touching this
-                * buffer.
-                * When the hardware hits the before last buffer with el-bit
-                * and size of 0, it will RNR interrupt, the RUS will go into
-                * the No Resources state.  It will not complete nor write to
-                * this buffer. */
-               new_before_last_rfd =
-                       (struct rfd *)new_before_last_rx->skb->data;
-               new_before_last_rfd->size = 0;
-               new_before_last_rfd->command |= cpu_to_le16(cb_el);
-               pci_dma_sync_single_for_device(nic->pdev,
-                       new_before_last_rx->dma_addr, sizeof(struct rfd),
-                       PCI_DMA_BIDIRECTIONAL);
-
-               /* Now that we have a new stopping point, we can clear the old
-                * stopping point.  We must sync twice to get the proper
-                * ordering on the hardware side of things. */
-               old_before_last_rfd->command &= ~cpu_to_le16(cb_el);
-               pci_dma_sync_single_for_device(nic->pdev,
-                       old_before_last_rx->dma_addr, sizeof(struct rfd),
-                       PCI_DMA_BIDIRECTIONAL);
-               old_before_last_rfd->size = cpu_to_le16(VLAN_ETH_FRAME_LEN);
-               pci_dma_sync_single_for_device(nic->pdev,
-                       old_before_last_rx->dma_addr, sizeof(struct rfd),
-                       PCI_DMA_BIDIRECTIONAL);
-       }
-
-       if (restart_required) {
-               // ack the rnr?
-               iowrite8(stat_ack_rnr, &nic->csr->scb.stat_ack);
-               e100_start_receiver(nic, nic->rx_to_clean);
-               if (work_done)
-                       (*work_done)++;
-       }
-}
-
-static void e100_rx_clean_list(struct nic *nic)
-{
-       struct rx *rx;
-       unsigned int i, count = nic->params.rfds.count;
-
-       nic->ru_running = RU_UNINITIALIZED;
-
-       if (nic->rxs) {
-               for (rx = nic->rxs, i = 0; i < count; rx++, i++) {
-                       if (rx->skb) {
-                               pci_unmap_single(nic->pdev, rx->dma_addr,
-                                       RFD_BUF_LEN, PCI_DMA_BIDIRECTIONAL);
-                               dev_kfree_skb(rx->skb);
-                       }
-               }
-               kfree(nic->rxs);
-               nic->rxs = NULL;
-       }
-
-       nic->rx_to_use = nic->rx_to_clean = NULL;
-}
-
-static int e100_rx_alloc_list(struct nic *nic)
-{
-       struct rx *rx;
-       unsigned int i, count = nic->params.rfds.count;
-       struct rfd *before_last;
-
-       nic->rx_to_use = nic->rx_to_clean = NULL;
-       nic->ru_running = RU_UNINITIALIZED;
-
-       if (!(nic->rxs = kcalloc(count, sizeof(struct rx), GFP_ATOMIC)))
-               return -ENOMEM;
-
-       for (rx = nic->rxs, i = 0; i < count; rx++, i++) {
-               rx->next = (i + 1 < count) ? rx + 1 : nic->rxs;
-               rx->prev = (i == 0) ? nic->rxs + count - 1 : rx - 1;
-               if (e100_rx_alloc_skb(nic, rx)) {
-                       e100_rx_clean_list(nic);
-                       return -ENOMEM;
-               }
-       }
-       /* Set the el-bit on the buffer that is before the last buffer.
-        * This lets us update the next pointer on the last buffer without
-        * worrying about hardware touching it.
-        * We set the size to 0 to prevent hardware from touching this buffer.
-        * When the hardware hits the before last buffer with el-bit and size
-        * of 0, it will RNR interrupt, the RU will go into the No Resources
-        * state.  It will not complete nor write to this buffer. */
-       rx = nic->rxs->prev->prev;
-       before_last = (struct rfd *)rx->skb->data;
-       before_last->command |= cpu_to_le16(cb_el);
-       before_last->size = 0;
-       pci_dma_sync_single_for_device(nic->pdev, rx->dma_addr,
-               sizeof(struct rfd), PCI_DMA_BIDIRECTIONAL);
-
-       nic->rx_to_use = nic->rx_to_clean = nic->rxs;
-       nic->ru_running = RU_SUSPENDED;
-
-       return 0;
-}
-
-static irqreturn_t e100_intr(int irq, void *dev_id)
-{
-       struct net_device *netdev = dev_id;
-       struct nic *nic = netdev_priv(netdev);
-       u8 stat_ack = ioread8(&nic->csr->scb.stat_ack);
-
-       DPRINTK(INTR, DEBUG, "stat_ack = 0x%02X\n", stat_ack);
-
-       if (stat_ack == stat_ack_not_ours ||    /* Not our interrupt */
-          stat_ack == stat_ack_not_present)    /* Hardware is ejected */
-               return IRQ_NONE;
-
-       printk ("receives an interrupt. stat_ack: %x\n", stat_ack);
-       /* Ack interrupt(s) */
-       iowrite8(stat_ack, &nic->csr->scb.stat_ack);
-
-       /* We hit Receive No Resource (RNR); restart RU after cleaning */
-       if (stat_ack & stat_ack_rnr)
-               nic->ru_running = RU_SUSPENDED;
-
-       if (likely(netif_rx_schedule_prep(&nic->napi))) {
-               e100_disable_irq(nic);
-               __netif_rx_schedule(&nic->napi);
-       }
-
-       return IRQ_HANDLED;
-}
-
-static int e100_poll(struct napi_struct *napi, int budget)
-{
-       struct nic *nic = container_of(napi, struct nic, napi);
-       unsigned int work_done = 0;
-
-       e100_rx_clean(nic, &work_done, budget);
-       e100_tx_clean(nic);
-
-       /* If budget not fully consumed, exit the polling mode */
-       if (work_done < budget) {
-               netif_rx_complete(napi);
-               e100_enable_irq(nic);
-       }
-
-       return work_done;
-}
-
-#ifdef CONFIG_NET_POLL_CONTROLLER
-static void e100_netpoll(struct net_device *netdev)
-{
-       struct nic *nic = netdev_priv(netdev);
-
-       e100_disable_irq(nic);
-       e100_intr(nic->pdev->irq, netdev);
-       e100_tx_clean(nic);
-       e100_enable_irq(nic);
-}
-#endif
-
-static int e100_set_mac_address(struct net_device *netdev, void *p)
-{
-       struct nic *nic = netdev_priv(netdev);
-       struct sockaddr *addr = p;
-
-       if (!is_valid_ether_addr(addr->sa_data))
-               return -EADDRNOTAVAIL;
-
-       memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len);
-       e100_exec_cb(nic, NULL, e100_setup_iaaddr);
-
-       return 0;
-}
-
-static int e100_change_mtu(struct net_device *netdev, int new_mtu)
-{
-       if (new_mtu < ETH_ZLEN || new_mtu > ETH_DATA_LEN)
-               return -EINVAL;
-       netdev->mtu = new_mtu;
-       return 0;
-}
-
-static int e100_asf(struct nic *nic)
-{
-       /* ASF can be enabled from eeprom */
-       return((nic->pdev->device >= 0x1050) && (nic->pdev->device <= 0x1057) &&
-          (nic->eeprom[eeprom_config_asf] & eeprom_asf) &&
-          !(nic->eeprom[eeprom_config_asf] & eeprom_gcl) &&
-          ((nic->eeprom[eeprom_smbus_addr] & 0xFF) != 0xFE));
-}
-
-static int e100_up(struct nic *nic)
-{
-       int err;
-
-       if ((err = e100_rx_alloc_list(nic)))
-               return err;
-       if ((err = e100_alloc_cbs(nic)))
-               goto err_rx_clean_list;
-       if ((err = e100_hw_init(nic)))
-               goto err_clean_cbs;
-       e100_set_multicast_list(nic->netdev);
-       e100_start_receiver(nic, NULL);
-       mod_timer(&nic->watchdog, jiffies);
-       if ((err = request_irq(nic->pdev->irq, e100_intr, IRQF_SHARED,
-               nic->netdev->name, nic->netdev)))
-               goto err_no_irq;
-       netif_wake_queue(nic->netdev);
-       napi_enable(&nic->napi);
-       /* enable ints _after_ enabling poll, preventing a race between
-        * disable ints+schedule */
-       e100_enable_irq(nic);
-       return 0;
-
-err_no_irq:
-       del_timer_sync(&nic->watchdog);
-err_clean_cbs:
-       e100_clean_cbs(nic);
-err_rx_clean_list:
-       e100_rx_clean_list(nic);
-       return err;
-}
-
-static void e100_down(struct nic *nic)
-{
-       /* wait here for poll to complete */
-       napi_disable(&nic->napi);
-       netif_stop_queue(nic->netdev);
-       e100_hw_reset(nic);
-       free_irq(nic->pdev->irq, nic->netdev);
-       del_timer_sync(&nic->watchdog);
-       netif_carrier_off(nic->netdev);
-       e100_clean_cbs(nic);
-       e100_rx_clean_list(nic);
-}
-
-static void e100_tx_timeout(struct net_device *netdev)
-{
-       struct nic *nic = netdev_priv(netdev);
-
-       /* Reset outside of interrupt context, to avoid request_irq
-        * in interrupt context */
-       schedule_work(&nic->tx_timeout_task);
-}
-
-static void e100_tx_timeout_task(struct work_struct *work)
-{
-       struct nic *nic = container_of(work, struct nic, tx_timeout_task);
-       struct net_device *netdev = nic->netdev;
-
-       DPRINTK(TX_ERR, DEBUG, "scb.status=0x%02X\n",
-               ioread8(&nic->csr->scb.status));
-       e100_down(netdev_priv(netdev));
-       e100_up(netdev_priv(netdev));
-}
-
-static int e100_loopback_test(struct nic *nic, enum loopback loopback_mode)
-{
-       int err;
-       struct sk_buff *skb;
-
-       /* Use driver resources to perform internal MAC or PHY
-        * loopback test.  A single packet is prepared and transmitted
-        * in loopback mode, and the test passes if the received
-        * packet compares byte-for-byte to the transmitted packet. */
-
-       if ((err = e100_rx_alloc_list(nic)))
-               return err;
-       if ((err = e100_alloc_cbs(nic)))
-               goto err_clean_rx;
-
-       /* ICH PHY loopback is broken so do MAC loopback instead */
-       if (nic->flags & ich && loopback_mode == lb_phy)
-               loopback_mode = lb_mac;
-
-       nic->loopback = loopback_mode;
-       if ((err = e100_hw_init(nic)))
-               goto err_loopback_none;
-
-       if (loopback_mode == lb_phy)
-               mdio_write(nic->netdev, nic->mii.phy_id, MII_BMCR,
-                       BMCR_LOOPBACK);
-
-       e100_start_receiver(nic, NULL);
-
-       if (!(skb = netdev_alloc_skb(nic->netdev, ETH_DATA_LEN))) {
-               err = -ENOMEM;
-               goto err_loopback_none;
-       }
-       skb_put(skb, ETH_DATA_LEN);
-       memset(skb->data, 0xFF, ETH_DATA_LEN);
-       e100_xmit_frame(skb, nic->netdev);
-
-       msleep(10);
-
-       pci_dma_sync_single_for_cpu(nic->pdev, nic->rx_to_clean->dma_addr,
-                       RFD_BUF_LEN, PCI_DMA_BIDIRECTIONAL);
-
-       if (memcmp(nic->rx_to_clean->skb->data + sizeof(struct rfd),
-          skb->data, ETH_DATA_LEN))
-               err = -EAGAIN;
-
-err_loopback_none:
-       mdio_write(nic->netdev, nic->mii.phy_id, MII_BMCR, 0);
-       nic->loopback = lb_none;
-       e100_clean_cbs(nic);
-       e100_hw_reset(nic);
-err_clean_rx:
-       e100_rx_clean_list(nic);
-       return err;
-}
-
-#define MII_LED_CONTROL        0x1B
-static void e100_blink_led(unsigned long data)
-{
-       struct nic *nic = (struct nic *)data;
-       enum led_state {
-               led_on     = 0x01,
-               led_off    = 0x04,
-               led_on_559 = 0x05,
-               led_on_557 = 0x07,
-       };
-
-       nic->leds = (nic->leds & led_on) ? led_off :
-               (nic->mac < mac_82559_D101M) ? led_on_557 : led_on_559;
-       mdio_write(nic->netdev, nic->mii.phy_id, MII_LED_CONTROL, nic->leds);
-       mod_timer(&nic->blink_timer, jiffies + HZ / 4);
-}
-
-static int e100_get_settings(struct net_device *netdev, struct ethtool_cmd 
*cmd)
-{
-       struct nic *nic = netdev_priv(netdev);
-       return mii_ethtool_gset(&nic->mii, cmd);
-}
-
-static int e100_set_settings(struct net_device *netdev, struct ethtool_cmd 
*cmd)
-{
-       struct nic *nic = netdev_priv(netdev);
-       int err;
-
-       mdio_write(netdev, nic->mii.phy_id, MII_BMCR, BMCR_RESET);
-       err = mii_ethtool_sset(&nic->mii, cmd);
-       e100_exec_cb(nic, NULL, e100_configure);
-
-       return err;
-}
-
-static void e100_get_drvinfo(struct net_device *netdev,
-       struct ethtool_drvinfo *info)
-{
-       struct nic *nic = netdev_priv(netdev);
-       strcpy(info->driver, DRV_NAME);
-       strcpy(info->version, DRV_VERSION);
-       strcpy(info->fw_version, "N/A");
-       strcpy(info->bus_info, pci_name(nic->pdev));
-}
-
-#define E100_PHY_REGS 0x1C
-static int e100_get_regs_len(struct net_device *netdev)
-{
-       struct nic *nic = netdev_priv(netdev);
-       return 1 + E100_PHY_REGS + sizeof(nic->mem->dump_buf);
-}
-
-static void e100_get_regs(struct net_device *netdev,
-       struct ethtool_regs *regs, void *p)
-{
-       struct nic *nic = netdev_priv(netdev);
-       u32 *buff = p;
-       int i;
-
-       regs->version = (1 << 24) | nic->pdev->revision;
-       buff[0] = ioread8(&nic->csr->scb.cmd_hi) << 24 |
-               ioread8(&nic->csr->scb.cmd_lo) << 16 |
-               ioread16(&nic->csr->scb.status);
-       for (i = E100_PHY_REGS; i >= 0; i--)
-               buff[1 + E100_PHY_REGS - i] =
-                       mdio_read(netdev, nic->mii.phy_id, i);
-       memset(nic->mem->dump_buf, 0, sizeof(nic->mem->dump_buf));
-       e100_exec_cb(nic, NULL, e100_dump);
-       msleep(10);
-       memcpy(&buff[2 + E100_PHY_REGS], nic->mem->dump_buf,
-               sizeof(nic->mem->dump_buf));
-}
-
-static void e100_get_wol(struct net_device *netdev, struct ethtool_wolinfo 
*wol)
-{
-       struct nic *nic = netdev_priv(netdev);
-       wol->supported = (nic->mac >= mac_82558_D101_A4) ?  WAKE_MAGIC : 0;
-       wol->wolopts = (nic->flags & wol_magic) ? WAKE_MAGIC : 0;
-}
-
-static int e100_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)
-{
-       struct nic *nic = netdev_priv(netdev);
-
-       if ((wol->wolopts && wol->wolopts != WAKE_MAGIC) ||
-           !device_can_wakeup(&nic->pdev->dev))
-               return -EOPNOTSUPP;
-
-       if (wol->wolopts)
-               nic->flags |= wol_magic;
-       else
-               nic->flags &= ~wol_magic;
-
-       device_set_wakeup_enable(&nic->pdev->dev, wol->wolopts);
-
-       e100_exec_cb(nic, NULL, e100_configure);
-
-       return 0;
-}
-
-static u32 e100_get_msglevel(struct net_device *netdev)
-{
-       struct nic *nic = netdev_priv(netdev);
-       return nic->msg_enable;
-}
-
-static void e100_set_msglevel(struct net_device *netdev, u32 value)
-{
-       struct nic *nic = netdev_priv(netdev);
-       nic->msg_enable = value;
-}
-
-static int e100_nway_reset(struct net_device *netdev)
-{
-       struct nic *nic = netdev_priv(netdev);
-       return mii_nway_restart(&nic->mii);
-}
-
-static u32 e100_get_link(struct net_device *netdev)
-{
-       struct nic *nic = netdev_priv(netdev);
-       return mii_link_ok(&nic->mii);
-}
-
-static int e100_get_eeprom_len(struct net_device *netdev)
-{
-       struct nic *nic = netdev_priv(netdev);
-       return nic->eeprom_wc << 1;
-}
-
-#define E100_EEPROM_MAGIC      0x1234
-static int e100_get_eeprom(struct net_device *netdev,
-       struct ethtool_eeprom *eeprom, u8 *bytes)
-{
-       struct nic *nic = netdev_priv(netdev);
-
-       eeprom->magic = E100_EEPROM_MAGIC;
-       memcpy(bytes, &((u8 *)nic->eeprom)[eeprom->offset], eeprom->len);
-
-       return 0;
-}
-
-static int e100_set_eeprom(struct net_device *netdev,
-       struct ethtool_eeprom *eeprom, u8 *bytes)
-{
-       struct nic *nic = netdev_priv(netdev);
-
-       if (eeprom->magic != E100_EEPROM_MAGIC)
-               return -EINVAL;
-
-       memcpy(&((u8 *)nic->eeprom)[eeprom->offset], bytes, eeprom->len);
-
-       return e100_eeprom_save(nic, eeprom->offset >> 1,
-               (eeprom->len >> 1) + 1);
-}
-
-static void e100_get_ringparam(struct net_device *netdev,
-       struct ethtool_ringparam *ring)
-{
-       struct nic *nic = netdev_priv(netdev);
-       struct param_range *rfds = &nic->params.rfds;
-       struct param_range *cbs = &nic->params.cbs;
-
-       ring->rx_max_pending = rfds->max;
-       ring->tx_max_pending = cbs->max;
-       ring->rx_mini_max_pending = 0;
-       ring->rx_jumbo_max_pending = 0;
-       ring->rx_pending = rfds->count;
-       ring->tx_pending = cbs->count;
-       ring->rx_mini_pending = 0;
-       ring->rx_jumbo_pending = 0;
-}
-
-static int e100_set_ringparam(struct net_device *netdev,
-       struct ethtool_ringparam *ring)
-{
-       struct nic *nic = netdev_priv(netdev);
-       struct param_range *rfds = &nic->params.rfds;
-       struct param_range *cbs = &nic->params.cbs;
-
-       if ((ring->rx_mini_pending) || (ring->rx_jumbo_pending))
-               return -EINVAL;
-
-       if (netif_running(netdev))
-               e100_down(nic);
-       rfds->count = max(ring->rx_pending, rfds->min);
-       rfds->count = min(rfds->count, rfds->max);
-       cbs->count = max(ring->tx_pending, cbs->min);
-       cbs->count = min(cbs->count, cbs->max);
-       DPRINTK(DRV, INFO, "Ring Param settings: rx: %d, tx %d\n",
-               rfds->count, cbs->count);
-       if (netif_running(netdev))
-               e100_up(nic);
-
-       return 0;
-}
-
-static const char e100_gstrings_test[][ETH_GSTRING_LEN] = {
-       "Link test     (on/offline)",
-       "Eeprom test   (on/offline)",
-       "Self test        (offline)",
-       "Mac loopback     (offline)",
-       "Phy loopback     (offline)",
-};
-#define E100_TEST_LEN  ARRAY_SIZE(e100_gstrings_test)
-
-static void e100_diag_test(struct net_device *netdev,
-       struct ethtool_test *test, u64 *data)
-{
-       struct ethtool_cmd cmd;
-       struct nic *nic = netdev_priv(netdev);
-       int i, err;
-
-       memset(data, 0, E100_TEST_LEN * sizeof(u64));
-       data[0] = !mii_link_ok(&nic->mii);
-       data[1] = e100_eeprom_load(nic);
-       if (test->flags & ETH_TEST_FL_OFFLINE) {
-
-               /* save speed, duplex & autoneg settings */
-               err = mii_ethtool_gset(&nic->mii, &cmd);
-
-               if (netif_running(netdev))
-                       e100_down(nic);
-               data[2] = e100_self_test(nic);
-               data[3] = e100_loopback_test(nic, lb_mac);
-               data[4] = e100_loopback_test(nic, lb_phy);
-
-               /* restore speed, duplex & autoneg settings */
-               err = mii_ethtool_sset(&nic->mii, &cmd);
-
-               if (netif_running(netdev))
-                       e100_up(nic);
-       }
-       for (i = 0; i < E100_TEST_LEN; i++)
-               test->flags |= data[i] ? ETH_TEST_FL_FAILED : 0;
-
-       msleep_interruptible(4 * 1000);
-}
-
-static int e100_phys_id(struct net_device *netdev, u32 data)
-{
-       struct nic *nic = netdev_priv(netdev);
-
-       if (!data || data > (u32)(MAX_SCHEDULE_TIMEOUT / HZ))
-               data = (u32)(MAX_SCHEDULE_TIMEOUT / HZ);
-       mod_timer(&nic->blink_timer, jiffies);
-       msleep_interruptible(data * 1000);
-       del_timer_sync(&nic->blink_timer);
-       mdio_write(netdev, nic->mii.phy_id, MII_LED_CONTROL, 0);
-
-       return 0;
-}
-
-static const char e100_gstrings_stats[][ETH_GSTRING_LEN] = {
-       "rx_packets", "tx_packets", "rx_bytes", "tx_bytes", "rx_errors",
-       "tx_errors", "rx_dropped", "tx_dropped", "multicast", "collisions",
-       "rx_length_errors", "rx_over_errors", "rx_crc_errors",
-       "rx_frame_errors", "rx_fifo_errors", "rx_missed_errors",
-       "tx_aborted_errors", "tx_carrier_errors", "tx_fifo_errors",
-       "tx_heartbeat_errors", "tx_window_errors",
-       /* device-specific stats */
-       "tx_deferred", "tx_single_collisions", "tx_multi_collisions",
-       "tx_flow_control_pause", "rx_flow_control_pause",
-       "rx_flow_control_unsupported", "tx_tco_packets", "rx_tco_packets",
-};
-#define E100_NET_STATS_LEN     21
-#define E100_STATS_LEN ARRAY_SIZE(e100_gstrings_stats)
-
-static int e100_get_sset_count(struct net_device *netdev, int sset)
-{
-       switch (sset) {
-       case ETH_SS_TEST:
-               return E100_TEST_LEN;
-       case ETH_SS_STATS:
-               return E100_STATS_LEN;
-       default:
-               return -EOPNOTSUPP;
-       }
-}
-
-static void e100_get_ethtool_stats(struct net_device *netdev,
-       struct ethtool_stats *stats, u64 *data)
-{
-       struct nic *nic = netdev_priv(netdev);
-       int i;
-
-       for (i = 0; i < E100_NET_STATS_LEN; i++)
-               data[i] = ((unsigned long *)&netdev->stats)[i];
-
-       data[i++] = nic->tx_deferred;
-       data[i++] = nic->tx_single_collisions;
-       data[i++] = nic->tx_multiple_collisions;
-       data[i++] = nic->tx_fc_pause;
-       data[i++] = nic->rx_fc_pause;
-       data[i++] = nic->rx_fc_unsupported;
-       data[i++] = nic->tx_tco_frames;
-       data[i++] = nic->rx_tco_frames;
-}
-
-static void e100_get_strings(struct net_device *netdev, u32 stringset, u8 
*data)
-{
-       switch (stringset) {
-       case ETH_SS_TEST:
-               memcpy(data, *e100_gstrings_test, sizeof(e100_gstrings_test));
-               break;
-       case ETH_SS_STATS:
-               memcpy(data, *e100_gstrings_stats, sizeof(e100_gstrings_stats));
-               break;
-       }
-}
-
-static const struct ethtool_ops e100_ethtool_ops = {
-       .get_settings           = e100_get_settings,
-       .set_settings           = e100_set_settings,
-       .get_drvinfo            = e100_get_drvinfo,
-       .get_regs_len           = e100_get_regs_len,
-       .get_regs               = e100_get_regs,
-       .get_wol                = e100_get_wol,
-       .set_wol                = e100_set_wol,
-       .get_msglevel           = e100_get_msglevel,
-       .set_msglevel           = e100_set_msglevel,
-       .nway_reset             = e100_nway_reset,
-       .get_link               = e100_get_link,
-       .get_eeprom_len         = e100_get_eeprom_len,
-       .get_eeprom             = e100_get_eeprom,
-       .set_eeprom             = e100_set_eeprom,
-       .get_ringparam          = e100_get_ringparam,
-       .set_ringparam          = e100_set_ringparam,
-       .self_test              = e100_diag_test,
-       .get_strings            = e100_get_strings,
-       .phys_id                = e100_phys_id,
-       .get_ethtool_stats      = e100_get_ethtool_stats,
-       .get_sset_count         = e100_get_sset_count,
-};
-
-static int e100_do_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)
-{
-       struct nic *nic = netdev_priv(netdev);
-
-       return generic_mii_ioctl(&nic->mii, if_mii(ifr), cmd, NULL);
-}
-
-static int e100_alloc(struct nic *nic)
-{
-       nic->mem = pci_alloc_consistent(nic->pdev, sizeof(struct mem),
-               &nic->dma_addr);
-       return nic->mem ? 0 : -ENOMEM;
-}
-
-static void e100_free(struct nic *nic)
-{
-       if (nic->mem) {
-               pci_free_consistent(nic->pdev, sizeof(struct mem),
-                       nic->mem, nic->dma_addr);
-               nic->mem = NULL;
-       }
-}
-
-static int e100_open(struct net_device *netdev)
-{
-       struct nic *nic = netdev_priv(netdev);
-       int err = 0;
-
-       netif_carrier_off(netdev);
-       if ((err = e100_up(nic)))
-               DPRINTK(IFUP, ERR, "Cannot open interface, aborting.\n");
-       return err;
-}
-
-static int e100_close(struct net_device *netdev)
-{
-       e100_down(netdev_priv(netdev));
-       return 0;
-}
-
-static const struct net_device_ops e100_netdev_ops = {
-       .ndo_open               = e100_open,
-       .ndo_stop               = e100_close,
-       .ndo_start_xmit         = e100_xmit_frame,
-       .ndo_validate_addr      = eth_validate_addr,
-       .ndo_set_multicast_list = e100_set_multicast_list,
-       .ndo_set_mac_address    = e100_set_mac_address,
-       .ndo_change_mtu         = e100_change_mtu,
-       .ndo_do_ioctl           = e100_do_ioctl,
-       .ndo_tx_timeout         = e100_tx_timeout,
-#ifdef CONFIG_NET_POLL_CONTROLLER
-       .ndo_poll_controller    = e100_netpoll,
-#endif
-};
-
-static int __devinit e100_probe(struct pci_dev *pdev,
-       const struct pci_device_id *ent)
-{
-       struct net_device *netdev;
-       struct nic *nic;
-       int err;
-
-       if (!(netdev = alloc_etherdev(sizeof(struct nic)))) {
-               if (((1 << debug) - 1) & NETIF_MSG_PROBE)
-                       printk(KERN_ERR PFX "Etherdev alloc failed, abort.\n");
-               return -ENOMEM;
-       }
-
-       netdev->netdev_ops = &e100_netdev_ops;
-       SET_ETHTOOL_OPS(netdev, &e100_ethtool_ops);
-       netdev->watchdog_timeo = E100_WATCHDOG_PERIOD;
-       strncpy(netdev->name, pci_name(pdev), sizeof(netdev->name) - 1);
-
-       nic = netdev_priv(netdev);
-       netif_napi_add(netdev, &nic->napi, e100_poll, E100_NAPI_WEIGHT);
-       nic->netdev = netdev;
-       nic->pdev = pdev;
-       nic->msg_enable = (1 << debug) - 1;
-       pci_set_drvdata(pdev, netdev);
-
-       if ((err = pci_enable_device(pdev))) {
-               DPRINTK(PROBE, ERR, "Cannot enable PCI device, aborting.\n");
-               goto err_out_free_dev;
-       }
-
-       if (!(pci_resource_flags(pdev, 0) & IORESOURCE_MEM)) {
-               DPRINTK(PROBE, ERR, "Cannot find proper PCI device "
-                       "base address, aborting.\n");
-               err = -ENODEV;
-               goto err_out_disable_pdev;
-       }
-
-       if ((err = pci_request_regions(pdev, DRV_NAME))) {
-               DPRINTK(PROBE, ERR, "Cannot obtain PCI resources, aborting.\n");
-               goto err_out_disable_pdev;
-       }
-
-       if ((err = pci_set_dma_mask(pdev, DMA_32BIT_MASK))) {
-               DPRINTK(PROBE, ERR, "No usable DMA configuration, aborting.\n");
-               goto err_out_free_res;
-       }
-
-       SET_NETDEV_DEV(netdev, &pdev->dev);
-
-       if (use_io)
-               DPRINTK(PROBE, INFO, "using i/o access mode\n");
-
-       nic->csr = pci_iomap(pdev, (use_io ? 1 : 0), sizeof(struct csr));
-       if (!nic->csr) {
-               DPRINTK(PROBE, ERR, "Cannot map device registers, aborting.\n");
-               err = -ENOMEM;
-               goto err_out_free_res;
-       }
-
-       if (ent->driver_data)
-               nic->flags |= ich;
-       else
-               nic->flags &= ~ich;
-
-       e100_get_defaults(nic);
-
-       /* locks must be initialized before calling hw_reset */
-       spin_lock_init(&nic->cb_lock);
-       spin_lock_init(&nic->cmd_lock);
-       spin_lock_init(&nic->mdio_lock);
-
-       /* Reset the device before pci_set_master() in case device is in some
-        * funky state and has an interrupt pending - hint: we don't have the
-        * interrupt handler registered yet. */
-       e100_hw_reset(nic);
-
-       pci_set_master(pdev);
-
-       init_timer(&nic->watchdog);
-       nic->watchdog.function = e100_watchdog;
-       nic->watchdog.data = (unsigned long)nic;
-       init_timer(&nic->blink_timer);
-       nic->blink_timer.function = e100_blink_led;
-       nic->blink_timer.data = (unsigned long)nic;
-
-       INIT_WORK(&nic->tx_timeout_task, e100_tx_timeout_task);
-
-       if ((err = e100_alloc(nic))) {
-               DPRINTK(PROBE, ERR, "Cannot alloc driver memory, aborting.\n");
-               goto err_out_iounmap;
-       }
-
-       if ((err = e100_eeprom_load(nic)))
-               goto err_out_free;
-
-       e100_phy_init(nic);
-
-       memcpy(netdev->dev_addr, nic->eeprom, ETH_ALEN);
-       memcpy(netdev->perm_addr, nic->eeprom, ETH_ALEN);
-       if (!is_valid_ether_addr(netdev->perm_addr)) {
-               if (!eeprom_bad_csum_allow) {
-                       DPRINTK(PROBE, ERR, "Invalid MAC address from "
-                               "EEPROM, aborting.\n");
-                       err = -EAGAIN;
-                       goto err_out_free;
-               } else {
-                       DPRINTK(PROBE, ERR, "Invalid MAC address from EEPROM, "
-                               "you MUST configure one.\n");
-               }
-       }
-
-       /* Wol magic packet can be enabled from eeprom */
-       if ((nic->mac >= mac_82558_D101_A4) &&
-          (nic->eeprom[eeprom_id] & eeprom_id_wol)) {
-               nic->flags |= wol_magic;
-               device_set_wakeup_enable(&pdev->dev, true);
-       }
-
-       /* ack any pending wake events, disable PME */
-       pci_pme_active(pdev, false);
-
-       strcpy(netdev->name, "eth%d");
-       if ((err = register_netdev(netdev))) {
-               DPRINTK(PROBE, ERR, "Cannot register net device, aborting.\n");
-               goto err_out_free;
-       }
-
-       DPRINTK(PROBE, INFO, "addr 0x%llx, irq %d, MAC addr %pM\n",
-               (unsigned long long)pci_resource_start(pdev, use_io ? 1 : 0),
-               pdev->irq, netdev->dev_addr);
-
-       return 0;
-
-err_out_free:
-       e100_free(nic);
-err_out_iounmap:
-       pci_iounmap(pdev, nic->csr);
-err_out_free_res:
-       pci_release_regions(pdev);
-err_out_disable_pdev:
-       pci_disable_device(pdev);
-err_out_free_dev:
-       pci_set_drvdata(pdev, NULL);
-       free_netdev(netdev);
-       return err;
-}
-
-static void __devexit e100_remove(struct pci_dev *pdev)
-{
-       struct net_device *netdev = pci_get_drvdata(pdev);
-
-       if (netdev) {
-               struct nic *nic = netdev_priv(netdev);
-               unregister_netdev(netdev);
-               e100_free(nic);
-               pci_iounmap(pdev, nic->csr);
-               free_netdev(netdev);
-               pci_release_regions(pdev);
-               pci_disable_device(pdev);
-               pci_set_drvdata(pdev, NULL);
-       }
-}
-
-static int e100_suspend(struct pci_dev *pdev, pm_message_t state)
-{
-       struct net_device *netdev = pci_get_drvdata(pdev);
-       struct nic *nic = netdev_priv(netdev);
-
-       if (netif_running(netdev))
-               e100_down(nic);
-       netif_device_detach(netdev);
-
-       pci_save_state(pdev);
-
-       if ((nic->flags & wol_magic) | e100_asf(nic)) {
-               if (pci_enable_wake(pdev, PCI_D3cold, true))
-                       pci_enable_wake(pdev, PCI_D3hot, true);
-       } else {
-               pci_enable_wake(pdev, PCI_D3hot, false);
-       }
-
-       pci_disable_device(pdev);
-       pci_set_power_state(pdev, PCI_D3hot);
-
-       return 0;
-}
-
-#ifdef CONFIG_PM
-static int e100_resume(struct pci_dev *pdev)
-{
-       struct net_device *netdev = pci_get_drvdata(pdev);
-       struct nic *nic = netdev_priv(netdev);
-
-       pci_set_power_state(pdev, PCI_D0);
-       pci_restore_state(pdev);
-       /* ack any pending wake events, disable PME */
-       pci_enable_wake(pdev, 0, 0);
-
-       netif_device_attach(netdev);
-       if (netif_running(netdev))
-               e100_up(nic);
-
-       return 0;
-}
-#endif /* CONFIG_PM */
-
-static void e100_shutdown(struct pci_dev *pdev)
-{
-       e100_suspend(pdev, PMSG_SUSPEND);
-}
-
-/* ------------------ PCI Error Recovery infrastructure  -------------- */
-/**
- * e100_io_error_detected - called when PCI error is detected.
- * @pdev: Pointer to PCI device
- * @state: The current pci connection state
- */
-static pci_ers_result_t e100_io_error_detected(struct pci_dev *pdev, 
pci_channel_state_t state)
-{
-       struct net_device *netdev = pci_get_drvdata(pdev);
-       struct nic *nic = netdev_priv(netdev);
-
-       /* Similar to calling e100_down(), but avoids adapter I/O. */
-       e100_close(netdev);
-
-       /* Detach; put netif into a state similar to hotplug unplug. */
-       napi_enable(&nic->napi);
-       netif_device_detach(netdev);
-       pci_disable_device(pdev);
-
-       /* Request a slot reset. */
-       return PCI_ERS_RESULT_NEED_RESET;
-}
-
-/**
- * e100_io_slot_reset - called after the pci bus has been reset.
- * @pdev: Pointer to PCI device
- *
- * Restart the card from scratch.
- */
-static pci_ers_result_t e100_io_slot_reset(struct pci_dev *pdev)
-{
-       struct net_device *netdev = pci_get_drvdata(pdev);
-       struct nic *nic = netdev_priv(netdev);
-
-       if (pci_enable_device(pdev)) {
-               printk(KERN_ERR "e100: Cannot re-enable PCI device after 
reset.\n");
-               return PCI_ERS_RESULT_DISCONNECT;
-       }
-       pci_set_master(pdev);
-
-       /* Only one device per card can do a reset */
-       if (0 != PCI_FUNC(pdev->devfn))
-               return PCI_ERS_RESULT_RECOVERED;
-       e100_hw_reset(nic);
-       e100_phy_init(nic);
-
-       return PCI_ERS_RESULT_RECOVERED;
-}
-
-/**
- * e100_io_resume - resume normal operations
- * @pdev: Pointer to PCI device
- *
- * Resume normal operations after an error recovery
- * sequence has been completed.
- */
-static void e100_io_resume(struct pci_dev *pdev)
-{
-       struct net_device *netdev = pci_get_drvdata(pdev);
-       struct nic *nic = netdev_priv(netdev);
-
-       /* ack any pending wake events, disable PME */
-       pci_enable_wake(pdev, 0, 0);
-
-       netif_device_attach(netdev);
-       if (netif_running(netdev)) {
-               e100_open(netdev);
-               mod_timer(&nic->watchdog, jiffies);
-       }
-}
-
-static struct pci_error_handlers e100_err_handler = {
-       .error_detected = e100_io_error_detected,
-       .slot_reset = e100_io_slot_reset,
-       .resume = e100_io_resume,
-};
-
-static struct pci_driver e100_driver = {
-       .name =         DRV_NAME,
-       .id_table =     e100_id_table,
-       .probe =        e100_probe,
-       .remove =       __devexit_p(e100_remove),
-#ifdef CONFIG_PM
-       /* Power Management hooks */
-       .suspend =      e100_suspend,
-       .resume =       e100_resume,
-#endif
-       .shutdown =     e100_shutdown,
-       .err_handler = &e100_err_handler,
-};
-
-static int __init e100_init_module(void)
-{
-       if (((1 << debug) - 1) & NETIF_MSG_DRV) {
-               printk(KERN_INFO PFX "%s, %s\n", DRV_DESCRIPTION, DRV_VERSION);
-               printk(KERN_INFO PFX "%s\n", DRV_COPYRIGHT);
-       }
-       return pci_register_driver(&e100_driver);
-}
-
-static void __exit e100_cleanup_module(void)
-{
-       pci_unregister_driver(&e100_driver);
-}
-
-module_init(e100_init_module);
-module_exit(e100_cleanup_module);
diff --git a/dde_e100/main.c b/dde_e100/main.c
deleted file mode 100644
index df8df1e..0000000
--- a/dde_e100/main.c
+++ /dev/null
@@ -1,35 +0,0 @@
-#include <dde26.h> /* l4dde26_*() */
-#include <dde26_net.h> /* l4dde26 networking */
-
-#include <linux/netdevice.h> /* struct sk_buff */
-#include <linux/pci.h> /* pci_unregister_driver() */
-#include <linux/init.h>  // initcall()
-#include <linux/delay.h> // msleep()
-
-#include <hurd/machdev.h>
-
-int using_std = 1;
-
-int main(int argc, char **argv)
-{
-       pthread_t thread;
-
-       l4dde26_init();
-       l4dde26_process_init();
-       l4dde26_softirq_init();
-
-       printk("Initializing skb subsystem\n");
-       skb_init();
-
-       l4dde26_do_initcalls();
-
-       register_net();
-       mach_device_init();
-       trivfs_init();
-
-       pthread_create (&thread, NULL, ds_server, NULL);
-       pthread_detach (thread);
-       trivfs_server();
-
-       return 0;
-}
diff --git a/dde_e1000/Makeconf.local b/dde_e1000/Makeconf.local
deleted file mode 100644
index 130c8cc..0000000
--- a/dde_e1000/Makeconf.local
+++ /dev/null
@@ -1,17 +0,0 @@
-SYSTEMS = x86-l4v2
-ARCH = x86
-SYSTEM = x86-l4v2
-
-BUILDDIR       ?= ..
-
-libmachdev_path := -L$(BUILDDIR)/libmachdev -lmachdev
-libddekit_path := -L$(BUILDDIR)/libddekit -lddekit
-libslab_path := -L$(BUILDDIR)/libhurd-slab -lhurd-slab
-libbpf_path := -L$(BUILDDIR)/libbpf -lbpf
-
-DDEKITLIBDIR = $(PKGDIR)/../libddekit/
-DDEKITINCDIR = $(PKGDIR)/../libddekit/include
-DDE26LIBDIR = $(PKGDIR)/lib/src
-OBJ_BASE = $(PKGDIR)/build
-
-L4LIBDIR = .
diff --git a/dde_e1000/Makefile b/dde_e1000/Makefile
deleted file mode 100644
index e0a1524..0000000
--- a/dde_e1000/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-PKGDIR        ?= ../libdde_linux26
-L4DIR         ?= $(PKGDIR)
-
-include Makeconf.local
-
-TARGET         = dde_e1000
-
-SRC_C          = main.c e1000_ethtool.c e1000_hw.c e1000_main.c e1000_param.c
-
-LIBS          += $(libmachdev_path) -ldde_linux26.o -ldde_linux26_net 
$(libddekit_path) -lfshelp -ltrivfs -lpciaccess -lz -lpthread -lshouldbeinlibc 
-lports $(libslab_path) $(libbpf_path)
-CFLAGS        += -g -I$(PKGDIR)/include -I$(BUILDDIR)/include
-
-# DDE configuration
-include $(L4DIR)/Makeconf
-
-include $(L4DIR)/mk/prog.mk
diff --git a/dde_e1000/default.ld b/dde_e1000/default.ld
deleted file mode 100644
index f8e4e28..0000000
--- a/dde_e1000/default.ld
+++ /dev/null
@@ -1,213 +0,0 @@
-/* Script for -z combreloc: combine and sort reloc sections */
-OUTPUT_FORMAT("elf32-i386", "elf32-i386",
-             "elf32-i386")
-OUTPUT_ARCH(i386)
-ENTRY(_start)
-SEARCH_DIR("/usr/i486-gnu/lib"); SEARCH_DIR("/usr/local/lib"); 
SEARCH_DIR("/lib"); SEARCH_DIR("/usr/lib");
-SECTIONS
-{
-  /* Read-only sections, merged into text segment: */
-  PROVIDE (__executable_start = 0x08048000); . = 0x08048000 + SIZEOF_HEADERS;
-  .interp         : { *(.interp) }
-  .note.gnu.build-id : { *(.note.gnu.build-id) }
-  .hash           : { *(.hash) }
-  .gnu.hash       : { *(.gnu.hash) }
-  .dynsym         : { *(.dynsym) }
-  .dynstr         : { *(.dynstr) }
-  .gnu.version    : { *(.gnu.version) }
-  .gnu.version_d  : { *(.gnu.version_d) }
-  .gnu.version_r  : { *(.gnu.version_r) }
-  .rel.dyn        :
-    {
-      *(.rel.init)
-      *(.rel.text .rel.text.* .rel.gnu.linkonce.t.*)
-      *(.rel.fini)
-      *(.rel.rodata .rel.rodata.* .rel.gnu.linkonce.r.*)
-      *(.rel.data.rel.ro* .rel.gnu.linkonce.d.rel.ro.*)
-      *(.rel.data .rel.data.* .rel.gnu.linkonce.d.*)
-      *(.rel.tdata .rel.tdata.* .rel.gnu.linkonce.td.*)
-      *(.rel.tbss .rel.tbss.* .rel.gnu.linkonce.tb.*)
-      *(.rel.ctors)
-      *(.rel.dtors)
-      *(.rel.got)
-      *(.rel.bss .rel.bss.* .rel.gnu.linkonce.b.*)
-    }
-  .rela.dyn       :
-    {
-      *(.rela.init)
-      *(.rela.text .rela.text.* .rela.gnu.linkonce.t.*)
-      *(.rela.fini)
-      *(.rela.rodata .rela.rodata.* .rela.gnu.linkonce.r.*)
-      *(.rela.data .rela.data.* .rela.gnu.linkonce.d.*)
-      *(.rela.tdata .rela.tdata.* .rela.gnu.linkonce.td.*)
-      *(.rela.tbss .rela.tbss.* .rela.gnu.linkonce.tb.*)
-      *(.rela.ctors)
-      *(.rela.dtors)
-      *(.rela.got)
-      *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*)
-    }
-  .rel.plt        : { *(.rel.plt) }
-  .rela.plt       : { *(.rela.plt) }
-  .init           :
-  {
-    KEEP (*(.init))
-  } =0x90909090
-  .plt            : { *(.plt) }
-  .text           :
-  {
-    *(.text .stub .text.* .gnu.linkonce.t.*)
-    KEEP (*(.text.*personality*))
-    /* .gnu.warning sections are handled specially by elf32.em.  */
-    *(.gnu.warning)
-  } =0x90909090
-  .fini           :
-  {
-    KEEP (*(.fini))
-  } =0x90909090
-  PROVIDE (__etext = .);
-  PROVIDE (_etext = .);
-  PROVIDE (etext = .);
-  .rodata         : { *(.rodata .rodata.* .gnu.linkonce.r.*) }
-  .rodata1        : { *(.rodata1) }
-  .eh_frame_hdr : { *(.eh_frame_hdr) }
-  .eh_frame       : ONLY_IF_RO { KEEP (*(.eh_frame)) }
-  .gcc_except_table   : ONLY_IF_RO { *(.gcc_except_table .gcc_except_table.*) }
-  /* Adjust the address for the data segment.  We want to adjust up to
-     the same address within the page on the next page up.  */
-  . = ALIGN (CONSTANT (MAXPAGESIZE)) - ((CONSTANT (MAXPAGESIZE) - .) & 
(CONSTANT (MAXPAGESIZE) - 1)); . = DATA_SEGMENT_ALIGN (CONSTANT (MAXPAGESIZE), 
CONSTANT (COMMONPAGESIZE));
-  /* Exception handling  */
-  .eh_frame       : ONLY_IF_RW { KEEP (*(.eh_frame)) }
-  .gcc_except_table   : ONLY_IF_RW { *(.gcc_except_table .gcc_except_table.*) }
-  /* Thread Local Storage sections  */
-  .tdata         : { *(.tdata .tdata.* .gnu.linkonce.td.*) }
-  .tbss                  : { *(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon) }
-  .preinit_array     :
-  {
-    PROVIDE_HIDDEN (__preinit_array_start = .);
-    KEEP (*(.preinit_array))
-    PROVIDE_HIDDEN (__preinit_array_end = .);
-  }
-  .init_array     :
-  {
-     PROVIDE_HIDDEN (__init_array_start = .);
-     KEEP (*(SORT(.init_array.*)))
-     KEEP (*(.init_array))
-     PROVIDE_HIDDEN (__init_array_end = .);
-  }
-  .fini_array     :
-  {
-    PROVIDE_HIDDEN (__fini_array_start = .);
-    KEEP (*(.fini_array))
-    KEEP (*(SORT(.fini_array.*)))
-    PROVIDE_HIDDEN (__fini_array_end = .);
-  }
-  .ctors          :
-  {
-    /* gcc uses crtbegin.o to find the start of
-       the constructors, so we make sure it is
-       first.  Because this is a wildcard, it
-       doesn't matter if the user does not
-       actually link against crtbegin.o; the
-       linker won't look for a file to match a
-       wildcard.  The wildcard also means that it
-       doesn't matter which directory crtbegin.o
-       is in.  */
-    KEEP (*crtbegin.o(.ctors))
-    KEEP (*crtbegin?.o(.ctors))
-    /* We don't want to include the .ctor section from
-       the crtend.o file until after the sorted ctors.
-       The .ctor section from the crtend file contains the
-       end of ctors marker and it must be last */
-    KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o ) .ctors))
-
-    KEEP (*(SORT(.ctors.*)))
-    KEEP (*(.ctors))
-
-    KEEP (*(.mark_beg_l4dde_ctors))
-    KEEP (*(SORT(.l4dde_ctors.?)))
-    KEEP (*(SORT(.l4dde_ctors.??)))
-    KEEP (*(SORT(.l4dde_ctors.???)))
-    KEEP (*(SORT(.l4dde_ctors.????)))
-    KEEP (*(SORT(.l4dde_ctors.?????)))
-    KEEP (*(.l4dde_ctors))
-    KEEP (*(.mark_end_l4dde_ctors))
-  }
-  .dtors          :
-  {
-    KEEP (*crtbegin.o(.dtors))
-    KEEP (*crtbegin?.o(.dtors))
-    KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o ) .dtors))
-    KEEP (*(SORT(.dtors.*)))
-    KEEP (*(.dtors))
-  }
-  .jcr            : { KEEP (*(.jcr)) }
-  .data.rel.ro : { *(.data.rel.ro.local* .gnu.linkonce.d.rel.ro.local.*) 
*(.data.rel.ro* .gnu.linkonce.d.rel.ro.*) }
-  .dynamic        : { *(.dynamic) }
-  .got            : { *(.got) }
-  . = DATA_SEGMENT_RELRO_END (12, .);
-  .got.plt        : { *(.got.plt) }
-  .data           :
-  {
-    *(.data .data.* .gnu.linkonce.d.*)
-    KEEP (*(.gnu.linkonce.d.*personality*))
-    SORT(CONSTRUCTORS)
-  }
-  .data1          : { *(.data1) }
-  _edata = .; PROVIDE (edata = .);
-  __bss_start = .;
-  .bss            :
-  {
-   *(.dynbss)
-   *(.bss .bss.* .gnu.linkonce.b.*)
-   *(COMMON)
-   /* Align here to ensure that the .bss section occupies space up to
-      _end.  Align after .bss to ensure correct alignment even if the
-      .bss section disappears because there are no input sections.
-      FIXME: Why do we need it? When there is no .bss section, we don't
-      pad the .data section.  */
-   . = ALIGN(. != 0 ? 32 / 8 : 1);
-  }
-  . = ALIGN(32 / 8);
-  . = ALIGN(32 / 8);
-  _end = .; PROVIDE (end = .);
-  . = DATA_SEGMENT_END (.);
-  /* Stabs debugging sections.  */
-  .stab          0 : { *(.stab) }
-  .stabstr       0 : { *(.stabstr) }
-  .stab.excl     0 : { *(.stab.excl) }
-  .stab.exclstr  0 : { *(.stab.exclstr) }
-  .stab.index    0 : { *(.stab.index) }
-  .stab.indexstr 0 : { *(.stab.indexstr) }
-  .comment       0 : { *(.comment) }
-  /* DWARF debug sections.
-     Symbols in the DWARF debugging sections are relative to the beginning
-     of the section so we begin them at 0.  */
-  /* DWARF 1 */
-  .debug          0 : { *(.debug) }
-  .line           0 : { *(.line) }
-  /* GNU DWARF 1 extensions */
-  .debug_srcinfo  0 : { *(.debug_srcinfo) }
-  .debug_sfnames  0 : { *(.debug_sfnames) }
-  /* DWARF 1.1 and DWARF 2 */
-  .debug_aranges  0 : { *(.debug_aranges) }
-  .debug_pubnames 0 : { *(.debug_pubnames) }
-  /* DWARF 2 */
-  .debug_info     0 : { *(.debug_info .gnu.linkonce.wi.*) }
-  .debug_abbrev   0 : { *(.debug_abbrev) }
-  .debug_line     0 : { *(.debug_line) }
-  .debug_frame    0 : { *(.debug_frame) }
-  .debug_str      0 : { *(.debug_str) }
-  .debug_loc      0 : { *(.debug_loc) }
-  .debug_macinfo  0 : { *(.debug_macinfo) }
-  /* SGI/MIPS DWARF 2 extensions */
-  .debug_weaknames 0 : { *(.debug_weaknames) }
-  .debug_funcnames 0 : { *(.debug_funcnames) }
-  .debug_typenames 0 : { *(.debug_typenames) }
-  .debug_varnames  0 : { *(.debug_varnames) }
-  /* DWARF 3 */
-  .debug_pubtypes 0 : { *(.debug_pubtypes) }
-  .debug_ranges   0 : { *(.debug_ranges) }
-  .gnu.attributes 0 : { KEEP (*(.gnu.attributes)) }
-  /DISCARD/ : { *(.note.GNU-stack) *(.gnu_debuglink) }
-}
-
diff --git a/dde_e1000/e1000.h b/dde_e1000/e1000.h
deleted file mode 100644
index f5581de..0000000
--- a/dde_e1000/e1000.h
+++ /dev/null
@@ -1,354 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2006 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify it
-  under the terms and conditions of the GNU General Public License,
-  version 2, as published by the Free Software Foundation.
-
-  This program is distributed in the hope it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
-
-  You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-
-  The full GNU General Public License is included in this distribution in
-  the file called "COPYING".
-
-  Contact Information:
-  Linux NICS <address@hidden>
-  e1000-devel Mailing List <address@hidden>
-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-
-*******************************************************************************/
-
-
-/* Linux PRO/1000 Ethernet Driver main header file */
-
-#ifndef _E1000_H_
-#define _E1000_H_
-
-#include <linux/stddef.h>
-#include <linux/module.h>
-#include <linux/types.h>
-#include <asm/byteorder.h>
-#include <linux/init.h>
-#include <linux/mm.h>
-#include <linux/errno.h>
-#include <linux/ioport.h>
-#include <linux/pci.h>
-#include <linux/kernel.h>
-#include <linux/netdevice.h>
-#include <linux/etherdevice.h>
-#include <linux/skbuff.h>
-#include <linux/delay.h>
-#include <linux/timer.h>
-#include <linux/slab.h>
-#include <linux/vmalloc.h>
-#include <linux/interrupt.h>
-#include <linux/string.h>
-#include <linux/pagemap.h>
-#include <linux/dma-mapping.h>
-#include <linux/bitops.h>
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <linux/capability.h>
-#include <linux/in.h>
-#include <linux/ip.h>
-#include <linux/ipv6.h>
-#include <linux/tcp.h>
-#include <linux/udp.h>
-#include <net/pkt_sched.h>
-#include <linux/list.h>
-#include <linux/reboot.h>
-#include <net/checksum.h>
-#include <linux/mii.h>
-#include <linux/ethtool.h>
-#include <linux/if_vlan.h>
-
-#define BAR_0          0
-#define BAR_1          1
-#define BAR_5          5
-
-#define INTEL_E1000_ETHERNET_DEVICE(device_id) {\
-       PCI_DEVICE(PCI_VENDOR_ID_INTEL, device_id)}
-
-struct e1000_adapter;
-
-#include "e1000_hw.h"
-
-#ifdef DBG
-#define E1000_DBG(args...) printk(KERN_DEBUG "e1000: " args)
-#else
-#define E1000_DBG(args...)
-#endif
-
-#define E1000_ERR(args...) printk(KERN_ERR "e1000: " args)
-
-#define PFX "e1000: "
-
-#define DPRINTK(nlevel, klevel, fmt, args...)                          \
-do {                                                                   \
-       if (NETIF_MSG_##nlevel & adapter->msg_enable)                   \
-               printk(KERN_##klevel PFX "%s: %s: " fmt,                \
-                      adapter->netdev->name, __func__, ##args);        \
-} while (0)
-
-#define E1000_MAX_INTR 10
-
-/* TX/RX descriptor defines */
-#define E1000_DEFAULT_TXD                  256
-#define E1000_MAX_TXD                      256
-#define E1000_MIN_TXD                       80
-#define E1000_MAX_82544_TXD               4096
-
-#define E1000_DEFAULT_RXD                  256
-#define E1000_MAX_RXD                      256
-#define E1000_MIN_RXD                       80
-#define E1000_MAX_82544_RXD               4096
-
-/* this is the size past which hardware will drop packets when setting LPE=0 */
-#define MAXIMUM_ETHERNET_VLAN_SIZE 1522
-
-/* Supported Rx Buffer Sizes */
-#define E1000_RXBUFFER_128   128    /* Used for packet split */
-#define E1000_RXBUFFER_256   256    /* Used for packet split */
-#define E1000_RXBUFFER_512   512
-#define E1000_RXBUFFER_1024  1024
-#define E1000_RXBUFFER_2048  2048
-#define E1000_RXBUFFER_4096  4096
-#define E1000_RXBUFFER_8192  8192
-#define E1000_RXBUFFER_16384 16384
-
-/* SmartSpeed delimiters */
-#define E1000_SMARTSPEED_DOWNSHIFT 3
-#define E1000_SMARTSPEED_MAX       15
-
-/* Packet Buffer allocations */
-#define E1000_PBA_BYTES_SHIFT 0xA
-#define E1000_TX_HEAD_ADDR_SHIFT 7
-#define E1000_PBA_TX_MASK 0xFFFF0000
-
-/* Flow Control Watermarks */
-#define E1000_FC_HIGH_DIFF 0x1638  /* High: 5688 bytes below Rx FIFO size */
-#define E1000_FC_LOW_DIFF 0x1640   /* Low:  5696 bytes below Rx FIFO size */
-
-#define E1000_FC_PAUSE_TIME 0x0680 /* 858 usec */
-
-/* How many Tx Descriptors do we need to call netif_wake_queue ? */
-#define E1000_TX_QUEUE_WAKE    16
-/* How many Rx Buffers do we bundle into one write to the hardware ? */
-#define E1000_RX_BUFFER_WRITE  16      /* Must be power of 2 */
-
-#define AUTO_ALL_MODES            0
-#define E1000_EEPROM_82544_APM    0x0004
-#define E1000_EEPROM_ICH8_APME    0x0004
-#define E1000_EEPROM_APME         0x0400
-
-#ifndef E1000_MASTER_SLAVE
-/* Switch to override PHY master/slave setting */
-#define E1000_MASTER_SLAVE     e1000_ms_hw_default
-#endif
-
-#define E1000_MNG_VLAN_NONE (-1)
-
-/* wrapper around a pointer to a socket buffer,
- * so a DMA handle can be stored along with the buffer */
-struct e1000_buffer {
-       struct sk_buff *skb;
-       dma_addr_t dma;
-       unsigned long time_stamp;
-       u16 length;
-       u16 next_to_watch;
-};
-
-struct e1000_tx_ring {
-       /* pointer to the descriptor ring memory */
-       void *desc;
-       /* physical address of the descriptor ring */
-       dma_addr_t dma;
-       /* length of descriptor ring in bytes */
-       unsigned int size;
-       /* number of descriptors in the ring */
-       unsigned int count;
-       /* next descriptor to associate a buffer with */
-       unsigned int next_to_use;
-       /* next descriptor to check for DD status bit */
-       unsigned int next_to_clean;
-       /* array of buffer information structs */
-       struct e1000_buffer *buffer_info;
-
-       spinlock_t tx_lock;
-       u16 tdh;
-       u16 tdt;
-       bool last_tx_tso;
-};
-
-struct e1000_rx_ring {
-       /* pointer to the descriptor ring memory */
-       void *desc;
-       /* physical address of the descriptor ring */
-       dma_addr_t dma;
-       /* length of descriptor ring in bytes */
-       unsigned int size;
-       /* number of descriptors in the ring */
-       unsigned int count;
-       /* next descriptor to associate a buffer with */
-       unsigned int next_to_use;
-       /* next descriptor to check for DD status bit */
-       unsigned int next_to_clean;
-       /* array of buffer information structs */
-       struct e1000_buffer *buffer_info;
-
-       /* cpu for rx queue */
-       int cpu;
-
-       u16 rdh;
-       u16 rdt;
-};
-
-#define E1000_DESC_UNUSED(R)                                           \
-       ((((R)->next_to_clean > (R)->next_to_use)                       \
-         ? 0 : (R)->count) + (R)->next_to_clean - (R)->next_to_use - 1)
-
-#define E1000_RX_DESC_EXT(R, i)                                                
\
-       (&(((union e1000_rx_desc_extended *)((R).desc))[i]))
-#define E1000_GET_DESC(R, i, type)     (&(((struct type *)((R).desc))[i]))
-#define E1000_RX_DESC(R, i)            E1000_GET_DESC(R, i, e1000_rx_desc)
-#define E1000_TX_DESC(R, i)            E1000_GET_DESC(R, i, e1000_tx_desc)
-#define E1000_CONTEXT_DESC(R, i)       E1000_GET_DESC(R, i, e1000_context_desc)
-
-/* board specific private data structure */
-
-struct e1000_adapter {
-       struct timer_list tx_fifo_stall_timer;
-       struct timer_list watchdog_timer;
-       struct timer_list phy_info_timer;
-       struct vlan_group *vlgrp;
-       u16 mng_vlan_id;
-       u32 bd_number;
-       u32 rx_buffer_len;
-       u32 wol;
-       u32 smartspeed;
-       u32 en_mng_pt;
-       u16 link_speed;
-       u16 link_duplex;
-       spinlock_t stats_lock;
-       spinlock_t tx_queue_lock;
-       unsigned int total_tx_bytes;
-       unsigned int total_tx_packets;
-       unsigned int total_rx_bytes;
-       unsigned int total_rx_packets;
-       /* Interrupt Throttle Rate */
-       u32 itr;
-       u32 itr_setting;
-       u16 tx_itr;
-       u16 rx_itr;
-
-       struct work_struct reset_task;
-       u8 fc_autoneg;
-
-       struct timer_list blink_timer;
-       unsigned long led_status;
-
-       /* TX */
-       struct e1000_tx_ring *tx_ring;      /* One per active queue */
-       unsigned int restart_queue;
-       unsigned long tx_queue_len;
-       u32 txd_cmd;
-       u32 tx_int_delay;
-       u32 tx_abs_int_delay;
-       u32 gotcl;
-       u64 gotcl_old;
-       u64 tpt_old;
-       u64 colc_old;
-       u32 tx_timeout_count;
-       u32 tx_fifo_head;
-       u32 tx_head_addr;
-       u32 tx_fifo_size;
-       u8  tx_timeout_factor;
-       atomic_t tx_fifo_stall;
-       bool pcix_82544;
-       bool detect_tx_hung;
-
-       /* RX */
-       bool (*clean_rx)(struct e1000_adapter *adapter,
-                        struct e1000_rx_ring *rx_ring,
-                        int *work_done, int work_to_do);
-       void (*alloc_rx_buf)(struct e1000_adapter *adapter,
-                            struct e1000_rx_ring *rx_ring,
-                            int cleaned_count);
-       struct e1000_rx_ring *rx_ring;      /* One per active queue */
-       struct napi_struct napi;
-
-       int num_tx_queues;
-       int num_rx_queues;
-
-       u64 hw_csum_err;
-       u64 hw_csum_good;
-       u64 rx_hdr_split;
-       u32 alloc_rx_buff_failed;
-       u32 rx_int_delay;
-       u32 rx_abs_int_delay;
-       bool rx_csum;
-       u32 gorcl;
-       u64 gorcl_old;
-
-       /* OS defined structs */
-       struct net_device *netdev;
-       struct pci_dev *pdev;
-       struct net_device_stats net_stats;
-
-       /* structs defined in e1000_hw.h */
-       struct e1000_hw hw;
-       struct e1000_hw_stats stats;
-       struct e1000_phy_info phy_info;
-       struct e1000_phy_stats phy_stats;
-
-       u32 test_icr;
-       struct e1000_tx_ring test_tx_ring;
-       struct e1000_rx_ring test_rx_ring;
-
-       int msg_enable;
-       bool have_msi;
-
-       /* to not mess up cache alignment, always add to the bottom */
-       bool tso_force;
-       bool smart_power_down;  /* phy smart power down */
-       bool quad_port_a;
-       unsigned long flags;
-       u32 eeprom_wol;
-
-       /* for ioport free */
-       int bars;
-       int need_ioport;
-};
-
-enum e1000_state_t {
-       __E1000_TESTING,
-       __E1000_RESETTING,
-       __E1000_DOWN
-};
-
-extern char e1000_driver_name[];
-extern const char e1000_driver_version[];
-
-extern int e1000_up(struct e1000_adapter *adapter);
-extern void e1000_down(struct e1000_adapter *adapter);
-extern void e1000_reinit_locked(struct e1000_adapter *adapter);
-extern void e1000_reset(struct e1000_adapter *adapter);
-extern int e1000_set_spd_dplx(struct e1000_adapter *adapter, u16 spddplx);
-extern int e1000_setup_all_rx_resources(struct e1000_adapter *adapter);
-extern int e1000_setup_all_tx_resources(struct e1000_adapter *adapter);
-extern void e1000_free_all_rx_resources(struct e1000_adapter *adapter);
-extern void e1000_free_all_tx_resources(struct e1000_adapter *adapter);
-extern void e1000_update_stats(struct e1000_adapter *adapter);
-extern void e1000_power_up_phy(struct e1000_adapter *);
-extern void e1000_set_ethtool_ops(struct net_device *netdev);
-extern void e1000_check_options(struct e1000_adapter *adapter);
-
-#endif /* _E1000_H_ */
diff --git a/dde_e1000/e1000_ethtool.c b/dde_e1000/e1000_ethtool.c
deleted file mode 100644
index fc2b92a..0000000
--- a/dde_e1000/e1000_ethtool.c
+++ /dev/null
@@ -1,1989 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2006 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify it
-  under the terms and conditions of the GNU General Public License,
-  version 2, as published by the Free Software Foundation.
-
-  This program is distributed in the hope it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
-
-  You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-
-  The full GNU General Public License is included in this distribution in
-  the file called "COPYING".
-
-  Contact Information:
-  Linux NICS <address@hidden>
-  e1000-devel Mailing List <address@hidden>
-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-
-*******************************************************************************/
-
-/* ethtool support for e1000 */
-
-#include "e1000.h"
-#include <asm/uaccess.h>
-
-#include <ddekit/timer.h>
-
-struct e1000_stats {
-       char stat_string[ETH_GSTRING_LEN];
-       int sizeof_stat;
-       int stat_offset;
-};
-
-#define E1000_STAT(m) FIELD_SIZEOF(struct e1000_adapter, m), \
-                     offsetof(struct e1000_adapter, m)
-static const struct e1000_stats e1000_gstrings_stats[] = {
-       { "rx_packets", E1000_STAT(stats.gprc) },
-       { "tx_packets", E1000_STAT(stats.gptc) },
-       { "rx_bytes", E1000_STAT(stats.gorcl) },
-       { "tx_bytes", E1000_STAT(stats.gotcl) },
-       { "rx_broadcast", E1000_STAT(stats.bprc) },
-       { "tx_broadcast", E1000_STAT(stats.bptc) },
-       { "rx_multicast", E1000_STAT(stats.mprc) },
-       { "tx_multicast", E1000_STAT(stats.mptc) },
-       { "rx_errors", E1000_STAT(stats.rxerrc) },
-       { "tx_errors", E1000_STAT(stats.txerrc) },
-       { "tx_dropped", E1000_STAT(net_stats.tx_dropped) },
-       { "multicast", E1000_STAT(stats.mprc) },
-       { "collisions", E1000_STAT(stats.colc) },
-       { "rx_length_errors", E1000_STAT(stats.rlerrc) },
-       { "rx_over_errors", E1000_STAT(net_stats.rx_over_errors) },
-       { "rx_crc_errors", E1000_STAT(stats.crcerrs) },
-       { "rx_frame_errors", E1000_STAT(net_stats.rx_frame_errors) },
-       { "rx_no_buffer_count", E1000_STAT(stats.rnbc) },
-       { "rx_missed_errors", E1000_STAT(stats.mpc) },
-       { "tx_aborted_errors", E1000_STAT(stats.ecol) },
-       { "tx_carrier_errors", E1000_STAT(stats.tncrs) },
-       { "tx_fifo_errors", E1000_STAT(net_stats.tx_fifo_errors) },
-       { "tx_heartbeat_errors", E1000_STAT(net_stats.tx_heartbeat_errors) },
-       { "tx_window_errors", E1000_STAT(stats.latecol) },
-       { "tx_abort_late_coll", E1000_STAT(stats.latecol) },
-       { "tx_deferred_ok", E1000_STAT(stats.dc) },
-       { "tx_single_coll_ok", E1000_STAT(stats.scc) },
-       { "tx_multi_coll_ok", E1000_STAT(stats.mcc) },
-       { "tx_timeout_count", E1000_STAT(tx_timeout_count) },
-       { "tx_restart_queue", E1000_STAT(restart_queue) },
-       { "rx_long_length_errors", E1000_STAT(stats.roc) },
-       { "rx_short_length_errors", E1000_STAT(stats.ruc) },
-       { "rx_align_errors", E1000_STAT(stats.algnerrc) },
-       { "tx_tcp_seg_good", E1000_STAT(stats.tsctc) },
-       { "tx_tcp_seg_failed", E1000_STAT(stats.tsctfc) },
-       { "rx_flow_control_xon", E1000_STAT(stats.xonrxc) },
-       { "rx_flow_control_xoff", E1000_STAT(stats.xoffrxc) },
-       { "tx_flow_control_xon", E1000_STAT(stats.xontxc) },
-       { "tx_flow_control_xoff", E1000_STAT(stats.xofftxc) },
-       { "rx_long_byte_count", E1000_STAT(stats.gorcl) },
-       { "rx_csum_offload_good", E1000_STAT(hw_csum_good) },
-       { "rx_csum_offload_errors", E1000_STAT(hw_csum_err) },
-       { "rx_header_split", E1000_STAT(rx_hdr_split) },
-       { "alloc_rx_buff_failed", E1000_STAT(alloc_rx_buff_failed) },
-       { "tx_smbus", E1000_STAT(stats.mgptc) },
-       { "rx_smbus", E1000_STAT(stats.mgprc) },
-       { "dropped_smbus", E1000_STAT(stats.mgpdc) },
-};
-
-#define E1000_QUEUE_STATS_LEN 0
-#define E1000_GLOBAL_STATS_LEN ARRAY_SIZE(e1000_gstrings_stats)
-#define E1000_STATS_LEN (E1000_GLOBAL_STATS_LEN + E1000_QUEUE_STATS_LEN)
-static const char e1000_gstrings_test[][ETH_GSTRING_LEN] = {
-       "Register test  (offline)", "Eeprom test    (offline)",
-       "Interrupt test (offline)", "Loopback test  (offline)",
-       "Link test   (on/offline)"
-};
-#define E1000_TEST_LEN ARRAY_SIZE(e1000_gstrings_test)
-
-static int e1000_get_settings(struct net_device *netdev,
-                             struct ethtool_cmd *ecmd)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-
-       if (hw->media_type == e1000_media_type_copper) {
-
-               ecmd->supported = (SUPPORTED_10baseT_Half |
-                                  SUPPORTED_10baseT_Full |
-                                  SUPPORTED_100baseT_Half |
-                                  SUPPORTED_100baseT_Full |
-                                  SUPPORTED_1000baseT_Full|
-                                  SUPPORTED_Autoneg |
-                                  SUPPORTED_TP);
-               if (hw->phy_type == e1000_phy_ife)
-                       ecmd->supported &= ~SUPPORTED_1000baseT_Full;
-               ecmd->advertising = ADVERTISED_TP;
-
-               if (hw->autoneg == 1) {
-                       ecmd->advertising |= ADVERTISED_Autoneg;
-                       /* the e1000 autoneg seems to match ethtool nicely */
-                       ecmd->advertising |= hw->autoneg_advertised;
-               }
-
-               ecmd->port = PORT_TP;
-               ecmd->phy_address = hw->phy_addr;
-
-               if (hw->mac_type == e1000_82543)
-                       ecmd->transceiver = XCVR_EXTERNAL;
-               else
-                       ecmd->transceiver = XCVR_INTERNAL;
-
-       } else {
-               ecmd->supported   = (SUPPORTED_1000baseT_Full |
-                                    SUPPORTED_FIBRE |
-                                    SUPPORTED_Autoneg);
-
-               ecmd->advertising = (ADVERTISED_1000baseT_Full |
-                                    ADVERTISED_FIBRE |
-                                    ADVERTISED_Autoneg);
-
-               ecmd->port = PORT_FIBRE;
-
-               if (hw->mac_type >= e1000_82545)
-                       ecmd->transceiver = XCVR_INTERNAL;
-               else
-                       ecmd->transceiver = XCVR_EXTERNAL;
-       }
-
-       if (er32(STATUS) & E1000_STATUS_LU) {
-
-               e1000_get_speed_and_duplex(hw, &adapter->link_speed,
-                                                  &adapter->link_duplex);
-               ecmd->speed = adapter->link_speed;
-
-               /* unfortunatly FULL_DUPLEX != DUPLEX_FULL
-                *          and HALF_DUPLEX != DUPLEX_HALF */
-
-               if (adapter->link_duplex == FULL_DUPLEX)
-                       ecmd->duplex = DUPLEX_FULL;
-               else
-                       ecmd->duplex = DUPLEX_HALF;
-       } else {
-               ecmd->speed = -1;
-               ecmd->duplex = -1;
-       }
-
-       ecmd->autoneg = ((hw->media_type == e1000_media_type_fiber) ||
-                        hw->autoneg) ? AUTONEG_ENABLE : AUTONEG_DISABLE;
-       return 0;
-}
-
-static int e1000_set_settings(struct net_device *netdev,
-                             struct ethtool_cmd *ecmd)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-
-       /* When SoL/IDER sessions are active, autoneg/speed/duplex
-        * cannot be changed */
-       if (e1000_check_phy_reset_block(hw)) {
-               DPRINTK(DRV, ERR, "Cannot change link characteristics "
-                       "when SoL/IDER is active.\n");
-               return -EINVAL;
-       }
-
-       while (test_and_set_bit(__E1000_RESETTING, &adapter->flags))
-               msleep(1);
-
-       if (ecmd->autoneg == AUTONEG_ENABLE) {
-               hw->autoneg = 1;
-               if (hw->media_type == e1000_media_type_fiber)
-                       hw->autoneg_advertised = ADVERTISED_1000baseT_Full |
-                                    ADVERTISED_FIBRE |
-                                    ADVERTISED_Autoneg;
-               else
-                       hw->autoneg_advertised = ecmd->advertising |
-                                                ADVERTISED_TP |
-                                                ADVERTISED_Autoneg;
-               ecmd->advertising = hw->autoneg_advertised;
-       } else
-               if (e1000_set_spd_dplx(adapter, ecmd->speed + ecmd->duplex)) {
-                       clear_bit(__E1000_RESETTING, &adapter->flags);
-                       return -EINVAL;
-               }
-
-       /* reset the link */
-
-       if (netif_running(adapter->netdev)) {
-               e1000_down(adapter);
-               e1000_up(adapter);
-       } else
-               e1000_reset(adapter);
-
-       clear_bit(__E1000_RESETTING, &adapter->flags);
-       return 0;
-}
-
-static void e1000_get_pauseparam(struct net_device *netdev,
-                                struct ethtool_pauseparam *pause)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-
-       pause->autoneg =
-               (adapter->fc_autoneg ? AUTONEG_ENABLE : AUTONEG_DISABLE);
-
-       if (hw->fc == E1000_FC_RX_PAUSE)
-               pause->rx_pause = 1;
-       else if (hw->fc == E1000_FC_TX_PAUSE)
-               pause->tx_pause = 1;
-       else if (hw->fc == E1000_FC_FULL) {
-               pause->rx_pause = 1;
-               pause->tx_pause = 1;
-       }
-}
-
-static int e1000_set_pauseparam(struct net_device *netdev,
-                               struct ethtool_pauseparam *pause)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       int retval = 0;
-
-       adapter->fc_autoneg = pause->autoneg;
-
-       while (test_and_set_bit(__E1000_RESETTING, &adapter->flags))
-               msleep(1);
-
-       if (pause->rx_pause && pause->tx_pause)
-               hw->fc = E1000_FC_FULL;
-       else if (pause->rx_pause && !pause->tx_pause)
-               hw->fc = E1000_FC_RX_PAUSE;
-       else if (!pause->rx_pause && pause->tx_pause)
-               hw->fc = E1000_FC_TX_PAUSE;
-       else if (!pause->rx_pause && !pause->tx_pause)
-               hw->fc = E1000_FC_NONE;
-
-       hw->original_fc = hw->fc;
-
-       if (adapter->fc_autoneg == AUTONEG_ENABLE) {
-               if (netif_running(adapter->netdev)) {
-                       e1000_down(adapter);
-                       e1000_up(adapter);
-               } else
-                       e1000_reset(adapter);
-       } else
-               retval = ((hw->media_type == e1000_media_type_fiber) ?
-                         e1000_setup_link(hw) : e1000_force_mac_fc(hw));
-
-       clear_bit(__E1000_RESETTING, &adapter->flags);
-       return retval;
-}
-
-static u32 e1000_get_rx_csum(struct net_device *netdev)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       return adapter->rx_csum;
-}
-
-static int e1000_set_rx_csum(struct net_device *netdev, u32 data)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       adapter->rx_csum = data;
-
-       if (netif_running(netdev))
-               e1000_reinit_locked(adapter);
-       else
-               e1000_reset(adapter);
-       return 0;
-}
-
-static u32 e1000_get_tx_csum(struct net_device *netdev)
-{
-       return (netdev->features & NETIF_F_HW_CSUM) != 0;
-}
-
-static int e1000_set_tx_csum(struct net_device *netdev, u32 data)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-
-       if (hw->mac_type < e1000_82543) {
-               if (!data)
-                       return -EINVAL;
-               return 0;
-       }
-
-       if (data)
-               netdev->features |= NETIF_F_HW_CSUM;
-       else
-               netdev->features &= ~NETIF_F_HW_CSUM;
-
-       return 0;
-}
-
-static int e1000_set_tso(struct net_device *netdev, u32 data)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-
-       if ((hw->mac_type < e1000_82544) ||
-           (hw->mac_type == e1000_82547))
-               return data ? -EINVAL : 0;
-
-       if (data)
-               netdev->features |= NETIF_F_TSO;
-       else
-               netdev->features &= ~NETIF_F_TSO;
-
-       if (data && (adapter->hw.mac_type > e1000_82547_rev_2))
-               netdev->features |= NETIF_F_TSO6;
-       else
-               netdev->features &= ~NETIF_F_TSO6;
-
-       DPRINTK(PROBE, INFO, "TSO is %s\n", data ? "Enabled" : "Disabled");
-       adapter->tso_force = true;
-       return 0;
-}
-
-static u32 e1000_get_msglevel(struct net_device *netdev)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       return adapter->msg_enable;
-}
-
-static void e1000_set_msglevel(struct net_device *netdev, u32 data)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       adapter->msg_enable = data;
-}
-
-static int e1000_get_regs_len(struct net_device *netdev)
-{
-#define E1000_REGS_LEN 32
-       return E1000_REGS_LEN * sizeof(u32);
-}
-
-static void e1000_get_regs(struct net_device *netdev, struct ethtool_regs 
*regs,
-                          void *p)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       u32 *regs_buff = p;
-       u16 phy_data;
-
-       memset(p, 0, E1000_REGS_LEN * sizeof(u32));
-
-       regs->version = (1 << 24) | (hw->revision_id << 16) | hw->device_id;
-
-       regs_buff[0]  = er32(CTRL);
-       regs_buff[1]  = er32(STATUS);
-
-       regs_buff[2]  = er32(RCTL);
-       regs_buff[3]  = er32(RDLEN);
-       regs_buff[4]  = er32(RDH);
-       regs_buff[5]  = er32(RDT);
-       regs_buff[6]  = er32(RDTR);
-
-       regs_buff[7]  = er32(TCTL);
-       regs_buff[8]  = er32(TDLEN);
-       regs_buff[9]  = er32(TDH);
-       regs_buff[10] = er32(TDT);
-       regs_buff[11] = er32(TIDV);
-
-       regs_buff[12] = hw->phy_type;  /* PHY type (IGP=1, M88=0) */
-       if (hw->phy_type == e1000_phy_igp) {
-               e1000_write_phy_reg(hw, IGP01E1000_PHY_PAGE_SELECT,
-                                   IGP01E1000_PHY_AGC_A);
-               e1000_read_phy_reg(hw, IGP01E1000_PHY_AGC_A &
-                                  IGP01E1000_PHY_PAGE_SELECT, &phy_data);
-               regs_buff[13] = (u32)phy_data; /* cable length */
-               e1000_write_phy_reg(hw, IGP01E1000_PHY_PAGE_SELECT,
-                                   IGP01E1000_PHY_AGC_B);
-               e1000_read_phy_reg(hw, IGP01E1000_PHY_AGC_B &
-                                  IGP01E1000_PHY_PAGE_SELECT, &phy_data);
-               regs_buff[14] = (u32)phy_data; /* cable length */
-               e1000_write_phy_reg(hw, IGP01E1000_PHY_PAGE_SELECT,
-                                   IGP01E1000_PHY_AGC_C);
-               e1000_read_phy_reg(hw, IGP01E1000_PHY_AGC_C &
-                                  IGP01E1000_PHY_PAGE_SELECT, &phy_data);
-               regs_buff[15] = (u32)phy_data; /* cable length */
-               e1000_write_phy_reg(hw, IGP01E1000_PHY_PAGE_SELECT,
-                                   IGP01E1000_PHY_AGC_D);
-               e1000_read_phy_reg(hw, IGP01E1000_PHY_AGC_D &
-                                  IGP01E1000_PHY_PAGE_SELECT, &phy_data);
-               regs_buff[16] = (u32)phy_data; /* cable length */
-               regs_buff[17] = 0; /* extended 10bt distance (not needed) */
-               e1000_write_phy_reg(hw, IGP01E1000_PHY_PAGE_SELECT, 0x0);
-               e1000_read_phy_reg(hw, IGP01E1000_PHY_PORT_STATUS &
-                                  IGP01E1000_PHY_PAGE_SELECT, &phy_data);
-               regs_buff[18] = (u32)phy_data; /* cable polarity */
-               e1000_write_phy_reg(hw, IGP01E1000_PHY_PAGE_SELECT,
-                                   IGP01E1000_PHY_PCS_INIT_REG);
-               e1000_read_phy_reg(hw, IGP01E1000_PHY_PCS_INIT_REG &
-                                  IGP01E1000_PHY_PAGE_SELECT, &phy_data);
-               regs_buff[19] = (u32)phy_data; /* cable polarity */
-               regs_buff[20] = 0; /* polarity correction enabled (always) */
-               regs_buff[22] = 0; /* phy receive errors (unavailable) */
-               regs_buff[23] = regs_buff[18]; /* mdix mode */
-               e1000_write_phy_reg(hw, IGP01E1000_PHY_PAGE_SELECT, 0x0);
-       } else {
-               e1000_read_phy_reg(hw, M88E1000_PHY_SPEC_STATUS, &phy_data);
-               regs_buff[13] = (u32)phy_data; /* cable length */
-               regs_buff[14] = 0;  /* Dummy (to align w/ IGP phy reg dump) */
-               regs_buff[15] = 0;  /* Dummy (to align w/ IGP phy reg dump) */
-               regs_buff[16] = 0;  /* Dummy (to align w/ IGP phy reg dump) */
-               e1000_read_phy_reg(hw, M88E1000_PHY_SPEC_CTRL, &phy_data);
-               regs_buff[17] = (u32)phy_data; /* extended 10bt distance */
-               regs_buff[18] = regs_buff[13]; /* cable polarity */
-               regs_buff[19] = 0;  /* Dummy (to align w/ IGP phy reg dump) */
-               regs_buff[20] = regs_buff[17]; /* polarity correction */
-               /* phy receive errors */
-               regs_buff[22] = adapter->phy_stats.receive_errors;
-               regs_buff[23] = regs_buff[13]; /* mdix mode */
-       }
-       regs_buff[21] = adapter->phy_stats.idle_errors;  /* phy idle errors */
-       e1000_read_phy_reg(hw, PHY_1000T_STATUS, &phy_data);
-       regs_buff[24] = (u32)phy_data;  /* phy local receiver status */
-       regs_buff[25] = regs_buff[24];  /* phy remote receiver status */
-       if (hw->mac_type >= e1000_82540 &&
-           hw->mac_type < e1000_82571 &&
-           hw->media_type == e1000_media_type_copper) {
-               regs_buff[26] = er32(MANC);
-       }
-}
-
-static int e1000_get_eeprom_len(struct net_device *netdev)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-
-       return hw->eeprom.word_size * 2;
-}
-
-static int e1000_get_eeprom(struct net_device *netdev,
-                           struct ethtool_eeprom *eeprom, u8 *bytes)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       u16 *eeprom_buff;
-       int first_word, last_word;
-       int ret_val = 0;
-       u16 i;
-
-       if (eeprom->len == 0)
-               return -EINVAL;
-
-       eeprom->magic = hw->vendor_id | (hw->device_id << 16);
-
-       first_word = eeprom->offset >> 1;
-       last_word = (eeprom->offset + eeprom->len - 1) >> 1;
-
-       eeprom_buff = kmalloc(sizeof(u16) *
-                       (last_word - first_word + 1), GFP_KERNEL);
-       if (!eeprom_buff)
-               return -ENOMEM;
-
-       if (hw->eeprom.type == e1000_eeprom_spi)
-               ret_val = e1000_read_eeprom(hw, first_word,
-                                           last_word - first_word + 1,
-                                           eeprom_buff);
-       else {
-               for (i = 0; i < last_word - first_word + 1; i++) {
-                       ret_val = e1000_read_eeprom(hw, first_word + i, 1,
-                                                   &eeprom_buff[i]);
-                       if (ret_val)
-                               break;
-               }
-       }
-
-       /* Device's eeprom is always little-endian, word addressable */
-       for (i = 0; i < last_word - first_word + 1; i++)
-               le16_to_cpus(&eeprom_buff[i]);
-
-       memcpy(bytes, (u8 *)eeprom_buff + (eeprom->offset & 1),
-                       eeprom->len);
-       kfree(eeprom_buff);
-
-       return ret_val;
-}
-
-static int e1000_set_eeprom(struct net_device *netdev,
-                           struct ethtool_eeprom *eeprom, u8 *bytes)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       u16 *eeprom_buff;
-       void *ptr;
-       int max_len, first_word, last_word, ret_val = 0;
-       u16 i;
-
-       if (eeprom->len == 0)
-               return -EOPNOTSUPP;
-
-       if (eeprom->magic != (hw->vendor_id | (hw->device_id << 16)))
-               return -EFAULT;
-
-       max_len = hw->eeprom.word_size * 2;
-
-       first_word = eeprom->offset >> 1;
-       last_word = (eeprom->offset + eeprom->len - 1) >> 1;
-       eeprom_buff = kmalloc(max_len, GFP_KERNEL);
-       if (!eeprom_buff)
-               return -ENOMEM;
-
-       ptr = (void *)eeprom_buff;
-
-       if (eeprom->offset & 1) {
-               /* need read/modify/write of first changed EEPROM word */
-               /* only the second byte of the word is being modified */
-               ret_val = e1000_read_eeprom(hw, first_word, 1,
-                                           &eeprom_buff[0]);
-               ptr++;
-       }
-       if (((eeprom->offset + eeprom->len) & 1) && (ret_val == 0)) {
-               /* need read/modify/write of last changed EEPROM word */
-               /* only the first byte of the word is being modified */
-               ret_val = e1000_read_eeprom(hw, last_word, 1,
-                                 &eeprom_buff[last_word - first_word]);
-       }
-
-       /* Device's eeprom is always little-endian, word addressable */
-       for (i = 0; i < last_word - first_word + 1; i++)
-               le16_to_cpus(&eeprom_buff[i]);
-
-       memcpy(ptr, bytes, eeprom->len);
-
-       for (i = 0; i < last_word - first_word + 1; i++)
-               eeprom_buff[i] = cpu_to_le16(eeprom_buff[i]);
-
-       ret_val = e1000_write_eeprom(hw, first_word,
-                                    last_word - first_word + 1, eeprom_buff);
-
-       /* Update the checksum over the first part of the EEPROM if needed
-        * and flush shadow RAM for 82573 conrollers */
-       if ((ret_val == 0) && ((first_word <= EEPROM_CHECKSUM_REG) ||
-                               (hw->mac_type == e1000_82573)))
-               e1000_update_eeprom_checksum(hw);
-
-       kfree(eeprom_buff);
-       return ret_val;
-}
-
-static void e1000_get_drvinfo(struct net_device *netdev,
-                             struct ethtool_drvinfo *drvinfo)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       char firmware_version[32];
-       u16 eeprom_data;
-
-       strncpy(drvinfo->driver,  e1000_driver_name, 32);
-       strncpy(drvinfo->version, e1000_driver_version, 32);
-
-       /* EEPROM image version # is reported as firmware version # for
-        * 8257{1|2|3} controllers */
-       e1000_read_eeprom(hw, 5, 1, &eeprom_data);
-       switch (hw->mac_type) {
-       case e1000_82571:
-       case e1000_82572:
-       case e1000_82573:
-       case e1000_80003es2lan:
-       case e1000_ich8lan:
-               sprintf(firmware_version, "%d.%d-%d",
-                       (eeprom_data & 0xF000) >> 12,
-                       (eeprom_data & 0x0FF0) >> 4,
-                       eeprom_data & 0x000F);
-               break;
-       default:
-               sprintf(firmware_version, "N/A");
-       }
-
-       strncpy(drvinfo->fw_version, firmware_version, 32);
-       strncpy(drvinfo->bus_info, pci_name(adapter->pdev), 32);
-       drvinfo->regdump_len = e1000_get_regs_len(netdev);
-       drvinfo->eedump_len = e1000_get_eeprom_len(netdev);
-}
-
-static void e1000_get_ringparam(struct net_device *netdev,
-                               struct ethtool_ringparam *ring)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       e1000_mac_type mac_type = hw->mac_type;
-       struct e1000_tx_ring *txdr = adapter->tx_ring;
-       struct e1000_rx_ring *rxdr = adapter->rx_ring;
-
-       ring->rx_max_pending = (mac_type < e1000_82544) ? E1000_MAX_RXD :
-               E1000_MAX_82544_RXD;
-       ring->tx_max_pending = (mac_type < e1000_82544) ? E1000_MAX_TXD :
-               E1000_MAX_82544_TXD;
-       ring->rx_mini_max_pending = 0;
-       ring->rx_jumbo_max_pending = 0;
-       ring->rx_pending = rxdr->count;
-       ring->tx_pending = txdr->count;
-       ring->rx_mini_pending = 0;
-       ring->rx_jumbo_pending = 0;
-}
-
-static int e1000_set_ringparam(struct net_device *netdev,
-                              struct ethtool_ringparam *ring)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       e1000_mac_type mac_type = hw->mac_type;
-       struct e1000_tx_ring *txdr, *tx_old;
-       struct e1000_rx_ring *rxdr, *rx_old;
-       int i, err;
-
-       if ((ring->rx_mini_pending) || (ring->rx_jumbo_pending))
-               return -EINVAL;
-
-       while (test_and_set_bit(__E1000_RESETTING, &adapter->flags))
-               msleep(1);
-
-       if (netif_running(adapter->netdev))
-               e1000_down(adapter);
-
-       tx_old = adapter->tx_ring;
-       rx_old = adapter->rx_ring;
-
-       err = -ENOMEM;
-       txdr = kcalloc(adapter->num_tx_queues, sizeof(struct e1000_tx_ring), 
GFP_KERNEL);
-       if (!txdr)
-               goto err_alloc_tx;
-
-       rxdr = kcalloc(adapter->num_rx_queues, sizeof(struct e1000_rx_ring), 
GFP_KERNEL);
-       if (!rxdr)
-               goto err_alloc_rx;
-
-       adapter->tx_ring = txdr;
-       adapter->rx_ring = rxdr;
-
-       rxdr->count = max(ring->rx_pending,(u32)E1000_MIN_RXD);
-       rxdr->count = min(rxdr->count,(u32)(mac_type < e1000_82544 ?
-               E1000_MAX_RXD : E1000_MAX_82544_RXD));
-       rxdr->count = ALIGN(rxdr->count, REQ_RX_DESCRIPTOR_MULTIPLE);
-
-       txdr->count = max(ring->tx_pending,(u32)E1000_MIN_TXD);
-       txdr->count = min(txdr->count,(u32)(mac_type < e1000_82544 ?
-               E1000_MAX_TXD : E1000_MAX_82544_TXD));
-       txdr->count = ALIGN(txdr->count, REQ_TX_DESCRIPTOR_MULTIPLE);
-
-       for (i = 0; i < adapter->num_tx_queues; i++)
-               txdr[i].count = txdr->count;
-       for (i = 0; i < adapter->num_rx_queues; i++)
-               rxdr[i].count = rxdr->count;
-
-       if (netif_running(adapter->netdev)) {
-               /* Try to get new resources before deleting old */
-               err = e1000_setup_all_rx_resources(adapter);
-               if (err)
-                       goto err_setup_rx;
-               err = e1000_setup_all_tx_resources(adapter);
-               if (err)
-                       goto err_setup_tx;
-
-               /* save the new, restore the old in order to free it,
-                * then restore the new back again */
-
-               adapter->rx_ring = rx_old;
-               adapter->tx_ring = tx_old;
-               e1000_free_all_rx_resources(adapter);
-               e1000_free_all_tx_resources(adapter);
-               kfree(tx_old);
-               kfree(rx_old);
-               adapter->rx_ring = rxdr;
-               adapter->tx_ring = txdr;
-               err = e1000_up(adapter);
-               if (err)
-                       goto err_setup;
-       }
-
-       clear_bit(__E1000_RESETTING, &adapter->flags);
-       return 0;
-err_setup_tx:
-       e1000_free_all_rx_resources(adapter);
-err_setup_rx:
-       adapter->rx_ring = rx_old;
-       adapter->tx_ring = tx_old;
-       kfree(rxdr);
-err_alloc_rx:
-       kfree(txdr);
-err_alloc_tx:
-       e1000_up(adapter);
-err_setup:
-       clear_bit(__E1000_RESETTING, &adapter->flags);
-       return err;
-}
-
-static bool reg_pattern_test(struct e1000_adapter *adapter, u64 *data, int reg,
-                            u32 mask, u32 write)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       static const u32 test[] =
-               {0x5A5A5A5A, 0xA5A5A5A5, 0x00000000, 0xFFFFFFFF};
-       u8 __iomem *address = hw->hw_addr + reg;
-       u32 read;
-       int i;
-
-       for (i = 0; i < ARRAY_SIZE(test); i++) {
-               writel(write & test[i], address);
-               read = readl(address);
-               if (read != (write & test[i] & mask)) {
-                       DPRINTK(DRV, ERR, "pattern test reg %04X failed: "
-                               "got 0x%08X expected 0x%08X\n",
-                               reg, read, (write & test[i] & mask));
-                       *data = reg;
-                       return true;
-               }
-       }
-       return false;
-}
-
-static bool reg_set_and_check(struct e1000_adapter *adapter, u64 *data, int 
reg,
-                             u32 mask, u32 write)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       u8 __iomem *address = hw->hw_addr + reg;
-       u32 read;
-
-       writel(write & mask, address);
-       read = readl(address);
-       if ((read & mask) != (write & mask)) {
-               DPRINTK(DRV, ERR, "set/check reg %04X test failed: "
-                       "got 0x%08X expected 0x%08X\n",
-                       reg, (read & mask), (write & mask));
-               *data = reg;
-               return true;
-       }
-       return false;
-}
-
-#define REG_PATTERN_TEST(reg, mask, write)                          \
-       do {                                                         \
-               if (reg_pattern_test(adapter, data,                  \
-                            (hw->mac_type >= e1000_82543)   \
-                            ? E1000_##reg : E1000_82542_##reg,      \
-                            mask, write))                           \
-                       return 1;                                    \
-       } while (0)
-
-#define REG_SET_AND_CHECK(reg, mask, write)                         \
-       do {                                                         \
-               if (reg_set_and_check(adapter, data,                 \
-                             (hw->mac_type >= e1000_82543)  \
-                             ? E1000_##reg : E1000_82542_##reg,     \
-                             mask, write))                          \
-                       return 1;                                    \
-       } while (0)
-
-static int e1000_reg_test(struct e1000_adapter *adapter, u64 *data)
-{
-       u32 value, before, after;
-       u32 i, toggle;
-       struct e1000_hw *hw = &adapter->hw;
-
-       /* The status register is Read Only, so a write should fail.
-        * Some bits that get toggled are ignored.
-        */
-       switch (hw->mac_type) {
-       /* there are several bits on newer hardware that are r/w */
-       case e1000_82571:
-       case e1000_82572:
-       case e1000_80003es2lan:
-               toggle = 0x7FFFF3FF;
-               break;
-       case e1000_82573:
-       case e1000_ich8lan:
-               toggle = 0x7FFFF033;
-               break;
-       default:
-               toggle = 0xFFFFF833;
-               break;
-       }
-
-       before = er32(STATUS);
-       value = (er32(STATUS) & toggle);
-       ew32(STATUS, toggle);
-       after = er32(STATUS) & toggle;
-       if (value != after) {
-               DPRINTK(DRV, ERR, "failed STATUS register test got: "
-                       "0x%08X expected: 0x%08X\n", after, value);
-               *data = 1;
-               return 1;
-       }
-       /* restore previous status */
-       ew32(STATUS, before);
-
-       if (hw->mac_type != e1000_ich8lan) {
-               REG_PATTERN_TEST(FCAL, 0xFFFFFFFF, 0xFFFFFFFF);
-               REG_PATTERN_TEST(FCAH, 0x0000FFFF, 0xFFFFFFFF);
-               REG_PATTERN_TEST(FCT, 0x0000FFFF, 0xFFFFFFFF);
-               REG_PATTERN_TEST(VET, 0x0000FFFF, 0xFFFFFFFF);
-       }
-
-       REG_PATTERN_TEST(RDTR, 0x0000FFFF, 0xFFFFFFFF);
-       REG_PATTERN_TEST(RDBAH, 0xFFFFFFFF, 0xFFFFFFFF);
-       REG_PATTERN_TEST(RDLEN, 0x000FFF80, 0x000FFFFF);
-       REG_PATTERN_TEST(RDH, 0x0000FFFF, 0x0000FFFF);
-       REG_PATTERN_TEST(RDT, 0x0000FFFF, 0x0000FFFF);
-       REG_PATTERN_TEST(FCRTH, 0x0000FFF8, 0x0000FFF8);
-       REG_PATTERN_TEST(FCTTV, 0x0000FFFF, 0x0000FFFF);
-       REG_PATTERN_TEST(TIPG, 0x3FFFFFFF, 0x3FFFFFFF);
-       REG_PATTERN_TEST(TDBAH, 0xFFFFFFFF, 0xFFFFFFFF);
-       REG_PATTERN_TEST(TDLEN, 0x000FFF80, 0x000FFFFF);
-
-       REG_SET_AND_CHECK(RCTL, 0xFFFFFFFF, 0x00000000);
-
-       before = (hw->mac_type == e1000_ich8lan ?
-                 0x06C3B33E : 0x06DFB3FE);
-       REG_SET_AND_CHECK(RCTL, before, 0x003FFFFB);
-       REG_SET_AND_CHECK(TCTL, 0xFFFFFFFF, 0x00000000);
-
-       if (hw->mac_type >= e1000_82543) {
-
-               REG_SET_AND_CHECK(RCTL, before, 0xFFFFFFFF);
-               REG_PATTERN_TEST(RDBAL, 0xFFFFFFF0, 0xFFFFFFFF);
-               if (hw->mac_type != e1000_ich8lan)
-                       REG_PATTERN_TEST(TXCW, 0xC000FFFF, 0x0000FFFF);
-               REG_PATTERN_TEST(TDBAL, 0xFFFFFFF0, 0xFFFFFFFF);
-               REG_PATTERN_TEST(TIDV, 0x0000FFFF, 0x0000FFFF);
-               value = (hw->mac_type == e1000_ich8lan ?
-                        E1000_RAR_ENTRIES_ICH8LAN : E1000_RAR_ENTRIES);
-               for (i = 0; i < value; i++) {
-                       REG_PATTERN_TEST(RA + (((i << 1) + 1) << 2), 0x8003FFFF,
-                                        0xFFFFFFFF);
-               }
-
-       } else {
-
-               REG_SET_AND_CHECK(RCTL, 0xFFFFFFFF, 0x01FFFFFF);
-               REG_PATTERN_TEST(RDBAL, 0xFFFFF000, 0xFFFFFFFF);
-               REG_PATTERN_TEST(TXCW, 0x0000FFFF, 0x0000FFFF);
-               REG_PATTERN_TEST(TDBAL, 0xFFFFF000, 0xFFFFFFFF);
-
-       }
-
-       value = (hw->mac_type == e1000_ich8lan ?
-                       E1000_MC_TBL_SIZE_ICH8LAN : E1000_MC_TBL_SIZE);
-       for (i = 0; i < value; i++)
-               REG_PATTERN_TEST(MTA + (i << 2), 0xFFFFFFFF, 0xFFFFFFFF);
-
-       *data = 0;
-       return 0;
-}
-
-static int e1000_eeprom_test(struct e1000_adapter *adapter, u64 *data)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       u16 temp;
-       u16 checksum = 0;
-       u16 i;
-
-       *data = 0;
-       /* Read and add up the contents of the EEPROM */
-       for (i = 0; i < (EEPROM_CHECKSUM_REG + 1); i++) {
-               if ((e1000_read_eeprom(hw, i, 1, &temp)) < 0) {
-                       *data = 1;
-                       break;
-               }
-               checksum += temp;
-       }
-
-       /* If Checksum is not Correct return error else test passed */
-       if ((checksum != (u16)EEPROM_SUM) && !(*data))
-               *data = 2;
-
-       return *data;
-}
-
-static irqreturn_t e1000_test_intr(int irq, void *data)
-{
-       struct net_device *netdev = (struct net_device *)data;
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-
-       adapter->test_icr |= er32(ICR);
-
-       return IRQ_HANDLED;
-}
-
-static int e1000_intr_test(struct e1000_adapter *adapter, u64 *data)
-{
-       struct net_device *netdev = adapter->netdev;
-       u32 mask, i = 0;
-       bool shared_int = true;
-       u32 irq = adapter->pdev->irq;
-       struct e1000_hw *hw = &adapter->hw;
-
-       *data = 0;
-
-       /* NOTE: we don't test MSI interrupts here, yet */
-       /* Hook up test interrupt handler just for this test */
-       if (!request_irq(irq, &e1000_test_intr, IRQF_PROBE_SHARED, netdev->name,
-                        netdev))
-               shared_int = false;
-       else if (request_irq(irq, &e1000_test_intr, IRQF_SHARED,
-                netdev->name, netdev)) {
-               *data = 1;
-               return -1;
-       }
-       DPRINTK(HW, INFO, "testing %s interrupt\n",
-               (shared_int ? "shared" : "unshared"));
-
-       /* Disable all the interrupts */
-       ew32(IMC, 0xFFFFFFFF);
-       msleep(10);
-
-       /* Test each interrupt */
-       for (; i < 10; i++) {
-
-               if (hw->mac_type == e1000_ich8lan && i == 8)
-                       continue;
-
-               /* Interrupt to test */
-               mask = 1 << i;
-
-               if (!shared_int) {
-                       /* Disable the interrupt to be reported in
-                        * the cause register and then force the same
-                        * interrupt and see if one gets posted.  If
-                        * an interrupt was posted to the bus, the
-                        * test failed.
-                        */
-                       adapter->test_icr = 0;
-                       ew32(IMC, mask);
-                       ew32(ICS, mask);
-                       msleep(10);
-
-                       if (adapter->test_icr & mask) {
-                               *data = 3;
-                               break;
-                       }
-               }
-
-               /* Enable the interrupt to be reported in
-                * the cause register and then force the same
-                * interrupt and see if one gets posted.  If
-                * an interrupt was not posted to the bus, the
-                * test failed.
-                */
-               adapter->test_icr = 0;
-               ew32(IMS, mask);
-               ew32(ICS, mask);
-               msleep(10);
-
-               if (!(adapter->test_icr & mask)) {
-                       *data = 4;
-                       break;
-               }
-
-               if (!shared_int) {
-                       /* Disable the other interrupts to be reported in
-                        * the cause register and then force the other
-                        * interrupts and see if any get posted.  If
-                        * an interrupt was posted to the bus, the
-                        * test failed.
-                        */
-                       adapter->test_icr = 0;
-                       ew32(IMC, ~mask & 0x00007FFF);
-                       ew32(ICS, ~mask & 0x00007FFF);
-                       msleep(10);
-
-                       if (adapter->test_icr) {
-                               *data = 5;
-                               break;
-                       }
-               }
-       }
-
-       /* Disable all the interrupts */
-       ew32(IMC, 0xFFFFFFFF);
-       msleep(10);
-
-       /* Unhook test interrupt handler */
-       free_irq(irq, netdev);
-
-       return *data;
-}
-
-static void e1000_free_desc_rings(struct e1000_adapter *adapter)
-{
-       struct e1000_tx_ring *txdr = &adapter->test_tx_ring;
-       struct e1000_rx_ring *rxdr = &adapter->test_rx_ring;
-       struct pci_dev *pdev = adapter->pdev;
-       int i;
-
-       if (txdr->desc && txdr->buffer_info) {
-               for (i = 0; i < txdr->count; i++) {
-                       if (txdr->buffer_info[i].dma)
-                               pci_unmap_single(pdev, txdr->buffer_info[i].dma,
-                                                txdr->buffer_info[i].length,
-                                                PCI_DMA_TODEVICE);
-                       if (txdr->buffer_info[i].skb)
-                               dev_kfree_skb(txdr->buffer_info[i].skb);
-               }
-       }
-
-       if (rxdr->desc && rxdr->buffer_info) {
-               for (i = 0; i < rxdr->count; i++) {
-                       if (rxdr->buffer_info[i].dma)
-                               pci_unmap_single(pdev, rxdr->buffer_info[i].dma,
-                                                rxdr->buffer_info[i].length,
-                                                PCI_DMA_FROMDEVICE);
-                       if (rxdr->buffer_info[i].skb)
-                               dev_kfree_skb(rxdr->buffer_info[i].skb);
-               }
-       }
-
-       if (txdr->desc) {
-               pci_free_consistent(pdev, txdr->size, txdr->desc, txdr->dma);
-               txdr->desc = NULL;
-       }
-       if (rxdr->desc) {
-               pci_free_consistent(pdev, rxdr->size, rxdr->desc, rxdr->dma);
-               rxdr->desc = NULL;
-       }
-
-       kfree(txdr->buffer_info);
-       txdr->buffer_info = NULL;
-       kfree(rxdr->buffer_info);
-       rxdr->buffer_info = NULL;
-
-       return;
-}
-
-static int e1000_setup_desc_rings(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       struct e1000_tx_ring *txdr = &adapter->test_tx_ring;
-       struct e1000_rx_ring *rxdr = &adapter->test_rx_ring;
-       struct pci_dev *pdev = adapter->pdev;
-       u32 rctl;
-       int i, ret_val;
-
-       /* Setup Tx descriptor ring and Tx buffers */
-
-       if (!txdr->count)
-               txdr->count = E1000_DEFAULT_TXD;
-
-       txdr->buffer_info = kcalloc(txdr->count, sizeof(struct e1000_buffer),
-                                   GFP_KERNEL);
-       if (!txdr->buffer_info) {
-               ret_val = 1;
-               goto err_nomem;
-       }
-
-       txdr->size = txdr->count * sizeof(struct e1000_tx_desc);
-       txdr->size = ALIGN(txdr->size, 4096);
-       txdr->desc = pci_alloc_consistent(pdev, txdr->size, &txdr->dma);
-       if (!txdr->desc) {
-               ret_val = 2;
-               goto err_nomem;
-       }
-       memset(txdr->desc, 0, txdr->size);
-       txdr->next_to_use = txdr->next_to_clean = 0;
-
-       ew32(TDBAL, ((u64)txdr->dma & 0x00000000FFFFFFFF));
-       ew32(TDBAH, ((u64)txdr->dma >> 32));
-       ew32(TDLEN, txdr->count * sizeof(struct e1000_tx_desc));
-       ew32(TDH, 0);
-       ew32(TDT, 0);
-       ew32(TCTL, E1000_TCTL_PSP | E1000_TCTL_EN |
-            E1000_COLLISION_THRESHOLD << E1000_CT_SHIFT |
-            E1000_FDX_COLLISION_DISTANCE << E1000_COLD_SHIFT);
-
-       for (i = 0; i < txdr->count; i++) {
-               struct e1000_tx_desc *tx_desc = E1000_TX_DESC(*txdr, i);
-               struct sk_buff *skb;
-               unsigned int size = 1024;
-
-               skb = alloc_skb(size, GFP_KERNEL);
-               if (!skb) {
-                       ret_val = 3;
-                       goto err_nomem;
-               }
-               skb_put(skb, size);
-               txdr->buffer_info[i].skb = skb;
-               txdr->buffer_info[i].length = skb->len;
-               txdr->buffer_info[i].dma =
-                       pci_map_single(pdev, skb->data, skb->len,
-                                      PCI_DMA_TODEVICE);
-               tx_desc->buffer_addr = cpu_to_le64(txdr->buffer_info[i].dma);
-               tx_desc->lower.data = cpu_to_le32(skb->len);
-               tx_desc->lower.data |= cpu_to_le32(E1000_TXD_CMD_EOP |
-                                                  E1000_TXD_CMD_IFCS |
-                                                  E1000_TXD_CMD_RPS);
-               tx_desc->upper.data = 0;
-       }
-
-       /* Setup Rx descriptor ring and Rx buffers */
-
-       if (!rxdr->count)
-               rxdr->count = E1000_DEFAULT_RXD;
-
-       rxdr->buffer_info = kcalloc(rxdr->count, sizeof(struct e1000_buffer),
-                                   GFP_KERNEL);
-       if (!rxdr->buffer_info) {
-               ret_val = 4;
-               goto err_nomem;
-       }
-
-       rxdr->size = rxdr->count * sizeof(struct e1000_rx_desc);
-       rxdr->desc = pci_alloc_consistent(pdev, rxdr->size, &rxdr->dma);
-       if (!rxdr->desc) {
-               ret_val = 5;
-               goto err_nomem;
-       }
-       memset(rxdr->desc, 0, rxdr->size);
-       rxdr->next_to_use = rxdr->next_to_clean = 0;
-
-       rctl = er32(RCTL);
-       ew32(RCTL, rctl & ~E1000_RCTL_EN);
-       ew32(RDBAL, ((u64)rxdr->dma & 0xFFFFFFFF));
-       ew32(RDBAH, ((u64)rxdr->dma >> 32));
-       ew32(RDLEN, rxdr->size);
-       ew32(RDH, 0);
-       ew32(RDT, 0);
-       rctl = E1000_RCTL_EN | E1000_RCTL_BAM | E1000_RCTL_SZ_2048 |
-               E1000_RCTL_LBM_NO | E1000_RCTL_RDMTS_HALF |
-               (hw->mc_filter_type << E1000_RCTL_MO_SHIFT);
-       ew32(RCTL, rctl);
-
-       for (i = 0; i < rxdr->count; i++) {
-               struct e1000_rx_desc *rx_desc = E1000_RX_DESC(*rxdr, i);
-               struct sk_buff *skb;
-
-               skb = alloc_skb(E1000_RXBUFFER_2048 + NET_IP_ALIGN, GFP_KERNEL);
-               if (!skb) {
-                       ret_val = 6;
-                       goto err_nomem;
-               }
-               skb_reserve(skb, NET_IP_ALIGN);
-               rxdr->buffer_info[i].skb = skb;
-               rxdr->buffer_info[i].length = E1000_RXBUFFER_2048;
-               rxdr->buffer_info[i].dma =
-                       pci_map_single(pdev, skb->data, E1000_RXBUFFER_2048,
-                                      PCI_DMA_FROMDEVICE);
-               rx_desc->buffer_addr = cpu_to_le64(rxdr->buffer_info[i].dma);
-               memset(skb->data, 0x00, skb->len);
-       }
-
-       return 0;
-
-err_nomem:
-       e1000_free_desc_rings(adapter);
-       return ret_val;
-}
-
-static void e1000_phy_disable_receiver(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-
-       /* Write out to PHY registers 29 and 30 to disable the Receiver. */
-       e1000_write_phy_reg(hw, 29, 0x001F);
-       e1000_write_phy_reg(hw, 30, 0x8FFC);
-       e1000_write_phy_reg(hw, 29, 0x001A);
-       e1000_write_phy_reg(hw, 30, 0x8FF0);
-}
-
-static void e1000_phy_reset_clk_and_crs(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       u16 phy_reg;
-
-       /* Because we reset the PHY above, we need to re-force TX_CLK in the
-        * Extended PHY Specific Control Register to 25MHz clock.  This
-        * value defaults back to a 2.5MHz clock when the PHY is reset.
-        */
-       e1000_read_phy_reg(hw, M88E1000_EXT_PHY_SPEC_CTRL, &phy_reg);
-       phy_reg |= M88E1000_EPSCR_TX_CLK_25;
-       e1000_write_phy_reg(hw,
-               M88E1000_EXT_PHY_SPEC_CTRL, phy_reg);
-
-       /* In addition, because of the s/w reset above, we need to enable
-        * CRS on TX.  This must be set for both full and half duplex
-        * operation.
-        */
-       e1000_read_phy_reg(hw, M88E1000_PHY_SPEC_CTRL, &phy_reg);
-       phy_reg |= M88E1000_PSCR_ASSERT_CRS_ON_TX;
-       e1000_write_phy_reg(hw,
-               M88E1000_PHY_SPEC_CTRL, phy_reg);
-}
-
-static int e1000_nonintegrated_phy_loopback(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       u32 ctrl_reg;
-       u16 phy_reg;
-
-       /* Setup the Device Control Register for PHY loopback test. */
-
-       ctrl_reg = er32(CTRL);
-       ctrl_reg |= (E1000_CTRL_ILOS |          /* Invert Loss-Of-Signal */
-                    E1000_CTRL_FRCSPD |        /* Set the Force Speed Bit */
-                    E1000_CTRL_FRCDPX |        /* Set the Force Duplex Bit */
-                    E1000_CTRL_SPD_1000 |      /* Force Speed to 1000 */
-                    E1000_CTRL_FD);            /* Force Duplex to FULL */
-
-       ew32(CTRL, ctrl_reg);
-
-       /* Read the PHY Specific Control Register (0x10) */
-       e1000_read_phy_reg(hw, M88E1000_PHY_SPEC_CTRL, &phy_reg);
-
-       /* Clear Auto-Crossover bits in PHY Specific Control Register
-        * (bits 6:5).
-        */
-       phy_reg &= ~M88E1000_PSCR_AUTO_X_MODE;
-       e1000_write_phy_reg(hw, M88E1000_PHY_SPEC_CTRL, phy_reg);
-
-       /* Perform software reset on the PHY */
-       e1000_phy_reset(hw);
-
-       /* Have to setup TX_CLK and TX_CRS after software reset */
-       e1000_phy_reset_clk_and_crs(adapter);
-
-       e1000_write_phy_reg(hw, PHY_CTRL, 0x8100);
-
-       /* Wait for reset to complete. */
-       udelay(500);
-
-       /* Have to setup TX_CLK and TX_CRS after software reset */
-       e1000_phy_reset_clk_and_crs(adapter);
-
-       /* Write out to PHY registers 29 and 30 to disable the Receiver. */
-       e1000_phy_disable_receiver(adapter);
-
-       /* Set the loopback bit in the PHY control register. */
-       e1000_read_phy_reg(hw, PHY_CTRL, &phy_reg);
-       phy_reg |= MII_CR_LOOPBACK;
-       e1000_write_phy_reg(hw, PHY_CTRL, phy_reg);
-
-       /* Setup TX_CLK and TX_CRS one more time. */
-       e1000_phy_reset_clk_and_crs(adapter);
-
-       /* Check Phy Configuration */
-       e1000_read_phy_reg(hw, PHY_CTRL, &phy_reg);
-       if (phy_reg != 0x4100)
-                return 9;
-
-       e1000_read_phy_reg(hw, M88E1000_EXT_PHY_SPEC_CTRL, &phy_reg);
-       if (phy_reg != 0x0070)
-               return 10;
-
-       e1000_read_phy_reg(hw, 29, &phy_reg);
-       if (phy_reg != 0x001A)
-               return 11;
-
-       return 0;
-}
-
-static int e1000_integrated_phy_loopback(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       u32 ctrl_reg = 0;
-       u32 stat_reg = 0;
-
-       hw->autoneg = false;
-
-       if (hw->phy_type == e1000_phy_m88) {
-               /* Auto-MDI/MDIX Off */
-               e1000_write_phy_reg(hw,
-                                   M88E1000_PHY_SPEC_CTRL, 0x0808);
-               /* reset to update Auto-MDI/MDIX */
-               e1000_write_phy_reg(hw, PHY_CTRL, 0x9140);
-               /* autoneg off */
-               e1000_write_phy_reg(hw, PHY_CTRL, 0x8140);
-       } else if (hw->phy_type == e1000_phy_gg82563)
-               e1000_write_phy_reg(hw,
-                                   GG82563_PHY_KMRN_MODE_CTRL,
-                                   0x1CC);
-
-       ctrl_reg = er32(CTRL);
-
-       if (hw->phy_type == e1000_phy_ife) {
-               /* force 100, set loopback */
-               e1000_write_phy_reg(hw, PHY_CTRL, 0x6100);
-
-               /* Now set up the MAC to the same speed/duplex as the PHY. */
-               ctrl_reg &= ~E1000_CTRL_SPD_SEL; /* Clear the speed sel bits */
-               ctrl_reg |= (E1000_CTRL_FRCSPD | /* Set the Force Speed Bit */
-                            E1000_CTRL_FRCDPX | /* Set the Force Duplex Bit */
-                            E1000_CTRL_SPD_100 |/* Force Speed to 100 */
-                            E1000_CTRL_FD);     /* Force Duplex to FULL */
-       } else {
-               /* force 1000, set loopback */
-               e1000_write_phy_reg(hw, PHY_CTRL, 0x4140);
-
-               /* Now set up the MAC to the same speed/duplex as the PHY. */
-               ctrl_reg = er32(CTRL);
-               ctrl_reg &= ~E1000_CTRL_SPD_SEL; /* Clear the speed sel bits */
-               ctrl_reg |= (E1000_CTRL_FRCSPD | /* Set the Force Speed Bit */
-                            E1000_CTRL_FRCDPX | /* Set the Force Duplex Bit */
-                            E1000_CTRL_SPD_1000 |/* Force Speed to 1000 */
-                            E1000_CTRL_FD);     /* Force Duplex to FULL */
-       }
-
-       if (hw->media_type == e1000_media_type_copper &&
-          hw->phy_type == e1000_phy_m88)
-               ctrl_reg |= E1000_CTRL_ILOS; /* Invert Loss of Signal */
-       else {
-               /* Set the ILOS bit on the fiber Nic is half
-                * duplex link is detected. */
-               stat_reg = er32(STATUS);
-               if ((stat_reg & E1000_STATUS_FD) == 0)
-                       ctrl_reg |= (E1000_CTRL_ILOS | E1000_CTRL_SLU);
-       }
-
-       ew32(CTRL, ctrl_reg);
-
-       /* Disable the receiver on the PHY so when a cable is plugged in, the
-        * PHY does not begin to autoneg when a cable is reconnected to the NIC.
-        */
-       if (hw->phy_type == e1000_phy_m88)
-               e1000_phy_disable_receiver(adapter);
-
-       udelay(500);
-
-       return 0;
-}
-
-static int e1000_set_phy_loopback(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       u16 phy_reg = 0;
-       u16 count = 0;
-
-       switch (hw->mac_type) {
-       case e1000_82543:
-               if (hw->media_type == e1000_media_type_copper) {
-                       /* Attempt to setup Loopback mode on Non-integrated PHY.
-                        * Some PHY registers get corrupted at random, so
-                        * attempt this 10 times.
-                        */
-                       while (e1000_nonintegrated_phy_loopback(adapter) &&
-                             count++ < 10);
-                       if (count < 11)
-                               return 0;
-               }
-               break;
-
-       case e1000_82544:
-       case e1000_82540:
-       case e1000_82545:
-       case e1000_82545_rev_3:
-       case e1000_82546:
-       case e1000_82546_rev_3:
-       case e1000_82541:
-       case e1000_82541_rev_2:
-       case e1000_82547:
-       case e1000_82547_rev_2:
-       case e1000_82571:
-       case e1000_82572:
-       case e1000_82573:
-       case e1000_80003es2lan:
-       case e1000_ich8lan:
-               return e1000_integrated_phy_loopback(adapter);
-               break;
-
-       default:
-               /* Default PHY loopback work is to read the MII
-                * control register and assert bit 14 (loopback mode).
-                */
-               e1000_read_phy_reg(hw, PHY_CTRL, &phy_reg);
-               phy_reg |= MII_CR_LOOPBACK;
-               e1000_write_phy_reg(hw, PHY_CTRL, phy_reg);
-               return 0;
-               break;
-       }
-
-       return 8;
-}
-
-static int e1000_setup_loopback_test(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       u32 rctl;
-
-       if (hw->media_type == e1000_media_type_fiber ||
-           hw->media_type == e1000_media_type_internal_serdes) {
-               switch (hw->mac_type) {
-               case e1000_82545:
-               case e1000_82546:
-               case e1000_82545_rev_3:
-               case e1000_82546_rev_3:
-                       return e1000_set_phy_loopback(adapter);
-                       break;
-               case e1000_82571:
-               case e1000_82572:
-#define E1000_SERDES_LB_ON 0x410
-                       e1000_set_phy_loopback(adapter);
-                       ew32(SCTL, E1000_SERDES_LB_ON);
-                       msleep(10);
-                       return 0;
-                       break;
-               default:
-                       rctl = er32(RCTL);
-                       rctl |= E1000_RCTL_LBM_TCVR;
-                       ew32(RCTL, rctl);
-                       return 0;
-               }
-       } else if (hw->media_type == e1000_media_type_copper)
-               return e1000_set_phy_loopback(adapter);
-
-       return 7;
-}
-
-static void e1000_loopback_cleanup(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       u32 rctl;
-       u16 phy_reg;
-
-       rctl = er32(RCTL);
-       rctl &= ~(E1000_RCTL_LBM_TCVR | E1000_RCTL_LBM_MAC);
-       ew32(RCTL, rctl);
-
-       switch (hw->mac_type) {
-       case e1000_82571:
-       case e1000_82572:
-               if (hw->media_type == e1000_media_type_fiber ||
-                   hw->media_type == e1000_media_type_internal_serdes) {
-#define E1000_SERDES_LB_OFF 0x400
-                       ew32(SCTL, E1000_SERDES_LB_OFF);
-                       msleep(10);
-                       break;
-               }
-               /* Fall Through */
-       case e1000_82545:
-       case e1000_82546:
-       case e1000_82545_rev_3:
-       case e1000_82546_rev_3:
-       default:
-               hw->autoneg = true;
-               if (hw->phy_type == e1000_phy_gg82563)
-                       e1000_write_phy_reg(hw,
-                                           GG82563_PHY_KMRN_MODE_CTRL,
-                                           0x180);
-               e1000_read_phy_reg(hw, PHY_CTRL, &phy_reg);
-               if (phy_reg & MII_CR_LOOPBACK) {
-                       phy_reg &= ~MII_CR_LOOPBACK;
-                       e1000_write_phy_reg(hw, PHY_CTRL, phy_reg);
-                       e1000_phy_reset(hw);
-               }
-               break;
-       }
-}
-
-static void e1000_create_lbtest_frame(struct sk_buff *skb,
-                                     unsigned int frame_size)
-{
-       memset(skb->data, 0xFF, frame_size);
-       frame_size &= ~1;
-       memset(&skb->data[frame_size / 2], 0xAA, frame_size / 2 - 1);
-       memset(&skb->data[frame_size / 2 + 10], 0xBE, 1);
-       memset(&skb->data[frame_size / 2 + 12], 0xAF, 1);
-}
-
-static int e1000_check_lbtest_frame(struct sk_buff *skb,
-                                   unsigned int frame_size)
-{
-       frame_size &= ~1;
-       if (*(skb->data + 3) == 0xFF) {
-               if ((*(skb->data + frame_size / 2 + 10) == 0xBE) &&
-                  (*(skb->data + frame_size / 2 + 12) == 0xAF)) {
-                       return 0;
-               }
-       }
-       return 13;
-}
-
-static int e1000_run_loopback_test(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       struct e1000_tx_ring *txdr = &adapter->test_tx_ring;
-       struct e1000_rx_ring *rxdr = &adapter->test_rx_ring;
-       struct pci_dev *pdev = adapter->pdev;
-       int i, j, k, l, lc, good_cnt, ret_val=0;
-       unsigned long time;
-
-       ew32(RDT, rxdr->count - 1);
-
-       /* Calculate the loop count based on the largest descriptor ring
-        * The idea is to wrap the largest ring a number of times using 64
-        * send/receive pairs during each loop
-        */
-
-       if (rxdr->count <= txdr->count)
-               lc = ((txdr->count / 64) * 2) + 1;
-       else
-               lc = ((rxdr->count / 64) * 2) + 1;
-
-       k = l = 0;
-       for (j = 0; j <= lc; j++) { /* loop count loop */
-               for (i = 0; i < 64; i++) { /* send the packets */
-                       e1000_create_lbtest_frame(txdr->buffer_info[i].skb,
-                                       1024);
-                       pci_dma_sync_single_for_device(pdev,
-                                       txdr->buffer_info[k].dma,
-                                       txdr->buffer_info[k].length,
-                                       PCI_DMA_TODEVICE);
-                       if (unlikely(++k == txdr->count)) k = 0;
-               }
-               ew32(TDT, k);
-               msleep(200);
-               time = jiffies; /* set the start time for the receive */
-               good_cnt = 0;
-               do { /* receive the sent packets */
-                       pci_dma_sync_single_for_cpu(pdev,
-                                       rxdr->buffer_info[l].dma,
-                                       rxdr->buffer_info[l].length,
-                                       PCI_DMA_FROMDEVICE);
-
-                       ret_val = e1000_check_lbtest_frame(
-                                       rxdr->buffer_info[l].skb,
-                                       1024);
-                       if (!ret_val)
-                               good_cnt++;
-                       if (unlikely(++l == rxdr->count)) l = 0;
-                       /* time + 20 msecs (200 msecs on 2.4) is more than
-                        * enough time to complete the receives, if it's
-                        * exceeded, break and error off
-                        */
-               } while (good_cnt < 64 && jiffies < (time + 20));
-               if (good_cnt != 64) {
-                       ret_val = 13; /* ret_val is the same as mis-compare */
-                       break;
-               }
-               if (jiffies >= (time + 2)) {
-                       ret_val = 14; /* error code for time out error */
-                       break;
-               }
-       } /* end loop count loop */
-       return ret_val;
-}
-
-static int e1000_loopback_test(struct e1000_adapter *adapter, u64 *data)
-{
-       struct e1000_hw *hw = &adapter->hw;
-
-       /* PHY loopback cannot be performed if SoL/IDER
-        * sessions are active */
-       if (e1000_check_phy_reset_block(hw)) {
-               DPRINTK(DRV, ERR, "Cannot do PHY loopback test "
-                       "when SoL/IDER is active.\n");
-               *data = 0;
-               goto out;
-       }
-
-       *data = e1000_setup_desc_rings(adapter);
-       if (*data)
-               goto out;
-       *data = e1000_setup_loopback_test(adapter);
-       if (*data)
-               goto err_loopback;
-       *data = e1000_run_loopback_test(adapter);
-       e1000_loopback_cleanup(adapter);
-
-err_loopback:
-       e1000_free_desc_rings(adapter);
-out:
-       return *data;
-}
-
-static int e1000_link_test(struct e1000_adapter *adapter, u64 *data)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       *data = 0;
-       if (hw->media_type == e1000_media_type_internal_serdes) {
-               int i = 0;
-               hw->serdes_link_down = true;
-
-               /* On some blade server designs, link establishment
-                * could take as long as 2-3 minutes */
-               do {
-                       e1000_check_for_link(hw);
-                       if (!hw->serdes_link_down)
-                               return *data;
-                       msleep(20);
-               } while (i++ < 3750);
-
-               *data = 1;
-       } else {
-               e1000_check_for_link(hw);
-               if (hw->autoneg)  /* if auto_neg is set wait for it */
-                       msleep(4000);
-
-               if (!(er32(STATUS) & E1000_STATUS_LU)) {
-                       *data = 1;
-               }
-       }
-       return *data;
-}
-
-static int e1000_get_sset_count(struct net_device *netdev, int sset)
-{
-       switch (sset) {
-       case ETH_SS_TEST:
-               return E1000_TEST_LEN;
-       case ETH_SS_STATS:
-               return E1000_STATS_LEN;
-       default:
-               return -EOPNOTSUPP;
-       }
-}
-
-static void e1000_diag_test(struct net_device *netdev,
-                           struct ethtool_test *eth_test, u64 *data)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       bool if_running = netif_running(netdev);
-
-       set_bit(__E1000_TESTING, &adapter->flags);
-       if (eth_test->flags == ETH_TEST_FL_OFFLINE) {
-               /* Offline tests */
-
-               /* save speed, duplex, autoneg settings */
-               u16 autoneg_advertised = hw->autoneg_advertised;
-               u8 forced_speed_duplex = hw->forced_speed_duplex;
-               u8 autoneg = hw->autoneg;
-
-               DPRINTK(HW, INFO, "offline testing starting\n");
-
-               /* Link test performed before hardware reset so autoneg doesn't
-                * interfere with test result */
-               if (e1000_link_test(adapter, &data[4]))
-                       eth_test->flags |= ETH_TEST_FL_FAILED;
-
-               if (if_running)
-                       /* indicate we're in test mode */
-                       dev_close(netdev);
-               else
-                       e1000_reset(adapter);
-
-               if (e1000_reg_test(adapter, &data[0]))
-                       eth_test->flags |= ETH_TEST_FL_FAILED;
-
-               e1000_reset(adapter);
-               if (e1000_eeprom_test(adapter, &data[1]))
-                       eth_test->flags |= ETH_TEST_FL_FAILED;
-
-               e1000_reset(adapter);
-               if (e1000_intr_test(adapter, &data[2]))
-                       eth_test->flags |= ETH_TEST_FL_FAILED;
-
-               e1000_reset(adapter);
-               /* make sure the phy is powered up */
-               e1000_power_up_phy(adapter);
-               if (e1000_loopback_test(adapter, &data[3]))
-                       eth_test->flags |= ETH_TEST_FL_FAILED;
-
-               /* restore speed, duplex, autoneg settings */
-               hw->autoneg_advertised = autoneg_advertised;
-               hw->forced_speed_duplex = forced_speed_duplex;
-               hw->autoneg = autoneg;
-
-               e1000_reset(adapter);
-               clear_bit(__E1000_TESTING, &adapter->flags);
-               if (if_running)
-                       dev_open(netdev);
-       } else {
-               DPRINTK(HW, INFO, "online testing starting\n");
-               /* Online tests */
-               if (e1000_link_test(adapter, &data[4]))
-                       eth_test->flags |= ETH_TEST_FL_FAILED;
-
-               /* Online tests aren't run; pass by default */
-               data[0] = 0;
-               data[1] = 0;
-               data[2] = 0;
-               data[3] = 0;
-
-               clear_bit(__E1000_TESTING, &adapter->flags);
-       }
-       msleep_interruptible(4 * 1000);
-}
-
-static int e1000_wol_exclusion(struct e1000_adapter *adapter,
-                              struct ethtool_wolinfo *wol)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       int retval = 1; /* fail by default */
-
-       switch (hw->device_id) {
-       case E1000_DEV_ID_82542:
-       case E1000_DEV_ID_82543GC_FIBER:
-       case E1000_DEV_ID_82543GC_COPPER:
-       case E1000_DEV_ID_82544EI_FIBER:
-       case E1000_DEV_ID_82546EB_QUAD_COPPER:
-       case E1000_DEV_ID_82545EM_FIBER:
-       case E1000_DEV_ID_82545EM_COPPER:
-       case E1000_DEV_ID_82546GB_QUAD_COPPER:
-       case E1000_DEV_ID_82546GB_PCIE:
-       case E1000_DEV_ID_82571EB_SERDES_QUAD:
-               /* these don't support WoL at all */
-               wol->supported = 0;
-               break;
-       case E1000_DEV_ID_82546EB_FIBER:
-       case E1000_DEV_ID_82546GB_FIBER:
-       case E1000_DEV_ID_82571EB_FIBER:
-       case E1000_DEV_ID_82571EB_SERDES:
-       case E1000_DEV_ID_82571EB_COPPER:
-               /* Wake events not supported on port B */
-               if (er32(STATUS) & E1000_STATUS_FUNC_1) {
-                       wol->supported = 0;
-                       break;
-               }
-               /* return success for non excluded adapter ports */
-               retval = 0;
-               break;
-       case E1000_DEV_ID_82571EB_QUAD_COPPER:
-       case E1000_DEV_ID_82571EB_QUAD_FIBER:
-       case E1000_DEV_ID_82571EB_QUAD_COPPER_LOWPROFILE:
-       case E1000_DEV_ID_82571PT_QUAD_COPPER:
-       case E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3:
-               /* quad port adapters only support WoL on port A */
-               if (!adapter->quad_port_a) {
-                       wol->supported = 0;
-                       break;
-               }
-               /* return success for non excluded adapter ports */
-               retval = 0;
-               break;
-       default:
-               /* dual port cards only support WoL on port A from now on
-                * unless it was enabled in the eeprom for port B
-                * so exclude FUNC_1 ports from having WoL enabled */
-               if (er32(STATUS) & E1000_STATUS_FUNC_1 &&
-                   !adapter->eeprom_wol) {
-                       wol->supported = 0;
-                       break;
-               }
-
-               retval = 0;
-       }
-
-       return retval;
-}
-
-static void e1000_get_wol(struct net_device *netdev,
-                         struct ethtool_wolinfo *wol)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-
-       wol->supported = WAKE_UCAST | WAKE_MCAST |
-                        WAKE_BCAST | WAKE_MAGIC;
-       wol->wolopts = 0;
-
-       /* this function will set ->supported = 0 and return 1 if wol is not
-        * supported by this hardware */
-       if (e1000_wol_exclusion(adapter, wol) ||
-           !device_can_wakeup(&adapter->pdev->dev))
-               return;
-
-       /* apply any specific unsupported masks here */
-       switch (hw->device_id) {
-       case E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3:
-               /* KSP3 does not suppport UCAST wake-ups */
-               wol->supported &= ~WAKE_UCAST;
-
-               if (adapter->wol & E1000_WUFC_EX)
-                       DPRINTK(DRV, ERR, "Interface does not support "
-                       "directed (unicast) frame wake-up packets\n");
-               break;
-       default:
-               break;
-       }
-
-       if (adapter->wol & E1000_WUFC_EX)
-               wol->wolopts |= WAKE_UCAST;
-       if (adapter->wol & E1000_WUFC_MC)
-               wol->wolopts |= WAKE_MCAST;
-       if (adapter->wol & E1000_WUFC_BC)
-               wol->wolopts |= WAKE_BCAST;
-       if (adapter->wol & E1000_WUFC_MAG)
-               wol->wolopts |= WAKE_MAGIC;
-
-       return;
-}
-
-static int e1000_set_wol(struct net_device *netdev, struct ethtool_wolinfo 
*wol)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-
-       if (wol->wolopts & (WAKE_PHY | WAKE_ARP | WAKE_MAGICSECURE))
-               return -EOPNOTSUPP;
-
-       if (e1000_wol_exclusion(adapter, wol) ||
-           !device_can_wakeup(&adapter->pdev->dev))
-               return wol->wolopts ? -EOPNOTSUPP : 0;
-
-       switch (hw->device_id) {
-       case E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3:
-               if (wol->wolopts & WAKE_UCAST) {
-                       DPRINTK(DRV, ERR, "Interface does not support "
-                       "directed (unicast) frame wake-up packets\n");
-                       return -EOPNOTSUPP;
-               }
-               break;
-       default:
-               break;
-       }
-
-       /* these settings will always override what we currently have */
-       adapter->wol = 0;
-
-       if (wol->wolopts & WAKE_UCAST)
-               adapter->wol |= E1000_WUFC_EX;
-       if (wol->wolopts & WAKE_MCAST)
-               adapter->wol |= E1000_WUFC_MC;
-       if (wol->wolopts & WAKE_BCAST)
-               adapter->wol |= E1000_WUFC_BC;
-       if (wol->wolopts & WAKE_MAGIC)
-               adapter->wol |= E1000_WUFC_MAG;
-
-       device_set_wakeup_enable(&adapter->pdev->dev, adapter->wol);
-
-       return 0;
-}
-
-/* toggle LED 4 times per second = 2 "blinks" per second */
-#define E1000_ID_INTERVAL      (HZ/4)
-
-/* bit defines for adapter->led_status */
-#define E1000_LED_ON           0
-
-static void e1000_led_blink_callback(unsigned long data)
-{
-       struct e1000_adapter *adapter = (struct e1000_adapter *) data;
-       struct e1000_hw *hw = &adapter->hw;
-
-       if (test_and_change_bit(E1000_LED_ON, &adapter->led_status))
-               e1000_led_off(hw);
-       else
-               e1000_led_on(hw);
-
-       mod_timer(&adapter->blink_timer, jiffies + E1000_ID_INTERVAL);
-}
-
-static int e1000_phys_id(struct net_device *netdev, u32 data)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-
-       if (!data)
-               data = INT_MAX;
-
-       if (hw->mac_type < e1000_82571) {
-               if (!adapter->blink_timer.function) {
-                       init_timer(&adapter->blink_timer);
-                       adapter->blink_timer.function = 
e1000_led_blink_callback;
-                       adapter->blink_timer.data = (unsigned long)adapter;
-               }
-               e1000_setup_led(hw);
-               mod_timer(&adapter->blink_timer, jiffies);
-               msleep_interruptible(data * 1000);
-               del_timer_sync(&adapter->blink_timer);
-       } else if (hw->phy_type == e1000_phy_ife) {
-               if (!adapter->blink_timer.function) {
-                       init_timer(&adapter->blink_timer);
-                       adapter->blink_timer.function = 
e1000_led_blink_callback;
-                       adapter->blink_timer.data = (unsigned long)adapter;
-               }
-               mod_timer(&adapter->blink_timer, jiffies);
-               msleep_interruptible(data * 1000);
-               del_timer_sync(&adapter->blink_timer);
-               e1000_write_phy_reg(&(adapter->hw), 
IFE_PHY_SPECIAL_CONTROL_LED, 0);
-       } else {
-               e1000_blink_led_start(hw);
-               msleep_interruptible(data * 1000);
-       }
-
-       e1000_led_off(hw);
-       clear_bit(E1000_LED_ON, &adapter->led_status);
-       e1000_cleanup_led(hw);
-
-       return 0;
-}
-
-static int e1000_nway_reset(struct net_device *netdev)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       if (netif_running(netdev))
-               e1000_reinit_locked(adapter);
-       return 0;
-}
-
-static void e1000_get_ethtool_stats(struct net_device *netdev,
-                                   struct ethtool_stats *stats, u64 *data)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       int i;
-
-       e1000_update_stats(adapter);
-       for (i = 0; i < E1000_GLOBAL_STATS_LEN; i++) {
-               char *p = (char *)adapter+e1000_gstrings_stats[i].stat_offset;
-               data[i] = (e1000_gstrings_stats[i].sizeof_stat ==
-                       sizeof(u64)) ? *(u64 *)p : *(u32 *)p;
-       }
-/*     BUG_ON(i != E1000_STATS_LEN); */
-}
-
-static void e1000_get_strings(struct net_device *netdev, u32 stringset,
-                             u8 *data)
-{
-       u8 *p = data;
-       int i;
-
-       switch (stringset) {
-       case ETH_SS_TEST:
-               memcpy(data, *e1000_gstrings_test,
-                       sizeof(e1000_gstrings_test));
-               break;
-       case ETH_SS_STATS:
-               for (i = 0; i < E1000_GLOBAL_STATS_LEN; i++) {
-                       memcpy(p, e1000_gstrings_stats[i].stat_string,
-                              ETH_GSTRING_LEN);
-                       p += ETH_GSTRING_LEN;
-               }
-/*             BUG_ON(p - data != E1000_STATS_LEN * ETH_GSTRING_LEN); */
-               break;
-       }
-}
-
-static const struct ethtool_ops e1000_ethtool_ops = {
-       .get_settings           = e1000_get_settings,
-       .set_settings           = e1000_set_settings,
-       .get_drvinfo            = e1000_get_drvinfo,
-       .get_regs_len           = e1000_get_regs_len,
-       .get_regs               = e1000_get_regs,
-       .get_wol                = e1000_get_wol,
-       .set_wol                = e1000_set_wol,
-       .get_msglevel           = e1000_get_msglevel,
-       .set_msglevel           = e1000_set_msglevel,
-       .nway_reset             = e1000_nway_reset,
-       .get_link               = ethtool_op_get_link,
-       .get_eeprom_len         = e1000_get_eeprom_len,
-       .get_eeprom             = e1000_get_eeprom,
-       .set_eeprom             = e1000_set_eeprom,
-       .get_ringparam          = e1000_get_ringparam,
-       .set_ringparam          = e1000_set_ringparam,
-       .get_pauseparam         = e1000_get_pauseparam,
-       .set_pauseparam         = e1000_set_pauseparam,
-       .get_rx_csum            = e1000_get_rx_csum,
-       .set_rx_csum            = e1000_set_rx_csum,
-       .get_tx_csum            = e1000_get_tx_csum,
-       .set_tx_csum            = e1000_set_tx_csum,
-       .set_sg                 = ethtool_op_set_sg,
-       .set_tso                = e1000_set_tso,
-       .self_test              = e1000_diag_test,
-       .get_strings            = e1000_get_strings,
-       .phys_id                = e1000_phys_id,
-       .get_ethtool_stats      = e1000_get_ethtool_stats,
-       .get_sset_count         = e1000_get_sset_count,
-};
-
-void e1000_set_ethtool_ops(struct net_device *netdev)
-{
-       SET_ETHTOOL_OPS(netdev, &e1000_ethtool_ops);
-}
diff --git a/dde_e1000/e1000_hw.c b/dde_e1000/e1000_hw.c
deleted file mode 100644
index e1a3fc1..0000000
--- a/dde_e1000/e1000_hw.c
+++ /dev/null
@@ -1,8878 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2006 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify it
-  under the terms and conditions of the GNU General Public License,
-  version 2, as published by the Free Software Foundation.
-
-  This program is distributed in the hope it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
-
-  You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-
-  The full GNU General Public License is included in this distribution in
-  the file called "COPYING".
-
-  Contact Information:
-  Linux NICS <address@hidden>
-  e1000-devel Mailing List <address@hidden>
-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-
-*******************************************************************************/
-
-/* e1000_hw.c
- * Shared functions for accessing and configuring the MAC
- */
-
-
-#include "e1000_hw.h"
-
-static s32 e1000_swfw_sync_acquire(struct e1000_hw *hw, u16 mask);
-static void e1000_swfw_sync_release(struct e1000_hw *hw, u16 mask);
-static s32 e1000_read_kmrn_reg(struct e1000_hw *hw, u32 reg_addr, u16 *data);
-static s32 e1000_write_kmrn_reg(struct e1000_hw *hw, u32 reg_addr, u16 data);
-static s32 e1000_get_software_semaphore(struct e1000_hw *hw);
-static void e1000_release_software_semaphore(struct e1000_hw *hw);
-
-static u8 e1000_arc_subsystem_valid(struct e1000_hw *hw);
-static s32 e1000_check_downshift(struct e1000_hw *hw);
-static s32 e1000_check_polarity(struct e1000_hw *hw,
-                               e1000_rev_polarity *polarity);
-static void e1000_clear_hw_cntrs(struct e1000_hw *hw);
-static void e1000_clear_vfta(struct e1000_hw *hw);
-static s32 e1000_commit_shadow_ram(struct e1000_hw *hw);
-static s32 e1000_config_dsp_after_link_change(struct e1000_hw *hw,
-                                             bool link_up);
-static s32 e1000_config_fc_after_link_up(struct e1000_hw *hw);
-static s32 e1000_detect_gig_phy(struct e1000_hw *hw);
-static s32 e1000_erase_ich8_4k_segment(struct e1000_hw *hw, u32 bank);
-static s32 e1000_get_auto_rd_done(struct e1000_hw *hw);
-static s32 e1000_get_cable_length(struct e1000_hw *hw, u16 *min_length,
-                                 u16 *max_length);
-static s32 e1000_get_hw_eeprom_semaphore(struct e1000_hw *hw);
-static s32 e1000_get_phy_cfg_done(struct e1000_hw *hw);
-static s32 e1000_get_software_flag(struct e1000_hw *hw);
-static s32 e1000_ich8_cycle_init(struct e1000_hw *hw);
-static s32 e1000_ich8_flash_cycle(struct e1000_hw *hw, u32 timeout);
-static s32 e1000_id_led_init(struct e1000_hw *hw);
-static s32 e1000_init_lcd_from_nvm_config_region(struct e1000_hw *hw,
-                                                u32 cnf_base_addr,
-                                                u32 cnf_size);
-static s32 e1000_init_lcd_from_nvm(struct e1000_hw *hw);
-static void e1000_init_rx_addrs(struct e1000_hw *hw);
-static void e1000_initialize_hardware_bits(struct e1000_hw *hw);
-static bool e1000_is_onboard_nvm_eeprom(struct e1000_hw *hw);
-static s32 e1000_kumeran_lock_loss_workaround(struct e1000_hw *hw);
-static s32 e1000_mng_enable_host_if(struct e1000_hw *hw);
-static s32 e1000_mng_host_if_write(struct e1000_hw *hw, u8 *buffer, u16 length,
-                                  u16 offset, u8 *sum);
-static s32 e1000_mng_write_cmd_header(struct e1000_hw* hw,
-                                     struct e1000_host_mng_command_header
-                                     *hdr);
-static s32 e1000_mng_write_commit(struct e1000_hw *hw);
-static s32 e1000_phy_ife_get_info(struct e1000_hw *hw,
-                                 struct e1000_phy_info *phy_info);
-static s32 e1000_phy_igp_get_info(struct e1000_hw *hw,
-                                 struct e1000_phy_info *phy_info);
-static s32 e1000_read_eeprom_eerd(struct e1000_hw *hw, u16 offset, u16 words,
-                                 u16 *data);
-static s32 e1000_write_eeprom_eewr(struct e1000_hw *hw, u16 offset, u16 words,
-                                  u16 *data);
-static s32 e1000_poll_eerd_eewr_done(struct e1000_hw *hw, int eerd);
-static s32 e1000_phy_m88_get_info(struct e1000_hw *hw,
-                                 struct e1000_phy_info *phy_info);
-static void e1000_put_hw_eeprom_semaphore(struct e1000_hw *hw);
-static s32 e1000_read_ich8_byte(struct e1000_hw *hw, u32 index, u8 *data);
-static s32 e1000_verify_write_ich8_byte(struct e1000_hw *hw, u32 index,
-                                       u8 byte);
-static s32 e1000_write_ich8_byte(struct e1000_hw *hw, u32 index, u8 byte);
-static s32 e1000_read_ich8_word(struct e1000_hw *hw, u32 index, u16 *data);
-static s32 e1000_read_ich8_data(struct e1000_hw *hw, u32 index, u32 size,
-                               u16 *data);
-static s32 e1000_write_ich8_data(struct e1000_hw *hw, u32 index, u32 size,
-                                u16 data);
-static s32 e1000_read_eeprom_ich8(struct e1000_hw *hw, u16 offset, u16 words,
-                                 u16 *data);
-static s32 e1000_write_eeprom_ich8(struct e1000_hw *hw, u16 offset, u16 words,
-                                  u16 *data);
-static void e1000_release_software_flag(struct e1000_hw *hw);
-static s32 e1000_set_d3_lplu_state(struct e1000_hw *hw, bool active);
-static s32 e1000_set_d0_lplu_state(struct e1000_hw *hw, bool active);
-static s32 e1000_set_pci_ex_no_snoop(struct e1000_hw *hw, u32 no_snoop);
-static void e1000_set_pci_express_master_disable(struct e1000_hw *hw);
-static s32 e1000_wait_autoneg(struct e1000_hw *hw);
-static void e1000_write_reg_io(struct e1000_hw *hw, u32 offset, u32 value);
-static s32 e1000_set_phy_type(struct e1000_hw *hw);
-static void e1000_phy_init_script(struct e1000_hw *hw);
-static s32 e1000_setup_copper_link(struct e1000_hw *hw);
-static s32 e1000_setup_fiber_serdes_link(struct e1000_hw *hw);
-static s32 e1000_adjust_serdes_amplitude(struct e1000_hw *hw);
-static s32 e1000_phy_force_speed_duplex(struct e1000_hw *hw);
-static s32 e1000_config_mac_to_phy(struct e1000_hw *hw);
-static void e1000_raise_mdi_clk(struct e1000_hw *hw, u32 *ctrl);
-static void e1000_lower_mdi_clk(struct e1000_hw *hw, u32 *ctrl);
-static void e1000_shift_out_mdi_bits(struct e1000_hw *hw, u32 data,
-                                    u16 count);
-static u16 e1000_shift_in_mdi_bits(struct e1000_hw *hw);
-static s32 e1000_phy_reset_dsp(struct e1000_hw *hw);
-static s32 e1000_write_eeprom_spi(struct e1000_hw *hw, u16 offset,
-                                      u16 words, u16 *data);
-static s32 e1000_write_eeprom_microwire(struct e1000_hw *hw, u16 offset,
-                                       u16 words, u16 *data);
-static s32 e1000_spi_eeprom_ready(struct e1000_hw *hw);
-static void e1000_raise_ee_clk(struct e1000_hw *hw, u32 *eecd);
-static void e1000_lower_ee_clk(struct e1000_hw *hw, u32 *eecd);
-static void e1000_shift_out_ee_bits(struct e1000_hw *hw, u16 data, u16 count);
-static s32 e1000_write_phy_reg_ex(struct e1000_hw *hw, u32 reg_addr,
-                                 u16 phy_data);
-static s32 e1000_read_phy_reg_ex(struct e1000_hw *hw,u32 reg_addr,
-                                u16 *phy_data);
-static u16 e1000_shift_in_ee_bits(struct e1000_hw *hw, u16 count);
-static s32 e1000_acquire_eeprom(struct e1000_hw *hw);
-static void e1000_release_eeprom(struct e1000_hw *hw);
-static void e1000_standby_eeprom(struct e1000_hw *hw);
-static s32 e1000_set_vco_speed(struct e1000_hw *hw);
-static s32 e1000_polarity_reversal_workaround(struct e1000_hw *hw);
-static s32 e1000_set_phy_mode(struct e1000_hw *hw);
-static s32 e1000_host_if_read_cookie(struct e1000_hw *hw, u8 *buffer);
-static u8 e1000_calculate_mng_checksum(char *buffer, u32 length);
-static s32 e1000_configure_kmrn_for_10_100(struct e1000_hw *hw, u16 duplex);
-static s32 e1000_configure_kmrn_for_1000(struct e1000_hw *hw);
-static s32 e1000_do_read_eeprom(struct e1000_hw *hw, u16 offset, u16 words, 
u16 *data);
-static s32 e1000_do_write_eeprom(struct e1000_hw *hw, u16 offset, u16 words, 
u16 *data);
-
-/* IGP cable length table */
-static const
-u16 e1000_igp_cable_length_table[IGP01E1000_AGC_LENGTH_TABLE_SIZE] =
-    { 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-      5, 10, 10, 10, 10, 10, 10, 10, 20, 20, 20, 20, 20, 25, 25, 25,
-      25, 25, 25, 25, 30, 30, 30, 30, 40, 40, 40, 40, 40, 40, 40, 40,
-      40, 50, 50, 50, 50, 50, 50, 50, 60, 60, 60, 60, 60, 60, 60, 60,
-      60, 70, 70, 70, 70, 70, 70, 80, 80, 80, 80, 80, 80, 90, 90, 90,
-      90, 90, 90, 90, 90, 90, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100,
-      100, 100, 100, 100, 110, 110, 110, 110, 110, 110, 110, 110, 110, 110, 
110, 110,
-      110, 110, 110, 110, 110, 110, 120, 120, 120, 120, 120, 120, 120, 120, 
120, 120};
-
-static const
-u16 e1000_igp_2_cable_length_table[IGP02E1000_AGC_LENGTH_TABLE_SIZE] =
-    { 0, 0, 0, 0, 0, 0, 0, 0, 3, 5, 8, 11, 13, 16, 18, 21,
-      0, 0, 0, 3, 6, 10, 13, 16, 19, 23, 26, 29, 32, 35, 38, 41,
-      6, 10, 14, 18, 22, 26, 30, 33, 37, 41, 44, 48, 51, 54, 58, 61,
-      21, 26, 31, 35, 40, 44, 49, 53, 57, 61, 65, 68, 72, 75, 79, 82,
-      40, 45, 51, 56, 61, 66, 70, 75, 79, 83, 87, 91, 94, 98, 101, 104,
-      60, 66, 72, 77, 82, 87, 92, 96, 100, 104, 108, 111, 114, 117, 119, 121,
-      83, 89, 95, 100, 105, 109, 113, 116, 119, 122, 124,
-      104, 109, 114, 118, 121, 124};
-
-static DEFINE_SPINLOCK(e1000_eeprom_lock);
-
-/******************************************************************************
- * Set the phy type member in the hw struct.
- *
- * hw - Struct containing variables accessed by shared code
- *****************************************************************************/
-static s32 e1000_set_phy_type(struct e1000_hw *hw)
-{
-    DEBUGFUNC("e1000_set_phy_type");
-
-    if (hw->mac_type == e1000_undefined)
-        return -E1000_ERR_PHY_TYPE;
-
-    switch (hw->phy_id) {
-    case M88E1000_E_PHY_ID:
-    case M88E1000_I_PHY_ID:
-    case M88E1011_I_PHY_ID:
-    case M88E1111_I_PHY_ID:
-        hw->phy_type = e1000_phy_m88;
-        break;
-    case IGP01E1000_I_PHY_ID:
-        if (hw->mac_type == e1000_82541 ||
-            hw->mac_type == e1000_82541_rev_2 ||
-            hw->mac_type == e1000_82547 ||
-            hw->mac_type == e1000_82547_rev_2) {
-            hw->phy_type = e1000_phy_igp;
-            break;
-        }
-    case IGP03E1000_E_PHY_ID:
-        hw->phy_type = e1000_phy_igp_3;
-        break;
-    case IFE_E_PHY_ID:
-    case IFE_PLUS_E_PHY_ID:
-    case IFE_C_E_PHY_ID:
-        hw->phy_type = e1000_phy_ife;
-        break;
-    case GG82563_E_PHY_ID:
-        if (hw->mac_type == e1000_80003es2lan) {
-            hw->phy_type = e1000_phy_gg82563;
-            break;
-        }
-        /* Fall Through */
-    default:
-        /* Should never have loaded on this device */
-        hw->phy_type = e1000_phy_undefined;
-        return -E1000_ERR_PHY_TYPE;
-    }
-
-    return E1000_SUCCESS;
-}
-
-/******************************************************************************
- * IGP phy init script - initializes the GbE PHY
- *
- * hw - Struct containing variables accessed by shared code
- *****************************************************************************/
-static void e1000_phy_init_script(struct e1000_hw *hw)
-{
-    u32 ret_val;
-    u16 phy_saved_data;
-
-    DEBUGFUNC("e1000_phy_init_script");
-
-    if (hw->phy_init_script) {
-        msleep(20);
-
-        /* Save off the current value of register 0x2F5B to be restored at
-         * the end of this routine. */
-        ret_val = e1000_read_phy_reg(hw, 0x2F5B, &phy_saved_data);
-
-        /* Disabled the PHY transmitter */
-        e1000_write_phy_reg(hw, 0x2F5B, 0x0003);
-
-        msleep(20);
-
-        e1000_write_phy_reg(hw,0x0000,0x0140);
-
-        msleep(5);
-
-        switch (hw->mac_type) {
-        case e1000_82541:
-        case e1000_82547:
-            e1000_write_phy_reg(hw, 0x1F95, 0x0001);
-
-            e1000_write_phy_reg(hw, 0x1F71, 0xBD21);
-
-            e1000_write_phy_reg(hw, 0x1F79, 0x0018);
-
-            e1000_write_phy_reg(hw, 0x1F30, 0x1600);
-
-            e1000_write_phy_reg(hw, 0x1F31, 0x0014);
-
-            e1000_write_phy_reg(hw, 0x1F32, 0x161C);
-
-            e1000_write_phy_reg(hw, 0x1F94, 0x0003);
-
-            e1000_write_phy_reg(hw, 0x1F96, 0x003F);
-
-            e1000_write_phy_reg(hw, 0x2010, 0x0008);
-            break;
-
-        case e1000_82541_rev_2:
-        case e1000_82547_rev_2:
-            e1000_write_phy_reg(hw, 0x1F73, 0x0099);
-            break;
-        default:
-            break;
-        }
-
-        e1000_write_phy_reg(hw, 0x0000, 0x3300);
-
-        msleep(20);
-
-        /* Now enable the transmitter */
-        e1000_write_phy_reg(hw, 0x2F5B, phy_saved_data);
-
-        if (hw->mac_type == e1000_82547) {
-            u16 fused, fine, coarse;
-
-            /* Move to analog registers page */
-            e1000_read_phy_reg(hw, IGP01E1000_ANALOG_SPARE_FUSE_STATUS, 
&fused);
-
-            if (!(fused & IGP01E1000_ANALOG_SPARE_FUSE_ENABLED)) {
-                e1000_read_phy_reg(hw, IGP01E1000_ANALOG_FUSE_STATUS, &fused);
-
-                fine = fused & IGP01E1000_ANALOG_FUSE_FINE_MASK;
-                coarse = fused & IGP01E1000_ANALOG_FUSE_COARSE_MASK;
-
-                if (coarse > IGP01E1000_ANALOG_FUSE_COARSE_THRESH) {
-                    coarse -= IGP01E1000_ANALOG_FUSE_COARSE_10;
-                    fine -= IGP01E1000_ANALOG_FUSE_FINE_1;
-                } else if (coarse == IGP01E1000_ANALOG_FUSE_COARSE_THRESH)
-                    fine -= IGP01E1000_ANALOG_FUSE_FINE_10;
-
-                fused = (fused & IGP01E1000_ANALOG_FUSE_POLY_MASK) |
-                        (fine & IGP01E1000_ANALOG_FUSE_FINE_MASK) |
-                        (coarse & IGP01E1000_ANALOG_FUSE_COARSE_MASK);
-
-                e1000_write_phy_reg(hw, IGP01E1000_ANALOG_FUSE_CONTROL, fused);
-                e1000_write_phy_reg(hw, IGP01E1000_ANALOG_FUSE_BYPASS,
-                                    IGP01E1000_ANALOG_FUSE_ENABLE_SW_CONTROL);
-            }
-        }
-    }
-}
-
-/******************************************************************************
- * Set the mac type member in the hw struct.
- *
- * hw - Struct containing variables accessed by shared code
- *****************************************************************************/
-s32 e1000_set_mac_type(struct e1000_hw *hw)
-{
-       DEBUGFUNC("e1000_set_mac_type");
-
-       switch (hw->device_id) {
-       case E1000_DEV_ID_82542:
-               switch (hw->revision_id) {
-               case E1000_82542_2_0_REV_ID:
-                       hw->mac_type = e1000_82542_rev2_0;
-                       break;
-               case E1000_82542_2_1_REV_ID:
-                       hw->mac_type = e1000_82542_rev2_1;
-                       break;
-               default:
-                       /* Invalid 82542 revision ID */
-                       return -E1000_ERR_MAC_TYPE;
-               }
-               break;
-       case E1000_DEV_ID_82543GC_FIBER:
-       case E1000_DEV_ID_82543GC_COPPER:
-               hw->mac_type = e1000_82543;
-               break;
-       case E1000_DEV_ID_82544EI_COPPER:
-       case E1000_DEV_ID_82544EI_FIBER:
-       case E1000_DEV_ID_82544GC_COPPER:
-       case E1000_DEV_ID_82544GC_LOM:
-               hw->mac_type = e1000_82544;
-               break;
-       case E1000_DEV_ID_82540EM:
-       case E1000_DEV_ID_82540EM_LOM:
-       case E1000_DEV_ID_82540EP:
-       case E1000_DEV_ID_82540EP_LOM:
-       case E1000_DEV_ID_82540EP_LP:
-               hw->mac_type = e1000_82540;
-               break;
-       case E1000_DEV_ID_82545EM_COPPER:
-       case E1000_DEV_ID_82545EM_FIBER:
-               hw->mac_type = e1000_82545;
-               break;
-       case E1000_DEV_ID_82545GM_COPPER:
-       case E1000_DEV_ID_82545GM_FIBER:
-       case E1000_DEV_ID_82545GM_SERDES:
-               hw->mac_type = e1000_82545_rev_3;
-               break;
-       case E1000_DEV_ID_82546EB_COPPER:
-       case E1000_DEV_ID_82546EB_FIBER:
-       case E1000_DEV_ID_82546EB_QUAD_COPPER:
-               hw->mac_type = e1000_82546;
-               break;
-       case E1000_DEV_ID_82546GB_COPPER:
-       case E1000_DEV_ID_82546GB_FIBER:
-       case E1000_DEV_ID_82546GB_SERDES:
-       case E1000_DEV_ID_82546GB_PCIE:
-       case E1000_DEV_ID_82546GB_QUAD_COPPER:
-       case E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3:
-               hw->mac_type = e1000_82546_rev_3;
-               break;
-       case E1000_DEV_ID_82541EI:
-       case E1000_DEV_ID_82541EI_MOBILE:
-       case E1000_DEV_ID_82541ER_LOM:
-               hw->mac_type = e1000_82541;
-               break;
-       case E1000_DEV_ID_82541ER:
-       case E1000_DEV_ID_82541GI:
-       case E1000_DEV_ID_82541GI_LF:
-       case E1000_DEV_ID_82541GI_MOBILE:
-               hw->mac_type = e1000_82541_rev_2;
-               break;
-       case E1000_DEV_ID_82547EI:
-       case E1000_DEV_ID_82547EI_MOBILE:
-               hw->mac_type = e1000_82547;
-               break;
-       case E1000_DEV_ID_82547GI:
-               hw->mac_type = e1000_82547_rev_2;
-               break;
-       case E1000_DEV_ID_82571EB_COPPER:
-       case E1000_DEV_ID_82571EB_FIBER:
-       case E1000_DEV_ID_82571EB_SERDES:
-       case E1000_DEV_ID_82571EB_SERDES_DUAL:
-       case E1000_DEV_ID_82571EB_SERDES_QUAD:
-       case E1000_DEV_ID_82571EB_QUAD_COPPER:
-       case E1000_DEV_ID_82571PT_QUAD_COPPER:
-       case E1000_DEV_ID_82571EB_QUAD_FIBER:
-       case E1000_DEV_ID_82571EB_QUAD_COPPER_LOWPROFILE:
-               hw->mac_type = e1000_82571;
-               break;
-       case E1000_DEV_ID_82572EI_COPPER:
-       case E1000_DEV_ID_82572EI_FIBER:
-       case E1000_DEV_ID_82572EI_SERDES:
-       case E1000_DEV_ID_82572EI:
-               hw->mac_type = e1000_82572;
-               break;
-       case E1000_DEV_ID_82573E:
-       case E1000_DEV_ID_82573E_IAMT:
-       case E1000_DEV_ID_82573L:
-               hw->mac_type = e1000_82573;
-               break;
-       case E1000_DEV_ID_80003ES2LAN_COPPER_SPT:
-       case E1000_DEV_ID_80003ES2LAN_SERDES_SPT:
-       case E1000_DEV_ID_80003ES2LAN_COPPER_DPT:
-       case E1000_DEV_ID_80003ES2LAN_SERDES_DPT:
-               hw->mac_type = e1000_80003es2lan;
-               break;
-       case E1000_DEV_ID_ICH8_IGP_M_AMT:
-       case E1000_DEV_ID_ICH8_IGP_AMT:
-       case E1000_DEV_ID_ICH8_IGP_C:
-       case E1000_DEV_ID_ICH8_IFE:
-       case E1000_DEV_ID_ICH8_IFE_GT:
-       case E1000_DEV_ID_ICH8_IFE_G:
-       case E1000_DEV_ID_ICH8_IGP_M:
-               hw->mac_type = e1000_ich8lan;
-               break;
-       default:
-               /* Should never have loaded on this device */
-               return -E1000_ERR_MAC_TYPE;
-       }
-
-       switch (hw->mac_type) {
-       case e1000_ich8lan:
-               hw->swfwhw_semaphore_present = true;
-               hw->asf_firmware_present = true;
-               break;
-       case e1000_80003es2lan:
-               hw->swfw_sync_present = true;
-               /* fall through */
-       case e1000_82571:
-       case e1000_82572:
-       case e1000_82573:
-               hw->eeprom_semaphore_present = true;
-               /* fall through */
-       case e1000_82541:
-       case e1000_82547:
-       case e1000_82541_rev_2:
-       case e1000_82547_rev_2:
-               hw->asf_firmware_present = true;
-               break;
-       default:
-               break;
-       }
-
-       /* The 82543 chip does not count tx_carrier_errors properly in
-        * FD mode
-        */
-       if (hw->mac_type == e1000_82543)
-               hw->bad_tx_carr_stats_fd = true;
-
-       /* capable of receiving management packets to the host */
-       if (hw->mac_type >= e1000_82571)
-               hw->has_manc2h = true;
-
-       /* In rare occasions, ESB2 systems would end up started without
-        * the RX unit being turned on.
-        */
-       if (hw->mac_type == e1000_80003es2lan)
-               hw->rx_needs_kicking = true;
-
-       if (hw->mac_type > e1000_82544)
-               hw->has_smbus = true;
-
-       return E1000_SUCCESS;
-}
-
-/*****************************************************************************
- * Set media type and TBI compatibility.
- *
- * hw - Struct containing variables accessed by shared code
- * **************************************************************************/
-void e1000_set_media_type(struct e1000_hw *hw)
-{
-    u32 status;
-
-    DEBUGFUNC("e1000_set_media_type");
-
-    if (hw->mac_type != e1000_82543) {
-        /* tbi_compatibility is only valid on 82543 */
-        hw->tbi_compatibility_en = false;
-    }
-
-    switch (hw->device_id) {
-    case E1000_DEV_ID_82545GM_SERDES:
-    case E1000_DEV_ID_82546GB_SERDES:
-    case E1000_DEV_ID_82571EB_SERDES:
-    case E1000_DEV_ID_82571EB_SERDES_DUAL:
-    case E1000_DEV_ID_82571EB_SERDES_QUAD:
-    case E1000_DEV_ID_82572EI_SERDES:
-    case E1000_DEV_ID_80003ES2LAN_SERDES_DPT:
-        hw->media_type = e1000_media_type_internal_serdes;
-        break;
-    default:
-        switch (hw->mac_type) {
-        case e1000_82542_rev2_0:
-        case e1000_82542_rev2_1:
-            hw->media_type = e1000_media_type_fiber;
-            break;
-        case e1000_ich8lan:
-        case e1000_82573:
-            /* The STATUS_TBIMODE bit is reserved or reused for the this
-             * device.
-             */
-            hw->media_type = e1000_media_type_copper;
-            break;
-        default:
-            status = er32(STATUS);
-            if (status & E1000_STATUS_TBIMODE) {
-                hw->media_type = e1000_media_type_fiber;
-                /* tbi_compatibility not valid on fiber */
-                hw->tbi_compatibility_en = false;
-            } else {
-                hw->media_type = e1000_media_type_copper;
-            }
-            break;
-        }
-    }
-}
-
-/******************************************************************************
- * Reset the transmit and receive units; mask and clear all interrupts.
- *
- * hw - Struct containing variables accessed by shared code
- *****************************************************************************/
-s32 e1000_reset_hw(struct e1000_hw *hw)
-{
-    u32 ctrl;
-    u32 ctrl_ext;
-    u32 icr;
-    u32 manc;
-    u32 led_ctrl;
-    u32 timeout;
-    u32 extcnf_ctrl;
-    s32 ret_val;
-
-    DEBUGFUNC("e1000_reset_hw");
-
-    /* For 82542 (rev 2.0), disable MWI before issuing a device reset */
-    if (hw->mac_type == e1000_82542_rev2_0) {
-        DEBUGOUT("Disabling MWI on 82542 rev 2.0\n");
-        e1000_pci_clear_mwi(hw);
-    }
-
-    if (hw->bus_type == e1000_bus_type_pci_express) {
-        /* Prevent the PCI-E bus from sticking if there is no TLP connection
-         * on the last TLP read/write transaction when MAC is reset.
-         */
-        if (e1000_disable_pciex_master(hw) != E1000_SUCCESS) {
-            DEBUGOUT("PCI-E Master disable polling has failed.\n");
-        }
-    }
-
-    /* Clear interrupt mask to stop board from generating interrupts */
-    DEBUGOUT("Masking off all interrupts\n");
-    ew32(IMC, 0xffffffff);
-
-    /* Disable the Transmit and Receive units.  Then delay to allow
-     * any pending transactions to complete before we hit the MAC with
-     * the global reset.
-     */
-    ew32(RCTL, 0);
-    ew32(TCTL, E1000_TCTL_PSP);
-    E1000_WRITE_FLUSH();
-
-    /* The tbi_compatibility_on Flag must be cleared when Rctl is cleared. */
-    hw->tbi_compatibility_on = false;
-
-    /* Delay to allow any outstanding PCI transactions to complete before
-     * resetting the device
-     */
-    msleep(10);
-
-    ctrl = er32(CTRL);
-
-    /* Must reset the PHY before resetting the MAC */
-    if ((hw->mac_type == e1000_82541) || (hw->mac_type == e1000_82547)) {
-        ew32(CTRL, (ctrl | E1000_CTRL_PHY_RST));
-        msleep(5);
-    }
-
-    /* Must acquire the MDIO ownership before MAC reset.
-     * Ownership defaults to firmware after a reset. */
-    if (hw->mac_type == e1000_82573) {
-        timeout = 10;
-
-        extcnf_ctrl = er32(EXTCNF_CTRL);
-        extcnf_ctrl |= E1000_EXTCNF_CTRL_MDIO_SW_OWNERSHIP;
-
-        do {
-            ew32(EXTCNF_CTRL, extcnf_ctrl);
-            extcnf_ctrl = er32(EXTCNF_CTRL);
-
-            if (extcnf_ctrl & E1000_EXTCNF_CTRL_MDIO_SW_OWNERSHIP)
-                break;
-            else
-                extcnf_ctrl |= E1000_EXTCNF_CTRL_MDIO_SW_OWNERSHIP;
-
-            msleep(2);
-            timeout--;
-        } while (timeout);
-    }
-
-    /* Workaround for ICH8 bit corruption issue in FIFO memory */
-    if (hw->mac_type == e1000_ich8lan) {
-        /* Set Tx and Rx buffer allocation to 8k apiece. */
-        ew32(PBA, E1000_PBA_8K);
-        /* Set Packet Buffer Size to 16k. */
-        ew32(PBS, E1000_PBS_16K);
-    }
-
-    /* Issue a global reset to the MAC.  This will reset the chip's
-     * transmit, receive, DMA, and link units.  It will not effect
-     * the current PCI configuration.  The global reset bit is self-
-     * clearing, and should clear within a microsecond.
-     */
-    DEBUGOUT("Issuing a global reset to MAC\n");
-
-    switch (hw->mac_type) {
-        case e1000_82544:
-        case e1000_82540:
-        case e1000_82545:
-        case e1000_82546:
-        case e1000_82541:
-        case e1000_82541_rev_2:
-            /* These controllers can't ack the 64-bit write when issuing the
-             * reset, so use IO-mapping as a workaround to issue the reset */
-            E1000_WRITE_REG_IO(hw, CTRL, (ctrl | E1000_CTRL_RST));
-            break;
-        case e1000_82545_rev_3:
-        case e1000_82546_rev_3:
-            /* Reset is performed on a shadow of the control register */
-            ew32(CTRL_DUP, (ctrl | E1000_CTRL_RST));
-            break;
-        case e1000_ich8lan:
-            if (!hw->phy_reset_disable &&
-                e1000_check_phy_reset_block(hw) == E1000_SUCCESS) {
-                /* e1000_ich8lan PHY HW reset requires MAC CORE reset
-                 * at the same time to make sure the interface between
-                 * MAC and the external PHY is reset.
-                 */
-                ctrl |= E1000_CTRL_PHY_RST;
-            }
-
-            e1000_get_software_flag(hw);
-            ew32(CTRL, (ctrl | E1000_CTRL_RST));
-            msleep(5);
-            break;
-        default:
-            ew32(CTRL, (ctrl | E1000_CTRL_RST));
-            break;
-    }
-
-    /* After MAC reset, force reload of EEPROM to restore power-on settings to
-     * device.  Later controllers reload the EEPROM automatically, so just wait
-     * for reload to complete.
-     */
-    switch (hw->mac_type) {
-        case e1000_82542_rev2_0:
-        case e1000_82542_rev2_1:
-        case e1000_82543:
-        case e1000_82544:
-            /* Wait for reset to complete */
-            udelay(10);
-            ctrl_ext = er32(CTRL_EXT);
-            ctrl_ext |= E1000_CTRL_EXT_EE_RST;
-            ew32(CTRL_EXT, ctrl_ext);
-            E1000_WRITE_FLUSH();
-            /* Wait for EEPROM reload */
-            msleep(2);
-            break;
-        case e1000_82541:
-        case e1000_82541_rev_2:
-        case e1000_82547:
-        case e1000_82547_rev_2:
-            /* Wait for EEPROM reload */
-            msleep(20);
-            break;
-        case e1000_82573:
-            if (!e1000_is_onboard_nvm_eeprom(hw)) {
-                udelay(10);
-                ctrl_ext = er32(CTRL_EXT);
-                ctrl_ext |= E1000_CTRL_EXT_EE_RST;
-                ew32(CTRL_EXT, ctrl_ext);
-                E1000_WRITE_FLUSH();
-            }
-            /* fall through */
-        default:
-            /* Auto read done will delay 5ms or poll based on mac type */
-            ret_val = e1000_get_auto_rd_done(hw);
-            if (ret_val)
-                return ret_val;
-            break;
-    }
-
-    /* Disable HW ARPs on ASF enabled adapters */
-    if (hw->mac_type >= e1000_82540 && hw->mac_type <= e1000_82547_rev_2) {
-        manc = er32(MANC);
-        manc &= ~(E1000_MANC_ARP_EN);
-        ew32(MANC, manc);
-    }
-
-    if ((hw->mac_type == e1000_82541) || (hw->mac_type == e1000_82547)) {
-        e1000_phy_init_script(hw);
-
-        /* Configure activity LED after PHY reset */
-        led_ctrl = er32(LEDCTL);
-        led_ctrl &= IGP_ACTIVITY_LED_MASK;
-        led_ctrl |= (IGP_ACTIVITY_LED_ENABLE | IGP_LED3_MODE);
-        ew32(LEDCTL, led_ctrl);
-    }
-
-    /* Clear interrupt mask to stop board from generating interrupts */
-    DEBUGOUT("Masking off all interrupts\n");
-    ew32(IMC, 0xffffffff);
-
-    /* Clear any pending interrupt events. */
-    icr = er32(ICR);
-
-    /* If MWI was previously enabled, reenable it. */
-    if (hw->mac_type == e1000_82542_rev2_0) {
-        if (hw->pci_cmd_word & PCI_COMMAND_INVALIDATE)
-            e1000_pci_set_mwi(hw);
-    }
-
-    if (hw->mac_type == e1000_ich8lan) {
-        u32 kab = er32(KABGTXD);
-        kab |= E1000_KABGTXD_BGSQLBIAS;
-        ew32(KABGTXD, kab);
-    }
-
-    return E1000_SUCCESS;
-}
-
-/******************************************************************************
- *
- * Initialize a number of hardware-dependent bits
- *
- * hw: Struct containing variables accessed by shared code
- *
- * This function contains hardware limitation workarounds for PCI-E adapters
- *
- *****************************************************************************/
-static void e1000_initialize_hardware_bits(struct e1000_hw *hw)
-{
-    if ((hw->mac_type >= e1000_82571) && (!hw->initialize_hw_bits_disable)) {
-        /* Settings common to all PCI-express silicon */
-        u32 reg_ctrl, reg_ctrl_ext;
-        u32 reg_tarc0, reg_tarc1;
-        u32 reg_tctl;
-        u32 reg_txdctl, reg_txdctl1;
-
-        /* link autonegotiation/sync workarounds */
-        reg_tarc0 = er32(TARC0);
-        reg_tarc0 &= ~((1 << 30)|(1 << 29)|(1 << 28)|(1 << 27));
-
-        /* Enable not-done TX descriptor counting */
-        reg_txdctl = er32(TXDCTL);
-        reg_txdctl |= E1000_TXDCTL_COUNT_DESC;
-        ew32(TXDCTL, reg_txdctl);
-        reg_txdctl1 = er32(TXDCTL1);
-        reg_txdctl1 |= E1000_TXDCTL_COUNT_DESC;
-        ew32(TXDCTL1, reg_txdctl1);
-
-        switch (hw->mac_type) {
-            case e1000_82571:
-            case e1000_82572:
-                /* Clear PHY TX compatible mode bits */
-                reg_tarc1 = er32(TARC1);
-                reg_tarc1 &= ~((1 << 30)|(1 << 29));
-
-                /* link autonegotiation/sync workarounds */
-                reg_tarc0 |= ((1 << 26)|(1 << 25)|(1 << 24)|(1 << 23));
-
-                /* TX ring control fixes */
-                reg_tarc1 |= ((1 << 26)|(1 << 25)|(1 << 24));
-
-                /* Multiple read bit is reversed polarity */
-                reg_tctl = er32(TCTL);
-                if (reg_tctl & E1000_TCTL_MULR)
-                    reg_tarc1 &= ~(1 << 28);
-                else
-                    reg_tarc1 |= (1 << 28);
-
-                ew32(TARC1, reg_tarc1);
-                break;
-            case e1000_82573:
-                reg_ctrl_ext = er32(CTRL_EXT);
-                reg_ctrl_ext &= ~(1 << 23);
-                reg_ctrl_ext |= (1 << 22);
-
-                /* TX byte count fix */
-                reg_ctrl = er32(CTRL);
-                reg_ctrl &= ~(1 << 29);
-
-                ew32(CTRL_EXT, reg_ctrl_ext);
-                ew32(CTRL, reg_ctrl);
-                break;
-            case e1000_80003es2lan:
-                /* improve small packet performace for fiber/serdes */
-                if ((hw->media_type == e1000_media_type_fiber) ||
-                    (hw->media_type == e1000_media_type_internal_serdes)) {
-                    reg_tarc0 &= ~(1 << 20);
-                }
-
-                /* Multiple read bit is reversed polarity */
-                reg_tctl = er32(TCTL);
-                reg_tarc1 = er32(TARC1);
-                if (reg_tctl & E1000_TCTL_MULR)
-                    reg_tarc1 &= ~(1 << 28);
-                else
-                    reg_tarc1 |= (1 << 28);
-
-                ew32(TARC1, reg_tarc1);
-                break;
-            case e1000_ich8lan:
-                /* Reduce concurrent DMA requests to 3 from 4 */
-                if ((hw->revision_id < 3) ||
-                    ((hw->device_id != E1000_DEV_ID_ICH8_IGP_M_AMT) &&
-                     (hw->device_id != E1000_DEV_ID_ICH8_IGP_M)))
-                    reg_tarc0 |= ((1 << 29)|(1 << 28));
-
-                reg_ctrl_ext = er32(CTRL_EXT);
-                reg_ctrl_ext |= (1 << 22);
-                ew32(CTRL_EXT, reg_ctrl_ext);
-
-                /* workaround TX hang with TSO=on */
-                reg_tarc0 |= ((1 << 27)|(1 << 26)|(1 << 24)|(1 << 23));
-
-                /* Multiple read bit is reversed polarity */
-                reg_tctl = er32(TCTL);
-                reg_tarc1 = er32(TARC1);
-                if (reg_tctl & E1000_TCTL_MULR)
-                    reg_tarc1 &= ~(1 << 28);
-                else
-                    reg_tarc1 |= (1 << 28);
-
-                /* workaround TX hang with TSO=on */
-                reg_tarc1 |= ((1 << 30)|(1 << 26)|(1 << 24));
-
-                ew32(TARC1, reg_tarc1);
-                break;
-            default:
-                break;
-        }
-
-        ew32(TARC0, reg_tarc0);
-    }
-}
-
-/******************************************************************************
- * Performs basic configuration of the adapter.
- *
- * hw - Struct containing variables accessed by shared code
- *
- * Assumes that the controller has previously been reset and is in a
- * post-reset uninitialized state. Initializes the receive address registers,
- * multicast table, and VLAN filter table. Calls routines to setup link
- * configuration and flow control settings. Clears all on-chip counters. Leaves
- * the transmit and receive units disabled and uninitialized.
- *****************************************************************************/
-s32 e1000_init_hw(struct e1000_hw *hw)
-{
-    u32 ctrl;
-    u32 i;
-    s32 ret_val;
-    u32 mta_size;
-    u32 reg_data;
-    u32 ctrl_ext;
-
-    DEBUGFUNC("e1000_init_hw");
-
-    /* force full DMA clock frequency for 10/100 on ICH8 A0-B0 */
-    if ((hw->mac_type == e1000_ich8lan) &&
-        ((hw->revision_id < 3) ||
-         ((hw->device_id != E1000_DEV_ID_ICH8_IGP_M_AMT) &&
-          (hw->device_id != E1000_DEV_ID_ICH8_IGP_M)))) {
-            reg_data = er32(STATUS);
-            reg_data &= ~0x80000000;
-            ew32(STATUS, reg_data);
-    }
-
-    /* Initialize Identification LED */
-    ret_val = e1000_id_led_init(hw);
-    if (ret_val) {
-        DEBUGOUT("Error Initializing Identification LED\n");
-        return ret_val;
-    }
-
-    /* Set the media type and TBI compatibility */
-    e1000_set_media_type(hw);
-
-    /* Must be called after e1000_set_media_type because media_type is used */
-    e1000_initialize_hardware_bits(hw);
-
-    /* Disabling VLAN filtering. */
-    DEBUGOUT("Initializing the IEEE VLAN\n");
-    /* VET hardcoded to standard value and VFTA removed in ICH8 LAN */
-    if (hw->mac_type != e1000_ich8lan) {
-        if (hw->mac_type < e1000_82545_rev_3)
-            ew32(VET, 0);
-        e1000_clear_vfta(hw);
-    }
-
-    /* For 82542 (rev 2.0), disable MWI and put the receiver into reset */
-    if (hw->mac_type == e1000_82542_rev2_0) {
-        DEBUGOUT("Disabling MWI on 82542 rev 2.0\n");
-        e1000_pci_clear_mwi(hw);
-        ew32(RCTL, E1000_RCTL_RST);
-        E1000_WRITE_FLUSH();
-        msleep(5);
-    }
-
-    /* Setup the receive address. This involves initializing all of the Receive
-     * Address Registers (RARs 0 - 15).
-     */
-    e1000_init_rx_addrs(hw);
-
-    /* For 82542 (rev 2.0), take the receiver out of reset and enable MWI */
-    if (hw->mac_type == e1000_82542_rev2_0) {
-        ew32(RCTL, 0);
-        E1000_WRITE_FLUSH();
-        msleep(1);
-        if (hw->pci_cmd_word & PCI_COMMAND_INVALIDATE)
-            e1000_pci_set_mwi(hw);
-    }
-
-    /* Zero out the Multicast HASH table */
-    DEBUGOUT("Zeroing the MTA\n");
-    mta_size = E1000_MC_TBL_SIZE;
-    if (hw->mac_type == e1000_ich8lan)
-        mta_size = E1000_MC_TBL_SIZE_ICH8LAN;
-    for (i = 0; i < mta_size; i++) {
-        E1000_WRITE_REG_ARRAY(hw, MTA, i, 0);
-        /* use write flush to prevent Memory Write Block (MWB) from
-         * occuring when accessing our register space */
-        E1000_WRITE_FLUSH();
-    }
-
-    /* Set the PCI priority bit correctly in the CTRL register.  This
-     * determines if the adapter gives priority to receives, or if it
-     * gives equal priority to transmits and receives.  Valid only on
-     * 82542 and 82543 silicon.
-     */
-    if (hw->dma_fairness && hw->mac_type <= e1000_82543) {
-        ctrl = er32(CTRL);
-        ew32(CTRL, ctrl | E1000_CTRL_PRIOR);
-    }
-
-    switch (hw->mac_type) {
-    case e1000_82545_rev_3:
-    case e1000_82546_rev_3:
-        break;
-    default:
-        /* Workaround for PCI-X problem when BIOS sets MMRBC incorrectly. */
-       if (hw->bus_type == e1000_bus_type_pcix && e1000_pcix_get_mmrbc(hw) > 
2048)
-               e1000_pcix_set_mmrbc(hw, 2048);
-       break;
-    }
-
-    /* More time needed for PHY to initialize */
-    if (hw->mac_type == e1000_ich8lan)
-        msleep(15);
-
-    /* Call a subroutine to configure the link and setup flow control. */
-    ret_val = e1000_setup_link(hw);
-
-    /* Set the transmit descriptor write-back policy */
-    if (hw->mac_type > e1000_82544) {
-        ctrl = er32(TXDCTL);
-        ctrl = (ctrl & ~E1000_TXDCTL_WTHRESH) | E1000_TXDCTL_FULL_TX_DESC_WB;
-        ew32(TXDCTL, ctrl);
-    }
-
-    if (hw->mac_type == e1000_82573) {
-        e1000_enable_tx_pkt_filtering(hw);
-    }
-
-    switch (hw->mac_type) {
-    default:
-        break;
-    case e1000_80003es2lan:
-        /* Enable retransmit on late collisions */
-        reg_data = er32(TCTL);
-        reg_data |= E1000_TCTL_RTLC;
-        ew32(TCTL, reg_data);
-
-        /* Configure Gigabit Carry Extend Padding */
-        reg_data = er32(TCTL_EXT);
-        reg_data &= ~E1000_TCTL_EXT_GCEX_MASK;
-        reg_data |= DEFAULT_80003ES2LAN_TCTL_EXT_GCEX;
-        ew32(TCTL_EXT, reg_data);
-
-        /* Configure Transmit Inter-Packet Gap */
-        reg_data = er32(TIPG);
-        reg_data &= ~E1000_TIPG_IPGT_MASK;
-        reg_data |= DEFAULT_80003ES2LAN_TIPG_IPGT_1000;
-        ew32(TIPG, reg_data);
-
-        reg_data = E1000_READ_REG_ARRAY(hw, FFLT, 0x0001);
-        reg_data &= ~0x00100000;
-        E1000_WRITE_REG_ARRAY(hw, FFLT, 0x0001, reg_data);
-        /* Fall through */
-    case e1000_82571:
-    case e1000_82572:
-    case e1000_ich8lan:
-        ctrl = er32(TXDCTL1);
-        ctrl = (ctrl & ~E1000_TXDCTL_WTHRESH) | E1000_TXDCTL_FULL_TX_DESC_WB;
-        ew32(TXDCTL1, ctrl);
-        break;
-    }
-
-
-    if (hw->mac_type == e1000_82573) {
-        u32 gcr = er32(GCR);
-        gcr |= E1000_GCR_L1_ACT_WITHOUT_L0S_RX;
-        ew32(GCR, gcr);
-    }
-
-    /* Clear all of the statistics registers (clear on read).  It is
-     * important that we do this after we have tried to establish link
-     * because the symbol error count will increment wildly if there
-     * is no link.
-     */
-    e1000_clear_hw_cntrs(hw);
-
-    /* ICH8 No-snoop bits are opposite polarity.
-     * Set to snoop by default after reset. */
-    if (hw->mac_type == e1000_ich8lan)
-        e1000_set_pci_ex_no_snoop(hw, PCI_EX_82566_SNOOP_ALL);
-
-    if (hw->device_id == E1000_DEV_ID_82546GB_QUAD_COPPER ||
-        hw->device_id == E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3) {
-        ctrl_ext = er32(CTRL_EXT);
-        /* Relaxed ordering must be disabled to avoid a parity
-         * error crash in a PCI slot. */
-        ctrl_ext |= E1000_CTRL_EXT_RO_DIS;
-        ew32(CTRL_EXT, ctrl_ext);
-    }
-
-    return ret_val;
-}
-
-/******************************************************************************
- * Adjust SERDES output amplitude based on EEPROM setting.
- *
- * hw - Struct containing variables accessed by shared code.
- *****************************************************************************/
-static s32 e1000_adjust_serdes_amplitude(struct e1000_hw *hw)
-{
-    u16 eeprom_data;
-    s32  ret_val;
-
-    DEBUGFUNC("e1000_adjust_serdes_amplitude");
-
-    if (hw->media_type != e1000_media_type_internal_serdes)
-        return E1000_SUCCESS;
-
-    switch (hw->mac_type) {
-    case e1000_82545_rev_3:
-    case e1000_82546_rev_3:
-        break;
-    default:
-        return E1000_SUCCESS;
-    }
-
-    ret_val = e1000_read_eeprom(hw, EEPROM_SERDES_AMPLITUDE, 1, &eeprom_data);
-    if (ret_val) {
-        return ret_val;
-    }
-
-    if (eeprom_data != EEPROM_RESERVED_WORD) {
-        /* Adjust SERDES output amplitude only. */
-        eeprom_data &= EEPROM_SERDES_AMPLITUDE_MASK;
-        ret_val = e1000_write_phy_reg(hw, M88E1000_PHY_EXT_CTRL, eeprom_data);
-        if (ret_val)
-            return ret_val;
-    }
-
-    return E1000_SUCCESS;
-}
-
-/******************************************************************************
- * Configures flow control and link settings.
- *
- * hw - Struct containing variables accessed by shared code
- *
- * Determines which flow control settings to use. Calls the apropriate media-
- * specific link configuration function. Configures the flow control settings.
- * Assuming the adapter has a valid link partner, a valid link should be
- * established. Assumes the hardware has previously been reset and the
- * transmitter and receiver are not enabled.
- *****************************************************************************/
-s32 e1000_setup_link(struct e1000_hw *hw)
-{
-    u32 ctrl_ext;
-    s32 ret_val;
-    u16 eeprom_data;
-
-    DEBUGFUNC("e1000_setup_link");
-
-    /* In the case of the phy reset being blocked, we already have a link.
-     * We do not have to set it up again. */
-    if (e1000_check_phy_reset_block(hw))
-        return E1000_SUCCESS;
-
-    /* Read and store word 0x0F of the EEPROM. This word contains bits
-     * that determine the hardware's default PAUSE (flow control) mode,
-     * a bit that determines whether the HW defaults to enabling or
-     * disabling auto-negotiation, and the direction of the
-     * SW defined pins. If there is no SW over-ride of the flow
-     * control setting, then the variable hw->fc will
-     * be initialized based on a value in the EEPROM.
-     */
-    if (hw->fc == E1000_FC_DEFAULT) {
-        switch (hw->mac_type) {
-        case e1000_ich8lan:
-        case e1000_82573:
-            hw->fc = E1000_FC_FULL;
-            break;
-        default:
-            ret_val = e1000_read_eeprom(hw, EEPROM_INIT_CONTROL2_REG,
-                                        1, &eeprom_data);
-            if (ret_val) {
-                DEBUGOUT("EEPROM Read Error\n");
-                return -E1000_ERR_EEPROM;
-            }
-            if ((eeprom_data & EEPROM_WORD0F_PAUSE_MASK) == 0)
-                hw->fc = E1000_FC_NONE;
-            else if ((eeprom_data & EEPROM_WORD0F_PAUSE_MASK) ==
-                    EEPROM_WORD0F_ASM_DIR)
-                hw->fc = E1000_FC_TX_PAUSE;
-            else
-                hw->fc = E1000_FC_FULL;
-            break;
-        }
-    }
-
-    /* We want to save off the original Flow Control configuration just
-     * in case we get disconnected and then reconnected into a different
-     * hub or switch with different Flow Control capabilities.
-     */
-    if (hw->mac_type == e1000_82542_rev2_0)
-        hw->fc &= (~E1000_FC_TX_PAUSE);
-
-    if ((hw->mac_type < e1000_82543) && (hw->report_tx_early == 1))
-        hw->fc &= (~E1000_FC_RX_PAUSE);
-
-    hw->original_fc = hw->fc;
-
-    DEBUGOUT1("After fix-ups FlowControl is now = %x\n", hw->fc);
-
-    /* Take the 4 bits from EEPROM word 0x0F that determine the initial
-     * polarity value for the SW controlled pins, and setup the
-     * Extended Device Control reg with that info.
-     * This is needed because one of the SW controlled pins is used for
-     * signal detection.  So this should be done before e1000_setup_pcs_link()
-     * or e1000_phy_setup() is called.
-     */
-    if (hw->mac_type == e1000_82543) {
-        ret_val = e1000_read_eeprom(hw, EEPROM_INIT_CONTROL2_REG,
-                                    1, &eeprom_data);
-        if (ret_val) {
-            DEBUGOUT("EEPROM Read Error\n");
-            return -E1000_ERR_EEPROM;
-        }
-        ctrl_ext = ((eeprom_data & EEPROM_WORD0F_SWPDIO_EXT) <<
-                    SWDPIO__EXT_SHIFT);
-        ew32(CTRL_EXT, ctrl_ext);
-    }
-
-    /* Call the necessary subroutine to configure the link. */
-    ret_val = (hw->media_type == e1000_media_type_copper) ?
-              e1000_setup_copper_link(hw) :
-              e1000_setup_fiber_serdes_link(hw);
-
-    /* Initialize the flow control address, type, and PAUSE timer
-     * registers to their default values.  This is done even if flow
-     * control is disabled, because it does not hurt anything to
-     * initialize these registers.
-     */
-    DEBUGOUT("Initializing the Flow Control address, type and timer regs\n");
-
-    /* FCAL/H and FCT are hardcoded to standard values in e1000_ich8lan. */
-    if (hw->mac_type != e1000_ich8lan) {
-        ew32(FCT, FLOW_CONTROL_TYPE);
-        ew32(FCAH, FLOW_CONTROL_ADDRESS_HIGH);
-        ew32(FCAL, FLOW_CONTROL_ADDRESS_LOW);
-    }
-
-    ew32(FCTTV, hw->fc_pause_time);
-
-    /* Set the flow control receive threshold registers.  Normally,
-     * these registers will be set to a default threshold that may be
-     * adjusted later by the driver's runtime code.  However, if the
-     * ability to transmit pause frames in not enabled, then these
-     * registers will be set to 0.
-     */
-    if (!(hw->fc & E1000_FC_TX_PAUSE)) {
-        ew32(FCRTL, 0);
-        ew32(FCRTH, 0);
-    } else {
-        /* We need to set up the Receive Threshold high and low water marks
-         * as well as (optionally) enabling the transmission of XON frames.
-         */
-        if (hw->fc_send_xon) {
-            ew32(FCRTL, (hw->fc_low_water | E1000_FCRTL_XONE));
-            ew32(FCRTH, hw->fc_high_water);
-        } else {
-            ew32(FCRTL, hw->fc_low_water);
-            ew32(FCRTH, hw->fc_high_water);
-        }
-    }
-    return ret_val;
-}
-
-/******************************************************************************
- * Sets up link for a fiber based or serdes based adapter
- *
- * hw - Struct containing variables accessed by shared code
- *
- * Manipulates Physical Coding Sublayer functions in order to configure
- * link. Assumes the hardware has been previously reset and the transmitter
- * and receiver are not enabled.
- *****************************************************************************/
-static s32 e1000_setup_fiber_serdes_link(struct e1000_hw *hw)
-{
-    u32 ctrl;
-    u32 status;
-    u32 txcw = 0;
-    u32 i;
-    u32 signal = 0;
-    s32 ret_val;
-
-    DEBUGFUNC("e1000_setup_fiber_serdes_link");
-
-    /* On 82571 and 82572 Fiber connections, SerDes loopback mode persists
-     * until explicitly turned off or a power cycle is performed.  A read to
-     * the register does not indicate its status.  Therefore, we ensure
-     * loopback mode is disabled during initialization.
-     */
-    if (hw->mac_type == e1000_82571 || hw->mac_type == e1000_82572)
-        ew32(SCTL, E1000_DISABLE_SERDES_LOOPBACK);
-
-    /* On adapters with a MAC newer than 82544, SWDP 1 will be
-     * set when the optics detect a signal. On older adapters, it will be
-     * cleared when there is a signal.  This applies to fiber media only.
-     * If we're on serdes media, adjust the output amplitude to value
-     * set in the EEPROM.
-     */
-    ctrl = er32(CTRL);
-    if (hw->media_type == e1000_media_type_fiber)
-        signal = (hw->mac_type > e1000_82544) ? E1000_CTRL_SWDPIN1 : 0;
-
-    ret_val = e1000_adjust_serdes_amplitude(hw);
-    if (ret_val)
-        return ret_val;
-
-    /* Take the link out of reset */
-    ctrl &= ~(E1000_CTRL_LRST);
-
-    /* Adjust VCO speed to improve BER performance */
-    ret_val = e1000_set_vco_speed(hw);
-    if (ret_val)
-        return ret_val;
-
-    e1000_config_collision_dist(hw);
-
-    /* Check for a software override of the flow control settings, and setup
-     * the device accordingly.  If auto-negotiation is enabled, then software
-     * will have to set the "PAUSE" bits to the correct value in the Tranmsit
-     * Config Word Register (TXCW) and re-start auto-negotiation.  However, if
-     * auto-negotiation is disabled, then software will have to manually
-     * configure the two flow control enable bits in the CTRL register.
-     *
-     * The possible values of the "fc" parameter are:
-     *      0:  Flow control is completely disabled
-     *      1:  Rx flow control is enabled (we can receive pause frames, but
-     *          not send pause frames).
-     *      2:  Tx flow control is enabled (we can send pause frames but we do
-     *          not support receiving pause frames).
-     *      3:  Both Rx and TX flow control (symmetric) are enabled.
-     */
-    switch (hw->fc) {
-    case E1000_FC_NONE:
-        /* Flow control is completely disabled by a software over-ride. */
-        txcw = (E1000_TXCW_ANE | E1000_TXCW_FD);
-        break;
-    case E1000_FC_RX_PAUSE:
-        /* RX Flow control is enabled and TX Flow control is disabled by a
-         * software over-ride. Since there really isn't a way to advertise
-         * that we are capable of RX Pause ONLY, we will advertise that we
-         * support both symmetric and asymmetric RX PAUSE. Later, we will
-         *  disable the adapter's ability to send PAUSE frames.
-         */
-        txcw = (E1000_TXCW_ANE | E1000_TXCW_FD | E1000_TXCW_PAUSE_MASK);
-        break;
-    case E1000_FC_TX_PAUSE:
-        /* TX Flow control is enabled, and RX Flow control is disabled, by a
-         * software over-ride.
-         */
-        txcw = (E1000_TXCW_ANE | E1000_TXCW_FD | E1000_TXCW_ASM_DIR);
-        break;
-    case E1000_FC_FULL:
-        /* Flow control (both RX and TX) is enabled by a software over-ride. */
-        txcw = (E1000_TXCW_ANE | E1000_TXCW_FD | E1000_TXCW_PAUSE_MASK);
-        break;
-    default:
-        DEBUGOUT("Flow control param set incorrectly\n");
-        return -E1000_ERR_CONFIG;
-        break;
-    }
-
-    /* Since auto-negotiation is enabled, take the link out of reset (the link
-     * will be in reset, because we previously reset the chip). This will
-     * restart auto-negotiation.  If auto-neogtiation is successful then the
-     * link-up status bit will be set and the flow control enable bits (RFCE
-     * and TFCE) will be set according to their negotiated value.
-     */
-    DEBUGOUT("Auto-negotiation enabled\n");
-
-    ew32(TXCW, txcw);
-    ew32(CTRL, ctrl);
-    E1000_WRITE_FLUSH();
-
-    hw->txcw = txcw;
-    msleep(1);
-
-    /* If we have a signal (the cable is plugged in) then poll for a "Link-Up"
-     * indication in the Device Status Register.  Time-out if a link isn't
-     * seen in 500 milliseconds seconds (Auto-negotiation should complete in
-     * less than 500 milliseconds even if the other end is doing it in SW).
-     * For internal serdes, we just assume a signal is present, then poll.
-     */
-    if (hw->media_type == e1000_media_type_internal_serdes ||
-       (er32(CTRL) & E1000_CTRL_SWDPIN1) == signal) {
-        DEBUGOUT("Looking for Link\n");
-        for (i = 0; i < (LINK_UP_TIMEOUT / 10); i++) {
-            msleep(10);
-            status = er32(STATUS);
-            if (status & E1000_STATUS_LU) break;
-        }
-        if (i == (LINK_UP_TIMEOUT / 10)) {
-            DEBUGOUT("Never got a valid link from auto-neg!!!\n");
-            hw->autoneg_failed = 1;
-            /* AutoNeg failed to achieve a link, so we'll call
-             * e1000_check_for_link. This routine will force the link up if
-             * we detect a signal. This will allow us to communicate with
-             * non-autonegotiating link partners.
-             */
-            ret_val = e1000_check_for_link(hw);
-            if (ret_val) {
-                DEBUGOUT("Error while checking for link\n");
-                return ret_val;
-            }
-            hw->autoneg_failed = 0;
-        } else {
-            hw->autoneg_failed = 0;
-            DEBUGOUT("Valid Link Found\n");
-        }
-    } else {
-        DEBUGOUT("No Signal Detected\n");
-    }
-    return E1000_SUCCESS;
-}
-
-/******************************************************************************
-* Make sure we have a valid PHY and change PHY mode before link setup.
-*
-* hw - Struct containing variables accessed by shared code
-******************************************************************************/
-static s32 e1000_copper_link_preconfig(struct e1000_hw *hw)
-{
-    u32 ctrl;
-    s32 ret_val;
-    u16 phy_data;
-
-    DEBUGFUNC("e1000_copper_link_preconfig");
-
-    ctrl = er32(CTRL);
-    /* With 82543, we need to force speed and duplex on the MAC equal to what
-     * the PHY speed and duplex configuration is. In addition, we need to
-     * perform a hardware reset on the PHY to take it out of reset.
-     */
-    if (hw->mac_type > e1000_82543) {
-        ctrl |= E1000_CTRL_SLU;
-        ctrl &= ~(E1000_CTRL_FRCSPD | E1000_CTRL_FRCDPX);
-        ew32(CTRL, ctrl);
-    } else {
-        ctrl |= (E1000_CTRL_FRCSPD | E1000_CTRL_FRCDPX | E1000_CTRL_SLU);
-        ew32(CTRL, ctrl);
-        ret_val = e1000_phy_hw_reset(hw);
-        if (ret_val)
-            return ret_val;
-    }
-
-    /* Make sure we have a valid PHY */
-    ret_val = e1000_detect_gig_phy(hw);
-    if (ret_val) {
-        DEBUGOUT("Error, did not detect valid phy.\n");
-        return ret_val;
-    }
-    DEBUGOUT1("Phy ID = %x \n", hw->phy_id);
-
-    /* Set PHY to class A mode (if necessary) */
-    ret_val = e1000_set_phy_mode(hw);
-    if (ret_val)
-        return ret_val;
-
-    if ((hw->mac_type == e1000_82545_rev_3) ||
-       (hw->mac_type == e1000_82546_rev_3)) {
-        ret_val = e1000_read_phy_reg(hw, M88E1000_PHY_SPEC_CTRL, &phy_data);
-        phy_data |= 0x00000008;
-        ret_val = e1000_write_phy_reg(hw, M88E1000_PHY_SPEC_CTRL, phy_data);
-    }
-
-    if (hw->mac_type <= e1000_82543 ||
-        hw->mac_type == e1000_82541 || hw->mac_type == e1000_82547 ||
-        hw->mac_type == e1000_82541_rev_2 || hw->mac_type == e1000_82547_rev_2)
-        hw->phy_reset_disable = false;
-
-   return E1000_SUCCESS;
-}
-
-
-/********************************************************************
-* Copper link setup for e1000_phy_igp series.
-*
-* hw - Struct containing variables accessed by shared code
-*********************************************************************/
-static s32 e1000_copper_link_igp_setup(struct e1000_hw *hw)
-{
-    u32 led_ctrl;
-    s32 ret_val;
-    u16 phy_data;
-
-    DEBUGFUNC("e1000_copper_link_igp_setup");
-
-    if (hw->phy_reset_disable)
-        return E1000_SUCCESS;
-
-    ret_val = e1000_phy_reset(hw);
-    if (ret_val) {
-        DEBUGOUT("Error Resetting the PHY\n");
-        return ret_val;
-    }
-
-    /* Wait 15ms for MAC to configure PHY from eeprom settings */
-    msleep(15);
-    if (hw->mac_type != e1000_ich8lan) {
-    /* Configure activity LED after PHY reset */
-    led_ctrl = er32(LEDCTL);
-    led_ctrl &= IGP_ACTIVITY_LED_MASK;
-    led_ctrl |= (IGP_ACTIVITY_LED_ENABLE | IGP_LED3_MODE);
-    ew32(LEDCTL, led_ctrl);
-    }
-
-    /* The NVM settings will configure LPLU in D3 for IGP2 and IGP3 PHYs */
-    if (hw->phy_type == e1000_phy_igp) {
-        /* disable lplu d3 during driver init */
-        ret_val = e1000_set_d3_lplu_state(hw, false);
-        if (ret_val) {
-            DEBUGOUT("Error Disabling LPLU D3\n");
-            return ret_val;
-        }
-    }
-
-    /* disable lplu d0 during driver init */
-    ret_val = e1000_set_d0_lplu_state(hw, false);
-    if (ret_val) {
-        DEBUGOUT("Error Disabling LPLU D0\n");
-        return ret_val;
-    }
-    /* Configure mdi-mdix settings */
-    ret_val = e1000_read_phy_reg(hw, IGP01E1000_PHY_PORT_CTRL, &phy_data);
-    if (ret_val)
-        return ret_val;
-
-    if ((hw->mac_type == e1000_82541) || (hw->mac_type == e1000_82547)) {
-        hw->dsp_config_state = e1000_dsp_config_disabled;
-        /* Force MDI for earlier revs of the IGP PHY */
-        phy_data &= ~(IGP01E1000_PSCR_AUTO_MDIX | 
IGP01E1000_PSCR_FORCE_MDI_MDIX);
-        hw->mdix = 1;
-
-    } else {
-        hw->dsp_config_state = e1000_dsp_config_enabled;
-        phy_data &= ~IGP01E1000_PSCR_AUTO_MDIX;
-
-        switch (hw->mdix) {
-        case 1:
-            phy_data &= ~IGP01E1000_PSCR_FORCE_MDI_MDIX;
-            break;
-        case 2:
-            phy_data |= IGP01E1000_PSCR_FORCE_MDI_MDIX;
-            break;
-        case 0:
-        default:
-            phy_data |= IGP01E1000_PSCR_AUTO_MDIX;
-            break;
-        }
-    }
-    ret_val = e1000_write_phy_reg(hw, IGP01E1000_PHY_PORT_CTRL, phy_data);
-    if (ret_val)
-        return ret_val;
-
-    /* set auto-master slave resolution settings */
-    if (hw->autoneg) {
-        e1000_ms_type phy_ms_setting = hw->master_slave;
-
-        if (hw->ffe_config_state == e1000_ffe_config_active)
-            hw->ffe_config_state = e1000_ffe_config_enabled;
-
-        if (hw->dsp_config_state == e1000_dsp_config_activated)
-            hw->dsp_config_state = e1000_dsp_config_enabled;
-
-        /* when autonegotiation advertisment is only 1000Mbps then we
-          * should disable SmartSpeed and enable Auto MasterSlave
-          * resolution as hardware default. */
-        if (hw->autoneg_advertised == ADVERTISE_1000_FULL) {
-            /* Disable SmartSpeed */
-            ret_val = e1000_read_phy_reg(hw, IGP01E1000_PHY_PORT_CONFIG,
-                                         &phy_data);
-            if (ret_val)
-                return ret_val;
-            phy_data &= ~IGP01E1000_PSCFR_SMART_SPEED;
-            ret_val = e1000_write_phy_reg(hw, IGP01E1000_PHY_PORT_CONFIG,
-                                          phy_data);
-            if (ret_val)
-                return ret_val;
-            /* Set auto Master/Slave resolution process */
-            ret_val = e1000_read_phy_reg(hw, PHY_1000T_CTRL, &phy_data);
-            if (ret_val)
-                return ret_val;
-            phy_data &= ~CR_1000T_MS_ENABLE;
-            ret_val = e1000_write_phy_reg(hw, PHY_1000T_CTRL, phy_data);
-            if (ret_val)
-                return ret_val;
-        }
-
-        ret_val = e1000_read_phy_reg(hw, PHY_1000T_CTRL, &phy_data);
-        if (ret_val)
-            return ret_val;
-
-        /* load defaults for future use */
-        hw->original_master_slave = (phy_data & CR_1000T_MS_ENABLE) ?
-                                        ((phy_data & CR_1000T_MS_VALUE) ?
-                                         e1000_ms_force_master :
-                                         e1000_ms_force_slave) :
-                                         e1000_ms_auto;
-
-        switch (phy_ms_setting) {
-        case e1000_ms_force_master:
-            phy_data |= (CR_1000T_MS_ENABLE | CR_1000T_MS_VALUE);
-            break;
-        case e1000_ms_force_slave:
-            phy_data |= CR_1000T_MS_ENABLE;
-            phy_data &= ~(CR_1000T_MS_VALUE);
-            break;
-        case e1000_ms_auto:
-            phy_data &= ~CR_1000T_MS_ENABLE;
-            default:
-            break;
-        }
-        ret_val = e1000_write_phy_reg(hw, PHY_1000T_CTRL, phy_data);
-        if (ret_val)
-            return ret_val;
-    }
-
-    return E1000_SUCCESS;
-}
-
-/********************************************************************
-* Copper link setup for e1000_phy_gg82563 series.
-*
-* hw - Struct containing variables accessed by shared code
-*********************************************************************/
-static s32 e1000_copper_link_ggp_setup(struct e1000_hw *hw)
-{
-    s32 ret_val;
-    u16 phy_data;
-    u32 reg_data;
-
-    DEBUGFUNC("e1000_copper_link_ggp_setup");
-
-    if (!hw->phy_reset_disable) {
-
-        /* Enable CRS on TX for half-duplex operation. */
-        ret_val = e1000_read_phy_reg(hw, GG82563_PHY_MAC_SPEC_CTRL,
-                                     &phy_data);
-        if (ret_val)
-            return ret_val;
-
-        phy_data |= GG82563_MSCR_ASSERT_CRS_ON_TX;
-        /* Use 25MHz for both link down and 1000BASE-T for Tx clock */
-        phy_data |= GG82563_MSCR_TX_CLK_1000MBPS_25MHZ;
-
-        ret_val = e1000_write_phy_reg(hw, GG82563_PHY_MAC_SPEC_CTRL,
-                                      phy_data);
-        if (ret_val)
-            return ret_val;
-
-        /* Options:
-         *   MDI/MDI-X = 0 (default)
-         *   0 - Auto for all speeds
-         *   1 - MDI mode
-         *   2 - MDI-X mode
-         *   3 - Auto for 1000Base-T only (MDI-X for 10/100Base-T modes)
-         */
-        ret_val = e1000_read_phy_reg(hw, GG82563_PHY_SPEC_CTRL, &phy_data);
-        if (ret_val)
-            return ret_val;
-
-        phy_data &= ~GG82563_PSCR_CROSSOVER_MODE_MASK;
-
-        switch (hw->mdix) {
-        case 1:
-            phy_data |= GG82563_PSCR_CROSSOVER_MODE_MDI;
-            break;
-        case 2:
-            phy_data |= GG82563_PSCR_CROSSOVER_MODE_MDIX;
-            break;
-        case 0:
-        default:
-            phy_data |= GG82563_PSCR_CROSSOVER_MODE_AUTO;
-            break;
-        }
-
-        /* Options:
-         *   disable_polarity_correction = 0 (default)
-         *       Automatic Correction for Reversed Cable Polarity
-         *   0 - Disabled
-         *   1 - Enabled
-         */
-        phy_data &= ~GG82563_PSCR_POLARITY_REVERSAL_DISABLE;
-        if (hw->disable_polarity_correction == 1)
-            phy_data |= GG82563_PSCR_POLARITY_REVERSAL_DISABLE;
-        ret_val = e1000_write_phy_reg(hw, GG82563_PHY_SPEC_CTRL, phy_data);
-
-        if (ret_val)
-            return ret_val;
-
-        /* SW Reset the PHY so all changes take effect */
-        ret_val = e1000_phy_reset(hw);
-        if (ret_val) {
-            DEBUGOUT("Error Resetting the PHY\n");
-            return ret_val;
-        }
-    } /* phy_reset_disable */
-
-    if (hw->mac_type == e1000_80003es2lan) {
-        /* Bypass RX and TX FIFO's */
-        ret_val = e1000_write_kmrn_reg(hw, E1000_KUMCTRLSTA_OFFSET_FIFO_CTRL,
-                                       E1000_KUMCTRLSTA_FIFO_CTRL_RX_BYPASS |
-                                       E1000_KUMCTRLSTA_FIFO_CTRL_TX_BYPASS);
-        if (ret_val)
-            return ret_val;
-
-        ret_val = e1000_read_phy_reg(hw, GG82563_PHY_SPEC_CTRL_2, &phy_data);
-        if (ret_val)
-            return ret_val;
-
-        phy_data &= ~GG82563_PSCR2_REVERSE_AUTO_NEG;
-        ret_val = e1000_write_phy_reg(hw, GG82563_PHY_SPEC_CTRL_2, phy_data);
-
-        if (ret_val)
-            return ret_val;
-
-        reg_data = er32(CTRL_EXT);
-        reg_data &= ~(E1000_CTRL_EXT_LINK_MODE_MASK);
-        ew32(CTRL_EXT, reg_data);
-
-        ret_val = e1000_read_phy_reg(hw, GG82563_PHY_PWR_MGMT_CTRL,
-                                          &phy_data);
-        if (ret_val)
-            return ret_val;
-
-        /* Do not init these registers when the HW is in IAMT mode, since the
-         * firmware will have already initialized them.  We only initialize
-         * them if the HW is not in IAMT mode.
-         */
-        if (!e1000_check_mng_mode(hw)) {
-            /* Enable Electrical Idle on the PHY */
-            phy_data |= GG82563_PMCR_ENABLE_ELECTRICAL_IDLE;
-            ret_val = e1000_write_phy_reg(hw, GG82563_PHY_PWR_MGMT_CTRL,
-                                          phy_data);
-            if (ret_val)
-                return ret_val;
-
-            ret_val = e1000_read_phy_reg(hw, GG82563_PHY_KMRN_MODE_CTRL,
-                                         &phy_data);
-            if (ret_val)
-                return ret_val;
-
-            phy_data &= ~GG82563_KMCR_PASS_FALSE_CARRIER;
-            ret_val = e1000_write_phy_reg(hw, GG82563_PHY_KMRN_MODE_CTRL,
-                                          phy_data);
-
-            if (ret_val)
-                return ret_val;
-        }
-
-        /* Workaround: Disable padding in Kumeran interface in the MAC
-         * and in the PHY to avoid CRC errors.
-         */
-        ret_val = e1000_read_phy_reg(hw, GG82563_PHY_INBAND_CTRL,
-                                     &phy_data);
-        if (ret_val)
-            return ret_val;
-        phy_data |= GG82563_ICR_DIS_PADDING;
-        ret_val = e1000_write_phy_reg(hw, GG82563_PHY_INBAND_CTRL,
-                                      phy_data);
-        if (ret_val)
-            return ret_val;
-    }
-
-    return E1000_SUCCESS;
-}
-
-/********************************************************************
-* Copper link setup for e1000_phy_m88 series.
-*
-* hw - Struct containing variables accessed by shared code
-*********************************************************************/
-static s32 e1000_copper_link_mgp_setup(struct e1000_hw *hw)
-{
-    s32 ret_val;
-    u16 phy_data;
-
-    DEBUGFUNC("e1000_copper_link_mgp_setup");
-
-    if (hw->phy_reset_disable)
-        return E1000_SUCCESS;
-
-    /* Enable CRS on TX. This must be set for half-duplex operation. */
-    ret_val = e1000_read_phy_reg(hw, M88E1000_PHY_SPEC_CTRL, &phy_data);
-    if (ret_val)
-        return ret_val;
-
-    phy_data |= M88E1000_PSCR_ASSERT_CRS_ON_TX;
-
-    /* Options:
-     *   MDI/MDI-X = 0 (default)
-     *   0 - Auto for all speeds
-     *   1 - MDI mode
-     *   2 - MDI-X mode
-     *   3 - Auto for 1000Base-T only (MDI-X for 10/100Base-T modes)
-     */
-    phy_data &= ~M88E1000_PSCR_AUTO_X_MODE;
-
-    switch (hw->mdix) {
-    case 1:
-        phy_data |= M88E1000_PSCR_MDI_MANUAL_MODE;
-        break;
-    case 2:
-        phy_data |= M88E1000_PSCR_MDIX_MANUAL_MODE;
-        break;
-    case 3:
-        phy_data |= M88E1000_PSCR_AUTO_X_1000T;
-        break;
-    case 0:
-    default:
-        phy_data |= M88E1000_PSCR_AUTO_X_MODE;
-        break;
-    }
-
-    /* Options:
-     *   disable_polarity_correction = 0 (default)
-     *       Automatic Correction for Reversed Cable Polarity
-     *   0 - Disabled
-     *   1 - Enabled
-     */
-    phy_data &= ~M88E1000_PSCR_POLARITY_REVERSAL;
-    if (hw->disable_polarity_correction == 1)
-        phy_data |= M88E1000_PSCR_POLARITY_REVERSAL;
-    ret_val = e1000_write_phy_reg(hw, M88E1000_PHY_SPEC_CTRL, phy_data);
-    if (ret_val)
-        return ret_val;
-
-    if (hw->phy_revision < M88E1011_I_REV_4) {
-        /* Force TX_CLK in the Extended PHY Specific Control Register
-         * to 25MHz clock.
-         */
-        ret_val = e1000_read_phy_reg(hw, M88E1000_EXT_PHY_SPEC_CTRL, 
&phy_data);
-        if (ret_val)
-            return ret_val;
-
-        phy_data |= M88E1000_EPSCR_TX_CLK_25;
-
-        if ((hw->phy_revision == E1000_REVISION_2) &&
-            (hw->phy_id == M88E1111_I_PHY_ID)) {
-            /* Vidalia Phy, set the downshift counter to 5x */
-            phy_data &= ~(M88EC018_EPSCR_DOWNSHIFT_COUNTER_MASK);
-            phy_data |= M88EC018_EPSCR_DOWNSHIFT_COUNTER_5X;
-            ret_val = e1000_write_phy_reg(hw,
-                                        M88E1000_EXT_PHY_SPEC_CTRL, phy_data);
-            if (ret_val)
-                return ret_val;
-        } else {
-            /* Configure Master and Slave downshift values */
-            phy_data &= ~(M88E1000_EPSCR_MASTER_DOWNSHIFT_MASK |
-                              M88E1000_EPSCR_SLAVE_DOWNSHIFT_MASK);
-            phy_data |= (M88E1000_EPSCR_MASTER_DOWNSHIFT_1X |
-                             M88E1000_EPSCR_SLAVE_DOWNSHIFT_1X);
-            ret_val = e1000_write_phy_reg(hw,
-                                        M88E1000_EXT_PHY_SPEC_CTRL, phy_data);
-            if (ret_val)
-               return ret_val;
-        }
-    }
-
-    /* SW Reset the PHY so all changes take effect */
-    ret_val = e1000_phy_reset(hw);
-    if (ret_val) {
-        DEBUGOUT("Error Resetting the PHY\n");
-        return ret_val;
-    }
-
-   return E1000_SUCCESS;
-}
-
-/********************************************************************
-* Setup auto-negotiation and flow control advertisements,
-* and then perform auto-negotiation.
-*
-* hw - Struct containing variables accessed by shared code
-*********************************************************************/
-static s32 e1000_copper_link_autoneg(struct e1000_hw *hw)
-{
-    s32 ret_val;
-    u16 phy_data;
-
-    DEBUGFUNC("e1000_copper_link_autoneg");
-
-    /* Perform some bounds checking on the hw->autoneg_advertised
-     * parameter.  If this variable is zero, then set it to the default.
-     */
-    hw->autoneg_advertised &= AUTONEG_ADVERTISE_SPEED_DEFAULT;
-
-    /* If autoneg_advertised is zero, we assume it was not defaulted
-     * by the calling code so we set to advertise full capability.
-     */
-    if (hw->autoneg_advertised == 0)
-        hw->autoneg_advertised = AUTONEG_ADVERTISE_SPEED_DEFAULT;
-
-    /* IFE phy only supports 10/100 */
-    if (hw->phy_type == e1000_phy_ife)
-        hw->autoneg_advertised &= AUTONEG_ADVERTISE_10_100_ALL;
-
-    DEBUGOUT("Reconfiguring auto-neg advertisement params\n");
-    ret_val = e1000_phy_setup_autoneg(hw);
-    if (ret_val) {
-        DEBUGOUT("Error Setting up Auto-Negotiation\n");
-        return ret_val;
-    }
-    DEBUGOUT("Restarting Auto-Neg\n");
-
-    /* Restart auto-negotiation by setting the Auto Neg Enable bit and
-     * the Auto Neg Restart bit in the PHY control register.
-     */
-    ret_val = e1000_read_phy_reg(hw, PHY_CTRL, &phy_data);
-    if (ret_val)
-        return ret_val;
-
-    phy_data |= (MII_CR_AUTO_NEG_EN | MII_CR_RESTART_AUTO_NEG);
-    ret_val = e1000_write_phy_reg(hw, PHY_CTRL, phy_data);
-    if (ret_val)
-        return ret_val;
-
-    /* Does the user want to wait for Auto-Neg to complete here, or
-     * check at a later time (for example, callback routine).
-     */
-    if (hw->wait_autoneg_complete) {
-        ret_val = e1000_wait_autoneg(hw);
-        if (ret_val) {
-            DEBUGOUT("Error while waiting for autoneg to complete\n");
-            return ret_val;
-        }
-    }
-
-    hw->get_link_status = true;
-
-    return E1000_SUCCESS;
-}
-
-/******************************************************************************
-* Config the MAC and the PHY after link is up.
-*   1) Set up the MAC to the current PHY speed/duplex
-*      if we are on 82543.  If we
-*      are on newer silicon, we only need to configure
-*      collision distance in the Transmit Control Register.
-*   2) Set up flow control on the MAC to that established with
-*      the link partner.
-*   3) Config DSP to improve Gigabit link quality for some PHY revisions.
-*
-* hw - Struct containing variables accessed by shared code
-******************************************************************************/
-static s32 e1000_copper_link_postconfig(struct e1000_hw *hw)
-{
-    s32 ret_val;
-    DEBUGFUNC("e1000_copper_link_postconfig");
-
-    if (hw->mac_type >= e1000_82544) {
-        e1000_config_collision_dist(hw);
-    } else {
-        ret_val = e1000_config_mac_to_phy(hw);
-        if (ret_val) {
-            DEBUGOUT("Error configuring MAC to PHY settings\n");
-            return ret_val;
-        }
-    }
-    ret_val = e1000_config_fc_after_link_up(hw);
-    if (ret_val) {
-        DEBUGOUT("Error Configuring Flow Control\n");
-        return ret_val;
-    }
-
-    /* Config DSP to improve Giga link quality */
-    if (hw->phy_type == e1000_phy_igp) {
-        ret_val = e1000_config_dsp_after_link_change(hw, true);
-        if (ret_val) {
-            DEBUGOUT("Error Configuring DSP after link up\n");
-            return ret_val;
-        }
-    }
-
-    return E1000_SUCCESS;
-}
-
-/******************************************************************************
-* Detects which PHY is present and setup the speed and duplex
-*
-* hw - Struct containing variables accessed by shared code
-******************************************************************************/
-static s32 e1000_setup_copper_link(struct e1000_hw *hw)
-{
-    s32 ret_val;
-    u16 i;
-    u16 phy_data;
-    u16 reg_data;
-
-    DEBUGFUNC("e1000_setup_copper_link");
-
-    switch (hw->mac_type) {
-    case e1000_80003es2lan:
-    case e1000_ich8lan:
-        /* Set the mac to wait the maximum time between each
-         * iteration and increase the max iterations when
-         * polling the phy; this fixes erroneous timeouts at 10Mbps. */
-        ret_val = e1000_write_kmrn_reg(hw, GG82563_REG(0x34, 4), 0xFFFF);
-        if (ret_val)
-            return ret_val;
-        ret_val = e1000_read_kmrn_reg(hw, GG82563_REG(0x34, 9), &reg_data);
-        if (ret_val)
-            return ret_val;
-        reg_data |= 0x3F;
-        ret_val = e1000_write_kmrn_reg(hw, GG82563_REG(0x34, 9), reg_data);
-        if (ret_val)
-            return ret_val;
-    default:
-        break;
-    }
-
-    /* Check if it is a valid PHY and set PHY mode if necessary. */
-    ret_val = e1000_copper_link_preconfig(hw);
-    if (ret_val)
-        return ret_val;
-
-    switch (hw->mac_type) {
-    case e1000_80003es2lan:
-        /* Kumeran registers are written-only */
-        reg_data = E1000_KUMCTRLSTA_INB_CTRL_LINK_STATUS_TX_TIMEOUT_DEFAULT;
-        reg_data |= E1000_KUMCTRLSTA_INB_CTRL_DIS_PADDING;
-        ret_val = e1000_write_kmrn_reg(hw, E1000_KUMCTRLSTA_OFFSET_INB_CTRL,
-                                       reg_data);
-        if (ret_val)
-            return ret_val;
-        break;
-    default:
-        break;
-    }
-
-    if (hw->phy_type == e1000_phy_igp ||
-        hw->phy_type == e1000_phy_igp_3 ||
-        hw->phy_type == e1000_phy_igp_2) {
-        ret_val = e1000_copper_link_igp_setup(hw);
-        if (ret_val)
-            return ret_val;
-    } else if (hw->phy_type == e1000_phy_m88) {
-        ret_val = e1000_copper_link_mgp_setup(hw);
-        if (ret_val)
-            return ret_val;
-    } else if (hw->phy_type == e1000_phy_gg82563) {
-        ret_val = e1000_copper_link_ggp_setup(hw);
-        if (ret_val)
-            return ret_val;
-    }
-
-    if (hw->autoneg) {
-        /* Setup autoneg and flow control advertisement
-          * and perform autonegotiation */
-        ret_val = e1000_copper_link_autoneg(hw);
-        if (ret_val)
-            return ret_val;
-    } else {
-        /* PHY will be set to 10H, 10F, 100H,or 100F
-          * depending on value from forced_speed_duplex. */
-        DEBUGOUT("Forcing speed and duplex\n");
-        ret_val = e1000_phy_force_speed_duplex(hw);
-        if (ret_val) {
-            DEBUGOUT("Error Forcing Speed and Duplex\n");
-            return ret_val;
-        }
-    }
-
-    /* Check link status. Wait up to 100 microseconds for link to become
-     * valid.
-     */
-    for (i = 0; i < 10; i++) {
-        ret_val = e1000_read_phy_reg(hw, PHY_STATUS, &phy_data);
-        if (ret_val)
-            return ret_val;
-        ret_val = e1000_read_phy_reg(hw, PHY_STATUS, &phy_data);
-        if (ret_val)
-            return ret_val;
-
-        if (phy_data & MII_SR_LINK_STATUS) {
-            /* Config the MAC and PHY after link is up */
-            ret_val = e1000_copper_link_postconfig(hw);
-            if (ret_val)
-                return ret_val;
-
-            DEBUGOUT("Valid link established!!!\n");
-            return E1000_SUCCESS;
-        }
-        udelay(10);
-    }
-
-    DEBUGOUT("Unable to establish link!!!\n");
-    return E1000_SUCCESS;
-}
-
-/******************************************************************************
-* Configure the MAC-to-PHY interface for 10/100Mbps
-*
-* hw - Struct containing variables accessed by shared code
-******************************************************************************/
-static s32 e1000_configure_kmrn_for_10_100(struct e1000_hw *hw, u16 duplex)
-{
-    s32 ret_val = E1000_SUCCESS;
-    u32 tipg;
-    u16 reg_data;
-
-    DEBUGFUNC("e1000_configure_kmrn_for_10_100");
-
-    reg_data = E1000_KUMCTRLSTA_HD_CTRL_10_100_DEFAULT;
-    ret_val = e1000_write_kmrn_reg(hw, E1000_KUMCTRLSTA_OFFSET_HD_CTRL,
-                                   reg_data);
-    if (ret_val)
-        return ret_val;
-
-    /* Configure Transmit Inter-Packet Gap */
-    tipg = er32(TIPG);
-    tipg &= ~E1000_TIPG_IPGT_MASK;
-    tipg |= DEFAULT_80003ES2LAN_TIPG_IPGT_10_100;
-    ew32(TIPG, tipg);
-
-    ret_val = e1000_read_phy_reg(hw, GG82563_PHY_KMRN_MODE_CTRL, &reg_data);
-
-    if (ret_val)
-        return ret_val;
-
-    if (duplex == HALF_DUPLEX)
-        reg_data |= GG82563_KMCR_PASS_FALSE_CARRIER;
-    else
-        reg_data &= ~GG82563_KMCR_PASS_FALSE_CARRIER;
-
-    ret_val = e1000_write_phy_reg(hw, GG82563_PHY_KMRN_MODE_CTRL, reg_data);
-
-    return ret_val;
-}
-
-static s32 e1000_configure_kmrn_for_1000(struct e1000_hw *hw)
-{
-    s32 ret_val = E1000_SUCCESS;
-    u16 reg_data;
-    u32 tipg;
-
-    DEBUGFUNC("e1000_configure_kmrn_for_1000");
-
-    reg_data = E1000_KUMCTRLSTA_HD_CTRL_1000_DEFAULT;
-    ret_val = e1000_write_kmrn_reg(hw, E1000_KUMCTRLSTA_OFFSET_HD_CTRL,
-                                   reg_data);
-    if (ret_val)
-        return ret_val;
-
-    /* Configure Transmit Inter-Packet Gap */
-    tipg = er32(TIPG);
-    tipg &= ~E1000_TIPG_IPGT_MASK;
-    tipg |= DEFAULT_80003ES2LAN_TIPG_IPGT_1000;
-    ew32(TIPG, tipg);
-
-    ret_val = e1000_read_phy_reg(hw, GG82563_PHY_KMRN_MODE_CTRL, &reg_data);
-
-    if (ret_val)
-        return ret_val;
-
-    reg_data &= ~GG82563_KMCR_PASS_FALSE_CARRIER;
-    ret_val = e1000_write_phy_reg(hw, GG82563_PHY_KMRN_MODE_CTRL, reg_data);
-
-    return ret_val;
-}
-
-/******************************************************************************
-* Configures PHY autoneg and flow control advertisement settings
-*
-* hw - Struct containing variables accessed by shared code
-******************************************************************************/
-s32 e1000_phy_setup_autoneg(struct e1000_hw *hw)
-{
-    s32 ret_val;
-    u16 mii_autoneg_adv_reg;
-    u16 mii_1000t_ctrl_reg;
-
-    DEBUGFUNC("e1000_phy_setup_autoneg");
-
-    /* Read the MII Auto-Neg Advertisement Register (Address 4). */
-    ret_val = e1000_read_phy_reg(hw, PHY_AUTONEG_ADV, &mii_autoneg_adv_reg);
-    if (ret_val)
-        return ret_val;
-
-    if (hw->phy_type != e1000_phy_ife) {
-        /* Read the MII 1000Base-T Control Register (Address 9). */
-        ret_val = e1000_read_phy_reg(hw, PHY_1000T_CTRL, &mii_1000t_ctrl_reg);
-        if (ret_val)
-            return ret_val;
-    } else
-        mii_1000t_ctrl_reg=0;
-
-    /* Need to parse both autoneg_advertised and fc and set up
-     * the appropriate PHY registers.  First we will parse for
-     * autoneg_advertised software override.  Since we can advertise
-     * a plethora of combinations, we need to check each bit
-     * individually.
-     */
-
-    /* First we clear all the 10/100 mb speed bits in the Auto-Neg
-     * Advertisement Register (Address 4) and the 1000 mb speed bits in
-     * the  1000Base-T Control Register (Address 9).
-     */
-    mii_autoneg_adv_reg &= ~REG4_SPEED_MASK;
-    mii_1000t_ctrl_reg &= ~REG9_SPEED_MASK;
-
-    DEBUGOUT1("autoneg_advertised %x\n", hw->autoneg_advertised);
-
-    /* Do we want to advertise 10 Mb Half Duplex? */
-    if (hw->autoneg_advertised & ADVERTISE_10_HALF) {
-        DEBUGOUT("Advertise 10mb Half duplex\n");
-        mii_autoneg_adv_reg |= NWAY_AR_10T_HD_CAPS;
-    }
-
-    /* Do we want to advertise 10 Mb Full Duplex? */
-    if (hw->autoneg_advertised & ADVERTISE_10_FULL) {
-        DEBUGOUT("Advertise 10mb Full duplex\n");
-        mii_autoneg_adv_reg |= NWAY_AR_10T_FD_CAPS;
-    }
-
-    /* Do we want to advertise 100 Mb Half Duplex? */
-    if (hw->autoneg_advertised & ADVERTISE_100_HALF) {
-        DEBUGOUT("Advertise 100mb Half duplex\n");
-        mii_autoneg_adv_reg |= NWAY_AR_100TX_HD_CAPS;
-    }
-
-    /* Do we want to advertise 100 Mb Full Duplex? */
-    if (hw->autoneg_advertised & ADVERTISE_100_FULL) {
-        DEBUGOUT("Advertise 100mb Full duplex\n");
-        mii_autoneg_adv_reg |= NWAY_AR_100TX_FD_CAPS;
-    }
-
-    /* We do not allow the Phy to advertise 1000 Mb Half Duplex */
-    if (hw->autoneg_advertised & ADVERTISE_1000_HALF) {
-        DEBUGOUT("Advertise 1000mb Half duplex requested, request denied!\n");
-    }
-
-    /* Do we want to advertise 1000 Mb Full Duplex? */
-    if (hw->autoneg_advertised & ADVERTISE_1000_FULL) {
-        DEBUGOUT("Advertise 1000mb Full duplex\n");
-        mii_1000t_ctrl_reg |= CR_1000T_FD_CAPS;
-        if (hw->phy_type == e1000_phy_ife) {
-            DEBUGOUT("e1000_phy_ife is a 10/100 PHY. Gigabit speed is not 
supported.\n");
-        }
-    }
-
-    /* Check for a software override of the flow control settings, and
-     * setup the PHY advertisement registers accordingly.  If
-     * auto-negotiation is enabled, then software will have to set the
-     * "PAUSE" bits to the correct value in the Auto-Negotiation
-     * Advertisement Register (PHY_AUTONEG_ADV) and re-start auto-negotiation.
-     *
-     * The possible values of the "fc" parameter are:
-     *      0:  Flow control is completely disabled
-     *      1:  Rx flow control is enabled (we can receive pause frames
-     *          but not send pause frames).
-     *      2:  Tx flow control is enabled (we can send pause frames
-     *          but we do not support receiving pause frames).
-     *      3:  Both Rx and TX flow control (symmetric) are enabled.
-     *  other:  No software override.  The flow control configuration
-     *          in the EEPROM is used.
-     */
-    switch (hw->fc) {
-    case E1000_FC_NONE: /* 0 */
-        /* Flow control (RX & TX) is completely disabled by a
-         * software over-ride.
-         */
-        mii_autoneg_adv_reg &= ~(NWAY_AR_ASM_DIR | NWAY_AR_PAUSE);
-        break;
-    case E1000_FC_RX_PAUSE: /* 1 */
-        /* RX Flow control is enabled, and TX Flow control is
-         * disabled, by a software over-ride.
-         */
-        /* Since there really isn't a way to advertise that we are
-         * capable of RX Pause ONLY, we will advertise that we
-         * support both symmetric and asymmetric RX PAUSE.  Later
-         * (in e1000_config_fc_after_link_up) we will disable the
-         *hw's ability to send PAUSE frames.
-         */
-        mii_autoneg_adv_reg |= (NWAY_AR_ASM_DIR | NWAY_AR_PAUSE);
-        break;
-    case E1000_FC_TX_PAUSE: /* 2 */
-        /* TX Flow control is enabled, and RX Flow control is
-         * disabled, by a software over-ride.
-         */
-        mii_autoneg_adv_reg |= NWAY_AR_ASM_DIR;
-        mii_autoneg_adv_reg &= ~NWAY_AR_PAUSE;
-        break;
-    case E1000_FC_FULL: /* 3 */
-        /* Flow control (both RX and TX) is enabled by a software
-         * over-ride.
-         */
-        mii_autoneg_adv_reg |= (NWAY_AR_ASM_DIR | NWAY_AR_PAUSE);
-        break;
-    default:
-        DEBUGOUT("Flow control param set incorrectly\n");
-        return -E1000_ERR_CONFIG;
-    }
-
-    ret_val = e1000_write_phy_reg(hw, PHY_AUTONEG_ADV, mii_autoneg_adv_reg);
-    if (ret_val)
-        return ret_val;
-
-    DEBUGOUT1("Auto-Neg Advertising %x\n", mii_autoneg_adv_reg);
-
-    if (hw->phy_type != e1000_phy_ife) {
-        ret_val = e1000_write_phy_reg(hw, PHY_1000T_CTRL, mii_1000t_ctrl_reg);
-        if (ret_val)
-            return ret_val;
-    }
-
-    return E1000_SUCCESS;
-}
-
-/******************************************************************************
-* Force PHY speed and duplex settings to hw->forced_speed_duplex
-*
-* hw - Struct containing variables accessed by shared code
-******************************************************************************/
-static s32 e1000_phy_force_speed_duplex(struct e1000_hw *hw)
-{
-    u32 ctrl;
-    s32 ret_val;
-    u16 mii_ctrl_reg;
-    u16 mii_status_reg;
-    u16 phy_data;
-    u16 i;
-
-    DEBUGFUNC("e1000_phy_force_speed_duplex");
-
-    /* Turn off Flow control if we are forcing speed and duplex. */
-    hw->fc = E1000_FC_NONE;
-
-    DEBUGOUT1("hw->fc = %d\n", hw->fc);
-
-    /* Read the Device Control Register. */
-    ctrl = er32(CTRL);
-
-    /* Set the bits to Force Speed and Duplex in the Device Ctrl Reg. */
-    ctrl |= (E1000_CTRL_FRCSPD | E1000_CTRL_FRCDPX);
-    ctrl &= ~(DEVICE_SPEED_MASK);
-
-    /* Clear the Auto Speed Detect Enable bit. */
-    ctrl &= ~E1000_CTRL_ASDE;
-
-    /* Read the MII Control Register. */
-    ret_val = e1000_read_phy_reg(hw, PHY_CTRL, &mii_ctrl_reg);
-    if (ret_val)
-        return ret_val;
-
-    /* We need to disable autoneg in order to force link and duplex. */
-
-    mii_ctrl_reg &= ~MII_CR_AUTO_NEG_EN;
-
-    /* Are we forcing Full or Half Duplex? */
-    if (hw->forced_speed_duplex == e1000_100_full ||
-        hw->forced_speed_duplex == e1000_10_full) {
-        /* We want to force full duplex so we SET the full duplex bits in the
-         * Device and MII Control Registers.
-         */
-        ctrl |= E1000_CTRL_FD;
-        mii_ctrl_reg |= MII_CR_FULL_DUPLEX;
-        DEBUGOUT("Full Duplex\n");
-    } else {
-        /* We want to force half duplex so we CLEAR the full duplex bits in
-         * the Device and MII Control Registers.
-         */
-        ctrl &= ~E1000_CTRL_FD;
-        mii_ctrl_reg &= ~MII_CR_FULL_DUPLEX;
-        DEBUGOUT("Half Duplex\n");
-    }
-
-    /* Are we forcing 100Mbps??? */
-    if (hw->forced_speed_duplex == e1000_100_full ||
-       hw->forced_speed_duplex == e1000_100_half) {
-        /* Set the 100Mb bit and turn off the 1000Mb and 10Mb bits. */
-        ctrl |= E1000_CTRL_SPD_100;
-        mii_ctrl_reg |= MII_CR_SPEED_100;
-        mii_ctrl_reg &= ~(MII_CR_SPEED_1000 | MII_CR_SPEED_10);
-        DEBUGOUT("Forcing 100mb ");
-    } else {
-        /* Set the 10Mb bit and turn off the 1000Mb and 100Mb bits. */
-        ctrl &= ~(E1000_CTRL_SPD_1000 | E1000_CTRL_SPD_100);
-        mii_ctrl_reg |= MII_CR_SPEED_10;
-        mii_ctrl_reg &= ~(MII_CR_SPEED_1000 | MII_CR_SPEED_100);
-        DEBUGOUT("Forcing 10mb ");
-    }
-
-    e1000_config_collision_dist(hw);
-
-    /* Write the configured values back to the Device Control Reg. */
-    ew32(CTRL, ctrl);
-
-    if ((hw->phy_type == e1000_phy_m88) ||
-        (hw->phy_type == e1000_phy_gg82563)) {
-        ret_val = e1000_read_phy_reg(hw, M88E1000_PHY_SPEC_CTRL, &phy_data);
-        if (ret_val)
-            return ret_val;
-
-        /* Clear Auto-Crossover to force MDI manually. M88E1000 requires MDI
-         * forced whenever speed are duplex are forced.
-         */
-        phy_data &= ~M88E1000_PSCR_AUTO_X_MODE;
-        ret_val = e1000_write_phy_reg(hw, M88E1000_PHY_SPEC_CTRL, phy_data);
-        if (ret_val)
-            return ret_val;
-
-        DEBUGOUT1("M88E1000 PSCR: %x \n", phy_data);
-
-        /* Need to reset the PHY or these changes will be ignored */
-        mii_ctrl_reg |= MII_CR_RESET;
-
-    /* Disable MDI-X support for 10/100 */
-    } else if (hw->phy_type == e1000_phy_ife) {
-        ret_val = e1000_read_phy_reg(hw, IFE_PHY_MDIX_CONTROL, &phy_data);
-        if (ret_val)
-            return ret_val;
-
-        phy_data &= ~IFE_PMC_AUTO_MDIX;
-        phy_data &= ~IFE_PMC_FORCE_MDIX;
-
-        ret_val = e1000_write_phy_reg(hw, IFE_PHY_MDIX_CONTROL, phy_data);
-        if (ret_val)
-            return ret_val;
-
-    } else {
-        /* Clear Auto-Crossover to force MDI manually.  IGP requires MDI
-         * forced whenever speed or duplex are forced.
-         */
-        ret_val = e1000_read_phy_reg(hw, IGP01E1000_PHY_PORT_CTRL, &phy_data);
-        if (ret_val)
-            return ret_val;
-
-        phy_data &= ~IGP01E1000_PSCR_AUTO_MDIX;
-        phy_data &= ~IGP01E1000_PSCR_FORCE_MDI_MDIX;
-
-        ret_val = e1000_write_phy_reg(hw, IGP01E1000_PHY_PORT_CTRL, phy_data);
-        if (ret_val)
-            return ret_val;
-    }
-
-    /* Write back the modified PHY MII control register. */
-    ret_val = e1000_write_phy_reg(hw, PHY_CTRL, mii_ctrl_reg);
-    if (ret_val)
-        return ret_val;
-
-    udelay(1);
-
-    /* The wait_autoneg_complete flag may be a little misleading here.
-     * Since we are forcing speed and duplex, Auto-Neg is not enabled.
-     * But we do want to delay for a period while forcing only so we
-     * don't generate false No Link messages.  So we will wait here
-     * only if the user has set wait_autoneg_complete to 1, which is
-     * the default.
-     */
-    if (hw->wait_autoneg_complete) {
-        /* We will wait for autoneg to complete. */
-        DEBUGOUT("Waiting for forced speed/duplex link.\n");
-        mii_status_reg = 0;
-
-        /* We will wait for autoneg to complete or 4.5 seconds to expire. */
-        for (i = PHY_FORCE_TIME; i > 0; i--) {
-            /* Read the MII Status Register and wait for Auto-Neg Complete bit
-             * to be set.
-             */
-            ret_val = e1000_read_phy_reg(hw, PHY_STATUS, &mii_status_reg);
-            if (ret_val)
-                return ret_val;
-
-            ret_val = e1000_read_phy_reg(hw, PHY_STATUS, &mii_status_reg);
-            if (ret_val)
-                return ret_val;
-
-            if (mii_status_reg & MII_SR_LINK_STATUS) break;
-            msleep(100);
-        }
-        if ((i == 0) &&
-           ((hw->phy_type == e1000_phy_m88) ||
-            (hw->phy_type == e1000_phy_gg82563))) {
-            /* We didn't get link.  Reset the DSP and wait again for link. */
-            ret_val = e1000_phy_reset_dsp(hw);
-            if (ret_val) {
-                DEBUGOUT("Error Resetting PHY DSP\n");
-                return ret_val;
-            }
-        }
-        /* This loop will early-out if the link condition has been met.  */
-        for (i = PHY_FORCE_TIME; i > 0; i--) {
-            if (mii_status_reg & MII_SR_LINK_STATUS) break;
-            msleep(100);
-            /* Read the MII Status Register and wait for Auto-Neg Complete bit
-             * to be set.
-             */
-            ret_val = e1000_read_phy_reg(hw, PHY_STATUS, &mii_status_reg);
-            if (ret_val)
-                return ret_val;
-
-            ret_val = e1000_read_phy_reg(hw, PHY_STATUS, &mii_status_reg);
-            if (ret_val)
-                return ret_val;
-        }
-    }
-
-    if (hw->phy_type == e1000_phy_m88) {
-        /* Because we reset the PHY above, we need to re-force TX_CLK in the
-         * Extended PHY Specific Control Register to 25MHz clock.  This value
-         * defaults back to a 2.5MHz clock when the PHY is reset.
-         */
-        ret_val = e1000_read_phy_reg(hw, M88E1000_EXT_PHY_SPEC_CTRL, 
&phy_data);
-        if (ret_val)
-            return ret_val;
-
-        phy_data |= M88E1000_EPSCR_TX_CLK_25;
-        ret_val = e1000_write_phy_reg(hw, M88E1000_EXT_PHY_SPEC_CTRL, 
phy_data);
-        if (ret_val)
-            return ret_val;
-
-        /* In addition, because of the s/w reset above, we need to enable CRS 
on
-         * TX.  This must be set for both full and half duplex operation.
-         */
-        ret_val = e1000_read_phy_reg(hw, M88E1000_PHY_SPEC_CTRL, &phy_data);
-        if (ret_val)
-            return ret_val;
-
-        phy_data |= M88E1000_PSCR_ASSERT_CRS_ON_TX;
-        ret_val = e1000_write_phy_reg(hw, M88E1000_PHY_SPEC_CTRL, phy_data);
-        if (ret_val)
-            return ret_val;
-
-        if ((hw->mac_type == e1000_82544 || hw->mac_type == e1000_82543) &&
-            (!hw->autoneg) && (hw->forced_speed_duplex == e1000_10_full ||
-             hw->forced_speed_duplex == e1000_10_half)) {
-            ret_val = e1000_polarity_reversal_workaround(hw);
-            if (ret_val)
-                return ret_val;
-        }
-    } else if (hw->phy_type == e1000_phy_gg82563) {
-        /* The TX_CLK of the Extended PHY Specific Control Register defaults
-         * to 2.5MHz on a reset.  We need to re-force it back to 25MHz, if
-         * we're not in a forced 10/duplex configuration. */
-        ret_val = e1000_read_phy_reg(hw, GG82563_PHY_MAC_SPEC_CTRL, &phy_data);
-        if (ret_val)
-            return ret_val;
-
-        phy_data &= ~GG82563_MSCR_TX_CLK_MASK;
-        if ((hw->forced_speed_duplex == e1000_10_full) ||
-            (hw->forced_speed_duplex == e1000_10_half))
-            phy_data |= GG82563_MSCR_TX_CLK_10MBPS_2_5MHZ;
-        else
-            phy_data |= GG82563_MSCR_TX_CLK_100MBPS_25MHZ;
-
-        /* Also due to the reset, we need to enable CRS on Tx. */
-        phy_data |= GG82563_MSCR_ASSERT_CRS_ON_TX;
-
-        ret_val = e1000_write_phy_reg(hw, GG82563_PHY_MAC_SPEC_CTRL, phy_data);
-        if (ret_val)
-            return ret_val;
-    }
-    return E1000_SUCCESS;
-}
-
-/******************************************************************************
-* Sets the collision distance in the Transmit Control register
-*
-* hw - Struct containing variables accessed by shared code
-*
-* Link should have been established previously. Reads the speed and duplex
-* information from the Device Status register.
-******************************************************************************/
-void e1000_config_collision_dist(struct e1000_hw *hw)
-{
-    u32 tctl, coll_dist;
-
-    DEBUGFUNC("e1000_config_collision_dist");
-
-    if (hw->mac_type < e1000_82543)
-        coll_dist = E1000_COLLISION_DISTANCE_82542;
-    else
-        coll_dist = E1000_COLLISION_DISTANCE;
-
-    tctl = er32(TCTL);
-
-    tctl &= ~E1000_TCTL_COLD;
-    tctl |= coll_dist << E1000_COLD_SHIFT;
-
-    ew32(TCTL, tctl);
-    E1000_WRITE_FLUSH();
-}
-
-/******************************************************************************
-* Sets MAC speed and duplex settings to reflect the those in the PHY
-*
-* hw - Struct containing variables accessed by shared code
-* mii_reg - data to write to the MII control register
-*
-* The contents of the PHY register containing the needed information need to
-* be passed in.
-******************************************************************************/
-static s32 e1000_config_mac_to_phy(struct e1000_hw *hw)
-{
-    u32 ctrl;
-    s32 ret_val;
-    u16 phy_data;
-
-    DEBUGFUNC("e1000_config_mac_to_phy");
-
-    /* 82544 or newer MAC, Auto Speed Detection takes care of
-    * MAC speed/duplex configuration.*/
-    if (hw->mac_type >= e1000_82544)
-        return E1000_SUCCESS;
-
-    /* Read the Device Control Register and set the bits to Force Speed
-     * and Duplex.
-     */
-    ctrl = er32(CTRL);
-    ctrl |= (E1000_CTRL_FRCSPD | E1000_CTRL_FRCDPX);
-    ctrl &= ~(E1000_CTRL_SPD_SEL | E1000_CTRL_ILOS);
-
-    /* Set up duplex in the Device Control and Transmit Control
-     * registers depending on negotiated values.
-     */
-    ret_val = e1000_read_phy_reg(hw, M88E1000_PHY_SPEC_STATUS, &phy_data);
-    if (ret_val)
-        return ret_val;
-
-    if (phy_data & M88E1000_PSSR_DPLX)
-        ctrl |= E1000_CTRL_FD;
-    else
-        ctrl &= ~E1000_CTRL_FD;
-
-    e1000_config_collision_dist(hw);
-
-    /* Set up speed in the Device Control register depending on
-     * negotiated values.
-     */
-    if ((phy_data & M88E1000_PSSR_SPEED) == M88E1000_PSSR_1000MBS)
-        ctrl |= E1000_CTRL_SPD_1000;
-    else if ((phy_data & M88E1000_PSSR_SPEED) == M88E1000_PSSR_100MBS)
-        ctrl |= E1000_CTRL_SPD_100;
-
-    /* Write the configured values back to the Device Control Reg. */
-    ew32(CTRL, ctrl);
-    return E1000_SUCCESS;
-}
-
-/******************************************************************************
- * Forces the MAC's flow control settings.
- *
- * hw - Struct containing variables accessed by shared code
- *
- * Sets the TFCE and RFCE bits in the device control register to reflect
- * the adapter settings. TFCE and RFCE need to be explicitly set by
- * software when a Copper PHY is used because autonegotiation is managed
- * by the PHY rather than the MAC. Software must also configure these
- * bits when link is forced on a fiber connection.
- *****************************************************************************/
-s32 e1000_force_mac_fc(struct e1000_hw *hw)
-{
-    u32 ctrl;
-
-    DEBUGFUNC("e1000_force_mac_fc");
-
-    /* Get the current configuration of the Device Control Register */
-    ctrl = er32(CTRL);
-
-    /* Because we didn't get link via the internal auto-negotiation
-     * mechanism (we either forced link or we got link via PHY
-     * auto-neg), we have to manually enable/disable transmit an
-     * receive flow control.
-     *
-     * The "Case" statement below enables/disable flow control
-     * according to the "hw->fc" parameter.
-     *
-     * The possible values of the "fc" parameter are:
-     *      0:  Flow control is completely disabled
-     *      1:  Rx flow control is enabled (we can receive pause
-     *          frames but not send pause frames).
-     *      2:  Tx flow control is enabled (we can send pause frames
-     *          frames but we do not receive pause frames).
-     *      3:  Both Rx and TX flow control (symmetric) is enabled.
-     *  other:  No other values should be possible at this point.
-     */
-
-    switch (hw->fc) {
-    case E1000_FC_NONE:
-        ctrl &= (~(E1000_CTRL_TFCE | E1000_CTRL_RFCE));
-        break;
-    case E1000_FC_RX_PAUSE:
-        ctrl &= (~E1000_CTRL_TFCE);
-        ctrl |= E1000_CTRL_RFCE;
-        break;
-    case E1000_FC_TX_PAUSE:
-        ctrl &= (~E1000_CTRL_RFCE);
-        ctrl |= E1000_CTRL_TFCE;
-        break;
-    case E1000_FC_FULL:
-        ctrl |= (E1000_CTRL_TFCE | E1000_CTRL_RFCE);
-        break;
-    default:
-        DEBUGOUT("Flow control param set incorrectly\n");
-        return -E1000_ERR_CONFIG;
-    }
-
-    /* Disable TX Flow Control for 82542 (rev 2.0) */
-    if (hw->mac_type == e1000_82542_rev2_0)
-        ctrl &= (~E1000_CTRL_TFCE);
-
-    ew32(CTRL, ctrl);
-    return E1000_SUCCESS;
-}
-
-/******************************************************************************
- * Configures flow control settings after link is established
- *
- * hw - Struct containing variables accessed by shared code
- *
- * Should be called immediately after a valid link has been established.
- * Forces MAC flow control settings if link was forced. When in MII/GMII mode
- * and autonegotiation is enabled, the MAC flow control settings will be set
- * based on the flow control negotiated by the PHY. In TBI mode, the TFCE
- * and RFCE bits will be automaticaly set to the negotiated flow control mode.
- *****************************************************************************/
-static s32 e1000_config_fc_after_link_up(struct e1000_hw *hw)
-{
-    s32 ret_val;
-    u16 mii_status_reg;
-    u16 mii_nway_adv_reg;
-    u16 mii_nway_lp_ability_reg;
-    u16 speed;
-    u16 duplex;
-
-    DEBUGFUNC("e1000_config_fc_after_link_up");
-
-    /* Check for the case where we have fiber media and auto-neg failed
-     * so we had to force link.  In this case, we need to force the
-     * configuration of the MAC to match the "fc" parameter.
-     */
-    if (((hw->media_type == e1000_media_type_fiber) && (hw->autoneg_failed)) ||
-        ((hw->media_type == e1000_media_type_internal_serdes) &&
-         (hw->autoneg_failed)) ||
-        ((hw->media_type == e1000_media_type_copper) && (!hw->autoneg))) {
-        ret_val = e1000_force_mac_fc(hw);
-        if (ret_val) {
-            DEBUGOUT("Error forcing flow control settings\n");
-            return ret_val;
-        }
-    }
-
-    /* Check for the case where we have copper media and auto-neg is
-     * enabled.  In this case, we need to check and see if Auto-Neg
-     * has completed, and if so, how the PHY and link partner has
-     * flow control configured.
-     */
-    if ((hw->media_type == e1000_media_type_copper) && hw->autoneg) {
-        /* Read the MII Status Register and check to see if AutoNeg
-         * has completed.  We read this twice because this reg has
-         * some "sticky" (latched) bits.
-         */
-        ret_val = e1000_read_phy_reg(hw, PHY_STATUS, &mii_status_reg);
-        if (ret_val)
-            return ret_val;
-        ret_val = e1000_read_phy_reg(hw, PHY_STATUS, &mii_status_reg);
-        if (ret_val)
-            return ret_val;
-
-        if (mii_status_reg & MII_SR_AUTONEG_COMPLETE) {
-            /* The AutoNeg process has completed, so we now need to
-             * read both the Auto Negotiation Advertisement Register
-             * (Address 4) and the Auto_Negotiation Base Page Ability
-             * Register (Address 5) to determine how flow control was
-             * negotiated.
-             */
-            ret_val = e1000_read_phy_reg(hw, PHY_AUTONEG_ADV,
-                                         &mii_nway_adv_reg);
-            if (ret_val)
-                return ret_val;
-            ret_val = e1000_read_phy_reg(hw, PHY_LP_ABILITY,
-                                         &mii_nway_lp_ability_reg);
-            if (ret_val)
-                return ret_val;
-
-            /* Two bits in the Auto Negotiation Advertisement Register
-             * (Address 4) and two bits in the Auto Negotiation Base
-             * Page Ability Register (Address 5) determine flow control
-             * for both the PHY and the link partner.  The following
-             * table, taken out of the IEEE 802.3ab/D6.0 dated March 25,
-             * 1999, describes these PAUSE resolution bits and how flow
-             * control is determined based upon these settings.
-             * NOTE:  DC = Don't Care
-             *
-             *   LOCAL DEVICE  |   LINK PARTNER
-             * PAUSE | ASM_DIR | PAUSE | ASM_DIR | NIC Resolution
-             *-------|---------|-------|---------|--------------------
-             *   0   |    0    |  DC   |   DC    | E1000_FC_NONE
-             *   0   |    1    |   0   |   DC    | E1000_FC_NONE
-             *   0   |    1    |   1   |    0    | E1000_FC_NONE
-             *   0   |    1    |   1   |    1    | E1000_FC_TX_PAUSE
-             *   1   |    0    |   0   |   DC    | E1000_FC_NONE
-             *   1   |   DC    |   1   |   DC    | E1000_FC_FULL
-             *   1   |    1    |   0   |    0    | E1000_FC_NONE
-             *   1   |    1    |   0   |    1    | E1000_FC_RX_PAUSE
-             *
-             */
-            /* Are both PAUSE bits set to 1?  If so, this implies
-             * Symmetric Flow Control is enabled at both ends.  The
-             * ASM_DIR bits are irrelevant per the spec.
-             *
-             * For Symmetric Flow Control:
-             *
-             *   LOCAL DEVICE  |   LINK PARTNER
-             * PAUSE | ASM_DIR | PAUSE | ASM_DIR | Result
-             *-------|---------|-------|---------|--------------------
-             *   1   |   DC    |   1   |   DC    | E1000_FC_FULL
-             *
-             */
-            if ((mii_nway_adv_reg & NWAY_AR_PAUSE) &&
-                (mii_nway_lp_ability_reg & NWAY_LPAR_PAUSE)) {
-                /* Now we need to check if the user selected RX ONLY
-                 * of pause frames.  In this case, we had to advertise
-                 * FULL flow control because we could not advertise RX
-                 * ONLY. Hence, we must now check to see if we need to
-                 * turn OFF  the TRANSMISSION of PAUSE frames.
-                 */
-                if (hw->original_fc == E1000_FC_FULL) {
-                    hw->fc = E1000_FC_FULL;
-                    DEBUGOUT("Flow Control = FULL.\n");
-                } else {
-                    hw->fc = E1000_FC_RX_PAUSE;
-                    DEBUGOUT("Flow Control = RX PAUSE frames only.\n");
-                }
-            }
-            /* For receiving PAUSE frames ONLY.
-             *
-             *   LOCAL DEVICE  |   LINK PARTNER
-             * PAUSE | ASM_DIR | PAUSE | ASM_DIR | Result
-             *-------|---------|-------|---------|--------------------
-             *   0   |    1    |   1   |    1    | E1000_FC_TX_PAUSE
-             *
-             */
-            else if (!(mii_nway_adv_reg & NWAY_AR_PAUSE) &&
-                     (mii_nway_adv_reg & NWAY_AR_ASM_DIR) &&
-                     (mii_nway_lp_ability_reg & NWAY_LPAR_PAUSE) &&
-                     (mii_nway_lp_ability_reg & NWAY_LPAR_ASM_DIR)) {
-                hw->fc = E1000_FC_TX_PAUSE;
-                DEBUGOUT("Flow Control = TX PAUSE frames only.\n");
-            }
-            /* For transmitting PAUSE frames ONLY.
-             *
-             *   LOCAL DEVICE  |   LINK PARTNER
-             * PAUSE | ASM_DIR | PAUSE | ASM_DIR | Result
-             *-------|---------|-------|---------|--------------------
-             *   1   |    1    |   0   |    1    | E1000_FC_RX_PAUSE
-             *
-             */
-            else if ((mii_nway_adv_reg & NWAY_AR_PAUSE) &&
-                     (mii_nway_adv_reg & NWAY_AR_ASM_DIR) &&
-                     !(mii_nway_lp_ability_reg & NWAY_LPAR_PAUSE) &&
-                     (mii_nway_lp_ability_reg & NWAY_LPAR_ASM_DIR)) {
-                hw->fc = E1000_FC_RX_PAUSE;
-                DEBUGOUT("Flow Control = RX PAUSE frames only.\n");
-            }
-            /* Per the IEEE spec, at this point flow control should be
-             * disabled.  However, we want to consider that we could
-             * be connected to a legacy switch that doesn't advertise
-             * desired flow control, but can be forced on the link
-             * partner.  So if we advertised no flow control, that is
-             * what we will resolve to.  If we advertised some kind of
-             * receive capability (Rx Pause Only or Full Flow Control)
-             * and the link partner advertised none, we will configure
-             * ourselves to enable Rx Flow Control only.  We can do
-             * this safely for two reasons:  If the link partner really
-             * didn't want flow control enabled, and we enable Rx, no
-             * harm done since we won't be receiving any PAUSE frames
-             * anyway.  If the intent on the link partner was to have
-             * flow control enabled, then by us enabling RX only, we
-             * can at least receive pause frames and process them.
-             * This is a good idea because in most cases, since we are
-             * predominantly a server NIC, more times than not we will
-             * be asked to delay transmission of packets than asking
-             * our link partner to pause transmission of frames.
-             */
-            else if ((hw->original_fc == E1000_FC_NONE ||
-                      hw->original_fc == E1000_FC_TX_PAUSE) ||
-                      hw->fc_strict_ieee) {
-                hw->fc = E1000_FC_NONE;
-                DEBUGOUT("Flow Control = NONE.\n");
-            } else {
-                hw->fc = E1000_FC_RX_PAUSE;
-                DEBUGOUT("Flow Control = RX PAUSE frames only.\n");
-            }
-
-            /* Now we need to do one last check...  If we auto-
-             * negotiated to HALF DUPLEX, flow control should not be
-             * enabled per IEEE 802.3 spec.
-             */
-            ret_val = e1000_get_speed_and_duplex(hw, &speed, &duplex);
-            if (ret_val) {
-                DEBUGOUT("Error getting link speed and duplex\n");
-                return ret_val;
-            }
-
-            if (duplex == HALF_DUPLEX)
-                hw->fc = E1000_FC_NONE;
-
-            /* Now we call a subroutine to actually force the MAC
-             * controller to use the correct flow control settings.
-             */
-            ret_val = e1000_force_mac_fc(hw);
-            if (ret_val) {
-                DEBUGOUT("Error forcing flow control settings\n");
-                return ret_val;
-            }
-        } else {
-            DEBUGOUT("Copper PHY and Auto Neg has not completed.\n");
-        }
-    }
-    return E1000_SUCCESS;
-}
-
-/******************************************************************************
- * Checks to see if the link status of the hardware has changed.
- *
- * hw - Struct containing variables accessed by shared code
- *
- * Called by any function that needs to check the link status of the adapter.
- *****************************************************************************/
-s32 e1000_check_for_link(struct e1000_hw *hw)
-{
-    u32 rxcw = 0;
-    u32 ctrl;
-    u32 status;
-    u32 rctl;
-    u32 icr;
-    u32 signal = 0;
-    s32 ret_val;
-    u16 phy_data;
-
-    DEBUGFUNC("e1000_check_for_link");
-
-    ctrl = er32(CTRL);
-    status = er32(STATUS);
-
-    /* On adapters with a MAC newer than 82544, SW Defineable pin 1 will be
-     * set when the optics detect a signal. On older adapters, it will be
-     * cleared when there is a signal.  This applies to fiber media only.
-     */
-    if ((hw->media_type == e1000_media_type_fiber) ||
-        (hw->media_type == e1000_media_type_internal_serdes)) {
-        rxcw = er32(RXCW);
-
-        if (hw->media_type == e1000_media_type_fiber) {
-            signal = (hw->mac_type > e1000_82544) ? E1000_CTRL_SWDPIN1 : 0;
-            if (status & E1000_STATUS_LU)
-                hw->get_link_status = false;
-        }
-    }
-
-    /* If we have a copper PHY then we only want to go out to the PHY
-     * registers to see if Auto-Neg has completed and/or if our link
-     * status has changed.  The get_link_status flag will be set if we
-     * receive a Link Status Change interrupt or we have Rx Sequence
-     * Errors.
-     */
-    if ((hw->media_type == e1000_media_type_copper) && hw->get_link_status) {
-        /* First we want to see if the MII Status Register reports
-         * link.  If so, then we want to get the current speed/duplex
-         * of the PHY.
-         * Read the register twice since the link bit is sticky.
-         */
-        ret_val = e1000_read_phy_reg(hw, PHY_STATUS, &phy_data);
-        if (ret_val)
-            return ret_val;
-        ret_val = e1000_read_phy_reg(hw, PHY_STATUS, &phy_data);
-        if (ret_val)
-            return ret_val;
-
-        if (phy_data & MII_SR_LINK_STATUS) {
-            hw->get_link_status = false;
-            /* Check if there was DownShift, must be checked immediately after
-             * link-up */
-            e1000_check_downshift(hw);
-
-            /* If we are on 82544 or 82543 silicon and speed/duplex
-             * are forced to 10H or 10F, then we will implement the polarity
-             * reversal workaround.  We disable interrupts first, and upon
-             * returning, place the devices interrupt state to its previous
-             * value except for the link status change interrupt which will
-             * happen due to the execution of this workaround.
-             */
-
-            if ((hw->mac_type == e1000_82544 || hw->mac_type == e1000_82543) &&
-                (!hw->autoneg) &&
-                (hw->forced_speed_duplex == e1000_10_full ||
-                 hw->forced_speed_duplex == e1000_10_half)) {
-                ew32(IMC, 0xffffffff);
-                ret_val = e1000_polarity_reversal_workaround(hw);
-                icr = er32(ICR);
-                ew32(ICS, (icr & ~E1000_ICS_LSC));
-                ew32(IMS, IMS_ENABLE_MASK);
-            }
-
-        } else {
-            /* No link detected */
-            e1000_config_dsp_after_link_change(hw, false);
-            return 0;
-        }
-
-        /* If we are forcing speed/duplex, then we simply return since
-         * we have already determined whether we have link or not.
-         */
-        if (!hw->autoneg) return -E1000_ERR_CONFIG;
-
-        /* optimize the dsp settings for the igp phy */
-        e1000_config_dsp_after_link_change(hw, true);
-
-        /* We have a M88E1000 PHY and Auto-Neg is enabled.  If we
-         * have Si on board that is 82544 or newer, Auto
-         * Speed Detection takes care of MAC speed/duplex
-         * configuration.  So we only need to configure Collision
-         * Distance in the MAC.  Otherwise, we need to force
-         * speed/duplex on the MAC to the current PHY speed/duplex
-         * settings.
-         */
-        if (hw->mac_type >= e1000_82544)
-            e1000_config_collision_dist(hw);
-        else {
-            ret_val = e1000_config_mac_to_phy(hw);
-            if (ret_val) {
-                DEBUGOUT("Error configuring MAC to PHY settings\n");
-                return ret_val;
-            }
-        }
-
-        /* Configure Flow Control now that Auto-Neg has completed. First, we
-         * need to restore the desired flow control settings because we may
-         * have had to re-autoneg with a different link partner.
-         */
-        ret_val = e1000_config_fc_after_link_up(hw);
-        if (ret_val) {
-            DEBUGOUT("Error configuring flow control\n");
-            return ret_val;
-        }
-
-        /* At this point we know that we are on copper and we have
-         * auto-negotiated link.  These are conditions for checking the link
-         * partner capability register.  We use the link speed to determine if
-         * TBI compatibility needs to be turned on or off.  If the link is not
-         * at gigabit speed, then TBI compatibility is not needed.  If we are
-         * at gigabit speed, we turn on TBI compatibility.
-         */
-        if (hw->tbi_compatibility_en) {
-            u16 speed, duplex;
-            ret_val = e1000_get_speed_and_duplex(hw, &speed, &duplex);
-            if (ret_val) {
-                DEBUGOUT("Error getting link speed and duplex\n");
-                return ret_val;
-            }
-            if (speed != SPEED_1000) {
-                /* If link speed is not set to gigabit speed, we do not need
-                 * to enable TBI compatibility.
-                 */
-                if (hw->tbi_compatibility_on) {
-                    /* If we previously were in the mode, turn it off. */
-                    rctl = er32(RCTL);
-                    rctl &= ~E1000_RCTL_SBP;
-                    ew32(RCTL, rctl);
-                    hw->tbi_compatibility_on = false;
-                }
-            } else {
-                /* If TBI compatibility is was previously off, turn it on. For
-                 * compatibility with a TBI link partner, we will store bad
-                 * packets. Some frames have an additional byte on the end and
-                 * will look like CRC errors to to the hardware.
-                 */
-                if (!hw->tbi_compatibility_on) {
-                    hw->tbi_compatibility_on = true;
-                    rctl = er32(RCTL);
-                    rctl |= E1000_RCTL_SBP;
-                    ew32(RCTL, rctl);
-                }
-            }
-        }
-    }
-    /* If we don't have link (auto-negotiation failed or link partner cannot
-     * auto-negotiate), the cable is plugged in (we have signal), and our
-     * link partner is not trying to auto-negotiate with us (we are receiving
-     * idles or data), we need to force link up. We also need to give
-     * auto-negotiation time to complete, in case the cable was just plugged
-     * in. The autoneg_failed flag does this.
-     */
-    else if ((((hw->media_type == e1000_media_type_fiber) &&
-              ((ctrl & E1000_CTRL_SWDPIN1) == signal)) ||
-              (hw->media_type == e1000_media_type_internal_serdes)) &&
-              (!(status & E1000_STATUS_LU)) &&
-              (!(rxcw & E1000_RXCW_C))) {
-        if (hw->autoneg_failed == 0) {
-            hw->autoneg_failed = 1;
-            return 0;
-        }
-        DEBUGOUT("NOT RXing /C/, disable AutoNeg and force link.\n");
-
-        /* Disable auto-negotiation in the TXCW register */
-        ew32(TXCW, (hw->txcw & ~E1000_TXCW_ANE));
-
-        /* Force link-up and also force full-duplex. */
-        ctrl = er32(CTRL);
-        ctrl |= (E1000_CTRL_SLU | E1000_CTRL_FD);
-        ew32(CTRL, ctrl);
-
-        /* Configure Flow Control after forcing link up. */
-        ret_val = e1000_config_fc_after_link_up(hw);
-        if (ret_val) {
-            DEBUGOUT("Error configuring flow control\n");
-            return ret_val;
-        }
-    }
-    /* If we are forcing link and we are receiving /C/ ordered sets, re-enable
-     * auto-negotiation in the TXCW register and disable forced link in the
-     * Device Control register in an attempt to auto-negotiate with our link
-     * partner.
-     */
-    else if (((hw->media_type == e1000_media_type_fiber) ||
-              (hw->media_type == e1000_media_type_internal_serdes)) &&
-              (ctrl & E1000_CTRL_SLU) && (rxcw & E1000_RXCW_C)) {
-        DEBUGOUT("RXing /C/, enable AutoNeg and stop forcing link.\n");
-        ew32(TXCW, hw->txcw);
-        ew32(CTRL, (ctrl & ~E1000_CTRL_SLU));
-
-        hw->serdes_link_down = false;
-    }
-    /* If we force link for non-auto-negotiation switch, check link status
-     * based on MAC synchronization for internal serdes media type.
-     */
-    else if ((hw->media_type == e1000_media_type_internal_serdes) &&
-             !(E1000_TXCW_ANE & er32(TXCW))) {
-        /* SYNCH bit and IV bit are sticky. */
-        udelay(10);
-        if (E1000_RXCW_SYNCH & er32(RXCW)) {
-            if (!(rxcw & E1000_RXCW_IV)) {
-                hw->serdes_link_down = false;
-                DEBUGOUT("SERDES: Link is up.\n");
-            }
-        } else {
-            hw->serdes_link_down = true;
-            DEBUGOUT("SERDES: Link is down.\n");
-        }
-    }
-    if ((hw->media_type == e1000_media_type_internal_serdes) &&
-        (E1000_TXCW_ANE & er32(TXCW))) {
-        hw->serdes_link_down = !(E1000_STATUS_LU & er32(STATUS));
-    }
-    return E1000_SUCCESS;
-}
-
-/******************************************************************************
- * Detects the current speed and duplex settings of the hardware.
- *
- * hw - Struct containing variables accessed by shared code
- * speed - Speed of the connection
- * duplex - Duplex setting of the connection
- *****************************************************************************/
-s32 e1000_get_speed_and_duplex(struct e1000_hw *hw, u16 *speed, u16 *duplex)
-{
-    u32 status;
-    s32 ret_val;
-    u16 phy_data;
-
-    DEBUGFUNC("e1000_get_speed_and_duplex");
-
-    if (hw->mac_type >= e1000_82543) {
-        status = er32(STATUS);
-        if (status & E1000_STATUS_SPEED_1000) {
-            *speed = SPEED_1000;
-            DEBUGOUT("1000 Mbs, ");
-        } else if (status & E1000_STATUS_SPEED_100) {
-            *speed = SPEED_100;
-            DEBUGOUT("100 Mbs, ");
-        } else {
-            *speed = SPEED_10;
-            DEBUGOUT("10 Mbs, ");
-        }
-
-        if (status & E1000_STATUS_FD) {
-            *duplex = FULL_DUPLEX;
-            DEBUGOUT("Full Duplex\n");
-        } else {
-            *duplex = HALF_DUPLEX;
-            DEBUGOUT(" Half Duplex\n");
-        }
-    } else {
-        DEBUGOUT("1000 Mbs, Full Duplex\n");
-        *speed = SPEED_1000;
-        *duplex = FULL_DUPLEX;
-    }
-
-    /* IGP01 PHY may advertise full duplex operation after speed downgrade even
-     * if it is operating at half duplex.  Here we set the duplex settings to
-     * match the duplex in the link partner's capabilities.
-     */
-    if (hw->phy_type == e1000_phy_igp && hw->speed_downgraded) {
-        ret_val = e1000_read_phy_reg(hw, PHY_AUTONEG_EXP, &phy_data);
-        if (ret_val)
-            return ret_val;
-
-        if (!(phy_data & NWAY_ER_LP_NWAY_CAPS))
-            *duplex = HALF_DUPLEX;
-        else {
-            ret_val = e1000_read_phy_reg(hw, PHY_LP_ABILITY, &phy_data);
-            if (ret_val)
-                return ret_val;
-            if ((*speed == SPEED_100 && !(phy_data & NWAY_LPAR_100TX_FD_CAPS)) 
||
-               (*speed == SPEED_10 && !(phy_data & NWAY_LPAR_10T_FD_CAPS)))
-                *duplex = HALF_DUPLEX;
-        }
-    }
-
-    if ((hw->mac_type == e1000_80003es2lan) &&
-        (hw->media_type == e1000_media_type_copper)) {
-        if (*speed == SPEED_1000)
-            ret_val = e1000_configure_kmrn_for_1000(hw);
-        else
-            ret_val = e1000_configure_kmrn_for_10_100(hw, *duplex);
-        if (ret_val)
-            return ret_val;
-    }
-
-    if ((hw->phy_type == e1000_phy_igp_3) && (*speed == SPEED_1000)) {
-        ret_val = e1000_kumeran_lock_loss_workaround(hw);
-        if (ret_val)
-            return ret_val;
-    }
-
-    return E1000_SUCCESS;
-}
-
-/******************************************************************************
-* Blocks until autoneg completes or times out (~4.5 seconds)
-*
-* hw - Struct containing variables accessed by shared code
-******************************************************************************/
-static s32 e1000_wait_autoneg(struct e1000_hw *hw)
-{
-    s32 ret_val;
-    u16 i;
-    u16 phy_data;
-
-    DEBUGFUNC("e1000_wait_autoneg");
-    DEBUGOUT("Waiting for Auto-Neg to complete.\n");
-
-    /* We will wait for autoneg to complete or 4.5 seconds to expire. */
-    for (i = PHY_AUTO_NEG_TIME; i > 0; i--) {
-        /* Read the MII Status Register and wait for Auto-Neg
-         * Complete bit to be set.
-         */
-        ret_val = e1000_read_phy_reg(hw, PHY_STATUS, &phy_data);
-        if (ret_val)
-            return ret_val;
-        ret_val = e1000_read_phy_reg(hw, PHY_STATUS, &phy_data);
-        if (ret_val)
-            return ret_val;
-        if (phy_data & MII_SR_AUTONEG_COMPLETE) {
-            return E1000_SUCCESS;
-        }
-        msleep(100);
-    }
-    return E1000_SUCCESS;
-}
-
-/******************************************************************************
-* Raises the Management Data Clock
-*
-* hw - Struct containing variables accessed by shared code
-* ctrl - Device control register's current value
-******************************************************************************/
-static void e1000_raise_mdi_clk(struct e1000_hw *hw, u32 *ctrl)
-{
-    /* Raise the clock input to the Management Data Clock (by setting the MDC
-     * bit), and then delay 10 microseconds.
-     */
-    ew32(CTRL, (*ctrl | E1000_CTRL_MDC));
-    E1000_WRITE_FLUSH();
-    udelay(10);
-}
-
-/******************************************************************************
-* Lowers the Management Data Clock
-*
-* hw - Struct containing variables accessed by shared code
-* ctrl - Device control register's current value
-******************************************************************************/
-static void e1000_lower_mdi_clk(struct e1000_hw *hw, u32 *ctrl)
-{
-    /* Lower the clock input to the Management Data Clock (by clearing the MDC
-     * bit), and then delay 10 microseconds.
-     */
-    ew32(CTRL, (*ctrl & ~E1000_CTRL_MDC));
-    E1000_WRITE_FLUSH();
-    udelay(10);
-}
-
-/******************************************************************************
-* Shifts data bits out to the PHY
-*
-* hw - Struct containing variables accessed by shared code
-* data - Data to send out to the PHY
-* count - Number of bits to shift out
-*
-* Bits are shifted out in MSB to LSB order.
-******************************************************************************/
-static void e1000_shift_out_mdi_bits(struct e1000_hw *hw, u32 data, u16 count)
-{
-    u32 ctrl;
-    u32 mask;
-
-    /* We need to shift "count" number of bits out to the PHY. So, the value
-     * in the "data" parameter will be shifted out to the PHY one bit at a
-     * time. In order to do this, "data" must be broken down into bits.
-     */
-    mask = 0x01;
-    mask <<= (count - 1);
-
-    ctrl = er32(CTRL);
-
-    /* Set MDIO_DIR and MDC_DIR direction bits to be used as output pins. */
-    ctrl |= (E1000_CTRL_MDIO_DIR | E1000_CTRL_MDC_DIR);
-
-    while (mask) {
-        /* A "1" is shifted out to the PHY by setting the MDIO bit to "1" and
-         * then raising and lowering the Management Data Clock. A "0" is
-         * shifted out to the PHY by setting the MDIO bit to "0" and then
-         * raising and lowering the clock.
-         */
-        if (data & mask)
-            ctrl |= E1000_CTRL_MDIO;
-        else
-            ctrl &= ~E1000_CTRL_MDIO;
-
-        ew32(CTRL, ctrl);
-        E1000_WRITE_FLUSH();
-
-        udelay(10);
-
-        e1000_raise_mdi_clk(hw, &ctrl);
-        e1000_lower_mdi_clk(hw, &ctrl);
-
-        mask = mask >> 1;
-    }
-}
-
-/******************************************************************************
-* Shifts data bits in from the PHY
-*
-* hw - Struct containing variables accessed by shared code
-*
-* Bits are shifted in in MSB to LSB order.
-******************************************************************************/
-static u16 e1000_shift_in_mdi_bits(struct e1000_hw *hw)
-{
-    u32 ctrl;
-    u16 data = 0;
-    u8 i;
-
-    /* In order to read a register from the PHY, we need to shift in a total
-     * of 18 bits from the PHY. The first two bit (turnaround) times are used
-     * to avoid contention on the MDIO pin when a read operation is performed.
-     * These two bits are ignored by us and thrown away. Bits are "shifted in"
-     * by raising the input to the Management Data Clock (setting the MDC bit),
-     * and then reading the value of the MDIO bit.
-     */
-    ctrl = er32(CTRL);
-
-    /* Clear MDIO_DIR (SWDPIO1) to indicate this bit is to be used as input. */
-    ctrl &= ~E1000_CTRL_MDIO_DIR;
-    ctrl &= ~E1000_CTRL_MDIO;
-
-    ew32(CTRL, ctrl);
-    E1000_WRITE_FLUSH();
-
-    /* Raise and Lower the clock before reading in the data. This accounts for
-     * the turnaround bits. The first clock occurred when we clocked out the
-     * last bit of the Register Address.
-     */
-    e1000_raise_mdi_clk(hw, &ctrl);
-    e1000_lower_mdi_clk(hw, &ctrl);
-
-    for (data = 0, i = 0; i < 16; i++) {
-        data = data << 1;
-        e1000_raise_mdi_clk(hw, &ctrl);
-        ctrl = er32(CTRL);
-        /* Check to see if we shifted in a "1". */
-        if (ctrl & E1000_CTRL_MDIO)
-            data |= 1;
-        e1000_lower_mdi_clk(hw, &ctrl);
-    }
-
-    e1000_raise_mdi_clk(hw, &ctrl);
-    e1000_lower_mdi_clk(hw, &ctrl);
-
-    return data;
-}
-
-static s32 e1000_swfw_sync_acquire(struct e1000_hw *hw, u16 mask)
-{
-    u32 swfw_sync = 0;
-    u32 swmask = mask;
-    u32 fwmask = mask << 16;
-    s32 timeout = 200;
-
-    DEBUGFUNC("e1000_swfw_sync_acquire");
-
-    if (hw->swfwhw_semaphore_present)
-        return e1000_get_software_flag(hw);
-
-    if (!hw->swfw_sync_present)
-        return e1000_get_hw_eeprom_semaphore(hw);
-
-    while (timeout) {
-            if (e1000_get_hw_eeprom_semaphore(hw))
-                return -E1000_ERR_SWFW_SYNC;
-
-            swfw_sync = er32(SW_FW_SYNC);
-            if (!(swfw_sync & (fwmask | swmask))) {
-                break;
-            }
-
-            /* firmware currently using resource (fwmask) */
-            /* or other software thread currently using resource (swmask) */
-            e1000_put_hw_eeprom_semaphore(hw);
-            mdelay(5);
-            timeout--;
-    }
-
-    if (!timeout) {
-        DEBUGOUT("Driver can't access resource, SW_FW_SYNC timeout.\n");
-        return -E1000_ERR_SWFW_SYNC;
-    }
-
-    swfw_sync |= swmask;
-    ew32(SW_FW_SYNC, swfw_sync);
-
-    e1000_put_hw_eeprom_semaphore(hw);
-    return E1000_SUCCESS;
-}
-
-static void e1000_swfw_sync_release(struct e1000_hw *hw, u16 mask)
-{
-    u32 swfw_sync;
-    u32 swmask = mask;
-
-    DEBUGFUNC("e1000_swfw_sync_release");
-
-    if (hw->swfwhw_semaphore_present) {
-        e1000_release_software_flag(hw);
-        return;
-    }
-
-    if (!hw->swfw_sync_present) {
-        e1000_put_hw_eeprom_semaphore(hw);
-        return;
-    }
-
-    /* if (e1000_get_hw_eeprom_semaphore(hw))
-     *    return -E1000_ERR_SWFW_SYNC; */
-    while (e1000_get_hw_eeprom_semaphore(hw) != E1000_SUCCESS);
-        /* empty */
-
-    swfw_sync = er32(SW_FW_SYNC);
-    swfw_sync &= ~swmask;
-    ew32(SW_FW_SYNC, swfw_sync);
-
-    e1000_put_hw_eeprom_semaphore(hw);
-}
-
-/*****************************************************************************
-* Reads the value from a PHY register, if the value is on a specific non zero
-* page, sets the page first.
-* hw - Struct containing variables accessed by shared code
-* reg_addr - address of the PHY register to read
-******************************************************************************/
-s32 e1000_read_phy_reg(struct e1000_hw *hw, u32 reg_addr, u16 *phy_data)
-{
-    u32 ret_val;
-    u16 swfw;
-
-    DEBUGFUNC("e1000_read_phy_reg");
-
-    if ((hw->mac_type == e1000_80003es2lan) &&
-        (er32(STATUS) & E1000_STATUS_FUNC_1)) {
-        swfw = E1000_SWFW_PHY1_SM;
-    } else {
-        swfw = E1000_SWFW_PHY0_SM;
-    }
-    if (e1000_swfw_sync_acquire(hw, swfw))
-        return -E1000_ERR_SWFW_SYNC;
-
-    if ((hw->phy_type == e1000_phy_igp ||
-        hw->phy_type == e1000_phy_igp_3 ||
-        hw->phy_type == e1000_phy_igp_2) &&
-       (reg_addr > MAX_PHY_MULTI_PAGE_REG)) {
-        ret_val = e1000_write_phy_reg_ex(hw, IGP01E1000_PHY_PAGE_SELECT,
-                                         (u16)reg_addr);
-        if (ret_val) {
-            e1000_swfw_sync_release(hw, swfw);
-            return ret_val;
-        }
-    } else if (hw->phy_type == e1000_phy_gg82563) {
-        if (((reg_addr & MAX_PHY_REG_ADDRESS) > MAX_PHY_MULTI_PAGE_REG) ||
-            (hw->mac_type == e1000_80003es2lan)) {
-            /* Select Configuration Page */
-            if ((reg_addr & MAX_PHY_REG_ADDRESS) < GG82563_MIN_ALT_REG) {
-                ret_val = e1000_write_phy_reg_ex(hw, GG82563_PHY_PAGE_SELECT,
-                          (u16)((u16)reg_addr >> GG82563_PAGE_SHIFT));
-            } else {
-                /* Use Alternative Page Select register to access
-                 * registers 30 and 31
-                 */
-                ret_val = e1000_write_phy_reg_ex(hw,
-                                                 GG82563_PHY_PAGE_SELECT_ALT,
-                          (u16)((u16)reg_addr >> GG82563_PAGE_SHIFT));
-            }
-
-            if (ret_val) {
-                e1000_swfw_sync_release(hw, swfw);
-                return ret_val;
-            }
-        }
-    }
-
-    ret_val = e1000_read_phy_reg_ex(hw, MAX_PHY_REG_ADDRESS & reg_addr,
-                                    phy_data);
-
-    e1000_swfw_sync_release(hw, swfw);
-    return ret_val;
-}
-
-static s32 e1000_read_phy_reg_ex(struct e1000_hw *hw, u32 reg_addr,
-                                u16 *phy_data)
-{
-    u32 i;
-    u32 mdic = 0;
-    const u32 phy_addr = 1;
-
-    DEBUGFUNC("e1000_read_phy_reg_ex");
-
-    if (reg_addr > MAX_PHY_REG_ADDRESS) {
-        DEBUGOUT1("PHY Address %d is out of range\n", reg_addr);
-        return -E1000_ERR_PARAM;
-    }
-
-    if (hw->mac_type > e1000_82543) {
-        /* Set up Op-code, Phy Address, and register address in the MDI
-         * Control register.  The MAC will take care of interfacing with the
-         * PHY to retrieve the desired data.
-         */
-        mdic = ((reg_addr << E1000_MDIC_REG_SHIFT) |
-                (phy_addr << E1000_MDIC_PHY_SHIFT) |
-                (E1000_MDIC_OP_READ));
-
-        ew32(MDIC, mdic);
-
-        /* Poll the ready bit to see if the MDI read completed */
-        for (i = 0; i < 64; i++) {
-            udelay(50);
-            mdic = er32(MDIC);
-            if (mdic & E1000_MDIC_READY) break;
-        }
-        if (!(mdic & E1000_MDIC_READY)) {
-            DEBUGOUT("MDI Read did not complete\n");
-            return -E1000_ERR_PHY;
-        }
-        if (mdic & E1000_MDIC_ERROR) {
-            DEBUGOUT("MDI Error\n");
-            return -E1000_ERR_PHY;
-        }
-        *phy_data = (u16)mdic;
-    } else {
-        /* We must first send a preamble through the MDIO pin to signal the
-         * beginning of an MII instruction.  This is done by sending 32
-         * consecutive "1" bits.
-         */
-        e1000_shift_out_mdi_bits(hw, PHY_PREAMBLE, PHY_PREAMBLE_SIZE);
-
-        /* Now combine the next few fields that are required for a read
-         * operation.  We use this method instead of calling the
-         * e1000_shift_out_mdi_bits routine five different times. The format of
-         * a MII read instruction consists of a shift out of 14 bits and is
-         * defined as follows:
-         *    <Preamble><SOF><Op Code><Phy Addr><Reg Addr>
-         * followed by a shift in of 18 bits.  This first two bits shifted in
-         * are TurnAround bits used to avoid contention on the MDIO pin when a
-         * READ operation is performed.  These two bits are thrown away
-         * followed by a shift in of 16 bits which contains the desired data.
-         */
-        mdic = ((reg_addr) | (phy_addr << 5) |
-                (PHY_OP_READ << 10) | (PHY_SOF << 12));
-
-        e1000_shift_out_mdi_bits(hw, mdic, 14);
-
-        /* Now that we've shifted out the read command to the MII, we need to
-         * "shift in" the 16-bit value (18 total bits) of the requested PHY
-         * register address.
-         */
-        *phy_data = e1000_shift_in_mdi_bits(hw);
-    }
-    return E1000_SUCCESS;
-}
-
-/******************************************************************************
-* Writes a value to a PHY register
-*
-* hw - Struct containing variables accessed by shared code
-* reg_addr - address of the PHY register to write
-* data - data to write to the PHY
-******************************************************************************/
-s32 e1000_write_phy_reg(struct e1000_hw *hw, u32 reg_addr, u16 phy_data)
-{
-    u32 ret_val;
-    u16 swfw;
-
-    DEBUGFUNC("e1000_write_phy_reg");
-
-    if ((hw->mac_type == e1000_80003es2lan) &&
-        (er32(STATUS) & E1000_STATUS_FUNC_1)) {
-        swfw = E1000_SWFW_PHY1_SM;
-    } else {
-        swfw = E1000_SWFW_PHY0_SM;
-    }
-    if (e1000_swfw_sync_acquire(hw, swfw))
-        return -E1000_ERR_SWFW_SYNC;
-
-    if ((hw->phy_type == e1000_phy_igp ||
-        hw->phy_type == e1000_phy_igp_3 ||
-        hw->phy_type == e1000_phy_igp_2) &&
-       (reg_addr > MAX_PHY_MULTI_PAGE_REG)) {
-        ret_val = e1000_write_phy_reg_ex(hw, IGP01E1000_PHY_PAGE_SELECT,
-                                         (u16)reg_addr);
-        if (ret_val) {
-            e1000_swfw_sync_release(hw, swfw);
-            return ret_val;
-        }
-    } else if (hw->phy_type == e1000_phy_gg82563) {
-        if (((reg_addr & MAX_PHY_REG_ADDRESS) > MAX_PHY_MULTI_PAGE_REG) ||
-            (hw->mac_type == e1000_80003es2lan)) {
-            /* Select Configuration Page */
-            if ((reg_addr & MAX_PHY_REG_ADDRESS) < GG82563_MIN_ALT_REG) {
-                ret_val = e1000_write_phy_reg_ex(hw, GG82563_PHY_PAGE_SELECT,
-                          (u16)((u16)reg_addr >> GG82563_PAGE_SHIFT));
-            } else {
-                /* Use Alternative Page Select register to access
-                 * registers 30 and 31
-                 */
-                ret_val = e1000_write_phy_reg_ex(hw,
-                                                 GG82563_PHY_PAGE_SELECT_ALT,
-                          (u16)((u16)reg_addr >> GG82563_PAGE_SHIFT));
-            }
-
-            if (ret_val) {
-                e1000_swfw_sync_release(hw, swfw);
-                return ret_val;
-            }
-        }
-    }
-
-    ret_val = e1000_write_phy_reg_ex(hw, MAX_PHY_REG_ADDRESS & reg_addr,
-                                     phy_data);
-
-    e1000_swfw_sync_release(hw, swfw);
-    return ret_val;
-}
-
-static s32 e1000_write_phy_reg_ex(struct e1000_hw *hw, u32 reg_addr,
-                                 u16 phy_data)
-{
-    u32 i;
-    u32 mdic = 0;
-    const u32 phy_addr = 1;
-
-    DEBUGFUNC("e1000_write_phy_reg_ex");
-
-    if (reg_addr > MAX_PHY_REG_ADDRESS) {
-        DEBUGOUT1("PHY Address %d is out of range\n", reg_addr);
-        return -E1000_ERR_PARAM;
-    }
-
-    if (hw->mac_type > e1000_82543) {
-        /* Set up Op-code, Phy Address, register address, and data intended
-         * for the PHY register in the MDI Control register.  The MAC will take
-         * care of interfacing with the PHY to send the desired data.
-         */
-        mdic = (((u32)phy_data) |
-                (reg_addr << E1000_MDIC_REG_SHIFT) |
-                (phy_addr << E1000_MDIC_PHY_SHIFT) |
-                (E1000_MDIC_OP_WRITE));
-
-        ew32(MDIC, mdic);
-
-        /* Poll the ready bit to see if the MDI read completed */
-        for (i = 0; i < 641; i++) {
-            udelay(5);
-            mdic = er32(MDIC);
-            if (mdic & E1000_MDIC_READY) break;
-        }
-        if (!(mdic & E1000_MDIC_READY)) {
-            DEBUGOUT("MDI Write did not complete\n");
-            return -E1000_ERR_PHY;
-        }
-    } else {
-        /* We'll need to use the SW defined pins to shift the write command
-         * out to the PHY. We first send a preamble to the PHY to signal the
-         * beginning of the MII instruction.  This is done by sending 32
-         * consecutive "1" bits.
-         */
-        e1000_shift_out_mdi_bits(hw, PHY_PREAMBLE, PHY_PREAMBLE_SIZE);
-
-        /* Now combine the remaining required fields that will indicate a
-         * write operation. We use this method instead of calling the
-         * e1000_shift_out_mdi_bits routine for each field in the command. The
-         * format of a MII write instruction is as follows:
-         * <Preamble><SOF><Op Code><Phy Addr><Reg Addr><Turnaround><Data>.
-         */
-        mdic = ((PHY_TURNAROUND) | (reg_addr << 2) | (phy_addr << 7) |
-                (PHY_OP_WRITE << 12) | (PHY_SOF << 14));
-        mdic <<= 16;
-        mdic |= (u32)phy_data;
-
-        e1000_shift_out_mdi_bits(hw, mdic, 32);
-    }
-
-    return E1000_SUCCESS;
-}
-
-static s32 e1000_read_kmrn_reg(struct e1000_hw *hw, u32 reg_addr, u16 *data)
-{
-    u32 reg_val;
-    u16 swfw;
-    DEBUGFUNC("e1000_read_kmrn_reg");
-
-    if ((hw->mac_type == e1000_80003es2lan) &&
-        (er32(STATUS) & E1000_STATUS_FUNC_1)) {
-        swfw = E1000_SWFW_PHY1_SM;
-    } else {
-        swfw = E1000_SWFW_PHY0_SM;
-    }
-    if (e1000_swfw_sync_acquire(hw, swfw))
-        return -E1000_ERR_SWFW_SYNC;
-
-    /* Write register address */
-    reg_val = ((reg_addr << E1000_KUMCTRLSTA_OFFSET_SHIFT) &
-              E1000_KUMCTRLSTA_OFFSET) |
-              E1000_KUMCTRLSTA_REN;
-    ew32(KUMCTRLSTA, reg_val);
-    udelay(2);
-
-    /* Read the data returned */
-    reg_val = er32(KUMCTRLSTA);
-    *data = (u16)reg_val;
-
-    e1000_swfw_sync_release(hw, swfw);
-    return E1000_SUCCESS;
-}
-
-static s32 e1000_write_kmrn_reg(struct e1000_hw *hw, u32 reg_addr, u16 data)
-{
-    u32 reg_val;
-    u16 swfw;
-    DEBUGFUNC("e1000_write_kmrn_reg");
-
-    if ((hw->mac_type == e1000_80003es2lan) &&
-        (er32(STATUS) & E1000_STATUS_FUNC_1)) {
-        swfw = E1000_SWFW_PHY1_SM;
-    } else {
-        swfw = E1000_SWFW_PHY0_SM;
-    }
-    if (e1000_swfw_sync_acquire(hw, swfw))
-        return -E1000_ERR_SWFW_SYNC;
-
-    reg_val = ((reg_addr << E1000_KUMCTRLSTA_OFFSET_SHIFT) &
-              E1000_KUMCTRLSTA_OFFSET) | data;
-    ew32(KUMCTRLSTA, reg_val);
-    udelay(2);
-
-    e1000_swfw_sync_release(hw, swfw);
-    return E1000_SUCCESS;
-}
-
-/******************************************************************************
-* Returns the PHY to the power-on reset state
-*
-* hw - Struct containing variables accessed by shared code
-******************************************************************************/
-s32 e1000_phy_hw_reset(struct e1000_hw *hw)
-{
-    u32 ctrl, ctrl_ext;
-    u32 led_ctrl;
-    s32 ret_val;
-    u16 swfw;
-
-    DEBUGFUNC("e1000_phy_hw_reset");
-
-    /* In the case of the phy reset being blocked, it's not an error, we
-     * simply return success without performing the reset. */
-    ret_val = e1000_check_phy_reset_block(hw);
-    if (ret_val)
-        return E1000_SUCCESS;
-
-    DEBUGOUT("Resetting Phy...\n");
-
-    if (hw->mac_type > e1000_82543) {
-        if ((hw->mac_type == e1000_80003es2lan) &&
-            (er32(STATUS) & E1000_STATUS_FUNC_1)) {
-            swfw = E1000_SWFW_PHY1_SM;
-        } else {
-            swfw = E1000_SWFW_PHY0_SM;
-        }
-        if (e1000_swfw_sync_acquire(hw, swfw)) {
-            DEBUGOUT("Unable to acquire swfw sync\n");
-            return -E1000_ERR_SWFW_SYNC;
-        }
-        /* Read the device control register and assert the E1000_CTRL_PHY_RST
-         * bit. Then, take it out of reset.
-         * For pre-e1000_82571 hardware, we delay for 10ms between the assert
-         * and deassert.  For e1000_82571 hardware and later, we instead delay
-         * for 50us between and 10ms after the deassertion.
-         */
-        ctrl = er32(CTRL);
-        ew32(CTRL, ctrl | E1000_CTRL_PHY_RST);
-        E1000_WRITE_FLUSH();
-
-        if (hw->mac_type < e1000_82571)
-            msleep(10);
-        else
-            udelay(100);
-
-        ew32(CTRL, ctrl);
-        E1000_WRITE_FLUSH();
-
-        if (hw->mac_type >= e1000_82571)
-            mdelay(10);
-
-        e1000_swfw_sync_release(hw, swfw);
-    } else {
-        /* Read the Extended Device Control Register, assert the PHY_RESET_DIR
-         * bit to put the PHY into reset. Then, take it out of reset.
-         */
-        ctrl_ext = er32(CTRL_EXT);
-        ctrl_ext |= E1000_CTRL_EXT_SDP4_DIR;
-        ctrl_ext &= ~E1000_CTRL_EXT_SDP4_DATA;
-        ew32(CTRL_EXT, ctrl_ext);
-        E1000_WRITE_FLUSH();
-        msleep(10);
-        ctrl_ext |= E1000_CTRL_EXT_SDP4_DATA;
-        ew32(CTRL_EXT, ctrl_ext);
-        E1000_WRITE_FLUSH();
-    }
-    udelay(150);
-
-    if ((hw->mac_type == e1000_82541) || (hw->mac_type == e1000_82547)) {
-        /* Configure activity LED after PHY reset */
-        led_ctrl = er32(LEDCTL);
-        led_ctrl &= IGP_ACTIVITY_LED_MASK;
-        led_ctrl |= (IGP_ACTIVITY_LED_ENABLE | IGP_LED3_MODE);
-        ew32(LEDCTL, led_ctrl);
-    }
-
-    /* Wait for FW to finish PHY configuration. */
-    ret_val = e1000_get_phy_cfg_done(hw);
-    if (ret_val != E1000_SUCCESS)
-        return ret_val;
-    e1000_release_software_semaphore(hw);
-
-    if ((hw->mac_type == e1000_ich8lan) && (hw->phy_type == e1000_phy_igp_3))
-        ret_val = e1000_init_lcd_from_nvm(hw);
-
-    return ret_val;
-}
-
-/******************************************************************************
-* Resets the PHY
-*
-* hw - Struct containing variables accessed by shared code
-*
-* Sets bit 15 of the MII Control register
-******************************************************************************/
-s32 e1000_phy_reset(struct e1000_hw *hw)
-{
-    s32 ret_val;
-    u16 phy_data;
-
-    DEBUGFUNC("e1000_phy_reset");
-
-    /* In the case of the phy reset being blocked, it's not an error, we
-     * simply return success without performing the reset. */
-    ret_val = e1000_check_phy_reset_block(hw);
-    if (ret_val)
-        return E1000_SUCCESS;
-
-    switch (hw->phy_type) {
-    case e1000_phy_igp:
-    case e1000_phy_igp_2:
-    case e1000_phy_igp_3:
-    case e1000_phy_ife:
-        ret_val = e1000_phy_hw_reset(hw);
-        if (ret_val)
-            return ret_val;
-        break;
-    default:
-        ret_val = e1000_read_phy_reg(hw, PHY_CTRL, &phy_data);
-        if (ret_val)
-            return ret_val;
-
-        phy_data |= MII_CR_RESET;
-        ret_val = e1000_write_phy_reg(hw, PHY_CTRL, phy_data);
-        if (ret_val)
-            return ret_val;
-
-        udelay(1);
-        break;
-    }
-
-    if (hw->phy_type == e1000_phy_igp || hw->phy_type == e1000_phy_igp_2)
-        e1000_phy_init_script(hw);
-
-    return E1000_SUCCESS;
-}
-
-/******************************************************************************
-* Work-around for 82566 power-down: on D3 entry-
-* 1) disable gigabit link
-* 2) write VR power-down enable
-* 3) read it back
-* if successful continue, else issue LCD reset and repeat
-*
-* hw - struct containing variables accessed by shared code
-******************************************************************************/
-void e1000_phy_powerdown_workaround(struct e1000_hw *hw)
-{
-    s32 reg;
-    u16 phy_data;
-    s32 retry = 0;
-
-    DEBUGFUNC("e1000_phy_powerdown_workaround");
-
-    if (hw->phy_type != e1000_phy_igp_3)
-        return;
-
-    do {
-        /* Disable link */
-        reg = er32(PHY_CTRL);
-        ew32(PHY_CTRL, reg | E1000_PHY_CTRL_GBE_DISABLE |
-                        E1000_PHY_CTRL_NOND0A_GBE_DISABLE);
-
-        /* Write VR power-down enable - bits 9:8 should be 10b */
-        e1000_read_phy_reg(hw, IGP3_VR_CTRL, &phy_data);
-        phy_data |= (1 << 9);
-        phy_data &= ~(1 << 8);
-        e1000_write_phy_reg(hw, IGP3_VR_CTRL, phy_data);
-
-        /* Read it back and test */
-        e1000_read_phy_reg(hw, IGP3_VR_CTRL, &phy_data);
-        if (((phy_data & IGP3_VR_CTRL_MODE_MASK) == IGP3_VR_CTRL_MODE_SHUT) || 
retry)
-            break;
-
-        /* Issue PHY reset and repeat at most one more time */
-        reg = er32(CTRL);
-        ew32(CTRL, reg | E1000_CTRL_PHY_RST);
-        retry++;
-    } while (retry);
-
-    return;
-
-}
-
-/******************************************************************************
-* Work-around for 82566 Kumeran PCS lock loss:
-* On link status change (i.e. PCI reset, speed change) and link is up and
-* speed is gigabit-
-* 0) if workaround is optionally disabled do nothing
-* 1) wait 1ms for Kumeran link to come up
-* 2) check Kumeran Diagnostic register PCS lock loss bit
-* 3) if not set the link is locked (all is good), otherwise...
-* 4) reset the PHY
-* 5) repeat up to 10 times
-* Note: this is only called for IGP3 copper when speed is 1gb.
-*
-* hw - struct containing variables accessed by shared code
-******************************************************************************/
-static s32 e1000_kumeran_lock_loss_workaround(struct e1000_hw *hw)
-{
-    s32 ret_val;
-    s32 reg;
-    s32 cnt;
-    u16 phy_data;
-
-    if (hw->kmrn_lock_loss_workaround_disabled)
-        return E1000_SUCCESS;
-
-    /* Make sure link is up before proceeding.  If not just return.
-     * Attempting this while link is negotiating fouled up link
-     * stability */
-    ret_val = e1000_read_phy_reg(hw, PHY_STATUS, &phy_data);
-    ret_val = e1000_read_phy_reg(hw, PHY_STATUS, &phy_data);
-
-    if (phy_data & MII_SR_LINK_STATUS) {
-        for (cnt = 0; cnt < 10; cnt++) {
-            /* read once to clear */
-            ret_val = e1000_read_phy_reg(hw, IGP3_KMRN_DIAG, &phy_data);
-            if (ret_val)
-                return ret_val;
-            /* and again to get new status */
-            ret_val = e1000_read_phy_reg(hw, IGP3_KMRN_DIAG, &phy_data);
-            if (ret_val)
-                return ret_val;
-
-            /* check for PCS lock */
-            if (!(phy_data & IGP3_KMRN_DIAG_PCS_LOCK_LOSS))
-                return E1000_SUCCESS;
-
-            /* Issue PHY reset */
-            e1000_phy_hw_reset(hw);
-            mdelay(5);
-        }
-        /* Disable GigE link negotiation */
-        reg = er32(PHY_CTRL);
-        ew32(PHY_CTRL, reg | E1000_PHY_CTRL_GBE_DISABLE |
-                        E1000_PHY_CTRL_NOND0A_GBE_DISABLE);
-
-        /* unable to acquire PCS lock */
-        return E1000_ERR_PHY;
-    }
-
-    return E1000_SUCCESS;
-}
-
-/******************************************************************************
-* Probes the expected PHY address for known PHY IDs
-*
-* hw - Struct containing variables accessed by shared code
-******************************************************************************/
-static s32 e1000_detect_gig_phy(struct e1000_hw *hw)
-{
-    s32 phy_init_status, ret_val;
-    u16 phy_id_high, phy_id_low;
-    bool match = false;
-
-    DEBUGFUNC("e1000_detect_gig_phy");
-
-    if (hw->phy_id != 0)
-        return E1000_SUCCESS;
-
-    /* The 82571 firmware may still be configuring the PHY.  In this
-     * case, we cannot access the PHY until the configuration is done.  So
-     * we explicitly set the PHY values. */
-    if (hw->mac_type == e1000_82571 ||
-        hw->mac_type == e1000_82572) {
-        hw->phy_id = IGP01E1000_I_PHY_ID;
-        hw->phy_type = e1000_phy_igp_2;
-        return E1000_SUCCESS;
-    }
-
-    /* ESB-2 PHY reads require e1000_phy_gg82563 to be set because of a work-
-     * around that forces PHY page 0 to be set or the reads fail.  The rest of
-     * the code in this routine uses e1000_read_phy_reg to read the PHY ID.
-     * So for ESB-2 we need to have this set so our reads won't fail.  If the
-     * attached PHY is not a e1000_phy_gg82563, the routines below will figure
-     * this out as well. */
-    if (hw->mac_type == e1000_80003es2lan)
-        hw->phy_type = e1000_phy_gg82563;
-
-    /* Read the PHY ID Registers to identify which PHY is onboard. */
-    ret_val = e1000_read_phy_reg(hw, PHY_ID1, &phy_id_high);
-    if (ret_val)
-        return ret_val;
-
-    hw->phy_id = (u32)(phy_id_high << 16);
-    udelay(20);
-    ret_val = e1000_read_phy_reg(hw, PHY_ID2, &phy_id_low);
-    if (ret_val)
-        return ret_val;
-
-    hw->phy_id |= (u32)(phy_id_low & PHY_REVISION_MASK);
-    hw->phy_revision = (u32)phy_id_low & ~PHY_REVISION_MASK;
-
-    switch (hw->mac_type) {
-    case e1000_82543:
-        if (hw->phy_id == M88E1000_E_PHY_ID) match = true;
-        break;
-    case e1000_82544:
-        if (hw->phy_id == M88E1000_I_PHY_ID) match = true;
-        break;
-    case e1000_82540:
-    case e1000_82545:
-    case e1000_82545_rev_3:
-    case e1000_82546:
-    case e1000_82546_rev_3:
-        if (hw->phy_id == M88E1011_I_PHY_ID) match = true;
-        break;
-    case e1000_82541:
-    case e1000_82541_rev_2:
-    case e1000_82547:
-    case e1000_82547_rev_2:
-        if (hw->phy_id == IGP01E1000_I_PHY_ID) match = true;
-        break;
-    case e1000_82573:
-        if (hw->phy_id == M88E1111_I_PHY_ID) match = true;
-        break;
-    case e1000_80003es2lan:
-        if (hw->phy_id == GG82563_E_PHY_ID) match = true;
-        break;
-    case e1000_ich8lan:
-        if (hw->phy_id == IGP03E1000_E_PHY_ID) match = true;
-        if (hw->phy_id == IFE_E_PHY_ID) match = true;
-        if (hw->phy_id == IFE_PLUS_E_PHY_ID) match = true;
-        if (hw->phy_id == IFE_C_E_PHY_ID) match = true;
-        break;
-    default:
-        DEBUGOUT1("Invalid MAC type %d\n", hw->mac_type);
-        return -E1000_ERR_CONFIG;
-    }
-    phy_init_status = e1000_set_phy_type(hw);
-
-    if ((match) && (phy_init_status == E1000_SUCCESS)) {
-        DEBUGOUT1("PHY ID 0x%X detected\n", hw->phy_id);
-        return E1000_SUCCESS;
-    }
-    DEBUGOUT1("Invalid PHY ID 0x%X\n", hw->phy_id);
-    return -E1000_ERR_PHY;
-}
-
-/******************************************************************************
-* Resets the PHY's DSP
-*
-* hw - Struct containing variables accessed by shared code
-******************************************************************************/
-static s32 e1000_phy_reset_dsp(struct e1000_hw *hw)
-{
-    s32 ret_val;
-    DEBUGFUNC("e1000_phy_reset_dsp");
-
-    do {
-        if (hw->phy_type != e1000_phy_gg82563) {
-            ret_val = e1000_write_phy_reg(hw, 29, 0x001d);
-            if (ret_val) break;
-        }
-        ret_val = e1000_write_phy_reg(hw, 30, 0x00c1);
-        if (ret_val) break;
-        ret_val = e1000_write_phy_reg(hw, 30, 0x0000);
-        if (ret_val) break;
-        ret_val = E1000_SUCCESS;
-    } while (0);
-
-    return ret_val;
-}
-
-/******************************************************************************
-* Get PHY information from various PHY registers for igp PHY only.
-*
-* hw - Struct containing variables accessed by shared code
-* phy_info - PHY information structure
-******************************************************************************/
-static s32 e1000_phy_igp_get_info(struct e1000_hw *hw,
-                                 struct e1000_phy_info *phy_info)
-{
-    s32 ret_val;
-    u16 phy_data, min_length, max_length, average;
-    e1000_rev_polarity polarity;
-
-    DEBUGFUNC("e1000_phy_igp_get_info");
-
-    /* The downshift status is checked only once, after link is established,
-     * and it stored in the hw->speed_downgraded parameter. */
-    phy_info->downshift = (e1000_downshift)hw->speed_downgraded;
-
-    /* IGP01E1000 does not need to support it. */
-    phy_info->extended_10bt_distance = e1000_10bt_ext_dist_enable_normal;
-
-    /* IGP01E1000 always correct polarity reversal */
-    phy_info->polarity_correction = e1000_polarity_reversal_enabled;
-
-    /* Check polarity status */
-    ret_val = e1000_check_polarity(hw, &polarity);
-    if (ret_val)
-        return ret_val;
-
-    phy_info->cable_polarity = polarity;
-
-    ret_val = e1000_read_phy_reg(hw, IGP01E1000_PHY_PORT_STATUS, &phy_data);
-    if (ret_val)
-        return ret_val;
-
-    phy_info->mdix_mode = (e1000_auto_x_mode)((phy_data & 
IGP01E1000_PSSR_MDIX) >>
-                          IGP01E1000_PSSR_MDIX_SHIFT);
-
-    if ((phy_data & IGP01E1000_PSSR_SPEED_MASK) ==
-       IGP01E1000_PSSR_SPEED_1000MBPS) {
-        /* Local/Remote Receiver Information are only valid at 1000 Mbps */
-        ret_val = e1000_read_phy_reg(hw, PHY_1000T_STATUS, &phy_data);
-        if (ret_val)
-            return ret_val;
-
-        phy_info->local_rx = ((phy_data & SR_1000T_LOCAL_RX_STATUS) >>
-                             SR_1000T_LOCAL_RX_STATUS_SHIFT) ?
-                             e1000_1000t_rx_status_ok : 
e1000_1000t_rx_status_not_ok;
-        phy_info->remote_rx = ((phy_data & SR_1000T_REMOTE_RX_STATUS) >>
-                              SR_1000T_REMOTE_RX_STATUS_SHIFT) ?
-                              e1000_1000t_rx_status_ok : 
e1000_1000t_rx_status_not_ok;
-
-        /* Get cable length */
-        ret_val = e1000_get_cable_length(hw, &min_length, &max_length);
-        if (ret_val)
-            return ret_val;
-
-        /* Translate to old method */
-        average = (max_length + min_length) / 2;
-
-        if (average <= e1000_igp_cable_length_50)
-            phy_info->cable_length = e1000_cable_length_50;
-        else if (average <= e1000_igp_cable_length_80)
-            phy_info->cable_length = e1000_cable_length_50_80;
-        else if (average <= e1000_igp_cable_length_110)
-            phy_info->cable_length = e1000_cable_length_80_110;
-        else if (average <= e1000_igp_cable_length_140)
-            phy_info->cable_length = e1000_cable_length_110_140;
-        else
-            phy_info->cable_length = e1000_cable_length_140;
-    }
-
-    return E1000_SUCCESS;
-}
-
-/******************************************************************************
-* Get PHY information from various PHY registers for ife PHY only.
-*
-* hw - Struct containing variables accessed by shared code
-* phy_info - PHY information structure
-******************************************************************************/
-static s32 e1000_phy_ife_get_info(struct e1000_hw *hw,
-                                 struct e1000_phy_info *phy_info)
-{
-    s32 ret_val;
-    u16 phy_data;
-    e1000_rev_polarity polarity;
-
-    DEBUGFUNC("e1000_phy_ife_get_info");
-
-    phy_info->downshift = (e1000_downshift)hw->speed_downgraded;
-    phy_info->extended_10bt_distance = e1000_10bt_ext_dist_enable_normal;
-
-    ret_val = e1000_read_phy_reg(hw, IFE_PHY_SPECIAL_CONTROL, &phy_data);
-    if (ret_val)
-        return ret_val;
-    phy_info->polarity_correction =
-                        ((phy_data & IFE_PSC_AUTO_POLARITY_DISABLE) >>
-                        IFE_PSC_AUTO_POLARITY_DISABLE_SHIFT) ?
-                        e1000_polarity_reversal_disabled : 
e1000_polarity_reversal_enabled;
-
-    if (phy_info->polarity_correction == e1000_polarity_reversal_enabled) {
-        ret_val = e1000_check_polarity(hw, &polarity);
-        if (ret_val)
-            return ret_val;
-    } else {
-        /* Polarity is forced. */
-        polarity = ((phy_data & IFE_PSC_FORCE_POLARITY) >>
-                     IFE_PSC_FORCE_POLARITY_SHIFT) ?
-                     e1000_rev_polarity_reversed : e1000_rev_polarity_normal;
-    }
-    phy_info->cable_polarity = polarity;
-
-    ret_val = e1000_read_phy_reg(hw, IFE_PHY_MDIX_CONTROL, &phy_data);
-    if (ret_val)
-        return ret_val;
-
-    phy_info->mdix_mode = (e1000_auto_x_mode)
-                     ((phy_data & (IFE_PMC_AUTO_MDIX | IFE_PMC_FORCE_MDIX)) >>
-                     IFE_PMC_MDIX_MODE_SHIFT);
-
-    return E1000_SUCCESS;
-}
-
-/******************************************************************************
-* Get PHY information from various PHY registers fot m88 PHY only.
-*
-* hw - Struct containing variables accessed by shared code
-* phy_info - PHY information structure
-******************************************************************************/
-static s32 e1000_phy_m88_get_info(struct e1000_hw *hw,
-                                 struct e1000_phy_info *phy_info)
-{
-    s32 ret_val;
-    u16 phy_data;
-    e1000_rev_polarity polarity;
-
-    DEBUGFUNC("e1000_phy_m88_get_info");
-
-    /* The downshift status is checked only once, after link is established,
-     * and it stored in the hw->speed_downgraded parameter. */
-    phy_info->downshift = (e1000_downshift)hw->speed_downgraded;
-
-    ret_val = e1000_read_phy_reg(hw, M88E1000_PHY_SPEC_CTRL, &phy_data);
-    if (ret_val)
-        return ret_val;
-
-    phy_info->extended_10bt_distance =
-        ((phy_data & M88E1000_PSCR_10BT_EXT_DIST_ENABLE) >>
-        M88E1000_PSCR_10BT_EXT_DIST_ENABLE_SHIFT) ?
-        e1000_10bt_ext_dist_enable_lower : e1000_10bt_ext_dist_enable_normal;
-
-    phy_info->polarity_correction =
-        ((phy_data & M88E1000_PSCR_POLARITY_REVERSAL) >>
-        M88E1000_PSCR_POLARITY_REVERSAL_SHIFT) ?
-        e1000_polarity_reversal_disabled : e1000_polarity_reversal_enabled;
-
-    /* Check polarity status */
-    ret_val = e1000_check_polarity(hw, &polarity);
-    if (ret_val)
-        return ret_val;
-    phy_info->cable_polarity = polarity;
-
-    ret_val = e1000_read_phy_reg(hw, M88E1000_PHY_SPEC_STATUS, &phy_data);
-    if (ret_val)
-        return ret_val;
-
-    phy_info->mdix_mode = (e1000_auto_x_mode)((phy_data & M88E1000_PSSR_MDIX) 
>>
-                          M88E1000_PSSR_MDIX_SHIFT);
-
-    if ((phy_data & M88E1000_PSSR_SPEED) == M88E1000_PSSR_1000MBS) {
-        /* Cable Length Estimation and Local/Remote Receiver Information
-         * are only valid at 1000 Mbps.
-         */
-        if (hw->phy_type != e1000_phy_gg82563) {
-            phy_info->cable_length = (e1000_cable_length)((phy_data & 
M88E1000_PSSR_CABLE_LENGTH) >>
-                                      M88E1000_PSSR_CABLE_LENGTH_SHIFT);
-        } else {
-            ret_val = e1000_read_phy_reg(hw, GG82563_PHY_DSP_DISTANCE,
-                                         &phy_data);
-            if (ret_val)
-                return ret_val;
-
-            phy_info->cable_length = (e1000_cable_length)(phy_data & 
GG82563_DSPD_CABLE_LENGTH);
-        }
-
-        ret_val = e1000_read_phy_reg(hw, PHY_1000T_STATUS, &phy_data);
-        if (ret_val)
-            return ret_val;
-
-        phy_info->local_rx = ((phy_data & SR_1000T_LOCAL_RX_STATUS) >>
-                             SR_1000T_LOCAL_RX_STATUS_SHIFT) ?
-                             e1000_1000t_rx_status_ok : 
e1000_1000t_rx_status_not_ok;
-        phy_info->remote_rx = ((phy_data & SR_1000T_REMOTE_RX_STATUS) >>
-                              SR_1000T_REMOTE_RX_STATUS_SHIFT) ?
-                              e1000_1000t_rx_status_ok : 
e1000_1000t_rx_status_not_ok;
-
-    }
-
-    return E1000_SUCCESS;
-}
-
-/******************************************************************************
-* Get PHY information from various PHY registers
-*
-* hw - Struct containing variables accessed by shared code
-* phy_info - PHY information structure
-******************************************************************************/
-s32 e1000_phy_get_info(struct e1000_hw *hw, struct e1000_phy_info *phy_info)
-{
-    s32 ret_val;
-    u16 phy_data;
-
-    DEBUGFUNC("e1000_phy_get_info");
-
-    phy_info->cable_length = e1000_cable_length_undefined;
-    phy_info->extended_10bt_distance = e1000_10bt_ext_dist_enable_undefined;
-    phy_info->cable_polarity = e1000_rev_polarity_undefined;
-    phy_info->downshift = e1000_downshift_undefined;
-    phy_info->polarity_correction = e1000_polarity_reversal_undefined;
-    phy_info->mdix_mode = e1000_auto_x_mode_undefined;
-    phy_info->local_rx = e1000_1000t_rx_status_undefined;
-    phy_info->remote_rx = e1000_1000t_rx_status_undefined;
-
-    if (hw->media_type != e1000_media_type_copper) {
-        DEBUGOUT("PHY info is only valid for copper media\n");
-        return -E1000_ERR_CONFIG;
-    }
-
-    ret_val = e1000_read_phy_reg(hw, PHY_STATUS, &phy_data);
-    if (ret_val)
-        return ret_val;
-
-    ret_val = e1000_read_phy_reg(hw, PHY_STATUS, &phy_data);
-    if (ret_val)
-        return ret_val;
-
-    if ((phy_data & MII_SR_LINK_STATUS) != MII_SR_LINK_STATUS) {
-        DEBUGOUT("PHY info is only valid if link is up\n");
-        return -E1000_ERR_CONFIG;
-    }
-
-    if (hw->phy_type == e1000_phy_igp ||
-        hw->phy_type == e1000_phy_igp_3 ||
-        hw->phy_type == e1000_phy_igp_2)
-        return e1000_phy_igp_get_info(hw, phy_info);
-    else if (hw->phy_type == e1000_phy_ife)
-        return e1000_phy_ife_get_info(hw, phy_info);
-    else
-        return e1000_phy_m88_get_info(hw, phy_info);
-}
-
-s32 e1000_validate_mdi_setting(struct e1000_hw *hw)
-{
-    DEBUGFUNC("e1000_validate_mdi_settings");
-
-    if (!hw->autoneg && (hw->mdix == 0 || hw->mdix == 3)) {
-        DEBUGOUT("Invalid MDI setting detected\n");
-        hw->mdix = 1;
-        return -E1000_ERR_CONFIG;
-    }
-    return E1000_SUCCESS;
-}
-
-
-/******************************************************************************
- * Sets up eeprom variables in the hw struct.  Must be called after mac_type
- * is configured.  Additionally, if this is ICH8, the flash controller GbE
- * registers must be mapped, or this will crash.
- *
- * hw - Struct containing variables accessed by shared code
- *****************************************************************************/
-s32 e1000_init_eeprom_params(struct e1000_hw *hw)
-{
-    struct e1000_eeprom_info *eeprom = &hw->eeprom;
-    u32 eecd = er32(EECD);
-    s32 ret_val = E1000_SUCCESS;
-    u16 eeprom_size;
-
-    DEBUGFUNC("e1000_init_eeprom_params");
-
-    switch (hw->mac_type) {
-    case e1000_82542_rev2_0:
-    case e1000_82542_rev2_1:
-    case e1000_82543:
-    case e1000_82544:
-        eeprom->type = e1000_eeprom_microwire;
-        eeprom->word_size = 64;
-        eeprom->opcode_bits = 3;
-        eeprom->address_bits = 6;
-        eeprom->delay_usec = 50;
-        eeprom->use_eerd = false;
-        eeprom->use_eewr = false;
-        break;
-    case e1000_82540:
-    case e1000_82545:
-    case e1000_82545_rev_3:
-    case e1000_82546:
-    case e1000_82546_rev_3:
-        eeprom->type = e1000_eeprom_microwire;
-        eeprom->opcode_bits = 3;
-        eeprom->delay_usec = 50;
-        if (eecd & E1000_EECD_SIZE) {
-            eeprom->word_size = 256;
-            eeprom->address_bits = 8;
-        } else {
-            eeprom->word_size = 64;
-            eeprom->address_bits = 6;
-        }
-        eeprom->use_eerd = false;
-        eeprom->use_eewr = false;
-        break;
-    case e1000_82541:
-    case e1000_82541_rev_2:
-    case e1000_82547:
-    case e1000_82547_rev_2:
-        if (eecd & E1000_EECD_TYPE) {
-            eeprom->type = e1000_eeprom_spi;
-            eeprom->opcode_bits = 8;
-            eeprom->delay_usec = 1;
-            if (eecd & E1000_EECD_ADDR_BITS) {
-                eeprom->page_size = 32;
-                eeprom->address_bits = 16;
-            } else {
-                eeprom->page_size = 8;
-                eeprom->address_bits = 8;
-            }
-        } else {
-            eeprom->type = e1000_eeprom_microwire;
-            eeprom->opcode_bits = 3;
-            eeprom->delay_usec = 50;
-            if (eecd & E1000_EECD_ADDR_BITS) {
-                eeprom->word_size = 256;
-                eeprom->address_bits = 8;
-            } else {
-                eeprom->word_size = 64;
-                eeprom->address_bits = 6;
-            }
-        }
-        eeprom->use_eerd = false;
-        eeprom->use_eewr = false;
-        break;
-    case e1000_82571:
-    case e1000_82572:
-        eeprom->type = e1000_eeprom_spi;
-        eeprom->opcode_bits = 8;
-        eeprom->delay_usec = 1;
-        if (eecd & E1000_EECD_ADDR_BITS) {
-            eeprom->page_size = 32;
-            eeprom->address_bits = 16;
-        } else {
-            eeprom->page_size = 8;
-            eeprom->address_bits = 8;
-        }
-        eeprom->use_eerd = false;
-        eeprom->use_eewr = false;
-        break;
-    case e1000_82573:
-        eeprom->type = e1000_eeprom_spi;
-        eeprom->opcode_bits = 8;
-        eeprom->delay_usec = 1;
-        if (eecd & E1000_EECD_ADDR_BITS) {
-            eeprom->page_size = 32;
-            eeprom->address_bits = 16;
-        } else {
-            eeprom->page_size = 8;
-            eeprom->address_bits = 8;
-        }
-        eeprom->use_eerd = true;
-        eeprom->use_eewr = true;
-        if (!e1000_is_onboard_nvm_eeprom(hw)) {
-            eeprom->type = e1000_eeprom_flash;
-            eeprom->word_size = 2048;
-
-            /* Ensure that the Autonomous FLASH update bit is cleared due to
-             * Flash update issue on parts which use a FLASH for NVM. */
-            eecd &= ~E1000_EECD_AUPDEN;
-            ew32(EECD, eecd);
-        }
-        break;
-    case e1000_80003es2lan:
-        eeprom->type = e1000_eeprom_spi;
-        eeprom->opcode_bits = 8;
-        eeprom->delay_usec = 1;
-        if (eecd & E1000_EECD_ADDR_BITS) {
-            eeprom->page_size = 32;
-            eeprom->address_bits = 16;
-        } else {
-            eeprom->page_size = 8;
-            eeprom->address_bits = 8;
-        }
-        eeprom->use_eerd = true;
-        eeprom->use_eewr = false;
-        break;
-    case e1000_ich8lan:
-        {
-        s32  i = 0;
-        u32 flash_size = E1000_READ_ICH_FLASH_REG(hw, ICH_FLASH_GFPREG);
-
-        eeprom->type = e1000_eeprom_ich8;
-        eeprom->use_eerd = false;
-        eeprom->use_eewr = false;
-        eeprom->word_size = E1000_SHADOW_RAM_WORDS;
-
-        /* Zero the shadow RAM structure. But don't load it from NVM
-         * so as to save time for driver init */
-        if (hw->eeprom_shadow_ram != NULL) {
-            for (i = 0; i < E1000_SHADOW_RAM_WORDS; i++) {
-                hw->eeprom_shadow_ram[i].modified = false;
-                hw->eeprom_shadow_ram[i].eeprom_word = 0xFFFF;
-            }
-        }
-
-        hw->flash_base_addr = (flash_size & ICH_GFPREG_BASE_MASK) *
-                              ICH_FLASH_SECTOR_SIZE;
-
-        hw->flash_bank_size = ((flash_size >> 16) & ICH_GFPREG_BASE_MASK) + 1;
-        hw->flash_bank_size -= (flash_size & ICH_GFPREG_BASE_MASK);
-
-        hw->flash_bank_size *= ICH_FLASH_SECTOR_SIZE;
-
-        hw->flash_bank_size /= 2 * sizeof(u16);
-
-        break;
-        }
-    default:
-        break;
-    }
-
-    if (eeprom->type == e1000_eeprom_spi) {
-        /* eeprom_size will be an enum [0..8] that maps to eeprom sizes 128B to
-         * 32KB (incremented by powers of 2).
-         */
-        if (hw->mac_type <= e1000_82547_rev_2) {
-            /* Set to default value for initial eeprom read. */
-            eeprom->word_size = 64;
-            ret_val = e1000_read_eeprom(hw, EEPROM_CFG, 1, &eeprom_size);
-            if (ret_val)
-                return ret_val;
-            eeprom_size = (eeprom_size & EEPROM_SIZE_MASK) >> 
EEPROM_SIZE_SHIFT;
-            /* 256B eeprom size was not supported in earlier hardware, so we
-             * bump eeprom_size up one to ensure that "1" (which maps to 256B)
-             * is never the result used in the shifting logic below. */
-            if (eeprom_size)
-                eeprom_size++;
-        } else {
-            eeprom_size = (u16)((eecd & E1000_EECD_SIZE_EX_MASK) >>
-                          E1000_EECD_SIZE_EX_SHIFT);
-        }
-
-        eeprom->word_size = 1 << (eeprom_size + EEPROM_WORD_SIZE_SHIFT);
-    }
-    return ret_val;
-}
-
-/******************************************************************************
- * Raises the EEPROM's clock input.
- *
- * hw - Struct containing variables accessed by shared code
- * eecd - EECD's current value
- *****************************************************************************/
-static void e1000_raise_ee_clk(struct e1000_hw *hw, u32 *eecd)
-{
-    /* Raise the clock input to the EEPROM (by setting the SK bit), and then
-     * wait <delay> microseconds.
-     */
-    *eecd = *eecd | E1000_EECD_SK;
-    ew32(EECD, *eecd);
-    E1000_WRITE_FLUSH();
-    udelay(hw->eeprom.delay_usec);
-}
-
-/******************************************************************************
- * Lowers the EEPROM's clock input.
- *
- * hw - Struct containing variables accessed by shared code
- * eecd - EECD's current value
- *****************************************************************************/
-static void e1000_lower_ee_clk(struct e1000_hw *hw, u32 *eecd)
-{
-    /* Lower the clock input to the EEPROM (by clearing the SK bit), and then
-     * wait 50 microseconds.
-     */
-    *eecd = *eecd & ~E1000_EECD_SK;
-    ew32(EECD, *eecd);
-    E1000_WRITE_FLUSH();
-    udelay(hw->eeprom.delay_usec);
-}
-
-/******************************************************************************
- * Shift data bits out to the EEPROM.
- *
- * hw - Struct containing variables accessed by shared code
- * data - data to send to the EEPROM
- * count - number of bits to shift out
- *****************************************************************************/
-static void e1000_shift_out_ee_bits(struct e1000_hw *hw, u16 data, u16 count)
-{
-    struct e1000_eeprom_info *eeprom = &hw->eeprom;
-    u32 eecd;
-    u32 mask;
-
-    /* We need to shift "count" bits out to the EEPROM. So, value in the
-     * "data" parameter will be shifted out to the EEPROM one bit at a time.
-     * In order to do this, "data" must be broken down into bits.
-     */
-    mask = 0x01 << (count - 1);
-    eecd = er32(EECD);
-    if (eeprom->type == e1000_eeprom_microwire) {
-        eecd &= ~E1000_EECD_DO;
-    } else if (eeprom->type == e1000_eeprom_spi) {
-        eecd |= E1000_EECD_DO;
-    }
-    do {
-        /* A "1" is shifted out to the EEPROM by setting bit "DI" to a "1",
-         * and then raising and then lowering the clock (the SK bit controls
-         * the clock input to the EEPROM).  A "0" is shifted out to the EEPROM
-         * by setting "DI" to "0" and then raising and then lowering the clock.
-         */
-        eecd &= ~E1000_EECD_DI;
-
-        if (data & mask)
-            eecd |= E1000_EECD_DI;
-
-        ew32(EECD, eecd);
-        E1000_WRITE_FLUSH();
-
-        udelay(eeprom->delay_usec);
-
-        e1000_raise_ee_clk(hw, &eecd);
-        e1000_lower_ee_clk(hw, &eecd);
-
-        mask = mask >> 1;
-
-    } while (mask);
-
-    /* We leave the "DI" bit set to "0" when we leave this routine. */
-    eecd &= ~E1000_EECD_DI;
-    ew32(EECD, eecd);
-}
-
-/******************************************************************************
- * Shift data bits in from the EEPROM
- *
- * hw - Struct containing variables accessed by shared code
- *****************************************************************************/
-static u16 e1000_shift_in_ee_bits(struct e1000_hw *hw, u16 count)
-{
-    u32 eecd;
-    u32 i;
-    u16 data;
-
-    /* In order to read a register from the EEPROM, we need to shift 'count'
-     * bits in from the EEPROM. Bits are "shifted in" by raising the clock
-     * input to the EEPROM (setting the SK bit), and then reading the value of
-     * the "DO" bit.  During this "shifting in" process the "DI" bit should
-     * always be clear.
-     */
-
-    eecd = er32(EECD);
-
-    eecd &= ~(E1000_EECD_DO | E1000_EECD_DI);
-    data = 0;
-
-    for (i = 0; i < count; i++) {
-        data = data << 1;
-        e1000_raise_ee_clk(hw, &eecd);
-
-        eecd = er32(EECD);
-
-        eecd &= ~(E1000_EECD_DI);
-        if (eecd & E1000_EECD_DO)
-            data |= 1;
-
-        e1000_lower_ee_clk(hw, &eecd);
-    }
-
-    return data;
-}
-
-/******************************************************************************
- * Prepares EEPROM for access
- *
- * hw - Struct containing variables accessed by shared code
- *
- * Lowers EEPROM clock. Clears input pin. Sets the chip select pin. This
- * function should be called before issuing a command to the EEPROM.
- *****************************************************************************/
-static s32 e1000_acquire_eeprom(struct e1000_hw *hw)
-{
-    struct e1000_eeprom_info *eeprom = &hw->eeprom;
-    u32 eecd, i=0;
-
-    DEBUGFUNC("e1000_acquire_eeprom");
-
-    if (e1000_swfw_sync_acquire(hw, E1000_SWFW_EEP_SM))
-        return -E1000_ERR_SWFW_SYNC;
-    eecd = er32(EECD);
-
-    if (hw->mac_type != e1000_82573) {
-        /* Request EEPROM Access */
-        if (hw->mac_type > e1000_82544) {
-            eecd |= E1000_EECD_REQ;
-            ew32(EECD, eecd);
-            eecd = er32(EECD);
-            while ((!(eecd & E1000_EECD_GNT)) &&
-                  (i < E1000_EEPROM_GRANT_ATTEMPTS)) {
-                i++;
-                udelay(5);
-                eecd = er32(EECD);
-            }
-            if (!(eecd & E1000_EECD_GNT)) {
-                eecd &= ~E1000_EECD_REQ;
-                ew32(EECD, eecd);
-                DEBUGOUT("Could not acquire EEPROM grant\n");
-                e1000_swfw_sync_release(hw, E1000_SWFW_EEP_SM);
-                return -E1000_ERR_EEPROM;
-            }
-        }
-    }
-
-    /* Setup EEPROM for Read/Write */
-
-    if (eeprom->type == e1000_eeprom_microwire) {
-        /* Clear SK and DI */
-        eecd &= ~(E1000_EECD_DI | E1000_EECD_SK);
-        ew32(EECD, eecd);
-
-        /* Set CS */
-        eecd |= E1000_EECD_CS;
-        ew32(EECD, eecd);
-    } else if (eeprom->type == e1000_eeprom_spi) {
-        /* Clear SK and CS */
-        eecd &= ~(E1000_EECD_CS | E1000_EECD_SK);
-        ew32(EECD, eecd);
-        udelay(1);
-    }
-
-    return E1000_SUCCESS;
-}
-
-/******************************************************************************
- * Returns EEPROM to a "standby" state
- *
- * hw - Struct containing variables accessed by shared code
- *****************************************************************************/
-static void e1000_standby_eeprom(struct e1000_hw *hw)
-{
-    struct e1000_eeprom_info *eeprom = &hw->eeprom;
-    u32 eecd;
-
-    eecd = er32(EECD);
-
-    if (eeprom->type == e1000_eeprom_microwire) {
-        eecd &= ~(E1000_EECD_CS | E1000_EECD_SK);
-        ew32(EECD, eecd);
-        E1000_WRITE_FLUSH();
-        udelay(eeprom->delay_usec);
-
-        /* Clock high */
-        eecd |= E1000_EECD_SK;
-        ew32(EECD, eecd);
-        E1000_WRITE_FLUSH();
-        udelay(eeprom->delay_usec);
-
-        /* Select EEPROM */
-        eecd |= E1000_EECD_CS;
-        ew32(EECD, eecd);
-        E1000_WRITE_FLUSH();
-        udelay(eeprom->delay_usec);
-
-        /* Clock low */
-        eecd &= ~E1000_EECD_SK;
-        ew32(EECD, eecd);
-        E1000_WRITE_FLUSH();
-        udelay(eeprom->delay_usec);
-    } else if (eeprom->type == e1000_eeprom_spi) {
-        /* Toggle CS to flush commands */
-        eecd |= E1000_EECD_CS;
-        ew32(EECD, eecd);
-        E1000_WRITE_FLUSH();
-        udelay(eeprom->delay_usec);
-        eecd &= ~E1000_EECD_CS;
-        ew32(EECD, eecd);
-        E1000_WRITE_FLUSH();
-        udelay(eeprom->delay_usec);
-    }
-}
-
-/******************************************************************************
- * Terminates a command by inverting the EEPROM's chip select pin
- *
- * hw - Struct containing variables accessed by shared code
- *****************************************************************************/
-static void e1000_release_eeprom(struct e1000_hw *hw)
-{
-    u32 eecd;
-
-    DEBUGFUNC("e1000_release_eeprom");
-
-    eecd = er32(EECD);
-
-    if (hw->eeprom.type == e1000_eeprom_spi) {
-        eecd |= E1000_EECD_CS;  /* Pull CS high */
-        eecd &= ~E1000_EECD_SK; /* Lower SCK */
-
-        ew32(EECD, eecd);
-
-        udelay(hw->eeprom.delay_usec);
-    } else if (hw->eeprom.type == e1000_eeprom_microwire) {
-        /* cleanup eeprom */
-
-        /* CS on Microwire is active-high */
-        eecd &= ~(E1000_EECD_CS | E1000_EECD_DI);
-
-        ew32(EECD, eecd);
-
-        /* Rising edge of clock */
-        eecd |= E1000_EECD_SK;
-        ew32(EECD, eecd);
-        E1000_WRITE_FLUSH();
-        udelay(hw->eeprom.delay_usec);
-
-        /* Falling edge of clock */
-        eecd &= ~E1000_EECD_SK;
-        ew32(EECD, eecd);
-        E1000_WRITE_FLUSH();
-        udelay(hw->eeprom.delay_usec);
-    }
-
-    /* Stop requesting EEPROM access */
-    if (hw->mac_type > e1000_82544) {
-        eecd &= ~E1000_EECD_REQ;
-        ew32(EECD, eecd);
-    }
-
-    e1000_swfw_sync_release(hw, E1000_SWFW_EEP_SM);
-}
-
-/******************************************************************************
- * Reads a 16 bit word from the EEPROM.
- *
- * hw - Struct containing variables accessed by shared code
- *****************************************************************************/
-static s32 e1000_spi_eeprom_ready(struct e1000_hw *hw)
-{
-    u16 retry_count = 0;
-    u8 spi_stat_reg;
-
-    DEBUGFUNC("e1000_spi_eeprom_ready");
-
-    /* Read "Status Register" repeatedly until the LSB is cleared.  The
-     * EEPROM will signal that the command has been completed by clearing
-     * bit 0 of the internal status register.  If it's not cleared within
-     * 5 milliseconds, then error out.
-     */
-    retry_count = 0;
-    do {
-        e1000_shift_out_ee_bits(hw, EEPROM_RDSR_OPCODE_SPI,
-                                hw->eeprom.opcode_bits);
-        spi_stat_reg = (u8)e1000_shift_in_ee_bits(hw, 8);
-        if (!(spi_stat_reg & EEPROM_STATUS_RDY_SPI))
-            break;
-
-        udelay(5);
-        retry_count += 5;
-
-        e1000_standby_eeprom(hw);
-    } while (retry_count < EEPROM_MAX_RETRY_SPI);
-
-    /* ATMEL SPI write time could vary from 0-20mSec on 3.3V devices (and
-     * only 0-5mSec on 5V devices)
-     */
-    if (retry_count >= EEPROM_MAX_RETRY_SPI) {
-        DEBUGOUT("SPI EEPROM Status error\n");
-        return -E1000_ERR_EEPROM;
-    }
-
-    return E1000_SUCCESS;
-}
-
-/******************************************************************************
- * Reads a 16 bit word from the EEPROM.
- *
- * hw - Struct containing variables accessed by shared code
- * offset - offset of  word in the EEPROM to read
- * data - word read from the EEPROM
- * words - number of words to read
- *****************************************************************************/
-s32 e1000_read_eeprom(struct e1000_hw *hw, u16 offset, u16 words, u16 *data)
-{
-    s32 ret;
-    spin_lock(&e1000_eeprom_lock);
-    ret = e1000_do_read_eeprom(hw, offset, words, data);
-    spin_unlock(&e1000_eeprom_lock);
-    return ret;
-}
-
-static s32 e1000_do_read_eeprom(struct e1000_hw *hw, u16 offset, u16 words, 
u16 *data)
-{
-    struct e1000_eeprom_info *eeprom = &hw->eeprom;
-    u32 i = 0;
-
-    DEBUGFUNC("e1000_read_eeprom");
-
-    /* If eeprom is not yet detected, do so now */
-    if (eeprom->word_size == 0)
-        e1000_init_eeprom_params(hw);
-
-    /* A check for invalid values:  offset too large, too many words, and not
-     * enough words.
-     */
-    if ((offset >= eeprom->word_size) || (words > eeprom->word_size - offset) 
||
-       (words == 0)) {
-        DEBUGOUT2("\"words\" parameter out of bounds. Words = %d, size = 
%d\n", offset, eeprom->word_size);
-        return -E1000_ERR_EEPROM;
-    }
-
-    /* EEPROM's that don't use EERD to read require us to bit-bang the SPI
-     * directly. In this case, we need to acquire the EEPROM so that
-     * FW or other port software does not interrupt.
-     */
-    if (e1000_is_onboard_nvm_eeprom(hw) && !hw->eeprom.use_eerd) {
-        /* Prepare the EEPROM for bit-bang reading */
-        if (e1000_acquire_eeprom(hw) != E1000_SUCCESS)
-            return -E1000_ERR_EEPROM;
-    }
-
-    /* Eerd register EEPROM access requires no eeprom aquire/release */
-    if (eeprom->use_eerd)
-        return e1000_read_eeprom_eerd(hw, offset, words, data);
-
-    /* ICH EEPROM access is done via the ICH flash controller */
-    if (eeprom->type == e1000_eeprom_ich8)
-        return e1000_read_eeprom_ich8(hw, offset, words, data);
-
-    /* Set up the SPI or Microwire EEPROM for bit-bang reading.  We have
-     * acquired the EEPROM at this point, so any returns should relase it */
-    if (eeprom->type == e1000_eeprom_spi) {
-        u16 word_in;
-        u8 read_opcode = EEPROM_READ_OPCODE_SPI;
-
-        if (e1000_spi_eeprom_ready(hw)) {
-            e1000_release_eeprom(hw);
-            return -E1000_ERR_EEPROM;
-        }
-
-        e1000_standby_eeprom(hw);
-
-        /* Some SPI eeproms use the 8th address bit embedded in the opcode */
-        if ((eeprom->address_bits == 8) && (offset >= 128))
-            read_opcode |= EEPROM_A8_OPCODE_SPI;
-
-        /* Send the READ command (opcode + addr)  */
-        e1000_shift_out_ee_bits(hw, read_opcode, eeprom->opcode_bits);
-        e1000_shift_out_ee_bits(hw, (u16)(offset*2), eeprom->address_bits);
-
-        /* Read the data.  The address of the eeprom internally increments with
-         * each byte (spi) being read, saving on the overhead of eeprom setup
-         * and tear-down.  The address counter will roll over if reading beyond
-         * the size of the eeprom, thus allowing the entire memory to be read
-         * starting from any offset. */
-        for (i = 0; i < words; i++) {
-            word_in = e1000_shift_in_ee_bits(hw, 16);
-            data[i] = (word_in >> 8) | (word_in << 8);
-        }
-    } else if (eeprom->type == e1000_eeprom_microwire) {
-        for (i = 0; i < words; i++) {
-            /* Send the READ command (opcode + addr)  */
-            e1000_shift_out_ee_bits(hw, EEPROM_READ_OPCODE_MICROWIRE,
-                                    eeprom->opcode_bits);
-            e1000_shift_out_ee_bits(hw, (u16)(offset + i),
-                                    eeprom->address_bits);
-
-            /* Read the data.  For microwire, each word requires the overhead
-             * of eeprom setup and tear-down. */
-            data[i] = e1000_shift_in_ee_bits(hw, 16);
-            e1000_standby_eeprom(hw);
-        }
-    }
-
-    /* End this read operation */
-    e1000_release_eeprom(hw);
-
-    return E1000_SUCCESS;
-}
-
-/******************************************************************************
- * Reads a 16 bit word from the EEPROM using the EERD register.
- *
- * hw - Struct containing variables accessed by shared code
- * offset - offset of  word in the EEPROM to read
- * data - word read from the EEPROM
- * words - number of words to read
- *****************************************************************************/
-static s32 e1000_read_eeprom_eerd(struct e1000_hw *hw, u16 offset, u16 words,
-                                 u16 *data)
-{
-    u32 i, eerd = 0;
-    s32 error = 0;
-
-    for (i = 0; i < words; i++) {
-        eerd = ((offset+i) << E1000_EEPROM_RW_ADDR_SHIFT) +
-                         E1000_EEPROM_RW_REG_START;
-
-        ew32(EERD, eerd);
-        error = e1000_poll_eerd_eewr_done(hw, E1000_EEPROM_POLL_READ);
-
-        if (error) {
-            break;
-        }
-        data[i] = (er32(EERD) >> E1000_EEPROM_RW_REG_DATA);
-
-    }
-
-    return error;
-}
-
-/******************************************************************************
- * Writes a 16 bit word from the EEPROM using the EEWR register.
- *
- * hw - Struct containing variables accessed by shared code
- * offset - offset of  word in the EEPROM to read
- * data - word read from the EEPROM
- * words - number of words to read
- *****************************************************************************/
-static s32 e1000_write_eeprom_eewr(struct e1000_hw *hw, u16 offset, u16 words,
-                                  u16 *data)
-{
-    u32    register_value = 0;
-    u32    i              = 0;
-    s32     error          = 0;
-
-    if (e1000_swfw_sync_acquire(hw, E1000_SWFW_EEP_SM))
-        return -E1000_ERR_SWFW_SYNC;
-
-    for (i = 0; i < words; i++) {
-        register_value = (data[i] << E1000_EEPROM_RW_REG_DATA) |
-                         ((offset+i) << E1000_EEPROM_RW_ADDR_SHIFT) |
-                         E1000_EEPROM_RW_REG_START;
-
-        error = e1000_poll_eerd_eewr_done(hw, E1000_EEPROM_POLL_WRITE);
-        if (error) {
-            break;
-        }
-
-        ew32(EEWR, register_value);
-
-        error = e1000_poll_eerd_eewr_done(hw, E1000_EEPROM_POLL_WRITE);
-
-        if (error) {
-            break;
-        }
-    }
-
-    e1000_swfw_sync_release(hw, E1000_SWFW_EEP_SM);
-    return error;
-}
-
-/******************************************************************************
- * Polls the status bit (bit 1) of the EERD to determine when the read is done.
- *
- * hw - Struct containing variables accessed by shared code
- *****************************************************************************/
-static s32 e1000_poll_eerd_eewr_done(struct e1000_hw *hw, int eerd)
-{
-    u32 attempts = 100000;
-    u32 i, reg = 0;
-    s32 done = E1000_ERR_EEPROM;
-
-    for (i = 0; i < attempts; i++) {
-        if (eerd == E1000_EEPROM_POLL_READ)
-            reg = er32(EERD);
-        else
-            reg = er32(EEWR);
-
-        if (reg & E1000_EEPROM_RW_REG_DONE) {
-            done = E1000_SUCCESS;
-            break;
-        }
-        udelay(5);
-    }
-
-    return done;
-}
-
-/***************************************************************************
-* Description:     Determines if the onboard NVM is FLASH or EEPROM.
-*
-* hw - Struct containing variables accessed by shared code
-****************************************************************************/
-static bool e1000_is_onboard_nvm_eeprom(struct e1000_hw *hw)
-{
-    u32 eecd = 0;
-
-    DEBUGFUNC("e1000_is_onboard_nvm_eeprom");
-
-    if (hw->mac_type == e1000_ich8lan)
-        return false;
-
-    if (hw->mac_type == e1000_82573) {
-        eecd = er32(EECD);
-
-        /* Isolate bits 15 & 16 */
-        eecd = ((eecd >> 15) & 0x03);
-
-        /* If both bits are set, device is Flash type */
-        if (eecd == 0x03) {
-            return false;
-        }
-    }
-    return true;
-}
-
-/******************************************************************************
- * Verifies that the EEPROM has a valid checksum
- *
- * hw - Struct containing variables accessed by shared code
- *
- * Reads the first 64 16 bit words of the EEPROM and sums the values read.
- * If the the sum of the 64 16 bit words is 0xBABA, the EEPROM's checksum is
- * valid.
- *****************************************************************************/
-s32 e1000_validate_eeprom_checksum(struct e1000_hw *hw)
-{
-    u16 checksum = 0;
-    u16 i, eeprom_data;
-
-    DEBUGFUNC("e1000_validate_eeprom_checksum");
-
-    if ((hw->mac_type == e1000_82573) && !e1000_is_onboard_nvm_eeprom(hw)) {
-        /* Check bit 4 of word 10h.  If it is 0, firmware is done updating
-         * 10h-12h.  Checksum may need to be fixed. */
-        e1000_read_eeprom(hw, 0x10, 1, &eeprom_data);
-        if ((eeprom_data & 0x10) == 0) {
-            /* Read 0x23 and check bit 15.  This bit is a 1 when the checksum
-             * has already been fixed.  If the checksum is still wrong and this
-             * bit is a 1, we need to return bad checksum.  Otherwise, we need
-             * to set this bit to a 1 and update the checksum. */
-            e1000_read_eeprom(hw, 0x23, 1, &eeprom_data);
-            if ((eeprom_data & 0x8000) == 0) {
-                eeprom_data |= 0x8000;
-                e1000_write_eeprom(hw, 0x23, 1, &eeprom_data);
-                e1000_update_eeprom_checksum(hw);
-            }
-        }
-    }
-
-    if (hw->mac_type == e1000_ich8lan) {
-        /* Drivers must allocate the shadow ram structure for the
-         * EEPROM checksum to be updated.  Otherwise, this bit as well
-         * as the checksum must both be set correctly for this
-         * validation to pass.
-         */
-        e1000_read_eeprom(hw, 0x19, 1, &eeprom_data);
-        if ((eeprom_data & 0x40) == 0) {
-            eeprom_data |= 0x40;
-            e1000_write_eeprom(hw, 0x19, 1, &eeprom_data);
-            e1000_update_eeprom_checksum(hw);
-        }
-    }
-
-    for (i = 0; i < (EEPROM_CHECKSUM_REG + 1); i++) {
-        if (e1000_read_eeprom(hw, i, 1, &eeprom_data) < 0) {
-            DEBUGOUT("EEPROM Read Error\n");
-            return -E1000_ERR_EEPROM;
-        }
-        checksum += eeprom_data;
-    }
-
-    if (checksum == (u16)EEPROM_SUM)
-        return E1000_SUCCESS;
-    else {
-        DEBUGOUT("EEPROM Checksum Invalid\n");
-        return -E1000_ERR_EEPROM;
-    }
-}
-
-/******************************************************************************
- * Calculates the EEPROM checksum and writes it to the EEPROM
- *
- * hw - Struct containing variables accessed by shared code
- *
- * Sums the first 63 16 bit words of the EEPROM. Subtracts the sum from 0xBABA.
- * Writes the difference to word offset 63 of the EEPROM.
- *****************************************************************************/
-s32 e1000_update_eeprom_checksum(struct e1000_hw *hw)
-{
-    u32 ctrl_ext;
-    u16 checksum = 0;
-    u16 i, eeprom_data;
-
-    DEBUGFUNC("e1000_update_eeprom_checksum");
-
-    for (i = 0; i < EEPROM_CHECKSUM_REG; i++) {
-        if (e1000_read_eeprom(hw, i, 1, &eeprom_data) < 0) {
-            DEBUGOUT("EEPROM Read Error\n");
-            return -E1000_ERR_EEPROM;
-        }
-        checksum += eeprom_data;
-    }
-    checksum = (u16)EEPROM_SUM - checksum;
-    if (e1000_write_eeprom(hw, EEPROM_CHECKSUM_REG, 1, &checksum) < 0) {
-        DEBUGOUT("EEPROM Write Error\n");
-        return -E1000_ERR_EEPROM;
-    } else if (hw->eeprom.type == e1000_eeprom_flash) {
-        e1000_commit_shadow_ram(hw);
-    } else if (hw->eeprom.type == e1000_eeprom_ich8) {
-        e1000_commit_shadow_ram(hw);
-        /* Reload the EEPROM, or else modifications will not appear
-         * until after next adapter reset. */
-        ctrl_ext = er32(CTRL_EXT);
-        ctrl_ext |= E1000_CTRL_EXT_EE_RST;
-        ew32(CTRL_EXT, ctrl_ext);
-        msleep(10);
-    }
-    return E1000_SUCCESS;
-}
-
-/******************************************************************************
- * Parent function for writing words to the different EEPROM types.
- *
- * hw - Struct containing variables accessed by shared code
- * offset - offset within the EEPROM to be written to
- * words - number of words to write
- * data - 16 bit word to be written to the EEPROM
- *
- * If e1000_update_eeprom_checksum is not called after this function, the
- * EEPROM will most likely contain an invalid checksum.
- *****************************************************************************/
-s32 e1000_write_eeprom(struct e1000_hw *hw, u16 offset, u16 words, u16 *data)
-{
-    s32 ret;
-    spin_lock(&e1000_eeprom_lock);
-    ret = e1000_do_write_eeprom(hw, offset, words, data);
-    spin_unlock(&e1000_eeprom_lock);
-    return ret;
-}
-
-
-static s32 e1000_do_write_eeprom(struct e1000_hw *hw, u16 offset, u16 words, 
u16 *data)
-{
-    struct e1000_eeprom_info *eeprom = &hw->eeprom;
-    s32 status = 0;
-
-    DEBUGFUNC("e1000_write_eeprom");
-
-    /* If eeprom is not yet detected, do so now */
-    if (eeprom->word_size == 0)
-        e1000_init_eeprom_params(hw);
-
-    /* A check for invalid values:  offset too large, too many words, and not
-     * enough words.
-     */
-    if ((offset >= eeprom->word_size) || (words > eeprom->word_size - offset) 
||
-       (words == 0)) {
-        DEBUGOUT("\"words\" parameter out of bounds\n");
-        return -E1000_ERR_EEPROM;
-    }
-
-    /* 82573 writes only through eewr */
-    if (eeprom->use_eewr)
-        return e1000_write_eeprom_eewr(hw, offset, words, data);
-
-    if (eeprom->type == e1000_eeprom_ich8)
-        return e1000_write_eeprom_ich8(hw, offset, words, data);
-
-    /* Prepare the EEPROM for writing  */
-    if (e1000_acquire_eeprom(hw) != E1000_SUCCESS)
-        return -E1000_ERR_EEPROM;
-
-    if (eeprom->type == e1000_eeprom_microwire) {
-        status = e1000_write_eeprom_microwire(hw, offset, words, data);
-    } else {
-        status = e1000_write_eeprom_spi(hw, offset, words, data);
-        msleep(10);
-    }
-
-    /* Done with writing */
-    e1000_release_eeprom(hw);
-
-    return status;
-}
-
-/******************************************************************************
- * Writes a 16 bit word to a given offset in an SPI EEPROM.
- *
- * hw - Struct containing variables accessed by shared code
- * offset - offset within the EEPROM to be written to
- * words - number of words to write
- * data - pointer to array of 8 bit words to be written to the EEPROM
- *
- *****************************************************************************/
-static s32 e1000_write_eeprom_spi(struct e1000_hw *hw, u16 offset, u16 words,
-                                 u16 *data)
-{
-    struct e1000_eeprom_info *eeprom = &hw->eeprom;
-    u16 widx = 0;
-
-    DEBUGFUNC("e1000_write_eeprom_spi");
-
-    while (widx < words) {
-        u8 write_opcode = EEPROM_WRITE_OPCODE_SPI;
-
-        if (e1000_spi_eeprom_ready(hw)) return -E1000_ERR_EEPROM;
-
-        e1000_standby_eeprom(hw);
-
-        /*  Send the WRITE ENABLE command (8 bit opcode )  */
-        e1000_shift_out_ee_bits(hw, EEPROM_WREN_OPCODE_SPI,
-                                    eeprom->opcode_bits);
-
-        e1000_standby_eeprom(hw);
-
-        /* Some SPI eeproms use the 8th address bit embedded in the opcode */
-        if ((eeprom->address_bits == 8) && (offset >= 128))
-            write_opcode |= EEPROM_A8_OPCODE_SPI;
-
-        /* Send the Write command (8-bit opcode + addr) */
-        e1000_shift_out_ee_bits(hw, write_opcode, eeprom->opcode_bits);
-
-        e1000_shift_out_ee_bits(hw, (u16)((offset + widx)*2),
-                                eeprom->address_bits);
-
-        /* Send the data */
-
-        /* Loop to allow for up to whole page write (32 bytes) of eeprom */
-        while (widx < words) {
-            u16 word_out = data[widx];
-            word_out = (word_out >> 8) | (word_out << 8);
-            e1000_shift_out_ee_bits(hw, word_out, 16);
-            widx++;
-
-            /* Some larger eeprom sizes are capable of a 32-byte PAGE WRITE
-             * operation, while the smaller eeproms are capable of an 8-byte
-             * PAGE WRITE operation.  Break the inner loop to pass new address
-             */
-            if ((((offset + widx)*2) % eeprom->page_size) == 0) {
-                e1000_standby_eeprom(hw);
-                break;
-            }
-        }
-    }
-
-    return E1000_SUCCESS;
-}
-
-/******************************************************************************
- * Writes a 16 bit word to a given offset in a Microwire EEPROM.
- *
- * hw - Struct containing variables accessed by shared code
- * offset - offset within the EEPROM to be written to
- * words - number of words to write
- * data - pointer to array of 16 bit words to be written to the EEPROM
- *
- *****************************************************************************/
-static s32 e1000_write_eeprom_microwire(struct e1000_hw *hw, u16 offset,
-                                       u16 words, u16 *data)
-{
-    struct e1000_eeprom_info *eeprom = &hw->eeprom;
-    u32 eecd;
-    u16 words_written = 0;
-    u16 i = 0;
-
-    DEBUGFUNC("e1000_write_eeprom_microwire");
-
-    /* Send the write enable command to the EEPROM (3-bit opcode plus
-     * 6/8-bit dummy address beginning with 11).  It's less work to include
-     * the 11 of the dummy address as part of the opcode than it is to shift
-     * it over the correct number of bits for the address.  This puts the
-     * EEPROM into write/erase mode.
-     */
-    e1000_shift_out_ee_bits(hw, EEPROM_EWEN_OPCODE_MICROWIRE,
-                            (u16)(eeprom->opcode_bits + 2));
-
-    e1000_shift_out_ee_bits(hw, 0, (u16)(eeprom->address_bits - 2));
-
-    /* Prepare the EEPROM */
-    e1000_standby_eeprom(hw);
-
-    while (words_written < words) {
-        /* Send the Write command (3-bit opcode + addr) */
-        e1000_shift_out_ee_bits(hw, EEPROM_WRITE_OPCODE_MICROWIRE,
-                                eeprom->opcode_bits);
-
-        e1000_shift_out_ee_bits(hw, (u16)(offset + words_written),
-                                eeprom->address_bits);
-
-        /* Send the data */
-        e1000_shift_out_ee_bits(hw, data[words_written], 16);
-
-        /* Toggle the CS line.  This in effect tells the EEPROM to execute
-         * the previous command.
-         */
-        e1000_standby_eeprom(hw);
-
-        /* Read DO repeatedly until it is high (equal to '1').  The EEPROM will
-         * signal that the command has been completed by raising the DO signal.
-         * If DO does not go high in 10 milliseconds, then error out.
-         */
-        for (i = 0; i < 200; i++) {
-            eecd = er32(EECD);
-            if (eecd & E1000_EECD_DO) break;
-            udelay(50);
-        }
-        if (i == 200) {
-            DEBUGOUT("EEPROM Write did not complete\n");
-            return -E1000_ERR_EEPROM;
-        }
-
-        /* Recover from write */
-        e1000_standby_eeprom(hw);
-
-        words_written++;
-    }
-
-    /* Send the write disable command to the EEPROM (3-bit opcode plus
-     * 6/8-bit dummy address beginning with 10).  It's less work to include
-     * the 10 of the dummy address as part of the opcode than it is to shift
-     * it over the correct number of bits for the address.  This takes the
-     * EEPROM out of write/erase mode.
-     */
-    e1000_shift_out_ee_bits(hw, EEPROM_EWDS_OPCODE_MICROWIRE,
-                            (u16)(eeprom->opcode_bits + 2));
-
-    e1000_shift_out_ee_bits(hw, 0, (u16)(eeprom->address_bits - 2));
-
-    return E1000_SUCCESS;
-}
-
-/******************************************************************************
- * Flushes the cached eeprom to NVM. This is done by saving the modified values
- * in the eeprom cache and the non modified values in the currently active bank
- * to the new bank.
- *
- * hw - Struct containing variables accessed by shared code
- * offset - offset of  word in the EEPROM to read
- * data - word read from the EEPROM
- * words - number of words to read
- *****************************************************************************/
-static s32 e1000_commit_shadow_ram(struct e1000_hw *hw)
-{
-    u32 attempts = 100000;
-    u32 eecd = 0;
-    u32 flop = 0;
-    u32 i = 0;
-    s32 error = E1000_SUCCESS;
-    u32 old_bank_offset = 0;
-    u32 new_bank_offset = 0;
-    u8 low_byte = 0;
-    u8 high_byte = 0;
-    bool sector_write_failed = false;
-
-    if (hw->mac_type == e1000_82573) {
-        /* The flop register will be used to determine if flash type is STM */
-        flop = er32(FLOP);
-        for (i=0; i < attempts; i++) {
-            eecd = er32(EECD);
-            if ((eecd & E1000_EECD_FLUPD) == 0) {
-                break;
-            }
-            udelay(5);
-        }
-
-        if (i == attempts) {
-            return -E1000_ERR_EEPROM;
-        }
-
-        /* If STM opcode located in bits 15:8 of flop, reset firmware */
-        if ((flop & 0xFF00) == E1000_STM_OPCODE) {
-            ew32(HICR, E1000_HICR_FW_RESET);
-        }
-
-        /* Perform the flash update */
-        ew32(EECD, eecd | E1000_EECD_FLUPD);
-
-        for (i=0; i < attempts; i++) {
-            eecd = er32(EECD);
-            if ((eecd & E1000_EECD_FLUPD) == 0) {
-                break;
-            }
-            udelay(5);
-        }
-
-        if (i == attempts) {
-            return -E1000_ERR_EEPROM;
-        }
-    }
-
-    if (hw->mac_type == e1000_ich8lan && hw->eeprom_shadow_ram != NULL) {
-        /* We're writing to the opposite bank so if we're on bank 1,
-         * write to bank 0 etc.  We also need to erase the segment that
-         * is going to be written */
-        if (!(er32(EECD) & E1000_EECD_SEC1VAL)) {
-            new_bank_offset = hw->flash_bank_size * 2;
-            old_bank_offset = 0;
-            e1000_erase_ich8_4k_segment(hw, 1);
-        } else {
-            old_bank_offset = hw->flash_bank_size * 2;
-            new_bank_offset = 0;
-            e1000_erase_ich8_4k_segment(hw, 0);
-        }
-
-        sector_write_failed = false;
-        /* Loop for every byte in the shadow RAM,
-         * which is in units of words. */
-        for (i = 0; i < E1000_SHADOW_RAM_WORDS; i++) {
-            /* Determine whether to write the value stored
-             * in the other NVM bank or a modified value stored
-             * in the shadow RAM */
-            if (hw->eeprom_shadow_ram[i].modified) {
-                low_byte = (u8)hw->eeprom_shadow_ram[i].eeprom_word;
-                udelay(100);
-                error = e1000_verify_write_ich8_byte(hw,
-                            (i << 1) + new_bank_offset, low_byte);
-
-                if (error != E1000_SUCCESS)
-                    sector_write_failed = true;
-                else {
-                    high_byte =
-                        (u8)(hw->eeprom_shadow_ram[i].eeprom_word >> 8);
-                    udelay(100);
-                }
-            } else {
-                e1000_read_ich8_byte(hw, (i << 1) + old_bank_offset,
-                                     &low_byte);
-                udelay(100);
-                error = e1000_verify_write_ich8_byte(hw,
-                            (i << 1) + new_bank_offset, low_byte);
-
-                if (error != E1000_SUCCESS)
-                    sector_write_failed = true;
-                else {
-                    e1000_read_ich8_byte(hw, (i << 1) + old_bank_offset + 1,
-                                         &high_byte);
-                    udelay(100);
-                }
-            }
-
-            /* If the write of the low byte was successful, go ahead and
-             * write the high byte while checking to make sure that if it
-             * is the signature byte, then it is handled properly */
-            if (!sector_write_failed) {
-                /* If the word is 0x13, then make sure the signature bits
-                 * (15:14) are 11b until the commit has completed.
-                 * This will allow us to write 10b which indicates the
-                 * signature is valid.  We want to do this after the write
-                 * has completed so that we don't mark the segment valid
-                 * while the write is still in progress */
-                if (i == E1000_ICH_NVM_SIG_WORD)
-                    high_byte = E1000_ICH_NVM_SIG_MASK | high_byte;
-
-                error = e1000_verify_write_ich8_byte(hw,
-                            (i << 1) + new_bank_offset + 1, high_byte);
-                if (error != E1000_SUCCESS)
-                    sector_write_failed = true;
-
-            } else {
-                /* If the write failed then break from the loop and
-                 * return an error */
-                break;
-            }
-        }
-
-        /* Don't bother writing the segment valid bits if sector
-         * programming failed. */
-        if (!sector_write_failed) {
-            /* Finally validate the new segment by setting bit 15:14
-             * to 10b in word 0x13 , this can be done without an
-             * erase as well since these bits are 11 to start with
-             * and we need to change bit 14 to 0b */
-            e1000_read_ich8_byte(hw,
-                                 E1000_ICH_NVM_SIG_WORD * 2 + 1 + 
new_bank_offset,
-                                 &high_byte);
-            high_byte &= 0xBF;
-            error = e1000_verify_write_ich8_byte(hw,
-                        E1000_ICH_NVM_SIG_WORD * 2 + 1 + new_bank_offset, 
high_byte);
-            /* And invalidate the previously valid segment by setting
-             * its signature word (0x13) high_byte to 0b. This can be
-             * done without an erase because flash erase sets all bits
-             * to 1's. We can write 1's to 0's without an erase */
-            if (error == E1000_SUCCESS) {
-                error = e1000_verify_write_ich8_byte(hw,
-                            E1000_ICH_NVM_SIG_WORD * 2 + 1 + old_bank_offset, 
0);
-            }
-
-            /* Clear the now not used entry in the cache */
-            for (i = 0; i < E1000_SHADOW_RAM_WORDS; i++) {
-                hw->eeprom_shadow_ram[i].modified = false;
-                hw->eeprom_shadow_ram[i].eeprom_word = 0xFFFF;
-            }
-        }
-    }
-
-    return error;
-}
-
-/******************************************************************************
- * Reads the adapter's MAC address from the EEPROM and inverts the LSB for the
- * second function of dual function devices
- *
- * hw - Struct containing variables accessed by shared code
- *****************************************************************************/
-s32 e1000_read_mac_addr(struct e1000_hw *hw)
-{
-    u16 offset;
-    u16 eeprom_data, i;
-
-    DEBUGFUNC("e1000_read_mac_addr");
-
-    for (i = 0; i < NODE_ADDRESS_SIZE; i += 2) {
-        offset = i >> 1;
-        if (e1000_read_eeprom(hw, offset, 1, &eeprom_data) < 0) {
-            DEBUGOUT("EEPROM Read Error\n");
-            return -E1000_ERR_EEPROM;
-        }
-        hw->perm_mac_addr[i] = (u8)(eeprom_data & 0x00FF);
-        hw->perm_mac_addr[i+1] = (u8)(eeprom_data >> 8);
-    }
-
-    switch (hw->mac_type) {
-    default:
-        break;
-    case e1000_82546:
-    case e1000_82546_rev_3:
-    case e1000_82571:
-    case e1000_80003es2lan:
-        if (er32(STATUS) & E1000_STATUS_FUNC_1)
-            hw->perm_mac_addr[5] ^= 0x01;
-        break;
-    }
-
-    for (i = 0; i < NODE_ADDRESS_SIZE; i++)
-        hw->mac_addr[i] = hw->perm_mac_addr[i];
-    return E1000_SUCCESS;
-}
-
-/******************************************************************************
- * Initializes receive address filters.
- *
- * hw - Struct containing variables accessed by shared code
- *
- * Places the MAC address in receive address register 0 and clears the rest
- * of the receive addresss registers. Clears the multicast table. Assumes
- * the receiver is in reset when the routine is called.
- *****************************************************************************/
-static void e1000_init_rx_addrs(struct e1000_hw *hw)
-{
-    u32 i;
-    u32 rar_num;
-
-    DEBUGFUNC("e1000_init_rx_addrs");
-
-    /* Setup the receive address. */
-    DEBUGOUT("Programming MAC Address into RAR[0]\n");
-
-    e1000_rar_set(hw, hw->mac_addr, 0);
-
-    rar_num = E1000_RAR_ENTRIES;
-
-    /* Reserve a spot for the Locally Administered Address to work around
-     * an 82571 issue in which a reset on one port will reload the MAC on
-     * the other port. */
-    if ((hw->mac_type == e1000_82571) && (hw->laa_is_present))
-        rar_num -= 1;
-    if (hw->mac_type == e1000_ich8lan)
-        rar_num = E1000_RAR_ENTRIES_ICH8LAN;
-
-    /* Zero out the other 15 receive addresses. */
-    DEBUGOUT("Clearing RAR[1-15]\n");
-    for (i = 1; i < rar_num; i++) {
-        E1000_WRITE_REG_ARRAY(hw, RA, (i << 1), 0);
-        E1000_WRITE_FLUSH();
-        E1000_WRITE_REG_ARRAY(hw, RA, ((i << 1) + 1), 0);
-        E1000_WRITE_FLUSH();
-    }
-}
-
-/******************************************************************************
- * Hashes an address to determine its location in the multicast table
- *
- * hw - Struct containing variables accessed by shared code
- * mc_addr - the multicast address to hash
- *****************************************************************************/
-u32 e1000_hash_mc_addr(struct e1000_hw *hw, u8 *mc_addr)
-{
-    u32 hash_value = 0;
-
-    /* The portion of the address that is used for the hash table is
-     * determined by the mc_filter_type setting.
-     */
-    switch (hw->mc_filter_type) {
-    /* [0] [1] [2] [3] [4] [5]
-     * 01  AA  00  12  34  56
-     * LSB                 MSB
-     */
-    case 0:
-        if (hw->mac_type == e1000_ich8lan) {
-            /* [47:38] i.e. 0x158 for above example address */
-            hash_value = ((mc_addr[4] >> 6) | (((u16)mc_addr[5]) << 2));
-        } else {
-            /* [47:36] i.e. 0x563 for above example address */
-            hash_value = ((mc_addr[4] >> 4) | (((u16)mc_addr[5]) << 4));
-        }
-        break;
-    case 1:
-        if (hw->mac_type == e1000_ich8lan) {
-            /* [46:37] i.e. 0x2B1 for above example address */
-            hash_value = ((mc_addr[4] >> 5) | (((u16)mc_addr[5]) << 3));
-        } else {
-            /* [46:35] i.e. 0xAC6 for above example address */
-            hash_value = ((mc_addr[4] >> 3) | (((u16)mc_addr[5]) << 5));
-        }
-        break;
-    case 2:
-        if (hw->mac_type == e1000_ich8lan) {
-            /*[45:36] i.e. 0x163 for above example address */
-            hash_value = ((mc_addr[4] >> 4) | (((u16)mc_addr[5]) << 4));
-        } else {
-            /* [45:34] i.e. 0x5D8 for above example address */
-            hash_value = ((mc_addr[4] >> 2) | (((u16)mc_addr[5]) << 6));
-        }
-        break;
-    case 3:
-        if (hw->mac_type == e1000_ich8lan) {
-            /* [43:34] i.e. 0x18D for above example address */
-            hash_value = ((mc_addr[4] >> 2) | (((u16)mc_addr[5]) << 6));
-        } else {
-            /* [43:32] i.e. 0x634 for above example address */
-            hash_value = ((mc_addr[4]) | (((u16)mc_addr[5]) << 8));
-        }
-        break;
-    }
-
-    hash_value &= 0xFFF;
-    if (hw->mac_type == e1000_ich8lan)
-        hash_value &= 0x3FF;
-
-    return hash_value;
-}
-
-/******************************************************************************
- * Sets the bit in the multicast table corresponding to the hash value.
- *
- * hw - Struct containing variables accessed by shared code
- * hash_value - Multicast address hash value
- *****************************************************************************/
-void e1000_mta_set(struct e1000_hw *hw, u32 hash_value)
-{
-    u32 hash_bit, hash_reg;
-    u32 mta;
-    u32 temp;
-
-    /* The MTA is a register array of 128 32-bit registers.
-     * It is treated like an array of 4096 bits.  We want to set
-     * bit BitArray[hash_value]. So we figure out what register
-     * the bit is in, read it, OR in the new bit, then write
-     * back the new value.  The register is determined by the
-     * upper 7 bits of the hash value and the bit within that
-     * register are determined by the lower 5 bits of the value.
-     */
-    hash_reg = (hash_value >> 5) & 0x7F;
-    if (hw->mac_type == e1000_ich8lan)
-        hash_reg &= 0x1F;
-
-    hash_bit = hash_value & 0x1F;
-
-    mta = E1000_READ_REG_ARRAY(hw, MTA, hash_reg);
-
-    mta |= (1 << hash_bit);
-
-    /* If we are on an 82544 and we are trying to write an odd offset
-     * in the MTA, save off the previous entry before writing and
-     * restore the old value after writing.
-     */
-    if ((hw->mac_type == e1000_82544) && ((hash_reg & 0x1) == 1)) {
-        temp = E1000_READ_REG_ARRAY(hw, MTA, (hash_reg - 1));
-        E1000_WRITE_REG_ARRAY(hw, MTA, hash_reg, mta);
-        E1000_WRITE_FLUSH();
-        E1000_WRITE_REG_ARRAY(hw, MTA, (hash_reg - 1), temp);
-        E1000_WRITE_FLUSH();
-    } else {
-        E1000_WRITE_REG_ARRAY(hw, MTA, hash_reg, mta);
-        E1000_WRITE_FLUSH();
-    }
-}
-
-/******************************************************************************
- * Puts an ethernet address into a receive address register.
- *
- * hw - Struct containing variables accessed by shared code
- * addr - Address to put into receive address register
- * index - Receive address register to write
- *****************************************************************************/
-void e1000_rar_set(struct e1000_hw *hw, u8 *addr, u32 index)
-{
-    u32 rar_low, rar_high;
-
-    /* HW expects these in little endian so we reverse the byte order
-     * from network order (big endian) to little endian
-     */
-    rar_low = ((u32)addr[0] | ((u32)addr[1] << 8) |
-               ((u32)addr[2] << 16) | ((u32)addr[3] << 24));
-    rar_high = ((u32)addr[4] | ((u32)addr[5] << 8));
-
-    /* Disable Rx and flush all Rx frames before enabling RSS to avoid Rx
-     * unit hang.
-     *
-     * Description:
-     * If there are any Rx frames queued up or otherwise present in the HW
-     * before RSS is enabled, and then we enable RSS, the HW Rx unit will
-     * hang.  To work around this issue, we have to disable receives and
-     * flush out all Rx frames before we enable RSS. To do so, we modify we
-     * redirect all Rx traffic to manageability and then reset the HW.
-     * This flushes away Rx frames, and (since the redirections to
-     * manageability persists across resets) keeps new ones from coming in
-     * while we work.  Then, we clear the Address Valid AV bit for all MAC
-     * addresses and undo the re-direction to manageability.
-     * Now, frames are coming in again, but the MAC won't accept them, so
-     * far so good.  We now proceed to initialize RSS (if necessary) and
-     * configure the Rx unit.  Last, we re-enable the AV bits and continue
-     * on our merry way.
-     */
-    switch (hw->mac_type) {
-    case e1000_82571:
-    case e1000_82572:
-    case e1000_80003es2lan:
-        if (hw->leave_av_bit_off)
-            break;
-    default:
-        /* Indicate to hardware the Address is Valid. */
-        rar_high |= E1000_RAH_AV;
-        break;
-    }
-
-    E1000_WRITE_REG_ARRAY(hw, RA, (index << 1), rar_low);
-    E1000_WRITE_FLUSH();
-    E1000_WRITE_REG_ARRAY(hw, RA, ((index << 1) + 1), rar_high);
-    E1000_WRITE_FLUSH();
-}
-
-/******************************************************************************
- * Writes a value to the specified offset in the VLAN filter table.
- *
- * hw - Struct containing variables accessed by shared code
- * offset - Offset in VLAN filer table to write
- * value - Value to write into VLAN filter table
- *****************************************************************************/
-void e1000_write_vfta(struct e1000_hw *hw, u32 offset, u32 value)
-{
-    u32 temp;
-
-    if (hw->mac_type == e1000_ich8lan)
-        return;
-
-    if ((hw->mac_type == e1000_82544) && ((offset & 0x1) == 1)) {
-        temp = E1000_READ_REG_ARRAY(hw, VFTA, (offset - 1));
-        E1000_WRITE_REG_ARRAY(hw, VFTA, offset, value);
-        E1000_WRITE_FLUSH();
-        E1000_WRITE_REG_ARRAY(hw, VFTA, (offset - 1), temp);
-        E1000_WRITE_FLUSH();
-    } else {
-        E1000_WRITE_REG_ARRAY(hw, VFTA, offset, value);
-        E1000_WRITE_FLUSH();
-    }
-}
-
-/******************************************************************************
- * Clears the VLAN filer table
- *
- * hw - Struct containing variables accessed by shared code
- *****************************************************************************/
-static void e1000_clear_vfta(struct e1000_hw *hw)
-{
-    u32 offset;
-    u32 vfta_value = 0;
-    u32 vfta_offset = 0;
-    u32 vfta_bit_in_reg = 0;
-
-    if (hw->mac_type == e1000_ich8lan)
-        return;
-
-    if (hw->mac_type == e1000_82573) {
-        if (hw->mng_cookie.vlan_id != 0) {
-            /* The VFTA is a 4096b bit-field, each identifying a single VLAN
-             * ID.  The following operations determine which 32b entry
-             * (i.e. offset) into the array we want to set the VLAN ID
-             * (i.e. bit) of the manageability unit. */
-            vfta_offset = (hw->mng_cookie.vlan_id >>
-                           E1000_VFTA_ENTRY_SHIFT) &
-                          E1000_VFTA_ENTRY_MASK;
-            vfta_bit_in_reg = 1 << (hw->mng_cookie.vlan_id &
-                                    E1000_VFTA_ENTRY_BIT_SHIFT_MASK);
-        }
-    }
-    for (offset = 0; offset < E1000_VLAN_FILTER_TBL_SIZE; offset++) {
-        /* If the offset we want to clear is the same offset of the
-         * manageability VLAN ID, then clear all bits except that of the
-         * manageability unit */
-        vfta_value = (offset == vfta_offset) ? vfta_bit_in_reg : 0;
-        E1000_WRITE_REG_ARRAY(hw, VFTA, offset, vfta_value);
-        E1000_WRITE_FLUSH();
-    }
-}
-
-static s32 e1000_id_led_init(struct e1000_hw *hw)
-{
-    u32 ledctl;
-    const u32 ledctl_mask = 0x000000FF;
-    const u32 ledctl_on = E1000_LEDCTL_MODE_LED_ON;
-    const u32 ledctl_off = E1000_LEDCTL_MODE_LED_OFF;
-    u16 eeprom_data, i, temp;
-    const u16 led_mask = 0x0F;
-
-    DEBUGFUNC("e1000_id_led_init");
-
-    if (hw->mac_type < e1000_82540) {
-        /* Nothing to do */
-        return E1000_SUCCESS;
-    }
-
-    ledctl = er32(LEDCTL);
-    hw->ledctl_default = ledctl;
-    hw->ledctl_mode1 = hw->ledctl_default;
-    hw->ledctl_mode2 = hw->ledctl_default;
-
-    if (e1000_read_eeprom(hw, EEPROM_ID_LED_SETTINGS, 1, &eeprom_data) < 0) {
-        DEBUGOUT("EEPROM Read Error\n");
-        return -E1000_ERR_EEPROM;
-    }
-
-    if ((hw->mac_type == e1000_82573) &&
-        (eeprom_data == ID_LED_RESERVED_82573))
-        eeprom_data = ID_LED_DEFAULT_82573;
-    else if ((eeprom_data == ID_LED_RESERVED_0000) ||
-            (eeprom_data == ID_LED_RESERVED_FFFF)) {
-        if (hw->mac_type == e1000_ich8lan)
-            eeprom_data = ID_LED_DEFAULT_ICH8LAN;
-        else
-            eeprom_data = ID_LED_DEFAULT;
-    }
-
-    for (i = 0; i < 4; i++) {
-        temp = (eeprom_data >> (i << 2)) & led_mask;
-        switch (temp) {
-        case ID_LED_ON1_DEF2:
-        case ID_LED_ON1_ON2:
-        case ID_LED_ON1_OFF2:
-            hw->ledctl_mode1 &= ~(ledctl_mask << (i << 3));
-            hw->ledctl_mode1 |= ledctl_on << (i << 3);
-            break;
-        case ID_LED_OFF1_DEF2:
-        case ID_LED_OFF1_ON2:
-        case ID_LED_OFF1_OFF2:
-            hw->ledctl_mode1 &= ~(ledctl_mask << (i << 3));
-            hw->ledctl_mode1 |= ledctl_off << (i << 3);
-            break;
-        default:
-            /* Do nothing */
-            break;
-        }
-        switch (temp) {
-        case ID_LED_DEF1_ON2:
-        case ID_LED_ON1_ON2:
-        case ID_LED_OFF1_ON2:
-            hw->ledctl_mode2 &= ~(ledctl_mask << (i << 3));
-            hw->ledctl_mode2 |= ledctl_on << (i << 3);
-            break;
-        case ID_LED_DEF1_OFF2:
-        case ID_LED_ON1_OFF2:
-        case ID_LED_OFF1_OFF2:
-            hw->ledctl_mode2 &= ~(ledctl_mask << (i << 3));
-            hw->ledctl_mode2 |= ledctl_off << (i << 3);
-            break;
-        default:
-            /* Do nothing */
-            break;
-        }
-    }
-    return E1000_SUCCESS;
-}
-
-/******************************************************************************
- * Prepares SW controlable LED for use and saves the current state of the LED.
- *
- * hw - Struct containing variables accessed by shared code
- *****************************************************************************/
-s32 e1000_setup_led(struct e1000_hw *hw)
-{
-    u32 ledctl;
-    s32 ret_val = E1000_SUCCESS;
-
-    DEBUGFUNC("e1000_setup_led");
-
-    switch (hw->mac_type) {
-    case e1000_82542_rev2_0:
-    case e1000_82542_rev2_1:
-    case e1000_82543:
-    case e1000_82544:
-        /* No setup necessary */
-        break;
-    case e1000_82541:
-    case e1000_82547:
-    case e1000_82541_rev_2:
-    case e1000_82547_rev_2:
-        /* Turn off PHY Smart Power Down (if enabled) */
-        ret_val = e1000_read_phy_reg(hw, IGP01E1000_GMII_FIFO,
-                                     &hw->phy_spd_default);
-        if (ret_val)
-            return ret_val;
-        ret_val = e1000_write_phy_reg(hw, IGP01E1000_GMII_FIFO,
-                                      (u16)(hw->phy_spd_default &
-                                      ~IGP01E1000_GMII_SPD));
-        if (ret_val)
-            return ret_val;
-        /* Fall Through */
-    default:
-        if (hw->media_type == e1000_media_type_fiber) {
-            ledctl = er32(LEDCTL);
-            /* Save current LEDCTL settings */
-            hw->ledctl_default = ledctl;
-            /* Turn off LED0 */
-            ledctl &= ~(E1000_LEDCTL_LED0_IVRT |
-                        E1000_LEDCTL_LED0_BLINK |
-                        E1000_LEDCTL_LED0_MODE_MASK);
-            ledctl |= (E1000_LEDCTL_MODE_LED_OFF <<
-                       E1000_LEDCTL_LED0_MODE_SHIFT);
-            ew32(LEDCTL, ledctl);
-        } else if (hw->media_type == e1000_media_type_copper)
-            ew32(LEDCTL, hw->ledctl_mode1);
-        break;
-    }
-
-    return E1000_SUCCESS;
-}
-
-
-/******************************************************************************
- * Used on 82571 and later Si that has LED blink bits.
- * Callers must use their own timer and should have already called
- * e1000_id_led_init()
- * Call e1000_cleanup led() to stop blinking
- *
- * hw - Struct containing variables accessed by shared code
- *****************************************************************************/
-s32 e1000_blink_led_start(struct e1000_hw *hw)
-{
-    s16  i;
-    u32 ledctl_blink = 0;
-
-    DEBUGFUNC("e1000_id_led_blink_on");
-
-    if (hw->mac_type < e1000_82571) {
-        /* Nothing to do */
-        return E1000_SUCCESS;
-    }
-    if (hw->media_type == e1000_media_type_fiber) {
-        /* always blink LED0 for PCI-E fiber */
-        ledctl_blink = E1000_LEDCTL_LED0_BLINK |
-                     (E1000_LEDCTL_MODE_LED_ON << 
E1000_LEDCTL_LED0_MODE_SHIFT);
-    } else {
-        /* set the blink bit for each LED that's "on" (0x0E) in ledctl_mode2 */
-        ledctl_blink = hw->ledctl_mode2;
-        for (i=0; i < 4; i++)
-            if (((hw->ledctl_mode2 >> (i * 8)) & 0xFF) ==
-                E1000_LEDCTL_MODE_LED_ON)
-                ledctl_blink |= (E1000_LEDCTL_LED0_BLINK << (i * 8));
-    }
-
-    ew32(LEDCTL, ledctl_blink);
-
-    return E1000_SUCCESS;
-}
-
-/******************************************************************************
- * Restores the saved state of the SW controlable LED.
- *
- * hw - Struct containing variables accessed by shared code
- *****************************************************************************/
-s32 e1000_cleanup_led(struct e1000_hw *hw)
-{
-    s32 ret_val = E1000_SUCCESS;
-
-    DEBUGFUNC("e1000_cleanup_led");
-
-    switch (hw->mac_type) {
-    case e1000_82542_rev2_0:
-    case e1000_82542_rev2_1:
-    case e1000_82543:
-    case e1000_82544:
-        /* No cleanup necessary */
-        break;
-    case e1000_82541:
-    case e1000_82547:
-    case e1000_82541_rev_2:
-    case e1000_82547_rev_2:
-        /* Turn on PHY Smart Power Down (if previously enabled) */
-        ret_val = e1000_write_phy_reg(hw, IGP01E1000_GMII_FIFO,
-                                      hw->phy_spd_default);
-        if (ret_val)
-            return ret_val;
-        /* Fall Through */
-    default:
-        if (hw->phy_type == e1000_phy_ife) {
-            e1000_write_phy_reg(hw, IFE_PHY_SPECIAL_CONTROL_LED, 0);
-            break;
-        }
-        /* Restore LEDCTL settings */
-        ew32(LEDCTL, hw->ledctl_default);
-        break;
-    }
-
-    return E1000_SUCCESS;
-}
-
-/******************************************************************************
- * Turns on the software controllable LED
- *
- * hw - Struct containing variables accessed by shared code
- *****************************************************************************/
-s32 e1000_led_on(struct e1000_hw *hw)
-{
-    u32 ctrl = er32(CTRL);
-
-    DEBUGFUNC("e1000_led_on");
-
-    switch (hw->mac_type) {
-    case e1000_82542_rev2_0:
-    case e1000_82542_rev2_1:
-    case e1000_82543:
-        /* Set SW Defineable Pin 0 to turn on the LED */
-        ctrl |= E1000_CTRL_SWDPIN0;
-        ctrl |= E1000_CTRL_SWDPIO0;
-        break;
-    case e1000_82544:
-        if (hw->media_type == e1000_media_type_fiber) {
-            /* Set SW Defineable Pin 0 to turn on the LED */
-            ctrl |= E1000_CTRL_SWDPIN0;
-            ctrl |= E1000_CTRL_SWDPIO0;
-        } else {
-            /* Clear SW Defineable Pin 0 to turn on the LED */
-            ctrl &= ~E1000_CTRL_SWDPIN0;
-            ctrl |= E1000_CTRL_SWDPIO0;
-        }
-        break;
-    default:
-        if (hw->media_type == e1000_media_type_fiber) {
-            /* Clear SW Defineable Pin 0 to turn on the LED */
-            ctrl &= ~E1000_CTRL_SWDPIN0;
-            ctrl |= E1000_CTRL_SWDPIO0;
-        } else if (hw->phy_type == e1000_phy_ife) {
-            e1000_write_phy_reg(hw, IFE_PHY_SPECIAL_CONTROL_LED,
-                 (IFE_PSCL_PROBE_MODE | IFE_PSCL_PROBE_LEDS_ON));
-        } else if (hw->media_type == e1000_media_type_copper) {
-            ew32(LEDCTL, hw->ledctl_mode2);
-            return E1000_SUCCESS;
-        }
-        break;
-    }
-
-    ew32(CTRL, ctrl);
-
-    return E1000_SUCCESS;
-}
-
-/******************************************************************************
- * Turns off the software controllable LED
- *
- * hw - Struct containing variables accessed by shared code
- *****************************************************************************/
-s32 e1000_led_off(struct e1000_hw *hw)
-{
-    u32 ctrl = er32(CTRL);
-
-    DEBUGFUNC("e1000_led_off");
-
-    switch (hw->mac_type) {
-    case e1000_82542_rev2_0:
-    case e1000_82542_rev2_1:
-    case e1000_82543:
-        /* Clear SW Defineable Pin 0 to turn off the LED */
-        ctrl &= ~E1000_CTRL_SWDPIN0;
-        ctrl |= E1000_CTRL_SWDPIO0;
-        break;
-    case e1000_82544:
-        if (hw->media_type == e1000_media_type_fiber) {
-            /* Clear SW Defineable Pin 0 to turn off the LED */
-            ctrl &= ~E1000_CTRL_SWDPIN0;
-            ctrl |= E1000_CTRL_SWDPIO0;
-        } else {
-            /* Set SW Defineable Pin 0 to turn off the LED */
-            ctrl |= E1000_CTRL_SWDPIN0;
-            ctrl |= E1000_CTRL_SWDPIO0;
-        }
-        break;
-    default:
-        if (hw->media_type == e1000_media_type_fiber) {
-            /* Set SW Defineable Pin 0 to turn off the LED */
-            ctrl |= E1000_CTRL_SWDPIN0;
-            ctrl |= E1000_CTRL_SWDPIO0;
-        } else if (hw->phy_type == e1000_phy_ife) {
-            e1000_write_phy_reg(hw, IFE_PHY_SPECIAL_CONTROL_LED,
-                 (IFE_PSCL_PROBE_MODE | IFE_PSCL_PROBE_LEDS_OFF));
-        } else if (hw->media_type == e1000_media_type_copper) {
-            ew32(LEDCTL, hw->ledctl_mode1);
-            return E1000_SUCCESS;
-        }
-        break;
-    }
-
-    ew32(CTRL, ctrl);
-
-    return E1000_SUCCESS;
-}
-
-/******************************************************************************
- * Clears all hardware statistics counters.
- *
- * hw - Struct containing variables accessed by shared code
- *****************************************************************************/
-static void e1000_clear_hw_cntrs(struct e1000_hw *hw)
-{
-    volatile u32 temp;
-
-    temp = er32(CRCERRS);
-    temp = er32(SYMERRS);
-    temp = er32(MPC);
-    temp = er32(SCC);
-    temp = er32(ECOL);
-    temp = er32(MCC);
-    temp = er32(LATECOL);
-    temp = er32(COLC);
-    temp = er32(DC);
-    temp = er32(SEC);
-    temp = er32(RLEC);
-    temp = er32(XONRXC);
-    temp = er32(XONTXC);
-    temp = er32(XOFFRXC);
-    temp = er32(XOFFTXC);
-    temp = er32(FCRUC);
-
-    if (hw->mac_type != e1000_ich8lan) {
-    temp = er32(PRC64);
-    temp = er32(PRC127);
-    temp = er32(PRC255);
-    temp = er32(PRC511);
-    temp = er32(PRC1023);
-    temp = er32(PRC1522);
-    }
-
-    temp = er32(GPRC);
-    temp = er32(BPRC);
-    temp = er32(MPRC);
-    temp = er32(GPTC);
-    temp = er32(GORCL);
-    temp = er32(GORCH);
-    temp = er32(GOTCL);
-    temp = er32(GOTCH);
-    temp = er32(RNBC);
-    temp = er32(RUC);
-    temp = er32(RFC);
-    temp = er32(ROC);
-    temp = er32(RJC);
-    temp = er32(TORL);
-    temp = er32(TORH);
-    temp = er32(TOTL);
-    temp = er32(TOTH);
-    temp = er32(TPR);
-    temp = er32(TPT);
-
-    if (hw->mac_type != e1000_ich8lan) {
-    temp = er32(PTC64);
-    temp = er32(PTC127);
-    temp = er32(PTC255);
-    temp = er32(PTC511);
-    temp = er32(PTC1023);
-    temp = er32(PTC1522);
-    }
-
-    temp = er32(MPTC);
-    temp = er32(BPTC);
-
-    if (hw->mac_type < e1000_82543) return;
-
-    temp = er32(ALGNERRC);
-    temp = er32(RXERRC);
-    temp = er32(TNCRS);
-    temp = er32(CEXTERR);
-    temp = er32(TSCTC);
-    temp = er32(TSCTFC);
-
-    if (hw->mac_type <= e1000_82544) return;
-
-    temp = er32(MGTPRC);
-    temp = er32(MGTPDC);
-    temp = er32(MGTPTC);
-
-    if (hw->mac_type <= e1000_82547_rev_2) return;
-
-    temp = er32(IAC);
-    temp = er32(ICRXOC);
-
-    if (hw->mac_type == e1000_ich8lan) return;
-
-    temp = er32(ICRXPTC);
-    temp = er32(ICRXATC);
-    temp = er32(ICTXPTC);
-    temp = er32(ICTXATC);
-    temp = er32(ICTXQEC);
-    temp = er32(ICTXQMTC);
-    temp = er32(ICRXDMTC);
-}
-
-/******************************************************************************
- * Resets Adaptive IFS to its default state.
- *
- * hw - Struct containing variables accessed by shared code
- *
- * Call this after e1000_init_hw. You may override the IFS defaults by setting
- * hw->ifs_params_forced to true. However, you must initialize hw->
- * current_ifs_val, ifs_min_val, ifs_max_val, ifs_step_size, and ifs_ratio
- * before calling this function.
- *****************************************************************************/
-void e1000_reset_adaptive(struct e1000_hw *hw)
-{
-    DEBUGFUNC("e1000_reset_adaptive");
-
-    if (hw->adaptive_ifs) {
-        if (!hw->ifs_params_forced) {
-            hw->current_ifs_val = 0;
-            hw->ifs_min_val = IFS_MIN;
-            hw->ifs_max_val = IFS_MAX;
-            hw->ifs_step_size = IFS_STEP;
-            hw->ifs_ratio = IFS_RATIO;
-        }
-        hw->in_ifs_mode = false;
-        ew32(AIT, 0);
-    } else {
-        DEBUGOUT("Not in Adaptive IFS mode!\n");
-    }
-}
-
-/******************************************************************************
- * Called during the callback/watchdog routine to update IFS value based on
- * the ratio of transmits to collisions.
- *
- * hw - Struct containing variables accessed by shared code
- * tx_packets - Number of transmits since last callback
- * total_collisions - Number of collisions since last callback
- *****************************************************************************/
-void e1000_update_adaptive(struct e1000_hw *hw)
-{
-    DEBUGFUNC("e1000_update_adaptive");
-
-    if (hw->adaptive_ifs) {
-        if ((hw->collision_delta * hw->ifs_ratio) > hw->tx_packet_delta) {
-            if (hw->tx_packet_delta > MIN_NUM_XMITS) {
-                hw->in_ifs_mode = true;
-                if (hw->current_ifs_val < hw->ifs_max_val) {
-                    if (hw->current_ifs_val == 0)
-                        hw->current_ifs_val = hw->ifs_min_val;
-                    else
-                        hw->current_ifs_val += hw->ifs_step_size;
-                    ew32(AIT, hw->current_ifs_val);
-                }
-            }
-        } else {
-            if (hw->in_ifs_mode && (hw->tx_packet_delta <= MIN_NUM_XMITS)) {
-                hw->current_ifs_val = 0;
-                hw->in_ifs_mode = false;
-                ew32(AIT, 0);
-            }
-        }
-    } else {
-        DEBUGOUT("Not in Adaptive IFS mode!\n");
-    }
-}
-
-/******************************************************************************
- * Adjusts the statistic counters when a frame is accepted by TBI_ACCEPT
- *
- * hw - Struct containing variables accessed by shared code
- * frame_len - The length of the frame in question
- * mac_addr - The Ethernet destination address of the frame in question
- *****************************************************************************/
-void e1000_tbi_adjust_stats(struct e1000_hw *hw, struct e1000_hw_stats *stats,
-                           u32 frame_len, u8 *mac_addr)
-{
-    u64 carry_bit;
-
-    /* First adjust the frame length. */
-    frame_len--;
-    /* We need to adjust the statistics counters, since the hardware
-     * counters overcount this packet as a CRC error and undercount
-     * the packet as a good packet
-     */
-    /* This packet should not be counted as a CRC error.    */
-    stats->crcerrs--;
-    /* This packet does count as a Good Packet Received.    */
-    stats->gprc++;
-
-    /* Adjust the Good Octets received counters             */
-    carry_bit = 0x80000000 & stats->gorcl;
-    stats->gorcl += frame_len;
-    /* If the high bit of Gorcl (the low 32 bits of the Good Octets
-     * Received Count) was one before the addition,
-     * AND it is zero after, then we lost the carry out,
-     * need to add one to Gorch (Good Octets Received Count High).
-     * This could be simplified if all environments supported
-     * 64-bit integers.
-     */
-    if (carry_bit && ((stats->gorcl & 0x80000000) == 0))
-        stats->gorch++;
-    /* Is this a broadcast or multicast?  Check broadcast first,
-     * since the test for a multicast frame will test positive on
-     * a broadcast frame.
-     */
-    if ((mac_addr[0] == (u8)0xff) && (mac_addr[1] == (u8)0xff))
-        /* Broadcast packet */
-        stats->bprc++;
-    else if (*mac_addr & 0x01)
-        /* Multicast packet */
-        stats->mprc++;
-
-    if (frame_len == hw->max_frame_size) {
-        /* In this case, the hardware has overcounted the number of
-         * oversize frames.
-         */
-        if (stats->roc > 0)
-            stats->roc--;
-    }
-
-    /* Adjust the bin counters when the extra byte put the frame in the
-     * wrong bin. Remember that the frame_len was adjusted above.
-     */
-    if (frame_len == 64) {
-        stats->prc64++;
-        stats->prc127--;
-    } else if (frame_len == 127) {
-        stats->prc127++;
-        stats->prc255--;
-    } else if (frame_len == 255) {
-        stats->prc255++;
-        stats->prc511--;
-    } else if (frame_len == 511) {
-        stats->prc511++;
-        stats->prc1023--;
-    } else if (frame_len == 1023) {
-        stats->prc1023++;
-        stats->prc1522--;
-    } else if (frame_len == 1522) {
-        stats->prc1522++;
-    }
-}
-
-/******************************************************************************
- * Gets the current PCI bus type, speed, and width of the hardware
- *
- * hw - Struct containing variables accessed by shared code
- *****************************************************************************/
-void e1000_get_bus_info(struct e1000_hw *hw)
-{
-    s32 ret_val;
-    u16 pci_ex_link_status;
-    u32 status;
-
-    switch (hw->mac_type) {
-    case e1000_82542_rev2_0:
-    case e1000_82542_rev2_1:
-        hw->bus_type = e1000_bus_type_pci;
-        hw->bus_speed = e1000_bus_speed_unknown;
-        hw->bus_width = e1000_bus_width_unknown;
-        break;
-    case e1000_82571:
-    case e1000_82572:
-    case e1000_82573:
-    case e1000_80003es2lan:
-        hw->bus_type = e1000_bus_type_pci_express;
-        hw->bus_speed = e1000_bus_speed_2500;
-        ret_val = e1000_read_pcie_cap_reg(hw,
-                                      PCI_EX_LINK_STATUS,
-                                      &pci_ex_link_status);
-        if (ret_val)
-            hw->bus_width = e1000_bus_width_unknown;
-        else
-            hw->bus_width = (pci_ex_link_status & PCI_EX_LINK_WIDTH_MASK) >>
-                          PCI_EX_LINK_WIDTH_SHIFT;
-        break;
-    case e1000_ich8lan:
-        hw->bus_type = e1000_bus_type_pci_express;
-        hw->bus_speed = e1000_bus_speed_2500;
-        hw->bus_width = e1000_bus_width_pciex_1;
-        break;
-    default:
-        status = er32(STATUS);
-        hw->bus_type = (status & E1000_STATUS_PCIX_MODE) ?
-                       e1000_bus_type_pcix : e1000_bus_type_pci;
-
-        if (hw->device_id == E1000_DEV_ID_82546EB_QUAD_COPPER) {
-            hw->bus_speed = (hw->bus_type == e1000_bus_type_pci) ?
-                            e1000_bus_speed_66 : e1000_bus_speed_120;
-        } else if (hw->bus_type == e1000_bus_type_pci) {
-            hw->bus_speed = (status & E1000_STATUS_PCI66) ?
-                            e1000_bus_speed_66 : e1000_bus_speed_33;
-        } else {
-            switch (status & E1000_STATUS_PCIX_SPEED) {
-            case E1000_STATUS_PCIX_SPEED_66:
-                hw->bus_speed = e1000_bus_speed_66;
-                break;
-            case E1000_STATUS_PCIX_SPEED_100:
-                hw->bus_speed = e1000_bus_speed_100;
-                break;
-            case E1000_STATUS_PCIX_SPEED_133:
-                hw->bus_speed = e1000_bus_speed_133;
-                break;
-            default:
-                hw->bus_speed = e1000_bus_speed_reserved;
-                break;
-            }
-        }
-        hw->bus_width = (status & E1000_STATUS_BUS64) ?
-                        e1000_bus_width_64 : e1000_bus_width_32;
-        break;
-    }
-}
-
-/******************************************************************************
- * Writes a value to one of the devices registers using port I/O (as opposed to
- * memory mapped I/O). Only 82544 and newer devices support port I/O.
- *
- * hw - Struct containing variables accessed by shared code
- * offset - offset to write to
- * value - value to write
- *****************************************************************************/
-static void e1000_write_reg_io(struct e1000_hw *hw, u32 offset, u32 value)
-{
-    unsigned long io_addr = hw->io_base;
-    unsigned long io_data = hw->io_base + 4;
-
-    e1000_io_write(hw, io_addr, offset);
-    e1000_io_write(hw, io_data, value);
-}
-
-/******************************************************************************
- * Estimates the cable length.
- *
- * hw - Struct containing variables accessed by shared code
- * min_length - The estimated minimum length
- * max_length - The estimated maximum length
- *
- * returns: - E1000_ERR_XXX
- *            E1000_SUCCESS
- *
- * This function always returns a ranged length (minimum & maximum).
- * So for M88 phy's, this function interprets the one value returned from the
- * register to the minimum and maximum range.
- * For IGP phy's, the function calculates the range by the AGC registers.
- *****************************************************************************/
-static s32 e1000_get_cable_length(struct e1000_hw *hw, u16 *min_length,
-                                 u16 *max_length)
-{
-    s32 ret_val;
-    u16 agc_value = 0;
-    u16 i, phy_data;
-    u16 cable_length;
-
-    DEBUGFUNC("e1000_get_cable_length");
-
-    *min_length = *max_length = 0;
-
-    /* Use old method for Phy older than IGP */
-    if (hw->phy_type == e1000_phy_m88) {
-
-        ret_val = e1000_read_phy_reg(hw, M88E1000_PHY_SPEC_STATUS,
-                                     &phy_data);
-        if (ret_val)
-            return ret_val;
-        cable_length = (phy_data & M88E1000_PSSR_CABLE_LENGTH) >>
-                       M88E1000_PSSR_CABLE_LENGTH_SHIFT;
-
-        /* Convert the enum value to ranged values */
-        switch (cable_length) {
-        case e1000_cable_length_50:
-            *min_length = 0;
-            *max_length = e1000_igp_cable_length_50;
-            break;
-        case e1000_cable_length_50_80:
-            *min_length = e1000_igp_cable_length_50;
-            *max_length = e1000_igp_cable_length_80;
-            break;
-        case e1000_cable_length_80_110:
-            *min_length = e1000_igp_cable_length_80;
-            *max_length = e1000_igp_cable_length_110;
-            break;
-        case e1000_cable_length_110_140:
-            *min_length = e1000_igp_cable_length_110;
-            *max_length = e1000_igp_cable_length_140;
-            break;
-        case e1000_cable_length_140:
-            *min_length = e1000_igp_cable_length_140;
-            *max_length = e1000_igp_cable_length_170;
-            break;
-        default:
-            return -E1000_ERR_PHY;
-            break;
-        }
-    } else if (hw->phy_type == e1000_phy_gg82563) {
-        ret_val = e1000_read_phy_reg(hw, GG82563_PHY_DSP_DISTANCE,
-                                     &phy_data);
-        if (ret_val)
-            return ret_val;
-        cable_length = phy_data & GG82563_DSPD_CABLE_LENGTH;
-
-        switch (cable_length) {
-        case e1000_gg_cable_length_60:
-            *min_length = 0;
-            *max_length = e1000_igp_cable_length_60;
-            break;
-        case e1000_gg_cable_length_60_115:
-            *min_length = e1000_igp_cable_length_60;
-            *max_length = e1000_igp_cable_length_115;
-            break;
-        case e1000_gg_cable_length_115_150:
-            *min_length = e1000_igp_cable_length_115;
-            *max_length = e1000_igp_cable_length_150;
-            break;
-        case e1000_gg_cable_length_150:
-            *min_length = e1000_igp_cable_length_150;
-            *max_length = e1000_igp_cable_length_180;
-            break;
-        default:
-            return -E1000_ERR_PHY;
-            break;
-        }
-    } else if (hw->phy_type == e1000_phy_igp) { /* For IGP PHY */
-        u16 cur_agc_value;
-        u16 min_agc_value = IGP01E1000_AGC_LENGTH_TABLE_SIZE;
-        u16 agc_reg_array[IGP01E1000_PHY_CHANNEL_NUM] =
-                                                         {IGP01E1000_PHY_AGC_A,
-                                                          IGP01E1000_PHY_AGC_B,
-                                                          IGP01E1000_PHY_AGC_C,
-                                                          
IGP01E1000_PHY_AGC_D};
-        /* Read the AGC registers for all channels */
-        for (i = 0; i < IGP01E1000_PHY_CHANNEL_NUM; i++) {
-
-            ret_val = e1000_read_phy_reg(hw, agc_reg_array[i], &phy_data);
-            if (ret_val)
-                return ret_val;
-
-            cur_agc_value = phy_data >> IGP01E1000_AGC_LENGTH_SHIFT;
-
-            /* Value bound check. */
-            if ((cur_agc_value >= IGP01E1000_AGC_LENGTH_TABLE_SIZE - 1) ||
-                (cur_agc_value == 0))
-                return -E1000_ERR_PHY;
-
-            agc_value += cur_agc_value;
-
-            /* Update minimal AGC value. */
-            if (min_agc_value > cur_agc_value)
-                min_agc_value = cur_agc_value;
-        }
-
-        /* Remove the minimal AGC result for length < 50m */
-        if (agc_value < IGP01E1000_PHY_CHANNEL_NUM * 
e1000_igp_cable_length_50) {
-            agc_value -= min_agc_value;
-
-            /* Get the average length of the remaining 3 channels */
-            agc_value /= (IGP01E1000_PHY_CHANNEL_NUM - 1);
-        } else {
-            /* Get the average length of all the 4 channels. */
-            agc_value /= IGP01E1000_PHY_CHANNEL_NUM;
-        }
-
-        /* Set the range of the calculated length. */
-        *min_length = ((e1000_igp_cable_length_table[agc_value] -
-                       IGP01E1000_AGC_RANGE) > 0) ?
-                       (e1000_igp_cable_length_table[agc_value] -
-                       IGP01E1000_AGC_RANGE) : 0;
-        *max_length = e1000_igp_cable_length_table[agc_value] +
-                      IGP01E1000_AGC_RANGE;
-    } else if (hw->phy_type == e1000_phy_igp_2 ||
-               hw->phy_type == e1000_phy_igp_3) {
-        u16 cur_agc_index, max_agc_index = 0;
-        u16 min_agc_index = IGP02E1000_AGC_LENGTH_TABLE_SIZE - 1;
-        u16 agc_reg_array[IGP02E1000_PHY_CHANNEL_NUM] =
-                                                         {IGP02E1000_PHY_AGC_A,
-                                                          IGP02E1000_PHY_AGC_B,
-                                                          IGP02E1000_PHY_AGC_C,
-                                                          
IGP02E1000_PHY_AGC_D};
-        /* Read the AGC registers for all channels */
-        for (i = 0; i < IGP02E1000_PHY_CHANNEL_NUM; i++) {
-            ret_val = e1000_read_phy_reg(hw, agc_reg_array[i], &phy_data);
-            if (ret_val)
-                return ret_val;
-
-            /* Getting bits 15:9, which represent the combination of course and
-             * fine gain values.  The result is a number that can be put into
-             * the lookup table to obtain the approximate cable length. */
-            cur_agc_index = (phy_data >> IGP02E1000_AGC_LENGTH_SHIFT) &
-                            IGP02E1000_AGC_LENGTH_MASK;
-
-            /* Array index bound check. */
-            if ((cur_agc_index >= IGP02E1000_AGC_LENGTH_TABLE_SIZE) ||
-                (cur_agc_index == 0))
-                return -E1000_ERR_PHY;
-
-            /* Remove min & max AGC values from calculation. */
-            if (e1000_igp_2_cable_length_table[min_agc_index] >
-                e1000_igp_2_cable_length_table[cur_agc_index])
-                min_agc_index = cur_agc_index;
-            if (e1000_igp_2_cable_length_table[max_agc_index] <
-                e1000_igp_2_cable_length_table[cur_agc_index])
-                max_agc_index = cur_agc_index;
-
-            agc_value += e1000_igp_2_cable_length_table[cur_agc_index];
-        }
-
-        agc_value -= (e1000_igp_2_cable_length_table[min_agc_index] +
-                      e1000_igp_2_cable_length_table[max_agc_index]);
-        agc_value /= (IGP02E1000_PHY_CHANNEL_NUM - 2);
-
-        /* Calculate cable length with the error range of +/- 10 meters. */
-        *min_length = ((agc_value - IGP02E1000_AGC_RANGE) > 0) ?
-                       (agc_value - IGP02E1000_AGC_RANGE) : 0;
-        *max_length = agc_value + IGP02E1000_AGC_RANGE;
-    }
-
-    return E1000_SUCCESS;
-}
-
-/******************************************************************************
- * Check the cable polarity
- *
- * hw - Struct containing variables accessed by shared code
- * polarity - output parameter : 0 - Polarity is not reversed
- *                               1 - Polarity is reversed.
- *
- * returns: - E1000_ERR_XXX
- *            E1000_SUCCESS
- *
- * For phy's older than IGP, this function simply reads the polarity bit in the
- * Phy Status register.  For IGP phy's, this bit is valid only if link speed is
- * 10 Mbps.  If the link speed is 100 Mbps there is no polarity so this bit 
will
- * return 0.  If the link speed is 1000 Mbps the polarity status is in the
- * IGP01E1000_PHY_PCS_INIT_REG.
- *****************************************************************************/
-static s32 e1000_check_polarity(struct e1000_hw *hw,
-                               e1000_rev_polarity *polarity)
-{
-    s32 ret_val;
-    u16 phy_data;
-
-    DEBUGFUNC("e1000_check_polarity");
-
-    if ((hw->phy_type == e1000_phy_m88) ||
-        (hw->phy_type == e1000_phy_gg82563)) {
-        /* return the Polarity bit in the Status register. */
-        ret_val = e1000_read_phy_reg(hw, M88E1000_PHY_SPEC_STATUS,
-                                     &phy_data);
-        if (ret_val)
-            return ret_val;
-        *polarity = ((phy_data & M88E1000_PSSR_REV_POLARITY) >>
-                     M88E1000_PSSR_REV_POLARITY_SHIFT) ?
-                     e1000_rev_polarity_reversed : e1000_rev_polarity_normal;
-
-    } else if (hw->phy_type == e1000_phy_igp ||
-              hw->phy_type == e1000_phy_igp_3 ||
-              hw->phy_type == e1000_phy_igp_2) {
-        /* Read the Status register to check the speed */
-        ret_val = e1000_read_phy_reg(hw, IGP01E1000_PHY_PORT_STATUS,
-                                     &phy_data);
-        if (ret_val)
-            return ret_val;
-
-        /* If speed is 1000 Mbps, must read the IGP01E1000_PHY_PCS_INIT_REG to
-         * find the polarity status */
-        if ((phy_data & IGP01E1000_PSSR_SPEED_MASK) ==
-           IGP01E1000_PSSR_SPEED_1000MBPS) {
-
-            /* Read the GIG initialization PCS register (0x00B4) */
-            ret_val = e1000_read_phy_reg(hw, IGP01E1000_PHY_PCS_INIT_REG,
-                                         &phy_data);
-            if (ret_val)
-                return ret_val;
-
-            /* Check the polarity bits */
-            *polarity = (phy_data & IGP01E1000_PHY_POLARITY_MASK) ?
-                         e1000_rev_polarity_reversed : 
e1000_rev_polarity_normal;
-        } else {
-            /* For 10 Mbps, read the polarity bit in the status register. (for
-             * 100 Mbps this bit is always 0) */
-            *polarity = (phy_data & IGP01E1000_PSSR_POLARITY_REVERSED) ?
-                         e1000_rev_polarity_reversed : 
e1000_rev_polarity_normal;
-        }
-    } else if (hw->phy_type == e1000_phy_ife) {
-        ret_val = e1000_read_phy_reg(hw, IFE_PHY_EXTENDED_STATUS_CONTROL,
-                                     &phy_data);
-        if (ret_val)
-            return ret_val;
-        *polarity = ((phy_data & IFE_PESC_POLARITY_REVERSED) >>
-                     IFE_PESC_POLARITY_REVERSED_SHIFT) ?
-                     e1000_rev_polarity_reversed : e1000_rev_polarity_normal;
-    }
-    return E1000_SUCCESS;
-}
-
-/******************************************************************************
- * Check if Downshift occured
- *
- * hw - Struct containing variables accessed by shared code
- * downshift - output parameter : 0 - No Downshift ocured.
- *                                1 - Downshift ocured.
- *
- * returns: - E1000_ERR_XXX
- *            E1000_SUCCESS
- *
- * For phy's older than IGP, this function reads the Downshift bit in the Phy
- * Specific Status register.  For IGP phy's, it reads the Downgrade bit in the
- * Link Health register.  In IGP this bit is latched high, so the driver must
- * read it immediately after link is established.
- *****************************************************************************/
-static s32 e1000_check_downshift(struct e1000_hw *hw)
-{
-    s32 ret_val;
-    u16 phy_data;
-
-    DEBUGFUNC("e1000_check_downshift");
-
-    if (hw->phy_type == e1000_phy_igp ||
-        hw->phy_type == e1000_phy_igp_3 ||
-        hw->phy_type == e1000_phy_igp_2) {
-        ret_val = e1000_read_phy_reg(hw, IGP01E1000_PHY_LINK_HEALTH,
-                                     &phy_data);
-        if (ret_val)
-            return ret_val;
-
-        hw->speed_downgraded = (phy_data & IGP01E1000_PLHR_SS_DOWNGRADE) ? 1 : 
0;
-    } else if ((hw->phy_type == e1000_phy_m88) ||
-               (hw->phy_type == e1000_phy_gg82563)) {
-        ret_val = e1000_read_phy_reg(hw, M88E1000_PHY_SPEC_STATUS,
-                                     &phy_data);
-        if (ret_val)
-            return ret_val;
-
-        hw->speed_downgraded = (phy_data & M88E1000_PSSR_DOWNSHIFT) >>
-                               M88E1000_PSSR_DOWNSHIFT_SHIFT;
-    } else if (hw->phy_type == e1000_phy_ife) {
-        /* e1000_phy_ife supports 10/100 speed only */
-        hw->speed_downgraded = false;
-    }
-
-    return E1000_SUCCESS;
-}
-
-/*****************************************************************************
- *
- * 82541_rev_2 & 82547_rev_2 have the capability to configure the DSP when a
- * gigabit link is achieved to improve link quality.
- *
- * hw: Struct containing variables accessed by shared code
- *
- * returns: - E1000_ERR_PHY if fail to read/write the PHY
- *            E1000_SUCCESS at any other case.
- *
- ****************************************************************************/
-
-static s32 e1000_config_dsp_after_link_change(struct e1000_hw *hw, bool 
link_up)
-{
-    s32 ret_val;
-    u16 phy_data, phy_saved_data, speed, duplex, i;
-    u16 dsp_reg_array[IGP01E1000_PHY_CHANNEL_NUM] =
-                                        {IGP01E1000_PHY_AGC_PARAM_A,
-                                        IGP01E1000_PHY_AGC_PARAM_B,
-                                        IGP01E1000_PHY_AGC_PARAM_C,
-                                        IGP01E1000_PHY_AGC_PARAM_D};
-    u16 min_length, max_length;
-
-    DEBUGFUNC("e1000_config_dsp_after_link_change");
-
-    if (hw->phy_type != e1000_phy_igp)
-        return E1000_SUCCESS;
-
-    if (link_up) {
-        ret_val = e1000_get_speed_and_duplex(hw, &speed, &duplex);
-        if (ret_val) {
-            DEBUGOUT("Error getting link speed and duplex\n");
-            return ret_val;
-        }
-
-        if (speed == SPEED_1000) {
-
-            ret_val = e1000_get_cable_length(hw, &min_length, &max_length);
-            if (ret_val)
-                return ret_val;
-
-            if ((hw->dsp_config_state == e1000_dsp_config_enabled) &&
-                min_length >= e1000_igp_cable_length_50) {
-
-                for (i = 0; i < IGP01E1000_PHY_CHANNEL_NUM; i++) {
-                    ret_val = e1000_read_phy_reg(hw, dsp_reg_array[i],
-                                                 &phy_data);
-                    if (ret_val)
-                        return ret_val;
-
-                    phy_data &= ~IGP01E1000_PHY_EDAC_MU_INDEX;
-
-                    ret_val = e1000_write_phy_reg(hw, dsp_reg_array[i],
-                                                  phy_data);
-                    if (ret_val)
-                        return ret_val;
-                }
-                hw->dsp_config_state = e1000_dsp_config_activated;
-            }
-
-            if ((hw->ffe_config_state == e1000_ffe_config_enabled) &&
-               (min_length < e1000_igp_cable_length_50)) {
-
-                u16 ffe_idle_err_timeout = FFE_IDLE_ERR_COUNT_TIMEOUT_20;
-                u32 idle_errs = 0;
-
-                /* clear previous idle error counts */
-                ret_val = e1000_read_phy_reg(hw, PHY_1000T_STATUS,
-                                             &phy_data);
-                if (ret_val)
-                    return ret_val;
-
-                for (i = 0; i < ffe_idle_err_timeout; i++) {
-                    udelay(1000);
-                    ret_val = e1000_read_phy_reg(hw, PHY_1000T_STATUS,
-                                                 &phy_data);
-                    if (ret_val)
-                        return ret_val;
-
-                    idle_errs += (phy_data & SR_1000T_IDLE_ERROR_CNT);
-                    if (idle_errs > SR_1000T_PHY_EXCESSIVE_IDLE_ERR_COUNT) {
-                        hw->ffe_config_state = e1000_ffe_config_active;
-
-                        ret_val = e1000_write_phy_reg(hw,
-                                    IGP01E1000_PHY_DSP_FFE,
-                                    IGP01E1000_PHY_DSP_FFE_CM_CP);
-                        if (ret_val)
-                            return ret_val;
-                        break;
-                    }
-
-                    if (idle_errs)
-                        ffe_idle_err_timeout = FFE_IDLE_ERR_COUNT_TIMEOUT_100;
-                }
-            }
-        }
-    } else {
-        if (hw->dsp_config_state == e1000_dsp_config_activated) {
-            /* Save off the current value of register 0x2F5B to be restored at
-             * the end of the routines. */
-            ret_val = e1000_read_phy_reg(hw, 0x2F5B, &phy_saved_data);
-
-            if (ret_val)
-                return ret_val;
-
-            /* Disable the PHY transmitter */
-            ret_val = e1000_write_phy_reg(hw, 0x2F5B, 0x0003);
-
-            if (ret_val)
-                return ret_val;
-
-            mdelay(20);
-
-            ret_val = e1000_write_phy_reg(hw, 0x0000,
-                                          IGP01E1000_IEEE_FORCE_GIGA);
-            if (ret_val)
-                return ret_val;
-            for (i = 0; i < IGP01E1000_PHY_CHANNEL_NUM; i++) {
-                ret_val = e1000_read_phy_reg(hw, dsp_reg_array[i], &phy_data);
-                if (ret_val)
-                    return ret_val;
-
-                phy_data &= ~IGP01E1000_PHY_EDAC_MU_INDEX;
-                phy_data |=  IGP01E1000_PHY_EDAC_SIGN_EXT_9_BITS;
-
-                ret_val = e1000_write_phy_reg(hw,dsp_reg_array[i], phy_data);
-                if (ret_val)
-                    return ret_val;
-            }
-
-            ret_val = e1000_write_phy_reg(hw, 0x0000,
-                                          IGP01E1000_IEEE_RESTART_AUTONEG);
-            if (ret_val)
-                return ret_val;
-
-            mdelay(20);
-
-            /* Now enable the transmitter */
-            ret_val = e1000_write_phy_reg(hw, 0x2F5B, phy_saved_data);
-
-            if (ret_val)
-                return ret_val;
-
-            hw->dsp_config_state = e1000_dsp_config_enabled;
-        }
-
-        if (hw->ffe_config_state == e1000_ffe_config_active) {
-            /* Save off the current value of register 0x2F5B to be restored at
-             * the end of the routines. */
-            ret_val = e1000_read_phy_reg(hw, 0x2F5B, &phy_saved_data);
-
-            if (ret_val)
-                return ret_val;
-
-            /* Disable the PHY transmitter */
-            ret_val = e1000_write_phy_reg(hw, 0x2F5B, 0x0003);
-
-            if (ret_val)
-                return ret_val;
-
-            mdelay(20);
-
-            ret_val = e1000_write_phy_reg(hw, 0x0000,
-                                          IGP01E1000_IEEE_FORCE_GIGA);
-            if (ret_val)
-                return ret_val;
-            ret_val = e1000_write_phy_reg(hw, IGP01E1000_PHY_DSP_FFE,
-                                          IGP01E1000_PHY_DSP_FFE_DEFAULT);
-            if (ret_val)
-                return ret_val;
-
-            ret_val = e1000_write_phy_reg(hw, 0x0000,
-                                          IGP01E1000_IEEE_RESTART_AUTONEG);
-            if (ret_val)
-                return ret_val;
-
-            mdelay(20);
-
-            /* Now enable the transmitter */
-            ret_val = e1000_write_phy_reg(hw, 0x2F5B, phy_saved_data);
-
-            if (ret_val)
-                return ret_val;
-
-            hw->ffe_config_state = e1000_ffe_config_enabled;
-        }
-    }
-    return E1000_SUCCESS;
-}
-
-/*****************************************************************************
- * Set PHY to class A mode
- * Assumes the following operations will follow to enable the new class mode.
- *  1. Do a PHY soft reset
- *  2. Restart auto-negotiation or force link.
- *
- * hw - Struct containing variables accessed by shared code
- ****************************************************************************/
-static s32 e1000_set_phy_mode(struct e1000_hw *hw)
-{
-    s32 ret_val;
-    u16 eeprom_data;
-
-    DEBUGFUNC("e1000_set_phy_mode");
-
-    if ((hw->mac_type == e1000_82545_rev_3) &&
-        (hw->media_type == e1000_media_type_copper)) {
-        ret_val = e1000_read_eeprom(hw, EEPROM_PHY_CLASS_WORD, 1, 
&eeprom_data);
-        if (ret_val) {
-            return ret_val;
-        }
-
-        if ((eeprom_data != EEPROM_RESERVED_WORD) &&
-            (eeprom_data & EEPROM_PHY_CLASS_A)) {
-            ret_val = e1000_write_phy_reg(hw, M88E1000_PHY_PAGE_SELECT, 
0x000B);
-            if (ret_val)
-                return ret_val;
-            ret_val = e1000_write_phy_reg(hw, M88E1000_PHY_GEN_CONTROL, 
0x8104);
-            if (ret_val)
-                return ret_val;
-
-            hw->phy_reset_disable = false;
-        }
-    }
-
-    return E1000_SUCCESS;
-}
-
-/*****************************************************************************
- *
- * This function sets the lplu state according to the active flag.  When
- * activating lplu this function also disables smart speed and vise versa.
- * lplu will not be activated unless the device autonegotiation advertisment
- * meets standards of either 10 or 10/100 or 10/100/1000 at all duplexes.
- * hw: Struct containing variables accessed by shared code
- * active - true to enable lplu false to disable lplu.
- *
- * returns: - E1000_ERR_PHY if fail to read/write the PHY
- *            E1000_SUCCESS at any other case.
- *
- ****************************************************************************/
-
-static s32 e1000_set_d3_lplu_state(struct e1000_hw *hw, bool active)
-{
-    u32 phy_ctrl = 0;
-    s32 ret_val;
-    u16 phy_data;
-    DEBUGFUNC("e1000_set_d3_lplu_state");
-
-    if (hw->phy_type != e1000_phy_igp && hw->phy_type != e1000_phy_igp_2
-        && hw->phy_type != e1000_phy_igp_3)
-        return E1000_SUCCESS;
-
-    /* During driver activity LPLU should not be used or it will attain link
-     * from the lowest speeds starting from 10Mbps. The capability is used for
-     * Dx transitions and states */
-    if (hw->mac_type == e1000_82541_rev_2 || hw->mac_type == 
e1000_82547_rev_2) {
-        ret_val = e1000_read_phy_reg(hw, IGP01E1000_GMII_FIFO, &phy_data);
-        if (ret_val)
-            return ret_val;
-    } else if (hw->mac_type == e1000_ich8lan) {
-        /* MAC writes into PHY register based on the state transition
-         * and start auto-negotiation. SW driver can overwrite the settings
-         * in CSR PHY power control E1000_PHY_CTRL register. */
-        phy_ctrl = er32(PHY_CTRL);
-    } else {
-        ret_val = e1000_read_phy_reg(hw, IGP02E1000_PHY_POWER_MGMT, &phy_data);
-        if (ret_val)
-            return ret_val;
-    }
-
-    if (!active) {
-        if (hw->mac_type == e1000_82541_rev_2 ||
-            hw->mac_type == e1000_82547_rev_2) {
-            phy_data &= ~IGP01E1000_GMII_FLEX_SPD;
-            ret_val = e1000_write_phy_reg(hw, IGP01E1000_GMII_FIFO, phy_data);
-            if (ret_val)
-                return ret_val;
-        } else {
-            if (hw->mac_type == e1000_ich8lan) {
-                phy_ctrl &= ~E1000_PHY_CTRL_NOND0A_LPLU;
-                ew32(PHY_CTRL, phy_ctrl);
-            } else {
-                phy_data &= ~IGP02E1000_PM_D3_LPLU;
-                ret_val = e1000_write_phy_reg(hw, IGP02E1000_PHY_POWER_MGMT,
-                                              phy_data);
-                if (ret_val)
-                    return ret_val;
-            }
-        }
-
-        /* LPLU and SmartSpeed are mutually exclusive.  LPLU is used during
-         * Dx states where the power conservation is most important.  During
-         * driver activity we should enable SmartSpeed, so performance is
-         * maintained. */
-        if (hw->smart_speed == e1000_smart_speed_on) {
-            ret_val = e1000_read_phy_reg(hw, IGP01E1000_PHY_PORT_CONFIG,
-                                         &phy_data);
-            if (ret_val)
-                return ret_val;
-
-            phy_data |= IGP01E1000_PSCFR_SMART_SPEED;
-            ret_val = e1000_write_phy_reg(hw, IGP01E1000_PHY_PORT_CONFIG,
-                                          phy_data);
-            if (ret_val)
-                return ret_val;
-        } else if (hw->smart_speed == e1000_smart_speed_off) {
-            ret_val = e1000_read_phy_reg(hw, IGP01E1000_PHY_PORT_CONFIG,
-                                         &phy_data);
-            if (ret_val)
-                return ret_val;
-
-            phy_data &= ~IGP01E1000_PSCFR_SMART_SPEED;
-            ret_val = e1000_write_phy_reg(hw, IGP01E1000_PHY_PORT_CONFIG,
-                                          phy_data);
-            if (ret_val)
-                return ret_val;
-        }
-
-    } else if ((hw->autoneg_advertised == AUTONEG_ADVERTISE_SPEED_DEFAULT) ||
-               (hw->autoneg_advertised == AUTONEG_ADVERTISE_10_ALL ) ||
-               (hw->autoneg_advertised == AUTONEG_ADVERTISE_10_100_ALL)) {
-
-        if (hw->mac_type == e1000_82541_rev_2 ||
-            hw->mac_type == e1000_82547_rev_2) {
-            phy_data |= IGP01E1000_GMII_FLEX_SPD;
-            ret_val = e1000_write_phy_reg(hw, IGP01E1000_GMII_FIFO, phy_data);
-            if (ret_val)
-                return ret_val;
-        } else {
-            if (hw->mac_type == e1000_ich8lan) {
-                phy_ctrl |= E1000_PHY_CTRL_NOND0A_LPLU;
-                ew32(PHY_CTRL, phy_ctrl);
-            } else {
-                phy_data |= IGP02E1000_PM_D3_LPLU;
-                ret_val = e1000_write_phy_reg(hw, IGP02E1000_PHY_POWER_MGMT,
-                                              phy_data);
-                if (ret_val)
-                    return ret_val;
-            }
-        }
-
-        /* When LPLU is enabled we should disable SmartSpeed */
-        ret_val = e1000_read_phy_reg(hw, IGP01E1000_PHY_PORT_CONFIG, 
&phy_data);
-        if (ret_val)
-            return ret_val;
-
-        phy_data &= ~IGP01E1000_PSCFR_SMART_SPEED;
-        ret_val = e1000_write_phy_reg(hw, IGP01E1000_PHY_PORT_CONFIG, 
phy_data);
-        if (ret_val)
-            return ret_val;
-
-    }
-    return E1000_SUCCESS;
-}
-
-/*****************************************************************************
- *
- * This function sets the lplu d0 state according to the active flag.  When
- * activating lplu this function also disables smart speed and vise versa.
- * lplu will not be activated unless the device autonegotiation advertisment
- * meets standards of either 10 or 10/100 or 10/100/1000 at all duplexes.
- * hw: Struct containing variables accessed by shared code
- * active - true to enable lplu false to disable lplu.
- *
- * returns: - E1000_ERR_PHY if fail to read/write the PHY
- *            E1000_SUCCESS at any other case.
- *
- ****************************************************************************/
-
-static s32 e1000_set_d0_lplu_state(struct e1000_hw *hw, bool active)
-{
-    u32 phy_ctrl = 0;
-    s32 ret_val;
-    u16 phy_data;
-    DEBUGFUNC("e1000_set_d0_lplu_state");
-
-    if (hw->mac_type <= e1000_82547_rev_2)
-        return E1000_SUCCESS;
-
-    if (hw->mac_type == e1000_ich8lan) {
-        phy_ctrl = er32(PHY_CTRL);
-    } else {
-        ret_val = e1000_read_phy_reg(hw, IGP02E1000_PHY_POWER_MGMT, &phy_data);
-        if (ret_val)
-            return ret_val;
-    }
-
-    if (!active) {
-        if (hw->mac_type == e1000_ich8lan) {
-            phy_ctrl &= ~E1000_PHY_CTRL_D0A_LPLU;
-            ew32(PHY_CTRL, phy_ctrl);
-        } else {
-            phy_data &= ~IGP02E1000_PM_D0_LPLU;
-            ret_val = e1000_write_phy_reg(hw, IGP02E1000_PHY_POWER_MGMT, 
phy_data);
-            if (ret_val)
-                return ret_val;
-        }
-
-        /* LPLU and SmartSpeed are mutually exclusive.  LPLU is used during
-         * Dx states where the power conservation is most important.  During
-         * driver activity we should enable SmartSpeed, so performance is
-         * maintained. */
-        if (hw->smart_speed == e1000_smart_speed_on) {
-            ret_val = e1000_read_phy_reg(hw, IGP01E1000_PHY_PORT_CONFIG,
-                                         &phy_data);
-            if (ret_val)
-                return ret_val;
-
-            phy_data |= IGP01E1000_PSCFR_SMART_SPEED;
-            ret_val = e1000_write_phy_reg(hw, IGP01E1000_PHY_PORT_CONFIG,
-                                          phy_data);
-            if (ret_val)
-                return ret_val;
-        } else if (hw->smart_speed == e1000_smart_speed_off) {
-            ret_val = e1000_read_phy_reg(hw, IGP01E1000_PHY_PORT_CONFIG,
-                                         &phy_data);
-            if (ret_val)
-                return ret_val;
-
-            phy_data &= ~IGP01E1000_PSCFR_SMART_SPEED;
-            ret_val = e1000_write_phy_reg(hw, IGP01E1000_PHY_PORT_CONFIG,
-                                          phy_data);
-            if (ret_val)
-                return ret_val;
-        }
-
-
-    } else {
-
-        if (hw->mac_type == e1000_ich8lan) {
-            phy_ctrl |= E1000_PHY_CTRL_D0A_LPLU;
-            ew32(PHY_CTRL, phy_ctrl);
-        } else {
-            phy_data |= IGP02E1000_PM_D0_LPLU;
-            ret_val = e1000_write_phy_reg(hw, IGP02E1000_PHY_POWER_MGMT, 
phy_data);
-            if (ret_val)
-                return ret_val;
-        }
-
-        /* When LPLU is enabled we should disable SmartSpeed */
-        ret_val = e1000_read_phy_reg(hw, IGP01E1000_PHY_PORT_CONFIG, 
&phy_data);
-        if (ret_val)
-            return ret_val;
-
-        phy_data &= ~IGP01E1000_PSCFR_SMART_SPEED;
-        ret_val = e1000_write_phy_reg(hw, IGP01E1000_PHY_PORT_CONFIG, 
phy_data);
-        if (ret_val)
-            return ret_val;
-
-    }
-    return E1000_SUCCESS;
-}
-
-/******************************************************************************
- * Change VCO speed register to improve Bit Error Rate performance of SERDES.
- *
- * hw - Struct containing variables accessed by shared code
- *****************************************************************************/
-static s32 e1000_set_vco_speed(struct e1000_hw *hw)
-{
-    s32  ret_val;
-    u16 default_page = 0;
-    u16 phy_data;
-
-    DEBUGFUNC("e1000_set_vco_speed");
-
-    switch (hw->mac_type) {
-    case e1000_82545_rev_3:
-    case e1000_82546_rev_3:
-       break;
-    default:
-        return E1000_SUCCESS;
-    }
-
-    /* Set PHY register 30, page 5, bit 8 to 0 */
-
-    ret_val = e1000_read_phy_reg(hw, M88E1000_PHY_PAGE_SELECT, &default_page);
-    if (ret_val)
-        return ret_val;
-
-    ret_val = e1000_write_phy_reg(hw, M88E1000_PHY_PAGE_SELECT, 0x0005);
-    if (ret_val)
-        return ret_val;
-
-    ret_val = e1000_read_phy_reg(hw, M88E1000_PHY_GEN_CONTROL, &phy_data);
-    if (ret_val)
-        return ret_val;
-
-    phy_data &= ~M88E1000_PHY_VCO_REG_BIT8;
-    ret_val = e1000_write_phy_reg(hw, M88E1000_PHY_GEN_CONTROL, phy_data);
-    if (ret_val)
-        return ret_val;
-
-    /* Set PHY register 30, page 4, bit 11 to 1 */
-
-    ret_val = e1000_write_phy_reg(hw, M88E1000_PHY_PAGE_SELECT, 0x0004);
-    if (ret_val)
-        return ret_val;
-
-    ret_val = e1000_read_phy_reg(hw, M88E1000_PHY_GEN_CONTROL, &phy_data);
-    if (ret_val)
-        return ret_val;
-
-    phy_data |= M88E1000_PHY_VCO_REG_BIT11;
-    ret_val = e1000_write_phy_reg(hw, M88E1000_PHY_GEN_CONTROL, phy_data);
-    if (ret_val)
-        return ret_val;
-
-    ret_val = e1000_write_phy_reg(hw, M88E1000_PHY_PAGE_SELECT, default_page);
-    if (ret_val)
-        return ret_val;
-
-    return E1000_SUCCESS;
-}
-
-
-/*****************************************************************************
- * This function reads the cookie from ARC ram.
- *
- * returns: - E1000_SUCCESS .
- ****************************************************************************/
-static s32 e1000_host_if_read_cookie(struct e1000_hw *hw, u8 *buffer)
-{
-    u8 i;
-    u32 offset = E1000_MNG_DHCP_COOKIE_OFFSET;
-    u8 length = E1000_MNG_DHCP_COOKIE_LENGTH;
-
-    length = (length >> 2);
-    offset = (offset >> 2);
-
-    for (i = 0; i < length; i++) {
-        *((u32 *)buffer + i) =
-            E1000_READ_REG_ARRAY_DWORD(hw, HOST_IF, offset + i);
-    }
-    return E1000_SUCCESS;
-}
-
-
-/*****************************************************************************
- * This function checks whether the HOST IF is enabled for command operaton
- * and also checks whether the previous command is completed.
- * It busy waits in case of previous command is not completed.
- *
- * returns: - E1000_ERR_HOST_INTERFACE_COMMAND in case if is not ready or
- *            timeout
- *          - E1000_SUCCESS for success.
- ****************************************************************************/
-static s32 e1000_mng_enable_host_if(struct e1000_hw *hw)
-{
-    u32 hicr;
-    u8 i;
-
-    /* Check that the host interface is enabled. */
-    hicr = er32(HICR);
-    if ((hicr & E1000_HICR_EN) == 0) {
-        DEBUGOUT("E1000_HOST_EN bit disabled.\n");
-        return -E1000_ERR_HOST_INTERFACE_COMMAND;
-    }
-    /* check the previous command is completed */
-    for (i = 0; i < E1000_MNG_DHCP_COMMAND_TIMEOUT; i++) {
-        hicr = er32(HICR);
-        if (!(hicr & E1000_HICR_C))
-            break;
-        mdelay(1);
-    }
-
-    if (i == E1000_MNG_DHCP_COMMAND_TIMEOUT) {
-        DEBUGOUT("Previous command timeout failed .\n");
-        return -E1000_ERR_HOST_INTERFACE_COMMAND;
-    }
-    return E1000_SUCCESS;
-}
-
-/*****************************************************************************
- * This function writes the buffer content at the offset given on the host if.
- * It also does alignment considerations to do the writes in most efficient 
way.
- * Also fills up the sum of the buffer in *buffer parameter.
- *
- * returns  - E1000_SUCCESS for success.
- ****************************************************************************/
-static s32 e1000_mng_host_if_write(struct e1000_hw *hw, u8 *buffer, u16 length,
-                                  u16 offset, u8 *sum)
-{
-    u8 *tmp;
-    u8 *bufptr = buffer;
-    u32 data = 0;
-    u16 remaining, i, j, prev_bytes;
-
-    /* sum = only sum of the data and it is not checksum */
-
-    if (length == 0 || offset + length > E1000_HI_MAX_MNG_DATA_LENGTH) {
-        return -E1000_ERR_PARAM;
-    }
-
-    tmp = (u8 *)&data;
-    prev_bytes = offset & 0x3;
-    offset &= 0xFFFC;
-    offset >>= 2;
-
-    if (prev_bytes) {
-        data = E1000_READ_REG_ARRAY_DWORD(hw, HOST_IF, offset);
-        for (j = prev_bytes; j < sizeof(u32); j++) {
-            *(tmp + j) = *bufptr++;
-            *sum += *(tmp + j);
-        }
-        E1000_WRITE_REG_ARRAY_DWORD(hw, HOST_IF, offset, data);
-        length -= j - prev_bytes;
-        offset++;
-    }
-
-    remaining = length & 0x3;
-    length -= remaining;
-
-    /* Calculate length in DWORDs */
-    length >>= 2;
-
-    /* The device driver writes the relevant command block into the
-     * ram area. */
-    for (i = 0; i < length; i++) {
-        for (j = 0; j < sizeof(u32); j++) {
-            *(tmp + j) = *bufptr++;
-            *sum += *(tmp + j);
-        }
-
-        E1000_WRITE_REG_ARRAY_DWORD(hw, HOST_IF, offset + i, data);
-    }
-    if (remaining) {
-        for (j = 0; j < sizeof(u32); j++) {
-            if (j < remaining)
-                *(tmp + j) = *bufptr++;
-            else
-                *(tmp + j) = 0;
-
-            *sum += *(tmp + j);
-        }
-        E1000_WRITE_REG_ARRAY_DWORD(hw, HOST_IF, offset + i, data);
-    }
-
-    return E1000_SUCCESS;
-}
-
-
-/*****************************************************************************
- * This function writes the command header after does the checksum calculation.
- *
- * returns  - E1000_SUCCESS for success.
- ****************************************************************************/
-static s32 e1000_mng_write_cmd_header(struct e1000_hw *hw,
-                                     struct e1000_host_mng_command_header *hdr)
-{
-    u16 i;
-    u8 sum;
-    u8 *buffer;
-
-    /* Write the whole command header structure which includes sum of
-     * the buffer */
-
-    u16 length = sizeof(struct e1000_host_mng_command_header);
-
-    sum = hdr->checksum;
-    hdr->checksum = 0;
-
-    buffer = (u8 *)hdr;
-    i = length;
-    while (i--)
-        sum += buffer[i];
-
-    hdr->checksum = 0 - sum;
-
-    length >>= 2;
-    /* The device driver writes the relevant command block into the ram area. 
*/
-    for (i = 0; i < length; i++) {
-        E1000_WRITE_REG_ARRAY_DWORD(hw, HOST_IF, i, *((u32 *)hdr + i));
-        E1000_WRITE_FLUSH();
-    }
-
-    return E1000_SUCCESS;
-}
-
-
-/*****************************************************************************
- * This function indicates to ARC that a new command is pending which completes
- * one write operation by the driver.
- *
- * returns  - E1000_SUCCESS for success.
- ****************************************************************************/
-static s32 e1000_mng_write_commit(struct e1000_hw *hw)
-{
-    u32 hicr;
-
-    hicr = er32(HICR);
-    /* Setting this bit tells the ARC that a new command is pending. */
-    ew32(HICR, hicr | E1000_HICR_C);
-
-    return E1000_SUCCESS;
-}
-
-
-/*****************************************************************************
- * This function checks the mode of the firmware.
- *
- * returns  - true when the mode is IAMT or false.
- ****************************************************************************/
-bool e1000_check_mng_mode(struct e1000_hw *hw)
-{
-    u32 fwsm;
-
-    fwsm = er32(FWSM);
-
-    if (hw->mac_type == e1000_ich8lan) {
-        if ((fwsm & E1000_FWSM_MODE_MASK) ==
-            (E1000_MNG_ICH_IAMT_MODE << E1000_FWSM_MODE_SHIFT))
-            return true;
-    } else if ((fwsm & E1000_FWSM_MODE_MASK) ==
-               (E1000_MNG_IAMT_MODE << E1000_FWSM_MODE_SHIFT))
-        return true;
-
-    return false;
-}
-
-
-/*****************************************************************************
- * This function writes the dhcp info .
- ****************************************************************************/
-s32 e1000_mng_write_dhcp_info(struct e1000_hw *hw, u8 *buffer, u16 length)
-{
-    s32 ret_val;
-    struct e1000_host_mng_command_header hdr;
-
-    hdr.command_id = E1000_MNG_DHCP_TX_PAYLOAD_CMD;
-    hdr.command_length = length;
-    hdr.reserved1 = 0;
-    hdr.reserved2 = 0;
-    hdr.checksum = 0;
-
-    ret_val = e1000_mng_enable_host_if(hw);
-    if (ret_val == E1000_SUCCESS) {
-        ret_val = e1000_mng_host_if_write(hw, buffer, length, sizeof(hdr),
-                                          &(hdr.checksum));
-        if (ret_val == E1000_SUCCESS) {
-            ret_val = e1000_mng_write_cmd_header(hw, &hdr);
-            if (ret_val == E1000_SUCCESS)
-                ret_val = e1000_mng_write_commit(hw);
-        }
-    }
-    return ret_val;
-}
-
-
-/*****************************************************************************
- * This function calculates the checksum.
- *
- * returns  - checksum of buffer contents.
- ****************************************************************************/
-static u8 e1000_calculate_mng_checksum(char *buffer, u32 length)
-{
-    u8 sum = 0;
-    u32 i;
-
-    if (!buffer)
-        return 0;
-
-    for (i=0; i < length; i++)
-        sum += buffer[i];
-
-    return (u8)(0 - sum);
-}
-
-/*****************************************************************************
- * This function checks whether tx pkt filtering needs to be enabled or not.
- *
- * returns  - true for packet filtering or false.
- ****************************************************************************/
-bool e1000_enable_tx_pkt_filtering(struct e1000_hw *hw)
-{
-    /* called in init as well as watchdog timer functions */
-
-    s32 ret_val, checksum;
-    bool tx_filter = false;
-    struct e1000_host_mng_dhcp_cookie *hdr = &(hw->mng_cookie);
-    u8 *buffer = (u8 *) &(hw->mng_cookie);
-
-    if (e1000_check_mng_mode(hw)) {
-        ret_val = e1000_mng_enable_host_if(hw);
-        if (ret_val == E1000_SUCCESS) {
-            ret_val = e1000_host_if_read_cookie(hw, buffer);
-            if (ret_val == E1000_SUCCESS) {
-                checksum = hdr->checksum;
-                hdr->checksum = 0;
-                if ((hdr->signature == E1000_IAMT_SIGNATURE) &&
-                    checksum == e1000_calculate_mng_checksum((char *)buffer,
-                                               E1000_MNG_DHCP_COOKIE_LENGTH)) {
-                    if (hdr->status &
-                        E1000_MNG_DHCP_COOKIE_STATUS_PARSING_SUPPORT)
-                        tx_filter = true;
-                } else
-                    tx_filter = true;
-            } else
-                tx_filter = true;
-        }
-    }
-
-    hw->tx_pkt_filtering = tx_filter;
-    return tx_filter;
-}
-
-/******************************************************************************
- * Verifies the hardware needs to allow ARPs to be processed by the host
- *
- * hw - Struct containing variables accessed by shared code
- *
- * returns: - true/false
- *
- *****************************************************************************/
-u32 e1000_enable_mng_pass_thru(struct e1000_hw *hw)
-{
-    u32 manc;
-    u32 fwsm, factps;
-
-    if (hw->asf_firmware_present) {
-        manc = er32(MANC);
-
-        if (!(manc & E1000_MANC_RCV_TCO_EN) ||
-            !(manc & E1000_MANC_EN_MAC_ADDR_FILTER))
-            return false;
-        if (e1000_arc_subsystem_valid(hw)) {
-            fwsm = er32(FWSM);
-            factps = er32(FACTPS);
-
-            if ((((fwsm & E1000_FWSM_MODE_MASK) >> E1000_FWSM_MODE_SHIFT) ==
-                   e1000_mng_mode_pt) && !(factps & E1000_FACTPS_MNGCG))
-                return true;
-        } else
-            if ((manc & E1000_MANC_SMBUS_EN) && !(manc & E1000_MANC_ASF_EN))
-                return true;
-    }
-    return false;
-}
-
-static s32 e1000_polarity_reversal_workaround(struct e1000_hw *hw)
-{
-    s32 ret_val;
-    u16 mii_status_reg;
-    u16 i;
-
-    /* Polarity reversal workaround for forced 10F/10H links. */
-
-    /* Disable the transmitter on the PHY */
-
-    ret_val = e1000_write_phy_reg(hw, M88E1000_PHY_PAGE_SELECT, 0x0019);
-    if (ret_val)
-        return ret_val;
-    ret_val = e1000_write_phy_reg(hw, M88E1000_PHY_GEN_CONTROL, 0xFFFF);
-    if (ret_val)
-        return ret_val;
-
-    ret_val = e1000_write_phy_reg(hw, M88E1000_PHY_PAGE_SELECT, 0x0000);
-    if (ret_val)
-        return ret_val;
-
-    /* This loop will early-out if the NO link condition has been met. */
-    for (i = PHY_FORCE_TIME; i > 0; i--) {
-        /* Read the MII Status Register and wait for Link Status bit
-         * to be clear.
-         */
-
-        ret_val = e1000_read_phy_reg(hw, PHY_STATUS, &mii_status_reg);
-        if (ret_val)
-            return ret_val;
-
-        ret_val = e1000_read_phy_reg(hw, PHY_STATUS, &mii_status_reg);
-        if (ret_val)
-            return ret_val;
-
-        if ((mii_status_reg & ~MII_SR_LINK_STATUS) == 0) break;
-        mdelay(100);
-    }
-
-    /* Recommended delay time after link has been lost */
-    mdelay(1000);
-
-    /* Now we will re-enable th transmitter on the PHY */
-
-    ret_val = e1000_write_phy_reg(hw, M88E1000_PHY_PAGE_SELECT, 0x0019);
-    if (ret_val)
-        return ret_val;
-    mdelay(50);
-    ret_val = e1000_write_phy_reg(hw, M88E1000_PHY_GEN_CONTROL, 0xFFF0);
-    if (ret_val)
-        return ret_val;
-    mdelay(50);
-    ret_val = e1000_write_phy_reg(hw, M88E1000_PHY_GEN_CONTROL, 0xFF00);
-    if (ret_val)
-        return ret_val;
-    mdelay(50);
-    ret_val = e1000_write_phy_reg(hw, M88E1000_PHY_GEN_CONTROL, 0x0000);
-    if (ret_val)
-        return ret_val;
-
-    ret_val = e1000_write_phy_reg(hw, M88E1000_PHY_PAGE_SELECT, 0x0000);
-    if (ret_val)
-        return ret_val;
-
-    /* This loop will early-out if the link condition has been met. */
-    for (i = PHY_FORCE_TIME; i > 0; i--) {
-        /* Read the MII Status Register and wait for Link Status bit
-         * to be set.
-         */
-
-        ret_val = e1000_read_phy_reg(hw, PHY_STATUS, &mii_status_reg);
-        if (ret_val)
-            return ret_val;
-
-        ret_val = e1000_read_phy_reg(hw, PHY_STATUS, &mii_status_reg);
-        if (ret_val)
-            return ret_val;
-
-        if (mii_status_reg & MII_SR_LINK_STATUS) break;
-        mdelay(100);
-    }
-    return E1000_SUCCESS;
-}
-
-/***************************************************************************
- *
- * Disables PCI-Express master access.
- *
- * hw: Struct containing variables accessed by shared code
- *
- * returns: - none.
- *
- ***************************************************************************/
-static void e1000_set_pci_express_master_disable(struct e1000_hw *hw)
-{
-    u32 ctrl;
-
-    DEBUGFUNC("e1000_set_pci_express_master_disable");
-
-    if (hw->bus_type != e1000_bus_type_pci_express)
-        return;
-
-    ctrl = er32(CTRL);
-    ctrl |= E1000_CTRL_GIO_MASTER_DISABLE;
-    ew32(CTRL, ctrl);
-}
-
-/*******************************************************************************
- *
- * Disables PCI-Express master access and verifies there are no pending 
requests
- *
- * hw: Struct containing variables accessed by shared code
- *
- * returns: - E1000_ERR_MASTER_REQUESTS_PENDING if master disable bit hasn't
- *            caused the master requests to be disabled.
- *            E1000_SUCCESS master requests disabled.
- *
- 
******************************************************************************/
-s32 e1000_disable_pciex_master(struct e1000_hw *hw)
-{
-    s32 timeout = MASTER_DISABLE_TIMEOUT;   /* 80ms */
-
-    DEBUGFUNC("e1000_disable_pciex_master");
-
-    if (hw->bus_type != e1000_bus_type_pci_express)
-        return E1000_SUCCESS;
-
-    e1000_set_pci_express_master_disable(hw);
-
-    while (timeout) {
-        if (!(er32(STATUS) & E1000_STATUS_GIO_MASTER_ENABLE))
-            break;
-        else
-            udelay(100);
-        timeout--;
-    }
-
-    if (!timeout) {
-        DEBUGOUT("Master requests are pending.\n");
-        return -E1000_ERR_MASTER_REQUESTS_PENDING;
-    }
-
-    return E1000_SUCCESS;
-}
-
-/*******************************************************************************
- *
- * Check for EEPROM Auto Read bit done.
- *
- * hw: Struct containing variables accessed by shared code
- *
- * returns: - E1000_ERR_RESET if fail to reset MAC
- *            E1000_SUCCESS at any other case.
- *
- 
******************************************************************************/
-static s32 e1000_get_auto_rd_done(struct e1000_hw *hw)
-{
-    s32 timeout = AUTO_READ_DONE_TIMEOUT;
-
-    DEBUGFUNC("e1000_get_auto_rd_done");
-
-    switch (hw->mac_type) {
-    default:
-        msleep(5);
-        break;
-    case e1000_82571:
-    case e1000_82572:
-    case e1000_82573:
-    case e1000_80003es2lan:
-    case e1000_ich8lan:
-        while (timeout) {
-            if (er32(EECD) & E1000_EECD_AUTO_RD)
-                break;
-            else msleep(1);
-            timeout--;
-        }
-
-        if (!timeout) {
-            DEBUGOUT("Auto read by HW from EEPROM has not completed.\n");
-            return -E1000_ERR_RESET;
-        }
-        break;
-    }
-
-    /* PHY configuration from NVM just starts after EECD_AUTO_RD sets to high.
-     * Need to wait for PHY configuration completion before accessing NVM
-     * and PHY. */
-    if (hw->mac_type == e1000_82573)
-        msleep(25);
-
-    return E1000_SUCCESS;
-}
-
-/***************************************************************************
- * Checks if the PHY configuration is done
- *
- * hw: Struct containing variables accessed by shared code
- *
- * returns: - E1000_ERR_RESET if fail to reset MAC
- *            E1000_SUCCESS at any other case.
- *
- ***************************************************************************/
-static s32 e1000_get_phy_cfg_done(struct e1000_hw *hw)
-{
-    s32 timeout = PHY_CFG_TIMEOUT;
-    u32 cfg_mask = E1000_EEPROM_CFG_DONE;
-
-    DEBUGFUNC("e1000_get_phy_cfg_done");
-
-    switch (hw->mac_type) {
-    default:
-        mdelay(10);
-        break;
-    case e1000_80003es2lan:
-        /* Separate *_CFG_DONE_* bit for each port */
-        if (er32(STATUS) & E1000_STATUS_FUNC_1)
-            cfg_mask = E1000_EEPROM_CFG_DONE_PORT_1;
-        /* Fall Through */
-    case e1000_82571:
-    case e1000_82572:
-        while (timeout) {
-            if (er32(EEMNGCTL) & cfg_mask)
-                break;
-            else
-                msleep(1);
-            timeout--;
-        }
-        if (!timeout) {
-            DEBUGOUT("MNG configuration cycle has not completed.\n");
-            return -E1000_ERR_RESET;
-        }
-        break;
-    }
-
-    return E1000_SUCCESS;
-}
-
-/***************************************************************************
- *
- * Using the combination of SMBI and SWESMBI semaphore bits when resetting
- * adapter or Eeprom access.
- *
- * hw: Struct containing variables accessed by shared code
- *
- * returns: - E1000_ERR_EEPROM if fail to access EEPROM.
- *            E1000_SUCCESS at any other case.
- *
- ***************************************************************************/
-static s32 e1000_get_hw_eeprom_semaphore(struct e1000_hw *hw)
-{
-    s32 timeout;
-    u32 swsm;
-
-    DEBUGFUNC("e1000_get_hw_eeprom_semaphore");
-
-    if (!hw->eeprom_semaphore_present)
-        return E1000_SUCCESS;
-
-    if (hw->mac_type == e1000_80003es2lan) {
-        /* Get the SW semaphore. */
-        if (e1000_get_software_semaphore(hw) != E1000_SUCCESS)
-            return -E1000_ERR_EEPROM;
-    }
-
-    /* Get the FW semaphore. */
-    timeout = hw->eeprom.word_size + 1;
-    while (timeout) {
-        swsm = er32(SWSM);
-        swsm |= E1000_SWSM_SWESMBI;
-        ew32(SWSM, swsm);
-        /* if we managed to set the bit we got the semaphore. */
-        swsm = er32(SWSM);
-        if (swsm & E1000_SWSM_SWESMBI)
-            break;
-
-        udelay(50);
-        timeout--;
-    }
-
-    if (!timeout) {
-        /* Release semaphores */
-        e1000_put_hw_eeprom_semaphore(hw);
-        DEBUGOUT("Driver can't access the Eeprom - SWESMBI bit is set.\n");
-        return -E1000_ERR_EEPROM;
-    }
-
-    return E1000_SUCCESS;
-}
-
-/***************************************************************************
- * This function clears HW semaphore bits.
- *
- * hw: Struct containing variables accessed by shared code
- *
- * returns: - None.
- *
- ***************************************************************************/
-static void e1000_put_hw_eeprom_semaphore(struct e1000_hw *hw)
-{
-    u32 swsm;
-
-    DEBUGFUNC("e1000_put_hw_eeprom_semaphore");
-
-    if (!hw->eeprom_semaphore_present)
-        return;
-
-    swsm = er32(SWSM);
-    if (hw->mac_type == e1000_80003es2lan) {
-        /* Release both semaphores. */
-        swsm &= ~(E1000_SWSM_SMBI | E1000_SWSM_SWESMBI);
-    } else
-        swsm &= ~(E1000_SWSM_SWESMBI);
-    ew32(SWSM, swsm);
-}
-
-/***************************************************************************
- *
- * Obtaining software semaphore bit (SMBI) before resetting PHY.
- *
- * hw: Struct containing variables accessed by shared code
- *
- * returns: - E1000_ERR_RESET if fail to obtain semaphore.
- *            E1000_SUCCESS at any other case.
- *
- ***************************************************************************/
-static s32 e1000_get_software_semaphore(struct e1000_hw *hw)
-{
-    s32 timeout = hw->eeprom.word_size + 1;
-    u32 swsm;
-
-    DEBUGFUNC("e1000_get_software_semaphore");
-
-    if (hw->mac_type != e1000_80003es2lan) {
-        return E1000_SUCCESS;
-    }
-
-    while (timeout) {
-        swsm = er32(SWSM);
-        /* If SMBI bit cleared, it is now set and we hold the semaphore */
-        if (!(swsm & E1000_SWSM_SMBI))
-            break;
-        mdelay(1);
-        timeout--;
-    }
-
-    if (!timeout) {
-        DEBUGOUT("Driver can't access device - SMBI bit is set.\n");
-        return -E1000_ERR_RESET;
-    }
-
-    return E1000_SUCCESS;
-}
-
-/***************************************************************************
- *
- * Release semaphore bit (SMBI).
- *
- * hw: Struct containing variables accessed by shared code
- *
- ***************************************************************************/
-static void e1000_release_software_semaphore(struct e1000_hw *hw)
-{
-    u32 swsm;
-
-    DEBUGFUNC("e1000_release_software_semaphore");
-
-    if (hw->mac_type != e1000_80003es2lan) {
-        return;
-    }
-
-    swsm = er32(SWSM);
-    /* Release the SW semaphores.*/
-    swsm &= ~E1000_SWSM_SMBI;
-    ew32(SWSM, swsm);
-}
-
-/******************************************************************************
- * Checks if PHY reset is blocked due to SOL/IDER session, for example.
- * Returning E1000_BLK_PHY_RESET isn't necessarily an error.  But it's up to
- * the caller to figure out how to deal with it.
- *
- * hw - Struct containing variables accessed by shared code
- *
- * returns: - E1000_BLK_PHY_RESET
- *            E1000_SUCCESS
- *
- *****************************************************************************/
-s32 e1000_check_phy_reset_block(struct e1000_hw *hw)
-{
-    u32 manc = 0;
-    u32 fwsm = 0;
-
-    if (hw->mac_type == e1000_ich8lan) {
-        fwsm = er32(FWSM);
-        return (fwsm & E1000_FWSM_RSPCIPHY) ? E1000_SUCCESS
-                                            : E1000_BLK_PHY_RESET;
-    }
-
-    if (hw->mac_type > e1000_82547_rev_2)
-        manc = er32(MANC);
-    return (manc & E1000_MANC_BLK_PHY_RST_ON_IDE) ?
-        E1000_BLK_PHY_RESET : E1000_SUCCESS;
-}
-
-static u8 e1000_arc_subsystem_valid(struct e1000_hw *hw)
-{
-    u32 fwsm;
-
-    /* On 8257x silicon, registers in the range of 0x8800 - 0x8FFC
-     * may not be provided a DMA clock when no manageability features are
-     * enabled.  We do not want to perform any reads/writes to these registers
-     * if this is the case.  We read FWSM to determine the manageability mode.
-     */
-    switch (hw->mac_type) {
-    case e1000_82571:
-    case e1000_82572:
-    case e1000_82573:
-    case e1000_80003es2lan:
-        fwsm = er32(FWSM);
-        if ((fwsm & E1000_FWSM_MODE_MASK) != 0)
-            return true;
-        break;
-    case e1000_ich8lan:
-        return true;
-    default:
-        break;
-    }
-    return false;
-}
-
-
-/******************************************************************************
- * Configure PCI-Ex no-snoop
- *
- * hw - Struct containing variables accessed by shared code.
- * no_snoop - Bitmap of no-snoop events.
- *
- * returns: E1000_SUCCESS
- *
- *****************************************************************************/
-static s32 e1000_set_pci_ex_no_snoop(struct e1000_hw *hw, u32 no_snoop)
-{
-    u32 gcr_reg = 0;
-
-    DEBUGFUNC("e1000_set_pci_ex_no_snoop");
-
-    if (hw->bus_type == e1000_bus_type_unknown)
-        e1000_get_bus_info(hw);
-
-    if (hw->bus_type != e1000_bus_type_pci_express)
-        return E1000_SUCCESS;
-
-    if (no_snoop) {
-        gcr_reg = er32(GCR);
-        gcr_reg &= ~(PCI_EX_NO_SNOOP_ALL);
-        gcr_reg |= no_snoop;
-        ew32(GCR, gcr_reg);
-    }
-    if (hw->mac_type == e1000_ich8lan) {
-        u32 ctrl_ext;
-
-        ew32(GCR, PCI_EX_82566_SNOOP_ALL);
-
-        ctrl_ext = er32(CTRL_EXT);
-        ctrl_ext |= E1000_CTRL_EXT_RO_DIS;
-        ew32(CTRL_EXT, ctrl_ext);
-    }
-
-    return E1000_SUCCESS;
-}
-
-/***************************************************************************
- *
- * Get software semaphore FLAG bit (SWFLAG).
- * SWFLAG is used to synchronize the access to all shared resource between
- * SW, FW and HW.
- *
- * hw: Struct containing variables accessed by shared code
- *
- ***************************************************************************/
-static s32 e1000_get_software_flag(struct e1000_hw *hw)
-{
-    s32 timeout = PHY_CFG_TIMEOUT;
-    u32 extcnf_ctrl;
-
-    DEBUGFUNC("e1000_get_software_flag");
-
-    if (hw->mac_type == e1000_ich8lan) {
-        while (timeout) {
-            extcnf_ctrl = er32(EXTCNF_CTRL);
-            extcnf_ctrl |= E1000_EXTCNF_CTRL_SWFLAG;
-            ew32(EXTCNF_CTRL, extcnf_ctrl);
-
-            extcnf_ctrl = er32(EXTCNF_CTRL);
-            if (extcnf_ctrl & E1000_EXTCNF_CTRL_SWFLAG)
-                break;
-            mdelay(1);
-            timeout--;
-        }
-
-        if (!timeout) {
-            DEBUGOUT("FW or HW locks the resource too long.\n");
-            return -E1000_ERR_CONFIG;
-        }
-    }
-
-    return E1000_SUCCESS;
-}
-
-/***************************************************************************
- *
- * Release software semaphore FLAG bit (SWFLAG).
- * SWFLAG is used to synchronize the access to all shared resource between
- * SW, FW and HW.
- *
- * hw: Struct containing variables accessed by shared code
- *
- ***************************************************************************/
-static void e1000_release_software_flag(struct e1000_hw *hw)
-{
-    u32 extcnf_ctrl;
-
-    DEBUGFUNC("e1000_release_software_flag");
-
-    if (hw->mac_type == e1000_ich8lan) {
-        extcnf_ctrl= er32(EXTCNF_CTRL);
-        extcnf_ctrl &= ~E1000_EXTCNF_CTRL_SWFLAG;
-        ew32(EXTCNF_CTRL, extcnf_ctrl);
-    }
-
-    return;
-}
-
-/******************************************************************************
- * Reads a 16 bit word or words from the EEPROM using the ICH8's flash access
- * register.
- *
- * hw - Struct containing variables accessed by shared code
- * offset - offset of word in the EEPROM to read
- * data - word read from the EEPROM
- * words - number of words to read
- *****************************************************************************/
-static s32 e1000_read_eeprom_ich8(struct e1000_hw *hw, u16 offset, u16 words,
-                                 u16 *data)
-{
-    s32  error = E1000_SUCCESS;
-    u32 flash_bank = 0;
-    u32 act_offset = 0;
-    u32 bank_offset = 0;
-    u16 word = 0;
-    u16 i = 0;
-
-    /* We need to know which is the valid flash bank.  In the event
-     * that we didn't allocate eeprom_shadow_ram, we may not be
-     * managing flash_bank.  So it cannot be trusted and needs
-     * to be updated with each read.
-     */
-    /* Value of bit 22 corresponds to the flash bank we're on. */
-    flash_bank = (er32(EECD) & E1000_EECD_SEC1VAL) ? 1 : 0;
-
-    /* Adjust offset appropriately if we're on bank 1 - adjust for word size */
-    bank_offset = flash_bank * (hw->flash_bank_size * 2);
-
-    error = e1000_get_software_flag(hw);
-    if (error != E1000_SUCCESS)
-        return error;
-
-    for (i = 0; i < words; i++) {
-        if (hw->eeprom_shadow_ram != NULL &&
-            hw->eeprom_shadow_ram[offset+i].modified) {
-            data[i] = hw->eeprom_shadow_ram[offset+i].eeprom_word;
-        } else {
-            /* The NVM part needs a byte offset, hence * 2 */
-            act_offset = bank_offset + ((offset + i) * 2);
-            error = e1000_read_ich8_word(hw, act_offset, &word);
-            if (error != E1000_SUCCESS)
-                break;
-            data[i] = word;
-        }
-    }
-
-    e1000_release_software_flag(hw);
-
-    return error;
-}
-
-/******************************************************************************
- * Writes a 16 bit word or words to the EEPROM using the ICH8's flash access
- * register.  Actually, writes are written to the shadow ram cache in the hw
- * structure hw->e1000_shadow_ram.  e1000_commit_shadow_ram flushes this to
- * the NVM, which occurs when the NVM checksum is updated.
- *
- * hw - Struct containing variables accessed by shared code
- * offset - offset of word in the EEPROM to write
- * words - number of words to write
- * data - words to write to the EEPROM
- *****************************************************************************/
-static s32 e1000_write_eeprom_ich8(struct e1000_hw *hw, u16 offset, u16 words,
-                                  u16 *data)
-{
-    u32 i = 0;
-    s32 error = E1000_SUCCESS;
-
-    error = e1000_get_software_flag(hw);
-    if (error != E1000_SUCCESS)
-        return error;
-
-    /* A driver can write to the NVM only if it has eeprom_shadow_ram
-     * allocated.  Subsequent reads to the modified words are read from
-     * this cached structure as well.  Writes will only go into this
-     * cached structure unless it's followed by a call to
-     * e1000_update_eeprom_checksum() where it will commit the changes
-     * and clear the "modified" field.
-     */
-    if (hw->eeprom_shadow_ram != NULL) {
-        for (i = 0; i < words; i++) {
-            if ((offset + i) < E1000_SHADOW_RAM_WORDS) {
-                hw->eeprom_shadow_ram[offset+i].modified = true;
-                hw->eeprom_shadow_ram[offset+i].eeprom_word = data[i];
-            } else {
-                error = -E1000_ERR_EEPROM;
-                break;
-            }
-        }
-    } else {
-        /* Drivers have the option to not allocate eeprom_shadow_ram as long
-         * as they don't perform any NVM writes.  An attempt in doing so
-         * will result in this error.
-         */
-        error = -E1000_ERR_EEPROM;
-    }
-
-    e1000_release_software_flag(hw);
-
-    return error;
-}
-
-/******************************************************************************
- * This function does initial flash setup so that a new read/write/erase cycle
- * can be started.
- *
- * hw - The pointer to the hw structure
- ****************************************************************************/
-static s32 e1000_ich8_cycle_init(struct e1000_hw *hw)
-{
-    union ich8_hws_flash_status hsfsts;
-    s32 error = E1000_ERR_EEPROM;
-    s32 i     = 0;
-
-    DEBUGFUNC("e1000_ich8_cycle_init");
-
-    hsfsts.regval = E1000_READ_ICH_FLASH_REG16(hw, ICH_FLASH_HSFSTS);
-
-    /* May be check the Flash Des Valid bit in Hw status */
-    if (hsfsts.hsf_status.fldesvalid == 0) {
-        DEBUGOUT("Flash descriptor invalid.  SW Sequencing must be used.");
-        return error;
-    }
-
-    /* Clear FCERR in Hw status by writing 1 */
-    /* Clear DAEL in Hw status by writing a 1 */
-    hsfsts.hsf_status.flcerr = 1;
-    hsfsts.hsf_status.dael = 1;
-
-    E1000_WRITE_ICH_FLASH_REG16(hw, ICH_FLASH_HSFSTS, hsfsts.regval);
-
-    /* Either we should have a hardware SPI cycle in progress bit to check
-     * against, in order to start a new cycle or FDONE bit should be changed
-     * in the hardware so that it is 1 after harware reset, which can then be
-     * used as an indication whether a cycle is in progress or has been
-     * completed .. we should also have some software semaphore mechanism to
-     * guard FDONE or the cycle in progress bit so that two threads access to
-     * those bits can be sequentiallized or a way so that 2 threads dont
-     * start the cycle at the same time */
-
-    if (hsfsts.hsf_status.flcinprog == 0) {
-        /* There is no cycle running at present, so we can start a cycle */
-        /* Begin by setting Flash Cycle Done. */
-        hsfsts.hsf_status.flcdone = 1;
-        E1000_WRITE_ICH_FLASH_REG16(hw, ICH_FLASH_HSFSTS, hsfsts.regval);
-        error = E1000_SUCCESS;
-    } else {
-        /* otherwise poll for sometime so the current cycle has a chance
-         * to end before giving up. */
-        for (i = 0; i < ICH_FLASH_COMMAND_TIMEOUT; i++) {
-            hsfsts.regval = E1000_READ_ICH_FLASH_REG16(hw, ICH_FLASH_HSFSTS);
-            if (hsfsts.hsf_status.flcinprog == 0) {
-                error = E1000_SUCCESS;
-                break;
-            }
-            udelay(1);
-        }
-        if (error == E1000_SUCCESS) {
-            /* Successful in waiting for previous cycle to timeout,
-             * now set the Flash Cycle Done. */
-            hsfsts.hsf_status.flcdone = 1;
-            E1000_WRITE_ICH_FLASH_REG16(hw, ICH_FLASH_HSFSTS, hsfsts.regval);
-        } else {
-            DEBUGOUT("Flash controller busy, cannot get access");
-        }
-    }
-    return error;
-}
-
-/******************************************************************************
- * This function starts a flash cycle and waits for its completion
- *
- * hw - The pointer to the hw structure
- ****************************************************************************/
-static s32 e1000_ich8_flash_cycle(struct e1000_hw *hw, u32 timeout)
-{
-    union ich8_hws_flash_ctrl hsflctl;
-    union ich8_hws_flash_status hsfsts;
-    s32 error = E1000_ERR_EEPROM;
-    u32 i = 0;
-
-    /* Start a cycle by writing 1 in Flash Cycle Go in Hw Flash Control */
-    hsflctl.regval = E1000_READ_ICH_FLASH_REG16(hw, ICH_FLASH_HSFCTL);
-    hsflctl.hsf_ctrl.flcgo = 1;
-    E1000_WRITE_ICH_FLASH_REG16(hw, ICH_FLASH_HSFCTL, hsflctl.regval);
-
-    /* wait till FDONE bit is set to 1 */
-    do {
-        hsfsts.regval = E1000_READ_ICH_FLASH_REG16(hw, ICH_FLASH_HSFSTS);
-        if (hsfsts.hsf_status.flcdone == 1)
-            break;
-        udelay(1);
-        i++;
-    } while (i < timeout);
-    if (hsfsts.hsf_status.flcdone == 1 && hsfsts.hsf_status.flcerr == 0) {
-        error = E1000_SUCCESS;
-    }
-    return error;
-}
-
-/******************************************************************************
- * Reads a byte or word from the NVM using the ICH8 flash access registers.
- *
- * hw - The pointer to the hw structure
- * index - The index of the byte or word to read.
- * size - Size of data to read, 1=byte 2=word
- * data - Pointer to the word to store the value read.
- *****************************************************************************/
-static s32 e1000_read_ich8_data(struct e1000_hw *hw, u32 index, u32 size,
-                               u16 *data)
-{
-    union ich8_hws_flash_status hsfsts;
-    union ich8_hws_flash_ctrl hsflctl;
-    u32 flash_linear_address;
-    u32 flash_data = 0;
-    s32 error = -E1000_ERR_EEPROM;
-    s32 count = 0;
-
-    DEBUGFUNC("e1000_read_ich8_data");
-
-    if (size < 1  || size > 2 || data == NULL ||
-        index > ICH_FLASH_LINEAR_ADDR_MASK)
-        return error;
-
-    flash_linear_address = (ICH_FLASH_LINEAR_ADDR_MASK & index) +
-                           hw->flash_base_addr;
-
-    do {
-        udelay(1);
-        /* Steps */
-        error = e1000_ich8_cycle_init(hw);
-        if (error != E1000_SUCCESS)
-            break;
-
-        hsflctl.regval = E1000_READ_ICH_FLASH_REG16(hw, ICH_FLASH_HSFCTL);
-        /* 0b/1b corresponds to 1 or 2 byte size, respectively. */
-        hsflctl.hsf_ctrl.fldbcount = size - 1;
-        hsflctl.hsf_ctrl.flcycle = ICH_CYCLE_READ;
-        E1000_WRITE_ICH_FLASH_REG16(hw, ICH_FLASH_HSFCTL, hsflctl.regval);
-
-        /* Write the last 24 bits of index into Flash Linear address field in
-         * Flash Address */
-        /* TODO: TBD maybe check the index against the size of flash */
-
-        E1000_WRITE_ICH_FLASH_REG(hw, ICH_FLASH_FADDR, flash_linear_address);
-
-        error = e1000_ich8_flash_cycle(hw, ICH_FLASH_COMMAND_TIMEOUT);
-
-        /* Check if FCERR is set to 1, if set to 1, clear it and try the whole
-         * sequence a few more times, else read in (shift in) the Flash Data0,
-         * the order is least significant byte first msb to lsb */
-        if (error == E1000_SUCCESS) {
-            flash_data = E1000_READ_ICH_FLASH_REG(hw, ICH_FLASH_FDATA0);
-            if (size == 1) {
-                *data = (u8)(flash_data & 0x000000FF);
-            } else if (size == 2) {
-                *data = (u16)(flash_data & 0x0000FFFF);
-            }
-            break;
-        } else {
-            /* If we've gotten here, then things are probably completely hosed,
-             * but if the error condition is detected, it won't hurt to give
-             * it another try...ICH_FLASH_CYCLE_REPEAT_COUNT times.
-             */
-            hsfsts.regval = E1000_READ_ICH_FLASH_REG16(hw, ICH_FLASH_HSFSTS);
-            if (hsfsts.hsf_status.flcerr == 1) {
-                /* Repeat for some time before giving up. */
-                continue;
-            } else if (hsfsts.hsf_status.flcdone == 0) {
-                DEBUGOUT("Timeout error - flash cycle did not complete.");
-                break;
-            }
-        }
-    } while (count++ < ICH_FLASH_CYCLE_REPEAT_COUNT);
-
-    return error;
-}
-
-/******************************************************************************
- * Writes One /two bytes to the NVM using the ICH8 flash access registers.
- *
- * hw - The pointer to the hw structure
- * index - The index of the byte/word to read.
- * size - Size of data to read, 1=byte 2=word
- * data - The byte(s) to write to the NVM.
- *****************************************************************************/
-static s32 e1000_write_ich8_data(struct e1000_hw *hw, u32 index, u32 size,
-                                u16 data)
-{
-    union ich8_hws_flash_status hsfsts;
-    union ich8_hws_flash_ctrl hsflctl;
-    u32 flash_linear_address;
-    u32 flash_data = 0;
-    s32 error = -E1000_ERR_EEPROM;
-    s32 count = 0;
-
-    DEBUGFUNC("e1000_write_ich8_data");
-
-    if (size < 1  || size > 2 || data > size * 0xff ||
-        index > ICH_FLASH_LINEAR_ADDR_MASK)
-        return error;
-
-    flash_linear_address = (ICH_FLASH_LINEAR_ADDR_MASK & index) +
-                           hw->flash_base_addr;
-
-    do {
-        udelay(1);
-        /* Steps */
-        error = e1000_ich8_cycle_init(hw);
-        if (error != E1000_SUCCESS)
-            break;
-
-        hsflctl.regval = E1000_READ_ICH_FLASH_REG16(hw, ICH_FLASH_HSFCTL);
-        /* 0b/1b corresponds to 1 or 2 byte size, respectively. */
-        hsflctl.hsf_ctrl.fldbcount = size -1;
-        hsflctl.hsf_ctrl.flcycle = ICH_CYCLE_WRITE;
-        E1000_WRITE_ICH_FLASH_REG16(hw, ICH_FLASH_HSFCTL, hsflctl.regval);
-
-        /* Write the last 24 bits of index into Flash Linear address field in
-         * Flash Address */
-        E1000_WRITE_ICH_FLASH_REG(hw, ICH_FLASH_FADDR, flash_linear_address);
-
-        if (size == 1)
-            flash_data = (u32)data & 0x00FF;
-        else
-            flash_data = (u32)data;
-
-        E1000_WRITE_ICH_FLASH_REG(hw, ICH_FLASH_FDATA0, flash_data);
-
-        /* check if FCERR is set to 1 , if set to 1, clear it and try the whole
-         * sequence a few more times else done */
-        error = e1000_ich8_flash_cycle(hw, ICH_FLASH_COMMAND_TIMEOUT);
-        if (error == E1000_SUCCESS) {
-            break;
-        } else {
-            /* If we're here, then things are most likely completely hosed,
-             * but if the error condition is detected, it won't hurt to give
-             * it another try...ICH_FLASH_CYCLE_REPEAT_COUNT times.
-             */
-            hsfsts.regval = E1000_READ_ICH_FLASH_REG16(hw, ICH_FLASH_HSFSTS);
-            if (hsfsts.hsf_status.flcerr == 1) {
-                /* Repeat for some time before giving up. */
-                continue;
-            } else if (hsfsts.hsf_status.flcdone == 0) {
-                DEBUGOUT("Timeout error - flash cycle did not complete.");
-                break;
-            }
-        }
-    } while (count++ < ICH_FLASH_CYCLE_REPEAT_COUNT);
-
-    return error;
-}
-
-/******************************************************************************
- * Reads a single byte from the NVM using the ICH8 flash access registers.
- *
- * hw - pointer to e1000_hw structure
- * index - The index of the byte to read.
- * data - Pointer to a byte to store the value read.
- *****************************************************************************/
-static s32 e1000_read_ich8_byte(struct e1000_hw *hw, u32 index, u8 *data)
-{
-    s32 status = E1000_SUCCESS;
-    u16 word = 0;
-
-    status = e1000_read_ich8_data(hw, index, 1, &word);
-    if (status == E1000_SUCCESS) {
-        *data = (u8)word;
-    }
-
-    return status;
-}
-
-/******************************************************************************
- * Writes a single byte to the NVM using the ICH8 flash access registers.
- * Performs verification by reading back the value and then going through
- * a retry algorithm before giving up.
- *
- * hw - pointer to e1000_hw structure
- * index - The index of the byte to write.
- * byte - The byte to write to the NVM.
- *****************************************************************************/
-static s32 e1000_verify_write_ich8_byte(struct e1000_hw *hw, u32 index, u8 
byte)
-{
-    s32 error = E1000_SUCCESS;
-    s32 program_retries = 0;
-
-    DEBUGOUT2("Byte := %2.2X Offset := %d\n", byte, index);
-
-    error = e1000_write_ich8_byte(hw, index, byte);
-
-    if (error != E1000_SUCCESS) {
-        for (program_retries = 0; program_retries < 100; program_retries++) {
-            DEBUGOUT2("Retrying \t Byte := %2.2X Offset := %d\n", byte, index);
-            error = e1000_write_ich8_byte(hw, index, byte);
-            udelay(100);
-            if (error == E1000_SUCCESS)
-                break;
-        }
-    }
-
-    if (program_retries == 100)
-        error = E1000_ERR_EEPROM;
-
-    return error;
-}
-
-/******************************************************************************
- * Writes a single byte to the NVM using the ICH8 flash access registers.
- *
- * hw - pointer to e1000_hw structure
- * index - The index of the byte to read.
- * data - The byte to write to the NVM.
- *****************************************************************************/
-static s32 e1000_write_ich8_byte(struct e1000_hw *hw, u32 index, u8 data)
-{
-    s32 status = E1000_SUCCESS;
-    u16 word = (u16)data;
-
-    status = e1000_write_ich8_data(hw, index, 1, word);
-
-    return status;
-}
-
-/******************************************************************************
- * Reads a word from the NVM using the ICH8 flash access registers.
- *
- * hw - pointer to e1000_hw structure
- * index - The starting byte index of the word to read.
- * data - Pointer to a word to store the value read.
- *****************************************************************************/
-static s32 e1000_read_ich8_word(struct e1000_hw *hw, u32 index, u16 *data)
-{
-    s32 status = E1000_SUCCESS;
-    status = e1000_read_ich8_data(hw, index, 2, data);
-    return status;
-}
-
-/******************************************************************************
- * Erases the bank specified. Each bank may be a 4, 8 or 64k block. Banks are 0
- * based.
- *
- * hw - pointer to e1000_hw structure
- * bank - 0 for first bank, 1 for second bank
- *
- * Note that this function may actually erase as much as 8 or 64 KBytes.  The
- * amount of NVM used in each bank is a *minimum* of 4 KBytes, but in fact the
- * bank size may be 4, 8 or 64 KBytes
- *****************************************************************************/
-static s32 e1000_erase_ich8_4k_segment(struct e1000_hw *hw, u32 bank)
-{
-    union ich8_hws_flash_status hsfsts;
-    union ich8_hws_flash_ctrl hsflctl;
-    u32 flash_linear_address;
-    s32  count = 0;
-    s32  error = E1000_ERR_EEPROM;
-    s32  iteration;
-    s32  sub_sector_size = 0;
-    s32  bank_size;
-    s32  j = 0;
-    s32  error_flag = 0;
-
-    hsfsts.regval = E1000_READ_ICH_FLASH_REG16(hw, ICH_FLASH_HSFSTS);
-
-    /* Determine HW Sector size: Read BERASE bits of Hw flash Status register 
*/
-    /* 00: The Hw sector is 256 bytes, hence we need to erase 16
-     *     consecutive sectors.  The start index for the nth Hw sector can be
-     *     calculated as bank * 4096 + n * 256
-     * 01: The Hw sector is 4K bytes, hence we need to erase 1 sector.
-     *     The start index for the nth Hw sector can be calculated
-     *     as bank * 4096
-     * 10: The HW sector is 8K bytes
-     * 11: The Hw sector size is 64K bytes */
-    if (hsfsts.hsf_status.berasesz == 0x0) {
-        /* Hw sector size 256 */
-        sub_sector_size = ICH_FLASH_SEG_SIZE_256;
-        bank_size = ICH_FLASH_SECTOR_SIZE;
-        iteration = ICH_FLASH_SECTOR_SIZE / ICH_FLASH_SEG_SIZE_256;
-    } else if (hsfsts.hsf_status.berasesz == 0x1) {
-        bank_size = ICH_FLASH_SEG_SIZE_4K;
-        iteration = 1;
-    } else if (hsfsts.hsf_status.berasesz == 0x3) {
-        bank_size = ICH_FLASH_SEG_SIZE_64K;
-        iteration = 1;
-    } else {
-        return error;
-    }
-
-    for (j = 0; j < iteration ; j++) {
-        do {
-            count++;
-            /* Steps */
-            error = e1000_ich8_cycle_init(hw);
-            if (error != E1000_SUCCESS) {
-                error_flag = 1;
-                break;
-            }
-
-            /* Write a value 11 (block Erase) in Flash Cycle field in Hw flash
-             * Control */
-            hsflctl.regval = E1000_READ_ICH_FLASH_REG16(hw, ICH_FLASH_HSFCTL);
-            hsflctl.hsf_ctrl.flcycle = ICH_CYCLE_ERASE;
-            E1000_WRITE_ICH_FLASH_REG16(hw, ICH_FLASH_HSFCTL, hsflctl.regval);
-
-            /* Write the last 24 bits of an index within the block into Flash
-             * Linear address field in Flash Address.  This probably needs to
-             * be calculated here based off the on-chip erase sector size and
-             * the software bank size (4, 8 or 64 KBytes) */
-            flash_linear_address = bank * bank_size + j * sub_sector_size;
-            flash_linear_address += hw->flash_base_addr;
-            flash_linear_address &= ICH_FLASH_LINEAR_ADDR_MASK;
-
-            E1000_WRITE_ICH_FLASH_REG(hw, ICH_FLASH_FADDR, 
flash_linear_address);
-
-            error = e1000_ich8_flash_cycle(hw, ICH_FLASH_ERASE_TIMEOUT);
-            /* Check if FCERR is set to 1.  If 1, clear it and try the whole
-             * sequence a few more times else Done */
-            if (error == E1000_SUCCESS) {
-                break;
-            } else {
-                hsfsts.regval = E1000_READ_ICH_FLASH_REG16(hw, 
ICH_FLASH_HSFSTS);
-                if (hsfsts.hsf_status.flcerr == 1) {
-                    /* repeat for some time before giving up */
-                    continue;
-                } else if (hsfsts.hsf_status.flcdone == 0) {
-                    error_flag = 1;
-                    break;
-                }
-            }
-        } while ((count < ICH_FLASH_CYCLE_REPEAT_COUNT) && !error_flag);
-        if (error_flag == 1)
-            break;
-    }
-    if (error_flag != 1)
-        error = E1000_SUCCESS;
-    return error;
-}
-
-static s32 e1000_init_lcd_from_nvm_config_region(struct e1000_hw *hw,
-                                                u32 cnf_base_addr,
-                                                u32 cnf_size)
-{
-    u32 ret_val = E1000_SUCCESS;
-    u16 word_addr, reg_data, reg_addr;
-    u16 i;
-
-    /* cnf_base_addr is in DWORD */
-    word_addr = (u16)(cnf_base_addr << 1);
-
-    /* cnf_size is returned in size of dwords */
-    for (i = 0; i < cnf_size; i++) {
-        ret_val = e1000_read_eeprom(hw, (word_addr + i*2), 1, &reg_data);
-        if (ret_val)
-            return ret_val;
-
-        ret_val = e1000_read_eeprom(hw, (word_addr + i*2 + 1), 1, &reg_addr);
-        if (ret_val)
-            return ret_val;
-
-        ret_val = e1000_get_software_flag(hw);
-        if (ret_val != E1000_SUCCESS)
-            return ret_val;
-
-        ret_val = e1000_write_phy_reg_ex(hw, (u32)reg_addr, reg_data);
-
-        e1000_release_software_flag(hw);
-    }
-
-    return ret_val;
-}
-
-
-/******************************************************************************
- * This function initializes the PHY from the NVM on ICH8 platforms. This
- * is needed due to an issue where the NVM configuration is not properly
- * autoloaded after power transitions. Therefore, after each PHY reset, we
- * will load the configuration data out of the NVM manually.
- *
- * hw: Struct containing variables accessed by shared code
- *****************************************************************************/
-static s32 e1000_init_lcd_from_nvm(struct e1000_hw *hw)
-{
-    u32 reg_data, cnf_base_addr, cnf_size, ret_val, loop;
-
-    if (hw->phy_type != e1000_phy_igp_3)
-          return E1000_SUCCESS;
-
-    /* Check if SW needs configure the PHY */
-    reg_data = er32(FEXTNVM);
-    if (!(reg_data & FEXTNVM_SW_CONFIG))
-        return E1000_SUCCESS;
-
-    /* Wait for basic configuration completes before proceeding*/
-    loop = 0;
-    do {
-        reg_data = er32(STATUS) & E1000_STATUS_LAN_INIT_DONE;
-        udelay(100);
-        loop++;
-    } while ((!reg_data) && (loop < 50));
-
-    /* Clear the Init Done bit for the next init event */
-    reg_data = er32(STATUS);
-    reg_data &= ~E1000_STATUS_LAN_INIT_DONE;
-    ew32(STATUS, reg_data);
-
-    /* Make sure HW does not configure LCD from PHY extended configuration
-       before SW configuration */
-    reg_data = er32(EXTCNF_CTRL);
-    if ((reg_data & E1000_EXTCNF_CTRL_LCD_WRITE_ENABLE) == 0x0000) {
-        reg_data = er32(EXTCNF_SIZE);
-        cnf_size = reg_data & E1000_EXTCNF_SIZE_EXT_PCIE_LENGTH;
-        cnf_size >>= 16;
-        if (cnf_size) {
-            reg_data = er32(EXTCNF_CTRL);
-            cnf_base_addr = reg_data & E1000_EXTCNF_CTRL_EXT_CNF_POINTER;
-            /* cnf_base_addr is in DWORD */
-            cnf_base_addr >>= 16;
-
-            /* Configure LCD from extended configuration region. */
-            ret_val = e1000_init_lcd_from_nvm_config_region(hw, cnf_base_addr,
-                                                            cnf_size);
-            if (ret_val)
-                return ret_val;
-        }
-    }
-
-    return E1000_SUCCESS;
-}
-
diff --git a/dde_e1000/e1000_hw.h b/dde_e1000/e1000_hw.h
deleted file mode 100644
index 99fce2c..0000000
--- a/dde_e1000/e1000_hw.h
+++ /dev/null
@@ -1,3406 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2006 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify it
-  under the terms and conditions of the GNU General Public License,
-  version 2, as published by the Free Software Foundation.
-
-  This program is distributed in the hope it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
-
-  You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-
-  The full GNU General Public License is included in this distribution in
-  the file called "COPYING".
-
-  Contact Information:
-  Linux NICS <address@hidden>
-  e1000-devel Mailing List <address@hidden>
-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-
-*******************************************************************************/
-
-/* e1000_hw.h
- * Structures, enums, and macros for the MAC
- */
-
-#ifndef _E1000_HW_H_
-#define _E1000_HW_H_
-
-#include "e1000_osdep.h"
-
-
-/* Forward declarations of structures used by the shared code */
-struct e1000_hw;
-struct e1000_hw_stats;
-
-/* Enumerated types specific to the e1000 hardware */
-/* Media Access Controlers */
-typedef enum {
-    e1000_undefined = 0,
-    e1000_82542_rev2_0,
-    e1000_82542_rev2_1,
-    e1000_82543,
-    e1000_82544,
-    e1000_82540,
-    e1000_82545,
-    e1000_82545_rev_3,
-    e1000_82546,
-    e1000_82546_rev_3,
-    e1000_82541,
-    e1000_82541_rev_2,
-    e1000_82547,
-    e1000_82547_rev_2,
-    e1000_82571,
-    e1000_82572,
-    e1000_82573,
-    e1000_80003es2lan,
-    e1000_ich8lan,
-    e1000_num_macs
-} e1000_mac_type;
-
-typedef enum {
-    e1000_eeprom_uninitialized = 0,
-    e1000_eeprom_spi,
-    e1000_eeprom_microwire,
-    e1000_eeprom_flash,
-    e1000_eeprom_ich8,
-    e1000_eeprom_none, /* No NVM support */
-    e1000_num_eeprom_types
-} e1000_eeprom_type;
-
-/* Media Types */
-typedef enum {
-    e1000_media_type_copper = 0,
-    e1000_media_type_fiber = 1,
-    e1000_media_type_internal_serdes = 2,
-    e1000_num_media_types
-} e1000_media_type;
-
-typedef enum {
-    e1000_10_half = 0,
-    e1000_10_full = 1,
-    e1000_100_half = 2,
-    e1000_100_full = 3
-} e1000_speed_duplex_type;
-
-/* Flow Control Settings */
-typedef enum {
-    E1000_FC_NONE = 0,
-    E1000_FC_RX_PAUSE = 1,
-    E1000_FC_TX_PAUSE = 2,
-    E1000_FC_FULL = 3,
-    E1000_FC_DEFAULT = 0xFF
-} e1000_fc_type;
-
-struct e1000_shadow_ram {
-    u16 eeprom_word;
-    bool modified;
-};
-
-/* PCI bus types */
-typedef enum {
-    e1000_bus_type_unknown = 0,
-    e1000_bus_type_pci,
-    e1000_bus_type_pcix,
-    e1000_bus_type_pci_express,
-    e1000_bus_type_reserved
-} e1000_bus_type;
-
-/* PCI bus speeds */
-typedef enum {
-    e1000_bus_speed_unknown = 0,
-    e1000_bus_speed_33,
-    e1000_bus_speed_66,
-    e1000_bus_speed_100,
-    e1000_bus_speed_120,
-    e1000_bus_speed_133,
-    e1000_bus_speed_2500,
-    e1000_bus_speed_reserved
-} e1000_bus_speed;
-
-/* PCI bus widths */
-typedef enum {
-    e1000_bus_width_unknown = 0,
-    /* These PCIe values should literally match the possible return values
-     * from config space */
-    e1000_bus_width_pciex_1 = 1,
-    e1000_bus_width_pciex_2 = 2,
-    e1000_bus_width_pciex_4 = 4,
-    e1000_bus_width_32,
-    e1000_bus_width_64,
-    e1000_bus_width_reserved
-} e1000_bus_width;
-
-/* PHY status info structure and supporting enums */
-typedef enum {
-    e1000_cable_length_50 = 0,
-    e1000_cable_length_50_80,
-    e1000_cable_length_80_110,
-    e1000_cable_length_110_140,
-    e1000_cable_length_140,
-    e1000_cable_length_undefined = 0xFF
-} e1000_cable_length;
-
-typedef enum {
-    e1000_gg_cable_length_60 = 0,
-    e1000_gg_cable_length_60_115 = 1,
-    e1000_gg_cable_length_115_150 = 2,
-    e1000_gg_cable_length_150 = 4
-} e1000_gg_cable_length;
-
-typedef enum {
-    e1000_igp_cable_length_10  = 10,
-    e1000_igp_cable_length_20  = 20,
-    e1000_igp_cable_length_30  = 30,
-    e1000_igp_cable_length_40  = 40,
-    e1000_igp_cable_length_50  = 50,
-    e1000_igp_cable_length_60  = 60,
-    e1000_igp_cable_length_70  = 70,
-    e1000_igp_cable_length_80  = 80,
-    e1000_igp_cable_length_90  = 90,
-    e1000_igp_cable_length_100 = 100,
-    e1000_igp_cable_length_110 = 110,
-    e1000_igp_cable_length_115 = 115,
-    e1000_igp_cable_length_120 = 120,
-    e1000_igp_cable_length_130 = 130,
-    e1000_igp_cable_length_140 = 140,
-    e1000_igp_cable_length_150 = 150,
-    e1000_igp_cable_length_160 = 160,
-    e1000_igp_cable_length_170 = 170,
-    e1000_igp_cable_length_180 = 180
-} e1000_igp_cable_length;
-
-typedef enum {
-    e1000_10bt_ext_dist_enable_normal = 0,
-    e1000_10bt_ext_dist_enable_lower,
-    e1000_10bt_ext_dist_enable_undefined = 0xFF
-} e1000_10bt_ext_dist_enable;
-
-typedef enum {
-    e1000_rev_polarity_normal = 0,
-    e1000_rev_polarity_reversed,
-    e1000_rev_polarity_undefined = 0xFF
-} e1000_rev_polarity;
-
-typedef enum {
-    e1000_downshift_normal = 0,
-    e1000_downshift_activated,
-    e1000_downshift_undefined = 0xFF
-} e1000_downshift;
-
-typedef enum {
-    e1000_smart_speed_default = 0,
-    e1000_smart_speed_on,
-    e1000_smart_speed_off
-} e1000_smart_speed;
-
-typedef enum {
-    e1000_polarity_reversal_enabled = 0,
-    e1000_polarity_reversal_disabled,
-    e1000_polarity_reversal_undefined = 0xFF
-} e1000_polarity_reversal;
-
-typedef enum {
-    e1000_auto_x_mode_manual_mdi = 0,
-    e1000_auto_x_mode_manual_mdix,
-    e1000_auto_x_mode_auto1,
-    e1000_auto_x_mode_auto2,
-    e1000_auto_x_mode_undefined = 0xFF
-} e1000_auto_x_mode;
-
-typedef enum {
-    e1000_1000t_rx_status_not_ok = 0,
-    e1000_1000t_rx_status_ok,
-    e1000_1000t_rx_status_undefined = 0xFF
-} e1000_1000t_rx_status;
-
-typedef enum {
-    e1000_phy_m88 = 0,
-    e1000_phy_igp,
-    e1000_phy_igp_2,
-    e1000_phy_gg82563,
-    e1000_phy_igp_3,
-    e1000_phy_ife,
-    e1000_phy_undefined = 0xFF
-} e1000_phy_type;
-
-typedef enum {
-    e1000_ms_hw_default = 0,
-    e1000_ms_force_master,
-    e1000_ms_force_slave,
-    e1000_ms_auto
-} e1000_ms_type;
-
-typedef enum {
-    e1000_ffe_config_enabled = 0,
-    e1000_ffe_config_active,
-    e1000_ffe_config_blocked
-} e1000_ffe_config;
-
-typedef enum {
-    e1000_dsp_config_disabled = 0,
-    e1000_dsp_config_enabled,
-    e1000_dsp_config_activated,
-    e1000_dsp_config_undefined = 0xFF
-} e1000_dsp_config;
-
-struct e1000_phy_info {
-    e1000_cable_length cable_length;
-    e1000_10bt_ext_dist_enable extended_10bt_distance;
-    e1000_rev_polarity cable_polarity;
-    e1000_downshift downshift;
-    e1000_polarity_reversal polarity_correction;
-    e1000_auto_x_mode mdix_mode;
-    e1000_1000t_rx_status local_rx;
-    e1000_1000t_rx_status remote_rx;
-};
-
-struct e1000_phy_stats {
-    u32 idle_errors;
-    u32 receive_errors;
-};
-
-struct e1000_eeprom_info {
-    e1000_eeprom_type type;
-    u16 word_size;
-    u16 opcode_bits;
-    u16 address_bits;
-    u16 delay_usec;
-    u16 page_size;
-    bool use_eerd;
-    bool use_eewr;
-};
-
-/* Flex ASF Information */
-#define E1000_HOST_IF_MAX_SIZE  2048
-
-typedef enum {
-    e1000_byte_align = 0,
-    e1000_word_align = 1,
-    e1000_dword_align = 2
-} e1000_align_type;
-
-
-
-/* Error Codes */
-#define E1000_SUCCESS      0
-#define E1000_ERR_EEPROM   1
-#define E1000_ERR_PHY      2
-#define E1000_ERR_CONFIG   3
-#define E1000_ERR_PARAM    4
-#define E1000_ERR_MAC_TYPE 5
-#define E1000_ERR_PHY_TYPE 6
-#define E1000_ERR_RESET   9
-#define E1000_ERR_MASTER_REQUESTS_PENDING 10
-#define E1000_ERR_HOST_INTERFACE_COMMAND 11
-#define E1000_BLK_PHY_RESET   12
-#define E1000_ERR_SWFW_SYNC 13
-
-#define E1000_BYTE_SWAP_WORD(_value) ((((_value) & 0x00ff) << 8) | \
-                                     (((_value) & 0xff00) >> 8))
-
-/* Function prototypes */
-/* Initialization */
-s32 e1000_reset_hw(struct e1000_hw *hw);
-s32 e1000_init_hw(struct e1000_hw *hw);
-s32 e1000_set_mac_type(struct e1000_hw *hw);
-void e1000_set_media_type(struct e1000_hw *hw);
-
-/* Link Configuration */
-s32 e1000_setup_link(struct e1000_hw *hw);
-s32 e1000_phy_setup_autoneg(struct e1000_hw *hw);
-void e1000_config_collision_dist(struct e1000_hw *hw);
-s32 e1000_check_for_link(struct e1000_hw *hw);
-s32 e1000_get_speed_and_duplex(struct e1000_hw *hw, u16 *speed, u16 *duplex);
-s32 e1000_force_mac_fc(struct e1000_hw *hw);
-
-/* PHY */
-s32 e1000_read_phy_reg(struct e1000_hw *hw, u32 reg_addr, u16 *phy_data);
-s32 e1000_write_phy_reg(struct e1000_hw *hw, u32 reg_addr, u16 data);
-s32 e1000_phy_hw_reset(struct e1000_hw *hw);
-s32 e1000_phy_reset(struct e1000_hw *hw);
-s32 e1000_phy_get_info(struct e1000_hw *hw, struct e1000_phy_info *phy_info);
-s32 e1000_validate_mdi_setting(struct e1000_hw *hw);
-
-void e1000_phy_powerdown_workaround(struct e1000_hw *hw);
-
-/* EEPROM Functions */
-s32 e1000_init_eeprom_params(struct e1000_hw *hw);
-
-/* MNG HOST IF functions */
-u32 e1000_enable_mng_pass_thru(struct e1000_hw *hw);
-
-#define E1000_MNG_DHCP_TX_PAYLOAD_CMD   64
-#define E1000_HI_MAX_MNG_DATA_LENGTH    0x6F8   /* Host Interface data length 
*/
-
-#define E1000_MNG_DHCP_COMMAND_TIMEOUT  10      /* Time in ms to process MNG 
command */
-#define E1000_MNG_DHCP_COOKIE_OFFSET    0x6F0   /* Cookie offset */
-#define E1000_MNG_DHCP_COOKIE_LENGTH    0x10    /* Cookie length */
-#define E1000_MNG_IAMT_MODE             0x3
-#define E1000_MNG_ICH_IAMT_MODE         0x2
-#define E1000_IAMT_SIGNATURE            0x544D4149 /* Intel(R) Active 
Management Technology signature */
-
-#define E1000_MNG_DHCP_COOKIE_STATUS_PARSING_SUPPORT 0x1 /* DHCP parsing 
enabled */
-#define E1000_MNG_DHCP_COOKIE_STATUS_VLAN_SUPPORT    0x2 /* DHCP parsing 
enabled */
-#define E1000_VFTA_ENTRY_SHIFT                       0x5
-#define E1000_VFTA_ENTRY_MASK                        0x7F
-#define E1000_VFTA_ENTRY_BIT_SHIFT_MASK              0x1F
-
-struct e1000_host_mng_command_header {
-    u8 command_id;
-    u8 checksum;
-    u16 reserved1;
-    u16 reserved2;
-    u16 command_length;
-};
-
-struct e1000_host_mng_command_info {
-    struct e1000_host_mng_command_header command_header;  /* Command 
Head/Command Result Head has 4 bytes */
-    u8 command_data[E1000_HI_MAX_MNG_DATA_LENGTH];   /* Command data can 
length 0..0x658*/
-};
-#ifdef __BIG_ENDIAN
-struct e1000_host_mng_dhcp_cookie{
-    u32 signature;
-    u16 vlan_id;
-    u8 reserved0;
-    u8 status;
-    u32 reserved1;
-    u8 checksum;
-    u8 reserved3;
-    u16 reserved2;
-};
-#else
-struct e1000_host_mng_dhcp_cookie{
-    u32 signature;
-    u8 status;
-    u8 reserved0;
-    u16 vlan_id;
-    u32 reserved1;
-    u16 reserved2;
-    u8 reserved3;
-    u8 checksum;
-};
-#endif
-
-s32 e1000_mng_write_dhcp_info(struct e1000_hw *hw, u8 *buffer,
-                                  u16 length);
-bool e1000_check_mng_mode(struct e1000_hw *hw);
-bool e1000_enable_tx_pkt_filtering(struct e1000_hw *hw);
-s32 e1000_read_eeprom(struct e1000_hw *hw, u16 reg, u16 words, u16 *data);
-s32 e1000_validate_eeprom_checksum(struct e1000_hw *hw);
-s32 e1000_update_eeprom_checksum(struct e1000_hw *hw);
-s32 e1000_write_eeprom(struct e1000_hw *hw, u16 reg, u16 words, u16 *data);
-s32 e1000_read_mac_addr(struct e1000_hw * hw);
-
-/* Filters (multicast, vlan, receive) */
-u32 e1000_hash_mc_addr(struct e1000_hw *hw, u8 * mc_addr);
-void e1000_mta_set(struct e1000_hw *hw, u32 hash_value);
-void e1000_rar_set(struct e1000_hw *hw, u8 * mc_addr, u32 rar_index);
-void e1000_write_vfta(struct e1000_hw *hw, u32 offset, u32 value);
-
-/* LED functions */
-s32 e1000_setup_led(struct e1000_hw *hw);
-s32 e1000_cleanup_led(struct e1000_hw *hw);
-s32 e1000_led_on(struct e1000_hw *hw);
-s32 e1000_led_off(struct e1000_hw *hw);
-s32 e1000_blink_led_start(struct e1000_hw *hw);
-
-/* Adaptive IFS Functions */
-
-/* Everything else */
-void e1000_reset_adaptive(struct e1000_hw *hw);
-void e1000_update_adaptive(struct e1000_hw *hw);
-void e1000_tbi_adjust_stats(struct e1000_hw *hw, struct e1000_hw_stats *stats, 
u32 frame_len, u8 * mac_addr);
-void e1000_get_bus_info(struct e1000_hw *hw);
-void e1000_pci_set_mwi(struct e1000_hw *hw);
-void e1000_pci_clear_mwi(struct e1000_hw *hw);
-s32 e1000_read_pcie_cap_reg(struct e1000_hw *hw, u32 reg, u16 *value);
-void e1000_pcix_set_mmrbc(struct e1000_hw *hw, int mmrbc);
-int e1000_pcix_get_mmrbc(struct e1000_hw *hw);
-/* Port I/O is only supported on 82544 and newer */
-void e1000_io_write(struct e1000_hw *hw, unsigned long port, u32 value);
-s32 e1000_disable_pciex_master(struct e1000_hw *hw);
-s32 e1000_check_phy_reset_block(struct e1000_hw *hw);
-
-
-#define E1000_READ_REG_IO(a, reg) \
-    e1000_read_reg_io((a), E1000_##reg)
-#define E1000_WRITE_REG_IO(a, reg, val) \
-    e1000_write_reg_io((a), E1000_##reg, val)
-
-/* PCI Device IDs */
-#define E1000_DEV_ID_82542               0x1000
-#define E1000_DEV_ID_82543GC_FIBER       0x1001
-#define E1000_DEV_ID_82543GC_COPPER      0x1004
-#define E1000_DEV_ID_82544EI_COPPER      0x1008
-#define E1000_DEV_ID_82544EI_FIBER       0x1009
-#define E1000_DEV_ID_82544GC_COPPER      0x100C
-#define E1000_DEV_ID_82544GC_LOM         0x100D
-#define E1000_DEV_ID_82540EM             0x100E
-#define E1000_DEV_ID_82540EM_LOM         0x1015
-#define E1000_DEV_ID_82540EP_LOM         0x1016
-#define E1000_DEV_ID_82540EP             0x1017
-#define E1000_DEV_ID_82540EP_LP          0x101E
-#define E1000_DEV_ID_82545EM_COPPER      0x100F
-#define E1000_DEV_ID_82545EM_FIBER       0x1011
-#define E1000_DEV_ID_82545GM_COPPER      0x1026
-#define E1000_DEV_ID_82545GM_FIBER       0x1027
-#define E1000_DEV_ID_82545GM_SERDES      0x1028
-#define E1000_DEV_ID_82546EB_COPPER      0x1010
-#define E1000_DEV_ID_82546EB_FIBER       0x1012
-#define E1000_DEV_ID_82546EB_QUAD_COPPER 0x101D
-#define E1000_DEV_ID_82541EI             0x1013
-#define E1000_DEV_ID_82541EI_MOBILE      0x1018
-#define E1000_DEV_ID_82541ER_LOM         0x1014
-#define E1000_DEV_ID_82541ER             0x1078
-#define E1000_DEV_ID_82547GI             0x1075
-#define E1000_DEV_ID_82541GI             0x1076
-#define E1000_DEV_ID_82541GI_MOBILE      0x1077
-#define E1000_DEV_ID_82541GI_LF          0x107C
-#define E1000_DEV_ID_82546GB_COPPER      0x1079
-#define E1000_DEV_ID_82546GB_FIBER       0x107A
-#define E1000_DEV_ID_82546GB_SERDES      0x107B
-#define E1000_DEV_ID_82546GB_PCIE        0x108A
-#define E1000_DEV_ID_82546GB_QUAD_COPPER 0x1099
-#define E1000_DEV_ID_82547EI             0x1019
-#define E1000_DEV_ID_82547EI_MOBILE      0x101A
-#define E1000_DEV_ID_82571EB_COPPER      0x105E
-#define E1000_DEV_ID_82571EB_FIBER       0x105F
-#define E1000_DEV_ID_82571EB_SERDES      0x1060
-#define E1000_DEV_ID_82571EB_QUAD_COPPER 0x10A4
-#define E1000_DEV_ID_82571PT_QUAD_COPPER 0x10D5
-#define E1000_DEV_ID_82571EB_QUAD_FIBER  0x10A5
-#define E1000_DEV_ID_82571EB_QUAD_COPPER_LOWPROFILE  0x10BC
-#define E1000_DEV_ID_82571EB_SERDES_DUAL 0x10D9
-#define E1000_DEV_ID_82571EB_SERDES_QUAD 0x10DA
-#define E1000_DEV_ID_82572EI_COPPER      0x107D
-#define E1000_DEV_ID_82572EI_FIBER       0x107E
-#define E1000_DEV_ID_82572EI_SERDES      0x107F
-#define E1000_DEV_ID_82572EI             0x10B9
-#define E1000_DEV_ID_82573E              0x108B
-#define E1000_DEV_ID_82573E_IAMT         0x108C
-#define E1000_DEV_ID_82573L              0x109A
-#define E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3 0x10B5
-#define E1000_DEV_ID_80003ES2LAN_COPPER_DPT     0x1096
-#define E1000_DEV_ID_80003ES2LAN_SERDES_DPT     0x1098
-#define E1000_DEV_ID_80003ES2LAN_COPPER_SPT     0x10BA
-#define E1000_DEV_ID_80003ES2LAN_SERDES_SPT     0x10BB
-
-#define E1000_DEV_ID_ICH8_IGP_M_AMT      0x1049
-#define E1000_DEV_ID_ICH8_IGP_AMT        0x104A
-#define E1000_DEV_ID_ICH8_IGP_C          0x104B
-#define E1000_DEV_ID_ICH8_IFE            0x104C
-#define E1000_DEV_ID_ICH8_IFE_GT         0x10C4
-#define E1000_DEV_ID_ICH8_IFE_G          0x10C5
-#define E1000_DEV_ID_ICH8_IGP_M          0x104D
-
-
-#define NODE_ADDRESS_SIZE 6
-#define ETH_LENGTH_OF_ADDRESS 6
-
-/* MAC decode size is 128K - This is the size of BAR0 */
-#define MAC_DECODE_SIZE (128 * 1024)
-
-#define E1000_82542_2_0_REV_ID 2
-#define E1000_82542_2_1_REV_ID 3
-#define E1000_REVISION_0       0
-#define E1000_REVISION_1       1
-#define E1000_REVISION_2       2
-#define E1000_REVISION_3       3
-
-#define SPEED_10    10
-#define SPEED_100   100
-#define SPEED_1000  1000
-#define HALF_DUPLEX 1
-#define FULL_DUPLEX 2
-
-/* The sizes (in bytes) of a ethernet packet */
-#define ENET_HEADER_SIZE             14
-#define MAXIMUM_ETHERNET_FRAME_SIZE  1518 /* With FCS */
-#define MINIMUM_ETHERNET_FRAME_SIZE  64   /* With FCS */
-#define ETHERNET_FCS_SIZE            4
-#define MAXIMUM_ETHERNET_PACKET_SIZE \
-    (MAXIMUM_ETHERNET_FRAME_SIZE - ETHERNET_FCS_SIZE)
-#define MINIMUM_ETHERNET_PACKET_SIZE \
-    (MINIMUM_ETHERNET_FRAME_SIZE - ETHERNET_FCS_SIZE)
-#define CRC_LENGTH                   ETHERNET_FCS_SIZE
-#define MAX_JUMBO_FRAME_SIZE         0x3F00
-
-
-/* 802.1q VLAN Packet Sizes */
-#define VLAN_TAG_SIZE  4     /* 802.3ac tag (not DMAed) */
-
-/* Ethertype field values */
-#define ETHERNET_IEEE_VLAN_TYPE 0x8100  /* 802.3ac packet */
-#define ETHERNET_IP_TYPE        0x0800  /* IP packets */
-#define ETHERNET_ARP_TYPE       0x0806  /* Address Resolution Protocol (ARP) */
-
-/* Packet Header defines */
-#define IP_PROTOCOL_TCP    6
-#define IP_PROTOCOL_UDP    0x11
-
-/* This defines the bits that are set in the Interrupt Mask
- * Set/Read Register.  Each bit is documented below:
- *   o RXDMT0 = Receive Descriptor Minimum Threshold hit (ring 0)
- *   o RXSEQ  = Receive Sequence Error
- */
-#define POLL_IMS_ENABLE_MASK ( \
-    E1000_IMS_RXDMT0 |         \
-    E1000_IMS_RXSEQ)
-
-/* This defines the bits that are set in the Interrupt Mask
- * Set/Read Register.  Each bit is documented below:
- *   o RXT0   = Receiver Timer Interrupt (ring 0)
- *   o TXDW   = Transmit Descriptor Written Back
- *   o RXDMT0 = Receive Descriptor Minimum Threshold hit (ring 0)
- *   o RXSEQ  = Receive Sequence Error
- *   o LSC    = Link Status Change
- */
-#define IMS_ENABLE_MASK ( \
-    E1000_IMS_RXT0   |    \
-    E1000_IMS_TXDW   |    \
-    E1000_IMS_RXDMT0 |    \
-    E1000_IMS_RXSEQ  |    \
-    E1000_IMS_LSC)
-
-/* Additional interrupts need to be handled for e1000_ich8lan:
-    DSW = The FW changed the status of the DISSW bit in FWSM
-    PHYINT = The LAN connected device generates an interrupt
-    EPRST = Manageability reset event */
-#define IMS_ICH8LAN_ENABLE_MASK (\
-    E1000_IMS_DSW   | \
-    E1000_IMS_PHYINT | \
-    E1000_IMS_EPRST)
-
-/* Number of high/low register pairs in the RAR. The RAR (Receive Address
- * Registers) holds the directed and multicast addresses that we monitor. We
- * reserve one of these spots for our directed address, allowing us room for
- * E1000_RAR_ENTRIES - 1 multicast addresses.
- */
-#define E1000_RAR_ENTRIES 15
-
-#define E1000_RAR_ENTRIES_ICH8LAN  6
-
-#define MIN_NUMBER_OF_DESCRIPTORS  8
-#define MAX_NUMBER_OF_DESCRIPTORS  0xFFF8
-
-/* Receive Descriptor */
-struct e1000_rx_desc {
-    __le64 buffer_addr; /* Address of the descriptor's data buffer */
-    __le16 length;     /* Length of data DMAed into data buffer */
-    __le16 csum;       /* Packet checksum */
-    u8 status;      /* Descriptor status */
-    u8 errors;      /* Descriptor Errors */
-    __le16 special;
-};
-
-/* Receive Descriptor - Extended */
-union e1000_rx_desc_extended {
-    struct {
-        __le64 buffer_addr;
-        __le64 reserved;
-    } read;
-    struct {
-        struct {
-            __le32 mrq;              /* Multiple Rx Queues */
-            union {
-                __le32 rss;          /* RSS Hash */
-                struct {
-                    __le16 ip_id;    /* IP id */
-                    __le16 csum;     /* Packet Checksum */
-                } csum_ip;
-            } hi_dword;
-        } lower;
-        struct {
-            __le32 status_error;     /* ext status/error */
-            __le16 length;
-            __le16 vlan;             /* VLAN tag */
-        } upper;
-    } wb;  /* writeback */
-};
-
-#define MAX_PS_BUFFERS 4
-/* Receive Descriptor - Packet Split */
-union e1000_rx_desc_packet_split {
-    struct {
-        /* one buffer for protocol header(s), three data buffers */
-        __le64 buffer_addr[MAX_PS_BUFFERS];
-    } read;
-    struct {
-        struct {
-            __le32 mrq;              /* Multiple Rx Queues */
-            union {
-                __le32 rss;          /* RSS Hash */
-                struct {
-                    __le16 ip_id;    /* IP id */
-                    __le16 csum;     /* Packet Checksum */
-                } csum_ip;
-            } hi_dword;
-        } lower;
-        struct {
-            __le32 status_error;     /* ext status/error */
-            __le16 length0;          /* length of buffer 0 */
-            __le16 vlan;             /* VLAN tag */
-        } middle;
-        struct {
-            __le16 header_status;
-            __le16 length[3];        /* length of buffers 1-3 */
-        } upper;
-        __le64 reserved;
-    } wb; /* writeback */
-};
-
-/* Receive Decriptor bit definitions */
-#define E1000_RXD_STAT_DD       0x01    /* Descriptor Done */
-#define E1000_RXD_STAT_EOP      0x02    /* End of Packet */
-#define E1000_RXD_STAT_IXSM     0x04    /* Ignore checksum */
-#define E1000_RXD_STAT_VP       0x08    /* IEEE VLAN Packet */
-#define E1000_RXD_STAT_UDPCS    0x10    /* UDP xsum caculated */
-#define E1000_RXD_STAT_TCPCS    0x20    /* TCP xsum calculated */
-#define E1000_RXD_STAT_IPCS     0x40    /* IP xsum calculated */
-#define E1000_RXD_STAT_PIF      0x80    /* passed in-exact filter */
-#define E1000_RXD_STAT_IPIDV    0x200   /* IP identification valid */
-#define E1000_RXD_STAT_UDPV     0x400   /* Valid UDP checksum */
-#define E1000_RXD_STAT_ACK      0x8000  /* ACK Packet indication */
-#define E1000_RXD_ERR_CE        0x01    /* CRC Error */
-#define E1000_RXD_ERR_SE        0x02    /* Symbol Error */
-#define E1000_RXD_ERR_SEQ       0x04    /* Sequence Error */
-#define E1000_RXD_ERR_CXE       0x10    /* Carrier Extension Error */
-#define E1000_RXD_ERR_TCPE      0x20    /* TCP/UDP Checksum Error */
-#define E1000_RXD_ERR_IPE       0x40    /* IP Checksum Error */
-#define E1000_RXD_ERR_RXE       0x80    /* Rx Data Error */
-#define E1000_RXD_SPC_VLAN_MASK 0x0FFF  /* VLAN ID is in lower 12 bits */
-#define E1000_RXD_SPC_PRI_MASK  0xE000  /* Priority is in upper 3 bits */
-#define E1000_RXD_SPC_PRI_SHIFT 13
-#define E1000_RXD_SPC_CFI_MASK  0x1000  /* CFI is bit 12 */
-#define E1000_RXD_SPC_CFI_SHIFT 12
-
-#define E1000_RXDEXT_STATERR_CE    0x01000000
-#define E1000_RXDEXT_STATERR_SE    0x02000000
-#define E1000_RXDEXT_STATERR_SEQ   0x04000000
-#define E1000_RXDEXT_STATERR_CXE   0x10000000
-#define E1000_RXDEXT_STATERR_TCPE  0x20000000
-#define E1000_RXDEXT_STATERR_IPE   0x40000000
-#define E1000_RXDEXT_STATERR_RXE   0x80000000
-
-#define E1000_RXDPS_HDRSTAT_HDRSP        0x00008000
-#define E1000_RXDPS_HDRSTAT_HDRLEN_MASK  0x000003FF
-
-/* mask to determine if packets should be dropped due to frame errors */
-#define E1000_RXD_ERR_FRAME_ERR_MASK ( \
-    E1000_RXD_ERR_CE  |                \
-    E1000_RXD_ERR_SE  |                \
-    E1000_RXD_ERR_SEQ |                \
-    E1000_RXD_ERR_CXE |                \
-    E1000_RXD_ERR_RXE)
-
-
-/* Same mask, but for extended and packet split descriptors */
-#define E1000_RXDEXT_ERR_FRAME_ERR_MASK ( \
-    E1000_RXDEXT_STATERR_CE  |            \
-    E1000_RXDEXT_STATERR_SE  |            \
-    E1000_RXDEXT_STATERR_SEQ |            \
-    E1000_RXDEXT_STATERR_CXE |            \
-    E1000_RXDEXT_STATERR_RXE)
-
-
-/* Transmit Descriptor */
-struct e1000_tx_desc {
-    __le64 buffer_addr;       /* Address of the descriptor's data buffer */
-    union {
-        __le32 data;
-        struct {
-            __le16 length;    /* Data buffer length */
-            u8 cso;        /* Checksum offset */
-            u8 cmd;        /* Descriptor control */
-        } flags;
-    } lower;
-    union {
-        __le32 data;
-        struct {
-            u8 status;     /* Descriptor status */
-            u8 css;        /* Checksum start */
-            __le16 special;
-        } fields;
-    } upper;
-};
-
-/* Transmit Descriptor bit definitions */
-#define E1000_TXD_DTYP_D     0x00100000 /* Data Descriptor */
-#define E1000_TXD_DTYP_C     0x00000000 /* Context Descriptor */
-#define E1000_TXD_POPTS_IXSM 0x01       /* Insert IP checksum */
-#define E1000_TXD_POPTS_TXSM 0x02       /* Insert TCP/UDP checksum */
-#define E1000_TXD_CMD_EOP    0x01000000 /* End of Packet */
-#define E1000_TXD_CMD_IFCS   0x02000000 /* Insert FCS (Ethernet CRC) */
-#define E1000_TXD_CMD_IC     0x04000000 /* Insert Checksum */
-#define E1000_TXD_CMD_RS     0x08000000 /* Report Status */
-#define E1000_TXD_CMD_RPS    0x10000000 /* Report Packet Sent */
-#define E1000_TXD_CMD_DEXT   0x20000000 /* Descriptor extension (0 = legacy) */
-#define E1000_TXD_CMD_VLE    0x40000000 /* Add VLAN tag */
-#define E1000_TXD_CMD_IDE    0x80000000 /* Enable Tidv register */
-#define E1000_TXD_STAT_DD    0x00000001 /* Descriptor Done */
-#define E1000_TXD_STAT_EC    0x00000002 /* Excess Collisions */
-#define E1000_TXD_STAT_LC    0x00000004 /* Late Collisions */
-#define E1000_TXD_STAT_TU    0x00000008 /* Transmit underrun */
-#define E1000_TXD_CMD_TCP    0x01000000 /* TCP packet */
-#define E1000_TXD_CMD_IP     0x02000000 /* IP packet */
-#define E1000_TXD_CMD_TSE    0x04000000 /* TCP Seg enable */
-#define E1000_TXD_STAT_TC    0x00000004 /* Tx Underrun */
-
-/* Offload Context Descriptor */
-struct e1000_context_desc {
-    union {
-        __le32 ip_config;
-        struct {
-            u8 ipcss;      /* IP checksum start */
-            u8 ipcso;      /* IP checksum offset */
-            __le16 ipcse;     /* IP checksum end */
-        } ip_fields;
-    } lower_setup;
-    union {
-        __le32 tcp_config;
-        struct {
-            u8 tucss;      /* TCP checksum start */
-            u8 tucso;      /* TCP checksum offset */
-            __le16 tucse;     /* TCP checksum end */
-        } tcp_fields;
-    } upper_setup;
-    __le32 cmd_and_length;    /* */
-    union {
-        __le32 data;
-        struct {
-            u8 status;     /* Descriptor status */
-            u8 hdr_len;    /* Header length */
-            __le16 mss;       /* Maximum segment size */
-        } fields;
-    } tcp_seg_setup;
-};
-
-/* Offload data descriptor */
-struct e1000_data_desc {
-    __le64 buffer_addr;       /* Address of the descriptor's buffer address */
-    union {
-        __le32 data;
-        struct {
-            __le16 length;    /* Data buffer length */
-            u8 typ_len_ext;        /* */
-            u8 cmd;        /* */
-        } flags;
-    } lower;
-    union {
-        __le32 data;
-        struct {
-            u8 status;     /* Descriptor status */
-            u8 popts;      /* Packet Options */
-            __le16 special;   /* */
-        } fields;
-    } upper;
-};
-
-/* Filters */
-#define E1000_NUM_UNICAST          16   /* Unicast filter entries */
-#define E1000_MC_TBL_SIZE          128  /* Multicast Filter Table (4096 bits) 
*/
-#define E1000_VLAN_FILTER_TBL_SIZE 128  /* VLAN Filter Table (4096 bits) */
-
-#define E1000_NUM_UNICAST_ICH8LAN  7
-#define E1000_MC_TBL_SIZE_ICH8LAN  32
-
-
-/* Receive Address Register */
-struct e1000_rar {
-    volatile __le32 low;      /* receive address low */
-    volatile __le32 high;     /* receive address high */
-};
-
-/* Number of entries in the Multicast Table Array (MTA). */
-#define E1000_NUM_MTA_REGISTERS 128
-#define E1000_NUM_MTA_REGISTERS_ICH8LAN 32
-
-/* IPv4 Address Table Entry */
-struct e1000_ipv4_at_entry {
-    volatile u32 ipv4_addr;        /* IP Address (RW) */
-    volatile u32 reserved;
-};
-
-/* Four wakeup IP addresses are supported */
-#define E1000_WAKEUP_IP_ADDRESS_COUNT_MAX 4
-#define E1000_IP4AT_SIZE                  E1000_WAKEUP_IP_ADDRESS_COUNT_MAX
-#define E1000_IP4AT_SIZE_ICH8LAN          3
-#define E1000_IP6AT_SIZE                  1
-
-/* IPv6 Address Table Entry */
-struct e1000_ipv6_at_entry {
-    volatile u8 ipv6_addr[16];
-};
-
-/* Flexible Filter Length Table Entry */
-struct e1000_fflt_entry {
-    volatile u32 length;   /* Flexible Filter Length (RW) */
-    volatile u32 reserved;
-};
-
-/* Flexible Filter Mask Table Entry */
-struct e1000_ffmt_entry {
-    volatile u32 mask;     /* Flexible Filter Mask (RW) */
-    volatile u32 reserved;
-};
-
-/* Flexible Filter Value Table Entry */
-struct e1000_ffvt_entry {
-    volatile u32 value;    /* Flexible Filter Value (RW) */
-    volatile u32 reserved;
-};
-
-/* Four Flexible Filters are supported */
-#define E1000_FLEXIBLE_FILTER_COUNT_MAX 4
-
-/* Each Flexible Filter is at most 128 (0x80) bytes in length */
-#define E1000_FLEXIBLE_FILTER_SIZE_MAX  128
-
-#define E1000_FFLT_SIZE E1000_FLEXIBLE_FILTER_COUNT_MAX
-#define E1000_FFMT_SIZE E1000_FLEXIBLE_FILTER_SIZE_MAX
-#define E1000_FFVT_SIZE E1000_FLEXIBLE_FILTER_SIZE_MAX
-
-#define E1000_DISABLE_SERDES_LOOPBACK   0x0400
-
-/* Register Set. (82543, 82544)
- *
- * Registers are defined to be 32 bits and  should be accessed as 32 bit 
values.
- * These registers are physically located on the NIC, but are mapped into the
- * host memory address space.
- *
- * RW - register is both readable and writable
- * RO - register is read only
- * WO - register is write only
- * R/clr - register is read only and is cleared when read
- * A - register array
- */
-#define E1000_CTRL     0x00000  /* Device Control - RW */
-#define E1000_CTRL_DUP 0x00004  /* Device Control Duplicate (Shadow) - RW */
-#define E1000_STATUS   0x00008  /* Device Status - RO */
-#define E1000_EECD     0x00010  /* EEPROM/Flash Control - RW */
-#define E1000_EERD     0x00014  /* EEPROM Read - RW */
-#define E1000_CTRL_EXT 0x00018  /* Extended Device Control - RW */
-#define E1000_FLA      0x0001C  /* Flash Access - RW */
-#define E1000_MDIC     0x00020  /* MDI Control - RW */
-#define E1000_SCTL     0x00024  /* SerDes Control - RW */
-#define E1000_FEXTNVM  0x00028  /* Future Extended NVM register */
-#define E1000_FCAL     0x00028  /* Flow Control Address Low - RW */
-#define E1000_FCAH     0x0002C  /* Flow Control Address High -RW */
-#define E1000_FCT      0x00030  /* Flow Control Type - RW */
-#define E1000_VET      0x00038  /* VLAN Ether Type - RW */
-#define E1000_ICR      0x000C0  /* Interrupt Cause Read - R/clr */
-#define E1000_ITR      0x000C4  /* Interrupt Throttling Rate - RW */
-#define E1000_ICS      0x000C8  /* Interrupt Cause Set - WO */
-#define E1000_IMS      0x000D0  /* Interrupt Mask Set - RW */
-#define E1000_IMC      0x000D8  /* Interrupt Mask Clear - WO */
-#define E1000_IAM      0x000E0  /* Interrupt Acknowledge Auto Mask */
-#define E1000_RCTL     0x00100  /* RX Control - RW */
-#define E1000_RDTR1    0x02820  /* RX Delay Timer (1) - RW */
-#define E1000_RDBAL1   0x02900  /* RX Descriptor Base Address Low (1) - RW */
-#define E1000_RDBAH1   0x02904  /* RX Descriptor Base Address High (1) - RW */
-#define E1000_RDLEN1   0x02908  /* RX Descriptor Length (1) - RW */
-#define E1000_RDH1     0x02910  /* RX Descriptor Head (1) - RW */
-#define E1000_RDT1     0x02918  /* RX Descriptor Tail (1) - RW */
-#define E1000_FCTTV    0x00170  /* Flow Control Transmit Timer Value - RW */
-#define E1000_TXCW     0x00178  /* TX Configuration Word - RW */
-#define E1000_RXCW     0x00180  /* RX Configuration Word - RO */
-#define E1000_TCTL     0x00400  /* TX Control - RW */
-#define E1000_TCTL_EXT 0x00404  /* Extended TX Control - RW */
-#define E1000_TIPG     0x00410  /* TX Inter-packet gap -RW */
-#define E1000_TBT      0x00448  /* TX Burst Timer - RW */
-#define E1000_AIT      0x00458  /* Adaptive Interframe Spacing Throttle - RW */
-#define E1000_LEDCTL   0x00E00  /* LED Control - RW */
-#define E1000_EXTCNF_CTRL  0x00F00  /* Extended Configuration Control */
-#define E1000_EXTCNF_SIZE  0x00F08  /* Extended Configuration Size */
-#define E1000_PHY_CTRL     0x00F10  /* PHY Control Register in CSR */
-#define FEXTNVM_SW_CONFIG  0x0001
-#define E1000_PBA      0x01000  /* Packet Buffer Allocation - RW */
-#define E1000_PBS      0x01008  /* Packet Buffer Size */
-#define E1000_EEMNGCTL 0x01010  /* MNG EEprom Control */
-#define E1000_FLASH_UPDATES 1000
-#define E1000_EEARBC   0x01024  /* EEPROM Auto Read Bus Control */
-#define E1000_FLASHT   0x01028  /* FLASH Timer Register */
-#define E1000_EEWR     0x0102C  /* EEPROM Write Register - RW */
-#define E1000_FLSWCTL  0x01030  /* FLASH control register */
-#define E1000_FLSWDATA 0x01034  /* FLASH data register */
-#define E1000_FLSWCNT  0x01038  /* FLASH Access Counter */
-#define E1000_FLOP     0x0103C  /* FLASH Opcode Register */
-#define E1000_ERT      0x02008  /* Early Rx Threshold - RW */
-#define E1000_FCRTL    0x02160  /* Flow Control Receive Threshold Low - RW */
-#define E1000_FCRTH    0x02168  /* Flow Control Receive Threshold High - RW */
-#define E1000_PSRCTL   0x02170  /* Packet Split Receive Control - RW */
-#define E1000_RDBAL    0x02800  /* RX Descriptor Base Address Low - RW */
-#define E1000_RDBAH    0x02804  /* RX Descriptor Base Address High - RW */
-#define E1000_RDLEN    0x02808  /* RX Descriptor Length - RW */
-#define E1000_RDH      0x02810  /* RX Descriptor Head - RW */
-#define E1000_RDT      0x02818  /* RX Descriptor Tail - RW */
-#define E1000_RDTR     0x02820  /* RX Delay Timer - RW */
-#define E1000_RDBAL0   E1000_RDBAL /* RX Desc Base Address Low (0) - RW */
-#define E1000_RDBAH0   E1000_RDBAH /* RX Desc Base Address High (0) - RW */
-#define E1000_RDLEN0   E1000_RDLEN /* RX Desc Length (0) - RW */
-#define E1000_RDH0     E1000_RDH   /* RX Desc Head (0) - RW */
-#define E1000_RDT0     E1000_RDT   /* RX Desc Tail (0) - RW */
-#define E1000_RDTR0    E1000_RDTR  /* RX Delay Timer (0) - RW */
-#define E1000_RXDCTL   0x02828  /* RX Descriptor Control queue 0 - RW */
-#define E1000_RXDCTL1  0x02928  /* RX Descriptor Control queue 1 - RW */
-#define E1000_RADV     0x0282C  /* RX Interrupt Absolute Delay Timer - RW */
-#define E1000_RSRPD    0x02C00  /* RX Small Packet Detect - RW */
-#define E1000_RAID     0x02C08  /* Receive Ack Interrupt Delay - RW */
-#define E1000_TXDMAC   0x03000  /* TX DMA Control - RW */
-#define E1000_KABGTXD  0x03004  /* AFE Band Gap Transmit Ref Data */
-#define E1000_TDFH     0x03410  /* TX Data FIFO Head - RW */
-#define E1000_TDFT     0x03418  /* TX Data FIFO Tail - RW */
-#define E1000_TDFHS    0x03420  /* TX Data FIFO Head Saved - RW */
-#define E1000_TDFTS    0x03428  /* TX Data FIFO Tail Saved - RW */
-#define E1000_TDFPC    0x03430  /* TX Data FIFO Packet Count - RW */
-#define E1000_TDBAL    0x03800  /* TX Descriptor Base Address Low - RW */
-#define E1000_TDBAH    0x03804  /* TX Descriptor Base Address High - RW */
-#define E1000_TDLEN    0x03808  /* TX Descriptor Length - RW */
-#define E1000_TDH      0x03810  /* TX Descriptor Head - RW */
-#define E1000_TDT      0x03818  /* TX Descripotr Tail - RW */
-#define E1000_TIDV     0x03820  /* TX Interrupt Delay Value - RW */
-#define E1000_TXDCTL   0x03828  /* TX Descriptor Control - RW */
-#define E1000_TADV     0x0382C  /* TX Interrupt Absolute Delay Val - RW */
-#define E1000_TSPMT    0x03830  /* TCP Segmentation PAD & Min Threshold - RW */
-#define E1000_TARC0    0x03840  /* TX Arbitration Count (0) */
-#define E1000_TDBAL1   0x03900  /* TX Desc Base Address Low (1) - RW */
-#define E1000_TDBAH1   0x03904  /* TX Desc Base Address High (1) - RW */
-#define E1000_TDLEN1   0x03908  /* TX Desc Length (1) - RW */
-#define E1000_TDH1     0x03910  /* TX Desc Head (1) - RW */
-#define E1000_TDT1     0x03918  /* TX Desc Tail (1) - RW */
-#define E1000_TXDCTL1  0x03928  /* TX Descriptor Control (1) - RW */
-#define E1000_TARC1    0x03940  /* TX Arbitration Count (1) */
-#define E1000_CRCERRS  0x04000  /* CRC Error Count - R/clr */
-#define E1000_ALGNERRC 0x04004  /* Alignment Error Count - R/clr */
-#define E1000_SYMERRS  0x04008  /* Symbol Error Count - R/clr */
-#define E1000_RXERRC   0x0400C  /* Receive Error Count - R/clr */
-#define E1000_MPC      0x04010  /* Missed Packet Count - R/clr */
-#define E1000_SCC      0x04014  /* Single Collision Count - R/clr */
-#define E1000_ECOL     0x04018  /* Excessive Collision Count - R/clr */
-#define E1000_MCC      0x0401C  /* Multiple Collision Count - R/clr */
-#define E1000_LATECOL  0x04020  /* Late Collision Count - R/clr */
-#define E1000_COLC     0x04028  /* Collision Count - R/clr */
-#define E1000_DC       0x04030  /* Defer Count - R/clr */
-#define E1000_TNCRS    0x04034  /* TX-No CRS - R/clr */
-#define E1000_SEC      0x04038  /* Sequence Error Count - R/clr */
-#define E1000_CEXTERR  0x0403C  /* Carrier Extension Error Count - R/clr */
-#define E1000_RLEC     0x04040  /* Receive Length Error Count - R/clr */
-#define E1000_XONRXC   0x04048  /* XON RX Count - R/clr */
-#define E1000_XONTXC   0x0404C  /* XON TX Count - R/clr */
-#define E1000_XOFFRXC  0x04050  /* XOFF RX Count - R/clr */
-#define E1000_XOFFTXC  0x04054  /* XOFF TX Count - R/clr */
-#define E1000_FCRUC    0x04058  /* Flow Control RX Unsupported Count- R/clr */
-#define E1000_PRC64    0x0405C  /* Packets RX (64 bytes) - R/clr */
-#define E1000_PRC127   0x04060  /* Packets RX (65-127 bytes) - R/clr */
-#define E1000_PRC255   0x04064  /* Packets RX (128-255 bytes) - R/clr */
-#define E1000_PRC511   0x04068  /* Packets RX (255-511 bytes) - R/clr */
-#define E1000_PRC1023  0x0406C  /* Packets RX (512-1023 bytes) - R/clr */
-#define E1000_PRC1522  0x04070  /* Packets RX (1024-1522 bytes) - R/clr */
-#define E1000_GPRC     0x04074  /* Good Packets RX Count - R/clr */
-#define E1000_BPRC     0x04078  /* Broadcast Packets RX Count - R/clr */
-#define E1000_MPRC     0x0407C  /* Multicast Packets RX Count - R/clr */
-#define E1000_GPTC     0x04080  /* Good Packets TX Count - R/clr */
-#define E1000_GORCL    0x04088  /* Good Octets RX Count Low - R/clr */
-#define E1000_GORCH    0x0408C  /* Good Octets RX Count High - R/clr */
-#define E1000_GOTCL    0x04090  /* Good Octets TX Count Low - R/clr */
-#define E1000_GOTCH    0x04094  /* Good Octets TX Count High - R/clr */
-#define E1000_RNBC     0x040A0  /* RX No Buffers Count - R/clr */
-#define E1000_RUC      0x040A4  /* RX Undersize Count - R/clr */
-#define E1000_RFC      0x040A8  /* RX Fragment Count - R/clr */
-#define E1000_ROC      0x040AC  /* RX Oversize Count - R/clr */
-#define E1000_RJC      0x040B0  /* RX Jabber Count - R/clr */
-#define E1000_MGTPRC   0x040B4  /* Management Packets RX Count - R/clr */
-#define E1000_MGTPDC   0x040B8  /* Management Packets Dropped Count - R/clr */
-#define E1000_MGTPTC   0x040BC  /* Management Packets TX Count - R/clr */
-#define E1000_TORL     0x040C0  /* Total Octets RX Low - R/clr */
-#define E1000_TORH     0x040C4  /* Total Octets RX High - R/clr */
-#define E1000_TOTL     0x040C8  /* Total Octets TX Low - R/clr */
-#define E1000_TOTH     0x040CC  /* Total Octets TX High - R/clr */
-#define E1000_TPR      0x040D0  /* Total Packets RX - R/clr */
-#define E1000_TPT      0x040D4  /* Total Packets TX - R/clr */
-#define E1000_PTC64    0x040D8  /* Packets TX (64 bytes) - R/clr */
-#define E1000_PTC127   0x040DC  /* Packets TX (65-127 bytes) - R/clr */
-#define E1000_PTC255   0x040E0  /* Packets TX (128-255 bytes) - R/clr */
-#define E1000_PTC511   0x040E4  /* Packets TX (256-511 bytes) - R/clr */
-#define E1000_PTC1023  0x040E8  /* Packets TX (512-1023 bytes) - R/clr */
-#define E1000_PTC1522  0x040EC  /* Packets TX (1024-1522 Bytes) - R/clr */
-#define E1000_MPTC     0x040F0  /* Multicast Packets TX Count - R/clr */
-#define E1000_BPTC     0x040F4  /* Broadcast Packets TX Count - R/clr */
-#define E1000_TSCTC    0x040F8  /* TCP Segmentation Context TX - R/clr */
-#define E1000_TSCTFC   0x040FC  /* TCP Segmentation Context TX Fail - R/clr */
-#define E1000_IAC      0x04100  /* Interrupt Assertion Count */
-#define E1000_ICRXPTC  0x04104  /* Interrupt Cause Rx Packet Timer Expire 
Count */
-#define E1000_ICRXATC  0x04108  /* Interrupt Cause Rx Absolute Timer Expire 
Count */
-#define E1000_ICTXPTC  0x0410C  /* Interrupt Cause Tx Packet Timer Expire 
Count */
-#define E1000_ICTXATC  0x04110  /* Interrupt Cause Tx Absolute Timer Expire 
Count */
-#define E1000_ICTXQEC  0x04118  /* Interrupt Cause Tx Queue Empty Count */
-#define E1000_ICTXQMTC 0x0411C  /* Interrupt Cause Tx Queue Minimum Threshold 
Count */
-#define E1000_ICRXDMTC 0x04120  /* Interrupt Cause Rx Descriptor Minimum 
Threshold Count */
-#define E1000_ICRXOC   0x04124  /* Interrupt Cause Receiver Overrun Count */
-#define E1000_RXCSUM   0x05000  /* RX Checksum Control - RW */
-#define E1000_RFCTL    0x05008  /* Receive Filter Control*/
-#define E1000_MTA      0x05200  /* Multicast Table Array - RW Array */
-#define E1000_RA       0x05400  /* Receive Address - RW Array */
-#define E1000_VFTA     0x05600  /* VLAN Filter Table Array - RW Array */
-#define E1000_WUC      0x05800  /* Wakeup Control - RW */
-#define E1000_WUFC     0x05808  /* Wakeup Filter Control - RW */
-#define E1000_WUS      0x05810  /* Wakeup Status - RO */
-#define E1000_MANC     0x05820  /* Management Control - RW */
-#define E1000_IPAV     0x05838  /* IP Address Valid - RW */
-#define E1000_IP4AT    0x05840  /* IPv4 Address Table - RW Array */
-#define E1000_IP6AT    0x05880  /* IPv6 Address Table - RW Array */
-#define E1000_WUPL     0x05900  /* Wakeup Packet Length - RW */
-#define E1000_WUPM     0x05A00  /* Wakeup Packet Memory - RO A */
-#define E1000_FFLT     0x05F00  /* Flexible Filter Length Table - RW Array */
-#define E1000_HOST_IF  0x08800  /* Host Interface */
-#define E1000_FFMT     0x09000  /* Flexible Filter Mask Table - RW Array */
-#define E1000_FFVT     0x09800  /* Flexible Filter Value Table - RW Array */
-
-#define E1000_KUMCTRLSTA 0x00034 /* MAC-PHY interface - RW */
-#define E1000_MDPHYA     0x0003C  /* PHY address - RW */
-#define E1000_MANC2H     0x05860  /* Managment Control To Host - RW */
-#define E1000_SW_FW_SYNC 0x05B5C /* Software-Firmware Synchronization - RW */
-
-#define E1000_GCR       0x05B00 /* PCI-Ex Control */
-#define E1000_GSCL_1    0x05B10 /* PCI-Ex Statistic Control #1 */
-#define E1000_GSCL_2    0x05B14 /* PCI-Ex Statistic Control #2 */
-#define E1000_GSCL_3    0x05B18 /* PCI-Ex Statistic Control #3 */
-#define E1000_GSCL_4    0x05B1C /* PCI-Ex Statistic Control #4 */
-#define E1000_FACTPS    0x05B30 /* Function Active and Power State to MNG */
-#define E1000_SWSM      0x05B50 /* SW Semaphore */
-#define E1000_FWSM      0x05B54 /* FW Semaphore */
-#define E1000_FFLT_DBG  0x05F04 /* Debug Register */
-#define E1000_HICR      0x08F00 /* Host Inteface Control */
-
-/* RSS registers */
-#define E1000_CPUVEC    0x02C10 /* CPU Vector Register - RW */
-#define E1000_MRQC      0x05818 /* Multiple Receive Control - RW */
-#define E1000_RETA      0x05C00 /* Redirection Table - RW Array */
-#define E1000_RSSRK     0x05C80 /* RSS Random Key - RW Array */
-#define E1000_RSSIM     0x05864 /* RSS Interrupt Mask */
-#define E1000_RSSIR     0x05868 /* RSS Interrupt Request */
-/* Register Set (82542)
- *
- * Some of the 82542 registers are located at different offsets than they are
- * in more current versions of the 8254x. Despite the difference in location,
- * the registers function in the same manner.
- */
-#define E1000_82542_CTRL     E1000_CTRL
-#define E1000_82542_CTRL_DUP E1000_CTRL_DUP
-#define E1000_82542_STATUS   E1000_STATUS
-#define E1000_82542_EECD     E1000_EECD
-#define E1000_82542_EERD     E1000_EERD
-#define E1000_82542_CTRL_EXT E1000_CTRL_EXT
-#define E1000_82542_FLA      E1000_FLA
-#define E1000_82542_MDIC     E1000_MDIC
-#define E1000_82542_SCTL     E1000_SCTL
-#define E1000_82542_FEXTNVM  E1000_FEXTNVM
-#define E1000_82542_FCAL     E1000_FCAL
-#define E1000_82542_FCAH     E1000_FCAH
-#define E1000_82542_FCT      E1000_FCT
-#define E1000_82542_VET      E1000_VET
-#define E1000_82542_RA       0x00040
-#define E1000_82542_ICR      E1000_ICR
-#define E1000_82542_ITR      E1000_ITR
-#define E1000_82542_ICS      E1000_ICS
-#define E1000_82542_IMS      E1000_IMS
-#define E1000_82542_IMC      E1000_IMC
-#define E1000_82542_RCTL     E1000_RCTL
-#define E1000_82542_RDTR     0x00108
-#define E1000_82542_RDBAL    0x00110
-#define E1000_82542_RDBAH    0x00114
-#define E1000_82542_RDLEN    0x00118
-#define E1000_82542_RDH      0x00120
-#define E1000_82542_RDT      0x00128
-#define E1000_82542_RDTR0    E1000_82542_RDTR
-#define E1000_82542_RDBAL0   E1000_82542_RDBAL
-#define E1000_82542_RDBAH0   E1000_82542_RDBAH
-#define E1000_82542_RDLEN0   E1000_82542_RDLEN
-#define E1000_82542_RDH0     E1000_82542_RDH
-#define E1000_82542_RDT0     E1000_82542_RDT
-#define E1000_82542_SRRCTL(_n) (0x280C + ((_n) << 8)) /* Split and Replication
-                                                       * RX Control - RW */
-#define E1000_82542_DCA_RXCTRL(_n) (0x02814 + ((_n) << 8))
-#define E1000_82542_RDBAH3   0x02B04 /* RX Desc Base High Queue 3 - RW */
-#define E1000_82542_RDBAL3   0x02B00 /* RX Desc Low Queue 3 - RW */
-#define E1000_82542_RDLEN3   0x02B08 /* RX Desc Length Queue 3 - RW */
-#define E1000_82542_RDH3     0x02B10 /* RX Desc Head Queue 3 - RW */
-#define E1000_82542_RDT3     0x02B18 /* RX Desc Tail Queue 3 - RW */
-#define E1000_82542_RDBAL2   0x02A00 /* RX Desc Base Low Queue 2 - RW */
-#define E1000_82542_RDBAH2   0x02A04 /* RX Desc Base High Queue 2 - RW */
-#define E1000_82542_RDLEN2   0x02A08 /* RX Desc Length Queue 2 - RW */
-#define E1000_82542_RDH2     0x02A10 /* RX Desc Head Queue 2 - RW */
-#define E1000_82542_RDT2     0x02A18 /* RX Desc Tail Queue 2 - RW */
-#define E1000_82542_RDTR1    0x00130
-#define E1000_82542_RDBAL1   0x00138
-#define E1000_82542_RDBAH1   0x0013C
-#define E1000_82542_RDLEN1   0x00140
-#define E1000_82542_RDH1     0x00148
-#define E1000_82542_RDT1     0x00150
-#define E1000_82542_FCRTH    0x00160
-#define E1000_82542_FCRTL    0x00168
-#define E1000_82542_FCTTV    E1000_FCTTV
-#define E1000_82542_TXCW     E1000_TXCW
-#define E1000_82542_RXCW     E1000_RXCW
-#define E1000_82542_MTA      0x00200
-#define E1000_82542_TCTL     E1000_TCTL
-#define E1000_82542_TCTL_EXT E1000_TCTL_EXT
-#define E1000_82542_TIPG     E1000_TIPG
-#define E1000_82542_TDBAL    0x00420
-#define E1000_82542_TDBAH    0x00424
-#define E1000_82542_TDLEN    0x00428
-#define E1000_82542_TDH      0x00430
-#define E1000_82542_TDT      0x00438
-#define E1000_82542_TIDV     0x00440
-#define E1000_82542_TBT      E1000_TBT
-#define E1000_82542_AIT      E1000_AIT
-#define E1000_82542_VFTA     0x00600
-#define E1000_82542_LEDCTL   E1000_LEDCTL
-#define E1000_82542_PBA      E1000_PBA
-#define E1000_82542_PBS      E1000_PBS
-#define E1000_82542_EEMNGCTL E1000_EEMNGCTL
-#define E1000_82542_EEARBC   E1000_EEARBC
-#define E1000_82542_FLASHT   E1000_FLASHT
-#define E1000_82542_EEWR     E1000_EEWR
-#define E1000_82542_FLSWCTL  E1000_FLSWCTL
-#define E1000_82542_FLSWDATA E1000_FLSWDATA
-#define E1000_82542_FLSWCNT  E1000_FLSWCNT
-#define E1000_82542_FLOP     E1000_FLOP
-#define E1000_82542_EXTCNF_CTRL  E1000_EXTCNF_CTRL
-#define E1000_82542_EXTCNF_SIZE  E1000_EXTCNF_SIZE
-#define E1000_82542_PHY_CTRL E1000_PHY_CTRL
-#define E1000_82542_ERT      E1000_ERT
-#define E1000_82542_RXDCTL   E1000_RXDCTL
-#define E1000_82542_RXDCTL1  E1000_RXDCTL1
-#define E1000_82542_RADV     E1000_RADV
-#define E1000_82542_RSRPD    E1000_RSRPD
-#define E1000_82542_TXDMAC   E1000_TXDMAC
-#define E1000_82542_KABGTXD  E1000_KABGTXD
-#define E1000_82542_TDFHS    E1000_TDFHS
-#define E1000_82542_TDFTS    E1000_TDFTS
-#define E1000_82542_TDFPC    E1000_TDFPC
-#define E1000_82542_TXDCTL   E1000_TXDCTL
-#define E1000_82542_TADV     E1000_TADV
-#define E1000_82542_TSPMT    E1000_TSPMT
-#define E1000_82542_CRCERRS  E1000_CRCERRS
-#define E1000_82542_ALGNERRC E1000_ALGNERRC
-#define E1000_82542_SYMERRS  E1000_SYMERRS
-#define E1000_82542_RXERRC   E1000_RXERRC
-#define E1000_82542_MPC      E1000_MPC
-#define E1000_82542_SCC      E1000_SCC
-#define E1000_82542_ECOL     E1000_ECOL
-#define E1000_82542_MCC      E1000_MCC
-#define E1000_82542_LATECOL  E1000_LATECOL
-#define E1000_82542_COLC     E1000_COLC
-#define E1000_82542_DC       E1000_DC
-#define E1000_82542_TNCRS    E1000_TNCRS
-#define E1000_82542_SEC      E1000_SEC
-#define E1000_82542_CEXTERR  E1000_CEXTERR
-#define E1000_82542_RLEC     E1000_RLEC
-#define E1000_82542_XONRXC   E1000_XONRXC
-#define E1000_82542_XONTXC   E1000_XONTXC
-#define E1000_82542_XOFFRXC  E1000_XOFFRXC
-#define E1000_82542_XOFFTXC  E1000_XOFFTXC
-#define E1000_82542_FCRUC    E1000_FCRUC
-#define E1000_82542_PRC64    E1000_PRC64
-#define E1000_82542_PRC127   E1000_PRC127
-#define E1000_82542_PRC255   E1000_PRC255
-#define E1000_82542_PRC511   E1000_PRC511
-#define E1000_82542_PRC1023  E1000_PRC1023
-#define E1000_82542_PRC1522  E1000_PRC1522
-#define E1000_82542_GPRC     E1000_GPRC
-#define E1000_82542_BPRC     E1000_BPRC
-#define E1000_82542_MPRC     E1000_MPRC
-#define E1000_82542_GPTC     E1000_GPTC
-#define E1000_82542_GORCL    E1000_GORCL
-#define E1000_82542_GORCH    E1000_GORCH
-#define E1000_82542_GOTCL    E1000_GOTCL
-#define E1000_82542_GOTCH    E1000_GOTCH
-#define E1000_82542_RNBC     E1000_RNBC
-#define E1000_82542_RUC      E1000_RUC
-#define E1000_82542_RFC      E1000_RFC
-#define E1000_82542_ROC      E1000_ROC
-#define E1000_82542_RJC      E1000_RJC
-#define E1000_82542_MGTPRC   E1000_MGTPRC
-#define E1000_82542_MGTPDC   E1000_MGTPDC
-#define E1000_82542_MGTPTC   E1000_MGTPTC
-#define E1000_82542_TORL     E1000_TORL
-#define E1000_82542_TORH     E1000_TORH
-#define E1000_82542_TOTL     E1000_TOTL
-#define E1000_82542_TOTH     E1000_TOTH
-#define E1000_82542_TPR      E1000_TPR
-#define E1000_82542_TPT      E1000_TPT
-#define E1000_82542_PTC64    E1000_PTC64
-#define E1000_82542_PTC127   E1000_PTC127
-#define E1000_82542_PTC255   E1000_PTC255
-#define E1000_82542_PTC511   E1000_PTC511
-#define E1000_82542_PTC1023  E1000_PTC1023
-#define E1000_82542_PTC1522  E1000_PTC1522
-#define E1000_82542_MPTC     E1000_MPTC
-#define E1000_82542_BPTC     E1000_BPTC
-#define E1000_82542_TSCTC    E1000_TSCTC
-#define E1000_82542_TSCTFC   E1000_TSCTFC
-#define E1000_82542_RXCSUM   E1000_RXCSUM
-#define E1000_82542_WUC      E1000_WUC
-#define E1000_82542_WUFC     E1000_WUFC
-#define E1000_82542_WUS      E1000_WUS
-#define E1000_82542_MANC     E1000_MANC
-#define E1000_82542_IPAV     E1000_IPAV
-#define E1000_82542_IP4AT    E1000_IP4AT
-#define E1000_82542_IP6AT    E1000_IP6AT
-#define E1000_82542_WUPL     E1000_WUPL
-#define E1000_82542_WUPM     E1000_WUPM
-#define E1000_82542_FFLT     E1000_FFLT
-#define E1000_82542_TDFH     0x08010
-#define E1000_82542_TDFT     0x08018
-#define E1000_82542_FFMT     E1000_FFMT
-#define E1000_82542_FFVT     E1000_FFVT
-#define E1000_82542_HOST_IF  E1000_HOST_IF
-#define E1000_82542_IAM         E1000_IAM
-#define E1000_82542_EEMNGCTL    E1000_EEMNGCTL
-#define E1000_82542_PSRCTL      E1000_PSRCTL
-#define E1000_82542_RAID        E1000_RAID
-#define E1000_82542_TARC0       E1000_TARC0
-#define E1000_82542_TDBAL1      E1000_TDBAL1
-#define E1000_82542_TDBAH1      E1000_TDBAH1
-#define E1000_82542_TDLEN1      E1000_TDLEN1
-#define E1000_82542_TDH1        E1000_TDH1
-#define E1000_82542_TDT1        E1000_TDT1
-#define E1000_82542_TXDCTL1     E1000_TXDCTL1
-#define E1000_82542_TARC1       E1000_TARC1
-#define E1000_82542_RFCTL       E1000_RFCTL
-#define E1000_82542_GCR         E1000_GCR
-#define E1000_82542_GSCL_1      E1000_GSCL_1
-#define E1000_82542_GSCL_2      E1000_GSCL_2
-#define E1000_82542_GSCL_3      E1000_GSCL_3
-#define E1000_82542_GSCL_4      E1000_GSCL_4
-#define E1000_82542_FACTPS      E1000_FACTPS
-#define E1000_82542_SWSM        E1000_SWSM
-#define E1000_82542_FWSM        E1000_FWSM
-#define E1000_82542_FFLT_DBG    E1000_FFLT_DBG
-#define E1000_82542_IAC         E1000_IAC
-#define E1000_82542_ICRXPTC     E1000_ICRXPTC
-#define E1000_82542_ICRXATC     E1000_ICRXATC
-#define E1000_82542_ICTXPTC     E1000_ICTXPTC
-#define E1000_82542_ICTXATC     E1000_ICTXATC
-#define E1000_82542_ICTXQEC     E1000_ICTXQEC
-#define E1000_82542_ICTXQMTC    E1000_ICTXQMTC
-#define E1000_82542_ICRXDMTC    E1000_ICRXDMTC
-#define E1000_82542_ICRXOC      E1000_ICRXOC
-#define E1000_82542_HICR        E1000_HICR
-
-#define E1000_82542_CPUVEC      E1000_CPUVEC
-#define E1000_82542_MRQC        E1000_MRQC
-#define E1000_82542_RETA        E1000_RETA
-#define E1000_82542_RSSRK       E1000_RSSRK
-#define E1000_82542_RSSIM       E1000_RSSIM
-#define E1000_82542_RSSIR       E1000_RSSIR
-#define E1000_82542_KUMCTRLSTA E1000_KUMCTRLSTA
-#define E1000_82542_SW_FW_SYNC E1000_SW_FW_SYNC
-#define E1000_82542_MANC2H      E1000_MANC2H
-
-/* Statistics counters collected by the MAC */
-struct e1000_hw_stats {
-       u64             crcerrs;
-       u64             algnerrc;
-       u64             symerrs;
-       u64             rxerrc;
-       u64             txerrc;
-       u64             mpc;
-       u64             scc;
-       u64             ecol;
-       u64             mcc;
-       u64             latecol;
-       u64             colc;
-       u64             dc;
-       u64             tncrs;
-       u64             sec;
-       u64             cexterr;
-       u64             rlec;
-       u64             xonrxc;
-       u64             xontxc;
-       u64             xoffrxc;
-       u64             xofftxc;
-       u64             fcruc;
-       u64             prc64;
-       u64             prc127;
-       u64             prc255;
-       u64             prc511;
-       u64             prc1023;
-       u64             prc1522;
-       u64             gprc;
-       u64             bprc;
-       u64             mprc;
-       u64             gptc;
-       u64             gorcl;
-       u64             gorch;
-       u64             gotcl;
-       u64             gotch;
-       u64             rnbc;
-       u64             ruc;
-       u64             rfc;
-       u64             roc;
-       u64             rlerrc;
-       u64             rjc;
-       u64             mgprc;
-       u64             mgpdc;
-       u64             mgptc;
-       u64             torl;
-       u64             torh;
-       u64             totl;
-       u64             toth;
-       u64             tpr;
-       u64             tpt;
-       u64             ptc64;
-       u64             ptc127;
-       u64             ptc255;
-       u64             ptc511;
-       u64             ptc1023;
-       u64             ptc1522;
-       u64             mptc;
-       u64             bptc;
-       u64             tsctc;
-       u64             tsctfc;
-       u64             iac;
-       u64             icrxptc;
-       u64             icrxatc;
-       u64             ictxptc;
-       u64             ictxatc;
-       u64             ictxqec;
-       u64             ictxqmtc;
-       u64             icrxdmtc;
-       u64             icrxoc;
-};
-
-/* Structure containing variables used by the shared code (e1000_hw.c) */
-struct e1000_hw {
-       u8 __iomem              *hw_addr;
-       u8 __iomem              *flash_address;
-       e1000_mac_type          mac_type;
-       e1000_phy_type          phy_type;
-       u32             phy_init_script;
-       e1000_media_type        media_type;
-       void                    *back;
-       struct e1000_shadow_ram *eeprom_shadow_ram;
-       u32             flash_bank_size;
-       u32             flash_base_addr;
-       e1000_fc_type           fc;
-       e1000_bus_speed         bus_speed;
-       e1000_bus_width         bus_width;
-       e1000_bus_type          bus_type;
-       struct e1000_eeprom_info eeprom;
-       e1000_ms_type           master_slave;
-       e1000_ms_type           original_master_slave;
-       e1000_ffe_config        ffe_config_state;
-       u32             asf_firmware_present;
-       u32             eeprom_semaphore_present;
-       u32             swfw_sync_present;
-       u32             swfwhw_semaphore_present;
-       unsigned long           io_base;
-       u32             phy_id;
-       u32             phy_revision;
-       u32             phy_addr;
-       u32             original_fc;
-       u32             txcw;
-       u32             autoneg_failed;
-       u32             max_frame_size;
-       u32             min_frame_size;
-       u32             mc_filter_type;
-       u32             num_mc_addrs;
-       u32             collision_delta;
-       u32             tx_packet_delta;
-       u32             ledctl_default;
-       u32             ledctl_mode1;
-       u32             ledctl_mode2;
-       bool                    tx_pkt_filtering;
-       struct e1000_host_mng_dhcp_cookie mng_cookie;
-       u16             phy_spd_default;
-       u16             autoneg_advertised;
-       u16             pci_cmd_word;
-       u16             fc_high_water;
-       u16             fc_low_water;
-       u16             fc_pause_time;
-       u16             current_ifs_val;
-       u16             ifs_min_val;
-       u16             ifs_max_val;
-       u16             ifs_step_size;
-       u16             ifs_ratio;
-       u16             device_id;
-       u16             vendor_id;
-       u16             subsystem_id;
-       u16             subsystem_vendor_id;
-       u8                      revision_id;
-       u8                      autoneg;
-       u8                      mdix;
-       u8                      forced_speed_duplex;
-       u8                      wait_autoneg_complete;
-       u8                      dma_fairness;
-       u8                      mac_addr[NODE_ADDRESS_SIZE];
-       u8                      perm_mac_addr[NODE_ADDRESS_SIZE];
-       bool                    disable_polarity_correction;
-       bool                    speed_downgraded;
-       e1000_smart_speed       smart_speed;
-       e1000_dsp_config        dsp_config_state;
-       bool                    get_link_status;
-       bool                    serdes_link_down;
-       bool                    tbi_compatibility_en;
-       bool                    tbi_compatibility_on;
-       bool                    laa_is_present;
-       bool                    phy_reset_disable;
-       bool                    initialize_hw_bits_disable;
-       bool                    fc_send_xon;
-       bool                    fc_strict_ieee;
-       bool                    report_tx_early;
-       bool                    adaptive_ifs;
-       bool                    ifs_params_forced;
-       bool                    in_ifs_mode;
-       bool                    mng_reg_access_disabled;
-       bool                    leave_av_bit_off;
-       bool                    kmrn_lock_loss_workaround_disabled;
-       bool                    bad_tx_carr_stats_fd;
-       bool                    has_manc2h;
-       bool                    rx_needs_kicking;
-       bool                    has_smbus;
-};
-
-
-#define E1000_EEPROM_SWDPIN0   0x0001   /* SWDPIN 0 EEPROM Value */
-#define E1000_EEPROM_LED_LOGIC 0x0020   /* Led Logic Word */
-#define E1000_EEPROM_RW_REG_DATA   16   /* Offset to data in EEPROM read/write 
registers */
-#define E1000_EEPROM_RW_REG_DONE   2    /* Offset to READ/WRITE done bit */
-#define E1000_EEPROM_RW_REG_START  1    /* First bit for telling part to start 
operation */
-#define E1000_EEPROM_RW_ADDR_SHIFT 2    /* Shift to the address bits */
-#define E1000_EEPROM_POLL_WRITE    1    /* Flag for polling for write complete 
*/
-#define E1000_EEPROM_POLL_READ     0    /* Flag for polling for read complete 
*/
-/* Register Bit Masks */
-/* Device Control */
-#define E1000_CTRL_FD       0x00000001  /* Full duplex.0=half; 1=full */
-#define E1000_CTRL_BEM      0x00000002  /* Endian Mode.0=little,1=big */
-#define E1000_CTRL_PRIOR    0x00000004  /* Priority on PCI. 0=rx,1=fair */
-#define E1000_CTRL_GIO_MASTER_DISABLE 0x00000004 /*Blocks new Master requests 
*/
-#define E1000_CTRL_LRST     0x00000008  /* Link reset. 0=normal,1=reset */
-#define E1000_CTRL_TME      0x00000010  /* Test mode. 0=normal,1=test */
-#define E1000_CTRL_SLE      0x00000020  /* Serial Link on 0=dis,1=en */
-#define E1000_CTRL_ASDE     0x00000020  /* Auto-speed detect enable */
-#define E1000_CTRL_SLU      0x00000040  /* Set link up (Force Link) */
-#define E1000_CTRL_ILOS     0x00000080  /* Invert Loss-Of Signal */
-#define E1000_CTRL_SPD_SEL  0x00000300  /* Speed Select Mask */
-#define E1000_CTRL_SPD_10   0x00000000  /* Force 10Mb */
-#define E1000_CTRL_SPD_100  0x00000100  /* Force 100Mb */
-#define E1000_CTRL_SPD_1000 0x00000200  /* Force 1Gb */
-#define E1000_CTRL_BEM32    0x00000400  /* Big Endian 32 mode */
-#define E1000_CTRL_FRCSPD   0x00000800  /* Force Speed */
-#define E1000_CTRL_FRCDPX   0x00001000  /* Force Duplex */
-#define E1000_CTRL_D_UD_EN  0x00002000  /* Dock/Undock enable */
-#define E1000_CTRL_D_UD_POLARITY 0x00004000 /* Defined polarity of Dock/Undock 
indication in SDP[0] */
-#define E1000_CTRL_FORCE_PHY_RESET 0x00008000 /* Reset both PHY ports, through 
PHYRST_N pin */
-#define E1000_CTRL_EXT_LINK_EN 0x00010000 /* enable link status from external 
LINK_0 and LINK_1 pins */
-#define E1000_CTRL_SWDPIN0  0x00040000  /* SWDPIN 0 value */
-#define E1000_CTRL_SWDPIN1  0x00080000  /* SWDPIN 1 value */
-#define E1000_CTRL_SWDPIN2  0x00100000  /* SWDPIN 2 value */
-#define E1000_CTRL_SWDPIN3  0x00200000  /* SWDPIN 3 value */
-#define E1000_CTRL_SWDPIO0  0x00400000  /* SWDPIN 0 Input or output */
-#define E1000_CTRL_SWDPIO1  0x00800000  /* SWDPIN 1 input or output */
-#define E1000_CTRL_SWDPIO2  0x01000000  /* SWDPIN 2 input or output */
-#define E1000_CTRL_SWDPIO3  0x02000000  /* SWDPIN 3 input or output */
-#define E1000_CTRL_RST      0x04000000  /* Global reset */
-#define E1000_CTRL_RFCE     0x08000000  /* Receive Flow Control enable */
-#define E1000_CTRL_TFCE     0x10000000  /* Transmit flow control enable */
-#define E1000_CTRL_RTE      0x20000000  /* Routing tag enable */
-#define E1000_CTRL_VME      0x40000000  /* IEEE VLAN mode enable */
-#define E1000_CTRL_PHY_RST  0x80000000  /* PHY Reset */
-#define E1000_CTRL_SW2FW_INT 0x02000000  /* Initiate an interrupt to 
manageability engine */
-
-/* Device Status */
-#define E1000_STATUS_FD         0x00000001      /* Full duplex.0=half,1=full */
-#define E1000_STATUS_LU         0x00000002      /* Link up.0=no,1=link */
-#define E1000_STATUS_FUNC_MASK  0x0000000C      /* PCI Function Mask */
-#define E1000_STATUS_FUNC_SHIFT 2
-#define E1000_STATUS_FUNC_0     0x00000000      /* Function 0 */
-#define E1000_STATUS_FUNC_1     0x00000004      /* Function 1 */
-#define E1000_STATUS_TXOFF      0x00000010      /* transmission paused */
-#define E1000_STATUS_TBIMODE    0x00000020      /* TBI mode */
-#define E1000_STATUS_SPEED_MASK 0x000000C0
-#define E1000_STATUS_SPEED_10   0x00000000      /* Speed 10Mb/s */
-#define E1000_STATUS_SPEED_100  0x00000040      /* Speed 100Mb/s */
-#define E1000_STATUS_SPEED_1000 0x00000080      /* Speed 1000Mb/s */
-#define E1000_STATUS_LAN_INIT_DONE 0x00000200   /* Lan Init Completion
-                                                   by EEPROM/Flash */
-#define E1000_STATUS_ASDV       0x00000300      /* Auto speed detect value */
-#define E1000_STATUS_DOCK_CI    0x00000800      /* Change in Dock/Undock 
state. Clear on write '0'. */
-#define E1000_STATUS_GIO_MASTER_ENABLE 0x00080000 /* Status of Master 
requests. */
-#define E1000_STATUS_MTXCKOK    0x00000400      /* MTX clock running OK */
-#define E1000_STATUS_PCI66      0x00000800      /* In 66Mhz slot */
-#define E1000_STATUS_BUS64      0x00001000      /* In 64 bit slot */
-#define E1000_STATUS_PCIX_MODE  0x00002000      /* PCI-X mode */
-#define E1000_STATUS_PCIX_SPEED 0x0000C000      /* PCI-X bus speed */
-#define E1000_STATUS_BMC_SKU_0  0x00100000 /* BMC USB redirect disabled */
-#define E1000_STATUS_BMC_SKU_1  0x00200000 /* BMC SRAM disabled */
-#define E1000_STATUS_BMC_SKU_2  0x00400000 /* BMC SDRAM disabled */
-#define E1000_STATUS_BMC_CRYPTO 0x00800000 /* BMC crypto disabled */
-#define E1000_STATUS_BMC_LITE   0x01000000 /* BMC external code execution 
disabled */
-#define E1000_STATUS_RGMII_ENABLE 0x02000000 /* RGMII disabled */
-#define E1000_STATUS_FUSE_8       0x04000000
-#define E1000_STATUS_FUSE_9       0x08000000
-#define E1000_STATUS_SERDES0_DIS  0x10000000 /* SERDES disabled on port 0 */
-#define E1000_STATUS_SERDES1_DIS  0x20000000 /* SERDES disabled on port 1 */
-
-/* Constants used to intrepret the masked PCI-X bus speed. */
-#define E1000_STATUS_PCIX_SPEED_66  0x00000000 /* PCI-X bus speed  50-66 MHz */
-#define E1000_STATUS_PCIX_SPEED_100 0x00004000 /* PCI-X bus speed  66-100 MHz 
*/
-#define E1000_STATUS_PCIX_SPEED_133 0x00008000 /* PCI-X bus speed 100-133 MHz 
*/
-
-/* EEPROM/Flash Control */
-#define E1000_EECD_SK        0x00000001 /* EEPROM Clock */
-#define E1000_EECD_CS        0x00000002 /* EEPROM Chip Select */
-#define E1000_EECD_DI        0x00000004 /* EEPROM Data In */
-#define E1000_EECD_DO        0x00000008 /* EEPROM Data Out */
-#define E1000_EECD_FWE_MASK  0x00000030
-#define E1000_EECD_FWE_DIS   0x00000010 /* Disable FLASH writes */
-#define E1000_EECD_FWE_EN    0x00000020 /* Enable FLASH writes */
-#define E1000_EECD_FWE_SHIFT 4
-#define E1000_EECD_REQ       0x00000040 /* EEPROM Access Request */
-#define E1000_EECD_GNT       0x00000080 /* EEPROM Access Grant */
-#define E1000_EECD_PRES      0x00000100 /* EEPROM Present */
-#define E1000_EECD_SIZE      0x00000200 /* EEPROM Size (0=64 word 1=256 word) 
*/
-#define E1000_EECD_ADDR_BITS 0x00000400 /* EEPROM Addressing bits based on type
-                                         * (0-small, 1-large) */
-#define E1000_EECD_TYPE      0x00002000 /* EEPROM Type (1-SPI, 0-Microwire) */
-#ifndef E1000_EEPROM_GRANT_ATTEMPTS
-#define E1000_EEPROM_GRANT_ATTEMPTS 1000 /* EEPROM # attempts to gain grant */
-#endif
-#define E1000_EECD_AUTO_RD          0x00000200  /* EEPROM Auto Read done */
-#define E1000_EECD_SIZE_EX_MASK     0x00007800  /* EEprom Size */
-#define E1000_EECD_SIZE_EX_SHIFT    11
-#define E1000_EECD_NVADDS    0x00018000 /* NVM Address Size */
-#define E1000_EECD_SELSHAD   0x00020000 /* Select Shadow RAM */
-#define E1000_EECD_INITSRAM  0x00040000 /* Initialize Shadow RAM */
-#define E1000_EECD_FLUPD     0x00080000 /* Update FLASH */
-#define E1000_EECD_AUPDEN    0x00100000 /* Enable Autonomous FLASH update */
-#define E1000_EECD_SHADV     0x00200000 /* Shadow RAM Data Valid */
-#define E1000_EECD_SEC1VAL   0x00400000 /* Sector One Valid */
-#define E1000_EECD_SECVAL_SHIFT      22
-#define E1000_STM_OPCODE     0xDB00
-#define E1000_HICR_FW_RESET  0xC0
-
-#define E1000_SHADOW_RAM_WORDS     2048
-#define E1000_ICH_NVM_SIG_WORD     0x13
-#define E1000_ICH_NVM_SIG_MASK     0xC0
-
-/* EEPROM Read */
-#define E1000_EERD_START      0x00000001 /* Start Read */
-#define E1000_EERD_DONE       0x00000010 /* Read Done */
-#define E1000_EERD_ADDR_SHIFT 8
-#define E1000_EERD_ADDR_MASK  0x0000FF00 /* Read Address */
-#define E1000_EERD_DATA_SHIFT 16
-#define E1000_EERD_DATA_MASK  0xFFFF0000 /* Read Data */
-
-/* SPI EEPROM Status Register */
-#define EEPROM_STATUS_RDY_SPI  0x01
-#define EEPROM_STATUS_WEN_SPI  0x02
-#define EEPROM_STATUS_BP0_SPI  0x04
-#define EEPROM_STATUS_BP1_SPI  0x08
-#define EEPROM_STATUS_WPEN_SPI 0x80
-
-/* Extended Device Control */
-#define E1000_CTRL_EXT_GPI0_EN   0x00000001 /* Maps SDP4 to GPI0 */
-#define E1000_CTRL_EXT_GPI1_EN   0x00000002 /* Maps SDP5 to GPI1 */
-#define E1000_CTRL_EXT_PHYINT_EN E1000_CTRL_EXT_GPI1_EN
-#define E1000_CTRL_EXT_GPI2_EN   0x00000004 /* Maps SDP6 to GPI2 */
-#define E1000_CTRL_EXT_GPI3_EN   0x00000008 /* Maps SDP7 to GPI3 */
-#define E1000_CTRL_EXT_SDP4_DATA 0x00000010 /* Value of SW Defineable Pin 4 */
-#define E1000_CTRL_EXT_SDP5_DATA 0x00000020 /* Value of SW Defineable Pin 5 */
-#define E1000_CTRL_EXT_PHY_INT   E1000_CTRL_EXT_SDP5_DATA
-#define E1000_CTRL_EXT_SDP6_DATA 0x00000040 /* Value of SW Defineable Pin 6 */
-#define E1000_CTRL_EXT_SDP7_DATA 0x00000080 /* Value of SW Defineable Pin 7 */
-#define E1000_CTRL_EXT_SDP4_DIR  0x00000100 /* Direction of SDP4 0=in 1=out */
-#define E1000_CTRL_EXT_SDP5_DIR  0x00000200 /* Direction of SDP5 0=in 1=out */
-#define E1000_CTRL_EXT_SDP6_DIR  0x00000400 /* Direction of SDP6 0=in 1=out */
-#define E1000_CTRL_EXT_SDP7_DIR  0x00000800 /* Direction of SDP7 0=in 1=out */
-#define E1000_CTRL_EXT_ASDCHK    0x00001000 /* Initiate an ASD sequence */
-#define E1000_CTRL_EXT_EE_RST    0x00002000 /* Reinitialize from EEPROM */
-#define E1000_CTRL_EXT_IPS       0x00004000 /* Invert Power State */
-#define E1000_CTRL_EXT_SPD_BYPS  0x00008000 /* Speed Select Bypass */
-#define E1000_CTRL_EXT_RO_DIS    0x00020000 /* Relaxed Ordering disable */
-#define E1000_CTRL_EXT_LINK_MODE_MASK 0x00C00000
-#define E1000_CTRL_EXT_LINK_MODE_GMII 0x00000000
-#define E1000_CTRL_EXT_LINK_MODE_TBI  0x00C00000
-#define E1000_CTRL_EXT_LINK_MODE_KMRN 0x00000000
-#define E1000_CTRL_EXT_LINK_MODE_SERDES  0x00C00000
-#define E1000_CTRL_EXT_LINK_MODE_SGMII   0x00800000
-#define E1000_CTRL_EXT_WR_WMARK_MASK  0x03000000
-#define E1000_CTRL_EXT_WR_WMARK_256   0x00000000
-#define E1000_CTRL_EXT_WR_WMARK_320   0x01000000
-#define E1000_CTRL_EXT_WR_WMARK_384   0x02000000
-#define E1000_CTRL_EXT_WR_WMARK_448   0x03000000
-#define E1000_CTRL_EXT_DRV_LOAD       0x10000000 /* Driver loaded bit for FW */
-#define E1000_CTRL_EXT_IAME           0x08000000 /* Interrupt acknowledge 
Auto-mask */
-#define E1000_CTRL_EXT_INT_TIMER_CLR  0x20000000 /* Clear Interrupt timers 
after IMS clear */
-#define E1000_CRTL_EXT_PB_PAREN       0x01000000 /* packet buffer parity error 
detection enabled */
-#define E1000_CTRL_EXT_DF_PAREN       0x02000000 /* descriptor FIFO parity 
error detection enable */
-#define E1000_CTRL_EXT_GHOST_PAREN    0x40000000
-
-/* MDI Control */
-#define E1000_MDIC_DATA_MASK 0x0000FFFF
-#define E1000_MDIC_REG_MASK  0x001F0000
-#define E1000_MDIC_REG_SHIFT 16
-#define E1000_MDIC_PHY_MASK  0x03E00000
-#define E1000_MDIC_PHY_SHIFT 21
-#define E1000_MDIC_OP_WRITE  0x04000000
-#define E1000_MDIC_OP_READ   0x08000000
-#define E1000_MDIC_READY     0x10000000
-#define E1000_MDIC_INT_EN    0x20000000
-#define E1000_MDIC_ERROR     0x40000000
-
-#define E1000_KUMCTRLSTA_MASK           0x0000FFFF
-#define E1000_KUMCTRLSTA_OFFSET         0x001F0000
-#define E1000_KUMCTRLSTA_OFFSET_SHIFT   16
-#define E1000_KUMCTRLSTA_REN            0x00200000
-
-#define E1000_KUMCTRLSTA_OFFSET_FIFO_CTRL      0x00000000
-#define E1000_KUMCTRLSTA_OFFSET_CTRL           0x00000001
-#define E1000_KUMCTRLSTA_OFFSET_INB_CTRL       0x00000002
-#define E1000_KUMCTRLSTA_OFFSET_DIAG           0x00000003
-#define E1000_KUMCTRLSTA_OFFSET_TIMEOUTS       0x00000004
-#define E1000_KUMCTRLSTA_OFFSET_INB_PARAM      0x00000009
-#define E1000_KUMCTRLSTA_OFFSET_HD_CTRL        0x00000010
-#define E1000_KUMCTRLSTA_OFFSET_M2P_SERDES     0x0000001E
-#define E1000_KUMCTRLSTA_OFFSET_M2P_MODES      0x0000001F
-
-/* FIFO Control */
-#define E1000_KUMCTRLSTA_FIFO_CTRL_RX_BYPASS   0x00000008
-#define E1000_KUMCTRLSTA_FIFO_CTRL_TX_BYPASS   0x00000800
-
-/* In-Band Control */
-#define E1000_KUMCTRLSTA_INB_CTRL_LINK_STATUS_TX_TIMEOUT_DEFAULT    0x00000500
-#define E1000_KUMCTRLSTA_INB_CTRL_DIS_PADDING  0x00000010
-
-/* Half-Duplex Control */
-#define E1000_KUMCTRLSTA_HD_CTRL_10_100_DEFAULT 0x00000004
-#define E1000_KUMCTRLSTA_HD_CTRL_1000_DEFAULT  0x00000000
-
-#define E1000_KUMCTRLSTA_OFFSET_K0S_CTRL       0x0000001E
-
-#define E1000_KUMCTRLSTA_DIAG_FELPBK           0x2000
-#define E1000_KUMCTRLSTA_DIAG_NELPBK           0x1000
-
-#define E1000_KUMCTRLSTA_K0S_100_EN            0x2000
-#define E1000_KUMCTRLSTA_K0S_GBE_EN            0x1000
-#define E1000_KUMCTRLSTA_K0S_ENTRY_LATENCY_MASK   0x0003
-
-#define E1000_KABGTXD_BGSQLBIAS                0x00050000
-
-#define E1000_PHY_CTRL_SPD_EN                  0x00000001
-#define E1000_PHY_CTRL_D0A_LPLU                0x00000002
-#define E1000_PHY_CTRL_NOND0A_LPLU             0x00000004
-#define E1000_PHY_CTRL_NOND0A_GBE_DISABLE      0x00000008
-#define E1000_PHY_CTRL_GBE_DISABLE             0x00000040
-#define E1000_PHY_CTRL_B2B_EN                  0x00000080
-
-/* LED Control */
-#define E1000_LEDCTL_LED0_MODE_MASK       0x0000000F
-#define E1000_LEDCTL_LED0_MODE_SHIFT      0
-#define E1000_LEDCTL_LED0_BLINK_RATE      0x0000020
-#define E1000_LEDCTL_LED0_IVRT            0x00000040
-#define E1000_LEDCTL_LED0_BLINK           0x00000080
-#define E1000_LEDCTL_LED1_MODE_MASK       0x00000F00
-#define E1000_LEDCTL_LED1_MODE_SHIFT      8
-#define E1000_LEDCTL_LED1_BLINK_RATE      0x0002000
-#define E1000_LEDCTL_LED1_IVRT            0x00004000
-#define E1000_LEDCTL_LED1_BLINK           0x00008000
-#define E1000_LEDCTL_LED2_MODE_MASK       0x000F0000
-#define E1000_LEDCTL_LED2_MODE_SHIFT      16
-#define E1000_LEDCTL_LED2_BLINK_RATE      0x00200000
-#define E1000_LEDCTL_LED2_IVRT            0x00400000
-#define E1000_LEDCTL_LED2_BLINK           0x00800000
-#define E1000_LEDCTL_LED3_MODE_MASK       0x0F000000
-#define E1000_LEDCTL_LED3_MODE_SHIFT      24
-#define E1000_LEDCTL_LED3_BLINK_RATE      0x20000000
-#define E1000_LEDCTL_LED3_IVRT            0x40000000
-#define E1000_LEDCTL_LED3_BLINK           0x80000000
-
-#define E1000_LEDCTL_MODE_LINK_10_1000  0x0
-#define E1000_LEDCTL_MODE_LINK_100_1000 0x1
-#define E1000_LEDCTL_MODE_LINK_UP       0x2
-#define E1000_LEDCTL_MODE_ACTIVITY      0x3
-#define E1000_LEDCTL_MODE_LINK_ACTIVITY 0x4
-#define E1000_LEDCTL_MODE_LINK_10       0x5
-#define E1000_LEDCTL_MODE_LINK_100      0x6
-#define E1000_LEDCTL_MODE_LINK_1000     0x7
-#define E1000_LEDCTL_MODE_PCIX_MODE     0x8
-#define E1000_LEDCTL_MODE_FULL_DUPLEX   0x9
-#define E1000_LEDCTL_MODE_COLLISION     0xA
-#define E1000_LEDCTL_MODE_BUS_SPEED     0xB
-#define E1000_LEDCTL_MODE_BUS_SIZE      0xC
-#define E1000_LEDCTL_MODE_PAUSED        0xD
-#define E1000_LEDCTL_MODE_LED_ON        0xE
-#define E1000_LEDCTL_MODE_LED_OFF       0xF
-
-/* Receive Address */
-#define E1000_RAH_AV  0x80000000        /* Receive descriptor valid */
-
-/* Interrupt Cause Read */
-#define E1000_ICR_TXDW          0x00000001 /* Transmit desc written back */
-#define E1000_ICR_TXQE          0x00000002 /* Transmit Queue empty */
-#define E1000_ICR_LSC           0x00000004 /* Link Status Change */
-#define E1000_ICR_RXSEQ         0x00000008 /* rx sequence error */
-#define E1000_ICR_RXDMT0        0x00000010 /* rx desc min. threshold (0) */
-#define E1000_ICR_RXO           0x00000040 /* rx overrun */
-#define E1000_ICR_RXT0          0x00000080 /* rx timer intr (ring 0) */
-#define E1000_ICR_MDAC          0x00000200 /* MDIO access complete */
-#define E1000_ICR_RXCFG         0x00000400 /* RX /c/ ordered set */
-#define E1000_ICR_GPI_EN0       0x00000800 /* GP Int 0 */
-#define E1000_ICR_GPI_EN1       0x00001000 /* GP Int 1 */
-#define E1000_ICR_GPI_EN2       0x00002000 /* GP Int 2 */
-#define E1000_ICR_GPI_EN3       0x00004000 /* GP Int 3 */
-#define E1000_ICR_TXD_LOW       0x00008000
-#define E1000_ICR_SRPD          0x00010000
-#define E1000_ICR_ACK           0x00020000 /* Receive Ack frame */
-#define E1000_ICR_MNG           0x00040000 /* Manageability event */
-#define E1000_ICR_DOCK          0x00080000 /* Dock/Undock */
-#define E1000_ICR_INT_ASSERTED  0x80000000 /* If this bit asserted, the driver 
should claim the interrupt */
-#define E1000_ICR_RXD_FIFO_PAR0 0x00100000 /* queue 0 Rx descriptor FIFO 
parity error */
-#define E1000_ICR_TXD_FIFO_PAR0 0x00200000 /* queue 0 Tx descriptor FIFO 
parity error */
-#define E1000_ICR_HOST_ARB_PAR  0x00400000 /* host arb read buffer parity 
error */
-#define E1000_ICR_PB_PAR        0x00800000 /* packet buffer parity error */
-#define E1000_ICR_RXD_FIFO_PAR1 0x01000000 /* queue 1 Rx descriptor FIFO 
parity error */
-#define E1000_ICR_TXD_FIFO_PAR1 0x02000000 /* queue 1 Tx descriptor FIFO 
parity error */
-#define E1000_ICR_ALL_PARITY    0x03F00000 /* all parity error bits */
-#define E1000_ICR_DSW           0x00000020 /* FW changed the status of DISSW 
bit in the FWSM */
-#define E1000_ICR_PHYINT        0x00001000 /* LAN connected device generates 
an interrupt */
-#define E1000_ICR_EPRST         0x00100000 /* ME handware reset occurs */
-
-/* Interrupt Cause Set */
-#define E1000_ICS_TXDW      E1000_ICR_TXDW      /* Transmit desc written back 
*/
-#define E1000_ICS_TXQE      E1000_ICR_TXQE      /* Transmit Queue empty */
-#define E1000_ICS_LSC       E1000_ICR_LSC       /* Link Status Change */
-#define E1000_ICS_RXSEQ     E1000_ICR_RXSEQ     /* rx sequence error */
-#define E1000_ICS_RXDMT0    E1000_ICR_RXDMT0    /* rx desc min. threshold */
-#define E1000_ICS_RXO       E1000_ICR_RXO       /* rx overrun */
-#define E1000_ICS_RXT0      E1000_ICR_RXT0      /* rx timer intr */
-#define E1000_ICS_MDAC      E1000_ICR_MDAC      /* MDIO access complete */
-#define E1000_ICS_RXCFG     E1000_ICR_RXCFG     /* RX /c/ ordered set */
-#define E1000_ICS_GPI_EN0   E1000_ICR_GPI_EN0   /* GP Int 0 */
-#define E1000_ICS_GPI_EN1   E1000_ICR_GPI_EN1   /* GP Int 1 */
-#define E1000_ICS_GPI_EN2   E1000_ICR_GPI_EN2   /* GP Int 2 */
-#define E1000_ICS_GPI_EN3   E1000_ICR_GPI_EN3   /* GP Int 3 */
-#define E1000_ICS_TXD_LOW   E1000_ICR_TXD_LOW
-#define E1000_ICS_SRPD      E1000_ICR_SRPD
-#define E1000_ICS_ACK       E1000_ICR_ACK       /* Receive Ack frame */
-#define E1000_ICS_MNG       E1000_ICR_MNG       /* Manageability event */
-#define E1000_ICS_DOCK      E1000_ICR_DOCK      /* Dock/Undock */
-#define E1000_ICS_RXD_FIFO_PAR0 E1000_ICR_RXD_FIFO_PAR0 /* queue 0 Rx 
descriptor FIFO parity error */
-#define E1000_ICS_TXD_FIFO_PAR0 E1000_ICR_TXD_FIFO_PAR0 /* queue 0 Tx 
descriptor FIFO parity error */
-#define E1000_ICS_HOST_ARB_PAR  E1000_ICR_HOST_ARB_PAR  /* host arb read 
buffer parity error */
-#define E1000_ICS_PB_PAR        E1000_ICR_PB_PAR        /* packet buffer 
parity error */
-#define E1000_ICS_RXD_FIFO_PAR1 E1000_ICR_RXD_FIFO_PAR1 /* queue 1 Rx 
descriptor FIFO parity error */
-#define E1000_ICS_TXD_FIFO_PAR1 E1000_ICR_TXD_FIFO_PAR1 /* queue 1 Tx 
descriptor FIFO parity error */
-#define E1000_ICS_DSW       E1000_ICR_DSW
-#define E1000_ICS_PHYINT    E1000_ICR_PHYINT
-#define E1000_ICS_EPRST     E1000_ICR_EPRST
-
-/* Interrupt Mask Set */
-#define E1000_IMS_TXDW      E1000_ICR_TXDW      /* Transmit desc written back 
*/
-#define E1000_IMS_TXQE      E1000_ICR_TXQE      /* Transmit Queue empty */
-#define E1000_IMS_LSC       E1000_ICR_LSC       /* Link Status Change */
-#define E1000_IMS_RXSEQ     E1000_ICR_RXSEQ     /* rx sequence error */
-#define E1000_IMS_RXDMT0    E1000_ICR_RXDMT0    /* rx desc min. threshold */
-#define E1000_IMS_RXO       E1000_ICR_RXO       /* rx overrun */
-#define E1000_IMS_RXT0      E1000_ICR_RXT0      /* rx timer intr */
-#define E1000_IMS_MDAC      E1000_ICR_MDAC      /* MDIO access complete */
-#define E1000_IMS_RXCFG     E1000_ICR_RXCFG     /* RX /c/ ordered set */
-#define E1000_IMS_GPI_EN0   E1000_ICR_GPI_EN0   /* GP Int 0 */
-#define E1000_IMS_GPI_EN1   E1000_ICR_GPI_EN1   /* GP Int 1 */
-#define E1000_IMS_GPI_EN2   E1000_ICR_GPI_EN2   /* GP Int 2 */
-#define E1000_IMS_GPI_EN3   E1000_ICR_GPI_EN3   /* GP Int 3 */
-#define E1000_IMS_TXD_LOW   E1000_ICR_TXD_LOW
-#define E1000_IMS_SRPD      E1000_ICR_SRPD
-#define E1000_IMS_ACK       E1000_ICR_ACK       /* Receive Ack frame */
-#define E1000_IMS_MNG       E1000_ICR_MNG       /* Manageability event */
-#define E1000_IMS_DOCK      E1000_ICR_DOCK      /* Dock/Undock */
-#define E1000_IMS_RXD_FIFO_PAR0 E1000_ICR_RXD_FIFO_PAR0 /* queue 0 Rx 
descriptor FIFO parity error */
-#define E1000_IMS_TXD_FIFO_PAR0 E1000_ICR_TXD_FIFO_PAR0 /* queue 0 Tx 
descriptor FIFO parity error */
-#define E1000_IMS_HOST_ARB_PAR  E1000_ICR_HOST_ARB_PAR  /* host arb read 
buffer parity error */
-#define E1000_IMS_PB_PAR        E1000_ICR_PB_PAR        /* packet buffer 
parity error */
-#define E1000_IMS_RXD_FIFO_PAR1 E1000_ICR_RXD_FIFO_PAR1 /* queue 1 Rx 
descriptor FIFO parity error */
-#define E1000_IMS_TXD_FIFO_PAR1 E1000_ICR_TXD_FIFO_PAR1 /* queue 1 Tx 
descriptor FIFO parity error */
-#define E1000_IMS_DSW       E1000_ICR_DSW
-#define E1000_IMS_PHYINT    E1000_ICR_PHYINT
-#define E1000_IMS_EPRST     E1000_ICR_EPRST
-
-/* Interrupt Mask Clear */
-#define E1000_IMC_TXDW      E1000_ICR_TXDW      /* Transmit desc written back 
*/
-#define E1000_IMC_TXQE      E1000_ICR_TXQE      /* Transmit Queue empty */
-#define E1000_IMC_LSC       E1000_ICR_LSC       /* Link Status Change */
-#define E1000_IMC_RXSEQ     E1000_ICR_RXSEQ     /* rx sequence error */
-#define E1000_IMC_RXDMT0    E1000_ICR_RXDMT0    /* rx desc min. threshold */
-#define E1000_IMC_RXO       E1000_ICR_RXO       /* rx overrun */
-#define E1000_IMC_RXT0      E1000_ICR_RXT0      /* rx timer intr */
-#define E1000_IMC_MDAC      E1000_ICR_MDAC      /* MDIO access complete */
-#define E1000_IMC_RXCFG     E1000_ICR_RXCFG     /* RX /c/ ordered set */
-#define E1000_IMC_GPI_EN0   E1000_ICR_GPI_EN0   /* GP Int 0 */
-#define E1000_IMC_GPI_EN1   E1000_ICR_GPI_EN1   /* GP Int 1 */
-#define E1000_IMC_GPI_EN2   E1000_ICR_GPI_EN2   /* GP Int 2 */
-#define E1000_IMC_GPI_EN3   E1000_ICR_GPI_EN3   /* GP Int 3 */
-#define E1000_IMC_TXD_LOW   E1000_ICR_TXD_LOW
-#define E1000_IMC_SRPD      E1000_ICR_SRPD
-#define E1000_IMC_ACK       E1000_ICR_ACK       /* Receive Ack frame */
-#define E1000_IMC_MNG       E1000_ICR_MNG       /* Manageability event */
-#define E1000_IMC_DOCK      E1000_ICR_DOCK      /* Dock/Undock */
-#define E1000_IMC_RXD_FIFO_PAR0 E1000_ICR_RXD_FIFO_PAR0 /* queue 0 Rx 
descriptor FIFO parity error */
-#define E1000_IMC_TXD_FIFO_PAR0 E1000_ICR_TXD_FIFO_PAR0 /* queue 0 Tx 
descriptor FIFO parity error */
-#define E1000_IMC_HOST_ARB_PAR  E1000_ICR_HOST_ARB_PAR  /* host arb read 
buffer parity error */
-#define E1000_IMC_PB_PAR        E1000_ICR_PB_PAR        /* packet buffer 
parity error */
-#define E1000_IMC_RXD_FIFO_PAR1 E1000_ICR_RXD_FIFO_PAR1 /* queue 1 Rx 
descriptor FIFO parity error */
-#define E1000_IMC_TXD_FIFO_PAR1 E1000_ICR_TXD_FIFO_PAR1 /* queue 1 Tx 
descriptor FIFO parity error */
-#define E1000_IMC_DSW       E1000_ICR_DSW
-#define E1000_IMC_PHYINT    E1000_ICR_PHYINT
-#define E1000_IMC_EPRST     E1000_ICR_EPRST
-
-/* Receive Control */
-#define E1000_RCTL_RST            0x00000001    /* Software reset */
-#define E1000_RCTL_EN             0x00000002    /* enable */
-#define E1000_RCTL_SBP            0x00000004    /* store bad packet */
-#define E1000_RCTL_UPE            0x00000008    /* unicast promiscuous enable 
*/
-#define E1000_RCTL_MPE            0x00000010    /* multicast promiscuous enab 
*/
-#define E1000_RCTL_LPE            0x00000020    /* long packet enable */
-#define E1000_RCTL_LBM_NO         0x00000000    /* no loopback mode */
-#define E1000_RCTL_LBM_MAC        0x00000040    /* MAC loopback mode */
-#define E1000_RCTL_LBM_SLP        0x00000080    /* serial link loopback mode */
-#define E1000_RCTL_LBM_TCVR       0x000000C0    /* tcvr loopback mode */
-#define E1000_RCTL_DTYP_MASK      0x00000C00    /* Descriptor type mask */
-#define E1000_RCTL_DTYP_PS        0x00000400    /* Packet Split descriptor */
-#define E1000_RCTL_RDMTS_HALF     0x00000000    /* rx desc min threshold size 
*/
-#define E1000_RCTL_RDMTS_QUAT     0x00000100    /* rx desc min threshold size 
*/
-#define E1000_RCTL_RDMTS_EIGTH    0x00000200    /* rx desc min threshold size 
*/
-#define E1000_RCTL_MO_SHIFT       12            /* multicast offset shift */
-#define E1000_RCTL_MO_0           0x00000000    /* multicast offset 11:0 */
-#define E1000_RCTL_MO_1           0x00001000    /* multicast offset 12:1 */
-#define E1000_RCTL_MO_2           0x00002000    /* multicast offset 13:2 */
-#define E1000_RCTL_MO_3           0x00003000    /* multicast offset 15:4 */
-#define E1000_RCTL_MDR            0x00004000    /* multicast desc ring 0 */
-#define E1000_RCTL_BAM            0x00008000    /* broadcast enable */
-/* these buffer sizes are valid if E1000_RCTL_BSEX is 0 */
-#define E1000_RCTL_SZ_2048        0x00000000    /* rx buffer size 2048 */
-#define E1000_RCTL_SZ_1024        0x00010000    /* rx buffer size 1024 */
-#define E1000_RCTL_SZ_512         0x00020000    /* rx buffer size 512 */
-#define E1000_RCTL_SZ_256         0x00030000    /* rx buffer size 256 */
-/* these buffer sizes are valid if E1000_RCTL_BSEX is 1 */
-#define E1000_RCTL_SZ_16384       0x00010000    /* rx buffer size 16384 */
-#define E1000_RCTL_SZ_8192        0x00020000    /* rx buffer size 8192 */
-#define E1000_RCTL_SZ_4096        0x00030000    /* rx buffer size 4096 */
-#define E1000_RCTL_VFE            0x00040000    /* vlan filter enable */
-#define E1000_RCTL_CFIEN          0x00080000    /* canonical form enable */
-#define E1000_RCTL_CFI            0x00100000    /* canonical form indicator */
-#define E1000_RCTL_DPF            0x00400000    /* discard pause frames */
-#define E1000_RCTL_PMCF           0x00800000    /* pass MAC control frames */
-#define E1000_RCTL_BSEX           0x02000000    /* Buffer size extension */
-#define E1000_RCTL_SECRC          0x04000000    /* Strip Ethernet CRC */
-#define E1000_RCTL_FLXBUF_MASK    0x78000000    /* Flexible buffer size */
-#define E1000_RCTL_FLXBUF_SHIFT   27            /* Flexible buffer shift */
-
-/* Use byte values for the following shift parameters
- * Usage:
- *     psrctl |= (((ROUNDUP(value0, 128) >> E1000_PSRCTL_BSIZE0_SHIFT) &
- *                  E1000_PSRCTL_BSIZE0_MASK) |
- *                ((ROUNDUP(value1, 1024) >> E1000_PSRCTL_BSIZE1_SHIFT) &
- *                  E1000_PSRCTL_BSIZE1_MASK) |
- *                ((ROUNDUP(value2, 1024) << E1000_PSRCTL_BSIZE2_SHIFT) &
- *                  E1000_PSRCTL_BSIZE2_MASK) |
- *                ((ROUNDUP(value3, 1024) << E1000_PSRCTL_BSIZE3_SHIFT) |;
- *                  E1000_PSRCTL_BSIZE3_MASK))
- * where value0 = [128..16256],  default=256
- *       value1 = [1024..64512], default=4096
- *       value2 = [0..64512],    default=4096
- *       value3 = [0..64512],    default=0
- */
-
-#define E1000_PSRCTL_BSIZE0_MASK   0x0000007F
-#define E1000_PSRCTL_BSIZE1_MASK   0x00003F00
-#define E1000_PSRCTL_BSIZE2_MASK   0x003F0000
-#define E1000_PSRCTL_BSIZE3_MASK   0x3F000000
-
-#define E1000_PSRCTL_BSIZE0_SHIFT  7            /* Shift _right_ 7 */
-#define E1000_PSRCTL_BSIZE1_SHIFT  2            /* Shift _right_ 2 */
-#define E1000_PSRCTL_BSIZE2_SHIFT  6            /* Shift _left_ 6 */
-#define E1000_PSRCTL_BSIZE3_SHIFT 14            /* Shift _left_ 14 */
-
-/* SW_W_SYNC definitions */
-#define E1000_SWFW_EEP_SM     0x0001
-#define E1000_SWFW_PHY0_SM    0x0002
-#define E1000_SWFW_PHY1_SM    0x0004
-#define E1000_SWFW_MAC_CSR_SM 0x0008
-
-/* Receive Descriptor */
-#define E1000_RDT_DELAY 0x0000ffff      /* Delay timer (1=1024us) */
-#define E1000_RDT_FPDB  0x80000000      /* Flush descriptor block */
-#define E1000_RDLEN_LEN 0x0007ff80      /* descriptor length */
-#define E1000_RDH_RDH   0x0000ffff      /* receive descriptor head */
-#define E1000_RDT_RDT   0x0000ffff      /* receive descriptor tail */
-
-/* Flow Control */
-#define E1000_FCRTH_RTH  0x0000FFF8     /* Mask Bits[15:3] for RTH */
-#define E1000_FCRTH_XFCE 0x80000000     /* External Flow Control Enable */
-#define E1000_FCRTL_RTL  0x0000FFF8     /* Mask Bits[15:3] for RTL */
-#define E1000_FCRTL_XONE 0x80000000     /* Enable XON frame transmission */
-
-/* Header split receive */
-#define E1000_RFCTL_ISCSI_DIS           0x00000001
-#define E1000_RFCTL_ISCSI_DWC_MASK      0x0000003E
-#define E1000_RFCTL_ISCSI_DWC_SHIFT     1
-#define E1000_RFCTL_NFSW_DIS            0x00000040
-#define E1000_RFCTL_NFSR_DIS            0x00000080
-#define E1000_RFCTL_NFS_VER_MASK        0x00000300
-#define E1000_RFCTL_NFS_VER_SHIFT       8
-#define E1000_RFCTL_IPV6_DIS            0x00000400
-#define E1000_RFCTL_IPV6_XSUM_DIS       0x00000800
-#define E1000_RFCTL_ACK_DIS             0x00001000
-#define E1000_RFCTL_ACKD_DIS            0x00002000
-#define E1000_RFCTL_IPFRSP_DIS          0x00004000
-#define E1000_RFCTL_EXTEN               0x00008000
-#define E1000_RFCTL_IPV6_EX_DIS         0x00010000
-#define E1000_RFCTL_NEW_IPV6_EXT_DIS    0x00020000
-
-/* Receive Descriptor Control */
-#define E1000_RXDCTL_PTHRESH 0x0000003F /* RXDCTL Prefetch Threshold */
-#define E1000_RXDCTL_HTHRESH 0x00003F00 /* RXDCTL Host Threshold */
-#define E1000_RXDCTL_WTHRESH 0x003F0000 /* RXDCTL Writeback Threshold */
-#define E1000_RXDCTL_GRAN    0x01000000 /* RXDCTL Granularity */
-
-/* Transmit Descriptor Control */
-#define E1000_TXDCTL_PTHRESH 0x0000003F /* TXDCTL Prefetch Threshold */
-#define E1000_TXDCTL_HTHRESH 0x00003F00 /* TXDCTL Host Threshold */
-#define E1000_TXDCTL_WTHRESH 0x003F0000 /* TXDCTL Writeback Threshold */
-#define E1000_TXDCTL_GRAN    0x01000000 /* TXDCTL Granularity */
-#define E1000_TXDCTL_LWTHRESH 0xFE000000 /* TXDCTL Low Threshold */
-#define E1000_TXDCTL_FULL_TX_DESC_WB 0x01010000 /* GRAN=1, WTHRESH=1 */
-#define E1000_TXDCTL_COUNT_DESC 0x00400000 /* Enable the counting of desc.
-                                              still to be processed. */
-/* Transmit Configuration Word */
-#define E1000_TXCW_FD         0x00000020        /* TXCW full duplex */
-#define E1000_TXCW_HD         0x00000040        /* TXCW half duplex */
-#define E1000_TXCW_PAUSE      0x00000080        /* TXCW sym pause request */
-#define E1000_TXCW_ASM_DIR    0x00000100        /* TXCW astm pause direction */
-#define E1000_TXCW_PAUSE_MASK 0x00000180        /* TXCW pause request mask */
-#define E1000_TXCW_RF         0x00003000        /* TXCW remote fault */
-#define E1000_TXCW_NP         0x00008000        /* TXCW next page */
-#define E1000_TXCW_CW         0x0000ffff        /* TxConfigWord mask */
-#define E1000_TXCW_TXC        0x40000000        /* Transmit Config control */
-#define E1000_TXCW_ANE        0x80000000        /* Auto-neg enable */
-
-/* Receive Configuration Word */
-#define E1000_RXCW_CW    0x0000ffff     /* RxConfigWord mask */
-#define E1000_RXCW_NC    0x04000000     /* Receive config no carrier */
-#define E1000_RXCW_IV    0x08000000     /* Receive config invalid */
-#define E1000_RXCW_CC    0x10000000     /* Receive config change */
-#define E1000_RXCW_C     0x20000000     /* Receive config */
-#define E1000_RXCW_SYNCH 0x40000000     /* Receive config synch */
-#define E1000_RXCW_ANC   0x80000000     /* Auto-neg complete */
-
-/* Transmit Control */
-#define E1000_TCTL_RST    0x00000001    /* software reset */
-#define E1000_TCTL_EN     0x00000002    /* enable tx */
-#define E1000_TCTL_BCE    0x00000004    /* busy check enable */
-#define E1000_TCTL_PSP    0x00000008    /* pad short packets */
-#define E1000_TCTL_CT     0x00000ff0    /* collision threshold */
-#define E1000_TCTL_COLD   0x003ff000    /* collision distance */
-#define E1000_TCTL_SWXOFF 0x00400000    /* SW Xoff transmission */
-#define E1000_TCTL_PBE    0x00800000    /* Packet Burst Enable */
-#define E1000_TCTL_RTLC   0x01000000    /* Re-transmit on late collision */
-#define E1000_TCTL_NRTU   0x02000000    /* No Re-transmit on underrun */
-#define E1000_TCTL_MULR   0x10000000    /* Multiple request support */
-/* Extended Transmit Control */
-#define E1000_TCTL_EXT_BST_MASK  0x000003FF /* Backoff Slot Time */
-#define E1000_TCTL_EXT_GCEX_MASK 0x000FFC00 /* Gigabit Carry Extend Padding */
-
-#define DEFAULT_80003ES2LAN_TCTL_EXT_GCEX   0x00010000
-
-/* Receive Checksum Control */
-#define E1000_RXCSUM_PCSS_MASK 0x000000FF   /* Packet Checksum Start */
-#define E1000_RXCSUM_IPOFL     0x00000100   /* IPv4 checksum offload */
-#define E1000_RXCSUM_TUOFL     0x00000200   /* TCP / UDP checksum offload */
-#define E1000_RXCSUM_IPV6OFL   0x00000400   /* IPv6 checksum offload */
-#define E1000_RXCSUM_IPPCSE    0x00001000   /* IP payload checksum enable */
-#define E1000_RXCSUM_PCSD      0x00002000   /* packet checksum disabled */
-
-/* Multiple Receive Queue Control */
-#define E1000_MRQC_ENABLE_MASK              0x00000003
-#define E1000_MRQC_ENABLE_RSS_2Q            0x00000001
-#define E1000_MRQC_ENABLE_RSS_INT           0x00000004
-#define E1000_MRQC_RSS_FIELD_MASK           0xFFFF0000
-#define E1000_MRQC_RSS_FIELD_IPV4_TCP       0x00010000
-#define E1000_MRQC_RSS_FIELD_IPV4           0x00020000
-#define E1000_MRQC_RSS_FIELD_IPV6_TCP_EX    0x00040000
-#define E1000_MRQC_RSS_FIELD_IPV6_EX        0x00080000
-#define E1000_MRQC_RSS_FIELD_IPV6           0x00100000
-#define E1000_MRQC_RSS_FIELD_IPV6_TCP       0x00200000
-
-/* Definitions for power management and wakeup registers */
-/* Wake Up Control */
-#define E1000_WUC_APME       0x00000001 /* APM Enable */
-#define E1000_WUC_PME_EN     0x00000002 /* PME Enable */
-#define E1000_WUC_PME_STATUS 0x00000004 /* PME Status */
-#define E1000_WUC_APMPME     0x00000008 /* Assert PME on APM Wakeup */
-#define E1000_WUC_SPM        0x80000000 /* Enable SPM */
-
-/* Wake Up Filter Control */
-#define E1000_WUFC_LNKC 0x00000001 /* Link Status Change Wakeup Enable */
-#define E1000_WUFC_MAG  0x00000002 /* Magic Packet Wakeup Enable */
-#define E1000_WUFC_EX   0x00000004 /* Directed Exact Wakeup Enable */
-#define E1000_WUFC_MC   0x00000008 /* Directed Multicast Wakeup Enable */
-#define E1000_WUFC_BC   0x00000010 /* Broadcast Wakeup Enable */
-#define E1000_WUFC_ARP  0x00000020 /* ARP Request Packet Wakeup Enable */
-#define E1000_WUFC_IPV4 0x00000040 /* Directed IPv4 Packet Wakeup Enable */
-#define E1000_WUFC_IPV6 0x00000080 /* Directed IPv6 Packet Wakeup Enable */
-#define E1000_WUFC_IGNORE_TCO      0x00008000 /* Ignore WakeOn TCO packets */
-#define E1000_WUFC_FLX0 0x00010000 /* Flexible Filter 0 Enable */
-#define E1000_WUFC_FLX1 0x00020000 /* Flexible Filter 1 Enable */
-#define E1000_WUFC_FLX2 0x00040000 /* Flexible Filter 2 Enable */
-#define E1000_WUFC_FLX3 0x00080000 /* Flexible Filter 3 Enable */
-#define E1000_WUFC_ALL_FILTERS 0x000F00FF /* Mask for all wakeup filters */
-#define E1000_WUFC_FLX_OFFSET 16       /* Offset to the Flexible Filters bits 
*/
-#define E1000_WUFC_FLX_FILTERS 0x000F0000 /* Mask for the 4 flexible filters */
-
-/* Wake Up Status */
-#define E1000_WUS_LNKC 0x00000001 /* Link Status Changed */
-#define E1000_WUS_MAG  0x00000002 /* Magic Packet Received */
-#define E1000_WUS_EX   0x00000004 /* Directed Exact Received */
-#define E1000_WUS_MC   0x00000008 /* Directed Multicast Received */
-#define E1000_WUS_BC   0x00000010 /* Broadcast Received */
-#define E1000_WUS_ARP  0x00000020 /* ARP Request Packet Received */
-#define E1000_WUS_IPV4 0x00000040 /* Directed IPv4 Packet Wakeup Received */
-#define E1000_WUS_IPV6 0x00000080 /* Directed IPv6 Packet Wakeup Received */
-#define E1000_WUS_FLX0 0x00010000 /* Flexible Filter 0 Match */
-#define E1000_WUS_FLX1 0x00020000 /* Flexible Filter 1 Match */
-#define E1000_WUS_FLX2 0x00040000 /* Flexible Filter 2 Match */
-#define E1000_WUS_FLX3 0x00080000 /* Flexible Filter 3 Match */
-#define E1000_WUS_FLX_FILTERS 0x000F0000 /* Mask for the 4 flexible filters */
-
-/* Management Control */
-#define E1000_MANC_SMBUS_EN      0x00000001 /* SMBus Enabled - RO */
-#define E1000_MANC_ASF_EN        0x00000002 /* ASF Enabled - RO */
-#define E1000_MANC_R_ON_FORCE    0x00000004 /* Reset on Force TCO - RO */
-#define E1000_MANC_RMCP_EN       0x00000100 /* Enable RCMP 026Fh Filtering */
-#define E1000_MANC_0298_EN       0x00000200 /* Enable RCMP 0298h Filtering */
-#define E1000_MANC_IPV4_EN       0x00000400 /* Enable IPv4 */
-#define E1000_MANC_IPV6_EN       0x00000800 /* Enable IPv6 */
-#define E1000_MANC_SNAP_EN       0x00001000 /* Accept LLC/SNAP */
-#define E1000_MANC_ARP_EN        0x00002000 /* Enable ARP Request Filtering */
-#define E1000_MANC_NEIGHBOR_EN   0x00004000 /* Enable Neighbor Discovery
-                                             * Filtering */
-#define E1000_MANC_ARP_RES_EN    0x00008000 /* Enable ARP response Filtering */
-#define E1000_MANC_TCO_RESET     0x00010000 /* TCO Reset Occurred */
-#define E1000_MANC_RCV_TCO_EN    0x00020000 /* Receive TCO Packets Enabled */
-#define E1000_MANC_REPORT_STATUS 0x00040000 /* Status Reporting Enabled */
-#define E1000_MANC_RCV_ALL       0x00080000 /* Receive All Enabled */
-#define E1000_MANC_BLK_PHY_RST_ON_IDE   0x00040000 /* Block phy resets */
-#define E1000_MANC_EN_MAC_ADDR_FILTER   0x00100000 /* Enable MAC address
-                                                    * filtering */
-#define E1000_MANC_EN_MNG2HOST   0x00200000 /* Enable MNG packets to host
-                                             * memory */
-#define E1000_MANC_EN_IP_ADDR_FILTER    0x00400000 /* Enable IP address
-                                                    * filtering */
-#define E1000_MANC_EN_XSUM_FILTER   0x00800000 /* Enable checksum filtering */
-#define E1000_MANC_BR_EN         0x01000000 /* Enable broadcast filtering */
-#define E1000_MANC_SMB_REQ       0x01000000 /* SMBus Request */
-#define E1000_MANC_SMB_GNT       0x02000000 /* SMBus Grant */
-#define E1000_MANC_SMB_CLK_IN    0x04000000 /* SMBus Clock In */
-#define E1000_MANC_SMB_DATA_IN   0x08000000 /* SMBus Data In */
-#define E1000_MANC_SMB_DATA_OUT  0x10000000 /* SMBus Data Out */
-#define E1000_MANC_SMB_CLK_OUT   0x20000000 /* SMBus Clock Out */
-
-#define E1000_MANC_SMB_DATA_OUT_SHIFT  28 /* SMBus Data Out Shift */
-#define E1000_MANC_SMB_CLK_OUT_SHIFT   29 /* SMBus Clock Out Shift */
-
-/* SW Semaphore Register */
-#define E1000_SWSM_SMBI         0x00000001 /* Driver Semaphore bit */
-#define E1000_SWSM_SWESMBI      0x00000002 /* FW Semaphore bit */
-#define E1000_SWSM_WMNG         0x00000004 /* Wake MNG Clock */
-#define E1000_SWSM_DRV_LOAD     0x00000008 /* Driver Loaded Bit */
-
-/* FW Semaphore Register */
-#define E1000_FWSM_MODE_MASK    0x0000000E /* FW mode */
-#define E1000_FWSM_MODE_SHIFT            1
-#define E1000_FWSM_FW_VALID     0x00008000 /* FW established a valid mode */
-
-#define E1000_FWSM_RSPCIPHY        0x00000040 /* Reset PHY on PCI reset */
-#define E1000_FWSM_DISSW           0x10000000 /* FW disable SW Write Access */
-#define E1000_FWSM_SKUSEL_MASK     0x60000000 /* LAN SKU select */
-#define E1000_FWSM_SKUEL_SHIFT     29
-#define E1000_FWSM_SKUSEL_EMB      0x0 /* Embedded SKU */
-#define E1000_FWSM_SKUSEL_CONS     0x1 /* Consumer SKU */
-#define E1000_FWSM_SKUSEL_PERF_100 0x2 /* Perf & Corp 10/100 SKU */
-#define E1000_FWSM_SKUSEL_PERF_GBE 0x3 /* Perf & Copr GbE SKU */
-
-/* FFLT Debug Register */
-#define E1000_FFLT_DBG_INVC     0x00100000 /* Invalid /C/ code handling */
-
-typedef enum {
-    e1000_mng_mode_none     = 0,
-    e1000_mng_mode_asf,
-    e1000_mng_mode_pt,
-    e1000_mng_mode_ipmi,
-    e1000_mng_mode_host_interface_only
-} e1000_mng_mode;
-
-/* Host Inteface Control Register */
-#define E1000_HICR_EN           0x00000001  /* Enable Bit - RO */
-#define E1000_HICR_C            0x00000002  /* Driver sets this bit when done
-                                             * to put command in RAM */
-#define E1000_HICR_SV           0x00000004  /* Status Validity */
-#define E1000_HICR_FWR          0x00000080  /* FW reset. Set by the Host */
-
-/* Host Interface Command Interface - Address range 0x8800-0x8EFF */
-#define E1000_HI_MAX_DATA_LENGTH         252 /* Host Interface data length */
-#define E1000_HI_MAX_BLOCK_BYTE_LENGTH  1792 /* Number of bytes in range */
-#define E1000_HI_MAX_BLOCK_DWORD_LENGTH  448 /* Number of dwords in range */
-#define E1000_HI_COMMAND_TIMEOUT         500 /* Time in ms to process HI 
command */
-
-struct e1000_host_command_header {
-    u8 command_id;
-    u8 command_length;
-    u8 command_options;   /* I/F bits for command, status for return */
-    u8 checksum;
-};
-struct e1000_host_command_info {
-    struct e1000_host_command_header command_header;  /* Command Head/Command 
Result Head has 4 bytes */
-    u8 command_data[E1000_HI_MAX_DATA_LENGTH];   /* Command data can length 
0..252 */
-};
-
-/* Host SMB register #0 */
-#define E1000_HSMC0R_CLKIN      0x00000001  /* SMB Clock in */
-#define E1000_HSMC0R_DATAIN     0x00000002  /* SMB Data in */
-#define E1000_HSMC0R_DATAOUT    0x00000004  /* SMB Data out */
-#define E1000_HSMC0R_CLKOUT     0x00000008  /* SMB Clock out */
-
-/* Host SMB register #1 */
-#define E1000_HSMC1R_CLKIN      E1000_HSMC0R_CLKIN
-#define E1000_HSMC1R_DATAIN     E1000_HSMC0R_DATAIN
-#define E1000_HSMC1R_DATAOUT    E1000_HSMC0R_DATAOUT
-#define E1000_HSMC1R_CLKOUT     E1000_HSMC0R_CLKOUT
-
-/* FW Status Register */
-#define E1000_FWSTS_FWS_MASK    0x000000FF  /* FW Status */
-
-/* Wake Up Packet Length */
-#define E1000_WUPL_LENGTH_MASK 0x0FFF   /* Only the lower 12 bits are valid */
-
-#define E1000_MDALIGN          4096
-
-/* PCI-Ex registers*/
-
-/* PCI-Ex Control Register */
-#define E1000_GCR_RXD_NO_SNOOP          0x00000001
-#define E1000_GCR_RXDSCW_NO_SNOOP       0x00000002
-#define E1000_GCR_RXDSCR_NO_SNOOP       0x00000004
-#define E1000_GCR_TXD_NO_SNOOP          0x00000008
-#define E1000_GCR_TXDSCW_NO_SNOOP       0x00000010
-#define E1000_GCR_TXDSCR_NO_SNOOP       0x00000020
-
-#define PCI_EX_NO_SNOOP_ALL (E1000_GCR_RXD_NO_SNOOP         | \
-                             E1000_GCR_RXDSCW_NO_SNOOP      | \
-                             E1000_GCR_RXDSCR_NO_SNOOP      | \
-                             E1000_GCR_TXD_NO_SNOOP         | \
-                             E1000_GCR_TXDSCW_NO_SNOOP      | \
-                             E1000_GCR_TXDSCR_NO_SNOOP)
-
-#define PCI_EX_82566_SNOOP_ALL PCI_EX_NO_SNOOP_ALL
-
-#define E1000_GCR_L1_ACT_WITHOUT_L0S_RX 0x08000000
-/* Function Active and Power State to MNG */
-#define E1000_FACTPS_FUNC0_POWER_STATE_MASK         0x00000003
-#define E1000_FACTPS_LAN0_VALID                     0x00000004
-#define E1000_FACTPS_FUNC0_AUX_EN                   0x00000008
-#define E1000_FACTPS_FUNC1_POWER_STATE_MASK         0x000000C0
-#define E1000_FACTPS_FUNC1_POWER_STATE_SHIFT        6
-#define E1000_FACTPS_LAN1_VALID                     0x00000100
-#define E1000_FACTPS_FUNC1_AUX_EN                   0x00000200
-#define E1000_FACTPS_FUNC2_POWER_STATE_MASK         0x00003000
-#define E1000_FACTPS_FUNC2_POWER_STATE_SHIFT        12
-#define E1000_FACTPS_IDE_ENABLE                     0x00004000
-#define E1000_FACTPS_FUNC2_AUX_EN                   0x00008000
-#define E1000_FACTPS_FUNC3_POWER_STATE_MASK         0x000C0000
-#define E1000_FACTPS_FUNC3_POWER_STATE_SHIFT        18
-#define E1000_FACTPS_SP_ENABLE                      0x00100000
-#define E1000_FACTPS_FUNC3_AUX_EN                   0x00200000
-#define E1000_FACTPS_FUNC4_POWER_STATE_MASK         0x03000000
-#define E1000_FACTPS_FUNC4_POWER_STATE_SHIFT        24
-#define E1000_FACTPS_IPMI_ENABLE                    0x04000000
-#define E1000_FACTPS_FUNC4_AUX_EN                   0x08000000
-#define E1000_FACTPS_MNGCG                          0x20000000
-#define E1000_FACTPS_LAN_FUNC_SEL                   0x40000000
-#define E1000_FACTPS_PM_STATE_CHANGED               0x80000000
-
-/* PCI-Ex Config Space */
-#define PCI_EX_LINK_STATUS           0x12
-#define PCI_EX_LINK_WIDTH_MASK       0x3F0
-#define PCI_EX_LINK_WIDTH_SHIFT      4
-
-/* EEPROM Commands - Microwire */
-#define EEPROM_READ_OPCODE_MICROWIRE  0x6  /* EEPROM read opcode */
-#define EEPROM_WRITE_OPCODE_MICROWIRE 0x5  /* EEPROM write opcode */
-#define EEPROM_ERASE_OPCODE_MICROWIRE 0x7  /* EEPROM erase opcode */
-#define EEPROM_EWEN_OPCODE_MICROWIRE  0x13 /* EEPROM erase/write enable */
-#define EEPROM_EWDS_OPCODE_MICROWIRE  0x10 /* EEPROM erast/write disable */
-
-/* EEPROM Commands - SPI */
-#define EEPROM_MAX_RETRY_SPI        5000 /* Max wait of 5ms, for RDY signal */
-#define EEPROM_READ_OPCODE_SPI      0x03  /* EEPROM read opcode */
-#define EEPROM_WRITE_OPCODE_SPI     0x02  /* EEPROM write opcode */
-#define EEPROM_A8_OPCODE_SPI        0x08  /* opcode bit-3 = address bit-8 */
-#define EEPROM_WREN_OPCODE_SPI      0x06  /* EEPROM set Write Enable latch */
-#define EEPROM_WRDI_OPCODE_SPI      0x04  /* EEPROM reset Write Enable latch */
-#define EEPROM_RDSR_OPCODE_SPI      0x05  /* EEPROM read Status register */
-#define EEPROM_WRSR_OPCODE_SPI      0x01  /* EEPROM write Status register */
-#define EEPROM_ERASE4K_OPCODE_SPI   0x20  /* EEPROM ERASE 4KB */
-#define EEPROM_ERASE64K_OPCODE_SPI  0xD8  /* EEPROM ERASE 64KB */
-#define EEPROM_ERASE256_OPCODE_SPI  0xDB  /* EEPROM ERASE 256B */
-
-/* EEPROM Size definitions */
-#define EEPROM_WORD_SIZE_SHIFT  6
-#define EEPROM_SIZE_SHIFT       10
-#define EEPROM_SIZE_MASK        0x1C00
-
-/* EEPROM Word Offsets */
-#define EEPROM_COMPAT                 0x0003
-#define EEPROM_ID_LED_SETTINGS        0x0004
-#define EEPROM_VERSION                0x0005
-#define EEPROM_SERDES_AMPLITUDE       0x0006 /* For SERDES output amplitude 
adjustment. */
-#define EEPROM_PHY_CLASS_WORD         0x0007
-#define EEPROM_INIT_CONTROL1_REG      0x000A
-#define EEPROM_INIT_CONTROL2_REG      0x000F
-#define EEPROM_SWDEF_PINS_CTRL_PORT_1 0x0010
-#define EEPROM_INIT_CONTROL3_PORT_B   0x0014
-#define EEPROM_INIT_3GIO_3            0x001A
-#define EEPROM_SWDEF_PINS_CTRL_PORT_0 0x0020
-#define EEPROM_INIT_CONTROL3_PORT_A   0x0024
-#define EEPROM_CFG                    0x0012
-#define EEPROM_FLASH_VERSION          0x0032
-#define EEPROM_CHECKSUM_REG           0x003F
-
-#define E1000_EEPROM_CFG_DONE         0x00040000   /* MNG config cycle done */
-#define E1000_EEPROM_CFG_DONE_PORT_1  0x00080000   /* ...for second port */
-
-/* Word definitions for ID LED Settings */
-#define ID_LED_RESERVED_0000 0x0000
-#define ID_LED_RESERVED_FFFF 0xFFFF
-#define ID_LED_RESERVED_82573  0xF746
-#define ID_LED_DEFAULT_82573   0x1811
-#define ID_LED_DEFAULT       ((ID_LED_OFF1_ON2 << 12) | \
-                              (ID_LED_OFF1_OFF2 << 8) | \
-                              (ID_LED_DEF1_DEF2 << 4) | \
-                              (ID_LED_DEF1_DEF2))
-#define ID_LED_DEFAULT_ICH8LAN  ((ID_LED_DEF1_DEF2 << 12) | \
-                                 (ID_LED_DEF1_OFF2 <<  8) | \
-                                 (ID_LED_DEF1_ON2  <<  4) | \
-                                 (ID_LED_DEF1_DEF2))
-#define ID_LED_DEF1_DEF2     0x1
-#define ID_LED_DEF1_ON2      0x2
-#define ID_LED_DEF1_OFF2     0x3
-#define ID_LED_ON1_DEF2      0x4
-#define ID_LED_ON1_ON2       0x5
-#define ID_LED_ON1_OFF2      0x6
-#define ID_LED_OFF1_DEF2     0x7
-#define ID_LED_OFF1_ON2      0x8
-#define ID_LED_OFF1_OFF2     0x9
-
-#define IGP_ACTIVITY_LED_MASK   0xFFFFF0FF
-#define IGP_ACTIVITY_LED_ENABLE 0x0300
-#define IGP_LED3_MODE           0x07000000
-
-
-/* Mask bits for SERDES amplitude adjustment in Word 6 of the EEPROM */
-#define EEPROM_SERDES_AMPLITUDE_MASK  0x000F
-
-/* Mask bit for PHY class in Word 7 of the EEPROM */
-#define EEPROM_PHY_CLASS_A   0x8000
-
-/* Mask bits for fields in Word 0x0a of the EEPROM */
-#define EEPROM_WORD0A_ILOS   0x0010
-#define EEPROM_WORD0A_SWDPIO 0x01E0
-#define EEPROM_WORD0A_LRST   0x0200
-#define EEPROM_WORD0A_FD     0x0400
-#define EEPROM_WORD0A_66MHZ  0x0800
-
-/* Mask bits for fields in Word 0x0f of the EEPROM */
-#define EEPROM_WORD0F_PAUSE_MASK 0x3000
-#define EEPROM_WORD0F_PAUSE      0x1000
-#define EEPROM_WORD0F_ASM_DIR    0x2000
-#define EEPROM_WORD0F_ANE        0x0800
-#define EEPROM_WORD0F_SWPDIO_EXT 0x00F0
-#define EEPROM_WORD0F_LPLU       0x0001
-
-/* Mask bits for fields in Word 0x10/0x20 of the EEPROM */
-#define EEPROM_WORD1020_GIGA_DISABLE         0x0010
-#define EEPROM_WORD1020_GIGA_DISABLE_NON_D0A 0x0008
-
-/* Mask bits for fields in Word 0x1a of the EEPROM */
-#define EEPROM_WORD1A_ASPM_MASK  0x000C
-
-/* For checksumming, the sum of all words in the EEPROM should equal 0xBABA. */
-#define EEPROM_SUM 0xBABA
-
-/* EEPROM Map defines (WORD OFFSETS)*/
-#define EEPROM_NODE_ADDRESS_BYTE_0 0
-#define EEPROM_PBA_BYTE_1          8
-
-#define EEPROM_RESERVED_WORD          0xFFFF
-
-/* EEPROM Map Sizes (Byte Counts) */
-#define PBA_SIZE 4
-
-/* Collision related configuration parameters */
-#define E1000_COLLISION_THRESHOLD       15
-#define E1000_CT_SHIFT                  4
-/* Collision distance is a 0-based value that applies to
- * half-duplex-capable hardware only. */
-#define E1000_COLLISION_DISTANCE        63
-#define E1000_COLLISION_DISTANCE_82542  64
-#define E1000_FDX_COLLISION_DISTANCE    E1000_COLLISION_DISTANCE
-#define E1000_HDX_COLLISION_DISTANCE    E1000_COLLISION_DISTANCE
-#define E1000_COLD_SHIFT                12
-
-/* Number of Transmit and Receive Descriptors must be a multiple of 8 */
-#define REQ_TX_DESCRIPTOR_MULTIPLE  8
-#define REQ_RX_DESCRIPTOR_MULTIPLE  8
-
-/* Default values for the transmit IPG register */
-#define DEFAULT_82542_TIPG_IPGT        10
-#define DEFAULT_82543_TIPG_IPGT_FIBER  9
-#define DEFAULT_82543_TIPG_IPGT_COPPER 8
-
-#define E1000_TIPG_IPGT_MASK  0x000003FF
-#define E1000_TIPG_IPGR1_MASK 0x000FFC00
-#define E1000_TIPG_IPGR2_MASK 0x3FF00000
-
-#define DEFAULT_82542_TIPG_IPGR1 2
-#define DEFAULT_82543_TIPG_IPGR1 8
-#define E1000_TIPG_IPGR1_SHIFT  10
-
-#define DEFAULT_82542_TIPG_IPGR2 10
-#define DEFAULT_82543_TIPG_IPGR2 6
-#define DEFAULT_80003ES2LAN_TIPG_IPGR2 7
-#define E1000_TIPG_IPGR2_SHIFT  20
-
-#define DEFAULT_80003ES2LAN_TIPG_IPGT_10_100 0x00000009
-#define DEFAULT_80003ES2LAN_TIPG_IPGT_1000   0x00000008
-#define E1000_TXDMAC_DPP 0x00000001
-
-/* Adaptive IFS defines */
-#define TX_THRESHOLD_START     8
-#define TX_THRESHOLD_INCREMENT 10
-#define TX_THRESHOLD_DECREMENT 1
-#define TX_THRESHOLD_STOP      190
-#define TX_THRESHOLD_DISABLE   0
-#define TX_THRESHOLD_TIMER_MS  10000
-#define MIN_NUM_XMITS          1000
-#define IFS_MAX                80
-#define IFS_STEP               10
-#define IFS_MIN                40
-#define IFS_RATIO              4
-
-/* Extended Configuration Control and Size */
-#define E1000_EXTCNF_CTRL_PCIE_WRITE_ENABLE 0x00000001
-#define E1000_EXTCNF_CTRL_PHY_WRITE_ENABLE  0x00000002
-#define E1000_EXTCNF_CTRL_D_UD_ENABLE       0x00000004
-#define E1000_EXTCNF_CTRL_D_UD_LATENCY      0x00000008
-#define E1000_EXTCNF_CTRL_D_UD_OWNER        0x00000010
-#define E1000_EXTCNF_CTRL_MDIO_SW_OWNERSHIP 0x00000020
-#define E1000_EXTCNF_CTRL_MDIO_HW_OWNERSHIP 0x00000040
-#define E1000_EXTCNF_CTRL_EXT_CNF_POINTER   0x0FFF0000
-
-#define E1000_EXTCNF_SIZE_EXT_PHY_LENGTH    0x000000FF
-#define E1000_EXTCNF_SIZE_EXT_DOCK_LENGTH   0x0000FF00
-#define E1000_EXTCNF_SIZE_EXT_PCIE_LENGTH   0x00FF0000
-#define E1000_EXTCNF_CTRL_LCD_WRITE_ENABLE  0x00000001
-#define E1000_EXTCNF_CTRL_SWFLAG            0x00000020
-
-/* PBA constants */
-#define E1000_PBA_8K 0x0008    /* 8KB, default Rx allocation */
-#define E1000_PBA_12K 0x000C    /* 12KB, default Rx allocation */
-#define E1000_PBA_16K 0x0010    /* 16KB, default TX allocation */
-#define E1000_PBA_20K 0x0014
-#define E1000_PBA_22K 0x0016
-#define E1000_PBA_24K 0x0018
-#define E1000_PBA_30K 0x001E
-#define E1000_PBA_32K 0x0020
-#define E1000_PBA_34K 0x0022
-#define E1000_PBA_38K 0x0026
-#define E1000_PBA_40K 0x0028
-#define E1000_PBA_48K 0x0030    /* 48KB, default RX allocation */
-
-#define E1000_PBS_16K E1000_PBA_16K
-
-/* Flow Control Constants */
-#define FLOW_CONTROL_ADDRESS_LOW  0x00C28001
-#define FLOW_CONTROL_ADDRESS_HIGH 0x00000100
-#define FLOW_CONTROL_TYPE         0x8808
-
-/* The historical defaults for the flow control values are given below. */
-#define FC_DEFAULT_HI_THRESH        (0x8000)    /* 32KB */
-#define FC_DEFAULT_LO_THRESH        (0x4000)    /* 16KB */
-#define FC_DEFAULT_TX_TIMER         (0x100)     /* ~130 us */
-
-/* PCIX Config space */
-#define PCIX_COMMAND_REGISTER    0xE6
-#define PCIX_STATUS_REGISTER_LO  0xE8
-#define PCIX_STATUS_REGISTER_HI  0xEA
-
-#define PCIX_COMMAND_MMRBC_MASK      0x000C
-#define PCIX_COMMAND_MMRBC_SHIFT     0x2
-#define PCIX_STATUS_HI_MMRBC_MASK    0x0060
-#define PCIX_STATUS_HI_MMRBC_SHIFT   0x5
-#define PCIX_STATUS_HI_MMRBC_4K      0x3
-#define PCIX_STATUS_HI_MMRBC_2K      0x2
-
-
-/* Number of bits required to shift right the "pause" bits from the
- * EEPROM (bits 13:12) to the "pause" (bits 8:7) field in the TXCW register.
- */
-#define PAUSE_SHIFT 5
-
-/* Number of bits required to shift left the "SWDPIO" bits from the
- * EEPROM (bits 8:5) to the "SWDPIO" (bits 25:22) field in the CTRL register.
- */
-#define SWDPIO_SHIFT 17
-
-/* Number of bits required to shift left the "SWDPIO_EXT" bits from the
- * EEPROM word F (bits 7:4) to the bits 11:8 of The Extended CTRL register.
- */
-#define SWDPIO__EXT_SHIFT 4
-
-/* Number of bits required to shift left the "ILOS" bit from the EEPROM
- * (bit 4) to the "ILOS" (bit 7) field in the CTRL register.
- */
-#define ILOS_SHIFT  3
-
-
-#define RECEIVE_BUFFER_ALIGN_SIZE  (256)
-
-/* Number of milliseconds we wait for auto-negotiation to complete */
-#define LINK_UP_TIMEOUT             500
-
-/* Number of 100 microseconds we wait for PCI Express master disable */
-#define MASTER_DISABLE_TIMEOUT      800
-/* Number of milliseconds we wait for Eeprom auto read bit done after MAC 
reset */
-#define AUTO_READ_DONE_TIMEOUT      10
-/* Number of milliseconds we wait for PHY configuration done after MAC reset */
-#define PHY_CFG_TIMEOUT             100
-
-#define E1000_TX_BUFFER_SIZE ((u32)1514)
-
-/* The carrier extension symbol, as received by the NIC. */
-#define CARRIER_EXTENSION   0x0F
-
-/* TBI_ACCEPT macro definition:
- *
- * This macro requires:
- *      adapter = a pointer to struct e1000_hw
- *      status = the 8 bit status field of the RX descriptor with EOP set
- *      error = the 8 bit error field of the RX descriptor with EOP set
- *      length = the sum of all the length fields of the RX descriptors that
- *               make up the current frame
- *      last_byte = the last byte of the frame DMAed by the hardware
- *      max_frame_length = the maximum frame length we want to accept.
- *      min_frame_length = the minimum frame length we want to accept.
- *
- * This macro is a conditional that should be used in the interrupt
- * handler's Rx processing routine when RxErrors have been detected.
- *
- * Typical use:
- *  ...
- *  if (TBI_ACCEPT) {
- *      accept_frame = true;
- *      e1000_tbi_adjust_stats(adapter, MacAddress);
- *      frame_length--;
- *  } else {
- *      accept_frame = false;
- *  }
- *  ...
- */
-
-#define TBI_ACCEPT(adapter, status, errors, length, last_byte) \
-    ((adapter)->tbi_compatibility_on && \
-     (((errors) & E1000_RXD_ERR_FRAME_ERR_MASK) == E1000_RXD_ERR_CE) && \
-     ((last_byte) == CARRIER_EXTENSION) && \
-     (((status) & E1000_RXD_STAT_VP) ? \
-          (((length) > ((adapter)->min_frame_size - VLAN_TAG_SIZE)) && \
-           ((length) <= ((adapter)->max_frame_size + 1))) : \
-          (((length) > (adapter)->min_frame_size) && \
-           ((length) <= ((adapter)->max_frame_size + VLAN_TAG_SIZE + 1)))))
-
-
-/* Structures, enums, and macros for the PHY */
-
-/* Bit definitions for the Management Data IO (MDIO) and Management Data
- * Clock (MDC) pins in the Device Control Register.
- */
-#define E1000_CTRL_PHY_RESET_DIR  E1000_CTRL_SWDPIO0
-#define E1000_CTRL_PHY_RESET      E1000_CTRL_SWDPIN0
-#define E1000_CTRL_MDIO_DIR       E1000_CTRL_SWDPIO2
-#define E1000_CTRL_MDIO           E1000_CTRL_SWDPIN2
-#define E1000_CTRL_MDC_DIR        E1000_CTRL_SWDPIO3
-#define E1000_CTRL_MDC            E1000_CTRL_SWDPIN3
-#define E1000_CTRL_PHY_RESET_DIR4 E1000_CTRL_EXT_SDP4_DIR
-#define E1000_CTRL_PHY_RESET4     E1000_CTRL_EXT_SDP4_DATA
-
-/* PHY 1000 MII Register/Bit Definitions */
-/* PHY Registers defined by IEEE */
-#define PHY_CTRL         0x00 /* Control Register */
-#define PHY_STATUS       0x01 /* Status Regiser */
-#define PHY_ID1          0x02 /* Phy Id Reg (word 1) */
-#define PHY_ID2          0x03 /* Phy Id Reg (word 2) */
-#define PHY_AUTONEG_ADV  0x04 /* Autoneg Advertisement */
-#define PHY_LP_ABILITY   0x05 /* Link Partner Ability (Base Page) */
-#define PHY_AUTONEG_EXP  0x06 /* Autoneg Expansion Reg */
-#define PHY_NEXT_PAGE_TX 0x07 /* Next Page TX */
-#define PHY_LP_NEXT_PAGE 0x08 /* Link Partner Next Page */
-#define PHY_1000T_CTRL   0x09 /* 1000Base-T Control Reg */
-#define PHY_1000T_STATUS 0x0A /* 1000Base-T Status Reg */
-#define PHY_EXT_STATUS   0x0F /* Extended Status Reg */
-
-#define MAX_PHY_REG_ADDRESS        0x1F  /* 5 bit address bus (0-0x1F) */
-#define MAX_PHY_MULTI_PAGE_REG     0xF   /* Registers equal on all pages */
-
-/* M88E1000 Specific Registers */
-#define M88E1000_PHY_SPEC_CTRL     0x10  /* PHY Specific Control Register */
-#define M88E1000_PHY_SPEC_STATUS   0x11  /* PHY Specific Status Register */
-#define M88E1000_INT_ENABLE        0x12  /* Interrupt Enable Register */
-#define M88E1000_INT_STATUS        0x13  /* Interrupt Status Register */
-#define M88E1000_EXT_PHY_SPEC_CTRL 0x14  /* Extended PHY Specific Control */
-#define M88E1000_RX_ERR_CNTR       0x15  /* Receive Error Counter */
-
-#define M88E1000_PHY_EXT_CTRL      0x1A  /* PHY extend control register */
-#define M88E1000_PHY_PAGE_SELECT   0x1D  /* Reg 29 for page number setting */
-#define M88E1000_PHY_GEN_CONTROL   0x1E  /* Its meaning depends on reg 29 */
-#define M88E1000_PHY_VCO_REG_BIT8  0x100 /* Bits 8 & 11 are adjusted for */
-#define M88E1000_PHY_VCO_REG_BIT11 0x800    /* improved BER performance */
-
-#define IGP01E1000_IEEE_REGS_PAGE  0x0000
-#define IGP01E1000_IEEE_RESTART_AUTONEG 0x3300
-#define IGP01E1000_IEEE_FORCE_GIGA      0x0140
-
-/* IGP01E1000 Specific Registers */
-#define IGP01E1000_PHY_PORT_CONFIG 0x10 /* PHY Specific Port Config Register */
-#define IGP01E1000_PHY_PORT_STATUS 0x11 /* PHY Specific Status Register */
-#define IGP01E1000_PHY_PORT_CTRL   0x12 /* PHY Specific Control Register */
-#define IGP01E1000_PHY_LINK_HEALTH 0x13 /* PHY Link Health Register */
-#define IGP01E1000_GMII_FIFO       0x14 /* GMII FIFO Register */
-#define IGP01E1000_PHY_CHANNEL_QUALITY 0x15 /* PHY Channel Quality Register */
-#define IGP02E1000_PHY_POWER_MGMT      0x19
-#define IGP01E1000_PHY_PAGE_SELECT     0x1F /* PHY Page Select Core Register */
-
-/* IGP01E1000 AGC Registers - stores the cable length values*/
-#define IGP01E1000_PHY_AGC_A        0x1172
-#define IGP01E1000_PHY_AGC_B        0x1272
-#define IGP01E1000_PHY_AGC_C        0x1472
-#define IGP01E1000_PHY_AGC_D        0x1872
-
-/* IGP02E1000 AGC Registers for cable length values */
-#define IGP02E1000_PHY_AGC_A        0x11B1
-#define IGP02E1000_PHY_AGC_B        0x12B1
-#define IGP02E1000_PHY_AGC_C        0x14B1
-#define IGP02E1000_PHY_AGC_D        0x18B1
-
-/* IGP01E1000 DSP Reset Register */
-#define IGP01E1000_PHY_DSP_RESET   0x1F33
-#define IGP01E1000_PHY_DSP_SET     0x1F71
-#define IGP01E1000_PHY_DSP_FFE     0x1F35
-
-#define IGP01E1000_PHY_CHANNEL_NUM    4
-#define IGP02E1000_PHY_CHANNEL_NUM    4
-
-#define IGP01E1000_PHY_AGC_PARAM_A    0x1171
-#define IGP01E1000_PHY_AGC_PARAM_B    0x1271
-#define IGP01E1000_PHY_AGC_PARAM_C    0x1471
-#define IGP01E1000_PHY_AGC_PARAM_D    0x1871
-
-#define IGP01E1000_PHY_EDAC_MU_INDEX        0xC000
-#define IGP01E1000_PHY_EDAC_SIGN_EXT_9_BITS 0x8000
-
-#define IGP01E1000_PHY_ANALOG_TX_STATE      0x2890
-#define IGP01E1000_PHY_ANALOG_CLASS_A       0x2000
-#define IGP01E1000_PHY_FORCE_ANALOG_ENABLE  0x0004
-#define IGP01E1000_PHY_DSP_FFE_CM_CP        0x0069
-
-#define IGP01E1000_PHY_DSP_FFE_DEFAULT      0x002A
-/* IGP01E1000 PCS Initialization register - stores the polarity status when
- * speed = 1000 Mbps. */
-#define IGP01E1000_PHY_PCS_INIT_REG  0x00B4
-#define IGP01E1000_PHY_PCS_CTRL_REG  0x00B5
-
-#define IGP01E1000_ANALOG_REGS_PAGE  0x20C0
-
-/* Bits...
- * 15-5: page
- * 4-0: register offset
- */
-#define GG82563_PAGE_SHIFT        5
-#define GG82563_REG(page, reg)    \
-        (((page) << GG82563_PAGE_SHIFT) | ((reg) & MAX_PHY_REG_ADDRESS))
-#define GG82563_MIN_ALT_REG       30
-
-/* GG82563 Specific Registers */
-#define GG82563_PHY_SPEC_CTRL           \
-        GG82563_REG(0, 16) /* PHY Specific Control */
-#define GG82563_PHY_SPEC_STATUS         \
-        GG82563_REG(0, 17) /* PHY Specific Status */
-#define GG82563_PHY_INT_ENABLE          \
-        GG82563_REG(0, 18) /* Interrupt Enable */
-#define GG82563_PHY_SPEC_STATUS_2       \
-        GG82563_REG(0, 19) /* PHY Specific Status 2 */
-#define GG82563_PHY_RX_ERR_CNTR         \
-        GG82563_REG(0, 21) /* Receive Error Counter */
-#define GG82563_PHY_PAGE_SELECT         \
-        GG82563_REG(0, 22) /* Page Select */
-#define GG82563_PHY_SPEC_CTRL_2         \
-        GG82563_REG(0, 26) /* PHY Specific Control 2 */
-#define GG82563_PHY_PAGE_SELECT_ALT     \
-        GG82563_REG(0, 29) /* Alternate Page Select */
-#define GG82563_PHY_TEST_CLK_CTRL       \
-        GG82563_REG(0, 30) /* Test Clock Control (use reg. 29 to select) */
-
-#define GG82563_PHY_MAC_SPEC_CTRL       \
-        GG82563_REG(2, 21) /* MAC Specific Control Register */
-#define GG82563_PHY_MAC_SPEC_CTRL_2     \
-        GG82563_REG(2, 26) /* MAC Specific Control 2 */
-
-#define GG82563_PHY_DSP_DISTANCE    \
-        GG82563_REG(5, 26) /* DSP Distance */
-
-/* Page 193 - Port Control Registers */
-#define GG82563_PHY_KMRN_MODE_CTRL   \
-        GG82563_REG(193, 16) /* Kumeran Mode Control */
-#define GG82563_PHY_PORT_RESET          \
-        GG82563_REG(193, 17) /* Port Reset */
-#define GG82563_PHY_REVISION_ID         \
-        GG82563_REG(193, 18) /* Revision ID */
-#define GG82563_PHY_DEVICE_ID           \
-        GG82563_REG(193, 19) /* Device ID */
-#define GG82563_PHY_PWR_MGMT_CTRL       \
-        GG82563_REG(193, 20) /* Power Management Control */
-#define GG82563_PHY_RATE_ADAPT_CTRL     \
-        GG82563_REG(193, 25) /* Rate Adaptation Control */
-
-/* Page 194 - KMRN Registers */
-#define GG82563_PHY_KMRN_FIFO_CTRL_STAT \
-        GG82563_REG(194, 16) /* FIFO's Control/Status */
-#define GG82563_PHY_KMRN_CTRL           \
-        GG82563_REG(194, 17) /* Control */
-#define GG82563_PHY_INBAND_CTRL         \
-        GG82563_REG(194, 18) /* Inband Control */
-#define GG82563_PHY_KMRN_DIAGNOSTIC     \
-        GG82563_REG(194, 19) /* Diagnostic */
-#define GG82563_PHY_ACK_TIMEOUTS        \
-        GG82563_REG(194, 20) /* Acknowledge Timeouts */
-#define GG82563_PHY_ADV_ABILITY         \
-        GG82563_REG(194, 21) /* Advertised Ability */
-#define GG82563_PHY_LINK_PARTNER_ADV_ABILITY \
-        GG82563_REG(194, 23) /* Link Partner Advertised Ability */
-#define GG82563_PHY_ADV_NEXT_PAGE       \
-        GG82563_REG(194, 24) /* Advertised Next Page */
-#define GG82563_PHY_LINK_PARTNER_ADV_NEXT_PAGE \
-        GG82563_REG(194, 25) /* Link Partner Advertised Next page */
-#define GG82563_PHY_KMRN_MISC           \
-        GG82563_REG(194, 26) /* Misc. */
-
-/* PHY Control Register */
-#define MII_CR_SPEED_SELECT_MSB 0x0040  /* bits 6,13: 10=1000, 01=100, 00=10 */
-#define MII_CR_COLL_TEST_ENABLE 0x0080  /* Collision test enable */
-#define MII_CR_FULL_DUPLEX      0x0100  /* FDX =1, half duplex =0 */
-#define MII_CR_RESTART_AUTO_NEG 0x0200  /* Restart auto negotiation */
-#define MII_CR_ISOLATE          0x0400  /* Isolate PHY from MII */
-#define MII_CR_POWER_DOWN       0x0800  /* Power down */
-#define MII_CR_AUTO_NEG_EN      0x1000  /* Auto Neg Enable */
-#define MII_CR_SPEED_SELECT_LSB 0x2000  /* bits 6,13: 10=1000, 01=100, 00=10 */
-#define MII_CR_LOOPBACK         0x4000  /* 0 = normal, 1 = loopback */
-#define MII_CR_RESET            0x8000  /* 0 = normal, 1 = PHY reset */
-
-/* PHY Status Register */
-#define MII_SR_EXTENDED_CAPS     0x0001 /* Extended register capabilities */
-#define MII_SR_JABBER_DETECT     0x0002 /* Jabber Detected */
-#define MII_SR_LINK_STATUS       0x0004 /* Link Status 1 = link */
-#define MII_SR_AUTONEG_CAPS      0x0008 /* Auto Neg Capable */
-#define MII_SR_REMOTE_FAULT      0x0010 /* Remote Fault Detect */
-#define MII_SR_AUTONEG_COMPLETE  0x0020 /* Auto Neg Complete */
-#define MII_SR_PREAMBLE_SUPPRESS 0x0040 /* Preamble may be suppressed */
-#define MII_SR_EXTENDED_STATUS   0x0100 /* Ext. status info in Reg 0x0F */
-#define MII_SR_100T2_HD_CAPS     0x0200 /* 100T2 Half Duplex Capable */
-#define MII_SR_100T2_FD_CAPS     0x0400 /* 100T2 Full Duplex Capable */
-#define MII_SR_10T_HD_CAPS       0x0800 /* 10T   Half Duplex Capable */
-#define MII_SR_10T_FD_CAPS       0x1000 /* 10T   Full Duplex Capable */
-#define MII_SR_100X_HD_CAPS      0x2000 /* 100X  Half Duplex Capable */
-#define MII_SR_100X_FD_CAPS      0x4000 /* 100X  Full Duplex Capable */
-#define MII_SR_100T4_CAPS        0x8000 /* 100T4 Capable */
-
-/* Autoneg Advertisement Register */
-#define NWAY_AR_SELECTOR_FIELD 0x0001   /* indicates IEEE 802.3 CSMA/CD */
-#define NWAY_AR_10T_HD_CAPS    0x0020   /* 10T   Half Duplex Capable */
-#define NWAY_AR_10T_FD_CAPS    0x0040   /* 10T   Full Duplex Capable */
-#define NWAY_AR_100TX_HD_CAPS  0x0080   /* 100TX Half Duplex Capable */
-#define NWAY_AR_100TX_FD_CAPS  0x0100   /* 100TX Full Duplex Capable */
-#define NWAY_AR_100T4_CAPS     0x0200   /* 100T4 Capable */
-#define NWAY_AR_PAUSE          0x0400   /* Pause operation desired */
-#define NWAY_AR_ASM_DIR        0x0800   /* Asymmetric Pause Direction bit */
-#define NWAY_AR_REMOTE_FAULT   0x2000   /* Remote Fault detected */
-#define NWAY_AR_NEXT_PAGE      0x8000   /* Next Page ability supported */
-
-/* Link Partner Ability Register (Base Page) */
-#define NWAY_LPAR_SELECTOR_FIELD 0x0000 /* LP protocol selector field */
-#define NWAY_LPAR_10T_HD_CAPS    0x0020 /* LP is 10T   Half Duplex Capable */
-#define NWAY_LPAR_10T_FD_CAPS    0x0040 /* LP is 10T   Full Duplex Capable */
-#define NWAY_LPAR_100TX_HD_CAPS  0x0080 /* LP is 100TX Half Duplex Capable */
-#define NWAY_LPAR_100TX_FD_CAPS  0x0100 /* LP is 100TX Full Duplex Capable */
-#define NWAY_LPAR_100T4_CAPS     0x0200 /* LP is 100T4 Capable */
-#define NWAY_LPAR_PAUSE          0x0400 /* LP Pause operation desired */
-#define NWAY_LPAR_ASM_DIR        0x0800 /* LP Asymmetric Pause Direction bit */
-#define NWAY_LPAR_REMOTE_FAULT   0x2000 /* LP has detected Remote Fault */
-#define NWAY_LPAR_ACKNOWLEDGE    0x4000 /* LP has rx'd link code word */
-#define NWAY_LPAR_NEXT_PAGE      0x8000 /* Next Page ability supported */
-
-/* Autoneg Expansion Register */
-#define NWAY_ER_LP_NWAY_CAPS      0x0001 /* LP has Auto Neg Capability */
-#define NWAY_ER_PAGE_RXD          0x0002 /* LP is 10T   Half Duplex Capable */
-#define NWAY_ER_NEXT_PAGE_CAPS    0x0004 /* LP is 10T   Full Duplex Capable */
-#define NWAY_ER_LP_NEXT_PAGE_CAPS 0x0008 /* LP is 100TX Half Duplex Capable */
-#define NWAY_ER_PAR_DETECT_FAULT  0x0010 /* LP is 100TX Full Duplex Capable */
-
-/* Next Page TX Register */
-#define NPTX_MSG_CODE_FIELD 0x0001 /* NP msg code or unformatted data */
-#define NPTX_TOGGLE         0x0800 /* Toggles between exchanges
-                                    * of different NP
-                                    */
-#define NPTX_ACKNOWLDGE2    0x1000 /* 1 = will comply with msg
-                                    * 0 = cannot comply with msg
-                                    */
-#define NPTX_MSG_PAGE       0x2000 /* formatted(1)/unformatted(0) pg */
-#define NPTX_NEXT_PAGE      0x8000 /* 1 = addition NP will follow
-                                    * 0 = sending last NP
-                                    */
-
-/* Link Partner Next Page Register */
-#define LP_RNPR_MSG_CODE_FIELD 0x0001 /* NP msg code or unformatted data */
-#define LP_RNPR_TOGGLE         0x0800 /* Toggles between exchanges
-                                       * of different NP
-                                       */
-#define LP_RNPR_ACKNOWLDGE2    0x1000 /* 1 = will comply with msg
-                                       * 0 = cannot comply with msg
-                                       */
-#define LP_RNPR_MSG_PAGE       0x2000  /* formatted(1)/unformatted(0) pg */
-#define LP_RNPR_ACKNOWLDGE     0x4000  /* 1 = ACK / 0 = NO ACK */
-#define LP_RNPR_NEXT_PAGE      0x8000  /* 1 = addition NP will follow
-                                        * 0 = sending last NP
-                                        */
-
-/* 1000BASE-T Control Register */
-#define CR_1000T_ASYM_PAUSE      0x0080 /* Advertise asymmetric pause bit */
-#define CR_1000T_HD_CAPS         0x0100 /* Advertise 1000T HD capability */
-#define CR_1000T_FD_CAPS         0x0200 /* Advertise 1000T FD capability  */
-#define CR_1000T_REPEATER_DTE    0x0400 /* 1=Repeater/switch device port */
-                                        /* 0=DTE device */
-#define CR_1000T_MS_VALUE        0x0800 /* 1=Configure PHY as Master */
-                                        /* 0=Configure PHY as Slave */
-#define CR_1000T_MS_ENABLE       0x1000 /* 1=Master/Slave manual config value 
*/
-                                        /* 0=Automatic Master/Slave config */
-#define CR_1000T_TEST_MODE_NORMAL 0x0000 /* Normal Operation */
-#define CR_1000T_TEST_MODE_1     0x2000 /* Transmit Waveform test */
-#define CR_1000T_TEST_MODE_2     0x4000 /* Master Transmit Jitter test */
-#define CR_1000T_TEST_MODE_3     0x6000 /* Slave Transmit Jitter test */
-#define CR_1000T_TEST_MODE_4     0x8000 /* Transmitter Distortion test */
-
-/* 1000BASE-T Status Register */
-#define SR_1000T_IDLE_ERROR_CNT   0x00FF /* Num idle errors since last read */
-#define SR_1000T_ASYM_PAUSE_DIR   0x0100 /* LP asymmetric pause direction bit 
*/
-#define SR_1000T_LP_HD_CAPS       0x0400 /* LP is 1000T HD capable */
-#define SR_1000T_LP_FD_CAPS       0x0800 /* LP is 1000T FD capable */
-#define SR_1000T_REMOTE_RX_STATUS 0x1000 /* Remote receiver OK */
-#define SR_1000T_LOCAL_RX_STATUS  0x2000 /* Local receiver OK */
-#define SR_1000T_MS_CONFIG_RES    0x4000 /* 1=Local TX is Master, 0=Slave */
-#define SR_1000T_MS_CONFIG_FAULT  0x8000 /* Master/Slave config fault */
-#define SR_1000T_REMOTE_RX_STATUS_SHIFT          12
-#define SR_1000T_LOCAL_RX_STATUS_SHIFT           13
-#define SR_1000T_PHY_EXCESSIVE_IDLE_ERR_COUNT    5
-#define FFE_IDLE_ERR_COUNT_TIMEOUT_20            20
-#define FFE_IDLE_ERR_COUNT_TIMEOUT_100           100
-
-/* Extended Status Register */
-#define IEEE_ESR_1000T_HD_CAPS 0x1000 /* 1000T HD capable */
-#define IEEE_ESR_1000T_FD_CAPS 0x2000 /* 1000T FD capable */
-#define IEEE_ESR_1000X_HD_CAPS 0x4000 /* 1000X HD capable */
-#define IEEE_ESR_1000X_FD_CAPS 0x8000 /* 1000X FD capable */
-
-#define PHY_TX_POLARITY_MASK   0x0100 /* register 10h bit 8 (polarity bit) */
-#define PHY_TX_NORMAL_POLARITY 0      /* register 10h bit 8 (normal polarity) 
*/
-
-#define AUTO_POLARITY_DISABLE  0x0010 /* register 11h bit 4 */
-                                      /* (0=enable, 1=disable) */
-
-/* M88E1000 PHY Specific Control Register */
-#define M88E1000_PSCR_JABBER_DISABLE    0x0001 /* 1=Jabber Function disabled */
-#define M88E1000_PSCR_POLARITY_REVERSAL 0x0002 /* 1=Polarity Reversal enabled 
*/
-#define M88E1000_PSCR_SQE_TEST          0x0004 /* 1=SQE Test enabled */
-#define M88E1000_PSCR_CLK125_DISABLE    0x0010 /* 1=CLK125 low,
-                                                * 0=CLK125 toggling
-                                                */
-#define M88E1000_PSCR_MDI_MANUAL_MODE  0x0000  /* MDI Crossover Mode bits 6:5 
*/
-                                               /* Manual MDI configuration */
-#define M88E1000_PSCR_MDIX_MANUAL_MODE 0x0020  /* Manual MDIX configuration */
-#define M88E1000_PSCR_AUTO_X_1000T     0x0040  /* 1000BASE-T: Auto crossover,
-                                                *  100BASE-TX/10BASE-T:
-                                                *  MDI Mode
-                                                */
-#define M88E1000_PSCR_AUTO_X_MODE      0x0060  /* Auto crossover enabled
-                                                * all speeds.
-                                                */
-#define M88E1000_PSCR_10BT_EXT_DIST_ENABLE 0x0080
-                                        /* 1=Enable Extended 10BASE-T distance
-                                         * (Lower 10BASE-T RX Threshold)
-                                         * 0=Normal 10BASE-T RX Threshold */
-#define M88E1000_PSCR_MII_5BIT_ENABLE      0x0100
-                                        /* 1=5-Bit interface in 100BASE-TX
-                                         * 0=MII interface in 100BASE-TX */
-#define M88E1000_PSCR_SCRAMBLER_DISABLE    0x0200 /* 1=Scrambler disable */
-#define M88E1000_PSCR_FORCE_LINK_GOOD      0x0400 /* 1=Force link good */
-#define M88E1000_PSCR_ASSERT_CRS_ON_TX     0x0800 /* 1=Assert CRS on Transmit 
*/
-
-#define M88E1000_PSCR_POLARITY_REVERSAL_SHIFT    1
-#define M88E1000_PSCR_AUTO_X_MODE_SHIFT          5
-#define M88E1000_PSCR_10BT_EXT_DIST_ENABLE_SHIFT 7
-
-/* M88E1000 PHY Specific Status Register */
-#define M88E1000_PSSR_JABBER             0x0001 /* 1=Jabber */
-#define M88E1000_PSSR_REV_POLARITY       0x0002 /* 1=Polarity reversed */
-#define M88E1000_PSSR_DOWNSHIFT          0x0020 /* 1=Downshifted */
-#define M88E1000_PSSR_MDIX               0x0040 /* 1=MDIX; 0=MDI */
-#define M88E1000_PSSR_CABLE_LENGTH       0x0380 /* 0=<50M;1=50-80M;2=80-110M;
-                                            * 3=110-140M;4=>140M */
-#define M88E1000_PSSR_LINK               0x0400 /* 1=Link up, 0=Link down */
-#define M88E1000_PSSR_SPD_DPLX_RESOLVED  0x0800 /* 1=Speed & Duplex resolved */
-#define M88E1000_PSSR_PAGE_RCVD          0x1000 /* 1=Page received */
-#define M88E1000_PSSR_DPLX               0x2000 /* 1=Duplex 0=Half Duplex */
-#define M88E1000_PSSR_SPEED              0xC000 /* Speed, bits 14:15 */
-#define M88E1000_PSSR_10MBS              0x0000 /* 00=10Mbs */
-#define M88E1000_PSSR_100MBS             0x4000 /* 01=100Mbs */
-#define M88E1000_PSSR_1000MBS            0x8000 /* 10=1000Mbs */
-
-#define M88E1000_PSSR_REV_POLARITY_SHIFT 1
-#define M88E1000_PSSR_DOWNSHIFT_SHIFT    5
-#define M88E1000_PSSR_MDIX_SHIFT         6
-#define M88E1000_PSSR_CABLE_LENGTH_SHIFT 7
-
-/* M88E1000 Extended PHY Specific Control Register */
-#define M88E1000_EPSCR_FIBER_LOOPBACK 0x4000 /* 1=Fiber loopback */
-#define M88E1000_EPSCR_DOWN_NO_IDLE   0x8000 /* 1=Lost lock detect enabled.
-                                              * Will assert lost lock and bring
-                                              * link down if idle not seen
-                                              * within 1ms in 1000BASE-T
-                                              */
-/* Number of times we will attempt to autonegotiate before downshifting if we
- * are the master */
-#define M88E1000_EPSCR_MASTER_DOWNSHIFT_MASK 0x0C00
-#define M88E1000_EPSCR_MASTER_DOWNSHIFT_1X   0x0000
-#define M88E1000_EPSCR_MASTER_DOWNSHIFT_2X   0x0400
-#define M88E1000_EPSCR_MASTER_DOWNSHIFT_3X   0x0800
-#define M88E1000_EPSCR_MASTER_DOWNSHIFT_4X   0x0C00
-/* Number of times we will attempt to autonegotiate before downshifting if we
- * are the slave */
-#define M88E1000_EPSCR_SLAVE_DOWNSHIFT_MASK  0x0300
-#define M88E1000_EPSCR_SLAVE_DOWNSHIFT_DIS   0x0000
-#define M88E1000_EPSCR_SLAVE_DOWNSHIFT_1X    0x0100
-#define M88E1000_EPSCR_SLAVE_DOWNSHIFT_2X    0x0200
-#define M88E1000_EPSCR_SLAVE_DOWNSHIFT_3X    0x0300
-#define M88E1000_EPSCR_TX_CLK_2_5     0x0060 /* 2.5 MHz TX_CLK */
-#define M88E1000_EPSCR_TX_CLK_25      0x0070 /* 25  MHz TX_CLK */
-#define M88E1000_EPSCR_TX_CLK_0       0x0000 /* NO  TX_CLK */
-
-/* M88EC018 Rev 2 specific DownShift settings */
-#define M88EC018_EPSCR_DOWNSHIFT_COUNTER_MASK  0x0E00
-#define M88EC018_EPSCR_DOWNSHIFT_COUNTER_1X    0x0000
-#define M88EC018_EPSCR_DOWNSHIFT_COUNTER_2X    0x0200
-#define M88EC018_EPSCR_DOWNSHIFT_COUNTER_3X    0x0400
-#define M88EC018_EPSCR_DOWNSHIFT_COUNTER_4X    0x0600
-#define M88EC018_EPSCR_DOWNSHIFT_COUNTER_5X    0x0800
-#define M88EC018_EPSCR_DOWNSHIFT_COUNTER_6X    0x0A00
-#define M88EC018_EPSCR_DOWNSHIFT_COUNTER_7X    0x0C00
-#define M88EC018_EPSCR_DOWNSHIFT_COUNTER_8X    0x0E00
-
-/* IGP01E1000 Specific Port Config Register - R/W */
-#define IGP01E1000_PSCFR_AUTO_MDIX_PAR_DETECT  0x0010
-#define IGP01E1000_PSCFR_PRE_EN                0x0020
-#define IGP01E1000_PSCFR_SMART_SPEED           0x0080
-#define IGP01E1000_PSCFR_DISABLE_TPLOOPBACK    0x0100
-#define IGP01E1000_PSCFR_DISABLE_JABBER        0x0400
-#define IGP01E1000_PSCFR_DISABLE_TRANSMIT      0x2000
-
-/* IGP01E1000 Specific Port Status Register - R/O */
-#define IGP01E1000_PSSR_AUTONEG_FAILED         0x0001 /* RO LH SC */
-#define IGP01E1000_PSSR_POLARITY_REVERSED      0x0002
-#define IGP01E1000_PSSR_CABLE_LENGTH           0x007C
-#define IGP01E1000_PSSR_FULL_DUPLEX            0x0200
-#define IGP01E1000_PSSR_LINK_UP                0x0400
-#define IGP01E1000_PSSR_MDIX                   0x0800
-#define IGP01E1000_PSSR_SPEED_MASK             0xC000 /* speed bits mask */
-#define IGP01E1000_PSSR_SPEED_10MBPS           0x4000
-#define IGP01E1000_PSSR_SPEED_100MBPS          0x8000
-#define IGP01E1000_PSSR_SPEED_1000MBPS         0xC000
-#define IGP01E1000_PSSR_CABLE_LENGTH_SHIFT     0x0002 /* shift right 2 */
-#define IGP01E1000_PSSR_MDIX_SHIFT             0x000B /* shift right 11 */
-
-/* IGP01E1000 Specific Port Control Register - R/W */
-#define IGP01E1000_PSCR_TP_LOOPBACK            0x0010
-#define IGP01E1000_PSCR_CORRECT_NC_SCMBLR      0x0200
-#define IGP01E1000_PSCR_TEN_CRS_SELECT         0x0400
-#define IGP01E1000_PSCR_FLIP_CHIP              0x0800
-#define IGP01E1000_PSCR_AUTO_MDIX              0x1000
-#define IGP01E1000_PSCR_FORCE_MDI_MDIX         0x2000 /* 0-MDI, 1-MDIX */
-
-/* IGP01E1000 Specific Port Link Health Register */
-#define IGP01E1000_PLHR_SS_DOWNGRADE           0x8000
-#define IGP01E1000_PLHR_GIG_SCRAMBLER_ERROR    0x4000
-#define IGP01E1000_PLHR_MASTER_FAULT           0x2000
-#define IGP01E1000_PLHR_MASTER_RESOLUTION      0x1000
-#define IGP01E1000_PLHR_GIG_REM_RCVR_NOK       0x0800 /* LH */
-#define IGP01E1000_PLHR_IDLE_ERROR_CNT_OFLOW   0x0400 /* LH */
-#define IGP01E1000_PLHR_DATA_ERR_1             0x0200 /* LH */
-#define IGP01E1000_PLHR_DATA_ERR_0             0x0100
-#define IGP01E1000_PLHR_AUTONEG_FAULT          0x0040
-#define IGP01E1000_PLHR_AUTONEG_ACTIVE         0x0010
-#define IGP01E1000_PLHR_VALID_CHANNEL_D        0x0008
-#define IGP01E1000_PLHR_VALID_CHANNEL_C        0x0004
-#define IGP01E1000_PLHR_VALID_CHANNEL_B        0x0002
-#define IGP01E1000_PLHR_VALID_CHANNEL_A        0x0001
-
-/* IGP01E1000 Channel Quality Register */
-#define IGP01E1000_MSE_CHANNEL_D        0x000F
-#define IGP01E1000_MSE_CHANNEL_C        0x00F0
-#define IGP01E1000_MSE_CHANNEL_B        0x0F00
-#define IGP01E1000_MSE_CHANNEL_A        0xF000
-
-#define IGP02E1000_PM_SPD                         0x0001  /* Smart Power Down 
*/
-#define IGP02E1000_PM_D3_LPLU                     0x0004  /* Enable LPLU in 
non-D0a modes */
-#define IGP02E1000_PM_D0_LPLU                     0x0002  /* Enable LPLU in 
D0a mode */
-
-/* IGP01E1000 DSP reset macros */
-#define DSP_RESET_ENABLE     0x0
-#define DSP_RESET_DISABLE    0x2
-#define E1000_MAX_DSP_RESETS 10
-
-/* IGP01E1000 & IGP02E1000 AGC Registers */
-
-#define IGP01E1000_AGC_LENGTH_SHIFT 7         /* Coarse - 13:11, Fine - 10:7 */
-#define IGP02E1000_AGC_LENGTH_SHIFT 9         /* Coarse - 15:13, Fine - 12:9 */
-
-/* IGP02E1000 AGC Register Length 9-bit mask */
-#define IGP02E1000_AGC_LENGTH_MASK  0x7F
-
-/* 7 bits (3 Coarse + 4 Fine) --> 128 optional values */
-#define IGP01E1000_AGC_LENGTH_TABLE_SIZE 128
-#define IGP02E1000_AGC_LENGTH_TABLE_SIZE 113
-
-/* The precision error of the cable length is +/- 10 meters */
-#define IGP01E1000_AGC_RANGE    10
-#define IGP02E1000_AGC_RANGE    15
-
-/* IGP01E1000 PCS Initialization register */
-/* bits 3:6 in the PCS registers stores the channels polarity */
-#define IGP01E1000_PHY_POLARITY_MASK    0x0078
-
-/* IGP01E1000 GMII FIFO Register */
-#define IGP01E1000_GMII_FLEX_SPD               0x10 /* Enable flexible speed
-                                                     * on Link-Up */
-#define IGP01E1000_GMII_SPD                    0x20 /* Enable SPD */
-
-/* IGP01E1000 Analog Register */
-#define IGP01E1000_ANALOG_SPARE_FUSE_STATUS       0x20D1
-#define IGP01E1000_ANALOG_FUSE_STATUS             0x20D0
-#define IGP01E1000_ANALOG_FUSE_CONTROL            0x20DC
-#define IGP01E1000_ANALOG_FUSE_BYPASS             0x20DE
-
-#define IGP01E1000_ANALOG_FUSE_POLY_MASK            0xF000
-#define IGP01E1000_ANALOG_FUSE_FINE_MASK            0x0F80
-#define IGP01E1000_ANALOG_FUSE_COARSE_MASK          0x0070
-#define IGP01E1000_ANALOG_SPARE_FUSE_ENABLED        0x0100
-#define IGP01E1000_ANALOG_FUSE_ENABLE_SW_CONTROL    0x0002
-
-#define IGP01E1000_ANALOG_FUSE_COARSE_THRESH        0x0040
-#define IGP01E1000_ANALOG_FUSE_COARSE_10            0x0010
-#define IGP01E1000_ANALOG_FUSE_FINE_1               0x0080
-#define IGP01E1000_ANALOG_FUSE_FINE_10              0x0500
-
-/* GG82563 PHY Specific Status Register (Page 0, Register 16 */
-#define GG82563_PSCR_DISABLE_JABBER             0x0001 /* 1=Disable Jabber */
-#define GG82563_PSCR_POLARITY_REVERSAL_DISABLE  0x0002 /* 1=Polarity Reversal 
Disabled */
-#define GG82563_PSCR_POWER_DOWN                 0x0004 /* 1=Power Down */
-#define GG82563_PSCR_COPPER_TRANSMITER_DISABLE  0x0008 /* 1=Transmitter 
Disabled */
-#define GG82563_PSCR_CROSSOVER_MODE_MASK        0x0060
-#define GG82563_PSCR_CROSSOVER_MODE_MDI         0x0000 /* 00=Manual MDI 
configuration */
-#define GG82563_PSCR_CROSSOVER_MODE_MDIX        0x0020 /* 01=Manual MDIX 
configuration */
-#define GG82563_PSCR_CROSSOVER_MODE_AUTO        0x0060 /* 11=Automatic 
crossover */
-#define GG82563_PSCR_ENALBE_EXTENDED_DISTANCE   0x0080 /* 1=Enable Extended 
Distance */
-#define GG82563_PSCR_ENERGY_DETECT_MASK         0x0300
-#define GG82563_PSCR_ENERGY_DETECT_OFF          0x0000 /* 00,01=Off */
-#define GG82563_PSCR_ENERGY_DETECT_RX           0x0200 /* 10=Sense on Rx only 
(Energy Detect) */
-#define GG82563_PSCR_ENERGY_DETECT_RX_TM        0x0300 /* 11=Sense and Tx NLP 
*/
-#define GG82563_PSCR_FORCE_LINK_GOOD            0x0400 /* 1=Force Link Good */
-#define GG82563_PSCR_DOWNSHIFT_ENABLE           0x0800 /* 1=Enable Downshift */
-#define GG82563_PSCR_DOWNSHIFT_COUNTER_MASK     0x7000
-#define GG82563_PSCR_DOWNSHIFT_COUNTER_SHIFT    12
-
-/* PHY Specific Status Register (Page 0, Register 17) */
-#define GG82563_PSSR_JABBER                0x0001 /* 1=Jabber */
-#define GG82563_PSSR_POLARITY              0x0002 /* 1=Polarity Reversed */
-#define GG82563_PSSR_LINK                  0x0008 /* 1=Link is Up */
-#define GG82563_PSSR_ENERGY_DETECT         0x0010 /* 1=Sleep, 0=Active */
-#define GG82563_PSSR_DOWNSHIFT             0x0020 /* 1=Downshift */
-#define GG82563_PSSR_CROSSOVER_STATUS      0x0040 /* 1=MDIX, 0=MDI */
-#define GG82563_PSSR_RX_PAUSE_ENABLED      0x0100 /* 1=Receive Pause Enabled */
-#define GG82563_PSSR_TX_PAUSE_ENABLED      0x0200 /* 1=Transmit Pause Enabled 
*/
-#define GG82563_PSSR_LINK_UP               0x0400 /* 1=Link Up */
-#define GG82563_PSSR_SPEED_DUPLEX_RESOLVED 0x0800 /* 1=Resolved */
-#define GG82563_PSSR_PAGE_RECEIVED         0x1000 /* 1=Page Received */
-#define GG82563_PSSR_DUPLEX                0x2000 /* 1-Full-Duplex */
-#define GG82563_PSSR_SPEED_MASK            0xC000
-#define GG82563_PSSR_SPEED_10MBPS          0x0000 /* 00=10Mbps */
-#define GG82563_PSSR_SPEED_100MBPS         0x4000 /* 01=100Mbps */
-#define GG82563_PSSR_SPEED_1000MBPS        0x8000 /* 10=1000Mbps */
-
-/* PHY Specific Status Register 2 (Page 0, Register 19) */
-#define GG82563_PSSR2_JABBER                0x0001 /* 1=Jabber */
-#define GG82563_PSSR2_POLARITY_CHANGED      0x0002 /* 1=Polarity Changed */
-#define GG82563_PSSR2_ENERGY_DETECT_CHANGED 0x0010 /* 1=Energy Detect Changed 
*/
-#define GG82563_PSSR2_DOWNSHIFT_INTERRUPT   0x0020 /* 1=Downshift Detected */
-#define GG82563_PSSR2_MDI_CROSSOVER_CHANGE  0x0040 /* 1=Crossover Changed */
-#define GG82563_PSSR2_FALSE_CARRIER         0x0100 /* 1=False Carrier */
-#define GG82563_PSSR2_SYMBOL_ERROR          0x0200 /* 1=Symbol Error */
-#define GG82563_PSSR2_LINK_STATUS_CHANGED   0x0400 /* 1=Link Status Changed */
-#define GG82563_PSSR2_AUTO_NEG_COMPLETED    0x0800 /* 1=Auto-Neg Completed */
-#define GG82563_PSSR2_PAGE_RECEIVED         0x1000 /* 1=Page Received */
-#define GG82563_PSSR2_DUPLEX_CHANGED        0x2000 /* 1=Duplex Changed */
-#define GG82563_PSSR2_SPEED_CHANGED         0x4000 /* 1=Speed Changed */
-#define GG82563_PSSR2_AUTO_NEG_ERROR        0x8000 /* 1=Auto-Neg Error */
-
-/* PHY Specific Control Register 2 (Page 0, Register 26) */
-#define GG82563_PSCR2_10BT_POLARITY_FORCE           0x0002 /* 1=Force Negative 
Polarity */
-#define GG82563_PSCR2_1000MB_TEST_SELECT_MASK       0x000C
-#define GG82563_PSCR2_1000MB_TEST_SELECT_NORMAL     0x0000 /* 00,01=Normal 
Operation */
-#define GG82563_PSCR2_1000MB_TEST_SELECT_112NS      0x0008 /* 10=Select 112ns 
Sequence */
-#define GG82563_PSCR2_1000MB_TEST_SELECT_16NS       0x000C /* 11=Select 16ns 
Sequence */
-#define GG82563_PSCR2_REVERSE_AUTO_NEG              0x2000 /* 1=Reverse 
Auto-Negotiation */
-#define GG82563_PSCR2_1000BT_DISABLE                0x4000 /* 1=Disable 
1000BASE-T */
-#define GG82563_PSCR2_TRANSMITER_TYPE_MASK          0x8000
-#define GG82563_PSCR2_TRANSMITTER_TYPE_CLASS_B      0x0000 /* 0=Class B */
-#define GG82563_PSCR2_TRANSMITTER_TYPE_CLASS_A      0x8000 /* 1=Class A */
-
-/* MAC Specific Control Register (Page 2, Register 21) */
-/* Tx clock speed for Link Down and 1000BASE-T for the following speeds */
-#define GG82563_MSCR_TX_CLK_MASK                    0x0007
-#define GG82563_MSCR_TX_CLK_10MBPS_2_5MHZ           0x0004
-#define GG82563_MSCR_TX_CLK_100MBPS_25MHZ           0x0005
-#define GG82563_MSCR_TX_CLK_1000MBPS_2_5MHZ         0x0006
-#define GG82563_MSCR_TX_CLK_1000MBPS_25MHZ          0x0007
-
-#define GG82563_MSCR_ASSERT_CRS_ON_TX               0x0010 /* 1=Assert */
-
-/* DSP Distance Register (Page 5, Register 26) */
-#define GG82563_DSPD_CABLE_LENGTH               0x0007 /* 0 = <50M;
-                                                          1 = 50-80M;
-                                                          2 = 80-110M;
-                                                          3 = 110-140M;
-                                                          4 = >140M */
-
-/* Kumeran Mode Control Register (Page 193, Register 16) */
-#define GG82563_KMCR_PHY_LEDS_EN                    0x0020 /* 1=PHY LEDs, 
0=Kumeran Inband LEDs */
-#define GG82563_KMCR_FORCE_LINK_UP                  0x0040 /* 1=Force Link Up 
*/
-#define GG82563_KMCR_SUPPRESS_SGMII_EPD_EXT         0x0080
-#define GG82563_KMCR_MDIO_BUS_SPEED_SELECT_MASK     0x0400
-#define GG82563_KMCR_MDIO_BUS_SPEED_SELECT          0x0400 /* 1=6.25MHz, 
0=0.8MHz */
-#define GG82563_KMCR_PASS_FALSE_CARRIER             0x0800
-
-/* Power Management Control Register (Page 193, Register 20) */
-#define GG82563_PMCR_ENABLE_ELECTRICAL_IDLE         0x0001 /* 1=Enalbe SERDES 
Electrical Idle */
-#define GG82563_PMCR_DISABLE_PORT                   0x0002 /* 1=Disable Port */
-#define GG82563_PMCR_DISABLE_SERDES                 0x0004 /* 1=Disable SERDES 
*/
-#define GG82563_PMCR_REVERSE_AUTO_NEG               0x0008 /* 1=Enable Reverse 
Auto-Negotiation */
-#define GG82563_PMCR_DISABLE_1000_NON_D0            0x0010 /* 1=Disable 
1000Mbps Auto-Neg in non D0 */
-#define GG82563_PMCR_DISABLE_1000                   0x0020 /* 1=Disable 
1000Mbps Auto-Neg Always */
-#define GG82563_PMCR_REVERSE_AUTO_NEG_D0A           0x0040 /* 1=Enable D0a 
Reverse Auto-Negotiation */
-#define GG82563_PMCR_FORCE_POWER_STATE              0x0080 /* 1=Force Power 
State */
-#define GG82563_PMCR_PROGRAMMED_POWER_STATE_MASK    0x0300
-#define GG82563_PMCR_PROGRAMMED_POWER_STATE_DR      0x0000 /* 00=Dr */
-#define GG82563_PMCR_PROGRAMMED_POWER_STATE_D0U     0x0100 /* 01=D0u */
-#define GG82563_PMCR_PROGRAMMED_POWER_STATE_D0A     0x0200 /* 10=D0a */
-#define GG82563_PMCR_PROGRAMMED_POWER_STATE_D3      0x0300 /* 11=D3 */
-
-/* In-Band Control Register (Page 194, Register 18) */
-#define GG82563_ICR_DIS_PADDING                     0x0010 /* Disable Padding 
Use */
-
-
-/* Bit definitions for valid PHY IDs. */
-/* I = Integrated
- * E = External
- */
-#define M88_VENDOR         0x0141
-#define M88E1000_E_PHY_ID  0x01410C50
-#define M88E1000_I_PHY_ID  0x01410C30
-#define M88E1011_I_PHY_ID  0x01410C20
-#define IGP01E1000_I_PHY_ID  0x02A80380
-#define M88E1000_12_PHY_ID M88E1000_E_PHY_ID
-#define M88E1000_14_PHY_ID M88E1000_E_PHY_ID
-#define M88E1011_I_REV_4   0x04
-#define M88E1111_I_PHY_ID  0x01410CC0
-#define L1LXT971A_PHY_ID   0x001378E0
-#define GG82563_E_PHY_ID   0x01410CA0
-
-
-/* Bits...
- * 15-5: page
- * 4-0: register offset
- */
-#define PHY_PAGE_SHIFT        5
-#define PHY_REG(page, reg)    \
-        (((page) << PHY_PAGE_SHIFT) | ((reg) & MAX_PHY_REG_ADDRESS))
-
-#define IGP3_PHY_PORT_CTRL           \
-        PHY_REG(769, 17) /* Port General Configuration */
-#define IGP3_PHY_RATE_ADAPT_CTRL \
-        PHY_REG(769, 25) /* Rate Adapter Control Register */
-
-#define IGP3_KMRN_FIFO_CTRL_STATS \
-        PHY_REG(770, 16) /* KMRN FIFO's control/status register */
-#define IGP3_KMRN_POWER_MNG_CTRL \
-        PHY_REG(770, 17) /* KMRN Power Management Control Register */
-#define IGP3_KMRN_INBAND_CTRL \
-        PHY_REG(770, 18) /* KMRN Inband Control Register */
-#define IGP3_KMRN_DIAG \
-        PHY_REG(770, 19) /* KMRN Diagnostic register */
-#define IGP3_KMRN_DIAG_PCS_LOCK_LOSS 0x0002 /* RX PCS is not synced */
-#define IGP3_KMRN_ACK_TIMEOUT \
-        PHY_REG(770, 20) /* KMRN Acknowledge Timeouts register */
-
-#define IGP3_VR_CTRL \
-        PHY_REG(776, 18) /* Voltage regulator control register */
-#define IGP3_VR_CTRL_MODE_SHUT       0x0200 /* Enter powerdown, shutdown VRs */
-#define IGP3_VR_CTRL_MODE_MASK       0x0300 /* Shutdown VR Mask */
-
-#define IGP3_CAPABILITY \
-        PHY_REG(776, 19) /* IGP3 Capability Register */
-
-/* Capabilities for SKU Control  */
-#define IGP3_CAP_INITIATE_TEAM       0x0001 /* Able to initiate a team */
-#define IGP3_CAP_WFM                 0x0002 /* Support WoL and PXE */
-#define IGP3_CAP_ASF                 0x0004 /* Support ASF */
-#define IGP3_CAP_LPLU                0x0008 /* Support Low Power Link Up */
-#define IGP3_CAP_DC_AUTO_SPEED       0x0010 /* Support AC/DC Auto Link Speed */
-#define IGP3_CAP_SPD                 0x0020 /* Support Smart Power Down */
-#define IGP3_CAP_MULT_QUEUE          0x0040 /* Support 2 tx & 2 rx queues */
-#define IGP3_CAP_RSS                 0x0080 /* Support RSS */
-#define IGP3_CAP_8021PQ              0x0100 /* Support 802.1Q & 802.1p */
-#define IGP3_CAP_AMT_CB              0x0200 /* Support active manageability 
and circuit breaker */
-
-#define IGP3_PPC_JORDAN_EN           0x0001
-#define IGP3_PPC_JORDAN_GIGA_SPEED   0x0002
-
-#define IGP3_KMRN_PMC_EE_IDLE_LINK_DIS         0x0001
-#define IGP3_KMRN_PMC_K0S_ENTRY_LATENCY_MASK   0x001E
-#define IGP3_KMRN_PMC_K0S_MODE1_EN_GIGA        0x0020
-#define IGP3_KMRN_PMC_K0S_MODE1_EN_100         0x0040
-
-#define IGP3E1000_PHY_MISC_CTRL                0x1B   /* Misc. Ctrl register */
-#define IGP3_PHY_MISC_DUPLEX_MANUAL_SET        0x1000 /* Duplex Manual Set */
-
-#define IGP3_KMRN_EXT_CTRL  PHY_REG(770, 18)
-#define IGP3_KMRN_EC_DIS_INBAND    0x0080
-
-#define IGP03E1000_E_PHY_ID  0x02A80390
-#define IFE_E_PHY_ID         0x02A80330 /* 10/100 PHY */
-#define IFE_PLUS_E_PHY_ID    0x02A80320
-#define IFE_C_E_PHY_ID       0x02A80310
-
-#define IFE_PHY_EXTENDED_STATUS_CONTROL   0x10  /* 100BaseTx Extended Status, 
Control and Address */
-#define IFE_PHY_SPECIAL_CONTROL           0x11  /* 100BaseTx PHY special 
control register */
-#define IFE_PHY_RCV_FALSE_CARRIER         0x13  /* 100BaseTx Receive False 
Carrier Counter */
-#define IFE_PHY_RCV_DISCONNECT            0x14  /* 100BaseTx Receive Disconnet 
Counter */
-#define IFE_PHY_RCV_ERROT_FRAME           0x15  /* 100BaseTx Receive Error 
Frame Counter */
-#define IFE_PHY_RCV_SYMBOL_ERR            0x16  /* Receive Symbol Error 
Counter */
-#define IFE_PHY_PREM_EOF_ERR              0x17  /* 100BaseTx Receive Premature 
End Of Frame Error Counter */
-#define IFE_PHY_RCV_EOF_ERR               0x18  /* 10BaseT Receive End Of 
Frame Error Counter */
-#define IFE_PHY_TX_JABBER_DETECT          0x19  /* 10BaseT Transmit Jabber 
Detect Counter */
-#define IFE_PHY_EQUALIZER                 0x1A  /* PHY Equalizer Control and 
Status */
-#define IFE_PHY_SPECIAL_CONTROL_LED       0x1B  /* PHY special control and LED 
configuration */
-#define IFE_PHY_MDIX_CONTROL              0x1C  /* MDI/MDI-X Control register 
*/
-#define IFE_PHY_HWI_CONTROL               0x1D  /* Hardware Integrity Control 
(HWI) */
-
-#define IFE_PESC_REDUCED_POWER_DOWN_DISABLE  0x2000  /* Defaut 1 = Disable 
auto reduced power down */
-#define IFE_PESC_100BTX_POWER_DOWN           0x0400  /* Indicates the power 
state of 100BASE-TX */
-#define IFE_PESC_10BTX_POWER_DOWN            0x0200  /* Indicates the power 
state of 10BASE-T */
-#define IFE_PESC_POLARITY_REVERSED           0x0100  /* Indicates 10BASE-T 
polarity */
-#define IFE_PESC_PHY_ADDR_MASK               0x007C  /* Bit 6:2 for sampled 
PHY address */
-#define IFE_PESC_SPEED                       0x0002  /* Auto-negotiation speed 
result 1=100Mbs, 0=10Mbs */
-#define IFE_PESC_DUPLEX                      0x0001  /* Auto-negotiation 
duplex result 1=Full, 0=Half */
-#define IFE_PESC_POLARITY_REVERSED_SHIFT     8
-
-#define IFE_PSC_DISABLE_DYNAMIC_POWER_DOWN   0x0100  /* 1 = Dyanmic Power Down 
disabled */
-#define IFE_PSC_FORCE_POLARITY               0x0020  /* 1=Reversed Polarity, 
0=Normal */
-#define IFE_PSC_AUTO_POLARITY_DISABLE        0x0010  /* 1=Auto Polarity 
Disabled, 0=Enabled */
-#define IFE_PSC_JABBER_FUNC_DISABLE          0x0001  /* 1=Jabber Disabled, 
0=Normal Jabber Operation */
-#define IFE_PSC_FORCE_POLARITY_SHIFT         5
-#define IFE_PSC_AUTO_POLARITY_DISABLE_SHIFT  4
-
-#define IFE_PMC_AUTO_MDIX                    0x0080  /* 1=enable MDI/MDI-X 
feature, default 0=disabled */
-#define IFE_PMC_FORCE_MDIX                   0x0040  /* 1=force MDIX-X, 
0=force MDI */
-#define IFE_PMC_MDIX_STATUS                  0x0020  /* 1=MDI-X, 0=MDI */
-#define IFE_PMC_AUTO_MDIX_COMPLETE           0x0010  /* Resolution algorithm 
is completed */
-#define IFE_PMC_MDIX_MODE_SHIFT              6
-#define IFE_PHC_MDIX_RESET_ALL_MASK          0x0000  /* Disable auto MDI-X */
-
-#define IFE_PHC_HWI_ENABLE                   0x8000  /* Enable the HWI feature 
*/
-#define IFE_PHC_ABILITY_CHECK                0x4000  /* 1= Test Passed, 
0=failed */
-#define IFE_PHC_TEST_EXEC                    0x2000  /* PHY launch test pulses 
on the wire */
-#define IFE_PHC_HIGHZ                        0x0200  /* 1 = Open Circuit */
-#define IFE_PHC_LOWZ                         0x0400  /* 1 = Short Circuit */
-#define IFE_PHC_LOW_HIGH_Z_MASK              0x0600  /* Mask for indication 
type of problem on the line */
-#define IFE_PHC_DISTANCE_MASK                0x01FF  /* Mask for distance to 
the cable problem, in 80cm granularity */
-#define IFE_PHC_RESET_ALL_MASK               0x0000  /* Disable HWI */
-#define IFE_PSCL_PROBE_MODE                  0x0020  /* LED Probe mode */
-#define IFE_PSCL_PROBE_LEDS_OFF              0x0006  /* Force LEDs 0 and 2 off 
*/
-#define IFE_PSCL_PROBE_LEDS_ON               0x0007  /* Force LEDs 0 and 2 on 
*/
-
-#define ICH_FLASH_COMMAND_TIMEOUT            5000    /* 5000 uSecs - adjusted 
*/
-#define ICH_FLASH_ERASE_TIMEOUT              3000000 /* Up to 3 seconds - 
worst case */
-#define ICH_FLASH_CYCLE_REPEAT_COUNT         10      /* 10 cycles */
-#define ICH_FLASH_SEG_SIZE_256               256
-#define ICH_FLASH_SEG_SIZE_4K                4096
-#define ICH_FLASH_SEG_SIZE_64K               65536
-
-#define ICH_CYCLE_READ                       0x0
-#define ICH_CYCLE_RESERVED                   0x1
-#define ICH_CYCLE_WRITE                      0x2
-#define ICH_CYCLE_ERASE                      0x3
-
-#define ICH_FLASH_GFPREG   0x0000
-#define ICH_FLASH_HSFSTS   0x0004
-#define ICH_FLASH_HSFCTL   0x0006
-#define ICH_FLASH_FADDR    0x0008
-#define ICH_FLASH_FDATA0   0x0010
-#define ICH_FLASH_FRACC    0x0050
-#define ICH_FLASH_FREG0    0x0054
-#define ICH_FLASH_FREG1    0x0058
-#define ICH_FLASH_FREG2    0x005C
-#define ICH_FLASH_FREG3    0x0060
-#define ICH_FLASH_FPR0     0x0074
-#define ICH_FLASH_FPR1     0x0078
-#define ICH_FLASH_SSFSTS   0x0090
-#define ICH_FLASH_SSFCTL   0x0092
-#define ICH_FLASH_PREOP    0x0094
-#define ICH_FLASH_OPTYPE   0x0096
-#define ICH_FLASH_OPMENU   0x0098
-
-#define ICH_FLASH_REG_MAPSIZE      0x00A0
-#define ICH_FLASH_SECTOR_SIZE      4096
-#define ICH_GFPREG_BASE_MASK       0x1FFF
-#define ICH_FLASH_LINEAR_ADDR_MASK 0x00FFFFFF
-
-/* ICH8 GbE Flash Hardware Sequencing Flash Status Register bit breakdown */
-/* Offset 04h HSFSTS */
-union ich8_hws_flash_status {
-    struct ich8_hsfsts {
-#ifdef __BIG_ENDIAN
-        u16 reserved2      :6;
-        u16 fldesvalid     :1;
-        u16 flockdn        :1;
-        u16 flcdone        :1;
-        u16 flcerr         :1;
-        u16 dael           :1;
-        u16 berasesz       :2;
-        u16 flcinprog      :1;
-        u16 reserved1      :2;
-#else
-        u16 flcdone        :1;   /* bit 0 Flash Cycle Done */
-        u16 flcerr         :1;   /* bit 1 Flash Cycle Error */
-        u16 dael           :1;   /* bit 2 Direct Access error Log */
-        u16 berasesz       :2;   /* bit 4:3 Block/Sector Erase Size */
-        u16 flcinprog      :1;   /* bit 5 flash SPI cycle in Progress */
-        u16 reserved1      :2;   /* bit 13:6 Reserved */
-        u16 reserved2      :6;   /* bit 13:6 Reserved */
-        u16 fldesvalid     :1;   /* bit 14 Flash Descriptor Valid */
-        u16 flockdn        :1;   /* bit 15 Flash Configuration Lock-Down */
-#endif
-    } hsf_status;
-    u16 regval;
-};
-
-/* ICH8 GbE Flash Hardware Sequencing Flash control Register bit breakdown */
-/* Offset 06h FLCTL */
-union ich8_hws_flash_ctrl {
-    struct ich8_hsflctl {
-#ifdef __BIG_ENDIAN
-        u16 fldbcount      :2;
-        u16 flockdn        :6;
-        u16 flcgo          :1;
-        u16 flcycle        :2;
-        u16 reserved       :5;
-#else
-        u16 flcgo          :1;   /* 0 Flash Cycle Go */
-        u16 flcycle        :2;   /* 2:1 Flash Cycle */
-        u16 reserved       :5;   /* 7:3 Reserved  */
-        u16 fldbcount      :2;   /* 9:8 Flash Data Byte Count */
-        u16 flockdn        :6;   /* 15:10 Reserved */
-#endif
-    } hsf_ctrl;
-    u16 regval;
-};
-
-/* ICH8 Flash Region Access Permissions */
-union ich8_hws_flash_regacc {
-    struct ich8_flracc {
-#ifdef __BIG_ENDIAN
-        u32 gmwag          :8;
-        u32 gmrag          :8;
-        u32 grwa           :8;
-        u32 grra           :8;
-#else
-        u32 grra           :8;   /* 0:7 GbE region Read Access */
-        u32 grwa           :8;   /* 8:15 GbE region Write Access */
-        u32 gmrag          :8;   /* 23:16 GbE Master Read Access Grant  */
-        u32 gmwag          :8;   /* 31:24 GbE Master Write Access Grant */
-#endif
-    } hsf_flregacc;
-    u16 regval;
-};
-
-/* Miscellaneous PHY bit definitions. */
-#define PHY_PREAMBLE        0xFFFFFFFF
-#define PHY_SOF             0x01
-#define PHY_OP_READ         0x02
-#define PHY_OP_WRITE        0x01
-#define PHY_TURNAROUND      0x02
-#define PHY_PREAMBLE_SIZE   32
-#define MII_CR_SPEED_1000   0x0040
-#define MII_CR_SPEED_100    0x2000
-#define MII_CR_SPEED_10     0x0000
-#define E1000_PHY_ADDRESS   0x01
-#define PHY_AUTO_NEG_TIME   45  /* 4.5 Seconds */
-#define PHY_FORCE_TIME      20  /* 2.0 Seconds */
-#define PHY_REVISION_MASK   0xFFFFFFF0
-#define DEVICE_SPEED_MASK   0x00000300  /* Device Ctrl Reg Speed Mask */
-#define REG4_SPEED_MASK     0x01E0
-#define REG9_SPEED_MASK     0x0300
-#define ADVERTISE_10_HALF   0x0001
-#define ADVERTISE_10_FULL   0x0002
-#define ADVERTISE_100_HALF  0x0004
-#define ADVERTISE_100_FULL  0x0008
-#define ADVERTISE_1000_HALF 0x0010
-#define ADVERTISE_1000_FULL 0x0020
-#define AUTONEG_ADVERTISE_SPEED_DEFAULT 0x002F  /* Everything but 1000-Half */
-#define AUTONEG_ADVERTISE_10_100_ALL    0x000F /* All 10/100 speeds*/
-#define AUTONEG_ADVERTISE_10_ALL        0x0003 /* 10Mbps Full & Half speeds*/
-
-#endif /* _E1000_HW_H_ */
diff --git a/dde_e1000/e1000_main.c b/dde_e1000/e1000_main.c
deleted file mode 100644
index f25a536..0000000
--- a/dde_e1000/e1000_main.c
+++ /dev/null
@@ -1,4851 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2006 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify it
-  under the terms and conditions of the GNU General Public License,
-  version 2, as published by the Free Software Foundation.
-
-  This program is distributed in the hope it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
-
-  You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-
-  The full GNU General Public License is included in this distribution in
-  the file called "COPYING".
-
-  Contact Information:
-  Linux NICS <address@hidden>
-  e1000-devel Mailing List <address@hidden>
-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-
-*******************************************************************************/
-
-#include "e1000.h"
-#include <net/ip6_checksum.h>
-
-#include <ddekit/timer.h>
-
-char e1000_driver_name[] = "e1000";
-static char e1000_driver_string[] = "Intel(R) PRO/1000 Network Driver";
-#define DRV_VERSION "7.3.21-k3-NAPI"
-const char e1000_driver_version[] = DRV_VERSION;
-static const char e1000_copyright[] = "Copyright (c) 1999-2006 Intel 
Corporation.";
-
-/* e1000_pci_tbl - PCI Device ID Table
- *
- * Last entry must be all 0s
- *
- * Macro expands to...
- *   {PCI_DEVICE(PCI_VENDOR_ID_INTEL, device_id)}
- */
-static struct pci_device_id e1000_pci_tbl[] = {
-       INTEL_E1000_ETHERNET_DEVICE(0x1000),
-       INTEL_E1000_ETHERNET_DEVICE(0x1001),
-       INTEL_E1000_ETHERNET_DEVICE(0x1004),
-       INTEL_E1000_ETHERNET_DEVICE(0x1008),
-       INTEL_E1000_ETHERNET_DEVICE(0x1009),
-       INTEL_E1000_ETHERNET_DEVICE(0x100C),
-       INTEL_E1000_ETHERNET_DEVICE(0x100D),
-       INTEL_E1000_ETHERNET_DEVICE(0x100E),
-       INTEL_E1000_ETHERNET_DEVICE(0x100F),
-       INTEL_E1000_ETHERNET_DEVICE(0x1010),
-       INTEL_E1000_ETHERNET_DEVICE(0x1011),
-       INTEL_E1000_ETHERNET_DEVICE(0x1012),
-       INTEL_E1000_ETHERNET_DEVICE(0x1013),
-       INTEL_E1000_ETHERNET_DEVICE(0x1014),
-       INTEL_E1000_ETHERNET_DEVICE(0x1015),
-       INTEL_E1000_ETHERNET_DEVICE(0x1016),
-       INTEL_E1000_ETHERNET_DEVICE(0x1017),
-       INTEL_E1000_ETHERNET_DEVICE(0x1018),
-       INTEL_E1000_ETHERNET_DEVICE(0x1019),
-       INTEL_E1000_ETHERNET_DEVICE(0x101A),
-       INTEL_E1000_ETHERNET_DEVICE(0x101D),
-       INTEL_E1000_ETHERNET_DEVICE(0x101E),
-       INTEL_E1000_ETHERNET_DEVICE(0x1026),
-       INTEL_E1000_ETHERNET_DEVICE(0x1027),
-       INTEL_E1000_ETHERNET_DEVICE(0x1028),
-       INTEL_E1000_ETHERNET_DEVICE(0x1075),
-       INTEL_E1000_ETHERNET_DEVICE(0x1076),
-       INTEL_E1000_ETHERNET_DEVICE(0x1077),
-       INTEL_E1000_ETHERNET_DEVICE(0x1078),
-       INTEL_E1000_ETHERNET_DEVICE(0x1079),
-       INTEL_E1000_ETHERNET_DEVICE(0x107A),
-       INTEL_E1000_ETHERNET_DEVICE(0x107B),
-       INTEL_E1000_ETHERNET_DEVICE(0x107C),
-       INTEL_E1000_ETHERNET_DEVICE(0x108A),
-       INTEL_E1000_ETHERNET_DEVICE(0x1099),
-       INTEL_E1000_ETHERNET_DEVICE(0x10B5),
-       /* required last entry */
-       {0,}
-};
-
-MODULE_DEVICE_TABLE(pci, e1000_pci_tbl);
-
-int e1000_up(struct e1000_adapter *adapter);
-void e1000_down(struct e1000_adapter *adapter);
-void e1000_reinit_locked(struct e1000_adapter *adapter);
-void e1000_reset(struct e1000_adapter *adapter);
-int e1000_set_spd_dplx(struct e1000_adapter *adapter, u16 spddplx);
-int e1000_setup_all_tx_resources(struct e1000_adapter *adapter);
-int e1000_setup_all_rx_resources(struct e1000_adapter *adapter);
-void e1000_free_all_tx_resources(struct e1000_adapter *adapter);
-void e1000_free_all_rx_resources(struct e1000_adapter *adapter);
-static int e1000_setup_tx_resources(struct e1000_adapter *adapter,
-                             struct e1000_tx_ring *txdr);
-static int e1000_setup_rx_resources(struct e1000_adapter *adapter,
-                             struct e1000_rx_ring *rxdr);
-static void e1000_free_tx_resources(struct e1000_adapter *adapter,
-                             struct e1000_tx_ring *tx_ring);
-static void e1000_free_rx_resources(struct e1000_adapter *adapter,
-                             struct e1000_rx_ring *rx_ring);
-void e1000_update_stats(struct e1000_adapter *adapter);
-
-static int e1000_init_module(void);
-static void e1000_exit_module(void);
-static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent);
-static void __devexit e1000_remove(struct pci_dev *pdev);
-static int e1000_alloc_queues(struct e1000_adapter *adapter);
-static int e1000_sw_init(struct e1000_adapter *adapter);
-static int e1000_open(struct net_device *netdev);
-static int e1000_close(struct net_device *netdev);
-static void e1000_configure_tx(struct e1000_adapter *adapter);
-static void e1000_configure_rx(struct e1000_adapter *adapter);
-static void e1000_setup_rctl(struct e1000_adapter *adapter);
-static void e1000_clean_all_tx_rings(struct e1000_adapter *adapter);
-static void e1000_clean_all_rx_rings(struct e1000_adapter *adapter);
-static void e1000_clean_tx_ring(struct e1000_adapter *adapter,
-                                struct e1000_tx_ring *tx_ring);
-static void e1000_clean_rx_ring(struct e1000_adapter *adapter,
-                                struct e1000_rx_ring *rx_ring);
-static void e1000_set_rx_mode(struct net_device *netdev);
-static void e1000_update_phy_info(unsigned long data);
-static void e1000_watchdog(unsigned long data);
-static void e1000_82547_tx_fifo_stall(unsigned long data);
-static int e1000_xmit_frame(struct sk_buff *skb, struct net_device *netdev);
-static struct net_device_stats * e1000_get_stats(struct net_device *netdev);
-static int e1000_change_mtu(struct net_device *netdev, int new_mtu);
-static int e1000_set_mac(struct net_device *netdev, void *p);
-static irqreturn_t e1000_intr(int irq, void *data);
-static irqreturn_t e1000_intr_msi(int irq, void *data);
-static bool e1000_clean_tx_irq(struct e1000_adapter *adapter,
-                              struct e1000_tx_ring *tx_ring);
-static int e1000_clean(struct napi_struct *napi, int budget);
-static bool e1000_clean_rx_irq(struct e1000_adapter *adapter,
-                              struct e1000_rx_ring *rx_ring,
-                              int *work_done, int work_to_do);
-static void e1000_alloc_rx_buffers(struct e1000_adapter *adapter,
-                                   struct e1000_rx_ring *rx_ring,
-                                  int cleaned_count);
-static int e1000_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd);
-static int e1000_mii_ioctl(struct net_device *netdev, struct ifreq *ifr,
-                          int cmd);
-static void e1000_enter_82542_rst(struct e1000_adapter *adapter);
-static void e1000_leave_82542_rst(struct e1000_adapter *adapter);
-static void e1000_tx_timeout(struct net_device *dev);
-static void e1000_reset_task(struct work_struct *work);
-static void e1000_smartspeed(struct e1000_adapter *adapter);
-static int e1000_82547_fifo_workaround(struct e1000_adapter *adapter,
-                                       struct sk_buff *skb);
-
-static void e1000_vlan_rx_register(struct net_device *netdev, struct 
vlan_group *grp);
-static void e1000_vlan_rx_add_vid(struct net_device *netdev, u16 vid);
-static void e1000_vlan_rx_kill_vid(struct net_device *netdev, u16 vid);
-static void e1000_restore_vlan(struct e1000_adapter *adapter);
-
-static int e1000_suspend(struct pci_dev *pdev, pm_message_t state);
-#ifdef CONFIG_PM
-static int e1000_resume(struct pci_dev *pdev);
-#endif
-static void e1000_shutdown(struct pci_dev *pdev);
-
-#ifdef CONFIG_NET_POLL_CONTROLLER
-/* for netdump / net console */
-static void e1000_netpoll (struct net_device *netdev);
-#endif
-
-#define COPYBREAK_DEFAULT 256
-static unsigned int copybreak __read_mostly = COPYBREAK_DEFAULT;
-module_param(copybreak, uint, 0644);
-MODULE_PARM_DESC(copybreak,
-       "Maximum size of packet that is copied to a new buffer on receive");
-
-static pci_ers_result_t e1000_io_error_detected(struct pci_dev *pdev,
-                     pci_channel_state_t state);
-static pci_ers_result_t e1000_io_slot_reset(struct pci_dev *pdev);
-static void e1000_io_resume(struct pci_dev *pdev);
-
-static struct pci_error_handlers e1000_err_handler = {
-       .error_detected = e1000_io_error_detected,
-       .slot_reset = e1000_io_slot_reset,
-       .resume = e1000_io_resume,
-};
-
-static struct pci_driver e1000_driver = {
-       .name     = e1000_driver_name,
-       .id_table = e1000_pci_tbl,
-       .probe    = e1000_probe,
-       .remove   = __devexit_p(e1000_remove),
-#ifdef CONFIG_PM
-       /* Power Managment Hooks */
-       .suspend  = e1000_suspend,
-       .resume   = e1000_resume,
-#endif
-       .shutdown = e1000_shutdown,
-       .err_handler = &e1000_err_handler
-};
-
-MODULE_AUTHOR("Intel Corporation, <address@hidden>");
-MODULE_DESCRIPTION("Intel(R) PRO/1000 Network Driver");
-MODULE_LICENSE("GPL");
-MODULE_VERSION(DRV_VERSION);
-
-static int debug = NETIF_MSG_DRV | NETIF_MSG_PROBE;
-module_param(debug, int, 0);
-MODULE_PARM_DESC(debug, "Debug level (0=none,...,16=all)");
-
-/**
- * e1000_init_module - Driver Registration Routine
- *
- * e1000_init_module is the first routine called when the driver is
- * loaded. All it does is register with the PCI subsystem.
- **/
-
-static int __init e1000_init_module(void)
-{
-       int ret;
-       printk(KERN_INFO "%s - version %s\n",
-              e1000_driver_string, e1000_driver_version);
-
-       printk(KERN_INFO "%s\n", e1000_copyright);
-
-       ret = pci_register_driver(&e1000_driver);
-       if (copybreak != COPYBREAK_DEFAULT) {
-               if (copybreak == 0)
-                       printk(KERN_INFO "e1000: copybreak disabled\n");
-               else
-                       printk(KERN_INFO "e1000: copybreak enabled for "
-                              "packets <= %u bytes\n", copybreak);
-       }
-       return ret;
-}
-
-module_init(e1000_init_module);
-
-/**
- * e1000_exit_module - Driver Exit Cleanup Routine
- *
- * e1000_exit_module is called just before the driver is removed
- * from memory.
- **/
-
-static void __exit e1000_exit_module(void)
-{
-       pci_unregister_driver(&e1000_driver);
-}
-
-module_exit(e1000_exit_module);
-
-static int e1000_request_irq(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       struct net_device *netdev = adapter->netdev;
-       irq_handler_t handler = e1000_intr;
-       int irq_flags = IRQF_SHARED;
-       int err;
-
-       if (hw->mac_type >= e1000_82571) {
-               adapter->have_msi = !pci_enable_msi(adapter->pdev);
-               if (adapter->have_msi) {
-                       handler = e1000_intr_msi;
-                       irq_flags = 0;
-               }
-       }
-
-       err = request_irq(adapter->pdev->irq, handler, irq_flags, netdev->name,
-                         netdev);
-       if (err) {
-               if (adapter->have_msi)
-                       pci_disable_msi(adapter->pdev);
-               DPRINTK(PROBE, ERR,
-                       "Unable to allocate interrupt Error: %d\n", err);
-       }
-
-       return err;
-}
-
-static void e1000_free_irq(struct e1000_adapter *adapter)
-{
-       struct net_device *netdev = adapter->netdev;
-
-       free_irq(adapter->pdev->irq, netdev);
-
-       if (adapter->have_msi)
-               pci_disable_msi(adapter->pdev);
-}
-
-/**
- * e1000_irq_disable - Mask off interrupt generation on the NIC
- * @adapter: board private structure
- **/
-
-static void e1000_irq_disable(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-
-       ew32(IMC, ~0);
-       E1000_WRITE_FLUSH();
-       synchronize_irq(adapter->pdev->irq);
-}
-
-/**
- * e1000_irq_enable - Enable default interrupt generation settings
- * @adapter: board private structure
- **/
-
-static void e1000_irq_enable(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-
-       ew32(IMS, IMS_ENABLE_MASK);
-       E1000_WRITE_FLUSH();
-}
-
-static void e1000_update_mng_vlan(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       struct net_device *netdev = adapter->netdev;
-       u16 vid = hw->mng_cookie.vlan_id;
-       u16 old_vid = adapter->mng_vlan_id;
-       if (adapter->vlgrp) {
-               if (!vlan_group_get_device(adapter->vlgrp, vid)) {
-                       if (hw->mng_cookie.status &
-                               E1000_MNG_DHCP_COOKIE_STATUS_VLAN_SUPPORT) {
-                               e1000_vlan_rx_add_vid(netdev, vid);
-                               adapter->mng_vlan_id = vid;
-                       } else
-                               adapter->mng_vlan_id = E1000_MNG_VLAN_NONE;
-
-                       if ((old_vid != (u16)E1000_MNG_VLAN_NONE) &&
-                                       (vid != old_vid) &&
-                           !vlan_group_get_device(adapter->vlgrp, old_vid))
-                               e1000_vlan_rx_kill_vid(netdev, old_vid);
-               } else
-                       adapter->mng_vlan_id = vid;
-       }
-}
-
-/**
- * e1000_release_hw_control - release control of the h/w to f/w
- * @adapter: address of board private structure
- *
- * e1000_release_hw_control resets {CTRL_EXT|FWSM}:DRV_LOAD bit.
- * For ASF and Pass Through versions of f/w this means that the
- * driver is no longer loaded. For AMT version (only with 82573) i
- * of the f/w this means that the network i/f is closed.
- *
- **/
-
-static void e1000_release_hw_control(struct e1000_adapter *adapter)
-{
-       u32 ctrl_ext;
-       u32 swsm;
-       struct e1000_hw *hw = &adapter->hw;
-
-       /* Let firmware taken over control of h/w */
-       switch (hw->mac_type) {
-       case e1000_82573:
-               swsm = er32(SWSM);
-               ew32(SWSM, swsm & ~E1000_SWSM_DRV_LOAD);
-               break;
-       case e1000_82571:
-       case e1000_82572:
-       case e1000_80003es2lan:
-       case e1000_ich8lan:
-               ctrl_ext = er32(CTRL_EXT);
-               ew32(CTRL_EXT, ctrl_ext & ~E1000_CTRL_EXT_DRV_LOAD);
-               break;
-       default:
-               break;
-       }
-}
-
-/**
- * e1000_get_hw_control - get control of the h/w from f/w
- * @adapter: address of board private structure
- *
- * e1000_get_hw_control sets {CTRL_EXT|FWSM}:DRV_LOAD bit.
- * For ASF and Pass Through versions of f/w this means that
- * the driver is loaded. For AMT version (only with 82573)
- * of the f/w this means that the network i/f is open.
- *
- **/
-
-static void e1000_get_hw_control(struct e1000_adapter *adapter)
-{
-       u32 ctrl_ext;
-       u32 swsm;
-       struct e1000_hw *hw = &adapter->hw;
-
-       /* Let firmware know the driver has taken over */
-       switch (hw->mac_type) {
-       case e1000_82573:
-               swsm = er32(SWSM);
-               ew32(SWSM, swsm | E1000_SWSM_DRV_LOAD);
-               break;
-       case e1000_82571:
-       case e1000_82572:
-       case e1000_80003es2lan:
-       case e1000_ich8lan:
-               ctrl_ext = er32(CTRL_EXT);
-               ew32(CTRL_EXT, ctrl_ext | E1000_CTRL_EXT_DRV_LOAD);
-               break;
-       default:
-               break;
-       }
-}
-
-static void e1000_init_manageability(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-
-       if (adapter->en_mng_pt) {
-               u32 manc = er32(MANC);
-
-               /* disable hardware interception of ARP */
-               manc &= ~(E1000_MANC_ARP_EN);
-
-               /* enable receiving management packets to the host */
-               /* this will probably generate destination unreachable messages
-                * from the host OS, but the packets will be handled on SMBUS */
-               if (hw->has_manc2h) {
-                       u32 manc2h = er32(MANC2H);
-
-                       manc |= E1000_MANC_EN_MNG2HOST;
-#define E1000_MNG2HOST_PORT_623 (1 << 5)
-#define E1000_MNG2HOST_PORT_664 (1 << 6)
-                       manc2h |= E1000_MNG2HOST_PORT_623;
-                       manc2h |= E1000_MNG2HOST_PORT_664;
-                       ew32(MANC2H, manc2h);
-               }
-
-               ew32(MANC, manc);
-       }
-}
-
-static void e1000_release_manageability(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-
-       if (adapter->en_mng_pt) {
-               u32 manc = er32(MANC);
-
-               /* re-enable hardware interception of ARP */
-               manc |= E1000_MANC_ARP_EN;
-
-               if (hw->has_manc2h)
-                       manc &= ~E1000_MANC_EN_MNG2HOST;
-
-               /* don't explicitly have to mess with MANC2H since
-                * MANC has an enable disable that gates MANC2H */
-
-               ew32(MANC, manc);
-       }
-}
-
-/**
- * e1000_configure - configure the hardware for RX and TX
- * @adapter = private board structure
- **/
-static void e1000_configure(struct e1000_adapter *adapter)
-{
-       struct net_device *netdev = adapter->netdev;
-       int i;
-
-       e1000_set_rx_mode(netdev);
-
-       e1000_restore_vlan(adapter);
-       e1000_init_manageability(adapter);
-
-       e1000_configure_tx(adapter);
-       e1000_setup_rctl(adapter);
-       e1000_configure_rx(adapter);
-       /* call E1000_DESC_UNUSED which always leaves
-        * at least 1 descriptor unused to make sure
-        * next_to_use != next_to_clean */
-       for (i = 0; i < adapter->num_rx_queues; i++) {
-               struct e1000_rx_ring *ring = &adapter->rx_ring[i];
-               adapter->alloc_rx_buf(adapter, ring,
-                                     E1000_DESC_UNUSED(ring));
-       }
-
-       adapter->tx_queue_len = netdev->tx_queue_len;
-}
-
-int e1000_up(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-
-       /* hardware has been reset, we need to reload some things */
-       e1000_configure(adapter);
-
-       clear_bit(__E1000_DOWN, &adapter->flags);
-
-       napi_enable(&adapter->napi);
-
-       e1000_irq_enable(adapter);
-
-       /* fire a link change interrupt to start the watchdog */
-       ew32(ICS, E1000_ICS_LSC);
-       return 0;
-}
-
-/**
- * e1000_power_up_phy - restore link in case the phy was powered down
- * @adapter: address of board private structure
- *
- * The phy may be powered down to save power and turn off link when the
- * driver is unloaded and wake on lan is not enabled (among others)
- * *** this routine MUST be followed by a call to e1000_reset ***
- *
- **/
-
-void e1000_power_up_phy(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       u16 mii_reg = 0;
-
-       /* Just clear the power down bit to wake the phy back up */
-       if (hw->media_type == e1000_media_type_copper) {
-               /* according to the manual, the phy will retain its
-                * settings across a power-down/up cycle */
-               e1000_read_phy_reg(hw, PHY_CTRL, &mii_reg);
-               mii_reg &= ~MII_CR_POWER_DOWN;
-               e1000_write_phy_reg(hw, PHY_CTRL, mii_reg);
-       }
-}
-
-static void e1000_power_down_phy(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-
-       /* Power down the PHY so no link is implied when interface is down *
-        * The PHY cannot be powered down if any of the following is true *
-        * (a) WoL is enabled
-        * (b) AMT is active
-        * (c) SoL/IDER session is active */
-       if (!adapter->wol && hw->mac_type >= e1000_82540 &&
-          hw->media_type == e1000_media_type_copper) {
-               u16 mii_reg = 0;
-
-               switch (hw->mac_type) {
-               case e1000_82540:
-               case e1000_82545:
-               case e1000_82545_rev_3:
-               case e1000_82546:
-               case e1000_82546_rev_3:
-               case e1000_82541:
-               case e1000_82541_rev_2:
-               case e1000_82547:
-               case e1000_82547_rev_2:
-                       if (er32(MANC) & E1000_MANC_SMBUS_EN)
-                               goto out;
-                       break;
-               case e1000_82571:
-               case e1000_82572:
-               case e1000_82573:
-               case e1000_80003es2lan:
-               case e1000_ich8lan:
-                       if (e1000_check_mng_mode(hw) ||
-                           e1000_check_phy_reset_block(hw))
-                               goto out;
-                       break;
-               default:
-                       goto out;
-               }
-               e1000_read_phy_reg(hw, PHY_CTRL, &mii_reg);
-               mii_reg |= MII_CR_POWER_DOWN;
-               e1000_write_phy_reg(hw, PHY_CTRL, mii_reg);
-               mdelay(1);
-       }
-out:
-       return;
-}
-
-void e1000_down(struct e1000_adapter *adapter)
-{
-       struct net_device *netdev = adapter->netdev;
-
-       /* signal that we're down so the interrupt handler does not
-        * reschedule our watchdog timer */
-       set_bit(__E1000_DOWN, &adapter->flags);
-
-       napi_disable(&adapter->napi);
-
-       e1000_irq_disable(adapter);
-
-       del_timer_sync(&adapter->tx_fifo_stall_timer);
-       del_timer_sync(&adapter->watchdog_timer);
-       del_timer_sync(&adapter->phy_info_timer);
-
-       netdev->tx_queue_len = adapter->tx_queue_len;
-       adapter->link_speed = 0;
-       adapter->link_duplex = 0;
-       netif_carrier_off(netdev);
-       netif_stop_queue(netdev);
-
-       e1000_reset(adapter);
-       e1000_clean_all_tx_rings(adapter);
-       e1000_clean_all_rx_rings(adapter);
-}
-
-void e1000_reinit_locked(struct e1000_adapter *adapter)
-{
-       WARN_ON(in_interrupt());
-       while (test_and_set_bit(__E1000_RESETTING, &adapter->flags))
-               msleep(1);
-       e1000_down(adapter);
-       e1000_up(adapter);
-       clear_bit(__E1000_RESETTING, &adapter->flags);
-}
-
-void e1000_reset(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       u32 pba = 0, tx_space, min_tx_space, min_rx_space;
-       u16 fc_high_water_mark = E1000_FC_HIGH_DIFF;
-       bool legacy_pba_adjust = false;
-
-       /* Repartition Pba for greater than 9k mtu
-        * To take effect CTRL.RST is required.
-        */
-
-       switch (hw->mac_type) {
-       case e1000_82542_rev2_0:
-       case e1000_82542_rev2_1:
-       case e1000_82543:
-       case e1000_82544:
-       case e1000_82540:
-       case e1000_82541:
-       case e1000_82541_rev_2:
-               legacy_pba_adjust = true;
-               pba = E1000_PBA_48K;
-               break;
-       case e1000_82545:
-       case e1000_82545_rev_3:
-       case e1000_82546:
-       case e1000_82546_rev_3:
-               pba = E1000_PBA_48K;
-               break;
-       case e1000_82547:
-       case e1000_82547_rev_2:
-               legacy_pba_adjust = true;
-               pba = E1000_PBA_30K;
-               break;
-       case e1000_82571:
-       case e1000_82572:
-       case e1000_80003es2lan:
-               pba = E1000_PBA_38K;
-               break;
-       case e1000_82573:
-               pba = E1000_PBA_20K;
-               break;
-       case e1000_ich8lan:
-               pba = E1000_PBA_8K;
-       case e1000_undefined:
-       case e1000_num_macs:
-               break;
-       }
-
-       if (legacy_pba_adjust) {
-               if (adapter->netdev->mtu > E1000_RXBUFFER_8192)
-                       pba -= 8; /* allocate more FIFO for Tx */
-
-               if (hw->mac_type == e1000_82547) {
-                       adapter->tx_fifo_head = 0;
-                       adapter->tx_head_addr = pba << E1000_TX_HEAD_ADDR_SHIFT;
-                       adapter->tx_fifo_size =
-                               (E1000_PBA_40K - pba) << E1000_PBA_BYTES_SHIFT;
-                       atomic_set(&adapter->tx_fifo_stall, 0);
-               }
-       } else if (hw->max_frame_size > MAXIMUM_ETHERNET_FRAME_SIZE) {
-               /* adjust PBA for jumbo frames */
-               ew32(PBA, pba);
-
-               /* To maintain wire speed transmits, the Tx FIFO should be
-                * large enough to accomodate two full transmit packets,
-                * rounded up to the next 1KB and expressed in KB.  Likewise,
-                * the Rx FIFO should be large enough to accomodate at least
-                * one full receive packet and is similarly rounded up and
-                * expressed in KB. */
-               pba = er32(PBA);
-               /* upper 16 bits has Tx packet buffer allocation size in KB */
-               tx_space = pba >> 16;
-               /* lower 16 bits has Rx packet buffer allocation size in KB */
-               pba &= 0xffff;
-               /* don't include ethernet FCS because hardware appends/strips */
-               min_rx_space = adapter->netdev->mtu + ENET_HEADER_SIZE +
-                              VLAN_TAG_SIZE;
-               min_tx_space = min_rx_space;
-               min_tx_space *= 2;
-               min_tx_space = ALIGN(min_tx_space, 1024);
-               min_tx_space >>= 10;
-               min_rx_space = ALIGN(min_rx_space, 1024);
-               min_rx_space >>= 10;
-
-               /* If current Tx allocation is less than the min Tx FIFO size,
-                * and the min Tx FIFO size is less than the current Rx FIFO
-                * allocation, take space away from current Rx allocation */
-               if (tx_space < min_tx_space &&
-                   ((min_tx_space - tx_space) < pba)) {
-                       pba = pba - (min_tx_space - tx_space);
-
-                       /* PCI/PCIx hardware has PBA alignment constraints */
-                       switch (hw->mac_type) {
-                       case e1000_82545 ... e1000_82546_rev_3:
-                               pba &= ~(E1000_PBA_8K - 1);
-                               break;
-                       default:
-                               break;
-                       }
-
-                       /* if short on rx space, rx wins and must trump tx
-                        * adjustment or use Early Receive if available */
-                       if (pba < min_rx_space) {
-                               switch (hw->mac_type) {
-                               case e1000_82573:
-                                       /* ERT enabled in e1000_configure_rx */
-                                       break;
-                               default:
-                                       pba = min_rx_space;
-                                       break;
-                               }
-                       }
-               }
-       }
-
-       ew32(PBA, pba);
-
-       /* flow control settings */
-       /* Set the FC high water mark to 90% of the FIFO size.
-        * Required to clear last 3 LSB */
-       fc_high_water_mark = ((pba * 9216)/10) & 0xFFF8;
-       /* We can't use 90% on small FIFOs because the remainder
-        * would be less than 1 full frame.  In this case, we size
-        * it to allow at least a full frame above the high water
-        *  mark. */
-       if (pba < E1000_PBA_16K)
-               fc_high_water_mark = (pba * 1024) - 1600;
-
-       hw->fc_high_water = fc_high_water_mark;
-       hw->fc_low_water = fc_high_water_mark - 8;
-       if (hw->mac_type == e1000_80003es2lan)
-               hw->fc_pause_time = 0xFFFF;
-       else
-               hw->fc_pause_time = E1000_FC_PAUSE_TIME;
-       hw->fc_send_xon = 1;
-       hw->fc = hw->original_fc;
-
-       /* Allow time for pending master requests to run */
-       e1000_reset_hw(hw);
-       if (hw->mac_type >= e1000_82544)
-               ew32(WUC, 0);
-
-       if (e1000_init_hw(hw))
-               DPRINTK(PROBE, ERR, "Hardware Error\n");
-       e1000_update_mng_vlan(adapter);
-
-       /* if (adapter->hwflags & HWFLAGS_PHY_PWR_BIT) { */
-       if (hw->mac_type >= e1000_82544 &&
-           hw->mac_type <= e1000_82547_rev_2 &&
-           hw->autoneg == 1 &&
-           hw->autoneg_advertised == ADVERTISE_1000_FULL) {
-               u32 ctrl = er32(CTRL);
-               /* clear phy power management bit if we are in gig only mode,
-                * which if enabled will attempt negotiation to 100Mb, which
-                * can cause a loss of link at power off or driver unload */
-               ctrl &= ~E1000_CTRL_SWDPIN3;
-               ew32(CTRL, ctrl);
-       }
-
-       /* Enable h/w to recognize an 802.1Q VLAN Ethernet packet */
-       ew32(VET, ETHERNET_IEEE_VLAN_TYPE);
-
-       e1000_reset_adaptive(hw);
-       e1000_phy_get_info(hw, &adapter->phy_info);
-
-       if (!adapter->smart_power_down &&
-           (hw->mac_type == e1000_82571 ||
-            hw->mac_type == e1000_82572)) {
-               u16 phy_data = 0;
-               /* speed up time to link by disabling smart power down, ignore
-                * the return value of this function because there is nothing
-                * different we would do if it failed */
-               e1000_read_phy_reg(hw, IGP02E1000_PHY_POWER_MGMT,
-                                  &phy_data);
-               phy_data &= ~IGP02E1000_PM_SPD;
-               e1000_write_phy_reg(hw, IGP02E1000_PHY_POWER_MGMT,
-                                   phy_data);
-       }
-
-       e1000_release_manageability(adapter);
-}
-
-/**
- *  Dump the eeprom for users having checksum issues
- **/
-static void e1000_dump_eeprom(struct e1000_adapter *adapter)
-{
-       struct net_device *netdev = adapter->netdev;
-       struct ethtool_eeprom eeprom;
-       const struct ethtool_ops *ops = netdev->ethtool_ops;
-       u8 *data;
-       int i;
-       u16 csum_old, csum_new = 0;
-
-       eeprom.len = ops->get_eeprom_len(netdev);
-       eeprom.offset = 0;
-
-       data = kmalloc(eeprom.len, GFP_KERNEL);
-       if (!data) {
-               printk(KERN_ERR "Unable to allocate memory to dump EEPROM"
-                      " data\n");
-               return;
-       }
-
-       ops->get_eeprom(netdev, &eeprom, data);
-
-       csum_old = (data[EEPROM_CHECKSUM_REG * 2]) +
-                  (data[EEPROM_CHECKSUM_REG * 2 + 1] << 8);
-       for (i = 0; i < EEPROM_CHECKSUM_REG * 2; i += 2)
-               csum_new += data[i] + (data[i + 1] << 8);
-       csum_new = EEPROM_SUM - csum_new;
-
-       printk(KERN_ERR "/*********************/\n");
-       printk(KERN_ERR "Current EEPROM Checksum : 0x%04x\n", csum_old);
-       printk(KERN_ERR "Calculated              : 0x%04x\n", csum_new);
-
-       printk(KERN_ERR "Offset    Values\n");
-       printk(KERN_ERR "========  ======\n");
-       print_hex_dump(KERN_ERR, "", DUMP_PREFIX_OFFSET, 16, 1, data, 128, 0);
-
-       printk(KERN_ERR "Include this output when contacting your support "
-              "provider.\n");
-       printk(KERN_ERR "This is not a software error! Something bad "
-              "happened to your hardware or\n");
-       printk(KERN_ERR "EEPROM image. Ignoring this "
-              "problem could result in further problems,\n");
-       printk(KERN_ERR "possibly loss of data, corruption or system hangs!\n");
-       printk(KERN_ERR "The MAC Address will be reset to 00:00:00:00:00:00, "
-              "which is invalid\n");
-       printk(KERN_ERR "and requires you to set the proper MAC "
-              "address manually before continuing\n");
-       printk(KERN_ERR "to enable this network device.\n");
-       printk(KERN_ERR "Please inspect the EEPROM dump and report the issue "
-              "to your hardware vendor\n");
-       printk(KERN_ERR "or Intel Customer Support.\n");
-       printk(KERN_ERR "/*********************/\n");
-
-       kfree(data);
-}
-
-/**
- * e1000_is_need_ioport - determine if an adapter needs ioport resources or not
- * @pdev: PCI device information struct
- *
- * Return true if an adapter needs ioport resources
- **/
-static int e1000_is_need_ioport(struct pci_dev *pdev)
-{
-       switch (pdev->device) {
-       case E1000_DEV_ID_82540EM:
-       case E1000_DEV_ID_82540EM_LOM:
-       case E1000_DEV_ID_82540EP:
-       case E1000_DEV_ID_82540EP_LOM:
-       case E1000_DEV_ID_82540EP_LP:
-       case E1000_DEV_ID_82541EI:
-       case E1000_DEV_ID_82541EI_MOBILE:
-       case E1000_DEV_ID_82541ER:
-       case E1000_DEV_ID_82541ER_LOM:
-       case E1000_DEV_ID_82541GI:
-       case E1000_DEV_ID_82541GI_LF:
-       case E1000_DEV_ID_82541GI_MOBILE:
-       case E1000_DEV_ID_82544EI_COPPER:
-       case E1000_DEV_ID_82544EI_FIBER:
-       case E1000_DEV_ID_82544GC_COPPER:
-       case E1000_DEV_ID_82544GC_LOM:
-       case E1000_DEV_ID_82545EM_COPPER:
-       case E1000_DEV_ID_82545EM_FIBER:
-       case E1000_DEV_ID_82546EB_COPPER:
-       case E1000_DEV_ID_82546EB_FIBER:
-       case E1000_DEV_ID_82546EB_QUAD_COPPER:
-               return true;
-       default:
-               return false;
-       }
-}
-
-static const struct net_device_ops e1000_netdev_ops = {
-       .ndo_open               = e1000_open,
-       .ndo_stop               = e1000_close,
-       .ndo_start_xmit         = e1000_xmit_frame,
-       .ndo_get_stats          = e1000_get_stats,
-       .ndo_set_rx_mode        = e1000_set_rx_mode,
-       .ndo_set_mac_address    = e1000_set_mac,
-       .ndo_tx_timeout         = e1000_tx_timeout,
-       .ndo_change_mtu         = e1000_change_mtu,
-       .ndo_do_ioctl           = e1000_ioctl,
-       .ndo_validate_addr      = eth_validate_addr,
-
-       .ndo_vlan_rx_register   = e1000_vlan_rx_register,
-       .ndo_vlan_rx_add_vid    = e1000_vlan_rx_add_vid,
-       .ndo_vlan_rx_kill_vid   = e1000_vlan_rx_kill_vid,
-#ifdef CONFIG_NET_POLL_CONTROLLER
-       .ndo_poll_controller    = e1000_netpoll,
-#endif
-};
-
-/**
- * e1000_probe - Device Initialization Routine
- * @pdev: PCI device information struct
- * @ent: entry in e1000_pci_tbl
- *
- * Returns 0 on success, negative on failure
- *
- * e1000_probe initializes an adapter identified by a pci_dev structure.
- * The OS initialization, configuring of the adapter private structure,
- * and a hardware reset occur.
- **/
-static int __devinit e1000_probe(struct pci_dev *pdev,
-                                const struct pci_device_id *ent)
-{
-       struct net_device *netdev;
-       struct e1000_adapter *adapter;
-       struct e1000_hw *hw;
-
-       static int cards_found = 0;
-       static int global_quad_port_a = 0; /* global ksp3 port a indication */
-       int i, err, pci_using_dac;
-       u16 eeprom_data = 0;
-       u16 eeprom_apme_mask = E1000_EEPROM_APME;
-       int bars, need_ioport;
-
-       /* do not allocate ioport bars when not needed */
-       need_ioport = e1000_is_need_ioport(pdev);
-       if (need_ioport) {
-               bars = pci_select_bars(pdev, IORESOURCE_MEM | IORESOURCE_IO);
-               err = pci_enable_device(pdev);
-       } else {
-               bars = pci_select_bars(pdev, IORESOURCE_MEM);
-               err = pci_enable_device_mem(pdev);
-       }
-       if (err)
-               return err;
-
-       if (!pci_set_dma_mask(pdev, DMA_64BIT_MASK) &&
-           !pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK)) {
-               pci_using_dac = 1;
-       } else {
-               err = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
-               if (err) {
-                       err = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);
-                       if (err) {
-                               E1000_ERR("No usable DMA configuration, "
-                                         "aborting\n");
-                               goto err_dma;
-                       }
-               }
-               pci_using_dac = 0;
-       }
-
-       err = pci_request_selected_regions(pdev, bars, e1000_driver_name);
-       if (err)
-               goto err_pci_reg;
-
-       pci_set_master(pdev);
-
-       err = -ENOMEM;
-       netdev = alloc_etherdev(sizeof(struct e1000_adapter));
-       if (!netdev)
-               goto err_alloc_etherdev;
-
-       SET_NETDEV_DEV(netdev, &pdev->dev);
-
-       pci_set_drvdata(pdev, netdev);
-       adapter = netdev_priv(netdev);
-       adapter->netdev = netdev;
-       adapter->pdev = pdev;
-       adapter->msg_enable = (1 << debug) - 1;
-       adapter->bars = bars;
-       adapter->need_ioport = need_ioport;
-
-       hw = &adapter->hw;
-       hw->back = adapter;
-
-       err = -EIO;
-       hw->hw_addr = pci_ioremap_bar(pdev, BAR_0);
-       if (!hw->hw_addr)
-               goto err_ioremap;
-
-       if (adapter->need_ioport) {
-               for (i = BAR_1; i <= BAR_5; i++) {
-                       if (pci_resource_len(pdev, i) == 0)
-                               continue;
-                       if (pci_resource_flags(pdev, i) & IORESOURCE_IO) {
-                               hw->io_base = pci_resource_start(pdev, i);
-                               break;
-                       }
-               }
-       }
-
-       netdev->netdev_ops = &e1000_netdev_ops;
-       e1000_set_ethtool_ops(netdev);
-       netdev->watchdog_timeo = 5 * HZ;
-       netif_napi_add(netdev, &adapter->napi, e1000_clean, 64);
-
-       strncpy(netdev->name, pci_name(pdev), sizeof(netdev->name) - 1);
-
-       adapter->bd_number = cards_found;
-
-       /* setup the private structure */
-
-       err = e1000_sw_init(adapter);
-       if (err)
-               goto err_sw_init;
-
-       err = -EIO;
-       /* Flash BAR mapping must happen after e1000_sw_init
-        * because it depends on mac_type */
-       if ((hw->mac_type == e1000_ich8lan) &&
-          (pci_resource_flags(pdev, 1) & IORESOURCE_MEM)) {
-               hw->flash_address = pci_ioremap_bar(pdev, 1);
-               if (!hw->flash_address)
-                       goto err_flashmap;
-       }
-
-       if (e1000_check_phy_reset_block(hw))
-               DPRINTK(PROBE, INFO, "PHY reset is blocked due to SOL/IDER 
session.\n");
-
-       if (hw->mac_type >= e1000_82543) {
-               netdev->features = NETIF_F_SG |
-                                  NETIF_F_HW_CSUM |
-                                  NETIF_F_HW_VLAN_TX |
-                                  NETIF_F_HW_VLAN_RX |
-                                  NETIF_F_HW_VLAN_FILTER;
-               if (hw->mac_type == e1000_ich8lan)
-                       netdev->features &= ~NETIF_F_HW_VLAN_FILTER;
-       }
-
-       if ((hw->mac_type >= e1000_82544) &&
-          (hw->mac_type != e1000_82547))
-               netdev->features |= NETIF_F_TSO;
-
-       if (hw->mac_type > e1000_82547_rev_2)
-               netdev->features |= NETIF_F_TSO6;
-       if (pci_using_dac)
-               netdev->features |= NETIF_F_HIGHDMA;
-
-       netdev->features |= NETIF_F_LLTX;
-
-       netdev->vlan_features |= NETIF_F_TSO;
-       netdev->vlan_features |= NETIF_F_TSO6;
-       netdev->vlan_features |= NETIF_F_HW_CSUM;
-       netdev->vlan_features |= NETIF_F_SG;
-
-       adapter->en_mng_pt = e1000_enable_mng_pass_thru(hw);
-
-       /* initialize eeprom parameters */
-       if (e1000_init_eeprom_params(hw)) {
-               E1000_ERR("EEPROM initialization failed\n");
-               goto err_eeprom;
-       }
-
-       /* before reading the EEPROM, reset the controller to
-        * put the device in a known good starting state */
-
-       e1000_reset_hw(hw);
-
-       /* make sure the EEPROM is good */
-       if (e1000_validate_eeprom_checksum(hw) < 0) {
-               DPRINTK(PROBE, ERR, "The EEPROM Checksum Is Not Valid\n");
-               e1000_dump_eeprom(adapter);
-               /*
-                * set MAC address to all zeroes to invalidate and temporary
-                * disable this device for the user. This blocks regular
-                * traffic while still permitting ethtool ioctls from reaching
-                * the hardware as well as allowing the user to run the
-                * interface after manually setting a hw addr using
-                * `ip set address`
-                */
-               memset(hw->mac_addr, 0, netdev->addr_len);
-       } else {
-               /* copy the MAC address out of the EEPROM */
-               if (e1000_read_mac_addr(hw))
-                       DPRINTK(PROBE, ERR, "EEPROM Read Error\n");
-       }
-       /* don't block initalization here due to bad MAC address */
-       memcpy(netdev->dev_addr, hw->mac_addr, netdev->addr_len);
-       memcpy(netdev->perm_addr, hw->mac_addr, netdev->addr_len);
-
-       if (!is_valid_ether_addr(netdev->perm_addr))
-               DPRINTK(PROBE, ERR, "Invalid MAC Address\n");
-
-       e1000_get_bus_info(hw);
-
-       init_timer(&adapter->tx_fifo_stall_timer);
-       adapter->tx_fifo_stall_timer.function = &e1000_82547_tx_fifo_stall;
-       adapter->tx_fifo_stall_timer.data = (unsigned long)adapter;
-
-       init_timer(&adapter->watchdog_timer);
-       adapter->watchdog_timer.function = &e1000_watchdog;
-       adapter->watchdog_timer.data = (unsigned long) adapter;
-
-       init_timer(&adapter->phy_info_timer);
-       adapter->phy_info_timer.function = &e1000_update_phy_info;
-       adapter->phy_info_timer.data = (unsigned long)adapter;
-
-       INIT_WORK(&adapter->reset_task, e1000_reset_task);
-
-       e1000_check_options(adapter);
-
-       /* Initial Wake on LAN setting
-        * If APM wake is enabled in the EEPROM,
-        * enable the ACPI Magic Packet filter
-        */
-
-       switch (hw->mac_type) {
-       case e1000_82542_rev2_0:
-       case e1000_82542_rev2_1:
-       case e1000_82543:
-               break;
-       case e1000_82544:
-               e1000_read_eeprom(hw,
-                       EEPROM_INIT_CONTROL2_REG, 1, &eeprom_data);
-               eeprom_apme_mask = E1000_EEPROM_82544_APM;
-               break;
-       case e1000_ich8lan:
-               e1000_read_eeprom(hw,
-                       EEPROM_INIT_CONTROL1_REG, 1, &eeprom_data);
-               eeprom_apme_mask = E1000_EEPROM_ICH8_APME;
-               break;
-       case e1000_82546:
-       case e1000_82546_rev_3:
-       case e1000_82571:
-       case e1000_80003es2lan:
-               if (er32(STATUS) & E1000_STATUS_FUNC_1){
-                       e1000_read_eeprom(hw,
-                               EEPROM_INIT_CONTROL3_PORT_B, 1, &eeprom_data);
-                       break;
-               }
-               /* Fall Through */
-       default:
-               e1000_read_eeprom(hw,
-                       EEPROM_INIT_CONTROL3_PORT_A, 1, &eeprom_data);
-               break;
-       }
-       if (eeprom_data & eeprom_apme_mask)
-               adapter->eeprom_wol |= E1000_WUFC_MAG;
-
-       /* now that we have the eeprom settings, apply the special cases
-        * where the eeprom may be wrong or the board simply won't support
-        * wake on lan on a particular port */
-       switch (pdev->device) {
-       case E1000_DEV_ID_82546GB_PCIE:
-               adapter->eeprom_wol = 0;
-               break;
-       case E1000_DEV_ID_82546EB_FIBER:
-       case E1000_DEV_ID_82546GB_FIBER:
-       case E1000_DEV_ID_82571EB_FIBER:
-               /* Wake events only supported on port A for dual fiber
-                * regardless of eeprom setting */
-               if (er32(STATUS) & E1000_STATUS_FUNC_1)
-                       adapter->eeprom_wol = 0;
-               break;
-       case E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3:
-       case E1000_DEV_ID_82571EB_QUAD_COPPER:
-       case E1000_DEV_ID_82571EB_QUAD_FIBER:
-       case E1000_DEV_ID_82571EB_QUAD_COPPER_LOWPROFILE:
-       case E1000_DEV_ID_82571PT_QUAD_COPPER:
-               /* if quad port adapter, disable WoL on all but port A */
-               if (global_quad_port_a != 0)
-                       adapter->eeprom_wol = 0;
-               else
-                       adapter->quad_port_a = 1;
-               /* Reset for multiple quad port adapters */
-               if (++global_quad_port_a == 4)
-                       global_quad_port_a = 0;
-               break;
-       }
-
-       /* initialize the wol settings based on the eeprom settings */
-       adapter->wol = adapter->eeprom_wol;
-       device_set_wakeup_enable(&adapter->pdev->dev, adapter->wol);
-
-       /* print bus type/speed/width info */
-       DPRINTK(PROBE, INFO, "(PCI%s:%s:%s) ",
-               ((hw->bus_type == e1000_bus_type_pcix) ? "-X" :
-                (hw->bus_type == e1000_bus_type_pci_express ? " Express":"")),
-               ((hw->bus_speed == e1000_bus_speed_2500) ? "2.5Gb/s" :
-                (hw->bus_speed == e1000_bus_speed_133) ? "133MHz" :
-                (hw->bus_speed == e1000_bus_speed_120) ? "120MHz" :
-                (hw->bus_speed == e1000_bus_speed_100) ? "100MHz" :
-                (hw->bus_speed == e1000_bus_speed_66) ? "66MHz" : "33MHz"),
-               ((hw->bus_width == e1000_bus_width_64) ? "64-bit" :
-                (hw->bus_width == e1000_bus_width_pciex_4) ? "Width x4" :
-                (hw->bus_width == e1000_bus_width_pciex_1) ? "Width x1" :
-                "32-bit"));
-
-       printk("%pM\n", netdev->dev_addr);
-
-       if (hw->bus_type == e1000_bus_type_pci_express) {
-               DPRINTK(PROBE, WARNING, "This device (id %04x:%04x) will no "
-                       "longer be supported by this driver in the future.\n",
-                       pdev->vendor, pdev->device);
-               DPRINTK(PROBE, WARNING, "please use the \"e1000e\" "
-                       "driver instead.\n");
-       }
-
-       /* reset the hardware with the new settings */
-       e1000_reset(adapter);
-
-       /* If the controller is 82573 and f/w is AMT, do not set
-        * DRV_LOAD until the interface is up.  For all other cases,
-        * let the f/w know that the h/w is now under the control
-        * of the driver. */
-       if (hw->mac_type != e1000_82573 ||
-           !e1000_check_mng_mode(hw))
-               e1000_get_hw_control(adapter);
-
-       /* tell the stack to leave us alone until e1000_open() is called */
-       netif_carrier_off(netdev);
-       netif_stop_queue(netdev);
-
-       strcpy(netdev->name, "eth%d");
-       err = register_netdev(netdev);
-       if (err)
-               goto err_register;
-
-       DPRINTK(PROBE, INFO, "Intel(R) PRO/1000 Network Connection\n");
-
-       cards_found++;
-       return 0;
-
-err_register:
-       e1000_release_hw_control(adapter);
-err_eeprom:
-       if (!e1000_check_phy_reset_block(hw))
-               e1000_phy_hw_reset(hw);
-
-       if (hw->flash_address)
-               iounmap(hw->flash_address);
-err_flashmap:
-       kfree(adapter->tx_ring);
-       kfree(adapter->rx_ring);
-err_sw_init:
-       iounmap(hw->hw_addr);
-err_ioremap:
-       free_netdev(netdev);
-err_alloc_etherdev:
-       pci_release_selected_regions(pdev, bars);
-err_pci_reg:
-err_dma:
-       pci_disable_device(pdev);
-       return err;
-}
-
-/**
- * e1000_remove - Device Removal Routine
- * @pdev: PCI device information struct
- *
- * e1000_remove is called by the PCI subsystem to alert the driver
- * that it should release a PCI device.  The could be caused by a
- * Hot-Plug event, or because the driver is going to be removed from
- * memory.
- **/
-
-static void __devexit e1000_remove(struct pci_dev *pdev)
-{
-       struct net_device *netdev = pci_get_drvdata(pdev);
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-
-       cancel_work_sync(&adapter->reset_task);
-
-       e1000_release_manageability(adapter);
-
-       /* Release control of h/w to f/w.  If f/w is AMT enabled, this
-        * would have already happened in close and is redundant. */
-       e1000_release_hw_control(adapter);
-
-       unregister_netdev(netdev);
-
-       if (!e1000_check_phy_reset_block(hw))
-               e1000_phy_hw_reset(hw);
-
-       kfree(adapter->tx_ring);
-       kfree(adapter->rx_ring);
-
-       iounmap(hw->hw_addr);
-       if (hw->flash_address)
-               iounmap(hw->flash_address);
-       pci_release_selected_regions(pdev, adapter->bars);
-
-       free_netdev(netdev);
-
-       pci_disable_device(pdev);
-}
-
-/**
- * e1000_sw_init - Initialize general software structures (struct 
e1000_adapter)
- * @adapter: board private structure to initialize
- *
- * e1000_sw_init initializes the Adapter private data structure.
- * Fields are initialized based on PCI device information and
- * OS network device settings (MTU size).
- **/
-
-static int __devinit e1000_sw_init(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       struct net_device *netdev = adapter->netdev;
-       struct pci_dev *pdev = adapter->pdev;
-
-       /* PCI config space info */
-
-       hw->vendor_id = pdev->vendor;
-       hw->device_id = pdev->device;
-       hw->subsystem_vendor_id = pdev->subsystem_vendor;
-       hw->subsystem_id = pdev->subsystem_device;
-       hw->revision_id = pdev->revision;
-
-       pci_read_config_word(pdev, PCI_COMMAND, &hw->pci_cmd_word);
-
-       adapter->rx_buffer_len = MAXIMUM_ETHERNET_VLAN_SIZE;
-       hw->max_frame_size = netdev->mtu +
-                            ENET_HEADER_SIZE + ETHERNET_FCS_SIZE;
-       hw->min_frame_size = MINIMUM_ETHERNET_FRAME_SIZE;
-
-       /* identify the MAC */
-
-       if (e1000_set_mac_type(hw)) {
-               DPRINTK(PROBE, ERR, "Unknown MAC Type\n");
-               return -EIO;
-       }
-
-       switch (hw->mac_type) {
-       default:
-               break;
-       case e1000_82541:
-       case e1000_82547:
-       case e1000_82541_rev_2:
-       case e1000_82547_rev_2:
-               hw->phy_init_script = 1;
-               break;
-       }
-
-       e1000_set_media_type(hw);
-
-       hw->wait_autoneg_complete = false;
-       hw->tbi_compatibility_en = true;
-       hw->adaptive_ifs = true;
-
-       /* Copper options */
-
-       if (hw->media_type == e1000_media_type_copper) {
-               hw->mdix = AUTO_ALL_MODES;
-               hw->disable_polarity_correction = false;
-               hw->master_slave = E1000_MASTER_SLAVE;
-       }
-
-       adapter->num_tx_queues = 1;
-       adapter->num_rx_queues = 1;
-
-       if (e1000_alloc_queues(adapter)) {
-               DPRINTK(PROBE, ERR, "Unable to allocate memory for queues\n");
-               return -ENOMEM;
-       }
-
-       spin_lock_init(&adapter->tx_queue_lock);
-
-       /* Explicitly disable IRQ since the NIC can be in any state. */
-       e1000_irq_disable(adapter);
-
-       spin_lock_init(&adapter->stats_lock);
-
-       set_bit(__E1000_DOWN, &adapter->flags);
-
-       return 0;
-}
-
-/**
- * e1000_alloc_queues - Allocate memory for all rings
- * @adapter: board private structure to initialize
- *
- * We allocate one ring per queue at run-time since we don't know the
- * number of queues at compile-time.
- **/
-
-static int __devinit e1000_alloc_queues(struct e1000_adapter *adapter)
-{
-       adapter->tx_ring = kcalloc(adapter->num_tx_queues,
-                                  sizeof(struct e1000_tx_ring), GFP_KERNEL);
-       if (!adapter->tx_ring)
-               return -ENOMEM;
-
-       adapter->rx_ring = kcalloc(adapter->num_rx_queues,
-                                  sizeof(struct e1000_rx_ring), GFP_KERNEL);
-       if (!adapter->rx_ring) {
-               kfree(adapter->tx_ring);
-               return -ENOMEM;
-       }
-
-       return E1000_SUCCESS;
-}
-
-/**
- * e1000_open - Called when a network interface is made active
- * @netdev: network interface device structure
- *
- * Returns 0 on success, negative value on failure
- *
- * The open entry point is called when a network interface is made
- * active by the system (IFF_UP).  At this point all resources needed
- * for transmit and receive operations are allocated, the interrupt
- * handler is registered with the OS, the watchdog timer is started,
- * and the stack is notified that the interface is ready.
- **/
-
-static int e1000_open(struct net_device *netdev)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       int err;
-
-       /* disallow open during test */
-       if (test_bit(__E1000_TESTING, &adapter->flags))
-               return -EBUSY;
-
-       /* allocate transmit descriptors */
-       err = e1000_setup_all_tx_resources(adapter);
-       if (err)
-               goto err_setup_tx;
-
-       /* allocate receive descriptors */
-       err = e1000_setup_all_rx_resources(adapter);
-       if (err)
-               goto err_setup_rx;
-
-       e1000_power_up_phy(adapter);
-
-       adapter->mng_vlan_id = E1000_MNG_VLAN_NONE;
-       if ((hw->mng_cookie.status &
-                         E1000_MNG_DHCP_COOKIE_STATUS_VLAN_SUPPORT)) {
-               e1000_update_mng_vlan(adapter);
-       }
-
-       /* If AMT is enabled, let the firmware know that the network
-        * interface is now open */
-       if (hw->mac_type == e1000_82573 &&
-           e1000_check_mng_mode(hw))
-               e1000_get_hw_control(adapter);
-
-       /* before we allocate an interrupt, we must be ready to handle it.
-        * Setting DEBUG_SHIRQ in the kernel makes it fire an interrupt
-        * as soon as we call pci_request_irq, so we have to setup our
-        * clean_rx handler before we do so.  */
-       e1000_configure(adapter);
-
-       err = e1000_request_irq(adapter);
-       if (err)
-               goto err_req_irq;
-
-       /* From here on the code is the same as e1000_up() */
-       clear_bit(__E1000_DOWN, &adapter->flags);
-
-       napi_enable(&adapter->napi);
-
-       e1000_irq_enable(adapter);
-
-       netif_start_queue(netdev);
-
-       /* fire a link status change interrupt to start the watchdog */
-       ew32(ICS, E1000_ICS_LSC);
-
-       return E1000_SUCCESS;
-
-err_req_irq:
-       e1000_release_hw_control(adapter);
-       e1000_power_down_phy(adapter);
-       e1000_free_all_rx_resources(adapter);
-err_setup_rx:
-       e1000_free_all_tx_resources(adapter);
-err_setup_tx:
-       e1000_reset(adapter);
-
-       return err;
-}
-
-/**
- * e1000_close - Disables a network interface
- * @netdev: network interface device structure
- *
- * Returns 0, this is not allowed to fail
- *
- * The close entry point is called when an interface is de-activated
- * by the OS.  The hardware is still under the drivers control, but
- * needs to be disabled.  A global MAC reset is issued to stop the
- * hardware, and all transmit and receive resources are freed.
- **/
-
-static int e1000_close(struct net_device *netdev)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-
-       WARN_ON(test_bit(__E1000_RESETTING, &adapter->flags));
-       e1000_down(adapter);
-       e1000_power_down_phy(adapter);
-       e1000_free_irq(adapter);
-
-       e1000_free_all_tx_resources(adapter);
-       e1000_free_all_rx_resources(adapter);
-
-       /* kill manageability vlan ID if supported, but not if a vlan with
-        * the same ID is registered on the host OS (let 8021q kill it) */
-       if ((hw->mng_cookie.status &
-                         E1000_MNG_DHCP_COOKIE_STATUS_VLAN_SUPPORT) &&
-            !(adapter->vlgrp &&
-              vlan_group_get_device(adapter->vlgrp, adapter->mng_vlan_id))) {
-               e1000_vlan_rx_kill_vid(netdev, adapter->mng_vlan_id);
-       }
-
-       /* If AMT is enabled, let the firmware know that the network
-        * interface is now closed */
-       if (hw->mac_type == e1000_82573 &&
-           e1000_check_mng_mode(hw))
-               e1000_release_hw_control(adapter);
-
-       return 0;
-}
-
-/**
- * e1000_check_64k_bound - check that memory doesn't cross 64kB boundary
- * @adapter: address of board private structure
- * @start: address of beginning of memory
- * @len: length of memory
- **/
-static bool e1000_check_64k_bound(struct e1000_adapter *adapter, void *start,
-                                 unsigned long len)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       unsigned long begin = (unsigned long)start;
-       unsigned long end = begin + len;
-
-       /* First rev 82545 and 82546 need to not allow any memory
-        * write location to cross 64k boundary due to errata 23 */
-       if (hw->mac_type == e1000_82545 ||
-           hw->mac_type == e1000_82546) {
-               return ((begin ^ (end - 1)) >> 16) != 0 ? false : true;
-       }
-
-       return true;
-}
-
-/**
- * e1000_setup_tx_resources - allocate Tx resources (Descriptors)
- * @adapter: board private structure
- * @txdr:    tx descriptor ring (for a specific queue) to setup
- *
- * Return 0 on success, negative on failure
- **/
-
-static int e1000_setup_tx_resources(struct e1000_adapter *adapter,
-                                   struct e1000_tx_ring *txdr)
-{
-       struct pci_dev *pdev = adapter->pdev;
-       int size;
-
-       size = sizeof(struct e1000_buffer) * txdr->count;
-       txdr->buffer_info = vmalloc(size);
-       if (!txdr->buffer_info) {
-               DPRINTK(PROBE, ERR,
-               "Unable to allocate memory for the transmit descriptor ring\n");
-               return -ENOMEM;
-       }
-       memset(txdr->buffer_info, 0, size);
-
-       /* round up to nearest 4K */
-
-       txdr->size = txdr->count * sizeof(struct e1000_tx_desc);
-       txdr->size = ALIGN(txdr->size, 4096);
-
-       txdr->desc = pci_alloc_consistent(pdev, txdr->size, &txdr->dma);
-       if (!txdr->desc) {
-setup_tx_desc_die:
-               vfree(txdr->buffer_info);
-               DPRINTK(PROBE, ERR,
-               "Unable to allocate memory for the transmit descriptor ring\n");
-               return -ENOMEM;
-       }
-
-       /* Fix for errata 23, can't cross 64kB boundary */
-       if (!e1000_check_64k_bound(adapter, txdr->desc, txdr->size)) {
-               void *olddesc = txdr->desc;
-               dma_addr_t olddma = txdr->dma;
-               DPRINTK(TX_ERR, ERR, "txdr align check failed: %u bytes "
-                                    "at %p\n", txdr->size, txdr->desc);
-               /* Try again, without freeing the previous */
-               txdr->desc = pci_alloc_consistent(pdev, txdr->size, &txdr->dma);
-               /* Failed allocation, critical failure */
-               if (!txdr->desc) {
-                       pci_free_consistent(pdev, txdr->size, olddesc, olddma);
-                       goto setup_tx_desc_die;
-               }
-
-               if (!e1000_check_64k_bound(adapter, txdr->desc, txdr->size)) {
-                       /* give up */
-                       pci_free_consistent(pdev, txdr->size, txdr->desc,
-                                           txdr->dma);
-                       pci_free_consistent(pdev, txdr->size, olddesc, olddma);
-                       DPRINTK(PROBE, ERR,
-                               "Unable to allocate aligned memory "
-                               "for the transmit descriptor ring\n");
-                       vfree(txdr->buffer_info);
-                       return -ENOMEM;
-               } else {
-                       /* Free old allocation, new allocation was successful */
-                       pci_free_consistent(pdev, txdr->size, olddesc, olddma);
-               }
-       }
-       memset(txdr->desc, 0, txdr->size);
-
-       txdr->next_to_use = 0;
-       txdr->next_to_clean = 0;
-       spin_lock_init(&txdr->tx_lock);
-
-       return 0;
-}
-
-/**
- * e1000_setup_all_tx_resources - wrapper to allocate Tx resources
- *                               (Descriptors) for all queues
- * @adapter: board private structure
- *
- * Return 0 on success, negative on failure
- **/
-
-int e1000_setup_all_tx_resources(struct e1000_adapter *adapter)
-{
-       int i, err = 0;
-
-       for (i = 0; i < adapter->num_tx_queues; i++) {
-               err = e1000_setup_tx_resources(adapter, &adapter->tx_ring[i]);
-               if (err) {
-                       DPRINTK(PROBE, ERR,
-                               "Allocation for Tx Queue %u failed\n", i);
-                       for (i-- ; i >= 0; i--)
-                               e1000_free_tx_resources(adapter,
-                                                       &adapter->tx_ring[i]);
-                       break;
-               }
-       }
-
-       return err;
-}
-
-/**
- * e1000_configure_tx - Configure 8254x Transmit Unit after Reset
- * @adapter: board private structure
- *
- * Configure the Tx unit of the MAC after a reset.
- **/
-
-static void e1000_configure_tx(struct e1000_adapter *adapter)
-{
-       u64 tdba;
-       struct e1000_hw *hw = &adapter->hw;
-       u32 tdlen, tctl, tipg, tarc;
-       u32 ipgr1, ipgr2;
-
-       /* Setup the HW Tx Head and Tail descriptor pointers */
-
-       switch (adapter->num_tx_queues) {
-       case 1:
-       default:
-               tdba = adapter->tx_ring[0].dma;
-               tdlen = adapter->tx_ring[0].count *
-                       sizeof(struct e1000_tx_desc);
-               ew32(TDLEN, tdlen);
-               ew32(TDBAH, (tdba >> 32));
-               ew32(TDBAL, (tdba & 0x00000000ffffffffULL));
-               ew32(TDT, 0);
-               ew32(TDH, 0);
-               adapter->tx_ring[0].tdh = ((hw->mac_type >= e1000_82543) ? 
E1000_TDH : E1000_82542_TDH);
-               adapter->tx_ring[0].tdt = ((hw->mac_type >= e1000_82543) ? 
E1000_TDT : E1000_82542_TDT);
-               break;
-       }
-
-       /* Set the default values for the Tx Inter Packet Gap timer */
-       if (hw->mac_type <= e1000_82547_rev_2 &&
-           (hw->media_type == e1000_media_type_fiber ||
-            hw->media_type == e1000_media_type_internal_serdes))
-               tipg = DEFAULT_82543_TIPG_IPGT_FIBER;
-       else
-               tipg = DEFAULT_82543_TIPG_IPGT_COPPER;
-
-       switch (hw->mac_type) {
-       case e1000_82542_rev2_0:
-       case e1000_82542_rev2_1:
-               tipg = DEFAULT_82542_TIPG_IPGT;
-               ipgr1 = DEFAULT_82542_TIPG_IPGR1;
-               ipgr2 = DEFAULT_82542_TIPG_IPGR2;
-               break;
-       case e1000_80003es2lan:
-               ipgr1 = DEFAULT_82543_TIPG_IPGR1;
-               ipgr2 = DEFAULT_80003ES2LAN_TIPG_IPGR2;
-               break;
-       default:
-               ipgr1 = DEFAULT_82543_TIPG_IPGR1;
-               ipgr2 = DEFAULT_82543_TIPG_IPGR2;
-               break;
-       }
-       tipg |= ipgr1 << E1000_TIPG_IPGR1_SHIFT;
-       tipg |= ipgr2 << E1000_TIPG_IPGR2_SHIFT;
-       ew32(TIPG, tipg);
-
-       /* Set the Tx Interrupt Delay register */
-
-       ew32(TIDV, adapter->tx_int_delay);
-       if (hw->mac_type >= e1000_82540)
-               ew32(TADV, adapter->tx_abs_int_delay);
-
-       /* Program the Transmit Control Register */
-
-       tctl = er32(TCTL);
-       tctl &= ~E1000_TCTL_CT;
-       tctl |= E1000_TCTL_PSP | E1000_TCTL_RTLC |
-               (E1000_COLLISION_THRESHOLD << E1000_CT_SHIFT);
-
-       if (hw->mac_type == e1000_82571 || hw->mac_type == e1000_82572) {
-               tarc = er32(TARC0);
-               /* set the speed mode bit, we'll clear it if we're not at
-                * gigabit link later */
-               tarc |= (1 << 21);
-               ew32(TARC0, tarc);
-       } else if (hw->mac_type == e1000_80003es2lan) {
-               tarc = er32(TARC0);
-               tarc |= 1;
-               ew32(TARC0, tarc);
-               tarc = er32(TARC1);
-               tarc |= 1;
-               ew32(TARC1, tarc);
-       }
-
-       e1000_config_collision_dist(hw);
-
-       /* Setup Transmit Descriptor Settings for eop descriptor */
-       adapter->txd_cmd = E1000_TXD_CMD_EOP | E1000_TXD_CMD_IFCS;
-
-       /* only set IDE if we are delaying interrupts using the timers */
-       if (adapter->tx_int_delay)
-               adapter->txd_cmd |= E1000_TXD_CMD_IDE;
-
-       if (hw->mac_type < e1000_82543)
-               adapter->txd_cmd |= E1000_TXD_CMD_RPS;
-       else
-               adapter->txd_cmd |= E1000_TXD_CMD_RS;
-
-       /* Cache if we're 82544 running in PCI-X because we'll
-        * need this to apply a workaround later in the send path. */
-       if (hw->mac_type == e1000_82544 &&
-           hw->bus_type == e1000_bus_type_pcix)
-               adapter->pcix_82544 = 1;
-
-       ew32(TCTL, tctl);
-
-}
-
-/**
- * e1000_setup_rx_resources - allocate Rx resources (Descriptors)
- * @adapter: board private structure
- * @rxdr:    rx descriptor ring (for a specific queue) to setup
- *
- * Returns 0 on success, negative on failure
- **/
-
-static int e1000_setup_rx_resources(struct e1000_adapter *adapter,
-                                   struct e1000_rx_ring *rxdr)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       struct pci_dev *pdev = adapter->pdev;
-       int size, desc_len;
-
-       size = sizeof(struct e1000_buffer) * rxdr->count;
-       rxdr->buffer_info = vmalloc(size);
-       if (!rxdr->buffer_info) {
-               DPRINTK(PROBE, ERR,
-               "Unable to allocate memory for the receive descriptor ring\n");
-               return -ENOMEM;
-       }
-       memset(rxdr->buffer_info, 0, size);
-
-       if (hw->mac_type <= e1000_82547_rev_2)
-               desc_len = sizeof(struct e1000_rx_desc);
-       else
-               desc_len = sizeof(union e1000_rx_desc_packet_split);
-
-       /* Round up to nearest 4K */
-
-       rxdr->size = rxdr->count * desc_len;
-       rxdr->size = ALIGN(rxdr->size, 4096);
-
-       rxdr->desc = pci_alloc_consistent(pdev, rxdr->size, &rxdr->dma);
-
-       if (!rxdr->desc) {
-               DPRINTK(PROBE, ERR,
-               "Unable to allocate memory for the receive descriptor ring\n");
-setup_rx_desc_die:
-               vfree(rxdr->buffer_info);
-               return -ENOMEM;
-       }
-
-       /* Fix for errata 23, can't cross 64kB boundary */
-       if (!e1000_check_64k_bound(adapter, rxdr->desc, rxdr->size)) {
-               void *olddesc = rxdr->desc;
-               dma_addr_t olddma = rxdr->dma;
-               DPRINTK(RX_ERR, ERR, "rxdr align check failed: %u bytes "
-                                    "at %p\n", rxdr->size, rxdr->desc);
-               /* Try again, without freeing the previous */
-               rxdr->desc = pci_alloc_consistent(pdev, rxdr->size, &rxdr->dma);
-               /* Failed allocation, critical failure */
-               if (!rxdr->desc) {
-                       pci_free_consistent(pdev, rxdr->size, olddesc, olddma);
-                       DPRINTK(PROBE, ERR,
-                               "Unable to allocate memory "
-                               "for the receive descriptor ring\n");
-                       goto setup_rx_desc_die;
-               }
-
-               if (!e1000_check_64k_bound(adapter, rxdr->desc, rxdr->size)) {
-                       /* give up */
-                       pci_free_consistent(pdev, rxdr->size, rxdr->desc,
-                                           rxdr->dma);
-                       pci_free_consistent(pdev, rxdr->size, olddesc, olddma);
-                       DPRINTK(PROBE, ERR,
-                               "Unable to allocate aligned memory "
-                               "for the receive descriptor ring\n");
-                       goto setup_rx_desc_die;
-               } else {
-                       /* Free old allocation, new allocation was successful */
-                       pci_free_consistent(pdev, rxdr->size, olddesc, olddma);
-               }
-       }
-       memset(rxdr->desc, 0, rxdr->size);
-
-       rxdr->next_to_clean = 0;
-       rxdr->next_to_use = 0;
-
-       return 0;
-}
-
-/**
- * e1000_setup_all_rx_resources - wrapper to allocate Rx resources
- *                               (Descriptors) for all queues
- * @adapter: board private structure
- *
- * Return 0 on success, negative on failure
- **/
-
-int e1000_setup_all_rx_resources(struct e1000_adapter *adapter)
-{
-       int i, err = 0;
-
-       for (i = 0; i < adapter->num_rx_queues; i++) {
-               err = e1000_setup_rx_resources(adapter, &adapter->rx_ring[i]);
-               if (err) {
-                       DPRINTK(PROBE, ERR,
-                               "Allocation for Rx Queue %u failed\n", i);
-                       for (i-- ; i >= 0; i--)
-                               e1000_free_rx_resources(adapter,
-                                                       &adapter->rx_ring[i]);
-                       break;
-               }
-       }
-
-       return err;
-}
-
-/**
- * e1000_setup_rctl - configure the receive control registers
- * @adapter: Board private structure
- **/
-#define PAGE_USE_COUNT(S) (((S) >> PAGE_SHIFT) + \
-                       (((S) & (PAGE_SIZE - 1)) ? 1 : 0))
-static void e1000_setup_rctl(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       u32 rctl;
-
-       rctl = er32(RCTL);
-
-       rctl &= ~(3 << E1000_RCTL_MO_SHIFT);
-
-       rctl |= E1000_RCTL_EN | E1000_RCTL_BAM |
-               E1000_RCTL_LBM_NO | E1000_RCTL_RDMTS_HALF |
-               (hw->mc_filter_type << E1000_RCTL_MO_SHIFT);
-
-       if (hw->tbi_compatibility_on == 1)
-               rctl |= E1000_RCTL_SBP;
-       else
-               rctl &= ~E1000_RCTL_SBP;
-
-       if (adapter->netdev->mtu <= ETH_DATA_LEN)
-               rctl &= ~E1000_RCTL_LPE;
-       else
-               rctl |= E1000_RCTL_LPE;
-
-       /* Setup buffer sizes */
-       rctl &= ~E1000_RCTL_SZ_4096;
-       rctl |= E1000_RCTL_BSEX;
-       switch (adapter->rx_buffer_len) {
-               case E1000_RXBUFFER_256:
-                       rctl |= E1000_RCTL_SZ_256;
-                       rctl &= ~E1000_RCTL_BSEX;
-                       break;
-               case E1000_RXBUFFER_512:
-                       rctl |= E1000_RCTL_SZ_512;
-                       rctl &= ~E1000_RCTL_BSEX;
-                       break;
-               case E1000_RXBUFFER_1024:
-                       rctl |= E1000_RCTL_SZ_1024;
-                       rctl &= ~E1000_RCTL_BSEX;
-                       break;
-               case E1000_RXBUFFER_2048:
-               default:
-                       rctl |= E1000_RCTL_SZ_2048;
-                       rctl &= ~E1000_RCTL_BSEX;
-                       break;
-               case E1000_RXBUFFER_4096:
-                       rctl |= E1000_RCTL_SZ_4096;
-                       break;
-               case E1000_RXBUFFER_8192:
-                       rctl |= E1000_RCTL_SZ_8192;
-                       break;
-               case E1000_RXBUFFER_16384:
-                       rctl |= E1000_RCTL_SZ_16384;
-                       break;
-       }
-
-       ew32(RCTL, rctl);
-}
-
-/**
- * e1000_configure_rx - Configure 8254x Receive Unit after Reset
- * @adapter: board private structure
- *
- * Configure the Rx unit of the MAC after a reset.
- **/
-
-static void e1000_configure_rx(struct e1000_adapter *adapter)
-{
-       u64 rdba;
-       struct e1000_hw *hw = &adapter->hw;
-       u32 rdlen, rctl, rxcsum, ctrl_ext;
-
-       rdlen = adapter->rx_ring[0].count *
-               sizeof(struct e1000_rx_desc);
-       adapter->clean_rx = e1000_clean_rx_irq;
-       adapter->alloc_rx_buf = e1000_alloc_rx_buffers;
-
-       /* disable receives while setting up the descriptors */
-       rctl = er32(RCTL);
-       ew32(RCTL, rctl & ~E1000_RCTL_EN);
-
-       /* set the Receive Delay Timer Register */
-       ew32(RDTR, adapter->rx_int_delay);
-
-       if (hw->mac_type >= e1000_82540) {
-               ew32(RADV, adapter->rx_abs_int_delay);
-               if (adapter->itr_setting != 0)
-                       ew32(ITR, 1000000000 / (adapter->itr * 256));
-       }
-
-       if (hw->mac_type >= e1000_82571) {
-               ctrl_ext = er32(CTRL_EXT);
-               /* Reset delay timers after every interrupt */
-               ctrl_ext |= E1000_CTRL_EXT_INT_TIMER_CLR;
-               /* Auto-Mask interrupts upon ICR access */
-               ctrl_ext |= E1000_CTRL_EXT_IAME;
-               ew32(IAM, 0xffffffff);
-               ew32(CTRL_EXT, ctrl_ext);
-               E1000_WRITE_FLUSH();
-       }
-
-       /* Setup the HW Rx Head and Tail Descriptor Pointers and
-        * the Base and Length of the Rx Descriptor Ring */
-       switch (adapter->num_rx_queues) {
-       case 1:
-       default:
-               rdba = adapter->rx_ring[0].dma;
-               ew32(RDLEN, rdlen);
-               ew32(RDBAH, (rdba >> 32));
-               ew32(RDBAL, (rdba & 0x00000000ffffffffULL));
-               ew32(RDT, 0);
-               ew32(RDH, 0);
-               adapter->rx_ring[0].rdh = ((hw->mac_type >= e1000_82543) ? 
E1000_RDH : E1000_82542_RDH);
-               adapter->rx_ring[0].rdt = ((hw->mac_type >= e1000_82543) ? 
E1000_RDT : E1000_82542_RDT);
-               break;
-       }
-
-       /* Enable 82543 Receive Checksum Offload for TCP and UDP */
-       if (hw->mac_type >= e1000_82543) {
-               rxcsum = er32(RXCSUM);
-               if (adapter->rx_csum)
-                       rxcsum |= E1000_RXCSUM_TUOFL;
-               else
-                       /* don't need to clear IPPCSE as it defaults to 0 */
-                       rxcsum &= ~E1000_RXCSUM_TUOFL;
-               ew32(RXCSUM, rxcsum);
-       }
-
-       /* Enable Receives */
-       ew32(RCTL, rctl);
-}
-
-/**
- * e1000_free_tx_resources - Free Tx Resources per Queue
- * @adapter: board private structure
- * @tx_ring: Tx descriptor ring for a specific queue
- *
- * Free all transmit software resources
- **/
-
-static void e1000_free_tx_resources(struct e1000_adapter *adapter,
-                                   struct e1000_tx_ring *tx_ring)
-{
-       struct pci_dev *pdev = adapter->pdev;
-
-       e1000_clean_tx_ring(adapter, tx_ring);
-
-       vfree(tx_ring->buffer_info);
-       tx_ring->buffer_info = NULL;
-
-       pci_free_consistent(pdev, tx_ring->size, tx_ring->desc, tx_ring->dma);
-
-       tx_ring->desc = NULL;
-}
-
-/**
- * e1000_free_all_tx_resources - Free Tx Resources for All Queues
- * @adapter: board private structure
- *
- * Free all transmit software resources
- **/
-
-void e1000_free_all_tx_resources(struct e1000_adapter *adapter)
-{
-       int i;
-
-       for (i = 0; i < adapter->num_tx_queues; i++)
-               e1000_free_tx_resources(adapter, &adapter->tx_ring[i]);
-}
-
-static void e1000_unmap_and_free_tx_resource(struct e1000_adapter *adapter,
-                                            struct e1000_buffer *buffer_info)
-{
-       if (buffer_info->dma) {
-               pci_unmap_page(adapter->pdev,
-                               buffer_info->dma,
-                               buffer_info->length,
-                               PCI_DMA_TODEVICE);
-               buffer_info->dma = 0;
-       }
-       if (buffer_info->skb) {
-               dev_kfree_skb_any(buffer_info->skb);
-               buffer_info->skb = NULL;
-       }
-       /* buffer_info must be completely set up in the transmit path */
-}
-
-/**
- * e1000_clean_tx_ring - Free Tx Buffers
- * @adapter: board private structure
- * @tx_ring: ring to be cleaned
- **/
-
-static void e1000_clean_tx_ring(struct e1000_adapter *adapter,
-                               struct e1000_tx_ring *tx_ring)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       struct e1000_buffer *buffer_info;
-       unsigned long size;
-       unsigned int i;
-
-       /* Free all the Tx ring sk_buffs */
-
-       for (i = 0; i < tx_ring->count; i++) {
-               buffer_info = &tx_ring->buffer_info[i];
-               e1000_unmap_and_free_tx_resource(adapter, buffer_info);
-       }
-
-       size = sizeof(struct e1000_buffer) * tx_ring->count;
-       memset(tx_ring->buffer_info, 0, size);
-
-       /* Zero out the descriptor ring */
-
-       memset(tx_ring->desc, 0, tx_ring->size);
-
-       tx_ring->next_to_use = 0;
-       tx_ring->next_to_clean = 0;
-       tx_ring->last_tx_tso = 0;
-
-       writel(0, hw->hw_addr + tx_ring->tdh);
-       writel(0, hw->hw_addr + tx_ring->tdt);
-}
-
-/**
- * e1000_clean_all_tx_rings - Free Tx Buffers for all queues
- * @adapter: board private structure
- **/
-
-static void e1000_clean_all_tx_rings(struct e1000_adapter *adapter)
-{
-       int i;
-
-       for (i = 0; i < adapter->num_tx_queues; i++)
-               e1000_clean_tx_ring(adapter, &adapter->tx_ring[i]);
-}
-
-/**
- * e1000_free_rx_resources - Free Rx Resources
- * @adapter: board private structure
- * @rx_ring: ring to clean the resources from
- *
- * Free all receive software resources
- **/
-
-static void e1000_free_rx_resources(struct e1000_adapter *adapter,
-                                   struct e1000_rx_ring *rx_ring)
-{
-       struct pci_dev *pdev = adapter->pdev;
-
-       e1000_clean_rx_ring(adapter, rx_ring);
-
-       vfree(rx_ring->buffer_info);
-       rx_ring->buffer_info = NULL;
-
-       pci_free_consistent(pdev, rx_ring->size, rx_ring->desc, rx_ring->dma);
-
-       rx_ring->desc = NULL;
-}
-
-/**
- * e1000_free_all_rx_resources - Free Rx Resources for All Queues
- * @adapter: board private structure
- *
- * Free all receive software resources
- **/
-
-void e1000_free_all_rx_resources(struct e1000_adapter *adapter)
-{
-       int i;
-
-       for (i = 0; i < adapter->num_rx_queues; i++)
-               e1000_free_rx_resources(adapter, &adapter->rx_ring[i]);
-}
-
-/**
- * e1000_clean_rx_ring - Free Rx Buffers per Queue
- * @adapter: board private structure
- * @rx_ring: ring to free buffers from
- **/
-
-static void e1000_clean_rx_ring(struct e1000_adapter *adapter,
-                               struct e1000_rx_ring *rx_ring)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       struct e1000_buffer *buffer_info;
-       struct pci_dev *pdev = adapter->pdev;
-       unsigned long size;
-       unsigned int i;
-
-       /* Free all the Rx ring sk_buffs */
-       for (i = 0; i < rx_ring->count; i++) {
-               buffer_info = &rx_ring->buffer_info[i];
-               if (buffer_info->skb) {
-                       pci_unmap_single(pdev,
-                                        buffer_info->dma,
-                                        buffer_info->length,
-                                        PCI_DMA_FROMDEVICE);
-
-                       dev_kfree_skb(buffer_info->skb);
-                       buffer_info->skb = NULL;
-               }
-       }
-
-       size = sizeof(struct e1000_buffer) * rx_ring->count;
-       memset(rx_ring->buffer_info, 0, size);
-
-       /* Zero out the descriptor ring */
-
-       memset(rx_ring->desc, 0, rx_ring->size);
-
-       rx_ring->next_to_clean = 0;
-       rx_ring->next_to_use = 0;
-
-       writel(0, hw->hw_addr + rx_ring->rdh);
-       writel(0, hw->hw_addr + rx_ring->rdt);
-}
-
-/**
- * e1000_clean_all_rx_rings - Free Rx Buffers for all queues
- * @adapter: board private structure
- **/
-
-static void e1000_clean_all_rx_rings(struct e1000_adapter *adapter)
-{
-       int i;
-
-       for (i = 0; i < adapter->num_rx_queues; i++)
-               e1000_clean_rx_ring(adapter, &adapter->rx_ring[i]);
-}
-
-/* The 82542 2.0 (revision 2) needs to have the receive unit in reset
- * and memory write and invalidate disabled for certain operations
- */
-static void e1000_enter_82542_rst(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       struct net_device *netdev = adapter->netdev;
-       u32 rctl;
-
-       e1000_pci_clear_mwi(hw);
-
-       rctl = er32(RCTL);
-       rctl |= E1000_RCTL_RST;
-       ew32(RCTL, rctl);
-       E1000_WRITE_FLUSH();
-       mdelay(5);
-
-       if (netif_running(netdev))
-               e1000_clean_all_rx_rings(adapter);
-}
-
-static void e1000_leave_82542_rst(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       struct net_device *netdev = adapter->netdev;
-       u32 rctl;
-
-       rctl = er32(RCTL);
-       rctl &= ~E1000_RCTL_RST;
-       ew32(RCTL, rctl);
-       E1000_WRITE_FLUSH();
-       mdelay(5);
-
-       if (hw->pci_cmd_word & PCI_COMMAND_INVALIDATE)
-               e1000_pci_set_mwi(hw);
-
-       if (netif_running(netdev)) {
-               /* No need to loop, because 82542 supports only 1 queue */
-               struct e1000_rx_ring *ring = &adapter->rx_ring[0];
-               e1000_configure_rx(adapter);
-               adapter->alloc_rx_buf(adapter, ring, E1000_DESC_UNUSED(ring));
-       }
-}
-
-/**
- * e1000_set_mac - Change the Ethernet Address of the NIC
- * @netdev: network interface device structure
- * @p: pointer to an address structure
- *
- * Returns 0 on success, negative on failure
- **/
-
-static int e1000_set_mac(struct net_device *netdev, void *p)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       struct sockaddr *addr = p;
-
-       if (!is_valid_ether_addr(addr->sa_data))
-               return -EADDRNOTAVAIL;
-
-       /* 82542 2.0 needs to be in reset to write receive address registers */
-
-       if (hw->mac_type == e1000_82542_rev2_0)
-               e1000_enter_82542_rst(adapter);
-
-       memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len);
-       memcpy(hw->mac_addr, addr->sa_data, netdev->addr_len);
-
-       e1000_rar_set(hw, hw->mac_addr, 0);
-
-       /* With 82571 controllers, LAA may be overwritten (with the default)
-        * due to controller reset from the other port. */
-       if (hw->mac_type == e1000_82571) {
-               /* activate the work around */
-               hw->laa_is_present = 1;
-
-               /* Hold a copy of the LAA in RAR[14] This is done so that
-                * between the time RAR[0] gets clobbered  and the time it
-                * gets fixed (in e1000_watchdog), the actual LAA is in one
-                * of the RARs and no incoming packets directed to this port
-                * are dropped. Eventaully the LAA will be in RAR[0] and
-                * RAR[14] */
-               e1000_rar_set(hw, hw->mac_addr,
-                                       E1000_RAR_ENTRIES - 1);
-       }
-
-       if (hw->mac_type == e1000_82542_rev2_0)
-               e1000_leave_82542_rst(adapter);
-
-       return 0;
-}
-
-/**
- * e1000_set_rx_mode - Secondary Unicast, Multicast and Promiscuous mode set
- * @netdev: network interface device structure
- *
- * The set_rx_mode entry point is called whenever the unicast or multicast
- * address lists or the network interface flags are updated. This routine is
- * responsible for configuring the hardware for proper unicast, multicast,
- * promiscuous mode, and all-multi behavior.
- **/
-
-static void e1000_set_rx_mode(struct net_device *netdev)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       struct dev_addr_list *uc_ptr;
-       struct dev_addr_list *mc_ptr;
-       u32 rctl;
-       u32 hash_value;
-       int i, rar_entries = E1000_RAR_ENTRIES;
-       int mta_reg_count = (hw->mac_type == e1000_ich8lan) ?
-                               E1000_NUM_MTA_REGISTERS_ICH8LAN :
-                               E1000_NUM_MTA_REGISTERS;
-
-       if (hw->mac_type == e1000_ich8lan)
-               rar_entries = E1000_RAR_ENTRIES_ICH8LAN;
-
-       /* reserve RAR[14] for LAA over-write work-around */
-       if (hw->mac_type == e1000_82571)
-               rar_entries--;
-
-       /* Check for Promiscuous and All Multicast modes */
-
-       rctl = er32(RCTL);
-
-       if (netdev->flags & IFF_PROMISC) {
-               rctl |= (E1000_RCTL_UPE | E1000_RCTL_MPE);
-               rctl &= ~E1000_RCTL_VFE;
-       } else {
-               if (netdev->flags & IFF_ALLMULTI) {
-                       rctl |= E1000_RCTL_MPE;
-               } else {
-                       rctl &= ~E1000_RCTL_MPE;
-               }
-               if (adapter->hw.mac_type != e1000_ich8lan)
-                       rctl |= E1000_RCTL_VFE;
-       }
-
-       uc_ptr = NULL;
-       if (netdev->uc_count > rar_entries - 1) {
-               rctl |= E1000_RCTL_UPE;
-       } else if (!(netdev->flags & IFF_PROMISC)) {
-               rctl &= ~E1000_RCTL_UPE;
-               uc_ptr = netdev->uc_list;
-       }
-
-       ew32(RCTL, rctl);
-
-       /* 82542 2.0 needs to be in reset to write receive address registers */
-
-       if (hw->mac_type == e1000_82542_rev2_0)
-               e1000_enter_82542_rst(adapter);
-
-       /* load the first 14 addresses into the exact filters 1-14. Unicast
-        * addresses take precedence to avoid disabling unicast filtering
-        * when possible.
-        *
-        * RAR 0 is used for the station MAC adddress
-        * if there are not 14 addresses, go ahead and clear the filters
-        * -- with 82571 controllers only 0-13 entries are filled here
-        */
-       mc_ptr = netdev->mc_list;
-
-       for (i = 1; i < rar_entries; i++) {
-               if (uc_ptr) {
-                       e1000_rar_set(hw, uc_ptr->da_addr, i);
-                       uc_ptr = uc_ptr->next;
-               } else if (mc_ptr) {
-                       e1000_rar_set(hw, mc_ptr->da_addr, i);
-                       mc_ptr = mc_ptr->next;
-               } else {
-                       E1000_WRITE_REG_ARRAY(hw, RA, i << 1, 0);
-                       E1000_WRITE_FLUSH();
-                       E1000_WRITE_REG_ARRAY(hw, RA, (i << 1) + 1, 0);
-                       E1000_WRITE_FLUSH();
-               }
-       }
-       WARN_ON(uc_ptr != NULL);
-
-       /* clear the old settings from the multicast hash table */
-
-       for (i = 0; i < mta_reg_count; i++) {
-               E1000_WRITE_REG_ARRAY(hw, MTA, i, 0);
-               E1000_WRITE_FLUSH();
-       }
-
-       /* load any remaining addresses into the hash table */
-
-       for (; mc_ptr; mc_ptr = mc_ptr->next) {
-               hash_value = e1000_hash_mc_addr(hw, mc_ptr->da_addr);
-               e1000_mta_set(hw, hash_value);
-       }
-
-       if (hw->mac_type == e1000_82542_rev2_0)
-               e1000_leave_82542_rst(adapter);
-}
-
-/* Need to wait a few seconds after link up to get diagnostic information from
- * the phy */
-
-static void e1000_update_phy_info(unsigned long data)
-{
-       struct e1000_adapter *adapter = (struct e1000_adapter *)data;
-       struct e1000_hw *hw = &adapter->hw;
-       e1000_phy_get_info(hw, &adapter->phy_info);
-}
-
-/**
- * e1000_82547_tx_fifo_stall - Timer Call-back
- * @data: pointer to adapter cast into an unsigned long
- **/
-
-static void e1000_82547_tx_fifo_stall(unsigned long data)
-{
-       struct e1000_adapter *adapter = (struct e1000_adapter *)data;
-       struct e1000_hw *hw = &adapter->hw;
-       struct net_device *netdev = adapter->netdev;
-       u32 tctl;
-
-       if (atomic_read(&adapter->tx_fifo_stall)) {
-               if ((er32(TDT) == er32(TDH)) &&
-                  (er32(TDFT) == er32(TDFH)) &&
-                  (er32(TDFTS) == er32(TDFHS))) {
-                       tctl = er32(TCTL);
-                       ew32(TCTL, tctl & ~E1000_TCTL_EN);
-                       ew32(TDFT, adapter->tx_head_addr);
-                       ew32(TDFH, adapter->tx_head_addr);
-                       ew32(TDFTS, adapter->tx_head_addr);
-                       ew32(TDFHS, adapter->tx_head_addr);
-                       ew32(TCTL, tctl);
-                       E1000_WRITE_FLUSH();
-
-                       adapter->tx_fifo_head = 0;
-                       atomic_set(&adapter->tx_fifo_stall, 0);
-                       netif_wake_queue(netdev);
-               } else {
-                       mod_timer(&adapter->tx_fifo_stall_timer, jiffies + 1);
-               }
-       }
-}
-
-/**
- * e1000_watchdog - Timer Call-back
- * @data: pointer to adapter cast into an unsigned long
- **/
-static void e1000_watchdog(unsigned long data)
-{
-       struct e1000_adapter *adapter = (struct e1000_adapter *)data;
-       struct e1000_hw *hw = &adapter->hw;
-       struct net_device *netdev = adapter->netdev;
-       struct e1000_tx_ring *txdr = adapter->tx_ring;
-       u32 link, tctl;
-       s32 ret_val;
-
-       ret_val = e1000_check_for_link(hw);
-       if ((ret_val == E1000_ERR_PHY) &&
-           (hw->phy_type == e1000_phy_igp_3) &&
-           (er32(CTRL) & E1000_PHY_CTRL_GBE_DISABLE)) {
-               /* See e1000_kumeran_lock_loss_workaround() */
-               DPRINTK(LINK, INFO,
-                       "Gigabit has been disabled, downgrading speed\n");
-       }
-
-       if (hw->mac_type == e1000_82573) {
-               e1000_enable_tx_pkt_filtering(hw);
-               if (adapter->mng_vlan_id != hw->mng_cookie.vlan_id)
-                       e1000_update_mng_vlan(adapter);
-       }
-
-       if ((hw->media_type == e1000_media_type_internal_serdes) &&
-          !(er32(TXCW) & E1000_TXCW_ANE))
-               link = !hw->serdes_link_down;
-       else
-               link = er32(STATUS) & E1000_STATUS_LU;
-
-       if (link) {
-               if (!netif_carrier_ok(netdev)) {
-                       u32 ctrl;
-                       bool txb2b = true;
-                       e1000_get_speed_and_duplex(hw,
-                                                  &adapter->link_speed,
-                                                  &adapter->link_duplex);
-
-                       ctrl = er32(CTRL);
-                       printk(KERN_INFO "e1000: %s NIC Link is Up %d Mbps %s, "
-                              "Flow Control: %s\n",
-                              netdev->name,
-                              adapter->link_speed,
-                              adapter->link_duplex == FULL_DUPLEX ?
-                               "Full Duplex" : "Half Duplex",
-                               ((ctrl & E1000_CTRL_TFCE) && (ctrl &
-                               E1000_CTRL_RFCE)) ? "RX/TX" : ((ctrl &
-                               E1000_CTRL_RFCE) ? "RX" : ((ctrl &
-                               E1000_CTRL_TFCE) ? "TX" : "None" )));
-
-                       /* tweak tx_queue_len according to speed/duplex
-                        * and adjust the timeout factor */
-                       netdev->tx_queue_len = adapter->tx_queue_len;
-                       adapter->tx_timeout_factor = 1;
-                       switch (adapter->link_speed) {
-                       case SPEED_10:
-                               txb2b = false;
-                               netdev->tx_queue_len = 10;
-                               adapter->tx_timeout_factor = 8;
-                               break;
-                       case SPEED_100:
-                               txb2b = false;
-                               netdev->tx_queue_len = 100;
-                               /* maybe add some timeout factor ? */
-                               break;
-                       }
-
-                       if ((hw->mac_type == e1000_82571 ||
-                            hw->mac_type == e1000_82572) &&
-                           !txb2b) {
-                               u32 tarc0;
-                               tarc0 = er32(TARC0);
-                               tarc0 &= ~(1 << 21);
-                               ew32(TARC0, tarc0);
-                       }
-
-                       /* disable TSO for pcie and 10/100 speeds, to avoid
-                        * some hardware issues */
-                       if (!adapter->tso_force &&
-                           hw->bus_type == e1000_bus_type_pci_express){
-                               switch (adapter->link_speed) {
-                               case SPEED_10:
-                               case SPEED_100:
-                                       DPRINTK(PROBE,INFO,
-                                       "10/100 speed: disabling TSO\n");
-                                       netdev->features &= ~NETIF_F_TSO;
-                                       netdev->features &= ~NETIF_F_TSO6;
-                                       break;
-                               case SPEED_1000:
-                                       netdev->features |= NETIF_F_TSO;
-                                       netdev->features |= NETIF_F_TSO6;
-                                       break;
-                               default:
-                                       /* oops */
-                                       break;
-                               }
-                       }
-
-                       /* enable transmits in the hardware, need to do this
-                        * after setting TARC0 */
-                       tctl = er32(TCTL);
-                       tctl |= E1000_TCTL_EN;
-                       ew32(TCTL, tctl);
-
-                       netif_carrier_on(netdev);
-                       netif_wake_queue(netdev);
-                       mod_timer(&adapter->phy_info_timer, 
round_jiffies(jiffies + 2 * HZ));
-                       adapter->smartspeed = 0;
-               } else {
-                       /* make sure the receive unit is started */
-                       if (hw->rx_needs_kicking) {
-                               u32 rctl = er32(RCTL);
-                               ew32(RCTL, rctl | E1000_RCTL_EN);
-                       }
-               }
-       } else {
-               if (netif_carrier_ok(netdev)) {
-                       adapter->link_speed = 0;
-                       adapter->link_duplex = 0;
-                       printk(KERN_INFO "e1000: %s NIC Link is Down\n",
-                              netdev->name);
-                       netif_carrier_off(netdev);
-                       netif_stop_queue(netdev);
-                       mod_timer(&adapter->phy_info_timer, 
round_jiffies(jiffies + 2 * HZ));
-
-                       /* 80003ES2LAN workaround--
-                        * For packet buffer work-around on link down event;
-                        * disable receives in the ISR and
-                        * reset device here in the watchdog
-                        */
-                       if (hw->mac_type == e1000_80003es2lan)
-                               /* reset device */
-                               schedule_work(&adapter->reset_task);
-               }
-
-               e1000_smartspeed(adapter);
-       }
-
-       e1000_update_stats(adapter);
-
-       hw->tx_packet_delta = adapter->stats.tpt - adapter->tpt_old;
-       adapter->tpt_old = adapter->stats.tpt;
-       hw->collision_delta = adapter->stats.colc - adapter->colc_old;
-       adapter->colc_old = adapter->stats.colc;
-
-       adapter->gorcl = adapter->stats.gorcl - adapter->gorcl_old;
-       adapter->gorcl_old = adapter->stats.gorcl;
-       adapter->gotcl = adapter->stats.gotcl - adapter->gotcl_old;
-       adapter->gotcl_old = adapter->stats.gotcl;
-
-       e1000_update_adaptive(hw);
-
-       if (!netif_carrier_ok(netdev)) {
-               if (E1000_DESC_UNUSED(txdr) + 1 < txdr->count) {
-                       /* We've lost link, so the controller stops DMA,
-                        * but we've got queued Tx work that's never going
-                        * to get done, so reset controller to flush Tx.
-                        * (Do the reset outside of interrupt context). */
-                       adapter->tx_timeout_count++;
-                       schedule_work(&adapter->reset_task);
-               }
-       }
-
-       /* Cause software interrupt to ensure rx ring is cleaned */
-       ew32(ICS, E1000_ICS_RXDMT0);
-
-       /* Force detection of hung controller every watchdog period */
-       adapter->detect_tx_hung = true;
-
-       /* With 82571 controllers, LAA may be overwritten due to controller
-        * reset from the other port. Set the appropriate LAA in RAR[0] */
-       if (hw->mac_type == e1000_82571 && hw->laa_is_present)
-               e1000_rar_set(hw, hw->mac_addr, 0);
-
-       /* Reset the timer */
-       mod_timer(&adapter->watchdog_timer, round_jiffies(jiffies + 2 * HZ));
-}
-
-enum latency_range {
-       lowest_latency = 0,
-       low_latency = 1,
-       bulk_latency = 2,
-       latency_invalid = 255
-};
-
-/**
- * e1000_update_itr - update the dynamic ITR value based on statistics
- *      Stores a new ITR value based on packets and byte
- *      counts during the last interrupt.  The advantage of per interrupt
- *      computation is faster updates and more accurate ITR for the current
- *      traffic pattern.  Constants in this function were computed
- *      based on theoretical maximum wire speed and thresholds were set based
- *      on testing data as well as attempting to minimize response time
- *      while increasing bulk throughput.
- *      this functionality is controlled by the InterruptThrottleRate module
- *      parameter (see e1000_param.c)
- * @adapter: pointer to adapter
- * @itr_setting: current adapter->itr
- * @packets: the number of packets during this measurement interval
- * @bytes: the number of bytes during this measurement interval
- **/
-static unsigned int e1000_update_itr(struct e1000_adapter *adapter,
-                                    u16 itr_setting, int packets, int bytes)
-{
-       unsigned int retval = itr_setting;
-       struct e1000_hw *hw = &adapter->hw;
-
-       if (unlikely(hw->mac_type < e1000_82540))
-               goto update_itr_done;
-
-       if (packets == 0)
-               goto update_itr_done;
-
-       switch (itr_setting) {
-       case lowest_latency:
-               /* jumbo frames get bulk treatment*/
-               if (bytes/packets > 8000)
-                       retval = bulk_latency;
-               else if ((packets < 5) && (bytes > 512))
-                       retval = low_latency;
-               break;
-       case low_latency:  /* 50 usec aka 20000 ints/s */
-               if (bytes > 10000) {
-                       /* jumbo frames need bulk latency setting */
-                       if (bytes/packets > 8000)
-                               retval = bulk_latency;
-                       else if ((packets < 10) || ((bytes/packets) > 1200))
-                               retval = bulk_latency;
-                       else if ((packets > 35))
-                               retval = lowest_latency;
-               } else if (bytes/packets > 2000)
-                       retval = bulk_latency;
-               else if (packets <= 2 && bytes < 512)
-                       retval = lowest_latency;
-               break;
-       case bulk_latency: /* 250 usec aka 4000 ints/s */
-               if (bytes > 25000) {
-                       if (packets > 35)
-                               retval = low_latency;
-               } else if (bytes < 6000) {
-                       retval = low_latency;
-               }
-               break;
-       }
-
-update_itr_done:
-       return retval;
-}
-
-static void e1000_set_itr(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       u16 current_itr;
-       u32 new_itr = adapter->itr;
-
-       if (unlikely(hw->mac_type < e1000_82540))
-               return;
-
-       /* for non-gigabit speeds, just fix the interrupt rate at 4000 */
-       if (unlikely(adapter->link_speed != SPEED_1000)) {
-               current_itr = 0;
-               new_itr = 4000;
-               goto set_itr_now;
-       }
-
-       adapter->tx_itr = e1000_update_itr(adapter,
-                                   adapter->tx_itr,
-                                   adapter->total_tx_packets,
-                                   adapter->total_tx_bytes);
-       /* conservative mode (itr 3) eliminates the lowest_latency setting */
-       if (adapter->itr_setting == 3 && adapter->tx_itr == lowest_latency)
-               adapter->tx_itr = low_latency;
-
-       adapter->rx_itr = e1000_update_itr(adapter,
-                                   adapter->rx_itr,
-                                   adapter->total_rx_packets,
-                                   adapter->total_rx_bytes);
-       /* conservative mode (itr 3) eliminates the lowest_latency setting */
-       if (adapter->itr_setting == 3 && adapter->rx_itr == lowest_latency)
-               adapter->rx_itr = low_latency;
-
-       current_itr = max(adapter->rx_itr, adapter->tx_itr);
-
-       switch (current_itr) {
-       /* counts and packets in update_itr are dependent on these numbers */
-       case lowest_latency:
-               new_itr = 70000;
-               break;
-       case low_latency:
-               new_itr = 20000; /* aka hwitr = ~200 */
-               break;
-       case bulk_latency:
-               new_itr = 4000;
-               break;
-       default:
-               break;
-       }
-
-set_itr_now:
-       if (new_itr != adapter->itr) {
-               /* this attempts to bias the interrupt rate towards Bulk
-                * by adding intermediate steps when interrupt rate is
-                * increasing */
-               new_itr = new_itr > adapter->itr ?
-                            min(adapter->itr + (new_itr >> 2), new_itr) :
-                            new_itr;
-               adapter->itr = new_itr;
-               ew32(ITR, 1000000000 / (new_itr * 256));
-       }
-
-       return;
-}
-
-#define E1000_TX_FLAGS_CSUM            0x00000001
-#define E1000_TX_FLAGS_VLAN            0x00000002
-#define E1000_TX_FLAGS_TSO             0x00000004
-#define E1000_TX_FLAGS_IPV4            0x00000008
-#define E1000_TX_FLAGS_VLAN_MASK       0xffff0000
-#define E1000_TX_FLAGS_VLAN_SHIFT      16
-
-static int e1000_tso(struct e1000_adapter *adapter,
-                    struct e1000_tx_ring *tx_ring, struct sk_buff *skb)
-{
-       struct e1000_context_desc *context_desc;
-       struct e1000_buffer *buffer_info;
-       unsigned int i;
-       u32 cmd_length = 0;
-       u16 ipcse = 0, tucse, mss;
-       u8 ipcss, ipcso, tucss, tucso, hdr_len;
-       int err;
-
-       if (skb_is_gso(skb)) {
-               if (skb_header_cloned(skb)) {
-                       err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC);
-                       if (err)
-                               return err;
-               }
-
-               hdr_len = skb_transport_offset(skb) + tcp_hdrlen(skb);
-               mss = skb_shinfo(skb)->gso_size;
-               if (skb->protocol == htons(ETH_P_IP)) {
-                       struct iphdr *iph = ip_hdr(skb);
-                       iph->tot_len = 0;
-                       iph->check = 0;
-                       tcp_hdr(skb)->check = ~csum_tcpudp_magic(iph->saddr,
-                                                                iph->daddr, 0,
-                                                                IPPROTO_TCP,
-                                                                0);
-                       cmd_length = E1000_TXD_CMD_IP;
-                       ipcse = skb_transport_offset(skb) - 1;
-               } else if (skb->protocol == htons(ETH_P_IPV6)) {
-                       ipv6_hdr(skb)->payload_len = 0;
-                       tcp_hdr(skb)->check =
-                               ~csum_ipv6_magic(&ipv6_hdr(skb)->saddr,
-                                                &ipv6_hdr(skb)->daddr,
-                                                0, IPPROTO_TCP, 0);
-                       ipcse = 0;
-               }
-               ipcss = skb_network_offset(skb);
-               ipcso = (void *)&(ip_hdr(skb)->check) - (void *)skb->data;
-               tucss = skb_transport_offset(skb);
-               tucso = (void *)&(tcp_hdr(skb)->check) - (void *)skb->data;
-               tucse = 0;
-
-               cmd_length |= (E1000_TXD_CMD_DEXT | E1000_TXD_CMD_TSE |
-                              E1000_TXD_CMD_TCP | (skb->len - (hdr_len)));
-
-               i = tx_ring->next_to_use;
-               context_desc = E1000_CONTEXT_DESC(*tx_ring, i);
-               buffer_info = &tx_ring->buffer_info[i];
-
-               context_desc->lower_setup.ip_fields.ipcss  = ipcss;
-               context_desc->lower_setup.ip_fields.ipcso  = ipcso;
-               context_desc->lower_setup.ip_fields.ipcse  = cpu_to_le16(ipcse);
-               context_desc->upper_setup.tcp_fields.tucss = tucss;
-               context_desc->upper_setup.tcp_fields.tucso = tucso;
-               context_desc->upper_setup.tcp_fields.tucse = cpu_to_le16(tucse);
-               context_desc->tcp_seg_setup.fields.mss     = cpu_to_le16(mss);
-               context_desc->tcp_seg_setup.fields.hdr_len = hdr_len;
-               context_desc->cmd_and_length = cpu_to_le32(cmd_length);
-
-               buffer_info->time_stamp = jiffies;
-               buffer_info->next_to_watch = i;
-
-               if (++i == tx_ring->count) i = 0;
-               tx_ring->next_to_use = i;
-
-               return true;
-       }
-       return false;
-}
-
-static bool e1000_tx_csum(struct e1000_adapter *adapter,
-                         struct e1000_tx_ring *tx_ring, struct sk_buff *skb)
-{
-       struct e1000_context_desc *context_desc;
-       struct e1000_buffer *buffer_info;
-       unsigned int i;
-       u8 css;
-       u32 cmd_len = E1000_TXD_CMD_DEXT;
-
-       if (skb->ip_summed != CHECKSUM_PARTIAL)
-               return false;
-
-       switch (skb->protocol) {
-       case __constant_htons(ETH_P_IP):
-               if (ip_hdr(skb)->protocol == IPPROTO_TCP)
-                       cmd_len |= E1000_TXD_CMD_TCP;
-               break;
-       case __constant_htons(ETH_P_IPV6):
-               /* XXX not handling all IPV6 headers */
-               if (ipv6_hdr(skb)->nexthdr == IPPROTO_TCP)
-                       cmd_len |= E1000_TXD_CMD_TCP;
-               break;
-       default:
-               if (unlikely(net_ratelimit()))
-                       DPRINTK(DRV, WARNING,
-                               "checksum_partial proto=%x!\n", skb->protocol);
-               break;
-       }
-
-       css = skb_transport_offset(skb);
-
-       i = tx_ring->next_to_use;
-       buffer_info = &tx_ring->buffer_info[i];
-       context_desc = E1000_CONTEXT_DESC(*tx_ring, i);
-
-       context_desc->lower_setup.ip_config = 0;
-       context_desc->upper_setup.tcp_fields.tucss = css;
-       context_desc->upper_setup.tcp_fields.tucso =
-               css + skb->csum_offset;
-       context_desc->upper_setup.tcp_fields.tucse = 0;
-       context_desc->tcp_seg_setup.data = 0;
-       context_desc->cmd_and_length = cpu_to_le32(cmd_len);
-
-       buffer_info->time_stamp = jiffies;
-       buffer_info->next_to_watch = i;
-
-       if (unlikely(++i == tx_ring->count)) i = 0;
-       tx_ring->next_to_use = i;
-
-       return true;
-}
-
-#define E1000_MAX_TXD_PWR      12
-#define E1000_MAX_DATA_PER_TXD (1<<E1000_MAX_TXD_PWR)
-
-static int e1000_tx_map(struct e1000_adapter *adapter,
-                       struct e1000_tx_ring *tx_ring,
-                       struct sk_buff *skb, unsigned int first,
-                       unsigned int max_per_txd, unsigned int nr_frags,
-                       unsigned int mss)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       struct e1000_buffer *buffer_info;
-       unsigned int len = skb->len;
-       unsigned int offset = 0, size, count = 0, i;
-       unsigned int f;
-       len -= skb->data_len;
-
-       i = tx_ring->next_to_use;
-
-       while (len) {
-               buffer_info = &tx_ring->buffer_info[i];
-               size = min(len, max_per_txd);
-               /* Workaround for Controller erratum --
-                * descriptor for non-tso packet in a linear SKB that follows a
-                * tso gets written back prematurely before the data is fully
-                * DMA'd to the controller */
-               if (!skb->data_len && tx_ring->last_tx_tso &&
-                   !skb_is_gso(skb)) {
-                       tx_ring->last_tx_tso = 0;
-                       size -= 4;
-               }
-
-               /* Workaround for premature desc write-backs
-                * in TSO mode.  Append 4-byte sentinel desc */
-               if (unlikely(mss && !nr_frags && size == len && size > 8))
-                       size -= 4;
-               /* work-around for errata 10 and it applies
-                * to all controllers in PCI-X mode
-                * The fix is to make sure that the first descriptor of a
-                * packet is smaller than 2048 - 16 - 16 (or 2016) bytes
-                */
-               if (unlikely((hw->bus_type == e1000_bus_type_pcix) &&
-                               (size > 2015) && count == 0))
-                       size = 2015;
-
-               /* Workaround for potential 82544 hang in PCI-X.  Avoid
-                * terminating buffers within evenly-aligned dwords. */
-               if (unlikely(adapter->pcix_82544 &&
-                  !((unsigned long)(skb->data + offset + size - 1) & 4) &&
-                  size > 4))
-                       size -= 4;
-
-               buffer_info->length = size;
-               buffer_info->dma =
-                       pci_map_single(adapter->pdev,
-                               skb->data + offset,
-                               size,
-                               PCI_DMA_TODEVICE);
-               buffer_info->time_stamp = jiffies;
-               buffer_info->next_to_watch = i;
-
-               len -= size;
-               offset += size;
-               count++;
-               if (unlikely(++i == tx_ring->count)) i = 0;
-       }
-
-       for (f = 0; f < nr_frags; f++) {
-               struct skb_frag_struct *frag;
-
-               frag = &skb_shinfo(skb)->frags[f];
-               len = frag->size;
-               offset = frag->page_offset;
-
-               while (len) {
-                       buffer_info = &tx_ring->buffer_info[i];
-                       size = min(len, max_per_txd);
-                       /* Workaround for premature desc write-backs
-                        * in TSO mode.  Append 4-byte sentinel desc */
-                       if (unlikely(mss && f == (nr_frags-1) && size == len && 
size > 8))
-                               size -= 4;
-                       /* Workaround for potential 82544 hang in PCI-X.
-                        * Avoid terminating buffers within evenly-aligned
-                        * dwords. */
-                       if (unlikely(adapter->pcix_82544 &&
-                          !((unsigned long)(frag->page+offset+size-1) & 4) &&
-                          size > 4))
-                               size -= 4;
-
-                       buffer_info->length = size;
-                       buffer_info->dma =
-                               pci_map_page(adapter->pdev,
-                                       frag->page,
-                                       offset,
-                                       size,
-                                       PCI_DMA_TODEVICE);
-                       buffer_info->time_stamp = jiffies;
-                       buffer_info->next_to_watch = i;
-
-                       len -= size;
-                       offset += size;
-                       count++;
-                       if (unlikely(++i == tx_ring->count)) i = 0;
-               }
-       }
-
-       i = (i == 0) ? tx_ring->count - 1 : i - 1;
-       tx_ring->buffer_info[i].skb = skb;
-       tx_ring->buffer_info[first].next_to_watch = i;
-
-       return count;
-}
-
-static void e1000_tx_queue(struct e1000_adapter *adapter,
-                          struct e1000_tx_ring *tx_ring, int tx_flags,
-                          int count)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       struct e1000_tx_desc *tx_desc = NULL;
-       struct e1000_buffer *buffer_info;
-       u32 txd_upper = 0, txd_lower = E1000_TXD_CMD_IFCS;
-       unsigned int i;
-
-       if (likely(tx_flags & E1000_TX_FLAGS_TSO)) {
-               txd_lower |= E1000_TXD_CMD_DEXT | E1000_TXD_DTYP_D |
-                            E1000_TXD_CMD_TSE;
-               txd_upper |= E1000_TXD_POPTS_TXSM << 8;
-
-               if (likely(tx_flags & E1000_TX_FLAGS_IPV4))
-                       txd_upper |= E1000_TXD_POPTS_IXSM << 8;
-       }
-
-       if (likely(tx_flags & E1000_TX_FLAGS_CSUM)) {
-               txd_lower |= E1000_TXD_CMD_DEXT | E1000_TXD_DTYP_D;
-               txd_upper |= E1000_TXD_POPTS_TXSM << 8;
-       }
-
-       if (unlikely(tx_flags & E1000_TX_FLAGS_VLAN)) {
-               txd_lower |= E1000_TXD_CMD_VLE;
-               txd_upper |= (tx_flags & E1000_TX_FLAGS_VLAN_MASK);
-       }
-
-       i = tx_ring->next_to_use;
-
-       while (count--) {
-               buffer_info = &tx_ring->buffer_info[i];
-               tx_desc = E1000_TX_DESC(*tx_ring, i);
-               tx_desc->buffer_addr = cpu_to_le64(buffer_info->dma);
-               tx_desc->lower.data =
-                       cpu_to_le32(txd_lower | buffer_info->length);
-               tx_desc->upper.data = cpu_to_le32(txd_upper);
-               if (unlikely(++i == tx_ring->count)) i = 0;
-       }
-
-       tx_desc->lower.data |= cpu_to_le32(adapter->txd_cmd);
-
-       /* Force memory writes to complete before letting h/w
-        * know there are new descriptors to fetch.  (Only
-        * applicable for weak-ordered memory model archs,
-        * such as IA-64). */
-       wmb();
-
-       tx_ring->next_to_use = i;
-       writel(i, hw->hw_addr + tx_ring->tdt);
-       /* we need this if more than one processor can write to our tail
-        * at a time, it syncronizes IO on IA64/Altix systems */
-       mmiowb();
-}
-
-/**
- * 82547 workaround to avoid controller hang in half-duplex environment.
- * The workaround is to avoid queuing a large packet that would span
- * the internal Tx FIFO ring boundary by notifying the stack to resend
- * the packet at a later time.  This gives the Tx FIFO an opportunity to
- * flush all packets.  When that occurs, we reset the Tx FIFO pointers
- * to the beginning of the Tx FIFO.
- **/
-
-#define E1000_FIFO_HDR                 0x10
-#define E1000_82547_PAD_LEN            0x3E0
-
-static int e1000_82547_fifo_workaround(struct e1000_adapter *adapter,
-                                      struct sk_buff *skb)
-{
-       u32 fifo_space = adapter->tx_fifo_size - adapter->tx_fifo_head;
-       u32 skb_fifo_len = skb->len + E1000_FIFO_HDR;
-
-       skb_fifo_len = ALIGN(skb_fifo_len, E1000_FIFO_HDR);
-
-       if (adapter->link_duplex != HALF_DUPLEX)
-               goto no_fifo_stall_required;
-
-       if (atomic_read(&adapter->tx_fifo_stall))
-               return 1;
-
-       if (skb_fifo_len >= (E1000_82547_PAD_LEN + fifo_space)) {
-               atomic_set(&adapter->tx_fifo_stall, 1);
-               return 1;
-       }
-
-no_fifo_stall_required:
-       adapter->tx_fifo_head += skb_fifo_len;
-       if (adapter->tx_fifo_head >= adapter->tx_fifo_size)
-               adapter->tx_fifo_head -= adapter->tx_fifo_size;
-       return 0;
-}
-
-#define MINIMUM_DHCP_PACKET_SIZE 282
-static int e1000_transfer_dhcp_info(struct e1000_adapter *adapter,
-                                   struct sk_buff *skb)
-{
-       struct e1000_hw *hw =  &adapter->hw;
-       u16 length, offset;
-       if (vlan_tx_tag_present(skb)) {
-               if (!((vlan_tx_tag_get(skb) == hw->mng_cookie.vlan_id) &&
-                       ( hw->mng_cookie.status &
-                         E1000_MNG_DHCP_COOKIE_STATUS_VLAN_SUPPORT)) )
-                       return 0;
-       }
-       if (skb->len > MINIMUM_DHCP_PACKET_SIZE) {
-               struct ethhdr *eth = (struct ethhdr *)skb->data;
-               if ((htons(ETH_P_IP) == eth->h_proto)) {
-                       const struct iphdr *ip =
-                               (struct iphdr *)((u8 *)skb->data+14);
-                       if (IPPROTO_UDP == ip->protocol) {
-                               struct udphdr *udp =
-                                       (struct udphdr *)((u8 *)ip +
-                                               (ip->ihl << 2));
-                               if (ntohs(udp->dest) == 67) {
-                                       offset = (u8 *)udp + 8 - skb->data;
-                                       length = skb->len - offset;
-
-                                       return e1000_mng_write_dhcp_info(hw,
-                                                       (u8 *)udp + 8,
-                                                       length);
-                               }
-                       }
-               }
-       }
-       return 0;
-}
-
-static int __e1000_maybe_stop_tx(struct net_device *netdev, int size)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_tx_ring *tx_ring = adapter->tx_ring;
-
-       netif_stop_queue(netdev);
-       /* Herbert's original patch had:
-        *  smp_mb__after_netif_stop_queue();
-        * but since that doesn't exist yet, just open code it. */
-       smp_mb();
-
-       /* We need to check again in a case another CPU has just
-        * made room available. */
-       if (likely(E1000_DESC_UNUSED(tx_ring) < size))
-               return -EBUSY;
-
-       /* A reprieve! */
-       netif_start_queue(netdev);
-       ++adapter->restart_queue;
-       return 0;
-}
-
-static int e1000_maybe_stop_tx(struct net_device *netdev,
-                               struct e1000_tx_ring *tx_ring, int size)
-{
-       if (likely(E1000_DESC_UNUSED(tx_ring) >= size))
-               return 0;
-       return __e1000_maybe_stop_tx(netdev, size);
-}
-
-#define TXD_USE_COUNT(S, X) (((S) >> (X)) + 1 )
-static int e1000_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       struct e1000_tx_ring *tx_ring;
-       unsigned int first, max_per_txd = E1000_MAX_DATA_PER_TXD;
-       unsigned int max_txd_pwr = E1000_MAX_TXD_PWR;
-       unsigned int tx_flags = 0;
-       unsigned int len = skb->len - skb->data_len;
-       unsigned long flags;
-       unsigned int nr_frags;
-       unsigned int mss;
-       int count = 0;
-       int tso;
-       unsigned int f;
-
-       /* This goes back to the question of how to logically map a tx queue
-        * to a flow.  Right now, performance is impacted slightly negatively
-        * if using multiple tx queues.  If the stack breaks away from a
-        * single qdisc implementation, we can look at this again. */
-       tx_ring = adapter->tx_ring;
-
-       if (unlikely(skb->len <= 0)) {
-               dev_kfree_skb_any(skb);
-               return NETDEV_TX_OK;
-       }
-
-       /* 82571 and newer doesn't need the workaround that limited descriptor
-        * length to 4kB */
-       if (hw->mac_type >= e1000_82571)
-               max_per_txd = 8192;
-
-       mss = skb_shinfo(skb)->gso_size;
-       /* The controller does a simple calculation to
-        * make sure there is enough room in the FIFO before
-        * initiating the DMA for each buffer.  The calc is:
-        * 4 = ceil(buffer len/mss).  To make sure we don't
-        * overrun the FIFO, adjust the max buffer len if mss
-        * drops. */
-       if (mss) {
-               u8 hdr_len;
-               max_per_txd = min(mss << 2, max_per_txd);
-               max_txd_pwr = fls(max_per_txd) - 1;
-
-               /* TSO Workaround for 82571/2/3 Controllers -- if skb->data
-               * points to just header, pull a few bytes of payload from
-               * frags into skb->data */
-               hdr_len = skb_transport_offset(skb) + tcp_hdrlen(skb);
-               if (skb->data_len && hdr_len == len) {
-                       switch (hw->mac_type) {
-                               unsigned int pull_size;
-                       case e1000_82544:
-                               /* Make sure we have room to chop off 4 bytes,
-                                * and that the end alignment will work out to
-                                * this hardware's requirements
-                                * NOTE: this is a TSO only workaround
-                                * if end byte alignment not correct move us
-                                * into the next dword */
-                               if ((unsigned long)(skb_tail_pointer(skb) - 1) 
& 4)
-                                       break;
-                               /* fall through */
-                       case e1000_82571:
-                       case e1000_82572:
-                       case e1000_82573:
-                       case e1000_ich8lan:
-                               pull_size = min((unsigned int)4, skb->data_len);
-                               if (!__pskb_pull_tail(skb, pull_size)) {
-                                       DPRINTK(DRV, ERR,
-                                               "__pskb_pull_tail failed.\n");
-                                       dev_kfree_skb_any(skb);
-                                       return NETDEV_TX_OK;
-                               }
-                               len = skb->len - skb->data_len;
-                               break;
-                       default:
-                               /* do nothing */
-                               break;
-                       }
-               }
-       }
-
-       /* reserve a descriptor for the offload context */
-       if ((mss) || (skb->ip_summed == CHECKSUM_PARTIAL))
-               count++;
-       count++;
-
-       /* Controller Erratum workaround */
-       if (!skb->data_len && tx_ring->last_tx_tso && !skb_is_gso(skb))
-               count++;
-
-       count += TXD_USE_COUNT(len, max_txd_pwr);
-
-       if (adapter->pcix_82544)
-               count++;
-
-       /* work-around for errata 10 and it applies to all controllers
-        * in PCI-X mode, so add one more descriptor to the count
-        */
-       if (unlikely((hw->bus_type == e1000_bus_type_pcix) &&
-                       (len > 2015)))
-               count++;
-
-       nr_frags = skb_shinfo(skb)->nr_frags;
-       for (f = 0; f < nr_frags; f++)
-               count += TXD_USE_COUNT(skb_shinfo(skb)->frags[f].size,
-                                      max_txd_pwr);
-       if (adapter->pcix_82544)
-               count += nr_frags;
-
-
-       if (hw->tx_pkt_filtering &&
-           (hw->mac_type == e1000_82573))
-               e1000_transfer_dhcp_info(adapter, skb);
-
-       if (!spin_trylock_irqsave(&tx_ring->tx_lock, flags))
-               /* Collision - tell upper layer to requeue */
-               return NETDEV_TX_LOCKED;
-
-       /* need: count + 2 desc gap to keep tail from touching
-        * head, otherwise try next time */
-       if (unlikely(e1000_maybe_stop_tx(netdev, tx_ring, count + 2))) {
-               spin_unlock_irqrestore(&tx_ring->tx_lock, flags);
-               return NETDEV_TX_BUSY;
-       }
-
-       if (unlikely(hw->mac_type == e1000_82547)) {
-               if (unlikely(e1000_82547_fifo_workaround(adapter, skb))) {
-                       netif_stop_queue(netdev);
-                       mod_timer(&adapter->tx_fifo_stall_timer, jiffies + 1);
-                       spin_unlock_irqrestore(&tx_ring->tx_lock, flags);
-                       return NETDEV_TX_BUSY;
-               }
-       }
-
-       if (unlikely(adapter->vlgrp && vlan_tx_tag_present(skb))) {
-               tx_flags |= E1000_TX_FLAGS_VLAN;
-               tx_flags |= (vlan_tx_tag_get(skb) << E1000_TX_FLAGS_VLAN_SHIFT);
-       }
-
-       first = tx_ring->next_to_use;
-
-       tso = e1000_tso(adapter, tx_ring, skb);
-       if (tso < 0) {
-               dev_kfree_skb_any(skb);
-               spin_unlock_irqrestore(&tx_ring->tx_lock, flags);
-               return NETDEV_TX_OK;
-       }
-
-       if (likely(tso)) {
-               tx_ring->last_tx_tso = 1;
-               tx_flags |= E1000_TX_FLAGS_TSO;
-       } else if (likely(e1000_tx_csum(adapter, tx_ring, skb)))
-               tx_flags |= E1000_TX_FLAGS_CSUM;
-
-       /* Old method was to assume IPv4 packet by default if TSO was enabled.
-        * 82571 hardware supports TSO capabilities for IPv6 as well...
-        * no longer assume, we must. */
-       if (likely(skb->protocol == htons(ETH_P_IP)))
-               tx_flags |= E1000_TX_FLAGS_IPV4;
-
-       e1000_tx_queue(adapter, tx_ring, tx_flags,
-                      e1000_tx_map(adapter, tx_ring, skb, first,
-                                   max_per_txd, nr_frags, mss));
-
-       netdev->trans_start = jiffies;
-
-       /* Make sure there is space in the ring for the next send. */
-       e1000_maybe_stop_tx(netdev, tx_ring, MAX_SKB_FRAGS + 2);
-
-       spin_unlock_irqrestore(&tx_ring->tx_lock, flags);
-       return NETDEV_TX_OK;
-}
-
-/**
- * e1000_tx_timeout - Respond to a Tx Hang
- * @netdev: network interface device structure
- **/
-
-static void e1000_tx_timeout(struct net_device *netdev)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-
-       /* Do the reset outside of interrupt context */
-       adapter->tx_timeout_count++;
-       schedule_work(&adapter->reset_task);
-}
-
-static void e1000_reset_task(struct work_struct *work)
-{
-       struct e1000_adapter *adapter =
-               container_of(work, struct e1000_adapter, reset_task);
-
-       e1000_reinit_locked(adapter);
-}
-
-/**
- * e1000_get_stats - Get System Network Statistics
- * @netdev: network interface device structure
- *
- * Returns the address of the device statistics structure.
- * The statistics are actually updated from the timer callback.
- **/
-
-static struct net_device_stats *e1000_get_stats(struct net_device *netdev)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-
-       /* only return the current stats */
-       return &adapter->net_stats;
-}
-
-/**
- * e1000_change_mtu - Change the Maximum Transfer Unit
- * @netdev: network interface device structure
- * @new_mtu: new value for maximum frame size
- *
- * Returns 0 on success, negative on failure
- **/
-
-static int e1000_change_mtu(struct net_device *netdev, int new_mtu)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       int max_frame = new_mtu + ENET_HEADER_SIZE + ETHERNET_FCS_SIZE;
-       u16 eeprom_data = 0;
-
-       if ((max_frame < MINIMUM_ETHERNET_FRAME_SIZE) ||
-           (max_frame > MAX_JUMBO_FRAME_SIZE)) {
-               DPRINTK(PROBE, ERR, "Invalid MTU setting\n");
-               return -EINVAL;
-       }
-
-       /* Adapter-specific max frame size limits. */
-       switch (hw->mac_type) {
-       case e1000_undefined ... e1000_82542_rev2_1:
-       case e1000_ich8lan:
-               if (max_frame > MAXIMUM_ETHERNET_FRAME_SIZE) {
-                       DPRINTK(PROBE, ERR, "Jumbo Frames not supported.\n");
-                       return -EINVAL;
-               }
-               break;
-       case e1000_82573:
-               /* Jumbo Frames not supported if:
-                * - this is not an 82573L device
-                * - ASPM is enabled in any way (0x1A bits 3:2) */
-               e1000_read_eeprom(hw, EEPROM_INIT_3GIO_3, 1,
-                                 &eeprom_data);
-               if ((hw->device_id != E1000_DEV_ID_82573L) ||
-                   (eeprom_data & EEPROM_WORD1A_ASPM_MASK)) {
-                       if (max_frame > MAXIMUM_ETHERNET_FRAME_SIZE) {
-                               DPRINTK(PROBE, ERR,
-                                       "Jumbo Frames not supported.\n");
-                               return -EINVAL;
-                       }
-                       break;
-               }
-               /* ERT will be enabled later to enable wire speed receives */
-
-               /* fall through to get support */
-       case e1000_82571:
-       case e1000_82572:
-       case e1000_80003es2lan:
-#define MAX_STD_JUMBO_FRAME_SIZE 9234
-               if (max_frame > MAX_STD_JUMBO_FRAME_SIZE) {
-                       DPRINTK(PROBE, ERR, "MTU > 9216 not supported.\n");
-                       return -EINVAL;
-               }
-               break;
-       default:
-               /* Capable of supporting up to MAX_JUMBO_FRAME_SIZE limit. */
-               break;
-       }
-
-       /* NOTE: netdev_alloc_skb reserves 16 bytes, and typically NET_IP_ALIGN
-        * means we reserve 2 more, this pushes us to allocate from the next
-        * larger slab size
-        * i.e. RXBUFFER_2048 --> size-4096 slab */
-
-       if (max_frame <= E1000_RXBUFFER_256)
-               adapter->rx_buffer_len = E1000_RXBUFFER_256;
-       else if (max_frame <= E1000_RXBUFFER_512)
-               adapter->rx_buffer_len = E1000_RXBUFFER_512;
-       else if (max_frame <= E1000_RXBUFFER_1024)
-               adapter->rx_buffer_len = E1000_RXBUFFER_1024;
-       else if (max_frame <= E1000_RXBUFFER_2048)
-               adapter->rx_buffer_len = E1000_RXBUFFER_2048;
-       else if (max_frame <= E1000_RXBUFFER_4096)
-               adapter->rx_buffer_len = E1000_RXBUFFER_4096;
-       else if (max_frame <= E1000_RXBUFFER_8192)
-               adapter->rx_buffer_len = E1000_RXBUFFER_8192;
-       else if (max_frame <= E1000_RXBUFFER_16384)
-               adapter->rx_buffer_len = E1000_RXBUFFER_16384;
-
-       /* adjust allocation if LPE protects us, and we aren't using SBP */
-       if (!hw->tbi_compatibility_on &&
-           ((max_frame == MAXIMUM_ETHERNET_FRAME_SIZE) ||
-            (max_frame == MAXIMUM_ETHERNET_VLAN_SIZE)))
-               adapter->rx_buffer_len = MAXIMUM_ETHERNET_VLAN_SIZE;
-
-       netdev->mtu = new_mtu;
-       hw->max_frame_size = max_frame;
-
-       if (netif_running(netdev))
-               e1000_reinit_locked(adapter);
-
-       return 0;
-}
-
-/**
- * e1000_update_stats - Update the board statistics counters
- * @adapter: board private structure
- **/
-
-void e1000_update_stats(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       struct pci_dev *pdev = adapter->pdev;
-       unsigned long flags;
-       u16 phy_tmp;
-
-#define PHY_IDLE_ERROR_COUNT_MASK 0x00FF
-
-       /*
-        * Prevent stats update while adapter is being reset, or if the pci
-        * connection is down.
-        */
-       if (adapter->link_speed == 0)
-               return;
-       if (pci_channel_offline(pdev))
-               return;
-
-       spin_lock_irqsave(&adapter->stats_lock, flags);
-
-       /* these counters are modified from e1000_tbi_adjust_stats,
-        * called from the interrupt context, so they must only
-        * be written while holding adapter->stats_lock
-        */
-
-       adapter->stats.crcerrs += er32(CRCERRS);
-       adapter->stats.gprc += er32(GPRC);
-       adapter->stats.gorcl += er32(GORCL);
-       adapter->stats.gorch += er32(GORCH);
-       adapter->stats.bprc += er32(BPRC);
-       adapter->stats.mprc += er32(MPRC);
-       adapter->stats.roc += er32(ROC);
-
-       if (hw->mac_type != e1000_ich8lan) {
-               adapter->stats.prc64 += er32(PRC64);
-               adapter->stats.prc127 += er32(PRC127);
-               adapter->stats.prc255 += er32(PRC255);
-               adapter->stats.prc511 += er32(PRC511);
-               adapter->stats.prc1023 += er32(PRC1023);
-               adapter->stats.prc1522 += er32(PRC1522);
-       }
-
-       adapter->stats.symerrs += er32(SYMERRS);
-       adapter->stats.mpc += er32(MPC);
-       adapter->stats.scc += er32(SCC);
-       adapter->stats.ecol += er32(ECOL);
-       adapter->stats.mcc += er32(MCC);
-       adapter->stats.latecol += er32(LATECOL);
-       adapter->stats.dc += er32(DC);
-       adapter->stats.sec += er32(SEC);
-       adapter->stats.rlec += er32(RLEC);
-       adapter->stats.xonrxc += er32(XONRXC);
-       adapter->stats.xontxc += er32(XONTXC);
-       adapter->stats.xoffrxc += er32(XOFFRXC);
-       adapter->stats.xofftxc += er32(XOFFTXC);
-       adapter->stats.fcruc += er32(FCRUC);
-       adapter->stats.gptc += er32(GPTC);
-       adapter->stats.gotcl += er32(GOTCL);
-       adapter->stats.gotch += er32(GOTCH);
-       adapter->stats.rnbc += er32(RNBC);
-       adapter->stats.ruc += er32(RUC);
-       adapter->stats.rfc += er32(RFC);
-       adapter->stats.rjc += er32(RJC);
-       adapter->stats.torl += er32(TORL);
-       adapter->stats.torh += er32(TORH);
-       adapter->stats.totl += er32(TOTL);
-       adapter->stats.toth += er32(TOTH);
-       adapter->stats.tpr += er32(TPR);
-
-       if (hw->mac_type != e1000_ich8lan) {
-               adapter->stats.ptc64 += er32(PTC64);
-               adapter->stats.ptc127 += er32(PTC127);
-               adapter->stats.ptc255 += er32(PTC255);
-               adapter->stats.ptc511 += er32(PTC511);
-               adapter->stats.ptc1023 += er32(PTC1023);
-               adapter->stats.ptc1522 += er32(PTC1522);
-       }
-
-       adapter->stats.mptc += er32(MPTC);
-       adapter->stats.bptc += er32(BPTC);
-
-       /* used for adaptive IFS */
-
-       hw->tx_packet_delta = er32(TPT);
-       adapter->stats.tpt += hw->tx_packet_delta;
-       hw->collision_delta = er32(COLC);
-       adapter->stats.colc += hw->collision_delta;
-
-       if (hw->mac_type >= e1000_82543) {
-               adapter->stats.algnerrc += er32(ALGNERRC);
-               adapter->stats.rxerrc += er32(RXERRC);
-               adapter->stats.tncrs += er32(TNCRS);
-               adapter->stats.cexterr += er32(CEXTERR);
-               adapter->stats.tsctc += er32(TSCTC);
-               adapter->stats.tsctfc += er32(TSCTFC);
-       }
-       if (hw->mac_type > e1000_82547_rev_2) {
-               adapter->stats.iac += er32(IAC);
-               adapter->stats.icrxoc += er32(ICRXOC);
-
-               if (hw->mac_type != e1000_ich8lan) {
-                       adapter->stats.icrxptc += er32(ICRXPTC);
-                       adapter->stats.icrxatc += er32(ICRXATC);
-                       adapter->stats.ictxptc += er32(ICTXPTC);
-                       adapter->stats.ictxatc += er32(ICTXATC);
-                       adapter->stats.ictxqec += er32(ICTXQEC);
-                       adapter->stats.ictxqmtc += er32(ICTXQMTC);
-                       adapter->stats.icrxdmtc += er32(ICRXDMTC);
-               }
-       }
-
-       /* Fill out the OS statistics structure */
-       adapter->net_stats.multicast = adapter->stats.mprc;
-       adapter->net_stats.collisions = adapter->stats.colc;
-
-       /* Rx Errors */
-
-       /* RLEC on some newer hardware can be incorrect so build
-       * our own version based on RUC and ROC */
-       adapter->net_stats.rx_errors = adapter->stats.rxerrc +
-               adapter->stats.crcerrs + adapter->stats.algnerrc +
-               adapter->stats.ruc + adapter->stats.roc +
-               adapter->stats.cexterr;
-       adapter->stats.rlerrc = adapter->stats.ruc + adapter->stats.roc;
-       adapter->net_stats.rx_length_errors = adapter->stats.rlerrc;
-       adapter->net_stats.rx_crc_errors = adapter->stats.crcerrs;
-       adapter->net_stats.rx_frame_errors = adapter->stats.algnerrc;
-       adapter->net_stats.rx_missed_errors = adapter->stats.mpc;
-
-       /* Tx Errors */
-       adapter->stats.txerrc = adapter->stats.ecol + adapter->stats.latecol;
-       adapter->net_stats.tx_errors = adapter->stats.txerrc;
-       adapter->net_stats.tx_aborted_errors = adapter->stats.ecol;
-       adapter->net_stats.tx_window_errors = adapter->stats.latecol;
-       adapter->net_stats.tx_carrier_errors = adapter->stats.tncrs;
-       if (hw->bad_tx_carr_stats_fd &&
-           adapter->link_duplex == FULL_DUPLEX) {
-               adapter->net_stats.tx_carrier_errors = 0;
-               adapter->stats.tncrs = 0;
-       }
-
-       /* Tx Dropped needs to be maintained elsewhere */
-
-       /* Phy Stats */
-       if (hw->media_type == e1000_media_type_copper) {
-               if ((adapter->link_speed == SPEED_1000) &&
-                  (!e1000_read_phy_reg(hw, PHY_1000T_STATUS, &phy_tmp))) {
-                       phy_tmp &= PHY_IDLE_ERROR_COUNT_MASK;
-                       adapter->phy_stats.idle_errors += phy_tmp;
-               }
-
-               if ((hw->mac_type <= e1000_82546) &&
-                  (hw->phy_type == e1000_phy_m88) &&
-                  !e1000_read_phy_reg(hw, M88E1000_RX_ERR_CNTR, &phy_tmp))
-                       adapter->phy_stats.receive_errors += phy_tmp;
-       }
-
-       /* Management Stats */
-       if (hw->has_smbus) {
-               adapter->stats.mgptc += er32(MGTPTC);
-               adapter->stats.mgprc += er32(MGTPRC);
-               adapter->stats.mgpdc += er32(MGTPDC);
-       }
-
-       spin_unlock_irqrestore(&adapter->stats_lock, flags);
-}
-
-/**
- * e1000_intr_msi - Interrupt Handler
- * @irq: interrupt number
- * @data: pointer to a network interface device structure
- **/
-
-static irqreturn_t e1000_intr_msi(int irq, void *data)
-{
-       struct net_device *netdev = data;
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       u32 icr = er32(ICR);
-
-       /* in NAPI mode read ICR disables interrupts using IAM */
-
-       if (icr & (E1000_ICR_RXSEQ | E1000_ICR_LSC)) {
-               hw->get_link_status = 1;
-               /* 80003ES2LAN workaround-- For packet buffer work-around on
-                * link down event; disable receives here in the ISR and reset
-                * adapter in watchdog */
-               if (netif_carrier_ok(netdev) &&
-                   (hw->mac_type == e1000_80003es2lan)) {
-                       /* disable receives */
-                       u32 rctl = er32(RCTL);
-                       ew32(RCTL, rctl & ~E1000_RCTL_EN);
-               }
-               /* guard against interrupt when we're going down */
-               if (!test_bit(__E1000_DOWN, &adapter->flags))
-                       mod_timer(&adapter->watchdog_timer, jiffies + 1);
-       }
-
-       if (likely(netif_rx_schedule_prep(&adapter->napi))) {
-               adapter->total_tx_bytes = 0;
-               adapter->total_tx_packets = 0;
-               adapter->total_rx_bytes = 0;
-               adapter->total_rx_packets = 0;
-               __netif_rx_schedule(&adapter->napi);
-       } else
-               e1000_irq_enable(adapter);
-
-       return IRQ_HANDLED;
-}
-
-/**
- * e1000_intr - Interrupt Handler
- * @irq: interrupt number
- * @data: pointer to a network interface device structure
- **/
-
-static irqreturn_t e1000_intr(int irq, void *data)
-{
-       struct net_device *netdev = data;
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       u32 rctl, icr = er32(ICR);
-
-       if (unlikely((!icr) || test_bit(__E1000_RESETTING, &adapter->flags)))
-               return IRQ_NONE;  /* Not our interrupt */
-
-       /* IMS will not auto-mask if INT_ASSERTED is not set, and if it is
-        * not set, then the adapter didn't send an interrupt */
-       if (unlikely(hw->mac_type >= e1000_82571 &&
-                    !(icr & E1000_ICR_INT_ASSERTED)))
-               return IRQ_NONE;
-
-       /* Interrupt Auto-Mask...upon reading ICR, interrupts are masked.  No
-        * need for the IMC write */
-
-       if (unlikely(icr & (E1000_ICR_RXSEQ | E1000_ICR_LSC))) {
-               hw->get_link_status = 1;
-               /* 80003ES2LAN workaround--
-                * For packet buffer work-around on link down event;
-                * disable receives here in the ISR and
-                * reset adapter in watchdog
-                */
-               if (netif_carrier_ok(netdev) &&
-                   (hw->mac_type == e1000_80003es2lan)) {
-                       /* disable receives */
-                       rctl = er32(RCTL);
-                       ew32(RCTL, rctl & ~E1000_RCTL_EN);
-               }
-               /* guard against interrupt when we're going down */
-               if (!test_bit(__E1000_DOWN, &adapter->flags))
-                       mod_timer(&adapter->watchdog_timer, jiffies + 1);
-       }
-
-       if (unlikely(hw->mac_type < e1000_82571)) {
-               /* disable interrupts, without the synchronize_irq bit */
-               ew32(IMC, ~0);
-               E1000_WRITE_FLUSH();
-       }
-       if (likely(netif_rx_schedule_prep(&adapter->napi))) {
-               adapter->total_tx_bytes = 0;
-               adapter->total_tx_packets = 0;
-               adapter->total_rx_bytes = 0;
-               adapter->total_rx_packets = 0;
-               __netif_rx_schedule(&adapter->napi);
-       } else
-               /* this really should not happen! if it does it is basically a
-                * bug, but not a hard error, so enable ints and continue */
-               e1000_irq_enable(adapter);
-
-       return IRQ_HANDLED;
-}
-
-/**
- * e1000_clean - NAPI Rx polling callback
- * @adapter: board private structure
- **/
-static int e1000_clean(struct napi_struct *napi, int budget)
-{
-       struct e1000_adapter *adapter = container_of(napi, struct 
e1000_adapter, napi);
-       struct net_device *poll_dev = adapter->netdev;
-       int tx_cleaned = 0, work_done = 0;
-
-       adapter = netdev_priv(poll_dev);
-
-       /* e1000_clean is called per-cpu.  This lock protects
-        * tx_ring[0] from being cleaned by multiple cpus
-        * simultaneously.  A failure obtaining the lock means
-        * tx_ring[0] is currently being cleaned anyway. */
-       if (spin_trylock(&adapter->tx_queue_lock)) {
-               tx_cleaned = e1000_clean_tx_irq(adapter,
-                                               &adapter->tx_ring[0]);
-               spin_unlock(&adapter->tx_queue_lock);
-       }
-
-       adapter->clean_rx(adapter, &adapter->rx_ring[0],
-                         &work_done, budget);
-
-       if (tx_cleaned)
-               work_done = budget;
-
-       /* If budget not fully consumed, exit the polling mode */
-       if (work_done < budget) {
-               if (likely(adapter->itr_setting & 3))
-                       e1000_set_itr(adapter);
-               netif_rx_complete(napi);
-               e1000_irq_enable(adapter);
-       }
-
-       return work_done;
-}
-
-/**
- * e1000_clean_tx_irq - Reclaim resources after transmit completes
- * @adapter: board private structure
- **/
-static bool e1000_clean_tx_irq(struct e1000_adapter *adapter,
-                              struct e1000_tx_ring *tx_ring)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       struct net_device *netdev = adapter->netdev;
-       struct e1000_tx_desc *tx_desc, *eop_desc;
-       struct e1000_buffer *buffer_info;
-       unsigned int i, eop;
-       unsigned int count = 0;
-       bool cleaned = false;
-       unsigned int total_tx_bytes=0, total_tx_packets=0;
-
-       i = tx_ring->next_to_clean;
-       eop = tx_ring->buffer_info[i].next_to_watch;
-       eop_desc = E1000_TX_DESC(*tx_ring, eop);
-
-       while (eop_desc->upper.data & cpu_to_le32(E1000_TXD_STAT_DD)) {
-               for (cleaned = false; !cleaned; ) {
-                       tx_desc = E1000_TX_DESC(*tx_ring, i);
-                       buffer_info = &tx_ring->buffer_info[i];
-                       cleaned = (i == eop);
-
-                       if (cleaned) {
-                               struct sk_buff *skb = buffer_info->skb;
-                               unsigned int segs, bytecount;
-                               segs = skb_shinfo(skb)->gso_segs ?: 1;
-                               /* multiply data chunks by size of headers */
-                               bytecount = ((segs - 1) * skb_headlen(skb)) +
-                                           skb->len;
-                               total_tx_packets += segs;
-                               total_tx_bytes += bytecount;
-                       }
-                       e1000_unmap_and_free_tx_resource(adapter, buffer_info);
-                       tx_desc->upper.data = 0;
-
-                       if (unlikely(++i == tx_ring->count)) i = 0;
-               }
-
-               eop = tx_ring->buffer_info[i].next_to_watch;
-               eop_desc = E1000_TX_DESC(*tx_ring, eop);
-#define E1000_TX_WEIGHT 64
-               /* weight of a sort for tx, to avoid endless transmit cleanup */
-               if (count++ == E1000_TX_WEIGHT)
-                       break;
-       }
-
-       tx_ring->next_to_clean = i;
-
-#define TX_WAKE_THRESHOLD 32
-       if (unlikely(cleaned && netif_carrier_ok(netdev) &&
-                    E1000_DESC_UNUSED(tx_ring) >= TX_WAKE_THRESHOLD)) {
-               /* Make sure that anybody stopping the queue after this
-                * sees the new next_to_clean.
-                */
-               smp_mb();
-               if (netif_queue_stopped(netdev)) {
-                       netif_wake_queue(netdev);
-                       ++adapter->restart_queue;
-               }
-       }
-
-       if (adapter->detect_tx_hung) {
-               /* Detect a transmit hang in hardware, this serializes the
-                * check with the clearing of time_stamp and movement of i */
-               adapter->detect_tx_hung = false;
-               if (tx_ring->buffer_info[eop].dma
-                       && time_after(jiffies, 
tx_ring->buffer_info[eop].time_stamp +
-                              (adapter->tx_timeout_factor * HZ))
-                   && !(er32(STATUS) & E1000_STATUS_TXOFF)) {
-
-                       /* detected Tx unit hang */
-                       DPRINTK(DRV, ERR, "Detected Tx Unit Hang\n"
-                                       "  Tx Queue             <%lu>\n"
-                                       "  TDH                  <%x>\n"
-                                       "  TDT                  <%x>\n"
-                                       "  next_to_use          <%x>\n"
-                                       "  next_to_clean        <%x>\n"
-                                       "buffer_info[next_to_clean]\n"
-                                       "  time_stamp           <%lx>\n"
-                                       "  next_to_watch        <%x>\n"
-                                       "  jiffies              <%lx>\n"
-                                       "  next_to_watch.status <%x>\n",
-                               (unsigned long)((tx_ring - adapter->tx_ring) /
-                                       sizeof(struct e1000_tx_ring)),
-                               readl(hw->hw_addr + tx_ring->tdh),
-                               readl(hw->hw_addr + tx_ring->tdt),
-                               tx_ring->next_to_use,
-                               tx_ring->next_to_clean,
-                               tx_ring->buffer_info[eop].time_stamp,
-                               eop,
-                               jiffies,
-                               eop_desc->upper.fields.status);
-                       netif_stop_queue(netdev);
-               }
-       }
-       adapter->total_tx_bytes += total_tx_bytes;
-       adapter->total_tx_packets += total_tx_packets;
-       adapter->net_stats.tx_bytes += total_tx_bytes;
-       adapter->net_stats.tx_packets += total_tx_packets;
-       return cleaned;
-}
-
-/**
- * e1000_rx_checksum - Receive Checksum Offload for 82543
- * @adapter:     board private structure
- * @status_err:  receive descriptor status and error fields
- * @csum:        receive descriptor csum field
- * @sk_buff:     socket buffer with received data
- **/
-
-static void e1000_rx_checksum(struct e1000_adapter *adapter, u32 status_err,
-                             u32 csum, struct sk_buff *skb)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       u16 status = (u16)status_err;
-       u8 errors = (u8)(status_err >> 24);
-       skb->ip_summed = CHECKSUM_NONE;
-
-       /* 82543 or newer only */
-       if (unlikely(hw->mac_type < e1000_82543)) return;
-       /* Ignore Checksum bit is set */
-       if (unlikely(status & E1000_RXD_STAT_IXSM)) return;
-       /* TCP/UDP checksum error bit is set */
-       if (unlikely(errors & E1000_RXD_ERR_TCPE)) {
-               /* let the stack verify checksum errors */
-               adapter->hw_csum_err++;
-               return;
-       }
-       /* TCP/UDP Checksum has not been calculated */
-       if (hw->mac_type <= e1000_82547_rev_2) {
-               if (!(status & E1000_RXD_STAT_TCPCS))
-                       return;
-       } else {
-               if (!(status & (E1000_RXD_STAT_TCPCS | E1000_RXD_STAT_UDPCS)))
-                       return;
-       }
-       /* It must be a TCP or UDP packet with a valid checksum */
-       if (likely(status & E1000_RXD_STAT_TCPCS)) {
-               /* TCP checksum is good */
-               skb->ip_summed = CHECKSUM_UNNECESSARY;
-       } else if (hw->mac_type > e1000_82547_rev_2) {
-               /* IP fragment with UDP payload */
-               /* Hardware complements the payload checksum, so we undo it
-                * and then put the value in host order for further stack use.
-                */
-               __sum16 sum = (__force __sum16)htons(csum);
-               skb->csum = csum_unfold(~sum);
-               skb->ip_summed = CHECKSUM_COMPLETE;
-       }
-       adapter->hw_csum_good++;
-}
-
-/**
- * e1000_clean_rx_irq - Send received data up the network stack; legacy
- * @adapter: board private structure
- **/
-static bool e1000_clean_rx_irq(struct e1000_adapter *adapter,
-                              struct e1000_rx_ring *rx_ring,
-                              int *work_done, int work_to_do)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       struct net_device *netdev = adapter->netdev;
-       struct pci_dev *pdev = adapter->pdev;
-       struct e1000_rx_desc *rx_desc, *next_rxd;
-       struct e1000_buffer *buffer_info, *next_buffer;
-       unsigned long flags;
-       u32 length;
-       u8 last_byte;
-       unsigned int i;
-       int cleaned_count = 0;
-       bool cleaned = false;
-       unsigned int total_rx_bytes=0, total_rx_packets=0;
-
-       i = rx_ring->next_to_clean;
-       rx_desc = E1000_RX_DESC(*rx_ring, i);
-       buffer_info = &rx_ring->buffer_info[i];
-
-       while (rx_desc->status & E1000_RXD_STAT_DD) {
-               struct sk_buff *skb;
-               u8 status;
-
-               if (*work_done >= work_to_do)
-                       break;
-               (*work_done)++;
-
-               status = rx_desc->status;
-               skb = buffer_info->skb;
-               buffer_info->skb = NULL;
-
-               prefetch(skb->data - NET_IP_ALIGN);
-
-               if (++i == rx_ring->count) i = 0;
-               next_rxd = E1000_RX_DESC(*rx_ring, i);
-               prefetch(next_rxd);
-
-               next_buffer = &rx_ring->buffer_info[i];
-
-               cleaned = true;
-               cleaned_count++;
-               pci_unmap_single(pdev,
-                                buffer_info->dma,
-                                buffer_info->length,
-                                PCI_DMA_FROMDEVICE);
-
-               length = le16_to_cpu(rx_desc->length);
-
-               if (unlikely(!(status & E1000_RXD_STAT_EOP))) {
-                       /* All receives must fit into a single buffer */
-                       E1000_DBG("%s: Receive packet consumed multiple"
-                                 " buffers\n", netdev->name);
-                       /* recycle */
-                       buffer_info->skb = skb;
-                       goto next_desc;
-               }
-
-               if (unlikely(rx_desc->errors & E1000_RXD_ERR_FRAME_ERR_MASK)) {
-                       last_byte = *(skb->data + length - 1);
-                       if (TBI_ACCEPT(hw, status, rx_desc->errors, length,
-                                      last_byte)) {
-                               spin_lock_irqsave(&adapter->stats_lock, flags);
-                               e1000_tbi_adjust_stats(hw, &adapter->stats,
-                                                      length, skb->data);
-                               spin_unlock_irqrestore(&adapter->stats_lock,
-                                                      flags);
-                               length--;
-                       } else {
-                               /* recycle */
-                               buffer_info->skb = skb;
-                               goto next_desc;
-                       }
-               }
-
-               /* adjust length to remove Ethernet CRC, this must be
-                * done after the TBI_ACCEPT workaround above */
-               length -= 4;
-
-               /* probably a little skewed due to removing CRC */
-               total_rx_bytes += length;
-               total_rx_packets++;
-
-               /* code added for copybreak, this should improve
-                * performance for small packets with large amounts
-                * of reassembly being done in the stack */
-               if (length < copybreak) {
-                       struct sk_buff *new_skb =
-                           netdev_alloc_skb(netdev, length + NET_IP_ALIGN);
-                       if (new_skb) {
-                               skb_reserve(new_skb, NET_IP_ALIGN);
-                               skb_copy_to_linear_data_offset(new_skb,
-                                                              -NET_IP_ALIGN,
-                                                              (skb->data -
-                                                               NET_IP_ALIGN),
-                                                              (length +
-                                                               NET_IP_ALIGN));
-                               /* save the skb in buffer_info as good */
-                               buffer_info->skb = skb;
-                               skb = new_skb;
-                       }
-                       /* else just continue with the old one */
-               }
-               /* end copybreak code */
-               skb_put(skb, length);
-
-               /* Receive Checksum Offload */
-               e1000_rx_checksum(adapter,
-                                 (u32)(status) |
-                                 ((u32)(rx_desc->errors) << 24),
-                                 le16_to_cpu(rx_desc->csum), skb);
-
-               skb->protocol = eth_type_trans(skb, netdev);
-
-               if (unlikely(adapter->vlgrp &&
-                           (status & E1000_RXD_STAT_VP))) {
-                       vlan_hwaccel_receive_skb(skb, adapter->vlgrp,
-                                                le16_to_cpu(rx_desc->special));
-               } else {
-                       netif_receive_skb(skb);
-               }
-
-next_desc:
-               rx_desc->status = 0;
-
-               /* return some buffers to hardware, one at a time is too slow */
-               if (unlikely(cleaned_count >= E1000_RX_BUFFER_WRITE)) {
-                       adapter->alloc_rx_buf(adapter, rx_ring, cleaned_count);
-                       cleaned_count = 0;
-               }
-
-               /* use prefetched values */
-               rx_desc = next_rxd;
-               buffer_info = next_buffer;
-       }
-       rx_ring->next_to_clean = i;
-
-       cleaned_count = E1000_DESC_UNUSED(rx_ring);
-       if (cleaned_count)
-               adapter->alloc_rx_buf(adapter, rx_ring, cleaned_count);
-
-       adapter->total_rx_packets += total_rx_packets;
-       adapter->total_rx_bytes += total_rx_bytes;
-       adapter->net_stats.rx_bytes += total_rx_bytes;
-       adapter->net_stats.rx_packets += total_rx_packets;
-       return cleaned;
-}
-
-/**
- * e1000_alloc_rx_buffers - Replace used receive buffers; legacy & extended
- * @adapter: address of board private structure
- **/
-
-static void e1000_alloc_rx_buffers(struct e1000_adapter *adapter,
-                                  struct e1000_rx_ring *rx_ring,
-                                  int cleaned_count)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       struct net_device *netdev = adapter->netdev;
-       struct pci_dev *pdev = adapter->pdev;
-       struct e1000_rx_desc *rx_desc;
-       struct e1000_buffer *buffer_info;
-       struct sk_buff *skb;
-       unsigned int i;
-       unsigned int bufsz = adapter->rx_buffer_len + NET_IP_ALIGN;
-
-       i = rx_ring->next_to_use;
-       buffer_info = &rx_ring->buffer_info[i];
-
-       while (cleaned_count--) {
-               skb = buffer_info->skb;
-               if (skb) {
-                       skb_trim(skb, 0);
-                       goto map_skb;
-               }
-
-               skb = netdev_alloc_skb(netdev, bufsz);
-               if (unlikely(!skb)) {
-                       /* Better luck next round */
-                       adapter->alloc_rx_buff_failed++;
-                       break;
-               }
-
-               /* Fix for errata 23, can't cross 64kB boundary */
-               if (!e1000_check_64k_bound(adapter, skb->data, bufsz)) {
-                       struct sk_buff *oldskb = skb;
-                       DPRINTK(RX_ERR, ERR, "skb align check failed: %u bytes "
-                                            "at %p\n", bufsz, skb->data);
-                       /* Try again, without freeing the previous */
-                       skb = netdev_alloc_skb(netdev, bufsz);
-                       /* Failed allocation, critical failure */
-                       if (!skb) {
-                               dev_kfree_skb(oldskb);
-                               break;
-                       }
-
-                       if (!e1000_check_64k_bound(adapter, skb->data, bufsz)) {
-                               /* give up */
-                               dev_kfree_skb(skb);
-                               dev_kfree_skb(oldskb);
-                               break; /* while !buffer_info->skb */
-                       }
-
-                       /* Use new allocation */
-                       dev_kfree_skb(oldskb);
-               }
-               /* Make buffer alignment 2 beyond a 16 byte boundary
-                * this will result in a 16 byte aligned IP header after
-                * the 14 byte MAC header is removed
-                */
-               skb_reserve(skb, NET_IP_ALIGN);
-
-               buffer_info->skb = skb;
-               buffer_info->length = adapter->rx_buffer_len;
-map_skb:
-               buffer_info->dma = pci_map_single(pdev,
-                                                 skb->data,
-                                                 adapter->rx_buffer_len,
-                                                 PCI_DMA_FROMDEVICE);
-
-               /* Fix for errata 23, can't cross 64kB boundary */
-               if (!e1000_check_64k_bound(adapter,
-                                       (void *)(unsigned long)buffer_info->dma,
-                                       adapter->rx_buffer_len)) {
-                       DPRINTK(RX_ERR, ERR,
-                               "dma align check failed: %u bytes at %p\n",
-                               adapter->rx_buffer_len,
-                               (void *)(unsigned long)buffer_info->dma);
-                       dev_kfree_skb(skb);
-                       buffer_info->skb = NULL;
-
-                       pci_unmap_single(pdev, buffer_info->dma,
-                                        adapter->rx_buffer_len,
-                                        PCI_DMA_FROMDEVICE);
-
-                       break; /* while !buffer_info->skb */
-               }
-               rx_desc = E1000_RX_DESC(*rx_ring, i);
-               rx_desc->buffer_addr = cpu_to_le64(buffer_info->dma);
-
-               if (unlikely(++i == rx_ring->count))
-                       i = 0;
-               buffer_info = &rx_ring->buffer_info[i];
-       }
-
-       if (likely(rx_ring->next_to_use != i)) {
-               rx_ring->next_to_use = i;
-               if (unlikely(i-- == 0))
-                       i = (rx_ring->count - 1);
-
-               /* Force memory writes to complete before letting h/w
-                * know there are new descriptors to fetch.  (Only
-                * applicable for weak-ordered memory model archs,
-                * such as IA-64). */
-               wmb();
-               writel(i, hw->hw_addr + rx_ring->rdt);
-       }
-}
-
-/**
- * e1000_smartspeed - Workaround for SmartSpeed on 82541 and 82547 controllers.
- * @adapter:
- **/
-
-static void e1000_smartspeed(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       u16 phy_status;
-       u16 phy_ctrl;
-
-       if ((hw->phy_type != e1000_phy_igp) || !hw->autoneg ||
-          !(hw->autoneg_advertised & ADVERTISE_1000_FULL))
-               return;
-
-       if (adapter->smartspeed == 0) {
-               /* If Master/Slave config fault is asserted twice,
-                * we assume back-to-back */
-               e1000_read_phy_reg(hw, PHY_1000T_STATUS, &phy_status);
-               if (!(phy_status & SR_1000T_MS_CONFIG_FAULT)) return;
-               e1000_read_phy_reg(hw, PHY_1000T_STATUS, &phy_status);
-               if (!(phy_status & SR_1000T_MS_CONFIG_FAULT)) return;
-               e1000_read_phy_reg(hw, PHY_1000T_CTRL, &phy_ctrl);
-               if (phy_ctrl & CR_1000T_MS_ENABLE) {
-                       phy_ctrl &= ~CR_1000T_MS_ENABLE;
-                       e1000_write_phy_reg(hw, PHY_1000T_CTRL,
-                                           phy_ctrl);
-                       adapter->smartspeed++;
-                       if (!e1000_phy_setup_autoneg(hw) &&
-                          !e1000_read_phy_reg(hw, PHY_CTRL,
-                                              &phy_ctrl)) {
-                               phy_ctrl |= (MII_CR_AUTO_NEG_EN |
-                                            MII_CR_RESTART_AUTO_NEG);
-                               e1000_write_phy_reg(hw, PHY_CTRL,
-                                                   phy_ctrl);
-                       }
-               }
-               return;
-       } else if (adapter->smartspeed == E1000_SMARTSPEED_DOWNSHIFT) {
-               /* If still no link, perhaps using 2/3 pair cable */
-               e1000_read_phy_reg(hw, PHY_1000T_CTRL, &phy_ctrl);
-               phy_ctrl |= CR_1000T_MS_ENABLE;
-               e1000_write_phy_reg(hw, PHY_1000T_CTRL, phy_ctrl);
-               if (!e1000_phy_setup_autoneg(hw) &&
-                  !e1000_read_phy_reg(hw, PHY_CTRL, &phy_ctrl)) {
-                       phy_ctrl |= (MII_CR_AUTO_NEG_EN |
-                                    MII_CR_RESTART_AUTO_NEG);
-                       e1000_write_phy_reg(hw, PHY_CTRL, phy_ctrl);
-               }
-       }
-       /* Restart process after E1000_SMARTSPEED_MAX iterations */
-       if (adapter->smartspeed++ == E1000_SMARTSPEED_MAX)
-               adapter->smartspeed = 0;
-}
-
-/**
- * e1000_ioctl -
- * @netdev:
- * @ifreq:
- * @cmd:
- **/
-
-static int e1000_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)
-{
-       switch (cmd) {
-       case SIOCGMIIPHY:
-       case SIOCGMIIREG:
-       case SIOCSMIIREG:
-               return e1000_mii_ioctl(netdev, ifr, cmd);
-       default:
-               return -EOPNOTSUPP;
-       }
-}
-
-/**
- * e1000_mii_ioctl -
- * @netdev:
- * @ifreq:
- * @cmd:
- **/
-
-static int e1000_mii_ioctl(struct net_device *netdev, struct ifreq *ifr,
-                          int cmd)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       struct mii_ioctl_data *data = if_mii(ifr);
-       int retval;
-       u16 mii_reg;
-       u16 spddplx;
-       unsigned long flags;
-
-       if (hw->media_type != e1000_media_type_copper)
-               return -EOPNOTSUPP;
-
-       switch (cmd) {
-       case SIOCGMIIPHY:
-               data->phy_id = hw->phy_addr;
-               break;
-       case SIOCGMIIREG:
-               if (!capable(CAP_NET_ADMIN))
-                       return -EPERM;
-               spin_lock_irqsave(&adapter->stats_lock, flags);
-               if (e1000_read_phy_reg(hw, data->reg_num & 0x1F,
-                                  &data->val_out)) {
-                       spin_unlock_irqrestore(&adapter->stats_lock, flags);
-                       return -EIO;
-               }
-               spin_unlock_irqrestore(&adapter->stats_lock, flags);
-               break;
-       case SIOCSMIIREG:
-               if (!capable(CAP_NET_ADMIN))
-                       return -EPERM;
-               if (data->reg_num & ~(0x1F))
-                       return -EFAULT;
-               mii_reg = data->val_in;
-               spin_lock_irqsave(&adapter->stats_lock, flags);
-               if (e1000_write_phy_reg(hw, data->reg_num,
-                                       mii_reg)) {
-                       spin_unlock_irqrestore(&adapter->stats_lock, flags);
-                       return -EIO;
-               }
-               spin_unlock_irqrestore(&adapter->stats_lock, flags);
-               if (hw->media_type == e1000_media_type_copper) {
-                       switch (data->reg_num) {
-                       case PHY_CTRL:
-                               if (mii_reg & MII_CR_POWER_DOWN)
-                                       break;
-                               if (mii_reg & MII_CR_AUTO_NEG_EN) {
-                                       hw->autoneg = 1;
-                                       hw->autoneg_advertised = 0x2F;
-                               } else {
-                                       if (mii_reg & 0x40)
-                                               spddplx = SPEED_1000;
-                                       else if (mii_reg & 0x2000)
-                                               spddplx = SPEED_100;
-                                       else
-                                               spddplx = SPEED_10;
-                                       spddplx += (mii_reg & 0x100)
-                                                  ? DUPLEX_FULL :
-                                                  DUPLEX_HALF;
-                                       retval = e1000_set_spd_dplx(adapter,
-                                                                   spddplx);
-                                       if (retval)
-                                               return retval;
-                               }
-                               if (netif_running(adapter->netdev))
-                                       e1000_reinit_locked(adapter);
-                               else
-                                       e1000_reset(adapter);
-                               break;
-                       case M88E1000_PHY_SPEC_CTRL:
-                       case M88E1000_EXT_PHY_SPEC_CTRL:
-                               if (e1000_phy_reset(hw))
-                                       return -EIO;
-                               break;
-                       }
-               } else {
-                       switch (data->reg_num) {
-                       case PHY_CTRL:
-                               if (mii_reg & MII_CR_POWER_DOWN)
-                                       break;
-                               if (netif_running(adapter->netdev))
-                                       e1000_reinit_locked(adapter);
-                               else
-                                       e1000_reset(adapter);
-                               break;
-                       }
-               }
-               break;
-       default:
-               return -EOPNOTSUPP;
-       }
-       return E1000_SUCCESS;
-}
-
-void e1000_pci_set_mwi(struct e1000_hw *hw)
-{
-       struct e1000_adapter *adapter = hw->back;
-       int ret_val = pci_set_mwi(adapter->pdev);
-
-       if (ret_val)
-               DPRINTK(PROBE, ERR, "Error in setting MWI\n");
-}
-
-void e1000_pci_clear_mwi(struct e1000_hw *hw)
-{
-       struct e1000_adapter *adapter = hw->back;
-
-       pci_clear_mwi(adapter->pdev);
-}
-
-int e1000_pcix_get_mmrbc(struct e1000_hw *hw)
-{
-       struct e1000_adapter *adapter = hw->back;
-       return pcix_get_mmrbc(adapter->pdev);
-}
-
-void e1000_pcix_set_mmrbc(struct e1000_hw *hw, int mmrbc)
-{
-       struct e1000_adapter *adapter = hw->back;
-       pcix_set_mmrbc(adapter->pdev, mmrbc);
-}
-
-s32 e1000_read_pcie_cap_reg(struct e1000_hw *hw, u32 reg, u16 *value)
-{
-    struct e1000_adapter *adapter = hw->back;
-    u16 cap_offset;
-
-    cap_offset = pci_find_capability(adapter->pdev, PCI_CAP_ID_EXP);
-    if (!cap_offset)
-        return -E1000_ERR_CONFIG;
-
-    pci_read_config_word(adapter->pdev, cap_offset + reg, value);
-
-    return E1000_SUCCESS;
-}
-
-void e1000_io_write(struct e1000_hw *hw, unsigned long port, u32 value)
-{
-       outl(value, port);
-}
-
-static void e1000_vlan_rx_register(struct net_device *netdev,
-                                  struct vlan_group *grp)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       u32 ctrl, rctl;
-
-       if (!test_bit(__E1000_DOWN, &adapter->flags))
-               e1000_irq_disable(adapter);
-       adapter->vlgrp = grp;
-
-       if (grp) {
-               /* enable VLAN tag insert/strip */
-               ctrl = er32(CTRL);
-               ctrl |= E1000_CTRL_VME;
-               ew32(CTRL, ctrl);
-
-               if (adapter->hw.mac_type != e1000_ich8lan) {
-                       /* enable VLAN receive filtering */
-                       rctl = er32(RCTL);
-                       rctl &= ~E1000_RCTL_CFIEN;
-                       ew32(RCTL, rctl);
-                       e1000_update_mng_vlan(adapter);
-               }
-       } else {
-               /* disable VLAN tag insert/strip */
-               ctrl = er32(CTRL);
-               ctrl &= ~E1000_CTRL_VME;
-               ew32(CTRL, ctrl);
-
-               if (adapter->hw.mac_type != e1000_ich8lan) {
-                       if (adapter->mng_vlan_id !=
-                           (u16)E1000_MNG_VLAN_NONE) {
-                               e1000_vlan_rx_kill_vid(netdev,
-                                                      adapter->mng_vlan_id);
-                               adapter->mng_vlan_id = E1000_MNG_VLAN_NONE;
-                       }
-               }
-       }
-
-       if (!test_bit(__E1000_DOWN, &adapter->flags))
-               e1000_irq_enable(adapter);
-}
-
-static void e1000_vlan_rx_add_vid(struct net_device *netdev, u16 vid)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       u32 vfta, index;
-
-       if ((hw->mng_cookie.status &
-            E1000_MNG_DHCP_COOKIE_STATUS_VLAN_SUPPORT) &&
-           (vid == adapter->mng_vlan_id))
-               return;
-       /* add VID to filter table */
-       index = (vid >> 5) & 0x7F;
-       vfta = E1000_READ_REG_ARRAY(hw, VFTA, index);
-       vfta |= (1 << (vid & 0x1F));
-       e1000_write_vfta(hw, index, vfta);
-}
-
-static void e1000_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       u32 vfta, index;
-
-       if (!test_bit(__E1000_DOWN, &adapter->flags))
-               e1000_irq_disable(adapter);
-       vlan_group_set_device(adapter->vlgrp, vid, NULL);
-       if (!test_bit(__E1000_DOWN, &adapter->flags))
-               e1000_irq_enable(adapter);
-
-       if ((hw->mng_cookie.status &
-            E1000_MNG_DHCP_COOKIE_STATUS_VLAN_SUPPORT) &&
-           (vid == adapter->mng_vlan_id)) {
-               /* release control to f/w */
-               e1000_release_hw_control(adapter);
-               return;
-       }
-
-       /* remove VID from filter table */
-       index = (vid >> 5) & 0x7F;
-       vfta = E1000_READ_REG_ARRAY(hw, VFTA, index);
-       vfta &= ~(1 << (vid & 0x1F));
-       e1000_write_vfta(hw, index, vfta);
-}
-
-static void e1000_restore_vlan(struct e1000_adapter *adapter)
-{
-       e1000_vlan_rx_register(adapter->netdev, adapter->vlgrp);
-
-       if (adapter->vlgrp) {
-               u16 vid;
-               for (vid = 0; vid < VLAN_GROUP_ARRAY_LEN; vid++) {
-                       if (!vlan_group_get_device(adapter->vlgrp, vid))
-                               continue;
-                       e1000_vlan_rx_add_vid(adapter->netdev, vid);
-               }
-       }
-}
-
-int e1000_set_spd_dplx(struct e1000_adapter *adapter, u16 spddplx)
-{
-       struct e1000_hw *hw = &adapter->hw;
-
-       hw->autoneg = 0;
-
-       /* Fiber NICs only allow 1000 gbps Full duplex */
-       if ((hw->media_type == e1000_media_type_fiber) &&
-               spddplx != (SPEED_1000 + DUPLEX_FULL)) {
-               DPRINTK(PROBE, ERR, "Unsupported Speed/Duplex configuration\n");
-               return -EINVAL;
-       }
-
-       switch (spddplx) {
-       case SPEED_10 + DUPLEX_HALF:
-               hw->forced_speed_duplex = e1000_10_half;
-               break;
-       case SPEED_10 + DUPLEX_FULL:
-               hw->forced_speed_duplex = e1000_10_full;
-               break;
-       case SPEED_100 + DUPLEX_HALF:
-               hw->forced_speed_duplex = e1000_100_half;
-               break;
-       case SPEED_100 + DUPLEX_FULL:
-               hw->forced_speed_duplex = e1000_100_full;
-               break;
-       case SPEED_1000 + DUPLEX_FULL:
-               hw->autoneg = 1;
-               hw->autoneg_advertised = ADVERTISE_1000_FULL;
-               break;
-       case SPEED_1000 + DUPLEX_HALF: /* not supported */
-       default:
-               DPRINTK(PROBE, ERR, "Unsupported Speed/Duplex configuration\n");
-               return -EINVAL;
-       }
-       return 0;
-}
-
-static int e1000_suspend(struct pci_dev *pdev, pm_message_t state)
-{
-       struct net_device *netdev = pci_get_drvdata(pdev);
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       u32 ctrl, ctrl_ext, rctl, status;
-       u32 wufc = adapter->wol;
-#ifdef CONFIG_PM
-       int retval = 0;
-#endif
-
-       netif_device_detach(netdev);
-
-       if (netif_running(netdev)) {
-               WARN_ON(test_bit(__E1000_RESETTING, &adapter->flags));
-               e1000_down(adapter);
-       }
-
-#ifdef CONFIG_PM
-       retval = pci_save_state(pdev);
-       if (retval)
-               return retval;
-#endif
-
-       status = er32(STATUS);
-       if (status & E1000_STATUS_LU)
-               wufc &= ~E1000_WUFC_LNKC;
-
-       if (wufc) {
-               e1000_setup_rctl(adapter);
-               e1000_set_rx_mode(netdev);
-
-               /* turn on all-multi mode if wake on multicast is enabled */
-               if (wufc & E1000_WUFC_MC) {
-                       rctl = er32(RCTL);
-                       rctl |= E1000_RCTL_MPE;
-                       ew32(RCTL, rctl);
-               }
-
-               if (hw->mac_type >= e1000_82540) {
-                       ctrl = er32(CTRL);
-                       /* advertise wake from D3Cold */
-                       #define E1000_CTRL_ADVD3WUC 0x00100000
-                       /* phy power management enable */
-                       #define E1000_CTRL_EN_PHY_PWR_MGMT 0x00200000
-                       ctrl |= E1000_CTRL_ADVD3WUC |
-                               E1000_CTRL_EN_PHY_PWR_MGMT;
-                       ew32(CTRL, ctrl);
-               }
-
-               if (hw->media_type == e1000_media_type_fiber ||
-                  hw->media_type == e1000_media_type_internal_serdes) {
-                       /* keep the laser running in D3 */
-                       ctrl_ext = er32(CTRL_EXT);
-                       ctrl_ext |= E1000_CTRL_EXT_SDP7_DATA;
-                       ew32(CTRL_EXT, ctrl_ext);
-               }
-
-               /* Allow time for pending master requests to run */
-               e1000_disable_pciex_master(hw);
-
-               ew32(WUC, E1000_WUC_PME_EN);
-               ew32(WUFC, wufc);
-               pci_enable_wake(pdev, PCI_D3hot, 1);
-               pci_enable_wake(pdev, PCI_D3cold, 1);
-       } else {
-               ew32(WUC, 0);
-               ew32(WUFC, 0);
-               pci_enable_wake(pdev, PCI_D3hot, 0);
-               pci_enable_wake(pdev, PCI_D3cold, 0);
-       }
-
-       e1000_release_manageability(adapter);
-
-       /* make sure adapter isn't asleep if manageability is enabled */
-       if (adapter->en_mng_pt) {
-               pci_enable_wake(pdev, PCI_D3hot, 1);
-               pci_enable_wake(pdev, PCI_D3cold, 1);
-       }
-
-       if (hw->phy_type == e1000_phy_igp_3)
-               e1000_phy_powerdown_workaround(hw);
-
-       if (netif_running(netdev))
-               e1000_free_irq(adapter);
-
-       /* Release control of h/w to f/w.  If f/w is AMT enabled, this
-        * would have already happened in close and is redundant. */
-       e1000_release_hw_control(adapter);
-
-       pci_disable_device(pdev);
-
-       pci_set_power_state(pdev, pci_choose_state(pdev, state));
-
-       return 0;
-}
-
-#ifdef CONFIG_PM
-static int e1000_resume(struct pci_dev *pdev)
-{
-       struct net_device *netdev = pci_get_drvdata(pdev);
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       u32 err;
-
-       pci_set_power_state(pdev, PCI_D0);
-       pci_restore_state(pdev);
-
-       if (adapter->need_ioport)
-               err = pci_enable_device(pdev);
-       else
-               err = pci_enable_device_mem(pdev);
-       if (err) {
-               printk(KERN_ERR "e1000: Cannot enable PCI device from 
suspend\n");
-               return err;
-       }
-       pci_set_master(pdev);
-
-       pci_enable_wake(pdev, PCI_D3hot, 0);
-       pci_enable_wake(pdev, PCI_D3cold, 0);
-
-       if (netif_running(netdev)) {
-               err = e1000_request_irq(adapter);
-               if (err)
-                       return err;
-       }
-
-       e1000_power_up_phy(adapter);
-       e1000_reset(adapter);
-       ew32(WUS, ~0);
-
-       e1000_init_manageability(adapter);
-
-       if (netif_running(netdev))
-               e1000_up(adapter);
-
-       netif_device_attach(netdev);
-
-       /* If the controller is 82573 and f/w is AMT, do not set
-        * DRV_LOAD until the interface is up.  For all other cases,
-        * let the f/w know that the h/w is now under the control
-        * of the driver. */
-       if (hw->mac_type != e1000_82573 ||
-           !e1000_check_mng_mode(hw))
-               e1000_get_hw_control(adapter);
-
-       return 0;
-}
-#endif
-
-static void e1000_shutdown(struct pci_dev *pdev)
-{
-       e1000_suspend(pdev, PMSG_SUSPEND);
-}
-
-#ifdef CONFIG_NET_POLL_CONTROLLER
-/*
- * Polling 'interrupt' - used by things like netconsole to send skbs
- * without having to re-enable interrupts. It's not called while
- * the interrupt routine is executing.
- */
-static void e1000_netpoll(struct net_device *netdev)
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-
-       disable_irq(adapter->pdev->irq);
-       e1000_intr(adapter->pdev->irq, netdev);
-       enable_irq(adapter->pdev->irq);
-}
-#endif
-
-/**
- * e1000_io_error_detected - called when PCI error is detected
- * @pdev: Pointer to PCI device
- * @state: The current pci conneection state
- *
- * This function is called after a PCI bus error affecting
- * this device has been detected.
- */
-static pci_ers_result_t e1000_io_error_detected(struct pci_dev *pdev,
-                                               pci_channel_state_t state)
-{
-       struct net_device *netdev = pci_get_drvdata(pdev);
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-
-       netif_device_detach(netdev);
-
-       if (netif_running(netdev))
-               e1000_down(adapter);
-       pci_disable_device(pdev);
-
-       /* Request a slot slot reset. */
-       return PCI_ERS_RESULT_NEED_RESET;
-}
-
-/**
- * e1000_io_slot_reset - called after the pci bus has been reset.
- * @pdev: Pointer to PCI device
- *
- * Restart the card from scratch, as if from a cold-boot. Implementation
- * resembles the first-half of the e1000_resume routine.
- */
-static pci_ers_result_t e1000_io_slot_reset(struct pci_dev *pdev)
-{
-       struct net_device *netdev = pci_get_drvdata(pdev);
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-       int err;
-
-       if (adapter->need_ioport)
-               err = pci_enable_device(pdev);
-       else
-               err = pci_enable_device_mem(pdev);
-       if (err) {
-               printk(KERN_ERR "e1000: Cannot re-enable PCI device after 
reset.\n");
-               return PCI_ERS_RESULT_DISCONNECT;
-       }
-       pci_set_master(pdev);
-
-       pci_enable_wake(pdev, PCI_D3hot, 0);
-       pci_enable_wake(pdev, PCI_D3cold, 0);
-
-       e1000_reset(adapter);
-       ew32(WUS, ~0);
-
-       return PCI_ERS_RESULT_RECOVERED;
-}
-
-/**
- * e1000_io_resume - called when traffic can start flowing again.
- * @pdev: Pointer to PCI device
- *
- * This callback is called when the error recovery driver tells us that
- * its OK to resume normal operation. Implementation resembles the
- * second-half of the e1000_resume routine.
- */
-static void e1000_io_resume(struct pci_dev *pdev)
-{
-       struct net_device *netdev = pci_get_drvdata(pdev);
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       struct e1000_hw *hw = &adapter->hw;
-
-       e1000_init_manageability(adapter);
-
-       if (netif_running(netdev)) {
-               if (e1000_up(adapter)) {
-                       printk("e1000: can't bring device back up after 
reset\n");
-                       return;
-               }
-       }
-
-       netif_device_attach(netdev);
-
-       /* If the controller is 82573 and f/w is AMT, do not set
-        * DRV_LOAD until the interface is up.  For all other cases,
-        * let the f/w know that the h/w is now under the control
-        * of the driver. */
-       if (hw->mac_type != e1000_82573 ||
-           !e1000_check_mng_mode(hw))
-               e1000_get_hw_control(adapter);
-
-}
-
-/* e1000_main.c */
diff --git a/dde_e1000/e1000_osdep.h b/dde_e1000/e1000_osdep.h
deleted file mode 100644
index d929852..0000000
--- a/dde_e1000/e1000_osdep.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2006 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify it
-  under the terms and conditions of the GNU General Public License,
-  version 2, as published by the Free Software Foundation.
-
-  This program is distributed in the hope it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
-
-  You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-
-  The full GNU General Public License is included in this distribution in
-  the file called "COPYING".
-
-  Contact Information:
-  Linux NICS <address@hidden>
-  e1000-devel Mailing List <address@hidden>
-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-
-*******************************************************************************/
-
-
-/* glue for the OS independent part of e1000
- * includes register access macros
- */
-
-#ifndef _E1000_OSDEP_H_
-#define _E1000_OSDEP_H_
-
-#include <linux/types.h>
-#include <linux/pci.h>
-#include <linux/delay.h>
-#include <asm/io.h>
-#include <linux/interrupt.h>
-#include <linux/sched.h>
-
-#ifdef DBG
-#define DEBUGOUT(S)            printk(KERN_DEBUG S "\n")
-#define DEBUGOUT1(S, A...)     printk(KERN_DEBUG S "\n", A)
-#else
-#define DEBUGOUT(S)
-#define DEBUGOUT1(S, A...)
-#endif
-
-#define DEBUGFUNC(F) DEBUGOUT(F "\n")
-#define DEBUGOUT2 DEBUGOUT1
-#define DEBUGOUT3 DEBUGOUT2
-#define DEBUGOUT7 DEBUGOUT3
-
-
-#define er32(reg)                                                      \
-       (readl(hw->hw_addr + ((hw->mac_type >= e1000_82543)             \
-                              ? E1000_##reg : E1000_82542_##reg)))
-
-#define ew32(reg, value)                                               \
-       (writel((value), (hw->hw_addr + ((hw->mac_type >= e1000_82543)  \
-                                        ? E1000_##reg : E1000_82542_##reg))))
-
-#define E1000_WRITE_REG_ARRAY(a, reg, offset, value) ( \
-    writel((value), ((a)->hw_addr + \
-        (((a)->mac_type >= e1000_82543) ? E1000_##reg : E1000_82542_##reg) + \
-        ((offset) << 2))))
-
-#define E1000_READ_REG_ARRAY(a, reg, offset) ( \
-    readl((a)->hw_addr + \
-        (((a)->mac_type >= e1000_82543) ? E1000_##reg : E1000_82542_##reg) + \
-        ((offset) << 2)))
-
-#define E1000_READ_REG_ARRAY_DWORD E1000_READ_REG_ARRAY
-#define E1000_WRITE_REG_ARRAY_DWORD E1000_WRITE_REG_ARRAY
-
-#define E1000_WRITE_REG_ARRAY_WORD(a, reg, offset, value) ( \
-    writew((value), ((a)->hw_addr + \
-        (((a)->mac_type >= e1000_82543) ? E1000_##reg : E1000_82542_##reg) + \
-        ((offset) << 1))))
-
-#define E1000_READ_REG_ARRAY_WORD(a, reg, offset) ( \
-    readw((a)->hw_addr + \
-        (((a)->mac_type >= e1000_82543) ? E1000_##reg : E1000_82542_##reg) + \
-        ((offset) << 1)))
-
-#define E1000_WRITE_REG_ARRAY_BYTE(a, reg, offset, value) ( \
-    writeb((value), ((a)->hw_addr + \
-        (((a)->mac_type >= e1000_82543) ? E1000_##reg : E1000_82542_##reg) + \
-        (offset))))
-
-#define E1000_READ_REG_ARRAY_BYTE(a, reg, offset) ( \
-    readb((a)->hw_addr + \
-        (((a)->mac_type >= e1000_82543) ? E1000_##reg : E1000_82542_##reg) + \
-        (offset)))
-
-#define E1000_WRITE_FLUSH() er32(STATUS)
-
-#define E1000_WRITE_ICH_FLASH_REG(a, reg, value) ( \
-    writel((value), ((a)->flash_address + reg)))
-
-#define E1000_READ_ICH_FLASH_REG(a, reg) ( \
-    readl((a)->flash_address + reg))
-
-#define E1000_WRITE_ICH_FLASH_REG16(a, reg, value) ( \
-    writew((value), ((a)->flash_address + reg)))
-
-#define E1000_READ_ICH_FLASH_REG16(a, reg) ( \
-    readw((a)->flash_address + reg))
-
-#endif /* _E1000_OSDEP_H_ */
diff --git a/dde_e1000/e1000_param.c b/dde_e1000/e1000_param.c
deleted file mode 100644
index 213437d..0000000
--- a/dde_e1000/e1000_param.c
+++ /dev/null
@@ -1,792 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2006 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify it
-  under the terms and conditions of the GNU General Public License,
-  version 2, as published by the Free Software Foundation.
-
-  This program is distributed in the hope it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
-
-  You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-
-  The full GNU General Public License is included in this distribution in
-  the file called "COPYING".
-
-  Contact Information:
-  Linux NICS <address@hidden>
-  e1000-devel Mailing List <address@hidden>
-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-
-*******************************************************************************/
-
-#include "e1000.h"
-
-/* This is the only thing that needs to be changed to adjust the
- * maximum number of ports that the driver can manage.
- */
-
-#define E1000_MAX_NIC 32
-
-#define OPTION_UNSET   -1
-#define OPTION_DISABLED 0
-#define OPTION_ENABLED  1
-
-/* All parameters are treated the same, as an integer array of values.
- * This macro just reduces the need to repeat the same declaration code
- * over and over (plus this helps to avoid typo bugs).
- */
-
-#define E1000_PARAM_INIT { [0 ... E1000_MAX_NIC] = OPTION_UNSET }
-#define E1000_PARAM(X, desc) \
-       static int __devinitdata X[E1000_MAX_NIC+1] = E1000_PARAM_INIT; \
-       static unsigned int num_##X; \
-       module_param_array_named(X, X, int, &num_##X, 0); \
-       MODULE_PARM_DESC(X, desc);
-
-/* Transmit Descriptor Count
- *
- * Valid Range: 80-256 for 82542 and 82543 gigabit ethernet controllers
- * Valid Range: 80-4096 for 82544 and newer
- *
- * Default Value: 256
- */
-E1000_PARAM(TxDescriptors, "Number of transmit descriptors");
-
-/* Receive Descriptor Count
- *
- * Valid Range: 80-256 for 82542 and 82543 gigabit ethernet controllers
- * Valid Range: 80-4096 for 82544 and newer
- *
- * Default Value: 256
- */
-E1000_PARAM(RxDescriptors, "Number of receive descriptors");
-
-/* User Specified Speed Override
- *
- * Valid Range: 0, 10, 100, 1000
- *  - 0    - auto-negotiate at all supported speeds
- *  - 10   - only link at 10 Mbps
- *  - 100  - only link at 100 Mbps
- *  - 1000 - only link at 1000 Mbps
- *
- * Default Value: 0
- */
-E1000_PARAM(Speed, "Speed setting");
-
-/* User Specified Duplex Override
- *
- * Valid Range: 0-2
- *  - 0 - auto-negotiate for duplex
- *  - 1 - only link at half duplex
- *  - 2 - only link at full duplex
- *
- * Default Value: 0
- */
-E1000_PARAM(Duplex, "Duplex setting");
-
-/* Auto-negotiation Advertisement Override
- *
- * Valid Range: 0x01-0x0F, 0x20-0x2F (copper); 0x20 (fiber)
- *
- * The AutoNeg value is a bit mask describing which speed and duplex
- * combinations should be advertised during auto-negotiation.
- * The supported speed and duplex modes are listed below
- *
- * Bit           7     6     5      4      3     2     1      0
- * Speed (Mbps)  N/A   N/A   1000   N/A    100   100   10     10
- * Duplex                    Full          Full  Half  Full   Half
- *
- * Default Value: 0x2F (copper); 0x20 (fiber)
- */
-E1000_PARAM(AutoNeg, "Advertised auto-negotiation setting");
-#define AUTONEG_ADV_DEFAULT  0x2F
-#define AUTONEG_ADV_MASK     0x2F
-
-/* User Specified Flow Control Override
- *
- * Valid Range: 0-3
- *  - 0 - No Flow Control
- *  - 1 - Rx only, respond to PAUSE frames but do not generate them
- *  - 2 - Tx only, generate PAUSE frames but ignore them on receive
- *  - 3 - Full Flow Control Support
- *
- * Default Value: Read flow control settings from the EEPROM
- */
-E1000_PARAM(FlowControl, "Flow Control setting");
-#define FLOW_CONTROL_DEFAULT FLOW_CONTROL_FULL
-
-/* XsumRX - Receive Checksum Offload Enable/Disable
- *
- * Valid Range: 0, 1
- *  - 0 - disables all checksum offload
- *  - 1 - enables receive IP/TCP/UDP checksum offload
- *        on 82543 and newer -based NICs
- *
- * Default Value: 1
- */
-E1000_PARAM(XsumRX, "Disable or enable Receive Checksum offload");
-
-/* Transmit Interrupt Delay in units of 1.024 microseconds
- *  Tx interrupt delay needs to typically be set to something non zero
- *
- * Valid Range: 0-65535
- */
-E1000_PARAM(TxIntDelay, "Transmit Interrupt Delay");
-#define DEFAULT_TIDV                   8
-#define MAX_TXDELAY               0xFFFF
-#define MIN_TXDELAY                    0
-
-/* Transmit Absolute Interrupt Delay in units of 1.024 microseconds
- *
- * Valid Range: 0-65535
- */
-E1000_PARAM(TxAbsIntDelay, "Transmit Absolute Interrupt Delay");
-#define DEFAULT_TADV                  32
-#define MAX_TXABSDELAY            0xFFFF
-#define MIN_TXABSDELAY                 0
-
-/* Receive Interrupt Delay in units of 1.024 microseconds
- *   hardware will likely hang if you set this to anything but zero.
- *
- * Valid Range: 0-65535
- */
-E1000_PARAM(RxIntDelay, "Receive Interrupt Delay");
-#define DEFAULT_RDTR                   0
-#define MAX_RXDELAY               0xFFFF
-#define MIN_RXDELAY                    0
-
-/* Receive Absolute Interrupt Delay in units of 1.024 microseconds
- *
- * Valid Range: 0-65535
- */
-E1000_PARAM(RxAbsIntDelay, "Receive Absolute Interrupt Delay");
-#define DEFAULT_RADV                   8
-#define MAX_RXABSDELAY            0xFFFF
-#define MIN_RXABSDELAY                 0
-
-/* Interrupt Throttle Rate (interrupts/sec)
- *
- * Valid Range: 100-100000 (0=off, 1=dynamic, 3=dynamic conservative)
- */
-E1000_PARAM(InterruptThrottleRate, "Interrupt Throttling Rate");
-#define DEFAULT_ITR                    3
-#define MAX_ITR                   100000
-#define MIN_ITR                      100
-
-/* Enable Smart Power Down of the PHY
- *
- * Valid Range: 0, 1
- *
- * Default Value: 0 (disabled)
- */
-E1000_PARAM(SmartPowerDownEnable, "Enable PHY smart power down");
-
-/* Enable Kumeran Lock Loss workaround
- *
- * Valid Range: 0, 1
- *
- * Default Value: 1 (enabled)
- */
-E1000_PARAM(KumeranLockLoss, "Enable Kumeran lock loss workaround");
-
-struct e1000_option {
-       enum { enable_option, range_option, list_option } type;
-       const char *name;
-       const char *err;
-       int def;
-       union {
-               struct { /* range_option info */
-                       int min;
-                       int max;
-               } r;
-               struct { /* list_option info */
-                       int nr;
-                       const struct e1000_opt_list { int i; char *str; } *p;
-               } l;
-       } arg;
-};
-
-static int __devinit e1000_validate_option(unsigned int *value,
-                                          const struct e1000_option *opt,
-                                          struct e1000_adapter *adapter)
-{
-       if (*value == OPTION_UNSET) {
-               *value = opt->def;
-               return 0;
-       }
-
-       switch (opt->type) {
-       case enable_option:
-               switch (*value) {
-               case OPTION_ENABLED:
-                       DPRINTK(PROBE, INFO, "%s Enabled\n", opt->name);
-                       return 0;
-               case OPTION_DISABLED:
-                       DPRINTK(PROBE, INFO, "%s Disabled\n", opt->name);
-                       return 0;
-               }
-               break;
-       case range_option:
-               if (*value >= opt->arg.r.min && *value <= opt->arg.r.max) {
-                       DPRINTK(PROBE, INFO,
-                                       "%s set to %i\n", opt->name, *value);
-                       return 0;
-               }
-               break;
-       case list_option: {
-               int i;
-               const struct e1000_opt_list *ent;
-
-               for (i = 0; i < opt->arg.l.nr; i++) {
-                       ent = &opt->arg.l.p[i];
-                       if (*value == ent->i) {
-                               if (ent->str[0] != '\0')
-                                       DPRINTK(PROBE, INFO, "%s\n", ent->str);
-                               return 0;
-                       }
-               }
-       }
-               break;
-       default:
-               BUG();
-       }
-
-       DPRINTK(PROBE, INFO, "Invalid %s value specified (%i) %s\n",
-              opt->name, *value, opt->err);
-       *value = opt->def;
-       return -1;
-}
-
-static void e1000_check_fiber_options(struct e1000_adapter *adapter);
-static void e1000_check_copper_options(struct e1000_adapter *adapter);
-
-/**
- * e1000_check_options - Range Checking for Command Line Parameters
- * @adapter: board private structure
- *
- * This routine checks all command line parameters for valid user
- * input.  If an invalid value is given, or if no user specified
- * value exists, a default value is used.  The final value is stored
- * in a variable in the adapter structure.
- **/
-
-void __devinit e1000_check_options(struct e1000_adapter *adapter)
-{
-       struct e1000_option opt;
-       int bd = adapter->bd_number;
-
-       if (bd >= E1000_MAX_NIC) {
-               DPRINTK(PROBE, NOTICE,
-                      "Warning: no configuration for board #%i\n", bd);
-               DPRINTK(PROBE, NOTICE, "Using defaults for all values\n");
-       }
-
-       { /* Transmit Descriptor Count */
-               struct e1000_tx_ring *tx_ring = adapter->tx_ring;
-               int i;
-               e1000_mac_type mac_type = adapter->hw.mac_type;
-
-               opt = (struct e1000_option) {
-                       .type = range_option,
-                       .name = "Transmit Descriptors",
-                       .err  = "using default of "
-                               __MODULE_STRING(E1000_DEFAULT_TXD),
-                       .def  = E1000_DEFAULT_TXD,
-                       .arg  = { .r = {
-                               .min = E1000_MIN_TXD,
-                               .max = mac_type < e1000_82544 ? E1000_MAX_TXD : 
E1000_MAX_82544_TXD
-                               }}
-               };
-
-               if (num_TxDescriptors > bd) {
-                       tx_ring->count = TxDescriptors[bd];
-                       e1000_validate_option(&tx_ring->count, &opt, adapter);
-                       tx_ring->count = ALIGN(tx_ring->count,
-                                               REQ_TX_DESCRIPTOR_MULTIPLE);
-               } else {
-                       tx_ring->count = opt.def;
-               }
-               for (i = 0; i < adapter->num_tx_queues; i++)
-                       tx_ring[i].count = tx_ring->count;
-       }
-       { /* Receive Descriptor Count */
-               struct e1000_rx_ring *rx_ring = adapter->rx_ring;
-               int i;
-               e1000_mac_type mac_type = adapter->hw.mac_type;
-
-               opt = (struct e1000_option) {
-                       .type = range_option,
-                       .name = "Receive Descriptors",
-                       .err  = "using default of "
-                               __MODULE_STRING(E1000_DEFAULT_RXD),
-                       .def  = E1000_DEFAULT_RXD,
-                       .arg  = { .r = {
-                               .min = E1000_MIN_RXD,
-                               .max = mac_type < e1000_82544 ? E1000_MAX_RXD : 
E1000_MAX_82544_RXD
-                       }}
-               };
-
-               if (num_RxDescriptors > bd) {
-                       rx_ring->count = RxDescriptors[bd];
-                       e1000_validate_option(&rx_ring->count, &opt, adapter);
-                       rx_ring->count = ALIGN(rx_ring->count,
-                                               REQ_RX_DESCRIPTOR_MULTIPLE);
-               } else {
-                       rx_ring->count = opt.def;
-               }
-               for (i = 0; i < adapter->num_rx_queues; i++)
-                       rx_ring[i].count = rx_ring->count;
-       }
-       { /* Checksum Offload Enable/Disable */
-               opt = (struct e1000_option) {
-                       .type = enable_option,
-                       .name = "Checksum Offload",
-                       .err  = "defaulting to Enabled",
-                       .def  = OPTION_ENABLED
-               };
-
-               if (num_XsumRX > bd) {
-                       unsigned int rx_csum = XsumRX[bd];
-                       e1000_validate_option(&rx_csum, &opt, adapter);
-                       adapter->rx_csum = rx_csum;
-               } else {
-                       adapter->rx_csum = opt.def;
-               }
-       }
-       { /* Flow Control */
-
-               struct e1000_opt_list fc_list[] =
-                       {{ E1000_FC_NONE,    "Flow Control Disabled" },
-                        { E1000_FC_RX_PAUSE,"Flow Control Receive Only" },
-                        { E1000_FC_TX_PAUSE,"Flow Control Transmit Only" },
-                        { E1000_FC_FULL,    "Flow Control Enabled" },
-                        { E1000_FC_DEFAULT, "Flow Control Hardware Default" }};
-
-               opt = (struct e1000_option) {
-                       .type = list_option,
-                       .name = "Flow Control",
-                       .err  = "reading default settings from EEPROM",
-                       .def  = E1000_FC_DEFAULT,
-                       .arg  = { .l = { .nr = ARRAY_SIZE(fc_list),
-                                        .p = fc_list }}
-               };
-
-               if (num_FlowControl > bd) {
-                       unsigned int fc = FlowControl[bd];
-                       e1000_validate_option(&fc, &opt, adapter);
-                       adapter->hw.fc = adapter->hw.original_fc = fc;
-               } else {
-                       adapter->hw.fc = adapter->hw.original_fc = opt.def;
-               }
-       }
-       { /* Transmit Interrupt Delay */
-               opt = (struct e1000_option) {
-                       .type = range_option,
-                       .name = "Transmit Interrupt Delay",
-                       .err  = "using default of " 
__MODULE_STRING(DEFAULT_TIDV),
-                       .def  = DEFAULT_TIDV,
-                       .arg  = { .r = { .min = MIN_TXDELAY,
-                                        .max = MAX_TXDELAY }}
-               };
-
-               if (num_TxIntDelay > bd) {
-                       adapter->tx_int_delay = TxIntDelay[bd];
-                       e1000_validate_option(&adapter->tx_int_delay, &opt,
-                                             adapter);
-               } else {
-                       adapter->tx_int_delay = opt.def;
-               }
-       }
-       { /* Transmit Absolute Interrupt Delay */
-               opt = (struct e1000_option) {
-                       .type = range_option,
-                       .name = "Transmit Absolute Interrupt Delay",
-                       .err  = "using default of " 
__MODULE_STRING(DEFAULT_TADV),
-                       .def  = DEFAULT_TADV,
-                       .arg  = { .r = { .min = MIN_TXABSDELAY,
-                                        .max = MAX_TXABSDELAY }}
-               };
-
-               if (num_TxAbsIntDelay > bd) {
-                       adapter->tx_abs_int_delay = TxAbsIntDelay[bd];
-                       e1000_validate_option(&adapter->tx_abs_int_delay, &opt,
-                                             adapter);
-               } else {
-                       adapter->tx_abs_int_delay = opt.def;
-               }
-       }
-       { /* Receive Interrupt Delay */
-               opt = (struct e1000_option) {
-                       .type = range_option,
-                       .name = "Receive Interrupt Delay",
-                       .err  = "using default of " 
__MODULE_STRING(DEFAULT_RDTR),
-                       .def  = DEFAULT_RDTR,
-                       .arg  = { .r = { .min = MIN_RXDELAY,
-                                        .max = MAX_RXDELAY }}
-               };
-
-               if (num_RxIntDelay > bd) {
-                       adapter->rx_int_delay = RxIntDelay[bd];
-                       e1000_validate_option(&adapter->rx_int_delay, &opt,
-                                             adapter);
-               } else {
-                       adapter->rx_int_delay = opt.def;
-               }
-       }
-       { /* Receive Absolute Interrupt Delay */
-               opt = (struct e1000_option) {
-                       .type = range_option,
-                       .name = "Receive Absolute Interrupt Delay",
-                       .err  = "using default of " 
__MODULE_STRING(DEFAULT_RADV),
-                       .def  = DEFAULT_RADV,
-                       .arg  = { .r = { .min = MIN_RXABSDELAY,
-                                        .max = MAX_RXABSDELAY }}
-               };
-
-               if (num_RxAbsIntDelay > bd) {
-                       adapter->rx_abs_int_delay = RxAbsIntDelay[bd];
-                       e1000_validate_option(&adapter->rx_abs_int_delay, &opt,
-                                             adapter);
-               } else {
-                       adapter->rx_abs_int_delay = opt.def;
-               }
-       }
-       { /* Interrupt Throttling Rate */
-               opt = (struct e1000_option) {
-                       .type = range_option,
-                       .name = "Interrupt Throttling Rate (ints/sec)",
-                       .err  = "using default of " 
__MODULE_STRING(DEFAULT_ITR),
-                       .def  = DEFAULT_ITR,
-                       .arg  = { .r = { .min = MIN_ITR,
-                                        .max = MAX_ITR }}
-               };
-
-               if (num_InterruptThrottleRate > bd) {
-                       adapter->itr = InterruptThrottleRate[bd];
-                       switch (adapter->itr) {
-                       case 0:
-                               DPRINTK(PROBE, INFO, "%s turned off\n",
-                                       opt.name);
-                               break;
-                       case 1:
-                               DPRINTK(PROBE, INFO, "%s set to dynamic mode\n",
-                                       opt.name);
-                               adapter->itr_setting = adapter->itr;
-                               adapter->itr = 20000;
-                               break;
-                       case 3:
-                               DPRINTK(PROBE, INFO,
-                                       "%s set to dynamic conservative mode\n",
-                                       opt.name);
-                               adapter->itr_setting = adapter->itr;
-                               adapter->itr = 20000;
-                               break;
-                       default:
-                               e1000_validate_option(&adapter->itr, &opt,
-                                       adapter);
-                               /* save the setting, because the dynamic bits 
change itr */
-                               /* clear the lower two bits because they are
-                                * used as control */
-                               adapter->itr_setting = adapter->itr & ~3;
-                               break;
-                       }
-               } else {
-                       adapter->itr_setting = opt.def;
-                       adapter->itr = 20000;
-               }
-       }
-       { /* Smart Power Down */
-               opt = (struct e1000_option) {
-                       .type = enable_option,
-                       .name = "PHY Smart Power Down",
-                       .err  = "defaulting to Disabled",
-                       .def  = OPTION_DISABLED
-               };
-
-               if (num_SmartPowerDownEnable > bd) {
-                       unsigned int spd = SmartPowerDownEnable[bd];
-                       e1000_validate_option(&spd, &opt, adapter);
-                       adapter->smart_power_down = spd;
-               } else {
-                       adapter->smart_power_down = opt.def;
-               }
-       }
-       { /* Kumeran Lock Loss Workaround */
-               opt = (struct e1000_option) {
-                       .type = enable_option,
-                       .name = "Kumeran Lock Loss Workaround",
-                       .err  = "defaulting to Enabled",
-                       .def  = OPTION_ENABLED
-               };
-
-               if (num_KumeranLockLoss > bd) {
-                       unsigned int kmrn_lock_loss = KumeranLockLoss[bd];
-                       e1000_validate_option(&kmrn_lock_loss, &opt, adapter);
-                       adapter->hw.kmrn_lock_loss_workaround_disabled = 
!kmrn_lock_loss;
-               } else {
-                       adapter->hw.kmrn_lock_loss_workaround_disabled = 
!opt.def;
-               }
-       }
-
-       switch (adapter->hw.media_type) {
-       case e1000_media_type_fiber:
-       case e1000_media_type_internal_serdes:
-               e1000_check_fiber_options(adapter);
-               break;
-       case e1000_media_type_copper:
-               e1000_check_copper_options(adapter);
-               break;
-       default:
-               BUG();
-       }
-}
-
-/**
- * e1000_check_fiber_options - Range Checking for Link Options, Fiber Version
- * @adapter: board private structure
- *
- * Handles speed and duplex options on fiber adapters
- **/
-
-static void __devinit e1000_check_fiber_options(struct e1000_adapter *adapter)
-{
-       int bd = adapter->bd_number;
-       if (num_Speed > bd) {
-               DPRINTK(PROBE, INFO, "Speed not valid for fiber adapters, "
-                      "parameter ignored\n");
-       }
-
-       if (num_Duplex > bd) {
-               DPRINTK(PROBE, INFO, "Duplex not valid for fiber adapters, "
-                      "parameter ignored\n");
-       }
-
-       if ((num_AutoNeg > bd) && (AutoNeg[bd] != 0x20)) {
-               DPRINTK(PROBE, INFO, "AutoNeg other than 1000/Full is "
-                                "not valid for fiber adapters, "
-                                "parameter ignored\n");
-       }
-}
-
-/**
- * e1000_check_copper_options - Range Checking for Link Options, Copper Version
- * @adapter: board private structure
- *
- * Handles speed and duplex options on copper adapters
- **/
-
-static void __devinit e1000_check_copper_options(struct e1000_adapter *adapter)
-{
-       struct e1000_option opt;
-       unsigned int speed, dplx, an;
-       int bd = adapter->bd_number;
-
-       { /* Speed */
-               static const struct e1000_opt_list speed_list[] = {
-                       {          0, "" },
-                       {   SPEED_10, "" },
-                       {  SPEED_100, "" },
-                       { SPEED_1000, "" }};
-
-               opt = (struct e1000_option) {
-                       .type = list_option,
-                       .name = "Speed",
-                       .err  = "parameter ignored",
-                       .def  = 0,
-                       .arg  = { .l = { .nr = ARRAY_SIZE(speed_list),
-                                        .p = speed_list }}
-               };
-
-               if (num_Speed > bd) {
-                       speed = Speed[bd];
-                       e1000_validate_option(&speed, &opt, adapter);
-               } else {
-                       speed = opt.def;
-               }
-       }
-       { /* Duplex */
-               static const struct e1000_opt_list dplx_list[] = {
-                       {           0, "" },
-                       { HALF_DUPLEX, "" },
-                       { FULL_DUPLEX, "" }};
-
-               opt = (struct e1000_option) {
-                       .type = list_option,
-                       .name = "Duplex",
-                       .err  = "parameter ignored",
-                       .def  = 0,
-                       .arg  = { .l = { .nr = ARRAY_SIZE(dplx_list),
-                                        .p = dplx_list }}
-               };
-
-               if (e1000_check_phy_reset_block(&adapter->hw)) {
-                       DPRINTK(PROBE, INFO,
-                               "Link active due to SoL/IDER Session. "
-                               "Speed/Duplex/AutoNeg parameter ignored.\n");
-                       return;
-               }
-               if (num_Duplex > bd) {
-                       dplx = Duplex[bd];
-                       e1000_validate_option(&dplx, &opt, adapter);
-               } else {
-                       dplx = opt.def;
-               }
-       }
-
-       if ((num_AutoNeg > bd) && (speed != 0 || dplx != 0)) {
-               DPRINTK(PROBE, INFO,
-                      "AutoNeg specified along with Speed or Duplex, "
-                      "parameter ignored\n");
-               adapter->hw.autoneg_advertised = AUTONEG_ADV_DEFAULT;
-       } else { /* Autoneg */
-               static const struct e1000_opt_list an_list[] =
-                       #define AA "AutoNeg advertising "
-                       {{ 0x01, AA "10/HD" },
-                        { 0x02, AA "10/FD" },
-                        { 0x03, AA "10/FD, 10/HD" },
-                        { 0x04, AA "100/HD" },
-                        { 0x05, AA "100/HD, 10/HD" },
-                        { 0x06, AA "100/HD, 10/FD" },
-                        { 0x07, AA "100/HD, 10/FD, 10/HD" },
-                        { 0x08, AA "100/FD" },
-                        { 0x09, AA "100/FD, 10/HD" },
-                        { 0x0a, AA "100/FD, 10/FD" },
-                        { 0x0b, AA "100/FD, 10/FD, 10/HD" },
-                        { 0x0c, AA "100/FD, 100/HD" },
-                        { 0x0d, AA "100/FD, 100/HD, 10/HD" },
-                        { 0x0e, AA "100/FD, 100/HD, 10/FD" },
-                        { 0x0f, AA "100/FD, 100/HD, 10/FD, 10/HD" },
-                        { 0x20, AA "1000/FD" },
-                        { 0x21, AA "1000/FD, 10/HD" },
-                        { 0x22, AA "1000/FD, 10/FD" },
-                        { 0x23, AA "1000/FD, 10/FD, 10/HD" },
-                        { 0x24, AA "1000/FD, 100/HD" },
-                        { 0x25, AA "1000/FD, 100/HD, 10/HD" },
-                        { 0x26, AA "1000/FD, 100/HD, 10/FD" },
-                        { 0x27, AA "1000/FD, 100/HD, 10/FD, 10/HD" },
-                        { 0x28, AA "1000/FD, 100/FD" },
-                        { 0x29, AA "1000/FD, 100/FD, 10/HD" },
-                        { 0x2a, AA "1000/FD, 100/FD, 10/FD" },
-                        { 0x2b, AA "1000/FD, 100/FD, 10/FD, 10/HD" },
-                        { 0x2c, AA "1000/FD, 100/FD, 100/HD" },
-                        { 0x2d, AA "1000/FD, 100/FD, 100/HD, 10/HD" },
-                        { 0x2e, AA "1000/FD, 100/FD, 100/HD, 10/FD" },
-                        { 0x2f, AA "1000/FD, 100/FD, 100/HD, 10/FD, 10/HD" }};
-
-               opt = (struct e1000_option) {
-                       .type = list_option,
-                       .name = "AutoNeg",
-                       .err  = "parameter ignored",
-                       .def  = AUTONEG_ADV_DEFAULT,
-                       .arg  = { .l = { .nr = ARRAY_SIZE(an_list),
-                                        .p = an_list }}
-               };
-
-               if (num_AutoNeg > bd) {
-                       an = AutoNeg[bd];
-                       e1000_validate_option(&an, &opt, adapter);
-               } else {
-                       an = opt.def;
-               }
-               adapter->hw.autoneg_advertised = an;
-       }
-
-       switch (speed + dplx) {
-       case 0:
-               adapter->hw.autoneg = adapter->fc_autoneg = 1;
-               if ((num_Speed > bd) && (speed != 0 || dplx != 0))
-                       DPRINTK(PROBE, INFO,
-                              "Speed and duplex autonegotiation enabled\n");
-               break;
-       case HALF_DUPLEX:
-               DPRINTK(PROBE, INFO, "Half Duplex specified without Speed\n");
-               DPRINTK(PROBE, INFO, "Using Autonegotiation at "
-                       "Half Duplex only\n");
-               adapter->hw.autoneg = adapter->fc_autoneg = 1;
-               adapter->hw.autoneg_advertised = ADVERTISE_10_HALF |
-                                                ADVERTISE_100_HALF;
-               break;
-       case FULL_DUPLEX:
-               DPRINTK(PROBE, INFO, "Full Duplex specified without Speed\n");
-               DPRINTK(PROBE, INFO, "Using Autonegotiation at "
-                       "Full Duplex only\n");
-               adapter->hw.autoneg = adapter->fc_autoneg = 1;
-               adapter->hw.autoneg_advertised = ADVERTISE_10_FULL |
-                                                ADVERTISE_100_FULL |
-                                                ADVERTISE_1000_FULL;
-               break;
-       case SPEED_10:
-               DPRINTK(PROBE, INFO, "10 Mbps Speed specified "
-                       "without Duplex\n");
-               DPRINTK(PROBE, INFO, "Using Autonegotiation at 10 Mbps only\n");
-               adapter->hw.autoneg = adapter->fc_autoneg = 1;
-               adapter->hw.autoneg_advertised = ADVERTISE_10_HALF |
-                                                ADVERTISE_10_FULL;
-               break;
-       case SPEED_10 + HALF_DUPLEX:
-               DPRINTK(PROBE, INFO, "Forcing to 10 Mbps Half Duplex\n");
-               adapter->hw.autoneg = adapter->fc_autoneg = 0;
-               adapter->hw.forced_speed_duplex = e1000_10_half;
-               adapter->hw.autoneg_advertised = 0;
-               break;
-       case SPEED_10 + FULL_DUPLEX:
-               DPRINTK(PROBE, INFO, "Forcing to 10 Mbps Full Duplex\n");
-               adapter->hw.autoneg = adapter->fc_autoneg = 0;
-               adapter->hw.forced_speed_duplex = e1000_10_full;
-               adapter->hw.autoneg_advertised = 0;
-               break;
-       case SPEED_100:
-               DPRINTK(PROBE, INFO, "100 Mbps Speed specified "
-                       "without Duplex\n");
-               DPRINTK(PROBE, INFO, "Using Autonegotiation at "
-                       "100 Mbps only\n");
-               adapter->hw.autoneg = adapter->fc_autoneg = 1;
-               adapter->hw.autoneg_advertised = ADVERTISE_100_HALF |
-                                                ADVERTISE_100_FULL;
-               break;
-       case SPEED_100 + HALF_DUPLEX:
-               DPRINTK(PROBE, INFO, "Forcing to 100 Mbps Half Duplex\n");
-               adapter->hw.autoneg = adapter->fc_autoneg = 0;
-               adapter->hw.forced_speed_duplex = e1000_100_half;
-               adapter->hw.autoneg_advertised = 0;
-               break;
-       case SPEED_100 + FULL_DUPLEX:
-               DPRINTK(PROBE, INFO, "Forcing to 100 Mbps Full Duplex\n");
-               adapter->hw.autoneg = adapter->fc_autoneg = 0;
-               adapter->hw.forced_speed_duplex = e1000_100_full;
-               adapter->hw.autoneg_advertised = 0;
-               break;
-       case SPEED_1000:
-               DPRINTK(PROBE, INFO, "1000 Mbps Speed specified without "
-                       "Duplex\n");
-               goto full_duplex_only;
-       case SPEED_1000 + HALF_DUPLEX:
-               DPRINTK(PROBE, INFO,
-                       "Half Duplex is not supported at 1000 Mbps\n");
-               /* fall through */
-       case SPEED_1000 + FULL_DUPLEX:
-full_duplex_only:
-               DPRINTK(PROBE, INFO,
-                      "Using Autonegotiation at 1000 Mbps Full Duplex only\n");
-               adapter->hw.autoneg = adapter->fc_autoneg = 1;
-               adapter->hw.autoneg_advertised = ADVERTISE_1000_FULL;
-               break;
-       default:
-               BUG();
-       }
-
-       /* Speed, AutoNeg and MDI/MDI-X must all play nice */
-       if (e1000_validate_mdi_setting(&(adapter->hw)) < 0) {
-               DPRINTK(PROBE, INFO,
-                       "Speed, AutoNeg and MDI-X specifications are "
-                       "incompatible. Setting MDI-X to a compatible value.\n");
-       }
-}
-
diff --git a/dde_e1000/main.c b/dde_e1000/main.c
deleted file mode 100644
index df8df1e..0000000
--- a/dde_e1000/main.c
+++ /dev/null
@@ -1,35 +0,0 @@
-#include <dde26.h> /* l4dde26_*() */
-#include <dde26_net.h> /* l4dde26 networking */
-
-#include <linux/netdevice.h> /* struct sk_buff */
-#include <linux/pci.h> /* pci_unregister_driver() */
-#include <linux/init.h>  // initcall()
-#include <linux/delay.h> // msleep()
-
-#include <hurd/machdev.h>
-
-int using_std = 1;
-
-int main(int argc, char **argv)
-{
-       pthread_t thread;
-
-       l4dde26_init();
-       l4dde26_process_init();
-       l4dde26_softirq_init();
-
-       printk("Initializing skb subsystem\n");
-       skb_init();
-
-       l4dde26_do_initcalls();
-
-       register_net();
-       mach_device_init();
-       trivfs_init();
-
-       pthread_create (&thread, NULL, ds_server, NULL);
-       pthread_detach (thread);
-       trivfs_server();
-
-       return 0;
-}
diff --git a/dde_ne2k_pci/.gitignore b/dde_ne2k_pci/.gitignore
deleted file mode 100644
index 75c140f..0000000
--- a/dde_ne2k_pci/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-dde_ne2k_pci
diff --git a/dde_ne2k_pci/8390.c b/dde_ne2k_pci/8390.c
deleted file mode 100644
index ec3e22e..0000000
--- a/dde_ne2k_pci/8390.c
+++ /dev/null
@@ -1,109 +0,0 @@
-/* 8390 core for usual drivers */
-
-static const char version[] =
-    "8390.c:v1.10cvs 9/23/94 Donald Becker (address@hidden)\n";
-
-#include "lib8390.c"
-
-int ei_open(struct net_device *dev)
-{
-       return __ei_open(dev);
-}
-EXPORT_SYMBOL(ei_open);
-
-int ei_close(struct net_device *dev)
-{
-       return __ei_close(dev);
-}
-EXPORT_SYMBOL(ei_close);
-
-int ei_start_xmit(struct sk_buff *skb, struct net_device *dev)
-{
-       return __ei_start_xmit(skb, dev);
-}
-EXPORT_SYMBOL(ei_start_xmit);
-
-struct net_device_stats *ei_get_stats(struct net_device *dev)
-{
-       return __ei_get_stats(dev);
-}
-EXPORT_SYMBOL(ei_get_stats);
-
-void ei_set_multicast_list(struct net_device *dev)
-{
-       __ei_set_multicast_list(dev);
-}
-EXPORT_SYMBOL(ei_set_multicast_list);
-
-void ei_tx_timeout(struct net_device *dev)
-{
-       __ei_tx_timeout(dev);
-}
-EXPORT_SYMBOL(ei_tx_timeout);
-
-irqreturn_t ei_interrupt(int irq, void *dev_id)
-{
-       return __ei_interrupt(irq, dev_id);
-}
-EXPORT_SYMBOL(ei_interrupt);
-
-#ifdef CONFIG_NET_POLL_CONTROLLER
-void ei_poll(struct net_device *dev)
-{
-       __ei_poll(dev);
-}
-EXPORT_SYMBOL(ei_poll);
-#endif
-
-const struct net_device_ops ei_netdev_ops = {
-       .ndo_open               = ei_open,
-       .ndo_stop               = ei_close,
-       .ndo_start_xmit         = ei_start_xmit,
-       .ndo_tx_timeout         = ei_tx_timeout,
-       .ndo_get_stats          = ei_get_stats,
-       .ndo_set_multicast_list = ei_set_multicast_list,
-       .ndo_validate_addr      = eth_validate_addr,
-       .ndo_set_mac_address    = eth_mac_addr,
-       .ndo_change_mtu         = eth_change_mtu,
-#ifdef CONFIG_NET_POLL_CONTROLLER
-       .ndo_poll_controller    = ei_poll,
-#endif
-};
-EXPORT_SYMBOL(ei_netdev_ops);
-
-struct net_device *__alloc_ei_netdev(int size)
-{
-       struct net_device *dev = ____alloc_ei_netdev(size);
-#ifdef CONFIG_COMPAT_NET_DEV_OPS
-       if (dev) {
-               dev->hard_start_xmit = ei_start_xmit;
-               dev->get_stats  = ei_get_stats;
-               dev->set_multicast_list = ei_set_multicast_list;
-               dev->tx_timeout = ei_tx_timeout;
-       }
-#endif
-       return dev;
-}
-EXPORT_SYMBOL(__alloc_ei_netdev);
-
-void NS8390_init(struct net_device *dev, int startp)
-{
-       __NS8390_init(dev, startp);
-}
-EXPORT_SYMBOL(NS8390_init);
-
-#if defined(MODULE)
-
-static int __init ns8390_module_init(void)
-{
-       return 0;
-}
-
-static void __exit ns8390_module_exit(void)
-{
-}
-
-module_init(ns8390_module_init);
-module_exit(ns8390_module_exit);
-#endif /* MODULE */
-MODULE_LICENSE("GPL");
diff --git a/dde_ne2k_pci/8390.h b/dde_ne2k_pci/8390.h
deleted file mode 100644
index 3c61d6d..0000000
--- a/dde_ne2k_pci/8390.h
+++ /dev/null
@@ -1,231 +0,0 @@
-/* Generic NS8390 register definitions. */
-/* This file is part of Donald Becker's 8390 drivers, and is distributed
-   under the same license. Auto-loading of 8390.o only in v2.2 - Paul G.
-   Some of these names and comments originated from the Crynwr
-   packet drivers, which are distributed under the GPL. */
-
-#ifndef _8390_h
-#define _8390_h
-
-#include <linux/if_ether.h>
-#include <linux/ioport.h>
-#include <linux/skbuff.h>
-
-#define TX_PAGES 12    /* Two Tx slots */
-
-#define ETHER_ADDR_LEN 6
-
-/* The 8390 specific per-packet-header format. */
-struct e8390_pkt_hdr {
-  unsigned char status; /* status */
-  unsigned char next;   /* pointer to next packet. */
-  unsigned short count; /* header + packet length in bytes */
-};
-
-#ifdef notdef
-extern int ei_debug;
-#else
-#define ei_debug 1
-#endif
-
-#ifdef CONFIG_NET_POLL_CONTROLLER
-extern void ei_poll(struct net_device *dev);
-extern void eip_poll(struct net_device *dev);
-#endif
-
-
-/* Without I/O delay - non ISA or later chips */
-extern void NS8390_init(struct net_device *dev, int startp);
-extern int ei_open(struct net_device *dev);
-extern int ei_close(struct net_device *dev);
-extern irqreturn_t ei_interrupt(int irq, void *dev_id);
-extern void ei_tx_timeout(struct net_device *dev);
-extern int ei_start_xmit(struct sk_buff *skb, struct net_device *dev);
-extern void ei_set_multicast_list(struct net_device *dev);
-extern struct net_device_stats *ei_get_stats(struct net_device *dev);
-
-extern const struct net_device_ops ei_netdev_ops;
-
-extern struct net_device *__alloc_ei_netdev(int size);
-static inline struct net_device *alloc_ei_netdev(void)
-{
-       return __alloc_ei_netdev(0);
-}
-
-/* With I/O delay form */
-extern void NS8390p_init(struct net_device *dev, int startp);
-extern int eip_open(struct net_device *dev);
-extern int eip_close(struct net_device *dev);
-extern irqreturn_t eip_interrupt(int irq, void *dev_id);
-extern void eip_tx_timeout(struct net_device *dev);
-extern int eip_start_xmit(struct sk_buff *skb, struct net_device *dev);
-extern void eip_set_multicast_list(struct net_device *dev);
-extern struct net_device_stats *eip_get_stats(struct net_device *dev);
-
-extern const struct net_device_ops eip_netdev_ops;
-
-extern struct net_device *__alloc_eip_netdev(int size);
-static inline struct net_device *alloc_eip_netdev(void)
-{
-       return __alloc_eip_netdev(0);
-}
-
-/* You have one of these per-board */
-struct ei_device {
-       const char *name;
-       void (*reset_8390)(struct net_device *);
-       void (*get_8390_hdr)(struct net_device *, struct e8390_pkt_hdr *, int);
-       void (*block_output)(struct net_device *, int, const unsigned char *, 
int);
-       void (*block_input)(struct net_device *, int, struct sk_buff *, int);
-       unsigned long rmem_start;
-       unsigned long rmem_end;
-       void __iomem *mem;
-       unsigned char mcfilter[8];
-       unsigned open:1;
-       unsigned word16:1;              /* We have the 16-bit (vs 8-bit) 
version of the card. */
-       unsigned bigendian:1;           /* 16-bit big endian mode. Do NOT */
-                                       /* set this on random 8390 clones! */
-       unsigned txing:1;               /* Transmit Active */
-       unsigned irqlock:1;             /* 8390's intrs disabled when '1'. */
-       unsigned dmaing:1;              /* Remote DMA Active */
-       unsigned char tx_start_page, rx_start_page, stop_page;
-       unsigned char current_page;     /* Read pointer in buffer  */
-       unsigned char interface_num;    /* Net port (AUI, 10bT.) to use. */
-       unsigned char txqueue;          /* Tx Packet buffer queue length. */
-       short tx1, tx2;                 /* Packet lengths for ping-pong tx. */
-       short lasttx;                   /* Alpha version consistency check. */
-       unsigned char reg0;             /* Register '0' in a WD8013 */
-       unsigned char reg5;             /* Register '5' in a WD8013 */
-       unsigned char saved_irq;        /* Original dev->irq value. */
-       u32 *reg_offset;                /* Register mapping table */
-       spinlock_t page_lock;           /* Page register locks */
-       unsigned long priv;             /* Private field to store bus IDs etc. 
*/
-#ifdef AX88796_PLATFORM
-       unsigned char rxcr_base;        /* default value for RXCR */
-#endif
-};
-
-/* The maximum number of 8390 interrupt service routines called per IRQ. */
-#define MAX_SERVICE 12
-
-/* The maximum time waited (in jiffies) before assuming a Tx failed. (20ms) */
-#define TX_TIMEOUT (20*HZ/100)
-
-#define ei_status (*(struct ei_device *)netdev_priv(dev))
-
-/* Some generic ethernet register configurations. */
-#define E8390_TX_IRQ_MASK      0xa     /* For register EN0_ISR */
-#define E8390_RX_IRQ_MASK      0x5
-
-#ifdef AX88796_PLATFORM
-#define E8390_RXCONFIG         (ei_status.rxcr_base | 0x04)
-#define E8390_RXOFF            (ei_status.rxcr_base | 0x20)
-#else
-#define E8390_RXCONFIG         0x4     /* EN0_RXCR: broadcasts, no 
multicast,errors */
-#define E8390_RXOFF            0x20    /* EN0_RXCR: Accept no packets */
-#endif
-
-#define E8390_TXCONFIG         0x00    /* EN0_TXCR: Normal transmit mode */
-#define E8390_TXOFF            0x02    /* EN0_TXCR: Transmitter off */
-
-
-/*  Register accessed at EN_CMD, the 8390 base addr.  */
-#define E8390_STOP     0x01    /* Stop and reset the chip */
-#define E8390_START    0x02    /* Start the chip, clear reset */
-#define E8390_TRANS    0x04    /* Transmit a frame */
-#define E8390_RREAD    0x08    /* Remote read */
-#define E8390_RWRITE   0x10    /* Remote write  */
-#define E8390_NODMA    0x20    /* Remote DMA */
-#define E8390_PAGE0    0x00    /* Select page chip registers */
-#define E8390_PAGE1    0x40    /* using the two high-order bits */
-#define E8390_PAGE2    0x80    /* Page 3 is invalid. */
-
-/*
- *     Only generate indirect loads given a machine that needs them.
- *      - removed AMIGA_PCMCIA from this list, handled as ISA io now
- *     - the _p for generates no delay by default 8390p.c overrides this.
- */
-
-#ifndef ei_inb
-#define ei_inb(_p)     inb(_p)
-#define ei_outb(_v,_p) outb(_v,_p)
-#define ei_inb_p(_p)   inb(_p)
-#define ei_outb_p(_v,_p) outb(_v,_p)
-#endif
-
-#ifndef EI_SHIFT
-#define EI_SHIFT(x)    (x)
-#endif
-
-#define E8390_CMD      EI_SHIFT(0x00)  /* The command register (for all pages) 
*/
-/* Page 0 register offsets. */
-#define EN0_CLDALO     EI_SHIFT(0x01)  /* Low byte of current local dma addr  
RD */
-#define EN0_STARTPG    EI_SHIFT(0x01)  /* Starting page of ring bfr WR */
-#define EN0_CLDAHI     EI_SHIFT(0x02)  /* High byte of current local dma addr  
RD */
-#define EN0_STOPPG     EI_SHIFT(0x02)  /* Ending page +1 of ring bfr WR */
-#define EN0_BOUNDARY   EI_SHIFT(0x03)  /* Boundary page of ring bfr RD WR */
-#define EN0_TSR                EI_SHIFT(0x04)  /* Transmit status reg RD */
-#define EN0_TPSR       EI_SHIFT(0x04)  /* Transmit starting page WR */
-#define EN0_NCR                EI_SHIFT(0x05)  /* Number of collision reg RD */
-#define EN0_TCNTLO     EI_SHIFT(0x05)  /* Low  byte of tx byte count WR */
-#define EN0_FIFO       EI_SHIFT(0x06)  /* FIFO RD */
-#define EN0_TCNTHI     EI_SHIFT(0x06)  /* High byte of tx byte count WR */
-#define EN0_ISR                EI_SHIFT(0x07)  /* Interrupt status reg RD WR */
-#define EN0_CRDALO     EI_SHIFT(0x08)  /* low byte of current remote dma 
address RD */
-#define EN0_RSARLO     EI_SHIFT(0x08)  /* Remote start address reg 0 */
-#define EN0_CRDAHI     EI_SHIFT(0x09)  /* high byte, current remote dma 
address RD */
-#define EN0_RSARHI     EI_SHIFT(0x09)  /* Remote start address reg 1 */
-#define EN0_RCNTLO     EI_SHIFT(0x0a)  /* Remote byte count reg WR */
-#define EN0_RCNTHI     EI_SHIFT(0x0b)  /* Remote byte count reg WR */
-#define EN0_RSR                EI_SHIFT(0x0c)  /* rx status reg RD */
-#define EN0_RXCR       EI_SHIFT(0x0c)  /* RX configuration reg WR */
-#define EN0_TXCR       EI_SHIFT(0x0d)  /* TX configuration reg WR */
-#define EN0_COUNTER0   EI_SHIFT(0x0d)  /* Rcv alignment error counter RD */
-#define EN0_DCFG       EI_SHIFT(0x0e)  /* Data configuration reg WR */
-#define EN0_COUNTER1   EI_SHIFT(0x0e)  /* Rcv CRC error counter RD */
-#define EN0_IMR                EI_SHIFT(0x0f)  /* Interrupt mask reg WR */
-#define EN0_COUNTER2   EI_SHIFT(0x0f)  /* Rcv missed frame error counter RD */
-
-/* Bits in EN0_ISR - Interrupt status register */
-#define ENISR_RX       0x01    /* Receiver, no error */
-#define ENISR_TX       0x02    /* Transmitter, no error */
-#define ENISR_RX_ERR   0x04    /* Receiver, with error */
-#define ENISR_TX_ERR   0x08    /* Transmitter, with error */
-#define ENISR_OVER     0x10    /* Receiver overwrote the ring */
-#define ENISR_COUNTERS 0x20    /* Counters need emptying */
-#define ENISR_RDC      0x40    /* remote dma complete */
-#define ENISR_RESET    0x80    /* Reset completed */
-#define ENISR_ALL      0x3f    /* Interrupts we will enable */
-
-/* Bits in EN0_DCFG - Data config register */
-#define ENDCFG_WTS     0x01    /* word transfer mode selection */
-#define ENDCFG_BOS     0x02    /* byte order selection */
-
-/* Page 1 register offsets. */
-#define EN1_PHYS   EI_SHIFT(0x01)      /* This board's physical enet addr RD 
WR */
-#define EN1_PHYS_SHIFT(i)  EI_SHIFT(i+1) /* Get and set mac address */
-#define EN1_CURPAG EI_SHIFT(0x07)      /* Current memory page RD WR */
-#define EN1_MULT   EI_SHIFT(0x08)      /* Multicast filter mask array (8 
bytes) RD WR */
-#define EN1_MULT_SHIFT(i)  EI_SHIFT(8+i) /* Get and set multicast filter */
-
-/* Bits in received packet status byte and EN0_RSR*/
-#define ENRSR_RXOK     0x01    /* Received a good packet */
-#define ENRSR_CRC      0x02    /* CRC error */
-#define ENRSR_FAE      0x04    /* frame alignment error */
-#define ENRSR_FO       0x08    /* FIFO overrun */
-#define ENRSR_MPA      0x10    /* missed pkt */
-#define ENRSR_PHY      0x20    /* physical/multicast address */
-#define ENRSR_DIS      0x40    /* receiver disable. set in monitor mode */
-#define ENRSR_DEF      0x80    /* deferring */
-
-/* Transmitted packet status, EN0_TSR. */
-#define ENTSR_PTX 0x01 /* Packet transmitted without error */
-#define ENTSR_ND  0x02 /* The transmit wasn't deferred. */
-#define ENTSR_COL 0x04 /* The transmit collided at least once. */
-#define ENTSR_ABT 0x08  /* The transmit collided 16 times, and was deferred. */
-#define ENTSR_CRS 0x10 /* The carrier sense was lost. */
-#define ENTSR_FU  0x20  /* A "FIFO underrun" occurred during transmit. */
-#define ENTSR_CDH 0x40 /* The collision detect "heartbeat" signal was lost. */
-#define ENTSR_OWC 0x80  /* There was an out-of-window collision. */
-
-#endif /* _8390_h */
diff --git a/dde_ne2k_pci/Makeconf.local b/dde_ne2k_pci/Makeconf.local
deleted file mode 100644
index 130c8cc..0000000
--- a/dde_ne2k_pci/Makeconf.local
+++ /dev/null
@@ -1,17 +0,0 @@
-SYSTEMS = x86-l4v2
-ARCH = x86
-SYSTEM = x86-l4v2
-
-BUILDDIR       ?= ..
-
-libmachdev_path := -L$(BUILDDIR)/libmachdev -lmachdev
-libddekit_path := -L$(BUILDDIR)/libddekit -lddekit
-libslab_path := -L$(BUILDDIR)/libhurd-slab -lhurd-slab
-libbpf_path := -L$(BUILDDIR)/libbpf -lbpf
-
-DDEKITLIBDIR = $(PKGDIR)/../libddekit/
-DDEKITINCDIR = $(PKGDIR)/../libddekit/include
-DDE26LIBDIR = $(PKGDIR)/lib/src
-OBJ_BASE = $(PKGDIR)/build
-
-L4LIBDIR = .
diff --git a/dde_ne2k_pci/Makefile b/dde_ne2k_pci/Makefile
deleted file mode 100644
index 932d5ad..0000000
--- a/dde_ne2k_pci/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-PKGDIR        ?= ../libdde_linux26
-L4DIR         ?= $(PKGDIR)
-
-SYSTEMS        = x86-l4v2
-
-include Makeconf.local
-
-TARGET         = dde_ne2k_pci
-
-SRC_C          = main.c ne2k-pci.c 8390.c
-
-LIBS          += $(libmachdev_path) -ldde_linux26.o -ldde_linux26_net 
$(libddekit_path) -lfshelp -ltrivfs -lpciaccess -lz -lpthread -lshouldbeinlibc 
-lports $(libslab_path) $(libbpf_path)
-CFLAGS        += -g -I$(PKGDIR)/include -I$(BUILDDIR)/include
-
-# DDE configuration
-include $(L4DIR)/Makeconf
-
-include $(L4DIR)/mk/prog.mk
diff --git a/dde_ne2k_pci/default.ld b/dde_ne2k_pci/default.ld
deleted file mode 100644
index f8e4e28..0000000
--- a/dde_ne2k_pci/default.ld
+++ /dev/null
@@ -1,213 +0,0 @@
-/* Script for -z combreloc: combine and sort reloc sections */
-OUTPUT_FORMAT("elf32-i386", "elf32-i386",
-             "elf32-i386")
-OUTPUT_ARCH(i386)
-ENTRY(_start)
-SEARCH_DIR("/usr/i486-gnu/lib"); SEARCH_DIR("/usr/local/lib"); 
SEARCH_DIR("/lib"); SEARCH_DIR("/usr/lib");
-SECTIONS
-{
-  /* Read-only sections, merged into text segment: */
-  PROVIDE (__executable_start = 0x08048000); . = 0x08048000 + SIZEOF_HEADERS;
-  .interp         : { *(.interp) }
-  .note.gnu.build-id : { *(.note.gnu.build-id) }
-  .hash           : { *(.hash) }
-  .gnu.hash       : { *(.gnu.hash) }
-  .dynsym         : { *(.dynsym) }
-  .dynstr         : { *(.dynstr) }
-  .gnu.version    : { *(.gnu.version) }
-  .gnu.version_d  : { *(.gnu.version_d) }
-  .gnu.version_r  : { *(.gnu.version_r) }
-  .rel.dyn        :
-    {
-      *(.rel.init)
-      *(.rel.text .rel.text.* .rel.gnu.linkonce.t.*)
-      *(.rel.fini)
-      *(.rel.rodata .rel.rodata.* .rel.gnu.linkonce.r.*)
-      *(.rel.data.rel.ro* .rel.gnu.linkonce.d.rel.ro.*)
-      *(.rel.data .rel.data.* .rel.gnu.linkonce.d.*)
-      *(.rel.tdata .rel.tdata.* .rel.gnu.linkonce.td.*)
-      *(.rel.tbss .rel.tbss.* .rel.gnu.linkonce.tb.*)
-      *(.rel.ctors)
-      *(.rel.dtors)
-      *(.rel.got)
-      *(.rel.bss .rel.bss.* .rel.gnu.linkonce.b.*)
-    }
-  .rela.dyn       :
-    {
-      *(.rela.init)
-      *(.rela.text .rela.text.* .rela.gnu.linkonce.t.*)
-      *(.rela.fini)
-      *(.rela.rodata .rela.rodata.* .rela.gnu.linkonce.r.*)
-      *(.rela.data .rela.data.* .rela.gnu.linkonce.d.*)
-      *(.rela.tdata .rela.tdata.* .rela.gnu.linkonce.td.*)
-      *(.rela.tbss .rela.tbss.* .rela.gnu.linkonce.tb.*)
-      *(.rela.ctors)
-      *(.rela.dtors)
-      *(.rela.got)
-      *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*)
-    }
-  .rel.plt        : { *(.rel.plt) }
-  .rela.plt       : { *(.rela.plt) }
-  .init           :
-  {
-    KEEP (*(.init))
-  } =0x90909090
-  .plt            : { *(.plt) }
-  .text           :
-  {
-    *(.text .stub .text.* .gnu.linkonce.t.*)
-    KEEP (*(.text.*personality*))
-    /* .gnu.warning sections are handled specially by elf32.em.  */
-    *(.gnu.warning)
-  } =0x90909090
-  .fini           :
-  {
-    KEEP (*(.fini))
-  } =0x90909090
-  PROVIDE (__etext = .);
-  PROVIDE (_etext = .);
-  PROVIDE (etext = .);
-  .rodata         : { *(.rodata .rodata.* .gnu.linkonce.r.*) }
-  .rodata1        : { *(.rodata1) }
-  .eh_frame_hdr : { *(.eh_frame_hdr) }
-  .eh_frame       : ONLY_IF_RO { KEEP (*(.eh_frame)) }
-  .gcc_except_table   : ONLY_IF_RO { *(.gcc_except_table .gcc_except_table.*) }
-  /* Adjust the address for the data segment.  We want to adjust up to
-     the same address within the page on the next page up.  */
-  . = ALIGN (CONSTANT (MAXPAGESIZE)) - ((CONSTANT (MAXPAGESIZE) - .) & 
(CONSTANT (MAXPAGESIZE) - 1)); . = DATA_SEGMENT_ALIGN (CONSTANT (MAXPAGESIZE), 
CONSTANT (COMMONPAGESIZE));
-  /* Exception handling  */
-  .eh_frame       : ONLY_IF_RW { KEEP (*(.eh_frame)) }
-  .gcc_except_table   : ONLY_IF_RW { *(.gcc_except_table .gcc_except_table.*) }
-  /* Thread Local Storage sections  */
-  .tdata         : { *(.tdata .tdata.* .gnu.linkonce.td.*) }
-  .tbss                  : { *(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon) }
-  .preinit_array     :
-  {
-    PROVIDE_HIDDEN (__preinit_array_start = .);
-    KEEP (*(.preinit_array))
-    PROVIDE_HIDDEN (__preinit_array_end = .);
-  }
-  .init_array     :
-  {
-     PROVIDE_HIDDEN (__init_array_start = .);
-     KEEP (*(SORT(.init_array.*)))
-     KEEP (*(.init_array))
-     PROVIDE_HIDDEN (__init_array_end = .);
-  }
-  .fini_array     :
-  {
-    PROVIDE_HIDDEN (__fini_array_start = .);
-    KEEP (*(.fini_array))
-    KEEP (*(SORT(.fini_array.*)))
-    PROVIDE_HIDDEN (__fini_array_end = .);
-  }
-  .ctors          :
-  {
-    /* gcc uses crtbegin.o to find the start of
-       the constructors, so we make sure it is
-       first.  Because this is a wildcard, it
-       doesn't matter if the user does not
-       actually link against crtbegin.o; the
-       linker won't look for a file to match a
-       wildcard.  The wildcard also means that it
-       doesn't matter which directory crtbegin.o
-       is in.  */
-    KEEP (*crtbegin.o(.ctors))
-    KEEP (*crtbegin?.o(.ctors))
-    /* We don't want to include the .ctor section from
-       the crtend.o file until after the sorted ctors.
-       The .ctor section from the crtend file contains the
-       end of ctors marker and it must be last */
-    KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o ) .ctors))
-
-    KEEP (*(SORT(.ctors.*)))
-    KEEP (*(.ctors))
-
-    KEEP (*(.mark_beg_l4dde_ctors))
-    KEEP (*(SORT(.l4dde_ctors.?)))
-    KEEP (*(SORT(.l4dde_ctors.??)))
-    KEEP (*(SORT(.l4dde_ctors.???)))
-    KEEP (*(SORT(.l4dde_ctors.????)))
-    KEEP (*(SORT(.l4dde_ctors.?????)))
-    KEEP (*(.l4dde_ctors))
-    KEEP (*(.mark_end_l4dde_ctors))
-  }
-  .dtors          :
-  {
-    KEEP (*crtbegin.o(.dtors))
-    KEEP (*crtbegin?.o(.dtors))
-    KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o ) .dtors))
-    KEEP (*(SORT(.dtors.*)))
-    KEEP (*(.dtors))
-  }
-  .jcr            : { KEEP (*(.jcr)) }
-  .data.rel.ro : { *(.data.rel.ro.local* .gnu.linkonce.d.rel.ro.local.*) 
*(.data.rel.ro* .gnu.linkonce.d.rel.ro.*) }
-  .dynamic        : { *(.dynamic) }
-  .got            : { *(.got) }
-  . = DATA_SEGMENT_RELRO_END (12, .);
-  .got.plt        : { *(.got.plt) }
-  .data           :
-  {
-    *(.data .data.* .gnu.linkonce.d.*)
-    KEEP (*(.gnu.linkonce.d.*personality*))
-    SORT(CONSTRUCTORS)
-  }
-  .data1          : { *(.data1) }
-  _edata = .; PROVIDE (edata = .);
-  __bss_start = .;
-  .bss            :
-  {
-   *(.dynbss)
-   *(.bss .bss.* .gnu.linkonce.b.*)
-   *(COMMON)
-   /* Align here to ensure that the .bss section occupies space up to
-      _end.  Align after .bss to ensure correct alignment even if the
-      .bss section disappears because there are no input sections.
-      FIXME: Why do we need it? When there is no .bss section, we don't
-      pad the .data section.  */
-   . = ALIGN(. != 0 ? 32 / 8 : 1);
-  }
-  . = ALIGN(32 / 8);
-  . = ALIGN(32 / 8);
-  _end = .; PROVIDE (end = .);
-  . = DATA_SEGMENT_END (.);
-  /* Stabs debugging sections.  */
-  .stab          0 : { *(.stab) }
-  .stabstr       0 : { *(.stabstr) }
-  .stab.excl     0 : { *(.stab.excl) }
-  .stab.exclstr  0 : { *(.stab.exclstr) }
-  .stab.index    0 : { *(.stab.index) }
-  .stab.indexstr 0 : { *(.stab.indexstr) }
-  .comment       0 : { *(.comment) }
-  /* DWARF debug sections.
-     Symbols in the DWARF debugging sections are relative to the beginning
-     of the section so we begin them at 0.  */
-  /* DWARF 1 */
-  .debug          0 : { *(.debug) }
-  .line           0 : { *(.line) }
-  /* GNU DWARF 1 extensions */
-  .debug_srcinfo  0 : { *(.debug_srcinfo) }
-  .debug_sfnames  0 : { *(.debug_sfnames) }
-  /* DWARF 1.1 and DWARF 2 */
-  .debug_aranges  0 : { *(.debug_aranges) }
-  .debug_pubnames 0 : { *(.debug_pubnames) }
-  /* DWARF 2 */
-  .debug_info     0 : { *(.debug_info .gnu.linkonce.wi.*) }
-  .debug_abbrev   0 : { *(.debug_abbrev) }
-  .debug_line     0 : { *(.debug_line) }
-  .debug_frame    0 : { *(.debug_frame) }
-  .debug_str      0 : { *(.debug_str) }
-  .debug_loc      0 : { *(.debug_loc) }
-  .debug_macinfo  0 : { *(.debug_macinfo) }
-  /* SGI/MIPS DWARF 2 extensions */
-  .debug_weaknames 0 : { *(.debug_weaknames) }
-  .debug_funcnames 0 : { *(.debug_funcnames) }
-  .debug_typenames 0 : { *(.debug_typenames) }
-  .debug_varnames  0 : { *(.debug_varnames) }
-  /* DWARF 3 */
-  .debug_pubtypes 0 : { *(.debug_pubtypes) }
-  .debug_ranges   0 : { *(.debug_ranges) }
-  .gnu.attributes 0 : { KEEP (*(.gnu.attributes)) }
-  /DISCARD/ : { *(.note.GNU-stack) *(.gnu_debuglink) }
-}
-
diff --git a/dde_ne2k_pci/lib8390.c b/dde_ne2k_pci/lib8390.c
deleted file mode 100644
index 3190a6a..0000000
--- a/dde_ne2k_pci/lib8390.c
+++ /dev/null
@@ -1,1126 +0,0 @@
-/* 8390.c: A general NS8390 ethernet driver core for linux. */
-/*
-       Written 1992-94 by Donald Becker.
-
-       Copyright 1993 United States Government as represented by the
-       Director, National Security Agency.
-
-       This software may be used and distributed according to the terms
-       of the GNU General Public License, incorporated herein by reference.
-
-       The author may be reached as address@hidden, or C/O
-       Scyld Computing Corporation
-       410 Severn Ave., Suite 210
-       Annapolis MD 21403
-
-
-  This is the chip-specific code for many 8390-based ethernet adaptors.
-  This is not a complete driver, it must be combined with board-specific
-  code such as ne.c, wd.c, 3c503.c, etc.
-
-  Seeing how at least eight drivers use this code, (not counting the
-  PCMCIA ones either) it is easy to break some card by what seems like
-  a simple innocent change. Please contact me or Donald if you think
-  you have found something that needs changing. -- PG
-
-
-  Changelog:
-
-  Paul Gortmaker       : remove set_bit lock, other cleanups.
-  Paul Gortmaker       : add ei_get_8390_hdr() so we can pass skb's to
-                         ei_block_input() for eth_io_copy_and_sum().
-  Paul Gortmaker       : exchange static int ei_pingpong for a #define,
-                         also add better Tx error handling.
-  Paul Gortmaker       : rewrite Rx overrun handling as per NS specs.
-  Alexey Kuznetsov     : use the 8390's six bit hash multicast filter.
-  Paul Gortmaker       : tweak ANK's above multicast changes a bit.
-  Paul Gortmaker       : update packet statistics for v2.1.x
-  Alan Cox             : support arbitary stupid port mappings on the
-                         68K Macintosh. Support >16bit I/O spaces
-  Paul Gortmaker       : add kmod support for auto-loading of the 8390
-                         module by all drivers that require it.
-  Alan Cox             : Spinlocking work, added 'BUG_83C690'
-  Paul Gortmaker       : Separate out Tx timeout code from Tx path.
-  Paul Gortmaker       : Remove old unused single Tx buffer code.
-  Hayato Fujiwara      : Add m32r support.
-  Paul Gortmaker       : use skb_padto() instead of stack scratch area
-
-  Sources:
-  The National Semiconductor LAN Databook, and the 3Com 3c503 databook.
-
-  */
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/jiffies.h>
-#include <linux/fs.h>
-#include <linux/types.h>
-#include <linux/string.h>
-#include <linux/bitops.h>
-#include <asm/system.h>
-#include <asm/uaccess.h>
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <linux/delay.h>
-#include <linux/errno.h>
-#include <linux/fcntl.h>
-#include <linux/in.h>
-#include <linux/interrupt.h>
-#include <linux/init.h>
-#include <linux/crc32.h>
-
-#include <linux/netdevice.h>
-#include <linux/etherdevice.h>
-
-#define NS8390_CORE
-#include "8390.h"
-#include <ddekit/timer.h>
-
-#define BUG_83C690
-
-/* These are the operational function interfaces to board-specific
-   routines.
-       void reset_8390(struct net_device *dev)
-               Resets the board associated with DEV, including a hardware 
reset of
-               the 8390.  This is only called when there is a transmit 
timeout, and
-               it is always followed by 8390_init().
-       void block_output(struct net_device *dev, int count, const unsigned 
char *buf,
-                                         int start_page)
-               Write the COUNT bytes of BUF to the packet buffer at 
START_PAGE.  The
-               "page" value uses the 8390's 256-byte pages.
-       void get_8390_hdr(struct net_device *dev, struct e8390_hdr *hdr, int 
ring_page)
-               Read the 4 byte, page aligned 8390 header. *If* there is a
-               subsequent read, it will be of the rest of the packet.
-       void block_input(struct net_device *dev, int count, struct sk_buff 
*skb, int ring_offset)
-               Read COUNT bytes from the packet buffer into the skb data area. 
Start
-               reading from RING_OFFSET, the address as the 8390 sees it.  
This will always
-               follow the read of the 8390 header.
-*/
-#define ei_reset_8390 (ei_local->reset_8390)
-#define ei_block_output (ei_local->block_output)
-#define ei_block_input (ei_local->block_input)
-#define ei_get_8390_hdr (ei_local->get_8390_hdr)
-
-/* use 0 for production, 1 for verification, >2 for debug */
-#ifndef ei_debug
-int ei_debug = 1;
-#endif
-
-/* Index to functions. */
-static void ei_tx_intr(struct net_device *dev);
-static void ei_tx_err(struct net_device *dev);
-void ei_tx_timeout(struct net_device *dev);
-static void ei_receive(struct net_device *dev);
-static void ei_rx_overrun(struct net_device *dev);
-
-/* Routines generic to NS8390-based boards. */
-static void NS8390_trigger_send(struct net_device *dev, unsigned int length,
-                                                               int start_page);
-static void do_set_multicast_list(struct net_device *dev);
-static void __NS8390_init(struct net_device *dev, int startp);
-
-/*
- *     SMP and the 8390 setup.
- *
- *     The 8390 isnt exactly designed to be multithreaded on RX/TX. There is
- *     a page register that controls bank and packet buffer access. We guard
- *     this with ei_local->page_lock. Nobody should assume or set the page 
other
- *     than zero when the lock is not held. Lock holders must restore page 0
- *     before unlocking. Even pure readers must take the lock to protect in
- *     page 0.
- *
- *     To make life difficult the chip can also be very slow. We therefore 
can't
- *     just use spinlocks. For the longer lockups we disable the irq the device
- *     sits on and hold the lock. We must hold the lock because there is a dual
- *     processor case other than interrupts (get stats/set multicast list in
- *     parallel with each other and transmit).
- *
- *     Note: in theory we can just disable the irq on the card _but_ there is
- *     a latency on SMP irq delivery. So we can easily go "disable irq" "sync 
irqs"
- *     enter lock, take the queued irq. So we waddle instead of flying.
- *
- *     Finally by special arrangement for the purpose of being generally
- *     annoying the transmit function is called bh atomic. That places
- *     restrictions on the user context callers as disable_irq won't save
- *     them.
- *
- *     Additional explanation of problems with locking by Alan Cox:
- *
- *     "The author (me) didn't use spin_lock_irqsave because the slowness of 
the
- *     card means that approach caused horrible problems like losing serial 
data
- *     at 38400 baud on some chips. Remember many 8390 nics on PCI were ISA
- *     chips with FPGA front ends.
- *
- *     Ok the logic behind the 8390 is very simple:
- *
- *     Things to know
- *             - IRQ delivery is asynchronous to the PCI bus
- *             - Blocking the local CPU IRQ via spin locks was too slow
- *             - The chip has register windows needing locking work
- *
- *     So the path was once (I say once as people appear to have changed it
- *     in the mean time and it now looks rather bogus if the changes to use
- *     disable_irq_nosync_irqsave are disabling the local IRQ)
- *
- *
- *             Take the page lock
- *             Mask the IRQ on chip
- *             Disable the IRQ (but not mask locally- someone seems to have
- *                     broken this with the lock validator stuff)
- *                     [This must be _nosync as the page lock may otherwise
- *                             deadlock us]
- *             Drop the page lock and turn IRQs back on
- *
- *             At this point an existing IRQ may still be running but we can't
- *             get a new one
- *
- *             Take the lock (so we know the IRQ has terminated) but don't mask
- *     the IRQs on the processor
- *             Set irqlock [for debug]
- *
- *             Transmit (slow as ****)
- *
- *             re-enable the IRQ
- *
- *
- *     We have to use disable_irq because otherwise you will get delayed
- *     interrupts on the APIC bus deadlocking the transmit path.
- *
- *     Quite hairy but the chip simply wasn't designed for SMP and you can't
- *     even ACK an interrupt without risking corrupting other parallel
- *     activities on the chip." [lkml, 25 Jul 2007]
- */
-
-
-
-/**
- * ei_open - Open/initialize the board.
- * @dev: network device to initialize
- *
- * This routine goes all-out, setting everything
- * up anew at each open, even though many of these registers should only
- * need to be set once at boot.
- */
-static int __ei_open(struct net_device *dev)
-{
-       unsigned long flags;
-       struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev);
-
-       if (dev->watchdog_timeo <= 0)
-                dev->watchdog_timeo = TX_TIMEOUT;
-
-       /*
-        *      Grab the page lock so we own the register set, then call
-        *      the init function.
-        */
-
-       spin_lock_irqsave(&ei_local->page_lock, flags);
-       __NS8390_init(dev, 1);
-       /* Set the flag before we drop the lock, That way the IRQ arrives
-          after its set and we get no silly warnings */
-       netif_start_queue(dev);
-       spin_unlock_irqrestore(&ei_local->page_lock, flags);
-       ei_local->irqlock = 0;
-       return 0;
-}
-
-/**
- * ei_close - shut down network device
- * @dev: network device to close
- *
- * Opposite of ei_open(). Only used when "ifconfig <devname> down" is done.
- */
-static int __ei_close(struct net_device *dev)
-{
-       struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev);
-       unsigned long flags;
-
-       /*
-        *      Hold the page lock during close
-        */
-
-       spin_lock_irqsave(&ei_local->page_lock, flags);
-       __NS8390_init(dev, 0);
-       spin_unlock_irqrestore(&ei_local->page_lock, flags);
-       netif_stop_queue(dev);
-       return 0;
-}
-
-/**
- * ei_tx_timeout - handle transmit time out condition
- * @dev: network device which has apparently fallen asleep
- *
- * Called by kernel when device never acknowledges a transmit has
- * completed (or failed) - i.e. never posted a Tx related interrupt.
- */
-
-static void __ei_tx_timeout(struct net_device *dev)
-{
-       unsigned long e8390_base = dev->base_addr;
-       struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev);
-       int txsr, isr, tickssofar = jiffies - dev->trans_start;
-       unsigned long flags;
-
-       dev->stats.tx_errors++;
-
-       spin_lock_irqsave(&ei_local->page_lock, flags);
-       txsr = ei_inb(e8390_base+EN0_TSR);
-       isr = ei_inb(e8390_base+EN0_ISR);
-       spin_unlock_irqrestore(&ei_local->page_lock, flags);
-
-       printk(KERN_DEBUG "%s: Tx timed out, %s TSR=%#2x, ISR=%#2x, t=%d.\n",
-               dev->name, (txsr & ENTSR_ABT) ? "excess collisions." :
-               (isr) ? "lost interrupt?" : "cable problem?", txsr, isr, 
tickssofar);
-
-       if (!isr && !dev->stats.tx_packets)
-       {
-               /* The 8390 probably hasn't gotten on the cable yet. */
-               ei_local->interface_num ^= 1;   /* Try a different xcvr.  */
-       }
-
-       /* Ugly but a reset can be slow, yet must be protected */
-
-       disable_irq_nosync_lockdep(dev->irq);
-       spin_lock(&ei_local->page_lock);
-
-       /* Try to restart the card.  Perhaps the user has fixed something. */
-       ei_reset_8390(dev);
-       __NS8390_init(dev, 1);
-
-       spin_unlock(&ei_local->page_lock);
-       enable_irq_lockdep(dev->irq);
-       netif_wake_queue(dev);
-}
-
-/**
- * ei_start_xmit - begin packet transmission
- * @skb: packet to be sent
- * @dev: network device to which packet is sent
- *
- * Sends a packet to an 8390 network device.
- */
-
-static int __ei_start_xmit(struct sk_buff *skb, struct net_device *dev)
-{
-       unsigned long e8390_base = dev->base_addr;
-       struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev);
-       int send_length = skb->len, output_page;
-       unsigned long flags;
-       char buf[ETH_ZLEN];
-       char *data = skb->data;
-
-       if (skb->len < ETH_ZLEN) {
-               memset(buf, 0, ETH_ZLEN);       /* more efficient than doing 
just the needed bits */
-               memcpy(buf, data, skb->len);
-               send_length = ETH_ZLEN;
-               data = buf;
-       }
-
-       /* Mask interrupts from the ethercard.
-          SMP: We have to grab the lock here otherwise the IRQ handler
-          on another CPU can flip window and race the IRQ mask set. We end
-          up trashing the mcast filter not disabling irqs if we don't lock */
-
-       spin_lock_irqsave(&ei_local->page_lock, flags);
-       ei_outb_p(0x00, e8390_base + EN0_IMR);
-       spin_unlock_irqrestore(&ei_local->page_lock, flags);
-
-
-       /*
-        *      Slow phase with lock held.
-        */
-
-       disable_irq_nosync_lockdep_irqsave(dev->irq, &flags);
-
-       spin_lock(&ei_local->page_lock);
-
-       ei_local->irqlock = 1;
-
-       /*
-        * We have two Tx slots available for use. Find the first free
-        * slot, and then perform some sanity checks. With two Tx bufs,
-        * you get very close to transmitting back-to-back packets. With
-        * only one Tx buf, the transmitter sits idle while you reload the
-        * card, leaving a substantial gap between each transmitted packet.
-        */
-
-       if (ei_local->tx1 == 0)
-       {
-               output_page = ei_local->tx_start_page;
-               ei_local->tx1 = send_length;
-               if (ei_debug  &&  ei_local->tx2 > 0)
-                       printk(KERN_DEBUG "%s: idle transmitter tx2=%d, 
lasttx=%d, txing=%d.\n",
-                               dev->name, ei_local->tx2, ei_local->lasttx, 
ei_local->txing);
-       }
-       else if (ei_local->tx2 == 0)
-       {
-               output_page = ei_local->tx_start_page + TX_PAGES/2;
-               ei_local->tx2 = send_length;
-               if (ei_debug  &&  ei_local->tx1 > 0)
-                       printk(KERN_DEBUG "%s: idle transmitter, tx1=%d, 
lasttx=%d, txing=%d.\n",
-                               dev->name, ei_local->tx1, ei_local->lasttx, 
ei_local->txing);
-       }
-       else
-       {       /* We should never get here. */
-               if (ei_debug)
-                       printk(KERN_DEBUG "%s: No Tx buffers free! tx1=%d 
tx2=%d last=%d\n",
-                               dev->name, ei_local->tx1, ei_local->tx2, 
ei_local->lasttx);
-               ei_local->irqlock = 0;
-               netif_stop_queue(dev);
-               ei_outb_p(ENISR_ALL, e8390_base + EN0_IMR);
-               spin_unlock(&ei_local->page_lock);
-               enable_irq_lockdep_irqrestore(dev->irq, &flags);
-               dev->stats.tx_errors++;
-               return 1;
-       }
-
-       /*
-        * Okay, now upload the packet and trigger a send if the transmitter
-        * isn't already sending. If it is busy, the interrupt handler will
-        * trigger the send later, upon receiving a Tx done interrupt.
-        */
-
-       ei_block_output(dev, send_length, data, output_page);
-
-       if (! ei_local->txing)
-       {
-               ei_local->txing = 1;
-               NS8390_trigger_send(dev, send_length, output_page);
-               dev->trans_start = jiffies;
-               if (output_page == ei_local->tx_start_page)
-               {
-                       ei_local->tx1 = -1;
-                       ei_local->lasttx = -1;
-               }
-               else
-               {
-                       ei_local->tx2 = -1;
-                       ei_local->lasttx = -2;
-               }
-       }
-       else ei_local->txqueue++;
-
-       if (ei_local->tx1  &&  ei_local->tx2)
-               netif_stop_queue(dev);
-       else
-               netif_start_queue(dev);
-
-       /* Turn 8390 interrupts back on. */
-       ei_local->irqlock = 0;
-       ei_outb_p(ENISR_ALL, e8390_base + EN0_IMR);
-
-       spin_unlock(&ei_local->page_lock);
-       enable_irq_lockdep_irqrestore(dev->irq, &flags);
-
-       dev_kfree_skb (skb);
-       dev->stats.tx_bytes += send_length;
-
-       return 0;
-}
-
-/**
- * ei_interrupt - handle the interrupts from an 8390
- * @irq: interrupt number
- * @dev_id: a pointer to the net_device
- *
- * Handle the ether interface interrupts. We pull packets from
- * the 8390 via the card specific functions and fire them at the networking
- * stack. We also handle transmit completions and wake the transmit path if
- * necessary. We also update the counters and do other housekeeping as
- * needed.
- */
-
-static irqreturn_t __ei_interrupt(int irq, void *dev_id)
-{
-       struct net_device *dev = dev_id;
-       unsigned long e8390_base = dev->base_addr;
-       int interrupts, nr_serviced = 0;
-       struct ei_device *ei_local = netdev_priv(dev);
-
-       /*
-        *      Protect the irq test too.
-        */
-
-       spin_lock(&ei_local->page_lock);
-
-       if (ei_local->irqlock)
-       {
-#if 1 /* This might just be an interrupt for a PCI device sharing this line */
-               /* The "irqlock" check is only for testing. */
-               printk(ei_local->irqlock
-                          ? "%s: Interrupted while interrupts are masked! 
isr=%#2x imr=%#2x.\n"
-                          : "%s: Reentering the interrupt handler! isr=%#2x 
imr=%#2x.\n",
-                          dev->name, ei_inb_p(e8390_base + EN0_ISR),
-                          ei_inb_p(e8390_base + EN0_IMR));
-#endif
-               spin_unlock(&ei_local->page_lock);
-               return IRQ_NONE;
-       }
-
-       /* Change to page 0 and read the intr status reg. */
-       ei_outb_p(E8390_NODMA+E8390_PAGE0, e8390_base + E8390_CMD);
-       if (ei_debug > 3)
-               printk(KERN_DEBUG "%s: interrupt(isr=%#2.2x).\n", dev->name,
-                          ei_inb_p(e8390_base + EN0_ISR));
-
-       /* !!Assumption!! -- we stay in page 0.  Don't break this. */
-       while ((interrupts = ei_inb_p(e8390_base + EN0_ISR)) != 0
-                  && ++nr_serviced < MAX_SERVICE)
-       {
-               if (!netif_running(dev)) {
-                       printk(KERN_WARNING "%s: interrupt from stopped 
card\n", dev->name);
-                       /* rmk - acknowledge the interrupts */
-                       ei_outb_p(interrupts, e8390_base + EN0_ISR);
-                       interrupts = 0;
-                       break;
-               }
-               if (interrupts & ENISR_OVER)
-                       ei_rx_overrun(dev);
-               else if (interrupts & (ENISR_RX+ENISR_RX_ERR))
-               {
-                       /* Got a good (?) packet. */
-                       ei_receive(dev);
-               }
-               /* Push the next to-transmit packet through. */
-               if (interrupts & ENISR_TX)
-                       ei_tx_intr(dev);
-               else if (interrupts & ENISR_TX_ERR)
-                       ei_tx_err(dev);
-
-               if (interrupts & ENISR_COUNTERS)
-               {
-                       dev->stats.rx_frame_errors += ei_inb_p(e8390_base + 
EN0_COUNTER0);
-                       dev->stats.rx_crc_errors   += ei_inb_p(e8390_base + 
EN0_COUNTER1);
-                       dev->stats.rx_missed_errors+= ei_inb_p(e8390_base + 
EN0_COUNTER2);
-                       ei_outb_p(ENISR_COUNTERS, e8390_base + EN0_ISR); /* Ack 
intr. */
-               }
-
-               /* Ignore any RDC interrupts that make it back to here. */
-               if (interrupts & ENISR_RDC)
-               {
-                       ei_outb_p(ENISR_RDC, e8390_base + EN0_ISR);
-               }
-
-               ei_outb_p(E8390_NODMA+E8390_PAGE0+E8390_START, e8390_base + 
E8390_CMD);
-       }
-
-       if (interrupts && ei_debug)
-       {
-               ei_outb_p(E8390_NODMA+E8390_PAGE0+E8390_START, e8390_base + 
E8390_CMD);
-               if (nr_serviced >= MAX_SERVICE)
-               {
-                       /* 0xFF is valid for a card removal */
-                       if(interrupts!=0xFF)
-                               printk(KERN_WARNING "%s: Too much work at 
interrupt, status %#2.2x\n",
-                                  dev->name, interrupts);
-                       ei_outb_p(ENISR_ALL, e8390_base + EN0_ISR); /* Ack. 
most intrs. */
-               } else {
-                       printk(KERN_WARNING "%s: unknown interrupt %#2x\n", 
dev->name, interrupts);
-                       ei_outb_p(0xff, e8390_base + EN0_ISR); /* Ack. all 
intrs. */
-               }
-       }
-       spin_unlock(&ei_local->page_lock);
-       return IRQ_RETVAL(nr_serviced > 0);
-}
-
-#ifdef CONFIG_NET_POLL_CONTROLLER
-static void __ei_poll(struct net_device *dev)
-{
-       disable_irq(dev->irq);
-       __ei_interrupt(dev->irq, dev);
-       enable_irq(dev->irq);
-}
-#endif
-
-/**
- * ei_tx_err - handle transmitter error
- * @dev: network device which threw the exception
- *
- * A transmitter error has happened. Most likely excess collisions (which
- * is a fairly normal condition). If the error is one where the Tx will
- * have been aborted, we try and send another one right away, instead of
- * letting the failed packet sit and collect dust in the Tx buffer. This
- * is a much better solution as it avoids kernel based Tx timeouts, and
- * an unnecessary card reset.
- *
- * Called with lock held.
- */
-
-static void ei_tx_err(struct net_device *dev)
-{
-       unsigned long e8390_base = dev->base_addr;
-       /* ei_local is used on some platforms via the EI_SHIFT macro */
-       struct ei_device *ei_local __maybe_unused = netdev_priv(dev);
-       unsigned char txsr = ei_inb_p(e8390_base+EN0_TSR);
-       unsigned char tx_was_aborted = txsr & (ENTSR_ABT+ENTSR_FU);
-
-#ifdef VERBOSE_ERROR_DUMP
-       printk(KERN_DEBUG "%s: transmitter error (%#2x): ", dev->name, txsr);
-       if (txsr & ENTSR_ABT)
-               printk("excess-collisions ");
-       if (txsr & ENTSR_ND)
-               printk("non-deferral ");
-       if (txsr & ENTSR_CRS)
-               printk("lost-carrier ");
-       if (txsr & ENTSR_FU)
-               printk("FIFO-underrun ");
-       if (txsr & ENTSR_CDH)
-               printk("lost-heartbeat ");
-       printk("\n");
-#endif
-
-       ei_outb_p(ENISR_TX_ERR, e8390_base + EN0_ISR); /* Ack intr. */
-
-       if (tx_was_aborted)
-               ei_tx_intr(dev);
-       else
-       {
-               dev->stats.tx_errors++;
-               if (txsr & ENTSR_CRS) dev->stats.tx_carrier_errors++;
-               if (txsr & ENTSR_CDH) dev->stats.tx_heartbeat_errors++;
-               if (txsr & ENTSR_OWC) dev->stats.tx_window_errors++;
-       }
-}
-
-/**
- * ei_tx_intr - transmit interrupt handler
- * @dev: network device for which tx intr is handled
- *
- * We have finished a transmit: check for errors and then trigger the next
- * packet to be sent. Called with lock held.
- */
-
-static void ei_tx_intr(struct net_device *dev)
-{
-       unsigned long e8390_base = dev->base_addr;
-       struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev);
-       int status = ei_inb(e8390_base + EN0_TSR);
-
-       ei_outb_p(ENISR_TX, e8390_base + EN0_ISR); /* Ack intr. */
-
-       /*
-        * There are two Tx buffers, see which one finished, and trigger
-        * the send of another one if it exists.
-        */
-       ei_local->txqueue--;
-
-       if (ei_local->tx1 < 0)
-       {
-               if (ei_local->lasttx != 1 && ei_local->lasttx != -1)
-                       printk(KERN_ERR "%s: bogus last_tx_buffer %d, 
tx1=%d.\n",
-                               ei_local->name, ei_local->lasttx, 
ei_local->tx1);
-               ei_local->tx1 = 0;
-               if (ei_local->tx2 > 0)
-               {
-                       ei_local->txing = 1;
-                       NS8390_trigger_send(dev, ei_local->tx2, 
ei_local->tx_start_page + 6);
-                       dev->trans_start = jiffies;
-                       ei_local->tx2 = -1,
-                       ei_local->lasttx = 2;
-               }
-               else ei_local->lasttx = 20, ei_local->txing = 0;
-       }
-       else if (ei_local->tx2 < 0)
-       {
-               if (ei_local->lasttx != 2  &&  ei_local->lasttx != -2)
-                       printk("%s: bogus last_tx_buffer %d, tx2=%d.\n",
-                               ei_local->name, ei_local->lasttx, 
ei_local->tx2);
-               ei_local->tx2 = 0;
-               if (ei_local->tx1 > 0)
-               {
-                       ei_local->txing = 1;
-                       NS8390_trigger_send(dev, ei_local->tx1, 
ei_local->tx_start_page);
-                       dev->trans_start = jiffies;
-                       ei_local->tx1 = -1;
-                       ei_local->lasttx = 1;
-               }
-               else
-                       ei_local->lasttx = 10, ei_local->txing = 0;
-       }
-//     else printk(KERN_WARNING "%s: unexpected TX-done interrupt, 
lasttx=%d.\n",
-//                     dev->name, ei_local->lasttx);
-
-       /* Minimize Tx latency: update the statistics after we restart TXing. */
-       if (status & ENTSR_COL)
-               dev->stats.collisions++;
-       if (status & ENTSR_PTX)
-               dev->stats.tx_packets++;
-       else
-       {
-               dev->stats.tx_errors++;
-               if (status & ENTSR_ABT)
-               {
-                       dev->stats.tx_aborted_errors++;
-                       dev->stats.collisions += 16;
-               }
-               if (status & ENTSR_CRS)
-                       dev->stats.tx_carrier_errors++;
-               if (status & ENTSR_FU)
-                       dev->stats.tx_fifo_errors++;
-               if (status & ENTSR_CDH)
-                       dev->stats.tx_heartbeat_errors++;
-               if (status & ENTSR_OWC)
-                       dev->stats.tx_window_errors++;
-       }
-       netif_wake_queue(dev);
-}
-
-/**
- * ei_receive - receive some packets
- * @dev: network device with which receive will be run
- *
- * We have a good packet(s), get it/them out of the buffers.
- * Called with lock held.
- */
-
-static void ei_receive(struct net_device *dev)
-{
-       unsigned long e8390_base = dev->base_addr;
-       struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev);
-       unsigned char rxing_page, this_frame, next_frame;
-       unsigned short current_offset;
-       int rx_pkt_count = 0;
-       struct e8390_pkt_hdr rx_frame;
-       int num_rx_pages = ei_local->stop_page-ei_local->rx_start_page;
-
-       while (++rx_pkt_count < 10)
-       {
-               int pkt_len, pkt_stat;
-
-               /* Get the rx page (incoming packet pointer). */
-               ei_outb_p(E8390_NODMA+E8390_PAGE1, e8390_base + E8390_CMD);
-               rxing_page = ei_inb_p(e8390_base + EN1_CURPAG);
-               ei_outb_p(E8390_NODMA+E8390_PAGE0, e8390_base + E8390_CMD);
-
-               /* Remove one frame from the ring.  Boundary is always a page 
behind. */
-               this_frame = ei_inb_p(e8390_base + EN0_BOUNDARY) + 1;
-               if (this_frame >= ei_local->stop_page)
-                       this_frame = ei_local->rx_start_page;
-
-               /* Someday we'll omit the previous, iff we never get this 
message.
-                  (There is at least one clone claimed to have a problem.)
-
-                  Keep quiet if it looks like a card removal. One problem here
-                  is that some clones crash in roughly the same way.
-                */
-               if (ei_debug > 0  &&  this_frame != ei_local->current_page && 
(this_frame!=0x0 || rxing_page!=0xFF))
-                       printk(KERN_ERR "%s: mismatched read page pointers %2x 
vs %2x.\n",
-                                  dev->name, this_frame, 
ei_local->current_page);
-
-               if (this_frame == rxing_page)   /* Read all the frames? */
-                       break;                          /* Done for now */
-
-               current_offset = this_frame << 8;
-               ei_get_8390_hdr(dev, &rx_frame, this_frame);
-
-               pkt_len = rx_frame.count - sizeof(struct e8390_pkt_hdr);
-               pkt_stat = rx_frame.status;
-
-               next_frame = this_frame + 1 + ((pkt_len+4)>>8);
-
-               /* Check for bogosity warned by 3c503 book: the status byte is 
never
-                  written.  This happened a lot during testing! This code 
should be
-                  cleaned up someday. */
-               if (rx_frame.next != next_frame
-                       && rx_frame.next != next_frame + 1
-                       && rx_frame.next != next_frame - num_rx_pages
-                       && rx_frame.next != next_frame + 1 - num_rx_pages) {
-                       ei_local->current_page = rxing_page;
-                       ei_outb(ei_local->current_page-1, 
e8390_base+EN0_BOUNDARY);
-                       dev->stats.rx_errors++;
-                       continue;
-               }
-
-               if (pkt_len < 60  ||  pkt_len > 1518)
-               {
-                       if (ei_debug)
-                               printk(KERN_DEBUG "%s: bogus packet size: %d, 
status=%#2x nxpg=%#2x.\n",
-                                          dev->name, rx_frame.count, 
rx_frame.status,
-                                          rx_frame.next);
-                       dev->stats.rx_errors++;
-                       dev->stats.rx_length_errors++;
-               }
-                else if ((pkt_stat & 0x0F) == ENRSR_RXOK)
-               {
-                       struct sk_buff *skb;
-
-                       skb = dev_alloc_skb(pkt_len+2);
-                       if (skb == NULL)
-                       {
-                               if (ei_debug > 1)
-                                       printk(KERN_DEBUG "%s: Couldn't 
allocate a sk_buff of size %d.\n",
-                                                  dev->name, pkt_len);
-                               dev->stats.rx_dropped++;
-                               break;
-                       }
-                       else
-                       {
-                               skb_reserve(skb,2);     /* IP headers on 16 
byte boundaries */
-                               skb_put(skb, pkt_len);  /* Make room */
-                               ei_block_input(dev, pkt_len, skb, 
current_offset + sizeof(rx_frame));
-                               skb->protocol=eth_type_trans(skb,dev);
-                               netif_rx(skb);
-                               dev->stats.rx_packets++;
-                               dev->stats.rx_bytes += pkt_len;
-                               if (pkt_stat & ENRSR_PHY)
-                                       dev->stats.multicast++;
-                       }
-               }
-               else
-               {
-                       if (ei_debug)
-                               printk(KERN_DEBUG "%s: bogus packet: 
status=%#2x nxpg=%#2x size=%d\n",
-                                          dev->name, rx_frame.status, 
rx_frame.next,
-                                          rx_frame.count);
-                       dev->stats.rx_errors++;
-                       /* NB: The NIC counts CRC, frame and missed errors. */
-                       if (pkt_stat & ENRSR_FO)
-                               dev->stats.rx_fifo_errors++;
-               }
-               next_frame = rx_frame.next;
-
-               /* This _should_ never happen: it's here for avoiding bad 
clones. */
-               if (next_frame >= ei_local->stop_page) {
-                       printk("%s: next frame inconsistency, %#2x\n", 
dev->name,
-                                  next_frame);
-                       next_frame = ei_local->rx_start_page;
-               }
-               ei_local->current_page = next_frame;
-               ei_outb_p(next_frame-1, e8390_base+EN0_BOUNDARY);
-       }
-
-       /* We used to also ack ENISR_OVER here, but that would sometimes mask
-          a real overrun, leaving the 8390 in a stopped state with rec'vr off. 
*/
-       ei_outb_p(ENISR_RX+ENISR_RX_ERR, e8390_base+EN0_ISR);
-       return;
-}
-
-/**
- * ei_rx_overrun - handle receiver overrun
- * @dev: network device which threw exception
- *
- * We have a receiver overrun: we have to kick the 8390 to get it started
- * again. Problem is that you have to kick it exactly as NS prescribes in
- * the updated datasheets, or "the NIC may act in an unpredictable manner."
- * This includes causing "the NIC to defer indefinitely when it is stopped
- * on a busy network."  Ugh.
- * Called with lock held. Don't call this with the interrupts off or your
- * computer will hate you - it takes 10ms or so.
- */
-
-static void ei_rx_overrun(struct net_device *dev)
-{
-       unsigned long e8390_base = dev->base_addr;
-       unsigned char was_txing, must_resend = 0;
-       /* ei_local is used on some platforms via the EI_SHIFT macro */
-       struct ei_device *ei_local __maybe_unused = netdev_priv(dev);
-
-       /*
-        * Record whether a Tx was in progress and then issue the
-        * stop command.
-        */
-       was_txing = ei_inb_p(e8390_base+E8390_CMD) & E8390_TRANS;
-       ei_outb_p(E8390_NODMA+E8390_PAGE0+E8390_STOP, e8390_base+E8390_CMD);
-
-       if (ei_debug > 1)
-               printk(KERN_DEBUG "%s: Receiver overrun.\n", dev->name);
-       dev->stats.rx_over_errors++;
-
-       /*
-        * Wait a full Tx time (1.2ms) + some guard time, NS says 1.6ms total.
-        * Early datasheets said to poll the reset bit, but now they say that
-        * it "is not a reliable indicator and subsequently should be ignored."
-        * We wait at least 10ms.
-        */
-
-       mdelay(10);
-
-       /*
-        * Reset RBCR[01] back to zero as per magic incantation.
-        */
-       ei_outb_p(0x00, e8390_base+EN0_RCNTLO);
-       ei_outb_p(0x00, e8390_base+EN0_RCNTHI);
-
-       /*
-        * See if any Tx was interrupted or not. According to NS, this
-        * step is vital, and skipping it will cause no end of havoc.
-        */
-
-       if (was_txing)
-       {
-               unsigned char tx_completed = ei_inb_p(e8390_base+EN0_ISR) & 
(ENISR_TX+ENISR_TX_ERR);
-               if (!tx_completed)
-                       must_resend = 1;
-       }
-
-       /*
-        * Have to enter loopback mode and then restart the NIC before
-        * you are allowed to slurp packets up off the ring.
-        */
-       ei_outb_p(E8390_TXOFF, e8390_base + EN0_TXCR);
-       ei_outb_p(E8390_NODMA + E8390_PAGE0 + E8390_START, e8390_base + 
E8390_CMD);
-
-       /*
-        * Clear the Rx ring of all the debris, and ack the interrupt.
-        */
-       ei_receive(dev);
-       ei_outb_p(ENISR_OVER, e8390_base+EN0_ISR);
-
-       /*
-        * Leave loopback mode, and resend any packet that got stopped.
-        */
-       ei_outb_p(E8390_TXCONFIG, e8390_base + EN0_TXCR);
-       if (must_resend)
-               ei_outb_p(E8390_NODMA + E8390_PAGE0 + E8390_START + 
E8390_TRANS, e8390_base + E8390_CMD);
-}
-
-/*
- *     Collect the stats. This is called unlocked and from several contexts.
- */
-
-static struct net_device_stats *__ei_get_stats(struct net_device *dev)
-{
-       unsigned long ioaddr = dev->base_addr;
-       struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev);
-       unsigned long flags;
-
-       /* If the card is stopped, just return the present stats. */
-       if (!netif_running(dev))
-               return &dev->stats;
-
-       spin_lock_irqsave(&ei_local->page_lock,flags);
-       /* Read the counter registers, assuming we are in page 0. */
-       dev->stats.rx_frame_errors += ei_inb_p(ioaddr + EN0_COUNTER0);
-       dev->stats.rx_crc_errors   += ei_inb_p(ioaddr + EN0_COUNTER1);
-       dev->stats.rx_missed_errors+= ei_inb_p(ioaddr + EN0_COUNTER2);
-       spin_unlock_irqrestore(&ei_local->page_lock, flags);
-
-       return &dev->stats;
-}
-
-/*
- * Form the 64 bit 8390 multicast table from the linked list of addresses
- * associated with this dev structure.
- */
-
-static inline void make_mc_bits(u8 *bits, struct net_device *dev)
-{
-       struct dev_mc_list *dmi;
-
-       for (dmi=dev->mc_list; dmi; dmi=dmi->next)
-       {
-               u32 crc;
-               if (dmi->dmi_addrlen != ETH_ALEN)
-               {
-                       printk(KERN_INFO "%s: invalid multicast address length 
given.\n", dev->name);
-                       continue;
-               }
-               crc = ether_crc(ETH_ALEN, dmi->dmi_addr);
-               /*
-                * The 8390 uses the 6 most significant bits of the
-                * CRC to index the multicast table.
-                */
-               bits[crc>>29] |= (1<<((crc>>26)&7));
-       }
-}
-
-/**
- * do_set_multicast_list - set/clear multicast filter
- * @dev: net device for which multicast filter is adjusted
- *
- *     Set or clear the multicast filter for this adaptor. May be called
- *     from a BH in 2.1.x. Must be called with lock held.
- */
-
-static void do_set_multicast_list(struct net_device *dev)
-{
-       unsigned long e8390_base = dev->base_addr;
-       int i;
-       struct ei_device *ei_local = (struct ei_device*)netdev_priv(dev);
-
-       if (!(dev->flags&(IFF_PROMISC|IFF_ALLMULTI)))
-       {
-               memset(ei_local->mcfilter, 0, 8);
-               if (dev->mc_list)
-                       make_mc_bits(ei_local->mcfilter, dev);
-       }
-       else
-               memset(ei_local->mcfilter, 0xFF, 8);    /* mcast set to 
accept-all */
-
-       /*
-        * DP8390 manuals don't specify any magic sequence for altering
-        * the multicast regs on an already running card. To be safe, we
-        * ensure multicast mode is off prior to loading up the new hash
-        * table. If this proves to be not enough, we can always resort
-        * to stopping the NIC, loading the table and then restarting.
-        *
-        * Bug Alert!  The MC regs on the SMC 83C690 (SMC Elite and SMC
-        * Elite16) appear to be write-only. The NS 8390 data sheet lists
-        * them as r/w so this is a bug.  The SMC 83C790 (SMC Ultra and
-        * Ultra32 EISA) appears to have this bug fixed.
-        */
-
-       if (netif_running(dev))
-               ei_outb_p(E8390_RXCONFIG, e8390_base + EN0_RXCR);
-       ei_outb_p(E8390_NODMA + E8390_PAGE1, e8390_base + E8390_CMD);
-       for(i = 0; i < 8; i++)
-       {
-               ei_outb_p(ei_local->mcfilter[i], e8390_base + 
EN1_MULT_SHIFT(i));
-#ifndef BUG_83C690
-               if(ei_inb_p(e8390_base + 
EN1_MULT_SHIFT(i))!=ei_local->mcfilter[i])
-                       printk(KERN_ERR "Multicast filter read/write mismap 
%d\n",i);
-#endif
-       }
-       ei_outb_p(E8390_NODMA + E8390_PAGE0, e8390_base + E8390_CMD);
-
-       if(dev->flags&IFF_PROMISC)
-               ei_outb_p(E8390_RXCONFIG | 0x18, e8390_base + EN0_RXCR);
-       else if(dev->flags&IFF_ALLMULTI || dev->mc_list)
-               ei_outb_p(E8390_RXCONFIG | 0x08, e8390_base + EN0_RXCR);
-       else
-               ei_outb_p(E8390_RXCONFIG, e8390_base + EN0_RXCR);
- }
-
-/*
- *     Called without lock held. This is invoked from user context and may
- *     be parallel to just about everything else. Its also fairly quick and
- *     not called too often. Must protect against both bh and irq users
- */
-
-static void __ei_set_multicast_list(struct net_device *dev)
-{
-       unsigned long flags;
-       struct ei_device *ei_local = (struct ei_device*)netdev_priv(dev);
-
-       spin_lock_irqsave(&ei_local->page_lock, flags);
-       do_set_multicast_list(dev);
-       spin_unlock_irqrestore(&ei_local->page_lock, flags);
-}
-
-/**
- * ethdev_setup - init rest of 8390 device struct
- * @dev: network device structure to init
- *
- * Initialize the rest of the 8390 device structure.  Do NOT __init
- * this, as it is used by 8390 based modular drivers too.
- */
-
-static void ethdev_setup(struct net_device *dev)
-{
-       struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev);
-       if (ei_debug > 1)
-               printk(version);
-
-       ether_setup(dev);
-
-       spin_lock_init(&ei_local->page_lock);
-}
-
-/**
- * alloc_ei_netdev - alloc_etherdev counterpart for 8390
- * @size: extra bytes to allocate
- *
- * Allocate 8390-specific net_device.
- */
-static struct net_device *____alloc_ei_netdev(int size)
-{
-       return alloc_netdev(sizeof(struct ei_device) + size, "eth%d",
-                               ethdev_setup);
-}
-
-
-
-
-/* This page of functions should be 8390 generic */
-/* Follow National Semi's recommendations for initializing the "NIC". */
-
-/**
- * NS8390_init - initialize 8390 hardware
- * @dev: network device to initialize
- * @startp: boolean.  non-zero value to initiate chip processing
- *
- *     Must be called with lock held.
- */
-
-static void __NS8390_init(struct net_device *dev, int startp)
-{
-       unsigned long e8390_base = dev->base_addr;
-       struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev);
-       int i;
-       int endcfg = ei_local->word16
-           ? (0x48 | ENDCFG_WTS | (ei_local->bigendian ? ENDCFG_BOS : 0))
-           : 0x48;
-
-       if(sizeof(struct e8390_pkt_hdr)!=4)
-               panic("8390.c: header struct mispacked\n");
-       /* Follow National Semi's recommendations for initing the DP83902. */
-       ei_outb_p(E8390_NODMA+E8390_PAGE0+E8390_STOP, e8390_base+E8390_CMD); /* 
0x21 */
-       ei_outb_p(endcfg, e8390_base + EN0_DCFG);       /* 0x48 or 0x49 */
-       /* Clear the remote byte count registers. */
-       ei_outb_p(0x00,  e8390_base + EN0_RCNTLO);
-       ei_outb_p(0x00,  e8390_base + EN0_RCNTHI);
-       /* Set to monitor and loopback mode -- this is vital!. */
-       ei_outb_p(E8390_RXOFF, e8390_base + EN0_RXCR); /* 0x20 */
-       ei_outb_p(E8390_TXOFF, e8390_base + EN0_TXCR); /* 0x02 */
-       /* Set the transmit page and receive ring. */
-       ei_outb_p(ei_local->tx_start_page, e8390_base + EN0_TPSR);
-       ei_local->tx1 = ei_local->tx2 = 0;
-       ei_outb_p(ei_local->rx_start_page, e8390_base + EN0_STARTPG);
-       ei_outb_p(ei_local->stop_page-1, e8390_base + EN0_BOUNDARY);    /* 
3c503 says 0x3f,NS0x26*/
-       ei_local->current_page = ei_local->rx_start_page;               /* 
assert boundary+1 */
-       ei_outb_p(ei_local->stop_page, e8390_base + EN0_STOPPG);
-       /* Clear the pending interrupts and mask. */
-       ei_outb_p(0xFF, e8390_base + EN0_ISR);
-       ei_outb_p(0x00,  e8390_base + EN0_IMR);
-
-       /* Copy the station address into the DS8390 registers. */
-
-       ei_outb_p(E8390_NODMA + E8390_PAGE1 + E8390_STOP, 
e8390_base+E8390_CMD); /* 0x61 */
-       for(i = 0; i < 6; i++)
-       {
-               ei_outb_p(dev->dev_addr[i], e8390_base + EN1_PHYS_SHIFT(i));
-               if (ei_debug > 1 && ei_inb_p(e8390_base + 
EN1_PHYS_SHIFT(i))!=dev->dev_addr[i])
-                       printk(KERN_ERR "Hw. address read/write mismap %d\n",i);
-       }
-
-       ei_outb_p(ei_local->rx_start_page, e8390_base + EN1_CURPAG);
-       ei_outb_p(E8390_NODMA+E8390_PAGE0+E8390_STOP, e8390_base+E8390_CMD);
-
-       netif_start_queue(dev);
-       ei_local->tx1 = ei_local->tx2 = 0;
-       ei_local->txing = 0;
-
-       if (startp)
-       {
-               ei_outb_p(0xff,  e8390_base + EN0_ISR);
-               ei_outb_p(ENISR_ALL,  e8390_base + EN0_IMR);
-               ei_outb_p(E8390_NODMA+E8390_PAGE0+E8390_START, 
e8390_base+E8390_CMD);
-               ei_outb_p(E8390_TXCONFIG, e8390_base + EN0_TXCR); /* xmit on. */
-               /* 3c503 TechMan says rxconfig only after the NIC is started. */
-               ei_outb_p(E8390_RXCONFIG, e8390_base + EN0_RXCR); /* rx on,  */
-               do_set_multicast_list(dev);     /* (re)load the mcast table */
-       }
-}
-
-/* Trigger a transmit start, assuming the length is valid.
-   Always called with the page lock held */
-
-static void NS8390_trigger_send(struct net_device *dev, unsigned int length,
-                                                               int start_page)
-{
-       unsigned long e8390_base = dev->base_addr;
-       struct ei_device *ei_local __attribute((unused)) = (struct ei_device *) 
netdev_priv(dev);
-
-       ei_outb_p(E8390_NODMA+E8390_PAGE0, e8390_base+E8390_CMD);
-
-       if (ei_inb_p(e8390_base + E8390_CMD) & E8390_TRANS)
-       {
-               printk(KERN_WARNING "%s: trigger_send() called with the 
transmitter busy.\n",
-                       dev->name);
-               return;
-       }
-       ei_outb_p(length & 0xff, e8390_base + EN0_TCNTLO);
-       ei_outb_p(length >> 8, e8390_base + EN0_TCNTHI);
-       ei_outb_p(start_page, e8390_base + EN0_TPSR);
-       ei_outb_p(E8390_NODMA+E8390_TRANS+E8390_START, e8390_base+E8390_CMD);
-}
diff --git a/dde_ne2k_pci/main.c b/dde_ne2k_pci/main.c
deleted file mode 100644
index df8df1e..0000000
--- a/dde_ne2k_pci/main.c
+++ /dev/null
@@ -1,35 +0,0 @@
-#include <dde26.h> /* l4dde26_*() */
-#include <dde26_net.h> /* l4dde26 networking */
-
-#include <linux/netdevice.h> /* struct sk_buff */
-#include <linux/pci.h> /* pci_unregister_driver() */
-#include <linux/init.h>  // initcall()
-#include <linux/delay.h> // msleep()
-
-#include <hurd/machdev.h>
-
-int using_std = 1;
-
-int main(int argc, char **argv)
-{
-       pthread_t thread;
-
-       l4dde26_init();
-       l4dde26_process_init();
-       l4dde26_softirq_init();
-
-       printk("Initializing skb subsystem\n");
-       skb_init();
-
-       l4dde26_do_initcalls();
-
-       register_net();
-       mach_device_init();
-       trivfs_init();
-
-       pthread_create (&thread, NULL, ds_server, NULL);
-       pthread_detach (thread);
-       trivfs_server();
-
-       return 0;
-}
diff --git a/dde_ne2k_pci/ne2k-pci.c b/dde_ne2k_pci/ne2k-pci.c
deleted file mode 100644
index b7d700c..0000000
--- a/dde_ne2k_pci/ne2k-pci.c
+++ /dev/null
@@ -1,728 +0,0 @@
-/* ne2k-pci.c: A NE2000 clone on PCI bus driver for Linux. */
-/*
-       A Linux device driver for PCI NE2000 clones.
-
-       Authors and other copyright holders:
-       1992-2000 by Donald Becker, NE2000 core and various modifications.
-       1995-1998 by Paul Gortmaker, core modifications and PCI support.
-       Copyright 1993 assigned to the United States Government as represented
-       by the Director, National Security Agency.
-
-       This software may be used and distributed according to the terms of
-       the GNU General Public License (GPL), incorporated herein by reference.
-       Drivers based on or derived from this code fall under the GPL and must
-       retain the authorship, copyright and license notice.  This file is not
-       a complete program and may only be used when the entire operating
-       system is licensed under the GPL.
-
-       The author may be reached as address@hidden, or C/O
-       Scyld Computing Corporation
-       410 Severn Ave., Suite 210
-       Annapolis MD 21403
-
-       Issues remaining:
-       People are making PCI ne2000 clones! Oh the horror, the horror...
-       Limited full-duplex support.
-*/
-
-#define DRV_NAME       "ne2k-pci"
-#define DRV_VERSION    "1.03"
-#define DRV_RELDATE    "9/22/2003"
-
-
-/* The user-configurable values.
-   These may be modified when a driver module is loaded.*/
-
-static int debug = 1;                  /* 1 normal messages, 0 quiet .. 7 
verbose. */
-
-#define MAX_UNITS 8                            /* More are supported, limit 
only on options */
-/* Used to pass the full-duplex flag, etc. */
-static int full_duplex[MAX_UNITS];
-static int options[MAX_UNITS];
-
-/* Force a non std. amount of memory.  Units are 256 byte pages. */
-/* #define PACKETBUF_MEMSIZE   0x40 */
-
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/errno.h>
-#include <linux/pci.h>
-#include <linux/init.h>
-#include <linux/interrupt.h>
-#include <linux/ethtool.h>
-#include <linux/netdevice.h>
-#include <linux/etherdevice.h>
-
-#include <asm/system.h>
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <asm/uaccess.h>
-
-#include "8390.h"
-#include <ddekit/timer.h>
-
-/* These identify the driver base version and may not be removed. */
-static char version[] __devinitdata =
-KERN_INFO DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE " D. Becker/P. 
Gortmaker\n";
-
-#if defined(__powerpc__)
-#define inl_le(addr)  le32_to_cpu(inl(addr))
-#define inw_le(addr)  le16_to_cpu(inw(addr))
-#endif
-
-#define PFX DRV_NAME ": "
-
-MODULE_AUTHOR("Donald Becker / Paul Gortmaker");
-MODULE_DESCRIPTION("PCI NE2000 clone driver");
-MODULE_LICENSE("GPL");
-
-module_param(debug, int, 0);
-module_param_array(options, int, NULL, 0);
-module_param_array(full_duplex, int, NULL, 0);
-MODULE_PARM_DESC(debug, "debug level (1-2)");
-MODULE_PARM_DESC(options, "Bit 5: full duplex");
-MODULE_PARM_DESC(full_duplex, "full duplex setting(s) (1)");
-
-/* Some defines that people can play with if so inclined. */
-
-/* Use 32 bit data-movement operations instead of 16 bit. */
-#define USE_LONGIO
-
-/* Do we implement the read before write bugfix ? */
-/* #define NE_RW_BUGFIX */
-
-/* Flags.  We rename an existing ei_status field to store flags! */
-/* Thus only the low 8 bits are usable for non-init-time flags. */
-#define ne2k_flags reg0
-enum {
-       ONLY_16BIT_IO=8, ONLY_32BIT_IO=4,       /* Chip can do only 16/32-bit 
xfers. */
-       FORCE_FDX=0x20,                                         /* User 
override. */
-       REALTEK_FDX=0x40, HOLTEK_FDX=0x80,
-       STOP_PG_0x60=0x100,
-};
-
-enum ne2k_pci_chipsets {
-       CH_RealTek_RTL_8029 = 0,
-       CH_Winbond_89C940,
-       CH_Compex_RL2000,
-       CH_KTI_ET32P2,
-       CH_NetVin_NV5000SC,
-       CH_Via_86C926,
-       CH_SureCom_NE34,
-       CH_Winbond_W89C940F,
-       CH_Holtek_HT80232,
-       CH_Holtek_HT80229,
-       CH_Winbond_89C940_8c4a,
-};
-
-
-static struct {
-       char *name;
-       int flags;
-} pci_clone_list[] __devinitdata = {
-       {"RealTek RTL-8029", REALTEK_FDX},
-       {"Winbond 89C940", 0},
-       {"Compex RL2000", 0},
-       {"KTI ET32P2", 0},
-       {"NetVin NV5000SC", 0},
-       {"Via 86C926", ONLY_16BIT_IO},
-       {"SureCom NE34", 0},
-       {"Winbond W89C940F", 0},
-       {"Holtek HT80232", ONLY_16BIT_IO | HOLTEK_FDX},
-       {"Holtek HT80229", ONLY_32BIT_IO | HOLTEK_FDX | STOP_PG_0x60 },
-       {"Winbond W89C940(misprogrammed)", 0},
-       {NULL,}
-};
-
-
-static struct pci_device_id ne2k_pci_tbl[] = {
-       { 0x10ec, 0x8029, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_RealTek_RTL_8029 },
-       { 0x1050, 0x0940, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_Winbond_89C940 },
-       { 0x11f6, 0x1401, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_Compex_RL2000 },
-       { 0x8e2e, 0x3000, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_KTI_ET32P2 },
-       { 0x4a14, 0x5000, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_NetVin_NV5000SC },
-       { 0x1106, 0x0926, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_Via_86C926 },
-       { 0x10bd, 0x0e34, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_SureCom_NE34 },
-       { 0x1050, 0x5a5a, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_Winbond_W89C940F },
-       { 0x12c3, 0x0058, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_Holtek_HT80232 },
-       { 0x12c3, 0x5598, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_Holtek_HT80229 },
-       { 0x8c4a, 0x1980, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_Winbond_89C940_8c4a 
},
-       { 0, }
-};
-MODULE_DEVICE_TABLE(pci, ne2k_pci_tbl);
-
-
-/* ---- No user-serviceable parts below ---- */
-
-#define NE_BASE         (dev->base_addr)
-#define NE_CMD         0x00
-#define NE_DATAPORT    0x10    /* NatSemi-defined port window offset. */
-#define NE_RESET       0x1f    /* Issue a read to reset, a write to clear. */
-#define NE_IO_EXTENT   0x20
-
-#define NESM_START_PG  0x40    /* First page of TX buffer */
-#define NESM_STOP_PG   0x80    /* Last page +1 of RX ring */
-
-
-static int ne2k_pci_open(struct net_device *dev);
-static int ne2k_pci_close(struct net_device *dev);
-
-static void ne2k_pci_reset_8390(struct net_device *dev);
-static void ne2k_pci_get_8390_hdr(struct net_device *dev, struct e8390_pkt_hdr 
*hdr,
-                         int ring_page);
-static void ne2k_pci_block_input(struct net_device *dev, int count,
-                         struct sk_buff *skb, int ring_offset);
-static void ne2k_pci_block_output(struct net_device *dev, const int count,
-               const unsigned char *buf, const int start_page);
-static const struct ethtool_ops ne2k_pci_ethtool_ops;
-
-
-
-/* There is no room in the standard 8390 structure for extra info we need,
-   so we build a meta/outer-wrapper structure.. */
-struct ne2k_pci_card {
-       struct net_device *dev;
-       struct pci_dev *pci_dev;
-};
-
-
-
-/*
-  NEx000-clone boards have a Station Address (SA) PROM (SAPROM) in the packet
-  buffer memory space.  By-the-spec NE2000 clones have 0x57,0x57 in bytes
-  0x0e,0x0f of the SAPROM, while other supposed NE2000 clones must be
-  detected by their SA prefix.
-
-  Reading the SAPROM from a word-wide card with the 8390 set in byte-wide
-  mode results in doubled values, which can be detected and compensated for.
-
-  The probe is also responsible for initializing the card and filling
-  in the 'dev' and 'ei_status' structures.
-*/
-
-static const struct net_device_ops ne2k_netdev_ops = {
-       .ndo_open               = ne2k_pci_open,
-       .ndo_stop               = ne2k_pci_close,
-       .ndo_start_xmit         = ei_start_xmit,
-       .ndo_tx_timeout         = ei_tx_timeout,
-       .ndo_get_stats          = ei_get_stats,
-       .ndo_set_multicast_list = ei_set_multicast_list,
-       .ndo_validate_addr      = eth_validate_addr,
-       .ndo_set_mac_address    = eth_mac_addr,
-       .ndo_change_mtu         = eth_change_mtu,
-#ifdef CONFIG_NET_POLL_CONTROLLER
-       .ndo_poll_controller = ei_poll,
-#endif
-};
-
-static int __devinit ne2k_pci_init_one (struct pci_dev *pdev,
-                                    const struct pci_device_id *ent)
-{
-       struct net_device *dev;
-       int i;
-       unsigned char SA_prom[32];
-       int start_page, stop_page;
-       int irq, reg0, chip_idx = ent->driver_data;
-       static unsigned int fnd_cnt;
-       long ioaddr;
-       int flags = pci_clone_list[chip_idx].flags;
-
-/* when built into the kernel, we only print version if device is found */
-#ifndef MODULE
-       static int printed_version;
-       if (!printed_version++)
-               printk(version);
-#endif
-
-       fnd_cnt++;
-
-       i = pci_enable_device (pdev);
-       if (i)
-               return i;
-
-       ioaddr = pci_resource_start (pdev, 0);
-       irq = pdev->irq;
-
-       if (!ioaddr || ((pci_resource_flags (pdev, 0) & IORESOURCE_IO) == 0)) {
-               dev_err(&pdev->dev, "no I/O resource at PCI BAR #0\n");
-               return -ENODEV;
-       }
-
-       if (request_region (ioaddr, NE_IO_EXTENT, DRV_NAME) == NULL) {
-               dev_err(&pdev->dev, "I/O resource 0x%x @ 0x%lx busy\n",
-                       NE_IO_EXTENT, ioaddr);
-               return -EBUSY;
-       }
-
-       reg0 = inb(ioaddr);
-       if (reg0 == 0xFF)
-               goto err_out_free_res;
-
-       /* Do a preliminary verification that we have a 8390. */
-       {
-               int regd;
-               outb(E8390_NODMA+E8390_PAGE1+E8390_STOP, ioaddr + E8390_CMD);
-               regd = inb(ioaddr + 0x0d);
-               outb(0xff, ioaddr + 0x0d);
-               outb(E8390_NODMA+E8390_PAGE0, ioaddr + E8390_CMD);
-               inb(ioaddr + EN0_COUNTER0); /* Clear the counter by reading. */
-               if (inb(ioaddr + EN0_COUNTER0) != 0) {
-                       outb(reg0, ioaddr);
-                       outb(regd, ioaddr + 0x0d);      /* Restore the old 
values. */
-                       goto err_out_free_res;
-               }
-       }
-
-       /* Allocate net_device, dev->priv; fill in 8390 specific dev fields. */
-       dev = alloc_ei_netdev();
-       if (!dev) {
-               dev_err(&pdev->dev, "cannot allocate ethernet device\n");
-               goto err_out_free_res;
-       }
-       dev->netdev_ops = &ne2k_netdev_ops;
-
-       SET_NETDEV_DEV(dev, &pdev->dev);
-
-       /* Reset card. Who knows what dain-bramaged state it was left in. */
-       {
-               unsigned long reset_start_time = jiffies;
-
-               outb(inb(ioaddr + NE_RESET), ioaddr + NE_RESET);
-
-               /* This looks like a horrible timing loop, but it should never 
take
-                  more than a few cycles.
-               */
-               while ((inb(ioaddr + EN0_ISR) & ENISR_RESET) == 0)
-                       /* Limit wait: '2' avoids jiffy roll-over. */
-                       if (jiffies - reset_start_time > 2) {
-                               dev_err(&pdev->dev,
-                                       "Card failure (no reset ack).\n");
-                               goto err_out_free_netdev;
-                       }
-
-               outb(0xff, ioaddr + EN0_ISR);           /* Ack all intr. */
-       }
-
-       /* Read the 16 bytes of station address PROM.
-          We must first initialize registers, similar to NS8390_init(eifdev, 
0).
-          We can't reliably read the SAPROM address without this.
-          (I learned the hard way!). */
-       {
-               struct {unsigned char value, offset; } program_seq[] = {
-                       {E8390_NODMA+E8390_PAGE0+E8390_STOP, E8390_CMD}, /* 
Select page 0*/
-                       {0x49,  EN0_DCFG},      /* Set word-wide access. */
-                       {0x00,  EN0_RCNTLO},    /* Clear the count regs. */
-                       {0x00,  EN0_RCNTHI},
-                       {0x00,  EN0_IMR},       /* Mask completion irq. */
-                       {0xFF,  EN0_ISR},
-                       {E8390_RXOFF, EN0_RXCR},        /* 0x20  Set to monitor 
*/
-                       {E8390_TXOFF, EN0_TXCR},        /* 0x02  and loopback 
mode. */
-                       {32,    EN0_RCNTLO},
-                       {0x00,  EN0_RCNTHI},
-                       {0x00,  EN0_RSARLO},    /* DMA starting at 0x0000. */
-                       {0x00,  EN0_RSARHI},
-                       {E8390_RREAD+E8390_START, E8390_CMD},
-               };
-               for (i = 0; i < ARRAY_SIZE(program_seq); i++)
-                       outb(program_seq[i].value, ioaddr + 
program_seq[i].offset);
-
-       }
-
-       /* Note: all PCI cards have at least 16 bit access, so we don't have
-          to check for 8 bit cards.  Most cards permit 32 bit access. */
-       if (flags & ONLY_32BIT_IO) {
-               for (i = 0; i < 4 ; i++)
-                       ((u32 *)SA_prom)[i] = le32_to_cpu(inl(ioaddr + 
NE_DATAPORT));
-       } else
-               for(i = 0; i < 32 /*sizeof(SA_prom)*/; i++)
-                       SA_prom[i] = inb(ioaddr + NE_DATAPORT);
-
-       /* We always set the 8390 registers for word mode. */
-       outb(0x49, ioaddr + EN0_DCFG);
-       start_page = NESM_START_PG;
-
-       stop_page = flags & STOP_PG_0x60 ? 0x60 : NESM_STOP_PG;
-
-       /* Set up the rest of the parameters. */
-       dev->irq = irq;
-       dev->base_addr = ioaddr;
-       pci_set_drvdata(pdev, dev);
-
-       ei_status.name = pci_clone_list[chip_idx].name;
-       ei_status.tx_start_page = start_page;
-       ei_status.stop_page = stop_page;
-       ei_status.word16 = 1;
-       ei_status.ne2k_flags = flags;
-       if (fnd_cnt < MAX_UNITS) {
-               if (full_duplex[fnd_cnt] > 0  ||  (options[fnd_cnt] & 
FORCE_FDX))
-                       ei_status.ne2k_flags |= FORCE_FDX;
-       }
-
-       ei_status.rx_start_page = start_page + TX_PAGES;
-#ifdef PACKETBUF_MEMSIZE
-       /* Allow the packet buffer size to be overridden by know-it-alls. */
-       ei_status.stop_page = ei_status.tx_start_page + PACKETBUF_MEMSIZE;
-#endif
-
-       ei_status.reset_8390 = &ne2k_pci_reset_8390;
-       ei_status.block_input = &ne2k_pci_block_input;
-       ei_status.block_output = &ne2k_pci_block_output;
-       ei_status.get_8390_hdr = &ne2k_pci_get_8390_hdr;
-       ei_status.priv = (unsigned long) pdev;
-
-       dev->ethtool_ops = &ne2k_pci_ethtool_ops;
-       NS8390_init(dev, 0);
-
-       i = register_netdev(dev);
-       if (i)
-               goto err_out_free_netdev;
-
-       for(i = 0; i < 6; i++)
-               dev->dev_addr[i] = SA_prom[i];
-       printk("%s: %s found at %#lx, IRQ %d, %pM.\n",
-              dev->name, pci_clone_list[chip_idx].name, ioaddr, dev->irq,
-              dev->dev_addr);
-
-       memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
-
-       return 0;
-
-err_out_free_netdev:
-       free_netdev (dev);
-err_out_free_res:
-       release_region (ioaddr, NE_IO_EXTENT);
-       pci_set_drvdata (pdev, NULL);
-       return -ENODEV;
-
-}
-
-/*
- * Magic incantation sequence for full duplex on the supported cards.
- */
-static inline int set_realtek_fdx(struct net_device *dev)
-{
-       long ioaddr = dev->base_addr;
-
-       outb(0xC0 + E8390_NODMA, ioaddr + NE_CMD); /* Page 3 */
-       outb(0xC0, ioaddr + 0x01); /* Enable writes to CONFIG3 */
-       outb(0x40, ioaddr + 0x06); /* Enable full duplex */
-       outb(0x00, ioaddr + 0x01); /* Disable writes to CONFIG3 */
-       outb(E8390_PAGE0 + E8390_NODMA, ioaddr + NE_CMD); /* Page 0 */
-       return 0;
-}
-
-static inline int set_holtek_fdx(struct net_device *dev)
-{
-       long ioaddr = dev->base_addr;
-
-       outb(inb(ioaddr + 0x20) | 0x80, ioaddr + 0x20);
-       return 0;
-}
-
-static int ne2k_pci_set_fdx(struct net_device *dev)
-{
-       if (ei_status.ne2k_flags & REALTEK_FDX)
-               return set_realtek_fdx(dev);
-       else if (ei_status.ne2k_flags & HOLTEK_FDX)
-               return set_holtek_fdx(dev);
-
-       return -EOPNOTSUPP;
-}
-
-static int ne2k_pci_open(struct net_device *dev)
-{
-       int ret = request_irq(dev->irq, ei_interrupt, IRQF_SHARED, dev->name, 
dev);
-       if (ret)
-               return ret;
-
-       if (ei_status.ne2k_flags & FORCE_FDX)
-               ne2k_pci_set_fdx(dev);
-
-       ei_open(dev);
-       return 0;
-}
-
-static int ne2k_pci_close(struct net_device *dev)
-{
-       ei_close(dev);
-       free_irq(dev->irq, dev);
-       return 0;
-}
-
-/* Hard reset the card.  This used to pause for the same period that a
-   8390 reset command required, but that shouldn't be necessary. */
-static void ne2k_pci_reset_8390(struct net_device *dev)
-{
-       unsigned long reset_start_time = jiffies;
-
-       if (debug > 1) printk("%s: Resetting the 8390 t=%ld...",
-                                                 dev->name, jiffies);
-
-       outb(inb(NE_BASE + NE_RESET), NE_BASE + NE_RESET);
-
-       ei_status.txing = 0;
-       ei_status.dmaing = 0;
-
-       /* This check _should_not_ be necessary, omit eventually. */
-       while ((inb(NE_BASE+EN0_ISR) & ENISR_RESET) == 0)
-               if (jiffies - reset_start_time > 2) {
-                       printk("%s: ne2k_pci_reset_8390() did not complete.\n", 
dev->name);
-                       break;
-               }
-       outb(ENISR_RESET, NE_BASE + EN0_ISR);   /* Ack intr. */
-}
-
-/* Grab the 8390 specific header. Similar to the block_input routine, but
-   we don't need to be concerned with ring wrap as the header will be at
-   the start of a page, so we optimize accordingly. */
-
-static void ne2k_pci_get_8390_hdr(struct net_device *dev, struct e8390_pkt_hdr 
*hdr, int ring_page)
-{
-
-       long nic_base = dev->base_addr;
-
-       /* This *shouldn't* happen. If it does, it's the last thing you'll see 
*/
-       if (ei_status.dmaing) {
-               printk("%s: DMAing conflict in ne2k_pci_get_8390_hdr "
-                          "[DMAstat:%d][irqlock:%d].\n",
-                          dev->name, ei_status.dmaing, ei_status.irqlock);
-               return;
-       }
-
-       ei_status.dmaing |= 0x01;
-       outb(E8390_NODMA+E8390_PAGE0+E8390_START, nic_base+ NE_CMD);
-       outb(sizeof(struct e8390_pkt_hdr), nic_base + EN0_RCNTLO);
-       outb(0, nic_base + EN0_RCNTHI);
-       outb(0, nic_base + EN0_RSARLO);         /* On page boundary */
-       outb(ring_page, nic_base + EN0_RSARHI);
-       outb(E8390_RREAD+E8390_START, nic_base + NE_CMD);
-
-       if (ei_status.ne2k_flags & ONLY_16BIT_IO) {
-               insw(NE_BASE + NE_DATAPORT, hdr, sizeof(struct 
e8390_pkt_hdr)>>1);
-       } else {
-               *(u32*)hdr = le32_to_cpu(inl(NE_BASE + NE_DATAPORT));
-               le16_to_cpus(&hdr->count);
-       }
-
-       outb(ENISR_RDC, nic_base + EN0_ISR);    /* Ack intr. */
-       ei_status.dmaing &= ~0x01;
-}
-
-/* Block input and output, similar to the Crynwr packet driver.  If you
-   are porting to a new ethercard, look at the packet driver source for hints.
-   The NEx000 doesn't share the on-board packet memory -- you have to put
-   the packet out through the "remote DMA" dataport using outb. */
-
-static void ne2k_pci_block_input(struct net_device *dev, int count,
-                                struct sk_buff *skb, int ring_offset)
-{
-       long nic_base = dev->base_addr;
-       char *buf = skb->data;
-
-       /* This *shouldn't* happen. If it does, it's the last thing you'll see 
*/
-       if (ei_status.dmaing) {
-               printk("%s: DMAing conflict in ne2k_pci_block_input "
-                          "[DMAstat:%d][irqlock:%d].\n",
-                          dev->name, ei_status.dmaing, ei_status.irqlock);
-               return;
-       }
-       ei_status.dmaing |= 0x01;
-       if (ei_status.ne2k_flags & ONLY_32BIT_IO)
-               count = (count + 3) & 0xFFFC;
-       outb(E8390_NODMA+E8390_PAGE0+E8390_START, nic_base+ NE_CMD);
-       outb(count & 0xff, nic_base + EN0_RCNTLO);
-       outb(count >> 8, nic_base + EN0_RCNTHI);
-       outb(ring_offset & 0xff, nic_base + EN0_RSARLO);
-       outb(ring_offset >> 8, nic_base + EN0_RSARHI);
-       outb(E8390_RREAD+E8390_START, nic_base + NE_CMD);
-
-       if (ei_status.ne2k_flags & ONLY_16BIT_IO) {
-               insw(NE_BASE + NE_DATAPORT,buf,count>>1);
-               if (count & 0x01) {
-                       buf[count-1] = inb(NE_BASE + NE_DATAPORT);
-               }
-       } else {
-               insl(NE_BASE + NE_DATAPORT, buf, count>>2);
-               if (count & 3) {
-                       buf += count & ~3;
-                       if (count & 2) {
-                               __le16 *b = (__le16 *)buf;
-
-                               *b++ = cpu_to_le16(inw(NE_BASE + NE_DATAPORT));
-                               buf = (char *)b;
-                       }
-                       if (count & 1)
-                               *buf = inb(NE_BASE + NE_DATAPORT);
-               }
-       }
-
-       outb(ENISR_RDC, nic_base + EN0_ISR);    /* Ack intr. */
-       ei_status.dmaing &= ~0x01;
-}
-
-static void ne2k_pci_block_output(struct net_device *dev, int count,
-                                 const unsigned char *buf, const int 
start_page)
-{
-       long nic_base = NE_BASE;
-       unsigned long dma_start;
-
-       /* On little-endian it's always safe to round the count up for
-          word writes. */
-       if (ei_status.ne2k_flags & ONLY_32BIT_IO)
-               count = (count + 3) & 0xFFFC;
-       else
-               if (count & 0x01)
-                       count++;
-
-       /* This *shouldn't* happen. If it does, it's the last thing you'll see 
*/
-       if (ei_status.dmaing) {
-               printk("%s: DMAing conflict in ne2k_pci_block_output."
-                          "[DMAstat:%d][irqlock:%d]\n",
-                          dev->name, ei_status.dmaing, ei_status.irqlock);
-               return;
-       }
-       ei_status.dmaing |= 0x01;
-       /* We should already be in page 0, but to be safe... */
-       outb(E8390_PAGE0+E8390_START+E8390_NODMA, nic_base + NE_CMD);
-
-#ifdef NE8390_RW_BUGFIX
-       /* Handle the read-before-write bug the same way as the
-          Crynwr packet driver -- the NatSemi method doesn't work.
-          Actually this doesn't always work either, but if you have
-          problems with your NEx000 this is better than nothing! */
-       outb(0x42, nic_base + EN0_RCNTLO);
-       outb(0x00, nic_base + EN0_RCNTHI);
-       outb(0x42, nic_base + EN0_RSARLO);
-       outb(0x00, nic_base + EN0_RSARHI);
-       outb(E8390_RREAD+E8390_START, nic_base + NE_CMD);
-#endif
-       outb(ENISR_RDC, nic_base + EN0_ISR);
-
-   /* Now the normal output. */
-       outb(count & 0xff, nic_base + EN0_RCNTLO);
-       outb(count >> 8,   nic_base + EN0_RCNTHI);
-       outb(0x00, nic_base + EN0_RSARLO);
-       outb(start_page, nic_base + EN0_RSARHI);
-       outb(E8390_RWRITE+E8390_START, nic_base + NE_CMD);
-       if (ei_status.ne2k_flags & ONLY_16BIT_IO) {
-               outsw(NE_BASE + NE_DATAPORT, buf, count>>1);
-       } else {
-               outsl(NE_BASE + NE_DATAPORT, buf, count>>2);
-               if (count & 3) {
-                       buf += count & ~3;
-                       if (count & 2) {
-                               __le16 *b = (__le16 *)buf;
-
-                               outw(le16_to_cpu(*b++), NE_BASE + NE_DATAPORT);
-                               buf = (char *)b;
-                       }
-               }
-       }
-
-       dma_start = jiffies;
-
-       while ((inb(nic_base + EN0_ISR) & ENISR_RDC) == 0)
-               if (jiffies - dma_start > 2) {                  /* Avoid clock 
roll-over. */
-                       printk(KERN_WARNING "%s: timeout waiting for Tx 
RDC.\n", dev->name);
-                       ne2k_pci_reset_8390(dev);
-                       NS8390_init(dev,1);
-                       break;
-               }
-
-       outb(ENISR_RDC, nic_base + EN0_ISR);    /* Ack intr. */
-       ei_status.dmaing &= ~0x01;
-       return;
-}
-
-static void ne2k_pci_get_drvinfo(struct net_device *dev,
-                                struct ethtool_drvinfo *info)
-{
-       struct ei_device *ei = netdev_priv(dev);
-       struct pci_dev *pci_dev = (struct pci_dev *) ei->priv;
-
-       strcpy(info->driver, DRV_NAME);
-       strcpy(info->version, DRV_VERSION);
-       strcpy(info->bus_info, pci_name(pci_dev));
-}
-
-static const struct ethtool_ops ne2k_pci_ethtool_ops = {
-       .get_drvinfo            = ne2k_pci_get_drvinfo,
-};
-
-static void __devexit ne2k_pci_remove_one (struct pci_dev *pdev)
-{
-       struct net_device *dev = pci_get_drvdata(pdev);
-
-       BUG_ON(!dev);
-       unregister_netdev(dev);
-       release_region(dev->base_addr, NE_IO_EXTENT);
-       free_netdev(dev);
-       pci_disable_device(pdev);
-       pci_set_drvdata(pdev, NULL);
-}
-
-#ifdef CONFIG_PM
-static int ne2k_pci_suspend (struct pci_dev *pdev, pm_message_t state)
-{
-       struct net_device *dev = pci_get_drvdata (pdev);
-
-       netif_device_detach(dev);
-       pci_save_state(pdev);
-       pci_disable_device(pdev);
-       pci_set_power_state(pdev, pci_choose_state(pdev, state));
-
-       return 0;
-}
-
-static int ne2k_pci_resume (struct pci_dev *pdev)
-{
-       struct net_device *dev = pci_get_drvdata (pdev);
-       int rc;
-
-       pci_set_power_state(pdev, 0);
-       pci_restore_state(pdev);
-
-       rc = pci_enable_device(pdev);
-       if (rc)
-               return rc;
-
-       NS8390_init(dev, 1);
-       netif_device_attach(dev);
-
-       return 0;
-}
-
-#endif /* CONFIG_PM */
-
-
-static struct pci_driver ne2k_driver = {
-       .name           = DRV_NAME,
-       .probe          = ne2k_pci_init_one,
-       .remove         = __devexit_p(ne2k_pci_remove_one),
-       .id_table       = ne2k_pci_tbl,
-#ifdef CONFIG_PM
-       .suspend        = ne2k_pci_suspend,
-       .resume         = ne2k_pci_resume,
-#endif /* CONFIG_PM */
-
-};
-
-
-static int __init ne2k_pci_init(void)
-{
-/* when a module, this is printed whether or not devices are found in probe */
-#ifdef MODULE
-       printk(version);
-#endif
-       return pci_register_driver(&ne2k_driver);
-}
-
-
-static void __exit ne2k_pci_cleanup(void)
-{
-       pci_unregister_driver (&ne2k_driver);
-}
-
-module_init(ne2k_pci_init);
-module_exit(ne2k_pci_cleanup);
diff --git a/dde_pcnet32/.gitignore b/dde_pcnet32/.gitignore
deleted file mode 100644
index 14dac58..0000000
--- a/dde_pcnet32/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-dde_pcnet32
diff --git a/dde_pcnet32/Makeconf.local b/dde_pcnet32/Makeconf.local
deleted file mode 100644
index 130c8cc..0000000
--- a/dde_pcnet32/Makeconf.local
+++ /dev/null
@@ -1,17 +0,0 @@
-SYSTEMS = x86-l4v2
-ARCH = x86
-SYSTEM = x86-l4v2
-
-BUILDDIR       ?= ..
-
-libmachdev_path := -L$(BUILDDIR)/libmachdev -lmachdev
-libddekit_path := -L$(BUILDDIR)/libddekit -lddekit
-libslab_path := -L$(BUILDDIR)/libhurd-slab -lhurd-slab
-libbpf_path := -L$(BUILDDIR)/libbpf -lbpf
-
-DDEKITLIBDIR = $(PKGDIR)/../libddekit/
-DDEKITINCDIR = $(PKGDIR)/../libddekit/include
-DDE26LIBDIR = $(PKGDIR)/lib/src
-OBJ_BASE = $(PKGDIR)/build
-
-L4LIBDIR = .
diff --git a/dde_pcnet32/Makefile b/dde_pcnet32/Makefile
deleted file mode 100644
index e228a61..0000000
--- a/dde_pcnet32/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-PKGDIR        ?= ../libdde_linux26
-L4DIR         ?= $(PKGDIR)
-
-include Makeconf.local
-
-TARGET         = dde_pcnet32
-
-SRC_C          = main.c pcnet32.c
-
-LIBS          += $(libmachdev_path) -ldde_linux26.o -ldde_linux26_net 
$(libddekit_path) -lfshelp -ltrivfs -lpciaccess -lz -lpthread -lshouldbeinlibc 
-lports $(libslab_path) $(libbpf_path)
-CFLAGS        += -g -I$(PKGDIR)/include -I$(BUILDDIR)/include
-
-# DDE configuration
-include $(L4DIR)/Makeconf
-
-include $(L4DIR)/mk/prog.mk
diff --git a/dde_pcnet32/default.ld b/dde_pcnet32/default.ld
deleted file mode 100644
index f8e4e28..0000000
--- a/dde_pcnet32/default.ld
+++ /dev/null
@@ -1,213 +0,0 @@
-/* Script for -z combreloc: combine and sort reloc sections */
-OUTPUT_FORMAT("elf32-i386", "elf32-i386",
-             "elf32-i386")
-OUTPUT_ARCH(i386)
-ENTRY(_start)
-SEARCH_DIR("/usr/i486-gnu/lib"); SEARCH_DIR("/usr/local/lib"); 
SEARCH_DIR("/lib"); SEARCH_DIR("/usr/lib");
-SECTIONS
-{
-  /* Read-only sections, merged into text segment: */
-  PROVIDE (__executable_start = 0x08048000); . = 0x08048000 + SIZEOF_HEADERS;
-  .interp         : { *(.interp) }
-  .note.gnu.build-id : { *(.note.gnu.build-id) }
-  .hash           : { *(.hash) }
-  .gnu.hash       : { *(.gnu.hash) }
-  .dynsym         : { *(.dynsym) }
-  .dynstr         : { *(.dynstr) }
-  .gnu.version    : { *(.gnu.version) }
-  .gnu.version_d  : { *(.gnu.version_d) }
-  .gnu.version_r  : { *(.gnu.version_r) }
-  .rel.dyn        :
-    {
-      *(.rel.init)
-      *(.rel.text .rel.text.* .rel.gnu.linkonce.t.*)
-      *(.rel.fini)
-      *(.rel.rodata .rel.rodata.* .rel.gnu.linkonce.r.*)
-      *(.rel.data.rel.ro* .rel.gnu.linkonce.d.rel.ro.*)
-      *(.rel.data .rel.data.* .rel.gnu.linkonce.d.*)
-      *(.rel.tdata .rel.tdata.* .rel.gnu.linkonce.td.*)
-      *(.rel.tbss .rel.tbss.* .rel.gnu.linkonce.tb.*)
-      *(.rel.ctors)
-      *(.rel.dtors)
-      *(.rel.got)
-      *(.rel.bss .rel.bss.* .rel.gnu.linkonce.b.*)
-    }
-  .rela.dyn       :
-    {
-      *(.rela.init)
-      *(.rela.text .rela.text.* .rela.gnu.linkonce.t.*)
-      *(.rela.fini)
-      *(.rela.rodata .rela.rodata.* .rela.gnu.linkonce.r.*)
-      *(.rela.data .rela.data.* .rela.gnu.linkonce.d.*)
-      *(.rela.tdata .rela.tdata.* .rela.gnu.linkonce.td.*)
-      *(.rela.tbss .rela.tbss.* .rela.gnu.linkonce.tb.*)
-      *(.rela.ctors)
-      *(.rela.dtors)
-      *(.rela.got)
-      *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*)
-    }
-  .rel.plt        : { *(.rel.plt) }
-  .rela.plt       : { *(.rela.plt) }
-  .init           :
-  {
-    KEEP (*(.init))
-  } =0x90909090
-  .plt            : { *(.plt) }
-  .text           :
-  {
-    *(.text .stub .text.* .gnu.linkonce.t.*)
-    KEEP (*(.text.*personality*))
-    /* .gnu.warning sections are handled specially by elf32.em.  */
-    *(.gnu.warning)
-  } =0x90909090
-  .fini           :
-  {
-    KEEP (*(.fini))
-  } =0x90909090
-  PROVIDE (__etext = .);
-  PROVIDE (_etext = .);
-  PROVIDE (etext = .);
-  .rodata         : { *(.rodata .rodata.* .gnu.linkonce.r.*) }
-  .rodata1        : { *(.rodata1) }
-  .eh_frame_hdr : { *(.eh_frame_hdr) }
-  .eh_frame       : ONLY_IF_RO { KEEP (*(.eh_frame)) }
-  .gcc_except_table   : ONLY_IF_RO { *(.gcc_except_table .gcc_except_table.*) }
-  /* Adjust the address for the data segment.  We want to adjust up to
-     the same address within the page on the next page up.  */
-  . = ALIGN (CONSTANT (MAXPAGESIZE)) - ((CONSTANT (MAXPAGESIZE) - .) & 
(CONSTANT (MAXPAGESIZE) - 1)); . = DATA_SEGMENT_ALIGN (CONSTANT (MAXPAGESIZE), 
CONSTANT (COMMONPAGESIZE));
-  /* Exception handling  */
-  .eh_frame       : ONLY_IF_RW { KEEP (*(.eh_frame)) }
-  .gcc_except_table   : ONLY_IF_RW { *(.gcc_except_table .gcc_except_table.*) }
-  /* Thread Local Storage sections  */
-  .tdata         : { *(.tdata .tdata.* .gnu.linkonce.td.*) }
-  .tbss                  : { *(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon) }
-  .preinit_array     :
-  {
-    PROVIDE_HIDDEN (__preinit_array_start = .);
-    KEEP (*(.preinit_array))
-    PROVIDE_HIDDEN (__preinit_array_end = .);
-  }
-  .init_array     :
-  {
-     PROVIDE_HIDDEN (__init_array_start = .);
-     KEEP (*(SORT(.init_array.*)))
-     KEEP (*(.init_array))
-     PROVIDE_HIDDEN (__init_array_end = .);
-  }
-  .fini_array     :
-  {
-    PROVIDE_HIDDEN (__fini_array_start = .);
-    KEEP (*(.fini_array))
-    KEEP (*(SORT(.fini_array.*)))
-    PROVIDE_HIDDEN (__fini_array_end = .);
-  }
-  .ctors          :
-  {
-    /* gcc uses crtbegin.o to find the start of
-       the constructors, so we make sure it is
-       first.  Because this is a wildcard, it
-       doesn't matter if the user does not
-       actually link against crtbegin.o; the
-       linker won't look for a file to match a
-       wildcard.  The wildcard also means that it
-       doesn't matter which directory crtbegin.o
-       is in.  */
-    KEEP (*crtbegin.o(.ctors))
-    KEEP (*crtbegin?.o(.ctors))
-    /* We don't want to include the .ctor section from
-       the crtend.o file until after the sorted ctors.
-       The .ctor section from the crtend file contains the
-       end of ctors marker and it must be last */
-    KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o ) .ctors))
-
-    KEEP (*(SORT(.ctors.*)))
-    KEEP (*(.ctors))
-
-    KEEP (*(.mark_beg_l4dde_ctors))
-    KEEP (*(SORT(.l4dde_ctors.?)))
-    KEEP (*(SORT(.l4dde_ctors.??)))
-    KEEP (*(SORT(.l4dde_ctors.???)))
-    KEEP (*(SORT(.l4dde_ctors.????)))
-    KEEP (*(SORT(.l4dde_ctors.?????)))
-    KEEP (*(.l4dde_ctors))
-    KEEP (*(.mark_end_l4dde_ctors))
-  }
-  .dtors          :
-  {
-    KEEP (*crtbegin.o(.dtors))
-    KEEP (*crtbegin?.o(.dtors))
-    KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o ) .dtors))
-    KEEP (*(SORT(.dtors.*)))
-    KEEP (*(.dtors))
-  }
-  .jcr            : { KEEP (*(.jcr)) }
-  .data.rel.ro : { *(.data.rel.ro.local* .gnu.linkonce.d.rel.ro.local.*) 
*(.data.rel.ro* .gnu.linkonce.d.rel.ro.*) }
-  .dynamic        : { *(.dynamic) }
-  .got            : { *(.got) }
-  . = DATA_SEGMENT_RELRO_END (12, .);
-  .got.plt        : { *(.got.plt) }
-  .data           :
-  {
-    *(.data .data.* .gnu.linkonce.d.*)
-    KEEP (*(.gnu.linkonce.d.*personality*))
-    SORT(CONSTRUCTORS)
-  }
-  .data1          : { *(.data1) }
-  _edata = .; PROVIDE (edata = .);
-  __bss_start = .;
-  .bss            :
-  {
-   *(.dynbss)
-   *(.bss .bss.* .gnu.linkonce.b.*)
-   *(COMMON)
-   /* Align here to ensure that the .bss section occupies space up to
-      _end.  Align after .bss to ensure correct alignment even if the
-      .bss section disappears because there are no input sections.
-      FIXME: Why do we need it? When there is no .bss section, we don't
-      pad the .data section.  */
-   . = ALIGN(. != 0 ? 32 / 8 : 1);
-  }
-  . = ALIGN(32 / 8);
-  . = ALIGN(32 / 8);
-  _end = .; PROVIDE (end = .);
-  . = DATA_SEGMENT_END (.);
-  /* Stabs debugging sections.  */
-  .stab          0 : { *(.stab) }
-  .stabstr       0 : { *(.stabstr) }
-  .stab.excl     0 : { *(.stab.excl) }
-  .stab.exclstr  0 : { *(.stab.exclstr) }
-  .stab.index    0 : { *(.stab.index) }
-  .stab.indexstr 0 : { *(.stab.indexstr) }
-  .comment       0 : { *(.comment) }
-  /* DWARF debug sections.
-     Symbols in the DWARF debugging sections are relative to the beginning
-     of the section so we begin them at 0.  */
-  /* DWARF 1 */
-  .debug          0 : { *(.debug) }
-  .line           0 : { *(.line) }
-  /* GNU DWARF 1 extensions */
-  .debug_srcinfo  0 : { *(.debug_srcinfo) }
-  .debug_sfnames  0 : { *(.debug_sfnames) }
-  /* DWARF 1.1 and DWARF 2 */
-  .debug_aranges  0 : { *(.debug_aranges) }
-  .debug_pubnames 0 : { *(.debug_pubnames) }
-  /* DWARF 2 */
-  .debug_info     0 : { *(.debug_info .gnu.linkonce.wi.*) }
-  .debug_abbrev   0 : { *(.debug_abbrev) }
-  .debug_line     0 : { *(.debug_line) }
-  .debug_frame    0 : { *(.debug_frame) }
-  .debug_str      0 : { *(.debug_str) }
-  .debug_loc      0 : { *(.debug_loc) }
-  .debug_macinfo  0 : { *(.debug_macinfo) }
-  /* SGI/MIPS DWARF 2 extensions */
-  .debug_weaknames 0 : { *(.debug_weaknames) }
-  .debug_funcnames 0 : { *(.debug_funcnames) }
-  .debug_typenames 0 : { *(.debug_typenames) }
-  .debug_varnames  0 : { *(.debug_varnames) }
-  /* DWARF 3 */
-  .debug_pubtypes 0 : { *(.debug_pubtypes) }
-  .debug_ranges   0 : { *(.debug_ranges) }
-  .gnu.attributes 0 : { KEEP (*(.gnu.attributes)) }
-  /DISCARD/ : { *(.note.GNU-stack) *(.gnu_debuglink) }
-}
-
diff --git a/dde_pcnet32/main.c b/dde_pcnet32/main.c
deleted file mode 100644
index df8df1e..0000000
--- a/dde_pcnet32/main.c
+++ /dev/null
@@ -1,35 +0,0 @@
-#include <dde26.h> /* l4dde26_*() */
-#include <dde26_net.h> /* l4dde26 networking */
-
-#include <linux/netdevice.h> /* struct sk_buff */
-#include <linux/pci.h> /* pci_unregister_driver() */
-#include <linux/init.h>  // initcall()
-#include <linux/delay.h> // msleep()
-
-#include <hurd/machdev.h>
-
-int using_std = 1;
-
-int main(int argc, char **argv)
-{
-       pthread_t thread;
-
-       l4dde26_init();
-       l4dde26_process_init();
-       l4dde26_softirq_init();
-
-       printk("Initializing skb subsystem\n");
-       skb_init();
-
-       l4dde26_do_initcalls();
-
-       register_net();
-       mach_device_init();
-       trivfs_init();
-
-       pthread_create (&thread, NULL, ds_server, NULL);
-       pthread_detach (thread);
-       trivfs_server();
-
-       return 0;
-}
diff --git a/dde_pcnet32/pcnet32.c b/dde_pcnet32/pcnet32.c
deleted file mode 100644
index 85c8a31..0000000
--- a/dde_pcnet32/pcnet32.c
+++ /dev/null
@@ -1,3063 +0,0 @@
-/* pcnet32.c: An AMD PCnet32 ethernet driver for linux. */
-/*
- *     Copyright 1996-1999 Thomas Bogendoerfer
- *
- *     Derived from the lance driver written 1993,1994,1995 by Donald Becker.
- *
- *     Copyright 1993 United States Government as represented by the
- *     Director, National Security Agency.
- *
- *     This software may be used and distributed according to the terms
- *     of the GNU General Public License, incorporated herein by reference.
- *
- *     This driver is for PCnet32 and PCnetPCI based ethercards
- */
-/**************************************************************************
- *  23 Oct, 2000.
- *  Fixed a few bugs, related to running the controller in 32bit mode.
- *
- *  Carsten Langgaard, address@hidden
- *  Copyright (C) 2000 MIPS Technologies, Inc.  All rights reserved.
- *
- *************************************************************************/
-
-#define DRV_NAME       "pcnet32"
-#define DRV_VERSION    "1.35"
-#define DRV_RELDATE    "21.Apr.2008"
-#define PFX            DRV_NAME ": "
-
-static const char *const version =
-    DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE " address@hidden";
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/string.h>
-#include <linux/errno.h>
-#include <linux/ioport.h>
-#include <linux/slab.h>
-#include <linux/interrupt.h>
-#include <linux/pci.h>
-#include <linux/delay.h>
-#include <linux/init.h>
-#include <linux/ethtool.h>
-#include <linux/mii.h>
-#include <linux/crc32.h>
-#include <linux/netdevice.h>
-#include <linux/etherdevice.h>
-#include <linux/skbuff.h>
-#include <linux/spinlock.h>
-#include <linux/moduleparam.h>
-#include <linux/bitops.h>
-
-#include <asm/dma.h>
-#include <asm/io.h>
-#include <asm/uaccess.h>
-#include <asm/irq.h>
-
-#include <ddekit/timer.h>
-
-/*
- * PCI device identifiers for "new style" Linux PCI Device Drivers
- */
-static struct pci_device_id pcnet32_pci_tbl[] = {
-       { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_LANCE_HOME), },
-       { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_LANCE), },
-
-       /*
-        * Adapters that were sold with IBM's RS/6000 or pSeries hardware have
-        * the incorrect vendor id.
-        */
-       { PCI_DEVICE(PCI_VENDOR_ID_TRIDENT, PCI_DEVICE_ID_AMD_LANCE),
-         .class = (PCI_CLASS_NETWORK_ETHERNET << 8), .class_mask = 0xffff00, },
-
-       { }     /* terminate list */
-};
-
-MODULE_DEVICE_TABLE(pci, pcnet32_pci_tbl);
-
-static int cards_found;
-
-/*
- * VLB I/O addresses
- */
-static unsigned int pcnet32_portlist[] __initdata =
-    { 0x300, 0x320, 0x340, 0x360, 0 };
-
-static int pcnet32_debug = 0xffff;
-static int tx_start = 1;       /* Mapping -- 0:20, 1:64, 2:128, 3:~220 
(depends on chip vers) */
-static int pcnet32vlb;         /* check for VLB cards ? */
-
-static struct net_device *pcnet32_dev;
-
-static int max_interrupt_work = 2;
-static int rx_copybreak = 200;
-
-#define PCNET32_PORT_AUI      0x00
-#define PCNET32_PORT_10BT     0x01
-#define PCNET32_PORT_GPSI     0x02
-#define PCNET32_PORT_MII      0x03
-
-#define PCNET32_PORT_PORTSEL  0x03
-#define PCNET32_PORT_ASEL     0x04
-#define PCNET32_PORT_100      0x40
-#define PCNET32_PORT_FD              0x80
-
-#define PCNET32_DMA_MASK 0xffffffff
-
-#define PCNET32_WATCHDOG_TIMEOUT (jiffies + (2 * HZ))
-#define PCNET32_BLINK_TIMEOUT  (jiffies + (HZ/4))
-
-/*
- * table to translate option values from tulip
- * to internal options
- */
-static const unsigned char options_mapping[] = {
-       PCNET32_PORT_ASEL,                      /*  0 Auto-select      */
-       PCNET32_PORT_AUI,                       /*  1 BNC/AUI          */
-       PCNET32_PORT_AUI,                       /*  2 AUI/BNC          */
-       PCNET32_PORT_ASEL,                      /*  3 not supported    */
-       PCNET32_PORT_10BT | PCNET32_PORT_FD,    /*  4 10baseT-FD       */
-       PCNET32_PORT_ASEL,                      /*  5 not supported    */
-       PCNET32_PORT_ASEL,                      /*  6 not supported    */
-       PCNET32_PORT_ASEL,                      /*  7 not supported    */
-       PCNET32_PORT_ASEL,                      /*  8 not supported    */
-       PCNET32_PORT_MII,                       /*  9 MII 10baseT      */
-       PCNET32_PORT_MII | PCNET32_PORT_FD,     /* 10 MII 10baseT-FD   */
-       PCNET32_PORT_MII,                       /* 11 MII (autosel)    */
-       PCNET32_PORT_10BT,                      /* 12 10BaseT          */
-       PCNET32_PORT_MII | PCNET32_PORT_100,    /* 13 MII 100BaseTx    */
-                                               /* 14 MII 100BaseTx-FD */
-       PCNET32_PORT_MII | PCNET32_PORT_100 | PCNET32_PORT_FD,
-       PCNET32_PORT_ASEL                       /* 15 not supported    */
-};
-
-static const char pcnet32_gstrings_test[][ETH_GSTRING_LEN] = {
-       "Loopback test  (offline)"
-};
-
-#define PCNET32_TEST_LEN       ARRAY_SIZE(pcnet32_gstrings_test)
-
-#define PCNET32_NUM_REGS 136
-
-#define MAX_UNITS 8            /* More are supported, limit only on options */
-static int options[MAX_UNITS];
-static int full_duplex[MAX_UNITS];
-static int homepna[MAX_UNITS];
-
-/*
- *                             Theory of Operation
- *
- * This driver uses the same software structure as the normal lance
- * driver. So look for a verbose description in lance.c. The differences
- * to the normal lance driver is the use of the 32bit mode of PCnet32
- * and PCnetPCI chips. Because these chips are 32bit chips, there is no
- * 16MB limitation and we don't need bounce buffers.
- */
-
-/*
- * Set the number of Tx and Rx buffers, using Log_2(# buffers).
- * Reasonable default values are 4 Tx buffers, and 16 Rx buffers.
- * That translates to 2 (4 == 2^^2) and 4 (16 == 2^^4).
- */
-#ifndef PCNET32_LOG_TX_BUFFERS
-#define PCNET32_LOG_TX_BUFFERS         4
-#define PCNET32_LOG_RX_BUFFERS         5
-#define PCNET32_LOG_MAX_TX_BUFFERS     9       /* 2^9 == 512 */
-#define PCNET32_LOG_MAX_RX_BUFFERS     9
-#endif
-
-#define TX_RING_SIZE           (1 << (PCNET32_LOG_TX_BUFFERS))
-#define TX_MAX_RING_SIZE       (1 << (PCNET32_LOG_MAX_TX_BUFFERS))
-
-#define RX_RING_SIZE           (1 << (PCNET32_LOG_RX_BUFFERS))
-#define RX_MAX_RING_SIZE       (1 << (PCNET32_LOG_MAX_RX_BUFFERS))
-
-#define PKT_BUF_SKB            1544
-/* actual buffer length after being aligned */
-#define PKT_BUF_SIZE           (PKT_BUF_SKB - NET_IP_ALIGN)
-/* chip wants twos complement of the (aligned) buffer length */
-#define NEG_BUF_SIZE           (NET_IP_ALIGN - PKT_BUF_SKB)
-
-/* Offsets from base I/O address. */
-#define PCNET32_WIO_RDP                0x10
-#define PCNET32_WIO_RAP                0x12
-#define PCNET32_WIO_RESET      0x14
-#define PCNET32_WIO_BDP                0x16
-
-#define PCNET32_DWIO_RDP       0x10
-#define PCNET32_DWIO_RAP       0x14
-#define PCNET32_DWIO_RESET     0x18
-#define PCNET32_DWIO_BDP       0x1C
-
-#define PCNET32_TOTAL_SIZE     0x20
-
-#define CSR0           0
-#define CSR0_INIT      0x1
-#define CSR0_START     0x2
-#define CSR0_STOP      0x4
-#define CSR0_TXPOLL    0x8
-#define CSR0_INTEN     0x40
-#define CSR0_IDON      0x0100
-#define CSR0_NORMAL    (CSR0_START | CSR0_INTEN)
-#define PCNET32_INIT_LOW       1
-#define PCNET32_INIT_HIGH      2
-#define CSR3           3
-#define CSR4           4
-#define CSR5           5
-#define CSR5_SUSPEND   0x0001
-#define CSR15          15
-#define PCNET32_MC_FILTER      8
-
-#define PCNET32_79C970A        0x2621
-
-/* The PCNET32 Rx and Tx ring descriptors. */
-struct pcnet32_rx_head {
-       __le32  base;
-       __le16  buf_length;     /* two`s complement of length */
-       __le16  status;
-       __le32  msg_length;
-       __le32  reserved;
-};
-
-struct pcnet32_tx_head {
-       __le32  base;
-       __le16  length;         /* two`s complement of length */
-       __le16  status;
-       __le32  misc;
-       __le32  reserved;
-};
-
-/* The PCNET32 32-Bit initialization block, described in databook. */
-struct pcnet32_init_block {
-       __le16  mode;
-       __le16  tlen_rlen;
-       u8      phys_addr[6];
-       __le16  reserved;
-       __le32  filter[2];
-       /* Receive and transmit ring base, along with extra bits. */
-       __le32  rx_ring;
-       __le32  tx_ring;
-};
-
-/* PCnet32 access functions */
-struct pcnet32_access {
-       u16     (*read_csr) (unsigned long, int);
-       void    (*write_csr) (unsigned long, int, u16);
-       u16     (*read_bcr) (unsigned long, int);
-       void    (*write_bcr) (unsigned long, int, u16);
-       u16     (*read_rap) (unsigned long);
-       void    (*write_rap) (unsigned long, u16);
-       void    (*reset) (unsigned long);
-};
-
-/*
- * The first field of pcnet32_private is read by the ethernet device
- * so the structure should be allocated using pci_alloc_consistent().
- */
-struct pcnet32_private {
-       struct pcnet32_init_block *init_block;
-       /* The Tx and Rx ring entries must be aligned on 16-byte boundaries in 
32bit mode. */
-       struct pcnet32_rx_head  *rx_ring;
-       struct pcnet32_tx_head  *tx_ring;
-       dma_addr_t              init_dma_addr;/* DMA address of beginning of 
the init block,
-                                  returned by pci_alloc_consistent */
-       struct pci_dev          *pci_dev;
-       const char              *name;
-       /* The saved address of a sent-in-place packet/buffer, for skfree(). */
-       struct sk_buff          **tx_skbuff;
-       struct sk_buff          **rx_skbuff;
-       dma_addr_t              *tx_dma_addr;
-       dma_addr_t              *rx_dma_addr;
-       struct pcnet32_access   a;
-       spinlock_t              lock;           /* Guard lock */
-       unsigned int            cur_rx, cur_tx; /* The next free ring entry */
-       unsigned int            rx_ring_size;   /* current rx ring size */
-       unsigned int            tx_ring_size;   /* current tx ring size */
-       unsigned int            rx_mod_mask;    /* rx ring modular mask */
-       unsigned int            tx_mod_mask;    /* tx ring modular mask */
-       unsigned short          rx_len_bits;
-       unsigned short          tx_len_bits;
-       dma_addr_t              rx_ring_dma_addr;
-       dma_addr_t              tx_ring_dma_addr;
-       unsigned int            dirty_rx,       /* ring entries to be freed. */
-                               dirty_tx;
-
-       struct net_device       *dev;
-       struct napi_struct      napi;
-       char                    tx_full;
-       char                    phycount;       /* number of phys found */
-       int                     options;
-       unsigned int            shared_irq:1,   /* shared irq possible */
-                               dxsuflo:1,   /* disable transmit stop on uflo */
-                               mii:1;          /* mii port available */
-       struct net_device       *next;
-       struct mii_if_info      mii_if;
-       struct timer_list       watchdog_timer;
-       struct timer_list       blink_timer;
-       u32                     msg_enable;     /* debug message level */
-
-       /* each bit indicates an available PHY */
-       u32                     phymask;
-       unsigned short          chip_version;   /* which variant this is */
-};
-
-static int pcnet32_probe_pci(struct pci_dev *, const struct pci_device_id *);
-static int pcnet32_probe1(unsigned long, int, struct pci_dev *);
-static int pcnet32_open(struct net_device *);
-static int pcnet32_init_ring(struct net_device *);
-static int pcnet32_start_xmit(struct sk_buff *, struct net_device *);
-static void pcnet32_tx_timeout(struct net_device *dev);
-static irqreturn_t pcnet32_interrupt(int, void *);
-static int pcnet32_close(struct net_device *);
-static struct net_device_stats *pcnet32_get_stats(struct net_device *);
-static void pcnet32_load_multicast(struct net_device *dev);
-static void pcnet32_set_multicast_list(struct net_device *);
-static int pcnet32_ioctl(struct net_device *, struct ifreq *, int);
-static void pcnet32_watchdog(struct net_device *);
-static int mdio_read(struct net_device *dev, int phy_id, int reg_num);
-static void mdio_write(struct net_device *dev, int phy_id, int reg_num,
-                      int val);
-static void pcnet32_restart(struct net_device *dev, unsigned int csr0_bits);
-static void pcnet32_ethtool_test(struct net_device *dev,
-                                struct ethtool_test *eth_test, u64 * data);
-static int pcnet32_loopback_test(struct net_device *dev, uint64_t * data1);
-static int pcnet32_phys_id(struct net_device *dev, u32 data);
-static void pcnet32_led_blink_callback(struct net_device *dev);
-static int pcnet32_get_regs_len(struct net_device *dev);
-static void pcnet32_get_regs(struct net_device *dev, struct ethtool_regs *regs,
-                            void *ptr);
-static void pcnet32_purge_tx_ring(struct net_device *dev);
-static int pcnet32_alloc_ring(struct net_device *dev, const char *name);
-static void pcnet32_free_ring(struct net_device *dev);
-static void pcnet32_check_media(struct net_device *dev, int verbose);
-
-static u16 pcnet32_wio_read_csr(unsigned long addr, int index)
-{
-       outw(index, addr + PCNET32_WIO_RAP);
-       return inw(addr + PCNET32_WIO_RDP);
-}
-
-static void pcnet32_wio_write_csr(unsigned long addr, int index, u16 val)
-{
-       outw(index, addr + PCNET32_WIO_RAP);
-       outw(val, addr + PCNET32_WIO_RDP);
-}
-
-static u16 pcnet32_wio_read_bcr(unsigned long addr, int index)
-{
-       outw(index, addr + PCNET32_WIO_RAP);
-       return inw(addr + PCNET32_WIO_BDP);
-}
-
-static void pcnet32_wio_write_bcr(unsigned long addr, int index, u16 val)
-{
-       outw(index, addr + PCNET32_WIO_RAP);
-       outw(val, addr + PCNET32_WIO_BDP);
-}
-
-static u16 pcnet32_wio_read_rap(unsigned long addr)
-{
-       return inw(addr + PCNET32_WIO_RAP);
-}
-
-static void pcnet32_wio_write_rap(unsigned long addr, u16 val)
-{
-       outw(val, addr + PCNET32_WIO_RAP);
-}
-
-static void pcnet32_wio_reset(unsigned long addr)
-{
-       inw(addr + PCNET32_WIO_RESET);
-}
-
-static int pcnet32_wio_check(unsigned long addr)
-{
-       outw(88, addr + PCNET32_WIO_RAP);
-       return (inw(addr + PCNET32_WIO_RAP) == 88);
-}
-
-static struct pcnet32_access pcnet32_wio = {
-       .read_csr = pcnet32_wio_read_csr,
-       .write_csr = pcnet32_wio_write_csr,
-       .read_bcr = pcnet32_wio_read_bcr,
-       .write_bcr = pcnet32_wio_write_bcr,
-       .read_rap = pcnet32_wio_read_rap,
-       .write_rap = pcnet32_wio_write_rap,
-       .reset = pcnet32_wio_reset
-};
-
-static u16 pcnet32_dwio_read_csr(unsigned long addr, int index)
-{
-       outl(index, addr + PCNET32_DWIO_RAP);
-       return (inl(addr + PCNET32_DWIO_RDP) & 0xffff);
-}
-
-static void pcnet32_dwio_write_csr(unsigned long addr, int index, u16 val)
-{
-       outl(index, addr + PCNET32_DWIO_RAP);
-       outl(val, addr + PCNET32_DWIO_RDP);
-}
-
-static u16 pcnet32_dwio_read_bcr(unsigned long addr, int index)
-{
-       outl(index, addr + PCNET32_DWIO_RAP);
-       return (inl(addr + PCNET32_DWIO_BDP) & 0xffff);
-}
-
-static void pcnet32_dwio_write_bcr(unsigned long addr, int index, u16 val)
-{
-       outl(index, addr + PCNET32_DWIO_RAP);
-       outl(val, addr + PCNET32_DWIO_BDP);
-}
-
-static u16 pcnet32_dwio_read_rap(unsigned long addr)
-{
-       return (inl(addr + PCNET32_DWIO_RAP) & 0xffff);
-}
-
-static void pcnet32_dwio_write_rap(unsigned long addr, u16 val)
-{
-       outl(val, addr + PCNET32_DWIO_RAP);
-}
-
-static void pcnet32_dwio_reset(unsigned long addr)
-{
-       inl(addr + PCNET32_DWIO_RESET);
-}
-
-static int pcnet32_dwio_check(unsigned long addr)
-{
-       outl(88, addr + PCNET32_DWIO_RAP);
-       return ((inl(addr + PCNET32_DWIO_RAP) & 0xffff) == 88);
-}
-
-static struct pcnet32_access pcnet32_dwio = {
-       .read_csr = pcnet32_dwio_read_csr,
-       .write_csr = pcnet32_dwio_write_csr,
-       .read_bcr = pcnet32_dwio_read_bcr,
-       .write_bcr = pcnet32_dwio_write_bcr,
-       .read_rap = pcnet32_dwio_read_rap,
-       .write_rap = pcnet32_dwio_write_rap,
-       .reset = pcnet32_dwio_reset
-};
-
-static void pcnet32_netif_stop(struct net_device *dev)
-{
-       struct pcnet32_private *lp = netdev_priv(dev);
-
-       dev->trans_start = jiffies;
-       napi_disable(&lp->napi);
-       netif_tx_disable(dev);
-}
-
-static void pcnet32_netif_start(struct net_device *dev)
-{
-       struct pcnet32_private *lp = netdev_priv(dev);
-       ulong ioaddr = dev->base_addr;
-       u16 val;
-
-       netif_wake_queue(dev);
-       val = lp->a.read_csr(ioaddr, CSR3);
-       val &= 0x00ff;
-       lp->a.write_csr(ioaddr, CSR3, val);
-       napi_enable(&lp->napi);
-}
-
-/*
- * Allocate space for the new sized tx ring.
- * Free old resources
- * Save new resources.
- * Any failure keeps old resources.
- * Must be called with lp->lock held.
- */
-static void pcnet32_realloc_tx_ring(struct net_device *dev,
-                                   struct pcnet32_private *lp,
-                                   unsigned int size)
-{
-       dma_addr_t new_ring_dma_addr;
-       dma_addr_t *new_dma_addr_list;
-       struct pcnet32_tx_head *new_tx_ring;
-       struct sk_buff **new_skb_list;
-
-       pcnet32_purge_tx_ring(dev);
-
-       new_tx_ring = pci_alloc_consistent(lp->pci_dev,
-                                          sizeof(struct pcnet32_tx_head) *
-                                          (1 << size),
-                                          &new_ring_dma_addr);
-       if (new_tx_ring == NULL) {
-               if (netif_msg_drv(lp))
-                       printk("\n" KERN_ERR
-                              "%s: Consistent memory allocation failed.\n",
-                              dev->name);
-               return;
-       }
-       memset(new_tx_ring, 0, sizeof(struct pcnet32_tx_head) * (1 << size));
-
-       new_dma_addr_list = kcalloc((1 << size), sizeof(dma_addr_t),
-                               GFP_ATOMIC);
-       if (!new_dma_addr_list) {
-               if (netif_msg_drv(lp))
-                       printk("\n" KERN_ERR
-                              "%s: Memory allocation failed.\n", dev->name);
-               goto free_new_tx_ring;
-       }
-
-       new_skb_list = kcalloc((1 << size), sizeof(struct sk_buff *),
-                               GFP_ATOMIC);
-       if (!new_skb_list) {
-               if (netif_msg_drv(lp))
-                       printk("\n" KERN_ERR
-                              "%s: Memory allocation failed.\n", dev->name);
-               goto free_new_lists;
-       }
-
-       kfree(lp->tx_skbuff);
-       kfree(lp->tx_dma_addr);
-       pci_free_consistent(lp->pci_dev,
-                           sizeof(struct pcnet32_tx_head) *
-                           lp->tx_ring_size, lp->tx_ring,
-                           lp->tx_ring_dma_addr);
-
-       lp->tx_ring_size = (1 << size);
-       lp->tx_mod_mask = lp->tx_ring_size - 1;
-       lp->tx_len_bits = (size << 12);
-       lp->tx_ring = new_tx_ring;
-       lp->tx_ring_dma_addr = new_ring_dma_addr;
-       lp->tx_dma_addr = new_dma_addr_list;
-       lp->tx_skbuff = new_skb_list;
-       return;
-
-    free_new_lists:
-       kfree(new_dma_addr_list);
-    free_new_tx_ring:
-       pci_free_consistent(lp->pci_dev,
-                           sizeof(struct pcnet32_tx_head) *
-                           (1 << size),
-                           new_tx_ring,
-                           new_ring_dma_addr);
-       return;
-}
-
-/*
- * Allocate space for the new sized rx ring.
- * Re-use old receive buffers.
- *   alloc extra buffers
- *   free unneeded buffers
- *   free unneeded buffers
- * Save new resources.
- * Any failure keeps old resources.
- * Must be called with lp->lock held.
- */
-static void pcnet32_realloc_rx_ring(struct net_device *dev,
-                                   struct pcnet32_private *lp,
-                                   unsigned int size)
-{
-       dma_addr_t new_ring_dma_addr;
-       dma_addr_t *new_dma_addr_list;
-       struct pcnet32_rx_head *new_rx_ring;
-       struct sk_buff **new_skb_list;
-       int new, overlap;
-
-       new_rx_ring = pci_alloc_consistent(lp->pci_dev,
-                                          sizeof(struct pcnet32_rx_head) *
-                                          (1 << size),
-                                          &new_ring_dma_addr);
-       if (new_rx_ring == NULL) {
-               if (netif_msg_drv(lp))
-                       printk("\n" KERN_ERR
-                              "%s: Consistent memory allocation failed.\n",
-                              dev->name);
-               return;
-       }
-       memset(new_rx_ring, 0, sizeof(struct pcnet32_rx_head) * (1 << size));
-
-       new_dma_addr_list = kcalloc((1 << size), sizeof(dma_addr_t),
-                               GFP_ATOMIC);
-       if (!new_dma_addr_list) {
-               if (netif_msg_drv(lp))
-                       printk("\n" KERN_ERR
-                              "%s: Memory allocation failed.\n", dev->name);
-               goto free_new_rx_ring;
-       }
-
-       new_skb_list = kcalloc((1 << size), sizeof(struct sk_buff *),
-                               GFP_ATOMIC);
-       if (!new_skb_list) {
-               if (netif_msg_drv(lp))
-                       printk("\n" KERN_ERR
-                              "%s: Memory allocation failed.\n", dev->name);
-               goto free_new_lists;
-       }
-
-       /* first copy the current receive buffers */
-       overlap = min(size, lp->rx_ring_size);
-       for (new = 0; new < overlap; new++) {
-               new_rx_ring[new] = lp->rx_ring[new];
-               new_dma_addr_list[new] = lp->rx_dma_addr[new];
-               new_skb_list[new] = lp->rx_skbuff[new];
-       }
-       /* now allocate any new buffers needed */
-       for (; new < size; new++ ) {
-               struct sk_buff *rx_skbuff;
-               new_skb_list[new] = dev_alloc_skb(PKT_BUF_SKB);
-               if (!(rx_skbuff = new_skb_list[new])) {
-                       /* keep the original lists and buffers */
-                       if (netif_msg_drv(lp))
-                               printk(KERN_ERR
-                                      "%s: pcnet32_realloc_rx_ring 
dev_alloc_skb failed.\n",
-                                      dev->name);
-                       goto free_all_new;
-               }
-               skb_reserve(rx_skbuff, NET_IP_ALIGN);
-
-               new_dma_addr_list[new] =
-                           pci_map_single(lp->pci_dev, rx_skbuff->data,
-                                          PKT_BUF_SIZE, PCI_DMA_FROMDEVICE);
-               new_rx_ring[new].base = cpu_to_le32(new_dma_addr_list[new]);
-               new_rx_ring[new].buf_length = cpu_to_le16(NEG_BUF_SIZE);
-               new_rx_ring[new].status = cpu_to_le16(0x8000);
-       }
-       /* and free any unneeded buffers */
-       for (; new < lp->rx_ring_size; new++) {
-               if (lp->rx_skbuff[new]) {
-                       pci_unmap_single(lp->pci_dev, lp->rx_dma_addr[new],
-                                        PKT_BUF_SIZE, PCI_DMA_FROMDEVICE);
-                       dev_kfree_skb(lp->rx_skbuff[new]);
-               }
-       }
-
-       kfree(lp->rx_skbuff);
-       kfree(lp->rx_dma_addr);
-       pci_free_consistent(lp->pci_dev,
-                           sizeof(struct pcnet32_rx_head) *
-                           lp->rx_ring_size, lp->rx_ring,
-                           lp->rx_ring_dma_addr);
-
-       lp->rx_ring_size = (1 << size);
-       lp->rx_mod_mask = lp->rx_ring_size - 1;
-       lp->rx_len_bits = (size << 4);
-       lp->rx_ring = new_rx_ring;
-       lp->rx_ring_dma_addr = new_ring_dma_addr;
-       lp->rx_dma_addr = new_dma_addr_list;
-       lp->rx_skbuff = new_skb_list;
-       return;
-
-    free_all_new:
-       for (; --new >= lp->rx_ring_size; ) {
-               if (new_skb_list[new]) {
-                       pci_unmap_single(lp->pci_dev, new_dma_addr_list[new],
-                                        PKT_BUF_SIZE, PCI_DMA_FROMDEVICE);
-                       dev_kfree_skb(new_skb_list[new]);
-               }
-       }
-       kfree(new_skb_list);
-    free_new_lists:
-       kfree(new_dma_addr_list);
-    free_new_rx_ring:
-       pci_free_consistent(lp->pci_dev,
-                           sizeof(struct pcnet32_rx_head) *
-                           (1 << size),
-                           new_rx_ring,
-                           new_ring_dma_addr);
-       return;
-}
-
-static void pcnet32_purge_rx_ring(struct net_device *dev)
-{
-       struct pcnet32_private *lp = netdev_priv(dev);
-       int i;
-
-       /* free all allocated skbuffs */
-       for (i = 0; i < lp->rx_ring_size; i++) {
-               lp->rx_ring[i].status = 0;      /* CPU owns buffer */
-               wmb();          /* Make sure adapter sees owner change */
-               if (lp->rx_skbuff[i]) {
-                       pci_unmap_single(lp->pci_dev, lp->rx_dma_addr[i],
-                                        PKT_BUF_SIZE, PCI_DMA_FROMDEVICE);
-                       dev_kfree_skb_any(lp->rx_skbuff[i]);
-               }
-               lp->rx_skbuff[i] = NULL;
-               lp->rx_dma_addr[i] = 0;
-       }
-}
-
-#ifdef CONFIG_NET_POLL_CONTROLLER
-static void pcnet32_poll_controller(struct net_device *dev)
-{
-       disable_irq(dev->irq);
-       pcnet32_interrupt(0, dev);
-       enable_irq(dev->irq);
-}
-#endif
-
-static int pcnet32_get_settings(struct net_device *dev, struct ethtool_cmd 
*cmd)
-{
-       struct pcnet32_private *lp = netdev_priv(dev);
-       unsigned long flags;
-       int r = -EOPNOTSUPP;
-
-       if (lp->mii) {
-               spin_lock_irqsave(&lp->lock, flags);
-               mii_ethtool_gset(&lp->mii_if, cmd);
-               spin_unlock_irqrestore(&lp->lock, flags);
-               r = 0;
-       }
-       return r;
-}
-
-static int pcnet32_set_settings(struct net_device *dev, struct ethtool_cmd 
*cmd)
-{
-       struct pcnet32_private *lp = netdev_priv(dev);
-       unsigned long flags;
-       int r = -EOPNOTSUPP;
-
-       if (lp->mii) {
-               spin_lock_irqsave(&lp->lock, flags);
-               r = mii_ethtool_sset(&lp->mii_if, cmd);
-               spin_unlock_irqrestore(&lp->lock, flags);
-       }
-       return r;
-}
-
-static void pcnet32_get_drvinfo(struct net_device *dev,
-                               struct ethtool_drvinfo *info)
-{
-       struct pcnet32_private *lp = netdev_priv(dev);
-
-       strcpy(info->driver, DRV_NAME);
-       strcpy(info->version, DRV_VERSION);
-       if (lp->pci_dev)
-               strcpy(info->bus_info, pci_name(lp->pci_dev));
-       else
-               sprintf(info->bus_info, "VLB 0x%lx", dev->base_addr);
-}
-
-static u32 pcnet32_get_link(struct net_device *dev)
-{
-       struct pcnet32_private *lp = netdev_priv(dev);
-       unsigned long flags;
-       int r;
-
-       spin_lock_irqsave(&lp->lock, flags);
-       if (lp->mii) {
-               r = mii_link_ok(&lp->mii_if);
-       } else if (lp->chip_version >= PCNET32_79C970A) {
-               ulong ioaddr = dev->base_addr;  /* card base I/O address */
-               r = (lp->a.read_bcr(ioaddr, 4) != 0xc0);
-       } else {        /* can not detect link on really old chips */
-               r = 1;
-       }
-       spin_unlock_irqrestore(&lp->lock, flags);
-
-       return r;
-}
-
-static u32 pcnet32_get_msglevel(struct net_device *dev)
-{
-       struct pcnet32_private *lp = netdev_priv(dev);
-       return lp->msg_enable;
-}
-
-static void pcnet32_set_msglevel(struct net_device *dev, u32 value)
-{
-       struct pcnet32_private *lp = netdev_priv(dev);
-       lp->msg_enable = value;
-}
-
-static int pcnet32_nway_reset(struct net_device *dev)
-{
-       struct pcnet32_private *lp = netdev_priv(dev);
-       unsigned long flags;
-       int r = -EOPNOTSUPP;
-
-       if (lp->mii) {
-               spin_lock_irqsave(&lp->lock, flags);
-               r = mii_nway_restart(&lp->mii_if);
-               spin_unlock_irqrestore(&lp->lock, flags);
-       }
-       return r;
-}
-
-static void pcnet32_get_ringparam(struct net_device *dev,
-                                 struct ethtool_ringparam *ering)
-{
-       struct pcnet32_private *lp = netdev_priv(dev);
-
-       ering->tx_max_pending = TX_MAX_RING_SIZE;
-       ering->tx_pending = lp->tx_ring_size;
-       ering->rx_max_pending = RX_MAX_RING_SIZE;
-       ering->rx_pending = lp->rx_ring_size;
-}
-
-static int pcnet32_set_ringparam(struct net_device *dev,
-                                struct ethtool_ringparam *ering)
-{
-       struct pcnet32_private *lp = netdev_priv(dev);
-       unsigned long flags;
-       unsigned int size;
-       ulong ioaddr = dev->base_addr;
-       int i;
-
-       if (ering->rx_mini_pending || ering->rx_jumbo_pending)
-               return -EINVAL;
-
-       if (netif_running(dev))
-               pcnet32_netif_stop(dev);
-
-       spin_lock_irqsave(&lp->lock, flags);
-       lp->a.write_csr(ioaddr, CSR0, CSR0_STOP);       /* stop the chip */
-
-       size = min(ering->tx_pending, (unsigned int)TX_MAX_RING_SIZE);
-
-       /* set the minimum ring size to 4, to allow the loopback test to work
-        * unchanged.
-        */
-       for (i = 2; i <= PCNET32_LOG_MAX_TX_BUFFERS; i++) {
-               if (size <= (1 << i))
-                       break;
-       }
-       if ((1 << i) != lp->tx_ring_size)
-               pcnet32_realloc_tx_ring(dev, lp, i);
-
-       size = min(ering->rx_pending, (unsigned int)RX_MAX_RING_SIZE);
-       for (i = 2; i <= PCNET32_LOG_MAX_RX_BUFFERS; i++) {
-               if (size <= (1 << i))
-                       break;
-       }
-       if ((1 << i) != lp->rx_ring_size)
-               pcnet32_realloc_rx_ring(dev, lp, i);
-
-       lp->napi.weight = lp->rx_ring_size / 2;
-
-       if (netif_running(dev)) {
-               pcnet32_netif_start(dev);
-               pcnet32_restart(dev, CSR0_NORMAL);
-       }
-
-       spin_unlock_irqrestore(&lp->lock, flags);
-
-       if (netif_msg_drv(lp))
-               printk(KERN_INFO
-                      "%s: Ring Param Settings: RX: %d, TX: %d\n", dev->name,
-                      lp->rx_ring_size, lp->tx_ring_size);
-
-       return 0;
-}
-
-static void pcnet32_get_strings(struct net_device *dev, u32 stringset,
-                               u8 * data)
-{
-       memcpy(data, pcnet32_gstrings_test, sizeof(pcnet32_gstrings_test));
-}
-
-static int pcnet32_get_sset_count(struct net_device *dev, int sset)
-{
-       switch (sset) {
-       case ETH_SS_TEST:
-               return PCNET32_TEST_LEN;
-       default:
-               return -EOPNOTSUPP;
-       }
-}
-
-static void pcnet32_ethtool_test(struct net_device *dev,
-                                struct ethtool_test *test, u64 * data)
-{
-       struct pcnet32_private *lp = netdev_priv(dev);
-       int rc;
-
-       if (test->flags == ETH_TEST_FL_OFFLINE) {
-               rc = pcnet32_loopback_test(dev, data);
-               if (rc) {
-                       if (netif_msg_hw(lp))
-                               printk(KERN_DEBUG "%s: Loopback test failed.\n",
-                                      dev->name);
-                       test->flags |= ETH_TEST_FL_FAILED;
-               } else if (netif_msg_hw(lp))
-                       printk(KERN_DEBUG "%s: Loopback test passed.\n",
-                              dev->name);
-       } else if (netif_msg_hw(lp))
-               printk(KERN_DEBUG
-                      "%s: No tests to run (specify 'Offline' on ethtool).",
-                      dev->name);
-}                              /* end pcnet32_ethtool_test */
-
-static int pcnet32_loopback_test(struct net_device *dev, uint64_t * data1)
-{
-       struct pcnet32_private *lp = netdev_priv(dev);
-       struct pcnet32_access *a = &lp->a;      /* access to registers */
-       ulong ioaddr = dev->base_addr;  /* card base I/O address */
-       struct sk_buff *skb;    /* sk buff */
-       int x, i;               /* counters */
-       int numbuffs = 4;       /* number of TX/RX buffers and descs */
-       u16 status = 0x8300;    /* TX ring status */
-       __le16 teststatus;      /* test of ring status */
-       int rc;                 /* return code */
-       int size;               /* size of packets */
-       unsigned char *packet;  /* source packet data */
-       static const int data_len = 60; /* length of source packets */
-       unsigned long flags;
-       unsigned long ticks;
-
-       rc = 1;                 /* default to fail */
-
-       if (netif_running(dev))
-               pcnet32_netif_stop(dev);
-
-       spin_lock_irqsave(&lp->lock, flags);
-       lp->a.write_csr(ioaddr, CSR0, CSR0_STOP);       /* stop the chip */
-
-       numbuffs = min(numbuffs, (int)min(lp->rx_ring_size, lp->tx_ring_size));
-
-       /* Reset the PCNET32 */
-       lp->a.reset(ioaddr);
-       lp->a.write_csr(ioaddr, CSR4, 0x0915);  /* auto tx pad */
-
-       /* switch pcnet32 to 32bit mode */
-       lp->a.write_bcr(ioaddr, 20, 2);
-
-       /* purge & init rings but don't actually restart */
-       pcnet32_restart(dev, 0x0000);
-
-       lp->a.write_csr(ioaddr, CSR0, CSR0_STOP);       /* Set STOP bit */
-
-       /* Initialize Transmit buffers. */
-       size = data_len + 15;
-       for (x = 0; x < numbuffs; x++) {
-               if (!(skb = dev_alloc_skb(size))) {
-                       if (netif_msg_hw(lp))
-                               printk(KERN_DEBUG
-                                      "%s: Cannot allocate skb at line: %d!\n",
-                                      dev->name, __LINE__);
-                       goto clean_up;
-               } else {
-                       packet = skb->data;
-                       skb_put(skb, size);     /* create space for data */
-                       lp->tx_skbuff[x] = skb;
-                       lp->tx_ring[x].length = cpu_to_le16(-skb->len);
-                       lp->tx_ring[x].misc = 0;
-
-                       /* put DA and SA into the skb */
-                       for (i = 0; i < 6; i++)
-                               *packet++ = dev->dev_addr[i];
-                       for (i = 0; i < 6; i++)
-                               *packet++ = dev->dev_addr[i];
-                       /* type */
-                       *packet++ = 0x08;
-                       *packet++ = 0x06;
-                       /* packet number */
-                       *packet++ = x;
-                       /* fill packet with data */
-                       for (i = 0; i < data_len; i++)
-                               *packet++ = i;
-
-                       lp->tx_dma_addr[x] =
-                           pci_map_single(lp->pci_dev, skb->data, skb->len,
-                                          PCI_DMA_TODEVICE);
-                       lp->tx_ring[x].base = cpu_to_le32(lp->tx_dma_addr[x]);
-                       wmb();  /* Make sure owner changes after all others are 
visible */
-                       lp->tx_ring[x].status = cpu_to_le16(status);
-               }
-       }
-
-       x = a->read_bcr(ioaddr, 32);    /* set internal loopback in BCR32 */
-       a->write_bcr(ioaddr, 32, x | 0x0002);
-
-       /* set int loopback in CSR15 */
-       x = a->read_csr(ioaddr, CSR15) & 0xfffc;
-       lp->a.write_csr(ioaddr, CSR15, x | 0x0044);
-
-       teststatus = cpu_to_le16(0x8000);
-       lp->a.write_csr(ioaddr, CSR0, CSR0_START);      /* Set STRT bit */
-
-       /* Check status of descriptors */
-       for (x = 0; x < numbuffs; x++) {
-               ticks = 0;
-               rmb();
-               while ((lp->rx_ring[x].status & teststatus) && (ticks < 200)) {
-                       spin_unlock_irqrestore(&lp->lock, flags);
-                       msleep(1);
-                       spin_lock_irqsave(&lp->lock, flags);
-                       rmb();
-                       ticks++;
-               }
-               if (ticks == 200) {
-                       if (netif_msg_hw(lp))
-                               printk("%s: Desc %d failed to reset!\n",
-                                      dev->name, x);
-                       break;
-               }
-       }
-
-       lp->a.write_csr(ioaddr, CSR0, CSR0_STOP);       /* Set STOP bit */
-       wmb();
-       if (netif_msg_hw(lp) && netif_msg_pktdata(lp)) {
-               printk(KERN_DEBUG "%s: RX loopback packets:\n", dev->name);
-
-               for (x = 0; x < numbuffs; x++) {
-                       printk(KERN_DEBUG "%s: Packet %d:\n", dev->name, x);
-                       skb = lp->rx_skbuff[x];
-                       for (i = 0; i < size; i++) {
-                               printk("%02x ", *(skb->data + i));
-                       }
-                       printk("\n");
-               }
-       }
-
-       x = 0;
-       rc = 0;
-       while (x < numbuffs && !rc) {
-               skb = lp->rx_skbuff[x];
-               packet = lp->tx_skbuff[x]->data;
-               for (i = 0; i < size; i++) {
-                       if (*(skb->data + i) != packet[i]) {
-                               if (netif_msg_hw(lp))
-                                       printk(KERN_DEBUG
-                                              "%s: Error in compare! %2x - 
%02x %02x\n",
-                                              dev->name, i, *(skb->data + i),
-                                              packet[i]);
-                               rc = 1;
-                               break;
-                       }
-               }
-               x++;
-       }
-
-      clean_up:
-       *data1 = rc;
-       pcnet32_purge_tx_ring(dev);
-
-       x = a->read_csr(ioaddr, CSR15);
-       a->write_csr(ioaddr, CSR15, (x & ~0x0044));     /* reset bits 6 and 2 */
-
-       x = a->read_bcr(ioaddr, 32);    /* reset internal loopback */
-       a->write_bcr(ioaddr, 32, (x & ~0x0002));
-
-       if (netif_running(dev)) {
-               pcnet32_netif_start(dev);
-               pcnet32_restart(dev, CSR0_NORMAL);
-       } else {
-               pcnet32_purge_rx_ring(dev);
-               lp->a.write_bcr(ioaddr, 20, 4); /* return to 16bit mode */
-       }
-       spin_unlock_irqrestore(&lp->lock, flags);
-
-       return (rc);
-}                              /* end pcnet32_loopback_test  */
-
-static void pcnet32_led_blink_callback(struct net_device *dev)
-{
-       struct pcnet32_private *lp = netdev_priv(dev);
-       struct pcnet32_access *a = &lp->a;
-       ulong ioaddr = dev->base_addr;
-       unsigned long flags;
-       int i;
-
-       spin_lock_irqsave(&lp->lock, flags);
-       for (i = 4; i < 8; i++) {
-               a->write_bcr(ioaddr, i, a->read_bcr(ioaddr, i) ^ 0x4000);
-       }
-       spin_unlock_irqrestore(&lp->lock, flags);
-
-       mod_timer(&lp->blink_timer, PCNET32_BLINK_TIMEOUT);
-}
-
-static int pcnet32_phys_id(struct net_device *dev, u32 data)
-{
-       struct pcnet32_private *lp = netdev_priv(dev);
-       struct pcnet32_access *a = &lp->a;
-       ulong ioaddr = dev->base_addr;
-       unsigned long flags;
-       int i, regs[4];
-
-       if (!lp->blink_timer.function) {
-               init_timer(&lp->blink_timer);
-               lp->blink_timer.function = (void *)pcnet32_led_blink_callback;
-               lp->blink_timer.data = (unsigned long)dev;
-       }
-
-       /* Save the current value of the bcrs */
-       spin_lock_irqsave(&lp->lock, flags);
-       for (i = 4; i < 8; i++) {
-               regs[i - 4] = a->read_bcr(ioaddr, i);
-       }
-       spin_unlock_irqrestore(&lp->lock, flags);
-
-       mod_timer(&lp->blink_timer, jiffies);
-       set_current_state(TASK_INTERRUPTIBLE);
-
-       /* AV: the limit here makes no sense whatsoever */
-       if ((!data) || (data > (u32) (MAX_SCHEDULE_TIMEOUT / HZ)))
-               data = (u32) (MAX_SCHEDULE_TIMEOUT / HZ);
-
-       msleep_interruptible(data * 1000);
-       del_timer_sync(&lp->blink_timer);
-
-       /* Restore the original value of the bcrs */
-       spin_lock_irqsave(&lp->lock, flags);
-       for (i = 4; i < 8; i++) {
-               a->write_bcr(ioaddr, i, regs[i - 4]);
-       }
-       spin_unlock_irqrestore(&lp->lock, flags);
-
-       return 0;
-}
-
-/*
- * lp->lock must be held.
- */
-static int pcnet32_suspend(struct net_device *dev, unsigned long *flags,
-               int can_sleep)
-{
-       int csr5;
-       struct pcnet32_private *lp = netdev_priv(dev);
-       struct pcnet32_access *a = &lp->a;
-       ulong ioaddr = dev->base_addr;
-       int ticks;
-
-       /* really old chips have to be stopped. */
-       if (lp->chip_version < PCNET32_79C970A)
-               return 0;
-
-       /* set SUSPEND (SPND) - CSR5 bit 0 */
-       csr5 = a->read_csr(ioaddr, CSR5);
-       a->write_csr(ioaddr, CSR5, csr5 | CSR5_SUSPEND);
-
-       /* poll waiting for bit to be set */
-       ticks = 0;
-       while (!(a->read_csr(ioaddr, CSR5) & CSR5_SUSPEND)) {
-               spin_unlock_irqrestore(&lp->lock, *flags);
-               if (can_sleep)
-                       msleep(1);
-               else
-                       mdelay(1);
-               spin_lock_irqsave(&lp->lock, *flags);
-               ticks++;
-               if (ticks > 200) {
-                       if (netif_msg_hw(lp))
-                               printk(KERN_DEBUG
-                                      "%s: Error getting into suspend!\n",
-                                      dev->name);
-                       return 0;
-               }
-       }
-       return 1;
-}
-
-/*
- * process one receive descriptor entry
- */
-
-static void pcnet32_rx_entry(struct net_device *dev,
-                            struct pcnet32_private *lp,
-                            struct pcnet32_rx_head *rxp,
-                            int entry)
-{
-       int status = (short)le16_to_cpu(rxp->status) >> 8;
-       int rx_in_place = 0;
-       struct sk_buff *skb;
-       short pkt_len;
-
-       if (status != 0x03) {   /* There was an error. */
-               /*
-                * There is a tricky error noted by John Murphy,
-                * <address@hidden> to Russ Nelson: Even with full-sized
-                * buffers it's possible for a jabber packet to use two
-                * buffers, with only the last correctly noting the error.
-                */
-               if (status & 0x01)      /* Only count a general error at the */
-                       dev->stats.rx_errors++; /* end of a packet. */
-               if (status & 0x20)
-                       dev->stats.rx_frame_errors++;
-               if (status & 0x10)
-                       dev->stats.rx_over_errors++;
-               if (status & 0x08)
-                       dev->stats.rx_crc_errors++;
-               if (status & 0x04)
-                       dev->stats.rx_fifo_errors++;
-               return;
-       }
-
-       pkt_len = (le32_to_cpu(rxp->msg_length) & 0xfff) - 4;
-
-       /* Discard oversize frames. */
-       if (unlikely(pkt_len > PKT_BUF_SIZE)) {
-               if (netif_msg_drv(lp))
-                       printk(KERN_ERR "%s: Impossible packet size %d!\n",
-                              dev->name, pkt_len);
-               dev->stats.rx_errors++;
-               return;
-       }
-       if (pkt_len < 60) {
-               if (netif_msg_rx_err(lp))
-                       printk(KERN_ERR "%s: Runt packet!\n", dev->name);
-               dev->stats.rx_errors++;
-               return;
-       }
-
-       if (pkt_len > rx_copybreak) {
-               struct sk_buff *newskb;
-
-               if ((newskb = dev_alloc_skb(PKT_BUF_SKB))) {
-                       skb_reserve(newskb, NET_IP_ALIGN);
-                       skb = lp->rx_skbuff[entry];
-                       pci_unmap_single(lp->pci_dev,
-                                        lp->rx_dma_addr[entry],
-                                        PKT_BUF_SIZE,
-                                        PCI_DMA_FROMDEVICE);
-                       skb_put(skb, pkt_len);
-                       lp->rx_skbuff[entry] = newskb;
-                       lp->rx_dma_addr[entry] =
-                                           pci_map_single(lp->pci_dev,
-                                                          newskb->data,
-                                                          PKT_BUF_SIZE,
-                                                          PCI_DMA_FROMDEVICE);
-                       rxp->base = cpu_to_le32(lp->rx_dma_addr[entry]);
-                       rx_in_place = 1;
-               } else
-                       skb = NULL;
-       } else {
-               skb = dev_alloc_skb(pkt_len + NET_IP_ALIGN);
-       }
-
-       if (skb == NULL) {
-               if (netif_msg_drv(lp))
-                       printk(KERN_ERR
-                              "%s: Memory squeeze, dropping packet.\n",
-                              dev->name);
-               dev->stats.rx_dropped++;
-               return;
-       }
-       skb->dev = dev;
-       if (!rx_in_place) {
-               skb_reserve(skb, NET_IP_ALIGN);
-               skb_put(skb, pkt_len);  /* Make room */
-               pci_dma_sync_single_for_cpu(lp->pci_dev,
-                                           lp->rx_dma_addr[entry],
-                                           pkt_len,
-                                           PCI_DMA_FROMDEVICE);
-               skb_copy_to_linear_data(skb,
-                                (unsigned char *)(lp->rx_skbuff[entry]->data),
-                                pkt_len);
-               pci_dma_sync_single_for_device(lp->pci_dev,
-                                              lp->rx_dma_addr[entry],
-                                              pkt_len,
-                                              PCI_DMA_FROMDEVICE);
-       }
-       dev->stats.rx_bytes += skb->len;
-       skb->protocol = eth_type_trans(skb, dev);
-       netif_receive_skb(skb);
-       dev->stats.rx_packets++;
-       return;
-}
-
-static int pcnet32_rx(struct net_device *dev, int budget)
-{
-       struct pcnet32_private *lp = netdev_priv(dev);
-       int entry = lp->cur_rx & lp->rx_mod_mask;
-       struct pcnet32_rx_head *rxp = &lp->rx_ring[entry];
-       int npackets = 0;
-
-       /* If we own the next entry, it's a new packet. Send it up. */
-       while (npackets < budget && (short)le16_to_cpu(rxp->status) >= 0) {
-               pcnet32_rx_entry(dev, lp, rxp, entry);
-               npackets += 1;
-               /*
-                * The docs say that the buffer length isn't touched, but Andrew
-                * Boyd of QNX reports that some revs of the 79C965 clear it.
-                */
-               rxp->buf_length = cpu_to_le16(NEG_BUF_SIZE);
-               wmb();  /* Make sure owner changes after others are visible */
-               rxp->status = cpu_to_le16(0x8000);
-               entry = (++lp->cur_rx) & lp->rx_mod_mask;
-               rxp = &lp->rx_ring[entry];
-       }
-
-       return npackets;
-}
-
-static int pcnet32_tx(struct net_device *dev)
-{
-       struct pcnet32_private *lp = netdev_priv(dev);
-       unsigned int dirty_tx = lp->dirty_tx;
-       int delta;
-       int must_restart = 0;
-
-       while (dirty_tx != lp->cur_tx) {
-               int entry = dirty_tx & lp->tx_mod_mask;
-               int status = (short)le16_to_cpu(lp->tx_ring[entry].status);
-
-               if (status < 0)
-                       break;  /* It still hasn't been Txed */
-
-               lp->tx_ring[entry].base = 0;
-
-               if (status & 0x4000) {
-                       /* There was a major error, log it. */
-                       int err_status = le32_to_cpu(lp->tx_ring[entry].misc);
-                       dev->stats.tx_errors++;
-                       if (netif_msg_tx_err(lp))
-                               printk(KERN_ERR
-                                      "%s: Tx error status=%04x 
err_status=%08x\n",
-                                      dev->name, status,
-                                      err_status);
-                       if (err_status & 0x04000000)
-                               dev->stats.tx_aborted_errors++;
-                       if (err_status & 0x08000000)
-                               dev->stats.tx_carrier_errors++;
-                       if (err_status & 0x10000000)
-                               dev->stats.tx_window_errors++;
-#ifndef DO_DXSUFLO
-                       if (err_status & 0x40000000) {
-                               dev->stats.tx_fifo_errors++;
-                               /* Ackk!  On FIFO errors the Tx unit is turned 
off! */
-                               /* Remove this verbosity later! */
-                               if (netif_msg_tx_err(lp))
-                                       printk(KERN_ERR
-                                              "%s: Tx FIFO error!\n",
-                                              dev->name);
-                               must_restart = 1;
-                       }
-#else
-                       if (err_status & 0x40000000) {
-                               dev->stats.tx_fifo_errors++;
-                               if (!lp->dxsuflo) {     /* If controller 
doesn't recover ... */
-                                       /* Ackk!  On FIFO errors the Tx unit is 
turned off! */
-                                       /* Remove this verbosity later! */
-                                       if (netif_msg_tx_err(lp))
-                                               printk(KERN_ERR
-                                                      "%s: Tx FIFO error!\n",
-                                                      dev->name);
-                                       must_restart = 1;
-                               }
-                       }
-#endif
-               } else {
-                       if (status & 0x1800)
-                               dev->stats.collisions++;
-                       dev->stats.tx_packets++;
-               }
-
-               /* We must free the original skb */
-               if (lp->tx_skbuff[entry]) {
-                       pci_unmap_single(lp->pci_dev,
-                                        lp->tx_dma_addr[entry],
-                                        lp->tx_skbuff[entry]->
-                                        len, PCI_DMA_TODEVICE);
-                       dev_kfree_skb_any(lp->tx_skbuff[entry]);
-                       lp->tx_skbuff[entry] = NULL;
-                       lp->tx_dma_addr[entry] = 0;
-               }
-               dirty_tx++;
-       }
-
-       delta = (lp->cur_tx - dirty_tx) & (lp->tx_mod_mask + lp->tx_ring_size);
-       if (delta > lp->tx_ring_size) {
-               if (netif_msg_drv(lp))
-                       printk(KERN_ERR
-                              "%s: out-of-sync dirty pointer, %d vs. %d, 
full=%d.\n",
-                              dev->name, dirty_tx, lp->cur_tx,
-                              lp->tx_full);
-               dirty_tx += lp->tx_ring_size;
-               delta -= lp->tx_ring_size;
-       }
-
-       if (lp->tx_full &&
-           netif_queue_stopped(dev) &&
-           delta < lp->tx_ring_size - 2) {
-               /* The ring is no longer full, clear tbusy. */
-               lp->tx_full = 0;
-               netif_wake_queue(dev);
-       }
-       lp->dirty_tx = dirty_tx;
-
-       return must_restart;
-}
-
-static int pcnet32_poll(struct napi_struct *napi, int budget)
-{
-       struct pcnet32_private *lp = container_of(napi, struct pcnet32_private, 
napi);
-       struct net_device *dev = lp->dev;
-       unsigned long ioaddr = dev->base_addr;
-       unsigned long flags;
-       int work_done;
-       u16 val;
-
-       work_done = pcnet32_rx(dev, budget);
-
-       spin_lock_irqsave(&lp->lock, flags);
-       if (pcnet32_tx(dev)) {
-               /* reset the chip to clear the error condition, then restart */
-               lp->a.reset(ioaddr);
-               lp->a.write_csr(ioaddr, CSR4, 0x0915);  /* auto tx pad */
-               pcnet32_restart(dev, CSR0_START);
-               netif_wake_queue(dev);
-       }
-       spin_unlock_irqrestore(&lp->lock, flags);
-
-       if (work_done < budget) {
-               spin_lock_irqsave(&lp->lock, flags);
-
-               __netif_rx_complete(napi);
-
-               /* clear interrupt masks */
-               val = lp->a.read_csr(ioaddr, CSR3);
-               val &= 0x00ff;
-               lp->a.write_csr(ioaddr, CSR3, val);
-
-               /* Set interrupt enable. */
-               lp->a.write_csr(ioaddr, CSR0, CSR0_INTEN);
-               mmiowb();
-               spin_unlock_irqrestore(&lp->lock, flags);
-       }
-       return work_done;
-}
-
-#define PCNET32_REGS_PER_PHY   32
-#define PCNET32_MAX_PHYS       32
-static int pcnet32_get_regs_len(struct net_device *dev)
-{
-       struct pcnet32_private *lp = netdev_priv(dev);
-       int j = lp->phycount * PCNET32_REGS_PER_PHY;
-
-       return ((PCNET32_NUM_REGS + j) * sizeof(u16));
-}
-
-static void pcnet32_get_regs(struct net_device *dev, struct ethtool_regs *regs,
-                            void *ptr)
-{
-       int i, csr0;
-       u16 *buff = ptr;
-       struct pcnet32_private *lp = netdev_priv(dev);
-       struct pcnet32_access *a = &lp->a;
-       ulong ioaddr = dev->base_addr;
-       unsigned long flags;
-
-       spin_lock_irqsave(&lp->lock, flags);
-
-       csr0 = a->read_csr(ioaddr, CSR0);
-       if (!(csr0 & CSR0_STOP))        /* If not stopped */
-               pcnet32_suspend(dev, &flags, 1);
-
-       /* read address PROM */
-       for (i = 0; i < 16; i += 2)
-               *buff++ = inw(ioaddr + i);
-
-       /* read control and status registers */
-       for (i = 0; i < 90; i++) {
-               *buff++ = a->read_csr(ioaddr, i);
-       }
-
-       *buff++ = a->read_csr(ioaddr, 112);
-       *buff++ = a->read_csr(ioaddr, 114);
-
-       /* read bus configuration registers */
-       for (i = 0; i < 30; i++) {
-               *buff++ = a->read_bcr(ioaddr, i);
-       }
-       *buff++ = 0;            /* skip bcr30 so as not to hang 79C976 */
-       for (i = 31; i < 36; i++) {
-               *buff++ = a->read_bcr(ioaddr, i);
-       }
-
-       /* read mii phy registers */
-       if (lp->mii) {
-               int j;
-               for (j = 0; j < PCNET32_MAX_PHYS; j++) {
-                       if (lp->phymask & (1 << j)) {
-                               for (i = 0; i < PCNET32_REGS_PER_PHY; i++) {
-                                       lp->a.write_bcr(ioaddr, 33,
-                                                       (j << 5) | i);
-                                       *buff++ = lp->a.read_bcr(ioaddr, 34);
-                               }
-                       }
-               }
-       }
-
-       if (!(csr0 & CSR0_STOP)) {      /* If not stopped */
-               int csr5;
-
-               /* clear SUSPEND (SPND) - CSR5 bit 0 */
-               csr5 = a->read_csr(ioaddr, CSR5);
-               a->write_csr(ioaddr, CSR5, csr5 & (~CSR5_SUSPEND));
-       }
-
-       spin_unlock_irqrestore(&lp->lock, flags);
-}
-
-static const struct ethtool_ops pcnet32_ethtool_ops = {
-       .get_settings           = pcnet32_get_settings,
-       .set_settings           = pcnet32_set_settings,
-       .get_drvinfo            = pcnet32_get_drvinfo,
-       .get_msglevel           = pcnet32_get_msglevel,
-       .set_msglevel           = pcnet32_set_msglevel,
-       .nway_reset             = pcnet32_nway_reset,
-       .get_link               = pcnet32_get_link,
-       .get_ringparam          = pcnet32_get_ringparam,
-       .set_ringparam          = pcnet32_set_ringparam,
-       .get_strings            = pcnet32_get_strings,
-       .self_test              = pcnet32_ethtool_test,
-       .phys_id                = pcnet32_phys_id,
-       .get_regs_len           = pcnet32_get_regs_len,
-       .get_regs               = pcnet32_get_regs,
-       .get_sset_count         = pcnet32_get_sset_count,
-};
-
-/* only probes for non-PCI devices, the rest are handled by
- * pci_register_driver via pcnet32_probe_pci */
-
-static void __devinit pcnet32_probe_vlbus(unsigned int *pcnet32_portlist)
-{
-       unsigned int *port, ioaddr;
-
-       /* search for PCnet32 VLB cards at known addresses */
-       for (port = pcnet32_portlist; (ioaddr = *port); port++) {
-               if (request_region
-                   (ioaddr, PCNET32_TOTAL_SIZE, "pcnet32_probe_vlbus")) {
-                       /* check if there is really a pcnet chip on that ioaddr 
*/
-                       if ((inb(ioaddr + 14) == 0x57)
-                           && (inb(ioaddr + 15) == 0x57)) {
-                               pcnet32_probe1(ioaddr, 0, NULL);
-                       } else {
-                               release_region(ioaddr, PCNET32_TOTAL_SIZE);
-                       }
-               }
-       }
-}
-
-static int __devinit
-pcnet32_probe_pci(struct pci_dev *pdev, const struct pci_device_id *ent)
-{
-       unsigned long ioaddr;
-       int err;
-
-       err = pci_enable_device(pdev);
-       if (err < 0) {
-               if (pcnet32_debug & NETIF_MSG_PROBE)
-                       printk(KERN_ERR PFX
-                              "failed to enable device -- err=%d\n", err);
-               return err;
-       }
-       pci_set_master(pdev);
-
-       ioaddr = pci_resource_start(pdev, 0);
-       if (!ioaddr) {
-               if (pcnet32_debug & NETIF_MSG_PROBE)
-                       printk(KERN_ERR PFX
-                              "card has no PCI IO resources, aborting\n");
-               return -ENODEV;
-       }
-
-       if (!pci_dma_supported(pdev, PCNET32_DMA_MASK)) {
-               if (pcnet32_debug & NETIF_MSG_PROBE)
-                       printk(KERN_ERR PFX
-                              "architecture does not support 32bit PCI 
busmaster DMA\n");
-               return -ENODEV;
-       }
-       if (request_region(ioaddr, PCNET32_TOTAL_SIZE, "pcnet32_probe_pci") ==
-           NULL) {
-               if (pcnet32_debug & NETIF_MSG_PROBE)
-                       printk(KERN_ERR PFX
-                              "io address range already allocated\n");
-               return -EBUSY;
-       }
-
-       err = pcnet32_probe1(ioaddr, 1, pdev);
-       if (err < 0) {
-               pci_disable_device(pdev);
-       }
-       return err;
-}
-
-static const struct net_device_ops pcnet32_netdev_ops = {
-       .ndo_open               = pcnet32_open,
-       .ndo_stop               = pcnet32_close,
-       .ndo_start_xmit         = pcnet32_start_xmit,
-       .ndo_tx_timeout         = pcnet32_tx_timeout,
-       .ndo_get_stats          = pcnet32_get_stats,
-       .ndo_set_multicast_list = pcnet32_set_multicast_list,
-       .ndo_do_ioctl           = pcnet32_ioctl,
-       .ndo_change_mtu         = eth_change_mtu,
-       .ndo_set_mac_address    = eth_mac_addr,
-       .ndo_validate_addr      = eth_validate_addr,
-#ifdef CONFIG_NET_POLL_CONTROLLER
-       .ndo_poll_controller    = pcnet32_poll_controller,
-#endif
-};
-
-/* pcnet32_probe1
- *  Called from both pcnet32_probe_vlbus and pcnet_probe_pci.
- *  pdev will be NULL when called from pcnet32_probe_vlbus.
- */
-static int __devinit
-pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
-{
-       struct pcnet32_private *lp;
-       int i, media;
-       int fdx, mii, fset, dxsuflo;
-       int chip_version;
-       char *chipname;
-       struct net_device *dev;
-       struct pcnet32_access *a = NULL;
-       u8 promaddr[6];
-       int ret = -ENODEV;
-
-       /* reset the chip */
-       pcnet32_wio_reset(ioaddr);
-
-       /* NOTE: 16-bit check is first, otherwise some older PCnet chips fail */
-       if (pcnet32_wio_read_csr(ioaddr, 0) == 4 && pcnet32_wio_check(ioaddr)) {
-               a = &pcnet32_wio;
-       } else {
-               pcnet32_dwio_reset(ioaddr);
-               if (pcnet32_dwio_read_csr(ioaddr, 0) == 4
-                   && pcnet32_dwio_check(ioaddr)) {
-                       a = &pcnet32_dwio;
-               } else
-                       goto err_release_region;
-       }
-
-       chip_version =
-           a->read_csr(ioaddr, 88) | (a->read_csr(ioaddr, 89) << 16);
-       if ((pcnet32_debug & NETIF_MSG_PROBE) && (pcnet32_debug & NETIF_MSG_HW))
-               printk(KERN_INFO "  PCnet chip version is %#x.\n",
-                      chip_version);
-       if ((chip_version & 0xfff) != 0x003) {
-               if (pcnet32_debug & NETIF_MSG_PROBE)
-                       printk(KERN_INFO PFX "Unsupported chip version.\n");
-               goto err_release_region;
-       }
-
-       /* initialize variables */
-       fdx = mii = fset = dxsuflo = 0;
-       chip_version = (chip_version >> 12) & 0xffff;
-
-       switch (chip_version) {
-       case 0x2420:
-               chipname = "PCnet/PCI 79C970";  /* PCI */
-               break;
-       case 0x2430:
-               if (shared)
-                       chipname = "PCnet/PCI 79C970";  /* 970 gives the wrong 
chip id back */
-               else
-                       chipname = "PCnet/32 79C965";   /* 486/VL bus */
-               break;
-       case 0x2621:
-               chipname = "PCnet/PCI II 79C970A";      /* PCI */
-               fdx = 1;
-               break;
-       case 0x2623:
-               chipname = "PCnet/FAST 79C971"; /* PCI */
-               fdx = 1;
-               mii = 1;
-               fset = 1;
-               break;
-       case 0x2624:
-               chipname = "PCnet/FAST+ 79C972";        /* PCI */
-               fdx = 1;
-               mii = 1;
-               fset = 1;
-               break;
-       case 0x2625:
-               chipname = "PCnet/FAST III 79C973";     /* PCI */
-               fdx = 1;
-               mii = 1;
-               break;
-       case 0x2626:
-               chipname = "PCnet/Home 79C978"; /* PCI */
-               fdx = 1;
-               /*
-                * This is based on specs published at www.amd.com.  This 
section
-                * assumes that a card with a 79C978 wants to go into standard
-                * ethernet mode.  The 79C978 can also go into 1Mb HomePNA mode,
-                * and the module option homepna=1 can select this instead.
-                */
-               media = a->read_bcr(ioaddr, 49);
-               media &= ~3;    /* default to 10Mb ethernet */
-               if (cards_found < MAX_UNITS && homepna[cards_found])
-                       media |= 1;     /* switch to home wiring mode */
-               if (pcnet32_debug & NETIF_MSG_PROBE)
-                       printk(KERN_DEBUG PFX "media set to %sMbit mode.\n",
-                              (media & 1) ? "1" : "10");
-               a->write_bcr(ioaddr, 49, media);
-               break;
-       case 0x2627:
-               chipname = "PCnet/FAST III 79C975";     /* PCI */
-               fdx = 1;
-               mii = 1;
-               break;
-       case 0x2628:
-               chipname = "PCnet/PRO 79C976";
-               fdx = 1;
-               mii = 1;
-               break;
-       default:
-               if (pcnet32_debug & NETIF_MSG_PROBE)
-                       printk(KERN_INFO PFX
-                              "PCnet version %#x, no PCnet32 chip.\n",
-                              chip_version);
-               goto err_release_region;
-       }
-
-       /*
-        *  On selected chips turn on the BCR18:NOUFLO bit. This stops transmit
-        *  starting until the packet is loaded. Strike one for reliability, 
lose
-        *  one for latency - although on PCI this isnt a big loss. Older chips
-        *  have FIFO's smaller than a packet, so you can't do this.
-        *  Turn on BCR18:BurstRdEn and BCR18:BurstWrEn.
-        */
-
-       if (fset) {
-               a->write_bcr(ioaddr, 18, (a->read_bcr(ioaddr, 18) | 0x0860));
-               a->write_csr(ioaddr, 80,
-                            (a->read_csr(ioaddr, 80) & 0x0C00) | 0x0c00);
-               dxsuflo = 1;
-       }
-
-       dev = alloc_etherdev(sizeof(*lp));
-       if (!dev) {
-               if (pcnet32_debug & NETIF_MSG_PROBE)
-                       printk(KERN_ERR PFX "Memory allocation failed.\n");
-               ret = -ENOMEM;
-               goto err_release_region;
-       }
-       SET_NETDEV_DEV(dev, &pdev->dev);
-
-       if (pcnet32_debug & NETIF_MSG_PROBE)
-               printk(KERN_INFO PFX "%s at %#3lx,", chipname, ioaddr);
-
-       /* In most chips, after a chip reset, the ethernet address is read from 
the
-        * station address PROM at the base address and programmed into the
-        * "Physical Address Registers" CSR12-14.
-        * As a precautionary measure, we read the PROM values and complain if
-        * they disagree with the CSRs.  If they miscompare, and the PROM addr
-        * is valid, then the PROM addr is used.
-        */
-       for (i = 0; i < 3; i++) {
-               unsigned int val;
-               val = a->read_csr(ioaddr, i + 12) & 0x0ffff;
-               /* There may be endianness issues here. */
-               dev->dev_addr[2 * i] = val & 0x0ff;
-               dev->dev_addr[2 * i + 1] = (val >> 8) & 0x0ff;
-       }
-
-       /* read PROM address and compare with CSR address */
-       for (i = 0; i < 6; i++)
-               promaddr[i] = inb(ioaddr + i);
-
-       if (memcmp(promaddr, dev->dev_addr, 6)
-           || !is_valid_ether_addr(dev->dev_addr)) {
-               if (is_valid_ether_addr(promaddr)) {
-                       if (pcnet32_debug & NETIF_MSG_PROBE) {
-                               printk(" warning: CSR address invalid,\n");
-                               printk(KERN_INFO
-                                      "    using instead PROM address of");
-                       }
-                       memcpy(dev->dev_addr, promaddr, 6);
-               }
-       }
-       memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
-
-       /* if the ethernet address is not valid, force to 00:00:00:00:00:00 */
-       if (!is_valid_ether_addr(dev->perm_addr))
-               memset(dev->dev_addr, 0, sizeof(dev->dev_addr));
-
-       if (pcnet32_debug & NETIF_MSG_PROBE) {
-               printk(" %pM", dev->dev_addr);
-
-               /* Version 0x2623 and 0x2624 */
-               if (((chip_version + 1) & 0xfffe) == 0x2624) {
-                       i = a->read_csr(ioaddr, 80) & 0x0C00;   /* Check 
tx_start_pt */
-                       printk("\n" KERN_INFO "    tx_start_pt(0x%04x):", i);
-                       switch (i >> 10) {
-                       case 0:
-                               printk("  20 bytes,");
-                               break;
-                       case 1:
-                               printk("  64 bytes,");
-                               break;
-                       case 2:
-                               printk(" 128 bytes,");
-                               break;
-                       case 3:
-                               printk("~220 bytes,");
-                               break;
-                       }
-                       i = a->read_bcr(ioaddr, 18);    /* Check Burst/Bus 
control */
-                       printk(" BCR18(%x):", i & 0xffff);
-                       if (i & (1 << 5))
-                               printk("BurstWrEn ");
-                       if (i & (1 << 6))
-                               printk("BurstRdEn ");
-                       if (i & (1 << 7))
-                               printk("DWordIO ");
-                       if (i & (1 << 11))
-                               printk("NoUFlow ");
-                       i = a->read_bcr(ioaddr, 25);
-                       printk("\n" KERN_INFO "    SRAMSIZE=0x%04x,", i << 8);
-                       i = a->read_bcr(ioaddr, 26);
-                       printk(" SRAM_BND=0x%04x,", i << 8);
-                       i = a->read_bcr(ioaddr, 27);
-                       if (i & (1 << 14))
-                               printk("LowLatRx");
-               }
-       }
-
-       dev->base_addr = ioaddr;
-       lp = netdev_priv(dev);
-       /* pci_alloc_consistent returns page-aligned memory, so we do not have 
to check the alignment */
-       if ((lp->init_block =
-            pci_alloc_consistent(pdev, sizeof(*lp->init_block), 
&lp->init_dma_addr)) == NULL) {
-               if (pcnet32_debug & NETIF_MSG_PROBE)
-                       printk(KERN_ERR PFX
-                              "Consistent memory allocation failed.\n");
-               ret = -ENOMEM;
-               goto err_free_netdev;
-       }
-       lp->pci_dev = pdev;
-
-       lp->dev = dev;
-
-       spin_lock_init(&lp->lock);
-
-       SET_NETDEV_DEV(dev, &pdev->dev);
-       lp->name = chipname;
-       lp->shared_irq = shared;
-       lp->tx_ring_size = TX_RING_SIZE;        /* default tx ring size */
-       lp->rx_ring_size = RX_RING_SIZE;        /* default rx ring size */
-       lp->tx_mod_mask = lp->tx_ring_size - 1;
-       lp->rx_mod_mask = lp->rx_ring_size - 1;
-       lp->tx_len_bits = (PCNET32_LOG_TX_BUFFERS << 12);
-       lp->rx_len_bits = (PCNET32_LOG_RX_BUFFERS << 4);
-       lp->mii_if.full_duplex = fdx;
-       lp->mii_if.phy_id_mask = 0x1f;
-       lp->mii_if.reg_num_mask = 0x1f;
-       lp->dxsuflo = dxsuflo;
-       lp->mii = mii;
-       lp->chip_version = chip_version;
-       lp->msg_enable = pcnet32_debug;
-       if ((cards_found >= MAX_UNITS)
-           || (options[cards_found] > sizeof(options_mapping)))
-               lp->options = PCNET32_PORT_ASEL;
-       else
-               lp->options = options_mapping[options[cards_found]];
-       lp->mii_if.dev = dev;
-       lp->mii_if.mdio_read = mdio_read;
-       lp->mii_if.mdio_write = mdio_write;
-
-       /* napi.weight is used in both the napi and non-napi cases */
-       lp->napi.weight = lp->rx_ring_size / 2;
-
-       netif_napi_add(dev, &lp->napi, pcnet32_poll, lp->rx_ring_size / 2);
-
-       if (fdx && !(lp->options & PCNET32_PORT_ASEL) &&
-           ((cards_found >= MAX_UNITS) || full_duplex[cards_found]))
-               lp->options |= PCNET32_PORT_FD;
-
-       if (!a) {
-               if (pcnet32_debug & NETIF_MSG_PROBE)
-                       printk(KERN_ERR PFX "No access methods\n");
-               ret = -ENODEV;
-               goto err_free_consistent;
-       }
-       lp->a = *a;
-
-       /* prior to register_netdev, dev->name is not yet correct */
-       if (pcnet32_alloc_ring(dev, pci_name(lp->pci_dev))) {
-               ret = -ENOMEM;
-               goto err_free_ring;
-       }
-       /* detect special T1/E1 WAN card by checking for MAC address */
-       if (dev->dev_addr[0] == 0x00 && dev->dev_addr[1] == 0xe0
-           && dev->dev_addr[2] == 0x75)
-               lp->options = PCNET32_PORT_FD | PCNET32_PORT_GPSI;
-
-       lp->init_block->mode = cpu_to_le16(0x0003);     /* Disable Rx and Tx. */
-       lp->init_block->tlen_rlen =
-           cpu_to_le16(lp->tx_len_bits | lp->rx_len_bits);
-       for (i = 0; i < 6; i++)
-               lp->init_block->phys_addr[i] = dev->dev_addr[i];
-       lp->init_block->filter[0] = 0x00000000;
-       lp->init_block->filter[1] = 0x00000000;
-       lp->init_block->rx_ring = cpu_to_le32(lp->rx_ring_dma_addr);
-       lp->init_block->tx_ring = cpu_to_le32(lp->tx_ring_dma_addr);
-
-       /* switch pcnet32 to 32bit mode */
-       a->write_bcr(ioaddr, 20, 2);
-
-       a->write_csr(ioaddr, 1, (lp->init_dma_addr & 0xffff));
-       a->write_csr(ioaddr, 2, (lp->init_dma_addr >> 16));
-
-       if (pdev) {             /* use the IRQ provided by PCI */
-               dev->irq = pdev->irq;
-               if (pcnet32_debug & NETIF_MSG_PROBE)
-                       printk(" assigned IRQ %d.\n", dev->irq);
-       } else {
-               unsigned long irq_mask = probe_irq_on();
-
-               /*
-                * To auto-IRQ we enable the initialization-done and DMA error
-                * interrupts. For ISA boards we get a DMA error, but VLB and 
PCI
-                * boards will work.
-                */
-               /* Trigger an initialization just for the interrupt. */
-               a->write_csr(ioaddr, CSR0, CSR0_INTEN | CSR0_INIT);
-               mdelay(1);
-
-               dev->irq = probe_irq_off(irq_mask);
-               if (!dev->irq) {
-                       if (pcnet32_debug & NETIF_MSG_PROBE)
-                               printk(", failed to detect IRQ line.\n");
-                       ret = -ENODEV;
-                       goto err_free_ring;
-               }
-               if (pcnet32_debug & NETIF_MSG_PROBE)
-                       printk(", probed IRQ %d.\n", dev->irq);
-       }
-
-       /* Set the mii phy_id so that we can query the link state */
-       if (lp->mii) {
-               /* lp->phycount and lp->phymask are set to 0 by memset above */
-
-               lp->mii_if.phy_id = ((lp->a.read_bcr(ioaddr, 33)) >> 5) & 0x1f;
-               /* scan for PHYs */
-               for (i = 0; i < PCNET32_MAX_PHYS; i++) {
-                       unsigned short id1, id2;
-
-                       id1 = mdio_read(dev, i, MII_PHYSID1);
-                       if (id1 == 0xffff)
-                               continue;
-                       id2 = mdio_read(dev, i, MII_PHYSID2);
-                       if (id2 == 0xffff)
-                               continue;
-                       if (i == 31 && ((chip_version + 1) & 0xfffe) == 0x2624)
-                               continue;       /* 79C971 & 79C972 have phantom 
phy at id 31 */
-                       lp->phycount++;
-                       lp->phymask |= (1 << i);
-                       lp->mii_if.phy_id = i;
-                       if (pcnet32_debug & NETIF_MSG_PROBE)
-                               printk(KERN_INFO PFX
-                                      "Found PHY %04x:%04x at address %d.\n",
-                                      id1, id2, i);
-               }
-               lp->a.write_bcr(ioaddr, 33, (lp->mii_if.phy_id) << 5);
-               if (lp->phycount > 1) {
-                       lp->options |= PCNET32_PORT_MII;
-               }
-       }
-
-       init_timer(&lp->watchdog_timer);
-       lp->watchdog_timer.data = (unsigned long)dev;
-       lp->watchdog_timer.function = (void *)&pcnet32_watchdog;
-
-       /* The PCNET32-specific entries in the device structure. */
-       dev->netdev_ops = &pcnet32_netdev_ops;
-       dev->ethtool_ops = &pcnet32_ethtool_ops;
-       dev->watchdog_timeo = (5 * HZ);
-
-       /* Fill in the generic fields of the device structure. */
-       if (register_netdev(dev))
-               goto err_free_ring;
-
-       if (pdev) {
-               pci_set_drvdata(pdev, dev);
-       } else {
-               lp->next = pcnet32_dev;
-               pcnet32_dev = dev;
-       }
-
-       if (pcnet32_debug & NETIF_MSG_PROBE)
-               printk(KERN_INFO "%s: registered as %s\n", dev->name, lp->name);
-       cards_found++;
-
-       /* enable LED writes */
-       a->write_bcr(ioaddr, 2, a->read_bcr(ioaddr, 2) | 0x1000);
-
-       return 0;
-
-      err_free_ring:
-       pcnet32_free_ring(dev);
-      err_free_consistent:
-       pci_free_consistent(lp->pci_dev, sizeof(*lp->init_block),
-                           lp->init_block, lp->init_dma_addr);
-      err_free_netdev:
-       free_netdev(dev);
-      err_release_region:
-       release_region(ioaddr, PCNET32_TOTAL_SIZE);
-       return ret;
-}
-
-/* if any allocation fails, caller must also call pcnet32_free_ring */
-static int pcnet32_alloc_ring(struct net_device *dev, const char *name)
-{
-       struct pcnet32_private *lp = netdev_priv(dev);
-
-       lp->tx_ring = pci_alloc_consistent(lp->pci_dev,
-                                          sizeof(struct pcnet32_tx_head) *
-                                          lp->tx_ring_size,
-                                          &lp->tx_ring_dma_addr);
-       if (lp->tx_ring == NULL) {
-               if (netif_msg_drv(lp))
-                       printk("\n" KERN_ERR PFX
-                              "%s: Consistent memory allocation failed.\n",
-                              name);
-               return -ENOMEM;
-       }
-
-       lp->rx_ring = pci_alloc_consistent(lp->pci_dev,
-                                          sizeof(struct pcnet32_rx_head) *
-                                          lp->rx_ring_size,
-                                          &lp->rx_ring_dma_addr);
-       if (lp->rx_ring == NULL) {
-               if (netif_msg_drv(lp))
-                       printk("\n" KERN_ERR PFX
-                              "%s: Consistent memory allocation failed.\n",
-                              name);
-               return -ENOMEM;
-       }
-
-       lp->tx_dma_addr = kcalloc(lp->tx_ring_size, sizeof(dma_addr_t),
-                                 GFP_ATOMIC);
-       if (!lp->tx_dma_addr) {
-               if (netif_msg_drv(lp))
-                       printk("\n" KERN_ERR PFX
-                              "%s: Memory allocation failed.\n", name);
-               return -ENOMEM;
-       }
-
-       lp->rx_dma_addr = kcalloc(lp->rx_ring_size, sizeof(dma_addr_t),
-                                 GFP_ATOMIC);
-       if (!lp->rx_dma_addr) {
-               if (netif_msg_drv(lp))
-                       printk("\n" KERN_ERR PFX
-                              "%s: Memory allocation failed.\n", name);
-               return -ENOMEM;
-       }
-
-       lp->tx_skbuff = kcalloc(lp->tx_ring_size, sizeof(struct sk_buff *),
-                               GFP_ATOMIC);
-       if (!lp->tx_skbuff) {
-               if (netif_msg_drv(lp))
-                       printk("\n" KERN_ERR PFX
-                              "%s: Memory allocation failed.\n", name);
-               return -ENOMEM;
-       }
-
-       lp->rx_skbuff = kcalloc(lp->rx_ring_size, sizeof(struct sk_buff *),
-                               GFP_ATOMIC);
-       if (!lp->rx_skbuff) {
-               if (netif_msg_drv(lp))
-                       printk("\n" KERN_ERR PFX
-                              "%s: Memory allocation failed.\n", name);
-               return -ENOMEM;
-       }
-
-       return 0;
-}
-
-static void pcnet32_free_ring(struct net_device *dev)
-{
-       struct pcnet32_private *lp = netdev_priv(dev);
-
-       kfree(lp->tx_skbuff);
-       lp->tx_skbuff = NULL;
-
-       kfree(lp->rx_skbuff);
-       lp->rx_skbuff = NULL;
-
-       kfree(lp->tx_dma_addr);
-       lp->tx_dma_addr = NULL;
-
-       kfree(lp->rx_dma_addr);
-       lp->rx_dma_addr = NULL;
-
-       if (lp->tx_ring) {
-               pci_free_consistent(lp->pci_dev,
-                                   sizeof(struct pcnet32_tx_head) *
-                                   lp->tx_ring_size, lp->tx_ring,
-                                   lp->tx_ring_dma_addr);
-               lp->tx_ring = NULL;
-       }
-
-       if (lp->rx_ring) {
-               pci_free_consistent(lp->pci_dev,
-                                   sizeof(struct pcnet32_rx_head) *
-                                   lp->rx_ring_size, lp->rx_ring,
-                                   lp->rx_ring_dma_addr);
-               lp->rx_ring = NULL;
-       }
-}
-
-static int pcnet32_open(struct net_device *dev)
-{
-       struct pcnet32_private *lp = netdev_priv(dev);
-       unsigned long ioaddr = dev->base_addr;
-       u16 val;
-       int i;
-       int rc;
-       unsigned long flags;
-
-       if (request_irq(dev->irq, &pcnet32_interrupt,
-                       lp->shared_irq ? IRQF_SHARED : 0, dev->name,
-                       (void *)dev)) {
-               return -EAGAIN;
-       }
-
-       spin_lock_irqsave(&lp->lock, flags);
-       /* Check for a valid station address */
-       if (!is_valid_ether_addr(dev->dev_addr)) {
-               rc = -EINVAL;
-               goto err_free_irq;
-       }
-
-       /* Reset the PCNET32 */
-       lp->a.reset(ioaddr);
-
-       /* switch pcnet32 to 32bit mode */
-       lp->a.write_bcr(ioaddr, 20, 2);
-
-       if (netif_msg_ifup(lp))
-               printk(KERN_DEBUG
-                      "%s: pcnet32_open() irq %d tx/rx rings %#x/%#x init 
%#x.\n",
-                      dev->name, dev->irq, (u32) (lp->tx_ring_dma_addr),
-                      (u32) (lp->rx_ring_dma_addr),
-                      (u32) (lp->init_dma_addr));
-
-       /* set/reset autoselect bit */
-       val = lp->a.read_bcr(ioaddr, 2) & ~2;
-       if (lp->options & PCNET32_PORT_ASEL)
-               val |= 2;
-       lp->a.write_bcr(ioaddr, 2, val);
-
-       /* handle full duplex setting */
-       if (lp->mii_if.full_duplex) {
-               val = lp->a.read_bcr(ioaddr, 9) & ~3;
-               if (lp->options & PCNET32_PORT_FD) {
-                       val |= 1;
-                       if (lp->options == (PCNET32_PORT_FD | PCNET32_PORT_AUI))
-                               val |= 2;
-               } else if (lp->options & PCNET32_PORT_ASEL) {
-                       /* workaround of xSeries250, turn on for 79C975 only */
-                       if (lp->chip_version == 0x2627)
-                               val |= 3;
-               }
-               lp->a.write_bcr(ioaddr, 9, val);
-       }
-
-       /* set/reset GPSI bit in test register */
-       val = lp->a.read_csr(ioaddr, 124) & ~0x10;
-       if ((lp->options & PCNET32_PORT_PORTSEL) == PCNET32_PORT_GPSI)
-               val |= 0x10;
-       lp->a.write_csr(ioaddr, 124, val);
-
-       /* Allied Telesyn AT 2700/2701 FX are 100Mbit only and do not negotiate 
*/
-       if (lp->pci_dev->subsystem_vendor == PCI_VENDOR_ID_AT &&
-           (lp->pci_dev->subsystem_device == PCI_SUBDEVICE_ID_AT_2700FX ||
-            lp->pci_dev->subsystem_device == PCI_SUBDEVICE_ID_AT_2701FX)) {
-               if (lp->options & PCNET32_PORT_ASEL) {
-                       lp->options = PCNET32_PORT_FD | PCNET32_PORT_100;
-                       if (netif_msg_link(lp))
-                               printk(KERN_DEBUG
-                                      "%s: Setting 100Mb-Full Duplex.\n",
-                                      dev->name);
-               }
-       }
-       if (lp->phycount < 2) {
-               /*
-                * 24 Jun 2004 according AMD, in order to change the PHY,
-                * DANAS (or DISPM for 79C976) must be set; then select the 
speed,
-                * duplex, and/or enable auto negotiation, and clear DANAS
-                */
-               if (lp->mii && !(lp->options & PCNET32_PORT_ASEL)) {
-                       lp->a.write_bcr(ioaddr, 32,
-                                       lp->a.read_bcr(ioaddr, 32) | 0x0080);
-                       /* disable Auto Negotiation, set 10Mpbs, HD */
-                       val = lp->a.read_bcr(ioaddr, 32) & ~0xb8;
-                       if (lp->options & PCNET32_PORT_FD)
-                               val |= 0x10;
-                       if (lp->options & PCNET32_PORT_100)
-                               val |= 0x08;
-                       lp->a.write_bcr(ioaddr, 32, val);
-               } else {
-                       if (lp->options & PCNET32_PORT_ASEL) {
-                               lp->a.write_bcr(ioaddr, 32,
-                                               lp->a.read_bcr(ioaddr,
-                                                              32) | 0x0080);
-                               /* enable auto negotiate, setup, disable fd */
-                               val = lp->a.read_bcr(ioaddr, 32) & ~0x98;
-                               val |= 0x20;
-                               lp->a.write_bcr(ioaddr, 32, val);
-                       }
-               }
-       } else {
-               int first_phy = -1;
-               u16 bmcr;
-               u32 bcr9;
-               struct ethtool_cmd ecmd;
-
-               /*
-                * There is really no good other way to handle multiple PHYs
-                * other than turning off all automatics
-                */
-               val = lp->a.read_bcr(ioaddr, 2);
-               lp->a.write_bcr(ioaddr, 2, val & ~2);
-               val = lp->a.read_bcr(ioaddr, 32);
-               lp->a.write_bcr(ioaddr, 32, val & ~(1 << 7));   /* stop MII 
manager */
-
-               if (!(lp->options & PCNET32_PORT_ASEL)) {
-                       /* setup ecmd */
-                       ecmd.port = PORT_MII;
-                       ecmd.transceiver = XCVR_INTERNAL;
-                       ecmd.autoneg = AUTONEG_DISABLE;
-                       ecmd.speed =
-                           lp->
-                           options & PCNET32_PORT_100 ? SPEED_100 : SPEED_10;
-                       bcr9 = lp->a.read_bcr(ioaddr, 9);
-
-                       if (lp->options & PCNET32_PORT_FD) {
-                               ecmd.duplex = DUPLEX_FULL;
-                               bcr9 |= (1 << 0);
-                       } else {
-                               ecmd.duplex = DUPLEX_HALF;
-                               bcr9 |= ~(1 << 0);
-                       }
-                       lp->a.write_bcr(ioaddr, 9, bcr9);
-               }
-
-               for (i = 0; i < PCNET32_MAX_PHYS; i++) {
-                       if (lp->phymask & (1 << i)) {
-                               /* isolate all but the first PHY */
-                               bmcr = mdio_read(dev, i, MII_BMCR);
-                               if (first_phy == -1) {
-                                       first_phy = i;
-                                       mdio_write(dev, i, MII_BMCR,
-                                                  bmcr & ~BMCR_ISOLATE);
-                               } else {
-                                       mdio_write(dev, i, MII_BMCR,
-                                                  bmcr | BMCR_ISOLATE);
-                               }
-                               /* use mii_ethtool_sset to setup PHY */
-                               lp->mii_if.phy_id = i;
-                               ecmd.phy_address = i;
-                               if (lp->options & PCNET32_PORT_ASEL) {
-                                       mii_ethtool_gset(&lp->mii_if, &ecmd);
-                                       ecmd.autoneg = AUTONEG_ENABLE;
-                               }
-                               mii_ethtool_sset(&lp->mii_if, &ecmd);
-                       }
-               }
-               lp->mii_if.phy_id = first_phy;
-               if (netif_msg_link(lp))
-                       printk(KERN_INFO "%s: Using PHY number %d.\n",
-                              dev->name, first_phy);
-       }
-
-#ifdef DO_DXSUFLO
-       if (lp->dxsuflo) {      /* Disable transmit stop on underflow */
-               val = lp->a.read_csr(ioaddr, CSR3);
-               val |= 0x40;
-               lp->a.write_csr(ioaddr, CSR3, val);
-       }
-#endif
-
-       lp->init_block->mode =
-           cpu_to_le16((lp->options & PCNET32_PORT_PORTSEL) << 7);
-       pcnet32_load_multicast(dev);
-
-       if (pcnet32_init_ring(dev)) {
-               rc = -ENOMEM;
-               goto err_free_ring;
-       }
-
-       napi_enable(&lp->napi);
-
-       /* Re-initialize the PCNET32, and start it when done. */
-       lp->a.write_csr(ioaddr, 1, (lp->init_dma_addr & 0xffff));
-       lp->a.write_csr(ioaddr, 2, (lp->init_dma_addr >> 16));
-
-       lp->a.write_csr(ioaddr, CSR4, 0x0915);  /* auto tx pad */
-       lp->a.write_csr(ioaddr, CSR0, CSR0_INIT);
-
-       netif_start_queue(dev);
-
-       if (lp->chip_version >= PCNET32_79C970A) {
-               /* Print the link status and start the watchdog */
-               pcnet32_check_media(dev, 1);
-               mod_timer(&lp->watchdog_timer, PCNET32_WATCHDOG_TIMEOUT);
-       }
-
-       i = 0;
-       while (i++ < 100)
-               if (lp->a.read_csr(ioaddr, CSR0) & CSR0_IDON)
-                       break;
-       /*
-        * We used to clear the InitDone bit, 0x0100, here but Mark Stockton
-        * reports that doing so triggers a bug in the '974.
-        */
-       lp->a.write_csr(ioaddr, CSR0, CSR0_NORMAL);
-
-       if (netif_msg_ifup(lp))
-               printk(KERN_DEBUG
-                      "%s: pcnet32 open after %d ticks, init block %#x csr0 
%4.4x.\n",
-                      dev->name, i,
-                      (u32) (lp->init_dma_addr),
-                      lp->a.read_csr(ioaddr, CSR0));
-
-       spin_unlock_irqrestore(&lp->lock, flags);
-
-       return 0;               /* Always succeed */
-
-      err_free_ring:
-       /* free any allocated skbuffs */
-       pcnet32_purge_rx_ring(dev);
-
-       /*
-        * Switch back to 16bit mode to avoid problems with dumb
-        * DOS packet driver after a warm reboot
-        */
-       lp->a.write_bcr(ioaddr, 20, 4);
-
-      err_free_irq:
-       spin_unlock_irqrestore(&lp->lock, flags);
-       free_irq(dev->irq, dev);
-       return rc;
-}
-
-/*
- * The LANCE has been halted for one reason or another (busmaster memory
- * arbitration error, Tx FIFO underflow, driver stopped it to reconfigure,
- * etc.).  Modern LANCE variants always reload their ring-buffer
- * configuration when restarted, so we must reinitialize our ring
- * context before restarting.  As part of this reinitialization,
- * find all packets still on the Tx ring and pretend that they had been
- * sent (in effect, drop the packets on the floor) - the higher-level
- * protocols will time out and retransmit.  It'd be better to shuffle
- * these skbs to a temp list and then actually re-Tx them after
- * restarting the chip, but I'm too lazy to do so right now.  address@hidden
- */
-
-static void pcnet32_purge_tx_ring(struct net_device *dev)
-{
-       struct pcnet32_private *lp = netdev_priv(dev);
-       int i;
-
-       for (i = 0; i < lp->tx_ring_size; i++) {
-               lp->tx_ring[i].status = 0;      /* CPU owns buffer */
-               wmb();          /* Make sure adapter sees owner change */
-               if (lp->tx_skbuff[i]) {
-                       pci_unmap_single(lp->pci_dev, lp->tx_dma_addr[i],
-                                        lp->tx_skbuff[i]->len,
-                                        PCI_DMA_TODEVICE);
-                       dev_kfree_skb_any(lp->tx_skbuff[i]);
-               }
-               lp->tx_skbuff[i] = NULL;
-               lp->tx_dma_addr[i] = 0;
-       }
-}
-
-/* Initialize the PCNET32 Rx and Tx rings. */
-static int pcnet32_init_ring(struct net_device *dev)
-{
-       struct pcnet32_private *lp = netdev_priv(dev);
-       int i;
-
-       lp->tx_full = 0;
-       lp->cur_rx = lp->cur_tx = 0;
-       lp->dirty_rx = lp->dirty_tx = 0;
-
-       for (i = 0; i < lp->rx_ring_size; i++) {
-               struct sk_buff *rx_skbuff = lp->rx_skbuff[i];
-               if (rx_skbuff == NULL) {
-                       if (!
-                           (rx_skbuff = lp->rx_skbuff[i] =
-                            dev_alloc_skb(PKT_BUF_SKB))) {
-                               /* there is not much, we can do at this point */
-                               if (netif_msg_drv(lp))
-                                       printk(KERN_ERR
-                                              "%s: pcnet32_init_ring 
dev_alloc_skb failed.\n",
-                                              dev->name);
-                               return -1;
-                       }
-                       skb_reserve(rx_skbuff, NET_IP_ALIGN);
-               }
-
-               rmb();
-               if (lp->rx_dma_addr[i] == 0)
-                       lp->rx_dma_addr[i] =
-                           pci_map_single(lp->pci_dev, rx_skbuff->data,
-                                          PKT_BUF_SIZE, PCI_DMA_FROMDEVICE);
-               lp->rx_ring[i].base = cpu_to_le32(lp->rx_dma_addr[i]);
-               lp->rx_ring[i].buf_length = cpu_to_le16(NEG_BUF_SIZE);
-               wmb();          /* Make sure owner changes after all others are 
visible */
-               lp->rx_ring[i].status = cpu_to_le16(0x8000);
-       }
-       /* The Tx buffer address is filled in as needed, but we do need to clear
-        * the upper ownership bit. */
-       for (i = 0; i < lp->tx_ring_size; i++) {
-               lp->tx_ring[i].status = 0;      /* CPU owns buffer */
-               wmb();          /* Make sure adapter sees owner change */
-               lp->tx_ring[i].base = 0;
-               lp->tx_dma_addr[i] = 0;
-       }
-
-       lp->init_block->tlen_rlen =
-           cpu_to_le16(lp->tx_len_bits | lp->rx_len_bits);
-       for (i = 0; i < 6; i++)
-               lp->init_block->phys_addr[i] = dev->dev_addr[i];
-       lp->init_block->rx_ring = cpu_to_le32(lp->rx_ring_dma_addr);
-       lp->init_block->tx_ring = cpu_to_le32(lp->tx_ring_dma_addr);
-       wmb();                  /* Make sure all changes are visible */
-       return 0;
-}
-
-/* the pcnet32 has been issued a stop or reset.  Wait for the stop bit
- * then flush the pending transmit operations, re-initialize the ring,
- * and tell the chip to initialize.
- */
-static void pcnet32_restart(struct net_device *dev, unsigned int csr0_bits)
-{
-       struct pcnet32_private *lp = netdev_priv(dev);
-       unsigned long ioaddr = dev->base_addr;
-       int i;
-
-       /* wait for stop */
-       for (i = 0; i < 100; i++)
-               if (lp->a.read_csr(ioaddr, CSR0) & CSR0_STOP)
-                       break;
-
-       if (i >= 100 && netif_msg_drv(lp))
-               printk(KERN_ERR
-                      "%s: pcnet32_restart timed out waiting for stop.\n",
-                      dev->name);
-
-       pcnet32_purge_tx_ring(dev);
-       if (pcnet32_init_ring(dev))
-               return;
-
-       /* ReInit Ring */
-       lp->a.write_csr(ioaddr, CSR0, CSR0_INIT);
-       i = 0;
-       while (i++ < 1000)
-               if (lp->a.read_csr(ioaddr, CSR0) & CSR0_IDON)
-                       break;
-
-       lp->a.write_csr(ioaddr, CSR0, csr0_bits);
-}
-
-static void pcnet32_tx_timeout(struct net_device *dev)
-{
-       struct pcnet32_private *lp = netdev_priv(dev);
-       unsigned long ioaddr = dev->base_addr, flags;
-
-       spin_lock_irqsave(&lp->lock, flags);
-       /* Transmitter timeout, serious problems. */
-       if (pcnet32_debug & NETIF_MSG_DRV)
-               printk(KERN_ERR
-                      "%s: transmit timed out, status %4.4x, resetting.\n",
-                      dev->name, lp->a.read_csr(ioaddr, CSR0));
-       lp->a.write_csr(ioaddr, CSR0, CSR0_STOP);
-       dev->stats.tx_errors++;
-       if (netif_msg_tx_err(lp)) {
-               int i;
-               printk(KERN_DEBUG
-                      " Ring data dump: dirty_tx %d cur_tx %d%s cur_rx %d.",
-                      lp->dirty_tx, lp->cur_tx, lp->tx_full ? " (full)" : "",
-                      lp->cur_rx);
-               for (i = 0; i < lp->rx_ring_size; i++)
-                       printk("%s %08x %04x %08x %04x", i & 1 ? "" : "\n ",
-                              le32_to_cpu(lp->rx_ring[i].base),
-                              (-le16_to_cpu(lp->rx_ring[i].buf_length)) &
-                              0xffff, le32_to_cpu(lp->rx_ring[i].msg_length),
-                              le16_to_cpu(lp->rx_ring[i].status));
-               for (i = 0; i < lp->tx_ring_size; i++)
-                       printk("%s %08x %04x %08x %04x", i & 1 ? "" : "\n ",
-                              le32_to_cpu(lp->tx_ring[i].base),
-                              (-le16_to_cpu(lp->tx_ring[i].length)) & 0xffff,
-                              le32_to_cpu(lp->tx_ring[i].misc),
-                              le16_to_cpu(lp->tx_ring[i].status));
-               printk("\n");
-       }
-       pcnet32_restart(dev, CSR0_NORMAL);
-
-       dev->trans_start = jiffies;
-       netif_wake_queue(dev);
-
-       spin_unlock_irqrestore(&lp->lock, flags);
-}
-
-static int pcnet32_start_xmit(struct sk_buff *skb, struct net_device *dev)
-{
-       struct pcnet32_private *lp = netdev_priv(dev);
-       unsigned long ioaddr = dev->base_addr;
-       u16 status;
-       int entry;
-       unsigned long flags;
-
-       spin_lock_irqsave(&lp->lock, flags);
-
-       if (netif_msg_tx_queued(lp)) {
-               printk(KERN_DEBUG
-                      "%s: pcnet32_start_xmit() called, csr0 %4.4x.\n",
-                      dev->name, lp->a.read_csr(ioaddr, CSR0));
-       }
-
-       /* Default status -- will not enable Successful-TxDone
-        * interrupt when that option is available to us.
-        */
-       status = 0x8300;
-
-       /* Fill in a Tx ring entry */
-
-       /* Mask to ring buffer boundary. */
-       entry = lp->cur_tx & lp->tx_mod_mask;
-
-       /* Caution: the write order is important here, set the status
-        * with the "ownership" bits last. */
-
-       lp->tx_ring[entry].length = cpu_to_le16(-skb->len);
-
-       lp->tx_ring[entry].misc = 0x00000000;
-
-       lp->tx_skbuff[entry] = skb;
-       lp->tx_dma_addr[entry] =
-           pci_map_single(lp->pci_dev, skb->data, skb->len, PCI_DMA_TODEVICE);
-       lp->tx_ring[entry].base = cpu_to_le32(lp->tx_dma_addr[entry]);
-       wmb();                  /* Make sure owner changes after all others are 
visible */
-       lp->tx_ring[entry].status = cpu_to_le16(status);
-
-       lp->cur_tx++;
-       dev->stats.tx_bytes += skb->len;
-
-       /* Trigger an immediate send poll. */
-       lp->a.write_csr(ioaddr, CSR0, CSR0_INTEN | CSR0_TXPOLL);
-
-       dev->trans_start = jiffies;
-
-       if (lp->tx_ring[(entry + 1) & lp->tx_mod_mask].base != 0) {
-               lp->tx_full = 1;
-               netif_stop_queue(dev);
-       }
-       spin_unlock_irqrestore(&lp->lock, flags);
-       return 0;
-}
-
-/* The PCNET32 interrupt handler. */
-static irqreturn_t
-pcnet32_interrupt(int irq, void *dev_id)
-{
-       struct net_device *dev = dev_id;
-       struct pcnet32_private *lp;
-       unsigned long ioaddr;
-       u16 csr0;
-       int boguscnt = max_interrupt_work;
-
-       ioaddr = dev->base_addr;
-       lp = netdev_priv(dev);
-
-       spin_lock(&lp->lock);
-
-       csr0 = lp->a.read_csr(ioaddr, CSR0);
-       while ((csr0 & 0x8f00) && --boguscnt >= 0) {
-               if (csr0 == 0xffff) {
-                       break;  /* PCMCIA remove happened */
-               }
-               /* Acknowledge all of the current interrupt sources ASAP. */
-               lp->a.write_csr(ioaddr, CSR0, csr0 & ~0x004f);
-
-               if (netif_msg_intr(lp))
-                       printk(KERN_DEBUG
-                              "%s: interrupt  csr0=%#2.2x new csr=%#2.2x.\n",
-                              dev->name, csr0, lp->a.read_csr(ioaddr, CSR0));
-
-               /* Log misc errors. */
-               if (csr0 & 0x4000)
-                       dev->stats.tx_errors++; /* Tx babble. */
-               if (csr0 & 0x1000) {
-                       /*
-                        * This happens when our receive ring is full. This
-                        * shouldn't be a problem as we will see normal rx
-                        * interrupts for the frames in the receive ring.  But
-                        * there are some PCI chipsets (I can reproduce this
-                        * on SP3G with Intel saturn chipset) which have
-                        * sometimes problems and will fill up the receive
-                        * ring with error descriptors.  In this situation we
-                        * don't get a rx interrupt, but a missed frame
-                        * interrupt sooner or later.
-                        */
-                       dev->stats.rx_errors++; /* Missed a Rx frame. */
-               }
-               if (csr0 & 0x0800) {
-                       if (netif_msg_drv(lp))
-                               printk(KERN_ERR
-                                      "%s: Bus master arbitration failure, 
status %4.4x.\n",
-                                      dev->name, csr0);
-                       /* unlike for the lance, there is no restart needed */
-               }
-               if (netif_rx_schedule_prep(&lp->napi)) {
-                       u16 val;
-                       /* set interrupt masks */
-                       val = lp->a.read_csr(ioaddr, CSR3);
-                       val |= 0x5f00;
-                       lp->a.write_csr(ioaddr, CSR3, val);
-                       mmiowb();
-                       __netif_rx_schedule(&lp->napi);
-                       break;
-               }
-               csr0 = lp->a.read_csr(ioaddr, CSR0);
-       }
-
-       if (netif_msg_intr(lp))
-               printk(KERN_DEBUG "%s: exiting interrupt, csr0=%#4.4x.\n",
-                      dev->name, lp->a.read_csr(ioaddr, CSR0));
-
-       spin_unlock(&lp->lock);
-
-       return IRQ_HANDLED;
-}
-
-static int pcnet32_close(struct net_device *dev)
-{
-       unsigned long ioaddr = dev->base_addr;
-       struct pcnet32_private *lp = netdev_priv(dev);
-       unsigned long flags;
-
-       del_timer_sync(&lp->watchdog_timer);
-
-       netif_stop_queue(dev);
-       napi_disable(&lp->napi);
-
-       spin_lock_irqsave(&lp->lock, flags);
-
-       dev->stats.rx_missed_errors = lp->a.read_csr(ioaddr, 112);
-
-       if (netif_msg_ifdown(lp))
-               printk(KERN_DEBUG
-                      "%s: Shutting down ethercard, status was %2.2x.\n",
-                      dev->name, lp->a.read_csr(ioaddr, CSR0));
-
-       /* We stop the PCNET32 here -- it occasionally polls memory if we 
don't. */
-       lp->a.write_csr(ioaddr, CSR0, CSR0_STOP);
-
-       /*
-        * Switch back to 16bit mode to avoid problems with dumb
-        * DOS packet driver after a warm reboot
-        */
-       lp->a.write_bcr(ioaddr, 20, 4);
-
-       spin_unlock_irqrestore(&lp->lock, flags);
-
-       free_irq(dev->irq, dev);
-
-       spin_lock_irqsave(&lp->lock, flags);
-
-       pcnet32_purge_rx_ring(dev);
-       pcnet32_purge_tx_ring(dev);
-
-       spin_unlock_irqrestore(&lp->lock, flags);
-
-       return 0;
-}
-
-static struct net_device_stats *pcnet32_get_stats(struct net_device *dev)
-{
-       struct pcnet32_private *lp = netdev_priv(dev);
-       unsigned long ioaddr = dev->base_addr;
-       unsigned long flags;
-
-       spin_lock_irqsave(&lp->lock, flags);
-       dev->stats.rx_missed_errors = lp->a.read_csr(ioaddr, 112);
-       spin_unlock_irqrestore(&lp->lock, flags);
-
-       return &dev->stats;
-}
-
-/* taken from the sunlance driver, which it took from the depca driver */
-static void pcnet32_load_multicast(struct net_device *dev)
-{
-       struct pcnet32_private *lp = netdev_priv(dev);
-       volatile struct pcnet32_init_block *ib = lp->init_block;
-       volatile __le16 *mcast_table = (__le16 *)ib->filter;
-       struct dev_mc_list *dmi = dev->mc_list;
-       unsigned long ioaddr = dev->base_addr;
-       char *addrs;
-       int i;
-       u32 crc;
-
-       /* set all multicast bits */
-       if (dev->flags & IFF_ALLMULTI) {
-               ib->filter[0] = cpu_to_le32(~0U);
-               ib->filter[1] = cpu_to_le32(~0U);
-               lp->a.write_csr(ioaddr, PCNET32_MC_FILTER, 0xffff);
-               lp->a.write_csr(ioaddr, PCNET32_MC_FILTER+1, 0xffff);
-               lp->a.write_csr(ioaddr, PCNET32_MC_FILTER+2, 0xffff);
-               lp->a.write_csr(ioaddr, PCNET32_MC_FILTER+3, 0xffff);
-               return;
-       }
-       /* clear the multicast filter */
-       ib->filter[0] = 0;
-       ib->filter[1] = 0;
-
-       /* Add addresses */
-       for (i = 0; i < dev->mc_count; i++) {
-               addrs = dmi->dmi_addr;
-               dmi = dmi->next;
-
-               /* multicast address? */
-               if (!(*addrs & 1))
-                       continue;
-
-               crc = ether_crc_le(6, addrs);
-               crc = crc >> 26;
-               mcast_table[crc >> 4] |= cpu_to_le16(1 << (crc & 0xf));
-       }
-       for (i = 0; i < 4; i++)
-               lp->a.write_csr(ioaddr, PCNET32_MC_FILTER + i,
-                               le16_to_cpu(mcast_table[i]));
-       return;
-}
-
-/*
- * Set or clear the multicast filter for this adaptor.
- */
-static void pcnet32_set_multicast_list(struct net_device *dev)
-{
-       unsigned long ioaddr = dev->base_addr, flags;
-       struct pcnet32_private *lp = netdev_priv(dev);
-       int csr15, suspended;
-
-       spin_lock_irqsave(&lp->lock, flags);
-       suspended = pcnet32_suspend(dev, &flags, 0);
-       csr15 = lp->a.read_csr(ioaddr, CSR15);
-       if (dev->flags & IFF_PROMISC) {
-               /* Log any net taps. */
-               if (netif_msg_hw(lp))
-                       printk(KERN_INFO "%s: Promiscuous mode enabled.\n",
-                              dev->name);
-               lp->init_block->mode =
-                   cpu_to_le16(0x8000 | (lp->options & PCNET32_PORT_PORTSEL) <<
-                               7);
-               lp->a.write_csr(ioaddr, CSR15, csr15 | 0x8000);
-       } else {
-               lp->init_block->mode =
-                   cpu_to_le16((lp->options & PCNET32_PORT_PORTSEL) << 7);
-               lp->a.write_csr(ioaddr, CSR15, csr15 & 0x7fff);
-               pcnet32_load_multicast(dev);
-       }
-
-       if (suspended) {
-               int csr5;
-               /* clear SUSPEND (SPND) - CSR5 bit 0 */
-               csr5 = lp->a.read_csr(ioaddr, CSR5);
-               lp->a.write_csr(ioaddr, CSR5, csr5 & (~CSR5_SUSPEND));
-       } else {
-               lp->a.write_csr(ioaddr, CSR0, CSR0_STOP);
-               pcnet32_restart(dev, CSR0_NORMAL);
-               netif_wake_queue(dev);
-       }
-
-       spin_unlock_irqrestore(&lp->lock, flags);
-}
-
-/* This routine assumes that the lp->lock is held */
-static int mdio_read(struct net_device *dev, int phy_id, int reg_num)
-{
-       struct pcnet32_private *lp = netdev_priv(dev);
-       unsigned long ioaddr = dev->base_addr;
-       u16 val_out;
-
-       if (!lp->mii)
-               return 0;
-
-       lp->a.write_bcr(ioaddr, 33, ((phy_id & 0x1f) << 5) | (reg_num & 0x1f));
-       val_out = lp->a.read_bcr(ioaddr, 34);
-
-       return val_out;
-}
-
-/* This routine assumes that the lp->lock is held */
-static void mdio_write(struct net_device *dev, int phy_id, int reg_num, int 
val)
-{
-       struct pcnet32_private *lp = netdev_priv(dev);
-       unsigned long ioaddr = dev->base_addr;
-
-       if (!lp->mii)
-               return;
-
-       lp->a.write_bcr(ioaddr, 33, ((phy_id & 0x1f) << 5) | (reg_num & 0x1f));
-       lp->a.write_bcr(ioaddr, 34, val);
-}
-
-static int pcnet32_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
-{
-       struct pcnet32_private *lp = netdev_priv(dev);
-       int rc;
-       unsigned long flags;
-
-       /* SIOC[GS]MIIxxx ioctls */
-       if (lp->mii) {
-               spin_lock_irqsave(&lp->lock, flags);
-               rc = generic_mii_ioctl(&lp->mii_if, if_mii(rq), cmd, NULL);
-               spin_unlock_irqrestore(&lp->lock, flags);
-       } else {
-               rc = -EOPNOTSUPP;
-       }
-
-       return rc;
-}
-
-static int pcnet32_check_otherphy(struct net_device *dev)
-{
-       struct pcnet32_private *lp = netdev_priv(dev);
-       struct mii_if_info mii = lp->mii_if;
-       u16 bmcr;
-       int i;
-
-       for (i = 0; i < PCNET32_MAX_PHYS; i++) {
-               if (i == lp->mii_if.phy_id)
-                       continue;       /* skip active phy */
-               if (lp->phymask & (1 << i)) {
-                       mii.phy_id = i;
-                       if (mii_link_ok(&mii)) {
-                               /* found PHY with active link */
-                               if (netif_msg_link(lp))
-                                       printk(KERN_INFO
-                                              "%s: Using PHY number %d.\n",
-                                              dev->name, i);
-
-                               /* isolate inactive phy */
-                               bmcr =
-                                   mdio_read(dev, lp->mii_if.phy_id, MII_BMCR);
-                               mdio_write(dev, lp->mii_if.phy_id, MII_BMCR,
-                                          bmcr | BMCR_ISOLATE);
-
-                               /* de-isolate new phy */
-                               bmcr = mdio_read(dev, i, MII_BMCR);
-                               mdio_write(dev, i, MII_BMCR,
-                                          bmcr & ~BMCR_ISOLATE);
-
-                               /* set new phy address */
-                               lp->mii_if.phy_id = i;
-                               return 1;
-                       }
-               }
-       }
-       return 0;
-}
-
-/*
- * Show the status of the media.  Similar to mii_check_media however it
- * correctly shows the link speed for all (tested) pcnet32 variants.
- * Devices with no mii just report link state without speed.
- *
- * Caller is assumed to hold and release the lp->lock.
- */
-
-static void pcnet32_check_media(struct net_device *dev, int verbose)
-{
-       struct pcnet32_private *lp = netdev_priv(dev);
-       int curr_link;
-       int prev_link = netif_carrier_ok(dev) ? 1 : 0;
-       u32 bcr9;
-
-       if (lp->mii) {
-               curr_link = mii_link_ok(&lp->mii_if);
-       } else {
-               ulong ioaddr = dev->base_addr;  /* card base I/O address */
-               curr_link = (lp->a.read_bcr(ioaddr, 4) != 0xc0);
-       }
-       if (!curr_link) {
-               if (prev_link || verbose) {
-                       netif_carrier_off(dev);
-                       if (netif_msg_link(lp))
-                               printk(KERN_INFO "%s: link down\n", dev->name);
-               }
-               if (lp->phycount > 1) {
-                       curr_link = pcnet32_check_otherphy(dev);
-                       prev_link = 0;
-               }
-       } else if (verbose || !prev_link) {
-               netif_carrier_on(dev);
-               if (lp->mii) {
-                       if (netif_msg_link(lp)) {
-                               struct ethtool_cmd ecmd;
-                               mii_ethtool_gset(&lp->mii_if, &ecmd);
-                               printk(KERN_INFO
-                                      "%s: link up, %sMbps, %s-duplex\n",
-                                      dev->name,
-                                      (ecmd.speed == SPEED_100) ? "100" : "10",
-                                      (ecmd.duplex ==
-                                       DUPLEX_FULL) ? "full" : "half");
-                       }
-                       bcr9 = lp->a.read_bcr(dev->base_addr, 9);
-                       if ((bcr9 & (1 << 0)) != lp->mii_if.full_duplex) {
-                               if (lp->mii_if.full_duplex)
-                                       bcr9 |= (1 << 0);
-                               else
-                                       bcr9 &= ~(1 << 0);
-                               lp->a.write_bcr(dev->base_addr, 9, bcr9);
-                       }
-               } else {
-                       if (netif_msg_link(lp))
-                               printk(KERN_INFO "%s: link up\n", dev->name);
-               }
-       }
-}
-
-/*
- * Check for loss of link and link establishment.
- * Can not use mii_check_media because it does nothing if mode is forced.
- */
-
-static void pcnet32_watchdog(struct net_device *dev)
-{
-       struct pcnet32_private *lp = netdev_priv(dev);
-       unsigned long flags;
-
-       /* Print the link status if it has changed */
-       spin_lock_irqsave(&lp->lock, flags);
-       pcnet32_check_media(dev, 0);
-       spin_unlock_irqrestore(&lp->lock, flags);
-
-       mod_timer(&lp->watchdog_timer, round_jiffies(PCNET32_WATCHDOG_TIMEOUT));
-}
-
-static int pcnet32_pm_suspend(struct pci_dev *pdev, pm_message_t state)
-{
-       struct net_device *dev = pci_get_drvdata(pdev);
-
-       if (netif_running(dev)) {
-               netif_device_detach(dev);
-               pcnet32_close(dev);
-       }
-       pci_save_state(pdev);
-       pci_set_power_state(pdev, pci_choose_state(pdev, state));
-       return 0;
-}
-
-static int pcnet32_pm_resume(struct pci_dev *pdev)
-{
-       struct net_device *dev = pci_get_drvdata(pdev);
-
-       pci_set_power_state(pdev, PCI_D0);
-       pci_restore_state(pdev);
-
-       if (netif_running(dev)) {
-               pcnet32_open(dev);
-               netif_device_attach(dev);
-       }
-       return 0;
-}
-
-static void __devexit pcnet32_remove_one(struct pci_dev *pdev)
-{
-       struct net_device *dev = pci_get_drvdata(pdev);
-
-       if (dev) {
-               struct pcnet32_private *lp = netdev_priv(dev);
-
-               unregister_netdev(dev);
-               pcnet32_free_ring(dev);
-               release_region(dev->base_addr, PCNET32_TOTAL_SIZE);
-               pci_free_consistent(lp->pci_dev, sizeof(*lp->init_block),
-                                   lp->init_block, lp->init_dma_addr);
-               free_netdev(dev);
-               pci_disable_device(pdev);
-               pci_set_drvdata(pdev, NULL);
-       }
-}
-
-static struct pci_driver pcnet32_driver = {
-       .name = DRV_NAME,
-       .probe = pcnet32_probe_pci,
-       .remove = __devexit_p(pcnet32_remove_one),
-       .id_table = pcnet32_pci_tbl,
-       .suspend = pcnet32_pm_suspend,
-       .resume = pcnet32_pm_resume,
-};
-
-/* An additional parameter that may be passed in... */
-static int debug = -1;
-static int tx_start_pt = -1;
-static int pcnet32_have_pci;
-
-module_param(debug, int, 0);
-MODULE_PARM_DESC(debug, DRV_NAME " debug level");
-module_param(max_interrupt_work, int, 0);
-MODULE_PARM_DESC(max_interrupt_work,
-                DRV_NAME " maximum events handled per interrupt");
-module_param(rx_copybreak, int, 0);
-MODULE_PARM_DESC(rx_copybreak,
-                DRV_NAME " copy breakpoint for copy-only-tiny-frames");
-module_param(tx_start_pt, int, 0);
-MODULE_PARM_DESC(tx_start_pt, DRV_NAME " transmit start point (0-3)");
-module_param(pcnet32vlb, int, 0);
-MODULE_PARM_DESC(pcnet32vlb, DRV_NAME " Vesa local bus (VLB) support (0/1)");
-module_param_array(options, int, NULL, 0);
-MODULE_PARM_DESC(options, DRV_NAME " initial option setting(s) (0-15)");
-module_param_array(full_duplex, int, NULL, 0);
-MODULE_PARM_DESC(full_duplex, DRV_NAME " full duplex setting(s) (1)");
-/* Module Parameter for HomePNA cards added by Patrick Simmons, 2004 */
-module_param_array(homepna, int, NULL, 0);
-MODULE_PARM_DESC(homepna,
-                DRV_NAME
-                " mode for 79C978 cards (1 for HomePNA, 0 for Ethernet, 
default Ethernet");
-
-MODULE_AUTHOR("Thomas Bogendoerfer");
-MODULE_DESCRIPTION("Driver for PCnet32 and PCnetPCI based ethercards");
-MODULE_LICENSE("GPL");
-
-#define PCNET32_MSG_DEFAULT (NETIF_MSG_DRV | NETIF_MSG_PROBE | NETIF_MSG_LINK)
-
-static int __init pcnet32_init_module(void)
-{
-       printk(KERN_INFO "%s", version);
-
-       pcnet32_debug = netif_msg_init(debug, PCNET32_MSG_DEFAULT);
-
-       if ((tx_start_pt >= 0) && (tx_start_pt <= 3))
-               tx_start = tx_start_pt;
-
-       /* find the PCI devices */
-       if (!pci_register_driver(&pcnet32_driver))
-               pcnet32_have_pci = 1;
-
-       /* should we find any remaining VLbus devices ? */
-       if (pcnet32vlb)
-               pcnet32_probe_vlbus(pcnet32_portlist);
-
-       if (cards_found && (pcnet32_debug & NETIF_MSG_PROBE))
-               printk(KERN_INFO PFX "%d cards_found.\n", cards_found);
-
-       return (pcnet32_have_pci + cards_found) ? 0 : -ENODEV;
-}
-
-static void __exit pcnet32_cleanup_module(void)
-{
-       struct net_device *next_dev;
-
-       while (pcnet32_dev) {
-               struct pcnet32_private *lp = netdev_priv(pcnet32_dev);
-               next_dev = lp->next;
-               unregister_netdev(pcnet32_dev);
-               pcnet32_free_ring(pcnet32_dev);
-               release_region(pcnet32_dev->base_addr, PCNET32_TOTAL_SIZE);
-               pci_free_consistent(lp->pci_dev, sizeof(*lp->init_block),
-                                   lp->init_block, lp->init_dma_addr);
-               free_netdev(pcnet32_dev);
-               pcnet32_dev = next_dev;
-       }
-
-       if (pcnet32_have_pci)
-               pci_unregister_driver(&pcnet32_driver);
-}
-
-module_init(pcnet32_init_module);
-module_exit(pcnet32_cleanup_module);
-
-/*
- * Local variables:
- *  c-indent-level: 4
- *  tab-width: 8
- * End:
- */
diff --git a/dde_pcnet32_test/.gitignore b/dde_pcnet32_test/.gitignore
deleted file mode 100644
index 14dac58..0000000
--- a/dde_pcnet32_test/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-dde_pcnet32
diff --git a/dde_pcnet32_test/Makeconf.local b/dde_pcnet32_test/Makeconf.local
deleted file mode 100644
index 3d03134..0000000
--- a/dde_pcnet32_test/Makeconf.local
+++ /dev/null
@@ -1,10 +0,0 @@
-SYSTEMS = x86-l4v2
-ARCH = x86
-SYSTEM = x86-l4v2
-
-DDEKITLIBDIR = $(PKGDIR)/../libddekit/
-DDEKITINCDIR = $(PKGDIR)/../libddekit/include
-DDE26LIBDIR = $(PKGDIR)/lib/src
-OBJ_BASE = $(PKGDIR)/build
-
-L4LIBDIR = .
diff --git a/dde_pcnet32_test/Makefile b/dde_pcnet32_test/Makefile
deleted file mode 100644
index 9f6f11d..0000000
--- a/dde_pcnet32_test/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-PKGDIR        ?= ../libdde_linux26
-L4DIR         ?= $(PKGDIR)
-
-SYSTEMS        = x86-l4v2
-
-include Makeconf.local
-
-TARGET         = dde_pcnet32
-
-SRC_C          = main.c arping.c pcnet32.c
-
-LIBS          += -ldde_linux26.o -ldde_linux26_block -ldde_linux26_char 
-ldde_linux26_net /root/hurd/libddekit/libddekit.a -lpciaccess -lpthread 
-lshouldbeinlibc
-CFLAGS        += -g
-
-# DDE configuration
-include $(L4DIR)/Makeconf
-
-include $(L4DIR)/mk/prog.mk
diff --git a/dde_pcnet32_test/arping.c b/dde_pcnet32_test/arping.c
deleted file mode 100644
index ac805aa..0000000
--- a/dde_pcnet32_test/arping.c
+++ /dev/null
@@ -1,180 +0,0 @@
-/****************************************************************
- * (c) 2007 Technische Universitaet Dresden                     *
- * This file is part of DROPS, which is distributed under the   *
- * terms of the GNU General Public License 2. Please see the    *
- * COPYING file for details.                                    *
- ****************************************************************/
-
-#include <linux/netdevice.h>
-#include <linux/if_ether.h>
-
-#include "arping.h"
-
-#define PROT_ICMP         1
-#define ICMP_REPLY        0
-#define ICMP_REQ          8
-#define ETH_ALEN          6
-
-/* configuration */
-int arping_verbose = 1;  // verbose
-
-#define VERBOSE_LOG(fmt, ...) \
-       do { \
-               if (arping_verbose) printk(fmt, ##__VA_ARGS__); \
-       } while (0);
-
-char LOG_tag[9] = "arping";
-ssize_t l4libc_heapsize = 32 * 1024;
-
-//static unsigned char broadcast_mac[6] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
-//static int exit_somewhen = 0;
-
-
-struct ethernet_hdr
-{
-       unsigned char dest[6];
-       unsigned char src[6];
-       unsigned char type[2];
-};
-
-
-struct ip_hdr
-{
-       char          version_length;
-       char          type;
-       int16_t    length;
-       int16_t    id;
-       int16_t    flags_offset;
-       char          ttl;
-       char          protocol;
-       int16_t    checksum;
-       int32_t    src_ip;
-       int32_t    dest_ip;
-};
-
-
-struct icmp_hdr
-{
-       char type;
-       char code;
-       uint16_t checksum;
-       uint16_t id;
-       uint16_t seq_num;
-};
-
-
-static int handle_icmp_packet(struct sk_buff *skb);
-static int handle_icmp_packet(struct sk_buff *skb)
-{
-       unsigned char *data = skb->data;
-       struct ethernet_hdr *eth = NULL;
-       struct ethernet_hdr *e   = NULL;
-       struct ip_hdr *ip        = NULL;
-       struct ip_hdr *iphdr     = NULL;
-       struct icmp_hdr *icmp    = NULL;
-       struct icmp_hdr *icmp2   = NULL;
-       int ver, len;
-       struct sk_buff *snd_skb  = NULL;
-
-       eth = (struct ethernet_hdr *)data;
-       VERBOSE_LOG("dest mac = %02x:%02x:%02x:%02x:%02x:%02x\n",
-                   eth->dest[0], eth->dest[1], eth->dest[2],
-                   eth->dest[3], eth->dest[4], eth->dest[5]);
-       VERBOSE_LOG("src mac = %02x:%02x:%02x:%02x:%02x:%02x\n",
-                   eth->src[0], eth->src[1], eth->src[2],
-                   eth->src[3], eth->src[4], eth->src[5]);
-       VERBOSE_LOG("type field = %02x%02x\n", eth->type[0], eth->type[1]);
-       if (eth->type[0] != 0x08 || eth->type[1] != 0x00) {
-               printk("unknown ethernet packet type!\n");
-               return -1;
-       }
-
-       ip = (struct ip_hdr *)(data + sizeof(struct ethernet_hdr));
-       VERBOSE_LOG("protocol = %02x (2x?)\n", ip->protocol, PROT_ICMP);
-       if (ip->protocol != PROT_ICMP)
-       {
-               printk("Unknown packet type.\n");
-               return -1;
-       }
-
-       VERBOSE_LOG("ICMP packet!\n");
-       ver = ip->version_length >> 4;
-       len = ip->version_length & 0x0F;
-       VERBOSE_LOG("IP version = %d, length = %d\n", ver, len);
-
-       VERBOSE_LOG("src IP: "NIPQUAD_FMT"\n", NIPQUAD(ip->src_ip));
-       VERBOSE_LOG("dest IP: "NIPQUAD_FMT"\n", NIPQUAD(ip->dest_ip));
-
-       icmp = (struct icmp_hdr *)(data + sizeof(struct ethernet_hdr)
-               + sizeof(struct ip_hdr));
-
-       if (icmp->type != ICMP_REQ)
-       {
-               printk("This is no ICMP request.\n");
-               return -1;
-       }
-       VERBOSE_LOG("Hey this is an ICMP request just for me. :)\n");
-       VERBOSE_LOG("ICMP type : %d\n", icmp->type);
-       VERBOSE_LOG("ICMP code : %d\n", icmp->code);
-       VERBOSE_LOG("ICMP seq  : %d\n", ntohs(icmp->seq_num));
-
-       snd_skb = alloc_skb(skb->len + skb->dev->hard_header_len, GFP_KERNEL);
-       memcpy(snd_skb->data, skb->data, skb->len);
-       
-       e = (struct ethernet_hdr *)snd_skb->data;
-       memcpy(e->src, skb->dev->dev_addr, ETH_ALEN);
-       memcpy(e->dest, eth->src, ETH_ALEN);
-       VERBOSE_LOG("dest mac = %02x:%02x:%02x:%02x:%02x:%02x\n",
-                   e->dest[0], e->dest[1], e->dest[2],
-                   e->dest[3], e->dest[4], e->dest[5]);
-       VERBOSE_LOG("src mac = %02x:%02x:%02x:%02x:%02x:%02x\n",
-                   e->src[0], e->src[1], e->src[2],
-                   e->src[3], e->src[4], e->src[5]);
-       e->type[0] = 0x08;
-       e->type[1] = 0x00;
-
-       iphdr  = (struct ip_hdr *)(snd_skb->data + sizeof(struct ethernet_hdr));
-       *iphdr = *ip;
-       // also switch src and dest
-       iphdr->src_ip  = ip->dest_ip;
-       iphdr->dest_ip = ip->src_ip;
-       VERBOSE_LOG("src IP: "NIPQUAD_FMT"\n", NIPQUAD(iphdr->src_ip));
-       VERBOSE_LOG("dest IP: "NIPQUAD_FMT"\n", NIPQUAD(iphdr->dest_ip));
-
-       icmp2 = (struct icmp_hdr *)(snd_skb->data + sizeof(struct ethernet_hdr)
-                                   + sizeof(struct ip_hdr));
-       *icmp2     = *icmp;
-       icmp2->type = ICMP_REPLY;
-
-       snd_skb->dev = skb->dev;
-       snd_skb->len = skb->len;
-
-       VERBOSE_LOG("sending reply\n");
-       skb->dev->netdev_ops->ndo_start_xmit(snd_skb, skb->dev);
-       VERBOSE_LOG("done\n");
-
-       return 0;
-}
-
-ddekit_sem_t *arping_semaphore  = NULL;
-struct arping_elem *arping_list = NULL;
-
-int arping(void)
-{
-       arping_semaphore = ddekit_sem_init(0);
-
-       while(1)
-       {
-               ddekit_sem_down(arping_semaphore);
-               struct arping_elem *elem = arping_list;
-               arping_list = arping_list->next;
-
-               /* parse packet */
-               int err = handle_icmp_packet(elem->skb);
-               VERBOSE_LOG("handle_icmp_packet: %d\n", err);
-
-               kfree_skb(elem->skb);
-               kfree(elem);
-       }
-}
-
diff --git a/dde_pcnet32_test/arping.h b/dde_pcnet32_test/arping.h
deleted file mode 100644
index 9eaabf7..0000000
--- a/dde_pcnet32_test/arping.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#pragma once
-
-#include <ddekit/semaphore.h>
-
-struct arping_elem
-{
-       struct arping_elem *next;
-       struct sk_buff     *skb;
-};
-
-extern ddekit_sem_t *arping_semaphore;
-extern struct arping_elem *arping_list;
-
-#define mac_fmt       "%02X:%02X:%02X:%02X:%02X:%02X"
-#define mac_str(mac)  (unsigned char)((mac)[0]), (unsigned 
char)((mac)[1]),(mac)[2],(mac)[3],(mac)[4],(mac)[5]
diff --git a/dde_pcnet32_test/default.ld b/dde_pcnet32_test/default.ld
deleted file mode 100644
index f8e4e28..0000000
--- a/dde_pcnet32_test/default.ld
+++ /dev/null
@@ -1,213 +0,0 @@
-/* Script for -z combreloc: combine and sort reloc sections */
-OUTPUT_FORMAT("elf32-i386", "elf32-i386",
-             "elf32-i386")
-OUTPUT_ARCH(i386)
-ENTRY(_start)
-SEARCH_DIR("/usr/i486-gnu/lib"); SEARCH_DIR("/usr/local/lib"); 
SEARCH_DIR("/lib"); SEARCH_DIR("/usr/lib");
-SECTIONS
-{
-  /* Read-only sections, merged into text segment: */
-  PROVIDE (__executable_start = 0x08048000); . = 0x08048000 + SIZEOF_HEADERS;
-  .interp         : { *(.interp) }
-  .note.gnu.build-id : { *(.note.gnu.build-id) }
-  .hash           : { *(.hash) }
-  .gnu.hash       : { *(.gnu.hash) }
-  .dynsym         : { *(.dynsym) }
-  .dynstr         : { *(.dynstr) }
-  .gnu.version    : { *(.gnu.version) }
-  .gnu.version_d  : { *(.gnu.version_d) }
-  .gnu.version_r  : { *(.gnu.version_r) }
-  .rel.dyn        :
-    {
-      *(.rel.init)
-      *(.rel.text .rel.text.* .rel.gnu.linkonce.t.*)
-      *(.rel.fini)
-      *(.rel.rodata .rel.rodata.* .rel.gnu.linkonce.r.*)
-      *(.rel.data.rel.ro* .rel.gnu.linkonce.d.rel.ro.*)
-      *(.rel.data .rel.data.* .rel.gnu.linkonce.d.*)
-      *(.rel.tdata .rel.tdata.* .rel.gnu.linkonce.td.*)
-      *(.rel.tbss .rel.tbss.* .rel.gnu.linkonce.tb.*)
-      *(.rel.ctors)
-      *(.rel.dtors)
-      *(.rel.got)
-      *(.rel.bss .rel.bss.* .rel.gnu.linkonce.b.*)
-    }
-  .rela.dyn       :
-    {
-      *(.rela.init)
-      *(.rela.text .rela.text.* .rela.gnu.linkonce.t.*)
-      *(.rela.fini)
-      *(.rela.rodata .rela.rodata.* .rela.gnu.linkonce.r.*)
-      *(.rela.data .rela.data.* .rela.gnu.linkonce.d.*)
-      *(.rela.tdata .rela.tdata.* .rela.gnu.linkonce.td.*)
-      *(.rela.tbss .rela.tbss.* .rela.gnu.linkonce.tb.*)
-      *(.rela.ctors)
-      *(.rela.dtors)
-      *(.rela.got)
-      *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*)
-    }
-  .rel.plt        : { *(.rel.plt) }
-  .rela.plt       : { *(.rela.plt) }
-  .init           :
-  {
-    KEEP (*(.init))
-  } =0x90909090
-  .plt            : { *(.plt) }
-  .text           :
-  {
-    *(.text .stub .text.* .gnu.linkonce.t.*)
-    KEEP (*(.text.*personality*))
-    /* .gnu.warning sections are handled specially by elf32.em.  */
-    *(.gnu.warning)
-  } =0x90909090
-  .fini           :
-  {
-    KEEP (*(.fini))
-  } =0x90909090
-  PROVIDE (__etext = .);
-  PROVIDE (_etext = .);
-  PROVIDE (etext = .);
-  .rodata         : { *(.rodata .rodata.* .gnu.linkonce.r.*) }
-  .rodata1        : { *(.rodata1) }
-  .eh_frame_hdr : { *(.eh_frame_hdr) }
-  .eh_frame       : ONLY_IF_RO { KEEP (*(.eh_frame)) }
-  .gcc_except_table   : ONLY_IF_RO { *(.gcc_except_table .gcc_except_table.*) }
-  /* Adjust the address for the data segment.  We want to adjust up to
-     the same address within the page on the next page up.  */
-  . = ALIGN (CONSTANT (MAXPAGESIZE)) - ((CONSTANT (MAXPAGESIZE) - .) & 
(CONSTANT (MAXPAGESIZE) - 1)); . = DATA_SEGMENT_ALIGN (CONSTANT (MAXPAGESIZE), 
CONSTANT (COMMONPAGESIZE));
-  /* Exception handling  */
-  .eh_frame       : ONLY_IF_RW { KEEP (*(.eh_frame)) }
-  .gcc_except_table   : ONLY_IF_RW { *(.gcc_except_table .gcc_except_table.*) }
-  /* Thread Local Storage sections  */
-  .tdata         : { *(.tdata .tdata.* .gnu.linkonce.td.*) }
-  .tbss                  : { *(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon) }
-  .preinit_array     :
-  {
-    PROVIDE_HIDDEN (__preinit_array_start = .);
-    KEEP (*(.preinit_array))
-    PROVIDE_HIDDEN (__preinit_array_end = .);
-  }
-  .init_array     :
-  {
-     PROVIDE_HIDDEN (__init_array_start = .);
-     KEEP (*(SORT(.init_array.*)))
-     KEEP (*(.init_array))
-     PROVIDE_HIDDEN (__init_array_end = .);
-  }
-  .fini_array     :
-  {
-    PROVIDE_HIDDEN (__fini_array_start = .);
-    KEEP (*(.fini_array))
-    KEEP (*(SORT(.fini_array.*)))
-    PROVIDE_HIDDEN (__fini_array_end = .);
-  }
-  .ctors          :
-  {
-    /* gcc uses crtbegin.o to find the start of
-       the constructors, so we make sure it is
-       first.  Because this is a wildcard, it
-       doesn't matter if the user does not
-       actually link against crtbegin.o; the
-       linker won't look for a file to match a
-       wildcard.  The wildcard also means that it
-       doesn't matter which directory crtbegin.o
-       is in.  */
-    KEEP (*crtbegin.o(.ctors))
-    KEEP (*crtbegin?.o(.ctors))
-    /* We don't want to include the .ctor section from
-       the crtend.o file until after the sorted ctors.
-       The .ctor section from the crtend file contains the
-       end of ctors marker and it must be last */
-    KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o ) .ctors))
-
-    KEEP (*(SORT(.ctors.*)))
-    KEEP (*(.ctors))
-
-    KEEP (*(.mark_beg_l4dde_ctors))
-    KEEP (*(SORT(.l4dde_ctors.?)))
-    KEEP (*(SORT(.l4dde_ctors.??)))
-    KEEP (*(SORT(.l4dde_ctors.???)))
-    KEEP (*(SORT(.l4dde_ctors.????)))
-    KEEP (*(SORT(.l4dde_ctors.?????)))
-    KEEP (*(.l4dde_ctors))
-    KEEP (*(.mark_end_l4dde_ctors))
-  }
-  .dtors          :
-  {
-    KEEP (*crtbegin.o(.dtors))
-    KEEP (*crtbegin?.o(.dtors))
-    KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o ) .dtors))
-    KEEP (*(SORT(.dtors.*)))
-    KEEP (*(.dtors))
-  }
-  .jcr            : { KEEP (*(.jcr)) }
-  .data.rel.ro : { *(.data.rel.ro.local* .gnu.linkonce.d.rel.ro.local.*) 
*(.data.rel.ro* .gnu.linkonce.d.rel.ro.*) }
-  .dynamic        : { *(.dynamic) }
-  .got            : { *(.got) }
-  . = DATA_SEGMENT_RELRO_END (12, .);
-  .got.plt        : { *(.got.plt) }
-  .data           :
-  {
-    *(.data .data.* .gnu.linkonce.d.*)
-    KEEP (*(.gnu.linkonce.d.*personality*))
-    SORT(CONSTRUCTORS)
-  }
-  .data1          : { *(.data1) }
-  _edata = .; PROVIDE (edata = .);
-  __bss_start = .;
-  .bss            :
-  {
-   *(.dynbss)
-   *(.bss .bss.* .gnu.linkonce.b.*)
-   *(COMMON)
-   /* Align here to ensure that the .bss section occupies space up to
-      _end.  Align after .bss to ensure correct alignment even if the
-      .bss section disappears because there are no input sections.
-      FIXME: Why do we need it? When there is no .bss section, we don't
-      pad the .data section.  */
-   . = ALIGN(. != 0 ? 32 / 8 : 1);
-  }
-  . = ALIGN(32 / 8);
-  . = ALIGN(32 / 8);
-  _end = .; PROVIDE (end = .);
-  . = DATA_SEGMENT_END (.);
-  /* Stabs debugging sections.  */
-  .stab          0 : { *(.stab) }
-  .stabstr       0 : { *(.stabstr) }
-  .stab.excl     0 : { *(.stab.excl) }
-  .stab.exclstr  0 : { *(.stab.exclstr) }
-  .stab.index    0 : { *(.stab.index) }
-  .stab.indexstr 0 : { *(.stab.indexstr) }
-  .comment       0 : { *(.comment) }
-  /* DWARF debug sections.
-     Symbols in the DWARF debugging sections are relative to the beginning
-     of the section so we begin them at 0.  */
-  /* DWARF 1 */
-  .debug          0 : { *(.debug) }
-  .line           0 : { *(.line) }
-  /* GNU DWARF 1 extensions */
-  .debug_srcinfo  0 : { *(.debug_srcinfo) }
-  .debug_sfnames  0 : { *(.debug_sfnames) }
-  /* DWARF 1.1 and DWARF 2 */
-  .debug_aranges  0 : { *(.debug_aranges) }
-  .debug_pubnames 0 : { *(.debug_pubnames) }
-  /* DWARF 2 */
-  .debug_info     0 : { *(.debug_info .gnu.linkonce.wi.*) }
-  .debug_abbrev   0 : { *(.debug_abbrev) }
-  .debug_line     0 : { *(.debug_line) }
-  .debug_frame    0 : { *(.debug_frame) }
-  .debug_str      0 : { *(.debug_str) }
-  .debug_loc      0 : { *(.debug_loc) }
-  .debug_macinfo  0 : { *(.debug_macinfo) }
-  /* SGI/MIPS DWARF 2 extensions */
-  .debug_weaknames 0 : { *(.debug_weaknames) }
-  .debug_funcnames 0 : { *(.debug_funcnames) }
-  .debug_typenames 0 : { *(.debug_typenames) }
-  .debug_varnames  0 : { *(.debug_varnames) }
-  /* DWARF 3 */
-  .debug_pubtypes 0 : { *(.debug_pubtypes) }
-  .debug_ranges   0 : { *(.debug_ranges) }
-  .gnu.attributes 0 : { KEEP (*(.gnu.attributes)) }
-  /DISCARD/ : { *(.note.GNU-stack) *(.gnu_debuglink) }
-}
-
diff --git a/dde_pcnet32_test/main.c b/dde_pcnet32_test/main.c
deleted file mode 100644
index cb5ed5b..0000000
--- a/dde_pcnet32_test/main.c
+++ /dev/null
@@ -1,112 +0,0 @@
-#include <dde26.h> /* l4dde26_*() */
-#include <dde26_net.h> /* l4dde26 networking */
-
-#include <linux/netdevice.h> /* struct sk_buff */
-#include <linux/pci.h> /* pci_unregister_driver() */
-#include <linux/init.h>  // initcall()
-#include <linux/delay.h> // msleep()
-
-#include "arping.h"
-
-int using_std = 1;
-
-extern int arping_verbose;
-#define VERBOSE_LOG(fmt, ...) \
-       do { \
-               if (arping_verbose) printk(fmt, ##__VA_ARGS__); \
-       } while (0);
-
-extern struct pci_driver ne2k_driver;
-extern int arping(void);
-
-void open_nw_dev(void);
-void open_nw_dev()
-{
-       struct net_device *dev;
-       struct net *net;
-
-       read_lock(&dev_base_lock);
-       for_each_net(net) {
-               for_each_netdev(net, dev) {
-                       int err = 0;
-                       printk("dev: '%s'\n", dev->name);
-                       printk("MAC: "mac_fmt"\n", mac_str(dev->dev_addr));
-
-                       err = dev_open(dev);
-               }
-       }
-       read_unlock(&dev_base_lock);
-}
-
-void close_nw_dev(void);
-void close_nw_dev(void)
-{
-       struct net_device *dev;
-       struct net *net;
-
-       read_lock(&dev_base_lock);
-       for_each_net(net) {
-               for_each_netdev(net, dev) {
-                       int err = 0;
-
-                       err = dev_close(dev);
-                       printk("closed %s\n", dev->name);
-               }
-       }
-       read_unlock(&dev_base_lock);
-}
-
-static int net_rx_handle(struct sk_buff *skb)
-{
-    skb_push(skb, skb->dev->hard_header_len);
-
-       struct arping_elem *e = kmalloc(sizeof(struct arping_elem), GFP_KERNEL);
-       e->skb = skb;
-       skb_get(skb);
-       e->next = NULL;
-
-       if (arping_list == NULL)
-               arping_list = e;
-       else {
-               struct arping_elem *f = arping_list;
-               while (f->next)
-                       f = f->next;
-               f->next = e;
-       }
-
-       ddekit_sem_up(arping_semaphore);
-    
-    kfree_skb(skb);
-
-       VERBOSE_LOG("freed skb, returning from netif_rx\n");
-    return NET_RX_SUCCESS;
-}
-
-//subsys_initcall(l4dde26_init_pci);
-
-int main(int argc, char **argv);
-int main(int argc, char **argv)
-{
-       l4dde26_init();
-       l4dde26_process_init();
-       l4dde26_softirq_init();
-
-       printk("Initializing skb subsystem\n");
-       skb_init();
-
-       l4dde26_do_initcalls();
-       printk("Setting rx callback @ %p\n", net_rx_handle);
-       l4dde26_register_rx_callback(net_rx_handle);
-
-       printk("Opening nw devs.\n");
-       open_nw_dev();
-       printk("dev is up and ready.\n");
-
-       arping();
-
-       close_nw_dev();
-
-       printk("shut down driver\n");
-
-       return 0;
-}
diff --git a/dde_pcnet32_test/pcnet32.c b/dde_pcnet32_test/pcnet32.c
deleted file mode 100644
index 27996de..0000000
--- a/dde_pcnet32_test/pcnet32.c
+++ /dev/null
@@ -1,3063 +0,0 @@
-/* pcnet32.c: An AMD PCnet32 ethernet driver for linux. */
-/*
- *     Copyright 1996-1999 Thomas Bogendoerfer
- *
- *     Derived from the lance driver written 1993,1994,1995 by Donald Becker.
- *
- *     Copyright 1993 United States Government as represented by the
- *     Director, National Security Agency.
- *
- *     This software may be used and distributed according to the terms
- *     of the GNU General Public License, incorporated herein by reference.
- *
- *     This driver is for PCnet32 and PCnetPCI based ethercards
- */
-/**************************************************************************
- *  23 Oct, 2000.
- *  Fixed a few bugs, related to running the controller in 32bit mode.
- *
- *  Carsten Langgaard, address@hidden
- *  Copyright (C) 2000 MIPS Technologies, Inc.  All rights reserved.
- *
- *************************************************************************/
-
-#define DRV_NAME       "pcnet32"
-#define DRV_VERSION    "1.35"
-#define DRV_RELDATE    "21.Apr.2008"
-#define PFX            DRV_NAME ": "
-
-static const char *const version =
-    DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE " address@hidden";
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/string.h>
-#include <linux/errno.h>
-#include <linux/ioport.h>
-#include <linux/slab.h>
-#include <linux/interrupt.h>
-#include <linux/pci.h>
-#include <linux/delay.h>
-#include <linux/init.h>
-#include <linux/ethtool.h>
-#include <linux/mii.h>
-#include <linux/crc32.h>
-#include <linux/netdevice.h>
-#include <linux/etherdevice.h>
-#include <linux/skbuff.h>
-#include <linux/spinlock.h>
-#include <linux/moduleparam.h>
-#include <linux/bitops.h>
-
-#include <asm/dma.h>
-#include <asm/io.h>
-#include <asm/uaccess.h>
-#include <asm/irq.h>
-
-#include <ddekit/timer.h>
-
-/*
- * PCI device identifiers for "new style" Linux PCI Device Drivers
- */
-static struct pci_device_id pcnet32_pci_tbl[] = {
-       { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_LANCE_HOME), },
-       { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_LANCE), },
-
-       /*
-        * Adapters that were sold with IBM's RS/6000 or pSeries hardware have
-        * the incorrect vendor id.
-        */
-       { PCI_DEVICE(PCI_VENDOR_ID_TRIDENT, PCI_DEVICE_ID_AMD_LANCE),
-         .class = (PCI_CLASS_NETWORK_ETHERNET << 8), .class_mask = 0xffff00, },
-
-       { }     /* terminate list */
-};
-
-MODULE_DEVICE_TABLE(pci, pcnet32_pci_tbl);
-
-static int cards_found;
-
-/*
- * VLB I/O addresses
- */
-static unsigned int pcnet32_portlist[] __initdata =
-    { 0x300, 0x320, 0x340, 0x360, 0 };
-
-static int pcnet32_debug = 0;
-static int tx_start = 1;       /* Mapping -- 0:20, 1:64, 2:128, 3:~220 
(depends on chip vers) */
-static int pcnet32vlb;         /* check for VLB cards ? */
-
-static struct net_device *pcnet32_dev;
-
-static int max_interrupt_work = 2;
-static int rx_copybreak = 200;
-
-#define PCNET32_PORT_AUI      0x00
-#define PCNET32_PORT_10BT     0x01
-#define PCNET32_PORT_GPSI     0x02
-#define PCNET32_PORT_MII      0x03
-
-#define PCNET32_PORT_PORTSEL  0x03
-#define PCNET32_PORT_ASEL     0x04
-#define PCNET32_PORT_100      0x40
-#define PCNET32_PORT_FD              0x80
-
-#define PCNET32_DMA_MASK 0xffffffff
-
-#define PCNET32_WATCHDOG_TIMEOUT (jiffies + (2 * HZ))
-#define PCNET32_BLINK_TIMEOUT  (jiffies + (HZ/4))
-
-/*
- * table to translate option values from tulip
- * to internal options
- */
-static const unsigned char options_mapping[] = {
-       PCNET32_PORT_ASEL,                      /*  0 Auto-select      */
-       PCNET32_PORT_AUI,                       /*  1 BNC/AUI          */
-       PCNET32_PORT_AUI,                       /*  2 AUI/BNC          */
-       PCNET32_PORT_ASEL,                      /*  3 not supported    */
-       PCNET32_PORT_10BT | PCNET32_PORT_FD,    /*  4 10baseT-FD       */
-       PCNET32_PORT_ASEL,                      /*  5 not supported    */
-       PCNET32_PORT_ASEL,                      /*  6 not supported    */
-       PCNET32_PORT_ASEL,                      /*  7 not supported    */
-       PCNET32_PORT_ASEL,                      /*  8 not supported    */
-       PCNET32_PORT_MII,                       /*  9 MII 10baseT      */
-       PCNET32_PORT_MII | PCNET32_PORT_FD,     /* 10 MII 10baseT-FD   */
-       PCNET32_PORT_MII,                       /* 11 MII (autosel)    */
-       PCNET32_PORT_10BT,                      /* 12 10BaseT          */
-       PCNET32_PORT_MII | PCNET32_PORT_100,    /* 13 MII 100BaseTx    */
-                                               /* 14 MII 100BaseTx-FD */
-       PCNET32_PORT_MII | PCNET32_PORT_100 | PCNET32_PORT_FD,
-       PCNET32_PORT_ASEL                       /* 15 not supported    */
-};
-
-static const char pcnet32_gstrings_test[][ETH_GSTRING_LEN] = {
-       "Loopback test  (offline)"
-};
-
-#define PCNET32_TEST_LEN       ARRAY_SIZE(pcnet32_gstrings_test)
-
-#define PCNET32_NUM_REGS 136
-
-#define MAX_UNITS 8            /* More are supported, limit only on options */
-static int options[MAX_UNITS];
-static int full_duplex[MAX_UNITS];
-static int homepna[MAX_UNITS];
-
-/*
- *                             Theory of Operation
- *
- * This driver uses the same software structure as the normal lance
- * driver. So look for a verbose description in lance.c. The differences
- * to the normal lance driver is the use of the 32bit mode of PCnet32
- * and PCnetPCI chips. Because these chips are 32bit chips, there is no
- * 16MB limitation and we don't need bounce buffers.
- */
-
-/*
- * Set the number of Tx and Rx buffers, using Log_2(# buffers).
- * Reasonable default values are 4 Tx buffers, and 16 Rx buffers.
- * That translates to 2 (4 == 2^^2) and 4 (16 == 2^^4).
- */
-#ifndef PCNET32_LOG_TX_BUFFERS
-#define PCNET32_LOG_TX_BUFFERS         4
-#define PCNET32_LOG_RX_BUFFERS         5
-#define PCNET32_LOG_MAX_TX_BUFFERS     9       /* 2^9 == 512 */
-#define PCNET32_LOG_MAX_RX_BUFFERS     9
-#endif
-
-#define TX_RING_SIZE           (1 << (PCNET32_LOG_TX_BUFFERS))
-#define TX_MAX_RING_SIZE       (1 << (PCNET32_LOG_MAX_TX_BUFFERS))
-
-#define RX_RING_SIZE           (1 << (PCNET32_LOG_RX_BUFFERS))
-#define RX_MAX_RING_SIZE       (1 << (PCNET32_LOG_MAX_RX_BUFFERS))
-
-#define PKT_BUF_SKB            1544
-/* actual buffer length after being aligned */
-#define PKT_BUF_SIZE           (PKT_BUF_SKB - NET_IP_ALIGN)
-/* chip wants twos complement of the (aligned) buffer length */
-#define NEG_BUF_SIZE           (NET_IP_ALIGN - PKT_BUF_SKB)
-
-/* Offsets from base I/O address. */
-#define PCNET32_WIO_RDP                0x10
-#define PCNET32_WIO_RAP                0x12
-#define PCNET32_WIO_RESET      0x14
-#define PCNET32_WIO_BDP                0x16
-
-#define PCNET32_DWIO_RDP       0x10
-#define PCNET32_DWIO_RAP       0x14
-#define PCNET32_DWIO_RESET     0x18
-#define PCNET32_DWIO_BDP       0x1C
-
-#define PCNET32_TOTAL_SIZE     0x20
-
-#define CSR0           0
-#define CSR0_INIT      0x1
-#define CSR0_START     0x2
-#define CSR0_STOP      0x4
-#define CSR0_TXPOLL    0x8
-#define CSR0_INTEN     0x40
-#define CSR0_IDON      0x0100
-#define CSR0_NORMAL    (CSR0_START | CSR0_INTEN)
-#define PCNET32_INIT_LOW       1
-#define PCNET32_INIT_HIGH      2
-#define CSR3           3
-#define CSR4           4
-#define CSR5           5
-#define CSR5_SUSPEND   0x0001
-#define CSR15          15
-#define PCNET32_MC_FILTER      8
-
-#define PCNET32_79C970A        0x2621
-
-/* The PCNET32 Rx and Tx ring descriptors. */
-struct pcnet32_rx_head {
-       __le32  base;
-       __le16  buf_length;     /* two`s complement of length */
-       __le16  status;
-       __le32  msg_length;
-       __le32  reserved;
-};
-
-struct pcnet32_tx_head {
-       __le32  base;
-       __le16  length;         /* two`s complement of length */
-       __le16  status;
-       __le32  misc;
-       __le32  reserved;
-};
-
-/* The PCNET32 32-Bit initialization block, described in databook. */
-struct pcnet32_init_block {
-       __le16  mode;
-       __le16  tlen_rlen;
-       u8      phys_addr[6];
-       __le16  reserved;
-       __le32  filter[2];
-       /* Receive and transmit ring base, along with extra bits. */
-       __le32  rx_ring;
-       __le32  tx_ring;
-};
-
-/* PCnet32 access functions */
-struct pcnet32_access {
-       u16     (*read_csr) (unsigned long, int);
-       void    (*write_csr) (unsigned long, int, u16);
-       u16     (*read_bcr) (unsigned long, int);
-       void    (*write_bcr) (unsigned long, int, u16);
-       u16     (*read_rap) (unsigned long);
-       void    (*write_rap) (unsigned long, u16);
-       void    (*reset) (unsigned long);
-};
-
-/*
- * The first field of pcnet32_private is read by the ethernet device
- * so the structure should be allocated using pci_alloc_consistent().
- */
-struct pcnet32_private {
-       struct pcnet32_init_block *init_block;
-       /* The Tx and Rx ring entries must be aligned on 16-byte boundaries in 
32bit mode. */
-       struct pcnet32_rx_head  *rx_ring;
-       struct pcnet32_tx_head  *tx_ring;
-       dma_addr_t              init_dma_addr;/* DMA address of beginning of 
the init block,
-                                  returned by pci_alloc_consistent */
-       struct pci_dev          *pci_dev;
-       const char              *name;
-       /* The saved address of a sent-in-place packet/buffer, for skfree(). */
-       struct sk_buff          **tx_skbuff;
-       struct sk_buff          **rx_skbuff;
-       dma_addr_t              *tx_dma_addr;
-       dma_addr_t              *rx_dma_addr;
-       struct pcnet32_access   a;
-       spinlock_t              lock;           /* Guard lock */
-       unsigned int            cur_rx, cur_tx; /* The next free ring entry */
-       unsigned int            rx_ring_size;   /* current rx ring size */
-       unsigned int            tx_ring_size;   /* current tx ring size */
-       unsigned int            rx_mod_mask;    /* rx ring modular mask */
-       unsigned int            tx_mod_mask;    /* tx ring modular mask */
-       unsigned short          rx_len_bits;
-       unsigned short          tx_len_bits;
-       dma_addr_t              rx_ring_dma_addr;
-       dma_addr_t              tx_ring_dma_addr;
-       unsigned int            dirty_rx,       /* ring entries to be freed. */
-                               dirty_tx;
-
-       struct net_device       *dev;
-       struct napi_struct      napi;
-       char                    tx_full;
-       char                    phycount;       /* number of phys found */
-       int                     options;
-       unsigned int            shared_irq:1,   /* shared irq possible */
-                               dxsuflo:1,   /* disable transmit stop on uflo */
-                               mii:1;          /* mii port available */
-       struct net_device       *next;
-       struct mii_if_info      mii_if;
-       struct timer_list       watchdog_timer;
-       struct timer_list       blink_timer;
-       u32                     msg_enable;     /* debug message level */
-
-       /* each bit indicates an available PHY */
-       u32                     phymask;
-       unsigned short          chip_version;   /* which variant this is */
-};
-
-static int pcnet32_probe_pci(struct pci_dev *, const struct pci_device_id *);
-static int pcnet32_probe1(unsigned long, int, struct pci_dev *);
-static int pcnet32_open(struct net_device *);
-static int pcnet32_init_ring(struct net_device *);
-static int pcnet32_start_xmit(struct sk_buff *, struct net_device *);
-static void pcnet32_tx_timeout(struct net_device *dev);
-static irqreturn_t pcnet32_interrupt(int, void *);
-static int pcnet32_close(struct net_device *);
-static struct net_device_stats *pcnet32_get_stats(struct net_device *);
-static void pcnet32_load_multicast(struct net_device *dev);
-static void pcnet32_set_multicast_list(struct net_device *);
-static int pcnet32_ioctl(struct net_device *, struct ifreq *, int);
-static void pcnet32_watchdog(struct net_device *);
-static int mdio_read(struct net_device *dev, int phy_id, int reg_num);
-static void mdio_write(struct net_device *dev, int phy_id, int reg_num,
-                      int val);
-static void pcnet32_restart(struct net_device *dev, unsigned int csr0_bits);
-static void pcnet32_ethtool_test(struct net_device *dev,
-                                struct ethtool_test *eth_test, u64 * data);
-static int pcnet32_loopback_test(struct net_device *dev, uint64_t * data1);
-static int pcnet32_phys_id(struct net_device *dev, u32 data);
-static void pcnet32_led_blink_callback(struct net_device *dev);
-static int pcnet32_get_regs_len(struct net_device *dev);
-static void pcnet32_get_regs(struct net_device *dev, struct ethtool_regs *regs,
-                            void *ptr);
-static void pcnet32_purge_tx_ring(struct net_device *dev);
-static int pcnet32_alloc_ring(struct net_device *dev, const char *name);
-static void pcnet32_free_ring(struct net_device *dev);
-static void pcnet32_check_media(struct net_device *dev, int verbose);
-
-static u16 pcnet32_wio_read_csr(unsigned long addr, int index)
-{
-       outw(index, addr + PCNET32_WIO_RAP);
-       return inw(addr + PCNET32_WIO_RDP);
-}
-
-static void pcnet32_wio_write_csr(unsigned long addr, int index, u16 val)
-{
-       outw(index, addr + PCNET32_WIO_RAP);
-       outw(val, addr + PCNET32_WIO_RDP);
-}
-
-static u16 pcnet32_wio_read_bcr(unsigned long addr, int index)
-{
-       outw(index, addr + PCNET32_WIO_RAP);
-       return inw(addr + PCNET32_WIO_BDP);
-}
-
-static void pcnet32_wio_write_bcr(unsigned long addr, int index, u16 val)
-{
-       outw(index, addr + PCNET32_WIO_RAP);
-       outw(val, addr + PCNET32_WIO_BDP);
-}
-
-static u16 pcnet32_wio_read_rap(unsigned long addr)
-{
-       return inw(addr + PCNET32_WIO_RAP);
-}
-
-static void pcnet32_wio_write_rap(unsigned long addr, u16 val)
-{
-       outw(val, addr + PCNET32_WIO_RAP);
-}
-
-static void pcnet32_wio_reset(unsigned long addr)
-{
-       inw(addr + PCNET32_WIO_RESET);
-}
-
-static int pcnet32_wio_check(unsigned long addr)
-{
-       outw(88, addr + PCNET32_WIO_RAP);
-       return (inw(addr + PCNET32_WIO_RAP) == 88);
-}
-
-static struct pcnet32_access pcnet32_wio = {
-       .read_csr = pcnet32_wio_read_csr,
-       .write_csr = pcnet32_wio_write_csr,
-       .read_bcr = pcnet32_wio_read_bcr,
-       .write_bcr = pcnet32_wio_write_bcr,
-       .read_rap = pcnet32_wio_read_rap,
-       .write_rap = pcnet32_wio_write_rap,
-       .reset = pcnet32_wio_reset
-};
-
-static u16 pcnet32_dwio_read_csr(unsigned long addr, int index)
-{
-       outl(index, addr + PCNET32_DWIO_RAP);
-       return (inl(addr + PCNET32_DWIO_RDP) & 0xffff);
-}
-
-static void pcnet32_dwio_write_csr(unsigned long addr, int index, u16 val)
-{
-       outl(index, addr + PCNET32_DWIO_RAP);
-       outl(val, addr + PCNET32_DWIO_RDP);
-}
-
-static u16 pcnet32_dwio_read_bcr(unsigned long addr, int index)
-{
-       outl(index, addr + PCNET32_DWIO_RAP);
-       return (inl(addr + PCNET32_DWIO_BDP) & 0xffff);
-}
-
-static void pcnet32_dwio_write_bcr(unsigned long addr, int index, u16 val)
-{
-       outl(index, addr + PCNET32_DWIO_RAP);
-       outl(val, addr + PCNET32_DWIO_BDP);
-}
-
-static u16 pcnet32_dwio_read_rap(unsigned long addr)
-{
-       return (inl(addr + PCNET32_DWIO_RAP) & 0xffff);
-}
-
-static void pcnet32_dwio_write_rap(unsigned long addr, u16 val)
-{
-       outl(val, addr + PCNET32_DWIO_RAP);
-}
-
-static void pcnet32_dwio_reset(unsigned long addr)
-{
-       inl(addr + PCNET32_DWIO_RESET);
-}
-
-static int pcnet32_dwio_check(unsigned long addr)
-{
-       outl(88, addr + PCNET32_DWIO_RAP);
-       return ((inl(addr + PCNET32_DWIO_RAP) & 0xffff) == 88);
-}
-
-static struct pcnet32_access pcnet32_dwio = {
-       .read_csr = pcnet32_dwio_read_csr,
-       .write_csr = pcnet32_dwio_write_csr,
-       .read_bcr = pcnet32_dwio_read_bcr,
-       .write_bcr = pcnet32_dwio_write_bcr,
-       .read_rap = pcnet32_dwio_read_rap,
-       .write_rap = pcnet32_dwio_write_rap,
-       .reset = pcnet32_dwio_reset
-};
-
-static void pcnet32_netif_stop(struct net_device *dev)
-{
-       struct pcnet32_private *lp = netdev_priv(dev);
-
-       dev->trans_start = jiffies;
-       napi_disable(&lp->napi);
-       netif_tx_disable(dev);
-}
-
-static void pcnet32_netif_start(struct net_device *dev)
-{
-       struct pcnet32_private *lp = netdev_priv(dev);
-       ulong ioaddr = dev->base_addr;
-       u16 val;
-
-       netif_wake_queue(dev);
-       val = lp->a.read_csr(ioaddr, CSR3);
-       val &= 0x00ff;
-       lp->a.write_csr(ioaddr, CSR3, val);
-       napi_enable(&lp->napi);
-}
-
-/*
- * Allocate space for the new sized tx ring.
- * Free old resources
- * Save new resources.
- * Any failure keeps old resources.
- * Must be called with lp->lock held.
- */
-static void pcnet32_realloc_tx_ring(struct net_device *dev,
-                                   struct pcnet32_private *lp,
-                                   unsigned int size)
-{
-       dma_addr_t new_ring_dma_addr;
-       dma_addr_t *new_dma_addr_list;
-       struct pcnet32_tx_head *new_tx_ring;
-       struct sk_buff **new_skb_list;
-
-       pcnet32_purge_tx_ring(dev);
-
-       new_tx_ring = pci_alloc_consistent(lp->pci_dev,
-                                          sizeof(struct pcnet32_tx_head) *
-                                          (1 << size),
-                                          &new_ring_dma_addr);
-       if (new_tx_ring == NULL) {
-               if (netif_msg_drv(lp))
-                       printk("\n" KERN_ERR
-                              "%s: Consistent memory allocation failed.\n",
-                              dev->name);
-               return;
-       }
-       memset(new_tx_ring, 0, sizeof(struct pcnet32_tx_head) * (1 << size));
-
-       new_dma_addr_list = kcalloc((1 << size), sizeof(dma_addr_t),
-                               GFP_ATOMIC);
-       if (!new_dma_addr_list) {
-               if (netif_msg_drv(lp))
-                       printk("\n" KERN_ERR
-                              "%s: Memory allocation failed.\n", dev->name);
-               goto free_new_tx_ring;
-       }
-
-       new_skb_list = kcalloc((1 << size), sizeof(struct sk_buff *),
-                               GFP_ATOMIC);
-       if (!new_skb_list) {
-               if (netif_msg_drv(lp))
-                       printk("\n" KERN_ERR
-                              "%s: Memory allocation failed.\n", dev->name);
-               goto free_new_lists;
-       }
-
-       kfree(lp->tx_skbuff);
-       kfree(lp->tx_dma_addr);
-       pci_free_consistent(lp->pci_dev,
-                           sizeof(struct pcnet32_tx_head) *
-                           lp->tx_ring_size, lp->tx_ring,
-                           lp->tx_ring_dma_addr);
-
-       lp->tx_ring_size = (1 << size);
-       lp->tx_mod_mask = lp->tx_ring_size - 1;
-       lp->tx_len_bits = (size << 12);
-       lp->tx_ring = new_tx_ring;
-       lp->tx_ring_dma_addr = new_ring_dma_addr;
-       lp->tx_dma_addr = new_dma_addr_list;
-       lp->tx_skbuff = new_skb_list;
-       return;
-
-    free_new_lists:
-       kfree(new_dma_addr_list);
-    free_new_tx_ring:
-       pci_free_consistent(lp->pci_dev,
-                           sizeof(struct pcnet32_tx_head) *
-                           (1 << size),
-                           new_tx_ring,
-                           new_ring_dma_addr);
-       return;
-}
-
-/*
- * Allocate space for the new sized rx ring.
- * Re-use old receive buffers.
- *   alloc extra buffers
- *   free unneeded buffers
- *   free unneeded buffers
- * Save new resources.
- * Any failure keeps old resources.
- * Must be called with lp->lock held.
- */
-static void pcnet32_realloc_rx_ring(struct net_device *dev,
-                                   struct pcnet32_private *lp,
-                                   unsigned int size)
-{
-       dma_addr_t new_ring_dma_addr;
-       dma_addr_t *new_dma_addr_list;
-       struct pcnet32_rx_head *new_rx_ring;
-       struct sk_buff **new_skb_list;
-       int new, overlap;
-
-       new_rx_ring = pci_alloc_consistent(lp->pci_dev,
-                                          sizeof(struct pcnet32_rx_head) *
-                                          (1 << size),
-                                          &new_ring_dma_addr);
-       if (new_rx_ring == NULL) {
-               if (netif_msg_drv(lp))
-                       printk("\n" KERN_ERR
-                              "%s: Consistent memory allocation failed.\n",
-                              dev->name);
-               return;
-       }
-       memset(new_rx_ring, 0, sizeof(struct pcnet32_rx_head) * (1 << size));
-
-       new_dma_addr_list = kcalloc((1 << size), sizeof(dma_addr_t),
-                               GFP_ATOMIC);
-       if (!new_dma_addr_list) {
-               if (netif_msg_drv(lp))
-                       printk("\n" KERN_ERR
-                              "%s: Memory allocation failed.\n", dev->name);
-               goto free_new_rx_ring;
-       }
-
-       new_skb_list = kcalloc((1 << size), sizeof(struct sk_buff *),
-                               GFP_ATOMIC);
-       if (!new_skb_list) {
-               if (netif_msg_drv(lp))
-                       printk("\n" KERN_ERR
-                              "%s: Memory allocation failed.\n", dev->name);
-               goto free_new_lists;
-       }
-
-       /* first copy the current receive buffers */
-       overlap = min(size, lp->rx_ring_size);
-       for (new = 0; new < overlap; new++) {
-               new_rx_ring[new] = lp->rx_ring[new];
-               new_dma_addr_list[new] = lp->rx_dma_addr[new];
-               new_skb_list[new] = lp->rx_skbuff[new];
-       }
-       /* now allocate any new buffers needed */
-       for (; new < size; new++ ) {
-               struct sk_buff *rx_skbuff;
-               new_skb_list[new] = dev_alloc_skb(PKT_BUF_SKB);
-               if (!(rx_skbuff = new_skb_list[new])) {
-                       /* keep the original lists and buffers */
-                       if (netif_msg_drv(lp))
-                               printk(KERN_ERR
-                                      "%s: pcnet32_realloc_rx_ring 
dev_alloc_skb failed.\n",
-                                      dev->name);
-                       goto free_all_new;
-               }
-               skb_reserve(rx_skbuff, NET_IP_ALIGN);
-
-               new_dma_addr_list[new] =
-                           pci_map_single(lp->pci_dev, rx_skbuff->data,
-                                          PKT_BUF_SIZE, PCI_DMA_FROMDEVICE);
-               new_rx_ring[new].base = cpu_to_le32(new_dma_addr_list[new]);
-               new_rx_ring[new].buf_length = cpu_to_le16(NEG_BUF_SIZE);
-               new_rx_ring[new].status = cpu_to_le16(0x8000);
-       }
-       /* and free any unneeded buffers */
-       for (; new < lp->rx_ring_size; new++) {
-               if (lp->rx_skbuff[new]) {
-                       pci_unmap_single(lp->pci_dev, lp->rx_dma_addr[new],
-                                        PKT_BUF_SIZE, PCI_DMA_FROMDEVICE);
-                       dev_kfree_skb(lp->rx_skbuff[new]);
-               }
-       }
-
-       kfree(lp->rx_skbuff);
-       kfree(lp->rx_dma_addr);
-       pci_free_consistent(lp->pci_dev,
-                           sizeof(struct pcnet32_rx_head) *
-                           lp->rx_ring_size, lp->rx_ring,
-                           lp->rx_ring_dma_addr);
-
-       lp->rx_ring_size = (1 << size);
-       lp->rx_mod_mask = lp->rx_ring_size - 1;
-       lp->rx_len_bits = (size << 4);
-       lp->rx_ring = new_rx_ring;
-       lp->rx_ring_dma_addr = new_ring_dma_addr;
-       lp->rx_dma_addr = new_dma_addr_list;
-       lp->rx_skbuff = new_skb_list;
-       return;
-
-    free_all_new:
-       for (; --new >= lp->rx_ring_size; ) {
-               if (new_skb_list[new]) {
-                       pci_unmap_single(lp->pci_dev, new_dma_addr_list[new],
-                                        PKT_BUF_SIZE, PCI_DMA_FROMDEVICE);
-                       dev_kfree_skb(new_skb_list[new]);
-               }
-       }
-       kfree(new_skb_list);
-    free_new_lists:
-       kfree(new_dma_addr_list);
-    free_new_rx_ring:
-       pci_free_consistent(lp->pci_dev,
-                           sizeof(struct pcnet32_rx_head) *
-                           (1 << size),
-                           new_rx_ring,
-                           new_ring_dma_addr);
-       return;
-}
-
-static void pcnet32_purge_rx_ring(struct net_device *dev)
-{
-       struct pcnet32_private *lp = netdev_priv(dev);
-       int i;
-
-       /* free all allocated skbuffs */
-       for (i = 0; i < lp->rx_ring_size; i++) {
-               lp->rx_ring[i].status = 0;      /* CPU owns buffer */
-               wmb();          /* Make sure adapter sees owner change */
-               if (lp->rx_skbuff[i]) {
-                       pci_unmap_single(lp->pci_dev, lp->rx_dma_addr[i],
-                                        PKT_BUF_SIZE, PCI_DMA_FROMDEVICE);
-                       dev_kfree_skb_any(lp->rx_skbuff[i]);
-               }
-               lp->rx_skbuff[i] = NULL;
-               lp->rx_dma_addr[i] = 0;
-       }
-}
-
-#ifdef CONFIG_NET_POLL_CONTROLLER
-static void pcnet32_poll_controller(struct net_device *dev)
-{
-       disable_irq(dev->irq);
-       pcnet32_interrupt(0, dev);
-       enable_irq(dev->irq);
-}
-#endif
-
-static int pcnet32_get_settings(struct net_device *dev, struct ethtool_cmd 
*cmd)
-{
-       struct pcnet32_private *lp = netdev_priv(dev);
-       unsigned long flags;
-       int r = -EOPNOTSUPP;
-
-       if (lp->mii) {
-               spin_lock_irqsave(&lp->lock, flags);
-               mii_ethtool_gset(&lp->mii_if, cmd);
-               spin_unlock_irqrestore(&lp->lock, flags);
-               r = 0;
-       }
-       return r;
-}
-
-static int pcnet32_set_settings(struct net_device *dev, struct ethtool_cmd 
*cmd)
-{
-       struct pcnet32_private *lp = netdev_priv(dev);
-       unsigned long flags;
-       int r = -EOPNOTSUPP;
-
-       if (lp->mii) {
-               spin_lock_irqsave(&lp->lock, flags);
-               r = mii_ethtool_sset(&lp->mii_if, cmd);
-               spin_unlock_irqrestore(&lp->lock, flags);
-       }
-       return r;
-}
-
-static void pcnet32_get_drvinfo(struct net_device *dev,
-                               struct ethtool_drvinfo *info)
-{
-       struct pcnet32_private *lp = netdev_priv(dev);
-
-       strcpy(info->driver, DRV_NAME);
-       strcpy(info->version, DRV_VERSION);
-       if (lp->pci_dev)
-               strcpy(info->bus_info, pci_name(lp->pci_dev));
-       else
-               sprintf(info->bus_info, "VLB 0x%lx", dev->base_addr);
-}
-
-static u32 pcnet32_get_link(struct net_device *dev)
-{
-       struct pcnet32_private *lp = netdev_priv(dev);
-       unsigned long flags;
-       int r;
-
-       spin_lock_irqsave(&lp->lock, flags);
-       if (lp->mii) {
-               r = mii_link_ok(&lp->mii_if);
-       } else if (lp->chip_version >= PCNET32_79C970A) {
-               ulong ioaddr = dev->base_addr;  /* card base I/O address */
-               r = (lp->a.read_bcr(ioaddr, 4) != 0xc0);
-       } else {        /* can not detect link on really old chips */
-               r = 1;
-       }
-       spin_unlock_irqrestore(&lp->lock, flags);
-
-       return r;
-}
-
-static u32 pcnet32_get_msglevel(struct net_device *dev)
-{
-       struct pcnet32_private *lp = netdev_priv(dev);
-       return lp->msg_enable;
-}
-
-static void pcnet32_set_msglevel(struct net_device *dev, u32 value)
-{
-       struct pcnet32_private *lp = netdev_priv(dev);
-       lp->msg_enable = value;
-}
-
-static int pcnet32_nway_reset(struct net_device *dev)
-{
-       struct pcnet32_private *lp = netdev_priv(dev);
-       unsigned long flags;
-       int r = -EOPNOTSUPP;
-
-       if (lp->mii) {
-               spin_lock_irqsave(&lp->lock, flags);
-               r = mii_nway_restart(&lp->mii_if);
-               spin_unlock_irqrestore(&lp->lock, flags);
-       }
-       return r;
-}
-
-static void pcnet32_get_ringparam(struct net_device *dev,
-                                 struct ethtool_ringparam *ering)
-{
-       struct pcnet32_private *lp = netdev_priv(dev);
-
-       ering->tx_max_pending = TX_MAX_RING_SIZE;
-       ering->tx_pending = lp->tx_ring_size;
-       ering->rx_max_pending = RX_MAX_RING_SIZE;
-       ering->rx_pending = lp->rx_ring_size;
-}
-
-static int pcnet32_set_ringparam(struct net_device *dev,
-                                struct ethtool_ringparam *ering)
-{
-       struct pcnet32_private *lp = netdev_priv(dev);
-       unsigned long flags;
-       unsigned int size;
-       ulong ioaddr = dev->base_addr;
-       int i;
-
-       if (ering->rx_mini_pending || ering->rx_jumbo_pending)
-               return -EINVAL;
-
-       if (netif_running(dev))
-               pcnet32_netif_stop(dev);
-
-       spin_lock_irqsave(&lp->lock, flags);
-       lp->a.write_csr(ioaddr, CSR0, CSR0_STOP);       /* stop the chip */
-
-       size = min(ering->tx_pending, (unsigned int)TX_MAX_RING_SIZE);
-
-       /* set the minimum ring size to 4, to allow the loopback test to work
-        * unchanged.
-        */
-       for (i = 2; i <= PCNET32_LOG_MAX_TX_BUFFERS; i++) {
-               if (size <= (1 << i))
-                       break;
-       }
-       if ((1 << i) != lp->tx_ring_size)
-               pcnet32_realloc_tx_ring(dev, lp, i);
-
-       size = min(ering->rx_pending, (unsigned int)RX_MAX_RING_SIZE);
-       for (i = 2; i <= PCNET32_LOG_MAX_RX_BUFFERS; i++) {
-               if (size <= (1 << i))
-                       break;
-       }
-       if ((1 << i) != lp->rx_ring_size)
-               pcnet32_realloc_rx_ring(dev, lp, i);
-
-       lp->napi.weight = lp->rx_ring_size / 2;
-
-       if (netif_running(dev)) {
-               pcnet32_netif_start(dev);
-               pcnet32_restart(dev, CSR0_NORMAL);
-       }
-
-       spin_unlock_irqrestore(&lp->lock, flags);
-
-       if (netif_msg_drv(lp))
-               printk(KERN_INFO
-                      "%s: Ring Param Settings: RX: %d, TX: %d\n", dev->name,
-                      lp->rx_ring_size, lp->tx_ring_size);
-
-       return 0;
-}
-
-static void pcnet32_get_strings(struct net_device *dev, u32 stringset,
-                               u8 * data)
-{
-       memcpy(data, pcnet32_gstrings_test, sizeof(pcnet32_gstrings_test));
-}
-
-static int pcnet32_get_sset_count(struct net_device *dev, int sset)
-{
-       switch (sset) {
-       case ETH_SS_TEST:
-               return PCNET32_TEST_LEN;
-       default:
-               return -EOPNOTSUPP;
-       }
-}
-
-static void pcnet32_ethtool_test(struct net_device *dev,
-                                struct ethtool_test *test, u64 * data)
-{
-       struct pcnet32_private *lp = netdev_priv(dev);
-       int rc;
-
-       if (test->flags == ETH_TEST_FL_OFFLINE) {
-               rc = pcnet32_loopback_test(dev, data);
-               if (rc) {
-                       if (netif_msg_hw(lp))
-                               printk(KERN_DEBUG "%s: Loopback test failed.\n",
-                                      dev->name);
-                       test->flags |= ETH_TEST_FL_FAILED;
-               } else if (netif_msg_hw(lp))
-                       printk(KERN_DEBUG "%s: Loopback test passed.\n",
-                              dev->name);
-       } else if (netif_msg_hw(lp))
-               printk(KERN_DEBUG
-                      "%s: No tests to run (specify 'Offline' on ethtool).",
-                      dev->name);
-}                              /* end pcnet32_ethtool_test */
-
-static int pcnet32_loopback_test(struct net_device *dev, uint64_t * data1)
-{
-       struct pcnet32_private *lp = netdev_priv(dev);
-       struct pcnet32_access *a = &lp->a;      /* access to registers */
-       ulong ioaddr = dev->base_addr;  /* card base I/O address */
-       struct sk_buff *skb;    /* sk buff */
-       int x, i;               /* counters */
-       int numbuffs = 4;       /* number of TX/RX buffers and descs */
-       u16 status = 0x8300;    /* TX ring status */
-       __le16 teststatus;      /* test of ring status */
-       int rc;                 /* return code */
-       int size;               /* size of packets */
-       unsigned char *packet;  /* source packet data */
-       static const int data_len = 60; /* length of source packets */
-       unsigned long flags;
-       unsigned long ticks;
-
-       rc = 1;                 /* default to fail */
-
-       if (netif_running(dev))
-               pcnet32_netif_stop(dev);
-
-       spin_lock_irqsave(&lp->lock, flags);
-       lp->a.write_csr(ioaddr, CSR0, CSR0_STOP);       /* stop the chip */
-
-       numbuffs = min(numbuffs, (int)min(lp->rx_ring_size, lp->tx_ring_size));
-
-       /* Reset the PCNET32 */
-       lp->a.reset(ioaddr);
-       lp->a.write_csr(ioaddr, CSR4, 0x0915);  /* auto tx pad */
-
-       /* switch pcnet32 to 32bit mode */
-       lp->a.write_bcr(ioaddr, 20, 2);
-
-       /* purge & init rings but don't actually restart */
-       pcnet32_restart(dev, 0x0000);
-
-       lp->a.write_csr(ioaddr, CSR0, CSR0_STOP);       /* Set STOP bit */
-
-       /* Initialize Transmit buffers. */
-       size = data_len + 15;
-       for (x = 0; x < numbuffs; x++) {
-               if (!(skb = dev_alloc_skb(size))) {
-                       if (netif_msg_hw(lp))
-                               printk(KERN_DEBUG
-                                      "%s: Cannot allocate skb at line: %d!\n",
-                                      dev->name, __LINE__);
-                       goto clean_up;
-               } else {
-                       packet = skb->data;
-                       skb_put(skb, size);     /* create space for data */
-                       lp->tx_skbuff[x] = skb;
-                       lp->tx_ring[x].length = cpu_to_le16(-skb->len);
-                       lp->tx_ring[x].misc = 0;
-
-                       /* put DA and SA into the skb */
-                       for (i = 0; i < 6; i++)
-                               *packet++ = dev->dev_addr[i];
-                       for (i = 0; i < 6; i++)
-                               *packet++ = dev->dev_addr[i];
-                       /* type */
-                       *packet++ = 0x08;
-                       *packet++ = 0x06;
-                       /* packet number */
-                       *packet++ = x;
-                       /* fill packet with data */
-                       for (i = 0; i < data_len; i++)
-                               *packet++ = i;
-
-                       lp->tx_dma_addr[x] =
-                           pci_map_single(lp->pci_dev, skb->data, skb->len,
-                                          PCI_DMA_TODEVICE);
-                       lp->tx_ring[x].base = cpu_to_le32(lp->tx_dma_addr[x]);
-                       wmb();  /* Make sure owner changes after all others are 
visible */
-                       lp->tx_ring[x].status = cpu_to_le16(status);
-               }
-       }
-
-       x = a->read_bcr(ioaddr, 32);    /* set internal loopback in BCR32 */
-       a->write_bcr(ioaddr, 32, x | 0x0002);
-
-       /* set int loopback in CSR15 */
-       x = a->read_csr(ioaddr, CSR15) & 0xfffc;
-       lp->a.write_csr(ioaddr, CSR15, x | 0x0044);
-
-       teststatus = cpu_to_le16(0x8000);
-       lp->a.write_csr(ioaddr, CSR0, CSR0_START);      /* Set STRT bit */
-
-       /* Check status of descriptors */
-       for (x = 0; x < numbuffs; x++) {
-               ticks = 0;
-               rmb();
-               while ((lp->rx_ring[x].status & teststatus) && (ticks < 200)) {
-                       spin_unlock_irqrestore(&lp->lock, flags);
-                       msleep(1);
-                       spin_lock_irqsave(&lp->lock, flags);
-                       rmb();
-                       ticks++;
-               }
-               if (ticks == 200) {
-                       if (netif_msg_hw(lp))
-                               printk("%s: Desc %d failed to reset!\n",
-                                      dev->name, x);
-                       break;
-               }
-       }
-
-       lp->a.write_csr(ioaddr, CSR0, CSR0_STOP);       /* Set STOP bit */
-       wmb();
-       if (netif_msg_hw(lp) && netif_msg_pktdata(lp)) {
-               printk(KERN_DEBUG "%s: RX loopback packets:\n", dev->name);
-
-               for (x = 0; x < numbuffs; x++) {
-                       printk(KERN_DEBUG "%s: Packet %d:\n", dev->name, x);
-                       skb = lp->rx_skbuff[x];
-                       for (i = 0; i < size; i++) {
-                               printk("%02x ", *(skb->data + i));
-                       }
-                       printk("\n");
-               }
-       }
-
-       x = 0;
-       rc = 0;
-       while (x < numbuffs && !rc) {
-               skb = lp->rx_skbuff[x];
-               packet = lp->tx_skbuff[x]->data;
-               for (i = 0; i < size; i++) {
-                       if (*(skb->data + i) != packet[i]) {
-                               if (netif_msg_hw(lp))
-                                       printk(KERN_DEBUG
-                                              "%s: Error in compare! %2x - 
%02x %02x\n",
-                                              dev->name, i, *(skb->data + i),
-                                              packet[i]);
-                               rc = 1;
-                               break;
-                       }
-               }
-               x++;
-       }
-
-      clean_up:
-       *data1 = rc;
-       pcnet32_purge_tx_ring(dev);
-
-       x = a->read_csr(ioaddr, CSR15);
-       a->write_csr(ioaddr, CSR15, (x & ~0x0044));     /* reset bits 6 and 2 */
-
-       x = a->read_bcr(ioaddr, 32);    /* reset internal loopback */
-       a->write_bcr(ioaddr, 32, (x & ~0x0002));
-
-       if (netif_running(dev)) {
-               pcnet32_netif_start(dev);
-               pcnet32_restart(dev, CSR0_NORMAL);
-       } else {
-               pcnet32_purge_rx_ring(dev);
-               lp->a.write_bcr(ioaddr, 20, 4); /* return to 16bit mode */
-       }
-       spin_unlock_irqrestore(&lp->lock, flags);
-
-       return (rc);
-}                              /* end pcnet32_loopback_test  */
-
-static void pcnet32_led_blink_callback(struct net_device *dev)
-{
-       struct pcnet32_private *lp = netdev_priv(dev);
-       struct pcnet32_access *a = &lp->a;
-       ulong ioaddr = dev->base_addr;
-       unsigned long flags;
-       int i;
-
-       spin_lock_irqsave(&lp->lock, flags);
-       for (i = 4; i < 8; i++) {
-               a->write_bcr(ioaddr, i, a->read_bcr(ioaddr, i) ^ 0x4000);
-       }
-       spin_unlock_irqrestore(&lp->lock, flags);
-
-       mod_timer(&lp->blink_timer, PCNET32_BLINK_TIMEOUT);
-}
-
-static int pcnet32_phys_id(struct net_device *dev, u32 data)
-{
-       struct pcnet32_private *lp = netdev_priv(dev);
-       struct pcnet32_access *a = &lp->a;
-       ulong ioaddr = dev->base_addr;
-       unsigned long flags;
-       int i, regs[4];
-
-       if (!lp->blink_timer.function) {
-               init_timer(&lp->blink_timer);
-               lp->blink_timer.function = (void *)pcnet32_led_blink_callback;
-               lp->blink_timer.data = (unsigned long)dev;
-       }
-
-       /* Save the current value of the bcrs */
-       spin_lock_irqsave(&lp->lock, flags);
-       for (i = 4; i < 8; i++) {
-               regs[i - 4] = a->read_bcr(ioaddr, i);
-       }
-       spin_unlock_irqrestore(&lp->lock, flags);
-
-       mod_timer(&lp->blink_timer, jiffies);
-       set_current_state(TASK_INTERRUPTIBLE);
-
-       /* AV: the limit here makes no sense whatsoever */
-       if ((!data) || (data > (u32) (MAX_SCHEDULE_TIMEOUT / HZ)))
-               data = (u32) (MAX_SCHEDULE_TIMEOUT / HZ);
-
-       msleep_interruptible(data * 1000);
-       del_timer_sync(&lp->blink_timer);
-
-       /* Restore the original value of the bcrs */
-       spin_lock_irqsave(&lp->lock, flags);
-       for (i = 4; i < 8; i++) {
-               a->write_bcr(ioaddr, i, regs[i - 4]);
-       }
-       spin_unlock_irqrestore(&lp->lock, flags);
-
-       return 0;
-}
-
-/*
- * lp->lock must be held.
- */
-static int pcnet32_suspend(struct net_device *dev, unsigned long *flags,
-               int can_sleep)
-{
-       int csr5;
-       struct pcnet32_private *lp = netdev_priv(dev);
-       struct pcnet32_access *a = &lp->a;
-       ulong ioaddr = dev->base_addr;
-       int ticks;
-
-       /* really old chips have to be stopped. */
-       if (lp->chip_version < PCNET32_79C970A)
-               return 0;
-
-       /* set SUSPEND (SPND) - CSR5 bit 0 */
-       csr5 = a->read_csr(ioaddr, CSR5);
-       a->write_csr(ioaddr, CSR5, csr5 | CSR5_SUSPEND);
-
-       /* poll waiting for bit to be set */
-       ticks = 0;
-       while (!(a->read_csr(ioaddr, CSR5) & CSR5_SUSPEND)) {
-               spin_unlock_irqrestore(&lp->lock, *flags);
-               if (can_sleep)
-                       msleep(1);
-               else
-                       mdelay(1);
-               spin_lock_irqsave(&lp->lock, *flags);
-               ticks++;
-               if (ticks > 200) {
-                       if (netif_msg_hw(lp))
-                               printk(KERN_DEBUG
-                                      "%s: Error getting into suspend!\n",
-                                      dev->name);
-                       return 0;
-               }
-       }
-       return 1;
-}
-
-/*
- * process one receive descriptor entry
- */
-
-static void pcnet32_rx_entry(struct net_device *dev,
-                            struct pcnet32_private *lp,
-                            struct pcnet32_rx_head *rxp,
-                            int entry)
-{
-       int status = (short)le16_to_cpu(rxp->status) >> 8;
-       int rx_in_place = 0;
-       struct sk_buff *skb;
-       short pkt_len;
-
-       if (status != 0x03) {   /* There was an error. */
-               /*
-                * There is a tricky error noted by John Murphy,
-                * <address@hidden> to Russ Nelson: Even with full-sized
-                * buffers it's possible for a jabber packet to use two
-                * buffers, with only the last correctly noting the error.
-                */
-               if (status & 0x01)      /* Only count a general error at the */
-                       dev->stats.rx_errors++; /* end of a packet. */
-               if (status & 0x20)
-                       dev->stats.rx_frame_errors++;
-               if (status & 0x10)
-                       dev->stats.rx_over_errors++;
-               if (status & 0x08)
-                       dev->stats.rx_crc_errors++;
-               if (status & 0x04)
-                       dev->stats.rx_fifo_errors++;
-               return;
-       }
-
-       pkt_len = (le32_to_cpu(rxp->msg_length) & 0xfff) - 4;
-
-       /* Discard oversize frames. */
-       if (unlikely(pkt_len > PKT_BUF_SIZE)) {
-               if (netif_msg_drv(lp))
-                       printk(KERN_ERR "%s: Impossible packet size %d!\n",
-                              dev->name, pkt_len);
-               dev->stats.rx_errors++;
-               return;
-       }
-       if (pkt_len < 60) {
-               if (netif_msg_rx_err(lp))
-                       printk(KERN_ERR "%s: Runt packet!\n", dev->name);
-               dev->stats.rx_errors++;
-               return;
-       }
-
-       if (pkt_len > rx_copybreak) {
-               struct sk_buff *newskb;
-
-               if ((newskb = dev_alloc_skb(PKT_BUF_SKB))) {
-                       skb_reserve(newskb, NET_IP_ALIGN);
-                       skb = lp->rx_skbuff[entry];
-                       pci_unmap_single(lp->pci_dev,
-                                        lp->rx_dma_addr[entry],
-                                        PKT_BUF_SIZE,
-                                        PCI_DMA_FROMDEVICE);
-                       skb_put(skb, pkt_len);
-                       lp->rx_skbuff[entry] = newskb;
-                       lp->rx_dma_addr[entry] =
-                                           pci_map_single(lp->pci_dev,
-                                                          newskb->data,
-                                                          PKT_BUF_SIZE,
-                                                          PCI_DMA_FROMDEVICE);
-                       rxp->base = cpu_to_le32(lp->rx_dma_addr[entry]);
-                       rx_in_place = 1;
-               } else
-                       skb = NULL;
-       } else {
-               skb = dev_alloc_skb(pkt_len + NET_IP_ALIGN);
-       }
-
-       if (skb == NULL) {
-               if (netif_msg_drv(lp))
-                       printk(KERN_ERR
-                              "%s: Memory squeeze, dropping packet.\n",
-                              dev->name);
-               dev->stats.rx_dropped++;
-               return;
-       }
-       skb->dev = dev;
-       if (!rx_in_place) {
-               skb_reserve(skb, NET_IP_ALIGN);
-               skb_put(skb, pkt_len);  /* Make room */
-               pci_dma_sync_single_for_cpu(lp->pci_dev,
-                                           lp->rx_dma_addr[entry],
-                                           pkt_len,
-                                           PCI_DMA_FROMDEVICE);
-               skb_copy_to_linear_data(skb,
-                                (unsigned char *)(lp->rx_skbuff[entry]->data),
-                                pkt_len);
-               pci_dma_sync_single_for_device(lp->pci_dev,
-                                              lp->rx_dma_addr[entry],
-                                              pkt_len,
-                                              PCI_DMA_FROMDEVICE);
-       }
-       dev->stats.rx_bytes += skb->len;
-       skb->protocol = eth_type_trans(skb, dev);
-       netif_receive_skb(skb);
-       dev->stats.rx_packets++;
-       return;
-}
-
-static int pcnet32_rx(struct net_device *dev, int budget)
-{
-       struct pcnet32_private *lp = netdev_priv(dev);
-       int entry = lp->cur_rx & lp->rx_mod_mask;
-       struct pcnet32_rx_head *rxp = &lp->rx_ring[entry];
-       int npackets = 0;
-
-       /* If we own the next entry, it's a new packet. Send it up. */
-       while (npackets < budget && (short)le16_to_cpu(rxp->status) >= 0) {
-               pcnet32_rx_entry(dev, lp, rxp, entry);
-               npackets += 1;
-               /*
-                * The docs say that the buffer length isn't touched, but Andrew
-                * Boyd of QNX reports that some revs of the 79C965 clear it.
-                */
-               rxp->buf_length = cpu_to_le16(NEG_BUF_SIZE);
-               wmb();  /* Make sure owner changes after others are visible */
-               rxp->status = cpu_to_le16(0x8000);
-               entry = (++lp->cur_rx) & lp->rx_mod_mask;
-               rxp = &lp->rx_ring[entry];
-       }
-
-       return npackets;
-}
-
-static int pcnet32_tx(struct net_device *dev)
-{
-       struct pcnet32_private *lp = netdev_priv(dev);
-       unsigned int dirty_tx = lp->dirty_tx;
-       int delta;
-       int must_restart = 0;
-
-       while (dirty_tx != lp->cur_tx) {
-               int entry = dirty_tx & lp->tx_mod_mask;
-               int status = (short)le16_to_cpu(lp->tx_ring[entry].status);
-
-               if (status < 0)
-                       break;  /* It still hasn't been Txed */
-
-               lp->tx_ring[entry].base = 0;
-
-               if (status & 0x4000) {
-                       /* There was a major error, log it. */
-                       int err_status = le32_to_cpu(lp->tx_ring[entry].misc);
-                       dev->stats.tx_errors++;
-                       if (netif_msg_tx_err(lp))
-                               printk(KERN_ERR
-                                      "%s: Tx error status=%04x 
err_status=%08x\n",
-                                      dev->name, status,
-                                      err_status);
-                       if (err_status & 0x04000000)
-                               dev->stats.tx_aborted_errors++;
-                       if (err_status & 0x08000000)
-                               dev->stats.tx_carrier_errors++;
-                       if (err_status & 0x10000000)
-                               dev->stats.tx_window_errors++;
-#ifndef DO_DXSUFLO
-                       if (err_status & 0x40000000) {
-                               dev->stats.tx_fifo_errors++;
-                               /* Ackk!  On FIFO errors the Tx unit is turned 
off! */
-                               /* Remove this verbosity later! */
-                               if (netif_msg_tx_err(lp))
-                                       printk(KERN_ERR
-                                              "%s: Tx FIFO error!\n",
-                                              dev->name);
-                               must_restart = 1;
-                       }
-#else
-                       if (err_status & 0x40000000) {
-                               dev->stats.tx_fifo_errors++;
-                               if (!lp->dxsuflo) {     /* If controller 
doesn't recover ... */
-                                       /* Ackk!  On FIFO errors the Tx unit is 
turned off! */
-                                       /* Remove this verbosity later! */
-                                       if (netif_msg_tx_err(lp))
-                                               printk(KERN_ERR
-                                                      "%s: Tx FIFO error!\n",
-                                                      dev->name);
-                                       must_restart = 1;
-                               }
-                       }
-#endif
-               } else {
-                       if (status & 0x1800)
-                               dev->stats.collisions++;
-                       dev->stats.tx_packets++;
-               }
-
-               /* We must free the original skb */
-               if (lp->tx_skbuff[entry]) {
-                       pci_unmap_single(lp->pci_dev,
-                                        lp->tx_dma_addr[entry],
-                                        lp->tx_skbuff[entry]->
-                                        len, PCI_DMA_TODEVICE);
-                       dev_kfree_skb_any(lp->tx_skbuff[entry]);
-                       lp->tx_skbuff[entry] = NULL;
-                       lp->tx_dma_addr[entry] = 0;
-               }
-               dirty_tx++;
-       }
-
-       delta = (lp->cur_tx - dirty_tx) & (lp->tx_mod_mask + lp->tx_ring_size);
-       if (delta > lp->tx_ring_size) {
-               if (netif_msg_drv(lp))
-                       printk(KERN_ERR
-                              "%s: out-of-sync dirty pointer, %d vs. %d, 
full=%d.\n",
-                              dev->name, dirty_tx, lp->cur_tx,
-                              lp->tx_full);
-               dirty_tx += lp->tx_ring_size;
-               delta -= lp->tx_ring_size;
-       }
-
-       if (lp->tx_full &&
-           netif_queue_stopped(dev) &&
-           delta < lp->tx_ring_size - 2) {
-               /* The ring is no longer full, clear tbusy. */
-               lp->tx_full = 0;
-               netif_wake_queue(dev);
-       }
-       lp->dirty_tx = dirty_tx;
-
-       return must_restart;
-}
-
-static int pcnet32_poll(struct napi_struct *napi, int budget)
-{
-       struct pcnet32_private *lp = container_of(napi, struct pcnet32_private, 
napi);
-       struct net_device *dev = lp->dev;
-       unsigned long ioaddr = dev->base_addr;
-       unsigned long flags;
-       int work_done;
-       u16 val;
-
-       work_done = pcnet32_rx(dev, budget);
-
-       spin_lock_irqsave(&lp->lock, flags);
-       if (pcnet32_tx(dev)) {
-               /* reset the chip to clear the error condition, then restart */
-               lp->a.reset(ioaddr);
-               lp->a.write_csr(ioaddr, CSR4, 0x0915);  /* auto tx pad */
-               pcnet32_restart(dev, CSR0_START);
-               netif_wake_queue(dev);
-       }
-       spin_unlock_irqrestore(&lp->lock, flags);
-
-       if (work_done < budget) {
-               spin_lock_irqsave(&lp->lock, flags);
-
-               __napi_complete(napi);
-
-               /* clear interrupt masks */
-               val = lp->a.read_csr(ioaddr, CSR3);
-               val &= 0x00ff;
-               lp->a.write_csr(ioaddr, CSR3, val);
-
-               /* Set interrupt enable. */
-               lp->a.write_csr(ioaddr, CSR0, CSR0_INTEN);
-               mmiowb();
-               spin_unlock_irqrestore(&lp->lock, flags);
-       }
-       return work_done;
-}
-
-#define PCNET32_REGS_PER_PHY   32
-#define PCNET32_MAX_PHYS       32
-static int pcnet32_get_regs_len(struct net_device *dev)
-{
-       struct pcnet32_private *lp = netdev_priv(dev);
-       int j = lp->phycount * PCNET32_REGS_PER_PHY;
-
-       return ((PCNET32_NUM_REGS + j) * sizeof(u16));
-}
-
-static void pcnet32_get_regs(struct net_device *dev, struct ethtool_regs *regs,
-                            void *ptr)
-{
-       int i, csr0;
-       u16 *buff = ptr;
-       struct pcnet32_private *lp = netdev_priv(dev);
-       struct pcnet32_access *a = &lp->a;
-       ulong ioaddr = dev->base_addr;
-       unsigned long flags;
-
-       spin_lock_irqsave(&lp->lock, flags);
-
-       csr0 = a->read_csr(ioaddr, CSR0);
-       if (!(csr0 & CSR0_STOP))        /* If not stopped */
-               pcnet32_suspend(dev, &flags, 1);
-
-       /* read address PROM */
-       for (i = 0; i < 16; i += 2)
-               *buff++ = inw(ioaddr + i);
-
-       /* read control and status registers */
-       for (i = 0; i < 90; i++) {
-               *buff++ = a->read_csr(ioaddr, i);
-       }
-
-       *buff++ = a->read_csr(ioaddr, 112);
-       *buff++ = a->read_csr(ioaddr, 114);
-
-       /* read bus configuration registers */
-       for (i = 0; i < 30; i++) {
-               *buff++ = a->read_bcr(ioaddr, i);
-       }
-       *buff++ = 0;            /* skip bcr30 so as not to hang 79C976 */
-       for (i = 31; i < 36; i++) {
-               *buff++ = a->read_bcr(ioaddr, i);
-       }
-
-       /* read mii phy registers */
-       if (lp->mii) {
-               int j;
-               for (j = 0; j < PCNET32_MAX_PHYS; j++) {
-                       if (lp->phymask & (1 << j)) {
-                               for (i = 0; i < PCNET32_REGS_PER_PHY; i++) {
-                                       lp->a.write_bcr(ioaddr, 33,
-                                                       (j << 5) | i);
-                                       *buff++ = lp->a.read_bcr(ioaddr, 34);
-                               }
-                       }
-               }
-       }
-
-       if (!(csr0 & CSR0_STOP)) {      /* If not stopped */
-               int csr5;
-
-               /* clear SUSPEND (SPND) - CSR5 bit 0 */
-               csr5 = a->read_csr(ioaddr, CSR5);
-               a->write_csr(ioaddr, CSR5, csr5 & (~CSR5_SUSPEND));
-       }
-
-       spin_unlock_irqrestore(&lp->lock, flags);
-}
-
-static const struct ethtool_ops pcnet32_ethtool_ops = {
-       .get_settings           = pcnet32_get_settings,
-       .set_settings           = pcnet32_set_settings,
-       .get_drvinfo            = pcnet32_get_drvinfo,
-       .get_msglevel           = pcnet32_get_msglevel,
-       .set_msglevel           = pcnet32_set_msglevel,
-       .nway_reset             = pcnet32_nway_reset,
-       .get_link               = pcnet32_get_link,
-       .get_ringparam          = pcnet32_get_ringparam,
-       .set_ringparam          = pcnet32_set_ringparam,
-       .get_strings            = pcnet32_get_strings,
-       .self_test              = pcnet32_ethtool_test,
-       .phys_id                = pcnet32_phys_id,
-       .get_regs_len           = pcnet32_get_regs_len,
-       .get_regs               = pcnet32_get_regs,
-       .get_sset_count         = pcnet32_get_sset_count,
-};
-
-/* only probes for non-PCI devices, the rest are handled by
- * pci_register_driver via pcnet32_probe_pci */
-
-static void __devinit pcnet32_probe_vlbus(unsigned int *pcnet32_portlist)
-{
-       unsigned int *port, ioaddr;
-
-       /* search for PCnet32 VLB cards at known addresses */
-       for (port = pcnet32_portlist; (ioaddr = *port); port++) {
-               if (request_region
-                   (ioaddr, PCNET32_TOTAL_SIZE, "pcnet32_probe_vlbus")) {
-                       /* check if there is really a pcnet chip on that ioaddr 
*/
-                       if ((inb(ioaddr + 14) == 0x57)
-                           && (inb(ioaddr + 15) == 0x57)) {
-                               pcnet32_probe1(ioaddr, 0, NULL);
-                       } else {
-                               release_region(ioaddr, PCNET32_TOTAL_SIZE);
-                       }
-               }
-       }
-}
-
-static int __devinit
-pcnet32_probe_pci(struct pci_dev *pdev, const struct pci_device_id *ent)
-{
-       unsigned long ioaddr;
-       int err;
-
-       err = pci_enable_device(pdev);
-       if (err < 0) {
-               if (pcnet32_debug & NETIF_MSG_PROBE)
-                       printk(KERN_ERR PFX
-                              "failed to enable device -- err=%d\n", err);
-               return err;
-       }
-       pci_set_master(pdev);
-
-       ioaddr = pci_resource_start(pdev, 0);
-       if (!ioaddr) {
-               if (pcnet32_debug & NETIF_MSG_PROBE)
-                       printk(KERN_ERR PFX
-                              "card has no PCI IO resources, aborting\n");
-               return -ENODEV;
-       }
-
-       if (!pci_dma_supported(pdev, PCNET32_DMA_MASK)) {
-               if (pcnet32_debug & NETIF_MSG_PROBE)
-                       printk(KERN_ERR PFX
-                              "architecture does not support 32bit PCI 
busmaster DMA\n");
-               return -ENODEV;
-       }
-       if (request_region(ioaddr, PCNET32_TOTAL_SIZE, "pcnet32_probe_pci") ==
-           NULL) {
-               if (pcnet32_debug & NETIF_MSG_PROBE)
-                       printk(KERN_ERR PFX
-                              "io address range already allocated\n");
-               return -EBUSY;
-       }
-
-       err = pcnet32_probe1(ioaddr, 1, pdev);
-       if (err < 0) {
-               pci_disable_device(pdev);
-       }
-       return err;
-}
-
-static const struct net_device_ops pcnet32_netdev_ops = {
-       .ndo_open               = pcnet32_open,
-       .ndo_stop               = pcnet32_close,
-       .ndo_start_xmit         = pcnet32_start_xmit,
-       .ndo_tx_timeout         = pcnet32_tx_timeout,
-       .ndo_get_stats          = pcnet32_get_stats,
-       .ndo_set_multicast_list = pcnet32_set_multicast_list,
-       .ndo_do_ioctl           = pcnet32_ioctl,
-       .ndo_change_mtu         = eth_change_mtu,
-       .ndo_set_mac_address    = eth_mac_addr,
-       .ndo_validate_addr      = eth_validate_addr,
-#ifdef CONFIG_NET_POLL_CONTROLLER
-       .ndo_poll_controller    = pcnet32_poll_controller,
-#endif
-};
-
-/* pcnet32_probe1
- *  Called from both pcnet32_probe_vlbus and pcnet_probe_pci.
- *  pdev will be NULL when called from pcnet32_probe_vlbus.
- */
-static int __devinit
-pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
-{
-       struct pcnet32_private *lp;
-       int i, media;
-       int fdx, mii, fset, dxsuflo;
-       int chip_version;
-       char *chipname;
-       struct net_device *dev;
-       struct pcnet32_access *a = NULL;
-       u8 promaddr[6];
-       int ret = -ENODEV;
-
-       /* reset the chip */
-       pcnet32_wio_reset(ioaddr);
-
-       /* NOTE: 16-bit check is first, otherwise some older PCnet chips fail */
-       if (pcnet32_wio_read_csr(ioaddr, 0) == 4 && pcnet32_wio_check(ioaddr)) {
-               a = &pcnet32_wio;
-       } else {
-               pcnet32_dwio_reset(ioaddr);
-               if (pcnet32_dwio_read_csr(ioaddr, 0) == 4
-                   && pcnet32_dwio_check(ioaddr)) {
-                       a = &pcnet32_dwio;
-               } else
-                       goto err_release_region;
-       }
-
-       chip_version =
-           a->read_csr(ioaddr, 88) | (a->read_csr(ioaddr, 89) << 16);
-       if ((pcnet32_debug & NETIF_MSG_PROBE) && (pcnet32_debug & NETIF_MSG_HW))
-               printk(KERN_INFO "  PCnet chip version is %#x.\n",
-                      chip_version);
-       if ((chip_version & 0xfff) != 0x003) {
-               if (pcnet32_debug & NETIF_MSG_PROBE)
-                       printk(KERN_INFO PFX "Unsupported chip version.\n");
-               goto err_release_region;
-       }
-
-       /* initialize variables */
-       fdx = mii = fset = dxsuflo = 0;
-       chip_version = (chip_version >> 12) & 0xffff;
-
-       switch (chip_version) {
-       case 0x2420:
-               chipname = "PCnet/PCI 79C970";  /* PCI */
-               break;
-       case 0x2430:
-               if (shared)
-                       chipname = "PCnet/PCI 79C970";  /* 970 gives the wrong 
chip id back */
-               else
-                       chipname = "PCnet/32 79C965";   /* 486/VL bus */
-               break;
-       case 0x2621:
-               chipname = "PCnet/PCI II 79C970A";      /* PCI */
-               fdx = 1;
-               break;
-       case 0x2623:
-               chipname = "PCnet/FAST 79C971"; /* PCI */
-               fdx = 1;
-               mii = 1;
-               fset = 1;
-               break;
-       case 0x2624:
-               chipname = "PCnet/FAST+ 79C972";        /* PCI */
-               fdx = 1;
-               mii = 1;
-               fset = 1;
-               break;
-       case 0x2625:
-               chipname = "PCnet/FAST III 79C973";     /* PCI */
-               fdx = 1;
-               mii = 1;
-               break;
-       case 0x2626:
-               chipname = "PCnet/Home 79C978"; /* PCI */
-               fdx = 1;
-               /*
-                * This is based on specs published at www.amd.com.  This 
section
-                * assumes that a card with a 79C978 wants to go into standard
-                * ethernet mode.  The 79C978 can also go into 1Mb HomePNA mode,
-                * and the module option homepna=1 can select this instead.
-                */
-               media = a->read_bcr(ioaddr, 49);
-               media &= ~3;    /* default to 10Mb ethernet */
-               if (cards_found < MAX_UNITS && homepna[cards_found])
-                       media |= 1;     /* switch to home wiring mode */
-               if (pcnet32_debug & NETIF_MSG_PROBE)
-                       printk(KERN_DEBUG PFX "media set to %sMbit mode.\n",
-                              (media & 1) ? "1" : "10");
-               a->write_bcr(ioaddr, 49, media);
-               break;
-       case 0x2627:
-               chipname = "PCnet/FAST III 79C975";     /* PCI */
-               fdx = 1;
-               mii = 1;
-               break;
-       case 0x2628:
-               chipname = "PCnet/PRO 79C976";
-               fdx = 1;
-               mii = 1;
-               break;
-       default:
-               if (pcnet32_debug & NETIF_MSG_PROBE)
-                       printk(KERN_INFO PFX
-                              "PCnet version %#x, no PCnet32 chip.\n",
-                              chip_version);
-               goto err_release_region;
-       }
-
-       /*
-        *  On selected chips turn on the BCR18:NOUFLO bit. This stops transmit
-        *  starting until the packet is loaded. Strike one for reliability, 
lose
-        *  one for latency - although on PCI this isnt a big loss. Older chips
-        *  have FIFO's smaller than a packet, so you can't do this.
-        *  Turn on BCR18:BurstRdEn and BCR18:BurstWrEn.
-        */
-
-       if (fset) {
-               a->write_bcr(ioaddr, 18, (a->read_bcr(ioaddr, 18) | 0x0860));
-               a->write_csr(ioaddr, 80,
-                            (a->read_csr(ioaddr, 80) & 0x0C00) | 0x0c00);
-               dxsuflo = 1;
-       }
-
-       dev = alloc_etherdev(sizeof(*lp));
-       if (!dev) {
-               if (pcnet32_debug & NETIF_MSG_PROBE)
-                       printk(KERN_ERR PFX "Memory allocation failed.\n");
-               ret = -ENOMEM;
-               goto err_release_region;
-       }
-       SET_NETDEV_DEV(dev, &pdev->dev);
-
-       if (pcnet32_debug & NETIF_MSG_PROBE)
-               printk(KERN_INFO PFX "%s at %#3lx,", chipname, ioaddr);
-
-       /* In most chips, after a chip reset, the ethernet address is read from 
the
-        * station address PROM at the base address and programmed into the
-        * "Physical Address Registers" CSR12-14.
-        * As a precautionary measure, we read the PROM values and complain if
-        * they disagree with the CSRs.  If they miscompare, and the PROM addr
-        * is valid, then the PROM addr is used.
-        */
-       for (i = 0; i < 3; i++) {
-               unsigned int val;
-               val = a->read_csr(ioaddr, i + 12) & 0x0ffff;
-               /* There may be endianness issues here. */
-               dev->dev_addr[2 * i] = val & 0x0ff;
-               dev->dev_addr[2 * i + 1] = (val >> 8) & 0x0ff;
-       }
-
-       /* read PROM address and compare with CSR address */
-       for (i = 0; i < 6; i++)
-               promaddr[i] = inb(ioaddr + i);
-
-       if (memcmp(promaddr, dev->dev_addr, 6)
-           || !is_valid_ether_addr(dev->dev_addr)) {
-               if (is_valid_ether_addr(promaddr)) {
-                       if (pcnet32_debug & NETIF_MSG_PROBE) {
-                               printk(" warning: CSR address invalid,\n");
-                               printk(KERN_INFO
-                                      "    using instead PROM address of");
-                       }
-                       memcpy(dev->dev_addr, promaddr, 6);
-               }
-       }
-       memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
-
-       /* if the ethernet address is not valid, force to 00:00:00:00:00:00 */
-       if (!is_valid_ether_addr(dev->perm_addr))
-               memset(dev->dev_addr, 0, sizeof(dev->dev_addr));
-
-       if (pcnet32_debug & NETIF_MSG_PROBE) {
-               printk(" %pM", dev->dev_addr);
-
-               /* Version 0x2623 and 0x2624 */
-               if (((chip_version + 1) & 0xfffe) == 0x2624) {
-                       i = a->read_csr(ioaddr, 80) & 0x0C00;   /* Check 
tx_start_pt */
-                       printk("\n" KERN_INFO "    tx_start_pt(0x%04x):", i);
-                       switch (i >> 10) {
-                       case 0:
-                               printk("  20 bytes,");
-                               break;
-                       case 1:
-                               printk("  64 bytes,");
-                               break;
-                       case 2:
-                               printk(" 128 bytes,");
-                               break;
-                       case 3:
-                               printk("~220 bytes,");
-                               break;
-                       }
-                       i = a->read_bcr(ioaddr, 18);    /* Check Burst/Bus 
control */
-                       printk(" BCR18(%x):", i & 0xffff);
-                       if (i & (1 << 5))
-                               printk("BurstWrEn ");
-                       if (i & (1 << 6))
-                               printk("BurstRdEn ");
-                       if (i & (1 << 7))
-                               printk("DWordIO ");
-                       if (i & (1 << 11))
-                               printk("NoUFlow ");
-                       i = a->read_bcr(ioaddr, 25);
-                       printk("\n" KERN_INFO "    SRAMSIZE=0x%04x,", i << 8);
-                       i = a->read_bcr(ioaddr, 26);
-                       printk(" SRAM_BND=0x%04x,", i << 8);
-                       i = a->read_bcr(ioaddr, 27);
-                       if (i & (1 << 14))
-                               printk("LowLatRx");
-               }
-       }
-
-       dev->base_addr = ioaddr;
-       lp = netdev_priv(dev);
-       /* pci_alloc_consistent returns page-aligned memory, so we do not have 
to check the alignment */
-       if ((lp->init_block =
-            pci_alloc_consistent(pdev, sizeof(*lp->init_block), 
&lp->init_dma_addr)) == NULL) {
-               if (pcnet32_debug & NETIF_MSG_PROBE)
-                       printk(KERN_ERR PFX
-                              "Consistent memory allocation failed.\n");
-               ret = -ENOMEM;
-               goto err_free_netdev;
-       }
-       lp->pci_dev = pdev;
-
-       lp->dev = dev;
-
-       spin_lock_init(&lp->lock);
-
-       SET_NETDEV_DEV(dev, &pdev->dev);
-       lp->name = chipname;
-       lp->shared_irq = shared;
-       lp->tx_ring_size = TX_RING_SIZE;        /* default tx ring size */
-       lp->rx_ring_size = RX_RING_SIZE;        /* default rx ring size */
-       lp->tx_mod_mask = lp->tx_ring_size - 1;
-       lp->rx_mod_mask = lp->rx_ring_size - 1;
-       lp->tx_len_bits = (PCNET32_LOG_TX_BUFFERS << 12);
-       lp->rx_len_bits = (PCNET32_LOG_RX_BUFFERS << 4);
-       lp->mii_if.full_duplex = fdx;
-       lp->mii_if.phy_id_mask = 0x1f;
-       lp->mii_if.reg_num_mask = 0x1f;
-       lp->dxsuflo = dxsuflo;
-       lp->mii = mii;
-       lp->chip_version = chip_version;
-       lp->msg_enable = pcnet32_debug;
-       if ((cards_found >= MAX_UNITS)
-           || (options[cards_found] > sizeof(options_mapping)))
-               lp->options = PCNET32_PORT_ASEL;
-       else
-               lp->options = options_mapping[options[cards_found]];
-       lp->mii_if.dev = dev;
-       lp->mii_if.mdio_read = mdio_read;
-       lp->mii_if.mdio_write = mdio_write;
-
-       /* napi.weight is used in both the napi and non-napi cases */
-       lp->napi.weight = lp->rx_ring_size / 2;
-
-       netif_napi_add(dev, &lp->napi, pcnet32_poll, lp->rx_ring_size / 2);
-
-       if (fdx && !(lp->options & PCNET32_PORT_ASEL) &&
-           ((cards_found >= MAX_UNITS) || full_duplex[cards_found]))
-               lp->options |= PCNET32_PORT_FD;
-
-       if (!a) {
-               if (pcnet32_debug & NETIF_MSG_PROBE)
-                       printk(KERN_ERR PFX "No access methods\n");
-               ret = -ENODEV;
-               goto err_free_consistent;
-       }
-       lp->a = *a;
-
-       /* prior to register_netdev, dev->name is not yet correct */
-       if (pcnet32_alloc_ring(dev, pci_name(lp->pci_dev))) {
-               ret = -ENOMEM;
-               goto err_free_ring;
-       }
-       /* detect special T1/E1 WAN card by checking for MAC address */
-       if (dev->dev_addr[0] == 0x00 && dev->dev_addr[1] == 0xe0
-           && dev->dev_addr[2] == 0x75)
-               lp->options = PCNET32_PORT_FD | PCNET32_PORT_GPSI;
-
-       lp->init_block->mode = cpu_to_le16(0x0003);     /* Disable Rx and Tx. */
-       lp->init_block->tlen_rlen =
-           cpu_to_le16(lp->tx_len_bits | lp->rx_len_bits);
-       for (i = 0; i < 6; i++)
-               lp->init_block->phys_addr[i] = dev->dev_addr[i];
-       lp->init_block->filter[0] = 0x00000000;
-       lp->init_block->filter[1] = 0x00000000;
-       lp->init_block->rx_ring = cpu_to_le32(lp->rx_ring_dma_addr);
-       lp->init_block->tx_ring = cpu_to_le32(lp->tx_ring_dma_addr);
-
-       /* switch pcnet32 to 32bit mode */
-       a->write_bcr(ioaddr, 20, 2);
-
-       a->write_csr(ioaddr, 1, (lp->init_dma_addr & 0xffff));
-       a->write_csr(ioaddr, 2, (lp->init_dma_addr >> 16));
-
-       if (pdev) {             /* use the IRQ provided by PCI */
-               dev->irq = pdev->irq;
-               if (pcnet32_debug & NETIF_MSG_PROBE)
-                       printk(" assigned IRQ %d.\n", dev->irq);
-       } else {
-               unsigned long irq_mask = probe_irq_on();
-
-               /*
-                * To auto-IRQ we enable the initialization-done and DMA error
-                * interrupts. For ISA boards we get a DMA error, but VLB and 
PCI
-                * boards will work.
-                */
-               /* Trigger an initialization just for the interrupt. */
-               a->write_csr(ioaddr, CSR0, CSR0_INTEN | CSR0_INIT);
-               mdelay(1);
-
-               dev->irq = probe_irq_off(irq_mask);
-               if (!dev->irq) {
-                       if (pcnet32_debug & NETIF_MSG_PROBE)
-                               printk(", failed to detect IRQ line.\n");
-                       ret = -ENODEV;
-                       goto err_free_ring;
-               }
-               if (pcnet32_debug & NETIF_MSG_PROBE)
-                       printk(", probed IRQ %d.\n", dev->irq);
-       }
-
-       /* Set the mii phy_id so that we can query the link state */
-       if (lp->mii) {
-               /* lp->phycount and lp->phymask are set to 0 by memset above */
-
-               lp->mii_if.phy_id = ((lp->a.read_bcr(ioaddr, 33)) >> 5) & 0x1f;
-               /* scan for PHYs */
-               for (i = 0; i < PCNET32_MAX_PHYS; i++) {
-                       unsigned short id1, id2;
-
-                       id1 = mdio_read(dev, i, MII_PHYSID1);
-                       if (id1 == 0xffff)
-                               continue;
-                       id2 = mdio_read(dev, i, MII_PHYSID2);
-                       if (id2 == 0xffff)
-                               continue;
-                       if (i == 31 && ((chip_version + 1) & 0xfffe) == 0x2624)
-                               continue;       /* 79C971 & 79C972 have phantom 
phy at id 31 */
-                       lp->phycount++;
-                       lp->phymask |= (1 << i);
-                       lp->mii_if.phy_id = i;
-                       if (pcnet32_debug & NETIF_MSG_PROBE)
-                               printk(KERN_INFO PFX
-                                      "Found PHY %04x:%04x at address %d.\n",
-                                      id1, id2, i);
-               }
-               lp->a.write_bcr(ioaddr, 33, (lp->mii_if.phy_id) << 5);
-               if (lp->phycount > 1) {
-                       lp->options |= PCNET32_PORT_MII;
-               }
-       }
-
-       init_timer(&lp->watchdog_timer);
-       lp->watchdog_timer.data = (unsigned long)dev;
-       lp->watchdog_timer.function = (void *)&pcnet32_watchdog;
-
-       /* The PCNET32-specific entries in the device structure. */
-       dev->netdev_ops = &pcnet32_netdev_ops;
-       dev->ethtool_ops = &pcnet32_ethtool_ops;
-       dev->watchdog_timeo = (5 * HZ);
-
-       /* Fill in the generic fields of the device structure. */
-       if (register_netdev(dev))
-               goto err_free_ring;
-
-       if (pdev) {
-               pci_set_drvdata(pdev, dev);
-       } else {
-               lp->next = pcnet32_dev;
-               pcnet32_dev = dev;
-       }
-
-       if (pcnet32_debug & NETIF_MSG_PROBE)
-               printk(KERN_INFO "%s: registered as %s\n", dev->name, lp->name);
-       cards_found++;
-
-       /* enable LED writes */
-       a->write_bcr(ioaddr, 2, a->read_bcr(ioaddr, 2) | 0x1000);
-
-       return 0;
-
-      err_free_ring:
-       pcnet32_free_ring(dev);
-      err_free_consistent:
-       pci_free_consistent(lp->pci_dev, sizeof(*lp->init_block),
-                           lp->init_block, lp->init_dma_addr);
-      err_free_netdev:
-       free_netdev(dev);
-      err_release_region:
-       release_region(ioaddr, PCNET32_TOTAL_SIZE);
-       return ret;
-}
-
-/* if any allocation fails, caller must also call pcnet32_free_ring */
-static int pcnet32_alloc_ring(struct net_device *dev, const char *name)
-{
-       struct pcnet32_private *lp = netdev_priv(dev);
-
-       lp->tx_ring = pci_alloc_consistent(lp->pci_dev,
-                                          sizeof(struct pcnet32_tx_head) *
-                                          lp->tx_ring_size,
-                                          &lp->tx_ring_dma_addr);
-       if (lp->tx_ring == NULL) {
-               if (netif_msg_drv(lp))
-                       printk("\n" KERN_ERR PFX
-                              "%s: Consistent memory allocation failed.\n",
-                              name);
-               return -ENOMEM;
-       }
-
-       lp->rx_ring = pci_alloc_consistent(lp->pci_dev,
-                                          sizeof(struct pcnet32_rx_head) *
-                                          lp->rx_ring_size,
-                                          &lp->rx_ring_dma_addr);
-       if (lp->rx_ring == NULL) {
-               if (netif_msg_drv(lp))
-                       printk("\n" KERN_ERR PFX
-                              "%s: Consistent memory allocation failed.\n",
-                              name);
-               return -ENOMEM;
-       }
-
-       lp->tx_dma_addr = kcalloc(lp->tx_ring_size, sizeof(dma_addr_t),
-                                 GFP_ATOMIC);
-       if (!lp->tx_dma_addr) {
-               if (netif_msg_drv(lp))
-                       printk("\n" KERN_ERR PFX
-                              "%s: Memory allocation failed.\n", name);
-               return -ENOMEM;
-       }
-
-       lp->rx_dma_addr = kcalloc(lp->rx_ring_size, sizeof(dma_addr_t),
-                                 GFP_ATOMIC);
-       if (!lp->rx_dma_addr) {
-               if (netif_msg_drv(lp))
-                       printk("\n" KERN_ERR PFX
-                              "%s: Memory allocation failed.\n", name);
-               return -ENOMEM;
-       }
-
-       lp->tx_skbuff = kcalloc(lp->tx_ring_size, sizeof(struct sk_buff *),
-                               GFP_ATOMIC);
-       if (!lp->tx_skbuff) {
-               if (netif_msg_drv(lp))
-                       printk("\n" KERN_ERR PFX
-                              "%s: Memory allocation failed.\n", name);
-               return -ENOMEM;
-       }
-
-       lp->rx_skbuff = kcalloc(lp->rx_ring_size, sizeof(struct sk_buff *),
-                               GFP_ATOMIC);
-       if (!lp->rx_skbuff) {
-               if (netif_msg_drv(lp))
-                       printk("\n" KERN_ERR PFX
-                              "%s: Memory allocation failed.\n", name);
-               return -ENOMEM;
-       }
-
-       return 0;
-}
-
-static void pcnet32_free_ring(struct net_device *dev)
-{
-       struct pcnet32_private *lp = netdev_priv(dev);
-
-       kfree(lp->tx_skbuff);
-       lp->tx_skbuff = NULL;
-
-       kfree(lp->rx_skbuff);
-       lp->rx_skbuff = NULL;
-
-       kfree(lp->tx_dma_addr);
-       lp->tx_dma_addr = NULL;
-
-       kfree(lp->rx_dma_addr);
-       lp->rx_dma_addr = NULL;
-
-       if (lp->tx_ring) {
-               pci_free_consistent(lp->pci_dev,
-                                   sizeof(struct pcnet32_tx_head) *
-                                   lp->tx_ring_size, lp->tx_ring,
-                                   lp->tx_ring_dma_addr);
-               lp->tx_ring = NULL;
-       }
-
-       if (lp->rx_ring) {
-               pci_free_consistent(lp->pci_dev,
-                                   sizeof(struct pcnet32_rx_head) *
-                                   lp->rx_ring_size, lp->rx_ring,
-                                   lp->rx_ring_dma_addr);
-               lp->rx_ring = NULL;
-       }
-}
-
-static int pcnet32_open(struct net_device *dev)
-{
-       struct pcnet32_private *lp = netdev_priv(dev);
-       unsigned long ioaddr = dev->base_addr;
-       u16 val;
-       int i;
-       int rc;
-       unsigned long flags;
-
-       if (request_irq(dev->irq, &pcnet32_interrupt,
-                       lp->shared_irq ? IRQF_SHARED : 0, dev->name,
-                       (void *)dev)) {
-               return -EAGAIN;
-       }
-
-       spin_lock_irqsave(&lp->lock, flags);
-       /* Check for a valid station address */
-       if (!is_valid_ether_addr(dev->dev_addr)) {
-               rc = -EINVAL;
-               goto err_free_irq;
-       }
-
-       /* Reset the PCNET32 */
-       lp->a.reset(ioaddr);
-
-       /* switch pcnet32 to 32bit mode */
-       lp->a.write_bcr(ioaddr, 20, 2);
-
-       if (netif_msg_ifup(lp))
-               printk(KERN_DEBUG
-                      "%s: pcnet32_open() irq %d tx/rx rings %#x/%#x init 
%#x.\n",
-                      dev->name, dev->irq, (u32) (lp->tx_ring_dma_addr),
-                      (u32) (lp->rx_ring_dma_addr),
-                      (u32) (lp->init_dma_addr));
-
-       /* set/reset autoselect bit */
-       val = lp->a.read_bcr(ioaddr, 2) & ~2;
-       if (lp->options & PCNET32_PORT_ASEL)
-               val |= 2;
-       lp->a.write_bcr(ioaddr, 2, val);
-
-       /* handle full duplex setting */
-       if (lp->mii_if.full_duplex) {
-               val = lp->a.read_bcr(ioaddr, 9) & ~3;
-               if (lp->options & PCNET32_PORT_FD) {
-                       val |= 1;
-                       if (lp->options == (PCNET32_PORT_FD | PCNET32_PORT_AUI))
-                               val |= 2;
-               } else if (lp->options & PCNET32_PORT_ASEL) {
-                       /* workaround of xSeries250, turn on for 79C975 only */
-                       if (lp->chip_version == 0x2627)
-                               val |= 3;
-               }
-               lp->a.write_bcr(ioaddr, 9, val);
-       }
-
-       /* set/reset GPSI bit in test register */
-       val = lp->a.read_csr(ioaddr, 124) & ~0x10;
-       if ((lp->options & PCNET32_PORT_PORTSEL) == PCNET32_PORT_GPSI)
-               val |= 0x10;
-       lp->a.write_csr(ioaddr, 124, val);
-
-       /* Allied Telesyn AT 2700/2701 FX are 100Mbit only and do not negotiate 
*/
-       if (lp->pci_dev->subsystem_vendor == PCI_VENDOR_ID_AT &&
-           (lp->pci_dev->subsystem_device == PCI_SUBDEVICE_ID_AT_2700FX ||
-            lp->pci_dev->subsystem_device == PCI_SUBDEVICE_ID_AT_2701FX)) {
-               if (lp->options & PCNET32_PORT_ASEL) {
-                       lp->options = PCNET32_PORT_FD | PCNET32_PORT_100;
-                       if (netif_msg_link(lp))
-                               printk(KERN_DEBUG
-                                      "%s: Setting 100Mb-Full Duplex.\n",
-                                      dev->name);
-               }
-       }
-       if (lp->phycount < 2) {
-               /*
-                * 24 Jun 2004 according AMD, in order to change the PHY,
-                * DANAS (or DISPM for 79C976) must be set; then select the 
speed,
-                * duplex, and/or enable auto negotiation, and clear DANAS
-                */
-               if (lp->mii && !(lp->options & PCNET32_PORT_ASEL)) {
-                       lp->a.write_bcr(ioaddr, 32,
-                                       lp->a.read_bcr(ioaddr, 32) | 0x0080);
-                       /* disable Auto Negotiation, set 10Mpbs, HD */
-                       val = lp->a.read_bcr(ioaddr, 32) & ~0xb8;
-                       if (lp->options & PCNET32_PORT_FD)
-                               val |= 0x10;
-                       if (lp->options & PCNET32_PORT_100)
-                               val |= 0x08;
-                       lp->a.write_bcr(ioaddr, 32, val);
-               } else {
-                       if (lp->options & PCNET32_PORT_ASEL) {
-                               lp->a.write_bcr(ioaddr, 32,
-                                               lp->a.read_bcr(ioaddr,
-                                                              32) | 0x0080);
-                               /* enable auto negotiate, setup, disable fd */
-                               val = lp->a.read_bcr(ioaddr, 32) & ~0x98;
-                               val |= 0x20;
-                               lp->a.write_bcr(ioaddr, 32, val);
-                       }
-               }
-       } else {
-               int first_phy = -1;
-               u16 bmcr;
-               u32 bcr9;
-               struct ethtool_cmd ecmd;
-
-               /*
-                * There is really no good other way to handle multiple PHYs
-                * other than turning off all automatics
-                */
-               val = lp->a.read_bcr(ioaddr, 2);
-               lp->a.write_bcr(ioaddr, 2, val & ~2);
-               val = lp->a.read_bcr(ioaddr, 32);
-               lp->a.write_bcr(ioaddr, 32, val & ~(1 << 7));   /* stop MII 
manager */
-
-               if (!(lp->options & PCNET32_PORT_ASEL)) {
-                       /* setup ecmd */
-                       ecmd.port = PORT_MII;
-                       ecmd.transceiver = XCVR_INTERNAL;
-                       ecmd.autoneg = AUTONEG_DISABLE;
-                       ecmd.speed =
-                           lp->
-                           options & PCNET32_PORT_100 ? SPEED_100 : SPEED_10;
-                       bcr9 = lp->a.read_bcr(ioaddr, 9);
-
-                       if (lp->options & PCNET32_PORT_FD) {
-                               ecmd.duplex = DUPLEX_FULL;
-                               bcr9 |= (1 << 0);
-                       } else {
-                               ecmd.duplex = DUPLEX_HALF;
-                               bcr9 |= ~(1 << 0);
-                       }
-                       lp->a.write_bcr(ioaddr, 9, bcr9);
-               }
-
-               for (i = 0; i < PCNET32_MAX_PHYS; i++) {
-                       if (lp->phymask & (1 << i)) {
-                               /* isolate all but the first PHY */
-                               bmcr = mdio_read(dev, i, MII_BMCR);
-                               if (first_phy == -1) {
-                                       first_phy = i;
-                                       mdio_write(dev, i, MII_BMCR,
-                                                  bmcr & ~BMCR_ISOLATE);
-                               } else {
-                                       mdio_write(dev, i, MII_BMCR,
-                                                  bmcr | BMCR_ISOLATE);
-                               }
-                               /* use mii_ethtool_sset to setup PHY */
-                               lp->mii_if.phy_id = i;
-                               ecmd.phy_address = i;
-                               if (lp->options & PCNET32_PORT_ASEL) {
-                                       mii_ethtool_gset(&lp->mii_if, &ecmd);
-                                       ecmd.autoneg = AUTONEG_ENABLE;
-                               }
-                               mii_ethtool_sset(&lp->mii_if, &ecmd);
-                       }
-               }
-               lp->mii_if.phy_id = first_phy;
-               if (netif_msg_link(lp))
-                       printk(KERN_INFO "%s: Using PHY number %d.\n",
-                              dev->name, first_phy);
-       }
-
-#ifdef DO_DXSUFLO
-       if (lp->dxsuflo) {      /* Disable transmit stop on underflow */
-               val = lp->a.read_csr(ioaddr, CSR3);
-               val |= 0x40;
-               lp->a.write_csr(ioaddr, CSR3, val);
-       }
-#endif
-
-       lp->init_block->mode =
-           cpu_to_le16((lp->options & PCNET32_PORT_PORTSEL) << 7);
-       pcnet32_load_multicast(dev);
-
-       if (pcnet32_init_ring(dev)) {
-               rc = -ENOMEM;
-               goto err_free_ring;
-       }
-
-       napi_enable(&lp->napi);
-
-       /* Re-initialize the PCNET32, and start it when done. */
-       lp->a.write_csr(ioaddr, 1, (lp->init_dma_addr & 0xffff));
-       lp->a.write_csr(ioaddr, 2, (lp->init_dma_addr >> 16));
-
-       lp->a.write_csr(ioaddr, CSR4, 0x0915);  /* auto tx pad */
-       lp->a.write_csr(ioaddr, CSR0, CSR0_INIT);
-
-       netif_start_queue(dev);
-
-       if (lp->chip_version >= PCNET32_79C970A) {
-               /* Print the link status and start the watchdog */
-               pcnet32_check_media(dev, 1);
-               mod_timer(&lp->watchdog_timer, PCNET32_WATCHDOG_TIMEOUT);
-       }
-
-       i = 0;
-       while (i++ < 100)
-               if (lp->a.read_csr(ioaddr, CSR0) & CSR0_IDON)
-                       break;
-       /*
-        * We used to clear the InitDone bit, 0x0100, here but Mark Stockton
-        * reports that doing so triggers a bug in the '974.
-        */
-       lp->a.write_csr(ioaddr, CSR0, CSR0_NORMAL);
-
-       if (netif_msg_ifup(lp))
-               printk(KERN_DEBUG
-                      "%s: pcnet32 open after %d ticks, init block %#x csr0 
%4.4x.\n",
-                      dev->name, i,
-                      (u32) (lp->init_dma_addr),
-                      lp->a.read_csr(ioaddr, CSR0));
-
-       spin_unlock_irqrestore(&lp->lock, flags);
-
-       return 0;               /* Always succeed */
-
-      err_free_ring:
-       /* free any allocated skbuffs */
-       pcnet32_purge_rx_ring(dev);
-
-       /*
-        * Switch back to 16bit mode to avoid problems with dumb
-        * DOS packet driver after a warm reboot
-        */
-       lp->a.write_bcr(ioaddr, 20, 4);
-
-      err_free_irq:
-       spin_unlock_irqrestore(&lp->lock, flags);
-       free_irq(dev->irq, dev);
-       return rc;
-}
-
-/*
- * The LANCE has been halted for one reason or another (busmaster memory
- * arbitration error, Tx FIFO underflow, driver stopped it to reconfigure,
- * etc.).  Modern LANCE variants always reload their ring-buffer
- * configuration when restarted, so we must reinitialize our ring
- * context before restarting.  As part of this reinitialization,
- * find all packets still on the Tx ring and pretend that they had been
- * sent (in effect, drop the packets on the floor) - the higher-level
- * protocols will time out and retransmit.  It'd be better to shuffle
- * these skbs to a temp list and then actually re-Tx them after
- * restarting the chip, but I'm too lazy to do so right now.  address@hidden
- */
-
-static void pcnet32_purge_tx_ring(struct net_device *dev)
-{
-       struct pcnet32_private *lp = netdev_priv(dev);
-       int i;
-
-       for (i = 0; i < lp->tx_ring_size; i++) {
-               lp->tx_ring[i].status = 0;      /* CPU owns buffer */
-               wmb();          /* Make sure adapter sees owner change */
-               if (lp->tx_skbuff[i]) {
-                       pci_unmap_single(lp->pci_dev, lp->tx_dma_addr[i],
-                                        lp->tx_skbuff[i]->len,
-                                        PCI_DMA_TODEVICE);
-                       dev_kfree_skb_any(lp->tx_skbuff[i]);
-               }
-               lp->tx_skbuff[i] = NULL;
-               lp->tx_dma_addr[i] = 0;
-       }
-}
-
-/* Initialize the PCNET32 Rx and Tx rings. */
-static int pcnet32_init_ring(struct net_device *dev)
-{
-       struct pcnet32_private *lp = netdev_priv(dev);
-       int i;
-
-       lp->tx_full = 0;
-       lp->cur_rx = lp->cur_tx = 0;
-       lp->dirty_rx = lp->dirty_tx = 0;
-
-       for (i = 0; i < lp->rx_ring_size; i++) {
-               struct sk_buff *rx_skbuff = lp->rx_skbuff[i];
-               if (rx_skbuff == NULL) {
-                       if (!
-                           (rx_skbuff = lp->rx_skbuff[i] =
-                            dev_alloc_skb(PKT_BUF_SKB))) {
-                               /* there is not much, we can do at this point */
-                               if (netif_msg_drv(lp))
-                                       printk(KERN_ERR
-                                              "%s: pcnet32_init_ring 
dev_alloc_skb failed.\n",
-                                              dev->name);
-                               return -1;
-                       }
-                       skb_reserve(rx_skbuff, NET_IP_ALIGN);
-               }
-
-               rmb();
-               if (lp->rx_dma_addr[i] == 0)
-                       lp->rx_dma_addr[i] =
-                           pci_map_single(lp->pci_dev, rx_skbuff->data,
-                                          PKT_BUF_SIZE, PCI_DMA_FROMDEVICE);
-               lp->rx_ring[i].base = cpu_to_le32(lp->rx_dma_addr[i]);
-               lp->rx_ring[i].buf_length = cpu_to_le16(NEG_BUF_SIZE);
-               wmb();          /* Make sure owner changes after all others are 
visible */
-               lp->rx_ring[i].status = cpu_to_le16(0x8000);
-       }
-       /* The Tx buffer address is filled in as needed, but we do need to clear
-        * the upper ownership bit. */
-       for (i = 0; i < lp->tx_ring_size; i++) {
-               lp->tx_ring[i].status = 0;      /* CPU owns buffer */
-               wmb();          /* Make sure adapter sees owner change */
-               lp->tx_ring[i].base = 0;
-               lp->tx_dma_addr[i] = 0;
-       }
-
-       lp->init_block->tlen_rlen =
-           cpu_to_le16(lp->tx_len_bits | lp->rx_len_bits);
-       for (i = 0; i < 6; i++)
-               lp->init_block->phys_addr[i] = dev->dev_addr[i];
-       lp->init_block->rx_ring = cpu_to_le32(lp->rx_ring_dma_addr);
-       lp->init_block->tx_ring = cpu_to_le32(lp->tx_ring_dma_addr);
-       wmb();                  /* Make sure all changes are visible */
-       return 0;
-}
-
-/* the pcnet32 has been issued a stop or reset.  Wait for the stop bit
- * then flush the pending transmit operations, re-initialize the ring,
- * and tell the chip to initialize.
- */
-static void pcnet32_restart(struct net_device *dev, unsigned int csr0_bits)
-{
-       struct pcnet32_private *lp = netdev_priv(dev);
-       unsigned long ioaddr = dev->base_addr;
-       int i;
-
-       /* wait for stop */
-       for (i = 0; i < 100; i++)
-               if (lp->a.read_csr(ioaddr, CSR0) & CSR0_STOP)
-                       break;
-
-       if (i >= 100 && netif_msg_drv(lp))
-               printk(KERN_ERR
-                      "%s: pcnet32_restart timed out waiting for stop.\n",
-                      dev->name);
-
-       pcnet32_purge_tx_ring(dev);
-       if (pcnet32_init_ring(dev))
-               return;
-
-       /* ReInit Ring */
-       lp->a.write_csr(ioaddr, CSR0, CSR0_INIT);
-       i = 0;
-       while (i++ < 1000)
-               if (lp->a.read_csr(ioaddr, CSR0) & CSR0_IDON)
-                       break;
-
-       lp->a.write_csr(ioaddr, CSR0, csr0_bits);
-}
-
-static void pcnet32_tx_timeout(struct net_device *dev)
-{
-       struct pcnet32_private *lp = netdev_priv(dev);
-       unsigned long ioaddr = dev->base_addr, flags;
-
-       spin_lock_irqsave(&lp->lock, flags);
-       /* Transmitter timeout, serious problems. */
-       if (pcnet32_debug & NETIF_MSG_DRV)
-               printk(KERN_ERR
-                      "%s: transmit timed out, status %4.4x, resetting.\n",
-                      dev->name, lp->a.read_csr(ioaddr, CSR0));
-       lp->a.write_csr(ioaddr, CSR0, CSR0_STOP);
-       dev->stats.tx_errors++;
-       if (netif_msg_tx_err(lp)) {
-               int i;
-               printk(KERN_DEBUG
-                      " Ring data dump: dirty_tx %d cur_tx %d%s cur_rx %d.",
-                      lp->dirty_tx, lp->cur_tx, lp->tx_full ? " (full)" : "",
-                      lp->cur_rx);
-               for (i = 0; i < lp->rx_ring_size; i++)
-                       printk("%s %08x %04x %08x %04x", i & 1 ? "" : "\n ",
-                              le32_to_cpu(lp->rx_ring[i].base),
-                              (-le16_to_cpu(lp->rx_ring[i].buf_length)) &
-                              0xffff, le32_to_cpu(lp->rx_ring[i].msg_length),
-                              le16_to_cpu(lp->rx_ring[i].status));
-               for (i = 0; i < lp->tx_ring_size; i++)
-                       printk("%s %08x %04x %08x %04x", i & 1 ? "" : "\n ",
-                              le32_to_cpu(lp->tx_ring[i].base),
-                              (-le16_to_cpu(lp->tx_ring[i].length)) & 0xffff,
-                              le32_to_cpu(lp->tx_ring[i].misc),
-                              le16_to_cpu(lp->tx_ring[i].status));
-               printk("\n");
-       }
-       pcnet32_restart(dev, CSR0_NORMAL);
-
-       dev->trans_start = jiffies;
-       netif_wake_queue(dev);
-
-       spin_unlock_irqrestore(&lp->lock, flags);
-}
-
-static int pcnet32_start_xmit(struct sk_buff *skb, struct net_device *dev)
-{
-       struct pcnet32_private *lp = netdev_priv(dev);
-       unsigned long ioaddr = dev->base_addr;
-       u16 status;
-       int entry;
-       unsigned long flags;
-
-       spin_lock_irqsave(&lp->lock, flags);
-
-       if (netif_msg_tx_queued(lp)) {
-               printk(KERN_DEBUG
-                      "%s: pcnet32_start_xmit() called, csr0 %4.4x.\n",
-                      dev->name, lp->a.read_csr(ioaddr, CSR0));
-       }
-
-       /* Default status -- will not enable Successful-TxDone
-        * interrupt when that option is available to us.
-        */
-       status = 0x8300;
-
-       /* Fill in a Tx ring entry */
-
-       /* Mask to ring buffer boundary. */
-       entry = lp->cur_tx & lp->tx_mod_mask;
-
-       /* Caution: the write order is important here, set the status
-        * with the "ownership" bits last. */
-
-       lp->tx_ring[entry].length = cpu_to_le16(-skb->len);
-
-       lp->tx_ring[entry].misc = 0x00000000;
-
-       lp->tx_skbuff[entry] = skb;
-       lp->tx_dma_addr[entry] =
-           pci_map_single(lp->pci_dev, skb->data, skb->len, PCI_DMA_TODEVICE);
-       lp->tx_ring[entry].base = cpu_to_le32(lp->tx_dma_addr[entry]);
-       wmb();                  /* Make sure owner changes after all others are 
visible */
-       lp->tx_ring[entry].status = cpu_to_le16(status);
-
-       lp->cur_tx++;
-       dev->stats.tx_bytes += skb->len;
-
-       /* Trigger an immediate send poll. */
-       lp->a.write_csr(ioaddr, CSR0, CSR0_INTEN | CSR0_TXPOLL);
-
-       dev->trans_start = jiffies;
-
-       if (lp->tx_ring[(entry + 1) & lp->tx_mod_mask].base != 0) {
-               lp->tx_full = 1;
-               netif_stop_queue(dev);
-       }
-       spin_unlock_irqrestore(&lp->lock, flags);
-       return 0;
-}
-
-/* The PCNET32 interrupt handler. */
-static irqreturn_t
-pcnet32_interrupt(int irq, void *dev_id)
-{
-       struct net_device *dev = dev_id;
-       struct pcnet32_private *lp;
-       unsigned long ioaddr;
-       u16 csr0;
-       int boguscnt = max_interrupt_work;
-
-       ioaddr = dev->base_addr;
-       lp = netdev_priv(dev);
-
-       spin_lock(&lp->lock);
-
-       csr0 = lp->a.read_csr(ioaddr, CSR0);
-       while ((csr0 & 0x8f00) && --boguscnt >= 0) {
-               if (csr0 == 0xffff) {
-                       break;  /* PCMCIA remove happened */
-               }
-               /* Acknowledge all of the current interrupt sources ASAP. */
-               lp->a.write_csr(ioaddr, CSR0, csr0 & ~0x004f);
-
-               if (netif_msg_intr(lp))
-                       printk(KERN_DEBUG
-                              "%s: interrupt  csr0=%#2.2x new csr=%#2.2x.\n",
-                              dev->name, csr0, lp->a.read_csr(ioaddr, CSR0));
-
-               /* Log misc errors. */
-               if (csr0 & 0x4000)
-                       dev->stats.tx_errors++; /* Tx babble. */
-               if (csr0 & 0x1000) {
-                       /*
-                        * This happens when our receive ring is full. This
-                        * shouldn't be a problem as we will see normal rx
-                        * interrupts for the frames in the receive ring.  But
-                        * there are some PCI chipsets (I can reproduce this
-                        * on SP3G with Intel saturn chipset) which have
-                        * sometimes problems and will fill up the receive
-                        * ring with error descriptors.  In this situation we
-                        * don't get a rx interrupt, but a missed frame
-                        * interrupt sooner or later.
-                        */
-                       dev->stats.rx_errors++; /* Missed a Rx frame. */
-               }
-               if (csr0 & 0x0800) {
-                       if (netif_msg_drv(lp))
-                               printk(KERN_ERR
-                                      "%s: Bus master arbitration failure, 
status %4.4x.\n",
-                                      dev->name, csr0);
-                       /* unlike for the lance, there is no restart needed */
-               }
-               if (napi_schedule_prep(&lp->napi)) {
-                       u16 val;
-                       /* set interrupt masks */
-                       val = lp->a.read_csr(ioaddr, CSR3);
-                       val |= 0x5f00;
-                       lp->a.write_csr(ioaddr, CSR3, val);
-                       mmiowb();
-                       __napi_schedule(&lp->napi);
-                       break;
-               }
-               csr0 = lp->a.read_csr(ioaddr, CSR0);
-       }
-
-       if (netif_msg_intr(lp))
-               printk(KERN_DEBUG "%s: exiting interrupt, csr0=%#4.4x.\n",
-                      dev->name, lp->a.read_csr(ioaddr, CSR0));
-
-       spin_unlock(&lp->lock);
-
-       return IRQ_HANDLED;
-}
-
-static int pcnet32_close(struct net_device *dev)
-{
-       unsigned long ioaddr = dev->base_addr;
-       struct pcnet32_private *lp = netdev_priv(dev);
-       unsigned long flags;
-
-       del_timer_sync(&lp->watchdog_timer);
-
-       netif_stop_queue(dev);
-       napi_disable(&lp->napi);
-
-       spin_lock_irqsave(&lp->lock, flags);
-
-       dev->stats.rx_missed_errors = lp->a.read_csr(ioaddr, 112);
-
-       if (netif_msg_ifdown(lp))
-               printk(KERN_DEBUG
-                      "%s: Shutting down ethercard, status was %2.2x.\n",
-                      dev->name, lp->a.read_csr(ioaddr, CSR0));
-
-       /* We stop the PCNET32 here -- it occasionally polls memory if we 
don't. */
-       lp->a.write_csr(ioaddr, CSR0, CSR0_STOP);
-
-       /*
-        * Switch back to 16bit mode to avoid problems with dumb
-        * DOS packet driver after a warm reboot
-        */
-       lp->a.write_bcr(ioaddr, 20, 4);
-
-       spin_unlock_irqrestore(&lp->lock, flags);
-
-       free_irq(dev->irq, dev);
-
-       spin_lock_irqsave(&lp->lock, flags);
-
-       pcnet32_purge_rx_ring(dev);
-       pcnet32_purge_tx_ring(dev);
-
-       spin_unlock_irqrestore(&lp->lock, flags);
-
-       return 0;
-}
-
-static struct net_device_stats *pcnet32_get_stats(struct net_device *dev)
-{
-       struct pcnet32_private *lp = netdev_priv(dev);
-       unsigned long ioaddr = dev->base_addr;
-       unsigned long flags;
-
-       spin_lock_irqsave(&lp->lock, flags);
-       dev->stats.rx_missed_errors = lp->a.read_csr(ioaddr, 112);
-       spin_unlock_irqrestore(&lp->lock, flags);
-
-       return &dev->stats;
-}
-
-/* taken from the sunlance driver, which it took from the depca driver */
-static void pcnet32_load_multicast(struct net_device *dev)
-{
-       struct pcnet32_private *lp = netdev_priv(dev);
-       volatile struct pcnet32_init_block *ib = lp->init_block;
-       volatile __le16 *mcast_table = (__le16 *)ib->filter;
-       struct dev_mc_list *dmi = dev->mc_list;
-       unsigned long ioaddr = dev->base_addr;
-       char *addrs;
-       int i;
-       u32 crc;
-
-       /* set all multicast bits */
-       if (dev->flags & IFF_ALLMULTI) {
-               ib->filter[0] = cpu_to_le32(~0U);
-               ib->filter[1] = cpu_to_le32(~0U);
-               lp->a.write_csr(ioaddr, PCNET32_MC_FILTER, 0xffff);
-               lp->a.write_csr(ioaddr, PCNET32_MC_FILTER+1, 0xffff);
-               lp->a.write_csr(ioaddr, PCNET32_MC_FILTER+2, 0xffff);
-               lp->a.write_csr(ioaddr, PCNET32_MC_FILTER+3, 0xffff);
-               return;
-       }
-       /* clear the multicast filter */
-       ib->filter[0] = 0;
-       ib->filter[1] = 0;
-
-       /* Add addresses */
-       for (i = 0; i < dev->mc_count; i++) {
-               addrs = dmi->dmi_addr;
-               dmi = dmi->next;
-
-               /* multicast address? */
-               if (!(*addrs & 1))
-                       continue;
-
-               crc = ether_crc_le(6, addrs);
-               crc = crc >> 26;
-               mcast_table[crc >> 4] |= cpu_to_le16(1 << (crc & 0xf));
-       }
-       for (i = 0; i < 4; i++)
-               lp->a.write_csr(ioaddr, PCNET32_MC_FILTER + i,
-                               le16_to_cpu(mcast_table[i]));
-       return;
-}
-
-/*
- * Set or clear the multicast filter for this adaptor.
- */
-static void pcnet32_set_multicast_list(struct net_device *dev)
-{
-       unsigned long ioaddr = dev->base_addr, flags;
-       struct pcnet32_private *lp = netdev_priv(dev);
-       int csr15, suspended;
-
-       spin_lock_irqsave(&lp->lock, flags);
-       suspended = pcnet32_suspend(dev, &flags, 0);
-       csr15 = lp->a.read_csr(ioaddr, CSR15);
-       if (dev->flags & IFF_PROMISC) {
-               /* Log any net taps. */
-               if (netif_msg_hw(lp))
-                       printk(KERN_INFO "%s: Promiscuous mode enabled.\n",
-                              dev->name);
-               lp->init_block->mode =
-                   cpu_to_le16(0x8000 | (lp->options & PCNET32_PORT_PORTSEL) <<
-                               7);
-               lp->a.write_csr(ioaddr, CSR15, csr15 | 0x8000);
-       } else {
-               lp->init_block->mode =
-                   cpu_to_le16((lp->options & PCNET32_PORT_PORTSEL) << 7);
-               lp->a.write_csr(ioaddr, CSR15, csr15 & 0x7fff);
-               pcnet32_load_multicast(dev);
-       }
-
-       if (suspended) {
-               int csr5;
-               /* clear SUSPEND (SPND) - CSR5 bit 0 */
-               csr5 = lp->a.read_csr(ioaddr, CSR5);
-               lp->a.write_csr(ioaddr, CSR5, csr5 & (~CSR5_SUSPEND));
-       } else {
-               lp->a.write_csr(ioaddr, CSR0, CSR0_STOP);
-               pcnet32_restart(dev, CSR0_NORMAL);
-               netif_wake_queue(dev);
-       }
-
-       spin_unlock_irqrestore(&lp->lock, flags);
-}
-
-/* This routine assumes that the lp->lock is held */
-static int mdio_read(struct net_device *dev, int phy_id, int reg_num)
-{
-       struct pcnet32_private *lp = netdev_priv(dev);
-       unsigned long ioaddr = dev->base_addr;
-       u16 val_out;
-
-       if (!lp->mii)
-               return 0;
-
-       lp->a.write_bcr(ioaddr, 33, ((phy_id & 0x1f) << 5) | (reg_num & 0x1f));
-       val_out = lp->a.read_bcr(ioaddr, 34);
-
-       return val_out;
-}
-
-/* This routine assumes that the lp->lock is held */
-static void mdio_write(struct net_device *dev, int phy_id, int reg_num, int 
val)
-{
-       struct pcnet32_private *lp = netdev_priv(dev);
-       unsigned long ioaddr = dev->base_addr;
-
-       if (!lp->mii)
-               return;
-
-       lp->a.write_bcr(ioaddr, 33, ((phy_id & 0x1f) << 5) | (reg_num & 0x1f));
-       lp->a.write_bcr(ioaddr, 34, val);
-}
-
-static int pcnet32_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
-{
-       struct pcnet32_private *lp = netdev_priv(dev);
-       int rc;
-       unsigned long flags;
-
-       /* SIOC[GS]MIIxxx ioctls */
-       if (lp->mii) {
-               spin_lock_irqsave(&lp->lock, flags);
-               rc = generic_mii_ioctl(&lp->mii_if, if_mii(rq), cmd, NULL);
-               spin_unlock_irqrestore(&lp->lock, flags);
-       } else {
-               rc = -EOPNOTSUPP;
-       }
-
-       return rc;
-}
-
-static int pcnet32_check_otherphy(struct net_device *dev)
-{
-       struct pcnet32_private *lp = netdev_priv(dev);
-       struct mii_if_info mii = lp->mii_if;
-       u16 bmcr;
-       int i;
-
-       for (i = 0; i < PCNET32_MAX_PHYS; i++) {
-               if (i == lp->mii_if.phy_id)
-                       continue;       /* skip active phy */
-               if (lp->phymask & (1 << i)) {
-                       mii.phy_id = i;
-                       if (mii_link_ok(&mii)) {
-                               /* found PHY with active link */
-                               if (netif_msg_link(lp))
-                                       printk(KERN_INFO
-                                              "%s: Using PHY number %d.\n",
-                                              dev->name, i);
-
-                               /* isolate inactive phy */
-                               bmcr =
-                                   mdio_read(dev, lp->mii_if.phy_id, MII_BMCR);
-                               mdio_write(dev, lp->mii_if.phy_id, MII_BMCR,
-                                          bmcr | BMCR_ISOLATE);
-
-                               /* de-isolate new phy */
-                               bmcr = mdio_read(dev, i, MII_BMCR);
-                               mdio_write(dev, i, MII_BMCR,
-                                          bmcr & ~BMCR_ISOLATE);
-
-                               /* set new phy address */
-                               lp->mii_if.phy_id = i;
-                               return 1;
-                       }
-               }
-       }
-       return 0;
-}
-
-/*
- * Show the status of the media.  Similar to mii_check_media however it
- * correctly shows the link speed for all (tested) pcnet32 variants.
- * Devices with no mii just report link state without speed.
- *
- * Caller is assumed to hold and release the lp->lock.
- */
-
-static void pcnet32_check_media(struct net_device *dev, int verbose)
-{
-       struct pcnet32_private *lp = netdev_priv(dev);
-       int curr_link;
-       int prev_link = netif_carrier_ok(dev) ? 1 : 0;
-       u32 bcr9;
-
-       if (lp->mii) {
-               curr_link = mii_link_ok(&lp->mii_if);
-       } else {
-               ulong ioaddr = dev->base_addr;  /* card base I/O address */
-               curr_link = (lp->a.read_bcr(ioaddr, 4) != 0xc0);
-       }
-       if (!curr_link) {
-               if (prev_link || verbose) {
-                       netif_carrier_off(dev);
-                       if (netif_msg_link(lp))
-                               printk(KERN_INFO "%s: link down\n", dev->name);
-               }
-               if (lp->phycount > 1) {
-                       curr_link = pcnet32_check_otherphy(dev);
-                       prev_link = 0;
-               }
-       } else if (verbose || !prev_link) {
-               netif_carrier_on(dev);
-               if (lp->mii) {
-                       if (netif_msg_link(lp)) {
-                               struct ethtool_cmd ecmd;
-                               mii_ethtool_gset(&lp->mii_if, &ecmd);
-                               printk(KERN_INFO
-                                      "%s: link up, %sMbps, %s-duplex\n",
-                                      dev->name,
-                                      (ecmd.speed == SPEED_100) ? "100" : "10",
-                                      (ecmd.duplex ==
-                                       DUPLEX_FULL) ? "full" : "half");
-                       }
-                       bcr9 = lp->a.read_bcr(dev->base_addr, 9);
-                       if ((bcr9 & (1 << 0)) != lp->mii_if.full_duplex) {
-                               if (lp->mii_if.full_duplex)
-                                       bcr9 |= (1 << 0);
-                               else
-                                       bcr9 &= ~(1 << 0);
-                               lp->a.write_bcr(dev->base_addr, 9, bcr9);
-                       }
-               } else {
-                       if (netif_msg_link(lp))
-                               printk(KERN_INFO "%s: link up\n", dev->name);
-               }
-       }
-}
-
-/*
- * Check for loss of link and link establishment.
- * Can not use mii_check_media because it does nothing if mode is forced.
- */
-
-static void pcnet32_watchdog(struct net_device *dev)
-{
-       struct pcnet32_private *lp = netdev_priv(dev);
-       unsigned long flags;
-
-       /* Print the link status if it has changed */
-       spin_lock_irqsave(&lp->lock, flags);
-       pcnet32_check_media(dev, 0);
-       spin_unlock_irqrestore(&lp->lock, flags);
-
-       mod_timer(&lp->watchdog_timer, round_jiffies(PCNET32_WATCHDOG_TIMEOUT));
-}
-
-static int pcnet32_pm_suspend(struct pci_dev *pdev, pm_message_t state)
-{
-       struct net_device *dev = pci_get_drvdata(pdev);
-
-       if (netif_running(dev)) {
-               netif_device_detach(dev);
-               pcnet32_close(dev);
-       }
-       pci_save_state(pdev);
-       pci_set_power_state(pdev, pci_choose_state(pdev, state));
-       return 0;
-}
-
-static int pcnet32_pm_resume(struct pci_dev *pdev)
-{
-       struct net_device *dev = pci_get_drvdata(pdev);
-
-       pci_set_power_state(pdev, PCI_D0);
-       pci_restore_state(pdev);
-
-       if (netif_running(dev)) {
-               pcnet32_open(dev);
-               netif_device_attach(dev);
-       }
-       return 0;
-}
-
-static void __devexit pcnet32_remove_one(struct pci_dev *pdev)
-{
-       struct net_device *dev = pci_get_drvdata(pdev);
-
-       if (dev) {
-               struct pcnet32_private *lp = netdev_priv(dev);
-
-               unregister_netdev(dev);
-               pcnet32_free_ring(dev);
-               release_region(dev->base_addr, PCNET32_TOTAL_SIZE);
-               pci_free_consistent(lp->pci_dev, sizeof(*lp->init_block),
-                                   lp->init_block, lp->init_dma_addr);
-               free_netdev(dev);
-               pci_disable_device(pdev);
-               pci_set_drvdata(pdev, NULL);
-       }
-}
-
-static struct pci_driver pcnet32_driver = {
-       .name = DRV_NAME,
-       .probe = pcnet32_probe_pci,
-       .remove = __devexit_p(pcnet32_remove_one),
-       .id_table = pcnet32_pci_tbl,
-       .suspend = pcnet32_pm_suspend,
-       .resume = pcnet32_pm_resume,
-};
-
-/* An additional parameter that may be passed in... */
-static int debug = -1;
-static int tx_start_pt = -1;
-static int pcnet32_have_pci;
-
-module_param(debug, int, 0);
-MODULE_PARM_DESC(debug, DRV_NAME " debug level");
-module_param(max_interrupt_work, int, 0);
-MODULE_PARM_DESC(max_interrupt_work,
-                DRV_NAME " maximum events handled per interrupt");
-module_param(rx_copybreak, int, 0);
-MODULE_PARM_DESC(rx_copybreak,
-                DRV_NAME " copy breakpoint for copy-only-tiny-frames");
-module_param(tx_start_pt, int, 0);
-MODULE_PARM_DESC(tx_start_pt, DRV_NAME " transmit start point (0-3)");
-module_param(pcnet32vlb, int, 0);
-MODULE_PARM_DESC(pcnet32vlb, DRV_NAME " Vesa local bus (VLB) support (0/1)");
-module_param_array(options, int, NULL, 0);
-MODULE_PARM_DESC(options, DRV_NAME " initial option setting(s) (0-15)");
-module_param_array(full_duplex, int, NULL, 0);
-MODULE_PARM_DESC(full_duplex, DRV_NAME " full duplex setting(s) (1)");
-/* Module Parameter for HomePNA cards added by Patrick Simmons, 2004 */
-module_param_array(homepna, int, NULL, 0);
-MODULE_PARM_DESC(homepna,
-                DRV_NAME
-                " mode for 79C978 cards (1 for HomePNA, 0 for Ethernet, 
default Ethernet");
-
-MODULE_AUTHOR("Thomas Bogendoerfer");
-MODULE_DESCRIPTION("Driver for PCnet32 and PCnetPCI based ethercards");
-MODULE_LICENSE("GPL");
-
-#define PCNET32_MSG_DEFAULT (NETIF_MSG_DRV | NETIF_MSG_PROBE | NETIF_MSG_LINK)
-
-static int __init pcnet32_init_module(void)
-{
-       printk(KERN_INFO "%s", version);
-
-       pcnet32_debug = netif_msg_init(debug, PCNET32_MSG_DEFAULT);
-
-       if ((tx_start_pt >= 0) && (tx_start_pt <= 3))
-               tx_start = tx_start_pt;
-
-       /* find the PCI devices */
-       if (!pci_register_driver(&pcnet32_driver))
-               pcnet32_have_pci = 1;
-
-       /* should we find any remaining VLbus devices ? */
-       if (pcnet32vlb)
-               pcnet32_probe_vlbus(pcnet32_portlist);
-
-       if (cards_found && (pcnet32_debug & NETIF_MSG_PROBE))
-               printk(KERN_INFO PFX "%d cards_found.\n", cards_found);
-
-       return (pcnet32_have_pci + cards_found) ? 0 : -ENODEV;
-}
-
-static void __exit pcnet32_cleanup_module(void)
-{
-       struct net_device *next_dev;
-
-       while (pcnet32_dev) {
-               struct pcnet32_private *lp = netdev_priv(pcnet32_dev);
-               next_dev = lp->next;
-               unregister_netdev(pcnet32_dev);
-               pcnet32_free_ring(pcnet32_dev);
-               release_region(pcnet32_dev->base_addr, PCNET32_TOTAL_SIZE);
-               pci_free_consistent(lp->pci_dev, sizeof(*lp->init_block),
-                                   lp->init_block, lp->init_dma_addr);
-               free_netdev(pcnet32_dev);
-               pcnet32_dev = next_dev;
-       }
-
-       if (pcnet32_have_pci)
-               pci_unregister_driver(&pcnet32_driver);
-}
-
-module_init(pcnet32_init_module);
-module_exit(pcnet32_cleanup_module);
-
-/*
- * Local variables:
- *  c-indent-level: 4
- *  tab-width: 8
- * End:
- */
diff --git a/dde_rtl8139/.gitignore b/dde_rtl8139/.gitignore
deleted file mode 100644
index daae004..0000000
--- a/dde_rtl8139/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-dde_rtl8139
diff --git a/dde_rtl8139/8139cp.c b/dde_rtl8139/8139cp.c
deleted file mode 100644
index 3c7d1e5..0000000
--- a/dde_rtl8139/8139cp.c
+++ /dev/null
@@ -1,2107 +0,0 @@
-/* 8139cp.c: A Linux PCI Ethernet driver for the RealTek 8139C+ chips. */
-/*
-       Copyright 2001-2004 Jeff Garzik <address@hidden>
-
-       Copyright (C) 2001, 2002 David S. Miller (address@hidden) [tg3.c]
-       Copyright (C) 2000, 2001 David S. Miller (address@hidden) [sungem.c]
-       Copyright 2001 Manfred Spraul                               [natsemi.c]
-       Copyright 1999-2001 by Donald Becker.                       [natsemi.c]
-               Written 1997-2001 by Donald Becker.                         
[8139too.c]
-       Copyright 1998-2001 by Jes Sorensen, <address@hidden>. [acenic.c]
-
-       This software may be used and distributed according to the terms of
-       the GNU General Public License (GPL), incorporated herein by reference.
-       Drivers based on or derived from this code fall under the GPL and must
-       retain the authorship, copyright and license notice.  This file is not
-       a complete program and may only be used when the entire operating
-       system is licensed under the GPL.
-
-       See the file COPYING in this distribution for more information.
-
-       Contributors:
-
-               Wake-on-LAN support - Felipe Damasio <address@hidden>
-               PCI suspend/resume  - Felipe Damasio <address@hidden>
-               LinkChg interrupt   - Felipe Damasio <address@hidden>
-
-       TODO:
-       * Test Tx checksumming thoroughly
-
-       Low priority TODO:
-       * Complete reset on PciErr
-       * Consider Rx interrupt mitigation using TimerIntr
-       * Investigate using skb->priority with h/w VLAN priority
-       * Investigate using High Priority Tx Queue with skb->priority
-       * Adjust Rx FIFO threshold and Max Rx DMA burst on Rx FIFO error
-       * Adjust Tx FIFO threshold and Max Tx DMA burst on Tx FIFO error
-       * Implement Tx software interrupt mitigation via
-         Tx descriptor bit
-       * The real minimum of CP_MIN_MTU is 4 bytes.  However,
-         for this to be supported, one must(?) turn on packet padding.
-       * Support external MII transceivers (patch available)
-
-       NOTES:
-       * TX checksumming is considered experimental.  It is off by
-         default, use ethtool to turn it on.
-
- */
-
-#define DRV_NAME               "8139cp"
-#define DRV_VERSION            "1.3"
-#define DRV_RELDATE            "Mar 22, 2004"
-
-
-#include <linux/module.h>
-#include <linux/moduleparam.h>
-#include <linux/kernel.h>
-#include <linux/compiler.h>
-#include <linux/netdevice.h>
-#include <linux/etherdevice.h>
-#include <linux/init.h>
-#include <linux/pci.h>
-#include <linux/dma-mapping.h>
-#include <linux/delay.h>
-#include <linux/ethtool.h>
-#include <linux/mii.h>
-#include <linux/if_vlan.h>
-#include <linux/crc32.h>
-#include <linux/in.h>
-#include <linux/ip.h>
-#include <linux/tcp.h>
-#include <linux/udp.h>
-#include <linux/cache.h>
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <asm/uaccess.h>
-
-#include <ddekit/timer.h>
-
-/* VLAN tagging feature enable/disable */
-#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
-#define CP_VLAN_TAG_USED 1
-#define CP_VLAN_TX_TAG(tx_desc,vlan_tag_value) \
-       do { (tx_desc)->opts2 = cpu_to_le32(vlan_tag_value); } while (0)
-#else
-#define CP_VLAN_TAG_USED 0
-#define CP_VLAN_TX_TAG(tx_desc,vlan_tag_value) \
-       do { (tx_desc)->opts2 = 0; } while (0)
-#endif
-
-/* These identify the driver base version and may not be removed. */
-static char version[] =
-KERN_INFO DRV_NAME ": 10/100 PCI Ethernet driver v" DRV_VERSION " (" 
DRV_RELDATE ")\n";
-
-MODULE_AUTHOR("Jeff Garzik <address@hidden>");
-MODULE_DESCRIPTION("RealTek RTL-8139C+ series 10/100 PCI Ethernet driver");
-MODULE_VERSION(DRV_VERSION);
-MODULE_LICENSE("GPL");
-
-static int debug = -1;
-module_param(debug, int, 0);
-MODULE_PARM_DESC (debug, "8139cp: bitmapped message enable number");
-
-/* Maximum number of multicast addresses to filter (vs. Rx-all-multicast).
-   The RTL chips use a 64 element hash table based on the Ethernet CRC.  */
-static int multicast_filter_limit = 32;
-module_param(multicast_filter_limit, int, 0);
-MODULE_PARM_DESC (multicast_filter_limit, "8139cp: maximum number of filtered 
multicast addresses");
-
-#define PFX                    DRV_NAME ": "
-
-#define CP_DEF_MSG_ENABLE      (NETIF_MSG_DRV          | \
-                                NETIF_MSG_PROBE        | \
-                                NETIF_MSG_LINK)
-#define CP_NUM_STATS           14      /* struct cp_dma_stats, plus one */
-#define CP_STATS_SIZE          64      /* size in bytes of DMA stats block */
-#define CP_REGS_SIZE           (0xff + 1)
-#define CP_REGS_VER            1               /* version 1 */
-#define CP_RX_RING_SIZE                64
-#define CP_TX_RING_SIZE                64
-#define CP_RING_BYTES          \
-               ((sizeof(struct cp_desc) * CP_RX_RING_SIZE) +   \
-                (sizeof(struct cp_desc) * CP_TX_RING_SIZE) +   \
-                CP_STATS_SIZE)
-#define NEXT_TX(N)             (((N) + 1) & (CP_TX_RING_SIZE - 1))
-#define NEXT_RX(N)             (((N) + 1) & (CP_RX_RING_SIZE - 1))
-#define TX_BUFFS_AVAIL(CP)                                     \
-       (((CP)->tx_tail <= (CP)->tx_head) ?                     \
-         (CP)->tx_tail + (CP_TX_RING_SIZE - 1) - (CP)->tx_head :       \
-         (CP)->tx_tail - (CP)->tx_head - 1)
-
-#define PKT_BUF_SZ             1536    /* Size of each temporary Rx buffer.*/
-#define CP_INTERNAL_PHY                32
-
-/* The following settings are log_2(bytes)-4:  0 == 16 bytes .. 6==1024, 
7==end of packet. */
-#define RX_FIFO_THRESH         5       /* Rx buffer level before first PCI 
xfer.  */
-#define RX_DMA_BURST           4       /* Maximum PCI burst, '4' is 256 */
-#define TX_DMA_BURST           6       /* Maximum PCI burst, '6' is 1024 */
-#define TX_EARLY_THRESH                256     /* Early Tx threshold, in bytes 
*/
-
-/* Time in jiffies before concluding the transmitter is hung. */
-#define TX_TIMEOUT             (6*HZ)
-
-/* hardware minimum and maximum for a single frame's data payload */
-#define CP_MIN_MTU             60      /* TODO: allow lower, but pad */
-#define CP_MAX_MTU             4096
-
-enum {
-       /* NIC register offsets */
-       MAC0            = 0x00, /* Ethernet hardware address. */
-       MAR0            = 0x08, /* Multicast filter. */
-       StatsAddr       = 0x10, /* 64-bit start addr of 64-byte DMA stats blk */
-       TxRingAddr      = 0x20, /* 64-bit start addr of Tx ring */
-       HiTxRingAddr    = 0x28, /* 64-bit start addr of high priority Tx ring */
-       Cmd             = 0x37, /* Command register */
-       IntrMask        = 0x3C, /* Interrupt mask */
-       IntrStatus      = 0x3E, /* Interrupt status */
-       TxConfig        = 0x40, /* Tx configuration */
-       ChipVersion     = 0x43, /* 8-bit chip version, inside TxConfig */
-       RxConfig        = 0x44, /* Rx configuration */
-       RxMissed        = 0x4C, /* 24 bits valid, write clears */
-       Cfg9346         = 0x50, /* EEPROM select/control; Cfg reg [un]lock */
-       Config1         = 0x52, /* Config1 */
-       Config3         = 0x59, /* Config3 */
-       Config4         = 0x5A, /* Config4 */
-       MultiIntr       = 0x5C, /* Multiple interrupt select */
-       BasicModeCtrl   = 0x62, /* MII BMCR */
-       BasicModeStatus = 0x64, /* MII BMSR */
-       NWayAdvert      = 0x66, /* MII ADVERTISE */
-       NWayLPAR        = 0x68, /* MII LPA */
-       NWayExpansion   = 0x6A, /* MII Expansion */
-       Config5         = 0xD8, /* Config5 */
-       TxPoll          = 0xD9, /* Tell chip to check Tx descriptors for work */
-       RxMaxSize       = 0xDA, /* Max size of an Rx packet (8169 only) */
-       CpCmd           = 0xE0, /* C+ Command register (C+ mode only) */
-       IntrMitigate    = 0xE2, /* rx/tx interrupt mitigation control */
-       RxRingAddr      = 0xE4, /* 64-bit start addr of Rx ring */
-       TxThresh        = 0xEC, /* Early Tx threshold */
-       OldRxBufAddr    = 0x30, /* DMA address of Rx ring buffer (C mode) */
-       OldTSD0         = 0x10, /* DMA address of first Tx desc (C mode) */
-
-       /* Tx and Rx status descriptors */
-       DescOwn         = (1 << 31), /* Descriptor is owned by NIC */
-       RingEnd         = (1 << 30), /* End of descriptor ring */
-       FirstFrag       = (1 << 29), /* First segment of a packet */
-       LastFrag        = (1 << 28), /* Final segment of a packet */
-       LargeSend       = (1 << 27), /* TCP Large Send Offload (TSO) */
-       MSSShift        = 16,        /* MSS value position */
-       MSSMask         = 0xfff,     /* MSS value: 11 bits */
-       TxError         = (1 << 23), /* Tx error summary */
-       RxError         = (1 << 20), /* Rx error summary */
-       IPCS            = (1 << 18), /* Calculate IP checksum */
-       UDPCS           = (1 << 17), /* Calculate UDP/IP checksum */
-       TCPCS           = (1 << 16), /* Calculate TCP/IP checksum */
-       TxVlanTag       = (1 << 17), /* Add VLAN tag */
-       RxVlanTagged    = (1 << 16), /* Rx VLAN tag available */
-       IPFail          = (1 << 15), /* IP checksum failed */
-       UDPFail         = (1 << 14), /* UDP/IP checksum failed */
-       TCPFail         = (1 << 13), /* TCP/IP checksum failed */
-       NormalTxPoll    = (1 << 6),  /* One or more normal Tx packets to send */
-       PID1            = (1 << 17), /* 2 protocol id bits:  0==non-IP, */
-       PID0            = (1 << 16), /* 1==UDP/IP, 2==TCP/IP, 3==IP */
-       RxProtoTCP      = 1,
-       RxProtoUDP      = 2,
-       RxProtoIP       = 3,
-       TxFIFOUnder     = (1 << 25), /* Tx FIFO underrun */
-       TxOWC           = (1 << 22), /* Tx Out-of-window collision */
-       TxLinkFail      = (1 << 21), /* Link failed during Tx of packet */
-       TxMaxCol        = (1 << 20), /* Tx aborted due to excessive collisions 
*/
-       TxColCntShift   = 16,        /* Shift, to get 4-bit Tx collision cnt */
-       TxColCntMask    = 0x01 | 0x02 | 0x04 | 0x08, /* 4-bit collision count */
-       RxErrFrame      = (1 << 27), /* Rx frame alignment error */
-       RxMcast         = (1 << 26), /* Rx multicast packet rcv'd */
-       RxErrCRC        = (1 << 18), /* Rx CRC error */
-       RxErrRunt       = (1 << 19), /* Rx error, packet < 64 bytes */
-       RxErrLong       = (1 << 21), /* Rx error, packet > 4096 bytes */
-       RxErrFIFO       = (1 << 22), /* Rx error, FIFO overflowed, pkt bad */
-
-       /* StatsAddr register */
-       DumpStats       = (1 << 3),  /* Begin stats dump */
-
-       /* RxConfig register */
-       RxCfgFIFOShift  = 13,        /* Shift, to get Rx FIFO thresh value */
-       RxCfgDMAShift   = 8,         /* Shift, to get Rx Max DMA value */
-       AcceptErr       = 0x20,      /* Accept packets with CRC errors */
-       AcceptRunt      = 0x10,      /* Accept runt (<64 bytes) packets */
-       AcceptBroadcast = 0x08,      /* Accept broadcast packets */
-       AcceptMulticast = 0x04,      /* Accept multicast packets */
-       AcceptMyPhys    = 0x02,      /* Accept pkts with our MAC as dest */
-       AcceptAllPhys   = 0x01,      /* Accept all pkts w/ physical dest */
-
-       /* IntrMask / IntrStatus registers */
-       PciErr          = (1 << 15), /* System error on the PCI bus */
-       TimerIntr       = (1 << 14), /* Asserted when TCTR reaches TimerInt 
value */
-       LenChg          = (1 << 13), /* Cable length change */
-       SWInt           = (1 << 8),  /* Software-requested interrupt */
-       TxEmpty         = (1 << 7),  /* No Tx descriptors available */
-       RxFIFOOvr       = (1 << 6),  /* Rx FIFO Overflow */
-       LinkChg         = (1 << 5),  /* Packet underrun, or link change */
-       RxEmpty         = (1 << 4),  /* No Rx descriptors available */
-       TxErr           = (1 << 3),  /* Tx error */
-       TxOK            = (1 << 2),  /* Tx packet sent */
-       RxErr           = (1 << 1),  /* Rx error */
-       RxOK            = (1 << 0),  /* Rx packet received */
-       IntrResvd       = (1 << 10), /* reserved, according to RealTek 
engineers,
-                                       but hardware likes to raise it */
-
-       IntrAll         = PciErr | TimerIntr | LenChg | SWInt | TxEmpty |
-                         RxFIFOOvr | LinkChg | RxEmpty | TxErr | TxOK |
-                         RxErr | RxOK | IntrResvd,
-
-       /* C mode command register */
-       CmdReset        = (1 << 4),  /* Enable to reset; self-clearing */
-       RxOn            = (1 << 3),  /* Rx mode enable */
-       TxOn            = (1 << 2),  /* Tx mode enable */
-
-       /* C+ mode command register */
-       RxVlanOn        = (1 << 6),  /* Rx VLAN de-tagging enable */
-       RxChkSum        = (1 << 5),  /* Rx checksum offload enable */
-       PCIDAC          = (1 << 4),  /* PCI Dual Address Cycle (64-bit PCI) */
-       PCIMulRW        = (1 << 3),  /* Enable PCI read/write multiple */
-       CpRxOn          = (1 << 1),  /* Rx mode enable */
-       CpTxOn          = (1 << 0),  /* Tx mode enable */
-
-       /* Cfg9436 EEPROM control register */
-       Cfg9346_Lock    = 0x00,      /* Lock ConfigX/MII register access */
-       Cfg9346_Unlock  = 0xC0,      /* Unlock ConfigX/MII register access */
-
-       /* TxConfig register */
-       IFG             = (1 << 25) | (1 << 24), /* standard IEEE interframe 
gap */
-       TxDMAShift      = 8,         /* DMA burst value (0-7) is shift this 
many bits */
-
-       /* Early Tx Threshold register */
-       TxThreshMask    = 0x3f,      /* Mask bits 5-0 */
-       TxThreshMax     = 2048,      /* Max early Tx threshold */
-
-       /* Config1 register */
-       DriverLoaded    = (1 << 5),  /* Software marker, driver is loaded */
-       LWACT           = (1 << 4),  /* LWAKE active mode */
-       PMEnable        = (1 << 0),  /* Enable various PM features of chip */
-
-       /* Config3 register */
-       PARMEnable      = (1 << 6),  /* Enable auto-loading of PHY parms */
-       MagicPacket     = (1 << 5),  /* Wake up when receives a Magic Packet */
-       LinkUp          = (1 << 4),  /* Wake up when the cable connection is 
re-established */
-
-       /* Config4 register */
-       LWPTN           = (1 << 1),  /* LWAKE Pattern */
-       LWPME           = (1 << 4),  /* LANWAKE vs PMEB */
-
-       /* Config5 register */
-       BWF             = (1 << 6),  /* Accept Broadcast wakeup frame */
-       MWF             = (1 << 5),  /* Accept Multicast wakeup frame */
-       UWF             = (1 << 4),  /* Accept Unicast wakeup frame */
-       LANWake         = (1 << 1),  /* Enable LANWake signal */
-       PMEStatus       = (1 << 0),  /* PME status can be reset by PCI RST# */
-
-       cp_norx_intr_mask = PciErr | LinkChg | TxOK | TxErr | TxEmpty,
-       cp_rx_intr_mask = RxOK | RxErr | RxEmpty | RxFIFOOvr,
-       cp_intr_mask = cp_rx_intr_mask | cp_norx_intr_mask,
-};
-
-static const unsigned int cp_rx_config =
-         (RX_FIFO_THRESH << RxCfgFIFOShift) |
-         (RX_DMA_BURST << RxCfgDMAShift);
-
-struct cp_desc {
-       __le32          opts1;
-       __le32          opts2;
-       __le64          addr;
-};
-
-struct cp_dma_stats {
-       __le64                  tx_ok;
-       __le64                  rx_ok;
-       __le64                  tx_err;
-       __le32                  rx_err;
-       __le16                  rx_fifo;
-       __le16                  frame_align;
-       __le32                  tx_ok_1col;
-       __le32                  tx_ok_mcol;
-       __le64                  rx_ok_phys;
-       __le64                  rx_ok_bcast;
-       __le32                  rx_ok_mcast;
-       __le16                  tx_abort;
-       __le16                  tx_underrun;
-} __attribute__((packed));
-
-struct cp_extra_stats {
-       unsigned long           rx_frags;
-};
-
-struct cp_private {
-       void                    __iomem *regs;
-       struct net_device       *dev;
-       spinlock_t              lock;
-       u32                     msg_enable;
-
-       struct napi_struct      napi;
-
-       struct pci_dev          *pdev;
-       u32                     rx_config;
-       u16                     cpcmd;
-
-       struct cp_extra_stats   cp_stats;
-
-       unsigned                rx_head         ____cacheline_aligned;
-       unsigned                rx_tail;
-       struct cp_desc          *rx_ring;
-       struct sk_buff          *rx_skb[CP_RX_RING_SIZE];
-
-       unsigned                tx_head         ____cacheline_aligned;
-       unsigned                tx_tail;
-       struct cp_desc          *tx_ring;
-       struct sk_buff          *tx_skb[CP_TX_RING_SIZE];
-
-       unsigned                rx_buf_sz;
-       unsigned                wol_enabled : 1; /* Is Wake-on-LAN enabled? */
-
-#if CP_VLAN_TAG_USED
-       struct vlan_group       *vlgrp;
-#endif
-       dma_addr_t              ring_dma;
-
-       struct mii_if_info      mii_if;
-};
-
-#define cpr8(reg)      readb(cp->regs + (reg))
-#define cpr16(reg)     readw(cp->regs + (reg))
-#define cpr32(reg)     readl(cp->regs + (reg))
-#define cpw8(reg,val)  writeb((val), cp->regs + (reg))
-#define cpw16(reg,val) writew((val), cp->regs + (reg))
-#define cpw32(reg,val) writel((val), cp->regs + (reg))
-#define cpw8_f(reg,val) do {                   \
-       writeb((val), cp->regs + (reg));        \
-       readb(cp->regs + (reg));                \
-       } while (0)
-#define cpw16_f(reg,val) do {                  \
-       writew((val), cp->regs + (reg));        \
-       readw(cp->regs + (reg));                \
-       } while (0)
-#define cpw32_f(reg,val) do {                  \
-       writel((val), cp->regs + (reg));        \
-       readl(cp->regs + (reg));                \
-       } while (0)
-
-
-static void __cp_set_rx_mode (struct net_device *dev);
-static void cp_tx (struct cp_private *cp);
-static void cp_clean_rings (struct cp_private *cp);
-#ifdef CONFIG_NET_POLL_CONTROLLER
-static void cp_poll_controller(struct net_device *dev);
-#endif
-static int cp_get_eeprom_len(struct net_device *dev);
-static int cp_get_eeprom(struct net_device *dev,
-                        struct ethtool_eeprom *eeprom, u8 *data);
-static int cp_set_eeprom(struct net_device *dev,
-                        struct ethtool_eeprom *eeprom, u8 *data);
-
-static struct pci_device_id cp_pci_tbl[] = {
-       { PCI_DEVICE(PCI_VENDOR_ID_REALTEK,     PCI_DEVICE_ID_REALTEK_8139), },
-       { PCI_DEVICE(PCI_VENDOR_ID_TTTECH,      PCI_DEVICE_ID_TTTECH_MC322), },
-       { },
-};
-MODULE_DEVICE_TABLE(pci, cp_pci_tbl);
-
-static struct {
-       const char str[ETH_GSTRING_LEN];
-} ethtool_stats_keys[] = {
-       { "tx_ok" },
-       { "rx_ok" },
-       { "tx_err" },
-       { "rx_err" },
-       { "rx_fifo" },
-       { "frame_align" },
-       { "tx_ok_1col" },
-       { "tx_ok_mcol" },
-       { "rx_ok_phys" },
-       { "rx_ok_bcast" },
-       { "rx_ok_mcast" },
-       { "tx_abort" },
-       { "tx_underrun" },
-       { "rx_frags" },
-};
-
-
-#if CP_VLAN_TAG_USED
-static void cp_vlan_rx_register(struct net_device *dev, struct vlan_group *grp)
-{
-       struct cp_private *cp = netdev_priv(dev);
-       unsigned long flags;
-
-       spin_lock_irqsave(&cp->lock, flags);
-       cp->vlgrp = grp;
-       if (grp)
-               cp->cpcmd |= RxVlanOn;
-       else
-               cp->cpcmd &= ~RxVlanOn;
-
-       cpw16(CpCmd, cp->cpcmd);
-       spin_unlock_irqrestore(&cp->lock, flags);
-}
-#endif /* CP_VLAN_TAG_USED */
-
-static inline void cp_set_rxbufsize (struct cp_private *cp)
-{
-       unsigned int mtu = cp->dev->mtu;
-
-       if (mtu > ETH_DATA_LEN)
-               /* MTU + ethernet header + FCS + optional VLAN tag */
-               cp->rx_buf_sz = mtu + ETH_HLEN + 8;
-       else
-               cp->rx_buf_sz = PKT_BUF_SZ;
-}
-
-static inline void cp_rx_skb (struct cp_private *cp, struct sk_buff *skb,
-                             struct cp_desc *desc)
-{
-       skb->protocol = eth_type_trans (skb, cp->dev);
-
-       cp->dev->stats.rx_packets++;
-       cp->dev->stats.rx_bytes += skb->len;
-
-#if CP_VLAN_TAG_USED
-       if (cp->vlgrp && (desc->opts2 & cpu_to_le32(RxVlanTagged))) {
-               vlan_hwaccel_receive_skb(skb, cp->vlgrp,
-                                        swab16(le32_to_cpu(desc->opts2) & 
0xffff));
-       } else
-#endif
-               netif_receive_skb(skb);
-}
-
-static void cp_rx_err_acct (struct cp_private *cp, unsigned rx_tail,
-                           u32 status, u32 len)
-{
-       if (netif_msg_rx_err (cp))
-               printk (KERN_DEBUG
-                       "%s: rx err, slot %d status 0x%x len %d\n",
-                       cp->dev->name, rx_tail, status, len);
-       cp->dev->stats.rx_errors++;
-       if (status & RxErrFrame)
-               cp->dev->stats.rx_frame_errors++;
-       if (status & RxErrCRC)
-               cp->dev->stats.rx_crc_errors++;
-       if ((status & RxErrRunt) || (status & RxErrLong))
-               cp->dev->stats.rx_length_errors++;
-       if ((status & (FirstFrag | LastFrag)) != (FirstFrag | LastFrag))
-               cp->dev->stats.rx_length_errors++;
-       if (status & RxErrFIFO)
-               cp->dev->stats.rx_fifo_errors++;
-}
-
-static inline unsigned int cp_rx_csum_ok (u32 status)
-{
-       unsigned int protocol = (status >> 16) & 0x3;
-
-       if (likely((protocol == RxProtoTCP) && (!(status & TCPFail))))
-               return 1;
-       else if ((protocol == RxProtoUDP) && (!(status & UDPFail)))
-               return 1;
-       else if ((protocol == RxProtoIP) && (!(status & IPFail)))
-               return 1;
-       return 0;
-}
-
-static int cp_rx_poll(struct napi_struct *napi, int budget)
-{
-       struct cp_private *cp = container_of(napi, struct cp_private, napi);
-       struct net_device *dev = cp->dev;
-       unsigned int rx_tail = cp->rx_tail;
-       int rx;
-
-rx_status_loop:
-       rx = 0;
-       cpw16(IntrStatus, cp_rx_intr_mask);
-
-       while (1) {
-               u32 status, len;
-               dma_addr_t mapping;
-               struct sk_buff *skb, *new_skb;
-               struct cp_desc *desc;
-               unsigned buflen;
-
-               skb = cp->rx_skb[rx_tail];
-               BUG_ON(!skb);
-
-               desc = &cp->rx_ring[rx_tail];
-               status = le32_to_cpu(desc->opts1);
-               if (status & DescOwn)
-                       break;
-
-               len = (status & 0x1fff) - 4;
-               mapping = le64_to_cpu(desc->addr);
-
-               if ((status & (FirstFrag | LastFrag)) != (FirstFrag | 
LastFrag)) {
-                       /* we don't support incoming fragmented frames.
-                        * instead, we attempt to ensure that the
-                        * pre-allocated RX skbs are properly sized such
-                        * that RX fragments are never encountered
-                        */
-                       cp_rx_err_acct(cp, rx_tail, status, len);
-                       dev->stats.rx_dropped++;
-                       cp->cp_stats.rx_frags++;
-                       goto rx_next;
-               }
-
-               if (status & (RxError | RxErrFIFO)) {
-                       cp_rx_err_acct(cp, rx_tail, status, len);
-                       goto rx_next;
-               }
-
-               if (netif_msg_rx_status(cp))
-                       printk(KERN_DEBUG "%s: rx slot %d status 0x%x len %d\n",
-                              dev->name, rx_tail, status, len);
-
-               buflen = cp->rx_buf_sz + NET_IP_ALIGN;
-               new_skb = netdev_alloc_skb(dev, buflen);
-               if (!new_skb) {
-                       dev->stats.rx_dropped++;
-                       goto rx_next;
-               }
-
-               skb_reserve(new_skb, NET_IP_ALIGN);
-
-               dma_unmap_single(&cp->pdev->dev, mapping,
-                                buflen, PCI_DMA_FROMDEVICE);
-
-               /* Handle checksum offloading for incoming packets. */
-               if (cp_rx_csum_ok(status))
-                       skb->ip_summed = CHECKSUM_UNNECESSARY;
-               else
-                       skb->ip_summed = CHECKSUM_NONE;
-
-               skb_put(skb, len);
-
-               mapping = dma_map_single(&cp->pdev->dev, new_skb->data, buflen,
-                                        PCI_DMA_FROMDEVICE);
-               cp->rx_skb[rx_tail] = new_skb;
-
-               cp_rx_skb(cp, skb, desc);
-               rx++;
-
-rx_next:
-               cp->rx_ring[rx_tail].opts2 = 0;
-               cp->rx_ring[rx_tail].addr = cpu_to_le64(mapping);
-               if (rx_tail == (CP_RX_RING_SIZE - 1))
-                       desc->opts1 = cpu_to_le32(DescOwn | RingEnd |
-                                                 cp->rx_buf_sz);
-               else
-                       desc->opts1 = cpu_to_le32(DescOwn | cp->rx_buf_sz);
-               rx_tail = NEXT_RX(rx_tail);
-
-               if (rx >= budget)
-                       break;
-       }
-
-       cp->rx_tail = rx_tail;
-
-       /* if we did not reach work limit, then we're done with
-        * this round of polling
-        */
-       if (rx < budget) {
-               unsigned long flags;
-
-               if (cpr16(IntrStatus) & cp_rx_intr_mask)
-                       goto rx_status_loop;
-
-               spin_lock_irqsave(&cp->lock, flags);
-               cpw16_f(IntrMask, cp_intr_mask);
-               __netif_rx_complete(napi);
-               spin_unlock_irqrestore(&cp->lock, flags);
-       }
-
-       return rx;
-}
-
-static irqreturn_t cp_interrupt (int irq, void *dev_instance)
-{
-       struct net_device *dev = dev_instance;
-       struct cp_private *cp;
-       u16 status;
-
-       if (unlikely(dev == NULL))
-               return IRQ_NONE;
-       cp = netdev_priv(dev);
-
-       status = cpr16(IntrStatus);
-       if (!status || (status == 0xFFFF))
-               return IRQ_NONE;
-
-       if (netif_msg_intr(cp))
-               printk(KERN_DEBUG "%s: intr, status %04x cmd %02x cpcmd %04x\n",
-                       dev->name, status, cpr8(Cmd), cpr16(CpCmd));
-
-       cpw16(IntrStatus, status & ~cp_rx_intr_mask);
-
-       spin_lock(&cp->lock);
-
-       /* close possible race's with dev_close */
-       if (unlikely(!netif_running(dev))) {
-               cpw16(IntrMask, 0);
-               spin_unlock(&cp->lock);
-               return IRQ_HANDLED;
-       }
-
-       if (status & (RxOK | RxErr | RxEmpty | RxFIFOOvr))
-               if (netif_rx_schedule_prep(&cp->napi)) {
-                       cpw16_f(IntrMask, cp_norx_intr_mask);
-                       __netif_rx_schedule(&cp->napi);
-               }
-
-       if (status & (TxOK | TxErr | TxEmpty | SWInt))
-               cp_tx(cp);
-       if (status & LinkChg)
-               mii_check_media(&cp->mii_if, netif_msg_link(cp), false);
-
-       spin_unlock(&cp->lock);
-
-       if (status & PciErr) {
-               u16 pci_status;
-
-               pci_read_config_word(cp->pdev, PCI_STATUS, &pci_status);
-               pci_write_config_word(cp->pdev, PCI_STATUS, pci_status);
-               printk(KERN_ERR "%s: PCI bus error, status=%04x, PCI 
status=%04x\n",
-                      dev->name, status, pci_status);
-
-               /* TODO: reset hardware */
-       }
-
-       return IRQ_HANDLED;
-}
-
-#ifdef CONFIG_NET_POLL_CONTROLLER
-/*
- * Polling receive - used by netconsole and other diagnostic tools
- * to allow network i/o with interrupts disabled.
- */
-static void cp_poll_controller(struct net_device *dev)
-{
-       disable_irq(dev->irq);
-       cp_interrupt(dev->irq, dev);
-       enable_irq(dev->irq);
-}
-#endif
-
-static void cp_tx (struct cp_private *cp)
-{
-       unsigned tx_head = cp->tx_head;
-       unsigned tx_tail = cp->tx_tail;
-
-       while (tx_tail != tx_head) {
-               struct cp_desc *txd = cp->tx_ring + tx_tail;
-               struct sk_buff *skb;
-               u32 status;
-
-               rmb();
-               status = le32_to_cpu(txd->opts1);
-               if (status & DescOwn)
-                       break;
-
-               skb = cp->tx_skb[tx_tail];
-               BUG_ON(!skb);
-
-               dma_unmap_single(&cp->pdev->dev, le64_to_cpu(txd->addr),
-                                le32_to_cpu(txd->opts1) & 0xffff,
-                                PCI_DMA_TODEVICE);
-
-               if (status & LastFrag) {
-                       if (status & (TxError | TxFIFOUnder)) {
-                               if (netif_msg_tx_err(cp))
-                                       printk(KERN_DEBUG "%s: tx err, status 
0x%x\n",
-                                              cp->dev->name, status);
-                               cp->dev->stats.tx_errors++;
-                               if (status & TxOWC)
-                                       cp->dev->stats.tx_window_errors++;
-                               if (status & TxMaxCol)
-                                       cp->dev->stats.tx_aborted_errors++;
-                               if (status & TxLinkFail)
-                                       cp->dev->stats.tx_carrier_errors++;
-                               if (status & TxFIFOUnder)
-                                       cp->dev->stats.tx_fifo_errors++;
-                       } else {
-                               cp->dev->stats.collisions +=
-                                       ((status >> TxColCntShift) & 
TxColCntMask);
-                               cp->dev->stats.tx_packets++;
-                               cp->dev->stats.tx_bytes += skb->len;
-                               if (netif_msg_tx_done(cp))
-                                       printk(KERN_DEBUG "%s: tx done, slot 
%d\n", cp->dev->name, tx_tail);
-                       }
-                       dev_kfree_skb_irq(skb);
-               }
-
-               cp->tx_skb[tx_tail] = NULL;
-
-               tx_tail = NEXT_TX(tx_tail);
-       }
-
-       cp->tx_tail = tx_tail;
-
-       if (TX_BUFFS_AVAIL(cp) > (MAX_SKB_FRAGS + 1))
-               netif_wake_queue(cp->dev);
-}
-
-static int cp_start_xmit (struct sk_buff *skb, struct net_device *dev)
-{
-       struct cp_private *cp = netdev_priv(dev);
-       unsigned entry;
-       u32 eor, flags;
-       unsigned long intr_flags;
-#if CP_VLAN_TAG_USED
-       u32 vlan_tag = 0;
-#endif
-       int mss = 0;
-
-       spin_lock_irqsave(&cp->lock, intr_flags);
-
-       /* This is a hard error, log it. */
-       if (TX_BUFFS_AVAIL(cp) <= (skb_shinfo(skb)->nr_frags + 1)) {
-               netif_stop_queue(dev);
-               spin_unlock_irqrestore(&cp->lock, intr_flags);
-               printk(KERN_ERR PFX "%s: BUG! Tx Ring full when queue awake!\n",
-                      dev->name);
-               return 1;
-       }
-
-#if CP_VLAN_TAG_USED
-       if (cp->vlgrp && vlan_tx_tag_present(skb))
-               vlan_tag = TxVlanTag | swab16(vlan_tx_tag_get(skb));
-#endif
-
-       entry = cp->tx_head;
-       eor = (entry == (CP_TX_RING_SIZE - 1)) ? RingEnd : 0;
-       if (dev->features & NETIF_F_TSO)
-               mss = skb_shinfo(skb)->gso_size;
-
-       if (skb_shinfo(skb)->nr_frags == 0) {
-               struct cp_desc *txd = &cp->tx_ring[entry];
-               u32 len;
-               dma_addr_t mapping;
-
-               len = skb->len;
-               mapping = dma_map_single(&cp->pdev->dev, skb->data, len, 
PCI_DMA_TODEVICE);
-               CP_VLAN_TX_TAG(txd, vlan_tag);
-               txd->addr = cpu_to_le64(mapping);
-               wmb();
-
-               flags = eor | len | DescOwn | FirstFrag | LastFrag;
-
-               if (mss)
-                       flags |= LargeSend | ((mss & MSSMask) << MSSShift);
-               else if (skb->ip_summed == CHECKSUM_PARTIAL) {
-                       const struct iphdr *ip = ip_hdr(skb);
-                       if (ip->protocol == IPPROTO_TCP)
-                               flags |= IPCS | TCPCS;
-                       else if (ip->protocol == IPPROTO_UDP)
-                               flags |= IPCS | UDPCS;
-                       else
-                               WARN_ON(1);     /* we need a WARN() */
-               }
-
-               txd->opts1 = cpu_to_le32(flags);
-               wmb();
-
-               cp->tx_skb[entry] = skb;
-               entry = NEXT_TX(entry);
-       } else {
-               struct cp_desc *txd;
-               u32 first_len, first_eor;
-               dma_addr_t first_mapping;
-               int frag, first_entry = entry;
-               const struct iphdr *ip = ip_hdr(skb);
-
-               /* We must give this initial chunk to the device last.
-                * Otherwise we could race with the device.
-                */
-               first_eor = eor;
-               first_len = skb_headlen(skb);
-               first_mapping = dma_map_single(&cp->pdev->dev, skb->data,
-                                              first_len, PCI_DMA_TODEVICE);
-               cp->tx_skb[entry] = skb;
-               entry = NEXT_TX(entry);
-
-               for (frag = 0; frag < skb_shinfo(skb)->nr_frags; frag++) {
-                       skb_frag_t *this_frag = &skb_shinfo(skb)->frags[frag];
-                       u32 len;
-                       u32 ctrl;
-                       dma_addr_t mapping;
-
-                       len = this_frag->size;
-                       mapping = dma_map_single(&cp->pdev->dev,
-                                                ((void *) 
page_address(this_frag->page) +
-                                                 this_frag->page_offset),
-                                                len, PCI_DMA_TODEVICE);
-                       eor = (entry == (CP_TX_RING_SIZE - 1)) ? RingEnd : 0;
-
-                       ctrl = eor | len | DescOwn;
-
-                       if (mss)
-                               ctrl |= LargeSend |
-                                       ((mss & MSSMask) << MSSShift);
-                       else if (skb->ip_summed == CHECKSUM_PARTIAL) {
-                               if (ip->protocol == IPPROTO_TCP)
-                                       ctrl |= IPCS | TCPCS;
-                               else if (ip->protocol == IPPROTO_UDP)
-                                       ctrl |= IPCS | UDPCS;
-                               else
-                                       BUG();
-                       }
-
-                       if (frag == skb_shinfo(skb)->nr_frags - 1)
-                               ctrl |= LastFrag;
-
-                       txd = &cp->tx_ring[entry];
-                       CP_VLAN_TX_TAG(txd, vlan_tag);
-                       txd->addr = cpu_to_le64(mapping);
-                       wmb();
-
-                       txd->opts1 = cpu_to_le32(ctrl);
-                       wmb();
-
-                       cp->tx_skb[entry] = skb;
-                       entry = NEXT_TX(entry);
-               }
-
-               txd = &cp->tx_ring[first_entry];
-               CP_VLAN_TX_TAG(txd, vlan_tag);
-               txd->addr = cpu_to_le64(first_mapping);
-               wmb();
-
-               if (skb->ip_summed == CHECKSUM_PARTIAL) {
-                       if (ip->protocol == IPPROTO_TCP)
-                               txd->opts1 = cpu_to_le32(first_eor | first_len |
-                                                        FirstFrag | DescOwn |
-                                                        IPCS | TCPCS);
-                       else if (ip->protocol == IPPROTO_UDP)
-                               txd->opts1 = cpu_to_le32(first_eor | first_len |
-                                                        FirstFrag | DescOwn |
-                                                        IPCS | UDPCS);
-                       else
-                               BUG();
-               } else
-                       txd->opts1 = cpu_to_le32(first_eor | first_len |
-                                                FirstFrag | DescOwn);
-               wmb();
-       }
-       cp->tx_head = entry;
-       if (netif_msg_tx_queued(cp))
-               printk(KERN_DEBUG "%s: tx queued, slot %d, skblen %d\n",
-                      dev->name, entry, skb->len);
-       if (TX_BUFFS_AVAIL(cp) <= (MAX_SKB_FRAGS + 1))
-               netif_stop_queue(dev);
-
-       spin_unlock_irqrestore(&cp->lock, intr_flags);
-
-       cpw8(TxPoll, NormalTxPoll);
-       dev->trans_start = jiffies;
-
-       return 0;
-}
-
-/* Set or clear the multicast filter for this adaptor.
-   This routine is not state sensitive and need not be SMP locked. */
-
-static void __cp_set_rx_mode (struct net_device *dev)
-{
-       struct cp_private *cp = netdev_priv(dev);
-       u32 mc_filter[2];       /* Multicast hash filter */
-       int i, rx_mode;
-       u32 tmp;
-
-       /* Note: do not reorder, GCC is clever about common statements. */
-       if (dev->flags & IFF_PROMISC) {
-               /* Unconditionally log net taps. */
-               rx_mode =
-                   AcceptBroadcast | AcceptMulticast | AcceptMyPhys |
-                   AcceptAllPhys;
-               mc_filter[1] = mc_filter[0] = 0xffffffff;
-       } else if ((dev->mc_count > multicast_filter_limit)
-                  || (dev->flags & IFF_ALLMULTI)) {
-               /* Too many to filter perfectly -- accept all multicasts. */
-               rx_mode = AcceptBroadcast | AcceptMulticast | AcceptMyPhys;
-               mc_filter[1] = mc_filter[0] = 0xffffffff;
-       } else {
-               struct dev_mc_list *mclist;
-               rx_mode = AcceptBroadcast | AcceptMyPhys;
-               mc_filter[1] = mc_filter[0] = 0;
-               for (i = 0, mclist = dev->mc_list; mclist && i < dev->mc_count;
-                    i++, mclist = mclist->next) {
-                       int bit_nr = ether_crc(ETH_ALEN, mclist->dmi_addr) >> 
26;
-
-                       mc_filter[bit_nr >> 5] |= 1 << (bit_nr & 31);
-                       rx_mode |= AcceptMulticast;
-               }
-       }
-
-       /* We can safely update without stopping the chip. */
-       tmp = cp_rx_config | rx_mode;
-       if (cp->rx_config != tmp) {
-               cpw32_f (RxConfig, tmp);
-               cp->rx_config = tmp;
-       }
-       cpw32_f (MAR0 + 0, mc_filter[0]);
-       cpw32_f (MAR0 + 4, mc_filter[1]);
-}
-
-static void cp_set_rx_mode (struct net_device *dev)
-{
-       unsigned long flags;
-       struct cp_private *cp = netdev_priv(dev);
-
-       spin_lock_irqsave (&cp->lock, flags);
-       __cp_set_rx_mode(dev);
-       spin_unlock_irqrestore (&cp->lock, flags);
-}
-
-static void __cp_get_stats(struct cp_private *cp)
-{
-       /* only lower 24 bits valid; write any value to clear */
-       cp->dev->stats.rx_missed_errors += (cpr32 (RxMissed) & 0xffffff);
-       cpw32 (RxMissed, 0);
-}
-
-static struct net_device_stats *cp_get_stats(struct net_device *dev)
-{
-       struct cp_private *cp = netdev_priv(dev);
-       unsigned long flags;
-
-       /* The chip only need report frame silently dropped. */
-       spin_lock_irqsave(&cp->lock, flags);
-       if (netif_running(dev) && netif_device_present(dev))
-               __cp_get_stats(cp);
-       spin_unlock_irqrestore(&cp->lock, flags);
-
-       return &dev->stats;
-}
-
-static void cp_stop_hw (struct cp_private *cp)
-{
-       cpw16(IntrStatus, ~(cpr16(IntrStatus)));
-       cpw16_f(IntrMask, 0);
-       cpw8(Cmd, 0);
-       cpw16_f(CpCmd, 0);
-       cpw16_f(IntrStatus, ~(cpr16(IntrStatus)));
-
-       cp->rx_tail = 0;
-       cp->tx_head = cp->tx_tail = 0;
-}
-
-static void cp_reset_hw (struct cp_private *cp)
-{
-       unsigned work = 1000;
-
-       cpw8(Cmd, CmdReset);
-
-       while (work--) {
-               if (!(cpr8(Cmd) & CmdReset))
-                       return;
-
-               schedule_timeout_uninterruptible(10);
-       }
-
-       printk(KERN_ERR "%s: hardware reset timeout\n", cp->dev->name);
-}
-
-static inline void cp_start_hw (struct cp_private *cp)
-{
-       cpw16(CpCmd, cp->cpcmd);
-       cpw8(Cmd, RxOn | TxOn);
-}
-
-static void cp_init_hw (struct cp_private *cp)
-{
-       struct net_device *dev = cp->dev;
-       dma_addr_t ring_dma;
-
-       cp_reset_hw(cp);
-
-       cpw8_f (Cfg9346, Cfg9346_Unlock);
-
-       /* Restore our idea of the MAC address. */
-       cpw32_f (MAC0 + 0, le32_to_cpu (*(__le32 *) (dev->dev_addr + 0)));
-       cpw32_f (MAC0 + 4, le32_to_cpu (*(__le32 *) (dev->dev_addr + 4)));
-
-       cp_start_hw(cp);
-       cpw8(TxThresh, 0x06); /* XXX convert magic num to a constant */
-
-       __cp_set_rx_mode(dev);
-       cpw32_f (TxConfig, IFG | (TX_DMA_BURST << TxDMAShift));
-
-       cpw8(Config1, cpr8(Config1) | DriverLoaded | PMEnable);
-       /* Disable Wake-on-LAN. Can be turned on with ETHTOOL_SWOL */
-       cpw8(Config3, PARMEnable);
-       cp->wol_enabled = 0;
-
-       cpw8(Config5, cpr8(Config5) & PMEStatus);
-
-       cpw32_f(HiTxRingAddr, 0);
-       cpw32_f(HiTxRingAddr + 4, 0);
-
-       ring_dma = cp->ring_dma;
-       cpw32_f(RxRingAddr, ring_dma & 0xffffffff);
-       cpw32_f(RxRingAddr + 4, (ring_dma >> 16) >> 16);
-
-       ring_dma += sizeof(struct cp_desc) * CP_RX_RING_SIZE;
-       cpw32_f(TxRingAddr, ring_dma & 0xffffffff);
-       cpw32_f(TxRingAddr + 4, (ring_dma >> 16) >> 16);
-
-       cpw16(MultiIntr, 0);
-
-       cpw16_f(IntrMask, cp_intr_mask);
-
-       cpw8_f(Cfg9346, Cfg9346_Lock);
-}
-
-static int cp_refill_rx(struct cp_private *cp)
-{
-       struct net_device *dev = cp->dev;
-       unsigned i;
-
-       for (i = 0; i < CP_RX_RING_SIZE; i++) {
-               struct sk_buff *skb;
-               dma_addr_t mapping;
-
-               skb = netdev_alloc_skb(dev, cp->rx_buf_sz + NET_IP_ALIGN);
-               if (!skb)
-                       goto err_out;
-
-               skb_reserve(skb, NET_IP_ALIGN);
-
-               mapping = dma_map_single(&cp->pdev->dev, skb->data,
-                                        cp->rx_buf_sz, PCI_DMA_FROMDEVICE);
-               cp->rx_skb[i] = skb;
-
-               cp->rx_ring[i].opts2 = 0;
-               cp->rx_ring[i].addr = cpu_to_le64(mapping);
-               if (i == (CP_RX_RING_SIZE - 1))
-                       cp->rx_ring[i].opts1 =
-                               cpu_to_le32(DescOwn | RingEnd | cp->rx_buf_sz);
-               else
-                       cp->rx_ring[i].opts1 =
-                               cpu_to_le32(DescOwn | cp->rx_buf_sz);
-       }
-
-       return 0;
-
-err_out:
-       cp_clean_rings(cp);
-       return -ENOMEM;
-}
-
-static void cp_init_rings_index (struct cp_private *cp)
-{
-       cp->rx_tail = 0;
-       cp->tx_head = cp->tx_tail = 0;
-}
-
-static int cp_init_rings (struct cp_private *cp)
-{
-       memset(cp->tx_ring, 0, sizeof(struct cp_desc) * CP_TX_RING_SIZE);
-       cp->tx_ring[CP_TX_RING_SIZE - 1].opts1 = cpu_to_le32(RingEnd);
-
-       cp_init_rings_index(cp);
-
-       return cp_refill_rx (cp);
-}
-
-static int cp_alloc_rings (struct cp_private *cp)
-{
-       void *mem;
-
-       mem = dma_alloc_coherent(&cp->pdev->dev, CP_RING_BYTES,
-                                &cp->ring_dma, GFP_KERNEL);
-       if (!mem)
-               return -ENOMEM;
-
-       cp->rx_ring = mem;
-       cp->tx_ring = &cp->rx_ring[CP_RX_RING_SIZE];
-
-       return cp_init_rings(cp);
-}
-
-static void cp_clean_rings (struct cp_private *cp)
-{
-       struct cp_desc *desc;
-       unsigned i;
-
-       for (i = 0; i < CP_RX_RING_SIZE; i++) {
-               if (cp->rx_skb[i]) {
-                       desc = cp->rx_ring + i;
-                       dma_unmap_single(&cp->pdev->dev,le64_to_cpu(desc->addr),
-                                        cp->rx_buf_sz, PCI_DMA_FROMDEVICE);
-                       dev_kfree_skb(cp->rx_skb[i]);
-               }
-       }
-
-       for (i = 0; i < CP_TX_RING_SIZE; i++) {
-               if (cp->tx_skb[i]) {
-                       struct sk_buff *skb = cp->tx_skb[i];
-
-                       desc = cp->tx_ring + i;
-                       dma_unmap_single(&cp->pdev->dev,le64_to_cpu(desc->addr),
-                                        le32_to_cpu(desc->opts1) & 0xffff,
-                                        PCI_DMA_TODEVICE);
-                       if (le32_to_cpu(desc->opts1) & LastFrag)
-                               dev_kfree_skb(skb);
-                       cp->dev->stats.tx_dropped++;
-               }
-       }
-
-       memset(cp->rx_ring, 0, sizeof(struct cp_desc) * CP_RX_RING_SIZE);
-       memset(cp->tx_ring, 0, sizeof(struct cp_desc) * CP_TX_RING_SIZE);
-
-       memset(cp->rx_skb, 0, sizeof(struct sk_buff *) * CP_RX_RING_SIZE);
-       memset(cp->tx_skb, 0, sizeof(struct sk_buff *) * CP_TX_RING_SIZE);
-}
-
-static void cp_free_rings (struct cp_private *cp)
-{
-       cp_clean_rings(cp);
-       dma_free_coherent(&cp->pdev->dev, CP_RING_BYTES, cp->rx_ring,
-                         cp->ring_dma);
-       cp->rx_ring = NULL;
-       cp->tx_ring = NULL;
-}
-
-static int cp_open (struct net_device *dev)
-{
-       struct cp_private *cp = netdev_priv(dev);
-       int rc;
-
-       if (netif_msg_ifup(cp))
-               printk(KERN_DEBUG "%s: enabling interface\n", dev->name);
-
-       rc = cp_alloc_rings(cp);
-       if (rc)
-               return rc;
-
-       napi_enable(&cp->napi);
-
-       cp_init_hw(cp);
-
-       rc = request_irq(dev->irq, cp_interrupt, IRQF_SHARED, dev->name, dev);
-       if (rc)
-               goto err_out_hw;
-
-       netif_carrier_off(dev);
-       mii_check_media(&cp->mii_if, netif_msg_link(cp), true);
-       netif_start_queue(dev);
-
-       return 0;
-
-err_out_hw:
-       napi_disable(&cp->napi);
-       cp_stop_hw(cp);
-       cp_free_rings(cp);
-       return rc;
-}
-
-static int cp_close (struct net_device *dev)
-{
-       struct cp_private *cp = netdev_priv(dev);
-       unsigned long flags;
-
-       napi_disable(&cp->napi);
-
-       if (netif_msg_ifdown(cp))
-               printk(KERN_DEBUG "%s: disabling interface\n", dev->name);
-
-       spin_lock_irqsave(&cp->lock, flags);
-
-       netif_stop_queue(dev);
-       netif_carrier_off(dev);
-
-       cp_stop_hw(cp);
-
-       spin_unlock_irqrestore(&cp->lock, flags);
-
-       free_irq(dev->irq, dev);
-
-       cp_free_rings(cp);
-       return 0;
-}
-
-static void cp_tx_timeout(struct net_device *dev)
-{
-       struct cp_private *cp = netdev_priv(dev);
-       unsigned long flags;
-       int rc;
-
-       printk(KERN_WARNING "%s: Transmit timeout, status %2x %4x %4x %4x\n",
-              dev->name, cpr8(Cmd), cpr16(CpCmd),
-              cpr16(IntrStatus), cpr16(IntrMask));
-
-       spin_lock_irqsave(&cp->lock, flags);
-
-       cp_stop_hw(cp);
-       cp_clean_rings(cp);
-       rc = cp_init_rings(cp);
-       cp_start_hw(cp);
-
-       netif_wake_queue(dev);
-
-       spin_unlock_irqrestore(&cp->lock, flags);
-
-       return;
-}
-
-#ifdef BROKEN
-static int cp_change_mtu(struct net_device *dev, int new_mtu)
-{
-       struct cp_private *cp = netdev_priv(dev);
-       int rc;
-       unsigned long flags;
-
-       /* check for invalid MTU, according to hardware limits */
-       if (new_mtu < CP_MIN_MTU || new_mtu > CP_MAX_MTU)
-               return -EINVAL;
-
-       /* if network interface not up, no need for complexity */
-       if (!netif_running(dev)) {
-               dev->mtu = new_mtu;
-               cp_set_rxbufsize(cp);   /* set new rx buf size */
-               return 0;
-       }
-
-       spin_lock_irqsave(&cp->lock, flags);
-
-       cp_stop_hw(cp);                 /* stop h/w and free rings */
-       cp_clean_rings(cp);
-
-       dev->mtu = new_mtu;
-       cp_set_rxbufsize(cp);           /* set new rx buf size */
-
-       rc = cp_init_rings(cp);         /* realloc and restart h/w */
-       cp_start_hw(cp);
-
-       spin_unlock_irqrestore(&cp->lock, flags);
-
-       return rc;
-}
-#endif /* BROKEN */
-
-static const char mii_2_8139_map[8] = {
-       BasicModeCtrl,
-       BasicModeStatus,
-       0,
-       0,
-       NWayAdvert,
-       NWayLPAR,
-       NWayExpansion,
-       0
-};
-
-static int mdio_read(struct net_device *dev, int phy_id, int location)
-{
-       struct cp_private *cp = netdev_priv(dev);
-
-       return location < 8 && mii_2_8139_map[location] ?
-              readw(cp->regs + mii_2_8139_map[location]) : 0;
-}
-
-
-static void mdio_write(struct net_device *dev, int phy_id, int location,
-                      int value)
-{
-       struct cp_private *cp = netdev_priv(dev);
-
-       if (location == 0) {
-               cpw8(Cfg9346, Cfg9346_Unlock);
-               cpw16(BasicModeCtrl, value);
-               cpw8(Cfg9346, Cfg9346_Lock);
-       } else if (location < 8 && mii_2_8139_map[location])
-               cpw16(mii_2_8139_map[location], value);
-}
-
-/* Set the ethtool Wake-on-LAN settings */
-static int netdev_set_wol (struct cp_private *cp,
-                          const struct ethtool_wolinfo *wol)
-{
-       u8 options;
-
-       options = cpr8 (Config3) & ~(LinkUp | MagicPacket);
-       /* If WOL is being disabled, no need for complexity */
-       if (wol->wolopts) {
-               if (wol->wolopts & WAKE_PHY)    options |= LinkUp;
-               if (wol->wolopts & WAKE_MAGIC)  options |= MagicPacket;
-       }
-
-       cpw8 (Cfg9346, Cfg9346_Unlock);
-       cpw8 (Config3, options);
-       cpw8 (Cfg9346, Cfg9346_Lock);
-
-       options = 0; /* Paranoia setting */
-       options = cpr8 (Config5) & ~(UWF | MWF | BWF);
-       /* If WOL is being disabled, no need for complexity */
-       if (wol->wolopts) {
-               if (wol->wolopts & WAKE_UCAST)  options |= UWF;
-               if (wol->wolopts & WAKE_BCAST)  options |= BWF;
-               if (wol->wolopts & WAKE_MCAST)  options |= MWF;
-       }
-
-       cpw8 (Config5, options);
-
-       cp->wol_enabled = (wol->wolopts) ? 1 : 0;
-
-       return 0;
-}
-
-/* Get the ethtool Wake-on-LAN settings */
-static void netdev_get_wol (struct cp_private *cp,
-                    struct ethtool_wolinfo *wol)
-{
-       u8 options;
-
-       wol->wolopts   = 0; /* Start from scratch */
-       wol->supported = WAKE_PHY   | WAKE_BCAST | WAKE_MAGIC |
-                        WAKE_MCAST | WAKE_UCAST;
-       /* We don't need to go on if WOL is disabled */
-       if (!cp->wol_enabled) return;
-
-       options        = cpr8 (Config3);
-       if (options & LinkUp)        wol->wolopts |= WAKE_PHY;
-       if (options & MagicPacket)   wol->wolopts |= WAKE_MAGIC;
-
-       options        = 0; /* Paranoia setting */
-       options        = cpr8 (Config5);
-       if (options & UWF)           wol->wolopts |= WAKE_UCAST;
-       if (options & BWF)           wol->wolopts |= WAKE_BCAST;
-       if (options & MWF)           wol->wolopts |= WAKE_MCAST;
-}
-
-static void cp_get_drvinfo (struct net_device *dev, struct ethtool_drvinfo 
*info)
-{
-       struct cp_private *cp = netdev_priv(dev);
-
-       strcpy (info->driver, DRV_NAME);
-       strcpy (info->version, DRV_VERSION);
-       strcpy (info->bus_info, pci_name(cp->pdev));
-}
-
-static int cp_get_regs_len(struct net_device *dev)
-{
-       return CP_REGS_SIZE;
-}
-
-static int cp_get_sset_count (struct net_device *dev, int sset)
-{
-       switch (sset) {
-       case ETH_SS_STATS:
-               return CP_NUM_STATS;
-       default:
-               return -EOPNOTSUPP;
-       }
-}
-
-static int cp_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
-{
-       struct cp_private *cp = netdev_priv(dev);
-       int rc;
-       unsigned long flags;
-
-       spin_lock_irqsave(&cp->lock, flags);
-       rc = mii_ethtool_gset(&cp->mii_if, cmd);
-       spin_unlock_irqrestore(&cp->lock, flags);
-
-       return rc;
-}
-
-static int cp_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
-{
-       struct cp_private *cp = netdev_priv(dev);
-       int rc;
-       unsigned long flags;
-
-       spin_lock_irqsave(&cp->lock, flags);
-       rc = mii_ethtool_sset(&cp->mii_if, cmd);
-       spin_unlock_irqrestore(&cp->lock, flags);
-
-       return rc;
-}
-
-static int cp_nway_reset(struct net_device *dev)
-{
-       struct cp_private *cp = netdev_priv(dev);
-       return mii_nway_restart(&cp->mii_if);
-}
-
-static u32 cp_get_msglevel(struct net_device *dev)
-{
-       struct cp_private *cp = netdev_priv(dev);
-       return cp->msg_enable;
-}
-
-static void cp_set_msglevel(struct net_device *dev, u32 value)
-{
-       struct cp_private *cp = netdev_priv(dev);
-       cp->msg_enable = value;
-}
-
-static u32 cp_get_rx_csum(struct net_device *dev)
-{
-       struct cp_private *cp = netdev_priv(dev);
-       return (cpr16(CpCmd) & RxChkSum) ? 1 : 0;
-}
-
-static int cp_set_rx_csum(struct net_device *dev, u32 data)
-{
-       struct cp_private *cp = netdev_priv(dev);
-       u16 cmd = cp->cpcmd, newcmd;
-
-       newcmd = cmd;
-
-       if (data)
-               newcmd |= RxChkSum;
-       else
-               newcmd &= ~RxChkSum;
-
-       if (newcmd != cmd) {
-               unsigned long flags;
-
-               spin_lock_irqsave(&cp->lock, flags);
-               cp->cpcmd = newcmd;
-               cpw16_f(CpCmd, newcmd);
-               spin_unlock_irqrestore(&cp->lock, flags);
-       }
-
-       return 0;
-}
-
-static void cp_get_regs(struct net_device *dev, struct ethtool_regs *regs,
-                       void *p)
-{
-       struct cp_private *cp = netdev_priv(dev);
-       unsigned long flags;
-
-       if (regs->len < CP_REGS_SIZE)
-               return /* -EINVAL */;
-
-       regs->version = CP_REGS_VER;
-
-       spin_lock_irqsave(&cp->lock, flags);
-       memcpy_fromio(p, cp->regs, CP_REGS_SIZE);
-       spin_unlock_irqrestore(&cp->lock, flags);
-}
-
-static void cp_get_wol (struct net_device *dev, struct ethtool_wolinfo *wol)
-{
-       struct cp_private *cp = netdev_priv(dev);
-       unsigned long flags;
-
-       spin_lock_irqsave (&cp->lock, flags);
-       netdev_get_wol (cp, wol);
-       spin_unlock_irqrestore (&cp->lock, flags);
-}
-
-static int cp_set_wol (struct net_device *dev, struct ethtool_wolinfo *wol)
-{
-       struct cp_private *cp = netdev_priv(dev);
-       unsigned long flags;
-       int rc;
-
-       spin_lock_irqsave (&cp->lock, flags);
-       rc = netdev_set_wol (cp, wol);
-       spin_unlock_irqrestore (&cp->lock, flags);
-
-       return rc;
-}
-
-static void cp_get_strings (struct net_device *dev, u32 stringset, u8 *buf)
-{
-       switch (stringset) {
-       case ETH_SS_STATS:
-               memcpy(buf, &ethtool_stats_keys, sizeof(ethtool_stats_keys));
-               break;
-       default:
-               BUG();
-               break;
-       }
-}
-
-static void cp_get_ethtool_stats (struct net_device *dev,
-                                 struct ethtool_stats *estats, u64 *tmp_stats)
-{
-       struct cp_private *cp = netdev_priv(dev);
-       struct cp_dma_stats *nic_stats;
-       dma_addr_t dma;
-       int i;
-
-       nic_stats = dma_alloc_coherent(&cp->pdev->dev, sizeof(*nic_stats),
-                                      &dma, GFP_KERNEL);
-       if (!nic_stats)
-               return;
-
-       /* begin NIC statistics dump */
-       cpw32(StatsAddr + 4, (u64)dma >> 32);
-       cpw32(StatsAddr, ((u64)dma & DMA_32BIT_MASK) | DumpStats);
-       cpr32(StatsAddr);
-
-       for (i = 0; i < 1000; i++) {
-               if ((cpr32(StatsAddr) & DumpStats) == 0)
-                       break;
-               udelay(10);
-       }
-       cpw32(StatsAddr, 0);
-       cpw32(StatsAddr + 4, 0);
-       cpr32(StatsAddr);
-
-       i = 0;
-       tmp_stats[i++] = le64_to_cpu(nic_stats->tx_ok);
-       tmp_stats[i++] = le64_to_cpu(nic_stats->rx_ok);
-       tmp_stats[i++] = le64_to_cpu(nic_stats->tx_err);
-       tmp_stats[i++] = le32_to_cpu(nic_stats->rx_err);
-       tmp_stats[i++] = le16_to_cpu(nic_stats->rx_fifo);
-       tmp_stats[i++] = le16_to_cpu(nic_stats->frame_align);
-       tmp_stats[i++] = le32_to_cpu(nic_stats->tx_ok_1col);
-       tmp_stats[i++] = le32_to_cpu(nic_stats->tx_ok_mcol);
-       tmp_stats[i++] = le64_to_cpu(nic_stats->rx_ok_phys);
-       tmp_stats[i++] = le64_to_cpu(nic_stats->rx_ok_bcast);
-       tmp_stats[i++] = le32_to_cpu(nic_stats->rx_ok_mcast);
-       tmp_stats[i++] = le16_to_cpu(nic_stats->tx_abort);
-       tmp_stats[i++] = le16_to_cpu(nic_stats->tx_underrun);
-       tmp_stats[i++] = cp->cp_stats.rx_frags;
-       BUG_ON(i != CP_NUM_STATS);
-
-       dma_free_coherent(&cp->pdev->dev, sizeof(*nic_stats), nic_stats, dma);
-}
-
-static const struct ethtool_ops cp_ethtool_ops = {
-       .get_drvinfo            = cp_get_drvinfo,
-       .get_regs_len           = cp_get_regs_len,
-       .get_sset_count         = cp_get_sset_count,
-       .get_settings           = cp_get_settings,
-       .set_settings           = cp_set_settings,
-       .nway_reset             = cp_nway_reset,
-       .get_link               = ethtool_op_get_link,
-       .get_msglevel           = cp_get_msglevel,
-       .set_msglevel           = cp_set_msglevel,
-       .get_rx_csum            = cp_get_rx_csum,
-       .set_rx_csum            = cp_set_rx_csum,
-       .set_tx_csum            = ethtool_op_set_tx_csum, /* local! */
-       .set_sg                 = ethtool_op_set_sg,
-       .set_tso                = ethtool_op_set_tso,
-       .get_regs               = cp_get_regs,
-       .get_wol                = cp_get_wol,
-       .set_wol                = cp_set_wol,
-       .get_strings            = cp_get_strings,
-       .get_ethtool_stats      = cp_get_ethtool_stats,
-       .get_eeprom_len         = cp_get_eeprom_len,
-       .get_eeprom             = cp_get_eeprom,
-       .set_eeprom             = cp_set_eeprom,
-};
-
-static int cp_ioctl (struct net_device *dev, struct ifreq *rq, int cmd)
-{
-       struct cp_private *cp = netdev_priv(dev);
-       int rc;
-       unsigned long flags;
-
-       if (!netif_running(dev))
-               return -EINVAL;
-
-       spin_lock_irqsave(&cp->lock, flags);
-       rc = generic_mii_ioctl(&cp->mii_if, if_mii(rq), cmd, NULL);
-       spin_unlock_irqrestore(&cp->lock, flags);
-       return rc;
-}
-
-/* Serial EEPROM section. */
-
-/*  EEPROM_Ctrl bits. */
-#define EE_SHIFT_CLK   0x04    /* EEPROM shift clock. */
-#define EE_CS                  0x08    /* EEPROM chip select. */
-#define EE_DATA_WRITE  0x02    /* EEPROM chip data in. */
-#define EE_WRITE_0             0x00
-#define EE_WRITE_1             0x02
-#define EE_DATA_READ   0x01    /* EEPROM chip data out. */
-#define EE_ENB                 (0x80 | EE_CS)
-
-/* Delay between EEPROM clock transitions.
-   No extra delay is needed with 33Mhz PCI, but 66Mhz may change this.
- */
-
-#define eeprom_delay() readl(ee_addr)
-
-/* The EEPROM commands include the alway-set leading bit. */
-#define EE_EXTEND_CMD  (4)
-#define EE_WRITE_CMD   (5)
-#define EE_READ_CMD            (6)
-#define EE_ERASE_CMD   (7)
-
-#define EE_EWDS_ADDR   (0)
-#define EE_WRAL_ADDR   (1)
-#define EE_ERAL_ADDR   (2)
-#define EE_EWEN_ADDR   (3)
-
-#define CP_EEPROM_MAGIC PCI_DEVICE_ID_REALTEK_8139
-
-static void eeprom_cmd_start(void __iomem *ee_addr)
-{
-       writeb (EE_ENB & ~EE_CS, ee_addr);
-       writeb (EE_ENB, ee_addr);
-       eeprom_delay ();
-}
-
-static void eeprom_cmd(void __iomem *ee_addr, int cmd, int cmd_len)
-{
-       int i;
-
-       /* Shift the command bits out. */
-       for (i = cmd_len - 1; i >= 0; i--) {
-               int dataval = (cmd & (1 << i)) ? EE_DATA_WRITE : 0;
-               writeb (EE_ENB | dataval, ee_addr);
-               eeprom_delay ();
-               writeb (EE_ENB | dataval | EE_SHIFT_CLK, ee_addr);
-               eeprom_delay ();
-       }
-       writeb (EE_ENB, ee_addr);
-       eeprom_delay ();
-}
-
-static void eeprom_cmd_end(void __iomem *ee_addr)
-{
-       writeb (~EE_CS, ee_addr);
-       eeprom_delay ();
-}
-
-static void eeprom_extend_cmd(void __iomem *ee_addr, int extend_cmd,
-                             int addr_len)
-{
-       int cmd = (EE_EXTEND_CMD << addr_len) | (extend_cmd << (addr_len - 2));
-
-       eeprom_cmd_start(ee_addr);
-       eeprom_cmd(ee_addr, cmd, 3 + addr_len);
-       eeprom_cmd_end(ee_addr);
-}
-
-static u16 read_eeprom (void __iomem *ioaddr, int location, int addr_len)
-{
-       int i;
-       u16 retval = 0;
-       void __iomem *ee_addr = ioaddr + Cfg9346;
-       int read_cmd = location | (EE_READ_CMD << addr_len);
-
-       eeprom_cmd_start(ee_addr);
-       eeprom_cmd(ee_addr, read_cmd, 3 + addr_len);
-
-       for (i = 16; i > 0; i--) {
-               writeb (EE_ENB | EE_SHIFT_CLK, ee_addr);
-               eeprom_delay ();
-               retval =
-                   (retval << 1) | ((readb (ee_addr) & EE_DATA_READ) ? 1 :
-                                    0);
-               writeb (EE_ENB, ee_addr);
-               eeprom_delay ();
-       }
-
-       eeprom_cmd_end(ee_addr);
-
-       return retval;
-}
-
-static void write_eeprom(void __iomem *ioaddr, int location, u16 val,
-                        int addr_len)
-{
-       int i;
-       void __iomem *ee_addr = ioaddr + Cfg9346;
-       int write_cmd = location | (EE_WRITE_CMD << addr_len);
-
-       eeprom_extend_cmd(ee_addr, EE_EWEN_ADDR, addr_len);
-
-       eeprom_cmd_start(ee_addr);
-       eeprom_cmd(ee_addr, write_cmd, 3 + addr_len);
-       eeprom_cmd(ee_addr, val, 16);
-       eeprom_cmd_end(ee_addr);
-
-       eeprom_cmd_start(ee_addr);
-       for (i = 0; i < 20000; i++)
-               if (readb(ee_addr) & EE_DATA_READ)
-                       break;
-       eeprom_cmd_end(ee_addr);
-
-       eeprom_extend_cmd(ee_addr, EE_EWDS_ADDR, addr_len);
-}
-
-static int cp_get_eeprom_len(struct net_device *dev)
-{
-       struct cp_private *cp = netdev_priv(dev);
-       int size;
-
-       spin_lock_irq(&cp->lock);
-       size = read_eeprom(cp->regs, 0, 8) == 0x8129 ? 256 : 128;
-       spin_unlock_irq(&cp->lock);
-
-       return size;
-}
-
-static int cp_get_eeprom(struct net_device *dev,
-                        struct ethtool_eeprom *eeprom, u8 *data)
-{
-       struct cp_private *cp = netdev_priv(dev);
-       unsigned int addr_len;
-       u16 val;
-       u32 offset = eeprom->offset >> 1;
-       u32 len = eeprom->len;
-       u32 i = 0;
-
-       eeprom->magic = CP_EEPROM_MAGIC;
-
-       spin_lock_irq(&cp->lock);
-
-       addr_len = read_eeprom(cp->regs, 0, 8) == 0x8129 ? 8 : 6;
-
-       if (eeprom->offset & 1) {
-               val = read_eeprom(cp->regs, offset, addr_len);
-               data[i++] = (u8)(val >> 8);
-               offset++;
-       }
-
-       while (i < len - 1) {
-               val = read_eeprom(cp->regs, offset, addr_len);
-               data[i++] = (u8)val;
-               data[i++] = (u8)(val >> 8);
-               offset++;
-       }
-
-       if (i < len) {
-               val = read_eeprom(cp->regs, offset, addr_len);
-               data[i] = (u8)val;
-       }
-
-       spin_unlock_irq(&cp->lock);
-       return 0;
-}
-
-static int cp_set_eeprom(struct net_device *dev,
-                        struct ethtool_eeprom *eeprom, u8 *data)
-{
-       struct cp_private *cp = netdev_priv(dev);
-       unsigned int addr_len;
-       u16 val;
-       u32 offset = eeprom->offset >> 1;
-       u32 len = eeprom->len;
-       u32 i = 0;
-
-       if (eeprom->magic != CP_EEPROM_MAGIC)
-               return -EINVAL;
-
-       spin_lock_irq(&cp->lock);
-
-       addr_len = read_eeprom(cp->regs, 0, 8) == 0x8129 ? 8 : 6;
-
-       if (eeprom->offset & 1) {
-               val = read_eeprom(cp->regs, offset, addr_len) & 0xff;
-               val |= (u16)data[i++] << 8;
-               write_eeprom(cp->regs, offset, val, addr_len);
-               offset++;
-       }
-
-       while (i < len - 1) {
-               val = (u16)data[i++];
-               val |= (u16)data[i++] << 8;
-               write_eeprom(cp->regs, offset, val, addr_len);
-               offset++;
-       }
-
-       if (i < len) {
-               val = read_eeprom(cp->regs, offset, addr_len) & 0xff00;
-               val |= (u16)data[i];
-               write_eeprom(cp->regs, offset, val, addr_len);
-       }
-
-       spin_unlock_irq(&cp->lock);
-       return 0;
-}
-
-/* Put the board into D3cold state and wait for WakeUp signal */
-static void cp_set_d3_state (struct cp_private *cp)
-{
-       pci_enable_wake (cp->pdev, 0, 1); /* Enable PME# generation */
-       pci_set_power_state (cp->pdev, PCI_D3hot);
-}
-
-static const struct net_device_ops cp_netdev_ops = {
-       .ndo_open               = cp_open,
-       .ndo_stop               = cp_close,
-       .ndo_validate_addr      = eth_validate_addr,
-       .ndo_set_mac_address    = eth_mac_addr,
-       .ndo_set_multicast_list = cp_set_rx_mode,
-       .ndo_get_stats          = cp_get_stats,
-       .ndo_do_ioctl           = cp_ioctl,
-       .ndo_start_xmit         = cp_start_xmit,
-       .ndo_tx_timeout         = cp_tx_timeout,
-#if CP_VLAN_TAG_USED
-       .ndo_vlan_rx_register   = cp_vlan_rx_register,
-#endif
-#ifdef BROKEN
-       .ndo_change_mtu         = cp_change_mtu,
-#endif
-
-#ifdef CONFIG_NET_POLL_CONTROLLER
-       .ndo_poll_controller    = cp_poll_controller,
-#endif
-};
-
-static int cp_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
-{
-       struct net_device *dev;
-       struct cp_private *cp;
-       int rc;
-       void __iomem *regs;
-       resource_size_t pciaddr;
-       unsigned int addr_len, i, pci_using_dac;
-
-#ifndef MODULE
-       static int version_printed;
-       if (version_printed++ == 0)
-               printk("%s", version);
-#endif
-
-       if (pdev->vendor == PCI_VENDOR_ID_REALTEK &&
-           pdev->device == PCI_DEVICE_ID_REALTEK_8139 && pdev->revision < 
0x20) {
-               dev_info(&pdev->dev,
-                          "This (id %04x:%04x rev %02x) is not an 8139C+ 
compatible chip, use 8139too\n",
-                          pdev->vendor, pdev->device, pdev->revision);
-               return -ENODEV;
-       }
-
-       dev = alloc_etherdev(sizeof(struct cp_private));
-       if (!dev)
-               return -ENOMEM;
-       SET_NETDEV_DEV(dev, &pdev->dev);
-
-       cp = netdev_priv(dev);
-       cp->pdev = pdev;
-       cp->dev = dev;
-       cp->msg_enable = (debug < 0 ? CP_DEF_MSG_ENABLE : debug);
-       spin_lock_init (&cp->lock);
-       cp->mii_if.dev = dev;
-       cp->mii_if.mdio_read = mdio_read;
-       cp->mii_if.mdio_write = mdio_write;
-       cp->mii_if.phy_id = CP_INTERNAL_PHY;
-       cp->mii_if.phy_id_mask = 0x1f;
-       cp->mii_if.reg_num_mask = 0x1f;
-       cp_set_rxbufsize(cp);
-
-       rc = pci_enable_device(pdev);
-       if (rc)
-               goto err_out_free;
-
-       rc = pci_set_mwi(pdev);
-       if (rc)
-               goto err_out_disable;
-
-       rc = pci_request_regions(pdev, DRV_NAME);
-       if (rc)
-               goto err_out_mwi;
-
-       pciaddr = pci_resource_start(pdev, 1);
-       if (!pciaddr) {
-               rc = -EIO;
-               dev_err(&pdev->dev, "no MMIO resource\n");
-               goto err_out_res;
-       }
-       if (pci_resource_len(pdev, 1) < CP_REGS_SIZE) {
-               rc = -EIO;
-               dev_err(&pdev->dev, "MMIO resource (%llx) too small\n",
-                      (unsigned long long)pci_resource_len(pdev, 1));
-               goto err_out_res;
-       }
-
-       /* Configure DMA attributes. */
-       if ((sizeof(dma_addr_t) > 4) &&
-           !pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK) &&
-           !pci_set_dma_mask(pdev, DMA_64BIT_MASK)) {
-               pci_using_dac = 1;
-       } else {
-               pci_using_dac = 0;
-
-               rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
-               if (rc) {
-                       dev_err(&pdev->dev,
-                                  "No usable DMA configuration, aborting.\n");
-                       goto err_out_res;
-               }
-               rc = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);
-               if (rc) {
-                       dev_err(&pdev->dev,
-                                  "No usable consistent DMA configuration, "
-                                  "aborting.\n");
-                       goto err_out_res;
-               }
-       }
-
-       cp->cpcmd = (pci_using_dac ? PCIDAC : 0) |
-                   PCIMulRW | RxChkSum | CpRxOn | CpTxOn;
-
-       regs = ioremap(pciaddr, CP_REGS_SIZE);
-       if (!regs) {
-               rc = -EIO;
-               dev_err(&pdev->dev, "Cannot map PCI MMIO (address@hidden)\n",
-                      (unsigned long long)pci_resource_len(pdev, 1),
-                      (unsigned long long)pciaddr);
-               goto err_out_res;
-       }
-       dev->base_addr = (unsigned long) regs;
-       cp->regs = regs;
-
-       cp_stop_hw(cp);
-
-       /* read MAC address from EEPROM */
-       addr_len = read_eeprom (regs, 0, 8) == 0x8129 ? 8 : 6;
-       for (i = 0; i < 3; i++)
-               ((__le16 *) (dev->dev_addr))[i] =
-                   cpu_to_le16(read_eeprom (regs, i + 7, addr_len));
-       memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
-
-       dev->netdev_ops = &cp_netdev_ops;
-       netif_napi_add(dev, &cp->napi, cp_rx_poll, 16);
-       dev->ethtool_ops = &cp_ethtool_ops;
-       dev->watchdog_timeo = TX_TIMEOUT;
-
-#if CP_VLAN_TAG_USED
-       dev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
-#endif
-
-       if (pci_using_dac)
-               dev->features |= NETIF_F_HIGHDMA;
-
-#if 0 /* disabled by default until verified */
-       dev->features |= NETIF_F_TSO;
-#endif
-
-       dev->irq = pdev->irq;
-
-       rc = register_netdev(dev);
-       if (rc)
-               goto err_out_iomap;
-
-       printk (KERN_INFO "%s: RTL-8139C+ at 0x%lx, "
-               "%pM, IRQ %d\n",
-               dev->name,
-               dev->base_addr,
-               dev->dev_addr,
-               dev->irq);
-
-       pci_set_drvdata(pdev, dev);
-
-       /* enable busmastering and memory-write-invalidate */
-       pci_set_master(pdev);
-
-       if (cp->wol_enabled)
-               cp_set_d3_state (cp);
-
-       return 0;
-
-err_out_iomap:
-       iounmap(regs);
-err_out_res:
-       pci_release_regions(pdev);
-err_out_mwi:
-       pci_clear_mwi(pdev);
-err_out_disable:
-       pci_disable_device(pdev);
-err_out_free:
-       free_netdev(dev);
-       return rc;
-}
-
-static void cp_remove_one (struct pci_dev *pdev)
-{
-       struct net_device *dev = pci_get_drvdata(pdev);
-       struct cp_private *cp = netdev_priv(dev);
-
-       unregister_netdev(dev);
-       iounmap(cp->regs);
-       if (cp->wol_enabled)
-               pci_set_power_state (pdev, PCI_D0);
-       pci_release_regions(pdev);
-       pci_clear_mwi(pdev);
-       pci_disable_device(pdev);
-       pci_set_drvdata(pdev, NULL);
-       free_netdev(dev);
-}
-
-#ifdef CONFIG_PM
-static int cp_suspend (struct pci_dev *pdev, pm_message_t state)
-{
-       struct net_device *dev = pci_get_drvdata(pdev);
-       struct cp_private *cp = netdev_priv(dev);
-       unsigned long flags;
-
-       if (!netif_running(dev))
-               return 0;
-
-       netif_device_detach (dev);
-       netif_stop_queue (dev);
-
-       spin_lock_irqsave (&cp->lock, flags);
-
-       /* Disable Rx and Tx */
-       cpw16 (IntrMask, 0);
-       cpw8  (Cmd, cpr8 (Cmd) & (~RxOn | ~TxOn));
-
-       spin_unlock_irqrestore (&cp->lock, flags);
-
-       pci_save_state(pdev);
-       pci_enable_wake(pdev, pci_choose_state(pdev, state), cp->wol_enabled);
-       pci_set_power_state(pdev, pci_choose_state(pdev, state));
-
-       return 0;
-}
-
-static int cp_resume (struct pci_dev *pdev)
-{
-       struct net_device *dev = pci_get_drvdata (pdev);
-       struct cp_private *cp = netdev_priv(dev);
-       unsigned long flags;
-
-       if (!netif_running(dev))
-               return 0;
-
-       netif_device_attach (dev);
-
-       pci_set_power_state(pdev, PCI_D0);
-       pci_restore_state(pdev);
-       pci_enable_wake(pdev, PCI_D0, 0);
-
-       /* FIXME: sh*t may happen if the Rx ring buffer is depleted */
-       cp_init_rings_index (cp);
-       cp_init_hw (cp);
-       netif_start_queue (dev);
-
-       spin_lock_irqsave (&cp->lock, flags);
-
-       mii_check_media(&cp->mii_if, netif_msg_link(cp), false);
-
-       spin_unlock_irqrestore (&cp->lock, flags);
-
-       return 0;
-}
-#endif /* CONFIG_PM */
-
-static struct pci_driver cp_driver = {
-       .name         = DRV_NAME,
-       .id_table     = cp_pci_tbl,
-       .probe        = cp_init_one,
-       .remove       = cp_remove_one,
-#ifdef CONFIG_PM
-       .resume       = cp_resume,
-       .suspend      = cp_suspend,
-#endif
-};
-
-static int __init cp_init (void)
-{
-#ifdef MODULE
-       printk("%s", version);
-#endif
-       return pci_register_driver(&cp_driver);
-}
-
-static void __exit cp_exit (void)
-{
-       pci_unregister_driver (&cp_driver);
-}
-
-module_init(cp_init);
-module_exit(cp_exit);
diff --git a/dde_rtl8139/Makeconf.local b/dde_rtl8139/Makeconf.local
deleted file mode 100644
index 130c8cc..0000000
--- a/dde_rtl8139/Makeconf.local
+++ /dev/null
@@ -1,17 +0,0 @@
-SYSTEMS = x86-l4v2
-ARCH = x86
-SYSTEM = x86-l4v2
-
-BUILDDIR       ?= ..
-
-libmachdev_path := -L$(BUILDDIR)/libmachdev -lmachdev
-libddekit_path := -L$(BUILDDIR)/libddekit -lddekit
-libslab_path := -L$(BUILDDIR)/libhurd-slab -lhurd-slab
-libbpf_path := -L$(BUILDDIR)/libbpf -lbpf
-
-DDEKITLIBDIR = $(PKGDIR)/../libddekit/
-DDEKITINCDIR = $(PKGDIR)/../libddekit/include
-DDE26LIBDIR = $(PKGDIR)/lib/src
-OBJ_BASE = $(PKGDIR)/build
-
-L4LIBDIR = .
diff --git a/dde_rtl8139/Makefile b/dde_rtl8139/Makefile
deleted file mode 100644
index 91a7df9..0000000
--- a/dde_rtl8139/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-PKGDIR        ?= ../libdde_linux26
-L4DIR         ?= $(PKGDIR)
-
-SYSTEMS        = x86-l4v2
-
-include Makeconf.local
-
-TARGET         = dde_rtl8139
-
-SRC_C          = main.c 8139cp.c
-
-LIBS          += $(libmachdev_path) -ldde_linux26.o -ldde_linux26_net 
$(libddekit_path) -lfshelp -ltrivfs -lpciaccess -lz -lpthread -lshouldbeinlibc 
-lports $(libslab_path) $(libbpf_path)
-CFLAGS        += -g -I$(PKGDIR)/include -I$(BUILDDIR)/include
-
-# DDE configuration
-include $(L4DIR)/Makeconf
-
-include $(L4DIR)/mk/prog.mk
diff --git a/dde_rtl8139/default.ld b/dde_rtl8139/default.ld
deleted file mode 100644
index f8e4e28..0000000
--- a/dde_rtl8139/default.ld
+++ /dev/null
@@ -1,213 +0,0 @@
-/* Script for -z combreloc: combine and sort reloc sections */
-OUTPUT_FORMAT("elf32-i386", "elf32-i386",
-             "elf32-i386")
-OUTPUT_ARCH(i386)
-ENTRY(_start)
-SEARCH_DIR("/usr/i486-gnu/lib"); SEARCH_DIR("/usr/local/lib"); 
SEARCH_DIR("/lib"); SEARCH_DIR("/usr/lib");
-SECTIONS
-{
-  /* Read-only sections, merged into text segment: */
-  PROVIDE (__executable_start = 0x08048000); . = 0x08048000 + SIZEOF_HEADERS;
-  .interp         : { *(.interp) }
-  .note.gnu.build-id : { *(.note.gnu.build-id) }
-  .hash           : { *(.hash) }
-  .gnu.hash       : { *(.gnu.hash) }
-  .dynsym         : { *(.dynsym) }
-  .dynstr         : { *(.dynstr) }
-  .gnu.version    : { *(.gnu.version) }
-  .gnu.version_d  : { *(.gnu.version_d) }
-  .gnu.version_r  : { *(.gnu.version_r) }
-  .rel.dyn        :
-    {
-      *(.rel.init)
-      *(.rel.text .rel.text.* .rel.gnu.linkonce.t.*)
-      *(.rel.fini)
-      *(.rel.rodata .rel.rodata.* .rel.gnu.linkonce.r.*)
-      *(.rel.data.rel.ro* .rel.gnu.linkonce.d.rel.ro.*)
-      *(.rel.data .rel.data.* .rel.gnu.linkonce.d.*)
-      *(.rel.tdata .rel.tdata.* .rel.gnu.linkonce.td.*)
-      *(.rel.tbss .rel.tbss.* .rel.gnu.linkonce.tb.*)
-      *(.rel.ctors)
-      *(.rel.dtors)
-      *(.rel.got)
-      *(.rel.bss .rel.bss.* .rel.gnu.linkonce.b.*)
-    }
-  .rela.dyn       :
-    {
-      *(.rela.init)
-      *(.rela.text .rela.text.* .rela.gnu.linkonce.t.*)
-      *(.rela.fini)
-      *(.rela.rodata .rela.rodata.* .rela.gnu.linkonce.r.*)
-      *(.rela.data .rela.data.* .rela.gnu.linkonce.d.*)
-      *(.rela.tdata .rela.tdata.* .rela.gnu.linkonce.td.*)
-      *(.rela.tbss .rela.tbss.* .rela.gnu.linkonce.tb.*)
-      *(.rela.ctors)
-      *(.rela.dtors)
-      *(.rela.got)
-      *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*)
-    }
-  .rel.plt        : { *(.rel.plt) }
-  .rela.plt       : { *(.rela.plt) }
-  .init           :
-  {
-    KEEP (*(.init))
-  } =0x90909090
-  .plt            : { *(.plt) }
-  .text           :
-  {
-    *(.text .stub .text.* .gnu.linkonce.t.*)
-    KEEP (*(.text.*personality*))
-    /* .gnu.warning sections are handled specially by elf32.em.  */
-    *(.gnu.warning)
-  } =0x90909090
-  .fini           :
-  {
-    KEEP (*(.fini))
-  } =0x90909090
-  PROVIDE (__etext = .);
-  PROVIDE (_etext = .);
-  PROVIDE (etext = .);
-  .rodata         : { *(.rodata .rodata.* .gnu.linkonce.r.*) }
-  .rodata1        : { *(.rodata1) }
-  .eh_frame_hdr : { *(.eh_frame_hdr) }
-  .eh_frame       : ONLY_IF_RO { KEEP (*(.eh_frame)) }
-  .gcc_except_table   : ONLY_IF_RO { *(.gcc_except_table .gcc_except_table.*) }
-  /* Adjust the address for the data segment.  We want to adjust up to
-     the same address within the page on the next page up.  */
-  . = ALIGN (CONSTANT (MAXPAGESIZE)) - ((CONSTANT (MAXPAGESIZE) - .) & 
(CONSTANT (MAXPAGESIZE) - 1)); . = DATA_SEGMENT_ALIGN (CONSTANT (MAXPAGESIZE), 
CONSTANT (COMMONPAGESIZE));
-  /* Exception handling  */
-  .eh_frame       : ONLY_IF_RW { KEEP (*(.eh_frame)) }
-  .gcc_except_table   : ONLY_IF_RW { *(.gcc_except_table .gcc_except_table.*) }
-  /* Thread Local Storage sections  */
-  .tdata         : { *(.tdata .tdata.* .gnu.linkonce.td.*) }
-  .tbss                  : { *(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon) }
-  .preinit_array     :
-  {
-    PROVIDE_HIDDEN (__preinit_array_start = .);
-    KEEP (*(.preinit_array))
-    PROVIDE_HIDDEN (__preinit_array_end = .);
-  }
-  .init_array     :
-  {
-     PROVIDE_HIDDEN (__init_array_start = .);
-     KEEP (*(SORT(.init_array.*)))
-     KEEP (*(.init_array))
-     PROVIDE_HIDDEN (__init_array_end = .);
-  }
-  .fini_array     :
-  {
-    PROVIDE_HIDDEN (__fini_array_start = .);
-    KEEP (*(.fini_array))
-    KEEP (*(SORT(.fini_array.*)))
-    PROVIDE_HIDDEN (__fini_array_end = .);
-  }
-  .ctors          :
-  {
-    /* gcc uses crtbegin.o to find the start of
-       the constructors, so we make sure it is
-       first.  Because this is a wildcard, it
-       doesn't matter if the user does not
-       actually link against crtbegin.o; the
-       linker won't look for a file to match a
-       wildcard.  The wildcard also means that it
-       doesn't matter which directory crtbegin.o
-       is in.  */
-    KEEP (*crtbegin.o(.ctors))
-    KEEP (*crtbegin?.o(.ctors))
-    /* We don't want to include the .ctor section from
-       the crtend.o file until after the sorted ctors.
-       The .ctor section from the crtend file contains the
-       end of ctors marker and it must be last */
-    KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o ) .ctors))
-
-    KEEP (*(SORT(.ctors.*)))
-    KEEP (*(.ctors))
-
-    KEEP (*(.mark_beg_l4dde_ctors))
-    KEEP (*(SORT(.l4dde_ctors.?)))
-    KEEP (*(SORT(.l4dde_ctors.??)))
-    KEEP (*(SORT(.l4dde_ctors.???)))
-    KEEP (*(SORT(.l4dde_ctors.????)))
-    KEEP (*(SORT(.l4dde_ctors.?????)))
-    KEEP (*(.l4dde_ctors))
-    KEEP (*(.mark_end_l4dde_ctors))
-  }
-  .dtors          :
-  {
-    KEEP (*crtbegin.o(.dtors))
-    KEEP (*crtbegin?.o(.dtors))
-    KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o ) .dtors))
-    KEEP (*(SORT(.dtors.*)))
-    KEEP (*(.dtors))
-  }
-  .jcr            : { KEEP (*(.jcr)) }
-  .data.rel.ro : { *(.data.rel.ro.local* .gnu.linkonce.d.rel.ro.local.*) 
*(.data.rel.ro* .gnu.linkonce.d.rel.ro.*) }
-  .dynamic        : { *(.dynamic) }
-  .got            : { *(.got) }
-  . = DATA_SEGMENT_RELRO_END (12, .);
-  .got.plt        : { *(.got.plt) }
-  .data           :
-  {
-    *(.data .data.* .gnu.linkonce.d.*)
-    KEEP (*(.gnu.linkonce.d.*personality*))
-    SORT(CONSTRUCTORS)
-  }
-  .data1          : { *(.data1) }
-  _edata = .; PROVIDE (edata = .);
-  __bss_start = .;
-  .bss            :
-  {
-   *(.dynbss)
-   *(.bss .bss.* .gnu.linkonce.b.*)
-   *(COMMON)
-   /* Align here to ensure that the .bss section occupies space up to
-      _end.  Align after .bss to ensure correct alignment even if the
-      .bss section disappears because there are no input sections.
-      FIXME: Why do we need it? When there is no .bss section, we don't
-      pad the .data section.  */
-   . = ALIGN(. != 0 ? 32 / 8 : 1);
-  }
-  . = ALIGN(32 / 8);
-  . = ALIGN(32 / 8);
-  _end = .; PROVIDE (end = .);
-  . = DATA_SEGMENT_END (.);
-  /* Stabs debugging sections.  */
-  .stab          0 : { *(.stab) }
-  .stabstr       0 : { *(.stabstr) }
-  .stab.excl     0 : { *(.stab.excl) }
-  .stab.exclstr  0 : { *(.stab.exclstr) }
-  .stab.index    0 : { *(.stab.index) }
-  .stab.indexstr 0 : { *(.stab.indexstr) }
-  .comment       0 : { *(.comment) }
-  /* DWARF debug sections.
-     Symbols in the DWARF debugging sections are relative to the beginning
-     of the section so we begin them at 0.  */
-  /* DWARF 1 */
-  .debug          0 : { *(.debug) }
-  .line           0 : { *(.line) }
-  /* GNU DWARF 1 extensions */
-  .debug_srcinfo  0 : { *(.debug_srcinfo) }
-  .debug_sfnames  0 : { *(.debug_sfnames) }
-  /* DWARF 1.1 and DWARF 2 */
-  .debug_aranges  0 : { *(.debug_aranges) }
-  .debug_pubnames 0 : { *(.debug_pubnames) }
-  /* DWARF 2 */
-  .debug_info     0 : { *(.debug_info .gnu.linkonce.wi.*) }
-  .debug_abbrev   0 : { *(.debug_abbrev) }
-  .debug_line     0 : { *(.debug_line) }
-  .debug_frame    0 : { *(.debug_frame) }
-  .debug_str      0 : { *(.debug_str) }
-  .debug_loc      0 : { *(.debug_loc) }
-  .debug_macinfo  0 : { *(.debug_macinfo) }
-  /* SGI/MIPS DWARF 2 extensions */
-  .debug_weaknames 0 : { *(.debug_weaknames) }
-  .debug_funcnames 0 : { *(.debug_funcnames) }
-  .debug_typenames 0 : { *(.debug_typenames) }
-  .debug_varnames  0 : { *(.debug_varnames) }
-  /* DWARF 3 */
-  .debug_pubtypes 0 : { *(.debug_pubtypes) }
-  .debug_ranges   0 : { *(.debug_ranges) }
-  .gnu.attributes 0 : { KEEP (*(.gnu.attributes)) }
-  /DISCARD/ : { *(.note.GNU-stack) *(.gnu_debuglink) }
-}
-
diff --git a/dde_rtl8139/main.c b/dde_rtl8139/main.c
deleted file mode 100644
index 7007b07..0000000
--- a/dde_rtl8139/main.c
+++ /dev/null
@@ -1,35 +0,0 @@
-#include <dde26.h> /* l4dde26_*() */
-#include <dde26_net.h> /* l4dde26 networking */
-
-#include <linux/netdevice.h> /* struct sk_buff */
-#include <linux/pci.h> /* pci_unregister_driver() */
-#include <linux/init.h>  // initcall()
-#include <linux/delay.h> // msleep()
-
-#include <hurd/machdev.h>
-
-int using_std = 1;
-
-int main(int argc, char **argv)
-{
-       pthread_t thread;
-
-       l4dde26_init();
-       l4dde26_process_init();
-       l4dde26_softirq_init();
-
-       printk("Initializing skb subsystem\n");
-       skb_init();
-
-       l4dde26_do_initcalls();
-
-       register_net();
-       mach_device_init();
-       trivfs_init();
-
-       pthread_create (&thread, NULL, ds_server, NULL;
-       pthread_detach (thread);
-       trivfs_server();
-
-       return 0;
-}
diff --git a/ddekit_test/Makefile b/ddekit_test/Makefile
deleted file mode 100644
index ea686d1..0000000
--- a/ddekit_test/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 2008 Free Software Foundation, 
Inc.
-# This file is part of the GNU Hurd.
-#
-# The GNU Hurd 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, or (at your option)
-# any later version.
-#
-# The GNU Hurd is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with the GNU Hurd; see the file COPYING.  If not, write to
-# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-
-dir := test
-makemode := server
-
-SRCS = main.c
-LCLHDRS = 
-DIST_FILES = 
-HURDLIBS = ddekit
-target = test
-MIGSTUBS = 
-OBJS = $(SRCS:.c=.o) $(MIGSTUBS)
-
-include ../Makeconf
-
-CFLAGS = -I../libddekit/include -g
diff --git a/ddekit_test/main.c b/ddekit_test/main.c
deleted file mode 100644
index bb9ccf8..0000000
--- a/ddekit_test/main.c
+++ /dev/null
@@ -1,342 +0,0 @@
-#include <mach.h>
-
-#include "dde.h"
-#include "ddekit/condvar.h"
-#include "ddekit/semaphore.h"
-#include "ddekit/thread.h"
-#include "ddekit/printf.h"
-#include "ddekit/assert.h"
-
-#define VERBOSE 1
-
-boolean_t using_std = 1;
-
-/****************
- ** Timer test **
- ****************/
-
-#include "ddekit/timer.h"
-
-static int twenty_timer = -1;
-
-static void __attribute__((unused)) dummy(void *arg) { }
-
-static void timer_func(void *arg)
-{
-       ddekit_printf("Timed func called with arg %d\n", (int)arg);
-
-       if ((int)arg == 15) {
-               int del = ddekit_del_timer(twenty_timer);
-               ddekit_printf("\tdropped 20s timer: %d\n", del);
-       }
-
-       if ((int)arg == 30)
-               ddekit_printf("\033[32;1mEND TIMER TEST\033[0m\n");
-}
-
-
-/* One tick each second. */
-static void tick(void *arg)
-{
-       static int cnt=0;
-       int r=0;
-
-       ddekit_printf("tick %d\n", cnt++);
-       
-       r = ddekit_add_timer(tick, 0, jiffies + HZ);
-}
-
-
-static void timer_test(void)
-{
-       int i;
-
-       ddekit_printf("\033[32;1mBEGIN TIMER TEST\033[0m\n");
-
-       ddekit_printf("HZ: %d\n", HZ);
-       ddekit_printf("JIFFIES: %lld\n", jiffies);
-       
-       ddekit_init_timers();
-       ddekit_thread_msleep(1000);
-
-       i = ddekit_add_timer(tick, 0, jiffies+HZ);
-       ddekit_printf("added timer: %d\n", i);
-
-       i = ddekit_add_timer(timer_func, (void *)5, jiffies + 5*HZ);
-       ddekit_printf("added timer: %d\n", i);
-       i = ddekit_add_timer(timer_func, (void *)10, jiffies + 10*HZ);
-       ddekit_printf("added timer: %d\n", i);
-       i = ddekit_add_timer(timer_func, (void *)15, jiffies + 15*HZ);
-       ddekit_printf("added timer: %d\n", i);
-       twenty_timer = ddekit_add_timer(timer_func, (void *)20, jiffies + 
20*HZ);
-       ddekit_printf("added timer: %d\n", twenty_timer);
-       i = ddekit_add_timer(timer_func, (void *)30, jiffies + 30*HZ);
-       ddekit_printf("added timer: %d\n", i);
-
-       ddekit_thread_msleep (10 * 1000);
-}
-
-/********************************
- ** Memory and page-table test **
- ********************************/
-
-#include "ddekit/memory.h"
-#include "ddekit/pgtab.h"
-
-static void memory_test(void)
-{
-       {
-               /* simple malloc */
-               ddekit_printf("\033[32;1mBEGIN SIMPLE MEMORY TEST\033[0m\n");
-
-               int i, j;
-               unsigned size = 508;
-               unsigned *p[10];
-
-               for (i = 0; i < 10; ++i) {
-                       p[i] = ddekit_simple_malloc(size);
-                       for (j = 0; j < size/sizeof(unsigned); ++j)
-                               (p[i])[j] = i;
-                       ddekit_printf("malloc(%d) => %p\n", size, p[i]);
-               }
-
-               i = 4;
-               ddekit_simple_free(p[i]);
-               ddekit_printf("free(%p)\n", p[i]);
-
-               p[i] = ddekit_simple_malloc(size);
-               for (j = 0; j < size/sizeof(unsigned); ++j)
-                       (p[i])[j] = 0xeeeeeeee;
-               ddekit_printf("malloc(%d) => %p\n", size, p[i]);
-
-               for (i = 9; i >= 0; --i) {
-                       ddekit_simple_free(p[i]);
-                       ddekit_printf("free(%p)\n", p[i]);
-               }
-
-               i = 0;
-               p[i] = ddekit_simple_malloc(size);
-               for (j = 0; j < size/sizeof(unsigned); ++j)
-                       (p[i])[j] = 0xaaaaaaaa;
-               ddekit_printf("malloc(%d) => %p\n", size, p[i]);
-
-               ddekit_printf("\033[32;1mEND SIMPLE MEMORY TEST\033[0m\n");
-       }
-       {
-               /* large malloc */
-               ddekit_printf("\033[32;1mBEGIN LARGE MEMORY TEST\033[0m\n");
-
-               const size_t malloc_size = 1024 * 4096;
-
-               char *p = ddekit_large_malloc(malloc_size);
-
-               ddekit_printf("virt->phys mappings:\n");
-               char *tmp = p;
-               ddekit_printf("  %p -> %p\n", tmp, 
ddekit_pgtab_get_physaddr(tmp));
-               tmp = p + malloc_size / 2;
-               ddekit_printf("  %p -> %p\n", tmp, 
ddekit_pgtab_get_physaddr(tmp));
-               tmp = p + malloc_size;
-               ddekit_printf("Expected error follows...\n");
-               ddekit_printf("  %p -> %p\n", tmp, 
ddekit_pgtab_get_physaddr(tmp));
-
-               ddekit_large_free(p);
-               tmp = p + malloc_size;
-               ddekit_printf("Expected error follows...\n");
-               ddekit_printf("  %p -> %p\n", tmp, 
ddekit_pgtab_get_physaddr(tmp));
-
-               p = ddekit_large_malloc(malloc_size);
-
-               ddekit_printf("virt->phys mappings:\n");
-               tmp = p;
-               ddekit_printf("  %p -> %p\n", tmp, 
ddekit_pgtab_get_physaddr(tmp));
-               tmp = p + malloc_size / 2;
-               ddekit_printf("  %p -> %p\n", tmp, 
ddekit_pgtab_get_physaddr(tmp));
-               tmp = p + malloc_size;
-               ddekit_printf("Expected error follows...\n");
-               ddekit_printf("  %p -> %p\n", tmp, 
ddekit_pgtab_get_physaddr(tmp));
-
-               ddekit_large_free(p);
-
-               ddekit_printf("\033[32;1mEND LARGE MEMORY TEST\033[0m\n");
-       }
-       {
-               int x = 0;
-               /* slabs */
-               ddekit_printf("\033[32;1mBEGIN SLAB MEMORY TEST\033[0m\n");
-
-               /* Test slabs for contiguous and non-contiguous case. */
-               for ( ; x < 2; ++x) {
-                       ddekit_printf("Contiguous mode set to %d\n", x);
-
-                       struct ddekit_slab *slab = ddekit_slab_init(256, x);
-                       if (!slab) ddekit_debug("slab cache init failed");
-
-                       unsigned const magic = 0xdeadbeef;
-                       ddekit_slab_set_data(slab, (void *)magic);
-                       if (ddekit_slab_get_data(slab) != (void *)magic)
-                               ddekit_debug("user pointer differs");
-
-                       unsigned i;
-                       unsigned *p[64];
-
-                       for (i = 0; i < sizeof(p)/sizeof(*p); ++i) {
-                               p[i]  = ddekit_slab_alloc(slab);
-                               *p[i] = i | 0xaffe0000;
-                               if (i % 8 == 0) {
-                                       if (x)
-                                               ddekit_printf("slab_alloc[%d] 
=> %p (%p phys)\n",
-                                                             i, p[i], 
ddekit_pgtab_get_physaddr(p[i]));
-                                       else
-                                               ddekit_printf("slab_alloc[%d] 
=> %p (no phys)\n", i, p[i]);
-                               }
-                       }
-
-                       for (i = 0; i < sizeof(p)/sizeof(*p); ++i) {
-                               ddekit_slab_free(slab, p[i]);
-                       }
-               }
-
-               ddekit_printf("\033[32;1mEND SLAB MEMORY TEST\033[0m\n");
-       }
-
-       {
-               ddekit_printf("\033[32;1mBEGIN PGTAB TEST\033[0m\n");
-               ddekit_addr_t phys = 0x12345000;
-               void *virt = (void *)0xABC00000;
-               void *virt2 = (void *)0;
-               void *virt3 = (void *)0;
-
-               ddekit_printf("4 invalid resolutions...\n");
-               ddekit_printf("virt_to_phys(0) = %p\n", 
ddekit_pgtab_get_physaddr(0));
-               ddekit_printf("phys_to_virt(0) = %p\n", 
ddekit_pgtab_get_virtaddr(0));
-               ddekit_printf("virt_to_phys(%p) = %p\n", virt, 
ddekit_pgtab_get_physaddr(virt));
-               ddekit_printf("phys_to_virt(%p) = %p\n", phys, 
ddekit_pgtab_get_virtaddr(phys));
-
-               virt = ddekit_large_malloc(16387);
-               virt2 = ddekit_large_malloc(32769);
-               virt3 = ddekit_large_malloc(8193);
-
-               ddekit_printf("6 correct lookups.\n");
-
-               phys = ddekit_pgtab_get_physaddr(virt);
-               ddekit_printf("virt_to_phys(%p) = %p\n", virt, phys);
-               ddekit_printf("phys_to_virt(%p) = %p\n", phys, 
ddekit_pgtab_get_virtaddr(phys));
-
-               phys = ddekit_pgtab_get_physaddr(virt2);
-               ddekit_printf("virt_to_phys(%p) = %p\n", virt2, phys);
-               ddekit_printf("phys_to_virt(%p) = %p\n", phys, 
ddekit_pgtab_get_virtaddr(phys));
-
-               phys = ddekit_pgtab_get_physaddr(virt3);
-               ddekit_printf("virt_to_phys(%p) = %p\n", virt3, phys);
-               ddekit_printf("phys_to_virt(%p) = %p\n", phys, 
ddekit_pgtab_get_virtaddr(phys));
-
-               ddekit_printf("freeing 2nd area.\n");
-               ddekit_large_free(virt2);
-
-
-               ddekit_printf("2 errors.\n");
-
-               phys = ddekit_pgtab_get_physaddr(virt2);
-               ddekit_printf("virt_to_phys(%p) = %p\n", virt2, phys);
-               ddekit_printf("phys_to_virt(%p) = %p\n", phys, 
ddekit_pgtab_get_virtaddr(phys));
-
-               ddekit_printf("4 correct lookups.\n");
-
-               phys = ddekit_pgtab_get_physaddr(virt);
-               ddekit_printf("virt_to_phys(%p) = %p\n", virt, phys);
-               ddekit_printf("phys_to_virt(%p) = %p\n", phys, 
ddekit_pgtab_get_virtaddr(phys));
-
-               phys = ddekit_pgtab_get_physaddr(virt3);
-               ddekit_printf("virt_to_phys(%p) = %p\n", virt3, phys);
-               ddekit_printf("phys_to_virt(%p) = %p\n", phys, 
ddekit_pgtab_get_virtaddr(phys));
-
-
-               ddekit_printf("\033[32;1mEND PGTAB TEST\033[0m\n");
-       }
-}
-
-ddekit_sem_t *sem;
-ddekit_condvar_t *cond;
-ddekit_lock_t cond_lock;
-int status;
-
-static void thread_func (void *arg)
-{
-  ddekit_lock_t lock = arg;
-  int ret;
-
-  ddekit_printf ("%s thread starts at %d\n",
-                ddekit_thread_get_name (ddekit_thread_myself ()), time (NULL));
-  ddekit_lock_lock (&lock);
-  ddekit_thread_sleep (&lock);
-  ddekit_lock_unlock (&lock);
-  ddekit_printf ("%s thread wakes up at %d\n",
-                ddekit_thread_get_name (ddekit_thread_myself ()), time (NULL));
-
-  ret = ddekit_sem_down_timed (sem, 1000);
-  ddekit_printf ("%s thread enter a semaphore at %d, timeout: %d\n",
-                ddekit_thread_get_name (ddekit_thread_myself ()),
-                time (NULL), ret != 0);
-
-  ddekit_printf ("%s thread waits for signal at %d\n",
-                ddekit_thread_get_name (ddekit_thread_myself ()), time (NULL));
-  ddekit_lock_lock (&cond_lock);
-  while (!status)
-    ddekit_condvar_wait (cond, &cond_lock);
-  ddekit_lock_unlock (&cond_lock);
-  ddekit_printf ("%s thread wakes up at %d\n",
-                ddekit_thread_get_name (ddekit_thread_myself ()), time (NULL));
-}
-
-static void thread_test ()
-{
-  ddekit_thread_t *thread1 = NULL;
-  ddekit_thread_t *thread2 = NULL;
-  ddekit_lock_t lock1;
-  ddekit_lock_t lock2;
-  
-  sem = ddekit_sem_init (0);
-  cond = ddekit_condvar_init ();
-  status = 0;
-  ddekit_lock_init (&cond_lock);
-  ddekit_lock_init (&lock1);
-  ddekit_lock_init (&lock2);
-
-  thread1 = ddekit_thread_create (thread_func, lock1, "test1");
-  thread2 = ddekit_thread_create (thread_func, lock2, "test2");
-
-  sleep (3);
-  ddekit_lock_lock (&lock1);
-  ddekit_thread_wakeup (thread1);
-  ddekit_lock_unlock (&lock1);
-
-  ddekit_lock_lock (&lock2);
-  ddekit_thread_wakeup (thread2);
-  ddekit_lock_unlock (&lock2);
-  sleep (2);
-
-  ddekit_sem_up (sem);
-  ddekit_sem_up (sem);
-  sleep (1);
-
-  ddekit_printf ("main thread wakes up the other two at %d\n", time (NULL));
-  ddekit_lock_lock (&cond_lock);
-  status = 1;
-  ddekit_condvar_broadcast (cond);
-  ddekit_lock_unlock (&cond_lock);
-  sleep (1);
-}
-
-
-int main(int argc, char **argv)
-{
-       ddekit_log(1, "Hey there, %s running...", argv[0]);
-
-       ddekit_init();
-
-       if (0) memory_test();
-       if (0) timer_test();
-       if (1) thread_test();
-
-       return 0;
-}
diff --git a/eth-filter.multi-thread/ChangeLog 
b/eth-filter.multi-thread/ChangeLog
deleted file mode 100644
index cd92006..0000000
--- a/eth-filter.multi-thread/ChangeLog
+++ /dev/null
@@ -1,105 +0,0 @@
-2008-08-22 Zheng Da <address@hidden>
-
-       * README: Update.
-
-       * filter.c (proxy_info): Removed.
-       (proxy_pfinetpi_ht): Removed.
-       (proxy_devicepi_ht): Removed.
-       (create_proxy): Removed.
-       (destroy_proxy): Removed.
-       (proxy_device): New structure.
-       (proxy_user): New structure.
-       (proxy): New structure.
-       (create_proxy_user): New function.
-       (create_proxy_device): New function.
-       (clean_proxy_user): New function.
-       (clean_proxy_device): New function.
-       (ethernet_demuxer): Get the data from proxy object instead of from
-       proxy_info.
-       (do_mach_notify_dead_name): Likewise.
-       (ds_device_write): Likewise.
-       (ds_device_write_inband): Likewise.
-       (ds_device_read): Likewise.
-       (ds_device_read_inband): Likewise.
-       (ds_device_map): Likewise.
-       (ds_device_set_status): Likewise.
-       (ds_device_get_status): Likewise.
-       (ds_device_set_filter): Likewise. Create the proxy_device object.
-       (do_mach_notify_no_senders): Use ports_do_mach_notify_no_senders().
-       (ds_device_open): Create proxy_user and proxy objects.
-       (main): Add the cleaning routine when creating the port class.
-
-2008-08-20 Zheng Da <address@hidden>
-
-       * README: Update.
-
-       * filter.c (options): Update.
-
-2008-08-20 Zheng Da <address@hidden>
-
-       * filter.c (destroy_proxy): Test p_deliverport_hashloc before removing
-       it from proxy_deliverport_ht, and reverse the order of calling
-       ports_destroy_right and ports_port_deref.
-       (ds_device_open): Test device_file and replace "eth" with the variable
-       name.
-
-2008-08-20 Zheng Da <address@hidden>
-
-       * filter.c (device_file): Change the name of a variable.
-       (ds_device_open): Use device_file directly.
-
-2008-08-19 Zheng Da <address@hidden>
-
-       * filter.c (ds_device_open): Generate the device file name, and use it
-       to open the device.
-
-2008-08-18 Zheng Da <address@hidden>
-
-       * README: New file.
-
-
-2008-08-17 Zheng Da <address@hidden>
-
-       * filter.c (device_name): Remove its default value.
-       (options): Remove the option '-M'.
-       (create_proxy): Get the port directly from port_right field in 
port_info.
-       (ds_device_open): Remove the code of checking the device name, 
-       and open the device from the device file.
-       (parse_opt): Remove the code of handling the option '-M'.
-       (main): Remove the code of getting the master device port.
-       
-
-2008-08-14 Zheng Da <address@hidden>
-
-       * filter.c (pfinet_portclass, device_portclass, other_portclass): 
-       New variables.
-       (create_proxy): Use pfinet_portclass and device_portclass to create the
-       port.
-       (destroy_proxy): Dereference the port before destroying it.
-       (trivfs_goaway): Test the number of ports in pfinet_portclass and 
destroy
-       the master_device.
-       (main): Create pfinet_portclass, device_portclass, other_portclass.
-       (print_msg): Deleted.
-       (deliver_msg): Remove debuging print.
-
-       * ChangeLog: New file.
-       
-
-2008-08-13 Zheng Da <address@hidden>
-
-       * bpf_impl.c: New file.
-
-       * Makefile: New file.
-
-       * queue.c: New file.
-
-       * util.h: New file.
-
-       * bpf_impl.h: New file.
-
-       * filter.c: New file.
-
-       * pcap_filter.c: New file.
-
-       * queue.h: New file.
-
diff --git a/eth-filter.multi-thread/Makefile b/eth-filter.multi-thread/Makefile
deleted file mode 100644
index 216664f..0000000
--- a/eth-filter.multi-thread/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 2008 Free Software Foundation, 
Inc.
-# This file is part of the GNU Hurd.
-#
-# The GNU Hurd 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, or (at your option)
-# any later version.
-#
-# The GNU Hurd is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with the GNU Hurd; see the file COPYING.  If not, write to
-# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-
-dir := eth-filter
-makemode := server
-
-SRCS = bpf_impl.c filter.c queue.c pcap_filter.c msg_queue.c
-LCLHDRS = bpf_impl.h queue.h util.h filter.h msg_queue.h
-DIST_FILES = ourdevice.defs notify.defs device_reply.defs
-HURDLIBS = ports trivfs fshelp ihash shouldbeinlibc
-OTHERLIBS = -lpthread
-target = eth-filter
-MIGSTUBS = ourdeviceServer.o notifyServer.o device_replyUser.o
-OBJS = $(SRCS:.c=.o) $(MIGSTUBS)
-
-include ../Makeconf
-
-CFLAGS += -I../pfinet/linux-src/include -I../pfinet/glue-include
-LDFLAGS += -lpcap
-
-ourdevice.defs: device.defs
-       $(CPP) $(CPPFLAGS) -x c $< | sed -e '/out[      ]*device[       ]*:[    
]*device_t/s/device_t/mach_port_send_t/' > $@
diff --git a/eth-filter.multi-thread/README b/eth-filter.multi-thread/README
deleted file mode 100644
index 2ef16ed..0000000
--- a/eth-filter.multi-thread/README
+++ /dev/null
@@ -1,39 +0,0 @@
-[Introduce]
-
-eth-filter is a filter translator that runs on the network device. The goal of 
eth-filter is to allow the user to setup the policy to control the traffic to 
the network. For example, it can block the invalid packet or the packet with 
the wrong destination address. It can work with eth-multiplexer to control and 
reduce the traffic between eth-multiplexer and pfinet, and can also work alone, 
running directly on the real network device.
-
-
-[Usage]
-
-Usage: eth-filter [OPTION...]
-Hurd filter translator.
-
-  -i, --interface=DEVICE     Network interface to use
-  -s, --send-filter=string   The filter rule which applies to the outgoing
-                             packet
-  -r, --receive-filter=string   The filter rule which applies to the ingoing
-                             packet
-  -S, --send-ip-range=IP range   A range of IP to create the send filter
-  -R, --receive-ip-range=IP range
-                             A range of IP to create the receive filter
-  -?, --help                 Give this help list
-      --usage                Give a short usage message
-  -V, --version              Print program version
-
-Mandatory or optional arguments to long options are also mandatory or optional
-for any corresponding short options.
-
-
-The '-i' option specifies the network interface the translator sits on. 
eth-filter can only connect to one network interface and the '-i' option should 
be only used once. DEVICE is a device file created by devnode translator.
-The '-s' and '-r' options give the user a full control to specify the filter 
rules which applies to the outgoing packet and the incoming packet, 
respectively. The expression of the rule is the same as the one in TCPDUMP. 
-The '-S' and '-R' options specify a range of IP that the user wants to filter. 
They are used to create the sending filter and the receiving filter, 
respectively. The generated rule is "arp or (ip and src net addr/prefixlen)" or 
"arp or (ip and dst net addr/prefixlen)". If prefixlen is 32, it can be 
omitted. 
-NOTE: '-s' and '-S' cannot be used together. One will replace the other if 
they are both used. So are '-r' and '-R' options.
-An example: settrans -acfg /servers/feth0 /hurd/eth-filter -i /dev/eth0 -S 
192.168.8.0/24 -R 192.168.8.0/24
-
-[Internal]
-
-eth-filter works as a proxy, forwarding the packet between the user program 
and the network interface. In order to forward packets, eth-filter runs as a 
client to the network device. It opens the device and writes the packet to the 
network device as pfinet does. It calls device_set_filter() to set the filter 
rule and give its own port to the device so it can receive packets from the 
device. The rule passed to the network device is from the user program that 
connects to eth-filter.
-eth-filter works as a RPC server to communicate with the user program and 
implements the server side functions in device.defs. It gets the packet in the 
server side function ds_device_write and gets the port to deliver packets to 
the user program in ds_device_set_filter. 
-Three structures are used for one pair of the user program and the device: 
proxy_user, proxy_device, proxy. When the ds_device_open() is called, a 
proxy_user and proxy objectis created. A proxy_device object is created when 
the ds_device_set_filter() is called. The proxy_user and proxy_device extend 
port_info structure. When a packet is received from the user program or from 
the device, we have to retrieve the proxy object to get the corresponding 
information. This process is very similar as pflocal. When a user program 
exits, we need to destroy its proxy_user object and proxy object, and 
meanwhile, the proxy_device object related to the proxy object is also 
destroyed. 
-Two filters exist in eth-filter, one for outgoing packets and the other for 
incoming packets. These are BPF filters, which are ported from GNU Mach. These 
BPF filters only decide whether the packet should be forwarded, and they cannot 
decide the destination of the packet. The BPF instructions are generated by 
libpcap from the filter rules given by '-s' and '-r' or '-S' and '-R' options.
-
diff --git a/eth-filter.multi-thread/bpf_impl.c 
b/eth-filter.multi-thread/bpf_impl.c
deleted file mode 100644
index e9202a5..0000000
--- a/eth-filter.multi-thread/bpf_impl.c
+++ /dev/null
@@ -1,872 +0,0 @@
- /* 
-  * Mach Operating System
-  * Copyright (c) 1993-1989 Carnegie Mellon University
-  * All Rights Reserved.
-  * 
-  * Permission to use, copy, modify and distribute this software and its
-  * documentation is hereby granted, provided that both the copyright
-  * notice and this permission notice appear in all copies of the
-  * software, derivative works or modified versions, and any portions
-  * thereof, and that both notices appear in supporting documentation.
-  * 
-  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
-  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-  * 
-  * Carnegie Mellon requests users of this software to return to
-  * 
-  *  Software Distribution Coordinator  or  address@hidden
-  *  School of Computer Science
-  *  Carnegie Mellon University
-  *  Pittsburgh PA 15213-3890
-  * 
-  * any improvements or extensions that they make and grant Carnegie Mellon
-  * the rights to redistribute these changes.
-  */
-/*
- *     Author: David B. Golub, Carnegie Mellon University
- *     Date:   3/98
- *
- *     Network IO.
- *
- *     Packet filter code taken from vaxif/enet.c written               
- *             CMU and Stanford. 
- */
-
-/* the code copied from device/net_io.c in Mach */
-
-#include <arpa/inet.h>
-#include <string.h>
-
-#include <mach.h>
-#include <hurd.h>
-
-#include "bpf_impl.h"
-#include "queue.h"
-#include "util.h"
-
-queue_head_t rcv_port_list;    /* input filter list */
-queue_head_t snd_port_list;    /* output filter list */
-
-/*
- * Execute the filter program starting at pc on the packet p
- * wirelen is the length of the original packet
- * buflen is the amount of data present
- *
- * @p: packet data.
- * @wirelen: data_count (in bytes)
- * @hlen: header len (in bytes)
- */
-
-int
-mach_bpf_do_filter(net_rcv_port_t infp, char *p,       unsigned int wirelen, 
-               char *header, unsigned int hlen, net_hash_entry_t **hash_headpp,
-               net_hash_entry_t *entpp)
-{
-       register bpf_insn_t pc, pc_end;
-       register unsigned int buflen;
-
-       register unsigned long A, X;
-       register int k;
-       unsigned int mem[BPF_MEMWORDS];
-
-       /* Generic pointer to either HEADER or P according to the specified 
offset. */
-       char *data = NULL;
-
-       pc = ((bpf_insn_t) infp->filter) + 1;
-       /* filter[0].code is (NETF_BPF | flags) */
-       pc_end = (bpf_insn_t)infp->filter_end;
-       buflen = NET_RCV_MAX;
-       *entpp = 0;                     /* default */
-
-       A = 0;
-       X = 0;
-       for (; pc < pc_end; ++pc) {
-               switch (pc->code) {
-
-                       default:
-                               abort();
-                       case BPF_RET|BPF_K:
-                               if (infp->rcv_port == MACH_PORT_NULL &&
-                                               *entpp == 0) {
-                                       return 0;
-                               }
-                               return ((u_int)pc->k <= wirelen) ?
-                                       pc->k : wirelen;
-
-                       case BPF_RET|BPF_A:
-                               if (infp->rcv_port == MACH_PORT_NULL &&
-                                               *entpp == 0) {
-                                       return 0;
-                               }
-                               return ((u_int)A <= wirelen) ?
-                                       A : wirelen;
-
-                       case BPF_RET|BPF_MATCH_IMM:
-                               if (mach_bpf_match ((net_hash_header_t)infp, 
pc->jt, mem,
-                                                       hash_headpp, entpp)) {
-                                       return ((u_int)pc->k <= wirelen) ?
-                                               pc->k : wirelen;
-                               }
-                               return 0;
-
-                       case BPF_LD|BPF_W|BPF_ABS:
-                               k = pc->k;
-
-load_word:
-                               if ((u_int)k + sizeof(long) <= hlen)
-                                       data = header;
-                               else if ((u_int)k + sizeof(long) <= buflen) {
-                                       k -= hlen;
-                                       data = p;
-                               } else
-                                       return 0;
-
-#ifdef BPF_ALIGN
-                               if (((int)(data + k) & 3) != 0)
-                                       A = EXTRACT_LONG(&data[k]);
-                               else
-#endif
-                                       A = ntohl(*(long *)(data + k));
-                               continue;
-
-                       case BPF_LD|BPF_H|BPF_ABS:
-                               k = pc->k;
-
-load_half:
-                               if ((u_int)k + sizeof(short) <= hlen)
-                                       data = header;
-                               else if ((u_int)k + sizeof(short) <= buflen) {
-                                       k -= hlen;
-                                       data = p;
-                               } else
-                                       return 0;
-
-                               A = EXTRACT_SHORT(&data[k]);
-                               continue;
-
-                       case BPF_LD|BPF_B|BPF_ABS:
-                               k = pc->k;
-
-load_byte:
-                               if ((u_int)k < hlen)
-                                       data = header;
-                               else if ((u_int)k < buflen) {
-                                       data = p;
-                                       k -= hlen;
-                               } else
-                                       return 0;
-
-                               A = data[k];
-                               continue;
-
-                       case BPF_LD|BPF_W|BPF_LEN:
-                               A = wirelen;
-                               continue;
-
-                       case BPF_LDX|BPF_W|BPF_LEN:
-                               X = wirelen;
-                               continue;
-
-                       case BPF_LD|BPF_W|BPF_IND:
-                               k = X + pc->k;
-                               goto load_word;
-
-                       case BPF_LD|BPF_H|BPF_IND:
-                               k = X + pc->k;
-                               goto load_half;
-
-                       case BPF_LD|BPF_B|BPF_IND:
-                               k = X + pc->k;
-                               goto load_byte;
-
-                       case BPF_LDX|BPF_MSH|BPF_B:
-                               k = pc->k;
-                               if (k < hlen)
-                                       data = header;
-                               else if (k < buflen) {
-                                       data = p;
-                                       k -= hlen;
-                               } else
-                                       return 0;
-
-                               X = (data[k] & 0xf) << 2;
-                               continue;
-
-                       case BPF_LD|BPF_IMM:
-                               A = pc->k;
-                               continue;
-
-                       case BPF_LDX|BPF_IMM:
-                               X = pc->k;
-                               continue;
-
-                       case BPF_LD|BPF_MEM:
-                               A = mem[pc->k];
-                               continue;
-
-                       case BPF_LDX|BPF_MEM:
-                               X = mem[pc->k];
-                               continue;
-
-                       case BPF_ST:
-                               mem[pc->k] = A;
-                               continue;
-
-                       case BPF_STX:
-                               mem[pc->k] = X;
-                               continue;
-
-                       case BPF_JMP|BPF_JA:
-                               pc += pc->k;
-                               continue;
-
-                       case BPF_JMP|BPF_JGT|BPF_K:
-                               pc += (A > pc->k) ? pc->jt : pc->jf;
-                               continue;
-
-                       case BPF_JMP|BPF_JGE|BPF_K:
-                               pc += (A >= pc->k) ? pc->jt : pc->jf;
-                               continue;
-
-                       case BPF_JMP|BPF_JEQ|BPF_K:
-                               pc += (A == pc->k) ? pc->jt : pc->jf;
-                               continue;
-
-                       case BPF_JMP|BPF_JSET|BPF_K:
-                               pc += (A & pc->k) ? pc->jt : pc->jf;
-                               continue;
-
-                       case BPF_JMP|BPF_JGT|BPF_X:
-                               pc += (A > X) ? pc->jt : pc->jf;
-                               continue;
-
-                       case BPF_JMP|BPF_JGE|BPF_X:
-                               pc += (A >= X) ? pc->jt : pc->jf;
-                               continue;
-
-                       case BPF_JMP|BPF_JEQ|BPF_X:
-                               pc += (A == X) ? pc->jt : pc->jf;
-                               continue;
-
-                       case BPF_JMP|BPF_JSET|BPF_X:
-                               pc += (A & X) ? pc->jt : pc->jf;
-                               continue;
-
-                       case BPF_ALU|BPF_ADD|BPF_X:
-                               A += X;
-                               continue;
-
-                       case BPF_ALU|BPF_SUB|BPF_X:
-                               A -= X;
-                               continue;
-
-                       case BPF_ALU|BPF_MUL|BPF_X:
-                               A *= X;
-                               continue;
-
-                       case BPF_ALU|BPF_DIV|BPF_X:
-                               if (X == 0)
-                                       return 0;
-                               A /= X;
-                               continue;
-
-                       case BPF_ALU|BPF_AND|BPF_X:
-                               A &= X;
-                               continue;
-
-                       case BPF_ALU|BPF_OR|BPF_X:
-                               A |= X;
-                               continue;
-
-                       case BPF_ALU|BPF_LSH|BPF_X:
-                               A <<= X;
-                               continue;
-
-                       case BPF_ALU|BPF_RSH|BPF_X:
-                               A >>= X;
-                               continue;
-
-                       case BPF_ALU|BPF_ADD|BPF_K:
-                               A += pc->k;
-                               continue;
-
-                       case BPF_ALU|BPF_SUB|BPF_K:
-                               A -= pc->k;
-                               continue;
-
-                       case BPF_ALU|BPF_MUL|BPF_K:
-                               A *= pc->k;
-                               continue;
-
-                       case BPF_ALU|BPF_DIV|BPF_K:
-                               A /= pc->k;
-                               continue;
-
-                       case BPF_ALU|BPF_AND|BPF_K:
-                               A &= pc->k;
-                               continue;
-
-                       case BPF_ALU|BPF_OR|BPF_K:
-                               A |= pc->k;
-                               continue;
-
-                       case BPF_ALU|BPF_LSH|BPF_K:
-                               A <<= pc->k;
-                               continue;
-
-                       case BPF_ALU|BPF_RSH|BPF_K:
-                               A >>= pc->k;
-                               continue;
-
-                       case BPF_ALU|BPF_NEG:
-                               A = -A;
-                               continue;
-
-                       case BPF_MISC|BPF_TAX:
-                               X = A;
-                               continue;
-
-                       case BPF_MISC|BPF_TXA:
-                               A = X;
-                               continue;
-               }
-       }
-
-       return 0;
-}
-
-/*
- * Return 1 if the 'f' is a valid filter program without a MATCH
- * instruction. Return 2 if it is a valid filter program with a MATCH
- * instruction. Otherwise, return 0.
- * The constraints are that each jump be forward and to a valid
- * code.  The code must terminate with either an accept or reject. 
- * 'valid' is an array for use by the routine (it must be at least
- * 'len' bytes long).  
- *
- * The kernel needs to be able to verify an application's filter code.
- * Otherwise, a bogus program could easily crash the system.
- */
-int
-mach_bpf_validate(bpf_insn_t f, int bytes, bpf_insn_t *match)
-{
-       register int i, j, len;
-       register bpf_insn_t p;
-
-       len = BPF_BYTES2LEN(bytes);
-
-       /*
-        * f[0].code is already checked to be (NETF_BPF | flags).
-        * So skip f[0].
-        */
-
-       for (i = 1; i < len; ++i) {
-               /*
-                * Check that that jumps are forward, and within 
-                * the code block.
-                */
-               p = &f[i];
-               if (BPF_CLASS(p->code) == BPF_JMP) {
-                       register int from = i + 1;
-
-                       if (BPF_OP(p->code) == BPF_JA) {
-                               if (from + p->k >= len)
-                                       return 0;
-                       }
-                       else if (from + p->jt >= len || from + p->jf >= len)
-                               return 0;
-               }
-               /*
-                * Check that memory operations use valid addresses.
-                */
-               if ((BPF_CLASS(p->code) == BPF_ST ||
-                                       (BPF_CLASS(p->code) == BPF_LD && 
-                                        (p->code & 0xe0) == BPF_MEM)) &&
-                               (p->k >= BPF_MEMWORDS || p->k < 0)) {
-                       return 0;
-               }
-               /*
-                * Check for constant division by 0.
-                */
-               if (p->code == (BPF_ALU|BPF_DIV|BPF_K) && p->k == 0) {
-                       return 0;
-               }
-               /*
-                * Check for match instruction.
-                * Only one match instruction per filter is allowed.
-                */
-               if (p->code == (BPF_RET|BPF_MATCH_IMM)) {
-                       if (*match != 0 ||
-                                       p->jt == 0 ||
-                                       p->jt > N_NET_HASH_KEYS)
-                               return 0;
-                       i += p->jt;             /* skip keys */
-                       if (i + 1 > len)
-                               return 0;
-
-                       for (j = 1; j <= p->jt; j++) {
-                               if (p[j].code != (BPF_MISC|BPF_KEY))
-                                       return 0;
-                       }
-
-                       *match = p;
-               }
-       }
-       if (BPF_CLASS(f[len - 1].code) == BPF_RET)
-               return ((*match == 0) ? 1 : 2);
-       else
-               return 0;
-}
-
-int
-mach_bpf_eq (bpf_insn_t f1, bpf_insn_t f2, int bytes)
-{
-       register int count;
-
-       count = BPF_BYTES2LEN(bytes);
-       for (; count--; f1++, f2++) {
-               if (!BPF_INSN_EQ(f1, f2)) {
-                       if ( f1->code == (BPF_MISC|BPF_KEY) &&
-                                       f2->code == (BPF_MISC|BPF_KEY) )
-                               continue;
-                       return FALSE;
-               }
-       };
-       return TRUE;
-}
-
-unsigned int
-mach_bpf_hash (int n, unsigned int *keys)
-{
-       register unsigned int hval = 0;
-
-       while (n--) {
-               hval += *keys++;
-       }
-       return (hval % NET_HASH_SIZE);
-}
-
-
-int
-mach_bpf_match (net_hash_header_t hash, int n_keys, unsigned int *keys,
-       net_hash_entry_t **hash_headpp, net_hash_entry_t *entpp)
-{
-       register net_hash_entry_t head, entp;
-       register int i;
-
-       if (n_keys != hash->n_keys)
-               return FALSE;
-
-       *hash_headpp = &hash->table[mach_bpf_hash(n_keys, keys)];
-       head = **hash_headpp;
-
-       if (head == 0)
-               return FALSE;
-
-       HASH_ITERATE (head, entp)
-       {
-               for (i = 0; i < n_keys; i++) {
-                       if (keys[i] != entp->keys[i])
-                               break;
-               }
-               if (i == n_keys) {
-                       *entpp = entp;
-                       return TRUE;
-               }
-       }
-       HASH_ITERATE_END (head, entp)
-               return FALSE;
-}
-
-/*
- * Removes a hash entry (ENTP) from its queue (HEAD).
- * If the reference count of filter (HP) becomes zero and not USED,
- * HP is removed from the corresponding port lists and is freed.
- */
-
-int
-hash_ent_remove (net_hash_header_t hp, int used,
-               net_hash_entry_t *head, net_hash_entry_t entp, queue_entry_t 
*dead_p)
-{
-       hp->ref_count--;
-
-       if (*head == entp) {
-               if (queue_empty((queue_t) entp)) {
-                       *head = 0;
-                       ENQUEUE_DEAD(*dead_p, entp, chain);
-                       if (hp->ref_count == 0 && !used) {
-                               if (((net_rcv_port_t)hp)->filter[0] & NETF_IN)
-                                       queue_remove(&rcv_port_list,
-                                                       (net_rcv_port_t)hp,
-                                                       net_rcv_port_t, chain);
-                               if (((net_rcv_port_t)hp)->filter[0] & NETF_OUT)
-                                       queue_remove(&snd_port_list,
-                                                       (net_rcv_port_t)hp,
-                                                       net_rcv_port_t, chain);
-                               hp->n_keys = 0;
-                               return TRUE;
-                       }
-                       return FALSE;
-               } else {
-                       *head = (net_hash_entry_t)queue_next((queue_t) entp);
-               }
-       }
-
-       remqueue((queue_t)*head, (queue_entry_t)entp);
-       ENQUEUE_DEAD(*dead_p, entp, chain);
-       return FALSE;
-}
-
-/*
- * net_free_dead_infp (dead_infp)
- *     queue_entry_t dead_infp;        list of dead net_rcv_port_t.
- *
- * Deallocates dead net_rcv_port_t.
- * No locks should be held when called.
- */
-void
-net_free_dead_infp (queue_entry_t dead_infp)
-{
-       register net_rcv_port_t infp, nextfp;
-
-       for (infp = (net_rcv_port_t) dead_infp; infp != 0; infp = nextfp) {
-               nextfp = (net_rcv_port_t) queue_next(&infp->chain);
-               mach_port_deallocate(mach_task_self(), infp->rcv_port);
-               free(infp);
-               debug ("a dead infp is freed\n");
-       }           
-}
-
-/*
- * net_free_dead_entp (dead_entp)
- *     queue_entry_t dead_entp;        list of dead net_hash_entry_t.
- *
- * Deallocates dead net_hash_entry_t.
- * No locks should be held when called.
- */
-void
-net_free_dead_entp (queue_entry_t dead_entp)
-{
-       register net_hash_entry_t entp, nextentp;
-
-       for (entp = (net_hash_entry_t)dead_entp; entp != 0; entp = nextentp) {
-               nextentp = (net_hash_entry_t) queue_next(&entp->chain);
-
-               mach_port_deallocate(mach_task_self(), entp->rcv_port);
-               free(entp);
-               debug ("a dead entp is freed\n");
-       }
-}
-
-/*
- * Set a filter for a network interface.
- *
- * We are given a naked send right for the rcv_port.
- * If we are successful, we must consume that right.
- */
-error_t
-net_set_filter (mach_port_t rcv_port, int priority,
-               filter_t *filter, unsigned int filter_count)
-{
-       int               filter_bytes;
-       bpf_insn_t            match;
-       register net_rcv_port_t   infp, my_infp;
-       net_rcv_port_t        nextfp;
-       net_hash_header_t     hhp;
-       register net_hash_entry_t entp, hash_entp=NULL;
-       net_hash_entry_t      *head, nextentp;
-       queue_entry_t     dead_infp, dead_entp;
-       int               i;
-       int               ret, is_new_infp;
-       io_return_t           rval;
-       boolean_t         in, out;
-
-       /* Check the filter syntax. */
-
-       debug ("filter_count: %d, filter[0]: %d\n", filter_count, filter[0]);
-
-       filter_bytes = CSPF_BYTES (filter_count);
-       match = (bpf_insn_t) 0;
-
-       if (filter_count == 0) {
-               return (D_INVALID_OPERATION);
-       } else if (!((filter[0] & NETF_IN) || (filter[0] & NETF_OUT))) {
-               return (D_INVALID_OPERATION); /* NETF_IN or NETF_OUT required */
-       } else if ((filter[0] & NETF_TYPE_MASK) == NETF_BPF) {
-               ret = mach_bpf_validate((bpf_insn_t)filter, filter_bytes, 
&match);
-               if (!ret)
-                       return (D_INVALID_OPERATION);
-       } else {
-               return (D_INVALID_OPERATION);
-       }
-       debug ("net_set_filter: check over\n");
-
-       rval = D_SUCCESS;         /* default return value */
-       dead_infp = dead_entp = 0;
-
-       if (match == (bpf_insn_t) 0) {
-               /*
-                * If there is no match instruction, we allocate
-                * a normal packet filter structure.
-                */
-               my_infp = (net_rcv_port_t) calloc(1, sizeof(struct 
net_rcv_port));
-               my_infp->rcv_port = rcv_port;
-               is_new_infp = TRUE;
-       } else {
-               /*
-                * If there is a match instruction, we assume there will be
-                * multiple sessions with a common substructure and allocate
-                * a hash table to deal with them.
-                */
-               my_infp = 0;
-               hash_entp = (net_hash_entry_t) calloc(1, sizeof(struct 
net_hash_entry));
-               is_new_infp = FALSE;
-       }
-
-       /*
-        * Look for an existing filter on the same reply port.
-        * Look for filters with dead ports (for GC).
-        * Look for a filter with the same code except KEY insns.
-        */
-       void check_filter_list(queue_head_t *if_port_list)
-       {
-               FILTER_ITERATE(if_port_list, infp, nextfp, &infp->chain) {
-                       if (infp->rcv_port == MACH_PORT_NULL) {
-                               if (match != 0
-                                               && infp->priority == priority
-                                               && my_infp == 0
-                                               && (infp->filter_end - 
infp->filter) == filter_count
-                                               && 
mach_bpf_eq((bpf_insn_t)infp->filter,
-                                                       (bpf_insn_t)filter, 
filter_bytes)) {
-                                       my_infp = infp;
-                               }
-
-                               for (i = 0; i < NET_HASH_SIZE; i++) {
-                                       head = &((net_hash_header_t) 
infp)->table[i];
-                                       if (*head == 0)
-                                               continue;
-
-                                       /*
-                                        * Check each hash entry to make sure 
the
-                                        * destination port is still valid.  
Remove
-                                        * any invalid entries.
-                                        */
-                                       entp = *head;
-                                       do {
-                                               nextentp = (net_hash_entry_t) 
entp->he_next;
-
-                                               /* checked without 
-                                                  ip_lock(entp->rcv_port) */
-                                               if (entp->rcv_port == rcv_port) 
{
-                                                       ret = hash_ent_remove 
((net_hash_header_t)infp,
-                                                                       
(my_infp == infp),
-                                                                       head,
-                                                                       entp,
-                                                                       
&dead_entp);
-                                                       if (ret)
-                                                               goto 
hash_loop_end;
-                                               }
-
-                                               entp = nextentp;
-                                               /* While test checks head since 
hash_ent_remove
-                                                * might modify it.
-                                                */
-                                       } while (*head != 0 && entp != *head);
-                               }
-
-hash_loop_end:
-                               ;
-                       } else if (infp->rcv_port == rcv_port) {
-                               /* Remove the old filter from lists */
-                               if (infp->filter[0] & NETF_IN)
-                                       queue_remove(&rcv_port_list, infp,
-                                                       net_rcv_port_t, chain);
-                               if (infp->filter[0] & NETF_OUT)
-                                       queue_remove(&snd_port_list, infp,
-                                                       net_rcv_port_t, chain);
-
-                               ENQUEUE_DEAD(dead_infp, infp, chain);
-                       }
-               }
-               FILTER_ITERATE_END
-       }
-
-       in = (filter[0] & NETF_IN) != 0;
-       out = (filter[0] & NETF_OUT) != 0;
-
-       if (in)
-               check_filter_list(&rcv_port_list);
-       if (out)
-               check_filter_list(&snd_port_list);
-
-       if (my_infp == 0) {
-               /* Allocate a dummy infp */
-               for (i = 0; i < N_NET_HASH; i++) {
-                       if (filter_hash_header[i].n_keys == 0)
-                               break;
-               }
-               if (i == N_NET_HASH) {
-
-                       mach_port_deallocate(mach_task_self() , rcv_port);
-                       if (match != 0)
-                               free(hash_entp);
-
-                       rval = D_NO_MEMORY;
-                       goto clean_and_return;
-               }
-
-               hhp = &filter_hash_header[i];
-               hhp->n_keys = match->jt;
-
-               hhp->ref_count = 0;
-               for (i = 0; i < NET_HASH_SIZE; i++)
-                       hhp->table[i] = 0;
-
-               my_infp = (net_rcv_port_t)hhp;
-               my_infp->rcv_port = MACH_PORT_NULL; /* indication of dummy */
-               is_new_infp = TRUE;
-       }
-
-       if (is_new_infp) {
-               my_infp->priority = priority;
-               my_infp->rcv_count = 0;
-
-               /* Copy filter program. */
-               memcpy (my_infp->filter, filter, filter_bytes);
-               my_infp->filter_end =
-                       (filter_t *)((char *)my_infp->filter + filter_bytes);
-
-               /* Insert my_infp according to priority */
-               if (in) {
-                       queue_iterate(&rcv_port_list, infp, net_rcv_port_t, 
chain)
-                               if (priority > infp->priority)
-                                       break;
-
-                       queue_enter(&rcv_port_list, my_infp, net_rcv_port_t, 
chain);
-               }
-
-               if (out) {
-                       queue_iterate(&snd_port_list, infp, net_rcv_port_t, 
chain)
-                               if (priority > infp->priority)
-                                       break;
-
-                       queue_enter(&snd_port_list, my_infp, net_rcv_port_t, 
chain);
-               }
-       }
-
-       if (match != 0) {
-               /* Insert to hash list */
-               net_hash_entry_t *p;
-
-               hash_entp->rcv_port = rcv_port;
-               for (i = 0; i < match->jt; i++)     /* match->jt is n_keys */
-                       hash_entp->keys[i] = match[i+1].k;
-               p = &((net_hash_header_t)my_infp)->
-                       table[mach_bpf_hash(match->jt, hash_entp->keys)];
-
-               /* Not checking for the same key values */
-               if (*p == 0) {
-                       queue_init ((queue_t) hash_entp);
-                       *p = hash_entp;
-               } else {
-                       enqueue_tail((queue_t)*p, (queue_entry_t)hash_entp);
-               }
-
-               ((net_hash_header_t)my_infp)->ref_count++;
-       }
-
-clean_and_return:
-       /* No locks are held at this point. */
-
-       if (dead_infp != 0)
-               net_free_dead_infp(dead_infp);
-       if (dead_entp != 0)
-               net_free_dead_entp(dead_entp);
-
-       return (rval);
-}
-
-/* Remove the filter in if_port_list whose port for delivering is dead_port. */
-void
-remove_dead_filter (queue_head_t *if_port_list, mach_port_t dead_port)
-{
-       net_rcv_port_t infp;
-       net_rcv_port_t nextfp;
-       net_hash_entry_t *head, nextentp;
-       queue_entry_t dead_infp, dead_entp;
-       net_hash_entry_t entp = NULL;
-       int i, ret;
-
-       dead_infp = dead_entp = 0;
-       FILTER_ITERATE (if_port_list, infp, nextfp, &infp->chain) {
-               if (infp->rcv_port == MACH_PORT_NULL) {
-                       for (i = 0; i < NET_HASH_SIZE; i++) {
-                               head = &((net_hash_header_t) infp)->table[i];
-                               if (*head == 0)
-                                       continue;
-
-                               /*
-                                * Check each hash entry to make sure the
-                                * destination port is still valid.  Remove
-                                * any invalid entries.
-                                */
-                               entp = *head;
-                               do {
-                                       nextentp = (net_hash_entry_t) 
entp->he_next;
-
-                                       /* checked without 
-                                          ip_lock(entp->rcv_port) */
-                                       if (entp->rcv_port == dead_port) {
-                                               ret = hash_ent_remove 
((net_hash_header_t) infp,
-                                                               0,
-                                                               head,
-                                                               entp,
-                                                               &dead_entp);
-                                               if (ret)
-                                                       goto hash_loop_end;
-                                       }
-
-                                       entp = nextentp;
-                                       /* While test checks head since 
hash_ent_remove
-                                        * might modify it.
-                                        */
-                               } while (*head != 0 && entp != *head);
-                       }
-
-hash_loop_end:
-                       ;
-               } else if (infp->rcv_port == dead_port) {
-                       /* Remove the old filter from lists */
-                       if (infp->filter[0] & NETF_IN)
-                               queue_remove(&rcv_port_list, infp,
-                                               net_rcv_port_t, chain);
-                       if (infp->filter[0] & NETF_OUT)
-                               queue_remove(&snd_port_list, infp,
-                                               net_rcv_port_t, chain);
-
-                       ENQUEUE_DEAD(dead_infp, infp, chain);
-               }
-       }
-       FILTER_ITERATE_END
-
-       if (dead_infp != 0)
-               net_free_dead_infp(dead_infp);
-       if (dead_entp != 0)
-               net_free_dead_entp(dead_entp);
-}
-
-/* Remove all filters whose port for delivering is dead_port. */
-void
-remove_dead_filter_from_all (mach_port_t dead_port)
-{
-       remove_dead_filter (&snd_port_list, dead_port);
-       remove_dead_filter (&rcv_port_list, dead_port);
-}
-
-void
-bpf_init()
-{
-       queue_init (&rcv_port_list);
-       queue_init (&snd_port_list);
-}
diff --git a/eth-filter.multi-thread/bpf_impl.h 
b/eth-filter.multi-thread/bpf_impl.h
deleted file mode 100644
index de61df1..0000000
--- a/eth-filter.multi-thread/bpf_impl.h
+++ /dev/null
@@ -1,158 +0,0 @@
- /* 
-  * Mach Operating System
-  * Copyright (c) 1993-1989 Carnegie Mellon University
-  * All Rights Reserved.
-  * 
-  * Permission to use, copy, modify and distribute this software and its
-  * documentation is hereby granted, provided that both the copyright
-  * notice and this permission notice appear in all copies of the
-  * software, derivative works or modified versions, and any portions
-  * thereof, and that both notices appear in supporting documentation.
-  * 
-  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
-  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
-  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-  * 
-  * Carnegie Mellon requests users of this software to return to
-  * 
-  *  Software Distribution Coordinator  or  address@hidden
-  *  School of Computer Science
-  *  Carnegie Mellon University
-  *  Pittsburgh PA 15213-3890
-  * 
-  * any improvements or extensions that they make and grant Carnegie Mellon
-  * the rights to redistribute these changes.
-  */
-/*
- *     Author: David B. Golub, Carnegie Mellon University
- *     Date:   3/98
- *
- *     Network IO.
- *
- *     Packet filter code taken from vaxif/enet.c written               
- *             CMU and Stanford. 
- */
-
-/* the code copied from device/net_io.c in Mach */
-
-#ifndef BPF_IMPL_H
-#define BPF_IMPL_H
-
-#include <mach.h>
-#include <hurd.h>
-#include <device/bpf.h>
-
-#include "queue.h"
-
-typedef        unsigned short  filter_t;
-typedef filter_t       *filter_array_t;
-
-#define        NET_MAX_FILTER          128 /* was 64, bpf programs are big */
-
-#define NET_HASH_SIZE   256
-#define N_NET_HASH      4
-#define N_NET_HASH_KEYS 4
-
-#ifndef BPF_ALIGN
-#define EXTRACT_SHORT(p)       ((u_short)ntohs(*(u_short *)p))
-#define EXTRACT_LONG(p)                (ntohl(*(u_long *)p))
-#else
-#define EXTRACT_SHORT(p)\
-       ((u_short)\
-        ((u_short)*((u_char *)p+0)<<8|\
-         (u_short)*((u_char *)p+1)<<0))
-#define EXTRACT_LONG(p)\
-       ((u_long)*((u_char *)p+0)<<24|\
-        (u_long)*((u_char *)p+1)<<16|\
-        (u_long)*((u_char *)p+2)<<8|\
-        (u_long)*((u_char *)p+3)<<0)
-#endif
-
-#define HASH_ITERATE(head, elt) (elt) = (net_hash_entry_t) (head); do {
-#define HASH_ITERATE_END(head, elt) \
-       (elt) = (net_hash_entry_t) queue_next((queue_entry_t) (elt));      \
-} while ((elt) != (head));
-
-#define FILTER_ITERATE(if_port_list, fp, nextfp, chain)        \
-       for ((fp) = (net_rcv_port_t) queue_first(if_port_list); \
-                       !queue_end(if_port_list, (queue_entry_t)(fp));  \
-                       (fp) = (nextfp)) {                                      
\
-               (nextfp) = (net_rcv_port_t) queue_next(chain);
-#define FILTER_ITERATE_END }
-
-/* entry_p must be net_rcv_port_t or net_hash_entry_t */
-#define ENQUEUE_DEAD(dead, entry_p, chain) {                   \
-       queue_next(&(entry_p)->chain) = (queue_entry_t) (dead); \
-       (dead) = (queue_entry_t)(entry_p);                      \
-}
-
-#define CSPF_BYTES(n) ((n) * sizeof (filter_t))
-
-/*
- * Receive port for net, with packet filter.
- * This data structure by itself represents a packet
- * filter for a single session.
- */
-struct net_rcv_port {
-       queue_chain_t   chain;
-       mach_port_t     rcv_port;       /* port to send packet to */
-       int             rcv_count;      /* number of packets received */
-       int             priority;       /* priority for filter */
-       filter_t        *filter_end;    /* pointer to end of filter */
-       filter_t        filter[NET_MAX_FILTER];
-       /* filter operations */
-};
-typedef struct net_rcv_port *net_rcv_port_t;
-
-/*
- * A single hash entry.
- */
-struct net_hash_entry {
-       queue_chain_t   chain;          /* list of entries with same hval */
-#define he_next chain.next
-#define he_prev chain.prev
-       mach_port_t      rcv_port;      /* destination port */
-       unsigned int    keys[N_NET_HASH_KEYS];
-};
-typedef struct net_hash_entry *net_hash_entry_t;
-
-/*
- * This structure represents a packet filter with multiple sessions.
- *
- * For example, all application level TCP sessions might be
- * represented by one of these structures.  It looks like a 
- * net_rcv_port struct so that both types can live on the
- * same packet filter queues.
- */
-struct net_hash_header {
-       struct net_rcv_port rcv;
-       int n_keys;                     /* zero if not used */
-       int ref_count;                  /* reference count */
-       net_hash_entry_t table[NET_HASH_SIZE];
-} filter_hash_header[N_NET_HASH];
-
-typedef struct net_hash_header *net_hash_header_t;
-
-int mach_bpf_do_filter(net_rcv_port_t infp, char *p,   unsigned int wirelen, 
-               char *header, unsigned int hlen, net_hash_entry_t **hash_headpp,
-               net_hash_entry_t *entpp);
-int mach_bpf_validate(bpf_insn_t f, int bytes, bpf_insn_t *match);
-int mach_bpf_eq (bpf_insn_t f1, bpf_insn_t f2, int bytes);
-unsigned int mach_bpf_hash (int n, unsigned int *keys);
-int mach_bpf_match (net_hash_header_t hash, int n_keys, unsigned int *keys,
-               net_hash_entry_t **hash_headpp, net_hash_entry_t *entpp);
-
-error_t net_set_filter(mach_port_t rcv_port, int priority,
-               filter_t *filter, unsigned int filter_count);
-int hash_ent_remove (net_hash_header_t hp, int used, net_hash_entry_t *head,
-               net_hash_entry_t entp, queue_entry_t *dead_p);
-void net_free_dead_infp (queue_entry_t dead_infp);
-void net_free_dead_entp (queue_entry_t dead_entp);
-void remove_dead_filter (queue_head_t *if_port_list, mach_port_t dead_port);
-void remove_dead_filter_from_all (mach_port_t dead_port);
-void bpf_init();
-
-extern queue_head_t rcv_port_list;     /* input filter list */
-extern queue_head_t snd_port_list;     /* output filter list */
-
-#endif /* _DEVICE_BPF_H_ */
diff --git a/eth-filter.multi-thread/filter.c b/eth-filter.multi-thread/filter.c
deleted file mode 100644
index ec3efe9..0000000
--- a/eth-filter.multi-thread/filter.c
+++ /dev/null
@@ -1,877 +0,0 @@
-/* 
-   Copyright (C) 2008 Free Software Foundation, Inc.
-   Written by Zheng Da.
-
-   This file is part of the GNU Hurd.
-
-   The GNU Hurd 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, or (at your option)
-   any later version.
-
-   The GNU Hurd is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the GNU Hurd; see the file COPYING.  If not, write to
-   the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
-
-/*
- * This program is a filter translator which sits on the top of the network
- * interface. 
- * It provides two filters: for outgoing packets and for incoming packets.
- * Only one pfinet server are allowed to run on the top of the translator. 
- */
-
-#include <argp.h>
-#include <errno.h>
-#include <error.h>
-#include <stddef.h>
-#include <unistd.h>
-
-#include <hurd.h>
-#include <mach.h>
-#include <pthread.h>
-#include <device/device.h>
-#include <hurd/trivfs.h>
-#include <hurd/ports.h>
-#include <hurd/ihash.h>
-
-#include "ourdevice_S.h"
-#include "notify_S.h"
-#include "device_reply_U.h"
-#include "bpf_impl.h"
-#include "util.h"
-#include "filter.h"
-#include "msg_queue.h"
-
-#ifdef DEBUG
-
-FILE *logfile;
-
-#endif 
-
-static struct hurd_ihash proxy_deliverport_ht
-= HURD_IHASH_INITIALIZER (offsetof (struct proxy, p_deliverport_hashloc));
-
-/* The name of the network interface that the filter translator sits on. */
-static char *device_file;
-const char *argp_program_version = "eth-filter 0.1";
-const char *argp_program_bug_address = "<address@hidden>";
-static const char doc[] = "Hurd filter translator.";
-static const struct argp_option options[] =
-{
-    {"interface", 'i', "DEVICE", 0,
-      "Network interface to use", 2},
-    {"send-filter", 's', "string", 0,
-      "The filter rule which applies to the outgoing packet", 4},
-    {"receive-filter", 'r', "string", 0,
-      "The filter rule which applies to the ingoing packet", 5},
-    {"send-ip-range", 'S', "IP range", 0,
-      "A range of IP to create the send filter", 6},
-    {"receive-ip-range", 'R', "IP range", 0,
-      "A range of IP to create the receive filter", 7},
-    {0}
-};
-
-/* A filter allows every packet to be sent and be received. */
-static struct bpf_insn default_snd_filter[] = 
-{
-    {NETF_OUT|NETF_BPF, 0, 0, 0},
-    {6, 0, 0, 1500}
-};
-static struct bpf_insn default_rcv_filter[] = 
-{
-    {NETF_IN|NETF_BPF, 0, 0, 0},
-    {6, 0, 0, 1500}
-};
-static struct bpf_insn *snd_filter = NULL;
-static int snd_filter_length;
-static struct bpf_insn *rcv_filter = NULL;
-static int rcv_filter_length;
-
-static pthread_t send_thread;
-static int send_thread_running = 1;
-
-/* Port bucket we service requests on.  */
-struct port_bucket *port_bucket;
-
-struct port_class *user_portclass;
-struct port_class *device_portclass;
-struct port_class *other_portclass;
-
-/* Trivfs hooks.  */
-int trivfs_fstype = FSTYPE_MISC;
-int trivfs_fsid = 0;
-int trivfs_support_read = 0;
-int trivfs_support_write = 0;
-int trivfs_support_exec = 0;
-int trivfs_allow_open = 0;
-
-struct port_class *trivfs_protid_portclasses[1];
-struct port_class *trivfs_cntl_portclasses[1];
-int trivfs_protid_nportclasses = 1;
-int trivfs_cntl_nportclasses = 1;
-
-/* For getting the notification of ports from the kernel. */
-struct port_info *notify_pi;
-
-/* Write the data from the client to the device. */
-int 
-filter_device_write (struct filter_msg *msg)
-{
-  error_t err = 0;
-  int ret_count = 0;
-  int has_filter = 0;
-  net_hash_entry_t entp, *hash_headp;
-  net_rcv_port_t infp, nextfp;
-  int bytes_written;
-  struct filter_write_msg *write_msg = (struct filter_write_msg *) msg;
-
-  /* The packet can be sent as long as it passes one filter,
-   * even thought there is usually only one filter in the list. */
-  FILTER_ITERATE (&snd_port_list, infp, nextfp, &infp->chain) 
-    {
-      has_filter = 1;
-      ret_count = mach_bpf_do_filter (infp,
-                                     write_msg->data + sizeof (struct ethhdr),
-                                     write_msg->datalen - sizeof (struct 
ethhdr),
-                                     write_msg->data, sizeof (struct ethhdr),
-                                     &hash_headp, &entp);
-      if (ret_count)
-       break;
-    }
-  FILTER_ITERATE_END
-
-  if (ret_count || !has_filter) 
-    err = device_write (msg->proxy->device_port, write_msg->mode,
-                       write_msg->recnum, write_msg->data,
-                       write_msg->datalen, &bytes_written);
-  ds_device_write_reply (write_msg->reply_port, write_msg->reply_type,
-                        err, bytes_written);
-  return 0;
-}
-
-/* Deliver the data from the device to the client. */
-int
-filter_deliver (struct filter_msg *msg)
-{
-  deliver_msg (((struct filter_deliver_msg *)msg)->net_msg,
-              &rcv_port_list, msg->proxy->deliver_port);
-  return 0;
-}
-
-error_t
-create_proxy_user (struct proxy *proxy, mach_port_t *port)
-{
-  error_t err;
-  struct proxy_user *user;
-
-  err = ports_create_port (user_portclass, port_bucket, sizeof (*user), &user);
-  if (err)
-      return err;
-  user->proxy = proxy;
-
-  *port = ports_get_right (user);
-  ports_port_deref (user);
-  return 0;
-}
-
-error_t 
-create_proxy_device (struct proxy *proxy, mach_port_t *port)
-{
-  error_t err;
-  struct proxy_device *device;
-
-  err = ports_create_port (device_portclass, port_bucket, sizeof (*device), 
&device);
-  if (err)
-      return err;
-  device->proxy = proxy;
-  proxy->device = device;
-
-  *port = ports_get_right (device);
-  ports_port_deref (device);
-  return 0;
-}
-
-void
-clean_proxy_user (void *p)
-{
-  struct proxy_user *user = p;
-  struct proxy *proxy = user->proxy;
-
-  if (proxy->p_deliverport_hashloc)
-    hurd_ihash_locp_remove (&proxy_deliverport_ht, 
proxy->p_deliverport_hashloc);
-
-  if (proxy->deliver_port != MACH_PORT_NULL)
-    mach_port_deallocate (mach_task_self (), proxy->deliver_port);
-  if (proxy->device_port != MACH_PORT_NULL)
-    mach_port_deallocate (mach_task_self (), proxy->device_port);
-
-  if (proxy->device)
-    ports_destroy_right (proxy->device);
-
-  free (proxy);
-}
-
-void
-clean_proxy_device (void *p)
-{
-  struct proxy_device *device = p;
-  if (device->proxy)
-    device->proxy->device = NULL;
-}
-
-static int
-filter_demuxer (mach_msg_header_t *inp,
-               mach_msg_header_t *outp)
-{
-  extern int device_server (mach_msg_header_t *, mach_msg_header_t *);
-  extern int notify_server (mach_msg_header_t *, mach_msg_header_t *);
-  extern int ethernet_demuxer (mach_msg_header_t *, mach_msg_header_t *);
-  return device_server (inp, outp) || notify_server (inp, outp)
-    || ethernet_demuxer (inp, outp) || trivfs_demuxer (inp, outp);
-}
-
-int
-ethernet_demuxer (mach_msg_header_t *inp,
-                 mach_msg_header_t *outp)
-{
-  struct net_rcv_msg *msg = (struct net_rcv_msg *) inp;
-  struct proxy_device *device;
-  struct proxy *proxy;
-
-  if (inp->msgh_id != NET_RCV_MSG_ID)
-    return 0;
-
-  device = ports_lookup_port (port_bucket, inp->msgh_local_port,
-                             device_portclass);
-  if (device == NULL)
-    return 0;
-
-  proxy = device->proxy;
-  ports_port_deref (device);
-
-  if (proxy && proxy->deliver_port != MACH_PORT_NULL)
-    queue_deliver (msg, proxy);
-//    deliver_msg (msg, &rcv_port_list, proxy->deliver_port);
-
-  return 1;
-}
-
-/* Implementation of notify interface */
-kern_return_t
-do_mach_notify_port_deleted (mach_port_t notify,
-                            mach_port_t name)
-{
-  return EOPNOTSUPP;
-}
-
-kern_return_t
-do_mach_notify_msg_accepted (mach_port_t notify,
-                            mach_port_t name)
-{
-  return EOPNOTSUPP;
-}
-
-kern_return_t
-do_mach_notify_port_destroyed (mach_port_t notify,
-                              mach_port_t port)
-{
-  return EOPNOTSUPP;
-}
-
-kern_return_t
-do_mach_notify_no_senders (mach_port_t notify,
-                          mach_port_mscount_t mscount)
-{
-  debug ("do_mach_notify_no_senders is called\n");
-  return ports_do_mach_notify_no_senders (notify, mscount);
-}
-
-kern_return_t
-do_mach_notify_send_once (mach_port_t notify)
-{
-  return EOPNOTSUPP;
-}
-
-kern_return_t
-do_mach_notify_dead_name (mach_port_t notify,
-                         mach_port_t name)
-{
-  struct proxy *proxy;
-
-  debug ("do_mach_notify_dead_name is called\n");
-  mach_port_deallocate (mach_task_self (), name);
-  proxy = hurd_ihash_find (&proxy_deliverport_ht, name);
-  if (proxy)
-    {
-      proxy->deliver_port = MACH_PORT_NULL;
-      return 0;
-    }
-  return EINVAL;
-}
-
-/* Implementation of device interface */
-kern_return_t 
-ds_xxx_device_set_status (device_t device, dev_flavor_t flavor,
-                         dev_status_t status, size_t statu_cnt)
-{
-  return D_INVALID_OPERATION;
-}
-
-kern_return_t
-ds_xxx_device_get_status (device_t device, dev_flavor_t flavor,
-                         dev_status_t status, size_t *statuscnt)
-{
-  return D_INVALID_OPERATION;
-}
-
-kern_return_t
-ds_xxx_device_set_filter (device_t device, mach_port_t rec,
-                         int pri, filter_array_t filt, size_t len)
-{
-  return D_INVALID_OPERATION;
-}
-
-kern_return_t
-ds_device_open (mach_port_t master_port, mach_port_t reply_port,
-               mach_msg_type_name_t reply_portPoly,
-               dev_mode_t mode, dev_name_t name, mach_port_t *device, 
-               mach_msg_type_name_t *devicetype)
-{
-  kern_return_t err;
-  mach_port_t master_device;
-  mach_port_t user_port;
-  struct proxy *proxy;
-
-  if (device_file == NULL)
-    return D_NO_SUCH_DEVICE;
-
-  master_device = file_name_lookup (device_file, 0, 0);
-  if (master_device == MACH_PORT_NULL)
-    return errno;
-
-  proxy = (struct proxy *)calloc (1, sizeof (*proxy));
-  if (proxy == NULL)
-    {
-      mach_port_deallocate (mach_task_self (), master_device);
-      return D_NO_MEMORY;
-    }
-
-  err = device_open (master_device, mode, name, &proxy->device_port);
-  mach_port_deallocate (mach_task_self (), master_device);
-  if (err != KERN_SUCCESS)
-    {
-      free (proxy);
-      return err;
-    }
-
-  err = create_proxy_user (proxy, &user_port);
-  if (err)
-    {
-      mach_port_deallocate (mach_task_self (), master_device);
-      free (proxy);
-      return err;
-    }
-
-  *device = user_port;
-  *devicetype = MACH_MSG_TYPE_MAKE_SEND;
-
-  return 0;
-}
-
-kern_return_t
-ds_device_close (device_t device)
-{
-  return 0;
-}
-
-kern_return_t
-ds_device_write (device_t device, mach_port_t reply_port,
-                mach_msg_type_name_t reply_type, dev_mode_t mode,
-                recnum_t recnum, io_buf_ptr_t data, size_t datalen,
-                int *bytes_written)
-{
-  kern_return_t err = 0;
-  struct proxy_user *user;
-  struct proxy *proxy;
-  int ret_count = 0;
-  int has_filter = 0;
-  net_hash_entry_t entp, *hash_headp;
-  net_rcv_port_t infp, nextfp;
-
-  user = ports_lookup_port (port_bucket, device, user_portclass);
-  if (user == NULL)
-    return D_INVALID_OPERATION;
-  proxy = user->proxy;
-
-  /* The packet can be sent as long as it passes one filter,
-   * even thought there is usually only one filter in the list. */
-  FILTER_ITERATE (&snd_port_list, infp, nextfp, &infp->chain) 
-    {
-      has_filter = 1;
-      ret_count = mach_bpf_do_filter (infp,
-                                     data + sizeof (struct ethhdr),
-                                     datalen - sizeof (struct ethhdr),
-                                     data, sizeof (struct ethhdr),
-                                     &hash_headp, &entp);
-      if (ret_count)
-       break;
-    }
-  FILTER_ITERATE_END
-
-  if (ret_count || !has_filter) 
-    err = device_write (proxy->device_port, mode, recnum, data,
-                       datalen, bytes_written);
-  ports_port_deref (user);
-  return err;
-}
-
-kern_return_t
-ds_device_write_inband (device_t device, mach_port_t reply_port,
-                       mach_msg_type_name_t reply_type, dev_mode_t mode,
-                       recnum_t recnum, io_buf_ptr_inband_t data,
-                       size_t datalen, int *bytes_written)
-{
-  kern_return_t ret;
-  struct proxy_user *user;
-  struct proxy *proxy;
-
-  user = ports_lookup_port (port_bucket, device, user_portclass);
-  if (user == NULL)
-    return D_INVALID_OPERATION;
-  proxy = user->proxy;
-  ports_port_deref (user);
-
-  ret = device_write_inband (proxy->device_port, mode, recnum, data,
-                            datalen, bytes_written);
-  return ret;
-}
-
-kern_return_t
-ds_device_read (device_t device, mach_port_t reply_port,
-               mach_msg_type_name_t reply_type, dev_mode_t mode,
-               recnum_t recnum, int bytes_wanted,
-               io_buf_ptr_t *data, size_t *datalen)
-{
-  kern_return_t ret;
-  struct proxy_user *user;
-  struct proxy *proxy;
-
-  user = ports_lookup_port (port_bucket, device, user_portclass);
-  if (user == NULL)
-    return D_INVALID_OPERATION;
-  proxy = user->proxy;
-  ports_port_deref (user);
-
-  ret = device_read (proxy->device_port, mode, recnum,
-                    bytes_wanted, data, datalen);
-  return ret;
-}
-
-kern_return_t
-ds_device_read_inband (device_t device, mach_port_t reply_port,
-                      mach_msg_type_name_t reply_type, dev_mode_t mode,
-                      recnum_t recnum, int bytes_wanted,
-                      io_buf_ptr_inband_t data, size_t *datalen)
-{
-  kern_return_t ret;
-  struct proxy_user *user;
-  struct proxy *proxy;
-
-  user = ports_lookup_port (port_bucket, device, user_portclass);
-  if (user == NULL)
-    return D_INVALID_OPERATION;
-  proxy = user->proxy;
-  ports_port_deref (user);
-
-  ret = device_read_inband (proxy->device_port, mode, recnum, 
-                           bytes_wanted, data, datalen);
-  return ret;
-}
-
-kern_return_t
-ds_device_map (device_t device, vm_prot_t prot, vm_offset_t offset,
-              vm_size_t size, memory_object_t *pager, int unmap)
-{
-  kern_return_t ret;
-  struct proxy_user *user;
-  struct proxy *proxy;
-
-  user = ports_lookup_port (port_bucket, device, user_portclass);
-  if (user == NULL)
-    return D_INVALID_OPERATION;
-  proxy = user->proxy;
-  ports_port_deref (user);
-
-  ret = device_map (proxy->device_port, prot, offset,
-                   size, pager, unmap);
-  return ret;
-}
-
-kern_return_t
-ds_device_set_status (device_t device, dev_flavor_t flavor,
-                     dev_status_t status, size_t statuslen)
-{
-  kern_return_t ret;
-  struct proxy_user *user;
-  struct proxy *proxy;
-
-  user = ports_lookup_port (port_bucket, device, user_portclass);
-  if (user == NULL)
-    return D_INVALID_OPERATION;
-  proxy = user->proxy;
-  ports_port_deref (user);
-
-  ret = device_set_status (proxy->device_port, flavor,
-                          status, statuslen);
-  return ret;
-}
-
-kern_return_t
-ds_device_get_status (device_t device, dev_flavor_t flavor,
-                     dev_status_t status, size_t *statuslen)
-{
-  kern_return_t ret;
-  struct proxy_user *user;
-  struct proxy *proxy;
-
-  user = ports_lookup_port (port_bucket, device, user_portclass);
-  if (user == NULL)
-    return D_INVALID_OPERATION;
-  proxy = user->proxy;
-  ports_port_deref (user);
-
-  ret = device_get_status (proxy->device_port, flavor, status, statuslen);
-  return ret;
-}
-
-kern_return_t
-ds_device_set_filter (device_t device, mach_port_t receive_port,
-                     int priority, filter_array_t filter, size_t filterlen)
-{
-  mach_port_t tmp;
-  kern_return_t err;
-  mach_port_t device_receive_port;
-  struct proxy_user *user;
-  struct proxy *proxy;
-
-  user = ports_lookup_port (port_bucket, device, user_portclass);
-  if (user == NULL)
-    return D_INVALID_OPERATION;
-  proxy = user->proxy;
-  ports_port_deref (user);
-
-  if (proxy->device == NULL)
-    {
-      error_t err;
-      err = create_proxy_device (proxy, &device_receive_port);
-      if (err)
-       return err;
-    }
-  else
-    device_receive_port = ports_get_right (proxy->device);
-
-  /* Set the filter from pfinet into the interface,
-   * but the packet will be delivered to the translator,
-   * so the translator has the chance to filter some packets. */
-  err = device_set_filter (proxy->device_port,
-                          device_receive_port,
-                          MACH_MSG_TYPE_MAKE_SEND, priority,
-                          filter, filterlen);
-  if (err)
-    return err;
-
-  proxy->deliver_port = receive_port;
-  hurd_ihash_add (&proxy_deliverport_ht, receive_port, proxy);
-
-  err = mach_port_request_notification (mach_task_self (), receive_port, 
-                                       MACH_NOTIFY_DEAD_NAME, 0,
-                                       ports_get_right (notify_pi), 
-                                       MACH_MSG_TYPE_MAKE_SEND_ONCE, &tmp);
-  if (tmp != MACH_PORT_NULL)
-    mach_port_deallocate (mach_task_self (), tmp);
-
-  return err;
-}
-
-void
-trivfs_modify_stat (struct trivfs_protid *cred, io_statbuf_t *stat)
-{
-}
-
-error_t
-trivfs_goaway (struct trivfs_control *fsys, int flags)
-{
-  int count;
-
-  /* Stop new requests.  */
-  ports_inhibit_class_rpcs (trivfs_cntl_portclasses[0]);
-  ports_inhibit_class_rpcs (trivfs_protid_portclasses[0]);
-
-  count = ports_count_class (user_portclass);
-  debug ("the number of ports alive: %d\n", count);
-
-  if (count && !(flags & FSYS_GOAWAY_FORCE)) 
-    {
-      /* We won't go away, so start things going again...  */
-      ports_enable_class (trivfs_protid_portclasses[0]);
-      ports_resume_class_rpcs (trivfs_cntl_portclasses[0]);
-      ports_resume_class_rpcs (trivfs_protid_portclasses[0]); 
-      return EBUSY;
-    } 
-
-  queue_flush ();
-  send_thread_running = 0;
-//  pthread_join (send_thread);
-
-#ifdef DEBUG
-  fclose (logfile);
-#endif
-  debug ("the translator is gone away\n");
-  exit (0);
-}
-
-/* Convert the network address input by the user into
- * a form that is accepted by libpcap. */
-int
-correct_net_addr (char *orig, char *result, int result_len)
-{
-  char *ptr;
-  int netmask_len;
-  int remain_bits;
-  int remain_bytes;
-  char netmask;
-  char addr[4];
-  char buf[INET_ADDRSTRLEN];
-  int i;
-
-  ptr = strstr (orig, "/");
-  if (ptr == NULL)
-    {
-      strncpy (result, orig, result_len);
-      return 0;
-    }
-
-  *ptr = 0;
-  ptr++;
-  netmask_len = atoi (ptr);
-  if (inet_pton (AF_INET, orig, addr) < 0)
-    {
-      perror ("inet_pton");
-      return -1;
-    }
-  remain_bits = netmask_len % 8;
-  netmask = ~0;
-  netmask >>= 8 - remain_bits;
-  netmask <<= 8 - remain_bits;
-  remain_bytes = netmask_len / 8;
-  addr[remain_bytes] &= netmask;
-  for (i=remain_bytes+1 ; i < 4 ; i++)
-    addr[i] = 0;
-
-  snprintf (result, result_len, "%s/%s",
-           inet_ntop (AF_INET, addr, buf, INET_ADDRSTRLEN), ptr);
-  return 0;
-}
-
-static error_t
-parse_opt (int opt, char *arg, struct argp_state *state)
-{
-  struct bpf_insn *trans_filter_program (char *str, int send,
-                                        int *filter_len);
-  char buf[1024];
-  char addr[INET_ADDRSTRLEN+4];
-
-  switch (opt)
-    {
-    case 'i':
-      device_file = arg;
-      break;
-    case 's':
-      if (snd_filter) 
-       free (snd_filter);
-      snd_filter = trans_filter_program (arg, 1, &snd_filter_length);
-      break;
-    case 'r':
-      if (rcv_filter)
-       free (rcv_filter);
-      rcv_filter = trans_filter_program (arg, 0, &rcv_filter_length);
-      break;
-    case 'S':
-      if (correct_net_addr (arg, addr, INET_ADDRSTRLEN+4) < 0)
-       return 0;
-      snprintf (buf, sizeof (buf), "arp or (ip and src net %s)", addr);
-      if (snd_filter) 
-       free (snd_filter);
-      snd_filter = trans_filter_program (buf, 1, &snd_filter_length);
-      break;
-    case 'R':
-      if (correct_net_addr (arg, addr, INET_ADDRSTRLEN+4) < 0)
-       return 0;
-      snprintf (buf, sizeof (buf), "arp or (ip and dst net %s)", addr);
-      if (rcv_filter) 
-       free (rcv_filter);
-      rcv_filter = trans_filter_program (buf, 0, &rcv_filter_length);
-      break;
-    case ARGP_KEY_ERROR:
-    case ARGP_KEY_SUCCESS:
-    case ARGP_KEY_INIT:
-      break;
-    default:
-      return ARGP_ERR_UNKNOWN;
-    }
-  return 0;
-}
-
-void *send_thread_func (void *arg)
-{
-  struct filter_msg *msg;
-  
-  while (send_thread_running)
-    {
-      msg = dequeue_msg ();
-      if (msg == NULL)
-       {
-//       queue_empty_wait ();
-         continue;
-       }
-      msg->forward (msg);
-      msg->destroy (msg);
-      free (msg);
-    }
-  return NULL;
-}
-
-int
-main (int argc, char *argv[])
-{
-  error_t err;
-  mach_port_t bootstrap;
-  struct trivfs_control *fsys;
-  const struct argp argp = { options, parse_opt, 0, doc };
-
-#ifdef DEBUG
-  logfile = fopen ("/root/filter.log", "a+");
-  if (logfile == NULL)
-    error (1, errno, "fopen");
-#endif
-
-  port_bucket = ports_create_bucket ();
-  user_portclass = ports_create_class (clean_proxy_user, 0);
-  device_portclass = ports_create_class (clean_proxy_device, 0);
-  other_portclass = ports_create_class (0, 0);
-  trivfs_cntl_portclasses[0] = ports_create_class (trivfs_clean_cntl, 0);
-  trivfs_protid_portclasses[0] = ports_create_class (trivfs_clean_protid, 0);
-
-  argp_parse (&argp, argc, argv, 0, 0, 0);
-
-  /* Prepare the filter. */
-  if (snd_filter == NULL) 
-    {
-      snd_filter = default_snd_filter;
-      snd_filter_length = sizeof (default_snd_filter) / sizeof (short);
-    }
-  if (rcv_filter == NULL) 
-    {
-      rcv_filter = default_rcv_filter;
-      rcv_filter_length = sizeof (default_rcv_filter) / sizeof (short);
-    }
-
-  task_get_bootstrap_port (mach_task_self (), &bootstrap);
-  if (bootstrap == MACH_PORT_NULL)
-    error (1, 0, "must be started as a translator");
-
-  err = ports_create_port (other_portclass, port_bucket, 
-                          sizeof (struct port_info), &notify_pi);
-  if (err)
-    error (1, err, "ports_create_port for notification");
-
-  /* Reply to our parent.  */
-  err = trivfs_startup (bootstrap, 0,
-                       trivfs_cntl_portclasses[0], port_bucket,
-                       trivfs_protid_portclasses[0], port_bucket, &fsys);
-  mach_port_deallocate (mach_task_self (), bootstrap);
-  if (err)
-    error (1, err, "Contacting parent");
-
-  /* Initialize the bpf, and set the filter for outgoing packets.
-   * MACH_PORT_DEAD is used because we don't need a receiving port. */
-  bpf_init ();
-  err = net_set_filter (MACH_PORT_DEAD, 0, (filter_t *) snd_filter,
-                       snd_filter_length);
-  if (err)
-    error (1, err, "set the sending filter");
-  /* Set the filter translator's own rule. */
-  err = net_set_filter (MACH_PORT_DEAD, 0, (filter_t *) rcv_filter,
-                       rcv_filter_length);
-  if (err)
-    error (1, err, "set the receiving filter");
-
-  pthread_create (&send_thread, NULL, send_thread_func, NULL);
-  /* TODO if the main thread exits,
-   * does the created thread exit if pthread_detach is called */
-  pthread_detach (send_thread);
-
-  /* Launch.  */
-  do 
-    {
-      ports_manage_port_operations_one_thread (port_bucket, 
-                                              filter_demuxer, 0);
-    } while (trivfs_goaway (fsys, 0)); 
-  return 0;
-}
-
-int
-deliver_msg (struct net_rcv_msg *msg, queue_head_t *port_list, 
-            mach_port_t dest)
-{
-  static int count = 0;
-  mach_msg_return_t err;
-  net_rcv_port_t infp, nextfp;
-
-  msg->msg_hdr.msgh_bits = MACH_MSGH_BITS (MACH_MSG_TYPE_COPY_SEND, 0);
-  msg->msg_hdr.msgh_local_port = MACH_PORT_NULL;
-  msg->msg_hdr.msgh_kind = MACH_MSGH_KIND_NORMAL;
-
-  /* Deliver the packet to the right pfinet,
-   * actually there should be only one filter in the list. */
-  FILTER_ITERATE (port_list, infp, nextfp, &infp->chain) 
-    {
-      net_hash_entry_t entp, *hash_headp;
-      int ret_count;
-
-      entp = (net_hash_entry_t) 0;
-      ret_count = mach_bpf_do_filter (infp,
-                                     msg->packet + sizeof (struct 
packet_header),
-                                     msg->net_rcv_msg_packet_count,
-                                     msg->header,
-                                     sizeof (struct ethhdr),
-                                     &hash_headp, &entp);
-
-      if (ret_count) 
-       {
-         msg->msg_hdr.msgh_remote_port = dest;
-         debug ("before delivering the packet to port %d, count: %d\n",
-                dest, ++count);
-         err = mach_msg ((mach_msg_header_t *)msg,
-                         MACH_SEND_MSG|MACH_SEND_TIMEOUT,
-                         msg->msg_hdr.msgh_size, 0, MACH_PORT_NULL,
-                         /*MACH_MSG_TIMEOUT_NONE*/500, MACH_PORT_NULL);
-         if (err != MACH_MSG_SUCCESS)
-           {
-             mach_port_deallocate(mach_task_self (),
-                                  ((mach_msg_header_t 
*)msg)->msgh_remote_port);
-             error (0, err, "mach_msg");
-             return -1;
-           }
-         debug ("after delivering the packet\n");
-       }
-    }
-  FILTER_ITERATE_END
-
-    return 0;
-}
diff --git a/eth-filter.multi-thread/filter.h b/eth-filter.multi-thread/filter.h
deleted file mode 100644
index e1c4c8b..0000000
--- a/eth-filter.multi-thread/filter.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* 
-   Copyright (C) 2008 Free Software Foundation, Inc.
-   Written by Zheng Da.
-
-   This file is part of the GNU Hurd.
-
-   The GNU Hurd 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, or (at your option)
-   any later version.
-
-   The GNU Hurd is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the GNU Hurd; see the file COPYING.  If not, write to
-   the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
-
-#ifndef FILTER_H
-#define FILTER_H
-
-#include <hurd.h>
-#include <mach.h>
-#include <hurd/ports.h>
-
-#include "bpf_impl.h"
-
-struct filter_msg;
-
-struct proxy_user
-{
-  struct port_info pi;
-  struct proxy *proxy;
-};
-
-struct proxy_device
-{
-  struct port_info pi;
-  struct proxy *proxy;
-};
-
-struct proxy
-{
-  struct proxy_device *device;
-  mach_port_t deliver_port;
-  hurd_ihash_locp_t p_deliverport_hashloc;
-  mach_port_t device_port;
-};
-
-int deliver_msg (struct net_rcv_msg *msg, queue_head_t *port_list, 
-                mach_port_t dest);
-int filter_device_write (struct filter_msg *msg);
-int filter_deliver (struct filter_msg *msg);
-
-#endif
diff --git a/eth-filter.multi-thread/msg_queue.c 
b/eth-filter.multi-thread/msg_queue.c
deleted file mode 100644
index 602b7fd..0000000
--- a/eth-filter.multi-thread/msg_queue.c
+++ /dev/null
@@ -1,224 +0,0 @@
-/* 
-   Copyright (C) 2008 Free Software Foundation, Inc.
-   Written by Zheng Da.
-
-   This file is part of the GNU Hurd.
-
-   The GNU Hurd 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, or (at your option)
-   any later version.
-
-   The GNU Hurd is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the GNU Hurd; see the file COPYING.  If not, write to
-   the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-
-#include "msg_queue.h"
-#include "filter.h"
-#include "util.h"
-
-static struct filter_msg *queue_head;
-static struct filter_msg *queue_tail;
-static int queue_len = 0;
-
-static pthread_mutex_t queuelock = PTHREAD_MUTEX_INITIALIZER;
-static pthread_mutex_t condition_mutex = PTHREAD_MUTEX_INITIALIZER;
-static pthread_cond_t condition_cond = PTHREAD_COND_INITIALIZER;
-
-void
-queue_msg (struct filter_msg *msg)
-{
-  msg->next = NULL;
-  // TODO what kind of lock do I need?
-  pthread_mutex_lock (&queuelock);
-  if (queue_head == NULL)
-    {
-      assert (queue_tail == NULL);
-      assert (queue_len == 0);
-      /* When the queue is empty. */
-      queue_head = msg;
-      queue_tail = msg;
-    }
-  else
-    {
-      queue_tail->next = msg;
-      queue_tail = msg;
-    }
-  queue_len++;
-  debug ("queue a message, queue length: %d.\n", queue_len);
-  pthread_mutex_unlock (&queuelock);
-//  queue_wakeup ();
-}
-
-struct filter_msg *
-dequeue_msg ()
-{
-  struct filter_msg *msg;
-
-  pthread_mutex_lock (&queuelock);
-  if (queue_head == NULL)
-    {
-      assert (queue_tail == NULL);
-      assert (queue_len == 0);
-      msg = NULL;
-    }
-  else
-    {
-      msg = queue_head;
-      queue_head = msg->next;
-      if (queue_head == NULL)
-       queue_tail = NULL;
-      queue_len--;
-    }
-  debug ("dequeue a message, the queue length: %d.\n", queue_len);
-  pthread_mutex_unlock (&queuelock);
-
-  return msg;
-}
-
-/* It can be called when the translator exits. */
-void
-queue_flush ()
-{
-  struct filter_msg *msg;
-  struct filter_msg *tmp;
-
-  pthread_mutex_lock (&queuelock);
-  msg = queue_head;
-  queue_head = queue_tail = NULL;
-  queue_len = 0;
-  pthread_mutex_unlock (&queuelock);
-
-  while (msg)
-    {
-      tmp = msg;
-      msg = msg->next;
-      if (tmp->destroy)
-       tmp->destroy (tmp);
-      free (tmp);
-    }
-}
-
-void
-filter_write_destroy (struct filter_msg *msg)
-{
-  struct filter_write_msg *write_msg = (struct filter_write_msg *) msg;
-
-  free (write_msg->data);
-}
-
-void filter_deliver_destroy (struct filter_msg *msg)
-{
-  struct filter_deliver_msg *deliver_msg = (struct filter_deliver_msg *) msg;
-
-  free (deliver_msg->net_msg);
-}
-
-kern_return_t
-queue_write (char *data, size_t datalen, mach_port_t reply_port,
-            mach_msg_type_name_t reply_type, dev_mode_t mode,
-            recnum_t recnum, struct proxy *proxy)
-{
-  /* Make a copy of the data */
-  char *new_data;
-  struct filter_msg *msg;
-  struct filter_write_msg *write_msg;
-
-  if (queue_len >= MAX_QUEUE)
-    return D_NO_MEMORY;
-  
-  new_data = (char *) malloc (datalen);
-  if (new_data == NULL)
-    return D_NO_MEMORY;
-
-  memcpy (new_data, data, datalen);
-
-  write_msg = (struct filter_write_msg *) malloc (sizeof (*write_msg));
-  if (write_msg == NULL)
-    {
-      free (new_data);
-      return D_NO_MEMORY;
-    }
-  msg = (struct filter_msg *) write_msg;
-
-  msg->proxy = proxy;
-  msg->forward = filter_device_write;
-  msg->destroy = filter_write_destroy;
-
-  write_msg->data = new_data;
-  write_msg->datalen = datalen;
-  write_msg->reply_port = reply_port;
-  write_msg->reply_type = reply_type;
-  write_msg->mode = mode;
-  write_msg->recnum = recnum;
-
-  queue_msg (msg);
-  return D_SUCCESS;
-}
-
-int
-queue_deliver (struct net_rcv_msg *msg, struct proxy *proxy)
-{
-  struct net_rcv_msg *msg_copy;
-  struct filter_deliver_msg *deliver_msg;
-
-  if (queue_len >= MAX_QUEUE)
-    return D_NO_MEMORY;
-
-  /* Make a copy of the data */
-  msg_copy = (struct net_rcv_msg *) malloc (sizeof (*msg_copy));
-  if (msg_copy == NULL)
-    return D_NO_MEMORY;
-
-  deliver_msg = (struct filter_deliver_msg *) malloc (sizeof (*deliver_msg));
-  if (deliver_msg == NULL)
-    {
-      free (msg_copy);
-      return D_NO_MEMORY;
-    }
-
-  *msg_copy = *msg;
-
-  deliver_msg->msg.proxy = proxy;
-  deliver_msg->msg.forward = filter_deliver;
-  deliver_msg->msg.destroy = filter_deliver_destroy;
-
-  deliver_msg->net_msg = msg_copy;
-
-  queue_msg ((struct filter_msg *)deliver_msg);
-  return D_SUCCESS;
-}
-
-void
-queue_empty_wait ()
-{
-  pthread_mutex_lock (&condition_mutex);
-//  debug ("queue length is %d\n", queue_len);
-  while (queue_head == NULL)
-    {
-      debug ("thread waits for a signal.\n");
-      pthread_cond_wait (&condition_cond, &condition_mutex);
-    }
-  pthread_mutex_unlock (&condition_mutex);
-}
-
-void
-queue_wakeup ()
-{
-  if (queue_head)
-    {
-      debug ("wake up a thread.\n");
-      pthread_cond_signal (&condition_cond);
-    }
-}
-
diff --git a/eth-filter.multi-thread/msg_queue.h 
b/eth-filter.multi-thread/msg_queue.h
deleted file mode 100644
index bc7800f..0000000
--- a/eth-filter.multi-thread/msg_queue.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* 
-   Copyright (C) 2008 Free Software Foundation, Inc.
-   Written by Zheng Da.
-
-   This file is part of the GNU Hurd.
-
-   The GNU Hurd 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, or (at your option)
-   any later version.
-
-   The GNU Hurd is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the GNU Hurd; see the file COPYING.  If not, write to
-   the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
-
-#ifndef MSG_QUEUE_H
-#define MSG_QUEUE_H
-
-#include <hurd.h>
-#include <mach.h>
-
-#define MAX_QUEUE 1000
-
-struct proxy;
-
-struct filter_msg 
-{
-  struct proxy *proxy;
-  struct filter_msg *next;
-
-  int (*forward) (struct filter_msg *);
-  void (*destroy) (struct filter_msg *);
-};
-
-struct filter_write_msg
-{
-  struct filter_msg msg;
-
-  char *data;
-  size_t datalen;
-  dev_mode_t mode;
-  recnum_t recnum;
-  mach_port_t reply_port;
-  mach_msg_type_name_t reply_type;
-};
-
-struct filter_deliver_msg 
-{
-  struct filter_msg msg;
-  
-  struct net_rcv_msg *net_msg;
-};
-
-void queue_msg (struct filter_msg *msg);
-struct filter_msg * dequeue_msg ();
-void queue_flush ();
-kern_return_t queue_write (char *data, size_t datalen, mach_port_t reply_port,
-            mach_msg_type_name_t reply_type, dev_mode_t mode,
-            recnum_t recnum, struct proxy *proxy);
-int queue_deliver (struct net_rcv_msg *msg, struct proxy *proxy);
-void queue_wakeup ();
-void queue_empty_wait ();
-
-#endif 
diff --git a/eth-filter.multi-thread/pcap_filter.c 
b/eth-filter.multi-thread/pcap_filter.c
deleted file mode 100644
index 67ee9bb..0000000
--- a/eth-filter.multi-thread/pcap_filter.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/* 
-   Copyright (C) 2008 Free Software Foundation, Inc.
-   Written by Zheng Da.
-
-   This file is part of the GNU Hurd.
-
-   The GNU Hurd 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, or (at your option)
-   any later version.
-
-   The GNU Hurd is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the GNU Hurd; see the file COPYING.  If not, write to
-   the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
-
-/*
- * This file translates a string into a bpf program.
- * The BPF structures are defined in both of bpf.h and pcap-bpf.h
- * Hopefully, there is no conflict between them.
- * This file uses the BPF definition in pcap-bpf.h.
- */
-
-#include <pcap.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "util.h"
-
-#define NETF_IN 0x1
-#define NETF_OUT 0x2
-#define NETF_NBPA 10
-#define NETF_BPF (1 << NETF_NBPA)
-
-/* This function translates the bpf program
- * from the string into the instructions. */
-struct bpf_insn *trans_filter_program (char *str, int send, int *filter_len)
-{
-  struct bpf_program program;
-  struct bpf_insn *insn;
-  pcap_t *pcap;
-  int err;
-
-  debug ("Compiling the bpf program: %s.\n", str);
-  pcap = pcap_open_dead (DLT_EN10MB, 1500);
-  if (pcap == NULL)
-    return NULL;
-  err = pcap_compile (pcap, &program, str, 1, 0);
-  if (err < 0) 
-    {
-      debug ("pcap_compile: %s\n", pcap_geterr (pcap));
-      pcap_close (pcap);
-      return NULL;
-    }
-
-  debug ("Finish compiling the bpf program, get %d bpf instructions.\n",
-        program.bf_len);
-  insn = (struct bpf_insn *) malloc ((program.bf_len + 1) * sizeof (*insn));
-  /* Clear the first instruction. */
-  memset (insn, 0, sizeof (*insn));
-  if (send)
-    insn->code = NETF_OUT | NETF_BPF;
-  else
-    insn->code = NETF_IN | NETF_BPF;
-  memcpy (insn + 1, program.bf_insns, program.bf_len * sizeof (*insn));
-  *filter_len = ((program.bf_len + 1) * sizeof (*insn)) / sizeof (short);
-  debug ("%d bpf instructions, the length of filters is %d words\n", 
-        program.bf_len, *filter_len);
-  pcap_freecode (&program);
-  pcap_close (pcap);
-
-  return insn;
-}
diff --git a/eth-filter.multi-thread/queue.c b/eth-filter.multi-thread/queue.c
deleted file mode 100644
index a43a21b..0000000
--- a/eth-filter.multi-thread/queue.c
+++ /dev/null
@@ -1,131 +0,0 @@
-/* 
- * Mach Operating System
- * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University
- * All Rights Reserved.
- * 
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- * 
- *  Software Distribution Coordinator  or  address@hidden
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- * 
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
- */
-/*
- *     Routines to implement queue package.
- */
-
-#include "queue.h"
-
-
-
-/*
- *     Insert element at head of queue.
- */
-void enqueue_head(
-       register queue_t        que,
-       register queue_entry_t  elt)
-{
-       elt->next = que->next;
-       elt->prev = que;
-       elt->next->prev = elt;
-       que->next = elt;
-}
-
-/*
- *     Insert element at tail of queue.
- */
-void enqueue_tail(
-       register queue_t        que,
-       register queue_entry_t  elt)
-{
-       elt->next = que;
-       elt->prev = que->prev;
-       elt->prev->next = elt;
-       que->prev = elt;
-}
-
-/*
- *     Remove and return element at head of queue.
- */
-queue_entry_t dequeue_head(
-       register queue_t        que)
-{
-       register queue_entry_t  elt;
-
-       if (que->next == que)
-               return((queue_entry_t)0);
-
-       elt = que->next;
-       elt->next->prev = que;
-       que->next = elt->next;
-       return(elt);
-}
-
-/*
- *     Remove and return element at tail of queue.
- */
-queue_entry_t dequeue_tail(
-       register queue_t        que)
-{
-       register queue_entry_t  elt;
-
-       if (que->prev == que)
-               return((queue_entry_t)0);
-
-       elt = que->prev;
-       elt->prev->next = que;
-       que->prev = elt->prev;
-       return(elt);
-}
-
-/*
- *     Remove arbitrary element from queue.
- *     Does not check whether element is on queue - the world
- *     will go haywire if it isn't.
- */
-
-/*ARGSUSED*/
-void remqueue(
-       queue_t                 que,
-       register queue_entry_t  elt)
-{
-       elt->next->prev = elt->prev;
-       elt->prev->next = elt->next;
-}
-
-/*
- *     Routines to directly imitate the VAX hardware queue
- *     package.
- */
-void insque(
-       register struct queue_entry *entry,
-       register struct queue_entry *pred)
-{
-       entry->next = pred->next;
-       entry->prev = pred;
-       (pred->next)->prev = entry;
-       pred->next = entry;
-}
-
-struct queue_entry
-*remque(
-       register struct queue_entry *elt)
-{
-       (elt->next)->prev = elt->prev;
-       (elt->prev)->next = elt->next;
-       return(elt);
-}
-
diff --git a/eth-filter.multi-thread/queue.h b/eth-filter.multi-thread/queue.h
deleted file mode 100644
index f067f55..0000000
--- a/eth-filter.multi-thread/queue.h
+++ /dev/null
@@ -1,329 +0,0 @@
-/*
- * Mach Operating System
- * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University
- * All Rights Reserved.
- *
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- *
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- *
- * Carnegie Mellon requests users of this software to return to
- *
- *  Software Distribution Coordinator  or  address@hidden
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- *
- * any improvements or extensions that they make and grant Carnegie Mellon 
rights
- * to redistribute these changes.
- */
-/*
- *     File:   queue.h
- *     Author: Avadis Tevanian, Jr.
- *     Date:   1985
- *
- *     Type definitions for generic queues.
- *
- */
-
-#ifndef        _KERN_QUEUE_H_
-#define        _KERN_QUEUE_H_
-
-/*
- *     Queue of abstract objects.  Queue is maintained
- *     within that object.
- *
- *     Supports fast removal from within the queue.
- *
- *     How to declare a queue of elements of type "foo_t":
- *             In the "*foo_t" type, you must have a field of
- *             type "queue_chain_t" to hold together this queue.
- *             There may be more than one chain through a
- *             "foo_t", for use by different queues.
- *
- *             Declare the queue as a "queue_t" type.
- *
- *             Elements of the queue (of type "foo_t", that is)
- *             are referred to by reference, and cast to type
- *             "queue_entry_t" within this module.
- */
-
-/*
- *     A generic doubly-linked list (queue).
- */
-
-struct queue_entry {
-       struct queue_entry      *next;          /* next element */
-       struct queue_entry      *prev;          /* previous element */
-};
-
-typedef struct queue_entry     *queue_t;
-typedef        struct queue_entry      queue_head_t;
-typedef        struct queue_entry      queue_chain_t;
-typedef        struct queue_entry      *queue_entry_t;
-
-/*
- *     enqueue puts "elt" on the "queue".
- *     dequeue returns the first element in the "queue".
- *     remqueue removes the specified "elt" from the specified "queue".
- */
-
-#define enqueue(queue,elt)     enqueue_tail(queue, elt)
-#define        dequeue(queue)          dequeue_head(queue)
-
-void           enqueue_head(queue_t, queue_entry_t);
-void           enqueue_tail(queue_t, queue_entry_t);
-queue_entry_t  dequeue_head(queue_t);
-queue_entry_t  dequeue_tail(queue_t);
-void           remqueue(queue_t, queue_entry_t);
-
-/*
- *     Macro:          queue_init
- *     Function:
- *             Initialize the given queue.
- *     Header:
- *             void queue_init(q)
- *                     queue_t         q;      *MODIFIED*
- */
-#define        queue_init(q)   ((q)->next = (q)->prev = q)
-
-/*
- *     Macro:          queue_first
- *     Function:
- *             Returns the first entry in the queue,
- *     Header:
- *             queue_entry_t queue_first(q)
- *                     queue_t q;              *IN*
- */
-#define        queue_first(q)  ((q)->next)
-
-/*
- *     Macro:          queue_next
- *     Function:
- *             Returns the entry after an item in the queue.
- *     Header:
- *             queue_entry_t queue_next(qc)
- *                     queue_t qc;
- */
-#define        queue_next(qc)  ((qc)->next)
-
-/*
- *     Macro:          queue_last
- *     Function:
- *             Returns the last entry in the queue.
- *     Header:
- *             queue_entry_t queue_last(q)
- *                     queue_t q;               *IN*
- */
-#define        queue_last(q)   ((q)->prev)
-
-/*
- *     Macro:          queue_prev
- *     Function:
- *             Returns the entry before an item in the queue.
- *     Header:
- *             queue_entry_t queue_prev(qc)
- *                     queue_t qc;
- */
-#define        queue_prev(qc)  ((qc)->prev)
-
-/*
- *     Macro:          queue_end
- *     Function:
- *             Tests whether a new entry is really the end of
- *             the queue.
- *     Header:
- *             boolean_t queue_end(q, qe)
- *                     queue_t q;
- *                     queue_entry_t qe;
- */
-#define        queue_end(q, qe)        ((q) == (qe))
-
-/*
- *     Macro:          queue_empty
- *     Function:
- *             Tests whether a queue is empty.
- *     Header:
- *             boolean_t queue_empty(q)
- *                     queue_t q;
- */
-#define        queue_empty(q)          queue_end((q), queue_first(q))
-
-
-/*----------------------------------------------------------------*/
-/*
- * Macros that operate on generic structures.  The queue
- * chain may be at any location within the structure, and there
- * may be more than one chain.
- */
-
-/*
- *     Macro:          queue_enter
- *     Function:
- *             Insert a new element at the tail of the queue.
- *     Header:
- *             void queue_enter(q, elt, type, field)
- *                     queue_t q;
- *                     <type> elt;
- *                     <type> is what's in our queue
- *                     <field> is the chain field in (*<type>)
- */
-#define queue_enter(head, elt, type, field)                    \
-{                                                              \
-       register queue_entry_t prev;                            \
-                                                               \
-       prev = (head)->prev;                                    \
-       if ((head) == prev) {                                   \
-               (head)->next = (queue_entry_t) (elt);           \
-       }                                                       \
-       else {                                                  \
-               ((type)prev)->field.next = (queue_entry_t)(elt);\
-       }                                                       \
-       (elt)->field.prev = prev;                               \
-       (elt)->field.next = head;                               \
-       (head)->prev = (queue_entry_t) elt;                     \
-}
-
-/*
- *     Macro:          queue_enter_first
- *     Function:
- *             Insert a new element at the head of the queue.
- *     Header:
- *             void queue_enter_first(q, elt, type, field)
- *                     queue_t q;
- *                     <type> elt;
- *                     <type> is what's in our queue
- *                     <field> is the chain field in (*<type>)
- */
-#define queue_enter_first(head, elt, type, field)              \
-{                                                              \
-       register queue_entry_t next;                            \
-                                                               \
-       next = (head)->next;                                    \
-       if ((head) == next) {                                   \
-               (head)->prev = (queue_entry_t) (elt);           \
-       }                                                       \
-       else {                                                  \
-               ((type)next)->field.prev = (queue_entry_t)(elt);\
-       }                                                       \
-       (elt)->field.next = next;                               \
-       (elt)->field.prev = head;                               \
-       (head)->next = (queue_entry_t) elt;                     \
-}
-
-/*
- *     Macro:          queue_field [internal use only]
- *     Function:
- *             Find the queue_chain_t (or queue_t) for the
- *             given element (thing) in the given queue (head)
- */
-#define        queue_field(head, thing, type, field)                   \
-               (((head) == (thing)) ? (head) : &((type)(thing))->field)
-
-/*
- *     Macro:          queue_remove
- *     Function:
- *             Remove an arbitrary item from the queue.
- *     Header:
- *             void queue_remove(q, qe, type, field)
- *                     arguments as in queue_enter
- */
-#define        queue_remove(head, elt, type, field)                    \
-{                                                              \
-       register queue_entry_t  next, prev;                     \
-                                                               \
-       next = (elt)->field.next;                               \
-       prev = (elt)->field.prev;                               \
-                                                               \
-       if ((head) == next)                                     \
-               (head)->prev = prev;                            \
-       else                                                    \
-               ((type)next)->field.prev = prev;                \
-                                                               \
-       if ((head) == prev)                                     \
-               (head)->next = next;                            \
-       else                                                    \
-               ((type)prev)->field.next = next;                \
-}
-
-/*
- *     Macro:          queue_remove_first
- *     Function:
- *             Remove and return the entry at the head of
- *             the queue.
- *     Header:
- *             queue_remove_first(head, entry, type, field)
- *             entry is returned by reference
- */
-#define        queue_remove_first(head, entry, type, field)            \
-{                                                              \
-       register queue_entry_t  next;                           \
-                                                               \
-       (entry) = (type) ((head)->next);                        \
-       next = (entry)->field.next;                             \
-                                                               \
-       if ((head) == next)                                     \
-               (head)->prev = (head);                          \
-       else                                                    \
-               ((type)(next))->field.prev = (head);            \
-       (head)->next = next;                                    \
-}
-
-/*
- *     Macro:          queue_remove_last
- *     Function:
- *             Remove and return the entry at the tail of
- *             the queue.
- *     Header:
- *             queue_remove_last(head, entry, type, field)
- *             entry is returned by reference
- */
-#define        queue_remove_last(head, entry, type, field)             \
-{                                                              \
-       register queue_entry_t  prev;                           \
-                                                               \
-       (entry) = (type) ((head)->prev);                        \
-       prev = (entry)->field.prev;                             \
-                                                               \
-       if ((head) == prev)                                     \
-               (head)->next = (head);                          \
-       else                                                    \
-               ((type)(prev))->field.next = (head);            \
-       (head)->prev = prev;                                    \
-}
-
-/*
- *     Macro:          queue_assign
- */
-#define        queue_assign(to, from, type, field)                     \
-{                                                              \
-       ((type)((from)->prev))->field.next = (to);              \
-       ((type)((from)->next))->field.prev = (to);              \
-       *to = *from;                                            \
-}
-
-/*
- *     Macro:          queue_iterate
- *     Function:
- *             iterate over each item in the queue.
- *             Generates a 'for' loop, setting elt to
- *             each item in turn (by reference).
- *     Header:
- *             queue_iterate(q, elt, type, field)
- *                     queue_t q;
- *                     <type> elt;
- *                     <type> is what's in our queue
- *                     <field> is the chain field in (*<type>)
- */
-#define queue_iterate(head, elt, type, field)                  \
-       for ((elt) = (type) queue_first(head);                  \
-            !queue_end((head), (queue_entry_t)(elt));          \
-            (elt) = (type) queue_next(&(elt)->field))
-
-#endif /* _KERN_QUEUE_H_ */
diff --git a/eth-filter.multi-thread/util.h b/eth-filter.multi-thread/util.h
deleted file mode 100644
index fa7189e..0000000
--- a/eth-filter.multi-thread/util.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* 
-   Copyright (C) 2008 Free Software Foundation, Inc.
-   Written by Zheng Da.
-
-   This file is part of the GNU Hurd.
-
-   The GNU Hurd 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, or (at your option)
-   any later version.
-
-   The GNU Hurd is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the GNU Hurd; see the file COPYING.  If not, write to
-   the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
-
-#ifndef UTIL_H
-#define UTIL_H
-
-#include <stdio.h>
-
-#include <linux/if_ether.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <arpa/inet.h>
-#include <netinet/ip.h>
-
-#define DEBUG
-
-#ifdef DEBUG 
-
-#define debug(format, ...) do                          \
-{                                                      \
-  extern FILE *logfile;                                        \
-  char buf[1024];                                       \
-  snprintf (buf, 1024, "filter: %s", format);          \
-  fprintf (stderr , buf, ## __VA_ARGS__);              \
-  fflush (logfile);                                    \
-} while (0)
-
-#else
-
-#define debug(format, ...) do {} while (0)
-
-#endif
-
-static inline void
-print_pack (char *packet, int len)
-{
-#ifdef DEBUG
-  struct ethhdr *ethh = (struct ethhdr *) packet;
-  struct iphdr *iph = (struct iphdr *)(ethh + 1);
-  char src_str[INET_ADDRSTRLEN];
-  char dst_str[INET_ADDRSTRLEN];
-  if (ntohs (ethh->h_proto) == ETH_P_IP
-      && len >= sizeof (struct ethhdr) + sizeof (struct iphdr)) 
-    {
-      debug ("pack: get a IP packet from %s to %s\n",
-             inet_ntop (AF_INET, &iph->saddr, src_str, INET_ADDRSTRLEN),
-             inet_ntop (AF_INET, &iph->daddr, dst_str, INET_ADDRSTRLEN));
-    }
-  else 
-    {
-      debug ("pack: get a non-IP packet: %x\n", ntohs (ethh->h_proto));
-    }
-#endif
-}
-
-#endif

-- 
Debian GNU Hurd packaging



reply via email to

[Prev in Thread] Current Thread [Next in Thread]