diff -Naurp linux-2.4.20-wolk4.3-fullkernel/Documentation/Configure.help linux-2.4.20-wolk4.4-fullkernel/Documentation/Configure.help
--- linux-2.4.20-wolk4.3-fullkernel/Documentation/Configure.help	2003-07-30 13:52:52.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/Documentation/Configure.help	2003-07-30 11:25:37.000000000 +0200
@@ -2246,6 +2246,13 @@ CONFIG_BLK_DEV_ELEVATOR_NOOP
 
   If unsure, say N.
 
+Normal I/O Elevator
+CONFIG_BLK_DEV_ELEVATOR_NORMAL
+  This is the normal I/O Elevator from 2.4.22-pre5 and above.
+
+  If you're building a kernel for normal desktop and server
+  usage, say Y.
+
 Low Latency Elevator
 CONFIG_BLK_DEV_ELEVATOR_LOWLAT
   If you are building your kernel for desktop usage it is highly
@@ -2262,29 +2269,19 @@ CONFIG_BLK_DEV_ELEVATOR_LOWLAT
   comparing apples with elephants! - So make up your mind first!
   ---------------------------------------------------------------
 
-
-  For the interested ones:
-  ------------------------
-  nr_requests:		16
-  read_passovers:	128
-  write_passovers:	256
-  max_bomb_segments:	2
-  bdflush:		30/50, 500, 0, 0, 5*HZ, 30*HZ, 60, 20, 0
-
-  You can, for sure, lower the latency much more but you'll experience
-  less write throughput.
-
-  For example:
-  ------------
-   elvtune -w 131072 /dev/$yourdevice
-   echo "90 500 0 0 600000 600000 95 20 0" >/proc/sys/vm/bdflush
-
-   This will lower the latency again much more but write throughput
-   will be about 6mb/s. Don't do this unless you know what you are doing.
-
   If you're building a kernel for server usage,
   say N, otherwise say Y.
 
+Max Throughput Elevator
+CONFIG_BLK_DEV_ELEVATOR_MAXSPEED
+  If you are building your kernel for server usage where you need
+  maximum datatransfers, it is highly recommended to say Y here.
+  With this option set, you can have very high I/O throughput.
+  This increases throughput about ~20% compared to the Normal I/O
+  Elevator.
+
+  If unsure, use the Normal I/O Elevator above.
+
 ISA-PNP EIDE support
 CONFIG_BLK_DEV_ISAPNP
   If you have an ISA EIDE card that is PnP (Plug and Play) and
@@ -4188,6 +4185,35 @@ CONFIG_IP_NF_IPTABLES
   If you want to compile it as a module, say M here and read
   <file:Documentation/modules.txt>.  If unsure, say `N'.
 
+High Performance Packet Classification
+CONFIG_IP_NF_HIPAC
+  NF-HIPAC is a high performance packet classification framework on
+  top of netfilter. Other than the linear classification algorithm
+  implemented by iptables NF-HIPAC is based on a novel classification
+  scheme. It provides highly efficient packet matching which is
+  especially useful when large rulesets and/or high bandwidth networks
+  are involved. Ruleset updates are submitted dynamically to the
+  kernel via netlink on a per rule basis.
+  In addition to its native matches (e.g. ip, proto, port match)
+  NF-HIPAC allows the usage of iptables matches and targets and
+  thus provides the same flexibility as iptables.
+  Furthermore the semantics and construction of a ruleset is identical
+  to the iptables way so that the internal representation is
+  completely transparent to the user.
+
+  Basically, you can think of NF-HIPAC as an alternative, optimized
+  iptables filter table (CONFIG_IP_NF_FILTER). Note that it cannot be
+  used for packet mangling or NAT but you can still adopt iptables'
+  mangle table (CONFIG_IP_NF_MANGLE) or nat table (CONFIG_IP_NF_NAT)
+  for that purpose since NF-HIPAC and iptables can be used together
+  at the same time.
+
+Connection tracking support for NF-HIPAC
+CONFIG_IP_NF_HIPAC_CTHELP
+  This module does NOT provide a connection tracking mechanism.
+  Instead it is required for NF-HIPAC to make use of the netfilter
+  connection tracking framework.
+
 quota match support
 CONFIG_IP_NF_MATCH_QUOTA
   This match implements network quotas.
@@ -13594,33 +13620,60 @@ CONFIG_ACENIC_OMIT_TIGON_I
 
   The safe and default value for this is N.
 
-SysKonnect SK-98xx and SK-95xx Gigabit Ethernet Adapter family support
+Marvell Yukon / SysKonnect SK-98xx and SK-95xx Gigabit Ethernet Adapter family support
 CONFIG_SK98LIN
-  Say Y here if you have a SysKonnect SK-98xx or SK-95xx Gigabit 
-  Ethernet Server Adapter. The following adapters are supported by 
-  this driver:
-  - SK-9521 10/100/1000Base-T Adapter
-  - SK-9821 Gigabit Ethernet 1000Base-T Server Adapter
-  - SK-9822 Gigabit Ethernet 1000Base-T Dual Port Server Adapter
-  - SK-9841 Gigabit Ethernet 1000Base-LX Server Adapter
-  - SK-9842 Gigabit Ethernet 1000Base-LX Dual Port Server Adapter
-  - SK-9843 Gigabit Ethernet 1000Base-SX Server Adapter
-  - SK-9844 Gigabit Ethernet 1000Base-SX Dual Port Server Adapter
-  - SK-9861 Gigabit Ethernet 1000Base-SX Server Adapter
-  - SK-9862 Gigabit Ethernet 1000Base-SX Dual Port Server Adapter
-  - SK-9871 Gigabit Ethernet 1000Base-ZX Server Adapter
-  - SK-9872 Gigabit Ethernet 1000Base-ZX Dual Port Server Adapter
+  Say Y here if you have a Marvell Yukon or SysKonnect SK-98xx/SK-95xx
+  compliant Gigabit Ethernet Adapter. The following adapters are supported
+  by this driver:
+  - 3Com 3C940 Gigabit LOM Ethernet Adapter
+  - 3Com 3C941 Gigabit LOM Ethernet Adapter
+  - SK-9821 Gigabit Ethernet Server Adapter (SK-NET GE-T)
+  - SK-9822 Gigabit Ethernet Server Adapter (SK-NET GE-T dual link)
+  - SK-9841 Gigabit Ethernet Server Adapter (SK-NET GE-LX)
+  - SK-9842 Gigabit Ethernet Server Adapter (SK-NET GE-LX dual link)
+  - SK-9843 Gigabit Ethernet Server Adapter (SK-NET GE-SX)
+  - SK-9844 Gigabit Ethernet Server Adapter (SK-NET GE-SX dual link)
+  - SK-9861 Gigabit Ethernet Server Adapter (SK-NET GE-SX Volition)
+  - SK-9862 Gigabit Ethernet Server Adapter (SK-NET GE-SX Volition dual link)
+  - SK-9871 Gigabit Ethernet Server Adapter (SK-NET GE-ZX)
+  - SK-9872 Gigabit Ethernet Server Adapter (SK-NET GE-ZX dual link)
+  - Allied Telesyn AT-2970SX Gigabit Ethernet Adapter
+  - Allied Telesyn AT-2970LX Gigabit Ethernet Adapter
+  - Allied Telesyn AT-2970TX Gigabit Ethernet Adapter
+  - Allied Telesyn AT-2971SX Gigabit Ethernet Adapter
+  - Allied Telesyn AT-2971T Gigabit Ethernet Adapter
+  - Allied Telesyn AT-2970SX/2SC Gigabit Ethernet Adapter
+  - Allied Telesyn AT-2970LX/2SC Gigabit Ethernet Adapter
+  - Allied Telesyn AT-2970TX/2TX Gigabit Ethernet Adapter
+  - Marvell RDK-8001 Adapter
+  - Marvell RDK-8002 Adapter
+  - Marvell RDK-8003 Adapter
+  - Marvell RDK-8004 Adapter
+  - Marvell RDK-8006 Adapter
+  - Marvell RDK-8007 Adapter
+  - Marvell RDK-8008 Adapter
+  - Marvell RDK-8009 Adapter
+  - Marvell RDK-8011 Adapter
+  - Marvell RDK-8012 Adapter
+  - SK-9521 V2.0 10/100/1000Base-T Adapter
   - SK-9821 V2.0 Gigabit Ethernet 10/100/1000Base-T Adapter
   - SK-9841 V2.0 Gigabit Ethernet 1000Base-LX Adapter
   - SK-9843 V2.0 Gigabit Ethernet 1000Base-SX Adapter
   - SK-9851 V2.0 Gigabit Ethernet 1000Base-SX Adapter
   - SK-9861 V2.0 Gigabit Ethernet 1000Base-SX Adapter
   - SK-9871 V2.0 Gigabit Ethernet 1000Base-ZX Adapter
+  - SK-9521 10/100/1000Base-T Adapter
+  - DGE-530T Gigabit Ethernet Adapter
+  - Marvell Yukon Gigabit Ethernet 10/100/1000Base-T Adapter
+  - N-Way PCI-Bus Giga-Card 1000/100/10Mbps(L)
+  - EG1032 v2 Instant Gigabit Network Adapter
+  - EG1064 v2 Instant Gigabit Network Adapter
 
   The adapters support Jumbo Frames.
   The dual link adapters support link-failover and dual port features.
-  The V2.0 adapters support the scatter-gather functionality with
-  sendfile(). Read Documentation/networking/sk98lin.txt for information about
+  Both Marvell Yukon and SysKonnect SK-98xx/SK-95xx adapters support 
+  the scatter-gather functionality with sendfile(). Please refer to 
+  Documentation/networking/sk98lin.txt for more information about
   optional driver parameters.
   Questions concerning this driver may be addressed to:
     linux@syskonnect.de
@@ -13630,6 +13683,122 @@ CONFIG_SK98LIN
   say M here and read Documentation/modules.txt. This is recommended.
   The module will be called sk98lin.o.
 
+Marvell Yukon Chipset
+CONFIG_SK98LIN_T1
+  This driver supports:
+
+  - 3Com 3C940 Gigabit LOM Ethernet Adapter
+  - 3Com 3C941 Gigabit LOM Ethernet Adapter
+
+  Questions concerning this driver may be addressed to:
+    linux@syskonnect.de
+
+SysKonnect SK98xx Support
+CONFIG_SK98LIN_T2
+  This driver supports:
+
+  - SK-9821 Gigabit Ethernet Server Adapter (SK-NET GE-T)
+  - SK-9822 Gigabit Ethernet Server Adapter (SK-NET GE-T dual link)
+  - SK-9841 Gigabit Ethernet Server Adapter (SK-NET GE-LX)
+  - SK-9842 Gigabit Ethernet Server Adapter (SK-NET GE-LX dual link)
+  - SK-9843 Gigabit Ethernet Server Adapter (SK-NET GE-SX)
+  - SK-9844 Gigabit Ethernet Server Adapter (SK-NET GE-SX dual link)
+  - SK-9861 Gigabit Ethernet Server Adapter (SK-NET GE-SX Volition)
+  - SK-9862 Gigabit Ethernet Server Adapter (SK-NET GE-SX Volition dual link)
+  - SK-9871 Gigabit Ethernet Server Adapter (SK-NET GE-ZX)
+  - SK-9872 Gigabit Ethernet Server Adapter (SK-NET GE-ZX dual link)
+
+  Questions concerning this driver may be addressed to:
+    linux@syskonnect.de
+
+SysKonnect SK98xx Support
+CONFIG_SK98LIN_T3
+  This driver supports:
+
+  - Allied Telesyn AT-2970SX Gigabit Ethernet Adapter
+  - Allied Telesyn AT-2970LX Gigabit Ethernet Adapter
+  - Allied Telesyn AT-2970TX Gigabit Ethernet Adapter
+  - Allied Telesyn AT-2971SX Gigabit Ethernet Adapter
+  - Allied Telesyn AT-2971T Gigabit Ethernet Adapter
+  - Allied Telesyn AT-2970SX/2SC Gigabit Ethernet Adapter
+  - Allied Telesyn AT-2970LX/2SC Gigabit Ethernet Adapter
+  - Allied Telesyn AT-2970TX/2TX Gigabit Ethernet Adapter
+
+  Questions concerning this driver may be addressed to:
+    linux@syskonnect.de
+
+Marvell Yukon Chipset
+CONFIG_SK98LIN_T4
+  This driver supports:
+
+  - Marvell RDK-8001 Adapter
+  - Marvell RDK-8002 Adapter
+  - Marvell RDK-8003 Adapter
+  - Marvell RDK-8004 Adapter
+  - Marvell RDK-8006 Adapter
+  - Marvell RDK-8007 Adapter
+  - Marvell RDK-8008 Adapter
+  - Marvell RDK-8009 Adapter
+  - Marvell RDK-8011 Adapter
+  - Marvell RDK-8012 Adapter
+
+  Questions concerning this driver may be addressed to:
+    linux@syskonnect.de
+
+Marvell Yukon Chipset
+CONFIG_SK98LIN_T5
+  This driver supports:
+
+  - SK-9521 V2.0 10/100/1000Base-T Adapter
+  - SK-9821 V2.0 Gigabit Ethernet 10/100/1000Base-T Adapter
+  - SK-9841 V2.0 Gigabit Ethernet 1000Base-LX Adapter
+  - SK-9843 V2.0 Gigabit Ethernet 1000Base-SX Adapter
+  - SK-9851 V2.0 Gigabit Ethernet 1000Base-SX Adapter
+  - SK-9861 V2.0 Gigabit Ethernet 1000Base-SX Adapter
+  - SK-9871 V2.0 Gigabit Ethernet 1000Base-ZX Adapter
+  - SK-9521 10/100/1000Base-T Adapter
+
+  Questions concerning this driver may be addressed to:
+    linux@syskonnect.de
+
+Marvell Yukon Chipset
+CONFIG_SK98LIN_T6
+  This driver supports:
+
+  - DGE-530T Gigabit Ethernet Adapter
+
+  Questions concerning this driver may be addressed to:
+    linux@syskonnect.de
+
+Marvell Yukon Chipset
+CONFIG_SK98LIN_T7
+  This driver supports:
+
+  - Marvell Yukon Gigabit Ethernet 10/100/1000Base-T Adapter
+
+  Questions concerning this driver may be addressed to:
+    linux@syskonnect.de
+
+Marvell Yukon Chipset
+CONFIG_SK98LIN_T8
+  This driver supports:
+
+  - N-Way PCI-Bus Giga-Card 1000/100/10Mbps(L)
+
+  Questions concerning this driver may be addressed to:
+    linux@syskonnect.de
+
+Marvell Yukon Chipset
+CONFIG_SK98LIN_T9
+  This driver supports:
+
+  - EG1032 v2 Instant Gigabit Network Adapter
+  - EG1064 v2 Instant Gigabit Network Adapter
+
+  Questions concerning this driver may be addressed to:
+    linux@syskonnect.de
+
+
 SysKonnect SK-9Dxx support
 CONFIG_SK9DLIN
   Say Y here if you have a SysKonnect SK-9Dxx Gigabit Ethernet Adapter.
@@ -14583,6 +14752,13 @@ CONFIG_EEPRO100
   a module, say M here and read <file:Documentation/modules.txt> as
   well as <file:Documentation/networking/net-modules.txt>.
 
+Use PIO instead of MMIO
+CONFIG_EEPRO100_PIO
+  This instructs the driver to use programmed I/O ports (PIO) instead
+  of PCI shared memory (MMIO).  This can possibly solve some problems
+  in case your mainboard has memory consistency issues.  If unsure,
+  say N.
+
 Enable Power Management
 CONFIG_EEPRO100_PM
   Many Intel EtherExpress PRO/100 PCI network cards are capable
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/Documentation/cciss.txt linux-2.4.20-wolk4.4-fullkernel/Documentation/cciss.txt
--- linux-2.4.20-wolk4.3-fullkernel/Documentation/cciss.txt	2003-07-30 13:51:06.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/Documentation/cciss.txt	2003-07-30 10:30:55.000000000 +0200
@@ -11,8 +11,8 @@ This driver is known to work with the fo
 	* SA 5312
 	* SA 641
 	* SA 642
-	* SA 6402
-	* SA 6404/256
+	* SA 6400
+	* SA 6400 U320 Expansion Module
 
 If nodes are not already created in the /dev/cciss directory
 
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/Documentation/networking/00-INDEX linux-2.4.20-wolk4.4-fullkernel/Documentation/networking/00-INDEX
--- linux-2.4.20-wolk4.3-fullkernel/Documentation/networking/00-INDEX	2003-07-30 13:51:07.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/Documentation/networking/00-INDEX	2003-07-30 10:31:38.000000000 +0200
@@ -97,8 +97,8 @@ shaper.txt
 sis900.txt
 	- SiS 900/7016 Fast Ethernet device driver info.
 sk98lin.txt
-	- SysKonnect SK-98xx and SK-98xx Gigabit Ethernet Adapter family
-	  driver info.
+	- Marvell Yukon Chipset / SysKonnect SK-98xx compliant Gigabit
+	  Ethernet Adapter family driver info
 sk9dlin.txt
 	- SysKonnect SK-NET (SK-9Dxx) Gigabit Ethernet driver info.
 skfp.txt
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/Documentation/networking/e100.txt linux-2.4.20-wolk4.4-fullkernel/Documentation/networking/e100.txt
--- linux-2.4.20-wolk4.3-fullkernel/Documentation/networking/e100.txt	2003-07-30 13:51:07.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/Documentation/networking/e100.txt	2002-12-18 01:03:44.000000000 +0100
@@ -1,7 +1,7 @@
 Linux* Base Driver for the Intel(R) PRO/100 Family of Adapters
 ==============================================================
 
-November 19, 2002
+September 16, 2002
 
 
 Contents
@@ -19,7 +19,7 @@ In This Release
 ===============
 
 This file describes the Linux* Base Driver for the Intel(R) PRO/100 Family of
-Adapters, version 2.2.x.  This driver includes support for Itanium(TM)-based 
+Adapters, version 2.1.x.  This driver includes support for Itanium(TM)-based 
 systems.
 
 
@@ -94,9 +94,8 @@ For the latest Intel PRO/100 network dri
 Command Line Parameters
 =======================
 
-If the driver is built as a module, the  following optional parameters are 
-used by entering them on the command line with the modprobe or insmod command
-using this syntax:
+The following optional parameters are used by entering them on the command 
+line with the modprobe or insmod command using this syntax:
 
      modprobe e100 [<option>=<VAL1>,<VAL2>,...]
 
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/Documentation/networking/e1000.txt linux-2.4.20-wolk4.4-fullkernel/Documentation/networking/e1000.txt
--- linux-2.4.20-wolk4.3-fullkernel/Documentation/networking/e1000.txt	2003-07-30 13:51:07.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/Documentation/networking/e1000.txt	2002-12-18 01:03:44.000000000 +0100
@@ -1,7 +1,7 @@
 Linux* Base Driver for the Intel(R) PRO/1000 Family of Adapters
 ===============================================================
 
-January 8, 2003
+October 12, 2002
 
 
 Contents
@@ -20,16 +20,33 @@ In This Release
 ===============
 
 This file describes the Linux* Base Driver for the Intel(R) PRO/1000 Family
-of Adapters, version 5.0.x.  This driver includes support for 
+of Adapters, version 4.4.x.  This driver includes support for 
 Itanium(TM)-based systems.
 
+This release version includes the following:
+
+   - Support for the ethtool 1.6 interface. A third-party application can use
+     the ethtool interface to get and set driver parameters.
+
+   - Zero copy. This feature provides faster data throughput. Enabled by
+     default in supporting kernels. It is not supported on the Intel(R)
+     PRO/1000 Gigabit Server Adapter.
+
+Features include:
+
+   - Support for the 82545 and 82546-based adapters listed below
+
+   - Wake on LAN* support via ethtool for 82540, 82544, 82545, and 82546-
+     based adapters
+
+   - Adaptive IFS for increased performance at half duplex
 
 
 
 Supported Adapters
 ==================
 
-The following Intel network adapters are compatible with the drivers in this 
+The following Intel network adapters are compatible with the drivers in this
 release:
 
    Controller  Adapter Name                         Board IDs
@@ -48,7 +65,6 @@ release:
    82544       PRO/1000 T Desktop Adapter           A62947-xxx
 
    82540       PRO/1000 MT Desktop Adapter          A78408-xxx
-   82541                                            C91016-xxx
 
    82545       PRO/1000 MT Server Adapter           A92165-xxx
 
@@ -61,42 +77,33 @@ release:
    82546       PRO/1000 MF Dual Port Server Adapter A91620-xxx
 
 
+To verify your Intel adapter is supported, find the board ID number on the
+adapter. Look for a label that has a barcode and a number in the format of
+123456-001 (six digits hyphen three digits). Match this to the list of
+numbers above.
 
-To verify your Intel adapter is supported, find the board ID number on the 
-adapter. Look for a label that has a barcode and a number in the format  
-A12345-001. Match this to the list of numbers above.
-
-For more information on how to identify your adapter, go to the Adapter & 
+For more information on how to identify your adapter, go to the Adapter &
 Driver ID Guide at:
 
     http://support.intel.com/support/network/adapter/pro100/21397.htm
 
-For the latest Intel network drivers for Linux, refer to the following
+For the latest Intel network drivers for Linux, go to:
 
-    http://downloadfinder.intel.com/scripts-df/support_intel.asp
+    http://appsr.intel.com/scripts-df/support_intel.asp
 
 
 Command Line Parameters
 =======================
 
-If the driver is built as a module, the  following optional parameters are 
-used by entering them on the command line with the modprobe or insmod command
-using this syntax:
-
-     modprobe e1000 [<option>=<VAL1>,<VAL2>,...]
-
-     insmod e1000 [<option>=<VAL1>,<VAL2>,...] 
-
+If the driver is built as a module, the following optional parameters are 
+used by entering them on the command line with the modprobe or insmod command. 
 For example, with two PRO/1000 PCI adapters, entering:
 
-     insmod e1000 TxDescriptors=80,128
+    insmod e1000 TxDescriptors=80,128
 
-loads the e1000 driver with 80 TX resources for the first adapter and 128 TX 
+loads the e1000 driver with 80 TX resources for the first adapter and 128 TX
 resources for the second adapter.
 
-The default value for each parameter is generally the recommended setting,
-unless otherwise noted.
-
 For more information about the AutoNeg, Duplex, and Speed parameters, see the
 "Speed and Duplex Configuration" section in this document.
 
@@ -122,20 +129,6 @@ Default: Read flow control settings from
     This parameter controls the automatic generation(Tx) and response(Rx) to 
     Ethernet PAUSE frames.
 
-InterruptThrottleRate
-Valid Range: 100-100000 (0=off, 1=dynamic)
-Default Value: 1
-    This value represents the maximum number of interrupts per second the 
-    controller generates. InterruptThrottleRate is another setting used in 
-    interrupt moderation. Dynamic mode uses a heuristic algorithm to adjust 
-    InterruptThrottleRate based on the current traffic load.
-
-    NOTE: InterruptThrottleRate takes precedence over the TxAbsIntDelay and 
-          RxAbsIntDelay parameters. In other words, minimizing the receive 
-          and/or transmit absolute delays does not force the controller to 
-          generate more interrupts than what the Interrupt Throttle Rate 
-          allows.
-
 RxDescriptors
 Valid Range: 80-256 for 82542 and 82543-based adapters
              80-4096 for 82540, 82544, 82545, and 82546-based adapters
@@ -161,9 +154,9 @@ Default Value: 0
     descriptors.
 
     CAUTION: When setting RxIntDelay to a value other than 0, adapters may 
-             hang (stop transmitting) under certain network conditions. If 
+             hang (stop transmitting) under certain network conditions. If
              this occurs a NETDEV WATCHDOG message is logged in the system
-             event log. In addition, the controller is automatically reset, 
+             event log. In addition, the controller is automatically reset,
              restoring the network connection. To eliminate the potential for
              the hang ensure that RxIntDelay is set to 0.
 
@@ -183,7 +176,7 @@ Default Value: 0 (auto-negotiate at all 
     Speed forces the line speed to the specified value in megabits per second
     (Mbps). If this parameter is not specified or is set to 0 and the link 
     partner is set to auto-negotiate, the board will auto-detect the correct 
-    speed. Duplex should also be set when Speed is set to either 10 or 100.
+    speed. Duplex must also be set when Speed is set to either 10 or 100.
 
 TxDescriptors
 Valid Range: 80-256 for 82542 and 82543-based adapters
@@ -197,7 +190,7 @@ TxIntDelay
 Valid Range: 0-65535 (0=off)
 Default Value: 64
     This value delays the generation of transmit interrupts in units of 
-    1.024 microseconds. Transmit interrupt reduction can improve CPU
+    1.024 microseconds.  Transmit interrupt reduction can improve CPU
     efficiency if properly tuned for specific network traffic. If the
     system is reporting dropped transmits, this value may be set too high
     causing the driver to run out of available transmit descriptors.
@@ -212,7 +205,7 @@ Default Value: 64
     along with TxIntDelay, may improve traffic throughput in specific 
     network conditions.
 
-XsumRX (not available on the 82542-based adapter)
+XsumRX (not available on the PRO/1000 Gigabit Server Adapter)
 Valid Range: 0-1
 Default Value: 1
     A value of '1' indicates that the driver should enable IP checksum
@@ -222,10 +215,10 @@ Default Value: 1
 Speed and Duplex Configuration
 ==============================
 
-Three keywords are used to control the speed and duplex configuration. These 
+Three keywords are used to control the speed and duplex configuration. These
 keywords are Speed, Duplex, and AutoNeg.
 
-If the board uses a fiber interface, these keywords are ignored, and the 
+If the board uses a fiber interface, these keywords are ignored, and the
 fiber interface board only links at 1000 Mbps full-duplex.
 
 For copper-based boards, the keywords interact as follows:
@@ -237,23 +230,23 @@ For copper-based boards, the keywords in
   If Speed = 1000, limited auto-negotiation is enabled and only 1000 Mbps is
   advertised (The 1000BaseT spec requires auto-negotiation.)
 
-  If Speed = 10 or 100, then both Speed and Duplex should be set. Auto-
-  negotiation is disabled, and the AutoNeg parameter is ignored. Partner SHOULD
+  If Speed = 10 or 100, then both Speed and Duplex must be set. Auto-
+  negotiation is disabled, and the AutoNeg parameter is ignored. Partner MUST
   also be forced.
 
 The AutoNeg parameter is used when more control is required over the auto-
-negotiation process.  When this parameter is used, Speed and Duplex must not 
-be specified.  This parameter is a bitmap that specifies which speed and 
+negotiation process.  When this parameter is used, Speed and Duplex must not
+be specified.  This parameter is a bitmap that specifies which speed and
 duplex settings are advertised to the link partner.
 
 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
 
-Note that setting AutoNeg does not guarantee that the board will link at the 
-highest specified speed or duplex mode, but the board will link at the 
+Note that setting AutoNeg does not guarantee that the board will link at the
+highest specified speed or duplex mode, but the board will link at the
 highest possible speed/duplex of the link partner IF the link partner is also
-set to auto-negotiate. If the link partner is forced speed/duplex, the 
+set to auto-negotiate. If the link partner is forced speed/duplex, the
 adapter MUST be forced to the same speed/duplex.
 
 
@@ -263,19 +256,13 @@ Additional Configurations
   Jumbo Frames
   ------------
 
-  The driver supports Jumbo Frames for all adapters except 82542-based 
-  adapters. Jumbo Frames support is enabled by changing the MTU to a value 
-  larger than the default of 1500. Use the ifconfig command to increase the 
+  The driver supports Jumbo Frames for all adapters except 82542-based
+  adapters.  Jumbo Frames support is enabled by changing the MTU to a value
+  larger than the default of 1500.  Use the ifconfig command to increase the
   MTU size. For example:
 
         ifconfig ethx mtu 9000 up
 
-  The maximum MTU setting for Jumbo Frames is 16110. This value coincides 
-  with the maximum Jumbo Frames size of 16128.
-
-  NOTE: Jumbo Frames are supported at 1000 Mbps only. Using Jumbo Frames at 
-  10 or 100 Mbps may result in poor performance or loss of link.
-
 
 Known Issues
 ============
@@ -283,33 +270,33 @@ Known Issues
   Jumbo Frames System Requirement
   -------------------------------
 
-  Memory allocation failures have been observed on Linux systems with 64 MB 
-  of RAM or less that are running Jumbo Frames. If you are using Jumbo 
-  Frames, your system may require more than the advertised minimum 
+  Memory allocation failures have been observed on Linux systems with 64 MB
+  of RAM or less that are running Jumbo Frames. If you are using Jumbo
+  Frames, your system may require more than the advertised minimum
   requirement of 64 MB of system memory.
 
 
 Support
 =======
 
-For general information, go to the Intel support website at:
+For general information and support, go to the Intel support website at:
 
     http://support.intel.com
 
 If an issue is identified with the released source code on the supported
-kernel with a supported adapter, email the specific information related to 
+kernel with a supported adapter, email the specific information related to
 the issue to linux.nics@intel.com.
 
 
 License
 =======
 
-This software program is released under the terms of a license agreement 
-between you ('Licensee') and Intel. Do not use or load this software or any 
-associated materials (collectively, the 'Software') until you have carefully 
-read the full terms and conditions of the LICENSE located in this software 
-package. By loading or using the Software, you agree to the terms of this 
-Agreement. If you do not agree with the terms of this Agreement, do not 
+This software program is released under the terms of a license agreement
+between you ('Licensee') and Intel. Do not use or load this software or any
+associated materials (collectively, the 'Software') until you have carefully
+read the full terms and conditions of the LICENSE located in this software
+package. By loading or using the Software, you agree to the terms of this
+Agreement. If you do not agree with the terms of this Agreement, do not
 install or use the Software.
 
 * Other names and brands may be claimed as the property of others.
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/Documentation/networking/sk98lin.txt linux-2.4.20-wolk4.4-fullkernel/Documentation/networking/sk98lin.txt
--- linux-2.4.20-wolk4.3-fullkernel/Documentation/networking/sk98lin.txt	2003-07-30 13:51:07.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/Documentation/networking/sk98lin.txt	2003-07-30 10:31:38.000000000 +0200
@@ -1,11 +1,11 @@
-(C)Copyright 1999-2003 SysKonnect GmbH.
+(C)Copyright 1999-2003 Marvell(R).
 All rights reserved
 ===========================================================================
 
-sk98lin.txt created 05-Feb-2003
+sk98lin.txt created 18-Jun-2003
 
-Readme File for sk98lin v6.03
-SysKonnect SK-98xx Gigabit Ethernet Adapter family driver for LINUX
+Readme File for sk98lin v6.12
+Marvell Yukon/SysKonnect SK-98xx Gigabit Ethernet Adapter family driver for LINUX
 
 This file contains
  1  Overview
@@ -27,8 +27,9 @@ This file contains
 1  Overview
 ===========
 
-The sk98lin driver supports the SysKonnect SK-98xx and SK-95xx family 
-on Linux. It has been tested with Linux on Intel/x86 machines.
+The sk98lin driver supports the Marvell Yukon and SysKonnect 
+SK-98xx/SK-95xx compliant Gigabit Ethernet Adapter on Linux. It has 
+been tested with Linux on Intel/x86 machines.
 ***
 
 
@@ -75,8 +76,8 @@ follows:
 To integrate the driver permanently into the kernel, proceed as follows:
 
 1. Select the menu "Network device support" and then "Ethernet(1000Mbit)"
-2. Mark "SysKonnect SK-98xx and SK-95xx Gigabit Ethernet Adapter
-   family support" with (*) 
+2. Mark "Marvell Yukon/SysKonnect SK-98xx/SK-95xx Gigabit Ethernet Adapter 
+   support" with (*) 
 3. Build a new kernel when the configuration of the above options is 
    finished.
 4. Install the new kernel.
@@ -87,8 +88,8 @@ To use the driver as a module, proceed a
 1. Enable 'loadable module support' in the kernel.
 2. For automatic driver start, enable the 'Kernel module loader'.
 3. Select the menu "Network device support" and then "Ethernet(1000Mbit)"
-4. Mark "SysKonnect SK-98xx and SK-95xx Gigabit Ethernet Adapter
-   family support" with (M)
+4. Mark "Marvell Yukon/SysKonnect SK-98xx/SK-95xx Gigabit Ethernet Adapter 
+   support" with (M)
 5. Execute the command "make modules".
 6. Execute the command "make modules_install".
    The appropiate modules will be installed.
@@ -100,21 +101,23 @@ Load the module manually
 To load the module manually, proceed as follows:
 
 1. Enter "modprobe sk98lin".
-2. If the SysKonnect SK-98xx adapter is installed in your computer and you
-   have a /proc file system, execute the command:
+2. If a Marvell Yukon or SysKonnect SK-98xx adapter is installed in 
+   your computer and you have a /proc file system, execute the command:
    "ls /proc/net/sk98lin/" 
    This should produce an output containing a line with the following 
    format:
    eth0   eth1  ...
    which indicates that your adapter has been found and initialized.
    
-   NOTE 1: If you have more than one SysKonnect SK-98xx adapter installed,
-           the adapters will be listed as 'eth0', 'eth1', 'eth2', etc.
-           For each adapter, repeat steps 3 and 4 below.
-
-   NOTE 2: If you have other Ethernet adapters installed, your SysKonnect
-           SK-98xx adapter will be mapped to the next available number, 
-           e.g. 'eth1'. The mapping is executed automatically.
+   NOTE 1: If you have more than one Marvell Yukon or SysKonnect SK-98xx 
+           adapter installed, the adapters will be listed as 'eth0', 
+                   'eth1', 'eth2', etc.
+                   For each adapter, repeat steps 3 and 4 below.
+
+   NOTE 2: If you have other Ethernet adapters installed, your Marvell
+           Yukon or SysKonnect SK-98xx adapter will be mapped to the 
+                   next available number, e.g. 'eth1'. The mapping is executed 
+                   automatically.
            The module installation message (displayed either in a system
            log file or on the console) prints a line for each adapter 
            found containing the corresponding 'ethX'.
@@ -141,7 +144,7 @@ To load the module manually, proceed as 
    Use 'ping <otherstation>' to verify the connection to other computers 
    on your network.
 5. To check the adapter configuration view /proc/net/sk98lin/[devicename].
-   For example by executing:	
+   For example by executing:    
    "cat /proc/net/sk98lin/eth0" 
 
 Unload the module
@@ -184,7 +187,7 @@ To set the driver parameters in this fil
    unload and reload the driver.
    The syntax of the driver parameters is:
 
- 	modprobe sk98lin parameter=value1[,value2[,value3...]]
+        modprobe sk98lin parameter=value1[,value2[,value3...]]
 
    where value1 refers to the first adapter, value2 to the second etc.
 
@@ -198,7 +201,7 @@ You also want to set DuplexCapabilities 
 to FULL, and on the second adapter to HALF.
 Then, you must enter:
 
- 	modprobe sk98lin AutoNeg=On,Off DupCap=Full,Half
+        modprobe sk98lin AutoNeg=On,Off DupCap=Full,Half
 
 NOTE: The number of adapters that can be configured this way is
       limited in the driver (file skge.c, constant SK_MAX_CARD_PARAM).
@@ -283,6 +286,72 @@ with this parameter.
 4.2  Adapter Parameters
 -----------------------
 
+Interrupt Moderation
+--------------------
+Parameter:    Moderation
+Values:       None, Static, Dynamic
+Default:      None
+
+Interrupt moderation is employed to limit the maxmimum number of interrupts
+the driver has to serve. That is, one or more interrupts (which indicate any
+transmit or receive packet to be processed) are queued until the driver 
+processes them. When queued interrupts are to be served, is determined by the
+'IntsPerSec' parameter, which is explained later below.
+
+Possible modes:
+
+   -- None - No interrupt moderation is applied on the adapter card. 
+      Therefore, each transmit or receive interrupt is served immediately
+      as soon as it appears on the interrupt line of the adapter card.
+
+   -- Static - Interrupt moderation is applied on the adapter card. 
+      All transmit and receive interrupts are queued until a complete
+      moderation interval ends. If such a moderation interval ends, all
+      queued interrupts are processed in one big bunch without any delay.
+      The term 'static' reflects the fact, that interrupt moderation is
+      always enabled, regardless how much network load is currently 
+      passing via a particular interface. In addition, the duration of
+      the moderation interval has a fixed length that never changes while
+      the driver is operational.
+
+   -- Dynamic - Interrupt moderation might be applied on the adapter card,
+      depending on the load of the system. If the driver detects that the
+      system load is too high, the driver tries to shield the system against 
+      too much network load by enabling interrupt moderation. If - at a later
+      time - the CPU utilizaton decreases again (or if the network load is 
+      negligible) the interrupt moderation will automatically be disabled.
+
+Interrupt moderation should be used when the driver has to handle one or more
+interfaces with a high network load, which - as a consequence - leads also to a
+high CPU utilization. When moderation is applied in such high network load 
+situations, CPU load might be reduced by 20-30%.
+
+NOTE: The drawback of using interrupt moderation is an increase of the round-
+trip-time (RTT), due to the queueing and serving of interrupts at dedicated
+moderation times.
+
+Interrupts per second
+---------------------
+Parameter:    IntsPerSec
+Values:       30...40000 (interrupts per second)
+Default:      2000
+
+This parameter is only used, if either static or dynamic interrupt moderation
+is used on a network adapter card. Using this paramter if no moderation is
+applied, will lead to no action performed.
+
+This parameter determines the length of any interrupt moderation interval. 
+Assuming that static interrupt moderation is to be used, an 'IntsPerSec' 
+parameter value of 2000 will lead to an interrupt moderation interval of
+500 microseconds. 
+
+NOTE: The duration of the moderation interval is to be chosen with care.
+At first glance, selecting a very long duration (e.g. only 100 interrupts per 
+second) seems to be meaningful, but the increase of packet-processing delay 
+is tremendous. On the other hand, selecting a very short moderation time might
+compensate the use of any moderation being applied.
+
+
 Preferred Port
 --------------
 Parameter:    PrefPort
@@ -365,10 +434,10 @@ in /etc/rc.d/rc2.d).
 6  VLAN and Link Aggregation Support (IEEE 802.1, 802.1q, 802.3ad)
 ==================================================================
 
-The SysKonnect Linux drivers are able to support VLAN and Link Aggregation
-according to IEEE standards 802.1, 802.1q, and 802.3ad. These features are
-only available after installation of open source modules available on the 
-Internet:
+The Marvell Yukon/SysKonnect Linux drivers are able to support VLAN and 
+Link Aggregation according to IEEE standards 802.1, 802.1q, and 802.3ad. 
+These features are only available after installation of open source 
+modules available on the Internet:
 For VLAN go to: http://scry.wanfear.com/~greear/vlan.html
 For Link Aggregation go to: http://www.st.rim.or.jp/~yumo
 
@@ -459,8 +528,8 @@ If your problem is not listed here, plea
 support for help (linux@syskonnect.de).
 When contacting our technical support, please ensure that the following 
 information is available:
-- System Manufacturer and Model
-- Boards in your system
+- System Manufacturer and HW Informations (CPU, Memory... )
+- PCI-Boards in your system
 - Distribution
 - Kernel version
 - Driver version
@@ -469,6 +538,53 @@ information is available:
 8  History
 ==========
 
+VERSION 6.11 (In-Kernel version)
+New Features:
+- Support for Kernel 2.5/2.6
+- Support for new IO-control MIB data structure
+- New SkOsGetTime function
+Problems fixed:
+- Fix: Race condition with broken LM80 chip
+- Fix: Common modules update (#10803, #10768, #10767)
+- Fix: Dim, ProcFS, Isr, Module Support changes for Kernel 2.5/2.6
+Known limitations:
+- None
+
+VERSION 6.10
+New Features:
+- none
+Problems fixed:
+- Fix: Race condition with padded frames
+Known limitations:
+- None
+
+VERSION 6.09
+New Features:
+- none
+Problems fixed:
+- Fix: Disabled HW Error IRQ on 32-bit Yukon if sensor IRQ occurs
+- Fix: Delay race condition with some server machines
+Known limitations:
+- None
+
+VERSION 6.08
+New Features:
+- Add: Dynamic Interrupt moderation
+- Add: Blink mode verification
+- Fix: CSUM changes
+Problems fixed:
+- Fix: CSUM changes
+Known limitations:
+- None
+
+VERSION 6.04 - 6.07
+New Features:
+- Common modules update
+Problems fixed:
+- none
+Known limitations:
+- None
+
 VERSION 6.03
 New Features:
 - Common modules update
@@ -599,84 +715,5 @@ New Features:
 Known limitations:
 - None
 
-VERSION 1.07
-Problems fixed:
-- RlmtMode parameter value strings were wrong (#10437)
-- Driver sent too many RLMT frames (#10439)
-- Driver did not recognize network segmentation (#10440)
-- RLMT switched too often on segmented network (#10441)
-Known limitations:
-- None
-
-VERSION 1.06
-Problems fixed:
-- System panic'ed after some time when running with 
-  RlmtMode=CheckOtherLink or RlmtMode=CheckSeg (#10421)
-  Panic message: "Kernel panic: skput: over ... dev: eth0"
-- Driver did not switch back to default port when connected
-  back-to-back (#10422).
-Changes:
-- RlmtMode parameter names have changed
-New features:
-- There is now a version for ALPHA processors
-Known limitations:
-- None
-
-VERSION 1.05
-Problems fixed:
-- Driver failed to load on kernels with version information
-  for module symbols enabled
-Known limitations:
-- None
-
-VERSION 1.04
-Problems fixed:
-- Large frame support does work now (no autonegotiation
-  support for large frames, just manually selectable)
-New Features:
-- Receive checksumming in hardware
-- Performance optimizations
-  Some numbers (on two PII-400 machines, back-to-back):
-  netpipe: 300 MBit/sec, with large frames: 470 MBit/sec
-  ttcp:  38 MByte/sec, with large frames: 60 MByte/sec
-  ttcp (UDP send): 66 MByte/sec, with large frames: 106 MByte/sec
-Known limitations:
-- None
-
-VERSION 1.03
-Problems fixed:
-- Unloading with "rmmod" caused segmentation fault (#10415)
-- The link LED flickered from time to time, if no link was
-  established (#10402)
-- Installation problems with RedHat 6.0 (#10409)
-New Features:
-- Connection state ouput at "network connection up"
-Known limitations:
-- None
-
-VERSION 1.02
-Problems fixed:
-- Failed with multiple adapters
-- Failed with Single Port adapters
-- Startup string was only displayed if adapter found
-- No link could be established on certain switches when the switches were
-  rebooted. (#10377)
-Known limitations:
-- Segmentation fault at "rmmod" with kernel 2.2.3 on some machines
-
-VERSION 1.01
-Problems fixed:
-- Sensor status was not set back to 'ok' after 'warning/error'. (#10386)
-Changes:
-- improved parallelism in driver
-
-VERSION 1.00
-Known limitations:
-- not tested with all kernel versions (I don't have that much time :-)
-- only x86 version available (if you need others, ask for it)
-- source code not completely available
 
 ***End of Readme File***
-
-
-
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/MAINTAINERS linux-2.4.20-wolk4.4-fullkernel/MAINTAINERS
--- linux-2.4.20-wolk4.3-fullkernel/MAINTAINERS	2003-07-30 13:51:07.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/MAINTAINERS	2003-07-30 11:13:04.000000000 +0200
@@ -1651,12 +1651,6 @@ M:	mj@ucw.cz
 L:	linux-video@atrey.karlin.mff.cuni.cz
 S:	Maintained
 
-SYSKONNECT DRIVER
-P: Mirko Lindner
-M: mlindner@syskonnect.de
-W: http://www.syskonnect.com
-S: Supported
-
 SYSV FILESYSTEM
 P:	Christoph Hellwig
 M:	hch@infradead.org
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/Makefile linux-2.4.20-wolk4.4-fullkernel/Makefile
--- linux-2.4.20-wolk4.3-fullkernel/Makefile	2003-07-30 13:52:52.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/Makefile	2003-07-30 11:25:06.000000000 +0200
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 4
 SUBLEVEL = 20
-EXTRAVERSION = -wolk4.3s
+EXTRAVERSION = -wolk4.4s
 
 KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 
@@ -362,9 +362,13 @@ LD_VMLINUX_KALLSYMS	:=
 endif
 
 evfs/efs:
-	make -C evfs efs
+	$(MAKE) -C evfs efs
 
+ifdef CONFIG_EVFS_FS
 vmlinux: include/linux/version.h $(CONFIGURATION) init/main.o init/version.o init/do_mounts.o linuxsubdirs evfs/efs
+else
+vmlinux: include/linux/version.h $(CONFIGURATION) init/main.o init/version.o init/do_mounts.o linuxsubdirs
+endif
 	@$(MAKE) CFLAGS="$(CFLAGS) $(CFLAGS_KERNEL)" kallsyms
 
 .PHONY:	kallsyms
@@ -463,6 +467,7 @@ include/linux/version.h: ./Makefile
 	@echo \#define UTS_RELEASE \"$(KERNELRELEASE)\" > .ver
 	@echo \#define LINUX_VERSION_CODE `expr $(VERSION) \\* 65536 + $(PATCHLEVEL) \\* 256 + $(SUBLEVEL)` >> .ver
 	@echo '#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))' >>.ver
+	@echo \#define WE_ARE_WOLK >>.ver
 	@echo \#define WE_ARE_WOLKS >>.ver
 	@mv -f .ver $@
 
@@ -562,7 +567,6 @@ clean:	archclean
 	rm -f $(CLEAN_FILES)
 	rm -rf $(CLEAN_DIRS)
 	$(MAKE) -C Documentation/DocBook clean
-	$(MAKE) -C fs/ocfs clean
 	$(MAKE) -C evfs clean
 
 mrproper: clean archmrproper
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/VERSION linux-2.4.20-wolk4.4-fullkernel/VERSION
--- linux-2.4.20-wolk4.3-fullkernel/VERSION	2003-07-30 13:52:52.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/VERSION	2003-07-30 11:21:15.000000000 +0200
@@ -1 +1 @@
-WOLK v4.3s "Server Edition" FINAL, based on 2.4.20
+WOLK v4.4s "Server Edition" FINAL, based on 2.4.20
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/WOLK-CHANGELOG linux-2.4.20-wolk4.4-fullkernel/WOLK-CHANGELOG
--- linux-2.4.20-wolk4.3-fullkernel/WOLK-CHANGELOG	2003-07-30 13:52:52.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/WOLK-CHANGELOG	2003-07-30 13:54:40.000000000 +0200
@@ -1,3 +1,82 @@
+Changelog from v4.3s -> v4.4s
+-----------------------------
+o   added:    High Performance Packet Classification (nf-hipac) v0.8 rev2
+o   added:    boost the copy-user asm.
+o   added:    merged IO-Stall fixes from 2.4.22-pre3/4/5/6/7
+o   added:    q->full, defaults to off and keeps the elvtune changes.
+                So to turn on the q->full low latency fixes, you need to:
+                "elvtune -b 1 /dev/xxxx" . Note that for lvm and md, you need
+                to elvtune each underlying device. Running it on an lvm/md
+                device doesn't do anything.
+o   added:    low latency / normal / max throughput - I/O elevator selection.
+o   fixed:    CAN-2003-0461: /proc/tty/driver/serial reveals the exact
+                character counts for serial links. This could be used by a
+                local attacker to infer password lengths and inter-keystroke
+                timings during password entry.
+o   fixed:    CAN-2003-0462: Paul Starzetz discovered a file read race
+                condition existing in the execve() system call, which could
+                cause a local crash.
+o   fixed:    CAN-2003-0476: The execve system call in Linux 2.4.x records
+                the file descriptor of the executable process in the file
+                table of the calling process, allowing local users to gain
+                read access to restricted file descriptors.
+o   fixed:    CAN-2003-0501: The /proc filesystem in Linux allows local users
+                to obtain sensitive information by opening various entries in
+                /proc/self before executing a setuid program. This causes the
+                program to fail to change the ownership and permissions of
+                already opened entries.
+o   fixed:    CAN-2003-0550: The STP protocol is known to have no security,
+                which could allow attackers to alter the bridge topology.
+                STP is now turned off by default.
+o   fixed:    CAN-2003-0551: STP input processing was lax in its length
+                checking, which could lead to a denial of service.
+o   fixed:    CAN-2003-0552: Jerry Kreuscher discovered that the Forwarding
+                table could be spoofed by sending forged packets with bogus
+                source addresses the same as the local host.
+o   fixed:    reduced the number of requests during seeks (the latency times
+                increased slightly during seeks with pre5/pre6).
+o   fixed:    reserved some spare request for reads. This is been measured
+                to avoid some waiting for reads and it's beneficial in the
+                common case
+o   fixed:    copy-namespace
+o   fixed:    RMAP: refill free list in batches, in fixup_freespace
+o   fixed:    RMAP: only wake up kswapd when low on free+clean pages
+o   fixed:    RMAP: in __alloc_pages_limit, first do rmqueue (to use per-cpu
+                      freelist) and fall back to direct_reclaim when needed
+o   fixed:    RMAP: make sure the first stage of page allocation doesn't
+                      upset the zone balancing
+o   fixed:    RANDOM: another SMP deadlock. I really wonder how many (read:
+                      tons * 2^99) deadlocks we have in the Linux kernel!
+                 I am _shouting_ out for a lock free kernel!! ;)
+o   updated:  Oracle Cluster FileSystem (OCFS) v1.0.9-pre Jul 17 2003
+o   updated:  AIO: allow aio on blkdevices too
+o   updated:  smp-timers: merged an anti deadlock fix from lcm, 2.5 probably
+                needs it too. In short the theory that mod_timer is the only
+                thing that can run in parallel was wrong, add_timer and
+                del_timer/del_timer_sync can too. Having already fixed
+                mod_timer in a backwards compatible way before merging the
+                smp-timers in -aa, made it easy to fix those further windows
+                too.
+o   updated:  ksoftirqd: merged a fix from Philip Craig to be sure to make
+                the anti-DoS logic effective. He wrote and verified the code.
+                It makes perfect sense so it's applied. Normal usages
+                shouldn't notice the difference, especially with the
+                max-loop logic.
+o   updated:  Intel E100 driver v2.3.18-k1 + bugfixes from .22-BK
+o   updated:  Intel E1000 driver v5.1.11-k1 + bugfixes from .22-BK
+o   updated:  Broadcom BCM5700 driver v6.2.11
+o   updated:  Broadcom Tigon3 v1.6
+o   updated:  SysKonnect SK-98xx driver v6.12
+o   updated:  HP CISS Driver v2.4.47
+o   updated:  Compaq SMART2 Driver v2.4.25
+o   updated:  raw vary-io 21, including more SCSI driver support
+o   updated:  Super FreeS/WAN v1.99.8 Final
+o   updated:  Qlogic QLA 2x00 v6 FC SCSI support v6.05.60
+o   updated:  3com 3c59x v0.99Za (vanilla ones is over 2 years old)
+o   removed:  LUFS: braindamaged, non-working. Get rid of that shit.
+o   changed:  DRM v4.3 is now seperate from DRM 4.0/4.1/4.2
+
+
 Changelog from v4.2s -> v4.3s
 -----------------------------
 o   add:      allows O_DIRECT writes I/O to run in parallel (not serialized
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/WOLK-README linux-2.4.20-wolk4.4-fullkernel/WOLK-README
--- linux-2.4.20-wolk4.3-fullkernel/WOLK-README	2003-07-30 13:52:52.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/WOLK-README	2003-07-21 13:11:53.000000000 +0200
@@ -1,4 +1,4 @@
-Kernel - patched - WOLK v4.3s - Base: Linux kernel 2.4.20
+Kernel - patched - WOLK v4.4s - Base: Linux kernel 2.4.20
  located at http://sf.net/projects/wolk
  by Marc-Christian Petersen <m.c.p@wolk-project.de>
 --------------------------------------------------------------------------
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/arch/all/Config-TWEAKS.in linux-2.4.20-wolk4.4-fullkernel/arch/all/Config-TWEAKS.in
--- linux-2.4.20-wolk4.3-fullkernel/arch/all/Config-TWEAKS.in	2003-07-30 13:52:42.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/arch/all/Config-TWEAKS.in	2003-07-30 11:25:37.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# O(1) Scheduler, Low Latency, Low Latency Elevator, Preempt, Memory Pools
+# O(1) Scheduler, Low Latency, Low Latency Elevator, Max Throughput Elevator, Preempt, Memory Pools
 #
 mainmenu_option next_comment
 comment 'Scheduler, Low Latency, Preempt - Tweaks'
@@ -13,11 +13,20 @@ if [ "$CONFIG_X86" = "y" -o "$CONFIG_PPC
 fi
 
 
-# Low Latency / Low Latency Elevator
+# Low Latency / Low Latency Elevator / Max Throughput Elevator
 comment 'Low Latency fixes are enabled'
 
-bool 'Low Latency Elevator - Read Latency v2 Edition' CONFIG_BLK_DEV_ELEVATOR_LOWLAT
+if [ "$CONFIG_BLK_DEV_ELEVATOR_LOWLAT" != "y" -a "$CONFIG_BLK_DEV_ELEVATOR_MAXSPEED" != "y" ]; then
+   bool 'Normal I/O Elevator' CONFIG_BLK_DEV_ELEVATOR_NORMAL
+fi
+
+if [ "$CONFIG_BLK_DEV_ELEVATOR_MAXSPEED" != "y" -a "$CONFIG_BLK_DEV_ELEVATOR_NORMAL" != "y" ]; then
+   bool 'Low Latency I/O Elevator' CONFIG_BLK_DEV_ELEVATOR_LOWLAT
+fi
 
+if [ "$CONFIG_BLK_DEV_ELEVATOR_LOWLAT" != "y" -a "$CONFIG_BLK_DEV_ELEVATOR_NORMAL" != "y" ]; then
+   bool 'Max Throughput I/O Elevator' CONFIG_BLK_DEV_ELEVATOR_MAXSPEED
+fi
 
 # Preempt
 if [ "$CONFIG_X86" = "y" -o "$CONFIG_ARM" = "y" -o \
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/arch/i386/kernel/i386_ksyms.c linux-2.4.20-wolk4.4-fullkernel/arch/i386/kernel/i386_ksyms.c
--- linux-2.4.20-wolk4.3-fullkernel/arch/i386/kernel/i386_ksyms.c	2003-07-30 13:51:08.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/arch/i386/kernel/i386_ksyms.c	2003-07-30 11:22:16.000000000 +0200
@@ -112,6 +112,12 @@ EXPORT_SYMBOL(__generic_copy_from_user);
 EXPORT_SYMBOL(__generic_copy_to_user);
 EXPORT_SYMBOL(strnlen_user);
 
+#ifdef CONFIG_X86_INTEL_USERCOPY
+EXPORT_SYMBOL(movsl_mask);
+EXPORT_SYMBOL(__copy_user_int);
+EXPORT_SYMBOL(__copy_user_zeroing_int);
+#endif
+
 EXPORT_SYMBOL(pci_alloc_consistent);
 EXPORT_SYMBOL(pci_free_consistent);
 
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/arch/i386/kernel/setup.c linux-2.4.20-wolk4.4-fullkernel/arch/i386/kernel/setup.c
--- linux-2.4.20-wolk4.3-fullkernel/arch/i386/kernel/setup.c	2003-07-30 13:52:53.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/arch/i386/kernel/setup.c	2003-07-30 11:18:50.000000000 +0200
@@ -150,6 +150,13 @@ unsigned long pci_mem_start = 0x10000000
 static unsigned int highmem_pages __initdata = -1;
 
 /*
+ * Alignment at which movsl is preferred for bulk memory copies
+ */
+#ifdef CONFIG_X86_INTEL_USERCOPY 
+struct movsl_mask movsl_mask;
+#endif 
+
+/*
  * Setup options
  */
 struct drive_info_struct { char dummy[32]; } drive_info;
@@ -2577,6 +2584,23 @@ static void __init init_intel(struct cpu
 
 	}
 #endif
+#ifdef CONFIG_X86_INTEL_USERCOPY 
+   /* 
+    * Set up the preferred alignment for movsl bulk memory moves
+    */
+                switch (c->x86) {
+                case 4:                                 /* 486: untested */
+                                break;
+                case 5:                                 /* Old Pentia: untested*/
+                                break;
+                case 6:                                 /* PII/PIII only like movsl with 8-byte alignment */
+                                movsl_mask.mask = 7;
+                                break;
+                case 7:                                 /* P4 is OK down to 8-byte alignment */
+                               movsl_mask.mask = 7;
+                                break;
+                }
+#endif 
 }
 
 void __init get_cpu_vendor(struct cpuinfo_x86 *c)
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/arch/i386/lib/usercopy.c linux-2.4.20-wolk4.4-fullkernel/arch/i386/lib/usercopy.c
--- linux-2.4.20-wolk4.3-fullkernel/arch/i386/lib/usercopy.c	2001-11-09 22:58:02.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/arch/i386/lib/usercopy.c	2003-07-30 10:28:59.000000000 +0200
@@ -45,8 +45,12 @@ unsigned long
 __generic_copy_to_user(void *to, const void *from, unsigned long n)
 {
 	prefetch(from);
-	if (access_ok(VERIFY_WRITE, to, n))
-		__copy_user(to,from,n);
+        if (access_ok(VERIFY_WRITE, to, n)) {
+              if (movsl_is_ok(to, from, n))
+                     __copy_user(to, from, n);
+               else
+                     n = __copy_user_int(to, from, n);
+         }
 	return n;
 }
 
@@ -54,10 +58,14 @@ unsigned long
 __generic_copy_from_user(void *to, const void *from, unsigned long n)
 {
 	prefetchw(to);
-	if (access_ok(VERIFY_READ, from, n))
-		__copy_user_zeroing(to,from,n);
-	else
-		memset(to, 0, n);
+        if (access_ok(VERIFY_READ, from, n)) {
+             if (movsl_is_ok(to, from, n))
+                   __copy_user_zeroing(to,from,n);
+             else
+                  n = __copy_user_zeroing_int(to, from, n);
+        } else {
+              memset(to, 0, n);
+        }           
 	return n;
 }
 
@@ -188,3 +196,194 @@ long strnlen_user(const char *s, long n)
 		:"cc");
 	return res & mask;
 }
+
+#ifdef CONFIG_X86_INTEL_USERCOPY
+/*
+ * Copy To/From Userspace
+ */
+
+/* Generic arbitrary sized copy.  */
+unsigned long __copy_user_int(void *to, const void *from,unsigned long size)
+{
+                int d0, d1;
+                __asm__ __volatile__(
+                                       "       .align 2,0x90\n"
+                                       "0:     movl 32(%4), %%eax\n"
+                                       "       cmpl $67, %0\n"
+                                       "       jbe 1f\n"
+                                       "       movl 64(%4), %%eax\n"
+                                       "       .align 2,0x90\n"
+                                       "1:     movl 0(%4), %%eax\n"
+                                       "       movl 4(%4), %%edx\n"
+                                       "2:     movl %%eax, 0(%3)\n"
+                                       "21:    movl %%edx, 4(%3)\n"
+                                       "       movl 8(%4), %%eax\n"
+                                       "       movl 12(%4),%%edx\n"
+                                       "3:     movl %%eax, 8(%3)\n"
+                                       "31:    movl %%edx, 12(%3)\n"
+                                       "       movl 16(%4), %%eax\n"
+                                       "       movl 20(%4), %%edx\n"
+                                       "4:     movl %%eax, 16(%3)\n"
+                                       "41:    movl %%edx, 20(%3)\n"
+                                       "       movl 24(%4), %%eax\n"
+                                       "       movl 28(%4), %%edx\n"
+                                       "10:    movl %%eax, 24(%3)\n"
+                                       "51:    movl %%edx, 28(%3)\n"
+                                       "       movl 32(%4), %%eax\n"
+                                       "       movl 36(%4), %%edx\n"
+                                       "11:    movl %%eax, 32(%3)\n"
+                                       "61:    movl %%edx, 36(%3)\n"
+                                       "       movl 40(%4), %%eax\n"
+                                       "       movl 44(%4), %%edx\n"
+                                       "12:    movl %%eax, 40(%3)\n"
+                                       "71:    movl %%edx, 44(%3)\n"
+                                       "       movl 48(%4), %%eax\n"
+                                       "       movl 52(%4), %%edx\n"
+                                       "13:    movl %%eax, 48(%3)\n"
+                                       "81:    movl %%edx, 52(%3)\n"
+                                       "       movl 56(%4), %%eax\n"
+                                       "       movl 60(%4), %%edx\n"
+                                       "14:    movl %%eax, 56(%3)\n"
+                                       "91:    movl %%edx, 60(%3)\n"
+                                       "       addl $-64, %0\n"
+                                       "       addl $64, %4\n"
+                                       "       addl $64, %3\n"
+                                       "       cmpl $63, %0\n"
+                                       "       ja  0b\n"
+                                       "5:     movl  %0, %%eax\n"
+                                       "       shrl  $2, %0\n"
+                                       "       andl  $3, %%eax\n"
+                                       "       cld\n"
+                                       "6:     rep; movsl\n"
+                                       "       movl %%eax, %0\n"
+                                       "7:     rep; movsb\n"
+                                       "8:\n"
+                                       ".section .fixup,\"ax\"\n"
+                                       "9:     lea 0(%%eax,%0,4),%0\n"
+                                       "       jmp 8b\n"
+                                       ".previous\n"
+                                       ".section __ex_table,\"a\"\n"
+                                       "       .align 4\n"
+                                       "       .long 2b,8b\n"
+				       "       .long 21b,8b\n"
+                                       "       .long 3b,8b\n"
+                                       "       .long 31b,8b\n"
+                                       "       .long 4b,8b\n"
+                                       "       .long 41b,8b\n"
+                                       "       .long 10b,8b\n"
+                                       "       .long 51b,8b\n"
+                                       "       .long 11b,8b\n"
+                                       "       .long 61b,8b\n"
+                                       "       .long 12b,8b\n"
+                                       "       .long 71b,8b\n"
+                                       "       .long 13b,8b\n"
+                                       "       .long 81b,8b\n"
+                                       "       .long 14b,8b\n"
+                                       "       .long 91b,8b\n"
+                                       "       .long 6b,9b\n"
+                                       "       .long 7b,8b\n"
+                                       ".previous"
+                                       : "=&c"(size), "=&D" (d0), "=&S" (d1)
+                                       :  "1"(to), "2"(from), "0"(size)
+                                       : "eax", "edx", "memory");
+
+                return size;
+}
+
+unsigned long
+__copy_user_zeroing_int(void *to, const void *from, unsigned long size)
+{
+                int d0, d1;
+                __asm__ __volatile__(
+                                       "        .align 2,0x90\n"
+                                       "0:      movl 32(%4), %%eax\n"
+                                       "        cmpl $67, %0\n"
+                                       "        jbe 2f\n"
+                                       "1:      movl 64(%4), %%eax\n"
+                                       "        .align 2,0x90\n"
+                                       "2:      movl 0(%4), %%eax\n"
+                                       "21:     movl 4(%4), %%edx\n"
+                                       "        movl %%eax, 0(%3)\n"
+                                       "        movl %%edx, 4(%3)\n"
+                                       "3:      movl 8(%4), %%eax\n"
+                                       "31:     movl 12(%4),%%edx\n"
+                                       "        movl %%eax, 8(%3)\n"
+                                       "        movl %%edx, 12(%3)\n"
+                                       "4:      movl 16(%4), %%eax\n"
+                                       "41:     movl 20(%4), %%edx\n"
+                                       "        movl %%eax, 16(%3)\n"
+                                       "        movl %%edx, 20(%3)\n"
+                                       "10:     movl 24(%4), %%eax\n"
+                                       "51:     movl 28(%4), %%edx\n"
+                                       "        movl %%eax, 24(%3)\n"
+                                       "        movl %%edx, 28(%3)\n"
+                                       "11:     movl 32(%4), %%eax\n"
+                                       "61:     movl 36(%4), %%edx\n"
+                                       "        movl %%eax, 32(%3)\n"
+                                       "        movl %%edx, 36(%3)\n"
+                                       "12:     movl 40(%4), %%eax\n"
+                                       "71:     movl 44(%4), %%edx\n"
+                                       "        movl %%eax, 40(%3)\n"
+                                       "        movl %%edx, 44(%3)\n"
+                                       "13:     movl 48(%4), %%eax\n"
+                                       "81:     movl 52(%4), %%edx\n"
+                                       "        movl %%eax, 48(%3)\n"
+				       "        movl %%edx, 52(%3)\n"
+                                       "14:     movl 56(%4), %%eax\n"
+                                       "91:     movl 60(%4), %%edx\n"
+                                       "        movl %%eax, 56(%3)\n"
+                                       "        movl %%edx, 60(%3)\n"
+                                       "        addl $-64, %0\n"
+                                       "        addl $64, %4\n"
+                                       "        addl $64, %3\n"
+                                       "        cmpl $63, %0\n"
+                                       "        ja  0b\n"
+                                       "5:      movl  %0, %%eax\n"
+                                       "        shrl  $2, %0\n"
+                                       "        andl $3, %%eax\n"
+                                       "        cld\n"
+                                       "6:      rep; movsl\n"
+                                       "        movl %%eax,%0\n"
+                                       "7:      rep; movsb\n"
+                                       "8:\n"
+                                       ".section .fixup,\"ax\"\n"
+                                       "9:      lea 0(%%eax,%0,4),%0\n"
+                                       "16:     pushl %0\n"
+                                       "        pushl %%eax\n"
+                                       "        xorl %%eax,%%eax\n"
+                                       "        rep; stosb\n"
+                                       "        popl %%eax\n"
+                                       "        popl %0\n"
+                                       "        jmp 8b\n"
+                                       ".previous\n"
+                                       ".section __ex_table,\"a\"\n"
+                                       "                .align 4\n"
+                                       "                .long 0b,16b\n"
+                                       "                .long 1b,16b\n"
+                                       "                .long 2b,16b\n"
+                                       "                .long 21b,16b\n"
+                                       "                .long 3b,16b\n"
+                                       "                .long 31b,16b\n"
+                                       "                .long 4b,16b\n"
+                                       "                .long 41b,16b\n"
+                                       "                .long 10b,16b\n"
+                                       "                .long 51b,16b\n"
+                                       "                .long 11b,16b\n"
+                                       "                .long 61b,16b\n"
+                                       "                .long 12b,16b\n"
+                                       "                .long 71b,16b\n"
+                                       "                .long 13b,16b\n"
+                                       "                .long 81b,16b\n"
+                                       "                .long 14b,16b\n"
+                                       "                .long 91b,16b\n"
+                                       "                .long 6b,9b\n"
+                                       "                .long 7b,16b\n"
+                                       ".previous"
+                                       : "=&c"(size), "=&D" (d0), "=&S" (d1)
+                                       :  "1"(to), "2"(from), "0"(size)
+                                       : "eax", "edx", "memory");
+                return size;
+}
+#endif          /* CONFIG_X86_INTEL_USERCOPY */
+
+
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/arch/i386/mm/init.c linux-2.4.20-wolk4.4-fullkernel/arch/i386/mm/init.c
--- linux-2.4.20-wolk4.3-fullkernel/arch/i386/mm/init.c	2003-07-30 13:52:53.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/arch/i386/mm/init.c	2003-07-30 11:18:40.000000000 +0200
@@ -621,9 +621,17 @@ void free_initmem(void)
 		gdt_table[2].a = (gdt_table[2].a & 0xFFFF0000UL) | (limit & 0x0FFFFUL);
 		gdt_table[2].b = (gdt_table[2].b & 0xFFF0FFFFUL) | (limit & 0xF0000UL);
 
+		/* PaX: nuke __FLAT_KERNEL_CS, no longer needed */
+		gdt_table[1].a = 0UL;
+		gdt_table[1].b = 0UL;
+
 #ifdef CONFIG_GRKERNSEC_PAX_SEGMEXEC
 		gdt_table2[2].a = (gdt_table2[2].a & 0xFFFF0000UL) | (limit & 0x0FFFFUL);
 		gdt_table2[2].b = (gdt_table2[2].b & 0xFFF0FFFFUL) | (limit & 0xF0000UL);
+
+		/* PaX: nuke __FLAT_KERNEL_CS, no longer needed */
+		gdt_table2[1].a = 0UL;
+		gdt_table2[1].b = 0UL;
 #endif
 
 	/* PaX: make KERNEL_CS read-only */
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/arch/ia64/kernel/smp.c linux-2.4.20-wolk4.4-fullkernel/arch/ia64/kernel/smp.c
--- linux-2.4.20-wolk4.3-fullkernel/arch/ia64/kernel/smp.c	2002-12-18 01:03:46.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/arch/ia64/kernel/smp.c	2003-07-30 10:27:56.000000000 +0200
@@ -304,6 +304,7 @@ smp_do_timer (struct pt_regs *regs)
 	if (--local_cpu_data->prof_counter <= 0) {
 		local_cpu_data->prof_counter = local_cpu_data->prof_multiplier;
 		update_process_times(user);
+		run_local_timers();
 	}
 }
 
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/arch/ia64/kernel/traps.c linux-2.4.20-wolk4.4-fullkernel/arch/ia64/kernel/traps.c
--- linux-2.4.20-wolk4.3-fullkernel/arch/ia64/kernel/traps.c	2002-12-18 01:03:46.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/arch/ia64/kernel/traps.c	2003-07-30 10:27:56.000000000 +0200
@@ -41,8 +41,6 @@ register double f30 asm ("f30"); registe
 
 #include <asm/fpswa.h>
 
-extern spinlock_t timerlist_lock;
-
 static fpswa_interface_t *fpswa_interface;
 
 void __init
@@ -66,7 +64,6 @@ trap_init (void)
 void
 bust_spinlocks (int yes)
 {
-	spin_lock_init(&timerlist_lock);
 	if (yes) {
 		oops_in_progress = 1;
 #ifdef CONFIG_SMP
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/arch/x86_64/kernel/apic.c linux-2.4.20-wolk4.4-fullkernel/arch/x86_64/kernel/apic.c
--- linux-2.4.20-wolk4.3-fullkernel/arch/x86_64/kernel/apic.c	2002-12-18 01:03:49.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/arch/x86_64/kernel/apic.c	2003-07-30 10:27:56.000000000 +0200
@@ -991,6 +991,9 @@ void smp_apic_timer_interrupt(struct pt_
 	smp_local_timer_interrupt(regs);
 	irq_exit(cpu, 0);
 
+#if CONFIG_SMP
+        run_local_timers();
+#endif
 	if (softirq_pending(cpu))
 		do_softirq();
 }
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/arch/x86_64/mm/fault.c linux-2.4.20-wolk4.4-fullkernel/arch/x86_64/mm/fault.c
--- linux-2.4.20-wolk4.3-fullkernel/arch/x86_64/mm/fault.c	2003-07-30 13:51:17.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/arch/x86_64/mm/fault.c	2003-07-30 10:30:18.000000000 +0200
@@ -34,7 +34,6 @@ extern spinlock_t console_lock, timerlis
 
 void bust_spinlocks(int yes)
 {
- 	spin_lock_init(&timerlist_lock);
 	if (yes) {
 		oops_in_progress = 1;
 #ifdef CONFIG_SMP
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/block/Config-elevator.in linux-2.4.20-wolk4.4-fullkernel/drivers/block/Config-elevator.in
--- linux-2.4.20-wolk4.3-fullkernel/drivers/block/Config-elevator.in	2003-07-30 13:51:22.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/block/Config-elevator.in	1970-01-01 01:00:00.000000000 +0100
@@ -1,10 +0,0 @@
-#
-# Elevator configuration
-#
-mainmenu_option next_comment
-comment 'Elevator'
-
-bool 'Low Latency Elevator - Read Latency v2 Edition' CONFIG_BLK_DEV_ELEVATOR_LOWLAT
-
-endmenu
-
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/block/blkpg.c linux-2.4.20-wolk4.4-fullkernel/drivers/block/blkpg.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/block/blkpg.c	2003-07-30 13:52:43.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/block/blkpg.c	2003-07-30 11:23:31.000000000 +0200
@@ -261,11 +261,10 @@ int blk_ioctl(kdev_t dev, unsigned int c
 			return blkpg_ioctl(dev, (struct blkpg_ioctl_arg *) arg);
 			
 		case BLKELVGET:
-			blk_print_stats(dev);
-			return blkelvget_ioctl(&blk_get_queue(dev)->elevator,
+			return blkelvget_ioctl(blk_get_queue(dev),
 					       (blkelv_ioctl_arg_t *) arg);
 		case BLKELVSET:
-			return blkelvset_ioctl(&blk_get_queue(dev)->elevator,
+			return blkelvset_ioctl(blk_get_queue(dev),
 					       (blkelv_ioctl_arg_t *) arg);
 
 		case BLKBSZGET:
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/block/cciss.c linux-2.4.20-wolk4.4-fullkernel/drivers/block/cciss.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/block/cciss.c	2003-07-30 13:51:23.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/block/cciss.c	2003-07-30 10:30:55.000000000 +0200
@@ -44,12 +44,12 @@
 #include <linux/genhd.h>
 
 #define CCISS_DRIVER_VERSION(maj,min,submin) ((maj<<16)|(min<<8)|(submin))
-#define DRIVER_NAME "HP CISS Driver (v 2.4.44)"
-#define DRIVER_VERSION CCISS_DRIVER_VERSION(2,4,44)
+#define DRIVER_NAME "HP CISS Driver (v 2.4.47)"
+#define DRIVER_VERSION CCISS_DRIVER_VERSION(2,4,47)
 
 /* Embedded module documentation macros - see modules.h */
 MODULE_AUTHOR("Charles M. White III - Hewlett-Packard Company");
-MODULE_DESCRIPTION("Driver for HP SA5xxx SA6xxx Controllers version 2.4.44");
+MODULE_DESCRIPTION("Driver for HP SA5xxx SA6xxx Controllers version 2.4.47");
 MODULE_SUPPORTED_DEVICE("HP SA5i SA5i+ SA532 SA5300 SA5312 SA641 SA642 SA6400"); 
 MODULE_LICENSE("GPL");
 
@@ -92,12 +92,13 @@ static struct board_type products[] = {
 	{ 0x40830E11, "Smart Array 5312", &SA5B_access},
 	{ 0x409A0E11, "Smart Array 641", &SA5_access},
 	{ 0x409B0E11, "Smart Array 642", &SA5_access},
-	{ 0x409C0E11, "Smart Array 6402", &SA5_access},
-	{ 0x409C0E11, "Smart Array 6404/256", &SA5_access},
+	{ 0x409C0E11, "Smart Array 6400", &SA5_access},
+	{ 0x409D0E11, "Smart Array 6400 EM", &SA5_access},
 };
 
 /* How long to wait (in millesconds) for board to go into simple mode */
-#define MAX_CONFIG_WAIT 1000 
+#define MAX_CONFIG_WAIT 30000 
+#define MAX_IOCTL_CONFIG_WAIT 1000
 
 /*define how many times we will try a command because of bus resets */
 #define MAX_CMD_RETRIES 3
@@ -106,7 +107,7 @@ static struct board_type products[] = {
 #define NR_CMDS		 128 /* #commands that can be outstanding */
 #define MAX_CTLR 8
 
-#define CCISS_DMA_MASK	0xFFFFFFFF	/* 32 bit DMA */
+#define CCISS_DMA_MASK 0xFFFFFFFFFFFFFFFF /* 64 bit DMA */
 
 static ctlr_info_t *hba[MAX_CTLR];
 
@@ -581,7 +582,7 @@ static int cciss_ioctl(struct inode *ino
                         &(c->cfgtable->HostWrite.CoalIntCount));
 		writel( CFGTBL_ChangeReq, c->vaddr + SA5_DOORBELL);
 
-		for(i=0;i<MAX_CONFIG_WAIT;i++) {
+		for(i=0;i<MAX_IOCTL_CONFIG_WAIT;i++) {
 			if (!(readl(c->vaddr + SA5_DOORBELL) 
 					& CFGTBL_ChangeReq))
 				break;
@@ -589,8 +590,11 @@ static int cciss_ioctl(struct inode *ino
 			udelay(1000);
 		}	
 		spin_unlock_irqrestore(&io_request_lock, flags);
-		if (i >= MAX_CONFIG_WAIT)
-			return -EFAULT;
+		if (i >= MAX_IOCTL_CONFIG_WAIT)
+			/* there is an unlikely case where this can happen,
+			 * involving hot replacing a failed 144 GB drive in a 
+			 * RAID 5 set just as we attempt this ioctl. */
+			return -EAGAIN;
                 return 0;
         }
 	case CCISS_GETNODENAME:
@@ -630,7 +634,7 @@ static int cciss_ioctl(struct inode *ino
 			
 		writel( CFGTBL_ChangeReq, c->vaddr + SA5_DOORBELL);
 
-		for(i=0;i<MAX_CONFIG_WAIT;i++) {
+		for(i=0;i<MAX_IOCTL_CONFIG_WAIT;i++) {
 			if (!(readl(c->vaddr + SA5_DOORBELL) 
 					& CFGTBL_ChangeReq))
 				break;
@@ -638,8 +642,11 @@ static int cciss_ioctl(struct inode *ino
 			udelay(1000);
 		}	
 		spin_unlock_irqrestore(&io_request_lock, flags);
-		if (i >= MAX_CONFIG_WAIT)
-			return -EFAULT;
+		if (i >= MAX_IOCTL_CONFIG_WAIT)
+			/* there is an unlikely case where this can happen,
+			 * involving hot replacing a failed 144 GB drive in a 
+			 * RAID 5 set just as we attempt this ioctl. */
+			return -EAGAIN;
                 return 0;
         }
 
@@ -2453,7 +2460,9 @@ static int find_PCI_BAR_index(struct pci
 				case PCI_BASE_ADDRESS_MEM_TYPE_64:
 					offset += 8;
 					break;
-				case PCI_BASE_ADDRESS_MEM_PREFETCH:
+				default: /* reserved in PCI 2.2 */
+					printk(KERN_WARNING "Base address is invalid\n");
+					return -1;	
 				break;
 			}
 		}
@@ -2465,19 +2474,21 @@ static int find_PCI_BAR_index(struct pci
 			
 static int cciss_pci_init(ctlr_info_t *c, struct pci_dev *pdev)
 {
-	ushort vendor_id, device_id, command;
-	unchar cache_line_size, latency_timer;
-	unchar irq, revision;
+	ushort subsystem_vendor_id, subsystem_device_id, command;
+	unchar irq = pdev->irq;
 	__u32 board_id;
 	__u64 cfg_offset;
 	__u32 cfg_base_addr;
 	__u64 cfg_base_addr_index;
 	int i;
 
-	vendor_id = pdev->vendor;
-	device_id = pdev->device;
-	irq = pdev->irq;
-
+	/* check to see if controller has been disabled */
+	/* BEFORE we try to enable it */
+	(void) pci_read_config_word(pdev, PCI_COMMAND,&command);
+	if (!(command & 0x02)) {
+		printk(KERN_WARNING "cciss: controller appears to be disabled\n");
+		return -1;
+	}
 	if (pci_enable_device(pdev)) {
 		printk(KERN_ERR "cciss: Unable to Enable PCI device\n");
 		return -1;
@@ -2487,21 +2498,12 @@ static int cciss_pci_init(ctlr_info_t *c
 		return -1;
 	}
 	
-	(void) pci_read_config_word(pdev, PCI_COMMAND,&command);
-	(void) pci_read_config_byte(pdev, PCI_CLASS_REVISION, &revision);
-	(void) pci_read_config_byte(pdev, PCI_CACHE_LINE_SIZE,
-						&cache_line_size);
-	(void) pci_read_config_byte(pdev, PCI_LATENCY_TIMER,
-						&latency_timer);
+	subsystem_vendor_id = pdev->subsystem_vendor;
+	subsystem_device_id = pdev->subsystem_device;
+	board_id = (((__u32) (subsystem_device_id << 16) & 0xffff0000) |
+					subsystem_vendor_id );
 
-	(void) pci_read_config_dword(pdev, PCI_SUBSYSTEM_VENDOR_ID, 
-						&board_id);
 
-	/* check to see if controller has been disabled */
-	if (!(command & 0x02)) {
-		printk(KERN_WARNING "cciss: controller appears to be disabled\n");
-		return -1;
-	}
 	/* search for our IO range so we can protect it */
 	for (i=0; i<DEVICE_COUNT_RESOURCE; i++) {
 		/* is this an IO range */
@@ -2528,15 +2530,8 @@ static int cciss_pci_init(ctlr_info_t *c
 	}
 
 #ifdef CCISS_DEBUG
-	printk("vendor_id = %x\n", vendor_id);
-	printk("device_id = %x\n", device_id);
 	printk("command = %x\n", command);
-	for(i=0; i<6; i++)
-		printk("addr[%d] = %x\n", i, pci_resource_start(pdev, i);
-	printk("revision = %x\n", revision);
 	printk("irq = %x\n", irq);
-	printk("cache_line_size = %x\n", cache_line_size);
-	printk("latency_timer = %x\n", latency_timer);
 	printk("board_id = %x\n", board_id);
 #endif /* CCISS_DEBUG */ 
 
@@ -2613,11 +2608,17 @@ static int cciss_pci_init(ctlr_info_t *c
 		&(c->cfgtable->HostWrite.TransportRequest));
 	writel( CFGTBL_ChangeReq, c->vaddr + SA5_DOORBELL);
 
+	/* Here, we wait, possibly for a long time, (4 secs or more). 
+	 * In some unlikely cases, (e.g. A failed 144 GB drive in a 
+	 * RAID 5 set was hot replaced just as we're coming in here) it 
+	 * can take that long.  Normally (almost always) we will wait 
+	 * less than 1 sec. */
 	for(i=0;i<MAX_CONFIG_WAIT;i++) {
 		if (!(readl(c->vaddr + SA5_DOORBELL) & CFGTBL_ChangeReq))
 			break;
 		/* delay and try again */
-		udelay(1000);
+		set_current_state(TASK_INTERRUPTIBLE);
+		schedule_timeout(1);
 	}	
 
 #ifdef CCISS_DEBUG
@@ -2861,15 +2862,6 @@ static int __init cciss_init_one(struct 
 	hba[i]->ctlr = i;
 	hba[i]->pdev = pdev;
 
-	/* configure PCI DMA stuff */
-	if (!pci_set_dma_mask(pdev, (u64) 0xffffffff))
-		printk("cciss: not using DAC cycles\n");
-	else {
-		printk("cciss: no suitable DMA available\n");
-		free_hba(i);
-		return -ENODEV;
-	}
-		
 	if (register_blkdev(MAJOR_NR+i, hba[i]->devname, &cciss_fops)) {
 		printk(KERN_ERR "cciss:  Unable to get major number "
 			"%d for %s\n", MAJOR_NR+i, hba[i]->devname);
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/block/cciss_scsi.c linux-2.4.20-wolk4.4-fullkernel/drivers/block/cciss_scsi.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/block/cciss_scsi.c	2003-07-30 13:51:23.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/block/cciss_scsi.c	2003-07-30 10:30:55.000000000 +0200
@@ -1182,6 +1182,12 @@ cciss_update_non_disk_devices(int cntl_n
 		{
 		  case 0x01: /* sequential access, (tape) */
 		  case 0x08: /* medium changer */
+			if (ncurrent >= CCISS_MAX_SCSI_DEVS_PER_HBA) {
+				printk(KERN_INFO "cciss%d: %s ignored, "
+					"too many devices.\n", cntl_num,
+					DEVICETYPE(devtype));
+				break;
+			}
 			memcpy(&currentsd[ncurrent].scsi3addr[0],
 				&scsi3addr[0], 8);
 			currentsd[ncurrent].devtype = devtype;
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/block/elevator.c linux-2.4.20-wolk4.4-fullkernel/drivers/block/elevator.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/block/elevator.c	2003-07-30 13:52:43.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/block/elevator.c	2003-07-30 11:23:31.000000000 +0200
@@ -77,6 +77,12 @@ inline int bh_rq_in_between(struct buffe
 static int rq_mergeable(struct request *req, struct buffer_head *bh,
 			request_queue_t *q, int rw, int count, int max_sectors)
 {
+	if (q->head_active && !q->plugged) {
+		struct request *next;
+		next = blkdev_entry_next_request(&q->queue_head);
+		if (next == req)
+			return 0;
+	}
 	if (q->head_active)
 		return 0;
 	if (req->waiting)
@@ -99,12 +105,9 @@ int elevator_linus_merge(request_queue_t
 			 int max_sectors)
 {
 	struct list_head *entry, *real_head;
-	unsigned int count = bh->b_size >> 9;
-	unsigned int ret = ELEVATOR_NO_MERGE;
-	const int max_bomb_segments = q->elevator.max_bomb_segments;
+	unsigned int count = bh->b_size >> 9, ret = ELEVATOR_NO_MERGE;
 	struct request *__rq;
 	int backmerge_only = 0;
-	int passed_a_read = 0;
 
 	if (!bh_elv_seq(bh))
 		entry = &q->queue_head;
@@ -137,14 +140,13 @@ int elevator_linus_merge(request_queue_t
 		/*
 		 * we can't insert beyond a zero sequence point
 		 */
-		if (__rq->elevator_sequence-- <= 0 && !bh_elv_seq(bh)) {
+		if (__rq->elevator_sequence <= 0 && !bh_elv_seq(bh))
 			/*
 			 * OK, we've exceeded someone's latency limit.
 			 * But we still continue to look for merges,
 			 * because they're so much better than seeks.
 			 */
 			backmerge_only = 1;
-		}
 
 		if (__rq->waiting)
 			continue;
@@ -152,8 +154,6 @@ int elevator_linus_merge(request_queue_t
 			continue;
 		if (!*req && bh_rq_in_between(bh, __rq, real_head) && !backmerge_only)
 			*req = __rq;
-		if (__rq->cmd != WRITE)
-			passed_a_read = 1;
 		if (__rq->cmd != rw)
 			continue;
 		if (__rq->nr_sectors + count > max_sectors)
@@ -196,57 +196,6 @@ out:
 		}
 	}
 
-	/*
-	 * If we failed to merge a read anywhere in the request
-	 * queue, we really don't want to place it at the end
-	 * of the list, behind lots of writes.  So place it near
-	 * the front.
-	 *
-	 * We don't want to place it in front of _all_ writes: that
-	 * would create lots of seeking, and isn't tunable.
-	 * We try to avoid promoting this read in front of existing
-	 * reads.
-	 *
-	 * max_bomb_segments becomes the maximum number of write
-	 * requests which we allow to remain in place in front of
-	 * a newly introduced read.  We weight things a little bit,
-	 * so large writes are more expensive than small ones, but it's
-	 * requests which count, not sectors.
-	 */
-	if (max_bomb_segments && rw == READ && !passed_a_read &&
-				ret == ELEVATOR_NO_MERGE) {
-		int cur_latency = 0;
-		struct request * const cur_request = *req;
-
-		entry = head->next;
-		while (entry != &q->queue_head) {
-			struct request *__rq;
-
-			if (entry == &q->queue_head)
-				BUG();
-			if (entry == q->queue_head.next &&
-					q->head_active && !q->plugged)
-				BUG();
-			__rq = blkdev_entry_to_request(entry);
-
-			if (__rq == cur_request) {
-				/*
-				 * This is where the old algorithm placed it.
-				 * There's no point pushing it further back,
-				 * so leave it here, in sorted order.
-				 */
-				break;
-			}
-			if (__rq->cmd == WRITE) {
-				cur_latency += 1 + __rq->nr_sectors / 64;
-				if (cur_latency >= max_bomb_segments) {
-					*req = __rq;
-					break;
-				}
-			}
-			entry = entry->next;
-		}
-	}
 	return ret;
 }
 
@@ -309,23 +258,28 @@ int elevator_noop_merge(request_queue_t 
 
 void elevator_noop_merge_req(struct request *req, struct request *next) {}
 
-int blkelvget_ioctl(elevator_t * elevator, blkelv_ioctl_arg_t * arg)
+int blkelvget_ioctl(request_queue_t *q, blkelv_ioctl_arg_t * arg)
 {
+	elevator_t *elevator = &q->elevator;
 	blkelv_ioctl_arg_t output;
 
 	output.queue_ID			= elevator->queue_ID;
 	output.read_latency		= elevator->read_latency;
 	output.write_latency		= elevator->write_latency;
-	output.max_bomb_segments	= elevator->max_bomb_segments;
-
+	output.max_bomb_segments	= q->max_queue_sectors;
+	if (q->low_latency)
+		output.max_bomb_segments |= MAX_BOMB_LATENCY_MASK;	
+	else
+		output.max_bomb_segments &= ~MAX_BOMB_LATENCY_MASK;	
 	if (copy_to_user(arg, &output, sizeof(blkelv_ioctl_arg_t)))
 		return -EFAULT;
 
 	return 0;
 }
 
-int blkelvset_ioctl(elevator_t * elevator, const blkelv_ioctl_arg_t * arg)
+int blkelvset_ioctl(request_queue_t *q, const blkelv_ioctl_arg_t * arg)
 {
+	elevator_t *elevator = &q->elevator;
 	blkelv_ioctl_arg_t input;
 
 	if (copy_from_user(&input, arg, sizeof(blkelv_ioctl_arg_t)))
@@ -340,7 +294,14 @@ int blkelvset_ioctl(elevator_t * elevato
 
 	elevator->read_latency		= input.read_latency;
 	elevator->write_latency		= input.write_latency;
-	elevator->max_bomb_segments	= input.max_bomb_segments;
+	q->low_latency = input.max_bomb_segments & MAX_BOMB_LATENCY_MASK ? 1:0;
+	printk("queue %d: low latency mode is now %s\n", elevator->queue_ID, 
+		q->low_latency ? "on" : "off");
+	input.max_bomb_segments &= ~MAX_BOMB_LATENCY_MASK;
+	if (input.max_bomb_segments)
+		q->max_queue_sectors = input.max_bomb_segments;
+	printk("queue %d: max queue sectors is now %d\n", elevator->queue_ID, 
+		q->max_queue_sectors);
 	return 0;
 }
 
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/block/ida_ioctl.h linux-2.4.20-wolk4.4-fullkernel/drivers/block/ida_ioctl.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/block/ida_ioctl.h	2003-07-30 13:51:23.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/block/ida_ioctl.h	2003-07-30 10:30:55.000000000 +0200
@@ -34,7 +34,7 @@
 #define IDADEREGDISK		0x33333434
 #define IDAREGNEWDISK		0x34343535
 #define IDAGETLOGINFO		0x35353636
-#define IDABIGPASSTHRU		0x36363535
+#define IDABIGPASSTHRU          0x36363535
 
 typedef struct _ida_pci_info_struct
 {
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/block/ll_rw_blk.c linux-2.4.20-wolk4.4-fullkernel/drivers/block/ll_rw_blk.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/block/ll_rw_blk.c	2003-07-30 13:52:53.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/block/ll_rw_blk.c	2003-07-30 11:23:31.000000000 +0200
@@ -116,7 +116,7 @@ int * hardsect_size[MAX_BLKDEV];
 int * max_readahead[MAX_BLKDEV];
 
 /*
- * Max number of sectors per request
+ *teax number of sectors per request
  */
 int * max_sectors[MAX_BLKDEV];
 
@@ -239,11 +239,12 @@ void blk_cleanup_queue(request_queue_t *
 {
 	int count = q->nr_requests;
 
-	count -= __blk_cleanup_queue(&q->rq[READ]);
-	count -= __blk_cleanup_queue(&q->rq[WRITE]);
+	count -= __blk_cleanup_queue(&q->rq);
 
 	if (count)
 		printk("blk_cleanup_queue: leaked requests (%d)\n", count);
+	if (atomic_read(&q->nr_sectors))
+		printk("blk_cleanup_queue: leaked sectors (%d)\n", atomic_read(&q->nr_sectors));
 
 	memset(q, 0, sizeof(*q));
 }
@@ -278,6 +279,24 @@ void blk_queue_headactive(request_queue_
 }
 
 /**
+ * blk_queue_throttle_sectors - indicates you will call sector throttling funcs
+ * @q:       The queue which this applies to.
+ * @active:  A flag indication if you want sector throttling on
+ *
+ * Description:
+ * The sector throttling code allows us to put a limit on the number of
+ * sectors pending io to the disk at a given time, sending @active nonzero
+ * indicates you will call blk_started_sectors and blk_finished_sectors in
+ * addition to calling blk_started_io and blk_finished_io in order to
+ * keep track of the number of sectors in flight.
+ **/
+ 
+void blk_queue_throttle_sectors(request_queue_t * q, int active)
+{
+	q->can_throttle = active;
+}
+
+/**
  * blk_queue_make_request - define an alternate make_request function for a device
  * @q:  the request queue for the device to be affected
  * @mfn: the alternate make_request function
@@ -426,6 +445,20 @@ static inline void __generic_unplug_devi
 	if (q->plugged) {
 		q->plugged = 0;
 		if (!list_empty(&q->queue_head)) {
+
+			/* we don't want merges later on to come in
+			 * and significantly increase the amount of
+			 * work during an unplug, it can lead to high
+			 * latencies while some poor waiter tries to
+			 * run an ever increasing chunk of io.
+			 * This does lower throughput some though.
+			 */
+			if (q->low_latency) {
+				struct request *rq;
+				rq = blkdev_entry_prev_request(&q->queue_head),
+				rq->elevator_sequence = 0;
+			}
+
 			next = blkdev_entry_next_request(&q->queue_head);
 
 			if (next == q->last_merge)
@@ -545,7 +578,7 @@ void blk_refile_atomic_queue(int sequenc
  *
  * Returns the (new) number of requests which the queue has available.
  */
-int blk_grow_request_list(request_queue_t *q, int nr_requests)
+int blk_grow_request_list(request_queue_t *q, int nr_requests, int max_queue_sectors)
 {
 	unsigned long flags;
 	/* Several broken drivers assume that this function doesn't sleep,
@@ -555,21 +588,34 @@ int blk_grow_request_list(request_queue_
 	spin_lock_irqsave(q->queue_lock, flags);
 	while (q->nr_requests < nr_requests) {
 		struct request *rq;
-		int rw;
 
 		rq = kmem_cache_alloc(request_cachep, SLAB_ATOMIC);
 		if (rq == NULL)
 			break;
 		memset(rq, 0, sizeof(*rq));
 		rq->rq_status = RQ_INACTIVE;
-		rw = q->nr_requests & 1;
-		list_add(&rq->queue, &q->rq[rw].free);
-		q->rq[rw].count++;
+ 		list_add(&rq->queue, &q->rq.free);
+ 		q->rq.count++;
+
 		q->nr_requests++;
 	}
+
+ 	/*
+ 	 * Wakeup waiters after both one quarter of the
+ 	 * max-in-fligh queue and one quarter of the requests
+ 	 * are available again.
+ 	 */
+
 	q->batch_requests = q->nr_requests / 4;
 	if (q->batch_requests > 32)
 		q->batch_requests = 32;
+ 	q->batch_sectors = max_queue_sectors / 4;
+ 
+ 	q->max_queue_sectors = max_queue_sectors;
+ 
+ 	BUG_ON(!q->batch_sectors);
+ 	atomic_set(&q->nr_sectors, 0);
+
 	spin_unlock_irqrestore(q->queue_lock, flags);
 	return q->nr_requests;
 }
@@ -578,81 +624,27 @@ static void blk_init_free_list(request_q
 {
 	struct sysinfo si;
 	int megs;		/* Total memory, in megabytes */
-	int nr_requests;
-
-	INIT_LIST_HEAD(&q->rq[READ].free);
-	INIT_LIST_HEAD(&q->rq[WRITE].free);
-	q->rq[READ].count = 0;
-	q->rq[WRITE].count = 0;
+ 	int nr_requests, max_queue_sectors = MAX_QUEUE_SECTORS;
+  
+ 	INIT_LIST_HEAD(&q->rq.free);
+	q->rq.count = 0;
+	q->rq.pending[READ] = q->rq.pending[WRITE] = 0;
 	q->nr_requests = 0;
 
 	si_meminfo(&si);
 	megs = si.totalram >> (20 - PAGE_SHIFT);
+ 	nr_requests = MAX_NR_REQUESTS;
+ 	if (megs < 30) {
+  		nr_requests /= 2;
+ 		max_queue_sectors /= 2;
+ 	}
+ 	/* notice early if anybody screwed the defaults */
+ 	BUG_ON(!nr_requests);
+ 	BUG_ON(!max_queue_sectors);
+ 
+ 	blk_grow_request_list(q, nr_requests, max_queue_sectors);
 
-#ifndef CONFIG_BLK_DEV_ELEVATOR_LOWLAT
-	nr_requests = (megs * 2) & ~15; /* One per half-megabyte */
-	if (nr_requests < 32)
-		nr_requests = 32;
-	if (nr_requests > 1024)
-		nr_requests = 1024;
-#else
-	nr_requests = 16;
-#endif
-	blk_grow_request_list(q, nr_requests);
-
-	init_waitqueue_head(&q->wait_for_requests[0]);
-	init_waitqueue_head(&q->wait_for_requests[1]);
-}
-
-void blk_print_stats(kdev_t dev) 
-{
-	request_queue_t *q;
-	unsigned long avg_wait;
-	unsigned long min_wait;
-	unsigned long high_wait;
-	unsigned long *d;
-
-	q = blk_get_queue(dev);
-	if (!q)
-		return;
-
-	min_wait = q->min_wait;
-	if (min_wait == ~0UL)
-		min_wait = 0;
-	if (q->num_wait) 
-		avg_wait = q->total_wait / q->num_wait;
-	else
-		avg_wait = 0;
-	printk("device %s: num_req %lu, total jiffies waited %lu\n", 
-	       kdevname(dev), q->num_req, q->total_wait);
-	printk("\t%lu forced to wait\n", q->num_wait);
-	printk("\t%lu min wait, %lu max wait\n", min_wait, q->max_wait);
-	printk("\t%lu average wait\n", avg_wait);
-	d = q->deviation;
-	printk("\t%lu < 100, %lu < 200, %lu < 300, %lu < 400, %lu < 500\n",
-               d[0], d[1], d[2], d[3], d[4]);
-	high_wait = d[0] + d[1] + d[2] + d[3] + d[4];
-	high_wait = q->num_wait - high_wait;
-	printk("\t%lu waits longer than 500 jiffies\n", high_wait);
-}
-
-static void reset_stats(request_queue_t *q)
-{
-	q->max_wait		= 0;
-	q->min_wait		= ~0UL;
-	q->total_wait		= 0;
-	q->num_req		= 0;
-	q->num_wait		= 0;
-	memset(q->deviation, 0, sizeof(q->deviation));
-}
-void blk_reset_stats(kdev_t dev) 
-{
-	request_queue_t *q;
-	q = blk_get_queue(dev);
-	if (!q)
-	    return;
-	printk("reset latency stats on device %s\n", kdevname(dev));
-	reset_stats(q);
+ 	init_waitqueue_head(&q->wait_for_requests);
 }
 
 static int __make_request(request_queue_t * q, int rw, struct buffer_head * bh);
@@ -707,10 +699,11 @@ void blk_init_queue(request_queue_t * q,
 	q->plug_tq.routine	= &generic_unplug_device;
 	q->plug_tq.data		= q;
 	q->plugged        	= 0;
+	q->full			= 0;
+	q->can_throttle		= 0;
+	q->low_latency		= 0;
 	q->last_merge		= NULL;
 
-	reset_stats(q);
-
 	/*
 	 * These booleans describe the queue properties.  We set the
 	 * default (and most common) values here.  Other drivers can
@@ -727,48 +720,77 @@ void blk_init_queue(request_queue_t * q,
  * Get a free request. io_request_lock must be held and interrupts
  * disabled on the way in.  Returns NULL if there are no free requests.
  */
-static struct request *get_request(request_queue_t *q, int rw)
+static struct request *__get_request(request_queue_t *q, int rw)
 {
 	struct request *rq = NULL;
-	struct request_list *rl = q->rq + rw;
+	struct request_list *rl = &q->rq;
+
+	if (blk_oversized_queue(q)) {
+		int rlim = q->nr_requests >> 5;
+
+		if (rlim < 4)
+			rlim = 4;
 
+		/*
+		 * if its a write, or we have more than a handful of reads
+		 * pending, bail out
+		 */
+		if ((rw == WRITE) || (rw == READ && rl->pending[READ] > rlim))
+			return NULL;
+		if (blk_oversized_queue_reads(q))
+			return NULL;
+	}
+	
 	if (!list_empty(&rl->free)) {
 		rq = blkdev_free_rq(&rl->free);
 		list_del(&rq->queue);
 		rl->count--;
+		rl->pending[rw]++;
 		rq->rq_status = RQ_ACTIVE;
 		rq->cmd = rw;
 		rq->special = NULL;
 		rq->q = q;
-	}
-
+	} else if (q->low_latency)
+		q->full = 1;
 	return rq;
 }
 
 /*
- * Here's the request allocation design:
+ * get a free request, honoring the queue_full condition
+ */
+static inline struct request *get_request(request_queue_t *q, int rw)
+{
+	if (q->full)
+		return NULL;
+	return __get_request(q, rw);
+}
+
+/*
+ * helper func to do memory barriers and wakeups when we finally decide
+ * to clear the queue full condition
+ */
+static inline void clear_full_and_wake(request_queue_t *q)
+{
+	q->full = 0;
+	mb();
+	if (waitqueue_active(&q->wait_for_requests))
+		wake_up(&q->wait_for_requests);
+}
+
+/*
+ * Here's the request allocation design, low latency version:
  *
  * 1: Blocking on request exhaustion is a key part of I/O throttling.
  * 
  * 2: We want to be `fair' to all requesters.  We must avoid starvation, and
  *    attempt to ensure that all requesters sleep for a similar duration.  Hence
  *    no stealing requests when there are other processes waiting.
- * 
- * 3: We also wish to support `batching' of requests.  So when a process is
- *    woken, we want to allow it to allocate a decent number of requests
- *    before it blocks again, so they can be nicely merged (this only really
- *    matters if the process happens to be adding requests near the head of
- *    the queue).
- * 
- * 4: We want to avoid scheduling storms.  This isn't really important, because
- *    the system will be I/O bound anyway.  But it's easy.
- * 
- *    There is tension between requirements 2 and 3.  Once a task has woken,
- *    we don't want to allow it to sleep as soon as it takes its second request.
- *    But we don't want currently-running tasks to steal all the requests
- *    from the sleepers.  We handle this with wakeup hysteresis around
- *    0 .. batch_requests and with the assumption that request taking is much,
- *    much faster than request freeing.
+ *
+ * There used to be more here, attempting to allow a process to send in a
+ * number of requests once it has woken up.  But, there's no way to 
+ * tell if a process has just been woken up, or if it is a new process
+ * coming in to steal requests from the waiters.  So, we give up and force
+ * everyone to wait fairly.
  * 
  * So here's what we do:
  * 
@@ -780,72 +802,52 @@ static struct request *get_request(reque
  * 
  *  When a process wants a new request:
  * 
- *    b) If free_requests == 0, the requester sleeps in FIFO manner.
- * 
- *    b) If 0 <  free_requests < batch_requests and there are waiters,
- *       we still take a request non-blockingly.  This provides batching.
- *
- *    c) If free_requests >= batch_requests, the caller is immediately
- *       granted a new request.
+ *    b) If free_requests == 0, the requester sleeps in FIFO manner, and
+ *       the queue full condition is set.  The full condition is not
+ *       cleared until there are no longer any waiters.  Once the full
+ *       condition is set, all new io must wait, hopefully for a very
+ *       short period of time.
  * 
  *  When a request is released:
  * 
- *    d) If free_requests < batch_requests, do nothing.
+ *    c) If free_requests < batch_requests, do nothing.
  * 
- *    f) If free_requests >= batch_requests, wake up a single waiter.
- * 
- *   The net effect is that when a process is woken at the batch_requests level,
- *   it will be able to take approximately (batch_requests) requests before
- *   blocking again (at the tail of the queue).
- * 
- *   This all assumes that the rate of taking requests is much, much higher
- *   than the rate of releasing them.  Which is very true.
+ *    d) If free_requests >= batch_requests, wake up a single waiter.
  *
- * -akpm, Feb 2002.
+ *   As each waiter gets a request, he wakes another waiter.  We do this
+ *   to prevent a race where an unplug might get run before a request makes
+ *   it's way onto the queue.  The result is a cascade of wakeups, so delaying
+ *   the initial wakeup until we've got batch_requests available helps avoid
+ *   wakeups where there aren't any requests available yet.
  */
 
 static struct request *__get_request_wait(request_queue_t *q, int rw)
 {
 	register struct request *rq;
-	unsigned long wait_start = jiffies;
-	unsigned long time_waited;
 	DECLARE_WAITQUEUE(wait, current);
+	int oversized;
+
+	add_wait_queue_exclusive(&q->wait_for_requests, &wait);
 
-#ifdef CONFIG_SCHED_DESKTOP
-	add_wait_queue(&q->wait_for_requests[rw], &wait);
-#else
-	add_wait_queue_exclusive(&q->wait_for_requests[rw], &wait);
-#endif
 	do {
 		set_current_state(TASK_UNINTERRUPTIBLE);
-		if (q->rq[rw].count == 0) {
-			/*
-			 * All we care about is not to stall if any request
-			 * is been released after we set TASK_UNINTERRUPTIBLE.
-			 * This is the most efficient place to unplug the queue
-			 * in case we hit the race and we can get the request
-			 * without waiting.
-			 */
-			generic_unplug_device(q);
+		spin_lock_irq(q->queue_lock);
+		oversized = blk_oversized_queue(q) || q->rq.count == 0;
+		if (q->full || oversized) {
+			if (oversized)
+				__generic_unplug_device(q);
+			spin_unlock_irq(q->queue_lock);
 			schedule();
+			spin_lock_irq(q->queue_lock);
 		}
-		spin_lock_irq(q->queue_lock);
-		rq = get_request(q, rw);
+		rq = __get_request(q, rw);
 		spin_unlock_irq(q->queue_lock);
 	} while (rq == NULL);
-	remove_wait_queue(&q->wait_for_requests[rw], &wait);
+	remove_wait_queue(&q->wait_for_requests, &wait);
 	current->state = TASK_RUNNING;
 
-	time_waited = jiffies - wait_start;
-	if (time_waited > q->max_wait)
-		q->max_wait = time_waited;
-	if (time_waited && time_waited < q->min_wait)
-		q->min_wait = time_waited;
-	q->total_wait += time_waited;
-	q->num_wait++;
-	if (time_waited < 500) {
-		q->deviation[time_waited/100]++;
-	}
+	if (!waitqueue_active(&q->wait_for_requests))
+		clear_full_and_wake(q);
 
 	return rq;
 }
@@ -856,9 +858,9 @@ static void get_request_wait_wakeup(requ
 	 * avoid losing an unplug if a second __get_request_wait did the
 	 * generic_unplug_device while our __get_request_wait was running
 	 * w/o the queue_lock held and w/ our request out of the queue.
-	 */
-	if (q->rq[rw].count == 0 && waitqueue_active(&q->wait_for_requests[rw]))
-		__generic_unplug_device(q);
+	 */	
+	if (waitqueue_active(&q->wait_for_requests))
+		wake_up(&q->wait_for_requests);
 }
 
 /* RO fail safe mechanism */
@@ -1072,7 +1074,6 @@ static inline void add_request(request_q
 void blkdev_release_request(struct request *req)
 {
 	request_queue_t *q = req->q;
-	int rw = req->cmd;
 
 	req->rq_status = RQ_INACTIVE;
 	req->q = NULL;
@@ -1081,24 +1082,32 @@ void blkdev_release_request(struct reque
 	 * Request may not have originated from ll_rw_blk. if not,
 	 * assume it has free buffers and check waiters
 	 */
-	if (q && (rw == READ || rw == WRITE)) {
-		list_add(&req->queue, &q->rq[rw].free);
-
-#ifdef CONFIG_SCHED_DESKTOP
-		if (++q->rq[rw].count >= q->batch_requests) {
-			smp_mb();
-			wake_up(&q->wait_for_requests[rw]);
-		}
-
-#else
-		if (++q->rq[rw].count >= q->batch_requests) {
+	if (q) {
+		struct request_list *rl = &q->rq;
+		int oversized_batch = 0;
+
+		if (q->can_throttle)
+			oversized_batch = blk_oversized_queue_batch(q);
+		rl->count++;
+		/*
+		 * paranoia check
+		 */
+		if (req->cmd == READ || req->cmd == WRITE)
+			rl->pending[req->cmd]--;
+		if (rl->pending[READ] > q->nr_requests)
+			printk("reads: %u\n", rl->pending[READ]);
+		if (rl->pending[WRITE] > q->nr_requests)
+			printk("writes: %u\n", rl->pending[WRITE]);
+		if (rl->pending[READ] + rl->pending[WRITE] > q->nr_requests)
+			printk("too many: %u + %u > %u\n", rl->pending[READ], rl->pending[WRITE], q->nr_requests);
+		list_add(&req->queue, &rl->free);
+		if (rl->count >= q->batch_requests && !oversized_batch) {
 			smp_mb();
-			if (waitqueue_active(&q->wait_for_requests[rw]))
-				wake_up(&q->wait_for_requests[rw]);
+			if (waitqueue_active(&q->wait_for_requests))
+				wake_up(&q->wait_for_requests);
+			else
+				clear_full_and_wake(q);
 		}
-
-#endif /* CONFIG_SCHED_DESKTOP */
-
 	}
 }
 
@@ -1172,18 +1181,19 @@ static inline void attempt_front_merge(r
 static int __make_request(request_queue_t * q, int rw,
 				  struct buffer_head * bh)
 {
-	int need_unplug = 0;
-	unsigned int sector, count;
+	unsigned int sector, count, sync;
 	int max_segments = MAX_SEGMENTS;
 	struct request * req, *freereq = NULL;
 	int rw_ahead, max_sectors, el_ret;
 	struct list_head *head, *real_head, *insert_here;
 	int latency;
 	elevator_t *elevator = &q->elevator;
+	int should_wake = 0;
 	int atomic = bh_elv_seq(bh), atomic_add = 0;
 
 	count = bh->b_size >> 9;
 	sector = bh->b_rsector;
+	sync = test_and_clear_bit(BH_Sync, &bh->b_state);
 
 	rw_ahead = 0;	/* normal case; gets changed below for READA */
 	switch (rw) {
@@ -1231,6 +1241,7 @@ static int __make_request(request_queue_
 
 again:
 	insert_here = head->prev;
+
 	if (!atomic) {
 		if (list_empty(head)) {
 			q->plug_device_fn(q, bh->b_rdev); /* is atomic */
@@ -1252,6 +1263,7 @@ again:
 			req->bhtail = bh;
 			req->nr_sectors = req->hard_nr_sectors += count;
 			blk_started_io(count);
+			blk_started_sectors(req, count);
 			drive_stat_acct(req->rq_dev, req->cmd, count, 0);
 			req_new_io(req, 1, count);
 			attempt_back_merge(q, real_head, req, max_sectors, max_segments);
@@ -1274,6 +1286,7 @@ again:
 			req->sector = req->hard_sector = sector;
 			req->nr_sectors = req->hard_nr_sectors += count;
 			blk_started_io(count);
+			blk_started_sectors(req, count);
 			drive_stat_acct(req->rq_dev, req->cmd, count, 0);
 			req_new_io(req, 1, count);
 			attempt_front_merge(q, head, req, max_sectors, max_segments);
@@ -1306,7 +1319,7 @@ get_rq:
 		 * See description above __get_request_wait()
 		 */
 		if (rw_ahead) {
-			if (q->rq[rw].count < q->batch_requests) {
+			if (q->rq.count < q->batch_requests || blk_oversized_queue_batch(q)) {
 				spin_unlock_irq(q->queue_lock);
 				goto end_io;
 			}
@@ -1321,7 +1334,7 @@ get_rq:
 					blk_refile_atomic_queue(atomic);
 				freereq = __get_request_wait(q, rw);
 				head = real_head;
-				need_unplug = 1;
+				should_wake = 1;
 				spin_lock_irq(q->queue_lock);
 				goto again;
 			}
@@ -1344,15 +1357,17 @@ get_rq:
 	req->rq_dev = bh->b_rdev;
 	req->start_time = jiffies;
 	req_new_io(req, 0, count);
-	q->num_req++;
 	blk_started_io(count);
+	blk_started_sectors(req, count);
 	add_request(q, req, insert_here);
 	atomic_add = atomic;
 out:
 	if (freereq)
 		blkdev_release_request(freereq);
-	if (need_unplug)
+	if (should_wake)
 		get_request_wait_wakeup(q, rw);
+	if (sync)
+		__generic_unplug_device(q);
 	spin_unlock_irq(q->queue_lock);
 	if (atomic_add)
 		blk_atomic_add(q);
@@ -1490,12 +1505,6 @@ void __submit_bh(int rw, struct buffer_h
 	bh->b_rdev = bh->b_dev;
 	bh->b_rsector = blocknr;
 
-	/*
-	 * Really we could read random memory in the waitqueue
-	 * check and as worse we would trigger a false positive
-	 * queue unplug, however getting the reference
-	 * on the bh and reading allocated memory is cleaner.
-	 */
 	get_bh(bh);
 	generic_make_request(rw, bh);
 
@@ -1503,8 +1512,8 @@ void __submit_bh(int rw, struct buffer_h
 	smp_mb(); /* spin_unlock may have inclusive semantics */
 	if (waitqueue_active(&bh->b_wait))
 		run_task_queue(&tq_disk);
-	put_bh(bh);
 
+	put_bh(bh);
 	switch (rw) {
 		case WRITE:
 			kstat.pgpgout += count;
@@ -1656,6 +1665,7 @@ int end_that_request_first (struct reque
 	if ((bh = req->bh) != NULL) {
 		nsect = bh->b_size >> 9;
 		blk_finished_io(nsect);
+		blk_finished_sectors(req, nsect);
 		req->bh = bh->b_reqnext;
 		bh->b_reqnext = NULL;
 		bh->b_end_io(bh, uptodate);
@@ -1825,6 +1835,7 @@ EXPORT_SYMBOL(blk_init_queue);
 EXPORT_SYMBOL(blk_get_queue);
 EXPORT_SYMBOL(blk_cleanup_queue);
 EXPORT_SYMBOL(blk_queue_headactive);
+EXPORT_SYMBOL(blk_queue_throttle_sectors);
 EXPORT_SYMBOL(blk_queue_make_request);
 EXPORT_SYMBOL(generic_make_request);
 EXPORT_SYMBOL(blkdev_release_request);
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/DRM-Config.in linux-2.4.20-wolk4.4-fullkernel/drivers/char/DRM-Config.in
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/DRM-Config.in	2003-07-30 13:51:23.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/DRM-Config.in	2003-07-30 11:18:33.000000000 +0200
@@ -2,14 +2,20 @@ mainmenu_option next_comment
 comment 'Direct Rendering Manager (XFree86 DRI support)'
 bool 'Direct Rendering Manager (XFree86 DRI support)' CONFIG_DRM
 if [ "$CONFIG_DRM" = "y" ]; then
-   bool '  Build drivers for old (XFree 4.0) DRM' CONFIG_DRM_OLD
-   if [ "$CONFIG_DRM_OLD" = "y" ]; then
-      comment 'DRM 4.0 drivers'
-      source drivers/char/drm-4.0/Config.in
+   bool '  Build drivers for XFree 4.3 DRM' CONFIG_DRM_43
+   if [ "$CONFIG_DRM_43" = "y" ]; then
+      comment 'DRM 4.3 drivers'
+      source drivers/char/drm-4.3/Config.in
    else
-      comment 'DRM 4.1 drivers'   
-      define_bool CONFIG_DRM_NEW y
-      source drivers/char/drm/Config.in
+      bool '  Build drivers for XFree 4.1 DRM' CONFIG_DRM_41
+      if [ "$CONFIG_DRM_41" = "y" ]; then
+         comment 'DRM 4.1 drivers'
+         source drivers/char/drm/Config.in
+      else
+         define_bool CONFIG_DRM_40 y
+         comment 'DRM 4.0 drivers'
+         source drivers/char/drm-4.0/Config.in
+      fi
    fi
 fi
 endmenu
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/Makefile linux-2.4.20-wolk4.4-fullkernel/drivers/char/Makefile
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/Makefile	2003-07-30 13:51:23.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/Makefile	2003-07-30 11:18:33.000000000 +0200
@@ -26,7 +26,7 @@ export-objs     :=	busmouse.o console.o 
 			sonypi.o tty_io.o tty_ioctl.o generic_serial.o \
 			au1000_gpio.o hp_psaux.o nvram.o rtc.o scx200.o
 
-mod-subdirs	:=	joystick ftape drm drm-4.0 pcmcia ibmasm omnibook
+mod-subdirs	:=	joystick ftape drm-4.3 drm drm-4.0 pcmcia ibmasm omnibook
 
 list-multi	:=	
 
@@ -254,8 +254,9 @@ obj-$(CONFIG_COBALT_LCD) += lcd.o
 obj-$(CONFIG_QIC02_TAPE) += tpqic02.o
 
 subdir-$(CONFIG_FTAPE) += ftape
-subdir-$(CONFIG_DRM_OLD) += drm-4.0
-subdir-$(CONFIG_DRM_NEW) += drm
+subdir-$(CONFIG_DRM_43) += drm-4.3
+subdir-$(CONFIG_DRM_41) += drm
+subdir-$(CONFIG_DRM_40) += drm-4.0
 subdir-$(CONFIG_PCMCIA) += pcmcia
 subdir-$(CONFIG_AGP) += agp
 
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/Makefile linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/Makefile
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/Makefile	2003-07-30 13:51:23.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/Makefile	2002-12-18 01:03:50.000000000 +0100
@@ -10,9 +10,9 @@ tdfx-objs   := tdfx_drv.o
 r128-objs   := r128_drv.o r128_cce.o r128_state.o
 mga-objs    := mga_drv.o mga_dma.o mga_state.o mga_warp.o
 i810-objs   := i810_drv.o i810_dma.o
-i830-objs   := i830_drv.o i830_dma.o i830_irq.o
+i830-objs   := i830_drv.o i830_dma.o
 
-radeon-objs := radeon_drv.o radeon_cp.o radeon_state.o radeon_mem.o radeon_irq.o
+radeon-objs := radeon_drv.o radeon_cp.o radeon_state.o
 ffb-objs    := ffb_drv.o ffb_context.o
 sis-objs    := sis_drv.o sis_ds.o sis_mm.o
 
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/drm.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/drm.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/drm.h	2003-07-30 13:51:23.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/drm.h	2002-12-29 18:51:09.000000000 +0100
@@ -38,27 +38,10 @@
 #if defined(__linux__)
 #include <linux/config.h>
 #include <asm/ioctl.h>		/* For _IO* macros */
-#define DRM_IOCTL_NR(n)		_IOC_NR(n)
-#define DRM_IOC_VOID		_IOC_NONE
-#define DRM_IOC_READ		_IOC_READ
-#define DRM_IOC_WRITE		_IOC_WRITE
-#define DRM_IOC_READWRITE	_IOC_READ|_IOC_WRITE
-#define DRM_IOC(dir, group, nr, size) _IOC(dir, group, nr, size)
-#elif defined(__FreeBSD__) || defined(__NetBSD__)
-#if defined(__FreeBSD__) && defined(XFree86Server)
-/* Prevent name collision when including sys/ioccom.h */
-#undef ioctl
+#define DRM_IOCTL_NR(n)	     _IOC_NR(n)
+#elif defined(__FreeBSD__)
 #include <sys/ioccom.h>
-#define ioctl(a,b,c)		xf86ioctl(a,b,c)
-#else
-#include <sys/ioccom.h>
-#endif /* __FreeBSD__ && xf86ioctl */
-#define DRM_IOCTL_NR(n)		((n) & 0xff)
-#define DRM_IOC_VOID		IOC_VOID
-#define DRM_IOC_READ		IOC_OUT
-#define DRM_IOC_WRITE		IOC_IN
-#define DRM_IOC_READWRITE	IOC_INOUT
-#define DRM_IOC(dir, group, nr, size) _IOC(dir, group, nr, size)
+#define DRM_IOCTL_NR(n)	     ((n) & 0xff)
 #endif
 
 #define XFREE86_VERSION(major,minor,patch,snap) \
@@ -101,10 +84,6 @@ typedef unsigned int  drm_magic_t;
 /* Warning: If you change this structure, make sure you change
  * XF86DRIClipRectRec in the server as well */
 
-/* KW: Actually it's illegal to change either for
- * backwards-compatibility reasons.
- */
-
 typedef struct drm_clip_rect {
 	unsigned short	x1;
 	unsigned short	y1;
@@ -353,32 +332,6 @@ typedef struct drm_irq_busid {
 	int funcnum;
 } drm_irq_busid_t;
 
-typedef enum {
-    _DRM_VBLANK_ABSOLUTE = 0x0,		/* Wait for specific vblank sequence number */
-    _DRM_VBLANK_RELATIVE = 0x1,		/* Wait for given number of vblanks */
-    _DRM_VBLANK_SIGNAL   = 0x40000000	/* Send signal instead of blocking */
-} drm_vblank_seq_type_t;
-
-#define _DRM_VBLANK_FLAGS_MASK _DRM_VBLANK_SIGNAL
-
-struct drm_wait_vblank_request {
-	drm_vblank_seq_type_t type;
-	unsigned int sequence;
-	unsigned long signal;
-};
-
-struct drm_wait_vblank_reply {
-	drm_vblank_seq_type_t type;
-	unsigned int sequence;
-	long tval_sec;
-	long tval_usec;
-};
-
-typedef union drm_wait_vblank {
-	struct drm_wait_vblank_request request;
-	struct drm_wait_vblank_reply reply;
-} drm_wait_vblank_t;
-
 typedef struct drm_agp_mode {
 	unsigned long mode;
 } drm_agp_mode_t;
@@ -418,9 +371,10 @@ typedef struct drm_scatter_gather {
 
 #define DRM_IOCTL_BASE			'd'
 #define DRM_IO(nr)			_IO(DRM_IOCTL_BASE,nr)
-#define DRM_IOR(nr,type)		_IOR(DRM_IOCTL_BASE,nr,type)
-#define DRM_IOW(nr,type)		_IOW(DRM_IOCTL_BASE,nr,type)
-#define DRM_IOWR(nr,type)		_IOWR(DRM_IOCTL_BASE,nr,type)
+#define DRM_IOR(nr,size)		_IOR(DRM_IOCTL_BASE,nr,size)
+#define DRM_IOW(nr,size)		_IOW(DRM_IOCTL_BASE,nr,size)
+#define DRM_IOWR(nr,size)		_IOWR(DRM_IOCTL_BASE,nr,size)
+
 
 #define DRM_IOCTL_VERSION		DRM_IOWR(0x00, drm_version_t)
 #define DRM_IOCTL_GET_UNIQUE		DRM_IOWR(0x01, drm_unique_t)
@@ -473,10 +427,86 @@ typedef struct drm_scatter_gather {
 #define DRM_IOCTL_SG_ALLOC		DRM_IOW( 0x38, drm_scatter_gather_t)
 #define DRM_IOCTL_SG_FREE		DRM_IOW( 0x39, drm_scatter_gather_t)
 
-#define DRM_IOCTL_WAIT_VBLANK		DRM_IOWR(0x3a, drm_wait_vblank_t)
-
-/* Device specfic ioctls should only be in their respective headers
- * The device specific ioctl range is 0x40 to 0x79.                  */
-#define DRM_COMMAND_BASE                0x40
+/* MGA specific ioctls */
+#define DRM_IOCTL_MGA_INIT		DRM_IOW( 0x40, drm_mga_init_t)
+#define DRM_IOCTL_MGA_FLUSH		DRM_IOW( 0x41, drm_lock_t)
+#define DRM_IOCTL_MGA_RESET		DRM_IO(  0x42)
+#define DRM_IOCTL_MGA_SWAP		DRM_IO(  0x43)
+#define DRM_IOCTL_MGA_CLEAR		DRM_IOW( 0x44, drm_mga_clear_t)
+#define DRM_IOCTL_MGA_VERTEX		DRM_IOW( 0x45, drm_mga_vertex_t)
+#define DRM_IOCTL_MGA_INDICES		DRM_IOW( 0x46, drm_mga_indices_t)
+#define DRM_IOCTL_MGA_ILOAD		DRM_IOW( 0x47, drm_mga_iload_t)
+#define DRM_IOCTL_MGA_BLIT		DRM_IOW( 0x48, drm_mga_blit_t)
+
+/* i810 specific ioctls */
+#define DRM_IOCTL_I810_INIT		DRM_IOW( 0x40, drm_i810_init_t)
+#define DRM_IOCTL_I810_VERTEX		DRM_IOW( 0x41, drm_i810_vertex_t)
+#define DRM_IOCTL_I810_CLEAR		DRM_IOW( 0x42, drm_i810_clear_t)
+#define DRM_IOCTL_I810_FLUSH		DRM_IO(  0x43)
+#define DRM_IOCTL_I810_GETAGE		DRM_IO(  0x44)
+#define DRM_IOCTL_I810_GETBUF		DRM_IOWR(0x45, drm_i810_dma_t)
+#define DRM_IOCTL_I810_SWAP		DRM_IO(  0x46)
+#define DRM_IOCTL_I810_COPY		DRM_IOW( 0x47, drm_i810_copy_t)
+#define DRM_IOCTL_I810_DOCOPY		DRM_IO(  0x48)
+#define DRM_IOCTL_I810_OV0INFO		DRM_IOR( 0x49, drm_i810_overlay_t)
+#define DRM_IOCTL_I810_FSTATUS		DRM_IO ( 0x4a)
+#define DRM_IOCTL_I810_OV0FLIP		DRM_IO ( 0x4b)
+#define DRM_IOCTL_I810_MC		DRM_IOW( 0x4c, drm_i810_mc_t)
+#define DRM_IOCTL_I810_RSTATUS		DRM_IO ( 0x4d )
+
+
+/* Rage 128 specific ioctls */
+#define DRM_IOCTL_R128_INIT		DRM_IOW( 0x40, drm_r128_init_t)
+#define DRM_IOCTL_R128_CCE_START	DRM_IO(  0x41)
+#define DRM_IOCTL_R128_CCE_STOP		DRM_IOW( 0x42, drm_r128_cce_stop_t)
+#define DRM_IOCTL_R128_CCE_RESET	DRM_IO(  0x43)
+#define DRM_IOCTL_R128_CCE_IDLE		DRM_IO(  0x44)
+#define DRM_IOCTL_R128_RESET		DRM_IO(  0x46)
+#define DRM_IOCTL_R128_SWAP		DRM_IO(  0x47)
+#define DRM_IOCTL_R128_CLEAR		DRM_IOW( 0x48, drm_r128_clear_t)
+#define DRM_IOCTL_R128_VERTEX		DRM_IOW( 0x49, drm_r128_vertex_t)
+#define DRM_IOCTL_R128_INDICES		DRM_IOW( 0x4a, drm_r128_indices_t)
+#define DRM_IOCTL_R128_BLIT		DRM_IOW( 0x4b, drm_r128_blit_t)
+#define DRM_IOCTL_R128_DEPTH		DRM_IOW( 0x4c, drm_r128_depth_t)
+#define DRM_IOCTL_R128_STIPPLE		DRM_IOW( 0x4d, drm_r128_stipple_t)
+#define DRM_IOCTL_R128_INDIRECT		DRM_IOWR(0x4f, drm_r128_indirect_t)
+#define DRM_IOCTL_R128_FULLSCREEN	DRM_IOW( 0x50, drm_r128_fullscreen_t)
+
+/* Radeon specific ioctls */
+#define DRM_IOCTL_RADEON_CP_INIT	DRM_IOW( 0x40, drm_radeon_init_t)
+#define DRM_IOCTL_RADEON_CP_START	DRM_IO(  0x41)
+#define DRM_IOCTL_RADEON_CP_STOP	DRM_IOW( 0x42, drm_radeon_cp_stop_t)
+#define DRM_IOCTL_RADEON_CP_RESET	DRM_IO(  0x43)
+#define DRM_IOCTL_RADEON_CP_IDLE	DRM_IO(  0x44)
+#define DRM_IOCTL_RADEON_RESET		DRM_IO(  0x45)
+#define DRM_IOCTL_RADEON_FULLSCREEN	DRM_IOW( 0x46, drm_radeon_fullscreen_t)
+#define DRM_IOCTL_RADEON_SWAP		DRM_IO(  0x47)
+#define DRM_IOCTL_RADEON_CLEAR		DRM_IOW( 0x48, drm_radeon_clear_t)
+#define DRM_IOCTL_RADEON_VERTEX		DRM_IOW( 0x49, drm_radeon_vertex_t)
+#define DRM_IOCTL_RADEON_INDICES	DRM_IOW( 0x4a, drm_radeon_indices_t)
+#define DRM_IOCTL_RADEON_STIPPLE	DRM_IOW( 0x4c, drm_radeon_stipple_t)
+#define DRM_IOCTL_RADEON_INDIRECT	DRM_IOWR(0x4d, drm_radeon_indirect_t)
+#define DRM_IOCTL_RADEON_TEXTURE	DRM_IOWR(0x4e, drm_radeon_texture_t)
+
+/* SiS specific ioctls */
+#define SIS_IOCTL_FB_ALLOC		DRM_IOWR(0x44, drm_sis_mem_t)
+#define SIS_IOCTL_FB_FREE		DRM_IOW( 0x45, drm_sis_mem_t)
+#define SIS_IOCTL_AGP_INIT		DRM_IOWR(0x53, drm_sis_agp_t)
+#define SIS_IOCTL_AGP_ALLOC		DRM_IOWR(0x54, drm_sis_mem_t)
+#define SIS_IOCTL_AGP_FREE		DRM_IOW( 0x55, drm_sis_mem_t)
+#define SIS_IOCTL_FLIP			DRM_IOW( 0x48, drm_sis_flip_t)
+#define SIS_IOCTL_FLIP_INIT		DRM_IO(  0x49)
+#define SIS_IOCTL_FLIP_FINAL		DRM_IO(  0x50)
+
+/* I830 specific ioctls */
+#define DRM_IOCTL_I830_INIT		DRM_IOW( 0x40, drm_i830_init_t)
+#define DRM_IOCTL_I830_VERTEX		DRM_IOW( 0x41, drm_i830_vertex_t)
+#define DRM_IOCTL_I830_CLEAR		DRM_IOW( 0x42, drm_i830_clear_t)
+#define DRM_IOCTL_I830_FLUSH		DRM_IO ( 0x43)
+#define DRM_IOCTL_I830_GETAGE		DRM_IO ( 0x44)
+#define DRM_IOCTL_I830_GETBUF		DRM_IOWR(0x45, drm_i830_dma_t)
+#define DRM_IOCTL_I830_SWAP		DRM_IO ( 0x46)
+#define DRM_IOCTL_I830_COPY		DRM_IOW( 0x47, drm_i830_copy_t)
+#define DRM_IOCTL_I830_DOCOPY		DRM_IO ( 0x48)
 
 #endif
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/drmP.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/drmP.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/drmP.h	2003-07-30 13:51:23.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/drmP.h	2003-05-22 23:50:11.000000000 +0200
@@ -53,7 +53,6 @@
 #include <linux/sched.h>
 #include <linux/smp_lock.h>	/* For (un)lock_kernel */
 #include <linux/mm.h>
-#include <linux/pagemap.h>
 #if defined(__alpha__) || defined(__powerpc__)
 #include <asm/pgtable.h> /* For pte_wrprotect */
 #endif
@@ -72,7 +71,10 @@
 #include <asm/pgalloc.h>
 #include "drm.h"
 
-#include "drm_os_linux.h"
+/* page_to_bus for earlier kernels, not optimal in all cases */
+#ifndef page_to_bus
+#define page_to_bus(page)	((unsigned int)(virt_to_bus(page_address(page))))
+#endif
 
 /* DRM template customization defaults
  */
@@ -207,7 +209,6 @@ static inline unsigned long __cmpxchg(vo
 				 (unsigned long)(n),sizeof(*(ptr))))
 #endif /* i386 & alpha */
 #endif
-#define __REALLY_HAVE_SG	(__HAVE_SG)
 
 /* Begin the DRM...
  */
@@ -250,58 +251,41 @@ static inline unsigned long __cmpxchg(vo
 
 #define DRM_MAX_CTXBITMAP (PAGE_SIZE * 8)
 
-				/* Backward compatibility section */
-#ifndef minor
-#define minor(x) MINOR((x))
-#endif
+#define VM_OFFSET(vma) ((vma)->vm_pgoff << PAGE_SHIFT)
 
-#ifndef MODULE_LICENSE
-#define MODULE_LICENSE(x) 
-#endif
+/* Macros to make printk easier */
 
+#if ( __GNUC__ > 2 )
 
-#ifndef pte_offset_map 
-#define pte_offset_map pte_offset
-#define pte_unmap(pte)
-#endif
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,19)
-static inline struct page * vmalloc_to_page(void * vmalloc_addr)
-{
-	unsigned long addr = (unsigned long) vmalloc_addr;
-	struct page *page = NULL;
-	pgd_t *pgd = pgd_offset_k(addr);
-	pmd_t *pmd;
-	pte_t *ptep, pte;
-  
-	if (!pgd_none(*pgd)) {
-		pmd = pmd_offset(pgd, addr);
-		if (!pmd_none(*pmd)) {
-			ptep = pte_offset_map(pmd, addr);
-			pte = *ptep;
-			if (pte_present(pte))
-				page = pte_page(pte);
-			pte_unmap(ptep);
-		}
-	}
-	return page;
-}
-#endif
+#define DRM_ERROR(fmt, arg...) \
+	printk(KERN_ERR "[" DRM_NAME ":%s] *ERROR* " fmt , __FUNCTION__, ##arg)
+#define DRM_MEM_ERROR(area, fmt, arg...) \
+	printk(KERN_ERR "[" DRM_NAME ":%s:%s] *ERROR* " fmt , __FUNCTION__, \
+	       DRM(mem_stats)[area].name , ##arg)
+#define DRM_INFO(fmt, arg...)  printk(KERN_INFO "[" DRM_NAME "] " fmt , ##arg)
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-#define DRM_RPR_ARG(vma)
+#if DRM_DEBUG_CODE
+#define DRM_DEBUG(fmt, arg...)						\
+	do {								\
+		if ( DRM(flags) & DRM_FLAG_DEBUG )			\
+			printk(KERN_DEBUG				\
+			       "[" DRM_NAME ":%s] " fmt ,		\
+			       __FUNCTION__,				\
+			       ##arg);					\
+	} while (0)
 #else
-#define DRM_RPR_ARG(vma) vma,
+#define DRM_DEBUG(fmt, arg...)		 do { } while (0)
 #endif
 
+#else	/* Gcc 2.x */
 
-#define VM_OFFSET(vma) ((vma)->vm_pgoff << PAGE_SHIFT)
+/* Work around a C preprocessor bug */
 
 				/* Macros to make printk easier */
 #define DRM_ERROR(fmt, arg...) \
-	printk(KERN_ERR "[" DRM_NAME ":%s] *ERROR* " fmt , __FUNCTION__ , ##arg)
+	printk(KERN_ERR "[" DRM_NAME ":" __FUNCTION__ "] *ERROR* " fmt , ##arg)
 #define DRM_MEM_ERROR(area, fmt, arg...) \
-	printk(KERN_ERR "[" DRM_NAME ":%s:%s] *ERROR* " fmt , __FUNCTION__, \
+	printk(KERN_ERR "[" DRM_NAME ":" __FUNCTION__ ":%s] *ERROR* " fmt , \
 	       DRM(mem_stats)[area].name , ##arg)
 #define DRM_INFO(fmt, arg...)  printk(KERN_INFO "[" DRM_NAME "] " fmt , ##arg)
 
@@ -310,13 +294,16 @@ static inline struct page * vmalloc_to_p
 	do {								\
 		if ( DRM(flags) & DRM_FLAG_DEBUG )			\
 			printk(KERN_DEBUG				\
-			       "[" DRM_NAME ":%s] " fmt ,	\
-			       __FUNCTION__ , ##arg);			\
+			       "[" DRM_NAME ":" __FUNCTION__ "] " fmt ,	\
+			       ##arg);					\
 	} while (0)
 #else
 #define DRM_DEBUG(fmt, arg...)		 do { } while (0)
 #endif
 
+#endif	/* Gcc 2.x */
+
+
 #define DRM_PROC_LIMIT (PAGE_SIZE-80)
 
 #define DRM_PROC_PRINT(fmt, arg...)					\
@@ -331,9 +318,6 @@ static inline struct page * vmalloc_to_p
 #define DRM_IOREMAP(map)						\
 	(map)->handle = DRM(ioremap)( (map)->offset, (map)->size )
 
-#define DRM_IOREMAP_NOCACHE(map)					\
-	(map)->handle = DRM(ioremap_nocache)((map)->offset, (map)->size)
-
 #define DRM_IOREMAPFREE(map)						\
 	do {								\
 		if ( (map)->handle && (map)->size )			\
@@ -615,17 +599,6 @@ typedef struct drm_map_list {
 	drm_map_t		*map;
 } drm_map_list_t;
 
-#if __HAVE_VBL_IRQ
-
-typedef struct drm_vbl_sig {
-	struct list_head	head;
-	unsigned int		sequence;
-	struct siginfo		info;
-	struct task_struct	*task;
-} drm_vbl_sig_t;
-
-#endif
-
 typedef struct drm_device {
 	const char	  *name;	/* Simple driver name		   */
 	char		  *unique;	/* Unique identifier: e.g., busid  */
@@ -685,13 +658,6 @@ typedef struct drm_device {
 	int		  last_context;	/* Last current context		   */
 	unsigned long	  last_switch;	/* jiffies at last context switch  */
 	struct tq_struct  tq;
-#if __HAVE_VBL_IRQ
-   	wait_queue_head_t vbl_queue;
-   	atomic_t          vbl_received;
-	spinlock_t        vbl_lock;
-	drm_vbl_sig_t     vbl_sigs;
-	unsigned int      vbl_pending;
-#endif
 	cycles_t	  ctx_start;
 	cycles_t	  lck_start;
 #if __HAVE_DMA_HISTOGRAM
@@ -759,16 +725,16 @@ extern unsigned int  DRM(poll)(struct fi
 				/* Mapping support (drm_vm.h) */
 extern struct page *DRM(vm_nopage)(struct vm_area_struct *vma,
 				   unsigned long address,
-				   int write_access);
+				   int unused);
 extern struct page *DRM(vm_shm_nopage)(struct vm_area_struct *vma,
 				       unsigned long address,
-				       int write_access);
+				       int unused);
 extern struct page *DRM(vm_dma_nopage)(struct vm_area_struct *vma,
 				       unsigned long address,
-				       int write_access);
+				       int unused);
 extern struct page *DRM(vm_sg_nopage)(struct vm_area_struct *vma,
 				      unsigned long address,
-				      int write_access);
+				      int unused);
 extern void	     DRM(vm_open)(struct vm_area_struct *vma);
 extern void	     DRM(vm_close)(struct vm_area_struct *vma);
 extern void	     DRM(vm_shm_close)(struct vm_area_struct *vma);
@@ -790,7 +756,6 @@ extern unsigned long DRM(alloc_pages)(in
 extern void	     DRM(free_pages)(unsigned long address, int order,
 				     int area);
 extern void	     *DRM(ioremap)(unsigned long offset, unsigned long size);
-extern void	     *DRM(ioremap_nocache)(unsigned long offset, unsigned long size);
 extern void	     DRM(ioremapfree)(void *pt, unsigned long size);
 
 #if __REALLY_HAVE_AGP
@@ -920,15 +885,6 @@ extern int           DRM(irq_install)( d
 extern int           DRM(irq_uninstall)( drm_device_t *dev );
 extern void          DRM(dma_service)( int irq, void *device,
 				       struct pt_regs *regs );
-extern void          DRM(driver_irq_preinstall)( drm_device_t *dev );
-extern void          DRM(driver_irq_postinstall)( drm_device_t *dev );
-extern void          DRM(driver_irq_uninstall)( drm_device_t *dev );
-#if __HAVE_VBL_IRQ
-extern int           DRM(wait_vblank)(struct inode *inode, struct file *filp,
-				      unsigned int cmd, unsigned long arg);
-extern int           DRM(vblank_wait)(drm_device_t *dev, unsigned int *vbl_seq);
-extern void          DRM(vbl_send_signals)( drm_device_t *dev );
-#endif
 #if __HAVE_DMA_IRQ_BH
 extern void          DRM(dma_immediate_bh)( void *dev );
 #endif
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/drm_agpsupport.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/drm_agpsupport.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/drm_agpsupport.h	2003-07-30 13:51:23.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/drm_agpsupport.h	2003-07-30 11:12:58.000000000 +0200
@@ -285,6 +285,8 @@ drm_agp_head_t *DRM(agp_init)(void)
 			break;
 		case VIA_VT8633:	head->chipset =	"VIA Apollo Pro266";
 			break;
+		case VIA_APOLLO_P4X400:	head->chipset = "VIA Apollo P4X400";
+			break;
 
 		case SIS_GENERIC:	head->chipset = "SiS";           break;
 		case AMD_GENERIC:	head->chipset = "AMD";           break;
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/drm_bufs.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/drm_bufs.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/drm_bufs.h	2003-07-30 13:51:23.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/drm_bufs.h	2003-05-22 23:50:11.000000000 +0200
@@ -136,7 +136,6 @@ int DRM(addmap)( struct inode *inode, st
 		}
 		map->offset = (unsigned long)map->handle;
 		if ( map->flags & _DRM_CONTAINS_LOCK ) {
-			dev->sigdata.lock =
 			dev->lock.hw_lock = map->handle; /* Pointer to lock */
 		}
 		break;
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/drm_context.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/drm_context.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/drm_context.h	2003-07-30 13:51:23.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/drm_context.h	2003-05-22 23:50:11.000000000 +0200
@@ -554,7 +554,7 @@ static int DRM(alloc_queue)(drm_device_t
 				/* Allocate a new queue */
 	down(&dev->struct_sem);
 
-	queue = DRM(alloc)(sizeof(*queue), DRM_MEM_QUEUES);
+	queue = gamma_alloc(sizeof(*queue), DRM_MEM_QUEUES);
 	memset(queue, 0, sizeof(*queue));
 	atomic_set(&queue->use_count, 1);
 
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/drm_dma.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/drm_dma.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/drm_dma.h	2003-07-30 13:51:23.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/drm_dma.h	2003-05-22 23:50:11.000000000 +0200
@@ -30,7 +30,7 @@
  */
 
 #include "drmP.h"
-#include "drm_os_linux.h"
+
 #include <linux/interrupt.h>	/* For task queue support */
 
 #ifndef __HAVE_DMA_WAITQUEUE
@@ -537,18 +537,8 @@ int DRM(irq_install)( drm_device_t *dev,
 	dev->tq.data = dev;
 #endif
 
-#if __HAVE_VBL_IRQ
-	init_waitqueue_head(&dev->vbl_queue);
-
-	spin_lock_init( &dev->vbl_lock );
-
-	INIT_LIST_HEAD( &dev->vbl_sigs.head );
-
-	dev->vbl_pending = 0;
-#endif
-
 				/* Before installing handler */
-	DRM(driver_irq_preinstall)(dev);
+	DRIVER_PREINSTALL();
 
 				/* Install handler */
 	ret = request_irq( dev->irq, DRM(dma_service),
@@ -561,7 +551,7 @@ int DRM(irq_install)( drm_device_t *dev,
 	}
 
 				/* After installing handler */
-	DRM(driver_irq_postinstall)(dev);
+	DRIVER_POSTINSTALL();
 
 	return 0;
 }
@@ -580,7 +570,7 @@ int DRM(irq_uninstall)( drm_device_t *de
 
 	DRM_DEBUG( "%s: irq=%d\n", __FUNCTION__, irq );
 
-	DRM(driver_irq_uninstall)( dev );
+	DRIVER_UNINSTALL();
 
 	free_irq( irq, dev );
 
@@ -607,142 +597,6 @@ int DRM(control)( struct inode *inode, s
 	}
 }
 
-#if __HAVE_VBL_IRQ
-
-int DRM(wait_vblank)(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long data )
-{
-	drm_file_t *priv = filp->private_data;
-	drm_device_t *dev = priv->dev;
-	drm_wait_vblank_t vblwait;
-	struct timeval now;
-	int ret = 0;
-	unsigned int flags;
-
-	if (!dev->irq)
-		return -EINVAL;
-
-	DRM_COPY_FROM_USER_IOCTL( vblwait, (drm_wait_vblank_t *)data,
-				  sizeof(vblwait) );
-
-	switch ( vblwait.request.type & ~_DRM_VBLANK_FLAGS_MASK ) {
-	case _DRM_VBLANK_RELATIVE:
-		vblwait.request.sequence += atomic_read( &dev->vbl_received );
-		vblwait.request.type &= ~_DRM_VBLANK_RELATIVE;
-	case _DRM_VBLANK_ABSOLUTE:
-		break;
-	default:
-		return -EINVAL;
-	}
-
-	flags = vblwait.request.type & _DRM_VBLANK_FLAGS_MASK;
-	
-	if ( flags & _DRM_VBLANK_SIGNAL ) {
-		unsigned long irqflags;
-		drm_vbl_sig_t *vbl_sig;
-		
-		vblwait.reply.sequence = atomic_read( &dev->vbl_received );
-
-		spin_lock_irqsave( &dev->vbl_lock, irqflags );
-
-		/* Check if this task has already scheduled the same signal
-		 * for the same vblank sequence number; nothing to be done in
-		 * that case
-		 */
-		list_for_each( ( (struct list_head *) vbl_sig ), &dev->vbl_sigs.head ) {
-			if (vbl_sig->sequence == vblwait.request.sequence
-			    && vbl_sig->info.si_signo == vblwait.request.signal
-			    && vbl_sig->task == current)
-			{
-				spin_unlock_irqrestore( &dev->vbl_lock, irqflags );
-				goto done;
-			}
-		}
-
-		if ( dev->vbl_pending >= 100 ) {
-			spin_unlock_irqrestore( &dev->vbl_lock, irqflags );
-			return -EBUSY;
-		}
-
-		dev->vbl_pending++;
-
-		spin_unlock_irqrestore( &dev->vbl_lock, irqflags );
-
-		if ( !( vbl_sig = kmalloc(sizeof(drm_vbl_sig_t), GFP_KERNEL) ) ) 
-			return -ENOMEM;
-		
-
-		memset( (void *)vbl_sig, 0, sizeof(*vbl_sig) );
-
-		vbl_sig->sequence = vblwait.request.sequence;
-		vbl_sig->info.si_signo = vblwait.request.signal;
-		vbl_sig->task = current;
-
-		spin_lock_irqsave( &dev->vbl_lock, irqflags );
-
-		list_add_tail( (struct list_head *) vbl_sig, &dev->vbl_sigs.head );
-
-		spin_unlock_irqrestore( &dev->vbl_lock, irqflags );
-	} else {
-		ret = DRM(vblank_wait)( dev, &vblwait.request.sequence );
-
-		do_gettimeofday( &now );
-		vblwait.reply.tval_sec = now.tv_sec;
-		vblwait.reply.tval_usec = now.tv_usec;
-	}
-
-done:
-	DRM_COPY_TO_USER_IOCTL( (drm_wait_vblank_t *)data, vblwait,
-				sizeof(vblwait) );
-
-	return ret;
-}
-
-void DRM(vbl_send_signals)( drm_device_t *dev )
-{
-	struct list_head *tmp;
-	drm_vbl_sig_t *vbl_sig;
-	unsigned int vbl_seq = atomic_read( &dev->vbl_received );
-	unsigned long flags;
-
-	spin_lock_irqsave( &dev->vbl_lock, flags );
-
-	list_for_each_safe( ( (struct list_head *) vbl_sig ), tmp, &dev->vbl_sigs.head ) {
-		if ( ( vbl_seq - vbl_sig->sequence ) <= (1<<23) ) {
-			vbl_sig->info.si_code = vbl_seq;
-			send_sig_info( vbl_sig->info.si_signo, &vbl_sig->info, vbl_sig->task );
-
-			list_del( (struct list_head *) vbl_sig );
-
-
-			kfree( vbl_sig );
-			dev->vbl_pending--;
-		}
-	}
-
-	spin_unlock_irqrestore( &dev->vbl_lock, flags );
-}
-
-#endif	/* __HAVE_VBL_IRQ */
-
-#else
-
-int DRM(control)( struct inode *inode, struct file *filp,
-		  unsigned int cmd, unsigned long arg )
-{
-	drm_control_t ctl;
-
-	if ( copy_from_user( &ctl, (drm_control_t *)arg, sizeof(ctl) ) )
-		return -EFAULT;
-
-	switch ( ctl.func ) {
-	case DRM_INST_HANDLER:
-	case DRM_UNINST_HANDLER:
-		return 0;
-	default:
-		return -EINVAL;
-	}
-}
-
 #endif /* __HAVE_DMA_IRQ */
 
 #endif /* __HAVE_DMA */
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/drm_drv.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/drm_drv.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/drm_drv.h	2003-07-30 13:51:23.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/drm_drv.h	2003-07-30 11:12:56.000000000 +0200
@@ -115,34 +115,18 @@
 #ifndef DRIVER_FOPS
 #define DRIVER_FOPS				\
 static struct file_operations	DRM(fops) = {	\
-	.owner   = THIS_MODULE,			\
-	.open	 = DRM(open),			\
-	.flush	 = DRM(flush),			\
-	.release = DRM(release),		\
-	.ioctl	 = DRM(ioctl),			\
-	.mmap	 = DRM(mmap),			\
-	.read	 = DRM(read),			\
-	.fasync  = DRM(fasync),			\
-	.poll	 = DRM(poll),			\
+	owner:   THIS_MODULE,			\
+	open:	 DRM(open),			\
+	flush:	 DRM(flush),			\
+	release: DRM(release),			\
+	ioctl:	 DRM(ioctl),			\
+	mmap:	 DRM(mmap),			\
+	read:	 DRM(read),			\
+	fasync:	 DRM(fasync),			\
+	poll:	 DRM(poll),			\
 }
 #endif
 
-#ifndef MODULE
-/* DRM(options) is called by the kernel to parse command-line options
- * passed via the boot-loader (e.g., LILO).  It calls the insmod option
- * routine, drm_parse_drm.
- */
-/* Use an additional macro to avoid preprocessor troubles */
-#define DRM_OPTIONS_FUNC DRM(options)
-static int __init DRM(options)( char *str )
-{
-	DRM(parse_options)( str );
-	return 1;
-}
-
-__setup( DRIVER_NAME "=", DRM_OPTIONS_FUNC );
-#undef DRM_OPTIONS_FUNC
-#endif
 
 /*
  * The default number of instances (minor numbers) to initialize.
@@ -203,8 +187,10 @@ static drm_ioctl_desc_t		  DRM(ioctls)[]
 
 	/* The DRM_IOCTL_DMA ioctl should be defined by the driver.
 	 */
+#if __HAVE_DMA_IRQ
 	[DRM_IOCTL_NR(DRM_IOCTL_CONTROL)]       = { DRM(control),     1, 1 },
 #endif
+#endif
 
 #if __REALLY_HAVE_AGP
 	[DRM_IOCTL_NR(DRM_IOCTL_AGP_ACQUIRE)]   = { DRM(agp_acquire), 1, 1 },
@@ -222,10 +208,6 @@ static drm_ioctl_desc_t		  DRM(ioctls)[]
 	[DRM_IOCTL_NR(DRM_IOCTL_SG_FREE)]       = { DRM(sg_free),     1, 1 },
 #endif
 
-#if __HAVE_VBL_IRQ
-	[DRM_IOCTL_NR(DRM_IOCTL_WAIT_VBLANK)]   = { DRM(wait_vblank), 0, 0 },
-#endif
-
 	DRIVER_IOCTLS
 };
 
@@ -310,7 +292,7 @@ static int DRM(setup)( drm_device_t *dev
 	dev->map_count = 0;
 
 	dev->vmalist = NULL;
-	dev->sigdata.lock = dev->lock.hw_lock = NULL;
+	dev->lock.hw_lock = NULL;
 	init_waitqueue_head( &dev->lock.lock_queue );
 	dev->queue_count = 0;
 	dev->queue_reserved = 0;
@@ -495,7 +477,7 @@ static int DRM(takedown)( drm_device_t *
 	DRM(dma_takedown)( dev );
 #endif
 	if ( dev->lock.hw_lock ) {
-		dev->sigdata.lock = dev->lock.hw_lock = NULL; /* SHM removed */
+		dev->lock.hw_lock = NULL; /* SHM removed */
 		dev->lock.pid = 0;
 		wake_up_interruptible( &dev->lock.lock_queue );
 	}
@@ -731,7 +713,7 @@ int DRM(open)( struct inode *inode, stru
 	int i;
 
 	for (i = 0; i < DRM(numdevs); i++) {
-		if (minor(inode->i_rdev) == DRM(minor)[i]) {
+		if (MINOR(inode->i_rdev) == DRM(minor)[i]) {
 			dev = &(DRM(device)[i]);
 			break;
 		}
@@ -773,8 +755,8 @@ int DRM(release)( struct inode *inode, s
 	 * Begin inline drm_release
 	 */
 
-	DRM_DEBUG( "pid = %d, device = 0x%lx, open_count = %d\n",
-		   current->pid, (long)dev->device, dev->open_count );
+	DRM_DEBUG( "pid = %d, device = 0x%x, open_count = %d\n",
+		   current->pid, dev->device, dev->open_count );
 
 	if ( dev->lock.hw_lock &&
 	     _DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock) &&
@@ -899,9 +881,8 @@ int DRM(ioctl)( struct inode *inode, str
 	atomic_inc( &dev->counts[_DRM_STAT_IOCTLS] );
 	++priv->ioctl_count;
 
-	DRM_DEBUG( "pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n",
-		   current->pid, cmd, nr, (long)dev->device, 
-		   priv->authenticated );
+	DRM_DEBUG( "pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%x, auth=%d\n",
+		   current->pid, cmd, nr, dev->device, priv->authenticated );
 
 	if ( nr >= DRIVER_IOCTL_COUNT ) {
 		retcode = -EINVAL;
@@ -1054,25 +1035,6 @@ int DRM(unlock)( struct inode *inode, st
 
 	atomic_inc( &dev->counts[_DRM_STAT_UNLOCKS] );
 
-#if __HAVE_KERNEL_CTX_SWITCH
-	/* We no longer really hold it, but if we are the next
-	 * agent to request it then we should just be able to
-	 * take it immediately and not eat the ioctl.
-	 */
-	dev->lock.pid = 0;
-	{
-		__volatile__ unsigned int *plock = &dev->lock.hw_lock->lock;
-		unsigned int old, new, prev, ctx;
-
-		ctx = lock.context;
-		do {
-			old  = *plock;
-			new  = ctx;
-			prev = cmpxchg(plock, old, new);
-		} while (prev != old);
-	}
-	wake_up_interruptible(&dev->lock.lock_queue);
-#else
 	DRM(lock_transfer)( dev, &dev->lock.hw_lock->lock,
 			    DRM_KERNEL_CONTEXT );
 #if __HAVE_DMA_SCHEDULE
@@ -1087,7 +1049,6 @@ int DRM(unlock)( struct inode *inode, st
 			DRM_ERROR( "\n" );
 		}
 	}
-#endif /* !__HAVE_KERNEL_CTX_SWITCH */
 
 	unblock_all_signals();
 	return 0;
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/drm_fops.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/drm_fops.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/drm_fops.h	2003-07-30 13:51:23.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/drm_fops.h	2003-05-22 23:50:11.000000000 +0200
@@ -37,7 +37,7 @@
 
 int DRM(open_helper)(struct inode *inode, struct file *filp, drm_device_t *dev)
 {
-	int	     minor = minor(inode->i_rdev);
+	kdev_t	     minor = MINOR(inode->i_rdev);
 	drm_file_t   *priv;
 
 	if (filp->f_flags & O_EXCL)   return -EBUSY; /* No exclusive opens */
@@ -94,8 +94,25 @@ int DRM(flush)(struct file *filp)
 	drm_file_t    *priv   = filp->private_data;
 	drm_device_t  *dev    = priv->dev;
 
-	DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %d\n",
-		  current->pid, (long)dev->device, dev->open_count);
+	DRM_DEBUG("pid = %d, device = 0x%x, open_count = %d\n",
+		  current->pid, dev->device, dev->open_count);
+	if ( dev->lock.hw_lock &&
+	     _DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock) &&
+	     dev->lock.pid == current->pid ) {
+		DRM_DEBUG( "Process %d closed fd, freeing lock for context %d\n",
+			   current->pid,
+			   _DRM_LOCKING_CONTEXT(dev->lock.hw_lock->lock) );
+#if __HAVE_RELEASE
+		DRIVER_RELEASE();
+#endif
+		DRM(lock_free)( dev, &dev->lock.hw_lock->lock,
+				_DRM_LOCKING_CONTEXT(dev->lock.hw_lock->lock) );
+
+				/* FIXME: may require heavy-handed reset of
+                                   hardware at this point, possibly
+                                   processed via a callback to the X
+                                   server. */
+	}
 	return 0;
 }
 
@@ -105,7 +122,7 @@ int DRM(fasync)(int fd, struct file *fil
 	drm_device_t  *dev    = priv->dev;
 	int	      retcode;
 
-	DRM_DEBUG("fd = %d, device = 0x%lx\n", fd, (long)dev->device);
+	DRM_DEBUG("fd = %d, device = 0x%x\n", fd, dev->device);
 	retcode = fasync_helper(fd, filp, on, &dev->buf_async);
 	if (retcode < 0) return retcode;
 	return 0;
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/drm_ioctl.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/drm_ioctl.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/drm_ioctl.h	2003-07-30 13:51:23.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/drm_ioctl.h	2003-07-30 11:12:58.000000000 +0200
@@ -111,7 +111,7 @@ int DRM(setunique)(struct inode *inode, 
 
 	do {
 		struct pci_dev *pci_dev;
-                int domain, b, d, f;
+                int b, d, f;
                 char *p;
  
                 for(p = dev->unique; p && *p && *p != ':'; p++);
@@ -123,27 +123,6 @@ int DRM(setunique)(struct inode *inode, 
                 f = (int)simple_strtoul(p+1, &p, 10);
                 if (*p) break;
  
-		domain = b >> 8;
-		b &= 0xff;
-
-#ifdef __alpha__
-		/*
-		 * Find the hose the device is on (the domain number is the
-		 * hose index) and offset the bus by the root bus of that
-		 * hose.
-		 */
-                for(pci_dev = pci_find_device(PCI_ANY_ID,PCI_ANY_ID,NULL);
-                    pci_dev;
-                    pci_dev = pci_find_device(PCI_ANY_ID,PCI_ANY_ID,pci_dev)) {
-			struct pci_controller *hose = pci_dev->sysdata;
-			
-			if (hose->index == domain) {
-				b += hose->bus->number;
-				break;
-			}
-		}
-#endif
-
                 pci_dev = pci_find_slot(b, PCI_DEVFN(d,f));
                 if (pci_dev) {
 			dev->pdev = pci_dev;
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/drm_lock.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/drm_lock.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/drm_lock.h	2003-07-30 13:51:23.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/drm_lock.h	2003-05-22 23:50:11.000000000 +0200
@@ -236,7 +236,7 @@ int DRM(notifier)(void *priv)
 
 
 				/* Allow signal delivery if lock isn't held */
-	if (!s->lock || !_DRM_LOCK_IS_HELD(s->lock->lock)
+	if (!_DRM_LOCK_IS_HELD(s->lock->lock)
 	    || _DRM_LOCKING_CONTEXT(s->lock->lock) != s->context) return 1;
 
 				/* Otherwise, set flag to force call to
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/drm_memory.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/drm_memory.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/drm_memory.h	2003-07-30 13:51:23.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/drm_memory.h	2003-05-22 23:50:11.000000000 +0200
@@ -313,29 +313,6 @@ void *DRM(ioremap)(unsigned long offset,
 	return pt;
 }
 
-void *DRM(ioremap_nocache)(unsigned long offset, unsigned long size)
-{
-	void *pt;
-
-	if (!size) {
-		DRM_MEM_ERROR(DRM_MEM_MAPPINGS,
-			      "Mapping 0 bytes at 0x%08lx\n", offset);
-		return NULL;
-	}
-
-	if (!(pt = ioremap_nocache(offset, size))) {
-		spin_lock(&DRM(mem_lock));
-		++DRM(mem_stats)[DRM_MEM_MAPPINGS].fail_count;
-		spin_unlock(&DRM(mem_lock));
-		return NULL;
-	}
-	spin_lock(&DRM(mem_lock));
-	++DRM(mem_stats)[DRM_MEM_MAPPINGS].succeed_count;
-	DRM(mem_stats)[DRM_MEM_MAPPINGS].bytes_allocated += size;
-	spin_unlock(&DRM(mem_lock));
-	return pt;
-}
-
 void DRM(ioremapfree)(void *pt, unsigned long size)
 {
 	int alloc_count;
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/drm_os_linux.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/drm_os_linux.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/drm_os_linux.h	2003-07-30 13:51:23.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/drm_os_linux.h	1970-01-01 01:00:00.000000000 +0100
@@ -1,56 +0,0 @@
-#define __NO_VERSION__
-
-#include <linux/interrupt.h>	/* For task queue support */
-#include <linux/delay.h>
-
-
-/* For data going from/to the kernel through the ioctl argument */
-#define DRM_COPY_FROM_USER_IOCTL(arg1, arg2, arg3)	\
-	if ( copy_from_user(&arg1, arg2, arg3) )	\
-		return -EFAULT
-#define DRM_COPY_TO_USER_IOCTL(arg1, arg2, arg3)	\
-	if ( copy_to_user(arg1, &arg2, arg3) )		\
-		return -EFAULT
-
-
-#warning the author of this code needs to read up on list_entry
-#define DRM_GETSAREA()							 \
-do { 									 \
-	struct list_head *list;						 \
-	list_for_each( list, &dev->maplist->head ) {			 \
-		drm_map_list_t *entry = (drm_map_list_t *)list;		 \
-		if ( entry->map &&					 \
-		     entry->map->type == _DRM_SHM &&			 \
-		     (entry->map->flags & _DRM_CONTAINS_LOCK) ) {	 \
-			dev_priv->sarea = entry->map;			 \
- 			break;						 \
- 		}							 \
- 	}								 \
-} while (0)
-
-#define DRM_WAIT_ON( ret, queue, timeout, condition )	\
-do {							\
-	DECLARE_WAITQUEUE(entry, current);		\
-	unsigned long end = jiffies + (timeout);	\
-	add_wait_queue(&(queue), &entry);		\
-							\
-	for (;;) {					\
-		set_current_state(TASK_INTERRUPTIBLE);	\
-		if (condition) 				\
-			break;				\
-		if((signed)(end - jiffies) <= 0) {	\
-			ret = -EBUSY;			\
-			break;				\
-		}					\
-		schedule_timeout((HZ/100 > 1) ? HZ/100 : 1);	\
-		if (signal_pending(current)) {		\
-			ret = -EINTR;			\
-			break;				\
-		}					\
-	}						\
-	set_current_state(TASK_RUNNING);		\
-	remove_wait_queue(&(queue), &entry);		\
-} while (0)
-
-
- 
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/drm_proc.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/drm_proc.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/drm_proc.h	2003-07-30 13:51:23.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/drm_proc.h	2003-07-30 10:30:13.000000000 +0200
@@ -147,10 +147,10 @@ static int DRM(name_info)(char *buf, cha
 	*eof   = 0;
 
 	if (dev->unique) {
-		DRM_PROC_PRINT("%s 0x%lx %s\n",
-			       dev->name, (long)dev->device, dev->unique);
+		DRM_PROC_PRINT("%s 0x%x %s\n",
+			       dev->name, dev->device, dev->unique);
 	} else {
-		DRM_PROC_PRINT("%s 0x%lx\n", dev->name, (long)dev->device);
+		DRM_PROC_PRINT("%s 0x%x\n", dev->name, dev->device);
 	}
 
 	if (len > request + offset) return request;
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/drm_sarea.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/drm_sarea.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/drm_sarea.h	2003-07-30 13:51:23.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/drm_sarea.h	1970-01-01 01:00:00.000000000 +0100
@@ -1,57 +0,0 @@
-/* sarea.h -- SAREA definitions -*- linux-c -*-
- *
- * Copyright 2002 Tungsten Graphics, Inc., Cedar Park, Texas.
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- *    Michel Dänzer <michel@daenzer.net>
- */
-
-#ifndef _DRM_SAREA_H_
-#define _DRM_SAREA_H_
-
-#define SAREA_MAX_DRAWABLES 		256
-
-typedef struct _drm_sarea_drawable_t {
-    unsigned int	stamp;
-    unsigned int	flags;
-} drm_sarea_drawable_t;
-
-typedef struct _dri_sarea_frame_t {
-    unsigned int        x;
-    unsigned int        y;
-    unsigned int        width;
-    unsigned int        height;
-    unsigned int        fullscreen;
-} drm_sarea_frame_t;
-
-typedef struct _drm_sarea_t {
-    /* first thing is always the drm locking structure */
-    drm_hw_lock_t		lock;
-		/* NOT_DONE: Use readers/writer lock for drawable_lock */
-    drm_hw_lock_t		drawable_lock;
-    drm_sarea_drawable_t	drawableTable[SAREA_MAX_DRAWABLES];
-    drm_sarea_frame_t		frame;
-    drm_context_t		dummy_context;
-} drm_sarea_t;
-
-#endif	/* _DRM_SAREA_H_ */
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/drm_stub.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/drm_stub.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/drm_stub.h	2003-07-30 13:51:23.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/drm_stub.h	2003-05-22 23:50:11.000000000 +0200
@@ -48,7 +48,7 @@ static struct drm_stub_info {
 
 static int DRM(stub_open)(struct inode *inode, struct file *filp)
 {
-	int                    minor = minor(inode->i_rdev);
+	int                    minor = MINOR(inode->i_rdev);
 	int                    err   = -ENODEV;
 	struct file_operations *old_fops;
 
@@ -65,8 +65,8 @@ static int DRM(stub_open)(struct inode *
 }
 
 static struct file_operations DRM(stub_fops) = {
-	.owner = THIS_MODULE,
-	.open  = DRM(stub_open)
+	owner:   THIS_MODULE,
+	open:	 DRM(stub_open)
 };
 
 static int DRM(stub_getminor)(const char *name, struct file_operations *fops,
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/drm_vm.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/drm_vm.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/drm_vm.h	2003-07-30 13:51:23.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/drm_vm.h	2003-07-30 11:12:58.000000000 +0200
@@ -57,7 +57,7 @@ struct vm_operations_struct   DRM(vm_sg_
 
 struct page *DRM(vm_nopage)(struct vm_area_struct *vma,
 			    unsigned long address,
-			    int write_access)
+			    int unused)
 {
 #if __REALLY_HAVE_AGP
 	drm_file_t *priv  = vma->vm_file->private_data;
@@ -70,7 +70,7 @@ struct page *DRM(vm_nopage)(struct vm_ar
          * Find the right map
          */
 
-	if(!dev->agp || !dev->agp->cant_use_aperture) goto vm_nopage_error;
+	if(!dev->agp->cant_use_aperture) goto vm_nopage_error;
 
 	list_for_each(list, &dev->maplist->head) {
 		r_list = (drm_map_list_t *)list;
@@ -141,7 +141,9 @@ struct page *DRM(vm_shm_nopage)(struct v
 		return NOPAGE_OOM;
 	get_page(page);
 
-	DRM_DEBUG("shm_nopage 0x%lx\n", address);
+#if 0	/* XXX page_to_bus is not a portable interface available on all platforms. */
+	DRM_DEBUG("0x%08lx => 0x%08llx\n", address, (u64)page_to_bus(page));
+#endif
 	return page;
 }
 
@@ -243,7 +245,10 @@ struct page *DRM(vm_dma_nopage)(struct v
 
 	get_page(page);
 
-	DRM_DEBUG("dma_nopage 0x%lx (page %lu)\n", address, page_nr);
+#if 0	/* XXX page_to_bus is not a portable interface available on all platforms. */
+	DRM_DEBUG("0x%08lx (page %lu) => 0x%08llx\n", address, page_nr, 
+		  (u64)page_to_bus(page));
+#endif
 	return page;
 }
 
@@ -444,12 +449,12 @@ int DRM(mmap)(struct file *filp, struct 
 		}
 		offset = DRIVER_GET_REG_OFS();
 #ifdef __sparc__
-		if (io_remap_page_range(DRM_RPR_ARG(vma) vma->vm_start,
+		if (io_remap_page_range(vma->vm_start,
 					VM_OFFSET(vma) + offset,
 					vma->vm_end - vma->vm_start,
 					vma->vm_page_prot, 0))
 #else
-		if (remap_page_range(DRM_RPR_ARG(vma) vma->vm_start,
+		if (remap_page_range(vma->vm_start,
 				     VM_OFFSET(vma) + offset,
 				     vma->vm_end - vma->vm_start,
 				     vma->vm_page_prot))
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/gamma.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/gamma.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/gamma.h	2003-07-30 13:51:23.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/gamma.h	2001-08-08 18:42:14.000000000 +0200
@@ -38,36 +38,9 @@
  */
 #define __HAVE_MTRR			1
 
-#define DRIVER_AUTHOR		"VA Linux Systems Inc."
-
-#define DRIVER_NAME		"gamma"
-#define DRIVER_DESC		"3DLabs gamma"
-#define DRIVER_DATE		"20010624"
-
-#define DRIVER_MAJOR		2
-#define DRIVER_MINOR		0
-#define DRIVER_PATCHLEVEL	0
-
-#define DRIVER_IOCTLS							  \
-	[DRM_IOCTL_NR(DRM_IOCTL_DMA)]	     = { gamma_dma,	  1, 0 }, \
-	[DRM_IOCTL_NR(DRM_IOCTL_GAMMA_INIT)] = { gamma_dma_init,  1, 1 }, \
-	[DRM_IOCTL_NR(DRM_IOCTL_GAMMA_COPY)] = { gamma_dma_copy,  1, 1 }
-
-#define IOCTL_TABLE_NAME	DRM(ioctls)
-#define IOCTL_FUNC_NAME 	DRM(ioctl)
-
-#define __HAVE_COUNTERS		5
-#define __HAVE_COUNTER6		_DRM_STAT_IRQ
-#define __HAVE_COUNTER7		_DRM_STAT_DMA
-#define __HAVE_COUNTER8		_DRM_STAT_PRIMARY
-#define __HAVE_COUNTER9		_DRM_STAT_SPECIAL
-#define __HAVE_COUNTER10	_DRM_STAT_MISSED
-
 /* DMA customization:
  */
 #define __HAVE_DMA			1
-#define __HAVE_AGP			1
-#define __MUST_HAVE_AGP			0
 #define __HAVE_OLD_DMA			1
 #define __HAVE_PCI_DMA			1
 
@@ -88,61 +61,33 @@
 #define __HAVE_DMA_QUIESCENT		1
 #define DRIVER_DMA_QUIESCENT() do {					\
 	/* FIXME ! */ 							\
-	gamma_dma_quiescent_single(dev);					\
+	gamma_dma_quiescent_dual(dev);					\
 	return 0;							\
 } while (0)
 
 #define __HAVE_DMA_IRQ			1
 #define __HAVE_DMA_IRQ_BH		1
-
-#if 1
 #define DRIVER_PREINSTALL() do {					\
 	drm_gamma_private_t *dev_priv =					\
 				(drm_gamma_private_t *)dev->dev_private;\
-	while(GAMMA_READ(GAMMA_INFIFOSPACE) < 2) cpu_relax();		\
-	GAMMA_WRITE( GAMMA_GCOMMANDMODE,	0x00000004 );		\
+	GAMMA_WRITE( GAMMA_GCOMMANDMODE,	0x00000000 );		\
 	GAMMA_WRITE( GAMMA_GDMACONTROL,		0x00000000 );		\
 } while (0)
+
 #define DRIVER_POSTINSTALL() do {					\
 	drm_gamma_private_t *dev_priv =					\
 				(drm_gamma_private_t *)dev->dev_private;\
-	while(GAMMA_READ(GAMMA_INFIFOSPACE) < 2) cpu_relax();		\
-	while(GAMMA_READ(GAMMA_INFIFOSPACE) < 3) cpu_relax();		\
 	GAMMA_WRITE( GAMMA_GINTENABLE,		0x00002001 );		\
 	GAMMA_WRITE( GAMMA_COMMANDINTENABLE,	0x00000008 );		\
 	GAMMA_WRITE( GAMMA_GDELAYTIMER,		0x00039090 );		\
 } while (0)
-#else
-#define DRIVER_POSTINSTALL() do {					\
-	drm_gamma_private_t *dev_priv =					\
-				(drm_gamma_private_t *)dev->dev_private;\
-	while(GAMMA_READ(GAMMA_INFIFOSPACE) < 2) cpu_relax();		\
-	while(GAMMA_READ(GAMMA_INFIFOSPACE) < 2) cpu_relax();		\
-	GAMMA_WRITE( GAMMA_GINTENABLE,		0x00002000 );		\
-	GAMMA_WRITE( GAMMA_COMMANDINTENABLE,	0x00000004 );		\
-} while (0)
-
-#define DRIVER_PREINSTALL() do {					\
-	drm_gamma_private_t *dev_priv =					\
-				(drm_gamma_private_t *)dev->dev_private;\
-	while(GAMMA_READ(GAMMA_INFIFOSPACE) < 2) cpu_relax();		\
-	while(GAMMA_READ(GAMMA_INFIFOSPACE) < 2) cpu_relax();		\
-	GAMMA_WRITE( GAMMA_GCOMMANDMODE,	GAMMA_QUEUED_DMA_MODE );\
-	GAMMA_WRITE( GAMMA_GDMACONTROL,		0x00000000 );\
-} while (0)
-#endif
 
 #define DRIVER_UNINSTALL() do {						\
 	drm_gamma_private_t *dev_priv =					\
 				(drm_gamma_private_t *)dev->dev_private;\
-	while(GAMMA_READ(GAMMA_INFIFOSPACE) < 2) cpu_relax();		\
-	while(GAMMA_READ(GAMMA_INFIFOSPACE) < 3) cpu_relax();		\
 	GAMMA_WRITE( GAMMA_GDELAYTIMER,		0x00000000 );		\
 	GAMMA_WRITE( GAMMA_COMMANDINTENABLE,	0x00000000 );		\
 	GAMMA_WRITE( GAMMA_GINTENABLE,		0x00000000 );		\
 } while (0)
 
-#define DRIVER_AGP_BUFFERS_MAP( dev )					\
-	((drm_gamma_private_t *)((dev)->dev_private))->buffers
-
 #endif /* __GAMMA_H__ */
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/gamma_dma.c linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/gamma_dma.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/gamma_dma.c	2003-07-30 13:51:23.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/gamma_dma.c	2002-12-18 01:03:51.000000000 +0100
@@ -31,32 +31,33 @@
 
 #include "gamma.h"
 #include "drmP.h"
-#include "drm.h"
-#include "gamma_drm.h"
 #include "gamma_drv.h"
 
 #include <linux/interrupt.h>	/* For task queue support */
 #include <linux/delay.h>
 
+
 static inline void gamma_dma_dispatch(drm_device_t *dev, unsigned long address,
 				      unsigned long length)
 {
 	drm_gamma_private_t *dev_priv =
-				(drm_gamma_private_t *)dev->dev_private;
-	mb();
-	while ( GAMMA_READ(GAMMA_INFIFOSPACE) < 2) cpu_relax();
-	GAMMA_WRITE(GAMMA_DMAADDRESS, address);
-	while (GAMMA_READ(GAMMA_GCOMMANDSTATUS) != 4) cpu_relax();
+		(drm_gamma_private_t *)dev->dev_private;
+
+	GAMMA_WRITE(GAMMA_DMAADDRESS, virt_to_phys((void *)address));
+	while (GAMMA_READ(GAMMA_GCOMMANDSTATUS) != 4)
+		;
 	GAMMA_WRITE(GAMMA_DMACOUNT, length / 4);
 }
 
 void gamma_dma_quiescent_single(drm_device_t *dev)
 {
 	drm_gamma_private_t *dev_priv =
-				(drm_gamma_private_t *)dev->dev_private;
-	while (GAMMA_READ(GAMMA_DMACOUNT)) cpu_relax();
+		(drm_gamma_private_t *)dev->dev_private;
 
-	while (GAMMA_READ(GAMMA_INFIFOSPACE) < 2) cpu_relax();
+	while (GAMMA_READ(GAMMA_DMACOUNT))
+		;
+	while (GAMMA_READ(GAMMA_INFIFOSPACE) < 3)
+		;
 
 	GAMMA_WRITE(GAMMA_FILTERMODE, 1 << 10);
 	GAMMA_WRITE(GAMMA_SYNC, 0);
@@ -70,50 +71,56 @@ void gamma_dma_quiescent_single(drm_devi
 void gamma_dma_quiescent_dual(drm_device_t *dev)
 {
 	drm_gamma_private_t *dev_priv =
-				(drm_gamma_private_t *)dev->dev_private;
-	while (GAMMA_READ(GAMMA_DMACOUNT)) cpu_relax();
+		(drm_gamma_private_t *)dev->dev_private;
 
-	while (GAMMA_READ(GAMMA_INFIFOSPACE) < 3) cpu_relax();
+	while (GAMMA_READ(GAMMA_DMACOUNT))
+		;
+	while (GAMMA_READ(GAMMA_INFIFOSPACE) < 3)
+		;
 
 	GAMMA_WRITE(GAMMA_BROADCASTMASK, 3);
+
 	GAMMA_WRITE(GAMMA_FILTERMODE, 1 << 10);
 	GAMMA_WRITE(GAMMA_SYNC, 0);
 
-	/* Read from first MX */
+				/* Read from first MX */
 	do {
-		while (!GAMMA_READ(GAMMA_OUTFIFOWORDS)) cpu_relax();
+		while (!GAMMA_READ(GAMMA_OUTFIFOWORDS))
+			;
 	} while (GAMMA_READ(GAMMA_OUTPUTFIFO) != GAMMA_SYNC_TAG);
 
-	/* Read from second MX */
+				/* Read from second MX */
 	do {
-		while (!GAMMA_READ(GAMMA_OUTFIFOWORDS + 0x10000)) cpu_relax();
+		while (!GAMMA_READ(GAMMA_OUTFIFOWORDS + 0x10000))
+			;
 	} while (GAMMA_READ(GAMMA_OUTPUTFIFO + 0x10000) != GAMMA_SYNC_TAG);
 }
 
 void gamma_dma_ready(drm_device_t *dev)
 {
 	drm_gamma_private_t *dev_priv =
-				(drm_gamma_private_t *)dev->dev_private;
-	while (GAMMA_READ(GAMMA_DMACOUNT)) cpu_relax();
+		(drm_gamma_private_t *)dev->dev_private;
+
+	while (GAMMA_READ(GAMMA_DMACOUNT))
+		;
 }
 
 static inline int gamma_dma_is_ready(drm_device_t *dev)
 {
 	drm_gamma_private_t *dev_priv =
-				(drm_gamma_private_t *)dev->dev_private;
-	return(!GAMMA_READ(GAMMA_DMACOUNT));
+		(drm_gamma_private_t *)dev->dev_private;
+
+	return !GAMMA_READ(GAMMA_DMACOUNT);
 }
 
 void gamma_dma_service(int irq, void *device, struct pt_regs *regs)
 {
-	drm_device_t	 *dev = (drm_device_t *)device;
-	drm_device_dma_t *dma = dev->dma;
+	drm_device_t	    *dev      = (drm_device_t *)device;
+	drm_device_dma_t    *dma      = dev->dma;
 	drm_gamma_private_t *dev_priv =
-				(drm_gamma_private_t *)dev->dev_private;
+		(drm_gamma_private_t *)dev->dev_private;
 
 	atomic_inc(&dev->counts[6]); /* _DRM_STAT_IRQ */
-
-	while (GAMMA_READ(GAMMA_INFIFOSPACE) < 3) cpu_relax();
 	GAMMA_WRITE(GAMMA_GDELAYTIMER, 0xc350/2); /* 0x05S */
 	GAMMA_WRITE(GAMMA_GCOMMANDINTFLAGS, 8);
 	GAMMA_WRITE(GAMMA_GINTFLAGS, 0x2001);
@@ -157,9 +164,7 @@ static int gamma_do_dma(drm_device_t *de
 	}
 
 	buf	= dma->next_buffer;
-	/* WE NOW ARE ON LOGICAL PAGES!! - using page table setup in dma_init */
-	/* So we pass the buffer index value into the physical page offset */
-	address = buf->idx << 12;
+	address = (unsigned long)buf->address;
 	length	= buf->used;
 
 	DRM_DEBUG("context %d, buffer %d (%ld bytes)\n",
@@ -226,9 +231,6 @@ static int gamma_do_dma(drm_device_t *de
 	buf->time_dispatched = get_cycles();
 #endif
 
-	/* WE NOW ARE ON LOGICAL PAGES!!! - overriding address */
-	address = buf->idx << 12;
-
 	gamma_dma_dispatch(dev, address, length);
 	gamma_free_buffer(dev, dma->this_buffer);
 	dma->this_buffer = buf;
@@ -521,11 +523,11 @@ static int gamma_dma_send_buffers(drm_de
 			}
 		}
 		if (retcode) {
-			DRM_ERROR("ctx%d w%d p%d c%ld i%d l%d %d/%d\n",
+			DRM_ERROR("ctx%d w%d p%d c%d i%d l%d %d/%d\n",
 				  d->context,
 				  last_buf->waiting,
 				  last_buf->pending,
-				  (long)DRM_WAITCOUNT(dev, d->context),
+				  DRM_WAITCOUNT(dev, d->context),
 				  last_buf->idx,
 				  last_buf->list,
 				  last_buf->pid,
@@ -579,256 +581,3 @@ int gamma_dma(struct inode *inode, struc
 
 	return retcode;
 }
-
-/* =============================================================
- * DMA initialization, cleanup
- */
-
-static int gamma_do_init_dma( drm_device_t *dev, drm_gamma_init_t *init )
-{
-	drm_gamma_private_t *dev_priv;
-	drm_device_dma_t    *dma = dev->dma;
-	drm_buf_t	    *buf;
-	int i;
-	struct list_head    *list;
-	unsigned long	    *pgt;
-
-	DRM_DEBUG( "%s\n", __FUNCTION__ );
-
-	dev_priv = DRM(alloc)( sizeof(drm_gamma_private_t),
-							DRM_MEM_DRIVER );
-	if ( !dev_priv )
-		return -ENOMEM;
-
-	dev->dev_private = (void *)dev_priv;
-
-	memset( dev_priv, 0, sizeof(drm_gamma_private_t) );
-
-	list_for_each(list, &dev->maplist->head) {
-		#warning list_entry() is needed here
-		drm_map_list_t *r_list = (drm_map_list_t *)list;
-		if( r_list->map &&
-		    r_list->map->type == _DRM_SHM &&
-		    r_list->map->flags & _DRM_CONTAINS_LOCK ) {
-			dev_priv->sarea = r_list->map;
- 			break;
- 		}
- 	}
-
-	DRM_FIND_MAP( dev_priv->mmio0, init->mmio0 );
-	DRM_FIND_MAP( dev_priv->mmio1, init->mmio1 );
-	DRM_FIND_MAP( dev_priv->mmio2, init->mmio2 );
-	DRM_FIND_MAP( dev_priv->mmio3, init->mmio3 );
-
-	dev_priv->sarea_priv = (drm_gamma_sarea_t *)
-		((u8 *)dev_priv->sarea->handle +
-		 init->sarea_priv_offset);
-
-	if (init->pcimode) {
-		buf = dma->buflist[GLINT_DRI_BUF_COUNT];
-		pgt = buf->address;
-
- 		for (i = 0; i < GLINT_DRI_BUF_COUNT; i++) {
-			buf = dma->buflist[i];
-			*pgt = virt_to_phys((void*)buf->address) | 0x07;
-			pgt++;
-		}
-
-		buf = dma->buflist[GLINT_DRI_BUF_COUNT];
-	} else {
-		DRM_FIND_MAP( dev_priv->buffers, init->buffers_offset );
-
-		DRM_IOREMAP( dev_priv->buffers );
-
-		buf = dma->buflist[GLINT_DRI_BUF_COUNT];
-		pgt = buf->address;
-
- 		for (i = 0; i < GLINT_DRI_BUF_COUNT; i++) {
-			buf = dma->buflist[i];
-			*pgt = (unsigned long)buf->address + 0x07;
-			pgt++;
-		}
-
-		buf = dma->buflist[GLINT_DRI_BUF_COUNT];
-
-		while (GAMMA_READ(GAMMA_INFIFOSPACE) < 1);
-		GAMMA_WRITE( GAMMA_GDMACONTROL, 0xe) cpu_relax();
-	}
-	while (GAMMA_READ(GAMMA_INFIFOSPACE) < 2); cpu_relax();
-	GAMMA_WRITE( GAMMA_PAGETABLEADDR, virt_to_phys((void*)buf->address) );
-	GAMMA_WRITE( GAMMA_PAGETABLELENGTH, 2 );
-
-	return 0;
-}
-
-int gamma_do_cleanup_dma( drm_device_t *dev )
-{
-	DRM_DEBUG( "%s\n", __FUNCTION__ );
-
-	if ( dev->dev_private ) {
-		drm_gamma_private_t *dev_priv = dev->dev_private;
-
-		DRM_IOREMAPFREE( dev_priv->buffers );
-
-		DRM(free)( dev->dev_private, sizeof(drm_gamma_private_t),
-			   DRM_MEM_DRIVER );
-		dev->dev_private = NULL;
-	}
-
-	return 0;
-}
-
-int gamma_dma_init( struct inode *inode, struct file *filp,
-		  unsigned int cmd, unsigned long arg )
-{
-	drm_file_t *priv = filp->private_data;
-	drm_device_t *dev = priv->dev;
-	drm_gamma_init_t init;
-
-	if ( copy_from_user( &init, (drm_gamma_init_t *)arg, sizeof(init) ) )
-		return -EFAULT;
-
-	switch ( init.func ) {
-	case GAMMA_INIT_DMA:
-		return gamma_do_init_dma( dev, &init );
-	case GAMMA_CLEANUP_DMA:
-		return gamma_do_cleanup_dma( dev );
-	}
-
-	return -EINVAL;
-}
-
-static int gamma_do_copy_dma( drm_device_t *dev, drm_gamma_copy_t *copy )
-{
-	drm_device_dma_t    *dma = dev->dma;
-	unsigned int        *screenbuf;
-
-	DRM_DEBUG( "%s\n", __FUNCTION__ );
-
-	/* We've DRM_RESTRICTED this DMA buffer */
-
-	screenbuf = dma->buflist[ GLINT_DRI_BUF_COUNT + 1 ]->address;
-
-#if 0
-	*buffer++ = 0x180;	/* Tag (FilterMode) */
-	*buffer++ = 0x200;	/* Allow FBColor through */
-	*buffer++ = 0x53B;	/* Tag */
-	*buffer++ = copy->Pitch;
-	*buffer++ = 0x53A;	/* Tag */
-	*buffer++ = copy->SrcAddress;
-	*buffer++ = 0x539;	/* Tag */
-	*buffer++ = copy->WidthHeight; /* Initiates transfer */
-	*buffer++ = 0x53C;	/* Tag - DMAOutputAddress */
-	*buffer++ = virt_to_phys((void*)screenbuf);
-	*buffer++ = 0x53D;	/* Tag - DMAOutputCount */
-	*buffer++ = copy->Count; /* Reads HostOutFifo BLOCKS until ..*/
-
-	/* Data now sitting in dma->buflist[ GLINT_DRI_BUF_COUNT + 1 ] */
-	/* Now put it back to the screen */
-
-	*buffer++ = 0x180;	/* Tag (FilterMode) */
-	*buffer++ = 0x400;	/* Allow Sync through */
-	*buffer++ = 0x538;	/* Tag - DMARectangleReadTarget */
-	*buffer++ = 0x155;	/* FBSourceData | count */
-	*buffer++ = 0x537;	/* Tag */
-	*buffer++ = copy->Pitch;
-	*buffer++ = 0x536;	/* Tag */
-	*buffer++ = copy->DstAddress;
-	*buffer++ = 0x535;	/* Tag */
-	*buffer++ = copy->WidthHeight; /* Initiates transfer */
-	*buffer++ = 0x530;	/* Tag - DMAAddr */
-	*buffer++ = virt_to_phys((void*)screenbuf);
-	*buffer++ = 0x531;
-	*buffer++ = copy->Count; /* initiates DMA transfer of color data */
-#endif
-
-	/* need to dispatch it now */
-
-	return 0;
-}
-
-int gamma_dma_copy( struct inode *inode, struct file *filp,
-		  unsigned int cmd, unsigned long arg )
-{
-	drm_file_t *priv = filp->private_data;
-	drm_device_t *dev = priv->dev;
-	drm_gamma_copy_t copy;
-
-	if ( copy_from_user( &copy, (drm_gamma_copy_t *)arg, sizeof(copy) ) )
-		return -EFAULT;
-
-	return gamma_do_copy_dma( dev, &copy );
-}
-
-/* =============================================================
- * Per Context SAREA Support
- */
-
-int gamma_getsareactx(struct inode *inode, struct file *filp,
-		     unsigned int cmd, unsigned long arg)
-{
-	drm_file_t	*priv	= filp->private_data;
-	drm_device_t	*dev	= priv->dev;
-	drm_ctx_priv_map_t request;
-	drm_map_t *map;
-
-	if (copy_from_user(&request,
-			   (drm_ctx_priv_map_t *)arg,
-			   sizeof(request)))
-		return -EFAULT;
-
-	down(&dev->struct_sem);
-	if ((int)request.ctx_id >= dev->max_context) {
-		up(&dev->struct_sem);
-		return -EINVAL;
-	}
-
-	map = dev->context_sareas[request.ctx_id];
-	up(&dev->struct_sem);
-
-	request.handle = map->handle;
-	if (copy_to_user((drm_ctx_priv_map_t *)arg, &request, sizeof(request)))
-		return -EFAULT;
-	return 0;
-}
-
-int gamma_setsareactx(struct inode *inode, struct file *filp,
-		     unsigned int cmd, unsigned long arg)
-{
-	drm_file_t	*priv	= filp->private_data;
-	drm_device_t	*dev	= priv->dev;
-	drm_ctx_priv_map_t request;
-	drm_map_t *map = NULL;
-	drm_map_list_t *r_list;
-	struct list_head *list;
-
-	if (copy_from_user(&request,
-			   (drm_ctx_priv_map_t *)arg,
-			   sizeof(request)))
-		return -EFAULT;
-
-	down(&dev->struct_sem);
-	r_list = NULL;
-	list_for_each(list, &dev->maplist->head) {
-		r_list = (drm_map_list_t *)list;
-		if(r_list->map &&
-		   r_list->map->handle == request.handle) break;
-	}
-	if (list == &(dev->maplist->head)) {
-		up(&dev->struct_sem);
-		return -EINVAL;
-	}
-	map = r_list->map;
-	up(&dev->struct_sem);
-
-	if (!map) return -EINVAL;
-
-	down(&dev->struct_sem);
-	if ((int)request.ctx_id >= dev->max_context) {
-		up(&dev->struct_sem);
-		return -EINVAL;
-	}
-	dev->context_sareas[request.ctx_id] = map;
-	up(&dev->struct_sem);
-	return 0;
-}
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/gamma_drm.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/gamma_drm.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/gamma_drm.h	2003-07-30 13:51:23.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/gamma_drm.h	1970-01-01 01:00:00.000000000 +0100
@@ -1,89 +0,0 @@
-#ifndef _GAMMA_DRM_H_
-#define _GAMMA_DRM_H_
-
-typedef struct _drm_gamma_tex_region {
-	unsigned char next, prev; /* indices to form a circular LRU  */
-	unsigned char in_use;	/* owned by a client, or free? */
-	int age;		/* tracked by clients to update local LRU's */
-} drm_gamma_tex_region_t;
-
-typedef struct {
-	unsigned int	GDeltaMode;
-	unsigned int	GDepthMode;
-	unsigned int	GGeometryMode;
-	unsigned int	GTransformMode;
-} drm_gamma_context_regs_t;
-
-typedef struct _drm_gamma_sarea {
-   	drm_gamma_context_regs_t context_state;
-
-	unsigned int dirty;
-
-
-	/* Maintain an LRU of contiguous regions of texture space.  If
-	 * you think you own a region of texture memory, and it has an
-	 * age different to the one you set, then you are mistaken and
-	 * it has been stolen by another client.  If global texAge
-	 * hasn't changed, there is no need to walk the list.
-	 *
-	 * These regions can be used as a proxy for the fine-grained
-	 * texture information of other clients - by maintaining them
-	 * in the same lru which is used to age their own textures,
-	 * clients have an approximate lru for the whole of global
-	 * texture space, and can make informed decisions as to which
-	 * areas to kick out.  There is no need to choose whether to
-	 * kick out your own texture or someone else's - simply eject
-	 * them all in LRU order.  
-	 */
-   
-#define GAMMA_NR_TEX_REGIONS 64
-	drm_gamma_tex_region_t texList[GAMMA_NR_TEX_REGIONS+1]; 
-				/* Last elt is sentinal */
-        int texAge;		/* last time texture was uploaded */
-        int last_enqueue;	/* last time a buffer was enqueued */
-	int last_dispatch;	/* age of the most recently dispatched buffer */
-	int last_quiescent;     /*  */
-	int ctxOwner;		/* last context to upload state */
-
-	int vertex_prim;
-} drm_gamma_sarea_t;
-
-/* WARNING: If you change any of these defines, make sure to wear a bullet
- * proof vest because these are part of the stable kernel<->userspace ABI
- */
-
-/* Gamma specific ioctls
- * The device specific ioctl range is 0x40 to 0x79.
- */
-#define DRM_IOCTL_GAMMA_INIT		DRM_IOW( 0x40, drm_gamma_init_t)
-#define DRM_IOCTL_GAMMA_COPY		DRM_IOW( 0x41, drm_gamma_copy_t)
-
-typedef struct drm_gamma_copy {
-	unsigned int	DMAOutputAddress;
-	unsigned int	DMAOutputCount;
-	unsigned int	DMAReadGLINTSource;
-	unsigned int	DMARectangleWriteAddress;
-	unsigned int	DMARectangleWriteLinePitch;
-	unsigned int	DMARectangleWrite;
-	unsigned int	DMARectangleReadAddress;
-	unsigned int	DMARectangleReadLinePitch;
-	unsigned int	DMARectangleRead;
-	unsigned int	DMARectangleReadTarget;
-} drm_gamma_copy_t;
-
-typedef struct drm_gamma_init {
-   	enum {
-	   	GAMMA_INIT_DMA    = 0x01,
-	       	GAMMA_CLEANUP_DMA = 0x02
-	} func;
-
-   	int sarea_priv_offset;
-	int pcimode;
-	unsigned int mmio0;
-	unsigned int mmio1;
-	unsigned int mmio2;
-	unsigned int mmio3;
-	unsigned int buffers_offset;
-} drm_gamma_init_t;
-
-#endif /* _GAMMA_DRM_H_ */
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/gamma_drv.c linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/gamma_drv.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/gamma_drv.c	2003-07-30 13:51:23.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/gamma_drv.c	2001-08-08 18:42:14.000000000 +0200
@@ -32,18 +32,57 @@
 #include <linux/config.h>
 #include "gamma.h"
 #include "drmP.h"
-#include "drm.h"
-#include "gamma_drm.h"
 #include "gamma_drv.h"
 
+#define DRIVER_AUTHOR		"VA Linux Systems Inc."
+
+#define DRIVER_NAME		"gamma"
+#define DRIVER_DESC		"3DLabs gamma"
+#define DRIVER_DATE		"20010216"
+
+#define DRIVER_MAJOR		1
+#define DRIVER_MINOR		0
+#define DRIVER_PATCHLEVEL	0
+
+#define DRIVER_IOCTLS							  \
+	[DRM_IOCTL_NR(DRM_IOCTL_DMA)]	     = { gamma_dma,	  1, 0 }
+
+
+#define __HAVE_COUNTERS		5
+#define __HAVE_COUNTER6		_DRM_STAT_IRQ
+#define __HAVE_COUNTER7		_DRM_STAT_DMA
+#define __HAVE_COUNTER8		_DRM_STAT_PRIMARY
+#define __HAVE_COUNTER9		_DRM_STAT_SPECIAL
+#define __HAVE_COUNTER10	_DRM_STAT_MISSED
+
+
 #include "drm_auth.h"
-#include "drm_agpsupport.h"
 #include "drm_bufs.h"
 #include "drm_context.h"
 #include "drm_dma.h"
 #include "drm_drawable.h"
 #include "drm_drv.h"
 
+#ifndef MODULE
+/* DRM(options) is called by the kernel to parse command-line options
+ * passed via the boot-loader (e.g., LILO).  It calls the insmod option
+ * routine, drm_parse_drm.
+ */
+
+/* JH- We have to hand expand the string ourselves because of the cpp.  If
+ * anyone can think of a way that we can fit into the __setup macro without
+ * changing it, then please send the solution my way.
+ */
+static int __init gamma_options( char *str )
+{
+	DRM(parse_options)( str );
+	return 1;
+}
+
+__setup( DRIVER_NAME "=", gamma_options );
+#endif
+
+
 #include "drm_fops.h"
 #include "drm_init.h"
 #include "drm_ioctl.h"
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/gamma_drv.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/gamma_drv.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/gamma_drv.h	2003-07-30 13:51:23.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/gamma_drv.h	2001-08-08 18:42:14.000000000 +0200
@@ -32,9 +32,8 @@
 #ifndef _GAMMA_DRV_H_
 #define _GAMMA_DRV_H_
 
+
 typedef struct drm_gamma_private {
-	drm_gamma_sarea_t *sarea_priv;
-	drm_map_t *sarea;
 	drm_map_t *buffers;
 	drm_map_t *mmio0;
 	drm_map_t *mmio1;
@@ -52,11 +51,6 @@ do {									\
 	}								\
 } while (0)
 
-				/* gamma_dma.c */
-extern int gamma_dma_init( struct inode *inode, struct file *filp,
-			 unsigned int cmd, unsigned long arg );
-extern int gamma_dma_copy( struct inode *inode, struct file *filp,
-			 unsigned int cmd, unsigned long arg );
 
 extern void gamma_dma_ready(drm_device_t *dev);
 extern void gamma_dma_quiescent_single(drm_device_t *dev);
@@ -69,7 +63,6 @@ extern int  gamma_dma(struct inode *inod
 extern int  gamma_find_devices(void);
 extern int  gamma_found(void);
 
-#define GLINT_DRI_BUF_COUNT 256
 
 #define GAMMA_OFF(reg)						   \
 	((reg < 0x1000)						   \
@@ -85,6 +78,7 @@ extern int  gamma_found(void);
 			   ((reg < 0x10000)  ? dev_priv->mmio1->handle :     \
 			    ((reg < 0x11000) ? dev_priv->mmio2->handle :     \
 					       dev_priv->mmio3->handle))))
+	
 #define GAMMA_ADDR(reg)	 (GAMMA_BASE(reg) + GAMMA_OFF(reg))
 #define GAMMA_DEREF(reg) *(__volatile__ int *)GAMMA_ADDR(reg)
 #define GAMMA_READ(reg)	 GAMMA_DEREF(reg)
@@ -97,11 +91,9 @@ extern int  gamma_found(void);
 #define GAMMA_FILTERMODE       0x8c00
 #define GAMMA_GCOMMANDINTFLAGS 0x0c50
 #define GAMMA_GCOMMANDMODE     0x0c40
-#define		GAMMA_QUEUED_DMA_MODE		1<<1
 #define GAMMA_GCOMMANDSTATUS   0x0c60
 #define GAMMA_GDELAYTIMER      0x0c38
 #define GAMMA_GDMACONTROL      0x0060
-#define 	GAMMA_USE_AGP			1<<1
 #define GAMMA_GINTENABLE       0x0808
 #define GAMMA_GINTFLAGS	       0x0810
 #define GAMMA_INFIFOSPACE      0x0018
@@ -109,12 +101,5 @@ extern int  gamma_found(void);
 #define GAMMA_OUTPUTFIFO       0x2000
 #define GAMMA_SYNC	       0x8c40
 #define GAMMA_SYNC_TAG	       0x0188
-#define GAMMA_PAGETABLEADDR    0x0C00
-#define GAMMA_PAGETABLELENGTH  0x0C08
-
-#define GAMMA_PASSTHROUGH	0x1FE
-#define GAMMA_DMAADDRTAG	0x530
-#define GAMMA_DMACOUNTTAG	0x531
-#define GAMMA_COMMANDINTTAG	0x532
 
 #endif
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/i810.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/i810.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/i810.h	2003-07-30 13:51:23.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/i810.h	2001-08-08 18:42:14.000000000 +0200
@@ -41,47 +41,6 @@
 #define __HAVE_MTRR		1
 #define __HAVE_CTX_BITMAP	1
 
-#define DRIVER_AUTHOR		"VA Linux Systems Inc."
-
-#define DRIVER_NAME		"i810"
-#define DRIVER_DESC		"Intel i810"
-#define DRIVER_DATE		"20020211"
-
-/* Interface history
- *
- * 1.1   - XFree86 4.1
- * 1.2   - XvMC interfaces
- *       - XFree86 4.2
- * 1.2.1 - Disable copying code (leave stub ioctls for backwards compatibility)
- *       - Remove requirement for interrupt (leave stubs again)
- */
-#define DRIVER_MAJOR		1
-#define DRIVER_MINOR		2
-#define DRIVER_PATCHLEVEL	1
-
-#define DRIVER_IOCTLS							    \
-	[DRM_IOCTL_NR(DRM_IOCTL_I810_INIT)]   = { i810_dma_init,    1, 1 }, \
-   	[DRM_IOCTL_NR(DRM_IOCTL_I810_VERTEX)] = { i810_dma_vertex,  1, 0 }, \
-   	[DRM_IOCTL_NR(DRM_IOCTL_I810_CLEAR)]  = { i810_clear_bufs,  1, 0 }, \
-      	[DRM_IOCTL_NR(DRM_IOCTL_I810_FLUSH)]  = { i810_flush_ioctl, 1, 0 }, \
-   	[DRM_IOCTL_NR(DRM_IOCTL_I810_GETAGE)] = { i810_getage,      1, 0 }, \
-	[DRM_IOCTL_NR(DRM_IOCTL_I810_GETBUF)] = { i810_getbuf,      1, 0 }, \
-   	[DRM_IOCTL_NR(DRM_IOCTL_I810_SWAP)]   = { i810_swap_bufs,   1, 0 }, \
-   	[DRM_IOCTL_NR(DRM_IOCTL_I810_COPY)]   = { i810_copybuf,     1, 0 }, \
-   	[DRM_IOCTL_NR(DRM_IOCTL_I810_DOCOPY)] = { i810_docopy,      1, 0 }, \
-	[DRM_IOCTL_NR(DRM_IOCTL_I810_OV0INFO)] = { i810_ov0_info,   1, 0 }, \
-	[DRM_IOCTL_NR(DRM_IOCTL_I810_FSTATUS)] = { i810_fstatus,    1, 0 }, \
-	[DRM_IOCTL_NR(DRM_IOCTL_I810_OV0FLIP)] = { i810_ov0_flip,   1, 0 }, \
-	[DRM_IOCTL_NR(DRM_IOCTL_I810_MC)]      = { i810_dma_mc,     1, 1 }, \
-	[DRM_IOCTL_NR(DRM_IOCTL_I810_RSTATUS)] = { i810_rstatus,    1, 0 }
-
-
-#define __HAVE_COUNTERS         4
-#define __HAVE_COUNTER6         _DRM_STAT_IRQ
-#define __HAVE_COUNTER7         _DRM_STAT_PRIMARY
-#define __HAVE_COUNTER8         _DRM_STAT_SECONDARY
-#define __HAVE_COUNTER9         _DRM_STAT_DMA
-
 /* Driver customization:
  */
 #define __HAVE_RELEASE		1
@@ -101,10 +60,50 @@
 	i810_dma_quiescent( dev );					\
 } while (0)
 
-/* Don't need an irq any more.  The template code will make sure that
- * a noop stub is generated for compatibility.
- */
-#define __HAVE_DMA_IRQ		0
+#define __HAVE_DMA_IRQ		1
+#define __HAVE_DMA_IRQ_BH	1
+#define __HAVE_SHARED_IRQ       1
+#define DRIVER_PREINSTALL() do {					\
+	drm_i810_private_t *dev_priv =					\
+		(drm_i810_private_t *)dev->dev_private;			\
+	u16 tmp;							\
+   	tmp = I810_READ16( I810REG_HWSTAM );				\
+   	tmp = tmp & 0x6000;						\
+   	I810_WRITE16( I810REG_HWSTAM, tmp );				\
+									\
+      	tmp = I810_READ16( I810REG_INT_MASK_R );			\
+   	tmp = tmp & 0x6000;		/* Unmask interrupts */		\
+   	I810_WRITE16( I810REG_INT_MASK_R, tmp );			\
+   	tmp = I810_READ16( I810REG_INT_ENABLE_R );			\
+   	tmp = tmp & 0x6000;		/* Disable all interrupts */	\
+      	I810_WRITE16( I810REG_INT_ENABLE_R, tmp );			\
+} while (0)
+
+#define DRIVER_POSTINSTALL() do {					\
+	drm_i810_private_t *dev_priv =					\
+		(drm_i810_private_t *)dev->dev_private;			\
+	u16 tmp;							\
+   	tmp = I810_READ16( I810REG_INT_ENABLE_R );			\
+   	tmp = tmp & 0x6000;						\
+   	tmp = tmp | 0x0003;	/* Enable bp & user interrupts */	\
+   	I810_WRITE16( I810REG_INT_ENABLE_R, tmp );			\
+} while (0)
+
+#define DRIVER_UNINSTALL() do {						\
+	drm_i810_private_t *dev_priv =					\
+		(drm_i810_private_t *)dev->dev_private;			\
+	u16 tmp;							\
+	if ( dev_priv ) {						\
+		tmp = I810_READ16( I810REG_INT_IDENTITY_R );		\
+		tmp = tmp & ~(0x6000);	/* Clear all interrupts */	\
+		if ( tmp != 0 )						\
+			I810_WRITE16( I810REG_INT_IDENTITY_R, tmp );	\
+									\
+		tmp = I810_READ16( I810REG_INT_ENABLE_R );		\
+		tmp = tmp & 0x6000;	/* Disable all interrupts */	\
+		I810_WRITE16( I810REG_INT_ENABLE_R, tmp );		\
+	}								\
+} while (0)
 
 /* Buffer customization:
  */
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/i810_dma.c linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/i810_dma.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/i810_dma.c	2003-07-30 13:51:23.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/i810_dma.c	2002-12-18 01:03:52.000000000 +0100
@@ -26,20 +26,21 @@
  *
  * Authors: Rickard E. (Rik) Faith <faith@valinux.com>
  *	    Jeff Hartmann <jhartmann@valinux.com>
- *          Keith Whitwell <keith@tungstengraphics.com>
+ *          Keith Whitwell <keithw@valinux.com>
  *
  */
 
 #include <linux/config.h>
 #include "i810.h"
 #include "drmP.h"
-#include "drm.h"
-#include "i810_drm.h"
 #include "i810_drv.h"
 #include <linux/interrupt.h>	/* For task queue support */
-#include <linux/delay.h>
+#include <linux/module.h>
 
-#define DO_MUNMAP(m, a, l)	do_munmap(m, a, l)
+/* in case we don't have a 2.3.99-pre6 kernel or later: */
+#ifndef VM_DONTCOPY
+#define VM_DONTCOPY 0
+#endif
 
 #define I810_BUF_FREE		2
 #define I810_BUF_CLIENT		1
@@ -50,27 +51,29 @@
 
 #define RING_LOCALS	unsigned int outring, ringmask; volatile char *virt;
 
-#define BEGIN_LP_RING(n) do {						\
-	if (0) DRM_DEBUG("BEGIN_LP_RING(%d) in %s\n", n, __FUNCTION__);	\
-	if (dev_priv->ring.space < n*4)					\
-		i810_wait_ring(dev, n*4);				\
-	dev_priv->ring.space -= n*4;					\
-	outring = dev_priv->ring.tail;					\
-	ringmask = dev_priv->ring.tail_mask;				\
-	virt = dev_priv->ring.virtual_start;				\
+#define BEGIN_LP_RING(n) do {				\
+	if (I810_VERBOSE)				\
+		DRM_DEBUG("BEGIN_LP_RING(%d) in %s\n",	\
+			  n, __FUNCTION__);		\
+	if (dev_priv->ring.space < n*4) 		\
+		i810_wait_ring(dev, n*4);		\
+	dev_priv->ring.space -= n*4;			\
+	outring = dev_priv->ring.tail;			\
+	ringmask = dev_priv->ring.tail_mask;		\
+	virt = dev_priv->ring.virtual_start;		\
 } while (0)
 
-#define ADVANCE_LP_RING() do {				\
-	if (0) DRM_DEBUG("ADVANCE_LP_RING\n");			\
-	dev_priv->ring.tail = outring;			\
-	I810_WRITE(LP_RING + RING_TAIL, outring);	\
+#define ADVANCE_LP_RING() do {					\
+	if (I810_VERBOSE) DRM_DEBUG("ADVANCE_LP_RING\n");	\
+	dev_priv->ring.tail = outring;				\
+	I810_WRITE(LP_RING + RING_TAIL, outring);		\
 } while(0)
 
-#define OUT_RING(n) do {				\
-	if (0) DRM_DEBUG("   OUT_RING %x\n", (int)(n));	\
-	*(volatile unsigned int *)(virt + outring) = n;	\
-	outring += 4;					\
-	outring &= ringmask;				\
+#define OUT_RING(n) do {						\
+	if (I810_VERBOSE) DRM_DEBUG("   OUT_RING %x\n", (int)(n));	\
+	*(volatile unsigned int *)(virt + outring) = n;			\
+	outring += 4;							\
+	outring &= ringmask;						\
 } while (0)
 
 static inline void i810_print_status_page(drm_device_t *dev)
@@ -132,14 +135,14 @@ static int i810_freelist_put(drm_device_
 }
 
 static struct file_operations i810_buffer_fops = {
-	.open	 = DRM(open),
-	.flush	 = DRM(flush),
-	.release = DRM(release),
-	.ioctl	 = DRM(ioctl),
-	.mmap	 = i810_mmap_buffers,
-	.read	 = DRM(read),
-	.fasync  = DRM(fasync),
-      	.poll	 = DRM(poll),
+	open:	 DRM(open),
+	flush:	 DRM(flush),
+	release: DRM(release),
+	ioctl:	 DRM(ioctl),
+	mmap:	 i810_mmap_buffers,
+	read:	 DRM(read),
+	fasync:	 DRM(fasync),
+      	poll:	 DRM(poll),
 };
 
 int i810_mmap_buffers(struct file *filp, struct vm_area_struct *vma)
@@ -162,7 +165,7 @@ int i810_mmap_buffers(struct file *filp,
    	buf_priv->currently_mapped = I810_BUF_MAPPED;
 	unlock_kernel();
 
-	if (remap_page_range(DRM_RPR_ARG(vma) vma->vm_start,
+	if (remap_page_range(vma->vm_start,
 			     VM_OFFSET(vma),
 			     vma->vm_end - vma->vm_start,
 			     vma->vm_page_prot)) return -EAGAIN;
@@ -180,31 +183,28 @@ static int i810_map_buffer(drm_buf_t *bu
 
 	if(buf_priv->currently_mapped == I810_BUF_MAPPED) return -EINVAL;
 
-
-
-
-	down_write( &current->mm->mmap_sem );
-
-	old_fops = filp->f_op;
-	filp->f_op = &i810_buffer_fops;
-	dev_priv->mmap_buffer = buf;
-	buf_priv->virtual = (void *)do_mmap(filp, 0, buf->total,
-					    PROT_READ|PROT_WRITE,
-					    MAP_SHARED,
-					    buf->bus_address);
-	dev_priv->mmap_buffer = NULL;
-	filp->f_op = old_fops;
-	if ((unsigned long)buf_priv->virtual > -1024UL) {
-		/* Real error */
-		DRM_DEBUG("mmap error\n");
-		retcode = (signed int)buf_priv->virtual;
-		buf_priv->virtual = 0;
+	if(VM_DONTCOPY != 0) {
+		down_write( &current->mm->mmap_sem );
+		old_fops = filp->f_op;
+		filp->f_op = &i810_buffer_fops;
+		dev_priv->mmap_buffer = buf;
+		buf_priv->virtual = (void *)do_mmap(filp, 0, buf->total,
+						    PROT_READ|PROT_WRITE,
+						    MAP_SHARED,
+						    buf->bus_address);
+		dev_priv->mmap_buffer = NULL;
+   		filp->f_op = old_fops;
+		if ((unsigned long)buf_priv->virtual > -1024UL) {
+			/* Real error */
+			DRM_DEBUG("mmap error\n");
+			retcode = (signed int)buf_priv->virtual;
+			buf_priv->virtual = 0;
+		}
+		up_write( &current->mm->mmap_sem );
+	} else {
+		buf_priv->virtual = buf_priv->kernel_virtual;
+   		buf_priv->currently_mapped = I810_BUF_MAPPED;
 	}
-
-
-
-	up_write( &current->mm->mmap_sem );
-
 	return retcode;
 }
 
@@ -213,21 +213,15 @@ static int i810_unmap_buffer(drm_buf_t *
 	drm_i810_buf_priv_t *buf_priv = buf->dev_private;
 	int retcode = 0;
 
-	if(buf_priv->currently_mapped != I810_BUF_MAPPED)
-		return -EINVAL;
-
-
-
-	down_write( &current->mm->mmap_sem );
-
-	retcode = DO_MUNMAP(current->mm,
-			    (unsigned long)buf_priv->virtual,
-			    (size_t) buf->total);
-
-
-
-	up_write( &current->mm->mmap_sem );
-
+	if(VM_DONTCOPY != 0) {
+		if(buf_priv->currently_mapped != I810_BUF_MAPPED)
+			return -EINVAL;
+		down_write( &current->mm->mmap_sem );
+        	retcode = do_munmap(current->mm,
+				    (unsigned long)buf_priv->virtual,
+				    (size_t) buf->total);
+		up_write( &current->mm->mmap_sem );
+	}
    	buf_priv->currently_mapped = I810_BUF_UNMAPPED;
    	buf_priv->virtual = 0;
 
@@ -279,9 +273,8 @@ static int i810_dma_cleanup(drm_device_t
 					 dev_priv->ring.Size);
 		}
 	   	if(dev_priv->hw_status_page != 0UL) {
-		   	pci_free_consistent(dev->pdev, PAGE_SIZE,
-					    (void *)dev_priv->hw_status_page,
-					    dev_priv->dma_status_page);
+		   	pci_free_consistent(dev->pdev, PAGE_SIZE, (void *)dev_priv->hw_status_page,
+		   		dev_priv->dma_status_page);
 		   	/* Need to rewrite hardware status page */
 		   	I810_WRITE(0x02080, 0x1ffff000);
 		}
@@ -308,6 +301,8 @@ static int i810_wait_ring(drm_device_t *
 
 	end = jiffies + (HZ*3);
    	while (ring->space < n) {
+	   	int i;
+
 	   	ring->head = I810_READ(LP_RING + RING_HEAD) & HEAD_ADDR;
 	   	ring->space = ring->head - (ring->tail+8);
 		if (ring->space < 0) ring->space += ring->Size;
@@ -316,12 +311,13 @@ static int i810_wait_ring(drm_device_t *
 		   end = jiffies + (HZ*3);
 
 	   	iters++;
-		if(time_before(end, jiffies)) {
+		if((signed)(end - jiffies) <= 0) {
 		   	DRM_ERROR("space: %d wanted %d\n", ring->space, n);
 		   	DRM_ERROR("lockup\n");
 		   	goto out_wait_ring;
 		}
-	   	udelay(1);
+
+	   	for (i = 0 ; i < 2000 ; i++) ;
 	}
 
 out_wait_ring:
@@ -409,6 +405,9 @@ static int i810_dma_initialize(drm_devic
 		((u8 *)dev_priv->sarea_map->handle +
 		 init->sarea_priv_offset);
 
+   	atomic_set(&dev_priv->flush_done, 0);
+	init_waitqueue_head(&dev_priv->flush_queue);
+
    	dev_priv->ring.Start = init->ring_start;
    	dev_priv->ring.End = init->ring_end;
    	dev_priv->ring.Size = init->ring_size;
@@ -441,9 +440,8 @@ static int i810_dma_initialize(drm_devic
 	dev_priv->zi1 = init->depth_offset | init->pitch_bits;
 
    	/* Program Hardware Status Page */
-   	dev_priv->hw_status_page =
-		(unsigned long) pci_alloc_consistent(dev->pdev, PAGE_SIZE,
-						&dev_priv->dma_status_page);
+   	dev_priv->hw_status_page = (unsigned long)pci_alloc_consistent(dev->pdev, PAGE_SIZE,
+   			&dev_priv->dma_status_page);
    	if(dev_priv->hw_status_page == 0UL) {
 		dev->dev_private = (void *)dev_priv;
 		i810_dma_cleanup(dev);
@@ -453,7 +451,7 @@ static int i810_dma_initialize(drm_devic
    	memset((void *) dev_priv->hw_status_page, 0, PAGE_SIZE);
    	DRM_DEBUG("hw status page @ %lx\n", dev_priv->hw_status_page);
 
-	I810_WRITE(0x02080, dev_priv->dma_status_page);
+   	I810_WRITE(0x02080, dev_priv->dma_status_page);
    	DRM_DEBUG("Enabled hardware status page\n");
 
    	/* Now we need to init our freelist */
@@ -534,12 +532,16 @@ int i810_dma_init(struct inode *inode, s
 
 /* Most efficient way to verify state for the i810 is as it is
  * emitted.  Non-conformant state is silently dropped.
+ *
+ * Use 'volatile' & local var tmp to force the emitted values to be
+ * identical to the verified ones.
  */
 static void i810EmitContextVerified( drm_device_t *dev,
-				     unsigned int *code )
+				     volatile unsigned int *code )
 {
    	drm_i810_private_t *dev_priv = dev->dev_private;
 	int i, j = 0;
+	unsigned int tmp;
 	RING_LOCALS;
 
 	BEGIN_LP_RING( I810_CTX_SETUP_SIZE );
@@ -551,13 +553,14 @@ static void i810EmitContextVerified( drm
 	OUT_RING( code[I810_CTXREG_ST1] );
 
 	for ( i = 4 ; i < I810_CTX_SETUP_SIZE ; i++ ) {
-		if ((code[i] & (7<<29)) == (3<<29) &&
-		    (code[i] & (0x1f<<24)) < (0x1d<<24))
+		tmp = code[i];
+
+		if ((tmp & (7<<29)) == (3<<29) &&
+		    (tmp & (0x1f<<24)) < (0x1d<<24))
 		{
-			OUT_RING( code[i] );
+			OUT_RING( tmp );
 			j++;
 		}
-		else printk("constext state dropped!!!\n");
 	}
 
 	if (j & 1)
@@ -571,6 +574,7 @@ static void i810EmitTexVerified( drm_dev
 {
    	drm_i810_private_t *dev_priv = dev->dev_private;
 	int i, j = 0;
+	unsigned int tmp;
 	RING_LOCALS;
 
 	BEGIN_LP_RING( I810_TEX_SETUP_SIZE );
@@ -581,14 +585,14 @@ static void i810EmitTexVerified( drm_dev
 	OUT_RING( code[I810_TEXREG_MI3] );
 
 	for ( i = 4 ; i < I810_TEX_SETUP_SIZE ; i++ ) {
+		tmp = code[i];
 
-		if ((code[i] & (7<<29)) == (3<<29) &&
-		    (code[i] & (0x1f<<24)) < (0x1d<<24))
+		if ((tmp & (7<<29)) == (3<<29) &&
+		    (tmp & (0x1f<<24)) < (0x1d<<24))
 		{
-			OUT_RING( code[i] );
+			OUT_RING( tmp );
 			j++;
 		}
-		else printk("texture state dropped!!!\n");
 	}
 
 	if (j & 1)
@@ -613,9 +617,9 @@ static void i810EmitDestVerified( drm_de
 	if (tmp == dev_priv->front_di1 || tmp == dev_priv->back_di1) {
 		OUT_RING( CMD_OP_DESTBUFFER_INFO );
 		OUT_RING( tmp );
-	} 
-	else
-	   printk("buffer state dropped\n");
+	} else
+	   DRM_DEBUG("bad di1 %x (allow %x or %x)\n",
+		     tmp, dev_priv->front_di1, dev_priv->back_di1);
 
 	/* invarient:
 	 */
@@ -700,6 +704,7 @@ static void i810_dma_dispatch_clear( drm
 			continue;
 
 	   	if ( flags & I810_FRONT ) {
+		   	DRM_DEBUG("clear front\n");
 			BEGIN_LP_RING( 6 );
 			OUT_RING( BR00_BITBLT_CLIENT |
 				  BR00_OP_COLOR_BLT | 0x3 );
@@ -712,6 +717,7 @@ static void i810_dma_dispatch_clear( drm
 		}
 
 		if ( flags & I810_BACK ) {
+			DRM_DEBUG("clear back\n");
 			BEGIN_LP_RING( 6 );
 			OUT_RING( BR00_BITBLT_CLIENT |
 				  BR00_OP_COLOR_BLT | 0x3 );
@@ -724,6 +730,7 @@ static void i810_dma_dispatch_clear( drm
 		}
 
 		if ( flags & I810_DEPTH ) {
+			DRM_DEBUG("clear depth\n");
 			BEGIN_LP_RING( 6 );
 			OUT_RING( BR00_BITBLT_CLIENT |
 				  BR00_OP_COLOR_BLT | 0x3 );
@@ -749,6 +756,8 @@ static void i810_dma_dispatch_swap( drm_
 	int i;
 	RING_LOCALS;
 
+	DRM_DEBUG("swapbuffers\n");
+
   	i810_kernel_lost_context(dev);
 
       	if (nbox > I810_NR_SAREA_CLIPRECTS)
@@ -767,6 +776,10 @@ static void i810_dma_dispatch_swap( drm_
 		    pbox->y2 > dev_priv->h)
 			continue;
 
+	   	DRM_DEBUG("dispatch swap %d,%d-%d,%d!\n",
+			  pbox[i].x1, pbox[i].y1,
+			  pbox[i].x2, pbox[i].y2);
+
 		BEGIN_LP_RING( 6 );
 		OUT_RING( BR00_BITBLT_CLIENT | BR00_OP_SRC_COPY_BLT | 0x4 );
 		OUT_RING( pitch | (0xCC << 16));
@@ -791,7 +804,7 @@ static void i810_dma_dispatch_vertex(drm
    	int nbox = sarea_priv->nbox;
 	unsigned long address = (unsigned long)buf->bus_address;
 	unsigned long start = address - dev->agp->base;
-	int i = 0;
+	int i = 0, u;
    	RING_LOCALS;
 
    	i810_kernel_lost_context(dev);
@@ -799,16 +812,33 @@ static void i810_dma_dispatch_vertex(drm
    	if (nbox > I810_NR_SAREA_CLIPRECTS)
 		nbox = I810_NR_SAREA_CLIPRECTS;
 
+	if (discard) {
+		u = cmpxchg(buf_priv->in_use, I810_BUF_CLIENT,
+			    I810_BUF_HARDWARE);
+		if(u != I810_BUF_CLIENT) {
+			DRM_DEBUG("xxxx 2\n");
+		}
+	}
+
 	if (used > 4*1024)
 		used = 0;
 
 	if (sarea_priv->dirty)
 	   i810EmitState( dev );
 
-	if (buf_priv->currently_mapped == I810_BUF_MAPPED) {
-		unsigned int prim = (sarea_priv->vertex_prim & PR_MASK);
+  	DRM_DEBUG("dispatch vertex addr 0x%lx, used 0x%x nbox %d\n",
+		  address, used, nbox);
 
-		*(u32 *)buf_priv->virtual = (GFX_OP_PRIMITIVE | prim | 
+   	dev_priv->counter++;
+   	DRM_DEBUG(  "dispatch counter : %ld\n", dev_priv->counter);
+   	DRM_DEBUG(  "i810_dma_dispatch\n");
+   	DRM_DEBUG(  "start : %lx\n", start);
+	DRM_DEBUG(  "used : %d\n", used);
+   	DRM_DEBUG(  "start + used - 4 : %ld\n", start + used - 4);
+
+	if (buf_priv->currently_mapped == I810_BUF_MAPPED) {
+		*(u32 *)buf_priv->virtual = (GFX_OP_PRIMITIVE |
+					     sarea_priv->vertex_prim |
 					     ((used/4)-2));
 
 		if (used & 4) {
@@ -841,32 +871,74 @@ static void i810_dma_dispatch_vertex(drm
 		} while (++i < nbox);
 	}
 
-	if (discard) {
-		dev_priv->counter++;
-
-		(void) cmpxchg(buf_priv->in_use, I810_BUF_CLIENT,
-			       I810_BUF_HARDWARE);
+	BEGIN_LP_RING(10);
+	OUT_RING( CMD_STORE_DWORD_IDX );
+	OUT_RING( 20 );
+	OUT_RING( dev_priv->counter );
+	OUT_RING( 0 );
 
-		BEGIN_LP_RING(8);
-		OUT_RING( CMD_STORE_DWORD_IDX );
-		OUT_RING( 20 );
-		OUT_RING( dev_priv->counter );
+	if (discard) {
 		OUT_RING( CMD_STORE_DWORD_IDX );
 		OUT_RING( buf_priv->my_use_idx );
 		OUT_RING( I810_BUF_FREE );
-		OUT_RING( CMD_REPORT_HEAD );
 		OUT_RING( 0 );
-		ADVANCE_LP_RING();
 	}
+
+      	OUT_RING( CMD_REPORT_HEAD );
+	OUT_RING( 0 );
+   	ADVANCE_LP_RING();
 }
 
 
-void i810_dma_quiescent(drm_device_t *dev)
+/* Interrupts are only for flushing */
+void i810_dma_service(int irq, void *device, struct pt_regs *regs)
 {
-      	drm_i810_private_t *dev_priv = dev->dev_private;
+	drm_device_t	 *dev = (drm_device_t *)device;
+      	drm_i810_private_t *dev_priv = (drm_i810_private_t *)dev->dev_private;
+   	u16 temp;
+
+	atomic_inc(&dev->counts[_DRM_STAT_IRQ]);
+      	temp = I810_READ16(I810REG_INT_IDENTITY_R);
+   	temp = temp & ~(0x6000);
+   	if(temp != 0) I810_WRITE16(I810REG_INT_IDENTITY_R,
+				   temp); /* Clear all interrupts */
+	else
+	   return;
+
+   	queue_task(&dev->tq, &tq_immediate);
+   	mark_bh(IMMEDIATE_BH);
+}
+
+void i810_dma_immediate_bh(void *device)
+{
+	drm_device_t *dev = (drm_device_t *) device;
+      	drm_i810_private_t *dev_priv = (drm_i810_private_t *)dev->dev_private;
+
+   	atomic_set(&dev_priv->flush_done, 1);
+   	wake_up_interruptible(&dev_priv->flush_queue);
+}
+
+static inline void i810_dma_emit_flush(drm_device_t *dev)
+{
+   	drm_i810_private_t *dev_priv = dev->dev_private;
    	RING_LOCALS;
 
-/*  	printk("%s\n", __FUNCTION__); */
+   	i810_kernel_lost_context(dev);
+
+   	BEGIN_LP_RING(2);
+      	OUT_RING( CMD_REPORT_HEAD );
+      	OUT_RING( GFX_OP_USER_INTERRUPT );
+      	ADVANCE_LP_RING();
+
+/*  	i810_wait_ring( dev, dev_priv->ring.Size - 8 ); */
+/*     	atomic_set(&dev_priv->flush_done, 1); */
+/*     	wake_up_interruptible(&dev_priv->flush_queue); */
+}
+
+static inline void i810_dma_quiescent_emit(drm_device_t *dev)
+{
+      	drm_i810_private_t *dev_priv = dev->dev_private;
+   	RING_LOCALS;
 
   	i810_kernel_lost_context(dev);
 
@@ -874,29 +946,79 @@ void i810_dma_quiescent(drm_device_t *de
    	OUT_RING( INST_PARSER_CLIENT | INST_OP_FLUSH | INST_FLUSH_MAP_CACHE );
    	OUT_RING( CMD_REPORT_HEAD );
       	OUT_RING( 0 );
-      	OUT_RING( 0 );
+      	OUT_RING( GFX_OP_USER_INTERRUPT );
    	ADVANCE_LP_RING();
 
-	i810_wait_ring( dev, dev_priv->ring.Size - 8 );
+/*  	i810_wait_ring( dev, dev_priv->ring.Size - 8 ); */
+/*     	atomic_set(&dev_priv->flush_done, 1); */
+/*     	wake_up_interruptible(&dev_priv->flush_queue); */
+}
+
+void i810_dma_quiescent(drm_device_t *dev)
+{
+      	DECLARE_WAITQUEUE(entry, current);
+  	drm_i810_private_t *dev_priv = (drm_i810_private_t *)dev->dev_private;
+	unsigned long end;
+
+   	if(dev_priv == NULL) {
+	   	return;
+	}
+      	atomic_set(&dev_priv->flush_done, 0);
+   	add_wait_queue(&dev_priv->flush_queue, &entry);
+   	end = jiffies + (HZ*3);
+
+   	for (;;) {
+		current->state = TASK_INTERRUPTIBLE;
+	      	i810_dma_quiescent_emit(dev);
+	   	if (atomic_read(&dev_priv->flush_done) == 1) break;
+		if((signed)(end - jiffies) <= 0) {
+		   	DRM_ERROR("lockup\n");
+		   	break;
+		}
+	      	schedule_timeout(HZ*3);
+	      	if (signal_pending(current)) {
+		   	break;
+		}
+	}
+
+   	current->state = TASK_RUNNING;
+   	remove_wait_queue(&dev_priv->flush_queue, &entry);
+
+   	return;
 }
 
 static int i810_flush_queue(drm_device_t *dev)
 {
-   	drm_i810_private_t *dev_priv = dev->dev_private;
+   	DECLARE_WAITQUEUE(entry, current);
+  	drm_i810_private_t *dev_priv = (drm_i810_private_t *)dev->dev_private;
 	drm_device_dma_t *dma = dev->dma;
+	unsigned long end;
    	int i, ret = 0;
-   	RING_LOCALS;
-	
-/*  	printk("%s\n", __FUNCTION__); */
 
-   	i810_kernel_lost_context(dev);
+   	if(dev_priv == NULL) {
+	   	return 0;
+	}
+      	atomic_set(&dev_priv->flush_done, 0);
+   	add_wait_queue(&dev_priv->flush_queue, &entry);
+   	end = jiffies + (HZ*3);
+   	for (;;) {
+		current->state = TASK_INTERRUPTIBLE;
+	      	i810_dma_emit_flush(dev);
+	   	if (atomic_read(&dev_priv->flush_done) == 1) break;
+		if((signed)(end - jiffies) <= 0) {
+		   	DRM_ERROR("lockup\n");
+		   	break;
+		}
+	      	schedule_timeout(HZ*3);
+	      	if (signal_pending(current)) {
+		   	ret = -EINTR; /* Can't restart */
+		   	break;
+		}
+	}
 
-   	BEGIN_LP_RING(2);
-      	OUT_RING( CMD_REPORT_HEAD );
-      	OUT_RING( 0 );
-      	ADVANCE_LP_RING();
+   	current->state = TASK_RUNNING;
+   	remove_wait_queue(&dev_priv->flush_queue, &entry);
 
-	i810_wait_ring( dev, dev_priv->ring.Size - 8 );
 
    	for (i = 0; i < dma->buf_count; i++) {
 	   	drm_buf_t *buf = dma->buflist[ i ];
@@ -908,7 +1030,7 @@ static int i810_flush_queue(drm_device_t
 		if (used == I810_BUF_HARDWARE)
 			DRM_DEBUG("reclaimed from HARDWARE\n");
 		if (used == I810_BUF_CLIENT)
-			DRM_DEBUG("still on client\n");
+			DRM_DEBUG("still on client HARDWARE\n");
 	}
 
    	return ret;
@@ -948,6 +1070,7 @@ int i810_flush_ioctl(struct inode *inode
    	drm_file_t	  *priv	  = filp->private_data;
    	drm_device_t	  *dev	  = priv->dev;
 
+   	DRM_DEBUG("i810_flush_ioctl\n");
    	if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
 		DRM_ERROR("i810_flush_ioctl called without lock held\n");
 		return -EINVAL;
@@ -978,6 +1101,9 @@ int i810_dma_vertex(struct inode *inode,
 		return -EINVAL;
 	}
 
+	DRM_DEBUG("i810 dma vertex, idx %d used %d discard %d\n",
+		  vertex.idx, vertex.used, vertex.discard);
+
 	if(vertex.idx < 0 || vertex.idx > dma->buf_count) return -EINVAL;
 
 	i810_dma_dispatch_vertex( dev,
@@ -1026,6 +1152,8 @@ int i810_swap_bufs(struct inode *inode, 
 	drm_file_t *priv = filp->private_data;
 	drm_device_t *dev = priv->dev;
 
+	DRM_DEBUG("i810_swap_bufs\n");
+
    	if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
 		DRM_ERROR("i810_swap_buf called without lock held\n");
 		return -EINVAL;
@@ -1061,6 +1189,7 @@ int i810_getbuf(struct inode *inode, str
    	drm_i810_sarea_t *sarea_priv = (drm_i810_sarea_t *)
      					dev_priv->sarea_priv;
 
+	DRM_DEBUG("getbuf\n");
    	if (copy_from_user(&d, (drm_i810_dma_t *)arg, sizeof(d)))
 		return -EFAULT;
 
@@ -1073,6 +1202,9 @@ int i810_getbuf(struct inode *inode, str
 
 	retcode = i810_dma_get_buffer(dev, &d, filp);
 
+	DRM_DEBUG("i810_dma: %d returning %d, granted = %d\n",
+		  current->pid, retcode, d.granted);
+
 	if (copy_to_user((drm_dma_t *)arg, &d, sizeof(d)))
 		return -EFAULT;
    	sarea_priv->last_dispatch = (int) hw_status[5];
@@ -1080,19 +1212,47 @@ int i810_getbuf(struct inode *inode, str
 	return retcode;
 }
 
-int i810_copybuf(struct inode *inode,
-		 struct file *filp, 
-		 unsigned int cmd,
-		 unsigned long arg)
+int i810_copybuf(struct inode *inode, struct file *filp, unsigned int cmd,
+		unsigned long arg)
 {
-	/* Never copy - 2.4.x doesn't need it */
+	drm_file_t	  *priv	    = filp->private_data;
+	drm_device_t	  *dev	    = priv->dev;
+	drm_i810_copy_t	  d;
+   	drm_i810_private_t *dev_priv = (drm_i810_private_t *)dev->dev_private;
+   	u32 *hw_status = (u32 *)dev_priv->hw_status_page;
+   	drm_i810_sarea_t *sarea_priv = (drm_i810_sarea_t *)
+     					dev_priv->sarea_priv;
+	drm_buf_t *buf;
+	drm_i810_buf_priv_t *buf_priv;
+	drm_device_dma_t *dma = dev->dma;
+
+	if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
+		DRM_ERROR("i810_dma called without lock held\n");
+		return -EINVAL;
+	}
+
+   	if (copy_from_user(&d, (drm_i810_copy_t *)arg, sizeof(d)))
+		return -EFAULT;
+
+        if(d.idx < 0 || d.idx > dma->buf_count) return -EINVAL;
+	buf = dma->buflist[ d.idx ];
+   	buf_priv = buf->dev_private;
+	if (buf_priv->currently_mapped != I810_BUF_MAPPED) return -EPERM;
+
+	if(d.used < 0 || d.used > buf->total) return -EINVAL;
+
+   	if (copy_from_user(buf_priv->virtual, d.address, d.used))
+		return -EFAULT;
+
+   	sarea_priv->last_dispatch = (int) hw_status[5];
+
 	return 0;
 }
 
 int i810_docopy(struct inode *inode, struct file *filp, unsigned int cmd,
 		unsigned long arg)
 {
-	/* Never copy - 2.4.x doesn't need it */
+	if(VM_DONTCOPY == 0) return 1;
 	return 0;
 }
 
@@ -1211,8 +1371,7 @@ int i810_ov0_info(struct inode *inode, s
 
 	data.offset = dev_priv->overlay_offset;
 	data.physical = dev_priv->overlay_physical;
-	if (copy_to_user((drm_i810_overlay_t *)arg,&data,sizeof(data)))
-		return -EFAULT;
+	copy_to_user((drm_i810_overlay_t *)arg,&data,sizeof(data));
 	return 0;
 }
 
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/i810_drm.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/i810_drm.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/i810_drm.h	2003-07-30 13:51:23.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/i810_drm.h	2002-12-18 01:03:52.000000000 +0100
@@ -88,8 +88,6 @@
 #define I810_TEXREG_MCS  7	/* GFX_OP_MAP_COORD_SETS ??? */
 #define I810_TEX_SETUP_SIZE 8
 
-/* Flags for clear ioctl
- */
 #define I810_FRONT   0x1
 #define I810_BACK    0x2
 #define I810_DEPTH   0x4
@@ -168,34 +166,14 @@ typedef struct _drm_i810_sarea {
 
 } drm_i810_sarea_t;
 
-/* WARNING: If you change any of these defines, make sure to wear a bullet
- * proof vest since these are part of the stable kernel<->userspace ABI
- */
-
-/* i810 specific ioctls
- * The device specific ioctl range is 0x40 to 0x79.
- */
-#define DRM_IOCTL_I810_INIT		DRM_IOW( 0x40, drm_i810_init_t)
-#define DRM_IOCTL_I810_VERTEX		DRM_IOW( 0x41, drm_i810_vertex_t)
-#define DRM_IOCTL_I810_CLEAR		DRM_IOW( 0x42, drm_i810_clear_t)
-#define DRM_IOCTL_I810_FLUSH		DRM_IO(  0x43)
-#define DRM_IOCTL_I810_GETAGE		DRM_IO(  0x44)
-#define DRM_IOCTL_I810_GETBUF		DRM_IOWR(0x45, drm_i810_dma_t)
-#define DRM_IOCTL_I810_SWAP		DRM_IO(  0x46)
-#define DRM_IOCTL_I810_COPY		DRM_IOW( 0x47, drm_i810_copy_t)
-#define DRM_IOCTL_I810_DOCOPY		DRM_IO(  0x48)
-#define DRM_IOCTL_I810_OV0INFO		DRM_IOR( 0x49, drm_i810_overlay_t)
-#define DRM_IOCTL_I810_FSTATUS		DRM_IO ( 0x4a)
-#define DRM_IOCTL_I810_OV0FLIP		DRM_IO ( 0x4b)
-#define DRM_IOCTL_I810_MC		DRM_IOW( 0x4c, drm_i810_mc_t)
-#define DRM_IOCTL_I810_RSTATUS		DRM_IO ( 0x4d )
-
 typedef struct _drm_i810_clear {
 	int clear_color;
 	int clear_depth;
 	int flags;
 } drm_i810_clear_t;
 
+
+
 /* These may be placeholders if we have more cliprects than
  * I810_NR_SAREA_CLIPRECTS.  In that case, the client sets discard to
  * false, indicating that the buffer will be dispatched again with a
@@ -213,17 +191,6 @@ typedef struct _drm_i810_copy_t {
 	void *address;		/* Address to copy from */
 } drm_i810_copy_t;
 
-#define PR_TRIANGLES         (0x0<<18)
-#define PR_TRISTRIP_0        (0x1<<18)
-#define PR_TRISTRIP_1        (0x2<<18)
-#define PR_TRIFAN            (0x3<<18)
-#define PR_POLYGON           (0x4<<18)
-#define PR_LINES             (0x5<<18)
-#define PR_LINESTRIP         (0x6<<18)
-#define PR_RECTS             (0x7<<18)
-#define PR_MASK              (0x7<<18)
-
-
 typedef struct drm_i810_dma {
 	void *virtual;
 	int request_idx;
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/i810_drv.c linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/i810_drv.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/i810_drv.c	2003-07-30 13:51:23.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/i810_drv.c	2002-12-18 01:03:52.000000000 +0100
@@ -33,10 +33,42 @@
 #include <linux/config.h>
 #include "i810.h"
 #include "drmP.h"
-#include "drm.h"
-#include "i810_drm.h"
 #include "i810_drv.h"
 
+#define DRIVER_AUTHOR		"VA Linux Systems Inc."
+
+#define DRIVER_NAME		"i810"
+#define DRIVER_DESC		"Intel i810"
+#define DRIVER_DATE		"20010920"
+
+#define DRIVER_MAJOR		1
+#define DRIVER_MINOR		2	
+#define DRIVER_PATCHLEVEL	0
+
+#define DRIVER_IOCTLS							    \
+	[DRM_IOCTL_NR(DRM_IOCTL_I810_INIT)]   = { i810_dma_init,    1, 1 }, \
+   	[DRM_IOCTL_NR(DRM_IOCTL_I810_VERTEX)] = { i810_dma_vertex,  1, 0 }, \
+   	[DRM_IOCTL_NR(DRM_IOCTL_I810_CLEAR)]  = { i810_clear_bufs,  1, 0 }, \
+      	[DRM_IOCTL_NR(DRM_IOCTL_I810_FLUSH)]  = { i810_flush_ioctl, 1, 0 }, \
+   	[DRM_IOCTL_NR(DRM_IOCTL_I810_GETAGE)] = { i810_getage,      1, 0 }, \
+	[DRM_IOCTL_NR(DRM_IOCTL_I810_GETBUF)] = { i810_getbuf,      1, 0 }, \
+   	[DRM_IOCTL_NR(DRM_IOCTL_I810_SWAP)]   = { i810_swap_bufs,   1, 0 }, \
+   	[DRM_IOCTL_NR(DRM_IOCTL_I810_COPY)]   = { i810_copybuf,     1, 0 }, \
+   	[DRM_IOCTL_NR(DRM_IOCTL_I810_DOCOPY)] = { i810_docopy,      1, 0 }, \
+	[DRM_IOCTL_NR(DRM_IOCTL_I810_OV0INFO)] = { i810_ov0_info,   1, 0 }, \
+	[DRM_IOCTL_NR(DRM_IOCTL_I810_FSTATUS)] = { i810_fstatus,    1, 0 }, \
+	[DRM_IOCTL_NR(DRM_IOCTL_I810_OV0FLIP)] = { i810_ov0_flip,   1, 0 }, \
+	[DRM_IOCTL_NR(DRM_IOCTL_I810_MC)]      = { i810_dma_mc,     1, 1 }, \
+	[DRM_IOCTL_NR(DRM_IOCTL_I810_RSTATUS)] = { i810_rstatus,    1, 0 }
+
+
+#define __HAVE_COUNTERS         4
+#define __HAVE_COUNTER6         _DRM_STAT_IRQ
+#define __HAVE_COUNTER7         _DRM_STAT_PRIMARY
+#define __HAVE_COUNTER8         _DRM_STAT_SECONDARY
+#define __HAVE_COUNTER9         _DRM_STAT_DMA
+
+
 #include "drm_agpsupport.h"
 #include "drm_auth.h"
 #include "drm_bufs.h"
@@ -45,6 +77,25 @@
 #include "drm_drawable.h"
 #include "drm_drv.h"
 
+#ifndef MODULE
+/* DRM(options) is called by the kernel to parse command-line options
+ * passed via the boot-loader (e.g., LILO).  It calls the insmod option
+ * routine, drm_parse_drm.
+ */
+
+/* JH- We have to hand expand the string ourselves because of the cpp.  If
+ * anyone can think of a way that we can fit into the __setup macro without
+ * changing it, then please send the solution my way.
+ */
+static int __init i810_options( char *str )
+{
+	DRM(parse_options)( str );
+	return 1;
+}
+
+__setup( DRIVER_NAME "=", i810_options );
+#endif
+
 #include "drm_fops.h"
 #include "drm_init.h"
 #include "drm_ioctl.h"
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/i810_drv.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/i810_drv.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/i810_drv.h	2003-07-30 13:51:23.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/i810_drv.h	2002-12-18 01:03:52.000000000 +0100
@@ -63,9 +63,10 @@ typedef struct drm_i810_private {
 
       	unsigned long hw_status_page;
    	unsigned long counter;
+   	dma_addr_t dma_status_page;
 
-	dma_addr_t dma_status_page;
-
+   	atomic_t flush_done;
+   	wait_queue_head_t flush_queue;	/* Processes waiting until flush    */
 	drm_buf_t *mmap_buffer;
 
 
@@ -77,7 +78,6 @@ typedef struct drm_i810_private {
 	int overlay_physical;
 	int w, h;
 	int pitch;
-
 } drm_i810_private_t;
 
 				/* i810_dma.c */
@@ -92,13 +92,8 @@ extern void i810_reclaim_buffers(drm_dev
 extern int  i810_getage(struct inode *inode, struct file *filp,
 			unsigned int cmd, unsigned long arg);
 extern int i810_mmap_buffers(struct file *filp, struct vm_area_struct *vma);
-
-/* Obsolete:
- */
 extern int i810_copybuf(struct inode *inode, struct file *filp,
 			unsigned int cmd, unsigned long arg);
-/* Obsolete:
- */
 extern int i810_docopy(struct inode *inode, struct file *filp,
 		       unsigned int cmd, unsigned long arg);
 
@@ -116,6 +111,9 @@ extern int i810_dma_mc(struct inode *ino
 
 extern void i810_dma_quiescent(drm_device_t *dev);
 
+#define I810_VERBOSE 0
+
+
 int i810_dma_vertex(struct inode *inode, struct file *filp,
 		    unsigned int cmd, unsigned long arg);
 
@@ -198,7 +196,6 @@ int i810_clear_bufs(struct inode *inode,
 
 #define CMD_OP_Z_BUFFER_INFO     ((0x0<<29)|(0x16<<23))
 #define CMD_OP_DESTBUFFER_INFO   ((0x0<<29)|(0x15<<23))
-#define CMD_OP_FRONTBUFFER_INFO  ((0x0<<29)|(0x14<<23))
 
 #define BR00_BITBLT_CLIENT   0x40000000
 #define BR00_OP_COLOR_BLT    0x10000000
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/i830.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/i830.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/i830.h	2003-07-30 13:51:23.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/i830.h	2002-12-18 01:03:52.000000000 +0100
@@ -41,48 +41,6 @@
 #define __HAVE_MTRR		1
 #define __HAVE_CTX_BITMAP	1
 
-#define DRIVER_AUTHOR		"VA Linux Systems Inc."
-
-#define DRIVER_NAME		"i830"
-#define DRIVER_DESC		"Intel 830M"
-#define DRIVER_DATE		"20021108"
-
-/* Interface history:
- *
- * 1.1: Original.
- * 1.2: ?
- * 1.3: New irq emit/wait ioctls.
- *      New pageflip ioctl.
- *      New getparam ioctl.
- *      State for texunits 3&4 in sarea.
- *      New (alternative) layout for texture state.
- */
-#define DRIVER_MAJOR		1
-#define DRIVER_MINOR		3
-#define DRIVER_PATCHLEVEL	2
-
-#define DRIVER_IOCTLS							    \
-	[DRM_IOCTL_NR(DRM_IOCTL_I830_INIT)]   = { i830_dma_init,    1, 1 }, \
-	[DRM_IOCTL_NR(DRM_IOCTL_I830_VERTEX)] = { i830_dma_vertex,  1, 0 }, \
-	[DRM_IOCTL_NR(DRM_IOCTL_I830_CLEAR)]  = { i830_clear_bufs,  1, 0 }, \
-	[DRM_IOCTL_NR(DRM_IOCTL_I830_FLUSH)]  = { i830_flush_ioctl, 1, 0 }, \
-	[DRM_IOCTL_NR(DRM_IOCTL_I830_GETAGE)] = { i830_getage,      1, 0 }, \
-	[DRM_IOCTL_NR(DRM_IOCTL_I830_GETBUF)] = { i830_getbuf,      1, 0 }, \
-	[DRM_IOCTL_NR(DRM_IOCTL_I830_SWAP)]   = { i830_swap_bufs,   1, 0 }, \
-	[DRM_IOCTL_NR(DRM_IOCTL_I830_COPY)]   = { i830_copybuf,     1, 0 }, \
-	[DRM_IOCTL_NR(DRM_IOCTL_I830_DOCOPY)] = { i830_docopy,      1, 0 }, \
-	[DRM_IOCTL_NR(DRM_IOCTL_I830_FLIP)]   = { i830_flip_bufs,   1, 0 }, \
-	[DRM_IOCTL_NR(DRM_IOCTL_I830_IRQ_EMIT)] = { i830_irq_emit,  1, 0 }, \
-	[DRM_IOCTL_NR(DRM_IOCTL_I830_IRQ_WAIT)] = { i830_irq_wait,  1, 0 }, \
-	[DRM_IOCTL_NR(DRM_IOCTL_I830_GETPARAM)] = { i830_getparam,  1, 0 }, \
-	[DRM_IOCTL_NR(DRM_IOCTL_I830_SETPARAM)] = { i830_setparam,  1, 0 } 
-
-#define __HAVE_COUNTERS         4
-#define __HAVE_COUNTER6         _DRM_STAT_IRQ
-#define __HAVE_COUNTER7         _DRM_STAT_PRIMARY
-#define __HAVE_COUNTER8         _DRM_STAT_SECONDARY
-#define __HAVE_COUNTER9         _DRM_STAT_DMA
-
 /* Driver customization:
  */
 #define __HAVE_RELEASE		1
@@ -102,50 +60,51 @@
 	i830_dma_quiescent( dev );					\
 } while (0)
 
-
-/* Driver will work either way: IRQ's save cpu time when waiting for
- * the card, but are subject to subtle interactions between bios,
- * hardware and the driver.
- */
-#define USE_IRQS 0
-
-
-#if USE_IRQS
 #define __HAVE_DMA_IRQ		1
-#define __HAVE_SHARED_IRQ	1
-
-#define DRIVER_PREINSTALL() do {			\
-	drm_i830_private_t *dev_priv =			\
-		(drm_i830_private_t *)dev->dev_private;	\
-							\
-   	I830_WRITE16( I830REG_HWSTAM, 0xffff );	\
-        I830_WRITE16( I830REG_INT_MASK_R, 0x0 );	\
-      	I830_WRITE16( I830REG_INT_ENABLE_R, 0x0 );	\
+#define __HAVE_DMA_IRQ_BH	1
+#define __HAVE_SHARED_IRQ       1
+#define DRIVER_PREINSTALL() do {					\
+	drm_i830_private_t *dev_priv =					\
+		(drm_i830_private_t *)dev->dev_private;			\
+	u16 tmp;							\
+   	tmp = I830_READ16( I830REG_HWSTAM );				\
+   	tmp = tmp & 0x6000;						\
+   	I830_WRITE16( I830REG_HWSTAM, tmp );				\
+									\
+      	tmp = I830_READ16( I830REG_INT_MASK_R );			\
+   	tmp = tmp & 0x6000;		/* Unmask interrupts */		\
+   	I830_WRITE16( I830REG_INT_MASK_R, tmp );			\
+   	tmp = I830_READ16( I830REG_INT_ENABLE_R );			\
+   	tmp = tmp & 0x6000;		/* Disable all interrupts */	\
+      	I830_WRITE16( I830REG_INT_ENABLE_R, tmp );			\
 } while (0)
 
-
-#define DRIVER_POSTINSTALL() do {				\
-	drm_i830_private_t *dev_priv =				\
-		(drm_i830_private_t *)dev->dev_private;		\
-   	I830_WRITE16( I830REG_INT_ENABLE_R, 0x2 );		\
-   	atomic_set(&dev_priv->irq_received, 0);			\
-   	atomic_set(&dev_priv->irq_emitted, 0);			\
-	init_waitqueue_head(&dev_priv->irq_queue);		\
+#define DRIVER_POSTINSTALL() do {					\
+	drm_i830_private_t *dev_priv =					\
+		(drm_i830_private_t *)dev->dev_private;	\
+	u16 tmp;							\
+   	tmp = I830_READ16( I830REG_INT_ENABLE_R );			\
+   	tmp = tmp & 0x6000;						\
+   	tmp = tmp | 0x0003;	/* Enable bp & user interrupts */	\
+   	I830_WRITE16( I830REG_INT_ENABLE_R, tmp );			\
 } while (0)
 
-
-/* This gets called too late to be useful: dev_priv has already been
- * freed.
- */
-#define DRIVER_UNINSTALL() do {					\
+#define DRIVER_UNINSTALL() do {						\
+	drm_i830_private_t *dev_priv =					\
+		(drm_i830_private_t *)dev->dev_private;			\
+	u16 tmp;							\
+	if ( dev_priv ) {						\
+		tmp = I830_READ16( I830REG_INT_IDENTITY_R );		\
+		tmp = tmp & ~(0x6000);	/* Clear all interrupts */	\
+		if ( tmp != 0 )						\
+			I830_WRITE16( I830REG_INT_IDENTITY_R, tmp );	\
+									\
+		tmp = I830_READ16( I830REG_INT_ENABLE_R );		\
+		tmp = tmp & 0x6000;	/* Disable all interrupts */	\
+		I830_WRITE16( I830REG_INT_ENABLE_R, tmp );		\
+	}								\
 } while (0)
 
-#else
-#define __HAVE_DMA_IRQ          0
-#endif
-
-
-
 /* Buffer customization:
  */
 
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/i830_dma.c linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/i830_dma.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/i830_dma.c	2003-07-30 13:51:23.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/i830_dma.c	2002-12-18 01:03:52.000000000 +0100
@@ -26,22 +26,20 @@
  *
  * Authors: Rickard E. (Rik) Faith <faith@valinux.com>
  *	    Jeff Hartmann <jhartmann@valinux.com>
- *	    Keith Whitwell <keith@tungstengraphics.com>
- *	    Abraham vd Merwe <abraham@2d3d.co.za>
+ *      Keith Whitwell <keithw@valinux.com>
+ *      Abraham vd Merwe <abraham@2d3d.co.za>
  *
  */
 
-
 #include "i830.h"
 #include "drmP.h"
-#include "drm.h"
-#include "i830_drm.h"
 #include "i830_drv.h"
 #include <linux/interrupt.h>	/* For task queue support */
-#include <linux/pagemap.h>     /* For FASTCALL on unlock_page() */
 #include <linux/delay.h>
-
-#define DO_MUNMAP(m, a, l)	do_munmap(m, a, l)
+/* in case we don't have a 2.3.99-pre6 kernel or later: */
+#ifndef VM_DONTCOPY
+#define VM_DONTCOPY 0
+#endif
 
 #define I830_BUF_FREE		2
 #define I830_BUF_CLIENT		1
@@ -50,24 +48,54 @@
 #define I830_BUF_UNMAPPED 0
 #define I830_BUF_MAPPED   1
 
+#define RING_LOCALS	unsigned int outring, ringmask; volatile char *virt;
 
 
-
-
-
-
-
-
-
-
-
-
+#define DO_IDLE_WORKAROUND()					\
+do {								\
+   int _head;							\
+   int _tail;							\
+   do { 							\
+      _head = I830_READ(LP_RING + RING_HEAD) & HEAD_ADDR;	\
+      _tail = I830_READ(LP_RING + RING_TAIL) & TAIL_ADDR;	\
+      udelay(1);						\
+   } while(_head != _tail);					\
+} while(0)
+
+#define I830_SYNC_WORKAROUND 0
+
+#define BEGIN_LP_RING(n) do {				\
+	if (I830_VERBOSE)				\
+		DRM_DEBUG("BEGIN_LP_RING(%d) in %s\n",	\
+			  n, __FUNCTION__);		\
+	if (I830_SYNC_WORKAROUND)			\
+		DO_IDLE_WORKAROUND();			\
+	if (dev_priv->ring.space < n*4) 		\
+		i830_wait_ring(dev, n*4);		\
+	dev_priv->ring.space -= n*4;			\
+	outring = dev_priv->ring.tail;			\
+	ringmask = dev_priv->ring.tail_mask;		\
+	virt = dev_priv->ring.virtual_start;		\
+} while (0)
+
+#define ADVANCE_LP_RING() do {					\
+	if (I830_VERBOSE) DRM_DEBUG("ADVANCE_LP_RING\n");	\
+	dev_priv->ring.tail = outring;				\
+	I830_WRITE(LP_RING + RING_TAIL, outring);		\
+} while(0)
+
+#define OUT_RING(n) do {						\
+	if (I830_VERBOSE) DRM_DEBUG("   OUT_RING %x\n", (int)(n));	\
+	*(volatile unsigned int *)(virt + outring) = n;			\
+	outring += 4;							\
+	outring &= ringmask;						\
+} while (0);
 
 static inline void i830_print_status_page(drm_device_t *dev)
 {
    	drm_device_dma_t *dma = dev->dma;
       	drm_i830_private_t *dev_priv = dev->dev_private;
-	u32 *temp = (u32 *)dev_priv->hw_status_page;
+	u8 *temp = dev_priv->hw_status_page;
    	int i;
 
    	DRM_DEBUG(  "hw_status: Interrupt Status : %x\n", temp[0]);
@@ -121,14 +149,14 @@ static int i830_freelist_put(drm_device_
 }
 
 static struct file_operations i830_buffer_fops = {
-	.open	 = DRM(open),
-	.flush	 = DRM(flush),
-	.release = DRM(release),
-	.ioctl	 = DRM(ioctl),
-	.mmap	 = i830_mmap_buffers,
-	.read	 = DRM(read),
-	.fasync  = DRM(fasync),
-      	.poll	 = DRM(poll),
+	open:	 DRM(open),
+	flush:	 DRM(flush),
+	release: DRM(release),
+	ioctl:	 DRM(ioctl),
+	mmap:	 i830_mmap_buffers,
+	read:	 DRM(read),
+	fasync:	 DRM(fasync),
+      	poll:	 DRM(poll),
 };
 
 int i830_mmap_buffers(struct file *filp, struct vm_area_struct *vma)
@@ -151,7 +179,7 @@ int i830_mmap_buffers(struct file *filp,
    	buf_priv->currently_mapped = I830_BUF_MAPPED;
 	unlock_kernel();
 
-	if (remap_page_range(DRM_RPR_ARG(vma) vma->vm_start,
+	if (remap_page_range(vma->vm_start,
 			     VM_OFFSET(vma),
 			     vma->vm_end - vma->vm_start,
 			     vma->vm_page_prot)) return -EAGAIN;
@@ -169,24 +197,28 @@ static int i830_map_buffer(drm_buf_t *bu
 
 	if(buf_priv->currently_mapped == I830_BUF_MAPPED) return -EINVAL;
 
-	down_write( &current->mm->mmap_sem );
-	old_fops = filp->f_op;
-	filp->f_op = &i830_buffer_fops;
-	dev_priv->mmap_buffer = buf;
-	buf_priv->virtual = (void *)do_mmap(filp, 0, buf->total, 
-					    PROT_READ|PROT_WRITE,
-					    MAP_SHARED, 
-					    buf->bus_address);
-	dev_priv->mmap_buffer = NULL;
-	filp->f_op = old_fops;
-	if ((unsigned long)buf_priv->virtual > -1024UL) {
-		/* Real error */
-		DRM_ERROR("mmap error\n");
-		retcode = (signed int)buf_priv->virtual;
-		buf_priv->virtual = 0;
+	if(VM_DONTCOPY != 0) {
+		down_write( &current->mm->mmap_sem );
+		old_fops = filp->f_op;
+		filp->f_op = &i830_buffer_fops;
+		dev_priv->mmap_buffer = buf;
+		buf_priv->virtual = (void *)do_mmap(filp, 0, buf->total, 
+						    PROT_READ|PROT_WRITE,
+						    MAP_SHARED, 
+						    buf->bus_address);
+		dev_priv->mmap_buffer = NULL;
+   		filp->f_op = old_fops;
+		if ((unsigned long)buf_priv->virtual > -1024UL) {
+			/* Real error */
+			DRM_DEBUG("mmap error\n");
+			retcode = (signed int)buf_priv->virtual;
+			buf_priv->virtual = 0;
+		}
+		up_write( &current->mm->mmap_sem );
+	} else {
+		buf_priv->virtual = buf_priv->kernel_virtual;
+   		buf_priv->currently_mapped = I830_BUF_MAPPED;
 	}
-	up_write( &current->mm->mmap_sem );
-
 	return retcode;
 }
 
@@ -195,15 +227,15 @@ static int i830_unmap_buffer(drm_buf_t *
 	drm_i830_buf_priv_t *buf_priv = buf->dev_private;
 	int retcode = 0;
 
-	if(buf_priv->currently_mapped != I830_BUF_MAPPED) 
-		return -EINVAL;
-
-	down_write(&current->mm->mmap_sem);
-	retcode = DO_MUNMAP(current->mm,
-			    (unsigned long)buf_priv->virtual,
-			    (size_t) buf->total);
-	up_write(&current->mm->mmap_sem);
-
+	if(VM_DONTCOPY != 0) {
+		if(buf_priv->currently_mapped != I830_BUF_MAPPED) 
+			return -EINVAL;
+		down_write( &current->mm->mmap_sem );
+        	retcode = do_munmap(current->mm, 
+				    (unsigned long)buf_priv->virtual, 
+				    (size_t) buf->total);
+   		up_write( &current->mm->mmap_sem );
+	}
    	buf_priv->currently_mapped = I830_BUF_UNMAPPED;
    	buf_priv->virtual = 0;
 
@@ -228,7 +260,7 @@ static int i830_dma_get_buffer(drm_devic
 	retcode = i830_map_buffer(buf, filp);
 	if(retcode) {
 		i830_freelist_put(dev, buf);
-	   	DRM_ERROR("mapbuf failed, retcode %d\n", retcode);
+	   	DRM_DEBUG("mapbuf failed, retcode %d\n", retcode);
 		return retcode;
 	}
 	buf->pid     = priv->pid;
@@ -254,22 +286,12 @@ static int i830_dma_cleanup(drm_device_t
 		   	DRM(ioremapfree)((void *) dev_priv->ring.virtual_start,
 					 dev_priv->ring.Size);
 		}
-	   	if(dev_priv->hw_status_page != 0UL) {
-			pci_free_consistent(dev->pdev, PAGE_SIZE,
-					    (void *)dev_priv->hw_status_page,
-					    dev_priv->dma_status_page);
+	   	if(dev_priv->hw_status_page != NULL) {
+	   		pci_free_consistent(dev->pdev, PAGE_SIZE, 
+	   		    dev_priv->hw_status_page, dev_priv->dma_status_page);
 		   	/* Need to rewrite hardware status page */
 		   	I830_WRITE(0x02080, 0x1ffff000);
 		}
-
-		/* Disable interrupts here because after dev_private
-		 * is freed, it's too late.
-		 */
-		if (dev->irq) {
-			I830_WRITE16( I830REG_INT_MASK_R, 0xffff );
-			I830_WRITE16( I830REG_INT_ENABLE_R, 0x0 );
-		}
-
 	   	DRM(free)(dev->dev_private, sizeof(drm_i830_private_t), 
 			 DRM_MEM_DRIVER);
 	   	dev->dev_private = NULL;
@@ -283,7 +305,7 @@ static int i830_dma_cleanup(drm_device_t
    	return 0;
 }
 
-int i830_wait_ring(drm_device_t *dev, int n, const char *caller)
+static int i830_wait_ring(drm_device_t *dev, int n)
 {
    	drm_i830_private_t *dev_priv = dev->dev_private;
    	drm_i830_ring_buffer_t *ring = &(dev_priv->ring);
@@ -292,7 +314,7 @@ int i830_wait_ring(drm_device_t *dev, in
 	unsigned int last_head = I830_READ(LP_RING + RING_HEAD) & HEAD_ADDR;
 
 	end = jiffies + (HZ*3);
-   	while (ring->space < n) {	
+   	while (ring->space < n) {
 	   	ring->head = I830_READ(LP_RING + RING_HEAD) & HEAD_ADDR;
 	   	ring->space = ring->head - (ring->tail+8);
 		if (ring->space < 0) ring->space += ring->Size;
@@ -303,13 +325,13 @@ int i830_wait_ring(drm_device_t *dev, in
 		}
 	  
 	   	iters++;
-		if(time_before(end, jiffies)) {
+		if(time_before(end,jiffies)) {
 		   	DRM_ERROR("space: %d wanted %d\n", ring->space, n);
 		   	DRM_ERROR("lockup\n");
 		   	goto out_wait_ring;
 		}
-		udelay(1);
-		dev_priv->sarea_priv->perf_boxes |= I830_BOX_WAIT;
+
+	   	udelay(1);
 	}
 
 out_wait_ring:   
@@ -322,12 +344,9 @@ static void i830_kernel_lost_context(drm
    	drm_i830_ring_buffer_t *ring = &(dev_priv->ring);
       
    	ring->head = I830_READ(LP_RING + RING_HEAD) & HEAD_ADDR;
-     	ring->tail = I830_READ(LP_RING + RING_TAIL) & TAIL_ADDR;
+     	ring->tail = I830_READ(LP_RING + RING_TAIL);
      	ring->space = ring->head - (ring->tail+8);
      	if (ring->space < 0) ring->space += ring->Size;
-
-	if (ring->head == ring->tail)
-		dev_priv->sarea_priv->perf_boxes |= I830_BOX_RING_EMPTY;
 }
 
 static int i830_freelist_init(drm_device_t *dev, drm_i830_private_t *dev_priv)
@@ -401,6 +420,9 @@ static int i830_dma_initialize(drm_devic
 		((u8 *)dev_priv->sarea_map->handle +
 		 init->sarea_priv_offset);
 
+   	atomic_set(&dev_priv->flush_done, 0);
+	init_waitqueue_head(&dev_priv->flush_queue);
+
    	dev_priv->ring.Start = init->ring_start;
    	dev_priv->ring.End = init->ring_end;
    	dev_priv->ring.Size = init->ring_size;
@@ -424,17 +446,11 @@ static int i830_dma_initialize(drm_devic
 	dev_priv->pitch = init->pitch;
 	dev_priv->back_offset = init->back_offset;
 	dev_priv->depth_offset = init->depth_offset;
-	dev_priv->front_offset = init->front_offset;
 
 	dev_priv->front_di1 = init->front_offset | init->pitch_bits;
 	dev_priv->back_di1 = init->back_offset | init->pitch_bits;
 	dev_priv->zi1 = init->depth_offset | init->pitch_bits;
 
-	DRM_DEBUG("front_di1 %x\n",    dev_priv->front_di1);
-	DRM_DEBUG("back_offset %x\n", dev_priv->back_offset);
-	DRM_DEBUG("back_di1 %x\n",    dev_priv->back_di1);
-	DRM_DEBUG("pitch_bits %x\n",    init->pitch_bits);
-
 	dev_priv->cpp = init->cpp;
 	/* We are using seperate values as placeholders for mechanisms for
 	 * private backbuffer/depthbuffer usage.
@@ -442,23 +458,20 @@ static int i830_dma_initialize(drm_devic
 
 	dev_priv->back_pitch = init->back_pitch;
 	dev_priv->depth_pitch = init->depth_pitch;
-	dev_priv->do_boxes = 0;
-	dev_priv->use_mi_batchbuffer_start = 0;
 
    	/* Program Hardware Status Page */
-   	dev_priv->hw_status_page =
-		(unsigned long) pci_alloc_consistent(dev->pdev, PAGE_SIZE,
+   	dev_priv->hw_status_page = pci_alloc_consistent(dev->pdev, PAGE_SIZE, 
 						&dev_priv->dma_status_page);
-   	if(dev_priv->hw_status_page == 0UL) {
+   	if(dev_priv->hw_status_page == NULL) {
 		dev->dev_private = (void *)dev_priv;
 		i830_dma_cleanup(dev);
 		DRM_ERROR("Can not allocate hardware status page\n");
 		return -ENOMEM;
 	}
-   	memset((void *) dev_priv->hw_status_page, 0, PAGE_SIZE);
-	DRM_DEBUG("hw status page @ %lx\n", dev_priv->hw_status_page);
+   	memset(dev_priv->hw_status_page, 0, PAGE_SIZE);
+	DRM_DEBUG("hw status page @ %p\n", dev_priv->hw_status_page);
    
-	I830_WRITE(0x02080, dev_priv->dma_status_page);
+   	I830_WRITE(0x02080, dev_priv->dma_status_page);
 	DRM_DEBUG("Enabled hardware status page\n");
    
    	/* Now we need to init our freelist */
@@ -504,107 +517,83 @@ int i830_dma_init(struct inode *inode, s
    	return retcode;
 }
 
-#define GFX_OP_STIPPLE           ((0x3<<29)|(0x1d<<24)|(0x83<<16))
-#define ST1_ENABLE               (1<<16)
-#define ST1_MASK                 (0xffff)
-
 /* Most efficient way to verify state for the i830 is as it is
  * emitted.  Non-conformant state is silently dropped.
+ *
+ * Use 'volatile' & local var tmp to force the emitted values to be
+ * identical to the verified ones.
  */
-static void i830EmitContextVerified( drm_device_t *dev,
-				     unsigned int *code )
+static void i830EmitContextVerified( drm_device_t *dev, 
+				     volatile unsigned int *code )
 {
    	drm_i830_private_t *dev_priv = dev->dev_private;
 	int i, j = 0;
 	unsigned int tmp;
 	RING_LOCALS;
 
-	BEGIN_LP_RING( I830_CTX_SETUP_SIZE + 4 );
-
-	for ( i = 0 ; i < I830_CTXREG_BLENDCOLR0 ; i++ ) {
+	BEGIN_LP_RING( I830_CTX_SETUP_SIZE );
+	for ( i = 0 ; i < I830_CTX_SETUP_SIZE ; i++ ) {
 		tmp = code[i];
-		if ((tmp & (7<<29)) == CMD_3D &&
-		    (tmp & (0x1f<<24)) < (0x1d<<24)) {
-			OUT_RING( tmp ); 
-			j++;
-		} else {
-			DRM_ERROR("Skipping %d\n", i);
-		}
-	}
-
-	OUT_RING( STATE3D_CONST_BLEND_COLOR_CMD ); 
-	OUT_RING( code[I830_CTXREG_BLENDCOLR] ); 
-	j += 2;
 
-	for ( i = I830_CTXREG_VF ; i < I830_CTXREG_MCSB0 ; i++ ) {
-		tmp = code[i];
-		if ((tmp & (7<<29)) == CMD_3D &&
+#if 0
+		if ((tmp & (7<<29)) == (3<<29) &&
 		    (tmp & (0x1f<<24)) < (0x1d<<24)) {
 			OUT_RING( tmp ); 
 			j++;
 		} else {
-			DRM_ERROR("Skipping %d\n", i);
+			printk("Skipping %d\n", i);
 		}
+#else
+		OUT_RING( tmp ); 
+		j++;
+#endif
 	}
 
-	OUT_RING( STATE3D_MAP_COORD_SETBIND_CMD ); 
-	OUT_RING( code[I830_CTXREG_MCSB1] ); 
-	j += 2;
-
 	if (j & 1) 
 		OUT_RING( 0 ); 
 
 	ADVANCE_LP_RING();
 }
 
-static void i830EmitTexVerified( drm_device_t *dev, unsigned int *code ) 
+static void i830EmitTexVerified( drm_device_t *dev, 
+				 volatile unsigned int *code ) 
 {
    	drm_i830_private_t *dev_priv = dev->dev_private;
 	int i, j = 0;
 	unsigned int tmp;
 	RING_LOCALS;
 
-	if (code[I830_TEXREG_MI0] == GFX_OP_MAP_INFO ||
-	    (code[I830_TEXREG_MI0] & ~(0xf*LOAD_TEXTURE_MAP0)) == 
-	    (STATE3D_LOAD_STATE_IMMEDIATE_2|4)) {
-
-		BEGIN_LP_RING( I830_TEX_SETUP_SIZE );
-
-		OUT_RING( code[I830_TEXREG_MI0] ); /* TM0LI */
-		OUT_RING( code[I830_TEXREG_MI1] ); /* TM0S0 */
-		OUT_RING( code[I830_TEXREG_MI2] ); /* TM0S1 */
-		OUT_RING( code[I830_TEXREG_MI3] ); /* TM0S2 */
-		OUT_RING( code[I830_TEXREG_MI4] ); /* TM0S3 */
-		OUT_RING( code[I830_TEXREG_MI5] ); /* TM0S4 */
-		
-		for ( i = 6 ; i < I830_TEX_SETUP_SIZE ; i++ ) {
-			tmp = code[i];
-			OUT_RING( tmp ); 
-			j++;
-		} 
+	BEGIN_LP_RING( I830_TEX_SETUP_SIZE );
 
-		if (j & 1) 
-			OUT_RING( 0 ); 
+	OUT_RING( GFX_OP_MAP_INFO );
+	OUT_RING( code[I830_TEXREG_MI1] );
+	OUT_RING( code[I830_TEXREG_MI2] );
+	OUT_RING( code[I830_TEXREG_MI3] );
+	OUT_RING( code[I830_TEXREG_MI4] );
+	OUT_RING( code[I830_TEXREG_MI5] );
 
-		ADVANCE_LP_RING();
-	}
-	else
-		printk("rejected packet %x\n", code[0]);
+	for ( i = 6 ; i < I830_TEX_SETUP_SIZE ; i++ ) {
+		tmp = code[i];
+		OUT_RING( tmp ); 
+		j++;
+	} 
+
+	if (j & 1) 
+		OUT_RING( 0 ); 
+
+	ADVANCE_LP_RING();
 }
 
 static void i830EmitTexBlendVerified( drm_device_t *dev, 
-				      unsigned int *code,
-				      unsigned int num)
+				     volatile unsigned int *code,
+				     volatile unsigned int num)
 {
    	drm_i830_private_t *dev_priv = dev->dev_private;
 	int i, j = 0;
 	unsigned int tmp;
 	RING_LOCALS;
 
-	if (!num)
-		return;
-
-	BEGIN_LP_RING( num + 1 );
+	BEGIN_LP_RING( num );
 
 	for ( i = 0 ; i < num ; i++ ) {
 		tmp = code[i];
@@ -627,8 +616,6 @@ static void i830EmitTexPalette( drm_devi
 	int i;
 	RING_LOCALS;
 
-	return; /* Is this right ? -- Arjan */
-
 	BEGIN_LP_RING( 258 );
 
 	if(is_shared == 1) {
@@ -642,43 +629,44 @@ static void i830EmitTexPalette( drm_devi
 		OUT_RING(palette[i]);
 	}
 	OUT_RING(0);
-	/* KW:  WHERE IS THE ADVANCE_LP_RING?  This is effectively a noop! 
-	 */
 }
 
 /* Need to do some additional checking when setting the dest buffer.
  */
 static void i830EmitDestVerified( drm_device_t *dev, 
-				  unsigned int *code ) 
+				  volatile unsigned int *code ) 
 {	
    	drm_i830_private_t *dev_priv = dev->dev_private;
 	unsigned int tmp;
 	RING_LOCALS;
 
-	BEGIN_LP_RING( I830_DEST_SETUP_SIZE + 10 );
-
+	BEGIN_LP_RING( I830_DEST_SETUP_SIZE + 6 );
 
 	tmp = code[I830_DESTREG_CBUFADDR];
-	if (tmp == dev_priv->front_di1 || tmp == dev_priv->back_di1) {
-		if (((int)outring) & 8) {
-			OUT_RING(0);
-			OUT_RING(0);
-		}
+	if (tmp == dev_priv->front_di1) {
+		/* Don't use fence when front buffer rendering */
+		OUT_RING( CMD_OP_DESTBUFFER_INFO );
+		OUT_RING( BUF_3D_ID_COLOR_BACK | 
+			  BUF_3D_PITCH(dev_priv->back_pitch * dev_priv->cpp) );
+		OUT_RING( tmp );
 
 		OUT_RING( CMD_OP_DESTBUFFER_INFO );
+		OUT_RING( BUF_3D_ID_DEPTH |
+			  BUF_3D_PITCH(dev_priv->depth_pitch * dev_priv->cpp));
+		OUT_RING( dev_priv->zi1 );
+	} else if(tmp == dev_priv->back_di1) {
+		OUT_RING( CMD_OP_DESTBUFFER_INFO );
 		OUT_RING( BUF_3D_ID_COLOR_BACK | 
 			  BUF_3D_PITCH(dev_priv->back_pitch * dev_priv->cpp) |
 			  BUF_3D_USE_FENCE);
 		OUT_RING( tmp );
-		OUT_RING( 0 );
 
 		OUT_RING( CMD_OP_DESTBUFFER_INFO );
 		OUT_RING( BUF_3D_ID_DEPTH | BUF_3D_USE_FENCE | 
 			  BUF_3D_PITCH(dev_priv->depth_pitch * dev_priv->cpp));
 		OUT_RING( dev_priv->zi1 );
-		OUT_RING( 0 );
 	} else {
-		DRM_ERROR("bad di1 %x (allow %x or %x)\n",
+		DRM_DEBUG("bad di1 %x (allow %x or %x)\n",
 			  tmp, dev_priv->front_di1, dev_priv->back_di1);
 	}
 
@@ -700,39 +688,25 @@ static void i830EmitDestVerified( drm_de
 	if((tmp & ~0x3) == GFX_OP_SCISSOR_ENABLE) {
 		OUT_RING( tmp );
 	} else {
-		DRM_ERROR("bad scissor enable\n");
+		DRM_DEBUG("bad scissor enable\n");
 		OUT_RING( 0 );
 	}
 
+	OUT_RING( code[I830_DESTREG_SENABLE] );
+
 	OUT_RING( GFX_OP_SCISSOR_RECT );
 	OUT_RING( code[I830_DESTREG_SR1] );
 	OUT_RING( code[I830_DESTREG_SR2] );
-	OUT_RING( 0 );
 
 	ADVANCE_LP_RING();
 }
 
-static void i830EmitStippleVerified( drm_device_t *dev, 
-				     unsigned int *code ) 
-{
-   	drm_i830_private_t *dev_priv = dev->dev_private;
-	RING_LOCALS;
-
-	BEGIN_LP_RING( 2 );
-	OUT_RING( GFX_OP_STIPPLE );
-	OUT_RING( code[1] );
-	ADVANCE_LP_RING();	
-}
-
-
 static void i830EmitState( drm_device_t *dev )
 {
    	drm_i830_private_t *dev_priv = dev->dev_private;
       	drm_i830_sarea_t *sarea_priv = dev_priv->sarea_priv;
 	unsigned int dirty = sarea_priv->dirty;
 
-	DRM_DEBUG("%s %x\n", __FUNCTION__, dirty);
-
 	if (dirty & I830_UPLOAD_BUFFERS) {
 		i830EmitDestVerified( dev, sarea_priv->BufferState );
 		sarea_priv->dirty &= ~I830_UPLOAD_BUFFERS;
@@ -766,154 +740,17 @@ static void i830EmitState( drm_device_t 
 	}
 
 	if (dirty & I830_UPLOAD_TEX_PALETTE_SHARED) {
-		i830EmitTexPalette(dev, sarea_priv->Palette[0], 0, 1);
-	} else {
-		if (dirty & I830_UPLOAD_TEX_PALETTE_N(0)) {
-			i830EmitTexPalette(dev, sarea_priv->Palette[0], 0, 0);
-			sarea_priv->dirty &= ~I830_UPLOAD_TEX_PALETTE_N(0);
-		}
-		if (dirty & I830_UPLOAD_TEX_PALETTE_N(1)) {
-			i830EmitTexPalette(dev, sarea_priv->Palette[1], 1, 0);
-			sarea_priv->dirty &= ~I830_UPLOAD_TEX_PALETTE_N(1);
-		}
-
-		/* 1.3:
-		 */
-#if 0
-		if (dirty & I830_UPLOAD_TEX_PALETTE_N(2)) {
-			i830EmitTexPalette(dev, sarea_priv->Palette2[0], 0, 0);
-			sarea_priv->dirty &= ~I830_UPLOAD_TEX_PALETTE_N(2);
-		}
-		if (dirty & I830_UPLOAD_TEX_PALETTE_N(3)) {
-			i830EmitTexPalette(dev, sarea_priv->Palette2[1], 1, 0);
-			sarea_priv->dirty &= ~I830_UPLOAD_TEX_PALETTE_N(2);
-		}
-#endif
-	}
-
-	/* 1.3:
-	 */
-	if (dirty & I830_UPLOAD_STIPPLE) {
-		i830EmitStippleVerified( dev, 
-					 sarea_priv->StippleState);
-		sarea_priv->dirty &= ~I830_UPLOAD_STIPPLE;
-	}
-
-	if (dirty & I830_UPLOAD_TEX2) {
-		i830EmitTexVerified( dev, sarea_priv->TexState2 );
-		sarea_priv->dirty &= ~I830_UPLOAD_TEX2;
-	}
-
-	if (dirty & I830_UPLOAD_TEX3) {
-		i830EmitTexVerified( dev, sarea_priv->TexState3 );
-		sarea_priv->dirty &= ~I830_UPLOAD_TEX3;
-	}
-
-
-	if (dirty & I830_UPLOAD_TEXBLEND2) {
-		i830EmitTexBlendVerified( 
-			dev, 
-			sarea_priv->TexBlendState2,
-			sarea_priv->TexBlendStateWordsUsed2);
-
-		sarea_priv->dirty &= ~I830_UPLOAD_TEXBLEND2;
-	}
-
-	if (dirty & I830_UPLOAD_TEXBLEND3) {
-		i830EmitTexBlendVerified( 
-			dev, 
-			sarea_priv->TexBlendState3,
-			sarea_priv->TexBlendStateWordsUsed3);
-		sarea_priv->dirty &= ~I830_UPLOAD_TEXBLEND3;
-	}
-}
-
-/* ================================================================
- * Performance monitoring functions
- */
-
-static void i830_fill_box( drm_device_t *dev,
-			   int x, int y, int w, int h,
-			   int r, int g, int b )
-{
-   	drm_i830_private_t *dev_priv = dev->dev_private;
-	u32 color;
-	unsigned int BR13, CMD;
-	RING_LOCALS;
-
-	BR13 = (0xF0 << 16) | (dev_priv->pitch * dev_priv->cpp) | (1<<24);
-	CMD = XY_COLOR_BLT_CMD;
-	x += dev_priv->sarea_priv->boxes[0].x1;
-	y += dev_priv->sarea_priv->boxes[0].y1;
-
-	if (dev_priv->cpp == 4) {
-		BR13 |= (1<<25);
-		CMD |= (XY_COLOR_BLT_WRITE_ALPHA | XY_COLOR_BLT_WRITE_RGB);
-		color = (((0xff) << 24) | (r << 16) | (g <<  8) | b);	
+	   i830EmitTexPalette(dev, sarea_priv->Palette[0], 0, 1);
 	} else {
-		color = (((r & 0xf8) << 8) |
-			 ((g & 0xfc) << 3) |
-			 ((b & 0xf8) >> 3));
-	}
-
-	BEGIN_LP_RING( 6 );	    
-	OUT_RING( CMD );
-	OUT_RING( BR13 );
-	OUT_RING( (y << 16) | x );
-	OUT_RING( ((y+h) << 16) | (x+w) );
-
- 	if ( dev_priv->current_page == 1 ) { 
-		OUT_RING( dev_priv->front_offset );
- 	} else {	 
-		OUT_RING( dev_priv->back_offset );
- 	} 
-
-	OUT_RING( color );
-	ADVANCE_LP_RING();
-}
-
-static void i830_cp_performance_boxes( drm_device_t *dev )
-{
-   	drm_i830_private_t *dev_priv = dev->dev_private;
-
-	/* Purple box for page flipping
-	 */
-	if ( dev_priv->sarea_priv->perf_boxes & I830_BOX_FLIP ) 
-		i830_fill_box( dev, 4, 4, 8, 8, 255, 0, 255 );
-
-	/* Red box if we have to wait for idle at any point
-	 */
-	if ( dev_priv->sarea_priv->perf_boxes & I830_BOX_WAIT ) 
-		i830_fill_box( dev, 16, 4, 8, 8, 255, 0, 0 );
-
-	/* Blue box: lost context?
-	 */
-	if ( dev_priv->sarea_priv->perf_boxes & I830_BOX_LOST_CONTEXT ) 
-		i830_fill_box( dev, 28, 4, 8, 8, 0, 0, 255 );
-
-	/* Yellow box for texture swaps
-	 */
-	if ( dev_priv->sarea_priv->perf_boxes & I830_BOX_TEXTURE_LOAD ) 
-		i830_fill_box( dev, 40, 4, 8, 8, 255, 255, 0 );
-
-	/* Green box if hardware never idles (as far as we can tell)
-	 */
-	if ( !(dev_priv->sarea_priv->perf_boxes & I830_BOX_RING_EMPTY) ) 
-		i830_fill_box( dev, 64, 4, 8, 8, 0, 255, 0 );
-
-
-	/* Draw bars indicating number of buffers allocated 
-	 * (not a great measure, easily confused)
-	 */
-	if (dev_priv->dma_used) {
-		int bar = dev_priv->dma_used / 10240;
-		if (bar > 100) bar = 100;
-		if (bar < 1) bar = 1;
-		i830_fill_box( dev, 4, 16, bar, 4, 196, 128, 128 );
-		dev_priv->dma_used = 0;
+	   if (dirty & I830_UPLOAD_TEX_PALETTE_N(0)) {
+	      i830EmitTexPalette(dev, sarea_priv->Palette[0], 0, 0);
+	      sarea_priv->dirty &= ~I830_UPLOAD_TEX_PALETTE_N(0);
+	   }
+	   if (dirty & I830_UPLOAD_TEX_PALETTE_N(1)) {
+	      i830EmitTexPalette(dev, sarea_priv->Palette[1], 1, 0);
+	      sarea_priv->dirty &= ~I830_UPLOAD_TEX_PALETTE_N(1);
+	   }
 	}
-
-	dev_priv->sarea_priv->perf_boxes = 0;
 }
 
 static void i830_dma_dispatch_clear( drm_device_t *dev, int flags, 
@@ -931,15 +768,6 @@ static void i830_dma_dispatch_clear( drm
 	unsigned int BR13, CMD, D_CMD;
 	RING_LOCALS;
 
-
-	if ( dev_priv->current_page == 1 ) {
-		unsigned int tmp = flags;
-
-		flags &= ~(I830_FRONT | I830_BACK);
-		if ( tmp & I830_FRONT ) flags |= I830_BACK;
-		if ( tmp & I830_BACK )  flags |= I830_FRONT;
-	}
-
   	i830_kernel_lost_context(dev);
 
 	switch(cpp) {
@@ -980,7 +808,7 @@ static void i830_dma_dispatch_clear( drm
 			OUT_RING( BR13 );
 			OUT_RING( (pbox->y1 << 16) | pbox->x1 );
 			OUT_RING( (pbox->y2 << 16) | pbox->x2 );
-			OUT_RING( dev_priv->front_offset );
+			OUT_RING( 0 );
 			OUT_RING( clear_color );
 			ADVANCE_LP_RING();
 		}
@@ -1019,17 +847,13 @@ static void i830_dma_dispatch_swap( drm_
 	drm_clip_rect_t *pbox = sarea_priv->boxes;
 	int pitch = dev_priv->pitch;
 	int cpp = dev_priv->cpp;
+	int ofs = dev_priv->back_offset;
 	int i;
 	unsigned int CMD, BR13;
 	RING_LOCALS;
 
 	DRM_DEBUG("swapbuffers\n");
 
-  	i830_kernel_lost_context(dev);
-
-	if (dev_priv->do_boxes)
-		i830_cp_performance_boxes( dev );
-
 	switch(cpp) {
 	case 2: 
 		BR13 = (pitch * cpp) | (0xCC << 16) | (1<<24);
@@ -1046,6 +870,7 @@ static void i830_dma_dispatch_swap( drm_
 		break;
 	}
 
+  	i830_kernel_lost_context(dev);
 
       	if (nbox > I830_NR_SAREA_CLIPRECTS)
      		nbox = I830_NR_SAREA_CLIPRECTS;
@@ -1065,72 +890,23 @@ static void i830_dma_dispatch_swap( drm_
 		BEGIN_LP_RING( 8 );
 		OUT_RING( CMD );
 		OUT_RING( BR13 );
-		OUT_RING( (pbox->y1 << 16) | pbox->x1 );
-		OUT_RING( (pbox->y2 << 16) | pbox->x2 );
 
-		if (dev_priv->current_page == 0) 
-			OUT_RING( dev_priv->front_offset );
-		else
-			OUT_RING( dev_priv->back_offset );			
+		OUT_RING( (pbox->y1 << 16) |
+			  pbox->x1 );
+		OUT_RING( (pbox->y2 << 16) |
+			  pbox->x2 );
+
+		OUT_RING( 0 /* front ofs always zero */ );
+		OUT_RING( (pbox->y1 << 16) |
+			  pbox->x1 );
 
-		OUT_RING( (pbox->y1 << 16) | pbox->x1 );
 		OUT_RING( BR13 & 0xffff );
-
-		if (dev_priv->current_page == 0) 
-			OUT_RING( dev_priv->back_offset );			
-		else
-			OUT_RING( dev_priv->front_offset );
+		OUT_RING( ofs );
 
 		ADVANCE_LP_RING();
 	}
 }
 
-static void i830_dma_dispatch_flip( drm_device_t *dev )
-{
-   	drm_i830_private_t *dev_priv = dev->dev_private;
-	RING_LOCALS;
-
-	DRM_DEBUG( "%s: page=%d pfCurrentPage=%d\n", 
-		   __FUNCTION__, 
-		   dev_priv->current_page,
-		   dev_priv->sarea_priv->pf_current_page);
-
-  	i830_kernel_lost_context(dev);
-
-	if (dev_priv->do_boxes) {
-		dev_priv->sarea_priv->perf_boxes |= I830_BOX_FLIP;
-		i830_cp_performance_boxes( dev );
-	}
-
-
-	BEGIN_LP_RING( 2 );
-    	OUT_RING( INST_PARSER_CLIENT | INST_OP_FLUSH | INST_FLUSH_MAP_CACHE ); 
-	OUT_RING( 0 );
-	ADVANCE_LP_RING();
-
-	BEGIN_LP_RING( 6 );
-	OUT_RING( CMD_OP_DISPLAYBUFFER_INFO | ASYNC_FLIP );	
-	OUT_RING( 0 );
-	if ( dev_priv->current_page == 0 ) {
-		OUT_RING( dev_priv->back_offset );
-		dev_priv->current_page = 1;
-	} else {
-		OUT_RING( dev_priv->front_offset );
-		dev_priv->current_page = 0;
-	}
-	OUT_RING(0);
-	ADVANCE_LP_RING();
-
-
-	BEGIN_LP_RING( 2 );
-	OUT_RING( MI_WAIT_FOR_EVENT |
-		  MI_WAIT_FOR_PLANE_A_FLIP );
-	OUT_RING( 0 );
-	ADVANCE_LP_RING();
-	
-
-	dev_priv->sarea_priv->pf_current_page = dev_priv->current_page;
-}
 
 static void i830_dma_dispatch_vertex(drm_device_t *dev, 
 				     drm_buf_t *buf,
@@ -1160,7 +936,7 @@ static void i830_dma_dispatch_vertex(drm
 		}
 	}
 
-	if (used > 4*1023) 
+	if (used > 4*1024) 
 		used = 0;
 
 	if (sarea_priv->dirty)
@@ -1177,19 +953,12 @@ static void i830_dma_dispatch_vertex(drm
    	DRM_DEBUG(  "start + used - 4 : %ld\n", start + used - 4);
 
 	if (buf_priv->currently_mapped == I830_BUF_MAPPED) {
-		u32 *vp = buf_priv->virtual;
-
-		vp[0] = (GFX_OP_PRIMITIVE |
-			 sarea_priv->vertex_prim |
-			 ((used/4)-2));
-
-		if (dev_priv->use_mi_batchbuffer_start) {
-			vp[used/4] = MI_BATCH_BUFFER_END; 
-			used += 4; 
-		}
+		*(u32 *)buf_priv->virtual = (GFX_OP_PRIMITIVE |
+					     sarea_priv->vertex_prim |
+					     ((used/4)-2));
 		
 		if (used & 4) {
-			vp[used/4] = 0;
+			*(u32 *)((u32)buf_priv->virtual + used) = 0;
 			used += 4;
 		}
 
@@ -1209,45 +978,80 @@ static void i830_dma_dispatch_vertex(drm
 				ADVANCE_LP_RING();
 			}
 
-			if (dev_priv->use_mi_batchbuffer_start) {
-				BEGIN_LP_RING(2);
-				OUT_RING( MI_BATCH_BUFFER_START | (2<<6) );
-				OUT_RING( start | MI_BATCH_NON_SECURE );
-				ADVANCE_LP_RING();
-			} 
-			else {
-				BEGIN_LP_RING(4);
-				OUT_RING( MI_BATCH_BUFFER );
-				OUT_RING( start | MI_BATCH_NON_SECURE );
-				OUT_RING( start + used - 4 );
-				OUT_RING( 0 );
-				ADVANCE_LP_RING();
-			}
+			BEGIN_LP_RING(4);
 
+			OUT_RING( MI_BATCH_BUFFER );
+			OUT_RING( start | MI_BATCH_NON_SECURE );
+			OUT_RING( start + used - 4 );
+			OUT_RING( 0 );
+			ADVANCE_LP_RING();
+			
 		} while (++i < nbox);
 	}
 
-	if (discard) {
-		dev_priv->counter++;
-
-		(void) cmpxchg(buf_priv->in_use, I830_BUF_CLIENT,
-			       I830_BUF_HARDWARE);
+	BEGIN_LP_RING(10);
+	OUT_RING( CMD_STORE_DWORD_IDX );
+	OUT_RING( 20 );
+	OUT_RING( dev_priv->counter );
+	OUT_RING( 0 );
 
-		BEGIN_LP_RING(8);
-		OUT_RING( CMD_STORE_DWORD_IDX );
-		OUT_RING( 20 );
-		OUT_RING( dev_priv->counter );
+	if (discard) {
 		OUT_RING( CMD_STORE_DWORD_IDX );
 		OUT_RING( buf_priv->my_use_idx );
 		OUT_RING( I830_BUF_FREE );
-		OUT_RING( CMD_REPORT_HEAD );
 		OUT_RING( 0 );
-		ADVANCE_LP_RING();
 	}
+
+      	OUT_RING( CMD_REPORT_HEAD );
+	OUT_RING( 0 );
+   	ADVANCE_LP_RING();
 }
 
+/* Interrupts are only for flushing */
+void i830_dma_service(int irq, void *device, struct pt_regs *regs)
+{
+	drm_device_t	 *dev = (drm_device_t *)device;
+      	drm_i830_private_t *dev_priv = (drm_i830_private_t *)dev->dev_private;
+   	u16 temp;
+   
+      	temp = I830_READ16(I830REG_INT_IDENTITY_R);
+   	temp = temp & ~(0x6000);
+   	if(temp != 0) I830_WRITE16(I830REG_INT_IDENTITY_R, 
+				   temp); /* Clear all interrupts */
+	else
+	   return;
+ 
+   	queue_task(&dev->tq, &tq_immediate);
+   	mark_bh(IMMEDIATE_BH);
+}
 
-void i830_dma_quiescent(drm_device_t *dev)
+void DRM(dma_immediate_bh)(void *device)
+{
+	drm_device_t *dev = (drm_device_t *) device;
+      	drm_i830_private_t *dev_priv = (drm_i830_private_t *)dev->dev_private;
+
+   	atomic_set(&dev_priv->flush_done, 1);
+   	wake_up_interruptible(&dev_priv->flush_queue);
+}
+
+static inline void i830_dma_emit_flush(drm_device_t *dev)
+{
+   	drm_i830_private_t *dev_priv = dev->dev_private;
+   	RING_LOCALS;
+
+   	i830_kernel_lost_context(dev);
+
+   	BEGIN_LP_RING(2);
+      	OUT_RING( CMD_REPORT_HEAD );
+      	OUT_RING( GFX_OP_USER_INTERRUPT );
+      	ADVANCE_LP_RING();
+
+	i830_wait_ring( dev, dev_priv->ring.Size - 8 );
+	atomic_set(&dev_priv->flush_done, 1);
+	wake_up_interruptible(&dev_priv->flush_queue);
+}
+
+static inline void i830_dma_quiescent_emit(drm_device_t *dev)
 {
       	drm_i830_private_t *dev_priv = dev->dev_private;
    	RING_LOCALS;
@@ -1258,27 +1062,79 @@ void i830_dma_quiescent(drm_device_t *de
    	OUT_RING( INST_PARSER_CLIENT | INST_OP_FLUSH | INST_FLUSH_MAP_CACHE );
    	OUT_RING( CMD_REPORT_HEAD );
       	OUT_RING( 0 );
-      	OUT_RING( 0 );
+      	OUT_RING( GFX_OP_USER_INTERRUPT );
    	ADVANCE_LP_RING();
 
-	i830_wait_ring( dev, dev_priv->ring.Size - 8, __FUNCTION__ );
+	i830_wait_ring( dev, dev_priv->ring.Size - 8 );
+	atomic_set(&dev_priv->flush_done, 1);
+	wake_up_interruptible(&dev_priv->flush_queue);
+}
+
+void i830_dma_quiescent(drm_device_t *dev)
+{
+      	DECLARE_WAITQUEUE(entry, current);
+  	drm_i830_private_t *dev_priv = (drm_i830_private_t *)dev->dev_private;
+	unsigned long end;      
+
+   	if(dev_priv == NULL) {
+	   	return;
+	}
+      	atomic_set(&dev_priv->flush_done, 0);
+   	add_wait_queue(&dev_priv->flush_queue, &entry);
+   	end = jiffies + (HZ*3);
+   
+   	for (;;) {
+		current->state = TASK_INTERRUPTIBLE;
+	      	i830_dma_quiescent_emit(dev);
+	   	if (atomic_read(&dev_priv->flush_done) == 1) break;
+		if(time_before(end, jiffies)) {
+		   	DRM_ERROR("lockup\n");
+		   	break;
+		}	   
+	      	schedule_timeout(HZ*3);
+	      	if (signal_pending(current)) {
+		   	break;
+		}
+	}
+   
+   	current->state = TASK_RUNNING;
+   	remove_wait_queue(&dev_priv->flush_queue, &entry);
+   
+   	return;
 }
 
 static int i830_flush_queue(drm_device_t *dev)
 {
-   	drm_i830_private_t *dev_priv = dev->dev_private;
+   	DECLARE_WAITQUEUE(entry, current);
+  	drm_i830_private_t *dev_priv = (drm_i830_private_t *)dev->dev_private;
 	drm_device_dma_t *dma = dev->dma;
-   	int i, ret = 0;
-   	RING_LOCALS;
-	
-   	i830_kernel_lost_context(dev);
+	unsigned long end;
+   	int i, ret = 0;      
 
-   	BEGIN_LP_RING(2);
-      	OUT_RING( CMD_REPORT_HEAD );
-      	OUT_RING( 0 );
-      	ADVANCE_LP_RING();
+   	if(dev_priv == NULL) {
+	   	return 0;
+	}
+      	atomic_set(&dev_priv->flush_done, 0);
+   	add_wait_queue(&dev_priv->flush_queue, &entry);
+   	end = jiffies + (HZ*3);
+   	for (;;) {
+		current->state = TASK_INTERRUPTIBLE;
+	      	i830_dma_emit_flush(dev);
+	   	if (atomic_read(&dev_priv->flush_done) == 1) break;
+		if(time_before(end, jiffies)) {
+		   	DRM_ERROR("lockup\n");
+		   	break;
+		}	   
+	      	schedule_timeout(HZ*3);
+	      	if (signal_pending(current)) {
+		   	ret = -EINTR; /* Can't restart */
+		   	break;
+		}
+	}
+   
+   	current->state = TASK_RUNNING;
+   	remove_wait_queue(&dev_priv->flush_queue, &entry);
 
-	i830_wait_ring( dev, dev_priv->ring.Size - 8, __FUNCTION__ );
 
    	for (i = 0; i < dma->buf_count; i++) {
 	   	drm_buf_t *buf = dma->buflist[ i ];
@@ -1290,7 +1146,7 @@ static int i830_flush_queue(drm_device_t
 		if (used == I830_BUF_HARDWARE)
 			DRM_DEBUG("reclaimed from HARDWARE\n");
 		if (used == I830_BUF_CLIENT)
-			DRM_DEBUG("still on client\n");
+			DRM_DEBUG("still on client HARDWARE\n");
 	}
 
    	return ret;
@@ -1329,7 +1185,8 @@ int i830_flush_ioctl(struct inode *inode
 {
    	drm_file_t	  *priv	  = filp->private_data;
    	drm_device_t	  *dev	  = priv->dev;
-
+   
+   	DRM_DEBUG("i830_flush_ioctl\n");
    	if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
 		DRM_ERROR("i830_flush_ioctl called without lock held\n");
 		return -EINVAL;
@@ -1418,53 +1275,6 @@ int i830_swap_bufs(struct inode *inode, 
    	return 0;
 }
 
-
-
-/* Not sure why this isn't set all the time:
- */ 
-static void i830_do_init_pageflip( drm_device_t *dev )
-{
-	drm_i830_private_t *dev_priv = dev->dev_private;
-
-	DRM_DEBUG("%s\n", __FUNCTION__);
-	dev_priv->page_flipping = 1;
-	dev_priv->current_page = 0;
-	dev_priv->sarea_priv->pf_current_page = dev_priv->current_page;
-}
-
-int i830_do_cleanup_pageflip( drm_device_t *dev )
-{
-	drm_i830_private_t *dev_priv = dev->dev_private;
-
-	DRM_DEBUG("%s\n", __FUNCTION__);
-	if (dev_priv->current_page != 0)
-		i830_dma_dispatch_flip( dev );
-
-	dev_priv->page_flipping = 0;
-	return 0;
-}
-
-int i830_flip_bufs(struct inode *inode, struct file *filp,
-		   unsigned int cmd, unsigned long arg)
-{
-	drm_file_t *priv = filp->private_data;
-	drm_device_t *dev = priv->dev;
-	drm_i830_private_t *dev_priv = dev->dev_private;
-
-	DRM_DEBUG("%s\n", __FUNCTION__);
-
-   	if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
-		DRM_ERROR("i830_flip_buf called without lock held\n");
-		return -EINVAL;
-	}
-
-	if (!dev_priv->page_flipping) 
-		i830_do_init_pageflip( dev );
-
-	i830_dma_dispatch_flip( dev );
-   	return 0;
-}
-
 int i830_getage(struct inode *inode, struct file *filp, unsigned int cmd,
 		unsigned long arg)
 {
@@ -1514,80 +1324,46 @@ int i830_getbuf(struct inode *inode, str
 	return retcode;
 }
 
-int i830_copybuf(struct inode *inode,
-		 struct file *filp, 
-		 unsigned int cmd,
-		 unsigned long arg)
-{
-	/* Never copy - 2.4.x doesn't need it */
-	return 0;
-}
-
-int i830_docopy(struct inode *inode, struct file *filp, unsigned int cmd,
+int i830_copybuf(struct inode *inode, struct file *filp, unsigned int cmd,
 		unsigned long arg)
 {
-	return 0;
-}
-
-
-
-int i830_getparam( struct inode *inode, struct file *filp, unsigned int cmd,
-		      unsigned long arg )
-{
 	drm_file_t	  *priv	    = filp->private_data;
 	drm_device_t	  *dev	    = priv->dev;
-	drm_i830_private_t *dev_priv = dev->dev_private;
-	drm_i830_getparam_t param;
-	int value;
+	drm_i830_copy_t	  d;
+   	drm_i830_private_t *dev_priv = (drm_i830_private_t *)dev->dev_private;
+   	u32 *hw_status = (u32 *)dev_priv->hw_status_page;
+   	drm_i830_sarea_t *sarea_priv = (drm_i830_sarea_t *) 
+     					dev_priv->sarea_priv; 
+	drm_buf_t *buf;
+	drm_i830_buf_priv_t *buf_priv;
+	drm_device_dma_t *dma = dev->dma;
 
-	if ( !dev_priv ) {
-		DRM_ERROR( "%s called with no initialization\n", __FUNCTION__ );
+	if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
+		DRM_ERROR("i830_dma called without lock held\n");
 		return -EINVAL;
 	}
-
-	if (copy_from_user(&param, (drm_i830_getparam_t *)arg, sizeof(param) ))
+   
+   	if (copy_from_user(&d, (drm_i830_copy_t *)arg, sizeof(d)))
 		return -EFAULT;
 
-	switch( param.param ) {
-	case I830_PARAM_IRQ_ACTIVE:
-		value = dev->irq ? 1 : 0;
-		break;
-	default:
-		return -EINVAL;
-	}
+	if(d.idx < 0 || d.idx > dma->buf_count) return -EINVAL;
+	buf = dma->buflist[ d.idx ];
+   	buf_priv = buf->dev_private;
+	if (buf_priv->currently_mapped != I830_BUF_MAPPED) return -EPERM;
 
-	if ( copy_to_user( param.value, &value, sizeof(int) ) ) {
-		DRM_ERROR( "copy_to_user\n" );
+	if(d.used < 0 || d.used > buf->total) return -EINVAL;
+
+   	if (copy_from_user(buf_priv->virtual, d.address, d.used))
 		return -EFAULT;
-	}
-	
+
+   	sarea_priv->last_dispatch = (int) hw_status[5];
+
 	return 0;
 }
 
-
-int i830_setparam( struct inode *inode, struct file *filp, unsigned int cmd,
-		   unsigned long arg )
+int i830_docopy(struct inode *inode, struct file *filp, unsigned int cmd,
+		unsigned long arg)
 {
-	drm_file_t	  *priv	    = filp->private_data;
-	drm_device_t	  *dev	    = priv->dev;
-	drm_i830_private_t *dev_priv = dev->dev_private;
-	drm_i830_setparam_t param;
-
-	if ( !dev_priv ) {
-		DRM_ERROR( "%s called with no initialization\n", __FUNCTION__ );
-		return -EINVAL;
-	}
-
-	if (copy_from_user(&param, (drm_i830_setparam_t *)arg, sizeof(param) ))
-		return -EFAULT;
-
-	switch( param.param ) {
-	case I830_SETPARAM_USE_MI_BATCHBUFFER_START:
-		dev_priv->use_mi_batchbuffer_start = param.value;
-		break;
-	default:
-		return -EINVAL;
-	}
-
+	if(VM_DONTCOPY == 0) return 1;
 	return 0;
 }
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/i830_drm.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/i830_drm.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/i830_drm.h	2003-07-30 13:51:23.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/i830_drm.h	2002-12-18 01:03:52.000000000 +0100
@@ -3,9 +3,6 @@
 
 /* WARNING: These defines must be the same as what the Xserver uses.
  * if you change them, you must change the defines in the Xserver.
- *
- * KW: Actually, you can't ever change them because doing so would
- * break backwards compatibility.
  */
 
 #ifndef _I830_DEFINES_
@@ -21,12 +18,14 @@
 #define I830_NR_TEX_REGIONS 64
 #define I830_LOG_MIN_TEX_REGION_SIZE 16
 
-/* KW: These aren't correct but someone set them to two and then
- * released the module.  Now we can't change them as doing so would
- * break backwards compatibility.
- */
+/* if defining I830_ENABLE_4_TEXTURES, do it in i830_3d_reg.h, too */
+#if !defined(I830_ENABLE_4_TEXTURES)
 #define I830_TEXTURE_COUNT	2
-#define I830_TEXBLEND_COUNT	I830_TEXTURE_COUNT
+#define I830_TEXBLEND_COUNT	2	/* always same as TEXTURE_COUNT? */
+#else /* defined(I830_ENABLE_4_TEXTURES) */
+#define I830_TEXTURE_COUNT	4
+#define I830_TEXBLEND_COUNT	4	/* always same as TEXTURE_COUNT? */
+#endif /* I830_ENABLE_4_TEXTURES */
 
 #define I830_TEXBLEND_SIZE	12	/* (4 args + op) * 2 + COLOR_FACTOR */
 
@@ -58,7 +57,6 @@
 #define I830_UPLOAD_TEXBLEND_MASK	0xf00000
 #define I830_UPLOAD_TEX_PALETTE_N(n)    (0x1000000 << (n))
 #define I830_UPLOAD_TEX_PALETTE_SHARED	0x4000000
-#define I830_UPLOAD_STIPPLE         	0x8000000
 
 /* Indices into buf.Setup where various bits of state are mirrored per
  * context and per buffer.  These can be fired at the card as a unit,
@@ -75,6 +73,7 @@
  */
 
 #define I830_DESTREG_CBUFADDR 0
+/* Invarient */
 #define I830_DESTREG_DBUFADDR 1
 #define I830_DESTREG_DV0 2
 #define I830_DESTREG_DV1 3
@@ -110,13 +109,6 @@
 #define I830_CTXREG_MCSB1		16
 #define I830_CTX_SETUP_SIZE		17
 
-/* 1.3: Stipple state
- */ 
-#define I830_STPREG_ST0 0
-#define I830_STPREG_ST1 1
-#define I830_STP_SETUP_SIZE 2
-
-
 /* Texture state (per tex unit)
  */
 
@@ -132,18 +124,6 @@
 #define I830_TEXREG_MCS	9	/* GFX_OP_MAP_COORD_SETS */
 #define I830_TEX_SETUP_SIZE 10
 
-#define I830_TEXREG_TM0LI      0 /* load immediate 2 texture map n */
-#define I830_TEXREG_TM0S0      1
-#define I830_TEXREG_TM0S1      2
-#define I830_TEXREG_TM0S2      3
-#define I830_TEXREG_TM0S3      4
-#define I830_TEXREG_TM0S4      5
-#define I830_TEXREG_NOP0       6       /* noop */
-#define I830_TEXREG_NOP1       7       /* noop */
-#define I830_TEXREG_NOP2       8       /* noop */
-#define __I830_TEXREG_MCS      9       /* GFX_OP_MAP_COORD_SETS -- shared */
-#define __I830_TEX_SETUP_SIZE   10
-
 #define I830_FRONT   0x1
 #define I830_BACK    0x2
 #define I830_DEPTH   0x4
@@ -219,53 +199,8 @@ typedef struct _drm_i830_sarea {
 	int ctxOwner;		/* last context to upload state */
 
 	int vertex_prim;
-
-        int pf_enabled;               /* is pageflipping allowed? */
-        int pf_active;               
-        int pf_current_page;	    /* which buffer is being displayed? */
-
-        int perf_boxes;             /* performance boxes to be displayed */
-   
-        /* Here's the state for texunits 2,3:
-	 */
-	unsigned int TexState2[I830_TEX_SETUP_SIZE];
-	unsigned int TexBlendState2[I830_TEXBLEND_SIZE];
-	unsigned int TexBlendStateWordsUsed2;
-
-	unsigned int TexState3[I830_TEX_SETUP_SIZE];
-	unsigned int TexBlendState3[I830_TEXBLEND_SIZE];
-	unsigned int TexBlendStateWordsUsed3;
-
-	unsigned int StippleState[I830_STP_SETUP_SIZE];
 } drm_i830_sarea_t;
 
-/* Flags for perf_boxes
- */
-#define I830_BOX_RING_EMPTY    0x1 /* populated by kernel */
-#define I830_BOX_FLIP          0x2 /* populated by kernel */
-#define I830_BOX_WAIT          0x4 /* populated by kernel & client */
-#define I830_BOX_TEXTURE_LOAD  0x8 /* populated by kernel */
-#define I830_BOX_LOST_CONTEXT  0x10 /* populated by client */
-
-
-/* I830 specific ioctls
- * The device specific ioctl range is 0x40 to 0x79.
- */
-#define DRM_IOCTL_I830_INIT		DRM_IOW( 0x40, drm_i830_init_t)
-#define DRM_IOCTL_I830_VERTEX		DRM_IOW( 0x41, drm_i830_vertex_t)
-#define DRM_IOCTL_I830_CLEAR		DRM_IOW( 0x42, drm_i830_clear_t)
-#define DRM_IOCTL_I830_FLUSH		DRM_IO ( 0x43)
-#define DRM_IOCTL_I830_GETAGE		DRM_IO ( 0x44)
-#define DRM_IOCTL_I830_GETBUF		DRM_IOWR(0x45, drm_i830_dma_t)
-#define DRM_IOCTL_I830_SWAP		DRM_IO ( 0x46)
-#define DRM_IOCTL_I830_COPY		DRM_IOW( 0x47, drm_i830_copy_t)
-#define DRM_IOCTL_I830_DOCOPY		DRM_IO ( 0x48)
-#define DRM_IOCTL_I830_FLIP		DRM_IO ( 0x49)
-#define DRM_IOCTL_I830_IRQ_EMIT         DRM_IOWR(0x4a, drm_i830_irq_emit_t)
-#define DRM_IOCTL_I830_IRQ_WAIT         DRM_IOW( 0x4b, drm_i830_irq_wait_t)
-#define DRM_IOCTL_I830_GETPARAM         DRM_IOWR(0x4c, drm_i830_getparam_t)
-#define DRM_IOCTL_I830_SETPARAM         DRM_IOWR(0x4d, drm_i830_setparam_t)
-
 typedef struct _drm_i830_clear {
 	int clear_color;
 	int clear_depth;
@@ -300,36 +235,4 @@ typedef struct drm_i830_dma {
 	int granted;
 } drm_i830_dma_t;
 
-
-/* 1.3: Userspace can request & wait on irq's:
- */
-typedef struct drm_i830_irq_emit {
-	int *irq_seq;
-} drm_i830_irq_emit_t;
-
-typedef struct drm_i830_irq_wait {
-	int irq_seq;
-} drm_i830_irq_wait_t;
-
-
-/* 1.3: New ioctl to query kernel params:
- */
-#define I830_PARAM_IRQ_ACTIVE            1
-
-typedef struct drm_i830_getparam {
-	int param;
-	int *value;
-} drm_i830_getparam_t;
-
-
-/* 1.3: New ioctl to set kernel params:
- */
-#define I830_SETPARAM_USE_MI_BATCHBUFFER_START            1
-
-typedef struct drm_i830_setparam {
-	int param;
-	int value;
-} drm_i830_setparam_t;
-
-
 #endif /* _I830_DRM_H_ */
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/i830_drv.c linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/i830_drv.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/i830_drv.c	2003-07-30 13:51:23.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/i830_drv.c	2002-12-18 01:03:52.000000000 +0100
@@ -29,16 +29,41 @@
  *    Jeff Hartmann <jhartmann@valinux.com>
  *    Gareth Hughes <gareth@valinux.com>
  *    Abraham vd Merwe <abraham@2d3d.co.za>
- *    Keith Whitwell <keith@tungstengraphics.com>
  */
 
 #include <linux/config.h>
 #include "i830.h"
 #include "drmP.h"
-#include "drm.h"
-#include "i830_drm.h"
 #include "i830_drv.h"
 
+#define DRIVER_AUTHOR		"VA Linux Systems Inc."
+
+#define DRIVER_NAME		"i830"
+#define DRIVER_DESC		"Intel 830M"
+#define DRIVER_DATE		"20011004"
+
+#define DRIVER_MAJOR		1
+#define DRIVER_MINOR		2
+#define DRIVER_PATCHLEVEL	0
+
+#define DRIVER_IOCTLS							    \
+	[DRM_IOCTL_NR(DRM_IOCTL_I830_INIT)]   = { i830_dma_init,    1, 1 }, \
+   	[DRM_IOCTL_NR(DRM_IOCTL_I830_VERTEX)] = { i830_dma_vertex,  1, 0 }, \
+   	[DRM_IOCTL_NR(DRM_IOCTL_I830_CLEAR)]  = { i830_clear_bufs,  1, 0 }, \
+      	[DRM_IOCTL_NR(DRM_IOCTL_I830_FLUSH)]  = { i830_flush_ioctl, 1, 0 }, \
+   	[DRM_IOCTL_NR(DRM_IOCTL_I830_GETAGE)] = { i830_getage,      1, 0 }, \
+	[DRM_IOCTL_NR(DRM_IOCTL_I830_GETBUF)] = { i830_getbuf,      1, 0 }, \
+   	[DRM_IOCTL_NR(DRM_IOCTL_I830_SWAP)]   = { i830_swap_bufs,   1, 0 }, \
+   	[DRM_IOCTL_NR(DRM_IOCTL_I830_COPY)]   = { i830_copybuf,     1, 0 }, \
+   	[DRM_IOCTL_NR(DRM_IOCTL_I830_DOCOPY)] = { i830_docopy,      1, 0 },
+
+#define __HAVE_COUNTERS         4
+#define __HAVE_COUNTER6         _DRM_STAT_IRQ
+#define __HAVE_COUNTER7         _DRM_STAT_PRIMARY
+#define __HAVE_COUNTER8         _DRM_STAT_SECONDARY
+#define __HAVE_COUNTER9         _DRM_STAT_DMA
+
+
 #include "drm_agpsupport.h"
 #include "drm_auth.h"
 #include "drm_bufs.h"
@@ -47,6 +72,25 @@
 #include "drm_drawable.h"
 #include "drm_drv.h"
 
+#ifndef MODULE
+/* DRM(options) is called by the kernel to parse command-line options
+ * passed via the boot-loader (e.g., LILO).  It calls the insmod option
+ * routine, drm_parse_drm.
+ */
+
+/* JH- We have to hand expand the string ourselves because of the cpp.  If
+ * anyone can think of a way that we can fit into the __setup macro without
+ * changing it, then please send the solution my way.
+ */
+static int __init i830_options( char *str )
+{
+   DRM(parse_options)( str );
+   return 1;
+}
+
+__setup( DRIVER_NAME "=", i830_options );
+#endif
+
 #include "drm_fops.h"
 #include "drm_init.h"
 #include "drm_ioctl.h"
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/i830_drv.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/i830_drv.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/i830_drv.h	2003-07-30 13:51:23.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/i830_drv.h	2002-12-18 01:03:52.000000000 +0100
@@ -61,36 +61,24 @@ typedef struct drm_i830_private {
 	drm_i830_sarea_t *sarea_priv;
    	drm_i830_ring_buffer_t ring;
 
-      	unsigned long hw_status_page;
+      	u8 *hw_status_page;
    	unsigned long counter;
+   	
+   	dma_addr_t dma_status_page;
 
-	dma_addr_t dma_status_page;
-
+   	atomic_t flush_done;
+   	wait_queue_head_t flush_queue;	/* Processes waiting until flush    */
 	drm_buf_t *mmap_buffer;
 	
 	u32 front_di1, back_di1, zi1;
 	
 	int back_offset;
 	int depth_offset;
-	int front_offset;
 	int w, h;
 	int pitch;
 	int back_pitch;
 	int depth_pitch;
 	unsigned int cpp;
-
-	int do_boxes;
-	int dma_used;
-
-	int current_page;
-	int page_flipping;
-
-	wait_queue_head_t irq_queue;
-   	atomic_t irq_received;
-   	atomic_t irq_emitted;
-
-	int use_mi_batchbuffer_start;
-
 } drm_i830_private_t;
 
 				/* i830_dma.c */
@@ -121,81 +109,24 @@ extern int i830_swap_bufs(struct inode *
 extern int i830_clear_bufs(struct inode *inode, struct file *filp,
 			  unsigned int cmd, unsigned long arg);
 
-extern int i830_flip_bufs(struct inode *inode, struct file *filp,
-			 unsigned int cmd, unsigned long arg);
-
-extern int i830_getparam( struct inode *inode, struct file *filp,
-			  unsigned int cmd, unsigned long arg );
-
-extern int i830_setparam( struct inode *inode, struct file *filp,
-			  unsigned int cmd, unsigned long arg );
-
-/* i830_irq.c */
-extern int i830_irq_emit( struct inode *inode, struct file *filp, 
-			  unsigned int cmd, unsigned long arg );
-extern int i830_irq_wait( struct inode *inode, struct file *filp,
-			  unsigned int cmd, unsigned long arg );
-extern int i830_wait_irq(drm_device_t *dev, int irq_nr);
-extern int i830_emit_irq(drm_device_t *dev);
-
+#define I830_VERBOSE 0
 
 #define I830_BASE(reg)		((unsigned long) \
 				dev_priv->mmio_map->handle)
 #define I830_ADDR(reg)		(I830_BASE(reg) + reg)
-#define I830_DEREF(reg)		*(__volatile__ unsigned int *)I830_ADDR(reg)
-#define I830_READ(reg)		readl((volatile u32 *)I830_ADDR(reg))
-#define I830_WRITE(reg,val) 	writel(val, (volatile u32 *)I830_ADDR(reg))
+#define I830_DEREF(reg)		*(__volatile__ int *)I830_ADDR(reg)
+#define I830_READ(reg)		I830_DEREF(reg)
+#define I830_WRITE(reg,val) 	do { I830_DEREF(reg) = val; } while (0)
 #define I830_DEREF16(reg)	*(__volatile__ u16 *)I830_ADDR(reg)
 #define I830_READ16(reg) 	I830_DEREF16(reg)
 #define I830_WRITE16(reg,val)	do { I830_DEREF16(reg) = val; } while (0)
 
-
-
-#define I830_VERBOSE 0
-
-#define RING_LOCALS	unsigned int outring, ringmask, outcount; \
-                        volatile char *virt;
-
-#define BEGIN_LP_RING(n) do {				\
-	if (I830_VERBOSE)				\
-		printk("BEGIN_LP_RING(%d) in %s\n",	\
-			  n, __FUNCTION__);		\
-	if (dev_priv->ring.space < n*4)			\
-		i830_wait_ring(dev, n*4, __FUNCTION__);		\
-	outcount = 0;					\
-	outring = dev_priv->ring.tail;			\
-	ringmask = dev_priv->ring.tail_mask;		\
-	virt = dev_priv->ring.virtual_start;		\
-} while (0)
-
-
-#define OUT_RING(n) do {					\
-	if (I830_VERBOSE) printk("   OUT_RING %x\n", (int)(n));	\
-	*(volatile unsigned int *)(virt + outring) = n;		\
-        outcount++;						\
-	outring += 4;						\
-	outring &= ringmask;					\
-} while (0)
-
-#define ADVANCE_LP_RING() do {						\
-	if (I830_VERBOSE) printk("ADVANCE_LP_RING %x\n", outring);	\
-	dev_priv->ring.tail = outring;					\
-	dev_priv->ring.space -= outcount * 4;				\
-	I830_WRITE(LP_RING + RING_TAIL, outring);			\
-} while(0)
-
-extern int i830_wait_ring(drm_device_t *dev, int n, const char *caller);
-
-
 #define GFX_OP_USER_INTERRUPT 		((0<<29)|(2<<23))
 #define GFX_OP_BREAKPOINT_INTERRUPT	((0<<29)|(1<<23))
 #define CMD_REPORT_HEAD			(7<<23)
 #define CMD_STORE_DWORD_IDX		((0x21<<23) | 0x1)
 #define CMD_OP_BATCH_BUFFER  ((0x0<<29)|(0x30<<23)|0x1)
 
-#define STATE3D_LOAD_STATE_IMMEDIATE_2      ((0x3<<29)|(0x1d<<24)|(0x03<<16))
-#define LOAD_TEXTURE_MAP0                   (1<<11)
-
 #define INST_PARSER_CLIENT   0x00000000
 #define INST_OP_FLUSH        0x02000000
 #define INST_FLUSH_MAP_CACHE 0x00000001
@@ -211,21 +142,18 @@ extern int i830_wait_ring(drm_device_t *
 #define I830REG_INT_MASK_R 	0x020a8
 #define I830REG_INT_ENABLE_R	0x020a0
 
-#define I830_IRQ_RESERVED ((1<<13)|(3<<2))
-
-
 #define LP_RING     		0x2030
 #define HP_RING     		0x2040
 #define RING_TAIL      		0x00
-#define TAIL_ADDR		0x001FFFF8
+#define TAIL_ADDR		0x000FFFF8
 #define RING_HEAD      		0x04
 #define HEAD_WRAP_COUNT     	0xFFE00000
 #define HEAD_WRAP_ONE       	0x00200000
 #define HEAD_ADDR           	0x001FFFFC
 #define RING_START     		0x08
-#define START_ADDR          	0x0xFFFFF000
+#define START_ADDR          	0x00FFFFF8
 #define RING_LEN       		0x0C
-#define RING_NR_PAGES       	0x001FF000 
+#define RING_NR_PAGES       	0x000FF000 
 #define RING_REPORT_MASK    	0x00000006
 #define RING_REPORT_64K     	0x00000002
 #define RING_REPORT_128K    	0x00000004
@@ -256,12 +184,6 @@ extern int i830_wait_ring(drm_device_t *
 
 #define CMD_OP_DESTBUFFER_INFO	 ((0x3<<29)|(0x1d<<24)|(0x8e<<16)|1)
 
-#define CMD_OP_DISPLAYBUFFER_INFO ((0x0<<29)|(0x14<<23)|2)
-#define ASYNC_FLIP                (1<<22)
-
-#define CMD_3D                          (0x3<<29)
-#define STATE3D_CONST_BLEND_COLOR_CMD   (CMD_3D|(0x1d<<24)|(0x88<<16))
-#define STATE3D_MAP_COORD_SETBIND_CMD   (CMD_3D|(0x1d<<24)|(0x02<<16))
 
 #define BR00_BITBLT_CLIENT   0x40000000
 #define BR00_OP_COLOR_BLT    0x10000000
@@ -286,15 +208,8 @@ extern int i830_wait_ring(drm_device_t *
 #define XY_SRC_COPY_BLT_WRITE_RGB       (1<<20)
 
 #define MI_BATCH_BUFFER 	((0x30<<23)|1)
-#define MI_BATCH_BUFFER_START 	(0x31<<23)
-#define MI_BATCH_BUFFER_END 	(0xA<<23)
 #define MI_BATCH_NON_SECURE	(1)
 
-#define MI_WAIT_FOR_EVENT       ((0x3<<23))
-#define MI_WAIT_FOR_PLANE_A_FLIP      (1<<2) 
-#define MI_WAIT_FOR_PLANE_A_SCANLINES (1<<1) 
-
-#define MI_LOAD_SCAN_LINES_INCL  ((0x12<<23))
 
 #endif
 
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/i830_irq.c linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/i830_irq.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/i830_irq.c	2003-07-30 13:51:23.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/i830_irq.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,178 +0,0 @@
-/* i830_dma.c -- DMA support for the I830 -*- linux-c -*-
- *
- * Copyright 2002 Tungsten Graphics, Inc.
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Authors: Keith Whitwell <keith@tungstengraphics.com>
- *
- */
-
-
-#include "i830.h"
-#include "drmP.h"
-#include "drm.h"
-#include "i830_drm.h"
-#include "i830_drv.h"
-#include <linux/interrupt.h>	/* For task queue support */
-#include <linux/delay.h>
-
-
-void DRM(dma_service)(int irq, void *device, struct pt_regs *regs)
-{
-	drm_device_t	 *dev = (drm_device_t *)device;
-      	drm_i830_private_t *dev_priv = (drm_i830_private_t *)dev->dev_private;
-   	u16 temp;
-   
-      	temp = I830_READ16(I830REG_INT_IDENTITY_R);
-	printk("%s: %x\n", __FUNCTION__, temp);
-	
-   	if(temp == 0) 
-	   return;
-
-	I830_WRITE16(I830REG_INT_IDENTITY_R, temp); 
-
-	if (temp & 2) {
-		atomic_inc(&dev_priv->irq_received);
-		wake_up_interruptible(&dev_priv->irq_queue); 
-	}
-}
-
-
-int i830_emit_irq(drm_device_t *dev)
-{
-	drm_i830_private_t *dev_priv = dev->dev_private;
-	RING_LOCALS;
-
-	DRM_DEBUG("%s\n", __FUNCTION__);
-
-	atomic_inc(&dev_priv->irq_emitted);
-
-   	BEGIN_LP_RING(2);
-      	OUT_RING( 0 );
-      	OUT_RING( GFX_OP_USER_INTERRUPT );
-      	ADVANCE_LP_RING();
-
-	return atomic_read(&dev_priv->irq_emitted);
-}
-
-
-int i830_wait_irq(drm_device_t *dev, int irq_nr)
-{
-  	drm_i830_private_t *dev_priv = 
-	   (drm_i830_private_t *)dev->dev_private;
-	DECLARE_WAITQUEUE(entry, current);
-	unsigned long end = jiffies + HZ*3;
-	int ret = 0;
-
-	DRM_DEBUG("%s\n", __FUNCTION__);
-
- 	if (atomic_read(&dev_priv->irq_received) >= irq_nr)  
- 		return 0; 
-
-	dev_priv->sarea_priv->perf_boxes |= I830_BOX_WAIT;
-
-	add_wait_queue(&dev_priv->irq_queue, &entry);
-
-	for (;;) {
-		current->state = TASK_INTERRUPTIBLE;
-	   	if (atomic_read(&dev_priv->irq_received) >= irq_nr) 
-		   break;
-		if (time_after(jiffies, end)) {
-			DRM_ERROR("timeout iir %x imr %x ier %x hwstam %x\n",
-				  I830_READ16( I830REG_INT_IDENTITY_R ),
-				  I830_READ16( I830REG_INT_MASK_R ),
-				  I830_READ16( I830REG_INT_ENABLE_R ),
-				  I830_READ16( I830REG_HWSTAM ));
-
-		   	ret = -EBUSY;	/* Lockup?  Missed irq? */
-			break;
-		}
-	      	schedule_timeout(HZ*3);
-	      	if (signal_pending(current)) {
-		   	ret = -EINTR;
-			break;
-		}
-	}
-
-	current->state = TASK_RUNNING;
-	remove_wait_queue(&dev_priv->irq_queue, &entry);
-	return ret;
-}
-
-
-/* Needs the lock as it touches the ring.
- */
-int i830_irq_emit( struct inode *inode, struct file *filp, unsigned int cmd,
-		   unsigned long arg )
-{
-	drm_file_t	  *priv	    = filp->private_data;
-	drm_device_t	  *dev	    = priv->dev;
-	drm_i830_private_t *dev_priv = dev->dev_private;
-	drm_i830_irq_emit_t emit;
-	int result;
-
-   	if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
-		DRM_ERROR("i830_irq_emit called without lock held\n");
-		return -EINVAL;
-	}
-
-	if ( !dev_priv ) {
-		DRM_ERROR( "%s called with no initialization\n", __FUNCTION__ );
-		return -EINVAL;
-	}
-
-	if (copy_from_user( &emit, (drm_i830_irq_emit_t *)arg, sizeof(emit) ))
-		return -EFAULT;
-
-	result = i830_emit_irq( dev );
-
-	if ( copy_to_user( emit.irq_seq, &result, sizeof(int) ) ) {
-		DRM_ERROR( "copy_to_user\n" );
-		return -EFAULT;
-	}
-
-	return 0;
-}
-
-
-/* Doesn't need the hardware lock.
- */
-int i830_irq_wait( struct inode *inode, struct file *filp, unsigned int cmd,
-		   unsigned long arg )
-{
-	drm_file_t	  *priv	    = filp->private_data;
-	drm_device_t	  *dev	    = priv->dev;
-	drm_i830_private_t *dev_priv = dev->dev_private;
-	drm_i830_irq_wait_t irqwait;
-
-	if ( !dev_priv ) {
-		DRM_ERROR( "%s called with no initialization\n", __FUNCTION__ );
-		return -EINVAL;
-	}
-
-	if (copy_from_user( &irqwait, (drm_i830_irq_wait_t *)arg, 
-			    sizeof(irqwait) ))
-		return -EFAULT;
-
-	return i830_wait_irq( dev, irqwait.irq_seq );
-}
-
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/mga.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/mga.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/mga.h	2003-07-30 13:51:23.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/mga.h	2001-08-08 18:42:15.000000000 +0200
@@ -41,33 +41,6 @@
 #define __HAVE_MTRR		1
 #define __HAVE_CTX_BITMAP	1
 
-#define DRIVER_AUTHOR		"Gareth Hughes, VA Linux Systems Inc."
-
-#define DRIVER_NAME		"mga"
-#define DRIVER_DESC		"Matrox G200/G400"
-#define DRIVER_DATE		"20010321"
-
-#define DRIVER_MAJOR		3
-#define DRIVER_MINOR		0
-#define DRIVER_PATCHLEVEL	2
-
-#define DRIVER_IOCTLS							   \
-	[DRM_IOCTL_NR(DRM_IOCTL_DMA)]	      = { mga_dma_buffers, 1, 0 }, \
-	[DRM_IOCTL_NR(DRM_IOCTL_MGA_INIT)]    = { mga_dma_init,    1, 1 }, \
-	[DRM_IOCTL_NR(DRM_IOCTL_MGA_FLUSH)]   = { mga_dma_flush,   1, 0 }, \
-	[DRM_IOCTL_NR(DRM_IOCTL_MGA_RESET)]   = { mga_dma_reset,   1, 0 }, \
-	[DRM_IOCTL_NR(DRM_IOCTL_MGA_SWAP)]    = { mga_dma_swap,    1, 0 }, \
-	[DRM_IOCTL_NR(DRM_IOCTL_MGA_CLEAR)]   = { mga_dma_clear,   1, 0 }, \
-	[DRM_IOCTL_NR(DRM_IOCTL_MGA_VERTEX)]  = { mga_dma_vertex,  1, 0 }, \
-	[DRM_IOCTL_NR(DRM_IOCTL_MGA_INDICES)] = { mga_dma_indices, 1, 0 }, \
-	[DRM_IOCTL_NR(DRM_IOCTL_MGA_ILOAD)]   = { mga_dma_iload,   1, 0 }, \
-	[DRM_IOCTL_NR(DRM_IOCTL_MGA_BLIT)]    = { mga_dma_blit,    1, 0 },
-
-#define __HAVE_COUNTERS         3
-#define __HAVE_COUNTER6         _DRM_STAT_IRQ
-#define __HAVE_COUNTER7         _DRM_STAT_PRIMARY
-#define __HAVE_COUNTER8         _DRM_STAT_SECONDARY
-
 /* Driver customization:
  */
 #define DRIVER_PRETAKEDOWN() do {					\
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/mga_dma.c linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/mga_dma.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/mga_dma.c	2003-07-30 13:52:43.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/mga_dma.c	2003-07-30 11:18:33.000000000 +0200
@@ -35,11 +35,10 @@
 
 #include "mga.h"
 #include "drmP.h"
-#include "drm.h"
-#include "mga_drm.h"
 #include "mga_drv.h"
-#include <asm/delay.h>
-#include "drm_os_linux.h"
+
+#include <linux/interrupt.h>	/* For task queue support */
+#include <linux/delay.h>
 
 #define MGA_DEFAULT_USEC_TIMEOUT	10000
 #define MGA_FREELIST_DEBUG		0
@@ -53,7 +52,7 @@ int mga_do_wait_for_idle( drm_mga_privat
 {
 	u32 status = 0;
 	int i;
-	DRM_DEBUG( "\n" );
+	DRM_DEBUG( "%s\n", __FUNCTION__ );
 
 	for ( i = 0 ; i < dev_priv->usec_timeout ; i++ ) {
 		status = MGA_READ( MGA_STATUS ) & MGA_ENGINE_IDLE_MASK;
@@ -76,7 +75,7 @@ int mga_do_dma_idle( drm_mga_private_t *
 {
 	u32 status = 0;
 	int i;
-	DRM_DEBUG( "\n" );
+	DRM_DEBUG( "%s\n", __FUNCTION__ );
 
 	for ( i = 0 ; i < dev_priv->usec_timeout ; i++ ) {
 		status = MGA_READ( MGA_STATUS ) & MGA_DMA_IDLE_MASK;
@@ -96,7 +95,7 @@ int mga_do_dma_reset( drm_mga_private_t 
 	drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
 	drm_mga_primary_buffer_t *primary = &dev_priv->prim;
 
-	DRM_DEBUG( "\n" );
+	DRM_DEBUG( "%s\n", __FUNCTION__ );
 
 	/* The primary DMA stream should look like new right about now.
 	 */
@@ -117,7 +116,7 @@ int mga_do_dma_reset( drm_mga_private_t 
 
 int mga_do_engine_reset( drm_mga_private_t *dev_priv )
 {
-	DRM_DEBUG( "\n" );
+	DRM_DEBUG( "%s\n", __FUNCTION__ );
 
 	/* Okay, so we've completely screwed up and locked the engine.
 	 * How about we clean up after ourselves?
@@ -164,8 +163,8 @@ void mga_do_dma_flush( drm_mga_private_t
 	u32 head, tail;
 	u32 status = 0;
 	int i;
- 	DMA_LOCALS;
-	DRM_DEBUG( "\n" );
+	DMA_LOCALS;
+	DRM_DEBUG( "%s:\n", __FUNCTION__ );
 
         /* We need to wait so that we can do an safe flush */
 	for ( i = 0 ; i < dev_priv->usec_timeout ; i++ ) {
@@ -211,7 +210,7 @@ void mga_do_dma_flush( drm_mga_private_t
 	mga_flush_write_combine();
 	MGA_WRITE( MGA_PRIMEND, tail | MGA_PAGPXFER );
 
-	DRM_DEBUG( "done.\n" );
+	DRM_DEBUG( "%s: done.\n", __FUNCTION__ );
 }
 
 void mga_do_dma_wrap_start( drm_mga_private_t *dev_priv )
@@ -219,7 +218,7 @@ void mga_do_dma_wrap_start( drm_mga_priv
 	drm_mga_primary_buffer_t *primary = &dev_priv->prim;
 	u32 head, tail;
 	DMA_LOCALS;
-	DRM_DEBUG( "\n" );
+	DRM_DEBUG( "%s:\n", __FUNCTION__ );
 
 	BEGIN_DMA_WRAP();
 
@@ -254,7 +253,7 @@ void mga_do_dma_wrap_start( drm_mga_priv
 	MGA_WRITE( MGA_PRIMEND, tail | MGA_PAGPXFER );
 
 	set_bit( 0, &primary->wrapped );
-	DRM_DEBUG( "done.\n" );
+	DRM_DEBUG( "%s: done.\n", __FUNCTION__ );
 }
 
 void mga_do_dma_wrap_end( drm_mga_private_t *dev_priv )
@@ -262,7 +261,7 @@ void mga_do_dma_wrap_end( drm_mga_privat
 	drm_mga_primary_buffer_t *primary = &dev_priv->prim;
 	drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
 	u32 head = dev_priv->primary->offset;
-	DRM_DEBUG( "\n" );
+	DRM_DEBUG( "%s:\n", __FUNCTION__ );
 
 	sarea_priv->last_wrap++;
 	DRM_DEBUG( "   wrap = %d\n", sarea_priv->last_wrap );
@@ -271,7 +270,7 @@ void mga_do_dma_wrap_end( drm_mga_privat
 	MGA_WRITE( MGA_PRIMADDRESS, head | MGA_DMA_GENERAL );
 
 	clear_bit( 0, &primary->wrapped );
-	DRM_DEBUG( "done.\n" );
+	DRM_DEBUG( "%s: done.\n", __FUNCTION__ );
 }
 
 
@@ -311,7 +310,8 @@ static int mga_freelist_init( drm_device
 	drm_mga_buf_priv_t *buf_priv;
 	drm_mga_freelist_t *entry;
 	int i;
-	DRM_DEBUG( "count=%d\n", dma->buf_count );
+	DRM_DEBUG( "%s: count=%d\n",
+		   __FUNCTION__, dma->buf_count );
 
 	dev_priv->head = DRM(alloc)( sizeof(drm_mga_freelist_t),
 				     DRM_MEM_DRIVER );
@@ -357,7 +357,7 @@ static void mga_freelist_cleanup( drm_de
 	drm_mga_private_t *dev_priv = dev->dev_private;
 	drm_mga_freelist_t *entry;
 	drm_mga_freelist_t *next;
-	DRM_DEBUG( "\n" );
+	DRM_DEBUG( "%s\n", __FUNCTION__ );
 
 	entry = dev_priv->head;
 	while ( entry ) {
@@ -395,7 +395,7 @@ static drm_buf_t *mga_freelist_get( drm_
 	drm_mga_freelist_t *prev;
 	drm_mga_freelist_t *tail = dev_priv->tail;
 	u32 head, wrap;
-	DRM_DEBUG( "\n" );
+	DRM_DEBUG( "%s:\n", __FUNCTION__ );
 
 	head = MGA_READ( MGA_PRIMADDRESS );
 	wrap = dev_priv->sarea_priv->last_wrap;
@@ -427,7 +427,8 @@ int mga_freelist_put( drm_device_t *dev,
 	drm_mga_buf_priv_t *buf_priv = buf->dev_private;
 	drm_mga_freelist_t *head, *entry, *prev;
 
-	DRM_DEBUG( "age=0x%06lx wrap=%d\n",
+	DRM_DEBUG( "%s: age=0x%06lx wrap=%d\n",
+		   __FUNCTION__,
 		   buf_priv->list_entry->age.head -
 		   dev_priv->primary->offset,
 		   buf_priv->list_entry->age.wrap );
@@ -460,8 +461,9 @@ int mga_freelist_put( drm_device_t *dev,
 static int mga_do_init_dma( drm_device_t *dev, drm_mga_init_t *init )
 {
 	drm_mga_private_t *dev_priv;
+	struct list_head *list;
 	int ret;
-	DRM_DEBUG( "\n" );
+	DRM_DEBUG( "%s\n", __FUNCTION__ );
 
 	dev_priv = DRM(alloc)( sizeof(drm_mga_private_t), DRM_MEM_DRIVER );
 	if ( !dev_priv )
@@ -495,8 +497,15 @@ static int mga_do_init_dma( drm_device_t
 	dev_priv->texture_offset = init->texture_offset[0];
 	dev_priv->texture_size = init->texture_size[0];
 
-	DRM_GETSAREA();
-
+	list_for_each( list, &dev->maplist->head ) {
+		drm_map_list_t *entry = (drm_map_list_t *)list;
+		if ( entry->map &&
+		     entry->map->type == _DRM_SHM &&
+		     (entry->map->flags & _DRM_CONTAINS_LOCK) ) {
+			dev_priv->sarea = entry->map;
+ 			break;
+ 		}
+ 	}
 	if(!dev_priv->sarea) {
 		DRM_ERROR( "failed to find sarea!\n" );
 		/* Assign dev_private so we can do cleanup. */
@@ -620,6 +629,8 @@ static int mga_do_init_dma( drm_device_t
 
 	dev_priv->prim.high_mark = 256 * DMA_BLOCK_SIZE;
 
+	spin_lock_init( &dev_priv->prim.list_lock );
+
 	dev_priv->prim.status[0] = dev_priv->primary->offset;
 	dev_priv->prim.status[1] = 0;
 
@@ -642,7 +653,7 @@ static int mga_do_init_dma( drm_device_t
 
 int mga_do_cleanup_dma( drm_device_t *dev )
 {
-	DRM_DEBUG( "\n" );
+	DRM_DEBUG( "%s\n", __FUNCTION__ );
 
 	if ( dev->dev_private ) {
 		drm_mga_private_t *dev_priv = dev->dev_private;
@@ -717,7 +728,7 @@ int mga_dma_flush( struct inode *inode, 
 #if MGA_DMA_DEBUG
 		int ret = mga_do_wait_for_idle( dev_priv );
 		if ( ret < 0 )
-			DRM_INFO( "%s: -EBUSY\n", __FUNCTION__ );
+			DRM_INFO( __FUNCTION__": -EBUSY\n" );
 		return ret;
 #else
 		return mga_do_wait_for_idle( dev_priv );
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/mga_drm.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/mga_drm.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/mga_drm.h	2003-07-30 13:51:23.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/mga_drm.h	2003-07-30 11:12:58.000000000 +0200
@@ -225,20 +225,6 @@ typedef struct _drm_mga_sarea {
 /* WARNING: If you change any of these defines, make sure to change the
  * defines in the Xserver file (xf86drmMga.h)
  */
-
-/* MGA specific ioctls
- * The device specific ioctl range is 0x40 to 0x79.
- */
-#define DRM_IOCTL_MGA_INIT		DRM_IOW( 0x40, drm_mga_init_t)
-#define DRM_IOCTL_MGA_FLUSH		DRM_IOW( 0x41, drm_lock_t)
-#define DRM_IOCTL_MGA_RESET		DRM_IO(  0x42)
-#define DRM_IOCTL_MGA_SWAP		DRM_IO(  0x43)
-#define DRM_IOCTL_MGA_CLEAR		DRM_IOW( 0x44, drm_mga_clear_t)
-#define DRM_IOCTL_MGA_VERTEX		DRM_IOW( 0x45, drm_mga_vertex_t)
-#define DRM_IOCTL_MGA_INDICES		DRM_IOW( 0x46, drm_mga_indices_t)
-#define DRM_IOCTL_MGA_ILOAD		DRM_IOW( 0x47, drm_mga_iload_t)
-#define DRM_IOCTL_MGA_BLIT		DRM_IOW( 0x48, drm_mga_blit_t)
-
 typedef struct _drm_mga_warp_index {
    	int installed;
    	unsigned long phys_addr;
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/mga_drv.c linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/mga_drv.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/mga_drv.c	2003-07-30 13:51:23.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/mga_drv.c	2001-08-08 18:42:15.000000000 +0200
@@ -32,9 +32,37 @@
 #include <linux/config.h>
 #include "mga.h"
 #include "drmP.h"
-#include "drm.h"
-#include "mga_drm.h"
 #include "mga_drv.h"
+
+#define DRIVER_AUTHOR		"Gareth Hughes, VA Linux Systems Inc."
+
+#define DRIVER_NAME		"mga"
+#define DRIVER_DESC		"Matrox G200/G400"
+#define DRIVER_DATE		"20010321"
+
+#define DRIVER_MAJOR		3
+#define DRIVER_MINOR		0
+#define DRIVER_PATCHLEVEL	2
+
+#define DRIVER_IOCTLS							   \
+	[DRM_IOCTL_NR(DRM_IOCTL_DMA)]	      = { mga_dma_buffers, 1, 0 }, \
+	[DRM_IOCTL_NR(DRM_IOCTL_MGA_INIT)]    = { mga_dma_init,    1, 1 }, \
+	[DRM_IOCTL_NR(DRM_IOCTL_MGA_FLUSH)]   = { mga_dma_flush,   1, 0 }, \
+	[DRM_IOCTL_NR(DRM_IOCTL_MGA_RESET)]   = { mga_dma_reset,   1, 0 }, \
+	[DRM_IOCTL_NR(DRM_IOCTL_MGA_SWAP)]    = { mga_dma_swap,    1, 0 }, \
+	[DRM_IOCTL_NR(DRM_IOCTL_MGA_CLEAR)]   = { mga_dma_clear,   1, 0 }, \
+	[DRM_IOCTL_NR(DRM_IOCTL_MGA_VERTEX)]  = { mga_dma_vertex,  1, 0 }, \
+	[DRM_IOCTL_NR(DRM_IOCTL_MGA_INDICES)] = { mga_dma_indices, 1, 0 }, \
+	[DRM_IOCTL_NR(DRM_IOCTL_MGA_ILOAD)]   = { mga_dma_iload,   1, 0 }, \
+	[DRM_IOCTL_NR(DRM_IOCTL_MGA_BLIT)]    = { mga_dma_blit,    1, 0 },
+
+
+#define __HAVE_COUNTERS         3
+#define __HAVE_COUNTER6         _DRM_STAT_IRQ
+#define __HAVE_COUNTER7         _DRM_STAT_PRIMARY
+#define __HAVE_COUNTER8         _DRM_STAT_SECONDARY
+
+
 #include "drm_agpsupport.h"
 #include "drm_auth.h"
 #include "drm_bufs.h"
@@ -42,6 +70,27 @@
 #include "drm_dma.h"
 #include "drm_drawable.h"
 #include "drm_drv.h"
+
+#ifndef MODULE
+/* DRM(options) is called by the kernel to parse command-line options
+ * passed via the boot-loader (e.g., LILO).  It calls the insmod option
+ * routine, drm_parse_drm.
+ */
+
+/* JH- We have to hand expand the string ourselves because of the cpp.  If
+ * anyone can think of a way that we can fit into the __setup macro without
+ * changing it, then please send the solution my way.
+ */
+static int __init mga_options( char *str )
+{
+	DRM(parse_options)( str );
+	return 1;
+}
+
+__setup( DRIVER_NAME "=", mga_options );
+#endif
+
+
 #include "drm_fops.h"
 #include "drm_init.h"
 #include "drm_ioctl.h"
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/mga_drv.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/mga_drv.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/mga_drv.h	2003-07-30 13:51:23.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/mga_drv.h	2002-12-18 01:03:52.000000000 +0100
@@ -46,6 +46,8 @@ typedef struct drm_mga_primary_buffer {
 	u32 last_wrap;
 
 	u32 high_mark;
+
+	spinlock_t list_lock;
 } drm_mga_primary_buffer_t;
 
 typedef struct drm_mga_freelist {
@@ -255,7 +257,7 @@ do {									\
 #define BEGIN_DMA_WRAP()						\
 do {									\
 	if ( MGA_VERBOSE ) {						\
-		DRM_INFO( "BEGIN_DMA() in %s\n", __FUNCTION__ );		\
+		DRM_INFO( "BEGIN_DMA() in %s\n", __FUNCTION__ );	\
 		DRM_INFO( "   space=0x%x\n", dev_priv->prim.space );	\
 	}								\
 	prim = dev_priv->prim.start;					\
@@ -274,7 +276,7 @@ do {									\
 #define FLUSH_DMA()							\
 do {									\
 	if ( 0 ) {							\
-		DRM_INFO( "%s:\n", __FUNCTION__ );				\
+		DRM_INFO( "%s:\n" , __FUNCTION__);			\
 		DRM_INFO( "   tail=0x%06x head=0x%06lx\n",		\
 			  dev_priv->prim.tail,				\
 			  MGA_READ( MGA_PRIMADDRESS ) -			\
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/mga_state.c linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/mga_state.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/mga_state.c	2003-07-30 13:51:23.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/mga_state.c	2003-07-30 11:12:58.000000000 +0200
@@ -34,9 +34,8 @@
 
 #include "mga.h"
 #include "drmP.h"
-#include "drm.h"
-#include "mga_drm.h"
 #include "mga_drv.h"
+#include "drm.h"
 
 
 /* ================================================================
@@ -513,7 +512,7 @@ static void mga_dma_dispatch_clear( drm_
 	int nbox = sarea_priv->nbox;
 	int i;
 	DMA_LOCALS;
-	DRM_DEBUG( "\n" );
+	DRM_DEBUG("%s:\n" , __FUNCTION__);
 
 	BEGIN_DMA( 1 );
 
@@ -607,7 +606,7 @@ static void mga_dma_dispatch_swap( drm_d
 	int nbox = sarea_priv->nbox;
 	int i;
 	DMA_LOCALS;
-	DRM_DEBUG( "\n" );
+	DRM_DEBUG( "%s:\n", __FUNCTION__ );
 
 	sarea_priv->last_frame.head = dev_priv->prim.tail;
 	sarea_priv->last_frame.wrap = dev_priv->prim.last_wrap;
@@ -761,7 +760,8 @@ static void mga_dma_dispatch_iload( drm_
 	u32 srcorg = buf->bus_address | MGA_SRCACC_AGP | MGA_SRCMAP_SYSMEM;
 	u32 y2;
 	DMA_LOCALS;
-	DRM_DEBUG( "buf=%d used=%d\n", buf->idx, buf->used );
+	DRM_DEBUG( "%s: buf=%d used=%d\n",
+		   __FUNCTION__, buf->idx, buf->used );
 
 	y2 = length / 64;
 
@@ -815,7 +815,7 @@ static void mga_dma_dispatch_blit( drm_d
 	int nbox = sarea_priv->nbox;
 	u32 scandir = 0, i;
 	DMA_LOCALS;
-	DRM_DEBUG( "\n" );
+	DRM_DEBUG( "%s:\n", __FUNCTION__ );
 
 	BEGIN_DMA( 4 + nbox );
 
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/mga_warp.c linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/mga_warp.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/mga_warp.c	2003-07-30 13:51:23.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/mga_warp.c	2002-12-18 01:03:52.000000000 +0100
@@ -27,11 +27,8 @@
  *    Gareth Hughes <gareth@valinux.com>
  */
 
-
 #include "mga.h"
 #include "drmP.h"
-#include "drm.h"
-#include "mga_drm.h"
 #include "mga_drv.h"
 #include "mga_ucode.h"
 
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/r128.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/r128.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/r128.h	2003-07-30 13:51:23.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/r128.h	2001-08-08 18:42:15.000000000 +0200
@@ -43,35 +43,6 @@
 #define __HAVE_SG		1
 #define __HAVE_PCI_DMA		1
 
-#define DRIVER_AUTHOR		"Gareth Hughes, VA Linux Systems Inc."
-
-#define DRIVER_NAME		"r128"
-#define DRIVER_DESC		"ATI Rage 128"
-#define DRIVER_DATE		"20010917"
-
-#define DRIVER_MAJOR		2
-#define DRIVER_MINOR		2
-#define DRIVER_PATCHLEVEL	0
-
-
-#define DRIVER_IOCTLS							    \
-   [DRM_IOCTL_NR(DRM_IOCTL_DMA)]             = { r128_cce_buffers,  1, 0 }, \
-   [DRM_IOCTL_NR(DRM_IOCTL_R128_INIT)]       = { r128_cce_init,     1, 1 }, \
-   [DRM_IOCTL_NR(DRM_IOCTL_R128_CCE_START)]  = { r128_cce_start,    1, 1 }, \
-   [DRM_IOCTL_NR(DRM_IOCTL_R128_CCE_STOP)]   = { r128_cce_stop,     1, 1 }, \
-   [DRM_IOCTL_NR(DRM_IOCTL_R128_CCE_RESET)]  = { r128_cce_reset,    1, 1 }, \
-   [DRM_IOCTL_NR(DRM_IOCTL_R128_CCE_IDLE)]   = { r128_cce_idle,     1, 0 }, \
-   [DRM_IOCTL_NR(DRM_IOCTL_R128_RESET)]      = { r128_engine_reset, 1, 0 }, \
-   [DRM_IOCTL_NR(DRM_IOCTL_R128_FULLSCREEN)] = { r128_fullscreen,   1, 0 }, \
-   [DRM_IOCTL_NR(DRM_IOCTL_R128_SWAP)]       = { r128_cce_swap,     1, 0 }, \
-   [DRM_IOCTL_NR(DRM_IOCTL_R128_CLEAR)]      = { r128_cce_clear,    1, 0 }, \
-   [DRM_IOCTL_NR(DRM_IOCTL_R128_VERTEX)]     = { r128_cce_vertex,   1, 0 }, \
-   [DRM_IOCTL_NR(DRM_IOCTL_R128_INDICES)]    = { r128_cce_indices,  1, 0 }, \
-   [DRM_IOCTL_NR(DRM_IOCTL_R128_BLIT)]       = { r128_cce_blit,     1, 0 }, \
-   [DRM_IOCTL_NR(DRM_IOCTL_R128_DEPTH)]      = { r128_cce_depth,    1, 0 }, \
-   [DRM_IOCTL_NR(DRM_IOCTL_R128_STIPPLE)]    = { r128_cce_stipple,  1, 0 }, \
-   [DRM_IOCTL_NR(DRM_IOCTL_R128_INDIRECT)]   = { r128_cce_indirect, 1, 1 },
-
 /* Driver customization:
  */
 #define DRIVER_PRERELEASE() do {					\
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/r128_cce.c linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/r128_cce.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/r128_cce.c	2003-07-30 13:52:43.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/r128_cce.c	2003-07-30 11:18:33.000000000 +0200
@@ -30,14 +30,14 @@
 
 #include "r128.h"
 #include "drmP.h"
-#include "drm.h"
-#include "r128_drm.h"
 #include "r128_drv.h"
-#include "drm_os_linux.h"
-#include <asm/delay.h>
+
+#include <linux/interrupt.h>	/* For task queue support */
+#include <linux/delay.h>
 
 #define R128_FIFO_DEBUG		0
 
+
 /* CCE microcode (from ATI) */
 static u32 r128_cce_microcode[] = {
 	0, 276838400, 0, 268449792, 2, 142, 2, 145, 0, 1076765731, 0,
@@ -83,7 +83,6 @@ static u32 r128_cce_microcode[] = {
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 };
 
-int r128_do_wait_for_idle( drm_r128_private_t *dev_priv );
 
 int R128_READ_PLL(drm_device_t *dev, int addr)
 {
@@ -133,7 +132,7 @@ static int r128_do_pixcache_flush( drm_r
 	}
 
 #if R128_FIFO_DEBUG
-	DRM_ERROR( "failed!\n" );
+	DRM_ERROR( "%s failed!\n", __FUNCTION__ );
 #endif
 	return -EBUSY;
 }
@@ -150,7 +149,7 @@ static int r128_do_wait_for_fifo( drm_r1
 	}
 
 #if R128_FIFO_DEBUG
-	DRM_ERROR( "failed!\n" );
+	DRM_ERROR( "%s failed!\n", __FUNCTION__ );
 #endif
 	return -EBUSY;
 }
@@ -160,7 +159,7 @@ int r128_do_wait_for_idle( drm_r128_priv
 	int i, ret;
 
 	ret = r128_do_wait_for_fifo( dev_priv, 64 );
-	if ( ret ) return ret;
+	if ( ret < 0 ) return ret;
 
 	for ( i = 0 ; i < dev_priv->usec_timeout ; i++ ) {
 		if ( !(R128_READ( R128_GUI_STAT ) & R128_GUI_ACTIVE) ) {
@@ -172,7 +171,7 @@ int r128_do_wait_for_idle( drm_r128_priv
 	}
 
 #if R128_FIFO_DEBUG
-	DRM_ERROR( "failed!\n" );
+	DRM_ERROR( "%s failed!\n", __FUNCTION__ );
 #endif
 	return -EBUSY;
 }
@@ -187,7 +186,7 @@ static void r128_cce_load_microcode( drm
 {
 	int i;
 
-	DRM_DEBUG( "\n" );
+	DRM_DEBUG( "%s\n", __FUNCTION__ );
 
 	r128_do_wait_for_idle( dev_priv );
 
@@ -324,7 +323,7 @@ static void r128_cce_init_ring_buffer( d
 	u32 ring_start;
 	u32 tmp;
 
-	DRM_DEBUG( "\n" );
+	DRM_DEBUG( "%s\n", __FUNCTION__ );
 
 	/* The manual (p. 2) says this address is in "VM space".  This
 	 * means it's an offset from the start of AGP space.
@@ -356,8 +355,8 @@ static void r128_cce_init_ring_buffer( d
 
 		R128_WRITE( R128_PM4_BUFFER_DL_RPTR_ADDR,
      			    entry->busaddr[page_ofs]);
-		DRM_DEBUG( "ring rptr: offset=0x%08x handle=0x%08lx\n",
-			   entry->busaddr[page_ofs],
+		DRM_DEBUG( "ring rptr: offset=0x%08llx handle=0x%08lx\n",
+			   (u64)entry->busaddr[page_ofs],
      			   entry->handle + tmp_ofs );
 	}
 
@@ -379,8 +378,9 @@ static void r128_cce_init_ring_buffer( d
 static int r128_do_init_cce( drm_device_t *dev, drm_r128_init_t *init )
 {
 	drm_r128_private_t *dev_priv;
+	struct list_head *list;
 
-	DRM_DEBUG( "\n" );
+	DRM_DEBUG( "%s\n", __FUNCTION__ );
 
 	dev_priv = DRM(alloc)( sizeof(drm_r128_private_t), DRM_MEM_DRIVER );
 	if ( dev_priv == NULL )
@@ -485,8 +485,15 @@ static int r128_do_init_cce( drm_device_
 	dev_priv->span_pitch_offset_c = (((dev_priv->depth_pitch/8) << 21) |
 					 (dev_priv->span_offset >> 5));
 
-	DRM_GETSAREA();
-	
+	list_for_each(list, &dev->maplist->head) {
+		drm_map_list_t *r_list = (drm_map_list_t *)list;
+		if( r_list->map &&
+		    r_list->map->type == _DRM_SHM &&
+		    r_list->map->flags & _DRM_CONTAINS_LOCK ) {
+			dev_priv->sarea = r_list->map;
+ 			break;
+ 		}
+ 	}
 	if(!dev_priv->sarea) {
 		DRM_ERROR("could not find sarea!\n");
 		dev->dev_private = (void *)dev_priv;
@@ -619,20 +626,16 @@ int r128_do_cleanup_cce( drm_device_t *d
 	if ( dev->dev_private ) {
 		drm_r128_private_t *dev_priv = dev->dev_private;
 
-#if __REALLY_HAVE_SG
 		if ( !dev_priv->is_pci ) {
-#endif
 			DRM_IOREMAPFREE( dev_priv->cce_ring );
 			DRM_IOREMAPFREE( dev_priv->ring_rptr );
 			DRM_IOREMAPFREE( dev_priv->buffers );
-#if __REALLY_HAVE_SG
 		} else {
 			if (!DRM(ati_pcigart_cleanup)( dev,
 						dev_priv->phys_pci_gart,
 						dev_priv->bus_pci_gart ))
 				DRM_ERROR( "failed to cleanup PCI GART!\n" );
 		}
-#endif
 
 		DRM(free)( dev->dev_private, sizeof(drm_r128_private_t),
 			   DRM_MEM_DRIVER );
@@ -714,7 +717,7 @@ int r128_cce_stop( struct inode *inode, 
 	 */
 	if ( stop.idle ) {
 		ret = r128_do_cce_idle( dev_priv );
-		if ( ret ) return ret;
+		if ( ret < 0 ) return ret;
 	}
 
 	/* Finally, we can turn off the CCE.  If the engine isn't idle,
@@ -791,7 +794,7 @@ int r128_engine_reset( struct inode *ino
 static int r128_do_init_pageflip( drm_device_t *dev )
 {
 	drm_r128_private_t *dev_priv = dev->dev_private;
-	DRM_DEBUG( "\n" );
+	DRM_DEBUG( "%s\n", __FUNCTION__ );
 
 	dev_priv->crtc_offset =      R128_READ( R128_CRTC_OFFSET );
 	dev_priv->crtc_offset_cntl = R128_READ( R128_CRTC_OFFSET_CNTL );
@@ -809,7 +812,7 @@ static int r128_do_init_pageflip( drm_de
 int r128_do_cleanup_pageflip( drm_device_t *dev )
 {
 	drm_r128_private_t *dev_priv = dev->dev_private;
-	DRM_DEBUG( "\n" );
+	DRM_DEBUG( "%s\n", __FUNCTION__ );
 
 	R128_WRITE( R128_CRTC_OFFSET,      dev_priv->crtc_offset );
 	R128_WRITE( R128_CRTC_OFFSET_CNTL, dev_priv->crtc_offset_cntl );
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/r128_drm.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/r128_drm.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/r128_drm.h	2003-07-30 13:51:23.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/r128_drm.h	2001-08-08 18:42:15.000000000 +0200
@@ -170,27 +170,6 @@ typedef struct drm_r128_sarea {
 /* WARNING: If you change any of these defines, make sure to change the
  * defines in the Xserver file (xf86drmR128.h)
  */
-
-/* Rage 128 specific ioctls
- * The device specific ioctl range is 0x40 to 0x79.
- */
-#define DRM_IOCTL_R128_INIT		DRM_IOW( 0x40, drm_r128_init_t)
-#define DRM_IOCTL_R128_CCE_START	DRM_IO(  0x41)
-#define DRM_IOCTL_R128_CCE_STOP		DRM_IOW( 0x42, drm_r128_cce_stop_t)
-#define DRM_IOCTL_R128_CCE_RESET	DRM_IO(  0x43)
-#define DRM_IOCTL_R128_CCE_IDLE		DRM_IO(  0x44)
-#define DRM_IOCTL_R128_RESET		DRM_IO(  0x46)
-#define DRM_IOCTL_R128_SWAP		DRM_IO(  0x47)
-#define DRM_IOCTL_R128_CLEAR		DRM_IOW( 0x48, drm_r128_clear_t)
-#define DRM_IOCTL_R128_VERTEX		DRM_IOW( 0x49, drm_r128_vertex_t)
-#define DRM_IOCTL_R128_INDICES		DRM_IOW( 0x4a, drm_r128_indices_t)
-#define DRM_IOCTL_R128_BLIT		DRM_IOW( 0x4b, drm_r128_blit_t)
-#define DRM_IOCTL_R128_DEPTH		DRM_IOW( 0x4c, drm_r128_depth_t)
-#define DRM_IOCTL_R128_STIPPLE		DRM_IOW( 0x4d, drm_r128_stipple_t)
-#define DRM_IOCTL_R128_INDIRECT		DRM_IOWR(0x4f, drm_r128_indirect_t)
-#define DRM_IOCTL_R128_FULLSCREEN	DRM_IOW( 0x50, drm_r128_fullscreen_t)
-#define DRM_IOCTL_R128_CLEAR2		DRM_IOW( 0x51, drm_r128_clear2_t)
-
 typedef struct drm_r128_init {
 	enum {
 		R128_INIT_CCE    = 0x01,
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/r128_drv.c linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/r128_drv.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/r128_drv.c	2003-07-30 13:51:23.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/r128_drv.c	2002-12-18 01:03:52.000000000 +0100
@@ -32,11 +32,48 @@
 #include <linux/config.h>
 #include "r128.h"
 #include "drmP.h"
-#include "drm.h"
-#include "r128_drm.h"
 #include "r128_drv.h"
 #include "ati_pcigart.h"
 
+#define DRIVER_AUTHOR		"Gareth Hughes, VA Linux Systems Inc."
+
+#define DRIVER_NAME		"r128"
+#define DRIVER_DESC		"ATI Rage 128"
+#define DRIVER_DATE		"20010917"
+
+#define DRIVER_MAJOR		2
+#define DRIVER_MINOR		2
+#define DRIVER_PATCHLEVEL	0
+
+#define DRIVER_IOCTLS							    \
+   [DRM_IOCTL_NR(DRM_IOCTL_DMA)]             = { r128_cce_buffers,  1, 0 }, \
+   [DRM_IOCTL_NR(DRM_IOCTL_R128_INIT)]       = { r128_cce_init,     1, 1 }, \
+   [DRM_IOCTL_NR(DRM_IOCTL_R128_CCE_START)]  = { r128_cce_start,    1, 1 }, \
+   [DRM_IOCTL_NR(DRM_IOCTL_R128_CCE_STOP)]   = { r128_cce_stop,     1, 1 }, \
+   [DRM_IOCTL_NR(DRM_IOCTL_R128_CCE_RESET)]  = { r128_cce_reset,    1, 1 }, \
+   [DRM_IOCTL_NR(DRM_IOCTL_R128_CCE_IDLE)]   = { r128_cce_idle,     1, 0 }, \
+   [DRM_IOCTL_NR(DRM_IOCTL_R128_RESET)]      = { r128_engine_reset, 1, 0 }, \
+   [DRM_IOCTL_NR(DRM_IOCTL_R128_FULLSCREEN)] = { r128_fullscreen,   1, 0 }, \
+   [DRM_IOCTL_NR(DRM_IOCTL_R128_SWAP)]       = { r128_cce_swap,     1, 0 }, \
+   [DRM_IOCTL_NR(DRM_IOCTL_R128_CLEAR)]      = { r128_cce_clear,    1, 0 }, \
+   [DRM_IOCTL_NR(DRM_IOCTL_R128_VERTEX)]     = { r128_cce_vertex,   1, 0 }, \
+   [DRM_IOCTL_NR(DRM_IOCTL_R128_INDICES)]    = { r128_cce_indices,  1, 0 }, \
+   [DRM_IOCTL_NR(DRM_IOCTL_R128_BLIT)]       = { r128_cce_blit,     1, 0 }, \
+   [DRM_IOCTL_NR(DRM_IOCTL_R128_DEPTH)]      = { r128_cce_depth,    1, 0 }, \
+   [DRM_IOCTL_NR(DRM_IOCTL_R128_STIPPLE)]    = { r128_cce_stipple,  1, 0 }, \
+   [DRM_IOCTL_NR(DRM_IOCTL_R128_INDIRECT)]   = { r128_cce_indirect, 1, 1 },
+
+
+#if 0
+/* GH: Count data sent to card via ring or vertex/indirect buffers.
+ */
+#define __HAVE_COUNTERS         3
+#define __HAVE_COUNTER6         _DRM_STAT_IRQ
+#define __HAVE_COUNTER7         _DRM_STAT_PRIMARY
+#define __HAVE_COUNTER8         _DRM_STAT_SECONDARY
+#endif
+
+
 #include "drm_agpsupport.h"
 #include "drm_auth.h"
 #include "drm_bufs.h"
@@ -44,6 +81,26 @@
 #include "drm_dma.h"
 #include "drm_drawable.h"
 #include "drm_drv.h"
+
+#ifndef MODULE
+/* DRM(options) is called by the kernel to parse command-line options
+ * passed via the boot-loader (e.g., LILO).  It calls the insmod option
+ * routine, drm_parse_drm.
+ */
+
+/* JH- We have to hand expand the string ourselves because of the cpp.  If
+ * anyone can think of a way that we can fit into the __setup macro without
+ * changing it, then please send the solution my way.
+ */
+static int __init r128_options( char *str )
+{
+	DRM(parse_options)( str );
+	return 1;
+}
+
+__setup( DRIVER_NAME "=", r128_options );
+#endif
+
 #include "drm_fops.h"
 #include "drm_init.h"
 #include "drm_ioctl.h"
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/r128_drv.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/r128_drv.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/r128_drv.h	2003-07-30 13:51:23.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/r128_drv.h	2002-12-18 01:03:52.000000000 +0100
@@ -33,10 +33,9 @@
 
 #ifndef __R128_DRV_H__
 #define __R128_DRV_H__
-#include <asm/delay.h>
 
-#define GET_RING_HEAD(ring)		readl(  (volatile u32 *) (ring)->head )
-#define SET_RING_HEAD(ring,val)		writel( (val), (volatile u32 *) (ring)->head )
+#define GET_RING_HEAD( ring )		le32_to_cpu( *(ring)->head )
+#define SET_RING_HEAD( ring, val )	*(ring)->head = cpu_to_le32( val )
 
 typedef struct drm_r128_freelist {
    	unsigned int age;
@@ -385,11 +384,44 @@ extern int r128_cce_indirect( struct ino
 #define R128_BASE(reg)		((unsigned long)(dev_priv->mmio->handle))
 #define R128_ADDR(reg)		(R128_BASE( reg ) + reg)
 
-#define R128_READ(reg)		readl(  (volatile u32 *) R128_ADDR(reg) )
-#define R128_WRITE(reg,val)	writel( (val) , (volatile u32 *) R128_ADDR(reg))
+#define R128_DEREF(reg)		*(volatile u32 *)R128_ADDR( reg )
+#ifdef __alpha__
+#define R128_READ(reg)		(_R128_READ((u32 *)R128_ADDR(reg)))
+static inline u32 _R128_READ(u32 *addr)
+{
+	mb();
+	return *(volatile u32 *)addr;
+}
+#define R128_WRITE(reg,val)						\
+do {									\
+	wmb();								\
+	R128_DEREF(reg) = val;						\
+} while (0)
+#else
+#define R128_READ(reg)		le32_to_cpu( R128_DEREF( reg ) )
+#define R128_WRITE(reg,val)						\
+do {									\
+	R128_DEREF( reg ) = cpu_to_le32( val );				\
+} while (0)
+#endif
 
-#define R128_READ8(reg)		readb(  (volatile u8 *) R128_ADDR(reg) )
-#define R128_WRITE8(reg,val)	writeb( (val), (volatile u8 *) R128_ADDR(reg) )
+#define R128_DEREF8(reg)	*(volatile u8 *)R128_ADDR( reg )
+#ifdef __alpha__
+#define R128_READ8(reg)		_R128_READ8((u8 *)R128_ADDR(reg))
+static inline u8 _R128_READ8(u8 *addr)
+{
+	mb();
+	return *(volatile u8 *)addr;
+}
+#define R128_WRITE8(reg,val)						\
+do {									\
+	wmb();								\
+	R128_DEREF8(reg) = val;						\
+} while (0)
+#else
+#define R128_READ8(reg)		R128_DEREF8( reg )
+#define R128_WRITE8(reg,val)	do { R128_DEREF8( reg ) = val; } while (0)
+#endif
 
 #define R128_WRITE_PLL(addr,val)					\
 do {									\
@@ -438,7 +470,6 @@ do {									\
 		return -EBUSY;						\
 	}								\
  __ring_space_done: ;							\
-  break;								\
 } while (0)
 
 #define VB_AGE_TEST_WITH_RETURN( dev_priv )				\
@@ -462,11 +493,7 @@ do {									\
  * Ring control
  */
 
-#if defined(__powerpc__)
-#define r128_flush_write_combine()	(void) GET_RING_HEAD( &dev_priv->ring )
-#else
 #define r128_flush_write_combine()	mb()
-#endif
 
 
 #define R128_VERBOSE	0
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/r128_state.c linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/r128_state.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/r128_state.c	2003-07-30 13:51:23.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/r128_state.c	2002-12-18 01:03:52.000000000 +0100
@@ -29,9 +29,9 @@
 
 #include "r128.h"
 #include "drmP.h"
-#include "drm.h"
-#include "r128_drm.h"
 #include "r128_drv.h"
+#include "drm.h"
+#include <linux/delay.h>
 
 
 /* ================================================================
@@ -528,7 +528,7 @@ static void r128_cce_dispatch_flip( drm_
 {
 	drm_r128_private_t *dev_priv = dev->dev_private;
 	RING_LOCALS;
-	DRM_DEBUG( "page=%d\n", dev_priv->current_page );
+	DRM_DEBUG( "%s: page=%d\n", __FUNCTION__, dev_priv->current_page );
 
 #if R128_PERFORMANCE_BOXES
 	/* Do some trivial performance monitoring...
@@ -577,7 +577,8 @@ static void r128_cce_dispatch_vertex( dr
 	int prim = buf_priv->prim;
 	int i = 0;
 	RING_LOCALS;
-	DRM_DEBUG( "buf=%d nbox=%d\n", buf->idx, sarea_priv->nbox );
+	DRM_DEBUG( "%s: buf=%d nbox=%d\n",
+		   __FUNCTION__, buf->idx, sarea_priv->nbox );
 
 	if ( 0 )
 		r128_print_dirty( "dispatch_vertex", sarea_priv->dirty );
@@ -788,7 +789,7 @@ static int r128_cce_dispatch_blit( drm_d
 	u32 *data;
 	int dword_shift, dwords;
 	RING_LOCALS;
-	DRM_DEBUG( "\n" );
+	DRM_DEBUG( "%s\n", __FUNCTION__ );
 
 	/* The compiler won't optimize away a division by a variable,
 	 * even if the only legal values are powers of two.  Thus, we'll
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/radeon.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/radeon.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/radeon.h	2003-07-30 13:51:23.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/radeon.h	2003-07-30 11:12:58.000000000 +0200
@@ -44,78 +44,7 @@
 #define __HAVE_SG		1
 #define __HAVE_PCI_DMA		1
 
-#define DRIVER_AUTHOR		"Gareth Hughes, Keith Whitwell, others."
-
-#define DRIVER_NAME		"radeon"
-#define DRIVER_DESC		"ATI Radeon"
-#define DRIVER_DATE		"20020828"
-
-#define DRIVER_MAJOR		1
-#define DRIVER_MINOR		7
-#define DRIVER_PATCHLEVEL	0
-
-/* Interface history:
- *
- * 1.1 - ??
- * 1.2 - Add vertex2 ioctl (keith)
- *     - Add stencil capability to clear ioctl (gareth, keith)
- *     - Increase MAX_TEXTURE_LEVELS (brian)
- * 1.3 - Add cmdbuf ioctl (keith)
- *     - Add support for new radeon packets (keith)
- *     - Add getparam ioctl (keith)
- *     - Add flip-buffers ioctl, deprecate fullscreen foo (keith).
- * 1.4 - Add scratch registers to get_param ioctl.
- * 1.5 - Add r200 packets to cmdbuf ioctl
- *     - Add r200 function to init ioctl
- *     - Add 'scalar2' instruction to cmdbuf
- * 1.6 - Add static agp memory manager
- *       Add irq handler (won't be turned on unless X server knows to)
- *       Add irq ioctls and irq_active getparam.
- *       Add wait command for cmdbuf ioctl
- *       Add agp offset query for getparam
- * 1.7 - Add support for cube map registers: R200_PP_CUBIC_FACES_[0..5]
- *       and R200_PP_CUBIC_OFFSET_F1_[0..5].
- *       Added packets R200_EMIT_PP_CUBIC_FACES_[0..5] and
- *       R200_EMIT_PP_CUBIC_OFFSETS_[0..5].  (brian)
- */
-#define DRIVER_IOCTLS							     \
- [DRM_IOCTL_NR(DRM_IOCTL_DMA)]               = { radeon_cp_buffers,  1, 0 }, \
- [DRM_IOCTL_NR(DRM_IOCTL_RADEON_CP_INIT)]    = { radeon_cp_init,     1, 1 }, \
- [DRM_IOCTL_NR(DRM_IOCTL_RADEON_CP_START)]   = { radeon_cp_start,    1, 1 }, \
- [DRM_IOCTL_NR(DRM_IOCTL_RADEON_CP_STOP)]    = { radeon_cp_stop,     1, 1 }, \
- [DRM_IOCTL_NR(DRM_IOCTL_RADEON_CP_RESET)]   = { radeon_cp_reset,    1, 1 }, \
- [DRM_IOCTL_NR(DRM_IOCTL_RADEON_CP_IDLE)]    = { radeon_cp_idle,     1, 0 }, \
- [DRM_IOCTL_NR(DRM_IOCTL_RADEON_RESET)]    = { radeon_engine_reset,  1, 0 }, \
- [DRM_IOCTL_NR(DRM_IOCTL_RADEON_FULLSCREEN)] = { radeon_fullscreen,  1, 0 }, \
- [DRM_IOCTL_NR(DRM_IOCTL_RADEON_SWAP)]       = { radeon_cp_swap,     1, 0 }, \
- [DRM_IOCTL_NR(DRM_IOCTL_RADEON_CLEAR)]      = { radeon_cp_clear,    1, 0 }, \
- [DRM_IOCTL_NR(DRM_IOCTL_RADEON_VERTEX)]     = { radeon_cp_vertex,   1, 0 }, \
- [DRM_IOCTL_NR(DRM_IOCTL_RADEON_INDICES)]    = { radeon_cp_indices,  1, 0 }, \
- [DRM_IOCTL_NR(DRM_IOCTL_RADEON_TEXTURE)]    = { radeon_cp_texture,  1, 0 }, \
- [DRM_IOCTL_NR(DRM_IOCTL_RADEON_STIPPLE)]    = { radeon_cp_stipple,  1, 0 }, \
- [DRM_IOCTL_NR(DRM_IOCTL_RADEON_INDIRECT)]   = { radeon_cp_indirect, 1, 1 }, \
- [DRM_IOCTL_NR(DRM_IOCTL_RADEON_VERTEX2)]    = { radeon_cp_vertex2,  1, 0 }, \
- [DRM_IOCTL_NR(DRM_IOCTL_RADEON_CMDBUF)]     = { radeon_cp_cmdbuf,   1, 0 }, \
- [DRM_IOCTL_NR(DRM_IOCTL_RADEON_GETPARAM)]   = { radeon_cp_getparam, 1, 0 }, \
- [DRM_IOCTL_NR(DRM_IOCTL_RADEON_FLIP)]       = { radeon_cp_flip,     1, 0 }, \
- [DRM_IOCTL_NR(DRM_IOCTL_RADEON_ALLOC)]      = { radeon_mem_alloc,   1, 0 }, \
- [DRM_IOCTL_NR(DRM_IOCTL_RADEON_FREE)]       = { radeon_mem_free,    1, 0 }, \
- [DRM_IOCTL_NR(DRM_IOCTL_RADEON_INIT_HEAP)]  = { radeon_mem_init_heap, 1, 1 }, \
- [DRM_IOCTL_NR(DRM_IOCTL_RADEON_IRQ_EMIT)]   = { radeon_irq_emit, 1, 0 }, \
- [DRM_IOCTL_NR(DRM_IOCTL_RADEON_IRQ_WAIT)]   = { radeon_irq_wait, 1, 0 },
-
-
-#define USE_IRQS 1
-#if USE_IRQS
-#define __HAVE_DMA_IRQ		1
-#define __HAVE_VBL_IRQ		1
-#define __HAVE_SHARED_IRQ       1
-
-/* When a client dies:
- *    - Check for and clean up flipped page state
- *    - Free any alloced agp memory.
- *
- * DRM infrastructure takes care of reclaiming dma buffers.
+/* Driver customization:
  */
 #define DRIVER_PRERELEASE() do {					\
 	if ( dev->dev_private ) {					\
@@ -123,36 +52,31 @@
 		if ( dev_priv->page_flipping ) {			\
 			radeon_do_cleanup_pageflip( dev );		\
 		}							\
-                radeon_mem_release( dev_priv->agp_heap );		\
 	}								\
 } while (0)
 
-/* On unloading the module:
- *    - Free memory heap structure
- *    - Remove mappings made at startup and free dev_private.
- */
 #define DRIVER_PRETAKEDOWN() do {					\
-	if ( dev->dev_private ) {					\
-		drm_radeon_private_t *dev_priv = dev->dev_private;	\
-		radeon_mem_takedown( &(dev_priv->agp_heap) );		\
-		radeon_do_cleanup_cp( dev );				\
-	}								\
+	if ( dev->dev_private ) radeon_do_cleanup_cp( dev );		\
 } while (0)
 
-#else
-#define __HAVE_DMA_IRQ 0
-#endif
-
 /* DMA customization:
  */
 #define __HAVE_DMA		1
 
+#if 0
+/* GH: Remove this for now... */
+#define __HAVE_DMA_QUIESCENT	1
+#define DRIVER_DMA_QUIESCENT() do {					\
+	drm_radeon_private_t *dev_priv = dev->dev_private;		\
+	return radeon_do_cp_idle( dev_priv );				\
+} while (0)
+#endif
 
 /* Buffer customization:
  */
 #define DRIVER_BUF_PRIV_T	drm_radeon_buf_priv_t
 
-#define DRIVER_AGP_BUFFERS_MAP( dev )				\
+#define DRIVER_AGP_BUFFERS_MAP( dev )					\
 	((drm_radeon_private_t *)((dev)->dev_private))->buffers
 
 #endif
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/radeon_cp.c linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/radeon_cp.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/radeon_cp.c	2003-07-30 13:51:23.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/radeon_cp.c	2002-12-18 01:03:52.000000000 +0100
@@ -30,16 +30,14 @@
 
 #include "radeon.h"
 #include "drmP.h"
-#include "drm.h"
-#include "radeon_drm.h"
 #include "radeon_drv.h"
-#include "drm_os_linux.h"
 
 #include <linux/interrupt.h>	/* For task queue support */
 #include <linux/delay.h>
+
 #define RADEON_FIFO_DEBUG	0
 
-#if defined(__alpha__) || defined(__powerpc__) || defined(__i386__)
+#if defined(__alpha__)
 # define PCIGART_ENABLED
 #else
 # undef PCIGART_ENABLED
@@ -47,266 +45,6 @@
 
 
 /* CP microcode (from ATI) */
-static u32 R200_cp_microcode[][2] = {
-	{ 0x21007000, 0000000000 },        
-	{ 0x20007000, 0000000000 }, 
-	{ 0x000000ab, 0x00000004 },
-	{ 0x000000af, 0x00000004 },
-	{ 0x66544a49, 0000000000 },
-	{ 0x49494174, 0000000000 },
-	{ 0x54517d83, 0000000000 },
-	{ 0x498d8b64, 0000000000 },
-	{ 0x49494949, 0000000000 },
-	{ 0x49da493c, 0000000000 },
-	{ 0x49989898, 0000000000 },
-	{ 0xd34949d5, 0000000000 },
-	{ 0x9dc90e11, 0000000000 },
-	{ 0xce9b9b9b, 0000000000 },
-	{ 0x000f0000, 0x00000016 },
-	{ 0x352e232c, 0000000000 },
-	{ 0x00000013, 0x00000004 },
-	{ 0x000f0000, 0x00000016 },
-	{ 0x352e272c, 0000000000 },
-	{ 0x000f0001, 0x00000016 },
-	{ 0x3239362f, 0000000000 },
-	{ 0x000077ef, 0x00000002 },
-	{ 0x00061000, 0x00000002 },
-	{ 0x00000020, 0x0000001a },
-	{ 0x00004000, 0x0000001e },
-	{ 0x00061000, 0x00000002 },
-	{ 0x00000020, 0x0000001a },
-	{ 0x00004000, 0x0000001e },
-	{ 0x00061000, 0x00000002 },
-	{ 0x00000020, 0x0000001a },
-	{ 0x00004000, 0x0000001e },
-	{ 0x00000016, 0x00000004 },
-	{ 0x0003802a, 0x00000002 },
-	{ 0x040067e0, 0x00000002 },
-	{ 0x00000016, 0x00000004 },
-	{ 0x000077e0, 0x00000002 },
-	{ 0x00065000, 0x00000002 },
-	{ 0x000037e1, 0x00000002 },
-	{ 0x040067e1, 0x00000006 },
-	{ 0x000077e0, 0x00000002 },
-	{ 0x000077e1, 0x00000002 },
-	{ 0x000077e1, 0x00000006 },
-	{ 0xffffffff, 0000000000 },
-	{ 0x10000000, 0000000000 },
-	{ 0x0003802a, 0x00000002 },
-	{ 0x040067e0, 0x00000006 },
-	{ 0x00007675, 0x00000002 },
-	{ 0x00007676, 0x00000002 },
-	{ 0x00007677, 0x00000002 },
-	{ 0x00007678, 0x00000006 },
-	{ 0x0003802b, 0x00000002 },
-	{ 0x04002676, 0x00000002 },
-	{ 0x00007677, 0x00000002 },
-	{ 0x00007678, 0x00000006 },
-	{ 0x0000002e, 0x00000018 },
-	{ 0x0000002e, 0x00000018 },
-	{ 0000000000, 0x00000006 },
-	{ 0x0000002f, 0x00000018 },
-	{ 0x0000002f, 0x00000018 },
-	{ 0000000000, 0x00000006 },
-	{ 0x01605000, 0x00000002 },
-	{ 0x00065000, 0x00000002 },
-	{ 0x00098000, 0x00000002 },
-	{ 0x00061000, 0x00000002 },
-	{ 0x64c0603d, 0x00000004 },
-	{ 0x00080000, 0x00000016 },
-	{ 0000000000, 0000000000 },
-	{ 0x0400251d, 0x00000002 },
-	{ 0x00007580, 0x00000002 },
-	{ 0x00067581, 0x00000002 },
-	{ 0x04002580, 0x00000002 },
-	{ 0x00067581, 0x00000002 },
-	{ 0x00000046, 0x00000004 },
-	{ 0x00005000, 0000000000 },
-	{ 0x00061000, 0x00000002 },
-	{ 0x0000750e, 0x00000002 },
-	{ 0x00019000, 0x00000002 },
-	{ 0x00011055, 0x00000014 },
-	{ 0x00000055, 0x00000012 },
-	{ 0x0400250f, 0x00000002 },
-	{ 0x0000504a, 0x00000004 },
-	{ 0x00007565, 0x00000002 },
-	{ 0x00007566, 0x00000002 },
-	{ 0x00000051, 0x00000004 },
-	{ 0x01e655b4, 0x00000002 },
-	{ 0x4401b0dc, 0x00000002 },
-	{ 0x01c110dc, 0x00000002 },
-	{ 0x2666705d, 0x00000018 },
-	{ 0x040c2565, 0x00000002 },
-	{ 0x0000005d, 0x00000018 },
-	{ 0x04002564, 0x00000002 },
-	{ 0x00007566, 0x00000002 },
-	{ 0x00000054, 0x00000004 },
-	{ 0x00401060, 0x00000008 },
-	{ 0x00101000, 0x00000002 },
-	{ 0x000d80ff, 0x00000002 },
-	{ 0x00800063, 0x00000008 },
-	{ 0x000f9000, 0x00000002 },
-	{ 0x000e00ff, 0x00000002 },
-	{ 0000000000, 0x00000006 },
-	{ 0x00000080, 0x00000018 },
-	{ 0x00000054, 0x00000004 },
-	{ 0x00007576, 0x00000002 },
-	{ 0x00065000, 0x00000002 },
-	{ 0x00009000, 0x00000002 },
-	{ 0x00041000, 0x00000002 },
-	{ 0x0c00350e, 0x00000002 },
-	{ 0x00049000, 0x00000002 },
-	{ 0x00051000, 0x00000002 },
-	{ 0x01e785f8, 0x00000002 },
-	{ 0x00200000, 0x00000002 },
-	{ 0x00600073, 0x0000000c },
-	{ 0x00007563, 0x00000002 },
-	{ 0x006075f0, 0x00000021 },
-	{ 0x20007068, 0x00000004 },
-	{ 0x00005068, 0x00000004 },
-	{ 0x00007576, 0x00000002 },
-	{ 0x00007577, 0x00000002 },
-	{ 0x0000750e, 0x00000002 },
-	{ 0x0000750f, 0x00000002 },
-	{ 0x00a05000, 0x00000002 },
-	{ 0x00600076, 0x0000000c },
-	{ 0x006075f0, 0x00000021 },
-	{ 0x000075f8, 0x00000002 },
-	{ 0x00000076, 0x00000004 },
-	{ 0x000a750e, 0x00000002 },
-	{ 0x0020750f, 0x00000002 },
-	{ 0x00600079, 0x00000004 },
-	{ 0x00007570, 0x00000002 },
-	{ 0x00007571, 0x00000002 },
-	{ 0x00007572, 0x00000006 },
-	{ 0x00005000, 0x00000002 },
-	{ 0x00a05000, 0x00000002 },
-	{ 0x00007568, 0x00000002 },
-	{ 0x00061000, 0x00000002 },
-	{ 0x00000084, 0x0000000c },
-	{ 0x00058000, 0x00000002 },
-	{ 0x0c607562, 0x00000002 },
-	{ 0x00000086, 0x00000004 },
-	{ 0x00600085, 0x00000004 },
-	{ 0x400070dd, 0000000000 },
-	{ 0x000380dd, 0x00000002 },
-	{ 0x00000093, 0x0000001c },
-	{ 0x00065095, 0x00000018 },
-	{ 0x040025bb, 0x00000002 },
-	{ 0x00061096, 0x00000018 },
-	{ 0x040075bc, 0000000000 },
-	{ 0x000075bb, 0x00000002 },
-	{ 0x000075bc, 0000000000 },
-	{ 0x00090000, 0x00000006 },
-	{ 0x00090000, 0x00000002 },
-	{ 0x000d8002, 0x00000006 },
-	{ 0x00005000, 0x00000002 },
-	{ 0x00007821, 0x00000002 },
-	{ 0x00007800, 0000000000 },
-	{ 0x00007821, 0x00000002 },
-	{ 0x00007800, 0000000000 },
-	{ 0x01665000, 0x00000002 },
-	{ 0x000a0000, 0x00000002 },
-	{ 0x000671cc, 0x00000002 },
-	{ 0x0286f1cd, 0x00000002 },
-	{ 0x000000a3, 0x00000010 },
-	{ 0x21007000, 0000000000 },
-	{ 0x000000aa, 0x0000001c },
-	{ 0x00065000, 0x00000002 },
-	{ 0x000a0000, 0x00000002 },
-	{ 0x00061000, 0x00000002 },
-	{ 0x000b0000, 0x00000002 },
-	{ 0x38067000, 0x00000002 },
-	{ 0x000a00a6, 0x00000004 },
-	{ 0x20007000, 0000000000 },
-	{ 0x01200000, 0x00000002 },
-	{ 0x20077000, 0x00000002 },
-	{ 0x01200000, 0x00000002 },
-	{ 0x20007000, 0000000000 },
-	{ 0x00061000, 0x00000002 },
-	{ 0x0120751b, 0x00000002 },
-	{ 0x8040750a, 0x00000002 },
-	{ 0x8040750b, 0x00000002 },
-	{ 0x00110000, 0x00000002 },
-	{ 0x000380dd, 0x00000002 },
-	{ 0x000000bd, 0x0000001c },
-	{ 0x00061096, 0x00000018 },
-	{ 0x844075bd, 0x00000002 },
-	{ 0x00061095, 0x00000018 },
-	{ 0x840075bb, 0x00000002 },
-	{ 0x00061096, 0x00000018 },
-	{ 0x844075bc, 0x00000002 },
-	{ 0x000000c0, 0x00000004 },
-	{ 0x804075bd, 0x00000002 },
-	{ 0x800075bb, 0x00000002 },
-	{ 0x804075bc, 0x00000002 },
-	{ 0x00108000, 0x00000002 },
-	{ 0x01400000, 0x00000002 },
-	{ 0x006000c4, 0x0000000c },
-	{ 0x20c07000, 0x00000020 },
-	{ 0x000000c6, 0x00000012 },
-	{ 0x00800000, 0x00000006 },
-	{ 0x0080751d, 0x00000006 },
-	{ 0x000025bb, 0x00000002 },
-	{ 0x000040c0, 0x00000004 },
-	{ 0x0000775c, 0x00000002 },
-	{ 0x00a05000, 0x00000002 },
-	{ 0x00661000, 0x00000002 },
-	{ 0x0460275d, 0x00000020 },
-	{ 0x00004000, 0000000000 },
-	{ 0x00007999, 0x00000002 },
-	{ 0x00a05000, 0x00000002 },
-	{ 0x00661000, 0x00000002 },
-	{ 0x0460299b, 0x00000020 },
-	{ 0x00004000, 0000000000 },
-	{ 0x01e00830, 0x00000002 },
-	{ 0x21007000, 0000000000 },
-	{ 0x00005000, 0x00000002 },
-	{ 0x00038042, 0x00000002 },
-	{ 0x040025e0, 0x00000002 },
-	{ 0x000075e1, 0000000000 },
-	{ 0x00000001, 0000000000 },
-	{ 0x000380d9, 0x00000002 },
-	{ 0x04007394, 0000000000 },
-	{ 0000000000, 0000000000 },
-	{ 0000000000, 0000000000 },
-	{ 0000000000, 0000000000 },
-	{ 0000000000, 0000000000 },
-	{ 0000000000, 0000000000 },
-	{ 0000000000, 0000000000 },
-	{ 0000000000, 0000000000 },
-	{ 0000000000, 0000000000 },
-	{ 0000000000, 0000000000 },
-	{ 0000000000, 0000000000 },
-	{ 0000000000, 0000000000 },
-	{ 0000000000, 0000000000 },
-	{ 0000000000, 0000000000 },
-	{ 0000000000, 0000000000 },
-	{ 0000000000, 0000000000 },
-	{ 0000000000, 0000000000 },
-	{ 0000000000, 0000000000 },
-	{ 0000000000, 0000000000 },
-	{ 0000000000, 0000000000 },
-	{ 0000000000, 0000000000 },
-	{ 0000000000, 0000000000 },
-	{ 0000000000, 0000000000 },
-	{ 0000000000, 0000000000 },
-	{ 0000000000, 0000000000 },
-	{ 0000000000, 0000000000 },
-	{ 0000000000, 0000000000 },
-	{ 0000000000, 0000000000 },
-	{ 0000000000, 0000000000 },
-	{ 0000000000, 0000000000 },
-	{ 0000000000, 0000000000 },
-	{ 0000000000, 0000000000 },
-	{ 0000000000, 0000000000 },
-	{ 0000000000, 0000000000 },
-	{ 0000000000, 0000000000 },
-	{ 0000000000, 0000000000 },
-	{ 0000000000, 0000000000 },
-};
-
-
 static u32 radeon_cp_microcode[][2] = {
 	{ 0x21007000, 0000000000 },
 	{ 0x20007000, 0000000000 },
@@ -608,8 +346,6 @@ static int radeon_do_pixcache_flush( drm
 	u32 tmp;
 	int i;
 
-	dev_priv->stats.boxes |= RADEON_BOX_WAIT_IDLE;
-
 	tmp  = RADEON_READ( RADEON_RB2D_DSTCACHE_CTLSTAT );
 	tmp |= RADEON_RB2D_DC_FLUSH_ALL;
 	RADEON_WRITE( RADEON_RB2D_DSTCACHE_CTLSTAT, tmp );
@@ -634,8 +370,6 @@ static int radeon_do_wait_for_fifo( drm_
 {
 	int i;
 
-	dev_priv->stats.boxes |= RADEON_BOX_WAIT_IDLE;
-
 	for ( i = 0 ; i < dev_priv->usec_timeout ; i++ ) {
 		int slots = ( RADEON_READ( RADEON_RBBM_STATUS )
 			      & RADEON_RBBM_FIFOCNT_MASK );
@@ -654,10 +388,8 @@ static int radeon_do_wait_for_idle( drm_
 {
 	int i, ret;
 
-	dev_priv->stats.boxes |= RADEON_BOX_WAIT_IDLE;
-
 	ret = radeon_do_wait_for_fifo( dev_priv, 64 );
-	if ( ret ) return ret;
+	if ( ret < 0 ) return ret;
 
 	for ( i = 0 ; i < dev_priv->usec_timeout ; i++ ) {
 		if ( !(RADEON_READ( RADEON_RBBM_STATUS )
@@ -684,31 +416,16 @@ static int radeon_do_wait_for_idle( drm_
 static void radeon_cp_load_microcode( drm_radeon_private_t *dev_priv )
 {
 	int i;
-	DRM_DEBUG( "\n" );
+	DRM_DEBUG( "%s\n", __FUNCTION__ );
 
 	radeon_do_wait_for_idle( dev_priv );
 
 	RADEON_WRITE( RADEON_CP_ME_RAM_ADDR, 0 );
-
-	if (dev_priv->is_r200)
-	{
-		DRM_INFO("Loading R200 Microcode\n");
-		for ( i = 0 ; i < 256 ; i++ ) 
-		{
-			RADEON_WRITE( RADEON_CP_ME_RAM_DATAH,
-				      R200_cp_microcode[i][1] );
-			RADEON_WRITE( RADEON_CP_ME_RAM_DATAL,
-				      R200_cp_microcode[i][0] );
-		}
-	}
-	else
-	{
-		for ( i = 0 ; i < 256 ; i++ ) {
-			RADEON_WRITE( RADEON_CP_ME_RAM_DATAH,
-				      radeon_cp_microcode[i][1] );
-			RADEON_WRITE( RADEON_CP_ME_RAM_DATAL,
-				      radeon_cp_microcode[i][0] );
-		}
+	for ( i = 0 ; i < 256 ; i++ ) {
+		RADEON_WRITE( RADEON_CP_ME_RAM_DATAH,
+			      radeon_cp_microcode[i][1] );
+		RADEON_WRITE( RADEON_CP_ME_RAM_DATAL,
+			      radeon_cp_microcode[i][0] );
 	}
 }
 
@@ -718,7 +435,7 @@ static void radeon_cp_load_microcode( dr
  */
 static void radeon_do_cp_flush( drm_radeon_private_t *dev_priv )
 {
-	DRM_DEBUG( "\n" );
+	DRM_DEBUG( "%s\n", __FUNCTION__ );
 #if 0
 	u32 tmp;
 
@@ -732,7 +449,7 @@ static void radeon_do_cp_flush( drm_rade
 int radeon_do_cp_idle( drm_radeon_private_t *dev_priv )
 {
 	RING_LOCALS;
-	DRM_DEBUG( "\n" );
+	DRM_DEBUG( "%s\n", __FUNCTION__ );
 
 	BEGIN_RING( 6 );
 
@@ -741,7 +458,6 @@ int radeon_do_cp_idle( drm_radeon_privat
 	RADEON_WAIT_UNTIL_IDLE();
 
 	ADVANCE_RING();
-	COMMIT_RING();
 
 	return radeon_do_wait_for_idle( dev_priv );
 }
@@ -751,7 +467,7 @@ int radeon_do_cp_idle( drm_radeon_privat
 static void radeon_do_cp_start( drm_radeon_private_t *dev_priv )
 {
 	RING_LOCALS;
-	DRM_DEBUG( "\n" );
+	DRM_DEBUG( "%s\n", __FUNCTION__ );
 
 	radeon_do_wait_for_idle( dev_priv );
 
@@ -766,7 +482,6 @@ static void radeon_do_cp_start( drm_rade
 	RADEON_WAIT_UNTIL_IDLE();
 
 	ADVANCE_RING();
-	COMMIT_RING();
 }
 
 /* Reset the Command Processor.  This will not flush any pending
@@ -776,7 +491,7 @@ static void radeon_do_cp_start( drm_rade
 static void radeon_do_cp_reset( drm_radeon_private_t *dev_priv )
 {
 	u32 cur_read_ptr;
-	DRM_DEBUG( "\n" );
+	DRM_DEBUG( "%s\n", __FUNCTION__ );
 
 	cur_read_ptr = RADEON_READ( RADEON_CP_RB_RPTR );
 	RADEON_WRITE( RADEON_CP_RB_WPTR, cur_read_ptr );
@@ -790,7 +505,7 @@ static void radeon_do_cp_reset( drm_rade
  */
 static void radeon_do_cp_stop( drm_radeon_private_t *dev_priv )
 {
-	DRM_DEBUG( "\n" );
+	DRM_DEBUG( "%s\n", __FUNCTION__ );
 
 	RADEON_WRITE( RADEON_CP_CSQ_CNTL, RADEON_CSQ_PRIDIS_INDDIS );
 
@@ -803,7 +518,7 @@ static int radeon_do_engine_reset( drm_d
 {
 	drm_radeon_private_t *dev_priv = dev->dev_private;
 	u32 clock_cntl_index, mclk_cntl, rbbm_soft_reset;
-	DRM_DEBUG( "\n" );
+	DRM_DEBUG( "%s\n", __FUNCTION__ );
 
 	radeon_do_pixcache_flush( dev_priv );
 
@@ -888,7 +603,6 @@ static void radeon_cp_init_ring_buffer( 
 
 	/* Set the write pointer delay */
 	RADEON_WRITE( RADEON_CP_RB_WPTR_DELAY, 0 );
-	RADEON_READ( RADEON_CP_RB_WPTR_DELAY ); /* read back to propagate */
 
 	/* Initialize the ring buffer's read and write pointers */
 	cur_read_ptr = RADEON_READ( RADEON_CP_RB_RPTR );
@@ -908,63 +622,13 @@ static void radeon_cp_init_ring_buffer( 
 
 		RADEON_WRITE( RADEON_CP_RB_RPTR_ADDR,
 			     entry->busaddr[page_ofs]);
-		DRM_DEBUG( "ring rptr: offset=0x%08x handle=0x%08lx\n",
-			   entry->busaddr[page_ofs],
+		DRM_DEBUG( "ring rptr: offset=0x%08llx handle=0x%08lx\n",
+			   (u64)entry->busaddr[page_ofs],
 			   entry->handle + tmp_ofs );
 	}
 
-	/* Initialize the scratch register pointer.  This will cause
-	 * the scratch register values to be written out to memory
-	 * whenever they are updated.
-	 *
-	 * We simply put this behind the ring read pointer, this works
-	 * with PCI GART as well as (whatever kind of) AGP GART
-	 */
-	RADEON_WRITE( RADEON_SCRATCH_ADDR, RADEON_READ( RADEON_CP_RB_RPTR_ADDR )
-					 + RADEON_SCRATCH_REG_OFFSET );
-
-	dev_priv->scratch = ((__volatile__ u32 *)
-			     dev_priv->ring.head +
-			     (RADEON_SCRATCH_REG_OFFSET / sizeof(u32)));
-
-	RADEON_WRITE( RADEON_SCRATCH_UMSK, 0x7 );
-
-	/* Writeback doesn't seem to work everywhere, test it first */
-	writel(0, &dev_priv->scratch[1]);
-	RADEON_WRITE( RADEON_SCRATCH_REG1, 0xdeadbeef );
-
-	for ( tmp = 0 ; tmp < dev_priv->usec_timeout ; tmp++ ) {
-		if ( readl( &dev_priv->scratch[1] ) == 0xdeadbeef )
-			break;
-		udelay(1);
-	}
-
-	if ( tmp < dev_priv->usec_timeout ) {
-		dev_priv->writeback_works = 1;
-		DRM_DEBUG( "writeback test succeeded, tmp=%d\n", tmp );
-	} else {
-		dev_priv->writeback_works = 0;
-		DRM_DEBUG( "writeback test failed\n" );
-	}
-
-	dev_priv->sarea_priv->last_frame = dev_priv->scratch[0] = 0;
-	RADEON_WRITE( RADEON_LAST_FRAME_REG,
-		      dev_priv->sarea_priv->last_frame );
-
-	dev_priv->sarea_priv->last_dispatch = dev_priv->scratch[1] = 0;
-	RADEON_WRITE( RADEON_LAST_DISPATCH_REG,
-		      dev_priv->sarea_priv->last_dispatch );
-
-	dev_priv->sarea_priv->last_clear = dev_priv->scratch[2] = 0;
-	RADEON_WRITE( RADEON_LAST_CLEAR_REG,
-		      dev_priv->sarea_priv->last_clear );
-
 	/* Set ring buffer size */
-#ifdef __BIG_ENDIAN
-	RADEON_WRITE( RADEON_CP_RB_CNTL, dev_priv->ring.size_l2qw | RADEON_BUF_SWAP_32BIT );
-#else
 	RADEON_WRITE( RADEON_CP_RB_CNTL, dev_priv->ring.size_l2qw );
-#endif
 
 	radeon_do_wait_for_idle( dev_priv );
 
@@ -983,8 +647,9 @@ static void radeon_cp_init_ring_buffer( 
 static int radeon_do_init_cp( drm_device_t *dev, drm_radeon_init_t *init )
 {
 	drm_radeon_private_t *dev_priv;
+	struct list_head *list;
 	u32 tmp;
-	DRM_DEBUG( "\n" );
+	DRM_DEBUG( "%s\n", __FUNCTION__ );
 
 	dev_priv = DRM(alloc)( sizeof(drm_radeon_private_t), DRM_MEM_DRIVER );
 	if ( dev_priv == NULL )
@@ -1021,10 +686,12 @@ static int radeon_do_init_cp( drm_device
 		return -EINVAL;
 	}
 
-	dev_priv->is_r200 = (init->func == RADEON_INIT_R200_CP);
-	dev_priv->do_boxes = 0;
 	dev_priv->cp_mode = init->cp_mode;
 
+	/* Simple idle check.
+	 */
+	atomic_set( &dev_priv->idle_count, 0 );
+
 	/* We don't support anything other than bus-mastering ring mode,
 	 * but the ring can be in either AGP or PCI space for the ring
 	 * read pointer.
@@ -1076,17 +743,17 @@ static int radeon_do_init_cp( drm_device
 	 * and screwing with the clear operation.
 	 */
 	dev_priv->depth_clear.rb3d_cntl = (RADEON_PLANE_MASK_ENABLE |
+					   RADEON_Z_ENABLE |
 					   (dev_priv->color_fmt << 10) |
-					   (1<<15));
+					   RADEON_ZBLOCK16);
 
-	dev_priv->depth_clear.rb3d_zstencilcntl = 
-		(dev_priv->depth_fmt |
-		 RADEON_Z_TEST_ALWAYS |
-		 RADEON_STENCIL_TEST_ALWAYS |
-		 RADEON_STENCIL_S_FAIL_REPLACE |
-		 RADEON_STENCIL_ZPASS_REPLACE |
-		 RADEON_STENCIL_ZFAIL_REPLACE |
-		 RADEON_Z_WRITE_ENABLE);
+	dev_priv->depth_clear.rb3d_zstencilcntl = (dev_priv->depth_fmt |
+						   RADEON_Z_TEST_ALWAYS |
+						   RADEON_STENCIL_TEST_ALWAYS |
+						   RADEON_STENCIL_S_FAIL_KEEP |
+						   RADEON_STENCIL_ZPASS_KEEP |
+						   RADEON_STENCIL_ZFAIL_KEEP |
+						   RADEON_Z_WRITE_ENABLE);
 
 	dev_priv->depth_clear.se_cntl = (RADEON_FFACE_CULL_CW |
 					 RADEON_BFACE_SOLID |
@@ -1100,8 +767,15 @@ static int radeon_do_init_cp( drm_device
 					 RADEON_ROUND_MODE_TRUNC |
 					 RADEON_ROUND_PREC_8TH_PIX);
 
-	DRM_GETSAREA();
-	
+	list_for_each(list, &dev->maplist->head) {
+		drm_map_list_t *r_list = (drm_map_list_t *)list;
+		if( r_list->map &&
+		    r_list->map->type == _DRM_SHM &&
+		    r_list->map->flags & _DRM_CONTAINS_LOCK ) {
+			dev_priv->sarea = r_list->map;
+ 			break;
+ 		}
+ 	}
 	if(!dev_priv->sarea) {
 		DRM_ERROR("could not find sarea!\n");
 		dev->dev_private = (void *)dev_priv;
@@ -1222,7 +896,34 @@ static int radeon_do_init_cp( drm_device
 
 	dev_priv->ring.high_mark = RADEON_RING_HIGH_MARK;
 
-#if __REALLY_HAVE_SG
+#if 0
+	/* Initialize the scratch register pointer.  This will cause
+	 * the scratch register values to be written out to memory
+	 * whenever they are updated.
+	 * FIXME: This doesn't quite work yet, so we're disabling it
+	 * for the release.
+	 */
+	RADEON_WRITE( RADEON_SCRATCH_ADDR, (dev_priv->ring_rptr->offset +
+					    RADEON_SCRATCH_REG_OFFSET) );
+	RADEON_WRITE( RADEON_SCRATCH_UMSK, 0x7 );
+#endif
+
+	dev_priv->scratch = ((__volatile__ u32 *)
+			     dev_priv->ring_rptr->handle +
+			     (RADEON_SCRATCH_REG_OFFSET / sizeof(u32)));
+
+	dev_priv->sarea_priv->last_frame = 0;
+	RADEON_WRITE( RADEON_LAST_FRAME_REG,
+		      dev_priv->sarea_priv->last_frame );
+
+	dev_priv->sarea_priv->last_dispatch = 0;
+	RADEON_WRITE( RADEON_LAST_DISPATCH_REG,
+		      dev_priv->sarea_priv->last_dispatch );
+
+	dev_priv->sarea_priv->last_clear = 0;
+	RADEON_WRITE( RADEON_LAST_CLEAR_REG,
+		      dev_priv->sarea_priv->last_clear );
+
 	if ( dev_priv->is_pci ) {
 		if (!DRM(ati_pcigart_init)( dev, &dev_priv->phys_pci_gart,
 					    &dev_priv->bus_pci_gart)) {
@@ -1252,20 +953,19 @@ static int radeon_do_init_cp( drm_device
 		RADEON_WRITE( RADEON_MC_AGP_LOCATION, 0xffffffc0 ); /* ?? */
 		RADEON_WRITE( RADEON_AGP_COMMAND, 0 ); /* clear AGP_COMMAND */
 	} else {
-#endif /* __REALLY_HAVE_SG */
 		/* Turn off PCI GART
 		 */
 		tmp = RADEON_READ( RADEON_AIC_CNTL )
 		      & ~RADEON_PCIGART_TRANSLATE_EN;
 		RADEON_WRITE( RADEON_AIC_CNTL, tmp );
-#if __REALLY_HAVE_SG
 	}
-#endif /* __REALLY_HAVE_SG */
 
 	radeon_cp_load_microcode( dev_priv );
 	radeon_cp_init_ring_buffer( dev, dev_priv );
 
+#if ROTATE_BUFS
 	dev_priv->last_buf = 0;
+#endif
 
 	dev->dev_private = (void *)dev_priv;
 
@@ -1276,7 +976,7 @@ static int radeon_do_init_cp( drm_device
 
 int radeon_do_cleanup_cp( drm_device_t *dev )
 {
-	DRM_DEBUG( "\n" );
+	DRM_DEBUG( "%s\n", __FUNCTION__ );
 
 	if ( dev->dev_private ) {
 		drm_radeon_private_t *dev_priv = dev->dev_private;
@@ -1286,12 +986,10 @@ int radeon_do_cleanup_cp( drm_device_t *
 			DRM_IOREMAPFREE( dev_priv->ring_rptr );
 			DRM_IOREMAPFREE( dev_priv->buffers );
 		} else {
-#if __REALLY_HAVE_SG
 			if (!DRM(ati_pcigart_cleanup)( dev,
 						dev_priv->phys_pci_gart,
 						dev_priv->bus_pci_gart ))
 				DRM_ERROR( "failed to cleanup PCI GART!\n" );
-#endif /* __REALLY_HAVE_SG */
 		}
 
 		DRM(free)( dev->dev_private, sizeof(drm_radeon_private_t),
@@ -1314,7 +1012,6 @@ int radeon_cp_init( struct inode *inode,
 
 	switch ( init.func ) {
 	case RADEON_INIT_CP:
-	case RADEON_INIT_R200_CP:
 		return radeon_do_init_cp( dev, &init );
 	case RADEON_CLEANUP_CP:
 		return radeon_do_cleanup_cp( dev );
@@ -1378,7 +1075,7 @@ int radeon_cp_stop( struct inode *inode,
 	 */
 	if ( stop.idle ) {
 		ret = radeon_do_cp_idle( dev_priv );
-		if ( ret ) return ret;
+		if ( ret < 0 ) return ret;
 	}
 
 	/* Finally, we can turn off the CP.  If the engine isn't idle,
@@ -1448,74 +1145,117 @@ int radeon_engine_reset( struct inode *i
  * Fullscreen mode
  */
 
-/* KW: Deprecated to say the least:
- */
-int radeon_fullscreen(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long data)
+static int radeon_do_init_pageflip( drm_device_t *dev )
 {
+	drm_radeon_private_t *dev_priv = dev->dev_private;
+	DRM_DEBUG( "%s\n", __FUNCTION__ );
+
+	dev_priv->crtc_offset =      RADEON_READ( RADEON_CRTC_OFFSET );
+	dev_priv->crtc_offset_cntl = RADEON_READ( RADEON_CRTC_OFFSET_CNTL );
+
+	RADEON_WRITE( RADEON_CRTC_OFFSET, dev_priv->front_offset );
+	RADEON_WRITE( RADEON_CRTC_OFFSET_CNTL,
+		      dev_priv->crtc_offset_cntl |
+		      RADEON_CRTC_OFFSET_FLIP_CNTL );
+
+	dev_priv->page_flipping = 1;
+	dev_priv->current_page = 0;
+
 	return 0;
 }
 
+int radeon_do_cleanup_pageflip( drm_device_t *dev )
+{
+	drm_radeon_private_t *dev_priv = dev->dev_private;
+	DRM_DEBUG( "%s\n", __FUNCTION__ );
+
+	RADEON_WRITE( RADEON_CRTC_OFFSET,      dev_priv->crtc_offset );
+	RADEON_WRITE( RADEON_CRTC_OFFSET_CNTL, dev_priv->crtc_offset_cntl );
+
+	dev_priv->page_flipping = 0;
+	dev_priv->current_page = 0;
+
+	return 0;
+}
+
+int radeon_fullscreen( struct inode *inode, struct file *filp,
+		       unsigned int cmd, unsigned long arg )
+{
+        drm_file_t *priv = filp->private_data;
+        drm_device_t *dev = priv->dev;
+	drm_radeon_fullscreen_t fs;
+
+	LOCK_TEST_WITH_RETURN( dev );
+
+	if ( copy_from_user( &fs, (drm_radeon_fullscreen_t *)arg,
+			     sizeof(fs) ) )
+		return -EFAULT;
+
+	switch ( fs.func ) {
+	case RADEON_INIT_FULLSCREEN:
+		return radeon_do_init_pageflip( dev );
+	case RADEON_CLEANUP_FULLSCREEN:
+		return radeon_do_cleanup_pageflip( dev );
+	}
+
+	return -EINVAL;
+}
+
 
 /* ================================================================
  * Freelist management
  */
+#define RADEON_BUFFER_USED	0xffffffff
+#define RADEON_BUFFER_FREE	0
 
-/* Original comment: FIXME: ROTATE_BUFS is a hack to cycle through
- *   bufs until freelist code is used.  Note this hides a problem with
- *   the scratch register * (used to keep track of last buffer
- *   completed) being written to before * the last buffer has actually
- *   completed rendering.  
- *
- * KW:  It's also a good way to find free buffers quickly.
- *
- * KW: Ideally this loop wouldn't exist, and freelist_get wouldn't
- * sleep.  However, bugs in older versions of radeon_accel.c mean that
- * we essentially have to do this, else old clients will break.
- * 
- * However, it does leave open a potential deadlock where all the
- * buffers are held by other clients, which can't release them because
- * they can't get the lock.  
- */
-
-drm_buf_t *radeon_freelist_get( drm_device_t *dev )
+#if 0
+static int radeon_freelist_init( drm_device_t *dev )
 {
 	drm_device_dma_t *dma = dev->dma;
 	drm_radeon_private_t *dev_priv = dev->dev_private;
-	drm_radeon_buf_priv_t *buf_priv;
 	drm_buf_t *buf;
-	int i, t;
-	int start;
+	drm_radeon_buf_priv_t *buf_priv;
+	drm_radeon_freelist_t *entry;
+	int i;
 
-	if ( ++dev_priv->last_buf >= dma->buf_count )
-		dev_priv->last_buf = 0;
+	dev_priv->head = DRM(alloc)( sizeof(drm_radeon_freelist_t),
+				     DRM_MEM_DRIVER );
+	if ( dev_priv->head == NULL )
+		return -ENOMEM;
 
-	start = dev_priv->last_buf;
+	memset( dev_priv->head, 0, sizeof(drm_radeon_freelist_t) );
+	dev_priv->head->age = RADEON_BUFFER_USED;
 
-	for ( t = 0 ; t < dev_priv->usec_timeout ; t++ ) {
-		u32 done_age = GET_SCRATCH( 1 );
-		DRM_DEBUG("done_age = %d\n",done_age);
-		for ( i = start ; i < dma->buf_count ; i++ ) {
-			buf = dma->buflist[i];
-			buf_priv = buf->dev_private;
-			if ( buf->pid == 0 || (buf->pending && 
-					       buf_priv->age <= done_age) ) {
-				dev_priv->stats.requested_bufs++;
-				buf->pending = 0;
-				return buf;
-			}
-			start = 0;
-		}
+	for ( i = 0 ; i < dma->buf_count ; i++ ) {
+		buf = dma->buflist[i];
+		buf_priv = buf->dev_private;
 
-		if (t) {
-			udelay(1);
-			dev_priv->stats.freelist_loops++;
-		}
+		entry = DRM(alloc)( sizeof(drm_radeon_freelist_t),
+				    DRM_MEM_DRIVER );
+		if ( !entry ) return -ENOMEM;
+
+		entry->age = RADEON_BUFFER_FREE;
+		entry->buf = buf;
+		entry->prev = dev_priv->head;
+		entry->next = dev_priv->head->next;
+		if ( !entry->next )
+			dev_priv->tail = entry;
+
+		buf_priv->discard = 0;
+		buf_priv->dispatched = 0;
+		buf_priv->list_entry = entry;
+
+		dev_priv->head->next = entry;
+
+		if ( dev_priv->head->next )
+			dev_priv->head->next->prev = entry;
 	}
 
-	DRM_ERROR( "returning NULL!\n" );
-	return NULL;
+	return 0;
+
 }
-#if 0
+#endif
+
 drm_buf_t *radeon_freelist_get( drm_device_t *dev )
 {
 	drm_device_dma_t *dma = dev->dma;
@@ -1523,40 +1263,76 @@ drm_buf_t *radeon_freelist_get( drm_devi
 	drm_radeon_buf_priv_t *buf_priv;
 	drm_buf_t *buf;
 	int i, t;
+#if ROTATE_BUFS
 	int start;
-	u32 done_age = readl(&dev_priv->scratch[1]);
+#endif
+
+	/* FIXME: Optimize -- use freelist code */
 
+	for ( i = 0 ; i < dma->buf_count ; i++ ) {
+		buf = dma->buflist[i];
+		buf_priv = buf->dev_private;
+		if ( buf->pid == 0 ) {
+			DRM_DEBUG( "  ret buf=%d last=%d pid=0\n",
+				   buf->idx, dev_priv->last_buf );
+			return buf;
+		}
+		DRM_DEBUG( "    skipping buf=%d pid=%d\n",
+			   buf->idx, buf->pid );
+	}
+
+#if ROTATE_BUFS
 	if ( ++dev_priv->last_buf >= dma->buf_count )
 		dev_priv->last_buf = 0;
-
 	start = dev_priv->last_buf;
-	dev_priv->stats.freelist_loops++;
-	
-	for ( t = 0 ; t < 2 ; t++ ) {
+#endif
+	for ( t = 0 ; t < dev_priv->usec_timeout ; t++ ) {
+#if 0
+		/* FIXME: Disable this for now */
+		u32 done_age = dev_priv->scratch[RADEON_LAST_DISPATCH];
+#else
+		u32 done_age = RADEON_READ( RADEON_LAST_DISPATCH_REG );
+#endif
+#if ROTATE_BUFS
 		for ( i = start ; i < dma->buf_count ; i++ ) {
+#else
+		for ( i = 0 ; i < dma->buf_count ; i++ ) {
+#endif
 			buf = dma->buflist[i];
 			buf_priv = buf->dev_private;
-			if ( buf->pid == 0 || (buf->pending && 
-					       buf_priv->age <= done_age) ) {
-				dev_priv->stats.requested_bufs++;
+			if ( buf->pending && buf_priv->age <= done_age ) {
+				/* The buffer has been processed, so it
+				 * can now be used.
+				 */
 				buf->pending = 0;
+				DRM_DEBUG( "  ret buf=%d last=%d age=%d done=%d\n", buf->idx, dev_priv->last_buf, buf_priv->age, done_age );
 				return buf;
 			}
+			DRM_DEBUG( "    skipping buf=%d age=%d done=%d\n",
+				   buf->idx, buf_priv->age,
+				   done_age );
+#if ROTATE_BUFS
+			start = 0;
+#endif
 		}
-		start = 0;
+		udelay( 1 );
 	}
 
+	DRM_ERROR( "returning NULL!\n" );
 	return NULL;
 }
-#endif
 
 void radeon_freelist_reset( drm_device_t *dev )
 {
 	drm_device_dma_t *dma = dev->dma;
+#if ROTATE_BUFS
 	drm_radeon_private_t *dev_priv = dev->dev_private;
+#endif
 	int i;
 
+#if ROTATE_BUFS
 	dev_priv->last_buf = 0;
+#endif
 	for ( i = 0 ; i < dma->buf_count ; i++ ) {
 		drm_buf_t *buf = dma->buflist[i];
 		drm_radeon_buf_priv_t *buf_priv = buf->dev_private;
@@ -1573,23 +1349,11 @@ int radeon_wait_ring( drm_radeon_private
 {
 	drm_radeon_ring_buffer_t *ring = &dev_priv->ring;
 	int i;
-	u32 last_head = GET_RING_HEAD(ring);
 
 	for ( i = 0 ; i < dev_priv->usec_timeout ; i++ ) {
-		u32 head = GET_RING_HEAD(ring);
-
-		ring->space = (head - ring->tail) * sizeof(u32);
-		if ( ring->space <= 0 )
-			ring->space += ring->size;
+		radeon_update_ring_snapshot( ring );
 		if ( ring->space > n )
 			return 0;
-		
-		dev_priv->stats.boxes |= RADEON_BOX_WAIT_IDLE;
-
-		if (head != last_head)
-			i = 0;
-		last_head = head;
-
 		udelay( 1 );
 	}
 
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/radeon_drm.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/radeon_drm.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/radeon_drm.h	2003-07-30 13:51:23.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/radeon_drm.h	2001-08-08 18:42:15.000000000 +0200
@@ -2,7 +2,6 @@
  *
  * Copyright 2000 Precision Insight, Inc., Cedar Park, Texas.
  * Copyright 2000 VA Linux Systems, Inc., Fremont, California.
- * Copyright 2002 Tungsten Graphics, Inc., Cedar Park, Texas.
  * All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -27,7 +26,6 @@
  * Authors:
  *    Kevin E. Martin <martin@valinux.com>
  *    Gareth Hughes <gareth@valinux.com>
- *    Keith Whitwell <keith@tungstengraphics.com>
  */
 
 #ifndef __RADEON_DRM_H__
@@ -39,8 +37,7 @@
 #ifndef __RADEON_SAREA_DEFINES__
 #define __RADEON_SAREA_DEFINES__
 
-/* Old style state flags, required for sarea interface (1.1 and 1.2
- * clears) and 1.2 drm_vertex2 ioctl.
+/* What needs to be changed for the current vertex buffer?
  */
 #define RADEON_UPLOAD_CONTEXT		0x00000001
 #define RADEON_UPLOAD_VERTFMT		0x00000002
@@ -59,136 +56,11 @@
 #define RADEON_UPLOAD_TEX2IMAGES	0x00004000
 #define RADEON_UPLOAD_CLIPRECTS		0x00008000 /* handled client-side */
 #define RADEON_REQUIRE_QUIESCENCE	0x00010000
-#define RADEON_UPLOAD_ZBIAS		0x00020000 /* version 1.2 and newer */
-#define RADEON_UPLOAD_ALL		0x003effff
-#define RADEON_UPLOAD_CONTEXT_ALL       0x003e01ff
-
-
-/* New style per-packet identifiers for use in cmd_buffer ioctl with
- * the RADEON_EMIT_PACKET command.  Comments relate new packets to old
- * state bits and the packet size:
- */
-#define RADEON_EMIT_PP_MISC                         0 /* context/7 */
-#define RADEON_EMIT_PP_CNTL                         1 /* context/3 */
-#define RADEON_EMIT_RB3D_COLORPITCH                 2 /* context/1 */
-#define RADEON_EMIT_RE_LINE_PATTERN                 3 /* line/2 */
-#define RADEON_EMIT_SE_LINE_WIDTH                   4 /* line/1 */
-#define RADEON_EMIT_PP_LUM_MATRIX                   5 /* bumpmap/1 */
-#define RADEON_EMIT_PP_ROT_MATRIX_0                 6 /* bumpmap/2 */
-#define RADEON_EMIT_RB3D_STENCILREFMASK             7 /* masks/3 */
-#define RADEON_EMIT_SE_VPORT_XSCALE                 8 /* viewport/6 */
-#define RADEON_EMIT_SE_CNTL                         9 /* setup/2 */
-#define RADEON_EMIT_SE_CNTL_STATUS                  10 /* setup/1 */
-#define RADEON_EMIT_RE_MISC                         11 /* misc/1 */
-#define RADEON_EMIT_PP_TXFILTER_0                   12 /* tex0/6 */
-#define RADEON_EMIT_PP_BORDER_COLOR_0               13 /* tex0/1 */
-#define RADEON_EMIT_PP_TXFILTER_1                   14 /* tex1/6 */
-#define RADEON_EMIT_PP_BORDER_COLOR_1               15 /* tex1/1 */
-#define RADEON_EMIT_PP_TXFILTER_2                   16 /* tex2/6 */
-#define RADEON_EMIT_PP_BORDER_COLOR_2               17 /* tex2/1 */
-#define RADEON_EMIT_SE_ZBIAS_FACTOR                 18 /* zbias/2 */
-#define RADEON_EMIT_SE_TCL_OUTPUT_VTX_FMT           19 /* tcl/11 */
-#define RADEON_EMIT_SE_TCL_MATERIAL_EMMISSIVE_RED   20 /* material/17 */
-#define R200_EMIT_PP_TXCBLEND_0                     21 /* tex0/4 */
-#define R200_EMIT_PP_TXCBLEND_1                     22 /* tex1/4 */
-#define R200_EMIT_PP_TXCBLEND_2                     23 /* tex2/4 */
-#define R200_EMIT_PP_TXCBLEND_3                     24 /* tex3/4 */
-#define R200_EMIT_PP_TXCBLEND_4                     25 /* tex4/4 */
-#define R200_EMIT_PP_TXCBLEND_5                     26 /* tex5/4 */
-#define R200_EMIT_PP_TXCBLEND_6                     27 /* /4 */
-#define R200_EMIT_PP_TXCBLEND_7                     28 /* /4 */
-#define R200_EMIT_TCL_LIGHT_MODEL_CTL_0             29 /* tcl/7 */
-#define R200_EMIT_TFACTOR_0                         30 /* tf/7 */
-#define R200_EMIT_VTX_FMT_0                         31 /* vtx/5 */
-#define R200_EMIT_VAP_CTL                           32 /* vap/1 */
-#define R200_EMIT_MATRIX_SELECT_0                   33 /* msl/5 */
-#define R200_EMIT_TEX_PROC_CTL_2                    34 /* tcg/5 */
-#define R200_EMIT_TCL_UCP_VERT_BLEND_CTL            35 /* tcl/1 */
-#define R200_EMIT_PP_TXFILTER_0                     36 /* tex0/6 */
-#define R200_EMIT_PP_TXFILTER_1                     37 /* tex1/6 */
-#define R200_EMIT_PP_TXFILTER_2                     38 /* tex2/6 */
-#define R200_EMIT_PP_TXFILTER_3                     39 /* tex3/6 */
-#define R200_EMIT_PP_TXFILTER_4                     40 /* tex4/6 */
-#define R200_EMIT_PP_TXFILTER_5                     41 /* tex5/6 */
-#define R200_EMIT_PP_TXOFFSET_0                     42 /* tex0/1 */
-#define R200_EMIT_PP_TXOFFSET_1                     43 /* tex1/1 */
-#define R200_EMIT_PP_TXOFFSET_2                     44 /* tex2/1 */
-#define R200_EMIT_PP_TXOFFSET_3                     45 /* tex3/1 */
-#define R200_EMIT_PP_TXOFFSET_4                     46 /* tex4/1 */
-#define R200_EMIT_PP_TXOFFSET_5                     47 /* tex5/1 */
-#define R200_EMIT_VTE_CNTL                          48 /* vte/1 */
-#define R200_EMIT_OUTPUT_VTX_COMP_SEL               49 /* vtx/1 */
-#define R200_EMIT_PP_TAM_DEBUG3                     50 /* tam/1 */
-#define R200_EMIT_PP_CNTL_X                         51 /* cst/1 */
-#define R200_EMIT_RB3D_DEPTHXY_OFFSET               52 /* cst/1 */
-#define R200_EMIT_RE_AUX_SCISSOR_CNTL               53 /* cst/1 */
-#define R200_EMIT_RE_SCISSOR_TL_0                   54 /* cst/2 */
-#define R200_EMIT_RE_SCISSOR_TL_1                   55 /* cst/2 */
-#define R200_EMIT_RE_SCISSOR_TL_2                   56 /* cst/2 */
-#define R200_EMIT_SE_VAP_CNTL_STATUS                57 /* cst/1 */
-#define R200_EMIT_SE_VTX_STATE_CNTL                 58 /* cst/1 */
-#define R200_EMIT_RE_POINTSIZE                      59 /* cst/1 */
-#define R200_EMIT_TCL_INPUT_VTX_VECTOR_ADDR_0       60 /* cst/4 */
-#define R200_EMIT_PP_CUBIC_FACES_0                  61
-#define R200_EMIT_PP_CUBIC_OFFSETS_0                62
-#define R200_EMIT_PP_CUBIC_FACES_1                  63
-#define R200_EMIT_PP_CUBIC_OFFSETS_1                64
-#define R200_EMIT_PP_CUBIC_FACES_2                  65
-#define R200_EMIT_PP_CUBIC_OFFSETS_2                66
-#define R200_EMIT_PP_CUBIC_FACES_3                  67
-#define R200_EMIT_PP_CUBIC_OFFSETS_3                68
-#define R200_EMIT_PP_CUBIC_FACES_4                  69
-#define R200_EMIT_PP_CUBIC_OFFSETS_4                70
-#define R200_EMIT_PP_CUBIC_FACES_5                  71
-#define R200_EMIT_PP_CUBIC_OFFSETS_5                72
-#define RADEON_MAX_STATE_PACKETS                    73
-
-
-/* Commands understood by cmd_buffer ioctl.  More can be added but
- * obviously these can't be removed or changed:
- */
-#define RADEON_CMD_PACKET      1 /* emit one of the register packets above */
-#define RADEON_CMD_SCALARS     2 /* emit scalar data */
-#define RADEON_CMD_VECTORS     3 /* emit vector data */
-#define RADEON_CMD_DMA_DISCARD 4 /* discard current dma buf */
-#define RADEON_CMD_PACKET3     5 /* emit hw packet */
-#define RADEON_CMD_PACKET3_CLIP 6 /* emit hw packet wrapped in cliprects */
-#define RADEON_CMD_SCALARS2     7 /* r200 stopgap */
-#define RADEON_CMD_WAIT         8 /* emit hw wait commands -- note:
-				   *  doesn't make the cpu wait, just
-				   *  the graphics hardware */
-
-
-typedef union {
-	int i;
-	struct { 
-		unsigned char cmd_type, pad0, pad1, pad2;
-	} header;
-	struct { 
-		unsigned char cmd_type, packet_id, pad0, pad1;
-	} packet;
-	struct { 
-		unsigned char cmd_type, offset, stride, count; 
-	} scalars;
-	struct { 
-		unsigned char cmd_type, offset, stride, count; 
-	} vectors;
-	struct { 
-		unsigned char cmd_type, buf_idx, pad0, pad1; 
-	} dma;
-	struct { 
-		unsigned char cmd_type, flags, pad0, pad1; 
-	} wait;
-} drm_radeon_cmd_header_t;
-
-#define RADEON_WAIT_2D  0x1
-#define RADEON_WAIT_3D  0x2
-
+#define RADEON_UPLOAD_ALL		0x0001ffff
 
 #define RADEON_FRONT			0x1
 #define RADEON_BACK			0x2
 #define RADEON_DEPTH			0x4
-#define RADEON_STENCIL                  0x8
 
 /* Primitive types
  */
@@ -206,9 +78,12 @@ typedef union {
 /* Byte offsets for indirect buffer data
  */
 #define RADEON_INDEX_PRIM_OFFSET	20
+#define RADEON_HOSTDATA_BLIT_OFFSET	32
 
 #define RADEON_SCRATCH_REG_OFFSET	32
 
+/* Keep these small for testing
+ */
 #define RADEON_NR_SAREA_CLIPRECTS	12
 
 /* There are 2 heaps (local/AGP).  Each region within a heap is a
@@ -220,7 +95,7 @@ typedef union {
 #define RADEON_NR_TEX_REGIONS		64
 #define RADEON_LOG_TEX_GRANULARITY	16
 
-#define RADEON_MAX_TEXTURE_LEVELS	12
+#define RADEON_MAX_TEXTURE_LEVELS	11
 #define RADEON_MAX_TEXTURE_UNITS	3
 
 #endif /* __RADEON_SAREA_DEFINES__ */
@@ -280,18 +155,28 @@ typedef struct {
 	/* Setup state */
 	unsigned int se_cntl_status;			/* 0x2140 */
 
+#ifdef TCL_ENABLE
+	/* TCL state */
+	radeon_color_regs_t se_tcl_material_emmissive;	/* 0x2210 */
+	radeon_color_regs_t se_tcl_material_ambient;
+	radeon_color_regs_t se_tcl_material_diffuse;
+	radeon_color_regs_t se_tcl_material_specular;
+	unsigned int se_tcl_shininess;
+	unsigned int se_tcl_output_vtx_fmt;
+	unsigned int se_tcl_output_vtx_sel;
+	unsigned int se_tcl_matrix_select_0;
+	unsigned int se_tcl_matrix_select_1;
+	unsigned int se_tcl_ucp_vert_blend_ctl;
+	unsigned int se_tcl_texture_proc_ctl;
+	unsigned int se_tcl_light_model_ctl;
+	unsigned int se_tcl_per_light_ctl[4];
+#endif
+
 	/* Misc state */
 	unsigned int re_top_left;			/* 0x26c0 */
 	unsigned int re_misc;
 } drm_radeon_context_regs_t;
 
-typedef struct {
-	/* Zbias state */
-	unsigned int se_zbias_factor;			/* 0x1dac */
-	unsigned int se_zbias_constant;
-} drm_radeon_context2_regs_t;
-
-
 /* Setup registers for each texture unit
  */
 typedef struct {
@@ -301,26 +186,14 @@ typedef struct {
 	unsigned int pp_txcblend;
 	unsigned int pp_txablend;
 	unsigned int pp_tfactor;
-	unsigned int pp_border_color;
-} drm_radeon_texture_regs_t;
 
-typedef struct {
-	unsigned int start;
-	unsigned int finish;
-	unsigned int prim:8;
-	unsigned int stateidx:8;
-	unsigned int numverts:16; /* overloaded as offset/64 for elt prims */
-        unsigned int vc_format;   /* vertex format */
-} drm_radeon_prim_t;
-
-
-typedef struct {
-	drm_radeon_context_regs_t context;
-	drm_radeon_texture_regs_t tex[RADEON_MAX_TEXTURE_UNITS];
-	drm_radeon_context2_regs_t context2;
-	unsigned int dirty;
-} drm_radeon_state_t;
+	unsigned int pp_border_color;
 
+#ifdef CUBIC_ENABLE
+	unsigned int pp_cubic_faces;
+	unsigned int pp_cubic_offset[5];
+#endif
+} drm_radeon_texture_regs_t;
 
 typedef struct {
 	unsigned char next, prev;
@@ -329,9 +202,8 @@ typedef struct {
 } drm_radeon_tex_region_t;
 
 typedef struct {
-	/* The channel for communication of state information to the
-	 * kernel on firing a vertex buffer with either of the
-	 * obsoleted vertex/index ioctls.
+	/* The channel for communication of state information to the kernel
+	 * on firing a vertex buffer.
 	 */
 	drm_radeon_context_regs_t context_state;
 	drm_radeon_texture_regs_t tex_state[RADEON_MAX_TEXTURE_UNITS];
@@ -353,50 +225,16 @@ typedef struct {
 	drm_radeon_tex_region_t tex_list[RADEON_NR_TEX_HEAPS][RADEON_NR_TEX_REGIONS+1];
 	int tex_age[RADEON_NR_TEX_HEAPS];
 	int ctx_owner;
-        int pfState;                /* number of 3d windows (0,1,2ormore) */
-        int pfCurrentPage;	    /* which buffer is being displayed? */
-	int crtc2_base;		    /* CRTC2 frame offset */
 } drm_radeon_sarea_t;
 
 
 /* WARNING: If you change any of these defines, make sure to change the
  * defines in the Xserver file (xf86drmRadeon.h)
- *
- * KW: actually it's illegal to change any of this (backwards compatibility).
  */
-
-/* Radeon specific ioctls
- * The device specific ioctl range is 0x40 to 0x79.
- */
-#define DRM_IOCTL_RADEON_CP_INIT    DRM_IOW( 0x40, drm_radeon_init_t)
-#define DRM_IOCTL_RADEON_CP_START   DRM_IO(  0x41)
-#define DRM_IOCTL_RADEON_CP_STOP    DRM_IOW( 0x42, drm_radeon_cp_stop_t)
-#define DRM_IOCTL_RADEON_CP_RESET   DRM_IO(  0x43)
-#define DRM_IOCTL_RADEON_CP_IDLE    DRM_IO(  0x44)
-#define DRM_IOCTL_RADEON_RESET      DRM_IO(  0x45)
-#define DRM_IOCTL_RADEON_FULLSCREEN DRM_IOW( 0x46, drm_radeon_fullscreen_t)
-#define DRM_IOCTL_RADEON_SWAP       DRM_IO(  0x47)
-#define DRM_IOCTL_RADEON_CLEAR      DRM_IOW( 0x48, drm_radeon_clear_t)
-#define DRM_IOCTL_RADEON_VERTEX     DRM_IOW( 0x49, drm_radeon_vertex_t)
-#define DRM_IOCTL_RADEON_INDICES    DRM_IOW( 0x4a, drm_radeon_indices_t)
-#define DRM_IOCTL_RADEON_STIPPLE    DRM_IOW( 0x4c, drm_radeon_stipple_t)
-#define DRM_IOCTL_RADEON_INDIRECT   DRM_IOWR(0x4d, drm_radeon_indirect_t)
-#define DRM_IOCTL_RADEON_TEXTURE    DRM_IOWR(0x4e, drm_radeon_texture_t)
-#define DRM_IOCTL_RADEON_VERTEX2    DRM_IOW( 0x4f, drm_radeon_vertex2_t)
-#define DRM_IOCTL_RADEON_CMDBUF     DRM_IOW( 0x50, drm_radeon_cmd_buffer_t)
-#define DRM_IOCTL_RADEON_GETPARAM   DRM_IOWR(0x51, drm_radeon_getparam_t)
-#define DRM_IOCTL_RADEON_FLIP	    DRM_IO(  0x52)
-#define DRM_IOCTL_RADEON_ALLOC      DRM_IOWR( 0x53, drm_radeon_mem_alloc_t)
-#define DRM_IOCTL_RADEON_FREE       DRM_IOW( 0x54, drm_radeon_mem_free_t)
-#define DRM_IOCTL_RADEON_INIT_HEAP  DRM_IOW( 0x55, drm_radeon_mem_init_heap_t)
-#define DRM_IOCTL_RADEON_IRQ_EMIT   DRM_IOWR( 0x56, drm_radeon_irq_emit_t)
-#define DRM_IOCTL_RADEON_IRQ_WAIT   DRM_IOW( 0x57, drm_radeon_irq_wait_t)
-
 typedef struct drm_radeon_init {
 	enum {
 		RADEON_INIT_CP    = 0x01,
-		RADEON_CLEANUP_CP = 0x02,
-		RADEON_INIT_R200_CP = 0x03,	
+		RADEON_CLEANUP_CP = 0x02
 	} func;
 	unsigned long sarea_priv_offset;
 	int is_pci;
@@ -447,7 +285,7 @@ typedef struct drm_radeon_clear {
 	unsigned int clear_color;
 	unsigned int clear_depth;
 	unsigned int color_mask;
-	unsigned int depth_mask;   /* misnamed field:  should be stencil */
+	unsigned int depth_mask;
 	drm_radeon_clear_rect_t *depth_boxes;
 } drm_radeon_clear_t;
 
@@ -466,36 +304,6 @@ typedef struct drm_radeon_indices {
 	int discard;			/* Client finished with buffer? */
 } drm_radeon_indices_t;
 
-/* v1.2 - obsoletes drm_radeon_vertex and drm_radeon_indices
- *      - allows multiple primitives and state changes in a single ioctl
- *      - supports driver change to emit native primitives
- */
-typedef struct drm_radeon_vertex2 {
-	int idx;			/* Index of vertex buffer */
-	int discard;			/* Client finished with buffer? */
-	int nr_states;
-	drm_radeon_state_t *state;
-	int nr_prims;
-	drm_radeon_prim_t *prim;
-} drm_radeon_vertex2_t;
-
-/* v1.3 - obsoletes drm_radeon_vertex2
- *      - allows arbitarily large cliprect list 
- *      - allows updating of tcl packet, vector and scalar state
- *      - allows memory-efficient description of state updates
- *      - allows state to be emitted without a primitive 
- *           (for clears, ctx switches)
- *      - allows more than one dma buffer to be referenced per ioctl
- *      - supports tcl driver
- *      - may be extended in future versions with new cmd types, packets
- */
-typedef struct drm_radeon_cmd_buffer {
-	int bufsz;
-	char *buf;
-	int nbox;
-	drm_clip_rect_t *boxes;
-} drm_radeon_cmd_buffer_t;
-
 typedef struct drm_radeon_tex_image {
 	unsigned int x, y;		/* Blit coordinates */
 	unsigned int width, height;
@@ -522,55 +330,4 @@ typedef struct drm_radeon_indirect {
 	int discard;
 } drm_radeon_indirect_t;
 
-
-/* 1.3: An ioctl to get parameters that aren't available to the 3d
- * client any other way.  
- */
-#define RADEON_PARAM_AGP_BUFFER_OFFSET     1 /* card offset of 1st agp buffer */
-#define RADEON_PARAM_LAST_FRAME            2
-#define RADEON_PARAM_LAST_DISPATCH         3
-#define RADEON_PARAM_LAST_CLEAR            4
-#define RADEON_PARAM_IRQ_NR                5
-#define RADEON_PARAM_AGP_BASE              6 /* card offset of agp base */
-
-typedef struct drm_radeon_getparam {
-	int param;
-	int *value;
-} drm_radeon_getparam_t;
-
-/* 1.6: Set up a memory manager for regions of shared memory:
- */
-#define RADEON_MEM_REGION_AGP 1
-#define RADEON_MEM_REGION_FB  2
-
-typedef struct drm_radeon_mem_alloc {
-	int region;
-	int alignment;
-	int size;
-	int *region_offset;	/* offset from start of fb or agp */
-} drm_radeon_mem_alloc_t;
-
-typedef struct drm_radeon_mem_free {
-	int region;
-	int region_offset;
-} drm_radeon_mem_free_t;
-
-typedef struct drm_radeon_mem_init_heap {
-	int region;
-	int size;
-	int start;	
-} drm_radeon_mem_init_heap_t;
-
-
-/* 1.6: Userspace can request & wait on irq's:
- */
-typedef struct drm_radeon_irq_emit {
-	int *irq_seq;
-} drm_radeon_irq_emit_t;
-
-typedef struct drm_radeon_irq_wait {
-	int irq_seq;
-} drm_radeon_irq_wait_t;
-
-
 #endif
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/radeon_drv.c linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/radeon_drv.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/radeon_drv.c	2003-07-30 13:51:23.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/radeon_drv.c	2001-08-08 18:42:15.000000000 +0200
@@ -30,11 +30,47 @@
 #include <linux/config.h>
 #include "radeon.h"
 #include "drmP.h"
-#include "drm.h"
-#include "radeon_drm.h"
 #include "radeon_drv.h"
 #include "ati_pcigart.h"
 
+#define DRIVER_AUTHOR		"Gareth Hughes, VA Linux Systems Inc."
+
+#define DRIVER_NAME		"radeon"
+#define DRIVER_DESC		"ATI Radeon"
+#define DRIVER_DATE		"20010405"
+
+#define DRIVER_MAJOR		1
+#define DRIVER_MINOR		1
+#define DRIVER_PATCHLEVEL	1
+
+#define DRIVER_IOCTLS							     \
+ [DRM_IOCTL_NR(DRM_IOCTL_DMA)]               = { radeon_cp_buffers,  1, 0 }, \
+ [DRM_IOCTL_NR(DRM_IOCTL_RADEON_CP_INIT)]    = { radeon_cp_init,     1, 1 }, \
+ [DRM_IOCTL_NR(DRM_IOCTL_RADEON_CP_START)]   = { radeon_cp_start,    1, 1 }, \
+ [DRM_IOCTL_NR(DRM_IOCTL_RADEON_CP_STOP)]    = { radeon_cp_stop,     1, 1 }, \
+ [DRM_IOCTL_NR(DRM_IOCTL_RADEON_CP_RESET)]   = { radeon_cp_reset,    1, 1 }, \
+ [DRM_IOCTL_NR(DRM_IOCTL_RADEON_CP_IDLE)]    = { radeon_cp_idle,     1, 0 }, \
+ [DRM_IOCTL_NR(DRM_IOCTL_RADEON_RESET)]    = { radeon_engine_reset,  1, 0 }, \
+ [DRM_IOCTL_NR(DRM_IOCTL_RADEON_FULLSCREEN)] = { radeon_fullscreen,  1, 0 }, \
+ [DRM_IOCTL_NR(DRM_IOCTL_RADEON_SWAP)]       = { radeon_cp_swap,     1, 0 }, \
+ [DRM_IOCTL_NR(DRM_IOCTL_RADEON_CLEAR)]      = { radeon_cp_clear,    1, 0 }, \
+ [DRM_IOCTL_NR(DRM_IOCTL_RADEON_VERTEX)]     = { radeon_cp_vertex,   1, 0 }, \
+ [DRM_IOCTL_NR(DRM_IOCTL_RADEON_INDICES)]    = { radeon_cp_indices,  1, 0 }, \
+ [DRM_IOCTL_NR(DRM_IOCTL_RADEON_TEXTURE)]    = { radeon_cp_texture,  1, 0 }, \
+ [DRM_IOCTL_NR(DRM_IOCTL_RADEON_STIPPLE)]    = { radeon_cp_stipple,  1, 0 }, \
+ [DRM_IOCTL_NR(DRM_IOCTL_RADEON_INDIRECT)]   = { radeon_cp_indirect, 1, 1 },
+
+
+#if 0
+/* GH: Count data sent to card via ring or vertex/indirect buffers.
+ */
+#define __HAVE_COUNTERS         3
+#define __HAVE_COUNTER6         _DRM_STAT_IRQ
+#define __HAVE_COUNTER7         _DRM_STAT_PRIMARY
+#define __HAVE_COUNTER8         _DRM_STAT_SECONDARY
+#endif
+
+
 #include "drm_agpsupport.h"
 #include "drm_auth.h"
 #include "drm_bufs.h"
@@ -42,6 +78,26 @@
 #include "drm_dma.h"
 #include "drm_drawable.h"
 #include "drm_drv.h"
+
+#ifndef MODULE
+/* DRM(options) is called by the kernel to parse command-line options
+ * passed via the boot-loader (e.g., LILO).  It calls the insmod option
+ * routine, drm_parse_drm.
+ */
+
+/* JH- We have to hand expand the string ourselves because of the cpp.  If
+ * anyone can think of a way that we can fit into the __setup macro without
+ * changing it, then please send the solution my way.
+ */
+static int __init radeon_options( char *str )
+{
+	DRM(parse_options)( str );
+	return 1;
+}
+
+__setup( DRIVER_NAME "=", radeon_options );
+#endif
+
 #include "drm_fops.h"
 #include "drm_init.h"
 #include "drm_ioctl.h"
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/radeon_drv.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/radeon_drv.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/radeon_drv.h	2003-07-30 13:51:23.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/radeon_drv.h	2002-12-18 01:03:52.000000000 +0100
@@ -31,9 +31,6 @@
 #ifndef __RADEON_DRV_H__
 #define __RADEON_DRV_H__
 
-#define GET_RING_HEAD(ring)		readl(  (volatile u32 *) (ring)->head )
-#define SET_RING_HEAD(ring,val)		writel( (val), (volatile u32 *) (ring)->head )
-
 typedef struct drm_radeon_freelist {
    	unsigned int age;
    	drm_buf_t *buf;
@@ -61,15 +58,6 @@ typedef struct drm_radeon_depth_clear_t 
 	u32 se_cntl;
 } drm_radeon_depth_clear_t;
 
-
-struct mem_block {
-	struct mem_block *next;
-	struct mem_block *prev;
-	int start;
-	int size;
-	int pid;		/* 0: free, -1: heap, other: real pids */
-};
-
 typedef struct drm_radeon_private {
 	drm_radeon_ring_buffer_t ring;
 	drm_radeon_sarea_t *sarea_priv;
@@ -83,32 +71,27 @@ typedef struct drm_radeon_private {
 
    	drm_radeon_freelist_t *head;
    	drm_radeon_freelist_t *tail;
+/* FIXME: ROTATE_BUFS is a hask to cycle through bufs until freelist
+   code is used.  Note this hides a problem with the scratch register
+   (used to keep track of last buffer completed) being written to before
+   the last buffer has actually completed rendering. */
+#define ROTATE_BUFS 1
+#if ROTATE_BUFS
 	int last_buf;
+#endif
 	volatile u32 *scratch;
-	int writeback_works;
 
 	int usec_timeout;
-
-	int is_r200;
-
 	int is_pci;
 	unsigned long phys_pci_gart;
 	dma_addr_t bus_pci_gart;
 
-	struct {
-		u32 boxes;
-		int freelist_timeouts;
-		int freelist_loops;
-		int requested_bufs;
-		int last_frame_reads;
-		int last_clear_reads;
-		int clears;
-		int texture_uploads;
-	} stats;
+	atomic_t idle_count;
 
-	int do_boxes;
 	int page_flipping;
 	int current_page;
+	u32 crtc_offset;
+	u32 crtc_offset_cntl;
 
 	u32 color_fmt;
 	unsigned int front_offset;
@@ -133,18 +116,14 @@ typedef struct drm_radeon_private {
 	drm_map_t *ring_rptr;
 	drm_map_t *buffers;
 	drm_map_t *agp_textures;
-
-	struct mem_block *agp_heap;
-	struct mem_block *fb_heap;
-
-	/* SW interrupt */
-   	wait_queue_head_t swi_queue;
-   	atomic_t swi_emitted;
-
 } drm_radeon_private_t;
 
 typedef struct drm_radeon_buf_priv {
 	u32 age;
+	int prim;
+	int discard;
+	int dispatched;
+   	drm_radeon_freelist_t *list_entry;
 } drm_radeon_buf_priv_t;
 
 				/* radeon_cp.c */
@@ -170,6 +149,14 @@ extern drm_buf_t *radeon_freelist_get( d
 
 extern int radeon_wait_ring( drm_radeon_private_t *dev_priv, int n );
 
+static inline void
+radeon_update_ring_snapshot( drm_radeon_ring_buffer_t *ring )
+{
+	ring->space = (*(volatile int *)ring->head - ring->tail) * sizeof(u32);
+	if ( ring->space <= 0 )
+		ring->space += ring->size;
+}
+
 extern int radeon_do_cp_idle( drm_radeon_private_t *dev_priv );
 extern int radeon_do_cleanup_cp( drm_device_t *dev );
 extern int radeon_do_cleanup_pageflip( drm_device_t *dev );
@@ -189,34 +176,6 @@ extern int radeon_cp_stipple( struct ino
 			      unsigned int cmd, unsigned long arg );
 extern int radeon_cp_indirect( struct inode *inode, struct file *filp,
 			       unsigned int cmd, unsigned long arg );
-extern int radeon_cp_vertex2(struct inode *inode, struct file *filp,unsigned int cmd, unsigned long arg );
-extern int radeon_cp_cmdbuf(struct inode *inode, struct file *filp,unsigned int cmd, unsigned long arg );
-extern int radeon_cp_getparam(struct inode *inode, struct file *filp,unsigned int cmd, unsigned long arg );
-extern int radeon_cp_flip(struct inode *inode, struct file *filp,unsigned int cmd, unsigned long arg );
-
-extern int radeon_mem_alloc(struct inode *inode, struct file *filp,unsigned int cmd, unsigned long arg );
-extern int radeon_mem_free(struct inode *inode, struct file *filp,unsigned int cmd, unsigned long arg );
-extern int radeon_mem_init_heap(struct inode *inode, struct file *filp,unsigned int cmd, unsigned long arg );
-extern void radeon_mem_takedown( struct mem_block **heap );
-extern void radeon_mem_release( struct mem_block *heap );
-
-				/* radeon_irq.c */
-extern int radeon_irq_emit(struct inode *inode, struct file *filp,unsigned int cmd, unsigned long arg );
-extern int radeon_irq_wait(struct inode *inode, struct file *filp,unsigned int cmd, unsigned long arg );
-
-extern int radeon_emit_and_wait_irq(drm_device_t *dev);
-extern int radeon_wait_irq(drm_device_t *dev, int swi_nr);
-extern int radeon_emit_irq(drm_device_t *dev);
-
-
-/* Flags for stats.boxes
- */
-#define RADEON_BOX_DMA_IDLE      0x1
-#define RADEON_BOX_RING_FULL     0x2
-#define RADEON_BOX_FLIP          0x4
-#define RADEON_BOX_WAIT_IDLE     0x8
-#define RADEON_BOX_TEXTURE_LOAD  0x10
-
 
 
 /* Register definitions, register access macros and drmAddMap constants
@@ -243,10 +202,10 @@ extern int radeon_emit_irq(drm_device_t 
 #define RADEON_CRTC_OFFSET_CNTL		0x0228
 #	define RADEON_CRTC_TILE_EN		(1 << 15)
 #	define RADEON_CRTC_OFFSET_FLIP_CNTL	(1 << 16)
-#define RADEON_CRTC2_OFFSET		0x0324
-#define RADEON_CRTC2_OFFSET_CNTL	0x0328
 
 #define RADEON_RB3D_COLORPITCH		0x1c48
+#define RADEON_RB3D_DEPTHCLEARVALUE	0x1c30
+#define RADEON_RB3D_DEPTHXY_OFFSET	0x1c60
 
 #define RADEON_DP_GUI_MASTER_CNTL	0x146c
 #	define RADEON_GMC_SRC_PITCH_OFFSET_CNTL	(1 << 0)
@@ -281,24 +240,6 @@ extern int radeon_emit_irq(drm_device_t 
 #define RADEON_SCRATCH_UMSK		0x0770
 #define RADEON_SCRATCH_ADDR		0x0774
 
-#define GET_SCRATCH( x )	(dev_priv->writeback_works			\
-				? readl( &dev_priv->scratch[(x)] )		\
-				: RADEON_READ( RADEON_SCRATCH_REG0 + 4*(x) ) )
-
-
-#define RADEON_GEN_INT_CNTL		0x0040
-#	define RADEON_CRTC_VBLANK_MASK		(1 << 0)
-#	define RADEON_GUI_IDLE_INT_ENABLE	(1 << 19)
-#	define RADEON_SW_INT_ENABLE		(1 << 25)
-
-#define RADEON_GEN_INT_STATUS		0x0044
-#	define RADEON_CRTC_VBLANK_STAT		(1 << 0)
-#	define RADEON_CRTC_VBLANK_STAT_ACK   	(1 << 0)
-#	define RADEON_GUI_IDLE_INT_TEST_ACK     (1 << 19)
-#	define RADEON_SW_INT_TEST		(1 << 25)
-#	define RADEON_SW_INT_TEST_ACK   	(1 << 25)
-#	define RADEON_SW_INT_FIRE		(1 << 26)
-
 #define RADEON_HOST_PATH_CNTL		0x0130
 #	define RADEON_HDP_SOFT_RESET		(1 << 26)
 #	define RADEON_HDP_WC_TIMEOUT_MASK	(7 << 28)
@@ -312,12 +253,6 @@ extern int radeon_emit_irq(drm_device_t 
 #	define RADEON_ISYNC_WAIT_IDLEGUI	(1 << 4)
 #	define RADEON_ISYNC_CPSCRATCH_IDLEGUI	(1 << 5)
 
-#define RADEON_RBBM_GUICNTL		0x172c
-#	define RADEON_HOST_DATA_SWAP_NONE	(0 << 0)
-#	define RADEON_HOST_DATA_SWAP_16BIT	(1 << 0)
-#	define RADEON_HOST_DATA_SWAP_32BIT	(2 << 0)
-#	define RADEON_HOST_DATA_SWAP_HDW	(3 << 0)
-
 #define RADEON_MC_AGP_LOCATION		0x014c
 #define RADEON_MC_FB_LOCATION		0x0148
 #define RADEON_MCLK_CNTL		0x0012
@@ -355,8 +290,10 @@ extern int radeon_emit_irq(drm_device_t 
 #	define RADEON_ROP_ENABLE		(1 << 6)
 #	define RADEON_STENCIL_ENABLE		(1 << 7)
 #	define RADEON_Z_ENABLE			(1 << 8)
+#	define RADEON_DEPTH_XZ_OFFEST_ENABLE	(1 << 9)
+#	define RADEON_ZBLOCK8			(0 << 15)
+#	define RADEON_ZBLOCK16			(1 << 15)
 #define RADEON_RB3D_DEPTHOFFSET		0x1c24
-#define RADEON_RB3D_DEPTHPITCH		0x1c28
 #define RADEON_RB3D_PLANEMASK		0x1d84
 #define RADEON_RB3D_STENCILREFMASK	0x1d7c
 #define RADEON_RB3D_ZCACHE_MODE		0x3250
@@ -369,9 +306,9 @@ extern int radeon_emit_irq(drm_device_t 
 #	define RADEON_Z_TEST_MASK		(7 << 4)
 #	define RADEON_Z_TEST_ALWAYS		(7 << 4)
 #	define RADEON_STENCIL_TEST_ALWAYS	(7 << 12)
-#	define RADEON_STENCIL_S_FAIL_REPLACE	(2 << 16)
-#	define RADEON_STENCIL_ZPASS_REPLACE	(2 << 20)
-#	define RADEON_STENCIL_ZFAIL_REPLACE	(2 << 24)
+#	define RADEON_STENCIL_S_FAIL_KEEP	(0 << 16)
+#	define RADEON_STENCIL_ZPASS_KEEP	(0 << 20)
+#	define RADEON_STENCIL_ZFAIL_KEEP	(0 << 20)
 #	define RADEON_Z_WRITE_ENABLE		(1 << 30)
 #define RADEON_RBBM_SOFT_RESET		0x00f0
 #	define RADEON_SOFT_RESET_CP		(1 <<  0)
@@ -420,16 +357,6 @@ extern int radeon_emit_irq(drm_device_t 
 #define RADEON_SE_CNTL_STATUS		0x2140
 #define RADEON_SE_LINE_WIDTH		0x1db8
 #define RADEON_SE_VPORT_XSCALE		0x1d98
-#define RADEON_SE_ZBIAS_FACTOR		0x1db0
-#define RADEON_SE_TCL_MATERIAL_EMMISSIVE_RED 0x2210
-#define RADEON_SE_TCL_OUTPUT_VTX_FMT         0x2254
-#define RADEON_SE_TCL_VECTOR_INDX_REG        0x2200
-#       define RADEON_VEC_INDX_OCTWORD_STRIDE_SHIFT  16
-#       define RADEON_VEC_INDX_DWORD_COUNT_SHIFT     28
-#define RADEON_SE_TCL_VECTOR_DATA_REG       0x2204
-#define RADEON_SE_TCL_SCALAR_INDX_REG       0x2208
-#       define RADEON_SCAL_INDX_DWORD_STRIDE_SHIFT  16
-#define RADEON_SE_TCL_SCALAR_DATA_REG       0x220C
 #define RADEON_SURFACE_ACCESS_FLAGS	0x0bf8
 #define RADEON_SURFACE_ACCESS_CLR	0x0bfc
 #define RADEON_SURFACE_CNTL		0x0b00
@@ -494,7 +421,6 @@ extern int radeon_emit_irq(drm_device_t 
 
 #define RADEON_CP_RB_BASE		0x0700
 #define RADEON_CP_RB_CNTL		0x0704
-#	define RADEON_BUF_SWAP_32BIT		(2 << 16)
 #define RADEON_CP_RB_RPTR_ADDR		0x070c
 #define RADEON_CP_RB_RPTR		0x0710
 #define RADEON_CP_RB_WPTR		0x0714
@@ -531,14 +457,11 @@ extern int radeon_emit_irq(drm_device_t 
 #define RADEON_CP_PACKET3		0xC0000000
 #	define RADEON_3D_RNDR_GEN_INDX_PRIM	0x00002300
 #	define RADEON_WAIT_FOR_IDLE		0x00002600
-#	define RADEON_3D_DRAW_VBUF		0x00002800
 #	define RADEON_3D_DRAW_IMMD		0x00002900
-#	define RADEON_3D_DRAW_INDX		0x00002A00
-#	define RADEON_3D_LOAD_VBPNTR		0x00002F00
+#	define RADEON_3D_CLEAR_ZMASK		0x00003200
 #	define RADEON_CNTL_HOSTDATA_BLT		0x00009400
 #	define RADEON_CNTL_PAINT_MULTI		0x00009A00
 #	define RADEON_CNTL_BITBLT_MULTI		0x00009B00
-#	define RADEON_CNTL_SET_SCISSORS		0xC0001E00
 
 #define RADEON_CP_PACKET_MASK		0xC0000000
 #define RADEON_CP_PACKET_COUNT_MASK	0x3fff0000
@@ -547,7 +470,6 @@ extern int radeon_emit_irq(drm_device_t 
 #define RADEON_CP_PACKET1_REG1_MASK	0x003ff800
 
 #define RADEON_VTX_Z_PRESENT			(1 << 31)
-#define RADEON_VTX_PKCOLOR_PRESENT		(1 << 3)
 
 #define RADEON_PRIM_TYPE_NONE			(0 << 0)
 #define RADEON_PRIM_TYPE_POINT			(1 << 0)
@@ -560,7 +482,6 @@ extern int radeon_emit_irq(drm_device_t 
 #define RADEON_PRIM_TYPE_RECT_LIST		(8 << 0)
 #define RADEON_PRIM_TYPE_3VRT_POINT_LIST	(9 << 0)
 #define RADEON_PRIM_TYPE_3VRT_LINE_LIST		(10 << 0)
-#define RADEON_PRIM_TYPE_MASK                   0xf
 #define RADEON_PRIM_WALK_IND			(1 << 4)
 #define RADEON_PRIM_WALK_LIST			(2 << 4)
 #define RADEON_PRIM_WALK_RING			(3 << 4)
@@ -587,105 +508,6 @@ extern int radeon_emit_irq(drm_device_t 
 #define RADEON_TXFORMAT_ARGB4444	5
 #define RADEON_TXFORMAT_ARGB8888	6
 #define RADEON_TXFORMAT_RGBA8888	7
-#define RADEON_TXFORMAT_VYUY422         10
-#define RADEON_TXFORMAT_YVYU422         11
-#define RADEON_TXFORMAT_DXT1            12
-#define RADEON_TXFORMAT_DXT23           14
-#define RADEON_TXFORMAT_DXT45           15
-
-#define R200_PP_TXCBLEND_0                0x2f00
-#define R200_PP_TXCBLEND_1                0x2f10
-#define R200_PP_TXCBLEND_2                0x2f20
-#define R200_PP_TXCBLEND_3                0x2f30
-#define R200_PP_TXCBLEND_4                0x2f40
-#define R200_PP_TXCBLEND_5                0x2f50
-#define R200_PP_TXCBLEND_6                0x2f60
-#define R200_PP_TXCBLEND_7                0x2f70
-#define R200_SE_TCL_LIGHT_MODEL_CTL_0     0x2268 
-#define R200_PP_TFACTOR_0                 0x2ee0
-#define R200_SE_VTX_FMT_0                 0x2088
-#define R200_SE_VAP_CNTL                  0x2080
-#define R200_SE_TCL_MATRIX_SEL_0          0x2230
-#define R200_SE_TCL_TEX_PROC_CTL_2        0x22a8 
-#define R200_SE_TCL_UCP_VERT_BLEND_CTL    0x22c0 
-#define R200_PP_TXFILTER_5                0x2ca0 
-#define R200_PP_TXFILTER_4                0x2c80 
-#define R200_PP_TXFILTER_3                0x2c60 
-#define R200_PP_TXFILTER_2                0x2c40 
-#define R200_PP_TXFILTER_1                0x2c20 
-#define R200_PP_TXFILTER_0                0x2c00 
-#define R200_PP_TXOFFSET_5                0x2d78
-#define R200_PP_TXOFFSET_4                0x2d60
-#define R200_PP_TXOFFSET_3                0x2d48
-#define R200_PP_TXOFFSET_2                0x2d30
-#define R200_PP_TXOFFSET_1                0x2d18
-#define R200_PP_TXOFFSET_0                0x2d00
-
-#define R200_PP_CUBIC_FACES_0             0x2c18
-#define R200_PP_CUBIC_FACES_1             0x2c38
-#define R200_PP_CUBIC_FACES_2             0x2c58
-#define R200_PP_CUBIC_FACES_3             0x2c78
-#define R200_PP_CUBIC_FACES_4             0x2c98
-#define R200_PP_CUBIC_FACES_5             0x2cb8
-#define R200_PP_CUBIC_OFFSET_F1_0         0x2d04
-#define R200_PP_CUBIC_OFFSET_F2_0         0x2d08
-#define R200_PP_CUBIC_OFFSET_F3_0         0x2d0c
-#define R200_PP_CUBIC_OFFSET_F4_0         0x2d10
-#define R200_PP_CUBIC_OFFSET_F5_0         0x2d14
-#define R200_PP_CUBIC_OFFSET_F1_1         0x2d1c
-#define R200_PP_CUBIC_OFFSET_F2_1         0x2d20
-#define R200_PP_CUBIC_OFFSET_F3_1         0x2d24
-#define R200_PP_CUBIC_OFFSET_F4_1         0x2d28
-#define R200_PP_CUBIC_OFFSET_F5_1         0x2d2c
-#define R200_PP_CUBIC_OFFSET_F1_2         0x2d34
-#define R200_PP_CUBIC_OFFSET_F2_2         0x2d38
-#define R200_PP_CUBIC_OFFSET_F3_2         0x2d3c
-#define R200_PP_CUBIC_OFFSET_F4_2         0x2d40
-#define R200_PP_CUBIC_OFFSET_F5_2         0x2d44
-#define R200_PP_CUBIC_OFFSET_F1_3         0x2d4c
-#define R200_PP_CUBIC_OFFSET_F2_3         0x2d50
-#define R200_PP_CUBIC_OFFSET_F3_3         0x2d54
-#define R200_PP_CUBIC_OFFSET_F4_3         0x2d58
-#define R200_PP_CUBIC_OFFSET_F5_3         0x2d5c
-#define R200_PP_CUBIC_OFFSET_F1_4         0x2d64
-#define R200_PP_CUBIC_OFFSET_F2_4         0x2d68
-#define R200_PP_CUBIC_OFFSET_F3_4         0x2d6c
-#define R200_PP_CUBIC_OFFSET_F4_4         0x2d70
-#define R200_PP_CUBIC_OFFSET_F5_4         0x2d74
-#define R200_PP_CUBIC_OFFSET_F1_5         0x2d7c
-#define R200_PP_CUBIC_OFFSET_F2_5         0x2d80
-#define R200_PP_CUBIC_OFFSET_F3_5         0x2d84
-#define R200_PP_CUBIC_OFFSET_F4_5         0x2d88
-#define R200_PP_CUBIC_OFFSET_F5_5         0x2d8c
-
-#define R200_RE_AUX_SCISSOR_CNTL          0x26f0
-#define R200_SE_VTE_CNTL                  0x20b0
-#define R200_SE_TCL_OUTPUT_VTX_COMP_SEL   0x2250
-#define R200_PP_TAM_DEBUG3                0x2d9c
-#define R200_PP_CNTL_X                    0x2cc4
-#define R200_SE_VAP_CNTL_STATUS           0x2140
-#define R200_RE_SCISSOR_TL_0              0x1cd8
-#define R200_RE_SCISSOR_TL_1              0x1ce0
-#define R200_RE_SCISSOR_TL_2              0x1ce8
-#define R200_RB3D_DEPTHXY_OFFSET          0x1d60 
-#define R200_RE_AUX_SCISSOR_CNTL          0x26f0
-#define R200_SE_VTX_STATE_CNTL            0x2180
-#define R200_RE_POINTSIZE                 0x2648
-#define R200_SE_TCL_INPUT_VTX_VECTOR_ADDR_0 0x2254
-
-
-#define SE_VAP_CNTL__TCL_ENA_MASK                          0x00000001
-#define SE_VAP_CNTL__FORCE_W_TO_ONE_MASK                   0x00010000
-#define SE_VAP_CNTL__VF_MAX_VTX_NUM__SHIFT                 0x00000012
-#define SE_VTE_CNTL__VTX_XY_FMT_MASK                       0x00000100
-#define SE_VTE_CNTL__VTX_Z_FMT_MASK                        0x00000200
-#define SE_VTX_FMT_0__VTX_Z0_PRESENT_MASK                  0x00000001
-#define SE_VTX_FMT_0__VTX_W0_PRESENT_MASK                  0x00000002
-#define SE_VTX_FMT_0__VTX_COLOR_0_FMT__SHIFT               0x0000000b
-#define R200_3D_DRAW_IMMD_2      0xC0003500
-#define R200_SE_VTX_FMT_1                 0x208c
-#define R200_RE_CNTL                      0x1c50 
-
 
 /* Constants */
 #define RADEON_MAX_USEC_TIMEOUT		100000	/* 100 ms */
@@ -693,7 +515,6 @@ extern int radeon_emit_irq(drm_device_t 
 #define RADEON_LAST_FRAME_REG		RADEON_SCRATCH_REG0
 #define RADEON_LAST_DISPATCH_REG	RADEON_SCRATCH_REG1
 #define RADEON_LAST_CLEAR_REG		RADEON_SCRATCH_REG2
-#define RADEON_LAST_SWI_REG		RADEON_SCRATCH_REG3
 #define RADEON_LAST_DISPATCH		1
 
 #define RADEON_MAX_VB_AGE		0x7fffffff
@@ -705,11 +526,41 @@ extern int radeon_emit_irq(drm_device_t 
 #define RADEON_BASE(reg)	((unsigned long)(dev_priv->mmio->handle))
 #define RADEON_ADDR(reg)	(RADEON_BASE( reg ) + reg)
 
-#define RADEON_READ(reg)	readl(  (volatile u32 *) RADEON_ADDR(reg) )
-#define RADEON_WRITE(reg,val)	writel( (val), (volatile u32 *) RADEON_ADDR(reg))
+#define RADEON_DEREF(reg)	*(volatile u32 *)RADEON_ADDR( reg )
+#ifdef __alpha__
+#define RADEON_READ(reg)	(_RADEON_READ((u32 *)RADEON_ADDR( reg )))
+static inline u32 _RADEON_READ(u32 *addr)
+{
+	mb();
+	return *(volatile u32 *)addr;
+}
+#define RADEON_WRITE(reg,val)						\
+do {									\
+	wmb();								\
+	RADEON_DEREF(reg) = val;					\
+} while (0)
+#else
+#define RADEON_READ(reg)	RADEON_DEREF( reg )
+#define RADEON_WRITE(reg, val)	do { RADEON_DEREF( reg ) = val; } while (0)
+#endif
 
-#define RADEON_READ8(reg)	readb(  (volatile u8 *) RADEON_ADDR(reg) )
-#define RADEON_WRITE8(reg,val)	writeb( (val), (volatile u8 *) RADEON_ADDR(reg))
+#define RADEON_DEREF8(reg)	*(volatile u8 *)RADEON_ADDR( reg )
+#ifdef __alpha__
+#define RADEON_READ8(reg)	_RADEON_READ8((u8 *)RADEON_ADDR( reg ))
+static inline u8 _RADEON_READ8(u8 *addr)
+{
+	mb();
+	return *(volatile u8 *)addr;
+}
+#define RADEON_WRITE8(reg,val)						\
+do {									\
+	wmb();								\
+	RADEON_DEREF8( reg ) = val;					\
+} while (0)
+#else
+#define RADEON_READ8(reg)	RADEON_DEREF8( reg )
+#define RADEON_WRITE8(reg, val)	do { RADEON_DEREF8( reg ) = val; } while (0)
+#endif
 
 #define RADEON_WRITE_PLL( addr, val )					\
 do {									\
@@ -796,16 +647,20 @@ do {									\
 	}								\
 } while (0)
 
-
-/* Perfbox functionality only.  
- */
 #define RING_SPACE_TEST_WITH_RETURN( dev_priv )				\
 do {									\
-	if (!(dev_priv->stats.boxes & RADEON_BOX_DMA_IDLE)) {		\
-		u32 head = GET_RING_HEAD(&dev_priv->ring);		\
-		if (head == dev_priv->ring.tail)			\
-			dev_priv->stats.boxes |= RADEON_BOX_DMA_IDLE;	\
+	drm_radeon_ring_buffer_t *ring = &dev_priv->ring; int i;	\
+	if ( ring->space < ring->high_mark ) {				\
+		for ( i = 0 ; i < dev_priv->usec_timeout ; i++ ) {	\
+			radeon_update_ring_snapshot( ring );		\
+			if ( ring->space >= ring->high_mark )		\
+				goto __ring_space_done;			\
+			udelay( 1 );					\
+		}							\
+		DRM_ERROR( "ring space check failed!\n" );		\
+		return -EBUSY;						\
 	}								\
+ __ring_space_done: ;							\
 } while (0)
 
 #define VB_AGE_TEST_WITH_RETURN( dev_priv )				\
@@ -813,7 +668,7 @@ do {									\
 	drm_radeon_sarea_t *sarea_priv = dev_priv->sarea_priv;		\
 	if ( sarea_priv->last_dispatch >= RADEON_MAX_VB_AGE ) {		\
 		int __ret = radeon_do_cp_idle( dev_priv );		\
-		if ( __ret ) return __ret;				\
+		if ( __ret < 0 ) return __ret;				\
 		sarea_priv->last_dispatch = 0;				\
 		radeon_freelist_reset( dev );				\
 	}								\
@@ -839,17 +694,12 @@ do {									\
  * Ring control
  */
 
-#if defined(__powerpc__)
-#define radeon_flush_write_combine()	(void) GET_RING_HEAD( &dev_priv->ring )
-#else
-#define radeon_flush_write_combine()	wmb()
-#warning PCI posting bug
-#endif
+#define radeon_flush_write_combine()	mb()
 
 
 #define RADEON_VERBOSE	0
 
-#define RING_LOCALS	int write, _nr; unsigned int mask; u32 *ring;
+#define RING_LOCALS	int write; unsigned int mask; volatile u32 *ring;
 
 #define BEGIN_RING( n ) do {						\
 	if ( RADEON_VERBOSE ) {						\
@@ -857,10 +707,9 @@ do {									\
 			   n, __FUNCTION__ );				\
 	}								\
 	if ( dev_priv->ring.space <= (n) * sizeof(u32) ) {		\
-                COMMIT_RING();						\
 		radeon_wait_ring( dev_priv, (n) * sizeof(u32) );	\
 	}								\
-	_nr = n; dev_priv->ring.space -= (n) * sizeof(u32);		\
+	dev_priv->ring.space -= (n) * sizeof(u32);			\
 	ring = dev_priv->ring.start;					\
 	write = dev_priv->ring.tail;					\
 	mask = dev_priv->ring.tail_mask;				\
@@ -871,22 +720,9 @@ do {									\
 		DRM_INFO( "ADVANCE_RING() wr=0x%06x tail=0x%06x\n",	\
 			  write, dev_priv->ring.tail );			\
 	}								\
-	if (((dev_priv->ring.tail + _nr) & mask) != write) {		\
-		DRM_ERROR( 						\
-			"ADVANCE_RING(): mismatch: nr: %x write: %x line: %d\n",	\
-			((dev_priv->ring.tail + _nr) & mask),		\
-			write, __LINE__);						\
-	} else								\
-		dev_priv->ring.tail = write;				\
-} while (0)
-
-#define COMMIT_RING() do {					    \
-	/* Flush writes to ring */					\
-	rmb();					\
-	GET_RING_HEAD( &dev_priv->ring );				\
-	RADEON_WRITE( RADEON_CP_RB_WPTR, dev_priv->ring.tail );		    \
-	/* read from PCI bus to ensure correct posting */		\
-	RADEON_READ( RADEON_CP_RB_RPTR );				\
+	radeon_flush_write_combine();					\
+	dev_priv->ring.tail = write;					\
+	RADEON_WRITE( RADEON_CP_RB_WPTR, write );			\
 } while (0)
 
 #define OUT_RING( x ) do {						\
@@ -898,33 +734,6 @@ do {									\
 	write &= mask;							\
 } while (0)
 
-#define OUT_RING_REG( reg, val ) do {					\
-	OUT_RING( CP_PACKET0( reg, 0 ) );				\
-	OUT_RING( val );						\
-} while (0)
-
-
-#define OUT_RING_USER_TABLE( tab, sz ) do {			\
-	int _size = (sz);					\
-	int *_tab = (tab);					\
-								\
-	if (write + _size > mask) {				\
-		int i = (mask+1) - write;			\
-		if (__copy_from_user( (int *)(ring+write),	\
-				      _tab, i*4 ))		\
-			return -EFAULT;		\
-		write = 0;					\
-		_size -= i;					\
-		_tab += i;					\
-	}							\
-								\
-	if (_size && __copy_from_user( (int *)(ring+write),	\
-			               _tab, _size*4 ))		\
-		return -EFAULT;			\
-								\
-	write += _size;						\
-	write &= mask;						\
-} while (0)
-
+#define RADEON_PERFORMANCE_BOXES	0
 
 #endif /* __RADEON_DRV_H__ */
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/radeon_irq.c linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/radeon_irq.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/radeon_irq.c	2003-07-30 13:51:23.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/radeon_irq.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,258 +0,0 @@
-/* radeon_irq.c -- IRQ handling for radeon -*- linux-c -*-
- *
- * Copyright (C) The Weather Channel, Inc.  2002.  All Rights Reserved.
- * 
- * The Weather Channel (TM) funded Tungsten Graphics to develop the
- * initial release of the Radeon 8500 driver under the XFree86 license.
- * This notice must be preserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- *    Keith Whitwell <keith@tungstengraphics.com>
- *    Michel Dänzer <michel@daenzer.net>
- */
-
-#include "radeon.h"
-#include "drmP.h"
-#include "drm.h"
-#include "radeon_drm.h"
-#include "radeon_drv.h"
-#include "drm_os_linux.h"
-
-/* Interrupts - Used for device synchronization and flushing in the
- * following circumstances:
- *
- * - Exclusive FB access with hw idle:
- *    - Wait for GUI Idle (?) interrupt, then do normal flush.
- *
- * - Frame throttling, NV_fence:
- *    - Drop marker irq's into command stream ahead of time.
- *    - Wait on irq's with lock *not held*
- *    - Check each for termination condition
- *
- * - Internally in cp_getbuffer, etc:
- *    - as above, but wait with lock held???
- *
- * NOTE: These functions are misleadingly named -- the irq's aren't
- * tied to dma at all, this is just a hangover from dri prehistory.
- */
-
-void DRM(dma_service)(int irq, void *arg, struct pt_regs *reg)
-{
-	drm_device_t *dev = (drm_device_t *) arg;
-	drm_radeon_private_t *dev_priv = 
-	   (drm_radeon_private_t *)dev->dev_private;
-   	u32 stat;
-
-	stat = RADEON_READ(RADEON_GEN_INT_STATUS) 
-		& (RADEON_SW_INT_TEST | RADEON_CRTC_VBLANK_STAT);
-	if (!stat)
-		return;
-
-	/* SW interrupt */
-	if (stat & RADEON_SW_INT_TEST) {
-		wake_up_interruptible( &dev_priv->swi_queue );
-	}
-
-	/* VBLANK interrupt */
-	if (stat & RADEON_CRTC_VBLANK_STAT) {
-		atomic_inc(&dev->vbl_received);
-		wake_up_interruptible(&dev->vbl_queue);
-		DRM(vbl_send_signals)(dev);
-	}
-
-	/* Acknowledge all the bits in GEN_INT_STATUS -- seem to get
-	 * more than we asked for...
-	 */
-	RADEON_WRITE(RADEON_GEN_INT_STATUS, stat);
-}
-
-static __inline__ void radeon_acknowledge_irqs(drm_radeon_private_t *dev_priv)
-{
-	u32 tmp = RADEON_READ( RADEON_GEN_INT_STATUS )
-		& (RADEON_SW_INT_TEST_ACK | RADEON_CRTC_VBLANK_STAT);
-	if (tmp)
-		RADEON_WRITE( RADEON_GEN_INT_STATUS, tmp );
-}
-
-int radeon_emit_irq(drm_device_t *dev)
-{
-	drm_radeon_private_t *dev_priv = dev->dev_private;
-	unsigned int ret;
-	RING_LOCALS;
-
-	atomic_inc(&dev_priv->swi_emitted);
-	ret = atomic_read(&dev_priv->swi_emitted);
-
-	BEGIN_RING( 4 );
-	OUT_RING_REG( RADEON_LAST_SWI_REG, ret );
-	OUT_RING_REG( RADEON_GEN_INT_STATUS, RADEON_SW_INT_FIRE );
-	ADVANCE_RING(); 
- 	COMMIT_RING();
-
-	return ret;
-}
-
-
-int radeon_wait_irq(drm_device_t *dev, int swi_nr)
-{
-  	drm_radeon_private_t *dev_priv = 
-	   (drm_radeon_private_t *)dev->dev_private;
-	int ret = 0;
-
- 	if (RADEON_READ( RADEON_LAST_SWI_REG ) >= swi_nr)  
- 		return 0; 
-
-	dev_priv->stats.boxes |= RADEON_BOX_WAIT_IDLE;
-
-	/* This is a hack to work around mysterious freezes on certain
-	 * systems:
-	 */ 
-	radeon_acknowledge_irqs( dev_priv );
-
-	DRM_WAIT_ON( ret, dev_priv->swi_queue, 3 * HZ, 
-		     RADEON_READ( RADEON_LAST_SWI_REG ) >= swi_nr );
-
-	return ret;
-}
-
-int radeon_emit_and_wait_irq(drm_device_t *dev)
-{
-	return radeon_wait_irq( dev, radeon_emit_irq(dev) );
-}
-
-
-int DRM(vblank_wait)(drm_device_t *dev, unsigned int *sequence)
-{
-  	drm_radeon_private_t *dev_priv = 
-	   (drm_radeon_private_t *)dev->dev_private;
-	unsigned int cur_vblank;
-	int ret = 0;
-
-	if ( !dev_priv ) {
-		DRM_ERROR( "%s called with no initialization\n", __FUNCTION__ );
-		return -EINVAL;
-	}
-
-	radeon_acknowledge_irqs( dev_priv );
-
-	dev_priv->stats.boxes |= RADEON_BOX_WAIT_IDLE;
-
-	/* Assume that the user has missed the current sequence number
-	 * by about a day rather than she wants to wait for years
-	 * using vertical blanks... 
-	 */
-	DRM_WAIT_ON( ret, dev->vbl_queue, 3*HZ, 
-		     ( ( ( cur_vblank = atomic_read(&dev->vbl_received ) )
-			 - *sequence ) <= (1<<23) ) );
-
-	*sequence = cur_vblank;
-
-	return ret;
-}
-
-
-/* Needs the lock as it touches the ring.
- */
-int radeon_irq_emit(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long data)
-{
-	drm_file_t	*priv	= filp->private_data;
-	drm_device_t	*dev	= priv->dev;
-	drm_radeon_private_t *dev_priv = dev->dev_private;
-	drm_radeon_irq_emit_t emit;
-	int result;
-
-	LOCK_TEST_WITH_RETURN( dev );
-
-	if ( !dev_priv ) {
-		DRM_ERROR( "%s called with no initialization\n", __FUNCTION__ );
-		return -EINVAL;
-	}
-
-	DRM_COPY_FROM_USER_IOCTL( emit, (drm_radeon_irq_emit_t *)data,
-				  sizeof(emit) );
-
-	result = radeon_emit_irq( dev );
-
-	if ( copy_to_user( emit.irq_seq, &result, sizeof(int) ) ) {
-		DRM_ERROR( "copy_to_user\n" );
-		return -EFAULT;
-	}
-
-	return 0;
-}
-
-
-/* Doesn't need the hardware lock.
- */
-int radeon_irq_wait(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long data)
-{
-        drm_file_t      *priv   = filp->private_data;
-	drm_device_t    *dev    = priv->dev;
-	drm_radeon_private_t *dev_priv = dev->dev_private;
-	drm_radeon_irq_wait_t irqwait;
-
-	if ( !dev_priv ) {
-		DRM_ERROR( "%s called with no initialization\n", __FUNCTION__ );
-		return -EINVAL;
-	}
-
-	DRM_COPY_FROM_USER_IOCTL( irqwait, (drm_radeon_irq_wait_t *)data,
-				  sizeof(irqwait) );
-
-	return radeon_wait_irq( dev, irqwait.irq_seq );
-}
-
-
-/* drm_dma.h hooks
-*/
-void DRM(driver_irq_preinstall)( drm_device_t *dev ) {
-	drm_radeon_private_t *dev_priv =
-		(drm_radeon_private_t *)dev->dev_private;
-
- 	/* Disable *all* interrupts */
-      	RADEON_WRITE( RADEON_GEN_INT_CNTL, 0 );
-
-	/* Clear bits if they're already high */
-	radeon_acknowledge_irqs( dev_priv );
-}
-
-void DRM(driver_irq_postinstall)( drm_device_t *dev ) {
-	drm_radeon_private_t *dev_priv =
-		(drm_radeon_private_t *)dev->dev_private;
-
-   	atomic_set(&dev_priv->swi_emitted, 0);
-	init_waitqueue_head( &dev_priv->swi_queue );
-
-	/* Turn on SW and VBL ints */
-   	RADEON_WRITE( RADEON_GEN_INT_CNTL,
-		      RADEON_CRTC_VBLANK_MASK |	
-		      RADEON_SW_INT_ENABLE );
-}
-
-void DRM(driver_irq_uninstall)( drm_device_t *dev ) {
-	drm_radeon_private_t *dev_priv =
-		(drm_radeon_private_t *)dev->dev_private;
-	if ( dev_priv ) {
-		/* Disable *all* interrupts */
-		RADEON_WRITE( RADEON_GEN_INT_CNTL, 0 );
-	}
-}
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/radeon_mem.c linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/radeon_mem.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/radeon_mem.c	2003-07-30 13:51:23.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/radeon_mem.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,338 +0,0 @@
-/* radeon_mem.c -- Simple agp/fb memory manager for radeon -*- linux-c -*-
- *
- * Copyright (C) The Weather Channel, Inc.  2002.  All Rights Reserved.
- * 
- * The Weather Channel (TM) funded Tungsten Graphics to develop the
- * initial release of the Radeon 8500 driver under the XFree86 license.
- * This notice must be preserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- *    Keith Whitwell <keith@tungstengraphics.com>
- */
-
-#include "radeon.h"
-#include "drmP.h"
-#include "drm.h"
-#include "radeon_drm.h"
-#include "radeon_drv.h"
-#include "drm_os_linux.h"
-
-/* Very simple allocator for agp memory, working on a static range
- * already mapped into each client's address space.  
- */
-
-static struct mem_block *split_block(struct mem_block *p, int start, int size,
-				     int pid )
-{
-	/* Maybe cut off the start of an existing block */
-	if (start > p->start) {
-		struct mem_block *newblock = kmalloc(sizeof(*newblock), GFP_KERNEL);
-		if (!newblock) 
-			goto out;
-		newblock->start = start;
-		newblock->size = p->size - (start - p->start);
-		newblock->pid = 0;
-		newblock->next = p->next;
-		newblock->prev = p;
-		p->next->prev = newblock;
-		p->next = newblock;
-		p->size -= newblock->size;
-		p = newblock;
-	}
-   
-	/* Maybe cut off the end of an existing block */
-	if (size < p->size) {
-		struct mem_block *newblock = kmalloc(sizeof(*newblock), GFP_KERNEL);
-		if (!newblock)
-			goto out;
-		newblock->start = start + size;
-		newblock->size = p->size - size;
-		newblock->pid = 0;
-		newblock->next = p->next;
-		newblock->prev = p;
-		p->next->prev = newblock;
-		p->next = newblock;
-		p->size = size;
-	}
-
- out:
-	/* Our block is in the middle */
-	p->pid = pid;
-	return p;
-}
-
-static struct mem_block *alloc_block( struct mem_block *heap, int size, 
-				      int align2, int pid )
-{
-	struct mem_block *p;
-	int mask = (1 << align2)-1;
-
-	for (p = heap->next ; p != heap ; p = p->next) {
-		int start = (p->start + mask) & ~mask;
-		if (p->pid == 0 && start + size <= p->start + p->size)
-			return split_block( p, start, size, pid );
-	}
-
-	return NULL;
-}
-
-static struct mem_block *find_block( struct mem_block *heap, int start )
-{
-	struct mem_block *p;
-
-	for (p = heap->next ; p != heap ; p = p->next) 
-		if (p->start == start)
-			return p;
-
-	return NULL;
-}
-
-
-static void free_block( struct mem_block *p )
-{
-	p->pid = 0;
-
-	/* Assumes a single contiguous range.  Needs a special pid in
-	 * 'heap' to stop it being subsumed.
-	 */
-	if (p->next->pid == 0) {
-		struct mem_block *q = p->next;
-		p->size += q->size;
-		p->next = q->next;
-		p->next->prev = p;
-		kfree(q);
-	}
-
-	if (p->prev->pid == 0) {
-		struct mem_block *q = p->prev;
-		q->size += p->size;
-		q->next = p->next;
-		q->next->prev = q;
-		kfree(p);
-	}
-}
-
-static void print_heap( struct mem_block *heap )
-{
-	struct mem_block *p;
-
-	for (p = heap->next ; p != heap ; p = p->next) 
-		DRM_DEBUG("0x%x..0x%x (0x%x) -- owner %d\n",
-			  p->start, p->start + p->size,
-			  p->size, p->pid);
-}
-
-/* Initialize.  How to check for an uninitialized heap?
- */
-static int init_heap(struct mem_block **heap, int start, int size)
-{
-	struct mem_block *blocks = kmalloc(sizeof(*blocks), GFP_KERNEL);
-
-	if (!blocks) 
-		return -ENOMEM;
-	
-	*heap = kmalloc(sizeof(**heap), GFP_KERNEL);
-	if (!*heap) {
-		kfree( blocks );
-		return -ENOMEM;
-	}
-
-	blocks->start = start;
-	blocks->size = size;
-	blocks->pid = 0;
-	blocks->next = blocks->prev = *heap;
-
-	memset( *heap, 0, sizeof(**heap) );
-	(*heap)->pid = -1;
-	(*heap)->next = (*heap)->prev = blocks;
-	return 0;
-}
-
-
-/* Free all blocks associated with the releasing pid.
- */
-void radeon_mem_release( struct mem_block *heap )
-{
-	int pid = current->pid;
-	struct mem_block *p;
-
-	if (!heap || !heap->next)
-		return;
-
-	for (p = heap->next ; p != heap ; p = p->next) {
-		if (p->pid == pid) 
-			p->pid = 0;
-	}
-
-	/* Assumes a single contiguous range.  Needs a special pid in
-	 * 'heap' to stop it being subsumed.
-	 */
-	for (p = heap->next ; p != heap ; p = p->next) {
-		while (p->pid == 0 && p->next->pid == 0) {
-			struct mem_block *q = p->next;
-			p->size += q->size;
-			p->next = q->next;
-			p->next->prev = p;
-			kfree(q);
-		}
-	}
-}
-
-/* Shutdown.
- */
-void radeon_mem_takedown( struct mem_block **heap )
-{
-	struct mem_block *p;
-	
-	if (!*heap)
-		return;
-
-	for (p = (*heap)->next ; p != *heap ; ) {
-		struct mem_block *q = p;
-		p = p->next;
-		kfree(q);
-	}
-
-	kfree( *heap );
-	*heap = 0;
-}
-
-
-
-/* IOCTL HANDLERS */
-
-static struct mem_block **get_heap( drm_radeon_private_t *dev_priv,
-				   int region )
-{
-	switch( region ) {
-	case RADEON_MEM_REGION_AGP:
- 		return &dev_priv->agp_heap; 
-	case RADEON_MEM_REGION_FB:
-		return &dev_priv->fb_heap;
-	default:
-		return 0;
-	}
-}
-
-int radeon_mem_alloc(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long data )
-{
-        drm_file_t      *priv   = filp->private_data;
-        drm_device_t    *dev    = priv->dev;
-        drm_radeon_private_t *dev_priv = dev->dev_private;
-	drm_radeon_mem_alloc_t alloc;
-	struct mem_block *block, **heap;
-
-	if ( !dev_priv ) {
-		DRM_ERROR( "%s called with no initialization\n", __FUNCTION__ );
-		return -EINVAL;
-	}
-
-	DRM_COPY_FROM_USER_IOCTL( alloc, (drm_radeon_mem_alloc_t *)data,
-				  sizeof(alloc) );
-
-	heap = get_heap( dev_priv, alloc.region );
-	if (!heap || !*heap)
-		return -EFAULT;
-	
-	/* Make things easier on ourselves: all allocations at least
-	 * 4k aligned.
-	 */
-	if (alloc.alignment < 12)
-		alloc.alignment = 12;
-
-	block = alloc_block( *heap, alloc.size, alloc.alignment,
-			     current->pid );
-
-	if (!block) 
-		return -ENOMEM;
-
-	if ( copy_to_user( alloc.region_offset, &block->start, 
-			       sizeof(int) ) ) {
-		DRM_ERROR( "copy_to_user\n" );
-		return -EFAULT;
-	}
-	
-	return 0;
-}
-
-
-
-int radeon_mem_free(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long data)
-{
-        drm_file_t      *priv   = filp->private_data;
-        drm_device_t    *dev    = priv->dev;
-	drm_radeon_private_t *dev_priv = dev->dev_private;
-	drm_radeon_mem_free_t memfree;
-	struct mem_block *block, **heap;
-
-	if ( !dev_priv ) {
-		DRM_ERROR( "%s called with no initialization\n", __FUNCTION__ );
-		return -EINVAL;
-	}
-
-	DRM_COPY_FROM_USER_IOCTL( memfree, (drm_radeon_mem_free_t *)data,
-				  sizeof(memfree) );
-
-	heap = get_heap( dev_priv, memfree.region );
-	if (!heap || !*heap)
-		return -EFAULT;
-	
-	block = find_block( *heap, memfree.region_offset );
-	if (!block)
-		return -EFAULT;
-
-	if (block->pid != current->pid)
-		return -EPERM;
-
-	free_block( block );	
-	return 0;
-}
-
-int radeon_mem_init_heap(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long data)
-{
-        drm_file_t      *priv   = filp->private_data;
-        drm_device_t    *dev    = priv->dev;
-	drm_radeon_private_t *dev_priv = dev->dev_private;
-	drm_radeon_mem_init_heap_t initheap;
-	struct mem_block **heap;
-
-	if ( !dev_priv ) {
-		DRM_ERROR( "%s called with no initialization\n", __FUNCTION__ );
-		return -EINVAL;
-	}
-
-	DRM_COPY_FROM_USER_IOCTL( initheap, (drm_radeon_mem_init_heap_t *)data,
-				  sizeof(initheap) );
-
-	heap = get_heap( dev_priv, initheap.region );
-	if (!heap) 
-		return -EFAULT;
-	
-	if (*heap) {
-		DRM_ERROR("heap already initialized?");
-		return -EFAULT;
-	}
-		
-	return init_heap( heap, initheap.start, initheap.size );
-}
-
-
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/radeon_state.c linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/radeon_state.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/radeon_state.c	2003-07-30 13:51:24.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/radeon_state.c	2002-12-18 01:03:52.000000000 +0100
@@ -29,11 +29,10 @@
 
 #include "radeon.h"
 #include "drmP.h"
-#include "drm.h"
-#include "drm_sarea.h"
-#include "radeon_drm.h"
 #include "radeon_drv.h"
-#include "drm_os_linux.h"
+#include "drm.h"
+#include <linux/delay.h>
+
 
 /* ================================================================
  * CP hardware state programming functions
@@ -48,254 +47,360 @@ static inline void radeon_emit_clip_rect
 		   box->x1, box->y1, box->x2, box->y2 );
 
 	BEGIN_RING( 4 );
+
 	OUT_RING( CP_PACKET0( RADEON_RE_TOP_LEFT, 0 ) );
 	OUT_RING( (box->y1 << 16) | box->x1 );
+
 	OUT_RING( CP_PACKET0( RADEON_RE_WIDTH_HEIGHT, 0 ) );
 	OUT_RING( ((box->y2 - 1) << 16) | (box->x2 - 1) );
+
 	ADVANCE_RING();
 }
 
-/* Emit 1.1 state
- */
-static void radeon_emit_state( drm_radeon_private_t *dev_priv,
-			       drm_radeon_context_regs_t *ctx,
-			       drm_radeon_texture_regs_t *tex,
-			       unsigned int dirty )
+static inline void radeon_emit_context( drm_radeon_private_t *dev_priv )
+{
+	drm_radeon_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	drm_radeon_context_regs_t *ctx = &sarea_priv->context_state;
+	RING_LOCALS;
+	DRM_DEBUG( "    %s\n", __FUNCTION__ );
+
+	BEGIN_RING( 14 );
+
+	OUT_RING( CP_PACKET0( RADEON_PP_MISC, 6 ) );
+	OUT_RING( ctx->pp_misc );
+	OUT_RING( ctx->pp_fog_color );
+	OUT_RING( ctx->re_solid_color );
+	OUT_RING( ctx->rb3d_blendcntl );
+	OUT_RING( ctx->rb3d_depthoffset );
+	OUT_RING( ctx->rb3d_depthpitch );
+	OUT_RING( ctx->rb3d_zstencilcntl );
+
+	OUT_RING( CP_PACKET0( RADEON_PP_CNTL, 2 ) );
+	OUT_RING( ctx->pp_cntl );
+	OUT_RING( ctx->rb3d_cntl );
+	OUT_RING( ctx->rb3d_coloroffset );
+
+	OUT_RING( CP_PACKET0( RADEON_RB3D_COLORPITCH, 0 ) );
+	OUT_RING( ctx->rb3d_colorpitch );
+
+	ADVANCE_RING();
+}
+
+static inline void radeon_emit_vertfmt( drm_radeon_private_t *dev_priv )
+{
+	drm_radeon_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	drm_radeon_context_regs_t *ctx = &sarea_priv->context_state;
+	RING_LOCALS;
+	DRM_DEBUG( "    %s\n", __FUNCTION__ );
+
+	BEGIN_RING( 2 );
+
+	OUT_RING( CP_PACKET0( RADEON_SE_COORD_FMT, 0 ) );
+	OUT_RING( ctx->se_coord_fmt );
+
+	ADVANCE_RING();
+}
+
+static inline void radeon_emit_line( drm_radeon_private_t *dev_priv )
 {
+	drm_radeon_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	drm_radeon_context_regs_t *ctx = &sarea_priv->context_state;
+	RING_LOCALS;
+	DRM_DEBUG( "    %s\n", __FUNCTION__ );
+
+	BEGIN_RING( 5 );
+
+	OUT_RING( CP_PACKET0( RADEON_RE_LINE_PATTERN, 1 ) );
+	OUT_RING( ctx->re_line_pattern );
+	OUT_RING( ctx->re_line_state );
+
+	OUT_RING( CP_PACKET0( RADEON_SE_LINE_WIDTH, 0 ) );
+	OUT_RING( ctx->se_line_width );
+
+	ADVANCE_RING();
+}
+
+static inline void radeon_emit_bumpmap( drm_radeon_private_t *dev_priv )
+{
+	drm_radeon_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	drm_radeon_context_regs_t *ctx = &sarea_priv->context_state;
 	RING_LOCALS;
-	DRM_DEBUG( "dirty=0x%08x\n", dirty );
+	DRM_DEBUG( "    %s\n", __FUNCTION__ );
+
+	BEGIN_RING( 5 );
+
+	OUT_RING( CP_PACKET0( RADEON_PP_LUM_MATRIX, 0 ) );
+	OUT_RING( ctx->pp_lum_matrix );
+
+	OUT_RING( CP_PACKET0( RADEON_PP_ROT_MATRIX_0, 1 ) );
+	OUT_RING( ctx->pp_rot_matrix_0 );
+	OUT_RING( ctx->pp_rot_matrix_1 );
+
+	ADVANCE_RING();
+}
+
+static inline void radeon_emit_masks( drm_radeon_private_t *dev_priv )
+{
+	drm_radeon_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	drm_radeon_context_regs_t *ctx = &sarea_priv->context_state;
+	RING_LOCALS;
+	DRM_DEBUG( "    %s\n", __FUNCTION__ );
+
+	BEGIN_RING( 4 );
+
+	OUT_RING( CP_PACKET0( RADEON_RB3D_STENCILREFMASK, 2 ) );
+	OUT_RING( ctx->rb3d_stencilrefmask );
+	OUT_RING( ctx->rb3d_ropcntl );
+	OUT_RING( ctx->rb3d_planemask );
+
+	ADVANCE_RING();
+}
+
+static inline void radeon_emit_viewport( drm_radeon_private_t *dev_priv )
+{
+	drm_radeon_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	drm_radeon_context_regs_t *ctx = &sarea_priv->context_state;
+	RING_LOCALS;
+	DRM_DEBUG( "    %s\n", __FUNCTION__ );
+
+	BEGIN_RING( 7 );
+
+	OUT_RING( CP_PACKET0( RADEON_SE_VPORT_XSCALE, 5 ) );
+	OUT_RING( ctx->se_vport_xscale );
+	OUT_RING( ctx->se_vport_xoffset );
+	OUT_RING( ctx->se_vport_yscale );
+	OUT_RING( ctx->se_vport_yoffset );
+	OUT_RING( ctx->se_vport_zscale );
+	OUT_RING( ctx->se_vport_zoffset );
+
+	ADVANCE_RING();
+}
+
+static inline void radeon_emit_setup( drm_radeon_private_t *dev_priv )
+{
+	drm_radeon_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	drm_radeon_context_regs_t *ctx = &sarea_priv->context_state;
+	RING_LOCALS;
+	DRM_DEBUG( "    %s\n", __FUNCTION__ );
+
+	BEGIN_RING( 4 );
+
+	OUT_RING( CP_PACKET0( RADEON_SE_CNTL, 0 ) );
+	OUT_RING( ctx->se_cntl );
+	OUT_RING( CP_PACKET0( RADEON_SE_CNTL_STATUS, 0 ) );
+	OUT_RING( ctx->se_cntl_status );
+
+	ADVANCE_RING();
+}
+
+static inline void radeon_emit_tcl( drm_radeon_private_t *dev_priv )
+{
+#ifdef TCL_ENABLE
+	drm_radeon_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	drm_radeon_context_regs_t *ctx = &sarea_priv->context_state;
+	RING_LOCALS;
+	DRM_DEBUG( "    %s\n", __FUNCTION__ );
+
+	BEGIN_RING( 29 );
+
+	OUT_RING( CP_PACKET0( RADEON_SE_TCL_MATERIAL_EMMISSIVE_RED, 27 ) );
+	OUT_RING( ctx->se_tcl_material_emmissive.red );
+	OUT_RING( ctx->se_tcl_material_emmissive.green );
+	OUT_RING( ctx->se_tcl_material_emmissive.blue );
+	OUT_RING( ctx->se_tcl_material_emmissive.alpha );
+	OUT_RING( ctx->se_tcl_material_ambient.red );
+	OUT_RING( ctx->se_tcl_material_ambient.green );
+	OUT_RING( ctx->se_tcl_material_ambient.blue );
+	OUT_RING( ctx->se_tcl_material_ambient.alpha );
+	OUT_RING( ctx->se_tcl_material_diffuse.red );
+	OUT_RING( ctx->se_tcl_material_diffuse.green );
+	OUT_RING( ctx->se_tcl_material_diffuse.blue );
+	OUT_RING( ctx->se_tcl_material_diffuse.alpha );
+	OUT_RING( ctx->se_tcl_material_specular.red );
+	OUT_RING( ctx->se_tcl_material_specular.green );
+	OUT_RING( ctx->se_tcl_material_specular.blue );
+	OUT_RING( ctx->se_tcl_material_specular.alpha );
+	OUT_RING( ctx->se_tcl_shininess );
+	OUT_RING( ctx->se_tcl_output_vtx_fmt );
+	OUT_RING( ctx->se_tcl_output_vtx_sel );
+	OUT_RING( ctx->se_tcl_matrix_select_0 );
+	OUT_RING( ctx->se_tcl_matrix_select_1 );
+	OUT_RING( ctx->se_tcl_ucp_vert_blend_ctl );
+	OUT_RING( ctx->se_tcl_texture_proc_ctl );
+	OUT_RING( ctx->se_tcl_light_model_ctl );
+	for ( i = 0 ; i < 4 ; i++ ) {
+		OUT_RING( ctx->se_tcl_per_light_ctl[i] );
+	}
+
+	ADVANCE_RING();
+#else
+	DRM_ERROR( "TCL not enabled!\n" );
+#endif
+}
+
+static inline void radeon_emit_misc( drm_radeon_private_t *dev_priv )
+{
+	drm_radeon_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	drm_radeon_context_regs_t *ctx = &sarea_priv->context_state;
+	RING_LOCALS;
+	DRM_DEBUG( "    %s\n", __FUNCTION__ );
+
+	BEGIN_RING( 2 );
+
+	OUT_RING( CP_PACKET0( RADEON_RE_MISC, 0 ) );
+	OUT_RING( ctx->re_misc );
+
+	ADVANCE_RING();
+}
+
+static inline void radeon_emit_tex0( drm_radeon_private_t *dev_priv )
+{
+	drm_radeon_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	drm_radeon_texture_regs_t *tex = &sarea_priv->tex_state[0];
+	RING_LOCALS;
+	DRM_DEBUG( "    %s: offset=0x%x\n", __FUNCTION__, tex->pp_txoffset );
+
+	BEGIN_RING( 9 );
+
+	OUT_RING( CP_PACKET0( RADEON_PP_TXFILTER_0, 5 ) );
+	OUT_RING( tex->pp_txfilter );
+	OUT_RING( tex->pp_txformat );
+	OUT_RING( tex->pp_txoffset );
+	OUT_RING( tex->pp_txcblend );
+	OUT_RING( tex->pp_txablend );
+	OUT_RING( tex->pp_tfactor );
+
+	OUT_RING( CP_PACKET0( RADEON_PP_BORDER_COLOR_0, 0 ) );
+	OUT_RING( tex->pp_border_color );
+
+	ADVANCE_RING();
+}
+
+static inline void radeon_emit_tex1( drm_radeon_private_t *dev_priv )
+{
+	drm_radeon_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	drm_radeon_texture_regs_t *tex = &sarea_priv->tex_state[1];
+	RING_LOCALS;
+	DRM_DEBUG( "    %s: offset=0x%x\n", __FUNCTION__, tex->pp_txoffset );
+
+	BEGIN_RING( 9 );
+
+	OUT_RING( CP_PACKET0( RADEON_PP_TXFILTER_1, 5 ) );
+	OUT_RING( tex->pp_txfilter );
+	OUT_RING( tex->pp_txformat );
+	OUT_RING( tex->pp_txoffset );
+	OUT_RING( tex->pp_txcblend );
+	OUT_RING( tex->pp_txablend );
+	OUT_RING( tex->pp_tfactor );
+
+	OUT_RING( CP_PACKET0( RADEON_PP_BORDER_COLOR_1, 0 ) );
+	OUT_RING( tex->pp_border_color );
+
+	ADVANCE_RING();
+}
+
+static inline void radeon_emit_tex2( drm_radeon_private_t *dev_priv )
+{
+	drm_radeon_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	drm_radeon_texture_regs_t *tex = &sarea_priv->tex_state[2];
+	RING_LOCALS;
+	DRM_DEBUG( "    %s\n", __FUNCTION__ );
+
+	BEGIN_RING( 9 );
+
+	OUT_RING( CP_PACKET0( RADEON_PP_TXFILTER_2, 5 ) );
+	OUT_RING( tex->pp_txfilter );
+	OUT_RING( tex->pp_txformat );
+	OUT_RING( tex->pp_txoffset );
+	OUT_RING( tex->pp_txcblend );
+	OUT_RING( tex->pp_txablend );
+	OUT_RING( tex->pp_tfactor );
+
+	OUT_RING( CP_PACKET0( RADEON_PP_BORDER_COLOR_2, 0 ) );
+	OUT_RING( tex->pp_border_color );
+
+	ADVANCE_RING();
+}
+
+static inline void radeon_emit_state( drm_radeon_private_t *dev_priv )
+{
+	drm_radeon_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	unsigned int dirty = sarea_priv->dirty;
+
+	DRM_DEBUG( "%s: dirty=0x%08x\n", __FUNCTION__, dirty );
 
 	if ( dirty & RADEON_UPLOAD_CONTEXT ) {
-		BEGIN_RING( 14 );
-		OUT_RING( CP_PACKET0( RADEON_PP_MISC, 6 ) );
-		OUT_RING( ctx->pp_misc );
-		OUT_RING( ctx->pp_fog_color );
-		OUT_RING( ctx->re_solid_color );
-		OUT_RING( ctx->rb3d_blendcntl );
-		OUT_RING( ctx->rb3d_depthoffset );
-		OUT_RING( ctx->rb3d_depthpitch );
-		OUT_RING( ctx->rb3d_zstencilcntl );
-		OUT_RING( CP_PACKET0( RADEON_PP_CNTL, 2 ) );
-		OUT_RING( ctx->pp_cntl );
-		OUT_RING( ctx->rb3d_cntl );
-		OUT_RING( ctx->rb3d_coloroffset );
-		OUT_RING( CP_PACKET0( RADEON_RB3D_COLORPITCH, 0 ) );
-		OUT_RING( ctx->rb3d_colorpitch );
-		ADVANCE_RING();
+		radeon_emit_context( dev_priv );
+		sarea_priv->dirty &= ~RADEON_UPLOAD_CONTEXT;
 	}
 
 	if ( dirty & RADEON_UPLOAD_VERTFMT ) {
-		BEGIN_RING( 2 );
-		OUT_RING( CP_PACKET0( RADEON_SE_COORD_FMT, 0 ) );
-		OUT_RING( ctx->se_coord_fmt );
-		ADVANCE_RING();
+		radeon_emit_vertfmt( dev_priv );
+		sarea_priv->dirty &= ~RADEON_UPLOAD_VERTFMT;
 	}
 
 	if ( dirty & RADEON_UPLOAD_LINE ) {
-		BEGIN_RING( 5 );
-		OUT_RING( CP_PACKET0( RADEON_RE_LINE_PATTERN, 1 ) );
-		OUT_RING( ctx->re_line_pattern );
-		OUT_RING( ctx->re_line_state );
-		OUT_RING( CP_PACKET0( RADEON_SE_LINE_WIDTH, 0 ) );
-		OUT_RING( ctx->se_line_width );
-		ADVANCE_RING();
+		radeon_emit_line( dev_priv );
+		sarea_priv->dirty &= ~RADEON_UPLOAD_LINE;
 	}
 
 	if ( dirty & RADEON_UPLOAD_BUMPMAP ) {
-		BEGIN_RING( 5 );
-		OUT_RING( CP_PACKET0( RADEON_PP_LUM_MATRIX, 0 ) );
-		OUT_RING( ctx->pp_lum_matrix );
-		OUT_RING( CP_PACKET0( RADEON_PP_ROT_MATRIX_0, 1 ) );
-		OUT_RING( ctx->pp_rot_matrix_0 );
-		OUT_RING( ctx->pp_rot_matrix_1 );
-		ADVANCE_RING();
+		radeon_emit_bumpmap( dev_priv );
+		sarea_priv->dirty &= ~RADEON_UPLOAD_BUMPMAP;
 	}
 
 	if ( dirty & RADEON_UPLOAD_MASKS ) {
-		BEGIN_RING( 4 );
-		OUT_RING( CP_PACKET0( RADEON_RB3D_STENCILREFMASK, 2 ) );
-		OUT_RING( ctx->rb3d_stencilrefmask );
-		OUT_RING( ctx->rb3d_ropcntl );
-		OUT_RING( ctx->rb3d_planemask );
-		ADVANCE_RING();
+		radeon_emit_masks( dev_priv );
+		sarea_priv->dirty &= ~RADEON_UPLOAD_MASKS;
 	}
 
 	if ( dirty & RADEON_UPLOAD_VIEWPORT ) {
-		BEGIN_RING( 7 );
-		OUT_RING( CP_PACKET0( RADEON_SE_VPORT_XSCALE, 5 ) );
-		OUT_RING( ctx->se_vport_xscale );
-		OUT_RING( ctx->se_vport_xoffset );
-		OUT_RING( ctx->se_vport_yscale );
-		OUT_RING( ctx->se_vport_yoffset );
-		OUT_RING( ctx->se_vport_zscale );
-		OUT_RING( ctx->se_vport_zoffset );
-		ADVANCE_RING();
+		radeon_emit_viewport( dev_priv );
+		sarea_priv->dirty &= ~RADEON_UPLOAD_VIEWPORT;
 	}
 
 	if ( dirty & RADEON_UPLOAD_SETUP ) {
-		BEGIN_RING( 4 );
-		OUT_RING( CP_PACKET0( RADEON_SE_CNTL, 0 ) );
-		OUT_RING( ctx->se_cntl );
-		OUT_RING( CP_PACKET0( RADEON_SE_CNTL_STATUS, 0 ) );
-		OUT_RING( ctx->se_cntl_status );
-		ADVANCE_RING();
+		radeon_emit_setup( dev_priv );
+		sarea_priv->dirty &= ~RADEON_UPLOAD_SETUP;
+	}
+
+	if ( dirty & RADEON_UPLOAD_TCL ) {
+#ifdef TCL_ENABLE
+		radeon_emit_tcl( dev_priv );
+#endif
+		sarea_priv->dirty &= ~RADEON_UPLOAD_TCL;
 	}
 
 	if ( dirty & RADEON_UPLOAD_MISC ) {
-		BEGIN_RING( 2 );
-		OUT_RING( CP_PACKET0( RADEON_RE_MISC, 0 ) );
-		OUT_RING( ctx->re_misc );
-		ADVANCE_RING();
+		radeon_emit_misc( dev_priv );
+		sarea_priv->dirty &= ~RADEON_UPLOAD_MISC;
 	}
 
 	if ( dirty & RADEON_UPLOAD_TEX0 ) {
-		BEGIN_RING( 9 );
-		OUT_RING( CP_PACKET0( RADEON_PP_TXFILTER_0, 5 ) );
-		OUT_RING( tex[0].pp_txfilter );
-		OUT_RING( tex[0].pp_txformat );
-		OUT_RING( tex[0].pp_txoffset );
-		OUT_RING( tex[0].pp_txcblend );
-		OUT_RING( tex[0].pp_txablend );
-		OUT_RING( tex[0].pp_tfactor );
-		OUT_RING( CP_PACKET0( RADEON_PP_BORDER_COLOR_0, 0 ) );
-		OUT_RING( tex[0].pp_border_color );
-		ADVANCE_RING();
+		radeon_emit_tex0( dev_priv );
+		sarea_priv->dirty &= ~RADEON_UPLOAD_TEX0;
 	}
 
 	if ( dirty & RADEON_UPLOAD_TEX1 ) {
-		BEGIN_RING( 9 );
-		OUT_RING( CP_PACKET0( RADEON_PP_TXFILTER_1, 5 ) );
-		OUT_RING( tex[1].pp_txfilter );
-		OUT_RING( tex[1].pp_txformat );
-		OUT_RING( tex[1].pp_txoffset );
-		OUT_RING( tex[1].pp_txcblend );
-		OUT_RING( tex[1].pp_txablend );
-		OUT_RING( tex[1].pp_tfactor );
-		OUT_RING( CP_PACKET0( RADEON_PP_BORDER_COLOR_1, 0 ) );
-		OUT_RING( tex[1].pp_border_color );
-		ADVANCE_RING();
+		radeon_emit_tex1( dev_priv );
+		sarea_priv->dirty &= ~RADEON_UPLOAD_TEX1;
 	}
 
 	if ( dirty & RADEON_UPLOAD_TEX2 ) {
-		BEGIN_RING( 9 );
-		OUT_RING( CP_PACKET0( RADEON_PP_TXFILTER_2, 5 ) );
-		OUT_RING( tex[2].pp_txfilter );
-		OUT_RING( tex[2].pp_txformat );
-		OUT_RING( tex[2].pp_txoffset );
-		OUT_RING( tex[2].pp_txcblend );
-		OUT_RING( tex[2].pp_txablend );
-		OUT_RING( tex[2].pp_tfactor );
-		OUT_RING( CP_PACKET0( RADEON_PP_BORDER_COLOR_2, 0 ) );
-		OUT_RING( tex[2].pp_border_color );
-		ADVANCE_RING();
-	}
-}
-
-/* Emit 1.2 state
- */
-static void radeon_emit_state2( drm_radeon_private_t *dev_priv,
-				drm_radeon_state_t *state )
-{
-	RING_LOCALS;
-
-	if (state->dirty & RADEON_UPLOAD_ZBIAS) {
-		BEGIN_RING( 3 );
-		OUT_RING( CP_PACKET0( RADEON_SE_ZBIAS_FACTOR, 1 ) );
-		OUT_RING( state->context2.se_zbias_factor ); 
-		OUT_RING( state->context2.se_zbias_constant ); 
-		ADVANCE_RING();
+#if 0
+		radeon_emit_tex2( dev_priv );
+#endif
+		sarea_priv->dirty &= ~RADEON_UPLOAD_TEX2;
 	}
 
-	radeon_emit_state( dev_priv, &state->context, 
-			   state->tex, state->dirty );
+	sarea_priv->dirty &= ~(RADEON_UPLOAD_TEX0IMAGES |
+			       RADEON_UPLOAD_TEX1IMAGES |
+			       RADEON_UPLOAD_TEX2IMAGES |
+			       RADEON_REQUIRE_QUIESCENCE);
 }
 
-/* New (1.3) state mechanism.  3 commands (packet, scalar, vector) in
- * 1.3 cmdbuffers allow all previous state to be updated as well as
- * the tcl scalar and vector areas.  
- */
-static struct { 
-	int start; 
-	int len; 
-	const char *name;
-} packet[RADEON_MAX_STATE_PACKETS] = {
-	{ RADEON_PP_MISC,7,"RADEON_PP_MISC" },
-	{ RADEON_PP_CNTL,3,"RADEON_PP_CNTL" },
-	{ RADEON_RB3D_COLORPITCH,1,"RADEON_RB3D_COLORPITCH" },
-	{ RADEON_RE_LINE_PATTERN,2,"RADEON_RE_LINE_PATTERN" },
-	{ RADEON_SE_LINE_WIDTH,1,"RADEON_SE_LINE_WIDTH" },
-	{ RADEON_PP_LUM_MATRIX,1,"RADEON_PP_LUM_MATRIX" },
-	{ RADEON_PP_ROT_MATRIX_0,2,"RADEON_PP_ROT_MATRIX_0" },
-	{ RADEON_RB3D_STENCILREFMASK,3,"RADEON_RB3D_STENCILREFMASK" },
-	{ RADEON_SE_VPORT_XSCALE,6,"RADEON_SE_VPORT_XSCALE" },
-	{ RADEON_SE_CNTL,2,"RADEON_SE_CNTL" },
-	{ RADEON_SE_CNTL_STATUS,1,"RADEON_SE_CNTL_STATUS" },
-	{ RADEON_RE_MISC,1,"RADEON_RE_MISC" },
-	{ RADEON_PP_TXFILTER_0,6,"RADEON_PP_TXFILTER_0" },
-	{ RADEON_PP_BORDER_COLOR_0,1,"RADEON_PP_BORDER_COLOR_0" },
-	{ RADEON_PP_TXFILTER_1,6,"RADEON_PP_TXFILTER_1" },
-	{ RADEON_PP_BORDER_COLOR_1,1,"RADEON_PP_BORDER_COLOR_1" },
-	{ RADEON_PP_TXFILTER_2,6,"RADEON_PP_TXFILTER_2" },
-	{ RADEON_PP_BORDER_COLOR_2,1,"RADEON_PP_BORDER_COLOR_2" },
-	{ RADEON_SE_ZBIAS_FACTOR,2,"RADEON_SE_ZBIAS_FACTOR" },
-	{ RADEON_SE_TCL_OUTPUT_VTX_FMT,11,"RADEON_SE_TCL_OUTPUT_VTX_FMT" },
-	{ RADEON_SE_TCL_MATERIAL_EMMISSIVE_RED,17,"RADEON_SE_TCL_MATERIAL_EMMISSIVE_RED" },
-	{ R200_PP_TXCBLEND_0, 4, "R200_PP_TXCBLEND_0" },
-	{ R200_PP_TXCBLEND_1, 4, "R200_PP_TXCBLEND_1" },
-	{ R200_PP_TXCBLEND_2, 4, "R200_PP_TXCBLEND_2" },
-	{ R200_PP_TXCBLEND_3, 4, "R200_PP_TXCBLEND_3" },
-	{ R200_PP_TXCBLEND_4, 4, "R200_PP_TXCBLEND_4" },
-	{ R200_PP_TXCBLEND_5, 4, "R200_PP_TXCBLEND_5" },
-	{ R200_PP_TXCBLEND_6, 4, "R200_PP_TXCBLEND_6" },
-	{ R200_PP_TXCBLEND_7, 4, "R200_PP_TXCBLEND_7" },
-	{ R200_SE_TCL_LIGHT_MODEL_CTL_0, 6, "R200_SE_TCL_LIGHT_MODEL_CTL_0" },
-	{ R200_PP_TFACTOR_0, 6, "R200_PP_TFACTOR_0" },
-	{ R200_SE_VTX_FMT_0, 4, "R200_SE_VTX_FMT_0" },
-	{ R200_SE_VAP_CNTL, 1, "R200_SE_VAP_CNTL" },
-	{ R200_SE_TCL_MATRIX_SEL_0, 5, "R200_SE_TCL_MATRIX_SEL_0" },
-	{ R200_SE_TCL_TEX_PROC_CTL_2, 5, "R200_SE_TCL_TEX_PROC_CTL_2" },
-	{ R200_SE_TCL_UCP_VERT_BLEND_CTL, 1, "R200_SE_TCL_UCP_VERT_BLEND_CTL" },
-	{ R200_PP_TXFILTER_0, 6, "R200_PP_TXFILTER_0" },
-	{ R200_PP_TXFILTER_1, 6, "R200_PP_TXFILTER_1" },
-	{ R200_PP_TXFILTER_2, 6, "R200_PP_TXFILTER_2" },
-	{ R200_PP_TXFILTER_3, 6, "R200_PP_TXFILTER_3" },
-	{ R200_PP_TXFILTER_4, 6, "R200_PP_TXFILTER_4" },
-	{ R200_PP_TXFILTER_5, 6, "R200_PP_TXFILTER_5" },
-	{ R200_PP_TXOFFSET_0, 1, "R200_PP_TXOFFSET_0" },
-	{ R200_PP_TXOFFSET_1, 1, "R200_PP_TXOFFSET_1" },
-	{ R200_PP_TXOFFSET_2, 1, "R200_PP_TXOFFSET_2" },
-	{ R200_PP_TXOFFSET_3, 1, "R200_PP_TXOFFSET_3" },
-	{ R200_PP_TXOFFSET_4, 1, "R200_PP_TXOFFSET_4" },
-	{ R200_PP_TXOFFSET_5, 1, "R200_PP_TXOFFSET_5" },
-	{ R200_SE_VTE_CNTL, 1, "R200_SE_VTE_CNTL" },
-	{ R200_SE_TCL_OUTPUT_VTX_COMP_SEL, 1, "R200_SE_TCL_OUTPUT_VTX_COMP_SEL" },
-	{ R200_PP_TAM_DEBUG3, 1, "R200_PP_TAM_DEBUG3" },
-	{ R200_PP_CNTL_X, 1, "R200_PP_CNTL_X" }, 
-	{ R200_RB3D_DEPTHXY_OFFSET, 1, "R200_RB3D_DEPTHXY_OFFSET" }, 
-	{ R200_RE_AUX_SCISSOR_CNTL, 1, "R200_RE_AUX_SCISSOR_CNTL" }, 
-	{ R200_RE_SCISSOR_TL_0, 2, "R200_RE_SCISSOR_TL_0" }, 
-	{ R200_RE_SCISSOR_TL_1, 2, "R200_RE_SCISSOR_TL_1" }, 
-	{ R200_RE_SCISSOR_TL_2, 2, "R200_RE_SCISSOR_TL_2" }, 
-	{ R200_SE_VAP_CNTL_STATUS, 1, "R200_SE_VAP_CNTL_STATUS" }, 
-	{ R200_SE_VTX_STATE_CNTL, 1, "R200_SE_VTX_STATE_CNTL" }, 
-	{ R200_RE_POINTSIZE, 1, "R200_RE_POINTSIZE" }, 
-	{ R200_SE_TCL_INPUT_VTX_VECTOR_ADDR_0, 4, "R200_SE_TCL_INPUT_VTX_VECTOR_ADDR_0" },
-	{ R200_PP_CUBIC_FACES_0, 1, "R200_PP_CUBIC_FACES_0" }, /* 61 */
-	{ R200_PP_CUBIC_OFFSET_F1_0, 5, "R200_PP_CUBIC_OFFSET_F1_0" }, /* 62 */
-	{ R200_PP_CUBIC_FACES_1, 1, "R200_PP_CUBIC_FACES_1" },
-	{ R200_PP_CUBIC_OFFSET_F1_1, 5, "R200_PP_CUBIC_OFFSET_F1_1" },
-	{ R200_PP_CUBIC_FACES_2, 1, "R200_PP_CUBIC_FACES_2" },
-	{ R200_PP_CUBIC_OFFSET_F1_2, 5, "R200_PP_CUBIC_OFFSET_F1_2" },
-	{ R200_PP_CUBIC_FACES_3, 1, "R200_PP_CUBIC_FACES_3" },
-	{ R200_PP_CUBIC_OFFSET_F1_3, 5, "R200_PP_CUBIC_OFFSET_F1_3" },
-	{ R200_PP_CUBIC_FACES_4, 1, "R200_PP_CUBIC_FACES_4" },
-	{ R200_PP_CUBIC_OFFSET_F1_4, 5, "R200_PP_CUBIC_OFFSET_F1_4" },
-	{ R200_PP_CUBIC_FACES_5, 1, "R200_PP_CUBIC_FACES_5" },
-	{ R200_PP_CUBIC_OFFSET_F1_5, 5, "R200_PP_CUBIC_OFFSET_F1_5" },
-};
-
-
 
+#if RADEON_PERFORMANCE_BOXES
 /* ================================================================
  * Performance monitoring functions
  */
@@ -304,12 +409,10 @@ static void radeon_clear_box( drm_radeon
 			      int x, int y, int w, int h,
 			      int r, int g, int b )
 {
+	u32 pitch, offset;
 	u32 color;
 	RING_LOCALS;
 
-	x += dev_priv->sarea_priv->boxes[0].x1;
-	y += dev_priv->sarea_priv->boxes[0].y1;
-
 	switch ( dev_priv->color_fmt ) {
 	case RADEON_COLOR_FORMAT_RGB565:
 		color = (((r & 0xf8) << 8) |
@@ -322,11 +425,8 @@ static void radeon_clear_box( drm_radeon
 		break;
 	}
 
-	BEGIN_RING( 4 );
-	RADEON_WAIT_UNTIL_3D_IDLE();		
-	OUT_RING( CP_PACKET0( RADEON_DP_WRITE_MASK, 0 ) );
-	OUT_RING( 0xffffffff );
-	ADVANCE_RING();
+	offset = dev_priv->back_offset;
+	pitch = dev_priv->back_pitch >> 3;
 
 	BEGIN_RING( 6 );
 
@@ -338,12 +438,7 @@ static void radeon_clear_box( drm_radeon
 		  RADEON_ROP3_P |
 		  RADEON_GMC_CLR_CMP_CNTL_DIS );
 
- 	if ( dev_priv->page_flipping && dev_priv->current_page == 1 ) { 
-		OUT_RING( dev_priv->front_pitch_offset );
- 	} else {	 
-		OUT_RING( dev_priv->back_pitch_offset );
- 	} 
-
+	OUT_RING( (pitch << 22) | (offset >> 5) );
 	OUT_RING( color );
 
 	OUT_RING( (x << 16) | y );
@@ -354,77 +449,53 @@ static void radeon_clear_box( drm_radeon
 
 static void radeon_cp_performance_boxes( drm_radeon_private_t *dev_priv )
 {
-	/* Collapse various things into a wait flag -- trying to
-	 * guess if userspase slept -- better just to have them tell us.
-	 */
-	if (dev_priv->stats.last_frame_reads > 1 ||
-	    dev_priv->stats.last_clear_reads > dev_priv->stats.clears) {
-		dev_priv->stats.boxes |= RADEON_BOX_WAIT_IDLE;
-	}
-
-	if (dev_priv->stats.freelist_loops) {
-		dev_priv->stats.boxes |= RADEON_BOX_WAIT_IDLE;
-	}
-
-	/* Purple box for page flipping
-	 */
-	if ( dev_priv->stats.boxes & RADEON_BOX_FLIP ) 
-		radeon_clear_box( dev_priv, 4, 4, 8, 8, 255, 0, 255 );
-
-	/* Red box if we have to wait for idle at any point
-	 */
-	if ( dev_priv->stats.boxes & RADEON_BOX_WAIT_IDLE ) 
-		radeon_clear_box( dev_priv, 16, 4, 8, 8, 255, 0, 0 );
-
-	/* Blue box: lost context?
-	 */
-
-	/* Yellow box for texture swaps
-	 */
-	if ( dev_priv->stats.boxes & RADEON_BOX_TEXTURE_LOAD ) 
-		radeon_clear_box( dev_priv, 40, 4, 8, 8, 255, 255, 0 );
-
-	/* Green box if hardware never idles (as far as we can tell)
-	 */
-	if ( !(dev_priv->stats.boxes & RADEON_BOX_DMA_IDLE) ) 
+	if ( atomic_read( &dev_priv->idle_count ) == 0 ) {
 		radeon_clear_box( dev_priv, 64, 4, 8, 8, 0, 255, 0 );
-
-
-	/* Draw bars indicating number of buffers allocated 
-	 * (not a great measure, easily confused)
-	 */
-	if (dev_priv->stats.requested_bufs) {
-		if (dev_priv->stats.requested_bufs > 100)
-			dev_priv->stats.requested_bufs = 100;
-
-		radeon_clear_box( dev_priv, 4, 16,  
-				  dev_priv->stats.requested_bufs, 4,
-				  196, 128, 128 );
+	} else {
+		atomic_set( &dev_priv->idle_count, 0 );
 	}
+}
+
+#endif
 
-	memset( &dev_priv->stats, 0, sizeof(dev_priv->stats) );
 
-}
 /* ================================================================
  * CP command dispatch functions
  */
 
+static void radeon_print_dirty( const char *msg, unsigned int flags )
+{
+	DRM_DEBUG( "%s: (0x%x) %s%s%s%s%s%s%s%s%s%s%s%s%s%s\n",
+		   msg,
+		   flags,
+		   (flags & RADEON_UPLOAD_CONTEXT)     ? "context, " : "",
+		   (flags & RADEON_UPLOAD_VERTFMT)     ? "vertfmt, " : "",
+		   (flags & RADEON_UPLOAD_LINE)        ? "line, " : "",
+		   (flags & RADEON_UPLOAD_BUMPMAP)     ? "bumpmap, " : "",
+		   (flags & RADEON_UPLOAD_MASKS)       ? "masks, " : "",
+		   (flags & RADEON_UPLOAD_VIEWPORT)    ? "viewport, " : "",
+		   (flags & RADEON_UPLOAD_SETUP)       ? "setup, " : "",
+		   (flags & RADEON_UPLOAD_TCL)         ? "tcl, " : "",
+		   (flags & RADEON_UPLOAD_MISC)        ? "misc, " : "",
+		   (flags & RADEON_UPLOAD_TEX0)        ? "tex0, " : "",
+		   (flags & RADEON_UPLOAD_TEX1)        ? "tex1, " : "",
+		   (flags & RADEON_UPLOAD_TEX2)        ? "tex2, " : "",
+		   (flags & RADEON_UPLOAD_CLIPRECTS)   ? "cliprects, " : "",
+		   (flags & RADEON_REQUIRE_QUIESCENCE) ? "quiescence, " : "" );
+}
+
 static void radeon_cp_dispatch_clear( drm_device_t *dev,
 				      drm_radeon_clear_t *clear,
 				      drm_radeon_clear_rect_t *depth_boxes )
 {
 	drm_radeon_private_t *dev_priv = dev->dev_private;
 	drm_radeon_sarea_t *sarea_priv = dev_priv->sarea_priv;
-	drm_radeon_depth_clear_t *depth_clear = &dev_priv->depth_clear;
 	int nbox = sarea_priv->nbox;
 	drm_clip_rect_t *pbox = sarea_priv->boxes;
 	unsigned int flags = clear->flags;
-	u32 rb3d_cntl = 0, rb3d_stencilrefmask= 0;
 	int i;
 	RING_LOCALS;
-	DRM_DEBUG( "flags = 0x%x\n", flags );
-
-	dev_priv->stats.clears++;
+	DRM_DEBUG( "%s\n", __FUNCTION__ );
 
 	if ( dev_priv->page_flipping && dev_priv->current_page == 1 ) {
 		unsigned int tmp = flags;
@@ -434,277 +505,127 @@ static void radeon_cp_dispatch_clear( dr
 		if ( tmp & RADEON_BACK )  flags |= RADEON_FRONT;
 	}
 
-	if ( flags & (RADEON_FRONT | RADEON_BACK) ) {
-
-		BEGIN_RING( 4 );
+	for ( i = 0 ; i < nbox ; i++ ) {
+		int x = pbox[i].x1;
+		int y = pbox[i].y1;
+		int w = pbox[i].x2 - x;
+		int h = pbox[i].y2 - y;
 
-		/* Ensure the 3D stream is idle before doing a
-		 * 2D fill to clear the front or back buffer.
-		 */
-		RADEON_WAIT_UNTIL_3D_IDLE();
-		
-		OUT_RING( CP_PACKET0( RADEON_DP_WRITE_MASK, 0 ) );
-		OUT_RING( clear->color_mask );
+		DRM_DEBUG( "dispatch clear %d,%d-%d,%d flags 0x%x\n",
+			   x, y, w, h, flags );
 
-		ADVANCE_RING();
+		if ( flags & (RADEON_FRONT | RADEON_BACK) ) {
+			BEGIN_RING( 4 );
 
-		/* Make sure we restore the 3D state next time.
-		 */
-		dev_priv->sarea_priv->ctx_owner = 0;
+			/* Ensure the 3D stream is idle before doing a
+			 * 2D fill to clear the front or back buffer.
+			 */
+			RADEON_WAIT_UNTIL_3D_IDLE();
 
-		for ( i = 0 ; i < nbox ; i++ ) {
-			int x = pbox[i].x1;
-			int y = pbox[i].y1;
-			int w = pbox[i].x2 - x;
-			int h = pbox[i].y2 - y;
-
-			DRM_DEBUG( "dispatch clear %d,%d-%d,%d flags 0x%x\n",
-				   x, y, w, h, flags );
-
-			if ( flags & RADEON_FRONT ) {
-				BEGIN_RING( 6 );
-				
-				OUT_RING( CP_PACKET3( RADEON_CNTL_PAINT_MULTI, 4 ) );
-				OUT_RING( RADEON_GMC_DST_PITCH_OFFSET_CNTL |
-					  RADEON_GMC_BRUSH_SOLID_COLOR |
-					  (dev_priv->color_fmt << 8) |
-					  RADEON_GMC_SRC_DATATYPE_COLOR |
-					  RADEON_ROP3_P |
-					  RADEON_GMC_CLR_CMP_CNTL_DIS );
-
-				OUT_RING( dev_priv->front_pitch_offset );
-				OUT_RING( clear->clear_color );
-				
-				OUT_RING( (x << 16) | y );
-				OUT_RING( (w << 16) | h );
-				
-				ADVANCE_RING();
-			}
-			
-			if ( flags & RADEON_BACK ) {
-				BEGIN_RING( 6 );
-				
-				OUT_RING( CP_PACKET3( RADEON_CNTL_PAINT_MULTI, 4 ) );
-				OUT_RING( RADEON_GMC_DST_PITCH_OFFSET_CNTL |
-					  RADEON_GMC_BRUSH_SOLID_COLOR |
-					  (dev_priv->color_fmt << 8) |
-					  RADEON_GMC_SRC_DATATYPE_COLOR |
-					  RADEON_ROP3_P |
-					  RADEON_GMC_CLR_CMP_CNTL_DIS );
-				
-				OUT_RING( dev_priv->back_pitch_offset );
-				OUT_RING( clear->clear_color );
+			OUT_RING( CP_PACKET0( RADEON_DP_WRITE_MASK, 0 ) );
+			OUT_RING( clear->color_mask );
 
-				OUT_RING( (x << 16) | y );
-				OUT_RING( (w << 16) | h );
+			ADVANCE_RING();
 
-				ADVANCE_RING();
-			}
+			/* Make sure we restore the 3D state next time.
+			 */
+			dev_priv->sarea_priv->dirty |= (RADEON_UPLOAD_CONTEXT |
+							RADEON_UPLOAD_MASKS);
 		}
-	}
-
-	/* We have to clear the depth and/or stencil buffers by
-	 * rendering a quad into just those buffers.  Thus, we have to
-	 * make sure the 3D engine is configured correctly.
-	 */
-	if ( dev_priv->is_r200 &&
-	     (flags & (RADEON_DEPTH | RADEON_STENCIL)) ) {
-
-		int tempPP_CNTL;
-		int tempRE_CNTL;
-		int tempRB3D_CNTL;
-		int tempRB3D_ZSTENCILCNTL;
-		int tempRB3D_STENCILREFMASK;
-		int tempRB3D_PLANEMASK;
-		int tempSE_CNTL;
-		int tempSE_VTE_CNTL;
-		int tempSE_VTX_FMT_0;
-		int tempSE_VTX_FMT_1;
-		int tempSE_VAP_CNTL;
-		int tempRE_AUX_SCISSOR_CNTL;
-
-		tempPP_CNTL = 0;
-		tempRE_CNTL = 0;
 
-		tempRB3D_CNTL = depth_clear->rb3d_cntl;
-		tempRB3D_CNTL &= ~(1<<15); /* unset radeon magic flag */
+		if ( flags & RADEON_FRONT ) {
+			BEGIN_RING( 6 );
 
-		tempRB3D_ZSTENCILCNTL = depth_clear->rb3d_zstencilcntl;
-		tempRB3D_STENCILREFMASK = 0x0;
-
-		tempSE_CNTL = depth_clear->se_cntl;
-
-
-
-		/* Disable TCL */
-
-		tempSE_VAP_CNTL = (/* SE_VAP_CNTL__FORCE_W_TO_ONE_MASK |  */
-				   (0x9 << SE_VAP_CNTL__VF_MAX_VTX_NUM__SHIFT));
-
-		tempRB3D_PLANEMASK = 0x0;
-
-		tempRE_AUX_SCISSOR_CNTL = 0x0;
-
-		tempSE_VTE_CNTL =
-			SE_VTE_CNTL__VTX_XY_FMT_MASK |
-			SE_VTE_CNTL__VTX_Z_FMT_MASK;
-
-		/* Vertex format (X, Y, Z, W)*/
-		tempSE_VTX_FMT_0 =
-			SE_VTX_FMT_0__VTX_Z0_PRESENT_MASK |
-			SE_VTX_FMT_0__VTX_W0_PRESENT_MASK;
-		tempSE_VTX_FMT_1 = 0x0;
+			OUT_RING( CP_PACKET3( RADEON_CNTL_PAINT_MULTI, 4 ) );
+			OUT_RING( RADEON_GMC_DST_PITCH_OFFSET_CNTL |
+				  RADEON_GMC_BRUSH_SOLID_COLOR |
+				  (dev_priv->color_fmt << 8) |
+				  RADEON_GMC_SRC_DATATYPE_COLOR |
+				  RADEON_ROP3_P |
+				  RADEON_GMC_CLR_CMP_CNTL_DIS );
 
+			OUT_RING( dev_priv->front_pitch_offset );
+			OUT_RING( clear->clear_color );
 
-		/* 
-		 * Depth buffer specific enables 
-		 */
-		if (flags & RADEON_DEPTH) {
-			/* Enable depth buffer */
-			tempRB3D_CNTL |= RADEON_Z_ENABLE;
-		} else {
-			/* Disable depth buffer */
-			tempRB3D_CNTL &= ~RADEON_Z_ENABLE;
-		}
+			OUT_RING( (x << 16) | y );
+			OUT_RING( (w << 16) | h );
 
-		/* 
-		 * Stencil buffer specific enables
-		 */
-		if ( flags & RADEON_STENCIL ) {
-			tempRB3D_CNTL |=  RADEON_STENCIL_ENABLE;
-			tempRB3D_STENCILREFMASK = clear->depth_mask; 
-		} else {
-			tempRB3D_CNTL &= ~RADEON_STENCIL_ENABLE;
-			tempRB3D_STENCILREFMASK = 0x00000000;
+			ADVANCE_RING();
 		}
 
-		BEGIN_RING( 26 );
-		RADEON_WAIT_UNTIL_2D_IDLE();
+		if ( flags & RADEON_BACK ) {
+			BEGIN_RING( 6 );
 
-		OUT_RING_REG( RADEON_PP_CNTL, tempPP_CNTL );
-		OUT_RING_REG( R200_RE_CNTL, tempRE_CNTL );
-		OUT_RING_REG( RADEON_RB3D_CNTL, tempRB3D_CNTL );
-		OUT_RING_REG( RADEON_RB3D_ZSTENCILCNTL,
-			      tempRB3D_ZSTENCILCNTL );
-		OUT_RING_REG( RADEON_RB3D_STENCILREFMASK, 
-			      tempRB3D_STENCILREFMASK );
-		OUT_RING_REG( RADEON_RB3D_PLANEMASK, tempRB3D_PLANEMASK );
-		OUT_RING_REG( RADEON_SE_CNTL, tempSE_CNTL );
-		OUT_RING_REG( R200_SE_VTE_CNTL, tempSE_VTE_CNTL );
-		OUT_RING_REG( R200_SE_VTX_FMT_0, tempSE_VTX_FMT_0 );
-		OUT_RING_REG( R200_SE_VTX_FMT_1, tempSE_VTX_FMT_1 );
-		OUT_RING_REG( R200_SE_VAP_CNTL, tempSE_VAP_CNTL );
-		OUT_RING_REG( R200_RE_AUX_SCISSOR_CNTL, 
-			      tempRE_AUX_SCISSOR_CNTL );
-		ADVANCE_RING();
+			OUT_RING( CP_PACKET3( RADEON_CNTL_PAINT_MULTI, 4 ) );
+			OUT_RING( RADEON_GMC_DST_PITCH_OFFSET_CNTL |
+				  RADEON_GMC_BRUSH_SOLID_COLOR |
+				  (dev_priv->color_fmt << 8) |
+				  RADEON_GMC_SRC_DATATYPE_COLOR |
+				  RADEON_ROP3_P |
+				  RADEON_GMC_CLR_CMP_CNTL_DIS );
 
-		/* Make sure we restore the 3D state next time.
-		 */
-		dev_priv->sarea_priv->ctx_owner = 0;
+			OUT_RING( dev_priv->back_pitch_offset );
+			OUT_RING( clear->clear_color );
 
-		for ( i = 0 ; i < nbox ; i++ ) {
-			
-			/* Funny that this should be required -- 
-			 *  sets top-left?
-			 */
-			radeon_emit_clip_rect( dev_priv,
-					       &sarea_priv->boxes[i] );
+			OUT_RING( (x << 16) | y );
+			OUT_RING( (w << 16) | h );
 
-			BEGIN_RING( 14 );
-			OUT_RING( CP_PACKET3( R200_3D_DRAW_IMMD_2, 12 ) );
-			OUT_RING( (RADEON_PRIM_TYPE_RECT_LIST |
-				   RADEON_PRIM_WALK_RING |
-				   (3 << RADEON_NUM_VERTICES_SHIFT)) );
-			OUT_RING( depth_boxes[i].ui[CLEAR_X1] );
-			OUT_RING( depth_boxes[i].ui[CLEAR_Y1] );
-			OUT_RING( depth_boxes[i].ui[CLEAR_DEPTH] );
-			OUT_RING( 0x3f800000 );
-			OUT_RING( depth_boxes[i].ui[CLEAR_X1] );
-			OUT_RING( depth_boxes[i].ui[CLEAR_Y2] );
-			OUT_RING( depth_boxes[i].ui[CLEAR_DEPTH] );
-			OUT_RING( 0x3f800000 );
-			OUT_RING( depth_boxes[i].ui[CLEAR_X2] );
-			OUT_RING( depth_boxes[i].ui[CLEAR_Y2] );
-			OUT_RING( depth_boxes[i].ui[CLEAR_DEPTH] );
-			OUT_RING( 0x3f800000 );
 			ADVANCE_RING();
-		}
-	} 
-	else if ( (flags & (RADEON_DEPTH | RADEON_STENCIL)) ) {
 
-		rb3d_cntl = depth_clear->rb3d_cntl;
-
-		if ( flags & RADEON_DEPTH ) {
-			rb3d_cntl |=  RADEON_Z_ENABLE;
-		} else {
-			rb3d_cntl &= ~RADEON_Z_ENABLE;
-		}
-
-		if ( flags & RADEON_STENCIL ) {
-			rb3d_cntl |=  RADEON_STENCIL_ENABLE;
-			rb3d_stencilrefmask = clear->depth_mask; /* misnamed field */
-		} else {
-			rb3d_cntl &= ~RADEON_STENCIL_ENABLE;
-			rb3d_stencilrefmask = 0x00000000;
 		}
 
-		BEGIN_RING( 13 );
-		RADEON_WAIT_UNTIL_2D_IDLE();
-
-		OUT_RING( CP_PACKET0( RADEON_PP_CNTL, 1 ) );
-		OUT_RING( 0x00000000 );
-		OUT_RING( rb3d_cntl );
-		
-		OUT_RING_REG( RADEON_RB3D_ZSTENCILCNTL,
-			      depth_clear->rb3d_zstencilcntl );
-		OUT_RING_REG( RADEON_RB3D_STENCILREFMASK,
-			      rb3d_stencilrefmask );
-		OUT_RING_REG( RADEON_RB3D_PLANEMASK,
-			      0x00000000 );
-		OUT_RING_REG( RADEON_SE_CNTL,
-			      depth_clear->se_cntl );
-		ADVANCE_RING();
+		if ( flags & RADEON_DEPTH ) {
+			drm_radeon_depth_clear_t *depth_clear =
+			   &dev_priv->depth_clear;
 
-		/* Make sure we restore the 3D state next time.
-		 */
-		dev_priv->sarea_priv->ctx_owner = 0;
+			if ( sarea_priv->dirty & ~RADEON_UPLOAD_CLIPRECTS ) {
+				radeon_emit_state( dev_priv );
+			}
 
-		for ( i = 0 ; i < nbox ; i++ ) {
-			
-			/* Funny that this should be required -- 
-			 *  sets top-left?
+			/* FIXME: Render a rectangle to clear the depth
+			 * buffer.  So much for those "fast Z clears"...
 			 */
-			radeon_emit_clip_rect( dev_priv,
-					       &sarea_priv->boxes[i] );
+			BEGIN_RING( 23 );
+
+			RADEON_WAIT_UNTIL_2D_IDLE();
 
-			BEGIN_RING( 15 );
+			OUT_RING( CP_PACKET0( RADEON_PP_CNTL, 1 ) );
+			OUT_RING( 0x00000000 );
+			OUT_RING( depth_clear->rb3d_cntl );
+			OUT_RING( CP_PACKET0( RADEON_RB3D_ZSTENCILCNTL, 0 ) );
+			OUT_RING( depth_clear->rb3d_zstencilcntl );
+			OUT_RING( CP_PACKET0( RADEON_RB3D_PLANEMASK, 0 ) );
+			OUT_RING( 0x00000000 );
+			OUT_RING( CP_PACKET0( RADEON_SE_CNTL, 0 ) );
+			OUT_RING( depth_clear->se_cntl );
 
-			OUT_RING( CP_PACKET3( RADEON_3D_DRAW_IMMD, 13 ) );
-			OUT_RING( RADEON_VTX_Z_PRESENT |
-				  RADEON_VTX_PKCOLOR_PRESENT);
+			OUT_RING( CP_PACKET3( RADEON_3D_DRAW_IMMD, 10 ) );
+			OUT_RING( RADEON_VTX_Z_PRESENT );
 			OUT_RING( (RADEON_PRIM_TYPE_RECT_LIST |
 				   RADEON_PRIM_WALK_RING |
 				   RADEON_MAOS_ENABLE |
 				   RADEON_VTX_FMT_RADEON_MODE |
 				   (3 << RADEON_NUM_VERTICES_SHIFT)) );
 
-
 			OUT_RING( depth_boxes[i].ui[CLEAR_X1] );
 			OUT_RING( depth_boxes[i].ui[CLEAR_Y1] );
 			OUT_RING( depth_boxes[i].ui[CLEAR_DEPTH] );
-			OUT_RING( 0x0 );
 
 			OUT_RING( depth_boxes[i].ui[CLEAR_X1] );
 			OUT_RING( depth_boxes[i].ui[CLEAR_Y2] );
 			OUT_RING( depth_boxes[i].ui[CLEAR_DEPTH] );
-			OUT_RING( 0x0 );
 
 			OUT_RING( depth_boxes[i].ui[CLEAR_X2] );
 			OUT_RING( depth_boxes[i].ui[CLEAR_Y2] );
 			OUT_RING( depth_boxes[i].ui[CLEAR_DEPTH] );
-			OUT_RING( 0x0 );
 
 			ADVANCE_RING();
+
+			/* Make sure we restore the 3D state next time.
+			 */
+			dev_priv->sarea_priv->dirty |= (RADEON_UPLOAD_CONTEXT |
+							RADEON_UPLOAD_SETUP |
+							RADEON_UPLOAD_MASKS);
 		}
 	}
 
@@ -730,13 +651,13 @@ static void radeon_cp_dispatch_swap( drm
 	drm_clip_rect_t *pbox = sarea_priv->boxes;
 	int i;
 	RING_LOCALS;
-	DRM_DEBUG( "\n" );
+	DRM_DEBUG( "%s\n", __FUNCTION__ );
 
+#if RADEON_PERFORMANCE_BOXES
 	/* Do some trivial performance monitoring...
 	 */
-	if (dev_priv->do_boxes)
-		radeon_cp_performance_boxes( dev_priv );
-
+	radeon_cp_performance_boxes( dev_priv );
+#endif
 
 	/* Wait for the 3D stream to idle before dispatching the bitblt.
 	 * This will prevent data corruption between the two streams.
@@ -768,17 +689,9 @@ static void radeon_cp_dispatch_swap( drm
 			  RADEON_DP_SRC_SOURCE_MEMORY |
 			  RADEON_GMC_CLR_CMP_CNTL_DIS |
 			  RADEON_GMC_WR_MSK_DIS );
-		
-		/* Make this work even if front & back are flipped:
-		 */
-		if (dev_priv->current_page == 0) {
-			OUT_RING( dev_priv->back_pitch_offset );
-			OUT_RING( dev_priv->front_pitch_offset );
-		} 
-		else {
-			OUT_RING( dev_priv->front_pitch_offset );
-			OUT_RING( dev_priv->back_pitch_offset );
-		}
+
+		OUT_RING( dev_priv->back_pitch_offset );
+		OUT_RING( dev_priv->front_pitch_offset );
 
 		OUT_RING( (x << 16) | y );
 		OUT_RING( (x << 16) | y );
@@ -804,33 +717,29 @@ static void radeon_cp_dispatch_swap( drm
 static void radeon_cp_dispatch_flip( drm_device_t *dev )
 {
 	drm_radeon_private_t *dev_priv = dev->dev_private;
-	drm_sarea_t *sarea = (drm_sarea_t *)dev_priv->sarea->handle;
-	int offset = (dev_priv->current_page == 1)
-		   ? dev_priv->front_offset : dev_priv->back_offset;
-	RING_LOCALS;
-	DRM_DEBUG( "%s: page=%d pfCurrentPage=%d\n", 
-		__FUNCTION__, 
-		dev_priv->current_page,
-		dev_priv->sarea_priv->pfCurrentPage);
+	RING_LOCALS;
+	DRM_DEBUG( "%s: page=%d\n", __FUNCTION__, dev_priv->current_page );
 
+#if RADEON_PERFORMANCE_BOXES
 	/* Do some trivial performance monitoring...
 	 */
-	if (dev_priv->do_boxes) {
-		dev_priv->stats.boxes |= RADEON_BOX_FLIP;
-		radeon_cp_performance_boxes( dev_priv );
-	}
+	radeon_cp_performance_boxes( dev_priv );
+#endif
 
-	/* Update the frame offsets for both CRTCs
-	 */
 	BEGIN_RING( 6 );
 
 	RADEON_WAIT_UNTIL_3D_IDLE();
-	OUT_RING_REG( RADEON_CRTC_OFFSET, ( ( sarea->frame.y * dev_priv->front_pitch
-					      + sarea->frame.x 
-					      * ( dev_priv->color_fmt - 2 ) ) & ~7 )
-					  + offset );
-	OUT_RING_REG( RADEON_CRTC2_OFFSET, dev_priv->sarea_priv->crtc2_base
-					   + offset );
+	RADEON_WAIT_UNTIL_PAGE_FLIPPED();
+
+	OUT_RING( CP_PACKET0( RADEON_CRTC_OFFSET, 0 ) );
+
+	if ( dev_priv->current_page == 0 ) {
+		OUT_RING( dev_priv->back_offset );
+		dev_priv->current_page = 1;
+	} else {
+		OUT_RING( dev_priv->front_offset );
+		dev_priv->current_page = 0;
+	}
 
 	ADVANCE_RING();
 
@@ -839,8 +748,6 @@ static void radeon_cp_dispatch_flip( drm
 	 * performing the swapbuffer ioctl.
 	 */
 	dev_priv->sarea_priv->last_frame++;
-	dev_priv->sarea_priv->pfCurrentPage = dev_priv->current_page =
-					      1 - dev_priv->current_page;
 
 	BEGIN_RING( 2 );
 
@@ -849,118 +756,82 @@ static void radeon_cp_dispatch_flip( drm
 	ADVANCE_RING();
 }
 
-static int bad_prim_vertex_nr( int primitive, int nr )
-{
-	switch (primitive & RADEON_PRIM_TYPE_MASK) {
-	case RADEON_PRIM_TYPE_NONE:
-	case RADEON_PRIM_TYPE_POINT:
-		return nr < 1;
-	case RADEON_PRIM_TYPE_LINE:
-		return (nr & 1) || nr == 0;
-	case RADEON_PRIM_TYPE_LINE_STRIP:
-		return nr < 2;
-	case RADEON_PRIM_TYPE_TRI_LIST:
-	case RADEON_PRIM_TYPE_3VRT_POINT_LIST:
-	case RADEON_PRIM_TYPE_3VRT_LINE_LIST:
-	case RADEON_PRIM_TYPE_RECT_LIST:
-		return nr % 3 || nr == 0;
-	case RADEON_PRIM_TYPE_TRI_FAN:
-	case RADEON_PRIM_TYPE_TRI_STRIP:
-		return nr < 3;
-	default:
-		return 1;
-	}	
-}
-
-
-
-typedef struct {
-	unsigned int start;
-	unsigned int finish;
-	unsigned int prim;
-	unsigned int numverts;
-	unsigned int offset;   
-        unsigned int vc_format;
-} drm_radeon_tcl_prim_t;
-
 static void radeon_cp_dispatch_vertex( drm_device_t *dev,
-				       drm_buf_t *buf,
-				       drm_radeon_tcl_prim_t *prim,
-				       drm_clip_rect_t *boxes,
-				       int nbox )
-
+				       drm_buf_t *buf )
 {
 	drm_radeon_private_t *dev_priv = dev->dev_private;
-	drm_clip_rect_t box;
-	int offset = dev_priv->agp_buffers_offset + buf->offset + prim->start;
-	int numverts = (int)prim->numverts;
+	drm_radeon_buf_priv_t *buf_priv = buf->dev_private;
+	drm_radeon_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	int format = sarea_priv->vc_format;
+	int offset = dev_priv->agp_buffers_offset + buf->offset;
+	int size = buf->used;
+	int prim = buf_priv->prim;
 	int i = 0;
 	RING_LOCALS;
+	DRM_DEBUG( "%s: nbox=%d\n", __FUNCTION__, sarea_priv->nbox );
+
+	if ( 0 )
+		radeon_print_dirty( "dispatch_vertex", sarea_priv->dirty );
 
-	DRM_DEBUG("hwprim 0x%x vfmt 0x%x %d..%d %d verts\n",
-		  prim->prim,
-		  prim->vc_format,
-		  prim->start,
-		  prim->finish,
-		  prim->numverts);
-
-	if (bad_prim_vertex_nr( prim->prim, prim->numverts )) {
-		DRM_ERROR( "bad prim %x numverts %d\n", 
-			   prim->prim, prim->numverts );
-		return;
-	}
-
-	do {
-		/* Emit the next cliprect */
-		if ( i < nbox ) {
-			if (__copy_from_user( &box, &boxes[i], sizeof(box) ))
-				return;
+	if ( buf->used ) {
+		buf_priv->dispatched = 1;
 
-			radeon_emit_clip_rect( dev_priv, &box );
+		if ( sarea_priv->dirty & ~RADEON_UPLOAD_CLIPRECTS ) {
+			radeon_emit_state( dev_priv );
 		}
 
-		/* Emit the vertex buffer rendering commands */
-		BEGIN_RING( 5 );
+		do {
+			/* Emit the next set of up to three cliprects */
+			if ( i < sarea_priv->nbox ) {
+				radeon_emit_clip_rect( dev_priv,
+						       &sarea_priv->boxes[i] );
+			}
 
-		OUT_RING( CP_PACKET3( RADEON_3D_RNDR_GEN_INDX_PRIM, 3 ) );
-		OUT_RING( offset );
-		OUT_RING( numverts );
-		OUT_RING( prim->vc_format );
-		OUT_RING( prim->prim | RADEON_PRIM_WALK_LIST |
-			  RADEON_COLOR_ORDER_RGBA |
-			  RADEON_VTX_FMT_RADEON_MODE |
-			  (numverts << RADEON_NUM_VERTICES_SHIFT) );
+			/* Emit the vertex buffer rendering commands */
+			BEGIN_RING( 5 );
 
-		ADVANCE_RING();
+			OUT_RING( CP_PACKET3( RADEON_3D_RNDR_GEN_INDX_PRIM, 3 ) );
+			OUT_RING( offset );
+			OUT_RING( size );
+			OUT_RING( format );
+			OUT_RING( prim | RADEON_PRIM_WALK_LIST |
+				  RADEON_COLOR_ORDER_RGBA |
+				  RADEON_VTX_FMT_RADEON_MODE |
+				  (size << RADEON_NUM_VERTICES_SHIFT) );
 
-		i++;
-	} while ( i < nbox );
-}
+			ADVANCE_RING();
 
+			i++;
+		} while ( i < sarea_priv->nbox );
+	}
 
+	if ( buf_priv->discard ) {
+		buf_priv->age = dev_priv->sarea_priv->last_dispatch;
 
-static void radeon_cp_discard_buffer( drm_device_t *dev, drm_buf_t *buf )
-{
-	drm_radeon_private_t *dev_priv = dev->dev_private;
-	drm_radeon_buf_priv_t *buf_priv = buf->dev_private;
-	RING_LOCALS;
+		/* Emit the vertex buffer age */
+		BEGIN_RING( 2 );
+		RADEON_DISPATCH_AGE( buf_priv->age );
+		ADVANCE_RING();
 
-	buf_priv->age = ++dev_priv->sarea_priv->last_dispatch;
+		buf->pending = 1;
+		buf->used = 0;
+		/* FIXME: Check dispatched field */
+		buf_priv->dispatched = 0;
+	}
 
-	/* Emit the vertex buffer age */
-	BEGIN_RING( 2 );
-	RADEON_DISPATCH_AGE( buf_priv->age );
-	ADVANCE_RING();
+	dev_priv->sarea_priv->last_dispatch++;
 
-	buf->pending = 1;
-	buf->used = 0;
+	sarea_priv->dirty &= ~RADEON_UPLOAD_CLIPRECTS;
+	sarea_priv->nbox = 0;
 }
 
+
 static void radeon_cp_dispatch_indirect( drm_device_t *dev,
 					 drm_buf_t *buf,
 					 int start, int end )
 {
 	drm_radeon_private_t *dev_priv = dev->dev_private;
+	drm_radeon_buf_priv_t *buf_priv = buf->dev_private;
 	RING_LOCALS;
 	DRM_DEBUG( "indirect: buf=%d s=0x%x e=0x%x\n",
 		   buf->idx, start, end );
@@ -981,6 +852,8 @@ static void radeon_cp_dispatch_indirect(
 			data[dwords++] = RADEON_CP_PACKET2;
 		}
 
+		buf_priv->dispatched = 1;
+
 		/* Fire off the indirect buffer */
 		BEGIN_RING( 3 );
 
@@ -990,75 +863,100 @@ static void radeon_cp_dispatch_indirect(
 
 		ADVANCE_RING();
 	}
-}
 
+	if ( buf_priv->discard ) {
+		buf_priv->age = dev_priv->sarea_priv->last_dispatch;
+
+		/* Emit the indirect buffer age */
+		BEGIN_RING( 2 );
+		RADEON_DISPATCH_AGE( buf_priv->age );
+		ADVANCE_RING();
+
+		buf->pending = 1;
+		buf->used = 0;
+		/* FIXME: Check dispatched field */
+		buf_priv->dispatched = 0;
+	}
+
+	dev_priv->sarea_priv->last_dispatch++;
+}
 
 static void radeon_cp_dispatch_indices( drm_device_t *dev,
-					drm_buf_t *elt_buf,
-					drm_radeon_tcl_prim_t *prim, 
-					drm_clip_rect_t *boxes,
-					int nbox )
+					drm_buf_t *buf,
+					int start, int end,
+					int count )
 {
 	drm_radeon_private_t *dev_priv = dev->dev_private;
-	drm_clip_rect_t box;
-	int offset = dev_priv->agp_buffers_offset + prim->offset;
+	drm_radeon_buf_priv_t *buf_priv = buf->dev_private;
+	drm_radeon_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	int format = sarea_priv->vc_format;
+	int offset = dev_priv->agp_buffers_offset;
+	int prim = buf_priv->prim;
 	u32 *data;
 	int dwords;
 	int i = 0;
-	int start = prim->start + RADEON_INDEX_PRIM_OFFSET;
-	int count = (prim->finish - start) / sizeof(u16);
+	RING_LOCALS;
+	DRM_DEBUG( "indices: s=%d e=%d c=%d\n", start, end, count );
 
-	DRM_DEBUG("hwprim 0x%x vfmt 0x%x %d..%d offset: %x nr %d\n",
-		  prim->prim,
-		  prim->vc_format,
-		  prim->start,
-		  prim->finish,
-		  prim->offset,
-		  prim->numverts);
-
-	if (bad_prim_vertex_nr( prim->prim, count )) {
-		DRM_ERROR( "bad prim %x count %d\n", 
-			   prim->prim, count );
-		return;
-	}
+	if ( 0 )
+		radeon_print_dirty( "dispatch_indices", sarea_priv->dirty );
 
+	if ( start != end ) {
+		buf_priv->dispatched = 1;
 
-	if ( start >= prim->finish ||
-	     (prim->start & 0x7) ) {
-		DRM_ERROR( "buffer prim %d\n", prim->prim );
-		return;
-	}
-
-	dwords = (prim->finish - prim->start + 3) / sizeof(u32);
-
-	data = (u32 *)((char *)dev_priv->buffers->handle +
-		       elt_buf->offset + prim->start);
-
-	data[0] = CP_PACKET3( RADEON_3D_RNDR_GEN_INDX_PRIM, dwords-2 );
-	data[1] = offset;
-	data[2] = prim->numverts;
-	data[3] = prim->vc_format;
-	data[4] = (prim->prim |
-		   RADEON_PRIM_WALK_IND |
-		   RADEON_COLOR_ORDER_RGBA |
-		   RADEON_VTX_FMT_RADEON_MODE |
-		   (count << RADEON_NUM_VERTICES_SHIFT) );
-
-	do {
-		if ( i < nbox ) {
-			if (__copy_from_user( &box, &boxes[i], sizeof(box) ))
-				return;
-			
-			radeon_emit_clip_rect( dev_priv, &box );
+		if ( sarea_priv->dirty & ~RADEON_UPLOAD_CLIPRECTS ) {
+			radeon_emit_state( dev_priv );
 		}
 
-		radeon_cp_dispatch_indirect( dev, elt_buf,
-					     prim->start,
-					     prim->finish );
+		dwords = (end - start + 3) / sizeof(u32);
+
+		data = (u32 *)((char *)dev_priv->buffers->handle
+			       + buf->offset + start);
 
-		i++;
-	} while ( i < nbox );
+		data[0] = CP_PACKET3( RADEON_3D_RNDR_GEN_INDX_PRIM, dwords-2 );
+
+		data[1] = offset;
+		data[2] = RADEON_MAX_VB_VERTS;
+		data[3] = format;
+		data[4] = (prim | RADEON_PRIM_WALK_IND |
+			   RADEON_COLOR_ORDER_RGBA |
+			   RADEON_VTX_FMT_RADEON_MODE |
+			   (count << RADEON_NUM_VERTICES_SHIFT) );
+
+		if ( count & 0x1 ) {
+			data[dwords-1] &= 0x0000ffff;
+		}
 
+		do {
+			/* Emit the next set of up to three cliprects */
+			if ( i < sarea_priv->nbox ) {
+				radeon_emit_clip_rect( dev_priv,
+						       &sarea_priv->boxes[i] );
+			}
+
+			radeon_cp_dispatch_indirect( dev, buf, start, end );
+
+			i++;
+		} while ( i < sarea_priv->nbox );
+	}
+
+	if ( buf_priv->discard ) {
+		buf_priv->age = dev_priv->sarea_priv->last_dispatch;
+
+		/* Emit the vertex buffer age */
+		BEGIN_RING( 2 );
+		RADEON_DISPATCH_AGE( buf_priv->age );
+		ADVANCE_RING();
+
+		buf->pending = 1;
+		/* FIXME: Check dispatched field */
+		buf_priv->dispatched = 0;
+	}
+
+	dev_priv->sarea_priv->last_dispatch++;
+
+	sarea_priv->dirty &= ~RADEON_UPLOAD_CLIPRECTS;
+	sarea_priv->nbox = 0;
 }
 
 #define RADEON_MAX_TEXTURE_SIZE (RADEON_BUFFER_SIZE - 8 * sizeof(u32))
@@ -1069,16 +967,15 @@ static int radeon_cp_dispatch_texture( d
 {
 	drm_radeon_private_t *dev_priv = dev->dev_private;
 	drm_buf_t *buf;
+	drm_radeon_buf_priv_t *buf_priv;
 	u32 format;
 	u32 *buffer;
-	const u8 *data;
+	u8 *data;
 	int size, dwords, tex_width, blit_width;
 	u32 y, height;
 	int ret = 0, i;
 	RING_LOCALS;
 
-	dev_priv->stats.boxes |= RADEON_BOX_TEXTURE_LOAD;
-
 	/* FIXME: Be smarter about this...
 	 */
 	buf = radeon_freelist_get( dev );
@@ -1088,6 +985,8 @@ static int radeon_cp_dispatch_texture( d
 		   tex->offset >> 10, tex->pitch, tex->format,
 		   image->x, image->y, image->width, image->height );
 
+	buf_priv = buf->dev_private;
+
 	/* The compiler won't optimize away a division by a variable,
 	 * even if the only legal values are powers of two.  Thus, we'll
 	 * use a shift instead.
@@ -1103,8 +1002,6 @@ static int radeon_cp_dispatch_texture( d
 	case RADEON_TXFORMAT_ARGB1555:
 	case RADEON_TXFORMAT_RGB565:
 	case RADEON_TXFORMAT_ARGB4444:
-	case RADEON_TXFORMAT_VYUY422:
-	case RADEON_TXFORMAT_YVYU422:
 		format = RADEON_COLOR_FORMAT_RGB565;
 		tex_width = tex->width * 2;
 		blit_width = image->width * 2;
@@ -1134,22 +1031,12 @@ static int radeon_cp_dispatch_texture( d
 
 	ADVANCE_RING();
 
-#ifdef __BIG_ENDIAN
-	/* The Mesa texture functions provide the data in little endian as the
-	 * chip wants it, but we need to compensate for the fact that the CP
-	 * ring gets byte-swapped
-	 */
-	BEGIN_RING( 2 );
-	OUT_RING_REG( RADEON_RBBM_GUICNTL, RADEON_HOST_DATA_SWAP_32BIT );
-	ADVANCE_RING();
-#endif
-
 	/* Make a copy of the parameters in case we have to update them
 	 * for a multi-pass texture blit.
 	 */
 	y = image->y;
 	height = image->height;
-	data = (const u8 *)image->data;
+	data = (u8 *)image->data;
 
 	size = height * blit_width;
 
@@ -1164,7 +1051,7 @@ static int radeon_cp_dispatch_texture( d
 		/* Update the input parameters for next time */
 		image->y += height;
 		image->height -= height;
-		image->data = (const char *)image->data + size;
+		image->data = (char *)image->data + size;
 
 		if ( copy_to_user( tex->image, image, sizeof(*image) ) ) {
 			DRM_ERROR( "EFAULT on tex->image\n" );
@@ -1225,9 +1112,9 @@ static int radeon_cp_dispatch_texture( d
 
 	buf->pid = current->pid;
 	buf->used = (dwords + 8) * sizeof(u32);
+	buf_priv->discard = 1;
 
 	radeon_cp_dispatch_indirect( dev, buf, 0, buf->used );
-	radeon_cp_discard_buffer( dev, buf );
 
 	/* Flush the pixel cache after the blit completes.  This ensures
 	 * the texture data is written out to memory before rendering
@@ -1243,13 +1130,12 @@ static int radeon_cp_dispatch_texture( d
 	return ret;
 }
 
-
 static void radeon_cp_dispatch_stipple( drm_device_t *dev, u32 *stipple )
 {
 	drm_radeon_private_t *dev_priv = dev->dev_private;
 	int i;
 	RING_LOCALS;
-	DRM_DEBUG( "\n" );
+	DRM_DEBUG( "%s\n", __FUNCTION__ );
 
 	BEGIN_RING( 35 );
 
@@ -1270,97 +1156,33 @@ static void radeon_cp_dispatch_stipple( 
  */
 
 int radeon_cp_clear( struct inode *inode, struct file *filp,
-		     unsigned int cmd, unsigned long arg )
-{
-	drm_file_t *priv = filp->private_data;
-	drm_device_t *dev = priv->dev;
-	drm_radeon_private_t *dev_priv = dev->dev_private;
-	drm_radeon_sarea_t *sarea_priv = dev_priv->sarea_priv;
-	drm_radeon_clear_t clear;
-	drm_radeon_clear_rect_t depth_boxes[RADEON_NR_SAREA_CLIPRECTS];
-	DRM_DEBUG( "\n" );
-
-	LOCK_TEST_WITH_RETURN( dev );
-
-	if ( copy_from_user( &clear, (drm_radeon_clear_t *)arg,
-			     sizeof(clear) ) )
-		return -EFAULT;
-
-	RING_SPACE_TEST_WITH_RETURN( dev_priv );
-
-	if ( sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS )
-		sarea_priv->nbox = RADEON_NR_SAREA_CLIPRECTS;
-
-	if ( copy_from_user( &depth_boxes, clear.depth_boxes,
-			     sarea_priv->nbox * sizeof(depth_boxes[0]) ) )
-		return -EFAULT;
-
-	radeon_cp_dispatch_clear( dev, &clear, depth_boxes );
-
-	COMMIT_RING();
-	return 0;
-}
-
-
-/* Not sure why this isn't set all the time:
- */ 
-static int radeon_do_init_pageflip( drm_device_t *dev )
-{
-	drm_radeon_private_t *dev_priv = dev->dev_private;
-	RING_LOCALS;
-
-	DRM_DEBUG( "\n" );
-
-	BEGIN_RING( 6 );
-	RADEON_WAIT_UNTIL_3D_IDLE();
-	OUT_RING( CP_PACKET0( RADEON_CRTC_OFFSET_CNTL, 0 ) );
-	OUT_RING( RADEON_READ( RADEON_CRTC_OFFSET_CNTL ) | RADEON_CRTC_OFFSET_FLIP_CNTL );
-	OUT_RING( CP_PACKET0( RADEON_CRTC2_OFFSET_CNTL, 0 ) );
-	OUT_RING( RADEON_READ( RADEON_CRTC2_OFFSET_CNTL ) | RADEON_CRTC_OFFSET_FLIP_CNTL );
-	ADVANCE_RING();
-
-	dev_priv->page_flipping = 1;
-	dev_priv->current_page = 0;
-	dev_priv->sarea_priv->pfCurrentPage = dev_priv->current_page;
-
-	return 0;
-}
-
-/* Called whenever a client dies, from DRM(release).
- * NOTE:  Lock isn't necessarily held when this is called!
- */
-int radeon_do_cleanup_pageflip( drm_device_t *dev )
-{
-	drm_radeon_private_t *dev_priv = dev->dev_private;
-	DRM_DEBUG( "\n" );
-
-	if (dev_priv->current_page != 0)
-		radeon_cp_dispatch_flip( dev );
-
-	dev_priv->page_flipping = 0;
-	return 0;
-}
-
-/* Swapping and flipping are different operations, need different ioctls.
- * They can & should be intermixed to support multiple 3d windows.  
- */
-int radeon_cp_flip(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long data )
+		     unsigned int cmd, unsigned long arg )
 {
-        drm_file_t      *priv   = filp->private_data;
-        drm_device_t    *dev    = priv->dev;
+	drm_file_t *priv = filp->private_data;
+	drm_device_t *dev = priv->dev;
 	drm_radeon_private_t *dev_priv = dev->dev_private;
-	DRM_DEBUG( "\n" );
+	drm_radeon_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	drm_radeon_clear_t clear;
+	drm_radeon_clear_rect_t depth_boxes[RADEON_NR_SAREA_CLIPRECTS];
+	DRM_DEBUG( "%s\n", __FUNCTION__ );
 
 	LOCK_TEST_WITH_RETURN( dev );
 
+	if ( copy_from_user( &clear, (drm_radeon_clear_t *)arg,
+			     sizeof(clear) ) )
+		return -EFAULT;
+
 	RING_SPACE_TEST_WITH_RETURN( dev_priv );
 
-	if (!dev_priv->page_flipping) 
-		radeon_do_init_pageflip( dev );
-		
-	radeon_cp_dispatch_flip( dev );
+	if ( sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS )
+		sarea_priv->nbox = RADEON_NR_SAREA_CLIPRECTS;
+
+	if ( copy_from_user( &depth_boxes, clear.depth_boxes,
+			     sarea_priv->nbox * sizeof(depth_boxes[0]) ) )
+		return -EFAULT;
+
+	radeon_cp_dispatch_clear( dev, &clear, depth_boxes );
 
-	COMMIT_RING();
 	return 0;
 }
 
@@ -1371,7 +1193,7 @@ int radeon_cp_swap( struct inode *inode,
 	drm_device_t *dev = priv->dev;
 	drm_radeon_private_t *dev_priv = dev->dev_private;
 	drm_radeon_sarea_t *sarea_priv = dev_priv->sarea_priv;
-	DRM_DEBUG( "\n" );
+	DRM_DEBUG( "%s\n", __FUNCTION__ );
 
 	LOCK_TEST_WITH_RETURN( dev );
 
@@ -1380,10 +1202,14 @@ int radeon_cp_swap( struct inode *inode,
 	if ( sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS )
 		sarea_priv->nbox = RADEON_NR_SAREA_CLIPRECTS;
 
-	radeon_cp_dispatch_swap( dev );
-	dev_priv->sarea_priv->ctx_owner = 0;
+	if ( !dev_priv->page_flipping ) {
+		radeon_cp_dispatch_swap( dev );
+		dev_priv->sarea_priv->dirty |= (RADEON_UPLOAD_CONTEXT |
+						RADEON_UPLOAD_MASKS);
+	} else {
+		radeon_cp_dispatch_flip( dev );
+	}
 
-	COMMIT_RING();
 	return 0;
 }
 
@@ -1393,11 +1219,10 @@ int radeon_cp_vertex( struct inode *inod
 	drm_file_t *priv = filp->private_data;
 	drm_device_t *dev = priv->dev;
 	drm_radeon_private_t *dev_priv = dev->dev_private;
-	drm_radeon_sarea_t *sarea_priv = dev_priv->sarea_priv;
 	drm_device_dma_t *dma = dev->dma;
 	drm_buf_t *buf;
+	drm_radeon_buf_priv_t *buf_priv;
 	drm_radeon_vertex_t vertex;
-	drm_radeon_tcl_prim_t prim;
 
 	LOCK_TEST_WITH_RETURN( dev );
 
@@ -1410,8 +1235,8 @@ int radeon_cp_vertex( struct inode *inod
 			     sizeof(vertex) ) )
 		return -EFAULT;
 
-	DRM_DEBUG( "pid=%d index=%d count=%d discard=%d\n",
-		   current->pid,
+	DRM_DEBUG( "%s: pid=%d index=%d count=%d discard=%d\n",
+		   __FUNCTION__, current->pid,
 		   vertex.idx, vertex.count, vertex.discard );
 
 	if ( vertex.idx < 0 || vertex.idx >= dma->buf_count ) {
@@ -1429,6 +1254,7 @@ int radeon_cp_vertex( struct inode *inod
 	VB_AGE_TEST_WITH_RETURN( dev_priv );
 
 	buf = dma->buflist[vertex.idx];
+	buf_priv = buf->dev_private;
 
 	if ( buf->pid != current->pid ) {
 		DRM_ERROR( "process %d using buffer owned by %d\n",
@@ -1440,39 +1266,12 @@ int radeon_cp_vertex( struct inode *inod
 		return -EINVAL;
 	}
 
-	/* Build up a prim_t record:
-	 */
-	if (vertex.count) {
-		buf->used = vertex.count; /* not used? */
-
-		if ( sarea_priv->dirty & ~RADEON_UPLOAD_CLIPRECTS ) {
-			radeon_emit_state( dev_priv,
-					   &sarea_priv->context_state,
-					   sarea_priv->tex_state,
-					   sarea_priv->dirty );
-			
-			sarea_priv->dirty &= ~(RADEON_UPLOAD_TEX0IMAGES |
-					       RADEON_UPLOAD_TEX1IMAGES |
-					       RADEON_UPLOAD_TEX2IMAGES |
-					       RADEON_REQUIRE_QUIESCENCE);
-		}
-
-		prim.start = 0;
-		prim.finish = vertex.count; /* unused */
-		prim.prim = vertex.prim;
-		prim.numverts = vertex.count;
-		prim.vc_format = dev_priv->sarea_priv->vc_format;
-		
-		radeon_cp_dispatch_vertex( dev, buf, &prim,
-					   dev_priv->sarea_priv->boxes,
-					   dev_priv->sarea_priv->nbox );
-	}
+	buf->used = vertex.count;
+	buf_priv->prim = vertex.prim;
+	buf_priv->discard = vertex.discard;
 
-	if (vertex.discard) {
-		radeon_cp_discard_buffer( dev, buf );
-	}
+	radeon_cp_dispatch_vertex( dev, buf );
 
-	COMMIT_RING();
 	return 0;
 }
 
@@ -1482,11 +1281,10 @@ int radeon_cp_indices( struct inode *ino
 	drm_file_t *priv = filp->private_data;
 	drm_device_t *dev = priv->dev;
 	drm_radeon_private_t *dev_priv = dev->dev_private;
-	drm_radeon_sarea_t *sarea_priv = dev_priv->sarea_priv;
 	drm_device_dma_t *dma = dev->dma;
 	drm_buf_t *buf;
+	drm_radeon_buf_priv_t *buf_priv;
 	drm_radeon_indices_t elts;
-	drm_radeon_tcl_prim_t prim;
 	int count;
 
 	LOCK_TEST_WITH_RETURN( dev );
@@ -1519,6 +1317,7 @@ int radeon_cp_indices( struct inode *ino
 	VB_AGE_TEST_WITH_RETURN( dev_priv );
 
 	buf = dma->buflist[elts.idx];
+	buf_priv = buf->dev_private;
 
 	if ( buf->pid != current->pid ) {
 		DRM_ERROR( "process %d using buffer owned by %d\n",
@@ -1543,37 +1342,11 @@ int radeon_cp_indices( struct inode *ino
 	}
 
 	buf->used = elts.end;
+	buf_priv->prim = elts.prim;
+	buf_priv->discard = elts.discard;
 
-	if ( sarea_priv->dirty & ~RADEON_UPLOAD_CLIPRECTS ) {
-		radeon_emit_state( dev_priv,
-				   &sarea_priv->context_state,
-				   sarea_priv->tex_state,
-				   sarea_priv->dirty );
-
-		sarea_priv->dirty &= ~(RADEON_UPLOAD_TEX0IMAGES |
-				       RADEON_UPLOAD_TEX1IMAGES |
-				       RADEON_UPLOAD_TEX2IMAGES |
-				       RADEON_REQUIRE_QUIESCENCE);
-	}
-
-
-	/* Build up a prim_t record:
-	 */
-	prim.start = elts.start;
-	prim.finish = elts.end; 
-	prim.prim = elts.prim;
-	prim.offset = 0;	/* offset from start of dma buffers */
-	prim.numverts = RADEON_MAX_VB_VERTS; /* duh */
-	prim.vc_format = dev_priv->sarea_priv->vc_format;
-	
-	radeon_cp_dispatch_indices( dev, buf, &prim,
-				   dev_priv->sarea_priv->boxes,
-				   dev_priv->sarea_priv->nbox );
-	if (elts.discard) {
-		radeon_cp_discard_buffer( dev, buf );
-	}
+	radeon_cp_dispatch_indices( dev, buf, elts.start, elts.end, count );
 
-	COMMIT_RING();
 	return 0;
 }
 
@@ -1585,7 +1358,6 @@ int radeon_cp_texture( struct inode *ino
 	drm_radeon_private_t *dev_priv = dev->dev_private;
 	drm_radeon_texture_t tex;
 	drm_radeon_tex_image_t image;
-	int ret;
 
 	LOCK_TEST_WITH_RETURN( dev );
 
@@ -1605,10 +1377,7 @@ int radeon_cp_texture( struct inode *ino
 	RING_SPACE_TEST_WITH_RETURN( dev_priv );
 	VB_AGE_TEST_WITH_RETURN( dev_priv );
 
-	ret = radeon_cp_dispatch_texture( dev, &tex, &image );
-
-	COMMIT_RING();
-	return ret;
+	return radeon_cp_dispatch_texture( dev, &tex, &image );
 }
 
 int radeon_cp_stipple( struct inode *inode, struct file *filp,
@@ -1633,7 +1402,6 @@ int radeon_cp_stipple( struct inode *ino
 
 	radeon_cp_dispatch_stipple( dev, mask );
 
-	COMMIT_RING();
 	return 0;
 }
 
@@ -1645,6 +1413,7 @@ int radeon_cp_indirect( struct inode *in
 	drm_radeon_private_t *dev_priv = dev->dev_private;
 	drm_device_dma_t *dma = dev->dma;
 	drm_buf_t *buf;
+	drm_radeon_buf_priv_t *buf_priv;
 	drm_radeon_indirect_t indirect;
 	RING_LOCALS;
 
@@ -1670,6 +1439,7 @@ int radeon_cp_indirect( struct inode *in
 	}
 
 	buf = dma->buflist[indirect.idx];
+	buf_priv = buf->dev_private;
 
 	if ( buf->pid != current->pid ) {
 		DRM_ERROR( "process %d using buffer owned by %d\n",
@@ -1691,6 +1461,7 @@ int radeon_cp_indirect( struct inode *in
 	VB_AGE_TEST_WITH_RETURN( dev_priv );
 
 	buf->used = indirect.end;
+	buf_priv->discard = indirect.discard;
 
 	/* Wait for the 3D stream to idle before the indirect buffer
 	 * containing 2D acceleration commands is processed.
@@ -1706,526 +1477,6 @@ int radeon_cp_indirect( struct inode *in
 	 * privileged clients.
 	 */
 	radeon_cp_dispatch_indirect( dev, buf, indirect.start, indirect.end );
-	if (indirect.discard) {
-		radeon_cp_discard_buffer( dev, buf );
-	}
-
-
-	COMMIT_RING();
-	return 0;
-}
-
-int radeon_cp_vertex2(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long data )
-{
-        drm_file_t      *priv   = filp->private_data;
-        drm_device_t    *dev    = priv->dev;
-	drm_radeon_private_t *dev_priv = dev->dev_private;
-	drm_radeon_sarea_t *sarea_priv = dev_priv->sarea_priv;
-	drm_device_dma_t *dma = dev->dma;
-	drm_buf_t *buf;
-	drm_radeon_vertex2_t vertex;
-	int i;
-	unsigned char laststate;
-
-	LOCK_TEST_WITH_RETURN( dev );
-
-	if ( !dev_priv ) {
-		DRM_ERROR( "%s called with no initialization\n", __FUNCTION__ );
-		return -EINVAL;
-	}
-
-	DRM_COPY_FROM_USER_IOCTL( vertex, (drm_radeon_vertex2_t *)data,
-			     sizeof(vertex) );
-
-	DRM_DEBUG( "pid=%d index=%d discard=%d\n",
-		   current->pid,
-		   vertex.idx, vertex.discard );
-
-	if ( vertex.idx < 0 || vertex.idx >= dma->buf_count ) {
-		DRM_ERROR( "buffer index %d (of %d max)\n",
-			   vertex.idx, dma->buf_count - 1 );
-		return -EINVAL;
-	}
-
-	RING_SPACE_TEST_WITH_RETURN( dev_priv );
-	VB_AGE_TEST_WITH_RETURN( dev_priv );
-
-	buf = dma->buflist[vertex.idx];
-
-	if ( buf->pid != current->pid ) {
-		DRM_ERROR( "process %d using buffer owned by %d\n",
-			   current->pid, buf->pid );
-		return -EINVAL;
-	}
-
-	if ( buf->pending ) {
-		DRM_ERROR( "sending pending buffer %d\n", vertex.idx );
-		return -EINVAL;
-	}
-	
-	if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS)
-		return -EINVAL;
-
-	for (laststate = 0xff, i = 0 ; i < vertex.nr_prims ; i++) {
-		drm_radeon_prim_t prim;
-		drm_radeon_tcl_prim_t tclprim;
-		
-		if ( copy_from_user( &prim, &vertex.prim[i], sizeof(prim) ) )
-			return -EFAULT;
-		
-		if ( prim.stateidx != laststate ) {
-			drm_radeon_state_t state;			       
-				
-			if ( copy_from_user( &state, 
-					     &vertex.state[prim.stateidx], 
-					     sizeof(state) ) )
-				return -EFAULT;
-
-			radeon_emit_state2( dev_priv, &state );
-
-			laststate = prim.stateidx;
-		}
-
-		tclprim.start = prim.start;
-		tclprim.finish = prim.finish;
-		tclprim.prim = prim.prim;
-		tclprim.vc_format = prim.vc_format;
-
-		if ( prim.prim & RADEON_PRIM_WALK_IND ) {
-			tclprim.offset = prim.numverts * 64;
-			tclprim.numverts = RADEON_MAX_VB_VERTS; /* duh */
-
-			radeon_cp_dispatch_indices( dev, buf, &tclprim,
-						    sarea_priv->boxes,
-						    sarea_priv->nbox);
-		} else {
-			tclprim.numverts = prim.numverts;
-			tclprim.offset = 0; /* not used */
-
-			radeon_cp_dispatch_vertex( dev, buf, &tclprim,
-						   sarea_priv->boxes,
-						   sarea_priv->nbox);
-		}
-		
-		if (sarea_priv->nbox == 1)
-			sarea_priv->nbox = 0;
-	}
-
-	if ( vertex.discard ) {
-		radeon_cp_discard_buffer( dev, buf );
-	}
-
-	COMMIT_RING();
-	return 0;
-}
-
-
-static int radeon_emit_packets( 
-	drm_radeon_private_t *dev_priv,
-	drm_radeon_cmd_header_t header,
-	drm_radeon_cmd_buffer_t *cmdbuf )
-{
-	int id = (int)header.packet.packet_id;
-	int sz, reg;
-	int *data = (int *)cmdbuf->buf;
-	RING_LOCALS;
-   
-	if (id >= RADEON_MAX_STATE_PACKETS)
-		return -EINVAL;
-
-	sz = packet[id].len;
-	reg = packet[id].start;
-
-	if (sz * sizeof(int) > cmdbuf->bufsz) 
-		return -EINVAL;
-
-	BEGIN_RING(sz+1);
-	OUT_RING( CP_PACKET0( reg, (sz-1) ) );
-	OUT_RING_USER_TABLE( data, sz );
-	ADVANCE_RING();
-
-	cmdbuf->buf += sz * sizeof(int);
-	cmdbuf->bufsz -= sz * sizeof(int);
-	return 0;
-}
-
-static __inline__ int radeon_emit_scalars( 
-	drm_radeon_private_t *dev_priv,
-	drm_radeon_cmd_header_t header,
-	drm_radeon_cmd_buffer_t *cmdbuf )
-{
-	int sz = header.scalars.count;
-	int *data = (int *)cmdbuf->buf;
-	int start = header.scalars.offset;
-	int stride = header.scalars.stride;
-	RING_LOCALS;
-
-	BEGIN_RING( 3+sz );
-	OUT_RING( CP_PACKET0( RADEON_SE_TCL_SCALAR_INDX_REG, 0 ) );
-	OUT_RING( start | (stride << RADEON_SCAL_INDX_DWORD_STRIDE_SHIFT));
-	OUT_RING( CP_PACKET0_TABLE( RADEON_SE_TCL_SCALAR_DATA_REG, sz-1 ) );
-	OUT_RING_USER_TABLE( data, sz );
-	ADVANCE_RING();
-	cmdbuf->buf += sz * sizeof(int);
-	cmdbuf->bufsz -= sz * sizeof(int);
-	return 0;
-}
-
-/* God this is ugly
- */
-static __inline__ int radeon_emit_scalars2( 
-	drm_radeon_private_t *dev_priv,
-	drm_radeon_cmd_header_t header,
-	drm_radeon_cmd_buffer_t *cmdbuf )
-{
-	int sz = header.scalars.count;
-	int *data = (int *)cmdbuf->buf;
-	int start = ((unsigned int)header.scalars.offset) + 0x100;
-	int stride = header.scalars.stride;
-	RING_LOCALS;
-
-	BEGIN_RING( 3+sz );
-	OUT_RING( CP_PACKET0( RADEON_SE_TCL_SCALAR_INDX_REG, 0 ) );
-	OUT_RING( start | (stride << RADEON_SCAL_INDX_DWORD_STRIDE_SHIFT));
-	OUT_RING( CP_PACKET0_TABLE( RADEON_SE_TCL_SCALAR_DATA_REG, sz-1 ) );
-	OUT_RING_USER_TABLE( data, sz );
-	ADVANCE_RING();
-	cmdbuf->buf += sz * sizeof(int);
-	cmdbuf->bufsz -= sz * sizeof(int);
-	return 0;
-}
-
-static __inline__ int radeon_emit_vectors( 
-	drm_radeon_private_t *dev_priv,
-	drm_radeon_cmd_header_t header,
-	drm_radeon_cmd_buffer_t *cmdbuf )
-{
-	int sz = header.vectors.count;
-	int *data = (int *)cmdbuf->buf;
-	int start = header.vectors.offset;
-	int stride = header.vectors.stride;
-	RING_LOCALS;
-
-	BEGIN_RING( 3+sz );
-	OUT_RING( CP_PACKET0( RADEON_SE_TCL_VECTOR_INDX_REG, 0 ) );
-	OUT_RING( start | (stride << RADEON_VEC_INDX_OCTWORD_STRIDE_SHIFT));
-	OUT_RING( CP_PACKET0_TABLE( RADEON_SE_TCL_VECTOR_DATA_REG, (sz-1) ) );
-	OUT_RING_USER_TABLE( data, sz );
-	ADVANCE_RING();
-
-	cmdbuf->buf += sz * sizeof(int);
-	cmdbuf->bufsz -= sz * sizeof(int);
-	return 0;
-}
-
-
-static int radeon_emit_packet3( drm_device_t *dev,
-				drm_radeon_cmd_buffer_t *cmdbuf )
-{
-	drm_radeon_private_t *dev_priv = dev->dev_private;
-	int cmdsz, tmp;
-	int *cmd = (int *)cmdbuf->buf;
-	RING_LOCALS;
 
-
-	DRM_DEBUG("\n");
-
-	if (__get_user( tmp, &cmd[0]))
-		return -EFAULT;
-
-	cmdsz = 2 + ((tmp & RADEON_CP_PACKET_COUNT_MASK) >> 16);
-
-	if ((tmp & 0xc0000000) != RADEON_CP_PACKET3 ||
-	    cmdsz * 4 > cmdbuf->bufsz)
-		return -EINVAL;
-
-	BEGIN_RING( cmdsz );
-	OUT_RING_USER_TABLE( cmd, cmdsz );
-	ADVANCE_RING();
-
-	cmdbuf->buf += cmdsz * 4;
-	cmdbuf->bufsz -= cmdsz * 4;
-	return 0;
-}
-
-
-static int radeon_emit_packet3_cliprect( drm_device_t *dev,
-					 drm_radeon_cmd_buffer_t *cmdbuf,
-					 int orig_nbox )
-{
-	drm_radeon_private_t *dev_priv = dev->dev_private;
-	drm_clip_rect_t box;
-	int cmdsz, tmp;
-	int *cmd = (int *)cmdbuf->buf;
-	drm_clip_rect_t *boxes = cmdbuf->boxes;
-	int i = 0;
-	RING_LOCALS;
-
-	DRM_DEBUG("\n");
-
-	if (__get_user( tmp, &cmd[0]))
-		return -EFAULT;
-
-	cmdsz = 2 + ((tmp & RADEON_CP_PACKET_COUNT_MASK) >> 16);
-
-	if ((tmp & 0xc0000000) != RADEON_CP_PACKET3 ||
-	    cmdsz * 4 > cmdbuf->bufsz)
-		return -EINVAL;
-
-	if (!orig_nbox)
-		goto out;
-
-	do {
-		if ( i < cmdbuf->nbox ) {
-			if (__copy_from_user( &box, &boxes[i], sizeof(box) ))
-				return -EFAULT;
-			/* FIXME The second and subsequent times round
-			 * this loop, send a WAIT_UNTIL_3D_IDLE before
-			 * calling emit_clip_rect(). This fixes a
-			 * lockup on fast machines when sending
-			 * several cliprects with a cmdbuf, as when
-			 * waving a 2D window over a 3D
-			 * window. Something in the commands from user
-			 * space seems to hang the card when they're
-			 * sent several times in a row. That would be
-			 * the correct place to fix it but this works
-			 * around it until I can figure that out - Tim
-			 * Smith */
-			if ( i ) {
-				BEGIN_RING( 2 );
-				RADEON_WAIT_UNTIL_3D_IDLE();
-				ADVANCE_RING();
-			}
-			radeon_emit_clip_rect( dev_priv, &box );
-		}
-		
-		BEGIN_RING( cmdsz );
-		OUT_RING_USER_TABLE( cmd, cmdsz );
-		ADVANCE_RING();
-
-	} while ( ++i < cmdbuf->nbox );
- 	if (cmdbuf->nbox == 1)
-		cmdbuf->nbox = 0;
-
- out:
-	cmdbuf->buf += cmdsz * 4;
-	cmdbuf->bufsz -= cmdsz * 4;
-	return 0;
-}
-
-
-static int radeon_emit_wait( drm_device_t *dev, int flags )
-{
-	drm_radeon_private_t *dev_priv = dev->dev_private;
-	RING_LOCALS;
-
-	DRM_DEBUG("%s: %x\n", __FUNCTION__, flags);
-	switch (flags) {
-	case RADEON_WAIT_2D:
-		BEGIN_RING( 2 );
-		RADEON_WAIT_UNTIL_2D_IDLE(); 
-		ADVANCE_RING();
-		break;
-	case RADEON_WAIT_3D:
-		BEGIN_RING( 2 );
-		RADEON_WAIT_UNTIL_3D_IDLE(); 
-		ADVANCE_RING();
-		break;
-	case RADEON_WAIT_2D|RADEON_WAIT_3D:
-		BEGIN_RING( 2 );
-		RADEON_WAIT_UNTIL_IDLE(); 
-		ADVANCE_RING();
-		break;
-	default:
-		return -EINVAL;
-	}
-
-	return 0;
-}
-
-int radeon_cp_cmdbuf(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long data )
-{
-        drm_file_t      *priv   = filp->private_data;
-        drm_device_t    *dev    = priv->dev;
-	drm_radeon_private_t *dev_priv = dev->dev_private;
-	drm_device_dma_t *dma = dev->dma;
-	drm_buf_t *buf = 0;
-	int idx;
-	drm_radeon_cmd_buffer_t cmdbuf;
-	drm_radeon_cmd_header_t header;
-	int orig_nbox;
-
-	LOCK_TEST_WITH_RETURN( dev );
-
-	if ( !dev_priv ) {
-		DRM_ERROR( "%s called with no initialization\n", __FUNCTION__ );
-		return -EINVAL;
-	}
-
-	DRM_COPY_FROM_USER_IOCTL( cmdbuf, (drm_radeon_cmd_buffer_t *)data,
-			     sizeof(cmdbuf) );
-
-	RING_SPACE_TEST_WITH_RETURN( dev_priv );
-	VB_AGE_TEST_WITH_RETURN( dev_priv );
-
-
-	if (verify_area( VERIFY_READ, cmdbuf.buf, cmdbuf.bufsz ))
-		return -EFAULT;
-
-	if (cmdbuf.nbox &&
-	    verify_area( VERIFY_READ, cmdbuf.boxes, 
-			 cmdbuf.nbox * sizeof(drm_clip_rect_t)))
-		return -EFAULT;
-
-	orig_nbox = cmdbuf.nbox;
-
-	while ( cmdbuf.bufsz >= sizeof(header) ) {
-		
-		if (__get_user( header.i, (int *)cmdbuf.buf )) {
-			DRM_ERROR("__get_user %p\n", cmdbuf.buf);
-			return -EFAULT;
-		}
-
-		cmdbuf.buf += sizeof(header);
-		cmdbuf.bufsz -= sizeof(header);
-
-		switch (header.header.cmd_type) {
-		case RADEON_CMD_PACKET: 
-			DRM_DEBUG("RADEON_CMD_PACKET\n");
-			if (radeon_emit_packets( dev_priv, header, &cmdbuf )) {
-				DRM_ERROR("radeon_emit_packets failed\n");
-				return -EINVAL;
-			}
-			break;
-
-		case RADEON_CMD_SCALARS:
-			DRM_DEBUG("RADEON_CMD_SCALARS\n");
-			if (radeon_emit_scalars( dev_priv, header, &cmdbuf )) {
-				DRM_ERROR("radeon_emit_scalars failed\n");
-				return -EINVAL;
-			}
-			break;
-
-		case RADEON_CMD_VECTORS:
-			DRM_DEBUG("RADEON_CMD_VECTORS\n");
-			if (radeon_emit_vectors( dev_priv, header, &cmdbuf )) {
-				DRM_ERROR("radeon_emit_vectors failed\n");
-				return -EINVAL;
-			}
-			break;
-
-		case RADEON_CMD_DMA_DISCARD:
-			DRM_DEBUG("RADEON_CMD_DMA_DISCARD\n");
-			idx = header.dma.buf_idx;
-			if ( idx < 0 || idx >= dma->buf_count ) {
-				DRM_ERROR( "buffer index %d (of %d max)\n",
-					   idx, dma->buf_count - 1 );
-				return -EINVAL;
-			}
-
-			buf = dma->buflist[idx];
-			if ( buf->pid != current->pid || buf->pending ) {
-				DRM_ERROR( "bad buffer\n" );
-				return -EINVAL;
-			}
-
-			radeon_cp_discard_buffer( dev, buf );
-			break;
-
-		case RADEON_CMD_PACKET3:
-			DRM_DEBUG("RADEON_CMD_PACKET3\n");
-			if (radeon_emit_packet3( dev, &cmdbuf )) {
-				DRM_ERROR("radeon_emit_packet3 failed\n");
-				return -EINVAL;
-			}
-			break;
-
-		case RADEON_CMD_PACKET3_CLIP:
-			DRM_DEBUG("RADEON_CMD_PACKET3_CLIP\n");
-			if (radeon_emit_packet3_cliprect( dev, &cmdbuf, orig_nbox )) {
-				DRM_ERROR("radeon_emit_packet3_clip failed\n");
-				return -EINVAL;
-			}
-			break;
-
-		case RADEON_CMD_SCALARS2:
-			DRM_DEBUG("RADEON_CMD_SCALARS2\n");
-			if (radeon_emit_scalars2( dev_priv, header, &cmdbuf )) {
-				DRM_ERROR("radeon_emit_scalars2 failed\n");
-				return -EINVAL;
-			}
-			break;
-
-		case RADEON_CMD_WAIT:
-			DRM_DEBUG("RADEON_CMD_WAIT\n");
-			if (radeon_emit_wait( dev, header.wait.flags )) {
-				DRM_ERROR("radeon_emit_wait failed\n");
-				return -EINVAL;
-			}
-			break;
-		default:
-			DRM_ERROR("bad cmd_type %d at %p\n", 
-				  header.header.cmd_type,
-				  cmdbuf.buf - sizeof(header));
-			return -EINVAL;
-		}
-	}
-
-
-	DRM_DEBUG("DONE\n");
-	COMMIT_RING();
-	return 0;
-}
-
-
-
-int radeon_cp_getparam(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long data)
-{
-        drm_file_t      *priv   = filp->private_data;
-        drm_device_t    *dev    = priv->dev;
-	drm_radeon_private_t *dev_priv = dev->dev_private;
-	drm_radeon_getparam_t param;
-	int value;
-
-	if ( !dev_priv ) {
-		DRM_ERROR( "%s called with no initialization\n", __FUNCTION__ );
-		return -EINVAL;
-	}
-
-	DRM_COPY_FROM_USER_IOCTL( param, (drm_radeon_getparam_t *)data,
-			     sizeof(param) );
-
-	DRM_DEBUG( "pid=%d\n", current->pid );
-
-	switch( param.param ) {
-	case RADEON_PARAM_AGP_BUFFER_OFFSET:
-		value = dev_priv->agp_buffers_offset;
-		break;
-	case RADEON_PARAM_LAST_FRAME:
-		dev_priv->stats.last_frame_reads++;
-		value = GET_SCRATCH( 0 );
-		break;
-	case RADEON_PARAM_LAST_DISPATCH:
-		value = GET_SCRATCH( 1 );
-		break;
-	case RADEON_PARAM_LAST_CLEAR:
-		dev_priv->stats.last_clear_reads++;
-		value = GET_SCRATCH( 2 );
-		break;
-	case RADEON_PARAM_IRQ_NR:
-		value = dev->irq;
-		break;
-	case RADEON_PARAM_AGP_BASE:
-		value = dev_priv->agp_vm_start;
-		break;
-	default:
-		return -EINVAL;
-	}
-
-	if ( copy_to_user( param.value, &value, sizeof(int) ) ) {
-		DRM_ERROR( "copy_to_user\n" );
-		return -EFAULT;
-	}
-	
 	return 0;
 }
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/sis.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/sis.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/sis.h	2003-07-30 13:51:24.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/sis.h	2001-12-21 18:41:53.000000000 +0100
@@ -24,7 +24,7 @@
  * DEALINGS IN THE SOFTWARE.
  * 
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/sis.h,v 1.2 2001/12/19 21:25:59 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/sis.h,v 1.1 2001/05/19 18:29:22 dawes Exp $ */
 
 #ifndef __SIS_H__
 #define __SIS_H__
@@ -42,31 +42,6 @@
 #define __HAVE_MTRR		1
 #define __HAVE_CTX_BITMAP	1
 
-#define DRIVER_AUTHOR	 "SIS"
-#define DRIVER_NAME	 "sis"
-#define DRIVER_DESC	 "SIS 300/630/540"
-#define DRIVER_DATE	 "20010503"
-#define DRIVER_MAJOR	 1
-#define DRIVER_MINOR	 0
-#define DRIVER_PATCHLEVEL  0
-
-#define DRIVER_IOCTLS \
-        [DRM_IOCTL_NR(SIS_IOCTL_FB_ALLOC)]   = { sis_fb_alloc,	  1, 0 }, \
-        [DRM_IOCTL_NR(SIS_IOCTL_FB_FREE)]    = { sis_fb_free,	  1, 0 }, \
-        /* AGP Memory Management */					  \
-        [DRM_IOCTL_NR(SIS_IOCTL_AGP_INIT)]   = { sisp_agp_init,	  1, 0 }, \
-        [DRM_IOCTL_NR(SIS_IOCTL_AGP_ALLOC)]  = { sisp_agp_alloc,  1, 0 }, \
-        [DRM_IOCTL_NR(SIS_IOCTL_AGP_FREE)]   = { sisp_agp_free,	  1, 0 }
-#if 0 /* these don't appear to be defined */
-	/* SIS Stereo */						 
-	[DRM_IOCTL_NR(DRM_IOCTL_CONTROL)]    = { sis_control,	  1, 1 }, 
-        [DRM_IOCTL_NR(SIS_IOCTL_FLIP)]       = { sis_flip,	  1, 1 }, 
-        [DRM_IOCTL_NR(SIS_IOCTL_FLIP_INIT)]  = { sis_flip_init,	  1, 1 }, 
-        [DRM_IOCTL_NR(SIS_IOCTL_FLIP_FINAL)] = { sis_flip_final,  1, 1 }
-#endif
-
-#define __HAVE_COUNTERS		5
-
 /* Buffer customization:
  */
 #define DRIVER_AGP_BUFFERS_MAP( dev )					\
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/sis_drm.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/sis_drm.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/sis_drm.h	2003-07-30 13:51:24.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/sis_drm.h	2002-12-18 01:03:52.000000000 +0100
@@ -2,16 +2,6 @@
 #ifndef _sis_drm_public_h_
 #define _sis_drm_public_h_
 
-/* SiS specific ioctls */
-#define SIS_IOCTL_FB_ALLOC		DRM_IOWR(0x44, drm_sis_mem_t)
-#define SIS_IOCTL_FB_FREE		DRM_IOW( 0x45, drm_sis_mem_t)
-#define SIS_IOCTL_AGP_INIT		DRM_IOWR(0x53, drm_sis_agp_t)
-#define SIS_IOCTL_AGP_ALLOC		DRM_IOWR(0x54, drm_sis_mem_t)
-#define SIS_IOCTL_AGP_FREE		DRM_IOW( 0x55, drm_sis_mem_t)
-#define SIS_IOCTL_FLIP			DRM_IOW( 0x48, drm_sis_flip_t)
-#define SIS_IOCTL_FLIP_INIT		DRM_IO(  0x49)
-#define SIS_IOCTL_FLIP_FINAL		DRM_IO(  0x50)
-
 typedef struct {
   int context;
   unsigned int offset;
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/sis_drv.c linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/sis_drv.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/sis_drv.c	2003-07-30 13:51:24.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/sis_drv.c	2002-02-25 20:37:57.000000000 +0100
@@ -31,6 +31,31 @@
 #include "sis_drm.h"
 #include "sis_drv.h"
 
+#define DRIVER_AUTHOR	 "SIS"
+#define DRIVER_NAME	 "sis"
+#define DRIVER_DESC	 "SIS 300/630/540"
+#define DRIVER_DATE	 "20010503"
+#define DRIVER_MAJOR	 1
+#define DRIVER_MINOR	 0
+#define DRIVER_PATCHLEVEL  0
+
+#define DRIVER_IOCTLS \
+        [DRM_IOCTL_NR(SIS_IOCTL_FB_ALLOC)]   = { sis_fb_alloc,	  1, 0 }, \
+        [DRM_IOCTL_NR(SIS_IOCTL_FB_FREE)]    = { sis_fb_free,	  1, 0 }, \
+        /* AGP Memory Management */					  \
+        [DRM_IOCTL_NR(SIS_IOCTL_AGP_INIT)]   = { sisp_agp_init,	  1, 0 }, \
+        [DRM_IOCTL_NR(SIS_IOCTL_AGP_ALLOC)]  = { sisp_agp_alloc,  1, 0 }, \
+        [DRM_IOCTL_NR(SIS_IOCTL_AGP_FREE)]   = { sisp_agp_free,	  1, 0 }
+#if 0 /* these don't appear to be defined */
+	/* SIS Stereo */						 
+	[DRM_IOCTL_NR(DRM_IOCTL_CONTROL)]    = { sis_control,	  1, 1 }, 
+        [DRM_IOCTL_NR(SIS_IOCTL_FLIP)]       = { sis_flip,	  1, 1 }, 
+        [DRM_IOCTL_NR(SIS_IOCTL_FLIP_INIT)]  = { sis_flip_init,	  1, 1 }, 
+        [DRM_IOCTL_NR(SIS_IOCTL_FLIP_FINAL)] = { sis_flip_final,  1, 1 }
+#endif
+
+#define __HAVE_COUNTERS		5
+
 #include "drm_auth.h"
 #include "drm_agpsupport.h"
 #include "drm_bufs.h"
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/sis_ds.c linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/sis_ds.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/sis_ds.c	2003-07-30 13:51:24.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/sis_ds.c	2002-12-18 01:03:52.000000000 +0100
@@ -50,15 +50,15 @@ set_t *setInit(void)
 
   set = (set_t *)MALLOC(sizeof(set_t));
   if (set) {
-  for(i = 0; i < SET_SIZE; i++){
-    set->list[i].free_next = i+1;    
-    set->list[i].alloc_next = -1;
-  }    
-  set->list[SET_SIZE-1].free_next = -1;
-  set->free = 0;
-  set->alloc = -1;
-  set->trace = -1;
-  }  
+    for(i = 0; i < SET_SIZE; i++){
+      set->list[i].free_next = i+1;    
+      set->list[i].alloc_next = -1;
+    }    
+    set->list[SET_SIZE-1].free_next = -1;
+    set->free = 0;
+    set->alloc = -1;
+    set->trace = -1;
+  }
   return set;
 }
 
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/tdfx_drv.c linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/tdfx_drv.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm/tdfx_drv.c	2003-07-30 13:51:24.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm/tdfx_drv.c	2001-08-27 16:40:33.000000000 +0200
@@ -82,6 +82,25 @@ static drm_pci_list_t DRM(idlist)[] = {
 #include "drm_drawable.h"
 #include "drm_drv.h"
 
+#ifndef MODULE
+/* DRM(options) is called by the kernel to parse command-line options
+ * passed via the boot-loader (e.g., LILO).  It calls the insmod option
+ * routine, drm_parse_drm.
+ */
+
+/* JH- We have to hand expand the string ourselves because of the cpp.  If
+ * anyone can think of a way that we can fit into the __setup macro without
+ * changing it, then please send the solution my way.
+ */
+static int __init tdfx_options( char *str )
+{
+	DRM(parse_options)( str );
+	return 1;
+}
+
+__setup( DRIVER_NAME "=", tdfx_options );
+#endif
+
 #include "drm_fops.h"
 #include "drm_init.h"
 #include "drm_ioctl.h"
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/Config.in linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/Config.in
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/Config.in	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/Config.in	2003-07-30 11:18:33.000000000 +0200
@@ -0,0 +1,16 @@
+#
+# Drm device configuration
+#
+# This driver provides support for the
+# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
+#
+
+if [ "$CONFIG_DRM" != "n" ]; then
+    tristate '  3dfx Banshee/Voodoo3+' CONFIG_DRM_TDFX
+    tristate '  3dlabs GMX 2000' CONFIG_DRM_GAMMA
+    tristate '  ATI Rage 128' CONFIG_DRM_R128
+    dep_tristate '  ATI Radeon' CONFIG_DRM_RADEON $CONFIG_AGP
+    dep_tristate '  Intel I810' CONFIG_DRM_I810 $CONFIG_AGP
+    dep_tristate '  Intel 830M' CONFIG_DRM_I830 $CONFIG_AGP
+    dep_tristate '  Matrox g200/g400' CONFIG_DRM_MGA $CONFIG_AGP
+fi
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/Makefile linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/Makefile
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/Makefile	2003-07-30 11:18:33.000000000 +0200
@@ -0,0 +1,50 @@
+#
+# Makefile for the drm device driver.  This driver provides support for the
+# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
+
+O_TARGET	:= drm.o
+list-multi	:= gamma.o tdfx.o r128.o mga.o i810.o i830.o radeon.o sis.o
+
+gamma-objs  := gamma_drv.o gamma_dma.o
+tdfx-objs   := tdfx_drv.o
+r128-objs   := r128_drv.o r128_cce.o r128_state.o r128_irq.o
+radeon-objs := radeon_drv.o radeon_cp.o radeon_state.o radeon_mem.o radeon_irq.o
+mga-objs    := mga_drv.o mga_dma.o mga_state.o mga_warp.o mga_irq.o
+i810-objs   := i810_drv.o i810_dma.o
+i830-objs   := i830_drv.o i830_dma.o i830_irq.o
+sis-objs    := sis_drv.o sis_ds.o sis_mm.o
+
+obj-$(CONFIG_DRM_GAMMA) += gamma.o
+obj-$(CONFIG_DRM_TDFX)	+= tdfx.o
+obj-$(CONFIG_DRM_R128)	+= r128.o
+obj-$(CONFIG_DRM_RADEON)+= radeon.o
+obj-$(CONFIG_DRM_MGA)	+= mga.o
+obj-$(CONFIG_DRM_I810)	+= i810.o
+obj-$(CONFIG_DRM_I830)	+= i830.o
+obj-$(CONFIG_DRM_SIS)   += sis.o
+
+include $(TOPDIR)/Rules.make
+
+gamma.o: $(gamma-objs) $(lib)
+	$(LD) -r -o $@ $(gamma-objs) $(lib)
+
+tdfx.o: $(tdfx-objs) $(lib)
+	$(LD) -r -o $@ $(tdfx-objs) $(lib)
+
+mga.o: $(mga-objs) $(lib)
+	$(LD) -r -o $@ $(mga-objs) $(lib)
+
+i810.o: $(i810-objs) $(lib)
+	$(LD) -r -o $@ $(i810-objs) $(lib)
+
+i830.o: $(i830-objs) $(lib)
+	$(LD) -r -o $@ $(i830-objs) $(lib)
+
+r128.o: $(r128-objs) $(lib)
+	$(LD) -r -o $@ $(r128-objs) $(lib)
+
+radeon.o: $(radeon-objs) $(lib)
+	$(LD) -r -o $@ $(radeon-objs) $(lib)
+
+sis.o: $(sis-objs) $(lib)
+	$(LD) -r -o $@ $(sis-objs) $(lib)
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/README.drm linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/README.drm
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/README.drm	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/README.drm	2003-07-30 11:18:33.000000000 +0200
@@ -0,0 +1,46 @@
+************************************************************
+* For the very latest on DRI development, please see:      *
+*     http://dri.sourceforge.net/                          *
+************************************************************
+
+The Direct Rendering Manager (drm) is a device-independent kernel-level
+device driver that provides support for the XFree86 Direct Rendering
+Infrastructure (DRI).
+
+The DRM supports the Direct Rendering Infrastructure (DRI) in four major
+ways:
+
+    1. The DRM provides synchronized access to the graphics hardware via
+       the use of an optimized two-tiered lock.
+
+    2. The DRM enforces the DRI security policy for access to the graphics
+       hardware by only allowing authenticated X11 clients access to
+       restricted regions of memory.
+
+    3. The DRM provides a generic DMA engine, complete with multiple
+       queues and the ability to detect the need for an OpenGL context
+       switch.
+
+    4. The DRM is extensible via the use of small device-specific modules
+       that rely extensively on the API exported by the DRM module.
+
+
+Documentation on the DRI is available from:
+    http://precisioninsight.com/piinsights.html
+
+For specific information about kernel-level support, see:
+
+    The Direct Rendering Manager, Kernel Support for the Direct Rendering
+    Infrastructure
+    http://precisioninsight.com/dr/drm.html
+
+    Hardware Locking for the Direct Rendering Infrastructure
+    http://precisioninsight.com/dr/locking.html
+
+    A Security Analysis of the Direct Rendering Infrastructure
+    http://precisioninsight.com/dr/security.html
+
+************************************************************
+* For the very latest on DRI development, please see:      *
+*     http://dri.sourceforge.net/                          *
+************************************************************
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/ati_pcigart.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/ati_pcigart.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/ati_pcigart.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/ati_pcigart.h	2003-07-30 11:18:33.000000000 +0200
@@ -0,0 +1,203 @@
+/* ati_pcigart.h -- ATI PCI GART support -*- linux-c -*-
+ * Created: Wed Dec 13 21:52:19 2000 by gareth@valinux.com
+ *
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *   Gareth Hughes <gareth@valinux.com>
+ */
+
+#define __NO_VERSION__
+#include "drmP.h"
+
+#if PAGE_SIZE == 65536
+# define ATI_PCIGART_TABLE_ORDER	0
+# define ATI_PCIGART_TABLE_PAGES	(1 << 0)
+#elif PAGE_SIZE == 16384
+# define ATI_PCIGART_TABLE_ORDER	1
+# define ATI_PCIGART_TABLE_PAGES	(1 << 1)
+#elif PAGE_SIZE == 8192
+# define ATI_PCIGART_TABLE_ORDER 	2
+# define ATI_PCIGART_TABLE_PAGES 	(1 << 2)
+#elif PAGE_SIZE == 4096
+# define ATI_PCIGART_TABLE_ORDER 	3
+# define ATI_PCIGART_TABLE_PAGES 	(1 << 3)
+#else
+# error - PAGE_SIZE not 64K, 16K, 8K or 4K
+#endif
+
+# define ATI_MAX_PCIGART_PAGES		8192	/* 32 MB aperture, 4K pages */
+# define ATI_PCIGART_PAGE_SIZE		4096	/* PCI GART page size */
+
+static unsigned long DRM(ati_alloc_pcigart_table)( void )
+{
+	unsigned long address;
+	struct page *page;
+	int i;
+	DRM_DEBUG( "%s\n", __FUNCTION__ );
+
+	address = __get_free_pages( GFP_KERNEL, ATI_PCIGART_TABLE_ORDER );
+	if ( address == 0UL ) {
+		return 0;
+	}
+
+	page = virt_to_page( address );
+
+	for ( i = 0 ; i < ATI_PCIGART_TABLE_PAGES ; i++, page++ ) {
+		atomic_inc( &page->count );
+		SetPageReserved( page );
+	}
+
+	DRM_DEBUG( "%s: returning 0x%08lx\n", __FUNCTION__, address );
+	return address;
+}
+
+static void DRM(ati_free_pcigart_table)( unsigned long address )
+{
+	struct page *page;
+	int i;
+	DRM_DEBUG( "%s\n", __FUNCTION__ );
+
+	page = virt_to_page( address );
+
+	for ( i = 0 ; i < ATI_PCIGART_TABLE_PAGES ; i++, page++ ) {
+		atomic_dec( &page->count );
+		ClearPageReserved( page );
+	}
+
+	free_pages( address, ATI_PCIGART_TABLE_ORDER );
+}
+
+int DRM(ati_pcigart_init)( drm_device_t *dev,
+			   unsigned long *addr,
+			   dma_addr_t *bus_addr)
+{
+	drm_sg_mem_t *entry = dev->sg;
+	unsigned long address = 0;
+	unsigned long pages;
+	u32 *pci_gart, page_base, bus_address = 0;
+	int i, j, ret = 0;
+
+	if ( !entry ) {
+		DRM_ERROR( "no scatter/gather memory!\n" );
+		goto done;
+	}
+
+	address = DRM(ati_alloc_pcigart_table)();
+	if ( !address ) {
+		DRM_ERROR( "cannot allocate PCI GART page!\n" );
+		goto done;
+	}
+
+	if ( !dev->pdev ) {
+		DRM_ERROR( "PCI device unknown!\n" );
+		goto done;
+	}
+
+	bus_address = pci_map_single(dev->pdev, (void *)address,
+				  ATI_PCIGART_TABLE_PAGES * PAGE_SIZE,
+				  PCI_DMA_TODEVICE);
+	if (bus_address == 0) {
+		DRM_ERROR( "unable to map PCIGART pages!\n" );
+		DRM(ati_free_pcigart_table)( address );
+		address = 0;
+		goto done;
+	}
+
+	pci_gart = (u32 *)address;
+
+	pages = ( entry->pages <= ATI_MAX_PCIGART_PAGES )
+		? entry->pages : ATI_MAX_PCIGART_PAGES;
+
+	memset( pci_gart, 0, ATI_MAX_PCIGART_PAGES * sizeof(u32) );
+
+	for ( i = 0 ; i < pages ; i++ ) {
+		/* we need to support large memory configurations */
+		entry->busaddr[i] = pci_map_single(dev->pdev,
+					   page_address( entry->pagelist[i] ),
+					   PAGE_SIZE,
+					   PCI_DMA_TODEVICE);
+		if (entry->busaddr[i] == 0) {
+			DRM_ERROR( "unable to map PCIGART pages!\n" );
+			DRM(ati_pcigart_cleanup)( dev, address, bus_address );
+			address = 0;
+			bus_address = 0;
+			goto done;
+		}
+		page_base = (u32) entry->busaddr[i];
+
+		for (j = 0; j < (PAGE_SIZE / ATI_PCIGART_PAGE_SIZE); j++) {
+			*pci_gart++ = cpu_to_le32( page_base );
+			page_base += ATI_PCIGART_PAGE_SIZE;
+		}
+	}
+
+	ret = 1;
+
+#if defined(__i386__) || defined(__x86_64__)
+	asm volatile ( "wbinvd" ::: "memory" );
+#else
+	mb();
+#endif
+
+done:
+	*addr = address;
+	*bus_addr = bus_address;
+	return ret;
+}
+
+int DRM(ati_pcigart_cleanup)( drm_device_t *dev,
+			      unsigned long addr,
+			      dma_addr_t bus_addr)
+{
+	drm_sg_mem_t *entry = dev->sg;
+	unsigned long pages;
+	int i;
+
+	/* we need to support large memory configurations */
+	if ( !entry ) {
+		DRM_ERROR( "no scatter/gather memory!\n" );
+		return 0;
+	}
+
+	if ( bus_addr ) {
+		pci_unmap_single(dev->pdev, bus_addr,
+				 ATI_PCIGART_TABLE_PAGES * PAGE_SIZE,
+				 PCI_DMA_TODEVICE);
+
+		pages = ( entry->pages <= ATI_MAX_PCIGART_PAGES )
+		        ? entry->pages : ATI_MAX_PCIGART_PAGES;
+
+		for ( i = 0 ; i < pages ; i++ ) {
+			if ( !entry->busaddr[i] ) break;
+			pci_unmap_single(dev->pdev, entry->busaddr[i],
+					 PAGE_SIZE, PCI_DMA_TODEVICE);
+		}
+	}
+
+	if ( addr ) {
+		DRM(ati_free_pcigart_table)( addr );
+	}
+
+	return 1;
+}
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/dristat.c linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/dristat.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/dristat.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/dristat.c	2003-07-30 11:18:33.000000000 +0200
@@ -0,0 +1,280 @@
+/* dristat.c -- 
+ * Created: Mon Jan 15 05:05:07 2001 by faith@acm.org
+ *
+ * Copyright 2000 VA Linux Systems, Inc., Fremont, California.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ * 
+ * Authors: Rickard E. (Rik) Faith <faith@valinux.com>
+ * 
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include "../../../xf86drm.h"
+#include "../xf86drmRandom.c"
+#include "../xf86drmHash.c"
+#include "../xf86drm.c"
+
+#define DRM_VERSION 0x00000001
+#define DRM_MEMORY  0x00000002
+#define DRM_CLIENTS 0x00000004
+#define DRM_STATS   0x00000008
+#define DRM_BUSID   0x00000010
+
+static void getversion(int fd)
+{
+    drmVersionPtr version;
+    
+    version = drmGetVersion(fd);
+    if (version) {
+	printf("  Version information:\n");
+	printf("    Name: %s\n", version->name ? version->name : "?");
+	printf("    Version: %d.%d.%d\n",
+	       version->version_major,
+	       version->version_minor,
+	       version->version_patchlevel);
+	printf("    Date: %s\n", version->date ? version->date : "?");
+	printf("    Desc: %s\n", version->desc ? version->desc : "?");
+	drmFreeVersion(version);
+    } else {
+	printf("  No version information available\n");
+    }
+}
+
+static void getbusid(int fd)
+{
+    const char *busid = drmGetBusid(fd);
+    
+    printf("  Busid: %s\n", *busid ? busid : "(not set)");
+    drmFreeBusid(busid);
+}
+
+#if 0
+typedef struct {
+    unsigned long	offset;	 /* Requested physical address (0 for SAREA)*/
+    unsigned long	size;	 /* Requested physical size (bytes)	    */
+    drm_map_type_t	type;	 /* Type of memory to map		    */
+    drm_map_flags_t flags;	 /* Flags				    */
+    void		*handle; /* User-space: "Handle" to pass to mmap    */
+    /* Kernel-space: kernel-virtual address    */
+    int		mtrr;	 /* MTRR slot used			    */
+				 /* Private data			    */
+} drmVmRec, *drmVmPtr;
+#endif
+
+static void getvm(int fd)
+{
+    int             i;
+    const char      *typename;
+    char            flagname[33];
+    drmHandle       offset;
+    drmSize         size;
+    drmMapType      type;
+    drmMapFlags     flags;
+    drmHandle       handle;
+    int             mtrr;
+
+    printf("  VM map information (Restricted locked kernel WC Lock):\n");
+    printf("    slot     offset       size type flags    address mtrr\n");
+
+    for (i = 0;
+	 !drmGetMap(fd, i, &offset, &size, &type, &flags, &handle, &mtrr);
+	 i++) {
+	
+	switch (type) {
+	case DRM_FRAME_BUFFER: typename = "FB";  break;
+	case DRM_REGISTERS:    typename = "REG"; break;
+	case DRM_SHM:          typename = "SHM"; break;
+	case DRM_AGP:          typename = "AGP"; break;
+	default:               typename = "???"; break;
+	}
+
+	flagname[0] = (flags & DRM_RESTRICTED)      ? 'R' : ' ';
+	flagname[1] = (flags & DRM_READ_ONLY)       ? 'r' : 'w';
+	flagname[2] = (flags & DRM_LOCKED)          ? 'l' : ' ';
+	flagname[3] = (flags & DRM_KERNEL)          ? 'k' : ' ';
+	flagname[4] = (flags & DRM_WRITE_COMBINING) ? 'W' : ' ';
+	flagname[5] = (flags & DRM_CONTAINS_LOCK)   ? 'L' : ' ';
+	flagname[6] = '\0';
+	
+	printf("    %4d 0x%08lx 0x%08lx %3.3s %6.6s 0x%08lx ",
+	       i, offset, (unsigned long)size, typename, flagname, handle);
+	if (mtrr < 0) printf("none\n");
+	else          printf("%4d\n", mtrr);
+    }
+}
+
+static void getclients(int fd)
+{
+    int           i;
+    int           auth;
+    int           pid;
+    int           uid;
+    unsigned long magic;
+    unsigned long iocs;
+    char          buf[64];
+    char          cmd[40];
+    int           procfd;
+    
+    printf("  DRI client information:\n");
+    printf("    a   pid   uid      magic     ioctls   prog\n");
+
+    for (i = 0; !drmGetClient(fd, i, &auth, &pid, &uid, &magic, &iocs); i++) {
+	sprintf(buf, "/proc/%d/cmdline", pid);
+	memset(cmd, sizeof(cmd), 0);
+	if ((procfd = open(buf, O_RDONLY, 0)) >= 0) {
+	    read(procfd, cmd, sizeof(cmd)-1);
+	    close(procfd);
+	}
+	if (*cmd) {
+	    char *pt;
+
+	    for (pt = cmd; *pt; pt++) if (!isprint(*pt)) *pt = ' ';
+	    printf("    %c %5d %5d %10lu %10lu   %s\n",
+		   auth ? 'y' : 'n', pid, uid, magic, iocs, cmd);
+	} else {
+	    printf("    %c %5d %5d %10lu %10lu\n",
+		   auth ? 'y' : 'n', pid, uid, magic, iocs);
+	}
+    }
+}
+
+static void printhuman(unsigned long value, const char *name, int mult)
+{
+    const char *p;
+    double     f;
+				/* Print width 5 number in width 6 space */
+    if (value < 100000) {
+	printf(" %5lu", value);
+	return;
+    }
+
+    p = name;
+    f = (double)value / (double)mult;
+    if (f < 10.0) {
+	printf(" %4.2f%c", f, *p);
+	return;
+    }
+
+    p++;
+    f = (double)value / (double)mult;
+    if (f < 10.0) {
+	printf(" %4.2f%c", f, *p);
+	return;
+    }
+    
+    p++;
+    f = (double)value / (double)mult;
+    if (f < 10.0) {
+	printf(" %4.2f%c", f, *p);
+	return;
+    }
+}
+
+static void getstats(int fd, int i)
+{
+    drmStatsT prev, curr;
+    int       j;
+    double    rate;
+    
+    printf("  System statistics:\n");
+
+    if (drmGetStats(fd, &prev)) return;
+    if (!i) {
+	for (j = 0; j < prev.count; j++) {
+	    printf("    ");
+	    printf(prev.data[j].long_format, prev.data[j].long_name);
+	    if (prev.data[j].isvalue) printf(" 0x%08lx\n", prev.data[j].value);
+	    else                      printf(" %10lu\n", prev.data[j].value);
+	}
+	return;
+    }
+
+    printf("    ");
+    for (j = 0; j < prev.count; j++)
+	if (!prev.data[j].verbose) {
+	    printf(" ");
+	    printf(prev.data[j].rate_format, prev.data[j].rate_name);
+	}
+    printf("\n");
+    
+    for (;;) {
+	sleep(i);
+	if (drmGetStats(fd, &curr)) return;
+	printf("    ");
+	for (j = 0; j < curr.count; j++) {
+	    if (curr.data[j].verbose) continue;
+	    if (curr.data[j].isvalue) {
+		printf(" %08lx", curr.data[j].value);
+	    } else {
+		rate = (curr.data[j].value - prev.data[j].value) / (double)i;
+		printhuman(rate, curr.data[j].mult_names, curr.data[j].mult);
+	    }
+	}
+	printf("\n");
+	memcpy(&prev, &curr, sizeof(prev));
+    }
+    
+}
+
+int main(int argc, char **argv)
+{
+    int  c;
+    int  mask     = 0;
+    int  minor    = 0;
+    int  interval = 0;
+    int  fd;
+    char buf[64];
+    int  i;
+
+    while ((c = getopt(argc, argv, "avmcsbM:i:")) != EOF)
+	switch (c) {
+	case 'a': mask = ~0;                          break;
+	case 'v': mask |= DRM_VERSION;                break;
+	case 'm': mask |= DRM_MEMORY;                 break;
+	case 'c': mask |= DRM_CLIENTS;                break;
+	case 's': mask |= DRM_STATS;                  break;
+	case 'b': mask |= DRM_BUSID;                  break;
+	case 'i': interval = strtol(optarg, NULL, 0); break;
+	case 'M': minor = strtol(optarg, NULL, 0);    break;
+	default:
+	    fprintf( stderr, "Usage: dristat [options]\n" );
+	    return 1;
+	}
+
+    for (i = 0; i < 16; i++) if (!minor || i == minor) {
+	sprintf(buf, DRM_DEV_NAME, DRM_DIR_NAME, i);
+	fd = drmOpenMinor(i, 1);
+	if (fd >= 0) {
+	    printf("%s\n", buf);
+	    if (mask & DRM_BUSID)   getbusid(fd);
+	    if (mask & DRM_VERSION) getversion(fd);
+	    if (mask & DRM_MEMORY)  getvm(fd);
+	    if (mask & DRM_CLIENTS) getclients(fd);
+	    if (mask & DRM_STATS)   getstats(fd, interval);
+	    close(fd);
+	}
+    }
+
+    return 0; 
+}
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/drm.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/drm.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/drm.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/drm.h	2003-07-30 11:18:33.000000000 +0200
@@ -0,0 +1,474 @@
+/* drm.h -- Header for Direct Rendering Manager -*- linux-c -*-
+ * Created: Mon Jan  4 10:05:05 1999 by faith@precisioninsight.com
+ *
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Rickard E. (Rik) Faith <faith@valinux.com>
+ *
+ * Acknowledgements:
+ * Dec 1999, Richard Henderson <rth@twiddle.net>, move to generic cmpxchg.
+ *
+ */
+
+#ifndef _DRM_H_
+#define _DRM_H_
+
+#if defined(__linux__)
+#include <linux/config.h>
+#include <asm/ioctl.h>		/* For _IO* macros */
+#define DRM_IOCTL_NR(n)		_IOC_NR(n)
+#define DRM_IOC_VOID		_IOC_NONE
+#define DRM_IOC_READ		_IOC_READ
+#define DRM_IOC_WRITE		_IOC_WRITE
+#define DRM_IOC_READWRITE	_IOC_READ|_IOC_WRITE
+#define DRM_IOC(dir, group, nr, size) _IOC(dir, group, nr, size)
+#elif defined(__FreeBSD__) || defined(__NetBSD__)
+#if defined(__FreeBSD__) && defined(XFree86Server)
+/* Prevent name collision when including sys/ioccom.h */
+#undef ioctl
+#include <sys/ioccom.h>
+#define ioctl(a,b,c)		xf86ioctl(a,b,c)
+#else
+#include <sys/ioccom.h>
+#endif /* __FreeBSD__ && xf86ioctl */
+#define DRM_IOCTL_NR(n)		((n) & 0xff)
+#define DRM_IOC_VOID		IOC_VOID
+#define DRM_IOC_READ		IOC_OUT
+#define DRM_IOC_WRITE		IOC_IN
+#define DRM_IOC_READWRITE	IOC_INOUT
+#define DRM_IOC(dir, group, nr, size) _IOC(dir, group, nr, size)
+#endif
+
+#define XFREE86_VERSION(major,minor,patch,snap) \
+		((major << 16) | (minor << 8) | patch)
+
+#ifndef CONFIG_XFREE86_VERSION
+#define CONFIG_XFREE86_VERSION XFREE86_VERSION(4,1,0,0)
+#endif
+
+#if CONFIG_XFREE86_VERSION < XFREE86_VERSION(4,1,0,0)
+#define DRM_PROC_DEVICES "/proc/devices"
+#define DRM_PROC_MISC	 "/proc/misc"
+#define DRM_PROC_DRM	 "/proc/drm"
+#define DRM_DEV_DRM	 "/dev/drm"
+#define DRM_DEV_MODE	 (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP)
+#define DRM_DEV_UID	 0
+#define DRM_DEV_GID	 0
+#endif
+
+#if CONFIG_XFREE86_VERSION >= XFREE86_VERSION(4,1,0,0)
+#define DRM_MAJOR       226
+#define DRM_MAX_MINOR   15
+#endif
+#define DRM_NAME	"drm"	  /* Name in kernel, /dev, and /proc	    */
+#define DRM_MIN_ORDER	5	  /* At least 2^5 bytes = 32 bytes	    */
+#define DRM_MAX_ORDER	22	  /* Up to 2^22 bytes = 4MB		    */
+#define DRM_RAM_PERCENT 10	  /* How much system ram can we lock?	    */
+
+#define _DRM_LOCK_HELD	0x80000000 /* Hardware lock is held		    */
+#define _DRM_LOCK_CONT	0x40000000 /* Hardware lock is contended	    */
+#define _DRM_LOCK_IS_HELD(lock)	   ((lock) & _DRM_LOCK_HELD)
+#define _DRM_LOCK_IS_CONT(lock)	   ((lock) & _DRM_LOCK_CONT)
+#define _DRM_LOCKING_CONTEXT(lock) ((lock) & ~(_DRM_LOCK_HELD|_DRM_LOCK_CONT))
+
+typedef unsigned long drm_handle_t;
+typedef unsigned int  drm_context_t;
+typedef unsigned int  drm_drawable_t;
+typedef unsigned int  drm_magic_t;
+
+/* Warning: If you change this structure, make sure you change
+ * XF86DRIClipRectRec in the server as well */
+
+/* KW: Actually it's illegal to change either for
+ * backwards-compatibility reasons.
+ */
+
+typedef struct drm_clip_rect {
+	unsigned short	x1;
+	unsigned short	y1;
+	unsigned short	x2;
+	unsigned short	y2;
+} drm_clip_rect_t;
+
+typedef struct drm_tex_region {
+	unsigned char	next;
+	unsigned char	prev;
+	unsigned char	in_use;
+	unsigned char	padding;
+	unsigned int	age;
+} drm_tex_region_t;
+
+typedef struct drm_version {
+	int    version_major;	  /* Major version			    */
+	int    version_minor;	  /* Minor version			    */
+	int    version_patchlevel;/* Patch level			    */
+	size_t name_len;	  /* Length of name buffer		    */
+	char   *name;		  /* Name of driver			    */
+	size_t date_len;	  /* Length of date buffer		    */
+	char   *date;		  /* User-space buffer to hold date	    */
+	size_t desc_len;	  /* Length of desc buffer		    */
+	char   *desc;		  /* User-space buffer to hold desc	    */
+} drm_version_t;
+
+typedef struct drm_unique {
+	size_t unique_len;	  /* Length of unique			    */
+	char   *unique;		  /* Unique name for driver instantiation   */
+} drm_unique_t;
+
+typedef struct drm_list {
+	int		 count;	  /* Length of user-space structures	    */
+	drm_version_t	 *version;
+} drm_list_t;
+
+typedef struct drm_block {
+	int		 unused;
+} drm_block_t;
+
+typedef struct drm_control {
+	enum {
+		DRM_ADD_COMMAND,
+		DRM_RM_COMMAND,
+		DRM_INST_HANDLER,
+		DRM_UNINST_HANDLER
+	}		 func;
+	int		 irq;
+} drm_control_t;
+
+typedef enum drm_map_type {
+	_DRM_FRAME_BUFFER   = 0,  /* WC (no caching), no core dump	    */
+	_DRM_REGISTERS	    = 1,  /* no caching, no core dump		    */
+	_DRM_SHM	    = 2,  /* shared, cached			    */
+	_DRM_AGP            = 3,  /* AGP/GART                               */
+	_DRM_SCATTER_GATHER = 4	  /* Scatter/gather memory for PCI DMA      */
+} drm_map_type_t;
+
+typedef enum drm_map_flags {
+	_DRM_RESTRICTED	     = 0x01, /* Cannot be mapped to user-virtual    */
+	_DRM_READ_ONLY	     = 0x02,
+	_DRM_LOCKED	     = 0x04, /* shared, cached, locked		    */
+	_DRM_KERNEL	     = 0x08, /* kernel requires access		    */
+	_DRM_WRITE_COMBINING = 0x10, /* use write-combining if available    */
+	_DRM_CONTAINS_LOCK   = 0x20, /* SHM page that contains lock	    */
+	_DRM_REMOVABLE	     = 0x40  /* Removable mapping		    */
+} drm_map_flags_t;
+
+typedef struct drm_ctx_priv_map {
+	unsigned int	ctx_id;  /* Context requesting private mapping */
+	void		*handle; /* Handle of map */
+} drm_ctx_priv_map_t;
+
+typedef struct drm_map {
+	unsigned long	offset;	 /* Requested physical address (0 for SAREA)*/
+	unsigned long	size;	 /* Requested physical size (bytes)	    */
+	drm_map_type_t	type;	 /* Type of memory to map		    */
+	drm_map_flags_t flags;	 /* Flags				    */
+	void		*handle; /* User-space: "Handle" to pass to mmap    */
+				 /* Kernel-space: kernel-virtual address    */
+	int		mtrr;	 /* MTRR slot used			    */
+				 /* Private data			    */
+} drm_map_t;
+
+typedef struct drm_client {
+	int		idx;	/* Which client desired?                    */
+	int		auth;	/* Is client authenticated?                 */
+	unsigned long	pid;	/* Process id                               */
+	unsigned long	uid;	/* User id                                  */
+	unsigned long	magic;	/* Magic                                    */
+	unsigned long	iocs;	/* Ioctl count                              */
+} drm_client_t;
+
+typedef enum {
+	_DRM_STAT_LOCK,
+	_DRM_STAT_OPENS,
+	_DRM_STAT_CLOSES,
+	_DRM_STAT_IOCTLS,
+	_DRM_STAT_LOCKS,
+	_DRM_STAT_UNLOCKS,
+	_DRM_STAT_VALUE,	/* Generic value                      */
+	_DRM_STAT_BYTE,		/* Generic byte counter (1024bytes/K) */
+	_DRM_STAT_COUNT,	/* Generic non-byte counter (1000/k)  */
+
+	_DRM_STAT_IRQ,		/* IRQ */
+	_DRM_STAT_PRIMARY,	/* Primary DMA bytes */
+	_DRM_STAT_SECONDARY,	/* Secondary DMA bytes */
+	_DRM_STAT_DMA,		/* DMA */
+	_DRM_STAT_SPECIAL,	/* Special DMA (e.g., priority or polled) */
+	_DRM_STAT_MISSED	/* Missed DMA opportunity */
+
+				/* Add to the *END* of the list */
+} drm_stat_type_t;
+
+typedef struct drm_stats {
+	unsigned long count;
+	struct {
+		unsigned long   value;
+		drm_stat_type_t type;
+	} data[15];
+} drm_stats_t;
+
+typedef enum drm_lock_flags {
+	_DRM_LOCK_READY	     = 0x01, /* Wait until hardware is ready for DMA */
+	_DRM_LOCK_QUIESCENT  = 0x02, /* Wait until hardware quiescent	     */
+	_DRM_LOCK_FLUSH	     = 0x04, /* Flush this context's DMA queue first */
+	_DRM_LOCK_FLUSH_ALL  = 0x08, /* Flush all DMA queues first	     */
+				/* These *HALT* flags aren't supported yet
+				   -- they will be used to support the
+				   full-screen DGA-like mode. */
+	_DRM_HALT_ALL_QUEUES = 0x10, /* Halt all current and future queues   */
+	_DRM_HALT_CUR_QUEUES = 0x20  /* Halt all current queues		     */
+} drm_lock_flags_t;
+
+typedef struct drm_lock {
+	int		 context;
+	drm_lock_flags_t flags;
+} drm_lock_t;
+
+typedef enum drm_dma_flags {	      /* These values *MUST* match xf86drm.h */
+				      /* Flags for DMA buffer dispatch	     */
+	_DRM_DMA_BLOCK	      = 0x01, /* Block until buffer dispatched.
+					 Note, the buffer may not yet have
+					 been processed by the hardware --
+					 getting a hardware lock with the
+					 hardware quiescent will ensure
+					 that the buffer has been
+					 processed.			     */
+	_DRM_DMA_WHILE_LOCKED = 0x02, /* Dispatch while lock held	     */
+	_DRM_DMA_PRIORITY     = 0x04, /* High priority dispatch		     */
+
+				      /* Flags for DMA buffer request	     */
+	_DRM_DMA_WAIT	      = 0x10, /* Wait for free buffers		     */
+	_DRM_DMA_SMALLER_OK   = 0x20, /* Smaller-than-requested buffers ok   */
+	_DRM_DMA_LARGER_OK    = 0x40  /* Larger-than-requested buffers ok    */
+} drm_dma_flags_t;
+
+typedef struct drm_buf_desc {
+	int	      count;	 /* Number of buffers of this size	     */
+	int	      size;	 /* Size in bytes			     */
+	int	      low_mark;	 /* Low water mark			     */
+	int	      high_mark; /* High water mark			     */
+	enum {
+		_DRM_PAGE_ALIGN = 0x01, /* Align on page boundaries for DMA  */
+		_DRM_AGP_BUFFER = 0x02, /* Buffer is in agp space            */
+		_DRM_SG_BUFFER  = 0x04  /* Scatter/gather memory buffer      */
+	}	      flags;
+	unsigned long agp_start; /* Start address of where the agp buffers
+				  * are in the agp aperture */
+} drm_buf_desc_t;
+
+typedef struct drm_buf_info {
+	int	       count;	/* Entries in list			     */
+	drm_buf_desc_t *list;
+} drm_buf_info_t;
+
+typedef struct drm_buf_free {
+	int	       count;
+	int	       *list;
+} drm_buf_free_t;
+
+typedef struct drm_buf_pub {
+	int		  idx;	       /* Index into master buflist	     */
+	int		  total;       /* Buffer size			     */
+	int		  used;	       /* Amount of buffer in use (for DMA)  */
+	void		  *address;    /* Address of buffer		     */
+} drm_buf_pub_t;
+
+typedef struct drm_buf_map {
+	int	      count;	/* Length of buflist			    */
+	void	      *virtual;	/* Mmaped area in user-virtual		    */
+	drm_buf_pub_t *list;	/* Buffer information			    */
+} drm_buf_map_t;
+
+typedef struct drm_dma {
+				/* Indices here refer to the offset into
+				   buflist in drm_buf_get_t.  */
+	int		context;	  /* Context handle		    */
+	int		send_count;	  /* Number of buffers to send	    */
+	int		*send_indices;	  /* List of handles to buffers	    */
+	int		*send_sizes;	  /* Lengths of data to send	    */
+	drm_dma_flags_t flags;		  /* Flags			    */
+	int		request_count;	  /* Number of buffers requested    */
+	int		request_size;	  /* Desired size for buffers	    */
+	int		*request_indices; /* Buffer information		    */
+	int		*request_sizes;
+	int		granted_count;	  /* Number of buffers granted	    */
+} drm_dma_t;
+
+typedef enum {
+	_DRM_CONTEXT_PRESERVED = 0x01,
+	_DRM_CONTEXT_2DONLY    = 0x02
+} drm_ctx_flags_t;
+
+typedef struct drm_ctx {
+	drm_context_t	handle;
+	drm_ctx_flags_t flags;
+} drm_ctx_t;
+
+typedef struct drm_ctx_res {
+	int		count;
+	drm_ctx_t	*contexts;
+} drm_ctx_res_t;
+
+typedef struct drm_draw {
+	drm_drawable_t	handle;
+} drm_draw_t;
+
+typedef struct drm_auth {
+	drm_magic_t	magic;
+} drm_auth_t;
+
+typedef struct drm_irq_busid {
+	int irq;
+	int busnum;
+	int devnum;
+	int funcnum;
+} drm_irq_busid_t;
+
+typedef enum {
+    _DRM_VBLANK_ABSOLUTE = 0x0,		/* Wait for specific vblank sequence number */
+    _DRM_VBLANK_RELATIVE = 0x1,		/* Wait for given number of vblanks */
+    _DRM_VBLANK_SIGNAL   = 0x40000000	/* Send signal instead of blocking */
+} drm_vblank_seq_type_t;
+
+#define _DRM_VBLANK_FLAGS_MASK _DRM_VBLANK_SIGNAL
+
+struct drm_wait_vblank_request {
+	drm_vblank_seq_type_t type;
+	unsigned int sequence;
+	unsigned long signal;
+};
+
+struct drm_wait_vblank_reply {
+	drm_vblank_seq_type_t type;
+	unsigned int sequence;
+	long tval_sec;
+	long tval_usec;
+};
+
+typedef union drm_wait_vblank {
+	struct drm_wait_vblank_request request;
+	struct drm_wait_vblank_reply reply;
+} drm_wait_vblank_t;
+
+typedef struct drm_agp_mode {
+	unsigned long mode;
+} drm_agp_mode_t;
+
+				/* For drm_agp_alloc -- allocated a buffer */
+typedef struct drm_agp_buffer {
+	unsigned long size;	/* In bytes -- will round to page boundary */
+	unsigned long handle;	/* Used for BIND/UNBIND ioctls */
+	unsigned long type;     /* Type of memory to allocate  */
+        unsigned long physical; /* Physical used by i810       */
+} drm_agp_buffer_t;
+
+				/* For drm_agp_bind */
+typedef struct drm_agp_binding {
+	unsigned long handle;   /* From drm_agp_buffer */
+	unsigned long offset;	/* In bytes -- will round to page boundary */
+} drm_agp_binding_t;
+
+typedef struct drm_agp_info {
+	int            agp_version_major;
+	int            agp_version_minor;
+	unsigned long  mode;
+	unsigned long  aperture_base;  /* physical address */
+	unsigned long  aperture_size;  /* bytes */
+	unsigned long  memory_allowed; /* bytes */
+	unsigned long  memory_used;
+
+				/* PCI information */
+	unsigned short id_vendor;
+	unsigned short id_device;
+} drm_agp_info_t;
+
+typedef struct drm_scatter_gather {
+	unsigned long size;	/* In bytes -- will round to page boundary */
+	unsigned long handle;	/* Used for mapping / unmapping */
+} drm_scatter_gather_t;
+
+#define DRM_IOCTL_BASE			'd'
+#define DRM_IO(nr)			_IO(DRM_IOCTL_BASE,nr)
+#define DRM_IOR(nr,type)		_IOR(DRM_IOCTL_BASE,nr,type)
+#define DRM_IOW(nr,type)		_IOW(DRM_IOCTL_BASE,nr,type)
+#define DRM_IOWR(nr,type)		_IOWR(DRM_IOCTL_BASE,nr,type)
+
+#define DRM_IOCTL_VERSION		DRM_IOWR(0x00, drm_version_t)
+#define DRM_IOCTL_GET_UNIQUE		DRM_IOWR(0x01, drm_unique_t)
+#define DRM_IOCTL_GET_MAGIC		DRM_IOR( 0x02, drm_auth_t)
+#define DRM_IOCTL_IRQ_BUSID		DRM_IOWR(0x03, drm_irq_busid_t)
+#define DRM_IOCTL_GET_MAP               DRM_IOWR(0x04, drm_map_t)
+#define DRM_IOCTL_GET_CLIENT            DRM_IOWR(0x05, drm_client_t)
+#define DRM_IOCTL_GET_STATS             DRM_IOR( 0x06, drm_stats_t)
+
+#define DRM_IOCTL_SET_UNIQUE		DRM_IOW( 0x10, drm_unique_t)
+#define DRM_IOCTL_AUTH_MAGIC		DRM_IOW( 0x11, drm_auth_t)
+#define DRM_IOCTL_BLOCK			DRM_IOWR(0x12, drm_block_t)
+#define DRM_IOCTL_UNBLOCK		DRM_IOWR(0x13, drm_block_t)
+#define DRM_IOCTL_CONTROL		DRM_IOW( 0x14, drm_control_t)
+#define DRM_IOCTL_ADD_MAP		DRM_IOWR(0x15, drm_map_t)
+#define DRM_IOCTL_ADD_BUFS		DRM_IOWR(0x16, drm_buf_desc_t)
+#define DRM_IOCTL_MARK_BUFS		DRM_IOW( 0x17, drm_buf_desc_t)
+#define DRM_IOCTL_INFO_BUFS		DRM_IOWR(0x18, drm_buf_info_t)
+#define DRM_IOCTL_MAP_BUFS		DRM_IOWR(0x19, drm_buf_map_t)
+#define DRM_IOCTL_FREE_BUFS		DRM_IOW( 0x1a, drm_buf_free_t)
+
+#define DRM_IOCTL_RM_MAP		DRM_IOW( 0x1b, drm_map_t)
+
+#define DRM_IOCTL_SET_SAREA_CTX		DRM_IOW( 0x1c, drm_ctx_priv_map_t)
+#define DRM_IOCTL_GET_SAREA_CTX 	DRM_IOWR(0x1d, drm_ctx_priv_map_t)
+
+#define DRM_IOCTL_ADD_CTX		DRM_IOWR(0x20, drm_ctx_t)
+#define DRM_IOCTL_RM_CTX		DRM_IOWR(0x21, drm_ctx_t)
+#define DRM_IOCTL_MOD_CTX		DRM_IOW( 0x22, drm_ctx_t)
+#define DRM_IOCTL_GET_CTX		DRM_IOWR(0x23, drm_ctx_t)
+#define DRM_IOCTL_SWITCH_CTX		DRM_IOW( 0x24, drm_ctx_t)
+#define DRM_IOCTL_NEW_CTX		DRM_IOW( 0x25, drm_ctx_t)
+#define DRM_IOCTL_RES_CTX		DRM_IOWR(0x26, drm_ctx_res_t)
+#define DRM_IOCTL_ADD_DRAW		DRM_IOWR(0x27, drm_draw_t)
+#define DRM_IOCTL_RM_DRAW		DRM_IOWR(0x28, drm_draw_t)
+#define DRM_IOCTL_DMA			DRM_IOWR(0x29, drm_dma_t)
+#define DRM_IOCTL_LOCK			DRM_IOW( 0x2a, drm_lock_t)
+#define DRM_IOCTL_UNLOCK		DRM_IOW( 0x2b, drm_lock_t)
+#define DRM_IOCTL_FINISH		DRM_IOW( 0x2c, drm_lock_t)
+
+#define DRM_IOCTL_AGP_ACQUIRE		DRM_IO(  0x30)
+#define DRM_IOCTL_AGP_RELEASE		DRM_IO(  0x31)
+#define DRM_IOCTL_AGP_ENABLE		DRM_IOW( 0x32, drm_agp_mode_t)
+#define DRM_IOCTL_AGP_INFO		DRM_IOR( 0x33, drm_agp_info_t)
+#define DRM_IOCTL_AGP_ALLOC		DRM_IOWR(0x34, drm_agp_buffer_t)
+#define DRM_IOCTL_AGP_FREE		DRM_IOW( 0x35, drm_agp_buffer_t)
+#define DRM_IOCTL_AGP_BIND		DRM_IOW( 0x36, drm_agp_binding_t)
+#define DRM_IOCTL_AGP_UNBIND		DRM_IOW( 0x37, drm_agp_binding_t)
+
+#define DRM_IOCTL_SG_ALLOC		DRM_IOW( 0x38, drm_scatter_gather_t)
+#define DRM_IOCTL_SG_FREE		DRM_IOW( 0x39, drm_scatter_gather_t)
+
+#define DRM_IOCTL_WAIT_VBLANK		DRM_IOWR(0x3a, drm_wait_vblank_t)
+
+/* Device specfic ioctls should only be in their respective headers
+ * The device specific ioctl range is 0x40 to 0x79.                  */
+#define DRM_COMMAND_BASE                0x40
+
+#endif
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/drmP.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/drmP.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/drmP.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/drmP.h	2003-07-30 11:18:33.000000000 +0200
@@ -0,0 +1,929 @@
+/* drmP.h -- Private header for Direct Rendering Manager -*- linux-c -*-
+ * Created: Mon Jan  4 10:05:05 1999 by faith@precisioninsight.com
+ *
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Rickard E. (Rik) Faith <faith@valinux.com>
+ *    Gareth Hughes <gareth@valinux.com>
+ */
+
+#ifndef _DRM_P_H_
+#define _DRM_P_H_
+
+#ifdef __KERNEL__
+#ifdef __alpha__
+/* add include of current.h so that "current" is defined
+ * before static inline funcs in wait.h. Doing this so we
+ * can build the DRM (part of PI DRI). 4/21/2000 S + B */
+#include <asm/current.h>
+#endif /* __alpha__ */
+#include <linux/config.h>
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/miscdevice.h>
+#include <linux/fs.h>
+#include <linux/proc_fs.h>
+#include <linux/init.h>
+#include <linux/file.h>
+#include <linux/pci.h>
+#include <linux/wrapper.h>
+#include <linux/version.h>
+#include <linux/sched.h>
+#include <linux/smp_lock.h>	/* For (un)lock_kernel */
+#include <linux/mm.h>
+#include <linux/pagemap.h>
+#if defined(__alpha__) || defined(__powerpc__)
+#include <asm/pgtable.h> /* For pte_wrprotect */
+#endif
+#include <asm/io.h>
+#include <asm/mman.h>
+#include <asm/uaccess.h>
+#ifdef CONFIG_MTRR
+#include <asm/mtrr.h>
+#endif
+#if defined(CONFIG_AGP) || defined(CONFIG_AGP_MODULE)
+#include <linux/types.h>
+#include <linux/agp_backend.h>
+#endif
+#include <linux/tqueue.h>
+#include <linux/poll.h>
+#include <asm/pgalloc.h>
+#include "drm.h"
+
+#include "drm_os_linux.h"
+
+/* DRM template customization defaults
+ */
+#ifndef __HAVE_AGP
+#define __HAVE_AGP		0
+#endif
+#ifndef __HAVE_MTRR
+#define __HAVE_MTRR		0
+#endif
+#ifndef __HAVE_CTX_BITMAP
+#define __HAVE_CTX_BITMAP	0
+#endif
+#ifndef __HAVE_DMA
+#define __HAVE_DMA		0
+#endif
+#ifndef __HAVE_DMA_IRQ
+#define __HAVE_DMA_IRQ		0
+#endif
+#ifndef __HAVE_DMA_WAITLIST
+#define __HAVE_DMA_WAITLIST	0
+#endif
+#ifndef __HAVE_DMA_FREELIST
+#define __HAVE_DMA_FREELIST	0
+#endif
+#ifndef __HAVE_DMA_HISTOGRAM
+#define __HAVE_DMA_HISTOGRAM	0
+#endif
+
+#define __REALLY_HAVE_AGP	(__HAVE_AGP && (defined(CONFIG_AGP) || \
+						defined(CONFIG_AGP_MODULE)))
+#define __REALLY_HAVE_MTRR	(__HAVE_MTRR && defined(CONFIG_MTRR))
+#define __REALLY_HAVE_SG	(__HAVE_SG)
+
+/* Begin the DRM...
+ */
+
+#define DRM_DEBUG_CODE 2	  /* Include debugging code (if > 1, then
+				     also include looping detection. */
+
+#define DRM_HASH_SIZE	      16 /* Size of key hash table		  */
+#define DRM_KERNEL_CONTEXT    0	 /* Change drm_resctx if changed	  */
+#define DRM_RESERVED_CONTEXTS 1	 /* Change drm_resctx if changed	  */
+#define DRM_LOOPING_LIMIT     5000000
+#define DRM_BSZ		      1024 /* Buffer size for /dev/drm? output	  */
+#define DRM_TIME_SLICE	      (HZ/20)  /* Time slice for GLXContexts	  */
+#define DRM_LOCK_SLICE	      1	/* Time slice for lock, in jiffies	  */
+
+#define DRM_FLAG_DEBUG	  0x01
+#define DRM_FLAG_NOCTX	  0x02
+
+#define DRM_MEM_DMA	   0
+#define DRM_MEM_SAREA	   1
+#define DRM_MEM_DRIVER	   2
+#define DRM_MEM_MAGIC	   3
+#define DRM_MEM_IOCTLS	   4
+#define DRM_MEM_MAPS	   5
+#define DRM_MEM_VMAS	   6
+#define DRM_MEM_BUFS	   7
+#define DRM_MEM_SEGS	   8
+#define DRM_MEM_PAGES	   9
+#define DRM_MEM_FILES	  10
+#define DRM_MEM_QUEUES	  11
+#define DRM_MEM_CMDS	  12
+#define DRM_MEM_MAPPINGS  13
+#define DRM_MEM_BUFLISTS  14
+#define DRM_MEM_AGPLISTS  15
+#define DRM_MEM_TOTALAGP  16
+#define DRM_MEM_BOUNDAGP  17
+#define DRM_MEM_CTXBITMAP 18
+#define DRM_MEM_STUB      19
+#define DRM_MEM_SGLISTS   20
+
+#define DRM_MAX_CTXBITMAP (PAGE_SIZE * 8)
+
+				/* Backward compatibility section */
+#ifndef minor
+#define minor(x) MINOR((x))
+#endif
+
+#ifndef MODULE_LICENSE
+#define MODULE_LICENSE(x) 
+#endif
+
+#ifndef preempt_disable
+#define preempt_disable()
+#define preempt_enable()
+#endif
+
+#ifndef pte_offset_map 
+#define pte_offset_map pte_offset
+#define pte_unmap(pte)
+#endif
+
+#ifndef list_for_each_safe
+#define list_for_each_safe(pos, n, head)				\
+	for (pos = (head)->next, n = pos->next; pos != (head);		\
+		pos = n, n = pos->next)
+#endif
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,19)
+static inline struct page * vmalloc_to_page(void * vmalloc_addr)
+{
+	unsigned long addr = (unsigned long) vmalloc_addr;
+	struct page *page = NULL;
+	pgd_t *pgd = pgd_offset_k(addr);
+	pmd_t *pmd;
+	pte_t *ptep, pte;
+  
+	if (!pgd_none(*pgd)) {
+		pmd = pmd_offset(pgd, addr);
+		if (!pmd_none(*pmd)) {
+			preempt_disable();
+			ptep = pte_offset_map(pmd, addr);
+			pte = *ptep;
+			if (pte_present(pte))
+				page = pte_page(pte);
+			pte_unmap(ptep);
+			preempt_enable();
+		}
+	}
+	return page;
+}
+#endif
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+#define DRM_RPR_ARG(vma)
+#else
+#define DRM_RPR_ARG(vma) vma,
+#endif
+
+
+#define VM_OFFSET(vma) ((vma)->vm_pgoff << PAGE_SHIFT)
+
+				/* Macros to make printk easier */
+#define DRM_ERROR(fmt, arg...) \
+	printk(KERN_ERR "[" DRM_NAME ":%s] *ERROR* " fmt , __FUNCTION__ , ##arg)
+#define DRM_MEM_ERROR(area, fmt, arg...) \
+	printk(KERN_ERR "[" DRM_NAME ":%s:%s] *ERROR* " fmt , __FUNCTION__, \
+	       DRM(mem_stats)[area].name , ##arg)
+#define DRM_INFO(fmt, arg...)  printk(KERN_INFO "[" DRM_NAME "] " fmt , ##arg)
+
+#if DRM_DEBUG_CODE
+#define DRM_DEBUG(fmt, arg...)						\
+	do {								\
+		if ( DRM(flags) & DRM_FLAG_DEBUG )			\
+			printk(KERN_DEBUG				\
+			       "[" DRM_NAME ":%s] " fmt ,	\
+			       __FUNCTION__ , ##arg);			\
+	} while (0)
+#else
+#define DRM_DEBUG(fmt, arg...)		 do { } while (0)
+#endif
+
+#define DRM_PROC_LIMIT (PAGE_SIZE-80)
+
+#define DRM_PROC_PRINT(fmt, arg...)					\
+   len += sprintf(&buf[len], fmt , ##arg);				\
+   if (len > DRM_PROC_LIMIT) { *eof = 1; return len - offset; }
+
+#define DRM_PROC_PRINT_RET(ret, fmt, arg...)				\
+   len += sprintf(&buf[len], fmt , ##arg);				\
+   if (len > DRM_PROC_LIMIT) { ret; *eof = 1; return len - offset; }
+
+				/* Mapping helper macros */
+#define DRM_IOREMAP(map)						\
+	(map)->handle = DRM(ioremap)( (map)->offset, (map)->size )
+
+#define DRM_IOREMAP_NOCACHE(map)					\
+	(map)->handle = DRM(ioremap_nocache)((map)->offset, (map)->size)
+
+#define DRM_IOREMAPFREE(map)						\
+	do {								\
+		if ( (map)->handle && (map)->size )			\
+			DRM(ioremapfree)( (map)->handle, (map)->size );	\
+	} while (0)
+
+#define DRM_FIND_MAP(_map, _o)						\
+do {									\
+	struct list_head *_list;					\
+	list_for_each( _list, &dev->maplist->head ) {			\
+		drm_map_list_t *_entry = (drm_map_list_t *)_list;	\
+		if ( _entry->map &&					\
+		     _entry->map->offset == (_o) ) {			\
+			(_map) = _entry->map;				\
+			break;						\
+ 		}							\
+	}								\
+} while(0)
+
+				/* Internal types and structures */
+#define DRM_ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))
+#define DRM_MIN(a,b) ((a)<(b)?(a):(b))
+#define DRM_MAX(a,b) ((a)>(b)?(a):(b))
+
+#define DRM_LEFTCOUNT(x) (((x)->rp + (x)->count - (x)->wp) % ((x)->count + 1))
+#define DRM_BUFCOUNT(x) ((x)->count - DRM_LEFTCOUNT(x))
+#define DRM_WAITCOUNT(dev,idx) DRM_BUFCOUNT(&dev->queuelist[idx]->waitlist)
+
+#define DRM_GET_PRIV_SAREA(_dev, _ctx, _map) do {	\
+	(_map) = (_dev)->context_sareas[_ctx];		\
+} while(0)
+
+typedef int drm_ioctl_t( struct inode *inode, struct file *filp,
+			 unsigned int cmd, unsigned long arg );
+
+typedef struct drm_pci_list {
+	u16 vendor;
+	u16 device;
+} drm_pci_list_t;
+
+typedef struct drm_ioctl_desc {
+	drm_ioctl_t	     *func;
+	int		     auth_needed;
+	int		     root_only;
+} drm_ioctl_desc_t;
+
+typedef struct drm_devstate {
+	pid_t		  owner;	/* X server pid holding x_lock */
+
+} drm_devstate_t;
+
+typedef struct drm_magic_entry {
+	drm_magic_t	       magic;
+	struct drm_file	       *priv;
+	struct drm_magic_entry *next;
+} drm_magic_entry_t;
+
+typedef struct drm_magic_head {
+	struct drm_magic_entry *head;
+	struct drm_magic_entry *tail;
+} drm_magic_head_t;
+
+typedef struct drm_vma_entry {
+	struct vm_area_struct *vma;
+	struct drm_vma_entry  *next;
+	pid_t		      pid;
+} drm_vma_entry_t;
+
+typedef struct drm_buf {
+	int		  idx;	       /* Index into master buflist	     */
+	int		  total;       /* Buffer size			     */
+	int		  order;       /* log-base-2(total)		     */
+	int		  used;	       /* Amount of buffer in use (for DMA)  */
+	unsigned long	  offset;      /* Byte offset (used internally)	     */
+	void		  *address;    /* Address of buffer		     */
+	unsigned long	  bus_address; /* Bus address of buffer		     */
+	struct drm_buf	  *next;       /* Kernel-only: used for free list    */
+	__volatile__ int  waiting;     /* On kernel DMA queue		     */
+	__volatile__ int  pending;     /* On hardware DMA queue		     */
+	wait_queue_head_t dma_wait;    /* Processes waiting		     */
+	pid_t		  pid;	       /* PID of holding process	     */
+	int		  context;     /* Kernel queue for this buffer	     */
+	int		  while_locked;/* Dispatch this buffer while locked  */
+	enum {
+		DRM_LIST_NONE	 = 0,
+		DRM_LIST_FREE	 = 1,
+		DRM_LIST_WAIT	 = 2,
+		DRM_LIST_PEND	 = 3,
+		DRM_LIST_PRIO	 = 4,
+		DRM_LIST_RECLAIM = 5
+	}		  list;	       /* Which list we're on		     */
+
+#if DRM_DMA_HISTOGRAM
+	cycles_t	  time_queued;	   /* Queued to kernel DMA queue     */
+	cycles_t	  time_dispatched; /* Dispatched to hardware	     */
+	cycles_t	  time_completed;  /* Completed by hardware	     */
+	cycles_t	  time_freed;	   /* Back on freelist		     */
+#endif
+
+	int		  dev_priv_size; /* Size of buffer private stoarge   */
+	void		  *dev_private;  /* Per-buffer private storage       */
+} drm_buf_t;
+
+#if DRM_DMA_HISTOGRAM
+#define DRM_DMA_HISTOGRAM_SLOTS		  9
+#define DRM_DMA_HISTOGRAM_INITIAL	 10
+#define DRM_DMA_HISTOGRAM_NEXT(current)	 ((current)*10)
+typedef struct drm_histogram {
+	atomic_t	  total;
+
+	atomic_t	  queued_to_dispatched[DRM_DMA_HISTOGRAM_SLOTS];
+	atomic_t	  dispatched_to_completed[DRM_DMA_HISTOGRAM_SLOTS];
+	atomic_t	  completed_to_freed[DRM_DMA_HISTOGRAM_SLOTS];
+
+	atomic_t	  queued_to_completed[DRM_DMA_HISTOGRAM_SLOTS];
+	atomic_t	  queued_to_freed[DRM_DMA_HISTOGRAM_SLOTS];
+
+	atomic_t	  dma[DRM_DMA_HISTOGRAM_SLOTS];
+	atomic_t	  schedule[DRM_DMA_HISTOGRAM_SLOTS];
+	atomic_t	  ctx[DRM_DMA_HISTOGRAM_SLOTS];
+	atomic_t	  lacq[DRM_DMA_HISTOGRAM_SLOTS];
+	atomic_t	  lhld[DRM_DMA_HISTOGRAM_SLOTS];
+} drm_histogram_t;
+#endif
+
+				/* bufs is one longer than it has to be */
+typedef struct drm_waitlist {
+	int		  count;	/* Number of possible buffers	   */
+	drm_buf_t	  **bufs;	/* List of pointers to buffers	   */
+	drm_buf_t	  **rp;		/* Read pointer			   */
+	drm_buf_t	  **wp;		/* Write pointer		   */
+	drm_buf_t	  **end;	/* End pointer			   */
+	spinlock_t	  read_lock;
+	spinlock_t	  write_lock;
+} drm_waitlist_t;
+
+typedef struct drm_freelist {
+	int		  initialized; /* Freelist in use		   */
+	atomic_t	  count;       /* Number of free buffers	   */
+	drm_buf_t	  *next;       /* End pointer			   */
+
+	wait_queue_head_t waiting;     /* Processes waiting on free bufs   */
+	int		  low_mark;    /* Low water mark		   */
+	int		  high_mark;   /* High water mark		   */
+	atomic_t	  wfh;	       /* If waiting for high mark	   */
+	spinlock_t        lock;
+} drm_freelist_t;
+
+typedef struct drm_buf_entry {
+	int		  buf_size;
+	int		  buf_count;
+	drm_buf_t	  *buflist;
+	int		  seg_count;
+	int		  page_order;
+	unsigned long	  *seglist;
+
+	drm_freelist_t	  freelist;
+} drm_buf_entry_t;
+
+typedef struct drm_hw_lock {
+	__volatile__ unsigned int lock;
+	char			  padding[60]; /* Pad to cache line */
+} drm_hw_lock_t;
+
+typedef struct drm_file {
+	int		  authenticated;
+	int		  minor;
+	pid_t		  pid;
+	uid_t		  uid;
+	drm_magic_t	  magic;
+	unsigned long	  ioctl_count;
+	struct drm_file	  *next;
+	struct drm_file	  *prev;
+	struct drm_device *dev;
+	int 		  remove_auth_on_close;
+} drm_file_t;
+
+
+typedef struct drm_queue {
+	atomic_t	  use_count;	/* Outstanding uses (+1)	    */
+	atomic_t	  finalization;	/* Finalization in progress	    */
+	atomic_t	  block_count;	/* Count of processes waiting	    */
+	atomic_t	  block_read;	/* Queue blocked for reads	    */
+	wait_queue_head_t read_queue;	/* Processes waiting on block_read  */
+	atomic_t	  block_write;	/* Queue blocked for writes	    */
+	wait_queue_head_t write_queue;	/* Processes waiting on block_write */
+#if 1
+	atomic_t	  total_queued;	/* Total queued statistic	    */
+	atomic_t	  total_flushed;/* Total flushes statistic	    */
+	atomic_t	  total_locks;	/* Total locks statistics	    */
+#endif
+	drm_ctx_flags_t	  flags;	/* Context preserving and 2D-only   */
+	drm_waitlist_t	  waitlist;	/* Pending buffers		    */
+	wait_queue_head_t flush_queue;	/* Processes waiting until flush    */
+} drm_queue_t;
+
+typedef struct drm_lock_data {
+	drm_hw_lock_t	  *hw_lock;	/* Hardware lock		   */
+	pid_t		  pid;		/* PID of lock holder (0=kernel)   */
+	wait_queue_head_t lock_queue;	/* Queue of blocked processes	   */
+	unsigned long	  lock_time;	/* Time of last lock in jiffies	   */
+} drm_lock_data_t;
+
+typedef struct drm_device_dma {
+#if 0
+				/* Performance Counters */
+	atomic_t	  total_prio;	/* Total DRM_DMA_PRIORITY	   */
+	atomic_t	  total_bytes;	/* Total bytes DMA'd		   */
+	atomic_t	  total_dmas;	/* Total DMA buffers dispatched	   */
+
+	atomic_t	  total_missed_dma;  /* Missed drm_do_dma	    */
+	atomic_t	  total_missed_lock; /* Missed lock in drm_do_dma   */
+	atomic_t	  total_missed_free; /* Missed drm_free_this_buffer */
+	atomic_t	  total_missed_sched;/* Missed drm_dma_schedule	    */
+
+	atomic_t	  total_tried;	/* Tried next_buffer		    */
+	atomic_t	  total_hit;	/* Sent next_buffer		    */
+	atomic_t	  total_lost;	/* Lost interrupt		    */
+#endif
+
+	drm_buf_entry_t	  bufs[DRM_MAX_ORDER+1];
+	int		  buf_count;
+	drm_buf_t	  **buflist;	/* Vector of pointers info bufs	   */
+	int		  seg_count;
+	int		  page_count;
+	unsigned long	  *pagelist;
+	unsigned long	  byte_count;
+	enum {
+		_DRM_DMA_USE_AGP = 0x01,
+		_DRM_DMA_USE_SG  = 0x02
+	} flags;
+
+				/* DMA support */
+	drm_buf_t	  *this_buffer;	/* Buffer being sent		   */
+	drm_buf_t	  *next_buffer; /* Selected buffer to send	   */
+	drm_queue_t	  *next_queue;	/* Queue from which buffer selected*/
+	wait_queue_head_t waiting;	/* Processes waiting on free bufs  */
+} drm_device_dma_t;
+
+#if __REALLY_HAVE_AGP
+typedef struct drm_agp_mem {
+	unsigned long      handle;
+	agp_memory         *memory;
+	unsigned long      bound; /* address */
+	int                pages;
+	struct drm_agp_mem *prev;
+	struct drm_agp_mem *next;
+} drm_agp_mem_t;
+
+typedef struct drm_agp_head {
+	agp_kern_info      agp_info;
+	drm_agp_mem_t      *memory;
+	unsigned long      mode;
+	int                enabled;
+	int                acquired;
+	unsigned long      base;
+   	int 		   agp_mtrr;
+	int		   cant_use_aperture;
+	unsigned long	   page_mask;
+} drm_agp_head_t;
+#endif
+
+typedef struct drm_sg_mem {
+	unsigned long   handle;
+	void            *virtual;
+	int             pages;
+	struct page     **pagelist;
+	dma_addr_t	*busaddr;
+} drm_sg_mem_t;
+
+typedef struct drm_sigdata {
+	int           context;
+	drm_hw_lock_t *lock;
+} drm_sigdata_t;
+
+typedef struct drm_map_list {
+	struct list_head	head;
+	drm_map_t		*map;
+} drm_map_list_t;
+
+#if __HAVE_VBL_IRQ
+
+typedef struct drm_vbl_sig {
+	struct list_head	head;
+	unsigned int		sequence;
+	struct siginfo		info;
+	struct task_struct	*task;
+} drm_vbl_sig_t;
+
+#endif
+
+typedef struct drm_device {
+	const char	  *name;	/* Simple driver name		   */
+	char		  *unique;	/* Unique identifier: e.g., busid  */
+	int		  unique_len;	/* Length of unique field	   */
+	dev_t		  device;	/* Device number for mknod	   */
+	char		  *devname;	/* For /proc/interrupts		   */
+
+	int		  blocked;	/* Blocked due to VC switch?	   */
+	struct proc_dir_entry *root;	/* Root for this device's entries  */
+
+				/* Locks */
+	spinlock_t	  count_lock;	/* For inuse, open_count, buf_use  */
+	struct semaphore  struct_sem;	/* For others			   */
+
+				/* Usage Counters */
+	int		  open_count;	/* Outstanding files open	   */
+	atomic_t	  ioctl_count;	/* Outstanding IOCTLs pending	   */
+	atomic_t	  vma_count;	/* Outstanding vma areas open	   */
+	int		  buf_use;	/* Buffers in use -- cannot alloc  */
+	atomic_t	  buf_alloc;	/* Buffer allocation in progress   */
+
+				/* Performance counters */
+	unsigned long     counters;
+	drm_stat_type_t   types[15];
+	atomic_t          counts[15];
+
+				/* Authentication */
+	drm_file_t	  *file_first;
+	drm_file_t	  *file_last;
+	drm_magic_head_t  magiclist[DRM_HASH_SIZE];
+
+				/* Memory management */
+	drm_map_list_t	  *maplist;	/* Linked list of regions	   */
+	int		  map_count;	/* Number of mappable regions	   */
+
+	drm_map_t	  **context_sareas;
+	int		  max_context;
+
+	drm_vma_entry_t	  *vmalist;	/* List of vmas (for debugging)	   */
+	drm_lock_data_t	  lock;		/* Information on hardware lock	   */
+
+				/* DMA queues (contexts) */
+	int		  queue_count;	/* Number of active DMA queues	   */
+	int		  queue_reserved; /* Number of reserved DMA queues */
+	int		  queue_slots;	/* Actual length of queuelist	   */
+	drm_queue_t	  **queuelist;	/* Vector of pointers to DMA queues */
+	drm_device_dma_t  *dma;		/* Optional pointer for DMA support */
+
+				/* Context support */
+	int		  irq;		/* Interrupt used by board	   */
+	__volatile__ long context_flag;	/* Context swapping flag	   */
+	__volatile__ long interrupt_flag; /* Interruption handler flag	   */
+	__volatile__ long dma_flag;	/* DMA dispatch flag		   */
+	struct timer_list timer;	/* Timer for delaying ctx switch   */
+	wait_queue_head_t context_wait; /* Processes waiting on ctx switch */
+	int		  last_checked;	/* Last context checked for DMA	   */
+	int		  last_context;	/* Last current context		   */
+	unsigned long	  last_switch;	/* jiffies at last context switch  */
+	struct tq_struct  tq;
+#if __HAVE_VBL_IRQ
+   	wait_queue_head_t vbl_queue;
+   	atomic_t          vbl_received;
+	spinlock_t        vbl_lock;
+	drm_vbl_sig_t     vbl_sigs;
+	unsigned int      vbl_pending;
+#endif
+	cycles_t	  ctx_start;
+	cycles_t	  lck_start;
+#if __HAVE_DMA_HISTOGRAM
+	drm_histogram_t	  histo;
+#endif
+
+				/* Callback to X server for context switch
+				   and for heavy-handed reset. */
+	char		  buf[DRM_BSZ]; /* Output buffer		   */
+	char		  *buf_rp;	/* Read pointer			   */
+	char		  *buf_wp;	/* Write pointer		   */
+	char		  *buf_end;	/* End pointer			   */
+	struct fasync_struct *buf_async;/* Processes waiting for SIGIO	   */
+	wait_queue_head_t buf_readers;	/* Processes waiting to read	   */
+	wait_queue_head_t buf_writers;	/* Processes waiting to ctx switch */
+
+#if __REALLY_HAVE_AGP
+	drm_agp_head_t    *agp;
+#endif
+	struct pci_dev *pdev;
+#ifdef __alpha__
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,3)
+	struct pci_controler *hose;
+#else
+	struct pci_controller *hose;
+#endif
+#endif
+	drm_sg_mem_t      *sg;  /* Scatter gather memory */
+	unsigned long     *ctx_bitmap;
+	void		  *dev_private;
+	drm_sigdata_t     sigdata; /* For block_all_signals */
+	sigset_t          sigmask;
+} drm_device_t;
+
+
+/* ================================================================
+ * Internal function definitions
+ */
+
+				/* Misc. support (drm_init.h) */
+extern int	     DRM(flags);
+extern void	     DRM(parse_options)( char *s );
+extern int           DRM(cpu_valid)( void );
+
+				/* Driver support (drm_drv.h) */
+extern int           DRM(version)(struct inode *inode, struct file *filp,
+				  unsigned int cmd, unsigned long arg);
+extern int           DRM(open)(struct inode *inode, struct file *filp);
+extern int           DRM(release)(struct inode *inode, struct file *filp);
+extern int           DRM(ioctl)(struct inode *inode, struct file *filp,
+				unsigned int cmd, unsigned long arg);
+extern int           DRM(lock)(struct inode *inode, struct file *filp,
+			       unsigned int cmd, unsigned long arg);
+extern int           DRM(unlock)(struct inode *inode, struct file *filp,
+				 unsigned int cmd, unsigned long arg);
+
+				/* Device support (drm_fops.h) */
+extern int	     DRM(open_helper)(struct inode *inode, struct file *filp,
+				      drm_device_t *dev);
+extern int	     DRM(flush)(struct file *filp);
+extern int	     DRM(release_fuck)(struct inode *inode, struct file *filp);
+extern int	     DRM(fasync)(int fd, struct file *filp, int on);
+extern ssize_t	     DRM(read)(struct file *filp, char *buf, size_t count,
+			       loff_t *off);
+extern int	     DRM(write_string)(drm_device_t *dev, const char *s);
+extern unsigned int  DRM(poll)(struct file *filp,
+			       struct poll_table_struct *wait);
+
+				/* Mapping support (drm_vm.h) */
+extern struct page *DRM(vm_nopage)(struct vm_area_struct *vma,
+				   unsigned long address,
+				   int write_access);
+extern struct page *DRM(vm_shm_nopage)(struct vm_area_struct *vma,
+				       unsigned long address,
+				       int write_access);
+extern struct page *DRM(vm_dma_nopage)(struct vm_area_struct *vma,
+				       unsigned long address,
+				       int write_access);
+extern struct page *DRM(vm_sg_nopage)(struct vm_area_struct *vma,
+				      unsigned long address,
+				      int write_access);
+extern void	     DRM(vm_open)(struct vm_area_struct *vma);
+extern void	     DRM(vm_close)(struct vm_area_struct *vma);
+extern void	     DRM(vm_shm_close)(struct vm_area_struct *vma);
+extern int	     DRM(mmap_dma)(struct file *filp,
+				   struct vm_area_struct *vma);
+extern int	     DRM(mmap)(struct file *filp, struct vm_area_struct *vma);
+
+				/* Memory management support (drm_memory.h) */
+extern void	     DRM(mem_init)(void);
+extern int	     DRM(mem_info)(char *buf, char **start, off_t offset,
+				   int request, int *eof, void *data);
+extern void	     *DRM(alloc)(size_t size, int area);
+extern void	     *DRM(realloc)(void *oldpt, size_t oldsize, size_t size,
+				   int area);
+extern char	     *DRM(strdup)(const char *s, int area);
+extern void	     DRM(strfree)(const char *s, int area);
+extern void	     DRM(free)(void *pt, size_t size, int area);
+extern unsigned long DRM(alloc_pages)(int order, int area);
+extern void	     DRM(free_pages)(unsigned long address, int order,
+				     int area);
+extern void	     *DRM(ioremap)(unsigned long offset, unsigned long size);
+extern void	     *DRM(ioremap_nocache)(unsigned long offset, unsigned long size);
+extern void	     DRM(ioremapfree)(void *pt, unsigned long size);
+
+#if __REALLY_HAVE_AGP
+extern agp_memory    *DRM(alloc_agp)(int pages, u32 type);
+extern int           DRM(free_agp)(agp_memory *handle, int pages);
+extern int           DRM(bind_agp)(agp_memory *handle, unsigned int start);
+extern int           DRM(unbind_agp)(agp_memory *handle);
+#endif
+
+				/* Misc. IOCTL support (drm_ioctl.h) */
+extern int	     DRM(irq_busid)(struct inode *inode, struct file *filp,
+				    unsigned int cmd, unsigned long arg);
+extern int	     DRM(getunique)(struct inode *inode, struct file *filp,
+				    unsigned int cmd, unsigned long arg);
+extern int	     DRM(setunique)(struct inode *inode, struct file *filp,
+				    unsigned int cmd, unsigned long arg);
+extern int	     DRM(getmap)(struct inode *inode, struct file *filp,
+				 unsigned int cmd, unsigned long arg);
+extern int	     DRM(getclient)(struct inode *inode, struct file *filp,
+				    unsigned int cmd, unsigned long arg);
+extern int	     DRM(getstats)(struct inode *inode, struct file *filp,
+				   unsigned int cmd, unsigned long arg);
+
+				/* Context IOCTL support (drm_context.h) */
+extern int	     DRM(resctx)( struct inode *inode, struct file *filp,
+				  unsigned int cmd, unsigned long arg );
+extern int	     DRM(addctx)( struct inode *inode, struct file *filp,
+				  unsigned int cmd, unsigned long arg );
+extern int	     DRM(modctx)( struct inode *inode, struct file *filp,
+				  unsigned int cmd, unsigned long arg );
+extern int	     DRM(getctx)( struct inode *inode, struct file *filp,
+				  unsigned int cmd, unsigned long arg );
+extern int	     DRM(switchctx)( struct inode *inode, struct file *filp,
+				     unsigned int cmd, unsigned long arg );
+extern int	     DRM(newctx)( struct inode *inode, struct file *filp,
+				  unsigned int cmd, unsigned long arg );
+extern int	     DRM(rmctx)( struct inode *inode, struct file *filp,
+				 unsigned int cmd, unsigned long arg );
+
+extern int	     DRM(context_switch)(drm_device_t *dev, int old, int new);
+extern int	     DRM(context_switch_complete)(drm_device_t *dev, int new);
+
+#if __HAVE_CTX_BITMAP
+extern int	     DRM(ctxbitmap_init)( drm_device_t *dev );
+extern void	     DRM(ctxbitmap_cleanup)( drm_device_t *dev );
+#endif
+
+extern int	     DRM(setsareactx)( struct inode *inode, struct file *filp,
+				       unsigned int cmd, unsigned long arg );
+extern int	     DRM(getsareactx)( struct inode *inode, struct file *filp,
+				       unsigned int cmd, unsigned long arg );
+
+				/* Drawable IOCTL support (drm_drawable.h) */
+extern int	     DRM(adddraw)(struct inode *inode, struct file *filp,
+				  unsigned int cmd, unsigned long arg);
+extern int	     DRM(rmdraw)(struct inode *inode, struct file *filp,
+				 unsigned int cmd, unsigned long arg);
+
+
+				/* Authentication IOCTL support (drm_auth.h) */
+extern int	     DRM(add_magic)(drm_device_t *dev, drm_file_t *priv,
+				    drm_magic_t magic);
+extern int	     DRM(remove_magic)(drm_device_t *dev, drm_magic_t magic);
+extern int	     DRM(getmagic)(struct inode *inode, struct file *filp,
+				   unsigned int cmd, unsigned long arg);
+extern int	     DRM(authmagic)(struct inode *inode, struct file *filp,
+				    unsigned int cmd, unsigned long arg);
+
+
+				/* Locking IOCTL support (drm_lock.h) */
+extern int	     DRM(block)(struct inode *inode, struct file *filp,
+				unsigned int cmd, unsigned long arg);
+extern int	     DRM(unblock)(struct inode *inode, struct file *filp,
+				  unsigned int cmd, unsigned long arg);
+extern int	     DRM(lock_take)(__volatile__ unsigned int *lock,
+				    unsigned int context);
+extern int	     DRM(lock_transfer)(drm_device_t *dev,
+					__volatile__ unsigned int *lock,
+					unsigned int context);
+extern int	     DRM(lock_free)(drm_device_t *dev,
+				    __volatile__ unsigned int *lock,
+				    unsigned int context);
+extern int	     DRM(finish)(struct inode *inode, struct file *filp,
+				 unsigned int cmd, unsigned long arg);
+extern int	     DRM(flush_unblock)(drm_device_t *dev, int context,
+					drm_lock_flags_t flags);
+extern int	     DRM(flush_block_and_flush)(drm_device_t *dev, int context,
+						drm_lock_flags_t flags);
+extern int           DRM(notifier)(void *priv);
+
+				/* Buffer management support (drm_bufs.h) */
+extern int	     DRM(order)( unsigned long size );
+extern int	     DRM(addmap)( struct inode *inode, struct file *filp,
+				  unsigned int cmd, unsigned long arg );
+extern int	     DRM(rmmap)( struct inode *inode, struct file *filp,
+				 unsigned int cmd, unsigned long arg );
+#if __HAVE_DMA
+extern int	     DRM(addbufs)( struct inode *inode, struct file *filp,
+				   unsigned int cmd, unsigned long arg );
+extern int	     DRM(infobufs)( struct inode *inode, struct file *filp,
+				    unsigned int cmd, unsigned long arg );
+extern int	     DRM(markbufs)( struct inode *inode, struct file *filp,
+				    unsigned int cmd, unsigned long arg );
+extern int	     DRM(freebufs)( struct inode *inode, struct file *filp,
+				    unsigned int cmd, unsigned long arg );
+extern int	     DRM(mapbufs)( struct inode *inode, struct file *filp,
+				   unsigned int cmd, unsigned long arg );
+
+				/* DMA support (drm_dma.h) */
+extern int	     DRM(dma_setup)(drm_device_t *dev);
+extern void	     DRM(dma_takedown)(drm_device_t *dev);
+extern void	     DRM(free_buffer)(drm_device_t *dev, drm_buf_t *buf);
+extern void	     DRM(reclaim_buffers)(drm_device_t *dev, pid_t pid);
+#if __HAVE_OLD_DMA
+/* GH: This is a dirty hack for now...
+ */
+extern void	     DRM(clear_next_buffer)(drm_device_t *dev);
+extern int	     DRM(select_queue)(drm_device_t *dev,
+				       void (*wrapper)(unsigned long));
+extern int	     DRM(dma_enqueue)(drm_device_t *dev, drm_dma_t *dma);
+extern int	     DRM(dma_get_buffers)(drm_device_t *dev, drm_dma_t *dma);
+#endif
+#if __HAVE_DMA_IRQ
+extern int           DRM(control)( struct inode *inode, struct file *filp,
+				   unsigned int cmd, unsigned long arg );
+extern int           DRM(irq_install)( drm_device_t *dev, int irq );
+extern int           DRM(irq_uninstall)( drm_device_t *dev );
+extern void          DRM(dma_service)( int irq, void *device,
+				       struct pt_regs *regs );
+extern void          DRM(driver_irq_preinstall)( drm_device_t *dev );
+extern void          DRM(driver_irq_postinstall)( drm_device_t *dev );
+extern void          DRM(driver_irq_uninstall)( drm_device_t *dev );
+#if __HAVE_VBL_IRQ
+extern int           DRM(wait_vblank)(struct inode *inode, struct file *filp,
+				      unsigned int cmd, unsigned long arg);
+extern int           DRM(vblank_wait)(drm_device_t *dev, unsigned int *vbl_seq);
+extern void          DRM(vbl_send_signals)( drm_device_t *dev );
+#endif
+#if __HAVE_DMA_IRQ_BH
+extern void          DRM(dma_immediate_bh)( void *dev );
+#endif
+#endif
+#if DRM_DMA_HISTOGRAM
+extern int	     DRM(histogram_slot)(unsigned long count);
+extern void	     DRM(histogram_compute)(drm_device_t *dev, drm_buf_t *buf);
+#endif
+
+				/* Buffer list support (drm_lists.h) */
+#if __HAVE_DMA_WAITLIST
+extern int	     DRM(waitlist_create)(drm_waitlist_t *bl, int count);
+extern int	     DRM(waitlist_destroy)(drm_waitlist_t *bl);
+extern int	     DRM(waitlist_put)(drm_waitlist_t *bl, drm_buf_t *buf);
+extern drm_buf_t     *DRM(waitlist_get)(drm_waitlist_t *bl);
+#endif
+#if __HAVE_DMA_FREELIST
+extern int	     DRM(freelist_create)(drm_freelist_t *bl, int count);
+extern int	     DRM(freelist_destroy)(drm_freelist_t *bl);
+extern int	     DRM(freelist_put)(drm_device_t *dev, drm_freelist_t *bl,
+				       drm_buf_t *buf);
+extern drm_buf_t     *DRM(freelist_get)(drm_freelist_t *bl, int block);
+#endif
+#endif /* __HAVE_DMA */
+
+#if __REALLY_HAVE_AGP
+				/* AGP/GART support (drm_agpsupport.h) */
+extern drm_agp_head_t *DRM(agp_init)(void);
+extern void           DRM(agp_uninit)(void);
+extern int            DRM(agp_acquire)(struct inode *inode, struct file *filp,
+				       unsigned int cmd, unsigned long arg);
+extern void           DRM(agp_do_release)(void);
+extern int            DRM(agp_release)(struct inode *inode, struct file *filp,
+				       unsigned int cmd, unsigned long arg);
+extern int            DRM(agp_enable)(struct inode *inode, struct file *filp,
+				      unsigned int cmd, unsigned long arg);
+extern int            DRM(agp_info)(struct inode *inode, struct file *filp,
+				    unsigned int cmd, unsigned long arg);
+extern int            DRM(agp_alloc)(struct inode *inode, struct file *filp,
+				     unsigned int cmd, unsigned long arg);
+extern int            DRM(agp_free)(struct inode *inode, struct file *filp,
+				    unsigned int cmd, unsigned long arg);
+extern int            DRM(agp_unbind)(struct inode *inode, struct file *filp,
+				      unsigned int cmd, unsigned long arg);
+extern int            DRM(agp_bind)(struct inode *inode, struct file *filp,
+				    unsigned int cmd, unsigned long arg);
+extern agp_memory     *DRM(agp_allocate_memory)(size_t pages, u32 type);
+extern int            DRM(agp_free_memory)(agp_memory *handle);
+extern int            DRM(agp_bind_memory)(agp_memory *handle, off_t start);
+extern int            DRM(agp_unbind_memory)(agp_memory *handle);
+#endif
+
+				/* Stub support (drm_stub.h) */
+int                   DRM(stub_register)(const char *name,
+					 struct file_operations *fops,
+					 drm_device_t *dev);
+int                   DRM(stub_unregister)(int minor);
+
+				/* Proc support (drm_proc.h) */
+extern struct proc_dir_entry *DRM(proc_init)(drm_device_t *dev,
+					     int minor,
+					     struct proc_dir_entry *root,
+					     struct proc_dir_entry **dev_root);
+extern int            DRM(proc_cleanup)(int minor,
+					struct proc_dir_entry *root,
+					struct proc_dir_entry *dev_root);
+
+#if __HAVE_SG
+				/* Scatter Gather Support (drm_scatter.h) */
+extern void           DRM(sg_cleanup)(drm_sg_mem_t *entry);
+extern int            DRM(sg_alloc)(struct inode *inode, struct file *filp,
+				    unsigned int cmd, unsigned long arg);
+extern int            DRM(sg_free)(struct inode *inode, struct file *filp,
+				   unsigned int cmd, unsigned long arg);
+#endif
+
+                               /* ATI PCIGART support (ati_pcigart.h) */
+extern int            DRM(ati_pcigart_init)(drm_device_t *dev,
+					    unsigned long *addr,
+					    dma_addr_t *bus_addr);
+extern int            DRM(ati_pcigart_cleanup)(drm_device_t *dev,
+					       unsigned long addr,
+					       dma_addr_t bus_addr);
+
+#endif /* __KERNEL__ */
+#endif
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/drm_agpsupport.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/drm_agpsupport.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/drm_agpsupport.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/drm_agpsupport.h	2003-07-30 11:18:33.000000000 +0200
@@ -0,0 +1,311 @@
+/* drm_agpsupport.h -- DRM support for AGP/GART backend -*- linux-c -*-
+ * Created: Mon Dec 13 09:56:45 1999 by faith@precisioninsight.com
+ *
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Author:
+ *    Rickard E. (Rik) Faith <faith@valinux.com>
+ *    Gareth Hughes <gareth@valinux.com>
+ */
+
+#define __NO_VERSION__
+#include "drmP.h"
+#include <linux/module.h>
+
+#if __REALLY_HAVE_AGP
+
+#define DRM_AGP_GET (drm_agp_t *)inter_module_get("drm_agp")
+#define DRM_AGP_PUT inter_module_put("drm_agp")
+
+static const drm_agp_t *drm_agp = NULL;
+
+int DRM(agp_info)(struct inode *inode, struct file *filp,
+		  unsigned int cmd, unsigned long arg)
+{
+	drm_file_t	 *priv	 = filp->private_data;
+	drm_device_t	 *dev	 = priv->dev;
+	agp_kern_info    *kern;
+	drm_agp_info_t   info;
+
+	if (!dev->agp || !dev->agp->acquired || !drm_agp->copy_info)
+		return -EINVAL;
+
+	kern                   = &dev->agp->agp_info;
+	info.agp_version_major = kern->version.major;
+	info.agp_version_minor = kern->version.minor;
+	info.mode              = kern->mode;
+	info.aperture_base     = kern->aper_base;
+	info.aperture_size     = kern->aper_size * 1024 * 1024;
+	info.memory_allowed    = kern->max_memory << PAGE_SHIFT;
+	info.memory_used       = kern->current_memory << PAGE_SHIFT;
+	info.id_vendor         = kern->device->vendor;
+	info.id_device         = kern->device->device;
+
+	if (copy_to_user((drm_agp_info_t *)arg, &info, sizeof(info)))
+		return -EFAULT;
+	return 0;
+}
+
+int DRM(agp_acquire)(struct inode *inode, struct file *filp,
+		     unsigned int cmd, unsigned long arg)
+{
+	drm_file_t	 *priv	 = filp->private_data;
+	drm_device_t	 *dev	 = priv->dev;
+	int              retcode;
+
+	if (!dev->agp || dev->agp->acquired || !drm_agp->acquire)
+		return -EINVAL;
+	if ((retcode = drm_agp->acquire())) return retcode;
+	dev->agp->acquired = 1;
+	return 0;
+}
+
+int DRM(agp_release)(struct inode *inode, struct file *filp,
+		     unsigned int cmd, unsigned long arg)
+{
+	drm_file_t	 *priv	 = filp->private_data;
+	drm_device_t	 *dev	 = priv->dev;
+
+	if (!dev->agp || !dev->agp->acquired || !drm_agp->release)
+		return -EINVAL;
+	drm_agp->release();
+	dev->agp->acquired = 0;
+	return 0;
+
+}
+
+void DRM(agp_do_release)(void)
+{
+	if (drm_agp->release) drm_agp->release();
+}
+
+int DRM(agp_enable)(struct inode *inode, struct file *filp,
+		    unsigned int cmd, unsigned long arg)
+{
+	drm_file_t	 *priv	 = filp->private_data;
+	drm_device_t	 *dev	 = priv->dev;
+	drm_agp_mode_t   mode;
+
+	if (!dev->agp || !dev->agp->acquired || !drm_agp->enable)
+		return -EINVAL;
+
+	if (copy_from_user(&mode, (drm_agp_mode_t *)arg, sizeof(mode)))
+		return -EFAULT;
+
+	dev->agp->mode    = mode.mode;
+	drm_agp->enable(mode.mode);
+	dev->agp->base    = dev->agp->agp_info.aper_base;
+	dev->agp->enabled = 1;
+	return 0;
+}
+
+int DRM(agp_alloc)(struct inode *inode, struct file *filp,
+		   unsigned int cmd, unsigned long arg)
+{
+	drm_file_t	 *priv	 = filp->private_data;
+	drm_device_t	 *dev	 = priv->dev;
+	drm_agp_buffer_t request;
+	drm_agp_mem_t    *entry;
+	agp_memory       *memory;
+	unsigned long    pages;
+	u32 		 type;
+
+	if (!dev->agp || !dev->agp->acquired) return -EINVAL;
+	if (copy_from_user(&request, (drm_agp_buffer_t *)arg, sizeof(request)))
+		return -EFAULT;
+	if (!(entry = DRM(alloc)(sizeof(*entry), DRM_MEM_AGPLISTS)))
+		return -ENOMEM;
+
+   	memset(entry, 0, sizeof(*entry));
+
+	pages = (request.size + PAGE_SIZE - 1) / PAGE_SIZE;
+	type = (u32) request.type;
+
+	if (!(memory = DRM(alloc_agp)(pages, type))) {
+		DRM(free)(entry, sizeof(*entry), DRM_MEM_AGPLISTS);
+		return -ENOMEM;
+	}
+
+	entry->handle    = (unsigned long)memory->memory;
+	entry->memory    = memory;
+	entry->bound     = 0;
+	entry->pages     = pages;
+	entry->prev      = NULL;
+	entry->next      = dev->agp->memory;
+	if (dev->agp->memory) dev->agp->memory->prev = entry;
+	dev->agp->memory = entry;
+
+	request.handle   = entry->handle;
+        request.physical = memory->physical;
+
+	if (copy_to_user((drm_agp_buffer_t *)arg, &request, sizeof(request))) {
+		dev->agp->memory       = entry->next;
+		dev->agp->memory->prev = NULL;
+		DRM(free_agp)(memory, pages);
+		DRM(free)(entry, sizeof(*entry), DRM_MEM_AGPLISTS);
+		return -EFAULT;
+	}
+	return 0;
+}
+
+static drm_agp_mem_t *DRM(agp_lookup_entry)(drm_device_t *dev,
+					    unsigned long handle)
+{
+	drm_agp_mem_t *entry;
+
+	for (entry = dev->agp->memory; entry; entry = entry->next) {
+		if (entry->handle == handle) return entry;
+	}
+	return NULL;
+}
+
+int DRM(agp_unbind)(struct inode *inode, struct file *filp,
+		    unsigned int cmd, unsigned long arg)
+{
+	drm_file_t	  *priv	 = filp->private_data;
+	drm_device_t	  *dev	 = priv->dev;
+	drm_agp_binding_t request;
+	drm_agp_mem_t     *entry;
+
+	if (!dev->agp || !dev->agp->acquired) return -EINVAL;
+	if (copy_from_user(&request, (drm_agp_binding_t *)arg, sizeof(request)))
+		return -EFAULT;
+	if (!(entry = DRM(agp_lookup_entry)(dev, request.handle)))
+		return -EINVAL;
+	if (!entry->bound) return -EINVAL;
+	return DRM(unbind_agp)(entry->memory);
+}
+
+int DRM(agp_bind)(struct inode *inode, struct file *filp,
+		  unsigned int cmd, unsigned long arg)
+{
+	drm_file_t	  *priv	 = filp->private_data;
+	drm_device_t	  *dev	 = priv->dev;
+	drm_agp_binding_t request;
+	drm_agp_mem_t     *entry;
+	int               retcode;
+	int               page;
+
+	if (!dev->agp || !dev->agp->acquired || !drm_agp->bind_memory)
+		return -EINVAL;
+	if (copy_from_user(&request, (drm_agp_binding_t *)arg, sizeof(request)))
+		return -EFAULT;
+	if (!(entry = DRM(agp_lookup_entry)(dev, request.handle)))
+		return -EINVAL;
+	if (entry->bound) return -EINVAL;
+	page = (request.offset + PAGE_SIZE - 1) / PAGE_SIZE;
+	if ((retcode = DRM(bind_agp)(entry->memory, page))) return retcode;
+	entry->bound = dev->agp->base + (page << PAGE_SHIFT);
+	DRM_DEBUG("base = 0x%lx entry->bound = 0x%lx\n",
+		  dev->agp->base, entry->bound);
+	return 0;
+}
+
+int DRM(agp_free)(struct inode *inode, struct file *filp,
+		  unsigned int cmd, unsigned long arg)
+{
+	drm_file_t	 *priv	 = filp->private_data;
+	drm_device_t	 *dev	 = priv->dev;
+	drm_agp_buffer_t request;
+	drm_agp_mem_t    *entry;
+
+	if (!dev->agp || !dev->agp->acquired) return -EINVAL;
+	if (copy_from_user(&request, (drm_agp_buffer_t *)arg, sizeof(request)))
+		return -EFAULT;
+	if (!(entry = DRM(agp_lookup_entry)(dev, request.handle)))
+		return -EINVAL;
+	if (entry->bound) DRM(unbind_agp)(entry->memory);
+
+	if (entry->prev) entry->prev->next = entry->next;
+	else             dev->agp->memory  = entry->next;
+	if (entry->next) entry->next->prev = entry->prev;
+	DRM(free_agp)(entry->memory, entry->pages);
+	DRM(free)(entry, sizeof(*entry), DRM_MEM_AGPLISTS);
+	return 0;
+}
+
+drm_agp_head_t *DRM(agp_init)(void)
+{
+	drm_agp_head_t *head         = NULL;
+
+	drm_agp = DRM_AGP_GET;
+	if (drm_agp) {
+		if (!(head = DRM(alloc)(sizeof(*head), DRM_MEM_AGPLISTS)))
+			return NULL;
+		memset((void *)head, 0, sizeof(*head));
+		drm_agp->copy_info(&head->agp_info);
+		if (head->agp_info.chipset == NOT_SUPPORTED) {
+			DRM(free)(head, sizeof(*head), DRM_MEM_AGPLISTS);
+			return NULL;
+		}
+		head->memory = NULL;
+#if LINUX_VERSION_CODE <= 0x020408
+		head->cant_use_aperture = 0;
+		head->page_mask = ~(0xfff);
+#else
+		head->cant_use_aperture = head->agp_info.cant_use_aperture;
+		head->page_mask = head->agp_info.page_mask;
+#endif
+
+		DRM_INFO("AGP %d.%d aperture @ 0x%08lx %ZuMB\n",
+			 head->agp_info.version.major,
+			 head->agp_info.version.minor,
+			 head->agp_info.aper_base,
+			 head->agp_info.aper_size);
+	}
+	return head;
+}
+
+void DRM(agp_uninit)(void)
+{
+	DRM_AGP_PUT;
+	drm_agp = NULL;
+}
+
+agp_memory *DRM(agp_allocate_memory)(size_t pages, u32 type)
+{
+	if (!drm_agp->allocate_memory) return NULL;
+	return drm_agp->allocate_memory(pages, type);
+}
+
+int DRM(agp_free_memory)(agp_memory *handle)
+{
+	if (!handle || !drm_agp->free_memory) return 0;
+	drm_agp->free_memory(handle);
+	return 1;
+}
+
+int DRM(agp_bind_memory)(agp_memory *handle, off_t start)
+{
+	if (!handle || !drm_agp->bind_memory) return -EINVAL;
+	return drm_agp->bind_memory(handle, start);
+}
+
+int DRM(agp_unbind_memory)(agp_memory *handle)
+{
+	if (!handle || !drm_agp->unbind_memory) return -EINVAL;
+	return drm_agp->unbind_memory(handle);
+}
+
+#endif /* __REALLY_HAVE_AGP */
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/drm_auth.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/drm_auth.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/drm_auth.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/drm_auth.h	2003-07-30 11:18:33.000000000 +0200
@@ -0,0 +1,163 @@
+/* drm_auth.h -- IOCTLs for authentication -*- linux-c -*-
+ * Created: Tue Feb  2 08:37:54 1999 by faith@valinux.com
+ *
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Rickard E. (Rik) Faith <faith@valinux.com>
+ *    Gareth Hughes <gareth@valinux.com>
+ */
+
+#define __NO_VERSION__
+#include "drmP.h"
+
+static int DRM(hash_magic)(drm_magic_t magic)
+{
+	return magic & (DRM_HASH_SIZE-1);
+}
+
+static drm_file_t *DRM(find_file)(drm_device_t *dev, drm_magic_t magic)
+{
+	drm_file_t	  *retval = NULL;
+	drm_magic_entry_t *pt;
+	int		  hash	  = DRM(hash_magic)(magic);
+
+	down(&dev->struct_sem);
+	for (pt = dev->magiclist[hash].head; pt; pt = pt->next) {
+		if (pt->magic == magic) {
+			retval = pt->priv;
+			break;
+		}
+	}
+	up(&dev->struct_sem);
+	return retval;
+}
+
+int DRM(add_magic)(drm_device_t *dev, drm_file_t *priv, drm_magic_t magic)
+{
+	int		  hash;
+	drm_magic_entry_t *entry;
+
+	DRM_DEBUG("%d\n", magic);
+
+	hash	     = DRM(hash_magic)(magic);
+	entry	     = DRM(alloc)(sizeof(*entry), DRM_MEM_MAGIC);
+	if (!entry) return -ENOMEM;
+	memset(entry, 0, sizeof(*entry));
+	entry->magic = magic;
+	entry->priv  = priv;
+	entry->next  = NULL;
+
+	down(&dev->struct_sem);
+	if (dev->magiclist[hash].tail) {
+		dev->magiclist[hash].tail->next = entry;
+		dev->magiclist[hash].tail	= entry;
+	} else {
+		dev->magiclist[hash].head	= entry;
+		dev->magiclist[hash].tail	= entry;
+	}
+	up(&dev->struct_sem);
+
+	return 0;
+}
+
+int DRM(remove_magic)(drm_device_t *dev, drm_magic_t magic)
+{
+	drm_magic_entry_t *prev = NULL;
+	drm_magic_entry_t *pt;
+	int		  hash;
+
+	DRM_DEBUG("%d\n", magic);
+	hash = DRM(hash_magic)(magic);
+
+	down(&dev->struct_sem);
+	for (pt = dev->magiclist[hash].head; pt; prev = pt, pt = pt->next) {
+		if (pt->magic == magic) {
+			if (dev->magiclist[hash].head == pt) {
+				dev->magiclist[hash].head = pt->next;
+			}
+			if (dev->magiclist[hash].tail == pt) {
+				dev->magiclist[hash].tail = prev;
+			}
+			if (prev) {
+				prev->next = pt->next;
+			}
+			up(&dev->struct_sem);
+			return 0;
+		}
+	}
+	up(&dev->struct_sem);
+
+	DRM(free)(pt, sizeof(*pt), DRM_MEM_MAGIC);
+
+	return -EINVAL;
+}
+
+int DRM(getmagic)(struct inode *inode, struct file *filp,
+		  unsigned int cmd, unsigned long arg)
+{
+	static drm_magic_t sequence = 0;
+	static spinlock_t  lock	    = SPIN_LOCK_UNLOCKED;
+	drm_file_t	   *priv    = filp->private_data;
+	drm_device_t	   *dev	    = priv->dev;
+	drm_auth_t	   auth;
+
+				/* Find unique magic */
+	if (priv->magic) {
+		auth.magic = priv->magic;
+	} else {
+		do {
+			spin_lock(&lock);
+			if (!sequence) ++sequence; /* reserve 0 */
+			auth.magic = sequence++;
+			spin_unlock(&lock);
+		} while (DRM(find_file)(dev, auth.magic));
+		priv->magic = auth.magic;
+		DRM(add_magic)(dev, priv, auth.magic);
+	}
+
+	DRM_DEBUG("%u\n", auth.magic);
+	if (copy_to_user((drm_auth_t *)arg, &auth, sizeof(auth)))
+		return -EFAULT;
+	return 0;
+}
+
+int DRM(authmagic)(struct inode *inode, struct file *filp,
+		   unsigned int cmd, unsigned long arg)
+{
+	drm_file_t	   *priv    = filp->private_data;
+	drm_device_t	   *dev	    = priv->dev;
+	drm_auth_t	   auth;
+	drm_file_t	   *file;
+
+	if (copy_from_user(&auth, (drm_auth_t *)arg, sizeof(auth)))
+		return -EFAULT;
+	DRM_DEBUG("%u\n", auth.magic);
+	if ((file = DRM(find_file)(dev, auth.magic))) {
+		file->authenticated = 1;
+		DRM(remove_magic)(dev, auth.magic);
+		return 0;
+	}
+	return -EINVAL;
+}
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/drm_bufs.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/drm_bufs.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/drm_bufs.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/drm_bufs.h	2003-07-30 11:18:33.000000000 +0200
@@ -0,0 +1,1137 @@
+/* drm_bufs.h -- Generic buffer template -*- linux-c -*-
+ * Created: Thu Nov 23 03:10:50 2000 by gareth@valinux.com
+ *
+ * Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Rickard E. (Rik) Faith <faith@valinux.com>
+ *    Gareth Hughes <gareth@valinux.com>
+ */
+
+#define __NO_VERSION__
+#include <linux/vmalloc.h>
+#include "drmP.h"
+
+#ifndef __HAVE_PCI_DMA
+#define __HAVE_PCI_DMA		0
+#endif
+
+#ifndef __HAVE_SG
+#define __HAVE_SG		0
+#endif
+
+#ifndef DRIVER_BUF_PRIV_T
+#define DRIVER_BUF_PRIV_T		u32
+#endif
+#ifndef DRIVER_AGP_BUFFERS_MAP
+#if __HAVE_AGP && __HAVE_DMA
+#error "You must define DRIVER_AGP_BUFFERS_MAP()"
+#else
+#define DRIVER_AGP_BUFFERS_MAP( dev )	NULL
+#endif
+#endif
+
+/*
+ * Compute order.  Can be made faster.
+ */
+int DRM(order)( unsigned long size )
+{
+	int order;
+	unsigned long tmp;
+
+	for ( order = 0, tmp = size ; tmp >>= 1 ; ++order );
+
+	if ( size & ~(1 << order) )
+		++order;
+
+	return order;
+}
+
+int DRM(addmap)( struct inode *inode, struct file *filp,
+		 unsigned int cmd, unsigned long arg )
+{
+	drm_file_t *priv = filp->private_data;
+	drm_device_t *dev = priv->dev;
+	drm_map_t *map;
+	drm_map_list_t *list;
+
+	if ( !(filp->f_mode & 3) ) return -EACCES; /* Require read/write */
+
+	map = DRM(alloc)( sizeof(*map), DRM_MEM_MAPS );
+	if ( !map )
+		return -ENOMEM;
+
+	if ( copy_from_user( map, (drm_map_t *)arg, sizeof(*map) ) ) {
+		DRM(free)( map, sizeof(*map), DRM_MEM_MAPS );
+		return -EFAULT;
+	}
+
+	/* Only allow shared memory to be removable since we only keep enough
+	 * book keeping information about shared memory to allow for removal
+	 * when processes fork.
+	 */
+	if ( (map->flags & _DRM_REMOVABLE) && map->type != _DRM_SHM ) {
+		DRM(free)( map, sizeof(*map), DRM_MEM_MAPS );
+		return -EINVAL;
+	}
+	DRM_DEBUG( "offset = 0x%08lx, size = 0x%08lx, type = %d\n",
+		   map->offset, map->size, map->type );
+	if ( (map->offset & (~PAGE_MASK)) || (map->size & (~PAGE_MASK)) ) {
+		DRM(free)( map, sizeof(*map), DRM_MEM_MAPS );
+		return -EINVAL;
+	}
+	map->mtrr   = -1;
+	map->handle = 0;
+
+	switch ( map->type ) {
+	case _DRM_REGISTERS:
+	case _DRM_FRAME_BUFFER:
+#if !defined(__sparc__) && !defined(__alpha__)
+		if ( map->offset + map->size < map->offset ||
+		     map->offset < virt_to_phys(high_memory) ) {
+			DRM(free)( map, sizeof(*map), DRM_MEM_MAPS );
+			return -EINVAL;
+		}
+#endif
+#ifdef __alpha__
+		map->offset += dev->hose->mem_space->start;
+#endif
+#if __REALLY_HAVE_MTRR
+		if ( map->type == _DRM_FRAME_BUFFER ||
+		     (map->flags & _DRM_WRITE_COMBINING) ) {
+			map->mtrr = mtrr_add( map->offset, map->size,
+					      MTRR_TYPE_WRCOMB, 1 );
+		}
+#endif
+		map->handle = DRM(ioremap)( map->offset, map->size );
+		break;
+
+	case _DRM_SHM:
+		map->handle = vmalloc_32(map->size);
+		DRM_DEBUG( "%ld %d %p\n",
+			   map->size, DRM(order)( map->size ), map->handle );
+		if ( !map->handle ) {
+			DRM(free)( map, sizeof(*map), DRM_MEM_MAPS );
+			return -ENOMEM;
+		}
+		map->offset = (unsigned long)map->handle;
+		if ( map->flags & _DRM_CONTAINS_LOCK ) {
+			dev->sigdata.lock =
+			dev->lock.hw_lock = map->handle; /* Pointer to lock */
+		}
+		break;
+#if __REALLY_HAVE_AGP
+	case _DRM_AGP:
+#ifdef __alpha__
+		map->offset += dev->hose->mem_space->start;
+#endif
+		map->offset = map->offset + dev->agp->base;
+		map->mtrr   = dev->agp->agp_mtrr; /* for getmap */
+		break;
+#endif
+	case _DRM_SCATTER_GATHER:
+		if (!dev->sg) {
+			DRM(free)(map, sizeof(*map), DRM_MEM_MAPS);
+			return -EINVAL;
+		}
+		map->offset = map->offset + dev->sg->handle;
+		break;
+
+	default:
+		DRM(free)( map, sizeof(*map), DRM_MEM_MAPS );
+		return -EINVAL;
+	}
+
+	list = DRM(alloc)(sizeof(*list), DRM_MEM_MAPS);
+	if(!list) {
+		DRM(free)(map, sizeof(*map), DRM_MEM_MAPS);
+		return -EINVAL;
+	}
+	memset(list, 0, sizeof(*list));
+	list->map = map;
+
+	down(&dev->struct_sem);
+	list_add(&list->head, &dev->maplist->head);
+ 	up(&dev->struct_sem);
+
+	if ( copy_to_user( (drm_map_t *)arg, map, sizeof(*map) ) )
+		return -EFAULT;
+	if ( map->type != _DRM_SHM ) {
+		if ( copy_to_user( &((drm_map_t *)arg)->handle,
+				   &map->offset,
+				   sizeof(map->offset) ) )
+			return -EFAULT;
+	}
+	return 0;
+}
+
+
+/* Remove a map private from list and deallocate resources if the mapping
+ * isn't in use.
+ */
+
+int DRM(rmmap)(struct inode *inode, struct file *filp,
+	       unsigned int cmd, unsigned long arg)
+{
+	drm_file_t	*priv	= filp->private_data;
+	drm_device_t	*dev	= priv->dev;
+	struct list_head *list;
+	drm_map_list_t *r_list = NULL;
+	drm_vma_entry_t *pt, *prev;
+	drm_map_t *map;
+	drm_map_t request;
+	int found_maps = 0;
+
+	if (copy_from_user(&request, (drm_map_t *)arg,
+			   sizeof(request))) {
+		return -EFAULT;
+	}
+
+	down(&dev->struct_sem);
+	list = &dev->maplist->head;
+	list_for_each(list, &dev->maplist->head) {
+		r_list = (drm_map_list_t *) list;
+
+		if(r_list->map &&
+		   r_list->map->handle == request.handle &&
+		   r_list->map->flags & _DRM_REMOVABLE) break;
+	}
+
+	/* List has wrapped around to the head pointer, or its empty we didn't
+	 * find anything.
+	 */
+	if(list == (&dev->maplist->head)) {
+		up(&dev->struct_sem);
+		return -EINVAL;
+	}
+	map = r_list->map;
+	list_del(list);
+	DRM(free)(list, sizeof(*list), DRM_MEM_MAPS);
+
+	for (pt = dev->vmalist, prev = NULL; pt; prev = pt, pt = pt->next) {
+		if (pt->vma->vm_private_data == map) found_maps++;
+	}
+
+	if(!found_maps) {
+		switch (map->type) {
+		case _DRM_REGISTERS:
+		case _DRM_FRAME_BUFFER:
+#if __REALLY_HAVE_MTRR
+			if (map->mtrr >= 0) {
+				int retcode;
+				retcode = mtrr_del(map->mtrr,
+						   map->offset,
+						   map->size);
+				DRM_DEBUG("mtrr_del = %d\n", retcode);
+			}
+#endif
+			DRM(ioremapfree)(map->handle, map->size);
+			break;
+		case _DRM_SHM:
+			vfree(map->handle);
+			break;
+		case _DRM_AGP:
+		case _DRM_SCATTER_GATHER:
+			break;
+		}
+		DRM(free)(map, sizeof(*map), DRM_MEM_MAPS);
+	}
+	up(&dev->struct_sem);
+	return 0;
+}
+
+#if __HAVE_DMA
+
+
+static void DRM(cleanup_buf_error)(drm_buf_entry_t *entry)
+{
+	int i;
+
+	if (entry->seg_count) {
+		for (i = 0; i < entry->seg_count; i++) {
+			DRM(free_pages)(entry->seglist[i],
+					entry->page_order,
+					DRM_MEM_DMA);
+		}
+		DRM(free)(entry->seglist,
+			  entry->seg_count *
+			  sizeof(*entry->seglist),
+			  DRM_MEM_SEGS);
+
+		entry->seg_count = 0;
+	}
+
+   	if(entry->buf_count) {
+	   	for(i = 0; i < entry->buf_count; i++) {
+			if(entry->buflist[i].dev_private) {
+				DRM(free)(entry->buflist[i].dev_private,
+					  entry->buflist[i].dev_priv_size,
+					  DRM_MEM_BUFS);
+			}
+		}
+		DRM(free)(entry->buflist,
+			  entry->buf_count *
+			  sizeof(*entry->buflist),
+			  DRM_MEM_BUFS);
+
+#if __HAVE_DMA_FREELIST
+	   	DRM(freelist_destroy)(&entry->freelist);
+#endif
+
+		entry->buf_count = 0;
+	}
+}
+
+#if __REALLY_HAVE_AGP
+int DRM(addbufs_agp)( struct inode *inode, struct file *filp,
+		      unsigned int cmd, unsigned long arg )
+{
+	drm_file_t *priv = filp->private_data;
+	drm_device_t *dev = priv->dev;
+	drm_device_dma_t *dma = dev->dma;
+	drm_buf_desc_t request;
+	drm_buf_entry_t *entry;
+	drm_buf_t *buf;
+	unsigned long offset;
+	unsigned long agp_offset;
+	int count;
+	int order;
+	int size;
+	int alignment;
+	int page_order;
+	int total;
+	int byte_count;
+	int i;
+	drm_buf_t **temp_buflist;
+
+	if ( !dma ) return -EINVAL;
+
+	if ( copy_from_user( &request, (drm_buf_desc_t *)arg,
+			     sizeof(request) ) )
+		return -EFAULT;
+
+	count = request.count;
+	order = DRM(order)( request.size );
+	size = 1 << order;
+
+	alignment  = (request.flags & _DRM_PAGE_ALIGN)
+		? PAGE_ALIGN(size) : size;
+	page_order = order - PAGE_SHIFT > 0 ? order - PAGE_SHIFT : 0;
+	total = PAGE_SIZE << page_order;
+
+	byte_count = 0;
+	agp_offset = dev->agp->base + request.agp_start;
+
+	DRM_DEBUG( "count:      %d\n",  count );
+	DRM_DEBUG( "order:      %d\n",  order );
+	DRM_DEBUG( "size:       %d\n",  size );
+	DRM_DEBUG( "agp_offset: %ld\n", agp_offset );
+	DRM_DEBUG( "alignment:  %d\n",  alignment );
+	DRM_DEBUG( "page_order: %d\n",  page_order );
+	DRM_DEBUG( "total:      %d\n",  total );
+
+	if ( order < DRM_MIN_ORDER || order > DRM_MAX_ORDER ) return -EINVAL;
+	if ( dev->queue_count ) return -EBUSY; /* Not while in use */
+
+	spin_lock( &dev->count_lock );
+	if ( dev->buf_use ) {
+		spin_unlock( &dev->count_lock );
+		return -EBUSY;
+	}
+	atomic_inc( &dev->buf_alloc );
+	spin_unlock( &dev->count_lock );
+
+	down( &dev->struct_sem );
+	entry = &dma->bufs[order];
+	if ( entry->buf_count ) {
+		up( &dev->struct_sem );
+		atomic_dec( &dev->buf_alloc );
+		return -ENOMEM; /* May only call once for each order */
+	}
+
+	if (count < 0 || count > 4096) {
+		up( &dev->struct_sem );
+		atomic_dec( &dev->buf_alloc );
+		return -EINVAL;
+	}
+
+	entry->buflist = DRM(alloc)( count * sizeof(*entry->buflist),
+				    DRM_MEM_BUFS );
+	if ( !entry->buflist ) {
+		up( &dev->struct_sem );
+		atomic_dec( &dev->buf_alloc );
+		return -ENOMEM;
+	}
+	memset( entry->buflist, 0, count * sizeof(*entry->buflist) );
+
+	entry->buf_size = size;
+	entry->page_order = page_order;
+
+	offset = 0;
+
+	while ( entry->buf_count < count ) {
+		buf          = &entry->buflist[entry->buf_count];
+		buf->idx     = dma->buf_count + entry->buf_count;
+		buf->total   = alignment;
+		buf->order   = order;
+		buf->used    = 0;
+
+		buf->offset  = (dma->byte_count + offset);
+		buf->bus_address = agp_offset + offset;
+		buf->address = (void *)(agp_offset + offset);
+		buf->next    = NULL;
+		buf->waiting = 0;
+		buf->pending = 0;
+		init_waitqueue_head( &buf->dma_wait );
+		buf->pid     = 0;
+
+		buf->dev_priv_size = sizeof(DRIVER_BUF_PRIV_T);
+		buf->dev_private = DRM(alloc)( sizeof(DRIVER_BUF_PRIV_T),
+					       DRM_MEM_BUFS );
+		if(!buf->dev_private) {
+			/* Set count correctly so we free the proper amount. */
+			entry->buf_count = count;
+			DRM(cleanup_buf_error)(entry);
+		}
+		memset( buf->dev_private, 0, buf->dev_priv_size );
+
+#if __HAVE_DMA_HISTOGRAM
+		buf->time_queued = 0;
+		buf->time_dispatched = 0;
+		buf->time_completed = 0;
+		buf->time_freed = 0;
+#endif
+		DRM_DEBUG( "buffer %d @ %p\n",
+			   entry->buf_count, buf->address );
+
+		offset += alignment;
+		entry->buf_count++;
+		byte_count += PAGE_SIZE << page_order;
+	}
+
+	DRM_DEBUG( "byte_count: %d\n", byte_count );
+
+	temp_buflist = DRM(realloc)( dma->buflist,
+				     dma->buf_count * sizeof(*dma->buflist),
+				     (dma->buf_count + entry->buf_count)
+				     * sizeof(*dma->buflist),
+				     DRM_MEM_BUFS );
+	if(!temp_buflist) {
+		/* Free the entry because it isn't valid */
+		DRM(cleanup_buf_error)(entry);
+		up( &dev->struct_sem );
+		atomic_dec( &dev->buf_alloc );
+		return -ENOMEM;
+	}
+	dma->buflist = temp_buflist;
+
+	for ( i = 0 ; i < entry->buf_count ; i++ ) {
+		dma->buflist[i + dma->buf_count] = &entry->buflist[i];
+	}
+
+	dma->buf_count += entry->buf_count;
+	dma->byte_count += byte_count;
+
+	DRM_DEBUG( "dma->buf_count : %d\n", dma->buf_count );
+	DRM_DEBUG( "entry->buf_count : %d\n", entry->buf_count );
+
+#if __HAVE_DMA_FREELIST
+	DRM(freelist_create)( &entry->freelist, entry->buf_count );
+	for ( i = 0 ; i < entry->buf_count ; i++ ) {
+		DRM(freelist_put)( dev, &entry->freelist, &entry->buflist[i] );
+	}
+#endif
+	up( &dev->struct_sem );
+
+	request.count = entry->buf_count;
+	request.size = size;
+
+	if ( copy_to_user( (drm_buf_desc_t *)arg, &request, sizeof(request) ) )
+		return -EFAULT;
+
+	dma->flags = _DRM_DMA_USE_AGP;
+
+	atomic_dec( &dev->buf_alloc );
+	return 0;
+}
+#endif /* __REALLY_HAVE_AGP */
+
+#if __HAVE_PCI_DMA
+int DRM(addbufs_pci)( struct inode *inode, struct file *filp,
+		      unsigned int cmd, unsigned long arg )
+{
+   	drm_file_t *priv = filp->private_data;
+	drm_device_t *dev = priv->dev;
+	drm_device_dma_t *dma = dev->dma;
+	drm_buf_desc_t request;
+	int count;
+	int order;
+	int size;
+	int total;
+	int page_order;
+	drm_buf_entry_t *entry;
+	unsigned long page;
+	drm_buf_t *buf;
+	int alignment;
+	unsigned long offset;
+	int i;
+	int byte_count;
+	int page_count;
+	unsigned long *temp_pagelist;
+	drm_buf_t **temp_buflist;
+
+	if ( !dma ) return -EINVAL;
+
+	if ( copy_from_user( &request, (drm_buf_desc_t *)arg,
+			     sizeof(request) ) )
+		return -EFAULT;
+
+	count = request.count;
+	order = DRM(order)( request.size );
+	size = 1 << order;
+
+	DRM_DEBUG( "count=%d, size=%d (%d), order=%d, queue_count=%d\n",
+		   request.count, request.size, size,
+		   order, dev->queue_count );
+
+	if ( order < DRM_MIN_ORDER || order > DRM_MAX_ORDER ) return -EINVAL;
+	if ( dev->queue_count ) return -EBUSY; /* Not while in use */
+
+	alignment = (request.flags & _DRM_PAGE_ALIGN)
+		? PAGE_ALIGN(size) : size;
+	page_order = order - PAGE_SHIFT > 0 ? order - PAGE_SHIFT : 0;
+	total = PAGE_SIZE << page_order;
+
+	spin_lock( &dev->count_lock );
+	if ( dev->buf_use ) {
+		spin_unlock( &dev->count_lock );
+		return -EBUSY;
+	}
+	atomic_inc( &dev->buf_alloc );
+	spin_unlock( &dev->count_lock );
+
+	down( &dev->struct_sem );
+	entry = &dma->bufs[order];
+	if ( entry->buf_count ) {
+		up( &dev->struct_sem );
+		atomic_dec( &dev->buf_alloc );
+		return -ENOMEM;	/* May only call once for each order */
+	}
+
+	if (count < 0 || count > 4096) {
+		up( &dev->struct_sem );
+		atomic_dec( &dev->buf_alloc );
+		return -EINVAL;
+	}
+
+	entry->buflist = DRM(alloc)( count * sizeof(*entry->buflist),
+				    DRM_MEM_BUFS );
+	if ( !entry->buflist ) {
+		up( &dev->struct_sem );
+		atomic_dec( &dev->buf_alloc );
+		return -ENOMEM;
+	}
+	memset( entry->buflist, 0, count * sizeof(*entry->buflist) );
+
+	entry->seglist = DRM(alloc)( count * sizeof(*entry->seglist),
+				    DRM_MEM_SEGS );
+	if ( !entry->seglist ) {
+		DRM(free)( entry->buflist,
+			  count * sizeof(*entry->buflist),
+			  DRM_MEM_BUFS );
+		up( &dev->struct_sem );
+		atomic_dec( &dev->buf_alloc );
+		return -ENOMEM;
+	}
+	memset( entry->seglist, 0, count * sizeof(*entry->seglist) );
+
+	temp_pagelist = DRM(realloc)( dma->pagelist,
+				      dma->page_count * sizeof(*dma->pagelist),
+				      (dma->page_count + (count << page_order))
+				      * sizeof(*dma->pagelist),
+				      DRM_MEM_PAGES );
+	if(!temp_pagelist) {
+		DRM(free)( entry->buflist,
+			   count * sizeof(*entry->buflist),
+			   DRM_MEM_BUFS );
+		DRM(free)( entry->seglist,
+			   count * sizeof(*entry->seglist),
+			   DRM_MEM_SEGS );
+		up( &dev->struct_sem );
+		atomic_dec( &dev->buf_alloc );
+		return -ENOMEM;
+	}
+
+	dma->pagelist = temp_pagelist;
+	DRM_DEBUG( "pagelist: %d entries\n",
+		   dma->page_count + (count << page_order) );
+
+	entry->buf_size	= size;
+	entry->page_order = page_order;
+	byte_count = 0;
+	page_count = 0;
+
+	while ( entry->buf_count < count ) {
+		page = DRM(alloc_pages)( page_order, DRM_MEM_DMA );
+		if ( !page ) break;
+		entry->seglist[entry->seg_count++] = page;
+		for ( i = 0 ; i < (1 << page_order) ; i++ ) {
+			DRM_DEBUG( "page %d @ 0x%08lx\n",
+				   dma->page_count + page_count,
+				   page + PAGE_SIZE * i );
+			dma->pagelist[dma->page_count + page_count++]
+				= page + PAGE_SIZE * i;
+		}
+		for ( offset = 0 ;
+		      offset + size <= total && entry->buf_count < count ;
+		      offset += alignment, ++entry->buf_count ) {
+			buf	     = &entry->buflist[entry->buf_count];
+			buf->idx     = dma->buf_count + entry->buf_count;
+			buf->total   = alignment;
+			buf->order   = order;
+			buf->used    = 0;
+			buf->offset  = (dma->byte_count + byte_count + offset);
+			buf->address = (void *)(page + offset);
+			buf->next    = NULL;
+			buf->waiting = 0;
+			buf->pending = 0;
+			init_waitqueue_head( &buf->dma_wait );
+			buf->pid     = 0;
+#if __HAVE_DMA_HISTOGRAM
+			buf->time_queued     = 0;
+			buf->time_dispatched = 0;
+			buf->time_completed  = 0;
+			buf->time_freed      = 0;
+#endif
+			DRM_DEBUG( "buffer %d @ %p\n",
+				   entry->buf_count, buf->address );
+		}
+		byte_count += PAGE_SIZE << page_order;
+	}
+
+	temp_buflist = DRM(realloc)( dma->buflist,
+				     dma->buf_count * sizeof(*dma->buflist),
+				     (dma->buf_count + entry->buf_count)
+				     * sizeof(*dma->buflist),
+				     DRM_MEM_BUFS );
+	if(!temp_buflist) {
+		/* Free the entry because it isn't valid */
+		DRM(cleanup_buf_error)(entry);
+		up( &dev->struct_sem );
+		atomic_dec( &dev->buf_alloc );
+		return -ENOMEM;
+	}
+	dma->buflist = temp_buflist;
+
+	for ( i = 0 ; i < entry->buf_count ; i++ ) {
+		dma->buflist[i + dma->buf_count] = &entry->buflist[i];
+	}
+
+	dma->buf_count += entry->buf_count;
+	dma->seg_count += entry->seg_count;
+	dma->page_count += entry->seg_count << page_order;
+	dma->byte_count += PAGE_SIZE * (entry->seg_count << page_order);
+
+#if __HAVE_DMA_FREELIST
+	DRM(freelist_create)( &entry->freelist, entry->buf_count );
+	for ( i = 0 ; i < entry->buf_count ; i++ ) {
+		DRM(freelist_put)( dev, &entry->freelist, &entry->buflist[i] );
+	}
+#endif
+	up( &dev->struct_sem );
+
+	request.count = entry->buf_count;
+	request.size = size;
+
+	if ( copy_to_user( (drm_buf_desc_t *)arg, &request, sizeof(request) ) )
+		return -EFAULT;
+
+	atomic_dec( &dev->buf_alloc );
+	return 0;
+
+}
+#endif /* __HAVE_PCI_DMA */
+
+#ifdef __HAVE_SG
+int DRM(addbufs_sg)( struct inode *inode, struct file *filp,
+                     unsigned int cmd, unsigned long arg )
+{
+	drm_file_t *priv = filp->private_data;
+	drm_device_t *dev = priv->dev;
+	drm_device_dma_t *dma = dev->dma;
+	drm_buf_desc_t request;
+	drm_buf_entry_t *entry;
+	drm_buf_t *buf;
+	unsigned long offset;
+	unsigned long agp_offset;
+	int count;
+	int order;
+	int size;
+	int alignment;
+	int page_order;
+	int total;
+	int byte_count;
+	int i;
+	drm_buf_t **temp_buflist;
+
+	if ( !dma ) return -EINVAL;
+
+	if ( copy_from_user( &request, (drm_buf_desc_t *)arg,
+                             sizeof(request) ) )
+		return -EFAULT;
+
+	count = request.count;
+	order = DRM(order)( request.size );
+	size = 1 << order;
+
+	alignment  = (request.flags & _DRM_PAGE_ALIGN)
+			? PAGE_ALIGN(size) : size;
+	page_order = order - PAGE_SHIFT > 0 ? order - PAGE_SHIFT : 0;
+	total = PAGE_SIZE << page_order;
+
+	byte_count = 0;
+	agp_offset = request.agp_start;
+
+	DRM_DEBUG( "count:      %d\n",  count );
+	DRM_DEBUG( "order:      %d\n",  order );
+	DRM_DEBUG( "size:       %d\n",  size );
+	DRM_DEBUG( "agp_offset: %ld\n", agp_offset );
+	DRM_DEBUG( "alignment:  %d\n",  alignment );
+	DRM_DEBUG( "page_order: %d\n",  page_order );
+	DRM_DEBUG( "total:      %d\n",  total );
+
+	if ( order < DRM_MIN_ORDER || order > DRM_MAX_ORDER ) return -EINVAL;
+	if ( dev->queue_count ) return -EBUSY; /* Not while in use */
+
+	spin_lock( &dev->count_lock );
+	if ( dev->buf_use ) {
+		spin_unlock( &dev->count_lock );
+		return -EBUSY;
+	}
+	atomic_inc( &dev->buf_alloc );
+	spin_unlock( &dev->count_lock );
+
+	down( &dev->struct_sem );
+	entry = &dma->bufs[order];
+	if ( entry->buf_count ) {
+		up( &dev->struct_sem );
+		atomic_dec( &dev->buf_alloc );
+		return -ENOMEM; /* May only call once for each order */
+	}
+
+	if (count < 0 || count > 4096) {
+		up( &dev->struct_sem );
+		atomic_dec( &dev->buf_alloc );
+		return -EINVAL;
+	}
+
+	entry->buflist = DRM(alloc)( count * sizeof(*entry->buflist),
+				     DRM_MEM_BUFS );
+	if ( !entry->buflist ) {
+		up( &dev->struct_sem );
+		atomic_dec( &dev->buf_alloc );
+		return -ENOMEM;
+	}
+	memset( entry->buflist, 0, count * sizeof(*entry->buflist) );
+
+	entry->buf_size = size;
+	entry->page_order = page_order;
+
+	offset = 0;
+
+	while ( entry->buf_count < count ) {
+		buf          = &entry->buflist[entry->buf_count];
+		buf->idx     = dma->buf_count + entry->buf_count;
+		buf->total   = alignment;
+		buf->order   = order;
+		buf->used    = 0;
+
+		buf->offset  = (dma->byte_count + offset);
+		buf->bus_address = agp_offset + offset;
+		buf->address = (void *)(agp_offset + offset + dev->sg->handle);
+		buf->next    = NULL;
+		buf->waiting = 0;
+		buf->pending = 0;
+		init_waitqueue_head( &buf->dma_wait );
+		buf->pid     = 0;
+
+		buf->dev_priv_size = sizeof(DRIVER_BUF_PRIV_T);
+		buf->dev_private = DRM(alloc)( sizeof(DRIVER_BUF_PRIV_T),
+					       DRM_MEM_BUFS );
+		if(!buf->dev_private) {
+			/* Set count correctly so we free the proper amount. */
+			entry->buf_count = count;
+			DRM(cleanup_buf_error)(entry);
+			up( &dev->struct_sem );
+			atomic_dec( &dev->buf_alloc );
+			return -ENOMEM;
+		}
+
+		memset( buf->dev_private, 0, buf->dev_priv_size );
+
+# if __HAVE_DMA_HISTOGRAM
+		buf->time_queued = 0;
+		buf->time_dispatched = 0;
+		buf->time_completed = 0;
+		buf->time_freed = 0;
+# endif
+		DRM_DEBUG( "buffer %d @ %p\n",
+			   entry->buf_count, buf->address );
+
+		offset += alignment;
+		entry->buf_count++;
+		byte_count += PAGE_SIZE << page_order;
+	}
+
+	DRM_DEBUG( "byte_count: %d\n", byte_count );
+
+	temp_buflist = DRM(realloc)( dma->buflist,
+				     dma->buf_count * sizeof(*dma->buflist),
+				     (dma->buf_count + entry->buf_count)
+				     * sizeof(*dma->buflist),
+				     DRM_MEM_BUFS );
+	if(!temp_buflist) {
+		/* Free the entry because it isn't valid */
+		DRM(cleanup_buf_error)(entry);
+		up( &dev->struct_sem );
+		atomic_dec( &dev->buf_alloc );
+		return -ENOMEM;
+	}
+	dma->buflist = temp_buflist;
+
+	for ( i = 0 ; i < entry->buf_count ; i++ ) {
+		dma->buflist[i + dma->buf_count] = &entry->buflist[i];
+	}
+
+	dma->buf_count += entry->buf_count;
+	dma->byte_count += byte_count;
+
+	DRM_DEBUG( "dma->buf_count : %d\n", dma->buf_count );
+	DRM_DEBUG( "entry->buf_count : %d\n", entry->buf_count );
+
+#if __HAVE_DMA_FREELIST
+	DRM(freelist_create)( &entry->freelist, entry->buf_count );
+	for ( i = 0 ; i < entry->buf_count ; i++ ) {
+		DRM(freelist_put)( dev, &entry->freelist, &entry->buflist[i] );
+	}
+#endif
+	up( &dev->struct_sem );
+
+	request.count = entry->buf_count;
+	request.size = size;
+
+	if ( copy_to_user( (drm_buf_desc_t *)arg, &request, sizeof(request) ) )
+		return -EFAULT;
+
+	dma->flags = _DRM_DMA_USE_SG;
+
+	atomic_dec( &dev->buf_alloc );
+	return 0;
+}
+#endif /* __HAVE_SG */
+
+int DRM(addbufs)( struct inode *inode, struct file *filp,
+		  unsigned int cmd, unsigned long arg )
+{
+	drm_buf_desc_t request;
+
+	if ( copy_from_user( &request, (drm_buf_desc_t *)arg,
+			     sizeof(request) ) )
+		return -EFAULT;
+
+#if __REALLY_HAVE_AGP
+	if ( request.flags & _DRM_AGP_BUFFER )
+		return DRM(addbufs_agp)( inode, filp, cmd, arg );
+	else
+#endif
+#if __HAVE_SG
+	if ( request.flags & _DRM_SG_BUFFER )
+		return DRM(addbufs_sg)( inode, filp, cmd, arg );
+	else
+#endif
+#if __HAVE_PCI_DMA
+		return DRM(addbufs_pci)( inode, filp, cmd, arg );
+#else
+		return -EINVAL;
+#endif
+}
+
+int DRM(infobufs)( struct inode *inode, struct file *filp,
+		   unsigned int cmd, unsigned long arg )
+{
+	drm_file_t *priv = filp->private_data;
+	drm_device_t *dev = priv->dev;
+	drm_device_dma_t *dma = dev->dma;
+	drm_buf_info_t request;
+	int i;
+	int count;
+
+	if ( !dma ) return -EINVAL;
+
+	spin_lock( &dev->count_lock );
+	if ( atomic_read( &dev->buf_alloc ) ) {
+		spin_unlock( &dev->count_lock );
+		return -EBUSY;
+	}
+	++dev->buf_use;		/* Can't allocate more after this call */
+	spin_unlock( &dev->count_lock );
+
+	if ( copy_from_user( &request,
+			     (drm_buf_info_t *)arg,
+			     sizeof(request) ) )
+		return -EFAULT;
+
+	for ( i = 0, count = 0 ; i < DRM_MAX_ORDER + 1 ; i++ ) {
+		if ( dma->bufs[i].buf_count ) ++count;
+	}
+
+	DRM_DEBUG( "count = %d\n", count );
+
+	if ( request.count >= count ) {
+		for ( i = 0, count = 0 ; i < DRM_MAX_ORDER + 1 ; i++ ) {
+			if ( dma->bufs[i].buf_count ) {
+				drm_buf_desc_t *to = &request.list[count];
+				drm_buf_entry_t *from = &dma->bufs[i];
+				drm_freelist_t *list = &dma->bufs[i].freelist;
+				if ( copy_to_user( &to->count,
+						   &from->buf_count,
+						   sizeof(from->buf_count) ) ||
+				     copy_to_user( &to->size,
+						   &from->buf_size,
+						   sizeof(from->buf_size) ) ||
+				     copy_to_user( &to->low_mark,
+						   &list->low_mark,
+						   sizeof(list->low_mark) ) ||
+				     copy_to_user( &to->high_mark,
+						   &list->high_mark,
+						   sizeof(list->high_mark) ) )
+					return -EFAULT;
+
+				DRM_DEBUG( "%d %d %d %d %d\n",
+					   i,
+					   dma->bufs[i].buf_count,
+					   dma->bufs[i].buf_size,
+					   dma->bufs[i].freelist.low_mark,
+					   dma->bufs[i].freelist.high_mark );
+				++count;
+			}
+		}
+	}
+	request.count = count;
+
+	if ( copy_to_user( (drm_buf_info_t *)arg,
+			   &request,
+			   sizeof(request) ) )
+		return -EFAULT;
+
+	return 0;
+}
+
+int DRM(markbufs)( struct inode *inode, struct file *filp,
+		   unsigned int cmd, unsigned long arg )
+{
+	drm_file_t *priv = filp->private_data;
+	drm_device_t *dev = priv->dev;
+	drm_device_dma_t *dma = dev->dma;
+	drm_buf_desc_t request;
+	int order;
+	drm_buf_entry_t *entry;
+
+	if ( !dma ) return -EINVAL;
+
+	if ( copy_from_user( &request,
+			     (drm_buf_desc_t *)arg,
+			     sizeof(request) ) )
+		return -EFAULT;
+
+	DRM_DEBUG( "%d, %d, %d\n",
+		   request.size, request.low_mark, request.high_mark );
+	order = DRM(order)( request.size );
+	if ( order < DRM_MIN_ORDER || order > DRM_MAX_ORDER ) return -EINVAL;
+	entry = &dma->bufs[order];
+
+	if ( request.low_mark < 0 || request.low_mark > entry->buf_count )
+		return -EINVAL;
+	if ( request.high_mark < 0 || request.high_mark > entry->buf_count )
+		return -EINVAL;
+
+	entry->freelist.low_mark  = request.low_mark;
+	entry->freelist.high_mark = request.high_mark;
+
+	return 0;
+}
+
+int DRM(freebufs)( struct inode *inode, struct file *filp,
+		   unsigned int cmd, unsigned long arg )
+{
+	drm_file_t *priv = filp->private_data;
+	drm_device_t *dev = priv->dev;
+	drm_device_dma_t *dma = dev->dma;
+	drm_buf_free_t request;
+	int i;
+	int idx;
+	drm_buf_t *buf;
+
+	if ( !dma ) return -EINVAL;
+
+	if ( copy_from_user( &request,
+			     (drm_buf_free_t *)arg,
+			     sizeof(request) ) )
+		return -EFAULT;
+
+	DRM_DEBUG( "%d\n", request.count );
+	for ( i = 0 ; i < request.count ; i++ ) {
+		if ( copy_from_user( &idx,
+				     &request.list[i],
+				     sizeof(idx) ) )
+			return -EFAULT;
+		if ( idx < 0 || idx >= dma->buf_count ) {
+			DRM_ERROR( "Index %d (of %d max)\n",
+				   idx, dma->buf_count - 1 );
+			return -EINVAL;
+		}
+		buf = dma->buflist[idx];
+		if ( buf->pid != current->pid ) {
+			DRM_ERROR( "Process %d freeing buffer owned by %d\n",
+				   current->pid, buf->pid );
+			return -EINVAL;
+		}
+		DRM(free_buffer)( dev, buf );
+	}
+
+	return 0;
+}
+
+int DRM(mapbufs)( struct inode *inode, struct file *filp,
+		  unsigned int cmd, unsigned long arg )
+{
+	drm_file_t *priv = filp->private_data;
+	drm_device_t *dev = priv->dev;
+	drm_device_dma_t *dma = dev->dma;
+	int retcode = 0;
+	const int zero = 0;
+	unsigned long virtual;
+	unsigned long address;
+	drm_buf_map_t request;
+	int i;
+
+	if ( !dma ) return -EINVAL;
+
+	spin_lock( &dev->count_lock );
+	if ( atomic_read( &dev->buf_alloc ) ) {
+		spin_unlock( &dev->count_lock );
+		return -EBUSY;
+	}
+	dev->buf_use++;		/* Can't allocate more after this call */
+	spin_unlock( &dev->count_lock );
+
+	if ( copy_from_user( &request, (drm_buf_map_t *)arg,
+			     sizeof(request) ) )
+		return -EFAULT;
+
+	if ( request.count >= dma->buf_count ) {
+		if ( (__HAVE_AGP && (dma->flags & _DRM_DMA_USE_AGP)) ||
+		     (__HAVE_SG && (dma->flags & _DRM_DMA_USE_SG)) ) {
+			drm_map_t *map = DRIVER_AGP_BUFFERS_MAP( dev );
+
+			if ( !map ) {
+				retcode = -EINVAL;
+				goto done;
+			}
+
+#if LINUX_VERSION_CODE <= 0x020402
+			down( &current->mm->mmap_sem );
+#else
+			down_write( &current->mm->mmap_sem );
+#endif
+			virtual = do_mmap( filp, 0, map->size,
+					   PROT_READ | PROT_WRITE,
+					   MAP_SHARED,
+					   (unsigned long)map->offset );
+#if LINUX_VERSION_CODE <= 0x020402
+			up( &current->mm->mmap_sem );
+#else
+			up_write( &current->mm->mmap_sem );
+#endif
+		} else {
+#if LINUX_VERSION_CODE <= 0x020402
+			down( &current->mm->mmap_sem );
+#else
+			down_write( &current->mm->mmap_sem );
+#endif
+			virtual = do_mmap( filp, 0, dma->byte_count,
+					   PROT_READ | PROT_WRITE,
+					   MAP_SHARED, 0 );
+#if LINUX_VERSION_CODE <= 0x020402
+			up( &current->mm->mmap_sem );
+#else
+			up_write( &current->mm->mmap_sem );
+#endif
+		}
+		if ( virtual > -1024UL ) {
+			/* Real error */
+			retcode = (signed long)virtual;
+			goto done;
+		}
+		request.virtual = (void *)virtual;
+
+		for ( i = 0 ; i < dma->buf_count ; i++ ) {
+			if ( copy_to_user( &request.list[i].idx,
+					   &dma->buflist[i]->idx,
+					   sizeof(request.list[0].idx) ) ) {
+				retcode = -EFAULT;
+				goto done;
+			}
+			if ( copy_to_user( &request.list[i].total,
+					   &dma->buflist[i]->total,
+					   sizeof(request.list[0].total) ) ) {
+				retcode = -EFAULT;
+				goto done;
+			}
+			if ( copy_to_user( &request.list[i].used,
+					   &zero,
+					   sizeof(zero) ) ) {
+				retcode = -EFAULT;
+				goto done;
+			}
+			address = virtual + dma->buflist[i]->offset; /* *** */
+			if ( copy_to_user( &request.list[i].address,
+					   &address,
+					   sizeof(address) ) ) {
+				retcode = -EFAULT;
+				goto done;
+			}
+		}
+	}
+ done:
+	request.count = dma->buf_count;
+	DRM_DEBUG( "%d buffers, retcode = %d\n", request.count, retcode );
+
+	if ( copy_to_user( (drm_buf_map_t *)arg, &request, sizeof(request) ) )
+		return -EFAULT;
+
+	return retcode;
+}
+
+#endif /* __HAVE_DMA */
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/drm_context.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/drm_context.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/drm_context.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/drm_context.h	2003-07-30 11:18:33.000000000 +0200
@@ -0,0 +1,781 @@
+/* drm_context.h -- IOCTLs for generic contexts -*- linux-c -*-
+ * Created: Fri Nov 24 18:31:37 2000 by gareth@valinux.com
+ *
+ * Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Rickard E. (Rik) Faith <faith@valinux.com>
+ *    Gareth Hughes <gareth@valinux.com>
+ * ChangeLog:
+ *  2001-11-16	Torsten Duwe <duwe@caldera.de>
+ *		added context constructor/destructor hooks,
+ *		needed by SiS driver's memory management.
+ */
+
+#define __NO_VERSION__
+#include "drmP.h"
+
+#if __HAVE_CTX_BITMAP
+
+/* ================================================================
+ * Context bitmap support
+ */
+
+void DRM(ctxbitmap_free)( drm_device_t *dev, int ctx_handle )
+{
+	if ( ctx_handle < 0 ) goto failed;
+	if ( !dev->ctx_bitmap ) goto failed;
+
+	if ( ctx_handle < DRM_MAX_CTXBITMAP ) {
+		down(&dev->struct_sem);
+		clear_bit( ctx_handle, dev->ctx_bitmap );
+		dev->context_sareas[ctx_handle] = NULL;
+		up(&dev->struct_sem);
+		return;
+	}
+failed:
+       	DRM_ERROR( "Attempt to free invalid context handle: %d\n",
+		   ctx_handle );
+       	return;
+}
+
+int DRM(ctxbitmap_next)( drm_device_t *dev )
+{
+	int bit;
+
+	if(!dev->ctx_bitmap) return -1;
+
+	down(&dev->struct_sem);
+	bit = find_first_zero_bit( dev->ctx_bitmap, DRM_MAX_CTXBITMAP );
+	if ( bit < DRM_MAX_CTXBITMAP ) {
+		set_bit( bit, dev->ctx_bitmap );
+	   	DRM_DEBUG( "drm_ctxbitmap_next bit : %d\n", bit );
+		if((bit+1) > dev->max_context) {
+			dev->max_context = (bit+1);
+			if(dev->context_sareas) {
+				drm_map_t **ctx_sareas;
+
+				ctx_sareas = DRM(realloc)(dev->context_sareas,
+						(dev->max_context - 1) * 
+						sizeof(*dev->context_sareas),
+						dev->max_context * 
+						sizeof(*dev->context_sareas),
+						DRM_MEM_MAPS);
+				if(!ctx_sareas) {
+					clear_bit(bit, dev->ctx_bitmap);
+					up(&dev->struct_sem);
+					return -1;
+				}
+				dev->context_sareas = ctx_sareas;
+				dev->context_sareas[bit] = NULL;
+			} else {
+				/* max_context == 1 at this point */
+				dev->context_sareas = DRM(alloc)(
+						dev->max_context * 
+						sizeof(*dev->context_sareas),
+						DRM_MEM_MAPS);
+				if(!dev->context_sareas) {
+					clear_bit(bit, dev->ctx_bitmap);
+					up(&dev->struct_sem);
+					return -1;
+				}
+				dev->context_sareas[bit] = NULL;
+			}
+		}
+		up(&dev->struct_sem);
+		return bit;
+	}
+	up(&dev->struct_sem);
+	return -1;
+}
+
+int DRM(ctxbitmap_init)( drm_device_t *dev )
+{
+	int i;
+   	int temp;
+
+	down(&dev->struct_sem);
+	dev->ctx_bitmap = (unsigned long *) DRM(alloc)( PAGE_SIZE,
+							DRM_MEM_CTXBITMAP );
+	if ( dev->ctx_bitmap == NULL ) {
+		up(&dev->struct_sem);
+		return -ENOMEM;
+	}
+	memset( (void *)dev->ctx_bitmap, 0, PAGE_SIZE );
+	dev->context_sareas = NULL;
+	dev->max_context = -1;
+	up(&dev->struct_sem);
+
+	for ( i = 0 ; i < DRM_RESERVED_CONTEXTS ; i++ ) {
+		temp = DRM(ctxbitmap_next)( dev );
+	   	DRM_DEBUG( "drm_ctxbitmap_init : %d\n", temp );
+	}
+
+	return 0;
+}
+
+void DRM(ctxbitmap_cleanup)( drm_device_t *dev )
+{
+	down(&dev->struct_sem);
+	if( dev->context_sareas ) DRM(free)( dev->context_sareas,
+					     sizeof(*dev->context_sareas) * 
+					     dev->max_context,
+					     DRM_MEM_MAPS );
+	DRM(free)( (void *)dev->ctx_bitmap, PAGE_SIZE, DRM_MEM_CTXBITMAP );
+	up(&dev->struct_sem);
+}
+
+/* ================================================================
+ * Per Context SAREA Support
+ */
+
+int DRM(getsareactx)(struct inode *inode, struct file *filp,
+		     unsigned int cmd, unsigned long arg)
+{
+	drm_file_t	*priv	= filp->private_data;
+	drm_device_t	*dev	= priv->dev;
+	drm_ctx_priv_map_t request;
+	drm_map_t *map;
+
+	if (copy_from_user(&request,
+			   (drm_ctx_priv_map_t *)arg,
+			   sizeof(request)))
+		return -EFAULT;
+
+	down(&dev->struct_sem);
+	if (dev->max_context < 0 || request.ctx_id >= (unsigned) dev->max_context) {
+		up(&dev->struct_sem);
+		return -EINVAL;
+	}
+
+	map = dev->context_sareas[request.ctx_id];
+	up(&dev->struct_sem);
+
+	request.handle = map->handle;
+	if (copy_to_user((drm_ctx_priv_map_t *)arg, &request, sizeof(request)))
+		return -EFAULT;
+	return 0;
+}
+
+int DRM(setsareactx)(struct inode *inode, struct file *filp,
+		     unsigned int cmd, unsigned long arg)
+{
+	drm_file_t	*priv	= filp->private_data;
+	drm_device_t	*dev	= priv->dev;
+	drm_ctx_priv_map_t request;
+	drm_map_t *map = NULL;
+	drm_map_list_t *r_list = NULL;
+	struct list_head *list;
+
+	if (copy_from_user(&request,
+			   (drm_ctx_priv_map_t *)arg,
+			   sizeof(request)))
+		return -EFAULT;
+
+	down(&dev->struct_sem);
+	list_for_each(list, &dev->maplist->head) {
+		r_list = (drm_map_list_t *)list;
+		if(r_list->map &&
+		   r_list->map->handle == request.handle)
+			goto found;
+	}
+bad:
+	up(&dev->struct_sem);
+	return -EINVAL;
+
+found:
+	map = r_list->map;
+	if (!map) goto bad;
+	if (dev->max_context < 0)
+		goto bad;
+	if (request.ctx_id >= (unsigned) dev->max_context)
+		goto bad;
+	dev->context_sareas[request.ctx_id] = map;
+	up(&dev->struct_sem);
+	return 0;
+}
+
+/* ================================================================
+ * The actual DRM context handling routines
+ */
+
+int DRM(context_switch)( drm_device_t *dev, int old, int new )
+{
+        char buf[64];
+
+        if ( test_and_set_bit( 0, &dev->context_flag ) ) {
+                DRM_ERROR( "Reentering -- FIXME\n" );
+                return -EBUSY;
+        }
+
+#if __HAVE_DMA_HISTOGRAM
+        dev->ctx_start = get_cycles();
+#endif
+
+        DRM_DEBUG( "Context switch from %d to %d\n", old, new );
+
+        if ( new == dev->last_context ) {
+                clear_bit( 0, &dev->context_flag );
+                return 0;
+        }
+
+        if ( DRM(flags) & DRM_FLAG_NOCTX ) {
+                DRM(context_switch_complete)( dev, new );
+        } else {
+                sprintf( buf, "C %d %d\n", old, new );
+                DRM(write_string)( dev, buf );
+        }
+
+        return 0;
+}
+
+int DRM(context_switch_complete)( drm_device_t *dev, int new )
+{
+        dev->last_context = new;  /* PRE/POST: This is the _only_ writer. */
+        dev->last_switch  = jiffies;
+
+        if ( !_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock) ) {
+                DRM_ERROR( "Lock isn't held after context switch\n" );
+        }
+
+				/* If a context switch is ever initiated
+                                   when the kernel holds the lock, release
+                                   that lock here. */
+#if __HAVE_DMA_HISTOGRAM
+        atomic_inc( &dev->histo.ctx[DRM(histogram_slot)(get_cycles()
+							- dev->ctx_start)] );
+
+#endif
+        clear_bit( 0, &dev->context_flag );
+        wake_up( &dev->context_wait );
+
+        return 0;
+}
+
+int DRM(resctx)( struct inode *inode, struct file *filp,
+		 unsigned int cmd, unsigned long arg )
+{
+	drm_ctx_res_t res;
+	drm_ctx_t ctx;
+	int i;
+
+	if ( copy_from_user( &res, (drm_ctx_res_t *)arg, sizeof(res) ) )
+		return -EFAULT;
+
+	if ( res.count >= DRM_RESERVED_CONTEXTS ) {
+		memset( &ctx, 0, sizeof(ctx) );
+		for ( i = 0 ; i < DRM_RESERVED_CONTEXTS ; i++ ) {
+			ctx.handle = i;
+			if ( copy_to_user( &res.contexts[i],
+					   &i, sizeof(i) ) )
+				return -EFAULT;
+		}
+	}
+	res.count = DRM_RESERVED_CONTEXTS;
+
+	if ( copy_to_user( (drm_ctx_res_t *)arg, &res, sizeof(res) ) )
+		return -EFAULT;
+	return 0;
+}
+
+int DRM(addctx)( struct inode *inode, struct file *filp,
+		 unsigned int cmd, unsigned long arg )
+{
+	drm_file_t *priv = filp->private_data;
+	drm_device_t *dev = priv->dev;
+	drm_ctx_t ctx;
+
+	if ( copy_from_user( &ctx, (drm_ctx_t *)arg, sizeof(ctx) ) )
+		return -EFAULT;
+
+	ctx.handle = DRM(ctxbitmap_next)( dev );
+	if ( ctx.handle == DRM_KERNEL_CONTEXT ) {
+				/* Skip kernel's context and get a new one. */
+		ctx.handle = DRM(ctxbitmap_next)( dev );
+	}
+	DRM_DEBUG( "%d\n", ctx.handle );
+	if ( ctx.handle == -1 ) {
+		DRM_DEBUG( "Not enough free contexts.\n" );
+				/* Should this return -EBUSY instead? */
+		return -ENOMEM;
+	}
+#ifdef DRIVER_CTX_CTOR
+	if ( ctx.handle != DRM_KERNEL_CONTEXT )
+		DRIVER_CTX_CTOR(ctx.handle); /* XXX: also pass dev ? */
+#endif
+
+	if ( copy_to_user( (drm_ctx_t *)arg, &ctx, sizeof(ctx) ) )
+		return -EFAULT;
+	return 0;
+}
+
+int DRM(modctx)( struct inode *inode, struct file *filp,
+		 unsigned int cmd, unsigned long arg )
+{
+	/* This does nothing */
+	return 0;
+}
+
+int DRM(getctx)( struct inode *inode, struct file *filp,
+		 unsigned int cmd, unsigned long arg )
+{
+	drm_ctx_t ctx;
+
+	if ( copy_from_user( &ctx, (drm_ctx_t*)arg, sizeof(ctx) ) )
+		return -EFAULT;
+
+	/* This is 0, because we don't handle any context flags */
+	ctx.flags = 0;
+
+	if ( copy_to_user( (drm_ctx_t*)arg, &ctx, sizeof(ctx) ) )
+		return -EFAULT;
+	return 0;
+}
+
+int DRM(switchctx)( struct inode *inode, struct file *filp,
+		    unsigned int cmd, unsigned long arg )
+{
+	drm_file_t *priv = filp->private_data;
+	drm_device_t *dev = priv->dev;
+	drm_ctx_t ctx;
+
+	if ( copy_from_user( &ctx, (drm_ctx_t *)arg, sizeof(ctx) ) )
+		return -EFAULT;
+
+	DRM_DEBUG( "%d\n", ctx.handle );
+	return DRM(context_switch)( dev, dev->last_context, ctx.handle );
+}
+
+int DRM(newctx)( struct inode *inode, struct file *filp,
+		 unsigned int cmd, unsigned long arg )
+{
+	drm_file_t *priv = filp->private_data;
+	drm_device_t *dev = priv->dev;
+	drm_ctx_t ctx;
+
+	if ( copy_from_user( &ctx, (drm_ctx_t *)arg, sizeof(ctx) ) )
+		return -EFAULT;
+
+	DRM_DEBUG( "%d\n", ctx.handle );
+	DRM(context_switch_complete)( dev, ctx.handle );
+
+	return 0;
+}
+
+int DRM(rmctx)( struct inode *inode, struct file *filp,
+		unsigned int cmd, unsigned long arg )
+{
+	drm_file_t *priv = filp->private_data;
+	drm_device_t *dev = priv->dev;
+	drm_ctx_t ctx;
+
+	if ( copy_from_user( &ctx, (drm_ctx_t *)arg, sizeof(ctx) ) )
+		return -EFAULT;
+
+	DRM_DEBUG( "%d\n", ctx.handle );
+	if ( ctx.handle == DRM_KERNEL_CONTEXT + 1 ) {
+		priv->remove_auth_on_close = 1;
+	}
+	if ( ctx.handle != DRM_KERNEL_CONTEXT ) {
+#ifdef DRIVER_CTX_DTOR
+		DRIVER_CTX_DTOR(ctx.handle); /* XXX: also pass dev ? */
+#endif
+		DRM(ctxbitmap_free)( dev, ctx.handle );
+	}
+
+	return 0;
+}
+
+
+#else /* __HAVE_CTX_BITMAP */
+
+/* ================================================================
+ * Old-style context support
+ */
+
+
+int DRM(context_switch)(drm_device_t *dev, int old, int new)
+{
+	char	    buf[64];
+	drm_queue_t *q;
+
+#if 0
+	atomic_inc(&dev->total_ctx);
+#endif
+
+	if (test_and_set_bit(0, &dev->context_flag)) {
+		DRM_ERROR("Reentering -- FIXME\n");
+		return -EBUSY;
+	}
+
+#if __HAVE_DMA_HISTOGRAM
+	dev->ctx_start = get_cycles();
+#endif
+
+	DRM_DEBUG("Context switch from %d to %d\n", old, new);
+
+	if (new >= dev->queue_count) {
+		clear_bit(0, &dev->context_flag);
+		return -EINVAL;
+	}
+
+	if (new == dev->last_context) {
+		clear_bit(0, &dev->context_flag);
+		return 0;
+	}
+
+	q = dev->queuelist[new];
+	atomic_inc(&q->use_count);
+	if (atomic_read(&q->use_count) == 1) {
+		atomic_dec(&q->use_count);
+		clear_bit(0, &dev->context_flag);
+		return -EINVAL;
+	}
+
+	if (DRM(flags) & DRM_FLAG_NOCTX) {
+		DRM(context_switch_complete)(dev, new);
+	} else {
+		sprintf(buf, "C %d %d\n", old, new);
+		DRM(write_string)(dev, buf);
+	}
+
+	atomic_dec(&q->use_count);
+
+	return 0;
+}
+
+int DRM(context_switch_complete)(drm_device_t *dev, int new)
+{
+	drm_device_dma_t *dma = dev->dma;
+
+	dev->last_context = new;  /* PRE/POST: This is the _only_ writer. */
+	dev->last_switch  = jiffies;
+
+	if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
+		DRM_ERROR("Lock isn't held after context switch\n");
+	}
+
+	if (!dma || !(dma->next_buffer && dma->next_buffer->while_locked)) {
+		if (DRM(lock_free)(dev, &dev->lock.hw_lock->lock,
+				  DRM_KERNEL_CONTEXT)) {
+			DRM_ERROR("Cannot free lock\n");
+		}
+	}
+
+#if __HAVE_DMA_HISTOGRAM
+	atomic_inc(&dev->histo.ctx[DRM(histogram_slot)(get_cycles()
+						      - dev->ctx_start)]);
+
+#endif
+	clear_bit(0, &dev->context_flag);
+	wake_up_interruptible(&dev->context_wait);
+
+	return 0;
+}
+
+static int DRM(init_queue)(drm_device_t *dev, drm_queue_t *q, drm_ctx_t *ctx)
+{
+	DRM_DEBUG("\n");
+
+	if (atomic_read(&q->use_count) != 1
+	    || atomic_read(&q->finalization)
+	    || atomic_read(&q->block_count)) {
+		DRM_ERROR("New queue is already in use: u%d f%d b%d\n",
+			  atomic_read(&q->use_count),
+			  atomic_read(&q->finalization),
+			  atomic_read(&q->block_count));
+	}
+
+	atomic_set(&q->finalization,  0);
+	atomic_set(&q->block_count,   0);
+	atomic_set(&q->block_read,    0);
+	atomic_set(&q->block_write,   0);
+	atomic_set(&q->total_queued,  0);
+	atomic_set(&q->total_flushed, 0);
+	atomic_set(&q->total_locks,   0);
+
+	init_waitqueue_head(&q->write_queue);
+	init_waitqueue_head(&q->read_queue);
+	init_waitqueue_head(&q->flush_queue);
+
+	q->flags = ctx->flags;
+
+	DRM(waitlist_create)(&q->waitlist, dev->dma->buf_count);
+
+	return 0;
+}
+
+
+/* drm_alloc_queue:
+PRE: 1) dev->queuelist[0..dev->queue_count] is allocated and will not
+	disappear (so all deallocation must be done after IOCTLs are off)
+     2) dev->queue_count < dev->queue_slots
+     3) dev->queuelist[i].use_count == 0 and
+	dev->queuelist[i].finalization == 0 if i not in use
+POST: 1) dev->queuelist[i].use_count == 1
+      2) dev->queue_count < dev->queue_slots */
+
+static int DRM(alloc_queue)(drm_device_t *dev)
+{
+	int	    i;
+	drm_queue_t *queue;
+	int	    oldslots;
+	int	    newslots;
+				/* Check for a free queue */
+	for (i = 0; i < dev->queue_count; i++) {
+		atomic_inc(&dev->queuelist[i]->use_count);
+		if (atomic_read(&dev->queuelist[i]->use_count) == 1
+		    && !atomic_read(&dev->queuelist[i]->finalization)) {
+			DRM_DEBUG("%d (free)\n", i);
+			return i;
+		}
+		atomic_dec(&dev->queuelist[i]->use_count);
+	}
+				/* Allocate a new queue */
+	down(&dev->struct_sem);
+
+	queue = DRM(alloc)(sizeof(*queue), DRM_MEM_QUEUES);
+	memset(queue, 0, sizeof(*queue));
+	atomic_set(&queue->use_count, 1);
+
+	++dev->queue_count;
+	if (dev->queue_count >= dev->queue_slots) {
+		oldslots = dev->queue_slots * sizeof(*dev->queuelist);
+		if (!dev->queue_slots) dev->queue_slots = 1;
+		dev->queue_slots *= 2;
+		newslots = dev->queue_slots * sizeof(*dev->queuelist);
+
+		dev->queuelist = DRM(realloc)(dev->queuelist,
+					      oldslots,
+					      newslots,
+					      DRM_MEM_QUEUES);
+		if (!dev->queuelist) {
+			up(&dev->struct_sem);
+			DRM_DEBUG("out of memory\n");
+			return -ENOMEM;
+		}
+	}
+	dev->queuelist[dev->queue_count-1] = queue;
+
+	up(&dev->struct_sem);
+	DRM_DEBUG("%d (new)\n", dev->queue_count - 1);
+	return dev->queue_count - 1;
+}
+
+int DRM(resctx)(struct inode *inode, struct file *filp,
+		unsigned int cmd, unsigned long arg)
+{
+	drm_ctx_res_t	res;
+	drm_ctx_t	ctx;
+	int		i;
+
+	DRM_DEBUG("%d\n", DRM_RESERVED_CONTEXTS);
+	if (copy_from_user(&res, (drm_ctx_res_t *)arg, sizeof(res)))
+		return -EFAULT;
+	if (res.count >= DRM_RESERVED_CONTEXTS) {
+		memset(&ctx, 0, sizeof(ctx));
+		for (i = 0; i < DRM_RESERVED_CONTEXTS; i++) {
+			ctx.handle = i;
+			if (copy_to_user(&res.contexts[i],
+					 &i,
+					 sizeof(i)))
+				return -EFAULT;
+		}
+	}
+	res.count = DRM_RESERVED_CONTEXTS;
+	if (copy_to_user((drm_ctx_res_t *)arg, &res, sizeof(res)))
+		return -EFAULT;
+	return 0;
+}
+
+int DRM(addctx)(struct inode *inode, struct file *filp,
+		unsigned int cmd, unsigned long arg)
+{
+	drm_file_t	*priv	= filp->private_data;
+	drm_device_t	*dev	= priv->dev;
+	drm_ctx_t	ctx;
+
+	if (copy_from_user(&ctx, (drm_ctx_t *)arg, sizeof(ctx)))
+		return -EFAULT;
+	if ((ctx.handle = DRM(alloc_queue)(dev)) == DRM_KERNEL_CONTEXT) {
+				/* Init kernel's context and get a new one. */
+		DRM(init_queue)(dev, dev->queuelist[ctx.handle], &ctx);
+		ctx.handle = DRM(alloc_queue)(dev);
+	}
+	DRM(init_queue)(dev, dev->queuelist[ctx.handle], &ctx);
+	DRM_DEBUG("%d\n", ctx.handle);
+	if (copy_to_user((drm_ctx_t *)arg, &ctx, sizeof(ctx)))
+		return -EFAULT;
+	return 0;
+}
+
+int DRM(modctx)(struct inode *inode, struct file *filp,
+		unsigned int cmd, unsigned long arg)
+{
+	drm_file_t	*priv	= filp->private_data;
+	drm_device_t	*dev	= priv->dev;
+	drm_ctx_t	ctx;
+	drm_queue_t	*q;
+
+	if (copy_from_user(&ctx, (drm_ctx_t *)arg, sizeof(ctx)))
+		return -EFAULT;
+
+	DRM_DEBUG("%d\n", ctx.handle);
+
+	if (ctx.handle < 0 || ctx.handle >= dev->queue_count) return -EINVAL;
+	q = dev->queuelist[ctx.handle];
+
+	atomic_inc(&q->use_count);
+	if (atomic_read(&q->use_count) == 1) {
+				/* No longer in use */
+		atomic_dec(&q->use_count);
+		return -EINVAL;
+	}
+
+	if (DRM_BUFCOUNT(&q->waitlist)) {
+		atomic_dec(&q->use_count);
+		return -EBUSY;
+	}
+
+	q->flags = ctx.flags;
+
+	atomic_dec(&q->use_count);
+	return 0;
+}
+
+int DRM(getctx)(struct inode *inode, struct file *filp,
+		unsigned int cmd, unsigned long arg)
+{
+	drm_file_t	*priv	= filp->private_data;
+	drm_device_t	*dev	= priv->dev;
+	drm_ctx_t	ctx;
+	drm_queue_t	*q;
+
+	if (copy_from_user(&ctx, (drm_ctx_t *)arg, sizeof(ctx)))
+		return -EFAULT;
+
+	DRM_DEBUG("%d\n", ctx.handle);
+
+	if (ctx.handle >= dev->queue_count) return -EINVAL;
+	q = dev->queuelist[ctx.handle];
+
+	atomic_inc(&q->use_count);
+	if (atomic_read(&q->use_count) == 1) {
+				/* No longer in use */
+		atomic_dec(&q->use_count);
+		return -EINVAL;
+	}
+
+	ctx.flags = q->flags;
+	atomic_dec(&q->use_count);
+
+	if (copy_to_user((drm_ctx_t *)arg, &ctx, sizeof(ctx)))
+		return -EFAULT;
+
+	return 0;
+}
+
+int DRM(switchctx)(struct inode *inode, struct file *filp,
+		   unsigned int cmd, unsigned long arg)
+{
+	drm_file_t	*priv	= filp->private_data;
+	drm_device_t	*dev	= priv->dev;
+	drm_ctx_t	ctx;
+
+	if (copy_from_user(&ctx, (drm_ctx_t *)arg, sizeof(ctx)))
+		return -EFAULT;
+	DRM_DEBUG("%d\n", ctx.handle);
+	return DRM(context_switch)(dev, dev->last_context, ctx.handle);
+}
+
+int DRM(newctx)(struct inode *inode, struct file *filp,
+		unsigned int cmd, unsigned long arg)
+{
+	drm_file_t	*priv	= filp->private_data;
+	drm_device_t	*dev	= priv->dev;
+	drm_ctx_t	ctx;
+
+	if (copy_from_user(&ctx, (drm_ctx_t *)arg, sizeof(ctx)))
+		return -EFAULT;
+	DRM_DEBUG("%d\n", ctx.handle);
+	DRM(context_switch_complete)(dev, ctx.handle);
+
+	return 0;
+}
+
+int DRM(rmctx)(struct inode *inode, struct file *filp,
+	       unsigned int cmd, unsigned long arg)
+{
+	drm_file_t	*priv	= filp->private_data;
+	drm_device_t	*dev	= priv->dev;
+	drm_ctx_t	ctx;
+	drm_queue_t	*q;
+	drm_buf_t	*buf;
+
+	if (copy_from_user(&ctx, (drm_ctx_t *)arg, sizeof(ctx)))
+		return -EFAULT;
+	DRM_DEBUG("%d\n", ctx.handle);
+
+	if (ctx.handle >= dev->queue_count) return -EINVAL;
+	q = dev->queuelist[ctx.handle];
+
+	atomic_inc(&q->use_count);
+	if (atomic_read(&q->use_count) == 1) {
+				/* No longer in use */
+		atomic_dec(&q->use_count);
+		return -EINVAL;
+	}
+
+	atomic_inc(&q->finalization); /* Mark queue in finalization state */
+	atomic_sub(2, &q->use_count); /* Mark queue as unused (pending
+					 finalization) */
+
+	while (test_and_set_bit(0, &dev->interrupt_flag)) {
+		schedule();
+		if (signal_pending(current)) {
+			clear_bit(0, &dev->interrupt_flag);
+			return -EINTR;
+		}
+	}
+				/* Remove queued buffers */
+	while ((buf = DRM(waitlist_get)(&q->waitlist))) {
+		DRM(free_buffer)(dev, buf);
+	}
+	clear_bit(0, &dev->interrupt_flag);
+
+				/* Wakeup blocked processes */
+	wake_up_interruptible(&q->read_queue);
+	wake_up_interruptible(&q->write_queue);
+	wake_up_interruptible(&q->flush_queue);
+
+				/* Finalization over.  Queue is made
+				   available when both use_count and
+				   finalization become 0, which won't
+				   happen until all the waiting processes
+				   stop waiting. */
+	atomic_dec(&q->finalization);
+	return 0;
+}
+
+#endif /* __HAVE_CTX_BITMAP */
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/drm_dma.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/drm_dma.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/drm_dma.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/drm_dma.h	2003-07-30 11:18:33.000000000 +0200
@@ -0,0 +1,749 @@
+/* drm_dma.c -- DMA IOCTL and function support -*- linux-c -*-
+ * Created: Fri Mar 19 14:30:16 1999 by faith@valinux.com
+ *
+ * Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Rickard E. (Rik) Faith <faith@valinux.com>
+ *    Gareth Hughes <gareth@valinux.com>
+ */
+
+#define __NO_VERSION__
+#include "drmP.h"
+
+#include <linux/interrupt.h>	/* For task queue support */
+
+#ifndef __HAVE_DMA_WAITQUEUE
+#define __HAVE_DMA_WAITQUEUE	0
+#endif
+#ifndef __HAVE_DMA_RECLAIM
+#define __HAVE_DMA_RECLAIM	0
+#endif
+#ifndef __HAVE_SHARED_IRQ
+#define __HAVE_SHARED_IRQ	0
+#endif
+
+#if __HAVE_SHARED_IRQ
+#define DRM_IRQ_TYPE		SA_SHIRQ
+#else
+#define DRM_IRQ_TYPE		0
+#endif
+
+#if __HAVE_DMA
+
+int DRM(dma_setup)( drm_device_t *dev )
+{
+	int i;
+
+	dev->dma = DRM(alloc)( sizeof(*dev->dma), DRM_MEM_DRIVER );
+	if ( !dev->dma )
+		return -ENOMEM;
+
+	memset( dev->dma, 0, sizeof(*dev->dma) );
+
+	for ( i = 0 ; i <= DRM_MAX_ORDER ; i++ )
+		memset(&dev->dma->bufs[i], 0, sizeof(dev->dma->bufs[0]));
+
+	return 0;
+}
+
+void DRM(dma_takedown)(drm_device_t *dev)
+{
+	drm_device_dma_t  *dma = dev->dma;
+	int		  i, j;
+
+	if (!dma) return;
+
+				/* Clear dma buffers */
+	for (i = 0; i <= DRM_MAX_ORDER; i++) {
+		if (dma->bufs[i].seg_count) {
+			DRM_DEBUG("order %d: buf_count = %d,"
+				  " seg_count = %d\n",
+				  i,
+				  dma->bufs[i].buf_count,
+				  dma->bufs[i].seg_count);
+			for (j = 0; j < dma->bufs[i].seg_count; j++) {
+				DRM(free_pages)(dma->bufs[i].seglist[j],
+						dma->bufs[i].page_order,
+						DRM_MEM_DMA);
+			}
+			DRM(free)(dma->bufs[i].seglist,
+				  dma->bufs[i].seg_count
+				  * sizeof(*dma->bufs[0].seglist),
+				  DRM_MEM_SEGS);
+		}
+	   	if(dma->bufs[i].buf_count) {
+		   	for(j = 0; j < dma->bufs[i].buf_count; j++) {
+			   if(dma->bufs[i].buflist[j].dev_private) {
+			      DRM(free)(dma->bufs[i].buflist[j].dev_private,
+					dma->bufs[i].buflist[j].dev_priv_size,
+					DRM_MEM_BUFS);
+			   }
+			}
+		   	DRM(free)(dma->bufs[i].buflist,
+				  dma->bufs[i].buf_count *
+				  sizeof(*dma->bufs[0].buflist),
+				  DRM_MEM_BUFS);
+#if __HAVE_DMA_FREELIST
+		   	DRM(freelist_destroy)(&dma->bufs[i].freelist);
+#endif
+		}
+	}
+
+	if (dma->buflist) {
+		DRM(free)(dma->buflist,
+			  dma->buf_count * sizeof(*dma->buflist),
+			  DRM_MEM_BUFS);
+	}
+
+	if (dma->pagelist) {
+		DRM(free)(dma->pagelist,
+			  dma->page_count * sizeof(*dma->pagelist),
+			  DRM_MEM_PAGES);
+	}
+	DRM(free)(dev->dma, sizeof(*dev->dma), DRM_MEM_DRIVER);
+	dev->dma = NULL;
+}
+
+
+#if __HAVE_DMA_HISTOGRAM
+/* This is slow, but is useful for debugging. */
+int DRM(histogram_slot)(unsigned long count)
+{
+	int value = DRM_DMA_HISTOGRAM_INITIAL;
+	int slot;
+
+	for (slot = 0;
+	     slot < DRM_DMA_HISTOGRAM_SLOTS;
+	     ++slot, value = DRM_DMA_HISTOGRAM_NEXT(value)) {
+		if (count < value) return slot;
+	}
+	return DRM_DMA_HISTOGRAM_SLOTS - 1;
+}
+
+void DRM(histogram_compute)(drm_device_t *dev, drm_buf_t *buf)
+{
+	cycles_t queued_to_dispatched;
+	cycles_t dispatched_to_completed;
+	cycles_t completed_to_freed;
+	int	 q2d, d2c, c2f, q2c, q2f;
+
+	if (buf->time_queued) {
+		queued_to_dispatched	= (buf->time_dispatched
+					   - buf->time_queued);
+		dispatched_to_completed = (buf->time_completed
+					   - buf->time_dispatched);
+		completed_to_freed	= (buf->time_freed
+					   - buf->time_completed);
+
+		q2d = DRM(histogram_slot)(queued_to_dispatched);
+		d2c = DRM(histogram_slot)(dispatched_to_completed);
+		c2f = DRM(histogram_slot)(completed_to_freed);
+
+		q2c = DRM(histogram_slot)(queued_to_dispatched
+					  + dispatched_to_completed);
+		q2f = DRM(histogram_slot)(queued_to_dispatched
+					  + dispatched_to_completed
+					  + completed_to_freed);
+
+		atomic_inc(&dev->histo.total);
+		atomic_inc(&dev->histo.queued_to_dispatched[q2d]);
+		atomic_inc(&dev->histo.dispatched_to_completed[d2c]);
+		atomic_inc(&dev->histo.completed_to_freed[c2f]);
+
+		atomic_inc(&dev->histo.queued_to_completed[q2c]);
+		atomic_inc(&dev->histo.queued_to_freed[q2f]);
+
+	}
+	buf->time_queued     = 0;
+	buf->time_dispatched = 0;
+	buf->time_completed  = 0;
+	buf->time_freed	     = 0;
+}
+#endif
+
+void DRM(free_buffer)(drm_device_t *dev, drm_buf_t *buf)
+{
+	if (!buf) return;
+
+	buf->waiting  = 0;
+	buf->pending  = 0;
+	buf->pid      = 0;
+	buf->used     = 0;
+#if __HAVE_DMA_HISTOGRAM
+	buf->time_completed = get_cycles();
+#endif
+
+	if ( __HAVE_DMA_WAITQUEUE && waitqueue_active(&buf->dma_wait)) {
+		wake_up_interruptible(&buf->dma_wait);
+	}
+#if __HAVE_DMA_FREELIST
+	else {
+		drm_device_dma_t *dma = dev->dma;
+				/* If processes are waiting, the last one
+				   to wake will put the buffer on the free
+				   list.  If no processes are waiting, we
+				   put the buffer on the freelist here. */
+		DRM(freelist_put)(dev, &dma->bufs[buf->order].freelist, buf);
+	}
+#endif
+}
+
+#if !__HAVE_DMA_RECLAIM
+void DRM(reclaim_buffers)(drm_device_t *dev, pid_t pid)
+{
+	drm_device_dma_t *dma = dev->dma;
+	int		 i;
+
+	if (!dma) return;
+	for (i = 0; i < dma->buf_count; i++) {
+		if (dma->buflist[i]->pid == pid) {
+			switch (dma->buflist[i]->list) {
+			case DRM_LIST_NONE:
+				DRM(free_buffer)(dev, dma->buflist[i]);
+				break;
+			case DRM_LIST_WAIT:
+				dma->buflist[i]->list = DRM_LIST_RECLAIM;
+				break;
+			default:
+				/* Buffer already on hardware. */
+				break;
+			}
+		}
+	}
+}
+#endif
+
+
+/* GH: This is a big hack for now...
+ */
+#if __HAVE_OLD_DMA
+
+void DRM(clear_next_buffer)(drm_device_t *dev)
+{
+	drm_device_dma_t *dma = dev->dma;
+
+	dma->next_buffer = NULL;
+	if (dma->next_queue && !DRM_BUFCOUNT(&dma->next_queue->waitlist)) {
+		wake_up_interruptible(&dma->next_queue->flush_queue);
+	}
+	dma->next_queue	 = NULL;
+}
+
+int DRM(select_queue)(drm_device_t *dev, void (*wrapper)(unsigned long))
+{
+	int	   i;
+	int	   candidate = -1;
+	int	   j	     = jiffies;
+
+	if (!dev) {
+		DRM_ERROR("No device\n");
+		return -1;
+	}
+	if (!dev->queuelist || !dev->queuelist[DRM_KERNEL_CONTEXT]) {
+				/* This only happens between the time the
+				   interrupt is initialized and the time
+				   the queues are initialized. */
+		return -1;
+	}
+
+				/* Doing "while locked" DMA? */
+	if (DRM_WAITCOUNT(dev, DRM_KERNEL_CONTEXT)) {
+		return DRM_KERNEL_CONTEXT;
+	}
+
+				/* If there are buffers on the last_context
+				   queue, and we have not been executing
+				   this context very long, continue to
+				   execute this context. */
+	if (dev->last_switch <= j
+	    && dev->last_switch + DRM_TIME_SLICE > j
+	    && DRM_WAITCOUNT(dev, dev->last_context)) {
+		return dev->last_context;
+	}
+
+				/* Otherwise, find a candidate */
+	for (i = dev->last_checked + 1; i < dev->queue_count; i++) {
+		if (DRM_WAITCOUNT(dev, i)) {
+			candidate = dev->last_checked = i;
+			break;
+		}
+	}
+
+	if (candidate < 0) {
+		for (i = 0; i < dev->queue_count; i++) {
+			if (DRM_WAITCOUNT(dev, i)) {
+				candidate = dev->last_checked = i;
+				break;
+			}
+		}
+	}
+
+	if (wrapper
+	    && candidate >= 0
+	    && candidate != dev->last_context
+	    && dev->last_switch <= j
+	    && dev->last_switch + DRM_TIME_SLICE > j) {
+		if (dev->timer.expires != dev->last_switch + DRM_TIME_SLICE) {
+			del_timer(&dev->timer);
+			dev->timer.function = wrapper;
+			dev->timer.data	    = (unsigned long)dev;
+			dev->timer.expires  = dev->last_switch+DRM_TIME_SLICE;
+			add_timer(&dev->timer);
+		}
+		return -1;
+	}
+
+	return candidate;
+}
+
+
+int DRM(dma_enqueue)(drm_device_t *dev, drm_dma_t *d)
+{
+	int		  i;
+	drm_queue_t	  *q;
+	drm_buf_t	  *buf;
+	int		  idx;
+	int		  while_locked = 0;
+	drm_device_dma_t  *dma = dev->dma;
+	DECLARE_WAITQUEUE(entry, current);
+
+	DRM_DEBUG("%d\n", d->send_count);
+
+	if (d->flags & _DRM_DMA_WHILE_LOCKED) {
+		int context = dev->lock.hw_lock->lock;
+
+		if (!_DRM_LOCK_IS_HELD(context)) {
+			DRM_ERROR("No lock held during \"while locked\""
+				  " request\n");
+			return -EINVAL;
+		}
+		if (d->context != _DRM_LOCKING_CONTEXT(context)
+		    && _DRM_LOCKING_CONTEXT(context) != DRM_KERNEL_CONTEXT) {
+			DRM_ERROR("Lock held by %d while %d makes"
+				  " \"while locked\" request\n",
+				  _DRM_LOCKING_CONTEXT(context),
+				  d->context);
+			return -EINVAL;
+		}
+		q = dev->queuelist[DRM_KERNEL_CONTEXT];
+		while_locked = 1;
+	} else {
+		q = dev->queuelist[d->context];
+	}
+
+
+	atomic_inc(&q->use_count);
+	if (atomic_read(&q->block_write)) {
+		add_wait_queue(&q->write_queue, &entry);
+		atomic_inc(&q->block_count);
+		for (;;) {
+			current->state = TASK_INTERRUPTIBLE;
+			if (!atomic_read(&q->block_write)) break;
+			schedule();
+			if (signal_pending(current)) {
+				atomic_dec(&q->use_count);
+				remove_wait_queue(&q->write_queue, &entry);
+				return -EINTR;
+			}
+		}
+		atomic_dec(&q->block_count);
+		current->state = TASK_RUNNING;
+		remove_wait_queue(&q->write_queue, &entry);
+	}
+
+	for (i = 0; i < d->send_count; i++) {
+		idx = d->send_indices[i];
+		if (idx < 0 || idx >= dma->buf_count) {
+			atomic_dec(&q->use_count);
+			DRM_ERROR("Index %d (of %d max)\n",
+				  d->send_indices[i], dma->buf_count - 1);
+			return -EINVAL;
+		}
+		buf = dma->buflist[ idx ];
+		if (buf->pid != current->pid) {
+			atomic_dec(&q->use_count);
+			DRM_ERROR("Process %d using buffer owned by %d\n",
+				  current->pid, buf->pid);
+			return -EINVAL;
+		}
+		if (buf->list != DRM_LIST_NONE) {
+			atomic_dec(&q->use_count);
+			DRM_ERROR("Process %d using buffer %d on list %d\n",
+				  current->pid, buf->idx, buf->list);
+		}
+		buf->used	  = d->send_sizes[i];
+		buf->while_locked = while_locked;
+		buf->context	  = d->context;
+		if (!buf->used) {
+			DRM_ERROR("Queueing 0 length buffer\n");
+		}
+		if (buf->pending) {
+			atomic_dec(&q->use_count);
+			DRM_ERROR("Queueing pending buffer:"
+				  " buffer %d, offset %d\n",
+				  d->send_indices[i], i);
+			return -EINVAL;
+		}
+		if (buf->waiting) {
+			atomic_dec(&q->use_count);
+			DRM_ERROR("Queueing waiting buffer:"
+				  " buffer %d, offset %d\n",
+				  d->send_indices[i], i);
+			return -EINVAL;
+		}
+		buf->waiting = 1;
+		if (atomic_read(&q->use_count) == 1
+		    || atomic_read(&q->finalization)) {
+			DRM(free_buffer)(dev, buf);
+		} else {
+			DRM(waitlist_put)(&q->waitlist, buf);
+			atomic_inc(&q->total_queued);
+		}
+	}
+	atomic_dec(&q->use_count);
+
+	return 0;
+}
+
+static int DRM(dma_get_buffers_of_order)(drm_device_t *dev, drm_dma_t *d,
+					 int order)
+{
+	int		  i;
+	drm_buf_t	  *buf;
+	drm_device_dma_t  *dma = dev->dma;
+
+	for (i = d->granted_count; i < d->request_count; i++) {
+		buf = DRM(freelist_get)(&dma->bufs[order].freelist,
+					d->flags & _DRM_DMA_WAIT);
+		if (!buf) break;
+		if (buf->pending || buf->waiting) {
+			DRM_ERROR("Free buffer %d in use by %d (w%d, p%d)\n",
+				  buf->idx,
+				  buf->pid,
+				  buf->waiting,
+				  buf->pending);
+		}
+		buf->pid     = current->pid;
+		if (copy_to_user(&d->request_indices[i],
+				 &buf->idx,
+				 sizeof(buf->idx)))
+			return -EFAULT;
+
+		if (copy_to_user(&d->request_sizes[i],
+				 &buf->total,
+				 sizeof(buf->total)))
+			return -EFAULT;
+
+		++d->granted_count;
+	}
+	return 0;
+}
+
+
+int DRM(dma_get_buffers)(drm_device_t *dev, drm_dma_t *dma)
+{
+	int		  order;
+	int		  retcode = 0;
+	int		  tmp_order;
+
+	order = DRM(order)(dma->request_size);
+
+	dma->granted_count = 0;
+	retcode		   = DRM(dma_get_buffers_of_order)(dev, dma, order);
+
+	if (dma->granted_count < dma->request_count
+	    && (dma->flags & _DRM_DMA_SMALLER_OK)) {
+		for (tmp_order = order - 1;
+		     !retcode
+			     && dma->granted_count < dma->request_count
+			     && tmp_order >= DRM_MIN_ORDER;
+		     --tmp_order) {
+
+			retcode = DRM(dma_get_buffers_of_order)(dev, dma,
+								tmp_order);
+		}
+	}
+
+	if (dma->granted_count < dma->request_count
+	    && (dma->flags & _DRM_DMA_LARGER_OK)) {
+		for (tmp_order = order + 1;
+		     !retcode
+			     && dma->granted_count < dma->request_count
+			     && tmp_order <= DRM_MAX_ORDER;
+		     ++tmp_order) {
+
+			retcode = DRM(dma_get_buffers_of_order)(dev, dma,
+								tmp_order);
+		}
+	}
+	return 0;
+}
+
+#endif /* __HAVE_OLD_DMA */
+
+
+#if __HAVE_DMA_IRQ
+
+int DRM(irq_install)( drm_device_t *dev, int irq )
+{
+	int ret;
+
+	if ( !irq )
+		return -EINVAL;
+
+	down( &dev->struct_sem );
+	if ( dev->irq ) {
+		up( &dev->struct_sem );
+		return -EBUSY;
+	}
+	dev->irq = irq;
+	up( &dev->struct_sem );
+
+	DRM_DEBUG( "%s: irq=%d\n", __FUNCTION__, irq );
+
+	dev->context_flag = 0;
+	dev->interrupt_flag = 0;
+	dev->dma_flag = 0;
+
+	dev->dma->next_buffer = NULL;
+	dev->dma->next_queue = NULL;
+	dev->dma->this_buffer = NULL;
+
+#if __HAVE_DMA_IRQ_BH
+	INIT_LIST_HEAD( &dev->tq.list );
+	dev->tq.sync = 0;
+	dev->tq.routine = DRM(dma_immediate_bh);
+	dev->tq.data = dev;
+#endif
+
+#if __HAVE_VBL_IRQ
+	init_waitqueue_head(&dev->vbl_queue);
+
+	spin_lock_init( &dev->vbl_lock );
+
+	INIT_LIST_HEAD( &dev->vbl_sigs.head );
+
+	dev->vbl_pending = 0;
+#endif
+
+				/* Before installing handler */
+	DRM(driver_irq_preinstall)(dev);
+
+				/* Install handler */
+	ret = request_irq( dev->irq, DRM(dma_service),
+			   DRM_IRQ_TYPE, dev->devname, dev );
+	if ( ret < 0 ) {
+		down( &dev->struct_sem );
+		dev->irq = 0;
+		up( &dev->struct_sem );
+		return ret;
+	}
+
+				/* After installing handler */
+	DRM(driver_irq_postinstall)(dev);
+
+	return 0;
+}
+
+int DRM(irq_uninstall)( drm_device_t *dev )
+{
+	int irq;
+
+	down( &dev->struct_sem );
+	irq = dev->irq;
+	dev->irq = 0;
+	up( &dev->struct_sem );
+
+	if ( !irq )
+		return -EINVAL;
+
+	DRM_DEBUG( "%s: irq=%d\n", __FUNCTION__, irq );
+
+	DRM(driver_irq_uninstall)( dev );
+
+	free_irq( irq, dev );
+
+	return 0;
+}
+
+int DRM(control)( struct inode *inode, struct file *filp,
+		  unsigned int cmd, unsigned long arg )
+{
+	drm_file_t *priv = filp->private_data;
+	drm_device_t *dev = priv->dev;
+	drm_control_t ctl;
+
+	if ( copy_from_user( &ctl, (drm_control_t *)arg, sizeof(ctl) ) )
+		return -EFAULT;
+
+	switch ( ctl.func ) {
+	case DRM_INST_HANDLER:
+		return DRM(irq_install)( dev, ctl.irq );
+	case DRM_UNINST_HANDLER:
+		return DRM(irq_uninstall)( dev );
+	default:
+		return -EINVAL;
+	}
+}
+
+#if __HAVE_VBL_IRQ
+
+int DRM(wait_vblank)( DRM_IOCTL_ARGS )
+{
+	drm_file_t *priv = filp->private_data;
+	drm_device_t *dev = priv->dev;
+	drm_wait_vblank_t vblwait;
+	struct timeval now;
+	int ret = 0;
+	unsigned int flags;
+
+	if (!dev->irq)
+		return -EINVAL;
+
+	DRM_COPY_FROM_USER_IOCTL( vblwait, (drm_wait_vblank_t *)data,
+				  sizeof(vblwait) );
+
+	switch ( vblwait.request.type & ~_DRM_VBLANK_FLAGS_MASK ) {
+	case _DRM_VBLANK_RELATIVE:
+		vblwait.request.sequence += atomic_read( &dev->vbl_received );
+		vblwait.request.type &= ~_DRM_VBLANK_RELATIVE;
+	case _DRM_VBLANK_ABSOLUTE:
+		break;
+	default:
+		return -EINVAL;
+	}
+
+	flags = vblwait.request.type & _DRM_VBLANK_FLAGS_MASK;
+	
+	if ( flags & _DRM_VBLANK_SIGNAL ) {
+		unsigned long irqflags;
+		drm_vbl_sig_t *vbl_sig;
+		
+		vblwait.reply.sequence = atomic_read( &dev->vbl_received );
+
+		spin_lock_irqsave( &dev->vbl_lock, irqflags );
+
+		/* Check if this task has already scheduled the same signal
+		 * for the same vblank sequence number; nothing to be done in
+		 * that case
+		 */
+		list_for_each( ( (struct list_head *) vbl_sig ), &dev->vbl_sigs.head ) {
+			if (vbl_sig->sequence == vblwait.request.sequence
+			    && vbl_sig->info.si_signo == vblwait.request.signal
+			    && vbl_sig->task == current)
+			{
+				spin_unlock_irqrestore( &dev->vbl_lock, irqflags );
+				goto done;
+			}
+		}
+
+		if ( dev->vbl_pending >= 100 ) {
+			spin_unlock_irqrestore( &dev->vbl_lock, irqflags );
+			return -EBUSY;
+		}
+
+		dev->vbl_pending++;
+
+		spin_unlock_irqrestore( &dev->vbl_lock, irqflags );
+
+		if ( !( vbl_sig = DRM_MALLOC( sizeof( drm_vbl_sig_t ) ) ) ) {
+			return -ENOMEM;
+		}
+
+		memset( (void *)vbl_sig, 0, sizeof(*vbl_sig) );
+
+		vbl_sig->sequence = vblwait.request.sequence;
+		vbl_sig->info.si_signo = vblwait.request.signal;
+		vbl_sig->task = current;
+
+		spin_lock_irqsave( &dev->vbl_lock, irqflags );
+
+		list_add_tail( (struct list_head *) vbl_sig, &dev->vbl_sigs.head );
+
+		spin_unlock_irqrestore( &dev->vbl_lock, irqflags );
+	} else {
+		ret = DRM(vblank_wait)( dev, &vblwait.request.sequence );
+
+		do_gettimeofday( &now );
+		vblwait.reply.tval_sec = now.tv_sec;
+		vblwait.reply.tval_usec = now.tv_usec;
+	}
+
+done:
+	DRM_COPY_TO_USER_IOCTL( (drm_wait_vblank_t *)data, vblwait,
+				sizeof(vblwait) );
+
+	return ret;
+}
+
+void DRM(vbl_send_signals)( drm_device_t *dev )
+{
+	struct list_head *tmp;
+	drm_vbl_sig_t *vbl_sig;
+	unsigned int vbl_seq = atomic_read( &dev->vbl_received );
+	unsigned long flags;
+
+	spin_lock_irqsave( &dev->vbl_lock, flags );
+
+	list_for_each_safe( ( (struct list_head *) vbl_sig ), tmp, &dev->vbl_sigs.head ) {
+		if ( ( vbl_seq - vbl_sig->sequence ) <= (1<<23) ) {
+			vbl_sig->info.si_code = vbl_seq;
+			send_sig_info( vbl_sig->info.si_signo, &vbl_sig->info, vbl_sig->task );
+
+			list_del( (struct list_head *) vbl_sig );
+
+			DRM_FREE( vbl_sig );
+
+			dev->vbl_pending--;
+		}
+	}
+
+	spin_unlock_irqrestore( &dev->vbl_lock, flags );
+}
+
+#endif	/* __HAVE_VBL_IRQ */
+
+#else
+
+int DRM(control)( struct inode *inode, struct file *filp,
+		  unsigned int cmd, unsigned long arg )
+{
+	drm_control_t ctl;
+
+	if ( copy_from_user( &ctl, (drm_control_t *)arg, sizeof(ctl) ) )
+		return -EFAULT;
+
+	switch ( ctl.func ) {
+	case DRM_INST_HANDLER:
+	case DRM_UNINST_HANDLER:
+		return 0;
+	default:
+		return -EINVAL;
+	}
+}
+
+#endif /* __HAVE_DMA_IRQ */
+
+#endif /* __HAVE_DMA */
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/drm_drawable.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/drm_drawable.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/drm_drawable.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/drm_drawable.h	2003-07-30 11:18:33.000000000 +0200
@@ -0,0 +1,51 @@
+/* drm_drawable.h -- IOCTLs for drawables -*- linux-c -*-
+ * Created: Tue Feb  2 08:37:54 1999 by faith@valinux.com
+ *
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Rickard E. (Rik) Faith <faith@valinux.com>
+ *    Gareth Hughes <gareth@valinux.com>
+ */
+
+#define __NO_VERSION__
+#include "drmP.h"
+
+int DRM(adddraw)(struct inode *inode, struct file *filp,
+		 unsigned int cmd, unsigned long arg)
+{
+	drm_draw_t draw;
+
+	draw.handle = 0;	/* NOOP */
+	DRM_DEBUG("%d\n", draw.handle);
+	if (copy_to_user((drm_draw_t *)arg, &draw, sizeof(draw)))
+		return -EFAULT;
+	return 0;
+}
+
+int DRM(rmdraw)(struct inode *inode, struct file *filp,
+		unsigned int cmd, unsigned long arg)
+{
+	return 0;		/* NOOP */
+}
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/drm_drv.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/drm_drv.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/drm_drv.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/drm_drv.h	2003-07-30 11:18:33.000000000 +0200
@@ -0,0 +1,1086 @@
+/* drm_drv.h -- Generic driver template -*- linux-c -*-
+ * Created: Thu Nov 23 03:10:50 2000 by gareth@valinux.com
+ *
+ * Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Rickard E. (Rik) Faith <faith@valinux.com>
+ *    Gareth Hughes <gareth@valinux.com>
+ */
+
+/*
+ * To use this template, you must at least define the following (samples
+ * given for the MGA driver):
+ *
+ * #define DRIVER_AUTHOR	"VA Linux Systems, Inc."
+ *
+ * #define DRIVER_NAME		"mga"
+ * #define DRIVER_DESC		"Matrox G200/G400"
+ * #define DRIVER_DATE		"20001127"
+ *
+ * #define DRIVER_MAJOR		2
+ * #define DRIVER_MINOR		0
+ * #define DRIVER_PATCHLEVEL	2
+ *
+ * #define DRIVER_IOCTL_COUNT	DRM_ARRAY_SIZE( mga_ioctls )
+ *
+ * #define DRM(x)		mga_##x
+ */
+
+#ifndef __MUST_HAVE_AGP
+#define __MUST_HAVE_AGP			0
+#endif
+#ifndef __HAVE_CTX_BITMAP
+#define __HAVE_CTX_BITMAP		0
+#endif
+#ifndef __HAVE_DMA_IRQ
+#define __HAVE_DMA_IRQ			0
+#endif
+#ifndef __HAVE_DMA_QUEUE
+#define __HAVE_DMA_QUEUE		0
+#endif
+#ifndef __HAVE_MULTIPLE_DMA_QUEUES
+#define __HAVE_MULTIPLE_DMA_QUEUES	0
+#endif
+#ifndef __HAVE_DMA_SCHEDULE
+#define __HAVE_DMA_SCHEDULE		0
+#endif
+#ifndef __HAVE_DMA_FLUSH
+#define __HAVE_DMA_FLUSH		0
+#endif
+#ifndef __HAVE_DMA_READY
+#define __HAVE_DMA_READY		0
+#endif
+#ifndef __HAVE_DMA_QUIESCENT
+#define __HAVE_DMA_QUIESCENT		0
+#endif
+#ifndef __HAVE_RELEASE
+#define __HAVE_RELEASE			0
+#endif
+#ifndef __HAVE_COUNTERS
+#define __HAVE_COUNTERS			0
+#endif
+#ifndef __HAVE_SG
+#define __HAVE_SG			0
+#endif
+#ifndef __HAVE_KERNEL_CTX_SWITCH
+#define __HAVE_KERNEL_CTX_SWITCH	0
+#endif
+
+#ifndef DRIVER_PREINIT
+#define DRIVER_PREINIT()
+#endif
+#ifndef DRIVER_POSTINIT
+#define DRIVER_POSTINIT()
+#endif
+#ifndef DRIVER_PRERELEASE
+#define DRIVER_PRERELEASE()
+#endif
+#ifndef DRIVER_PRETAKEDOWN
+#define DRIVER_PRETAKEDOWN()
+#endif
+#ifndef DRIVER_POSTCLEANUP
+#define DRIVER_POSTCLEANUP()
+#endif
+#ifndef DRIVER_PRESETUP
+#define DRIVER_PRESETUP()
+#endif
+#ifndef DRIVER_POSTSETUP
+#define DRIVER_POSTSETUP()
+#endif
+#ifndef DRIVER_IOCTLS
+#define DRIVER_IOCTLS
+#endif
+#ifndef DRIVER_FOPS
+#define DRIVER_FOPS				\
+static struct file_operations	DRM(fops) = {	\
+	.owner   = THIS_MODULE,			\
+	.open	 = DRM(open),			\
+	.flush	 = DRM(flush),			\
+	.release = DRM(release),		\
+	.ioctl	 = DRM(ioctl),			\
+	.mmap	 = DRM(mmap),			\
+	.read	 = DRM(read),			\
+	.fasync  = DRM(fasync),			\
+	.poll	 = DRM(poll),			\
+}
+#endif
+
+#ifndef MODULE
+/* DRM(options) is called by the kernel to parse command-line options
+ * passed via the boot-loader (e.g., LILO).  It calls the insmod option
+ * routine, drm_parse_drm.
+ */
+/* Use an additional macro to avoid preprocessor troubles */
+#define DRM_OPTIONS_FUNC DRM(options)
+static int __init DRM(options)( char *str )
+{
+	DRM(parse_options)( str );
+	return 1;
+}
+
+__setup( DRIVER_NAME "=", DRM_OPTIONS_FUNC );
+#undef DRM_OPTIONS_FUNC
+#endif
+
+/*
+ * The default number of instances (minor numbers) to initialize.
+ */
+#ifndef DRIVER_NUM_CARDS
+#define DRIVER_NUM_CARDS 1
+#endif
+
+static drm_device_t	*DRM(device);
+static int		*DRM(minor);
+static int		DRM(numdevs) = 0;
+
+DRIVER_FOPS;
+
+static drm_ioctl_desc_t		  DRM(ioctls)[] = {
+	[DRM_IOCTL_NR(DRM_IOCTL_VERSION)]       = { DRM(version),     0, 0 },
+	[DRM_IOCTL_NR(DRM_IOCTL_GET_UNIQUE)]    = { DRM(getunique),   0, 0 },
+	[DRM_IOCTL_NR(DRM_IOCTL_GET_MAGIC)]     = { DRM(getmagic),    0, 0 },
+	[DRM_IOCTL_NR(DRM_IOCTL_IRQ_BUSID)]     = { DRM(irq_busid),   0, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_GET_MAP)]       = { DRM(getmap),      0, 0 },
+	[DRM_IOCTL_NR(DRM_IOCTL_GET_CLIENT)]    = { DRM(getclient),   0, 0 },
+	[DRM_IOCTL_NR(DRM_IOCTL_GET_STATS)]     = { DRM(getstats),    0, 0 },
+
+	[DRM_IOCTL_NR(DRM_IOCTL_SET_UNIQUE)]    = { DRM(setunique),   1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_BLOCK)]         = { DRM(block),       1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_UNBLOCK)]       = { DRM(unblock),     1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_AUTH_MAGIC)]    = { DRM(authmagic),   1, 1 },
+
+	[DRM_IOCTL_NR(DRM_IOCTL_ADD_MAP)]       = { DRM(addmap),      1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_RM_MAP)]        = { DRM(rmmap),       1, 0 },
+
+#if __HAVE_CTX_BITMAP
+	[DRM_IOCTL_NR(DRM_IOCTL_SET_SAREA_CTX)] = { DRM(setsareactx), 1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_GET_SAREA_CTX)] = { DRM(getsareactx), 1, 0 },
+#endif
+
+	[DRM_IOCTL_NR(DRM_IOCTL_ADD_CTX)]       = { DRM(addctx),      1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_RM_CTX)]        = { DRM(rmctx),       1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_MOD_CTX)]       = { DRM(modctx),      1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_GET_CTX)]       = { DRM(getctx),      1, 0 },
+	[DRM_IOCTL_NR(DRM_IOCTL_SWITCH_CTX)]    = { DRM(switchctx),   1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_NEW_CTX)]       = { DRM(newctx),      1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_RES_CTX)]       = { DRM(resctx),      1, 0 },
+
+	[DRM_IOCTL_NR(DRM_IOCTL_ADD_DRAW)]      = { DRM(adddraw),     1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_RM_DRAW)]       = { DRM(rmdraw),      1, 1 },
+
+	[DRM_IOCTL_NR(DRM_IOCTL_LOCK)]	        = { DRM(lock),        1, 0 },
+	[DRM_IOCTL_NR(DRM_IOCTL_UNLOCK)]        = { DRM(unlock),      1, 0 },
+	[DRM_IOCTL_NR(DRM_IOCTL_FINISH)]        = { DRM(finish),      1, 0 },
+
+#if __HAVE_DMA
+	[DRM_IOCTL_NR(DRM_IOCTL_ADD_BUFS)]      = { DRM(addbufs),     1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_MARK_BUFS)]     = { DRM(markbufs),    1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_INFO_BUFS)]     = { DRM(infobufs),    1, 0 },
+	[DRM_IOCTL_NR(DRM_IOCTL_MAP_BUFS)]      = { DRM(mapbufs),     1, 0 },
+	[DRM_IOCTL_NR(DRM_IOCTL_FREE_BUFS)]     = { DRM(freebufs),    1, 0 },
+
+	/* The DRM_IOCTL_DMA ioctl should be defined by the driver.
+	 */
+	[DRM_IOCTL_NR(DRM_IOCTL_CONTROL)]       = { DRM(control),     1, 1 },
+#endif
+
+#if __REALLY_HAVE_AGP
+	[DRM_IOCTL_NR(DRM_IOCTL_AGP_ACQUIRE)]   = { DRM(agp_acquire), 1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_AGP_RELEASE)]   = { DRM(agp_release), 1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_AGP_ENABLE)]    = { DRM(agp_enable),  1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_AGP_INFO)]      = { DRM(agp_info),    1, 0 },
+	[DRM_IOCTL_NR(DRM_IOCTL_AGP_ALLOC)]     = { DRM(agp_alloc),   1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_AGP_FREE)]      = { DRM(agp_free),    1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_AGP_BIND)]      = { DRM(agp_bind),    1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_AGP_UNBIND)]    = { DRM(agp_unbind),  1, 1 },
+#endif
+
+#if __HAVE_SG
+	[DRM_IOCTL_NR(DRM_IOCTL_SG_ALLOC)]      = { DRM(sg_alloc),    1, 1 },
+	[DRM_IOCTL_NR(DRM_IOCTL_SG_FREE)]       = { DRM(sg_free),     1, 1 },
+#endif
+
+#if __HAVE_VBL_IRQ
+	[DRM_IOCTL_NR(DRM_IOCTL_WAIT_VBLANK)]   = { DRM(wait_vblank), 0, 0 },
+#endif
+
+	DRIVER_IOCTLS
+};
+
+#define DRIVER_IOCTL_COUNT	DRM_ARRAY_SIZE( DRM(ioctls) )
+
+#ifdef MODULE
+static char *drm_opts = NULL;
+#endif
+
+MODULE_AUTHOR( DRIVER_AUTHOR );
+MODULE_DESCRIPTION( DRIVER_DESC );
+MODULE_PARM( drm_opts, "s" );
+MODULE_LICENSE("GPL and additional rights");
+
+static int DRM(setup)( drm_device_t *dev )
+{
+	int i;
+
+	DRIVER_PRESETUP();
+	atomic_set( &dev->ioctl_count, 0 );
+	atomic_set( &dev->vma_count, 0 );
+	dev->buf_use = 0;
+	atomic_set( &dev->buf_alloc, 0 );
+
+#if __HAVE_DMA
+	i = DRM(dma_setup)( dev );
+	if ( i < 0 )
+		return i;
+#endif
+
+	dev->counters  = 6 + __HAVE_COUNTERS;
+	dev->types[0]  = _DRM_STAT_LOCK;
+	dev->types[1]  = _DRM_STAT_OPENS;
+	dev->types[2]  = _DRM_STAT_CLOSES;
+	dev->types[3]  = _DRM_STAT_IOCTLS;
+	dev->types[4]  = _DRM_STAT_LOCKS;
+	dev->types[5]  = _DRM_STAT_UNLOCKS;
+#ifdef __HAVE_COUNTER6
+	dev->types[6]  = __HAVE_COUNTER6;
+#endif
+#ifdef __HAVE_COUNTER7
+	dev->types[7]  = __HAVE_COUNTER7;
+#endif
+#ifdef __HAVE_COUNTER8
+	dev->types[8]  = __HAVE_COUNTER8;
+#endif
+#ifdef __HAVE_COUNTER9
+	dev->types[9]  = __HAVE_COUNTER9;
+#endif
+#ifdef __HAVE_COUNTER10
+	dev->types[10] = __HAVE_COUNTER10;
+#endif
+#ifdef __HAVE_COUNTER11
+	dev->types[11] = __HAVE_COUNTER11;
+#endif
+#ifdef __HAVE_COUNTER12
+	dev->types[12] = __HAVE_COUNTER12;
+#endif
+#ifdef __HAVE_COUNTER13
+	dev->types[13] = __HAVE_COUNTER13;
+#endif
+#ifdef __HAVE_COUNTER14
+	dev->types[14] = __HAVE_COUNTER14;
+#endif
+#ifdef __HAVE_COUNTER15
+	dev->types[14] = __HAVE_COUNTER14;
+#endif
+
+	for ( i = 0 ; i < DRM_ARRAY_SIZE(dev->counts) ; i++ )
+		atomic_set( &dev->counts[i], 0 );
+
+	for ( i = 0 ; i < DRM_HASH_SIZE ; i++ ) {
+		dev->magiclist[i].head = NULL;
+		dev->magiclist[i].tail = NULL;
+	}
+
+	dev->maplist = DRM(alloc)(sizeof(*dev->maplist),
+				  DRM_MEM_MAPS);
+	if(dev->maplist == NULL) return -ENOMEM;
+	memset(dev->maplist, 0, sizeof(*dev->maplist));
+	INIT_LIST_HEAD(&dev->maplist->head);
+	dev->map_count = 0;
+
+	dev->vmalist = NULL;
+	dev->sigdata.lock = dev->lock.hw_lock = NULL;
+	init_waitqueue_head( &dev->lock.lock_queue );
+	dev->queue_count = 0;
+	dev->queue_reserved = 0;
+	dev->queue_slots = 0;
+	dev->queuelist = NULL;
+	dev->irq = 0;
+	dev->context_flag = 0;
+	dev->interrupt_flag = 0;
+	dev->dma_flag = 0;
+	dev->last_context = 0;
+	dev->last_switch = 0;
+	dev->last_checked = 0;
+	init_timer( &dev->timer );
+	init_waitqueue_head( &dev->context_wait );
+
+	dev->ctx_start = 0;
+	dev->lck_start = 0;
+
+	dev->buf_rp = dev->buf;
+	dev->buf_wp = dev->buf;
+	dev->buf_end = dev->buf + DRM_BSZ;
+	dev->buf_async = NULL;
+	init_waitqueue_head( &dev->buf_readers );
+	init_waitqueue_head( &dev->buf_writers );
+
+	DRM_DEBUG( "\n" );
+
+	/* The kernel's context could be created here, but is now created
+	 * in drm_dma_enqueue.	This is more resource-efficient for
+	 * hardware that does not do DMA, but may mean that
+	 * drm_select_queue fails between the time the interrupt is
+	 * initialized and the time the queues are initialized.
+	 */
+	DRIVER_POSTSETUP();
+	return 0;
+}
+
+
+static int DRM(takedown)( drm_device_t *dev )
+{
+	drm_magic_entry_t *pt, *next;
+	drm_map_t *map;
+	drm_map_list_t *r_list;
+	struct list_head *list, *list_next;
+	drm_vma_entry_t *vma, *vma_next;
+	int i;
+
+	DRM_DEBUG( "\n" );
+
+	DRIVER_PRETAKEDOWN();
+#if __HAVE_DMA_IRQ
+	if ( dev->irq ) DRM(irq_uninstall)( dev );
+#endif
+
+	down( &dev->struct_sem );
+	del_timer( &dev->timer );
+
+	if ( dev->devname ) {
+		DRM(free)( dev->devname, strlen( dev->devname ) + 1,
+			   DRM_MEM_DRIVER );
+		dev->devname = NULL;
+	}
+
+	if ( dev->unique ) {
+		DRM(free)( dev->unique, strlen( dev->unique ) + 1,
+			   DRM_MEM_DRIVER );
+		dev->unique = NULL;
+		dev->unique_len = 0;
+	}
+				/* Clear pid list */
+	for ( i = 0 ; i < DRM_HASH_SIZE ; i++ ) {
+		for ( pt = dev->magiclist[i].head ; pt ; pt = next ) {
+			next = pt->next;
+			DRM(free)( pt, sizeof(*pt), DRM_MEM_MAGIC );
+		}
+		dev->magiclist[i].head = dev->magiclist[i].tail = NULL;
+	}
+
+#if __REALLY_HAVE_AGP
+				/* Clear AGP information */
+	if ( dev->agp ) {
+		drm_agp_mem_t *entry;
+		drm_agp_mem_t *nexte;
+
+				/* Remove AGP resources, but leave dev->agp
+                                   intact until drv_cleanup is called. */
+		for ( entry = dev->agp->memory ; entry ; entry = nexte ) {
+			nexte = entry->next;
+			if ( entry->bound ) DRM(unbind_agp)( entry->memory );
+			DRM(free_agp)( entry->memory, entry->pages );
+			DRM(free)( entry, sizeof(*entry), DRM_MEM_AGPLISTS );
+		}
+		dev->agp->memory = NULL;
+
+		if ( dev->agp->acquired ) DRM(agp_do_release)();
+
+		dev->agp->acquired = 0;
+		dev->agp->enabled  = 0;
+	}
+#endif
+
+				/* Clear vma list (only built for debugging) */
+	if ( dev->vmalist ) {
+		for ( vma = dev->vmalist ; vma ; vma = vma_next ) {
+			vma_next = vma->next;
+			DRM(free)( vma, sizeof(*vma), DRM_MEM_VMAS );
+		}
+		dev->vmalist = NULL;
+	}
+
+	if( dev->maplist ) {
+		for(list = dev->maplist->head.next;
+		    list != &dev->maplist->head;
+		    list = list_next) {
+			list_next = list->next;
+			r_list = (drm_map_list_t *)list;
+			map = r_list->map;
+			DRM(free)(r_list, sizeof(*r_list), DRM_MEM_MAPS);
+			if(!map) continue;
+
+			switch ( map->type ) {
+			case _DRM_REGISTERS:
+			case _DRM_FRAME_BUFFER:
+#if __REALLY_HAVE_MTRR
+				if ( map->mtrr >= 0 ) {
+					int retcode;
+					retcode = mtrr_del( map->mtrr,
+							    map->offset,
+							    map->size );
+					DRM_DEBUG( "mtrr_del=%d\n", retcode );
+				}
+#endif
+				DRM(ioremapfree)( map->handle, map->size );
+				break;
+			case _DRM_SHM:
+				vfree(map->handle);
+				break;
+
+			case _DRM_AGP:
+				/* Do nothing here, because this is all
+				 * handled in the AGP/GART driver.
+				 */
+				break;
+                       case _DRM_SCATTER_GATHER:
+				/* Handle it, but do nothing, if HAVE_SG
+				 * isn't defined.
+				 */
+#if __HAVE_SG
+				if(dev->sg) {
+					DRM(sg_cleanup)(dev->sg);
+					dev->sg = NULL;
+				}
+#endif
+				break;
+			}
+ 			DRM(free)(map, sizeof(*map), DRM_MEM_MAPS);
+ 		}
+		DRM(free)(dev->maplist, sizeof(*dev->maplist), DRM_MEM_MAPS);
+		dev->maplist = NULL;
+ 	}
+
+#if __HAVE_DMA_QUEUE || __HAVE_MULTIPLE_DMA_QUEUES
+	if ( dev->queuelist ) {
+		for ( i = 0 ; i < dev->queue_count ; i++ ) {
+			DRM(waitlist_destroy)( &dev->queuelist[i]->waitlist );
+			if ( dev->queuelist[i] ) {
+				DRM(free)( dev->queuelist[i],
+					  sizeof(*dev->queuelist[0]),
+					  DRM_MEM_QUEUES );
+				dev->queuelist[i] = NULL;
+			}
+		}
+		DRM(free)( dev->queuelist,
+			  dev->queue_slots * sizeof(*dev->queuelist),
+			  DRM_MEM_QUEUES );
+		dev->queuelist = NULL;
+	}
+	dev->queue_count = 0;
+#endif
+
+#if __HAVE_DMA
+	DRM(dma_takedown)( dev );
+#endif
+	if ( dev->lock.hw_lock ) {
+		dev->sigdata.lock = dev->lock.hw_lock = NULL; /* SHM removed */
+		dev->lock.pid = 0;
+		wake_up_interruptible( &dev->lock.lock_queue );
+	}
+	up( &dev->struct_sem );
+
+	return 0;
+}
+
+/*
+ * Figure out how many instances to initialize.
+ */
+static int drm_count_cards(void)
+{
+	int num = 0;
+#if defined(DRIVER_CARD_LIST)
+	int i;
+	drm_pci_list_t *l;
+	u16 device, vendor;
+	struct pci_dev *pdev = NULL;
+#endif
+
+	DRM_DEBUG( "\n" );
+
+#if defined(DRIVER_COUNT_CARDS)
+	num = DRIVER_COUNT_CARDS();
+#elif defined(DRIVER_CARD_LIST)
+	for (i = 0, l = DRIVER_CARD_LIST; l[i].vendor != 0; i++) {
+		pdev = NULL;
+		vendor = l[i].vendor;
+		device = l[i].device;
+		if(device == 0xffff) device = PCI_ANY_ID;
+		if(vendor == 0xffff) vendor = PCI_ANY_ID;
+		while ((pdev = pci_find_device(vendor, device, pdev))) {
+			num++;
+		}
+	}
+#else
+	num = DRIVER_NUM_CARDS;
+#endif
+	DRM_DEBUG("numdevs = %d\n", num);
+	return num;
+}
+
+/* drm_init is called via init_module at module load time, or via
+ * linux/init/main.c (this is not currently supported).
+ */
+static int __init drm_init( void )
+{
+
+	drm_device_t *dev;
+	int i;
+#if __HAVE_CTX_BITMAP
+	int retcode;
+#endif
+	DRM_DEBUG( "\n" );
+
+#ifdef MODULE
+	DRM(parse_options)( drm_opts );
+#endif
+
+	DRM(numdevs) = drm_count_cards();
+	/* Force at least one instance. */
+	if (DRM(numdevs) <= 0)
+		DRM(numdevs) = 1;
+
+	DRM(device) = kmalloc(sizeof(*DRM(device)) * DRM(numdevs), GFP_KERNEL);
+	if (!DRM(device)) {
+		return -ENOMEM;
+	}
+	DRM(minor) = kmalloc(sizeof(*DRM(minor)) * DRM(numdevs), GFP_KERNEL);
+	if (!DRM(minor)) {
+		kfree(DRM(device));
+		return -ENOMEM;
+	}
+
+	DRIVER_PREINIT();
+
+	DRM(mem_init)();
+
+	for (i = 0; i < DRM(numdevs); i++) {
+		dev = &(DRM(device)[i]);
+		memset( (void *)dev, 0, sizeof(*dev) );
+		dev->count_lock = SPIN_LOCK_UNLOCKED;
+		sema_init( &dev->struct_sem, 1 );
+
+		if ((DRM(minor)[i] = DRM(stub_register)(DRIVER_NAME, &DRM(fops),dev)) < 0)
+			return -EPERM;
+		dev->device = MKDEV(DRM_MAJOR, DRM(minor)[i] );
+		dev->name   = DRIVER_NAME;
+
+#if __REALLY_HAVE_AGP
+		dev->agp = DRM(agp_init)();
+#if __MUST_HAVE_AGP
+		if ( dev->agp == NULL ) {
+			DRM_ERROR( "Cannot initialize the agpgart module.\n" );
+			DRM(stub_unregister)(DRM(minor)[i]);
+			DRM(takedown)( dev );
+			return -ENOMEM;
+		}
+#endif
+#if __REALLY_HAVE_MTRR
+		if (dev->agp)
+			dev->agp->agp_mtrr = mtrr_add( dev->agp->agp_info.aper_base,
+				       dev->agp->agp_info.aper_size*1024*1024,
+				       MTRR_TYPE_WRCOMB,
+				       1 );
+#endif
+#endif
+
+#if __HAVE_CTX_BITMAP
+		retcode = DRM(ctxbitmap_init)( dev );
+		if( retcode ) {
+			DRM_ERROR( "Cannot allocate memory for context bitmap.\n" );
+			DRM(stub_unregister)(DRM(minor)[i]);
+			DRM(takedown)( dev );
+			return retcode;
+		}
+#endif
+		DRM_INFO( "Initialized %s %d.%d.%d %s on minor %d\n",
+		  	DRIVER_NAME,
+		  	DRIVER_MAJOR,
+		  	DRIVER_MINOR,
+		  	DRIVER_PATCHLEVEL,
+		  	DRIVER_DATE,
+		  	DRM(minor)[i] );
+	}
+
+	DRIVER_POSTINIT();
+
+	return 0;
+}
+
+/* drm_cleanup is called via cleanup_module at module unload time.
+ */
+static void __exit drm_cleanup( void )
+{
+	drm_device_t *dev;
+	int i;
+
+	DRM_DEBUG( "\n" );
+
+	for (i = DRM(numdevs) - 1; i >= 0; i--) {
+		dev = &(DRM(device)[i]);
+		if ( DRM(stub_unregister)(DRM(minor)[i]) ) {
+			DRM_ERROR( "Cannot unload module\n" );
+		} else {
+			DRM_DEBUG("minor %d unregistered\n", DRM(minor)[i]);
+			if (i == 0) {
+				DRM_INFO( "Module unloaded\n" );
+			}
+		}
+#if __HAVE_CTX_BITMAP
+		DRM(ctxbitmap_cleanup)( dev );
+#endif
+
+#if __REALLY_HAVE_AGP && __REALLY_HAVE_MTRR
+		if ( dev->agp && dev->agp->agp_mtrr >= 0) {
+			int retval;
+			retval = mtrr_del( dev->agp->agp_mtrr,
+				   dev->agp->agp_info.aper_base,
+				   dev->agp->agp_info.aper_size*1024*1024 );
+			DRM_DEBUG( "mtrr_del=%d\n", retval );
+		}
+#endif
+
+		DRM(takedown)( dev );
+
+#if __REALLY_HAVE_AGP
+		if ( dev->agp ) {
+			DRM(agp_uninit)();
+			DRM(free)( dev->agp, sizeof(*dev->agp), DRM_MEM_AGPLISTS );
+			dev->agp = NULL;
+		}
+#endif
+	}
+	DRIVER_POSTCLEANUP();
+	kfree(DRM(minor));
+	kfree(DRM(device));
+	DRM(numdevs) = 0;
+}
+
+module_init( drm_init );
+module_exit( drm_cleanup );
+
+
+int DRM(version)( struct inode *inode, struct file *filp,
+		  unsigned int cmd, unsigned long arg )
+{
+	drm_version_t version;
+	int len;
+
+	if ( copy_from_user( &version,
+			     (drm_version_t *)arg,
+			     sizeof(version) ) )
+		return -EFAULT;
+
+#define DRM_COPY( name, value )						\
+	len = strlen( value );						\
+	if ( len > name##_len ) len = name##_len;			\
+	name##_len = strlen( value );					\
+	if ( len && name ) {						\
+		if ( copy_to_user( name, value, len ) )			\
+			return -EFAULT;					\
+	}
+
+	version.version_major = DRIVER_MAJOR;
+	version.version_minor = DRIVER_MINOR;
+	version.version_patchlevel = DRIVER_PATCHLEVEL;
+
+	DRM_COPY( version.name, DRIVER_NAME );
+	DRM_COPY( version.date, DRIVER_DATE );
+	DRM_COPY( version.desc, DRIVER_DESC );
+
+	if ( copy_to_user( (drm_version_t *)arg,
+			   &version,
+			   sizeof(version) ) )
+		return -EFAULT;
+	return 0;
+}
+
+int DRM(open)( struct inode *inode, struct file *filp )
+{
+	drm_device_t *dev = NULL;
+	int retcode = 0;
+	int i;
+
+	for (i = 0; i < DRM(numdevs); i++) {
+		if (minor(inode->i_rdev) == DRM(minor)[i]) {
+			dev = &(DRM(device)[i]);
+			break;
+		}
+	}
+	if (!dev) {
+		return -ENODEV;
+	}
+
+	DRM_DEBUG( "open_count = %d\n", dev->open_count );
+
+	retcode = DRM(open_helper)( inode, filp, dev );
+	if ( !retcode ) {
+		atomic_inc( &dev->counts[_DRM_STAT_OPENS] );
+		spin_lock( &dev->count_lock );
+		if ( !dev->open_count++ ) {
+			spin_unlock( &dev->count_lock );
+			return DRM(setup)( dev );
+		}
+		spin_unlock( &dev->count_lock );
+	}
+
+	return retcode;
+}
+
+int DRM(release)( struct inode *inode, struct file *filp )
+{
+	drm_file_t *priv = filp->private_data;
+	drm_device_t *dev;
+	int retcode = 0;
+
+	lock_kernel();
+	dev = priv->dev;
+
+	DRM_DEBUG( "open_count = %d\n", dev->open_count );
+
+	DRIVER_PRERELEASE();
+
+	/* ========================================================
+	 * Begin inline drm_release
+	 */
+
+	DRM_DEBUG( "pid = %d, device = 0x%lx, open_count = %d\n",
+		   current->pid, (long)dev->device, dev->open_count );
+
+	if ( dev->lock.hw_lock &&
+	     _DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock) &&
+	     dev->lock.pid == current->pid ) {
+		DRM_DEBUG( "Process %d dead, freeing lock for context %d\n",
+			   current->pid,
+			   _DRM_LOCKING_CONTEXT(dev->lock.hw_lock->lock) );
+#if __HAVE_RELEASE
+		DRIVER_RELEASE();
+#endif
+		DRM(lock_free)( dev, &dev->lock.hw_lock->lock,
+				_DRM_LOCKING_CONTEXT(dev->lock.hw_lock->lock) );
+
+				/* FIXME: may require heavy-handed reset of
+                                   hardware at this point, possibly
+                                   processed via a callback to the X
+                                   server. */
+	}
+#if __HAVE_RELEASE
+	else if ( dev->lock.hw_lock ) {
+		/* The lock is required to reclaim buffers */
+		DECLARE_WAITQUEUE( entry, current );
+		add_wait_queue( &dev->lock.lock_queue, &entry );
+		for (;;) {
+			current->state = TASK_INTERRUPTIBLE;
+			if ( !dev->lock.hw_lock ) {
+				/* Device has been unregistered */
+				retcode = -EINTR;
+				break;
+			}
+			if ( DRM(lock_take)( &dev->lock.hw_lock->lock,
+					     DRM_KERNEL_CONTEXT ) ) {
+				dev->lock.pid	    = priv->pid;
+				dev->lock.lock_time = jiffies;
+                                atomic_inc( &dev->counts[_DRM_STAT_LOCKS] );
+				break;	/* Got lock */
+			}
+				/* Contention */
+#if 0
+			atomic_inc( &dev->total_sleeps );
+#endif
+			schedule();
+			if ( signal_pending( current ) ) {
+				retcode = -ERESTARTSYS;
+				break;
+			}
+		}
+		current->state = TASK_RUNNING;
+		remove_wait_queue( &dev->lock.lock_queue, &entry );
+		if( !retcode ) {
+			DRIVER_RELEASE();
+			DRM(lock_free)( dev, &dev->lock.hw_lock->lock,
+					DRM_KERNEL_CONTEXT );
+		}
+	}
+#elif __HAVE_DMA
+	DRM(reclaim_buffers)( dev, priv->pid );
+#endif
+
+	DRM(fasync)( -1, filp, 0 );
+
+	down( &dev->struct_sem );
+	if ( priv->remove_auth_on_close == 1 ) {
+		drm_file_t *temp = dev->file_first;
+		while ( temp ) {
+			temp->authenticated = 0;
+			temp = temp->next;
+		}
+	}
+	if ( priv->prev ) {
+		priv->prev->next = priv->next;
+	} else {
+		dev->file_first	 = priv->next;
+	}
+	if ( priv->next ) {
+		priv->next->prev = priv->prev;
+	} else {
+		dev->file_last	 = priv->prev;
+	}
+	up( &dev->struct_sem );
+
+	DRM(free)( priv, sizeof(*priv), DRM_MEM_FILES );
+
+	/* ========================================================
+	 * End inline drm_release
+	 */
+
+	atomic_inc( &dev->counts[_DRM_STAT_CLOSES] );
+	spin_lock( &dev->count_lock );
+	if ( !--dev->open_count ) {
+		if ( atomic_read( &dev->ioctl_count ) || dev->blocked ) {
+			DRM_ERROR( "Device busy: %d %d\n",
+				   atomic_read( &dev->ioctl_count ),
+				   dev->blocked );
+			spin_unlock( &dev->count_lock );
+			unlock_kernel();
+			return -EBUSY;
+		}
+		spin_unlock( &dev->count_lock );
+		unlock_kernel();
+		return DRM(takedown)( dev );
+	}
+	spin_unlock( &dev->count_lock );
+
+	unlock_kernel();
+	return retcode;
+}
+
+/* DRM(ioctl) is called whenever a process performs an ioctl on /dev/drm.
+ */
+int DRM(ioctl)( struct inode *inode, struct file *filp,
+		unsigned int cmd, unsigned long arg )
+{
+	drm_file_t *priv = filp->private_data;
+	drm_device_t *dev = priv->dev;
+	drm_ioctl_desc_t *ioctl;
+	drm_ioctl_t *func;
+	int nr = DRM_IOCTL_NR(cmd);
+	int retcode = 0;
+
+	atomic_inc( &dev->ioctl_count );
+	atomic_inc( &dev->counts[_DRM_STAT_IOCTLS] );
+	++priv->ioctl_count;
+
+	DRM_DEBUG( "pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n",
+		   current->pid, cmd, nr, (long)dev->device, 
+		   priv->authenticated );
+
+	if ( nr >= DRIVER_IOCTL_COUNT ) {
+		retcode = -EINVAL;
+	} else {
+		ioctl = &DRM(ioctls)[nr];
+		func = ioctl->func;
+
+		if ( !func ) {
+			DRM_DEBUG( "no function\n" );
+			retcode = -EINVAL;
+		} else if ( ( ioctl->root_only && !capable( CAP_SYS_ADMIN ) )||
+			    ( ioctl->auth_needed && !priv->authenticated ) ) {
+			retcode = -EACCES;
+		} else {
+			retcode = func( inode, filp, cmd, arg );
+		}
+	}
+
+	atomic_dec( &dev->ioctl_count );
+	return retcode;
+}
+
+int DRM(lock)( struct inode *inode, struct file *filp,
+	       unsigned int cmd, unsigned long arg )
+{
+        drm_file_t *priv = filp->private_data;
+        drm_device_t *dev = priv->dev;
+        DECLARE_WAITQUEUE( entry, current );
+        drm_lock_t lock;
+        int ret = 0;
+#if __HAVE_MULTIPLE_DMA_QUEUES
+	drm_queue_t *q;
+#endif
+#if __HAVE_DMA_HISTOGRAM
+        cycles_t start;
+
+        dev->lck_start = start = get_cycles();
+#endif
+
+        if ( copy_from_user( &lock, (drm_lock_t *)arg, sizeof(lock) ) )
+		return -EFAULT;
+
+        if ( lock.context == DRM_KERNEL_CONTEXT ) {
+                DRM_ERROR( "Process %d using kernel context %d\n",
+			   current->pid, lock.context );
+                return -EINVAL;
+        }
+
+        DRM_DEBUG( "%d (pid %d) requests lock (0x%08x), flags = 0x%08x\n",
+		   lock.context, current->pid,
+		   dev->lock.hw_lock->lock, lock.flags );
+
+#if __HAVE_DMA_QUEUE
+        if ( lock.context < 0 )
+                return -EINVAL;
+#elif __HAVE_MULTIPLE_DMA_QUEUES
+        if ( lock.context < 0 || lock.context >= dev->queue_count )
+                return -EINVAL;
+	q = dev->queuelist[lock.context];
+#endif
+
+#if __HAVE_DMA_FLUSH
+	ret = DRM(flush_block_and_flush)( dev, lock.context, lock.flags );
+#endif
+        if ( !ret ) {
+                add_wait_queue( &dev->lock.lock_queue, &entry );
+                for (;;) {
+                        current->state = TASK_INTERRUPTIBLE;
+                        if ( !dev->lock.hw_lock ) {
+                                /* Device has been unregistered */
+                                ret = -EINTR;
+                                break;
+                        }
+                        if ( DRM(lock_take)( &dev->lock.hw_lock->lock,
+					     lock.context ) ) {
+                                dev->lock.pid       = current->pid;
+                                dev->lock.lock_time = jiffies;
+                                atomic_inc( &dev->counts[_DRM_STAT_LOCKS] );
+                                break;  /* Got lock */
+                        }
+
+                                /* Contention */
+                        schedule();
+                        if ( signal_pending( current ) ) {
+                                ret = -ERESTARTSYS;
+                                break;
+                        }
+                }
+                current->state = TASK_RUNNING;
+                remove_wait_queue( &dev->lock.lock_queue, &entry );
+        }
+
+#if __HAVE_DMA_FLUSH
+	DRM(flush_unblock)( dev, lock.context, lock.flags ); /* cleanup phase */
+#endif
+
+        if ( !ret ) {
+		sigemptyset( &dev->sigmask );
+		sigaddset( &dev->sigmask, SIGSTOP );
+		sigaddset( &dev->sigmask, SIGTSTP );
+		sigaddset( &dev->sigmask, SIGTTIN );
+		sigaddset( &dev->sigmask, SIGTTOU );
+		dev->sigdata.context = lock.context;
+		dev->sigdata.lock    = dev->lock.hw_lock;
+		block_all_signals( DRM(notifier),
+				   &dev->sigdata, &dev->sigmask );
+
+#if __HAVE_DMA_READY
+                if ( lock.flags & _DRM_LOCK_READY ) {
+			DRIVER_DMA_READY();
+		}
+#endif
+#if __HAVE_DMA_QUIESCENT
+                if ( lock.flags & _DRM_LOCK_QUIESCENT ) {
+			DRIVER_DMA_QUIESCENT();
+		}
+#endif
+#if __HAVE_KERNEL_CTX_SWITCH
+		if ( dev->last_context != lock.context ) {
+			DRM(context_switch)(dev, dev->last_context,
+					    lock.context);
+		}
+#endif
+        }
+
+        DRM_DEBUG( "%d %s\n", lock.context, ret ? "interrupted" : "has lock" );
+
+#if __HAVE_DMA_HISTOGRAM
+        atomic_inc(&dev->histo.lacq[DRM(histogram_slot)(get_cycles()-start)]);
+#endif
+        return ret;
+}
+
+
+int DRM(unlock)( struct inode *inode, struct file *filp,
+		 unsigned int cmd, unsigned long arg )
+{
+	drm_file_t *priv = filp->private_data;
+	drm_device_t *dev = priv->dev;
+	drm_lock_t lock;
+
+	if ( copy_from_user( &lock, (drm_lock_t *)arg, sizeof(lock) ) )
+		return -EFAULT;
+
+	if ( lock.context == DRM_KERNEL_CONTEXT ) {
+		DRM_ERROR( "Process %d using kernel context %d\n",
+			   current->pid, lock.context );
+		return -EINVAL;
+	}
+
+	atomic_inc( &dev->counts[_DRM_STAT_UNLOCKS] );
+
+#if __HAVE_KERNEL_CTX_SWITCH
+	/* We no longer really hold it, but if we are the next
+	 * agent to request it then we should just be able to
+	 * take it immediately and not eat the ioctl.
+	 */
+	dev->lock.pid = 0;
+	{
+		__volatile__ unsigned int *plock = &dev->lock.hw_lock->lock;
+		unsigned int old, new, prev, ctx;
+
+		ctx = lock.context;
+		do {
+			old  = *plock;
+			new  = ctx;
+			prev = cmpxchg(plock, old, new);
+		} while (prev != old);
+	}
+	wake_up_interruptible(&dev->lock.lock_queue);
+#else
+	DRM(lock_transfer)( dev, &dev->lock.hw_lock->lock,
+			    DRM_KERNEL_CONTEXT );
+#if __HAVE_DMA_SCHEDULE
+	DRM(dma_schedule)( dev, 1 );
+#endif
+
+	/* FIXME: Do we ever really need to check this???
+	 */
+	if ( 1 /* !dev->context_flag */ ) {
+		if ( DRM(lock_free)( dev, &dev->lock.hw_lock->lock,
+				     DRM_KERNEL_CONTEXT ) ) {
+			DRM_ERROR( "\n" );
+		}
+	}
+#endif /* !__HAVE_KERNEL_CTX_SWITCH */
+
+	unblock_all_signals();
+	return 0;
+}
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/drm_fops.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/drm_fops.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/drm_fops.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/drm_fops.h	2003-07-30 11:18:33.000000000 +0200
@@ -0,0 +1,209 @@
+/* drm_fops.h -- File operations for DRM -*- linux-c -*-
+ * Created: Mon Jan  4 08:58:31 1999 by faith@valinux.com
+ *
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Rickard E. (Rik) Faith <faith@valinux.com>
+ *    Daryll Strauss <daryll@valinux.com>
+ *    Gareth Hughes <gareth@valinux.com>
+ */
+
+#define __NO_VERSION__
+#include "drmP.h"
+#include <linux/poll.h>
+
+/* drm_open is called whenever a process opens /dev/drm. */
+
+int DRM(open_helper)(struct inode *inode, struct file *filp, drm_device_t *dev)
+{
+	int	     minor = minor(inode->i_rdev);
+	drm_file_t   *priv;
+
+	if (filp->f_flags & O_EXCL)   return -EBUSY; /* No exclusive opens */
+	if (!DRM(cpu_valid)())        return -EINVAL;
+
+	DRM_DEBUG("pid = %d, minor = %d\n", current->pid, minor);
+
+	priv		    = DRM(alloc)(sizeof(*priv), DRM_MEM_FILES);
+	if(!priv) return -ENOMEM;
+
+	memset(priv, 0, sizeof(*priv));
+	filp->private_data  = priv;
+	priv->uid	    = current->euid;
+	priv->pid	    = current->pid;
+	priv->minor	    = minor;
+	priv->dev	    = dev;
+	priv->ioctl_count   = 0;
+	priv->authenticated = capable(CAP_SYS_ADMIN);
+
+	down(&dev->struct_sem);
+	if (!dev->file_last) {
+		priv->next	= NULL;
+		priv->prev	= NULL;
+		dev->file_first = priv;
+		dev->file_last	= priv;
+	} else {
+		priv->next	     = NULL;
+		priv->prev	     = dev->file_last;
+		dev->file_last->next = priv;
+		dev->file_last	     = priv;
+	}
+	up(&dev->struct_sem);
+
+#ifdef __alpha__
+	/*
+	 * Default the hose
+	 */
+	if (!dev->hose) {
+		struct pci_dev *pci_dev;
+		pci_dev = pci_find_class(PCI_CLASS_DISPLAY_VGA << 8, NULL);
+		if (pci_dev) dev->hose = pci_dev->sysdata;
+		if (!dev->hose) {
+			struct pci_bus *b = pci_bus_b(pci_root_buses.next);
+			if (b) dev->hose = b->sysdata;
+		}
+	}
+#endif
+
+	return 0;
+}
+
+int DRM(flush)(struct file *filp)
+{
+	drm_file_t    *priv   = filp->private_data;
+	drm_device_t  *dev    = priv->dev;
+
+	DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %d\n",
+		  current->pid, (long)dev->device, dev->open_count);
+	return 0;
+}
+
+int DRM(fasync)(int fd, struct file *filp, int on)
+{
+	drm_file_t    *priv   = filp->private_data;
+	drm_device_t  *dev    = priv->dev;
+	int	      retcode;
+
+	DRM_DEBUG("fd = %d, device = 0x%lx\n", fd, (long)dev->device);
+	retcode = fasync_helper(fd, filp, on, &dev->buf_async);
+	if (retcode < 0) return retcode;
+	return 0;
+}
+
+
+/* The drm_read and drm_write_string code (especially that which manages
+   the circular buffer), is based on Alessandro Rubini's LINUX DEVICE
+   DRIVERS (Cambridge: O'Reilly, 1998), pages 111-113. */
+
+ssize_t DRM(read)(struct file *filp, char *buf, size_t count, loff_t *off)
+{
+	drm_file_t    *priv   = filp->private_data;
+	drm_device_t  *dev    = priv->dev;
+	int	      left;
+	int	      avail;
+	int	      send;
+	int	      cur;
+
+	DRM_DEBUG("%p, %p\n", dev->buf_rp, dev->buf_wp);
+
+	while (dev->buf_rp == dev->buf_wp) {
+		DRM_DEBUG("  sleeping\n");
+		if (filp->f_flags & O_NONBLOCK) {
+			return -EAGAIN;
+		}
+		interruptible_sleep_on(&dev->buf_readers);
+		if (signal_pending(current)) {
+			DRM_DEBUG("  interrupted\n");
+			return -ERESTARTSYS;
+		}
+		DRM_DEBUG("  awake\n");
+	}
+
+	left  = (dev->buf_rp + DRM_BSZ - dev->buf_wp) % DRM_BSZ;
+	avail = DRM_BSZ - left;
+	send  = DRM_MIN(avail, count);
+
+	while (send) {
+		if (dev->buf_wp > dev->buf_rp) {
+			cur = DRM_MIN(send, dev->buf_wp - dev->buf_rp);
+		} else {
+			cur = DRM_MIN(send, dev->buf_end - dev->buf_rp);
+		}
+		if (copy_to_user(buf, dev->buf_rp, cur))
+			return -EFAULT;
+		dev->buf_rp += cur;
+		if (dev->buf_rp == dev->buf_end) dev->buf_rp = dev->buf;
+		send -= cur;
+	}
+
+	wake_up_interruptible(&dev->buf_writers);
+	return DRM_MIN(avail, count);;
+}
+
+int DRM(write_string)(drm_device_t *dev, const char *s)
+{
+	int left   = (dev->buf_rp + DRM_BSZ - dev->buf_wp) % DRM_BSZ;
+	int send   = strlen(s);
+	int count;
+
+	DRM_DEBUG("%d left, %d to send (%p, %p)\n",
+		  left, send, dev->buf_rp, dev->buf_wp);
+
+	if (left == 1 || dev->buf_wp != dev->buf_rp) {
+		DRM_ERROR("Buffer not empty (%d left, wp = %p, rp = %p)\n",
+			  left,
+			  dev->buf_wp,
+			  dev->buf_rp);
+	}
+
+	while (send) {
+		if (dev->buf_wp >= dev->buf_rp) {
+			count = DRM_MIN(send, dev->buf_end - dev->buf_wp);
+			if (count == left) --count; /* Leave a hole */
+		} else {
+			count = DRM_MIN(send, dev->buf_rp - dev->buf_wp - 1);
+		}
+		strncpy(dev->buf_wp, s, count);
+		dev->buf_wp += count;
+		if (dev->buf_wp == dev->buf_end) dev->buf_wp = dev->buf;
+		send -= count;
+	}
+
+	if (dev->buf_async) kill_fasync(&dev->buf_async, SIGIO, POLL_IN);
+
+	DRM_DEBUG("waking\n");
+	wake_up_interruptible(&dev->buf_readers);
+	return 0;
+}
+
+unsigned int DRM(poll)(struct file *filp, struct poll_table_struct *wait)
+{
+	drm_file_t   *priv = filp->private_data;
+	drm_device_t *dev  = priv->dev;
+
+	poll_wait(filp, &dev->buf_readers, wait);
+	if (dev->buf_wp != dev->buf_rp) return POLLIN | POLLRDNORM;
+	return 0;
+}
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/drm_init.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/drm_init.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/drm_init.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/drm_init.h	2003-07-30 11:18:33.000000000 +0200
@@ -0,0 +1,116 @@
+/* drm_init.h -- Setup/Cleanup for DRM -*- linux-c -*-
+ * Created: Mon Jan  4 08:58:31 1999 by faith@valinux.com
+ *
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Rickard E. (Rik) Faith <faith@valinux.com>
+ *    Gareth Hughes <gareth@valinux.com>
+ */
+
+#define __NO_VERSION__
+#include "drmP.h"
+
+#if 0
+int DRM(flags) = DRM_FLAG_DEBUG;
+#else
+int DRM(flags) = 0;
+#endif
+
+/* drm_parse_option parses a single option.  See description for
+ * drm_parse_options for details.
+ */
+static void DRM(parse_option)(char *s)
+{
+	char *c, *r;
+
+	DRM_DEBUG("\"%s\"\n", s);
+	if (!s || !*s) return;
+	for (c = s; *c && *c != ':'; c++); /* find : or \0 */
+	if (*c) r = c + 1; else r = NULL;  /* remember remainder */
+	*c = '\0';			   /* terminate */
+	if (!strcmp(s, "noctx")) {
+		DRM(flags) |= DRM_FLAG_NOCTX;
+		DRM_INFO("Server-mediated context switching OFF\n");
+		return;
+	}
+	if (!strcmp(s, "debug")) {
+		DRM(flags) |= DRM_FLAG_DEBUG;
+		DRM_INFO("Debug messages ON\n");
+		return;
+	}
+	DRM_ERROR("\"%s\" is not a valid option\n", s);
+	return;
+}
+
+/* drm_parse_options parse the insmod "drm_opts=" options, or the command-line
+ * options passed to the kernel via LILO.  The grammar of the format is as
+ * follows:
+ *
+ * drm		::= 'drm_opts=' option_list
+ * option_list	::= option [ ';' option_list ]
+ * option	::= 'device:' major
+ *		|   'debug'
+ *		|   'noctx'
+ * major	::= INTEGER
+ *
+ * Note that 's' contains option_list without the 'drm_opts=' part.
+ *
+ * device=major,minor specifies the device number used for /dev/drm
+ *	  if major == 0 then the misc device is used
+ *	  if major == 0 and minor == 0 then dynamic misc allocation is used
+ * debug=on specifies that debugging messages will be printk'd
+ * debug=trace specifies that each function call will be logged via printk
+ * debug=off turns off all debugging options
+ *
+ */
+
+void DRM(parse_options)(char *s)
+{
+	char *h, *t, *n;
+
+	DRM_DEBUG("\"%s\"\n", s ?: "");
+	if (!s || !*s) return;
+
+	for (h = t = n = s; h && *h; h = n) {
+		for (; *t && *t != ';'; t++);	       /* find ; or \0 */
+		if (*t) n = t + 1; else n = NULL;      /* remember next */
+		*t = '\0';			       /* terminate */
+		DRM(parse_option)(h);		       /* parse */
+	}
+}
+
+/* drm_cpu_valid returns non-zero if the DRI will run on this CPU, and 0
+ * otherwise.
+ */
+int DRM(cpu_valid)(void)
+{
+#if defined(__i386__)
+	if (boot_cpu_data.x86 == 3) return 0; /* No cmpxchg on a 386 */
+#endif
+#if defined(__sparc__) && !defined(__sparc_v9__)
+	return 0; /* No cmpxchg before v9 sparc. */
+#endif
+	return 1;
+}
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/drm_ioctl.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/drm_ioctl.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/drm_ioctl.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/drm_ioctl.h	2003-07-30 11:18:33.000000000 +0200
@@ -0,0 +1,292 @@
+/* drm_ioctl.h -- IOCTL processing for DRM -*- linux-c -*-
+ * Created: Fri Jan  8 09:01:26 1999 by faith@valinux.com
+ *
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Rickard E. (Rik) Faith <faith@valinux.com>
+ *    Gareth Hughes <gareth@valinux.com>
+ */
+
+#define __NO_VERSION__
+#include "drmP.h"
+
+
+int DRM(irq_busid)(struct inode *inode, struct file *filp,
+		   unsigned int cmd, unsigned long arg)
+{
+	drm_irq_busid_t p;
+	struct pci_dev	*dev;
+
+	if (copy_from_user(&p, (drm_irq_busid_t *)arg, sizeof(p)))
+		return -EFAULT;
+#ifdef __alpha__
+	{
+		int domain = p.busnum >> 8;
+		p.busnum &= 0xff;
+
+		/*
+		 * Find the hose the device is on (the domain number is the
+		 * hose index) and offset the bus by the root bus of that
+		 * hose.
+		 */
+                for(dev = pci_find_device(PCI_ANY_ID,PCI_ANY_ID,NULL);
+                    dev;
+                    dev = pci_find_device(PCI_ANY_ID,PCI_ANY_ID,dev)) {
+			struct pci_controller *hose = dev->sysdata;
+			
+			if (hose->index == domain) {
+				p.busnum += hose->bus->number;
+				break;
+			}
+		}
+	}
+#endif
+	dev = pci_find_slot(p.busnum, PCI_DEVFN(p.devnum, p.funcnum));
+	if (!dev) {
+		DRM_ERROR("pci_find_slot failed for %d:%d:%d\n",
+			  p.busnum, p.devnum, p.funcnum);
+		p.irq = 0;
+		goto out;
+	}			
+	if (pci_enable_device(dev) != 0) {
+		DRM_ERROR("pci_enable_device failed for %d:%d:%d\n",
+			  p.busnum, p.devnum, p.funcnum);
+		p.irq = 0;
+		goto out;
+	}		
+	p.irq = dev->irq;
+ out:
+	DRM_DEBUG("%d:%d:%d => IRQ %d\n",
+		  p.busnum, p.devnum, p.funcnum, p.irq);
+	if (copy_to_user((drm_irq_busid_t *)arg, &p, sizeof(p)))
+		return -EFAULT;
+	return 0;
+}
+
+int DRM(getunique)(struct inode *inode, struct file *filp,
+		   unsigned int cmd, unsigned long arg)
+{
+	drm_file_t	 *priv	 = filp->private_data;
+	drm_device_t	 *dev	 = priv->dev;
+	drm_unique_t	 u;
+
+	if (copy_from_user(&u, (drm_unique_t *)arg, sizeof(u)))
+		return -EFAULT;
+	if (u.unique_len >= dev->unique_len) {
+		if (copy_to_user(u.unique, dev->unique, dev->unique_len))
+			return -EFAULT;
+	}
+	u.unique_len = dev->unique_len;
+	if (copy_to_user((drm_unique_t *)arg, &u, sizeof(u)))
+		return -EFAULT;
+	return 0;
+}
+
+int DRM(setunique)(struct inode *inode, struct file *filp,
+		   unsigned int cmd, unsigned long arg)
+{
+	drm_file_t	 *priv	 = filp->private_data;
+	drm_device_t	 *dev	 = priv->dev;
+	drm_unique_t	 u;
+
+	if (dev->unique_len || dev->unique) return -EBUSY;
+
+	if (copy_from_user(&u, (drm_unique_t *)arg, sizeof(u))) return -EFAULT;
+
+	if (!u.unique_len || u.unique_len > 1024) return -EINVAL;
+
+	dev->unique_len = u.unique_len;
+	dev->unique	= DRM(alloc)(u.unique_len + 1, DRM_MEM_DRIVER);
+	if(!dev->unique) return -ENOMEM;
+	if (copy_from_user(dev->unique, u.unique, dev->unique_len))
+		return -EFAULT;
+
+	dev->unique[dev->unique_len] = '\0';
+
+	dev->devname = DRM(alloc)(strlen(dev->name) + strlen(dev->unique) + 2,
+				  DRM_MEM_DRIVER);
+	if(!dev->devname) {
+		DRM(free)(dev->devname, sizeof(*dev->devname), DRM_MEM_DRIVER);
+		return -ENOMEM;
+	}
+	sprintf(dev->devname, "%s@%s", dev->name, dev->unique);
+
+	do {
+		struct pci_dev *pci_dev;
+                int domain, b, d, f;
+                char *p;
+ 
+                for(p = dev->unique; p && *p && *p != ':'; p++);
+                if (!p || !*p) break;
+                b = (int)simple_strtoul(p+1, &p, 10);
+                if (*p != ':') break;
+                d = (int)simple_strtoul(p+1, &p, 10);
+                if (*p != ':') break;
+                f = (int)simple_strtoul(p+1, &p, 10);
+                if (*p) break;
+ 
+		domain = b >> 8;
+		b &= 0xff;
+
+#ifdef __alpha__
+		/*
+		 * Find the hose the device is on (the domain number is the
+		 * hose index) and offset the bus by the root bus of that
+		 * hose.
+		 */
+                for(pci_dev = pci_find_device(PCI_ANY_ID,PCI_ANY_ID,NULL);
+                    pci_dev;
+                    pci_dev = pci_find_device(PCI_ANY_ID,PCI_ANY_ID,pci_dev)) {
+			struct pci_controller *hose = pci_dev->sysdata;
+			
+			if (hose->index == domain) {
+				b += hose->bus->number;
+				break;
+			}
+		}
+#endif
+
+                pci_dev = pci_find_slot(b, PCI_DEVFN(d,f));
+                if (pci_dev) {
+			dev->pdev = pci_dev;
+#ifdef __alpha__
+			dev->hose = pci_dev->sysdata;
+#endif
+		}
+        } while(0);
+
+	return 0;
+}
+
+
+int DRM(getmap)( struct inode *inode, struct file *filp,
+		 unsigned int cmd, unsigned long arg )
+{
+	drm_file_t   *priv = filp->private_data;
+	drm_device_t *dev  = priv->dev;
+	drm_map_t    map;
+	drm_map_list_t *r_list = NULL;
+	struct list_head *list;
+	int          idx;
+	int	     i;
+
+	if (copy_from_user(&map, (drm_map_t *)arg, sizeof(map)))
+		return -EFAULT;
+	idx = map.offset;
+
+	down(&dev->struct_sem);
+	if (idx < 0 || idx >= dev->map_count) {
+		up(&dev->struct_sem);
+		return -EINVAL;
+	}
+
+	i = 0;
+	list_for_each(list, &dev->maplist->head) {
+		if(i == idx) {
+			r_list = (drm_map_list_t *)list;
+			break;
+		}
+		i++;
+	}
+	if(!r_list || !r_list->map) {
+		up(&dev->struct_sem);
+		return -EINVAL;
+	}
+
+	map.offset = r_list->map->offset;
+	map.size   = r_list->map->size;
+	map.type   = r_list->map->type;
+	map.flags  = r_list->map->flags;
+	map.handle = r_list->map->handle;
+	map.mtrr   = r_list->map->mtrr;
+	up(&dev->struct_sem);
+
+	if (copy_to_user((drm_map_t *)arg, &map, sizeof(map))) return -EFAULT;
+	return 0;
+}
+
+int DRM(getclient)( struct inode *inode, struct file *filp,
+		    unsigned int cmd, unsigned long arg )
+{
+	drm_file_t   *priv = filp->private_data;
+	drm_device_t *dev  = priv->dev;
+	drm_client_t client;
+	drm_file_t   *pt;
+	int          idx;
+	int          i;
+
+	if (copy_from_user(&client, (drm_client_t *)arg, sizeof(client)))
+		return -EFAULT;
+	idx = client.idx;
+	down(&dev->struct_sem);
+	for (i = 0, pt = dev->file_first; i < idx && pt; i++, pt = pt->next)
+		;
+
+	if (!pt) {
+		up(&dev->struct_sem);
+		return -EINVAL;
+	}
+	client.auth  = pt->authenticated;
+	client.pid   = pt->pid;
+	client.uid   = pt->uid;
+	client.magic = pt->magic;
+	client.iocs  = pt->ioctl_count;
+	up(&dev->struct_sem);
+
+	if (copy_to_user((drm_client_t *)arg, &client, sizeof(client)))
+		return -EFAULT;
+	return 0;
+}
+
+int DRM(getstats)( struct inode *inode, struct file *filp,
+		   unsigned int cmd, unsigned long arg )
+{
+	drm_file_t   *priv = filp->private_data;
+	drm_device_t *dev  = priv->dev;
+	drm_stats_t  stats;
+	int          i;
+
+	memset(&stats, 0, sizeof(stats));
+	
+	down(&dev->struct_sem);
+
+	for (i = 0; i < dev->counters; i++) {
+		if (dev->types[i] == _DRM_STAT_LOCK)
+			stats.data[i].value
+				= (dev->lock.hw_lock
+				   ? dev->lock.hw_lock->lock : 0);
+		else 
+			stats.data[i].value = atomic_read(&dev->counts[i]);
+		stats.data[i].type  = dev->types[i];
+	}
+	
+	stats.count = dev->counters;
+
+	up(&dev->struct_sem);
+
+	if (copy_to_user((drm_stats_t *)arg, &stats, sizeof(stats)))
+		return -EFAULT;
+	return 0;
+}
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/drm_lists.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/drm_lists.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/drm_lists.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/drm_lists.h	2003-07-30 11:18:33.000000000 +0200
@@ -0,0 +1,230 @@
+/* drm_lists.h -- Buffer list handling routines -*- linux-c -*-
+ * Created: Mon Apr 19 20:54:22 1999 by faith@valinux.com
+ *
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Rickard E. (Rik) Faith <faith@valinux.com>
+ *    Gareth Hughes <gareth@valinux.com>
+ */
+
+#define __NO_VERSION__
+#include "drmP.h"
+
+#if __HAVE_DMA_WAITLIST
+
+int DRM(waitlist_create)(drm_waitlist_t *bl, int count)
+{
+	if (bl->count) return -EINVAL;
+
+	bl->bufs       = DRM(alloc)((bl->count + 2) * sizeof(*bl->bufs),
+				    DRM_MEM_BUFLISTS);
+
+	if(!bl->bufs) return -ENOMEM;
+	memset(bl->bufs, 0, sizeof(*bl->bufs));
+	bl->count      = count;
+	bl->rp	       = bl->bufs;
+	bl->wp	       = bl->bufs;
+	bl->end	       = &bl->bufs[bl->count+1];
+	bl->write_lock = SPIN_LOCK_UNLOCKED;
+	bl->read_lock  = SPIN_LOCK_UNLOCKED;
+	return 0;
+}
+
+int DRM(waitlist_destroy)(drm_waitlist_t *bl)
+{
+	if (bl->rp != bl->wp) return -EINVAL;
+	if (bl->bufs) DRM(free)(bl->bufs,
+				(bl->count + 2) * sizeof(*bl->bufs),
+				DRM_MEM_BUFLISTS);
+	bl->count = 0;
+	bl->bufs  = NULL;
+	bl->rp	  = NULL;
+	bl->wp	  = NULL;
+	bl->end	  = NULL;
+	return 0;
+}
+
+int DRM(waitlist_put)(drm_waitlist_t *bl, drm_buf_t *buf)
+{
+	int	      left;
+	unsigned long flags;
+
+	left = DRM_LEFTCOUNT(bl);
+	if (!left) {
+		DRM_ERROR("Overflow while adding buffer %d from pid %d\n",
+			  buf->idx, buf->pid);
+		return -EINVAL;
+	}
+#if __HAVE_DMA_HISTOGRAM
+	buf->time_queued = get_cycles();
+#endif
+	buf->list	 = DRM_LIST_WAIT;
+
+	spin_lock_irqsave(&bl->write_lock, flags);
+	*bl->wp = buf;
+	if (++bl->wp >= bl->end) bl->wp = bl->bufs;
+	spin_unlock_irqrestore(&bl->write_lock, flags);
+
+	return 0;
+}
+
+drm_buf_t *DRM(waitlist_get)(drm_waitlist_t *bl)
+{
+	drm_buf_t     *buf;
+	unsigned long flags;
+
+	spin_lock_irqsave(&bl->read_lock, flags);
+	buf = *bl->rp;
+	if (bl->rp == bl->wp) {
+		spin_unlock_irqrestore(&bl->read_lock, flags);
+		return NULL;
+	}
+	if (++bl->rp >= bl->end) bl->rp = bl->bufs;
+	spin_unlock_irqrestore(&bl->read_lock, flags);
+
+	return buf;
+}
+
+#endif /* __HAVE_DMA_WAITLIST */
+
+
+#if __HAVE_DMA_FREELIST
+
+int DRM(freelist_create)(drm_freelist_t *bl, int count)
+{
+	atomic_set(&bl->count, 0);
+	bl->next      = NULL;
+	init_waitqueue_head(&bl->waiting);
+	bl->low_mark  = 0;
+	bl->high_mark = 0;
+	atomic_set(&bl->wfh,   0);
+	bl->lock      = SPIN_LOCK_UNLOCKED;
+	++bl->initialized;
+	return 0;
+}
+
+int DRM(freelist_destroy)(drm_freelist_t *bl)
+{
+	atomic_set(&bl->count, 0);
+	bl->next = NULL;
+	return 0;
+}
+
+int DRM(freelist_put)(drm_device_t *dev, drm_freelist_t *bl, drm_buf_t *buf)
+{
+	drm_device_dma_t *dma  = dev->dma;
+
+	if (!dma) {
+		DRM_ERROR("No DMA support\n");
+		return 1;
+	}
+
+	if (buf->waiting || buf->pending || buf->list == DRM_LIST_FREE) {
+		DRM_ERROR("Freed buffer %d: w%d, p%d, l%d\n",
+			  buf->idx, buf->waiting, buf->pending, buf->list);
+	}
+	if (!bl) return 1;
+#if __HAVE_DMA_HISTOGRAM
+	buf->time_freed = get_cycles();
+	DRM(histogram_compute)(dev, buf);
+#endif
+	buf->list	= DRM_LIST_FREE;
+
+	spin_lock(&bl->lock);
+	buf->next	= bl->next;
+	bl->next	= buf;
+	spin_unlock(&bl->lock);
+
+	atomic_inc(&bl->count);
+	if (atomic_read(&bl->count) > dma->buf_count) {
+		DRM_ERROR("%d of %d buffers free after addition of %d\n",
+			  atomic_read(&bl->count), dma->buf_count, buf->idx);
+		return 1;
+	}
+				/* Check for high water mark */
+	if (atomic_read(&bl->wfh) && atomic_read(&bl->count)>=bl->high_mark) {
+		atomic_set(&bl->wfh, 0);
+		wake_up_interruptible(&bl->waiting);
+	}
+	return 0;
+}
+
+static drm_buf_t *DRM(freelist_try)(drm_freelist_t *bl)
+{
+	drm_buf_t	  *buf;
+
+	if (!bl) return NULL;
+
+				/* Get buffer */
+	spin_lock(&bl->lock);
+	if (!bl->next) {
+		spin_unlock(&bl->lock);
+		return NULL;
+	}
+	buf	  = bl->next;
+	bl->next  = bl->next->next;
+	spin_unlock(&bl->lock);
+
+	atomic_dec(&bl->count);
+	buf->next = NULL;
+	buf->list = DRM_LIST_NONE;
+	if (buf->waiting || buf->pending) {
+		DRM_ERROR("Free buffer %d: w%d, p%d, l%d\n",
+			  buf->idx, buf->waiting, buf->pending, buf->list);
+	}
+
+	return buf;
+}
+
+drm_buf_t *DRM(freelist_get)(drm_freelist_t *bl, int block)
+{
+	drm_buf_t	  *buf	= NULL;
+	DECLARE_WAITQUEUE(entry, current);
+
+	if (!bl || !bl->initialized) return NULL;
+
+				/* Check for low water mark */
+	if (atomic_read(&bl->count) <= bl->low_mark) /* Became low */
+		atomic_set(&bl->wfh, 1);
+	if (atomic_read(&bl->wfh)) {
+		if (block) {
+			add_wait_queue(&bl->waiting, &entry);
+			for (;;) {
+				current->state = TASK_INTERRUPTIBLE;
+				if (!atomic_read(&bl->wfh)
+				    && (buf = DRM(freelist_try)(bl))) break;
+				schedule();
+				if (signal_pending(current)) break;
+			}
+			current->state = TASK_RUNNING;
+			remove_wait_queue(&bl->waiting, &entry);
+		}
+		return buf;
+	}
+
+	return DRM(freelist_try)(bl);
+}
+
+#endif /* __HAVE_DMA_FREELIST */
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/drm_lock.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/drm_lock.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/drm_lock.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/drm_lock.h	2003-07-30 11:18:33.000000000 +0200
@@ -0,0 +1,251 @@
+/* lock.c -- IOCTLs for locking -*- linux-c -*-
+ * Created: Tue Feb  2 08:37:54 1999 by faith@valinux.com
+ *
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Rickard E. (Rik) Faith <faith@valinux.com>
+ *    Gareth Hughes <gareth@valinux.com>
+ */
+
+#define __NO_VERSION__
+#include "drmP.h"
+
+int DRM(block)(struct inode *inode, struct file *filp, unsigned int cmd,
+	       unsigned long arg)
+{
+	DRM_DEBUG("\n");
+	return 0;
+}
+
+int DRM(unblock)(struct inode *inode, struct file *filp, unsigned int cmd,
+		 unsigned long arg)
+{
+	DRM_DEBUG("\n");
+	return 0;
+}
+
+int DRM(lock_take)(__volatile__ unsigned int *lock, unsigned int context)
+{
+	unsigned int old, new, prev;
+
+	do {
+		old = *lock;
+		if (old & _DRM_LOCK_HELD) new = old | _DRM_LOCK_CONT;
+		else			  new = context | _DRM_LOCK_HELD;
+		prev = cmpxchg(lock, old, new);
+	} while (prev != old);
+	if (_DRM_LOCKING_CONTEXT(old) == context) {
+		if (old & _DRM_LOCK_HELD) {
+			if (context != DRM_KERNEL_CONTEXT) {
+				DRM_ERROR("%d holds heavyweight lock\n",
+					  context);
+			}
+			return 0;
+		}
+	}
+	if (new == (context | _DRM_LOCK_HELD)) {
+				/* Have lock */
+		return 1;
+	}
+	return 0;
+}
+
+/* This takes a lock forcibly and hands it to context.	Should ONLY be used
+   inside *_unlock to give lock to kernel before calling *_dma_schedule. */
+int DRM(lock_transfer)(drm_device_t *dev,
+		       __volatile__ unsigned int *lock, unsigned int context)
+{
+	unsigned int old, new, prev;
+
+	dev->lock.pid = 0;
+	do {
+		old  = *lock;
+		new  = context | _DRM_LOCK_HELD;
+		prev = cmpxchg(lock, old, new);
+	} while (prev != old);
+	return 1;
+}
+
+int DRM(lock_free)(drm_device_t *dev,
+		   __volatile__ unsigned int *lock, unsigned int context)
+{
+	unsigned int old, new, prev;
+	pid_t        pid = dev->lock.pid;
+
+	dev->lock.pid = 0;
+	do {
+		old  = *lock;
+		new  = 0;
+		prev = cmpxchg(lock, old, new);
+	} while (prev != old);
+	if (_DRM_LOCK_IS_HELD(old) && _DRM_LOCKING_CONTEXT(old) != context) {
+		DRM_ERROR("%d freed heavyweight lock held by %d (pid %d)\n",
+			  context,
+			  _DRM_LOCKING_CONTEXT(old),
+			  pid);
+		return 1;
+	}
+	wake_up_interruptible(&dev->lock.lock_queue);
+	return 0;
+}
+
+static int DRM(flush_queue)(drm_device_t *dev, int context)
+{
+	DECLARE_WAITQUEUE(entry, current);
+	int		  ret	= 0;
+	drm_queue_t	  *q	= dev->queuelist[context];
+
+	DRM_DEBUG("\n");
+
+	atomic_inc(&q->use_count);
+	if (atomic_read(&q->use_count) > 1) {
+		atomic_inc(&q->block_write);
+		add_wait_queue(&q->flush_queue, &entry);
+		atomic_inc(&q->block_count);
+		for (;;) {
+			current->state = TASK_INTERRUPTIBLE;
+			if (!DRM_BUFCOUNT(&q->waitlist)) break;
+			schedule();
+			if (signal_pending(current)) {
+				ret = -EINTR; /* Can't restart */
+				break;
+			}
+		}
+		atomic_dec(&q->block_count);
+		current->state = TASK_RUNNING;
+		remove_wait_queue(&q->flush_queue, &entry);
+	}
+	atomic_dec(&q->use_count);
+
+				/* NOTE: block_write is still incremented!
+				   Use drm_flush_unlock_queue to decrement. */
+	return ret;
+}
+
+static int DRM(flush_unblock_queue)(drm_device_t *dev, int context)
+{
+	drm_queue_t	  *q	= dev->queuelist[context];
+
+	DRM_DEBUG("\n");
+
+	atomic_inc(&q->use_count);
+	if (atomic_read(&q->use_count) > 1) {
+		if (atomic_read(&q->block_write)) {
+			atomic_dec(&q->block_write);
+			wake_up_interruptible(&q->write_queue);
+		}
+	}
+	atomic_dec(&q->use_count);
+	return 0;
+}
+
+int DRM(flush_block_and_flush)(drm_device_t *dev, int context,
+			       drm_lock_flags_t flags)
+{
+	int ret = 0;
+	int i;
+
+	DRM_DEBUG("\n");
+
+	if (flags & _DRM_LOCK_FLUSH) {
+		ret = DRM(flush_queue)(dev, DRM_KERNEL_CONTEXT);
+		if (!ret) ret = DRM(flush_queue)(dev, context);
+	}
+	if (flags & _DRM_LOCK_FLUSH_ALL) {
+		for (i = 0; !ret && i < dev->queue_count; i++) {
+			ret = DRM(flush_queue)(dev, i);
+		}
+	}
+	return ret;
+}
+
+int DRM(flush_unblock)(drm_device_t *dev, int context, drm_lock_flags_t flags)
+{
+	int ret = 0;
+	int i;
+
+	DRM_DEBUG("\n");
+
+	if (flags & _DRM_LOCK_FLUSH) {
+		ret = DRM(flush_unblock_queue)(dev, DRM_KERNEL_CONTEXT);
+		if (!ret) ret = DRM(flush_unblock_queue)(dev, context);
+	}
+	if (flags & _DRM_LOCK_FLUSH_ALL) {
+		for (i = 0; !ret && i < dev->queue_count; i++) {
+			ret = DRM(flush_unblock_queue)(dev, i);
+		}
+	}
+
+	return ret;
+}
+
+int DRM(finish)(struct inode *inode, struct file *filp, unsigned int cmd,
+		unsigned long arg)
+{
+	drm_file_t	  *priv	  = filp->private_data;
+	drm_device_t	  *dev	  = priv->dev;
+	int		  ret	  = 0;
+	drm_lock_t	  lock;
+
+	DRM_DEBUG("\n");
+
+	if (copy_from_user(&lock, (drm_lock_t *)arg, sizeof(lock)))
+		return -EFAULT;
+	ret = DRM(flush_block_and_flush)(dev, lock.context, lock.flags);
+	DRM(flush_unblock)(dev, lock.context, lock.flags);
+	return ret;
+}
+
+/* If we get here, it means that the process has called DRM_IOCTL_LOCK
+   without calling DRM_IOCTL_UNLOCK.
+
+   If the lock is not held, then let the signal proceed as usual.
+
+   If the lock is held, then set the contended flag and keep the signal
+   blocked.
+
+
+   Return 1 if the signal should be delivered normally.
+   Return 0 if the signal should be blocked.  */
+
+int DRM(notifier)(void *priv)
+{
+	drm_sigdata_t *s = (drm_sigdata_t *)priv;
+	unsigned int  old, new, prev;
+
+
+				/* Allow signal delivery if lock isn't held */
+	if (!s->lock || !_DRM_LOCK_IS_HELD(s->lock->lock)
+	    || _DRM_LOCKING_CONTEXT(s->lock->lock) != s->context) return 1;
+
+				/* Otherwise, set flag to force call to
+                                   drmUnlock */
+	do {
+		old  = s->lock->lock;
+		new  = old | _DRM_LOCK_CONT;
+		prev = cmpxchg(&s->lock->lock, old, new);
+	} while (prev != old);
+	return 0;
+}
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/drm_memory.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/drm_memory.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/drm_memory.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/drm_memory.h	2003-07-30 11:18:33.000000000 +0200
@@ -0,0 +1,467 @@
+/* drm_memory.h -- Memory management wrappers for DRM -*- linux-c -*-
+ * Created: Thu Feb  4 14:00:34 1999 by faith@valinux.com
+ *
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Rickard E. (Rik) Faith <faith@valinux.com>
+ *    Gareth Hughes <gareth@valinux.com>
+ */
+
+#define __NO_VERSION__
+#include <linux/config.h>
+#include "drmP.h"
+#include <linux/wrapper.h>
+
+typedef struct drm_mem_stats {
+	const char	  *name;
+	int		  succeed_count;
+	int		  free_count;
+	int		  fail_count;
+	unsigned long	  bytes_allocated;
+	unsigned long	  bytes_freed;
+} drm_mem_stats_t;
+
+static spinlock_t	  DRM(mem_lock)	     = SPIN_LOCK_UNLOCKED;
+static unsigned long	  DRM(ram_available) = 0; /* In pages */
+static unsigned long	  DRM(ram_used)      = 0;
+static drm_mem_stats_t	  DRM(mem_stats)[]   = {
+	[DRM_MEM_DMA]	    = { "dmabufs"  },
+	[DRM_MEM_SAREA]	    = { "sareas"   },
+	[DRM_MEM_DRIVER]    = { "driver"   },
+	[DRM_MEM_MAGIC]	    = { "magic"	   },
+	[DRM_MEM_IOCTLS]    = { "ioctltab" },
+	[DRM_MEM_MAPS]	    = { "maplist"  },
+	[DRM_MEM_VMAS]	    = { "vmalist"  },
+	[DRM_MEM_BUFS]	    = { "buflist"  },
+	[DRM_MEM_SEGS]	    = { "seglist"  },
+	[DRM_MEM_PAGES]	    = { "pagelist" },
+	[DRM_MEM_FILES]	    = { "files"	   },
+	[DRM_MEM_QUEUES]    = { "queues"   },
+	[DRM_MEM_CMDS]	    = { "commands" },
+	[DRM_MEM_MAPPINGS]  = { "mappings" },
+	[DRM_MEM_BUFLISTS]  = { "buflists" },
+	[DRM_MEM_AGPLISTS]  = { "agplist"  },
+	[DRM_MEM_SGLISTS]   = { "sglist"   },
+	[DRM_MEM_TOTALAGP]  = { "totalagp" },
+	[DRM_MEM_BOUNDAGP]  = { "boundagp" },
+	[DRM_MEM_CTXBITMAP] = { "ctxbitmap"},
+	[DRM_MEM_STUB]      = { "stub"     },
+	{ NULL, 0, }		/* Last entry must be null */
+};
+
+void DRM(mem_init)(void)
+{
+	drm_mem_stats_t *mem;
+	struct sysinfo	si;
+
+	for (mem = DRM(mem_stats); mem->name; ++mem) {
+		mem->succeed_count   = 0;
+		mem->free_count	     = 0;
+		mem->fail_count	     = 0;
+		mem->bytes_allocated = 0;
+		mem->bytes_freed     = 0;
+	}
+
+	si_meminfo(&si);
+	DRM(ram_available) = si.totalram;
+	DRM(ram_used)	   = 0;
+}
+
+/* drm_mem_info is called whenever a process reads /dev/drm/mem. */
+
+static int DRM(_mem_info)(char *buf, char **start, off_t offset,
+			  int request, int *eof, void *data)
+{
+	drm_mem_stats_t *pt;
+	int             len = 0;
+
+	if (offset > DRM_PROC_LIMIT) {
+		*eof = 1;
+		return 0;
+	}
+
+	*eof   = 0;
+	*start = &buf[offset];
+
+	DRM_PROC_PRINT("		  total counts			"
+		       " |    outstanding  \n");
+	DRM_PROC_PRINT("type	   alloc freed fail	bytes	   freed"
+		       " | allocs      bytes\n\n");
+	DRM_PROC_PRINT("%-9.9s %5d %5d %4d %10lu kB         |\n",
+		       "system", 0, 0, 0,
+		       DRM(ram_available) << (PAGE_SHIFT - 10));
+	DRM_PROC_PRINT("%-9.9s %5d %5d %4d %10lu kB         |\n",
+		       "locked", 0, 0, 0, DRM(ram_used) >> 10);
+	DRM_PROC_PRINT("\n");
+	for (pt = DRM(mem_stats); pt->name; pt++) {
+		DRM_PROC_PRINT("%-9.9s %5d %5d %4d %10lu %10lu | %6d %10ld\n",
+			       pt->name,
+			       pt->succeed_count,
+			       pt->free_count,
+			       pt->fail_count,
+			       pt->bytes_allocated,
+			       pt->bytes_freed,
+			       pt->succeed_count - pt->free_count,
+			       (long)pt->bytes_allocated
+			       - (long)pt->bytes_freed);
+	}
+
+	if (len > request + offset) return request;
+	*eof = 1;
+	return len - offset;
+}
+
+int DRM(mem_info)(char *buf, char **start, off_t offset,
+		  int len, int *eof, void *data)
+{
+	int ret;
+
+	spin_lock(&DRM(mem_lock));
+	ret = DRM(_mem_info)(buf, start, offset, len, eof, data);
+	spin_unlock(&DRM(mem_lock));
+	return ret;
+}
+
+void *DRM(alloc)(size_t size, int area)
+{
+	void *pt;
+
+	if (!size) {
+		DRM_MEM_ERROR(area, "Allocating 0 bytes\n");
+		return NULL;
+	}
+
+	if (!(pt = kmalloc(size, GFP_KERNEL))) {
+		spin_lock(&DRM(mem_lock));
+		++DRM(mem_stats)[area].fail_count;
+		spin_unlock(&DRM(mem_lock));
+		return NULL;
+	}
+	spin_lock(&DRM(mem_lock));
+	++DRM(mem_stats)[area].succeed_count;
+	DRM(mem_stats)[area].bytes_allocated += size;
+	spin_unlock(&DRM(mem_lock));
+	return pt;
+}
+
+void *DRM(realloc)(void *oldpt, size_t oldsize, size_t size, int area)
+{
+	void *pt;
+
+	if (!(pt = DRM(alloc)(size, area))) return NULL;
+	if (oldpt && oldsize) {
+		memcpy(pt, oldpt, oldsize);
+		DRM(free)(oldpt, oldsize, area);
+	}
+	return pt;
+}
+
+char *DRM(strdup)(const char *s, int area)
+{
+	char *pt;
+	int	 length = s ? strlen(s) : 0;
+
+	if (!(pt = DRM(alloc)(length+1, area))) return NULL;
+	strcpy(pt, s);
+	return pt;
+}
+
+void DRM(strfree)(const char *s, int area)
+{
+	unsigned int size;
+
+	if (!s) return;
+
+	size = 1 + (s ? strlen(s) : 0);
+	DRM(free)((void *)s, size, area);
+}
+
+void DRM(free)(void *pt, size_t size, int area)
+{
+	int alloc_count;
+	int free_count;
+
+	if (!pt) DRM_MEM_ERROR(area, "Attempt to free NULL pointer\n");
+	else	 kfree(pt);
+	spin_lock(&DRM(mem_lock));
+	DRM(mem_stats)[area].bytes_freed += size;
+	free_count  = ++DRM(mem_stats)[area].free_count;
+	alloc_count =	DRM(mem_stats)[area].succeed_count;
+	spin_unlock(&DRM(mem_lock));
+	if (free_count > alloc_count) {
+		DRM_MEM_ERROR(area, "Excess frees: %d frees, %d allocs\n",
+			      free_count, alloc_count);
+	}
+}
+
+unsigned long DRM(alloc_pages)(int order, int area)
+{
+	unsigned long address;
+	unsigned long bytes	  = PAGE_SIZE << order;
+	unsigned long addr;
+	unsigned int  sz;
+
+	spin_lock(&DRM(mem_lock));
+	if ((DRM(ram_used) >> PAGE_SHIFT)
+	    > (DRM_RAM_PERCENT * DRM(ram_available)) / 100) {
+		spin_unlock(&DRM(mem_lock));
+		return 0;
+	}
+	spin_unlock(&DRM(mem_lock));
+
+	address = __get_free_pages(GFP_KERNEL, order);
+	if (!address) {
+		spin_lock(&DRM(mem_lock));
+		++DRM(mem_stats)[area].fail_count;
+		spin_unlock(&DRM(mem_lock));
+		return 0;
+	}
+	spin_lock(&DRM(mem_lock));
+	++DRM(mem_stats)[area].succeed_count;
+	DRM(mem_stats)[area].bytes_allocated += bytes;
+	DRM(ram_used)		             += bytes;
+	spin_unlock(&DRM(mem_lock));
+
+
+				/* Zero outside the lock */
+	memset((void *)address, 0, bytes);
+
+				/* Reserve */
+	for (addr = address, sz = bytes;
+	     sz > 0;
+	     addr += PAGE_SIZE, sz -= PAGE_SIZE) {
+		mem_map_reserve(virt_to_page(addr));
+	}
+
+	return address;
+}
+
+void DRM(free_pages)(unsigned long address, int order, int area)
+{
+	unsigned long bytes = PAGE_SIZE << order;
+	int		  alloc_count;
+	int		  free_count;
+	unsigned long addr;
+	unsigned int  sz;
+
+	if (!address) {
+		DRM_MEM_ERROR(area, "Attempt to free address 0\n");
+	} else {
+				/* Unreserve */
+		for (addr = address, sz = bytes;
+		     sz > 0;
+		     addr += PAGE_SIZE, sz -= PAGE_SIZE) {
+			mem_map_unreserve(virt_to_page(addr));
+		}
+		free_pages(address, order);
+	}
+
+	spin_lock(&DRM(mem_lock));
+	free_count  = ++DRM(mem_stats)[area].free_count;
+	alloc_count =	DRM(mem_stats)[area].succeed_count;
+	DRM(mem_stats)[area].bytes_freed += bytes;
+	DRM(ram_used)			 -= bytes;
+	spin_unlock(&DRM(mem_lock));
+	if (free_count > alloc_count) {
+		DRM_MEM_ERROR(area,
+			      "Excess frees: %d frees, %d allocs\n",
+			      free_count, alloc_count);
+	}
+}
+
+void *DRM(ioremap)(unsigned long offset, unsigned long size)
+{
+	void *pt;
+
+	if (!size) {
+		DRM_MEM_ERROR(DRM_MEM_MAPPINGS,
+			      "Mapping 0 bytes at 0x%08lx\n", offset);
+		return NULL;
+	}
+
+	if (!(pt = ioremap(offset, size))) {
+		spin_lock(&DRM(mem_lock));
+		++DRM(mem_stats)[DRM_MEM_MAPPINGS].fail_count;
+		spin_unlock(&DRM(mem_lock));
+		return NULL;
+	}
+	spin_lock(&DRM(mem_lock));
+	++DRM(mem_stats)[DRM_MEM_MAPPINGS].succeed_count;
+	DRM(mem_stats)[DRM_MEM_MAPPINGS].bytes_allocated += size;
+	spin_unlock(&DRM(mem_lock));
+	return pt;
+}
+
+void *DRM(ioremap_nocache)(unsigned long offset, unsigned long size)
+{
+	void *pt;
+
+	if (!size) {
+		DRM_MEM_ERROR(DRM_MEM_MAPPINGS,
+			      "Mapping 0 bytes at 0x%08lx\n", offset);
+		return NULL;
+	}
+
+	if (!(pt = ioremap_nocache(offset, size))) {
+		spin_lock(&DRM(mem_lock));
+		++DRM(mem_stats)[DRM_MEM_MAPPINGS].fail_count;
+		spin_unlock(&DRM(mem_lock));
+		return NULL;
+	}
+	spin_lock(&DRM(mem_lock));
+	++DRM(mem_stats)[DRM_MEM_MAPPINGS].succeed_count;
+	DRM(mem_stats)[DRM_MEM_MAPPINGS].bytes_allocated += size;
+	spin_unlock(&DRM(mem_lock));
+	return pt;
+}
+
+void DRM(ioremapfree)(void *pt, unsigned long size)
+{
+	int alloc_count;
+	int free_count;
+
+	if (!pt)
+		DRM_MEM_ERROR(DRM_MEM_MAPPINGS,
+			      "Attempt to free NULL pointer\n");
+	else
+		iounmap(pt);
+
+	spin_lock(&DRM(mem_lock));
+	DRM(mem_stats)[DRM_MEM_MAPPINGS].bytes_freed += size;
+	free_count  = ++DRM(mem_stats)[DRM_MEM_MAPPINGS].free_count;
+	alloc_count =	DRM(mem_stats)[DRM_MEM_MAPPINGS].succeed_count;
+	spin_unlock(&DRM(mem_lock));
+	if (free_count > alloc_count) {
+		DRM_MEM_ERROR(DRM_MEM_MAPPINGS,
+			      "Excess frees: %d frees, %d allocs\n",
+			      free_count, alloc_count);
+	}
+}
+
+#if __REALLY_HAVE_AGP
+
+agp_memory *DRM(alloc_agp)(int pages, u32 type)
+{
+	agp_memory *handle;
+
+	if (!pages) {
+		DRM_MEM_ERROR(DRM_MEM_TOTALAGP, "Allocating 0 pages\n");
+		return NULL;
+	}
+
+	if ((handle = DRM(agp_allocate_memory)(pages, type))) {
+		spin_lock(&DRM(mem_lock));
+		++DRM(mem_stats)[DRM_MEM_TOTALAGP].succeed_count;
+		DRM(mem_stats)[DRM_MEM_TOTALAGP].bytes_allocated
+			+= pages << PAGE_SHIFT;
+		spin_unlock(&DRM(mem_lock));
+		return handle;
+	}
+	spin_lock(&DRM(mem_lock));
+	++DRM(mem_stats)[DRM_MEM_TOTALAGP].fail_count;
+	spin_unlock(&DRM(mem_lock));
+	return NULL;
+}
+
+int DRM(free_agp)(agp_memory *handle, int pages)
+{
+	int           alloc_count;
+	int           free_count;
+	int           retval = -EINVAL;
+
+	if (!handle) {
+		DRM_MEM_ERROR(DRM_MEM_TOTALAGP,
+			      "Attempt to free NULL AGP handle\n");
+		return retval;;
+	}
+
+	if (DRM(agp_free_memory)(handle)) {
+		spin_lock(&DRM(mem_lock));
+		free_count  = ++DRM(mem_stats)[DRM_MEM_TOTALAGP].free_count;
+		alloc_count =   DRM(mem_stats)[DRM_MEM_TOTALAGP].succeed_count;
+		DRM(mem_stats)[DRM_MEM_TOTALAGP].bytes_freed
+			+= pages << PAGE_SHIFT;
+		spin_unlock(&DRM(mem_lock));
+		if (free_count > alloc_count) {
+			DRM_MEM_ERROR(DRM_MEM_TOTALAGP,
+				      "Excess frees: %d frees, %d allocs\n",
+				      free_count, alloc_count);
+		}
+		return 0;
+	}
+	return retval;
+}
+
+int DRM(bind_agp)(agp_memory *handle, unsigned int start)
+{
+	int retcode = -EINVAL;
+
+	if (!handle) {
+		DRM_MEM_ERROR(DRM_MEM_BOUNDAGP,
+			      "Attempt to bind NULL AGP handle\n");
+		return retcode;
+	}
+
+	if (!(retcode = DRM(agp_bind_memory)(handle, start))) {
+		spin_lock(&DRM(mem_lock));
+		++DRM(mem_stats)[DRM_MEM_BOUNDAGP].succeed_count;
+		DRM(mem_stats)[DRM_MEM_BOUNDAGP].bytes_allocated
+			+= handle->page_count << PAGE_SHIFT;
+		spin_unlock(&DRM(mem_lock));
+		return retcode;
+	}
+	spin_lock(&DRM(mem_lock));
+	++DRM(mem_stats)[DRM_MEM_BOUNDAGP].fail_count;
+	spin_unlock(&DRM(mem_lock));
+	return retcode;
+}
+
+int DRM(unbind_agp)(agp_memory *handle)
+{
+	int alloc_count;
+	int free_count;
+	int retcode = -EINVAL;
+
+	if (!handle) {
+		DRM_MEM_ERROR(DRM_MEM_BOUNDAGP,
+			      "Attempt to unbind NULL AGP handle\n");
+		return retcode;
+	}
+
+	if ((retcode = DRM(agp_unbind_memory)(handle))) return retcode;
+	spin_lock(&DRM(mem_lock));
+	free_count  = ++DRM(mem_stats)[DRM_MEM_BOUNDAGP].free_count;
+	alloc_count = DRM(mem_stats)[DRM_MEM_BOUNDAGP].succeed_count;
+	DRM(mem_stats)[DRM_MEM_BOUNDAGP].bytes_freed
+		+= handle->page_count << PAGE_SHIFT;
+	spin_unlock(&DRM(mem_lock));
+	if (free_count > alloc_count) {
+		DRM_MEM_ERROR(DRM_MEM_BOUNDAGP,
+			      "Excess frees: %d frees, %d allocs\n",
+			      free_count, alloc_count);
+	}
+	return retcode;
+}
+#endif
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/drm_os_linux.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/drm_os_linux.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/drm_os_linux.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/drm_os_linux.h	2003-07-30 11:18:33.000000000 +0200
@@ -0,0 +1,90 @@
+#define __NO_VERSION__
+
+#include <linux/interrupt.h>	/* For task queue support */
+#include <linux/delay.h>
+
+#define DRM_IOCTL_ARGS			struct inode *inode, struct file *filp, unsigned int cmd, unsigned long data
+#define DRM_ERR(d)			-(d)
+#define DRM_CURRENTPID			current->pid
+#define DRM_UDELAY(d)			udelay(d)
+#define DRM_READ8(addr)			readb(addr)
+#define DRM_READ32(addr)		readl(addr)
+#define DRM_WRITE8(addr, val)		writeb(val, addr)
+#define DRM_WRITE32(addr, val)		writel(val, addr)
+#define DRM_READMEMORYBARRIER()		mb()
+#define DRM_WRITEMEMORYBARRIER()	wmb()
+#define DRM_DEVICE	drm_file_t	*priv	= filp->private_data; \
+			drm_device_t	*dev	= priv->dev
+
+#define DRM_IRQ_ARGS	        int irq, void *arg, struct pt_regs *regs
+#define DRM_TASKQUEUE_ARGS	void *arg
+
+/* For data going from/to the kernel through the ioctl argument */
+#define DRM_COPY_FROM_USER_IOCTL(arg1, arg2, arg3)	\
+	if ( copy_from_user(&arg1, arg2, arg3) )	\
+		return -EFAULT
+#define DRM_COPY_TO_USER_IOCTL(arg1, arg2, arg3)	\
+	if ( copy_to_user(arg1, &arg2, arg3) )		\
+		return -EFAULT
+/* Other copying of data from/to kernel space */
+#define DRM_COPY_FROM_USER(arg1, arg2, arg3)		\
+	copy_from_user(arg1, arg2, arg3)
+#define DRM_COPY_TO_USER(arg1, arg2, arg3)		\
+	copy_to_user(arg1, arg2, arg3)
+/* Macros for copyfrom user, but checking readability only once */
+#define DRM_VERIFYAREA_READ( uaddr, size ) 		\
+	verify_area( VERIFY_READ, uaddr, size )
+#define DRM_COPY_FROM_USER_UNCHECKED(arg1, arg2, arg3) 	\
+	__copy_from_user(arg1, arg2, arg3)
+#define DRM_GET_USER_UNCHECKED(val, uaddr)		\
+	__get_user(val, uaddr)
+
+
+/* malloc/free without the overhead of DRM(alloc) */
+#define DRM_MALLOC(x) kmalloc(x, GFP_KERNEL)
+#define DRM_FREE(x) kfree(x)
+
+#define DRM_GETSAREA()							 \
+do { 									 \
+	struct list_head *list;						 \
+	list_for_each( list, &dev->maplist->head ) {			 \
+		drm_map_list_t *entry = (drm_map_list_t *)list;		 \
+		if ( entry->map &&					 \
+		     entry->map->type == _DRM_SHM &&			 \
+		     (entry->map->flags & _DRM_CONTAINS_LOCK) ) {	 \
+			dev_priv->sarea = entry->map;			 \
+ 			break;						 \
+ 		}							 \
+ 	}								 \
+} while (0)
+
+#define DRM_HZ HZ
+
+#define DRM_WAIT_ON( ret, queue, timeout, condition )	\
+do {							\
+	DECLARE_WAITQUEUE(entry, current);		\
+	unsigned long end = jiffies + (timeout);	\
+	add_wait_queue(&(queue), &entry);		\
+							\
+	for (;;) {					\
+		current->state = TASK_INTERRUPTIBLE;	\
+		if (condition) 				\
+			break;				\
+		if((signed)(end - jiffies) <= 0) {	\
+			ret = -EBUSY;			\
+			break;				\
+		}					\
+		schedule_timeout((HZ/100 > 1) ? HZ/100 : 1);	\
+		if (signal_pending(current)) {		\
+			ret = -EINTR;			\
+			break;				\
+		}					\
+	}						\
+	current->state = TASK_RUNNING;			\
+	remove_wait_queue(&(queue), &entry);		\
+} while (0)
+
+
+#define DRM_WAKEUP( queue ) wake_up_interruptible( queue )
+#define DRM_INIT_WAITQUEUE( queue ) init_waitqueue_head( queue )
+ 
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/drm_proc.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/drm_proc.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/drm_proc.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/drm_proc.h	2003-07-30 11:18:33.000000000 +0200
@@ -0,0 +1,633 @@
+/* drm_proc.h -- /proc support for DRM -*- linux-c -*-
+ * Created: Mon Jan 11 09:48:47 1999 by faith@valinux.com
+ *
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Rickard E. (Rik) Faith <faith@valinux.com>
+ *    Gareth Hughes <gareth@valinux.com>
+ *
+ * Acknowledgements:
+ *    Matthew J Sottek <matthew.j.sottek@intel.com> sent in a patch to fix
+ *    the problem with the proc files not outputting all their information.
+ */
+
+#define __NO_VERSION__
+#include "drmP.h"
+
+static int	   DRM(name_info)(char *buf, char **start, off_t offset,
+				  int request, int *eof, void *data);
+static int	   DRM(vm_info)(char *buf, char **start, off_t offset,
+				int request, int *eof, void *data);
+static int	   DRM(clients_info)(char *buf, char **start, off_t offset,
+				     int request, int *eof, void *data);
+static int	   DRM(queues_info)(char *buf, char **start, off_t offset,
+				    int request, int *eof, void *data);
+static int	   DRM(bufs_info)(char *buf, char **start, off_t offset,
+				  int request, int *eof, void *data);
+#if DRM_DEBUG_CODE
+static int	   DRM(vma_info)(char *buf, char **start, off_t offset,
+				 int request, int *eof, void *data);
+#endif
+#if __HAVE_DMA_HISTOGRAM
+static int	   DRM(histo_info)(char *buf, char **start, off_t offset,
+				   int request, int *eof, void *data);
+#endif
+
+struct drm_proc_list {
+	const char *name;
+	int	   (*f)(char *, char **, off_t, int, int *, void *);
+} DRM(proc_list)[] = {
+	{ "name",    DRM(name_info)    },
+	{ "mem",     DRM(mem_info)     },
+	{ "vm",	     DRM(vm_info)      },
+	{ "clients", DRM(clients_info) },
+	{ "queues",  DRM(queues_info)  },
+	{ "bufs",    DRM(bufs_info)    },
+#if DRM_DEBUG_CODE
+	{ "vma",     DRM(vma_info)     },
+#endif
+#if __HAVE_DMA_HISTOGRAM
+	{ "histo",   DRM(histo_info)   },
+#endif
+};
+#define DRM_PROC_ENTRIES (sizeof(DRM(proc_list))/sizeof(DRM(proc_list)[0]))
+
+struct proc_dir_entry *DRM(proc_init)(drm_device_t *dev, int minor,
+				      struct proc_dir_entry *root,
+				      struct proc_dir_entry **dev_root)
+{
+	struct proc_dir_entry *ent;
+	int		      i, j;
+	char                  name[64];
+
+	if (!minor) root = create_proc_entry("dri", S_IFDIR, NULL);
+	if (!root) {
+		DRM_ERROR("Cannot create /proc/dri\n");
+		return NULL;
+	}
+
+	sprintf(name, "%d", minor);
+	*dev_root = create_proc_entry(name, S_IFDIR, root);
+	if (!*dev_root) {
+		DRM_ERROR("Cannot create /proc/%s\n", name);
+		return NULL;
+	}
+
+	for (i = 0; i < DRM_PROC_ENTRIES; i++) {
+		ent = create_proc_entry(DRM(proc_list)[i].name,
+					S_IFREG|S_IRUGO, *dev_root);
+		if (!ent) {
+			DRM_ERROR("Cannot create /proc/dri/%s/%s\n",
+				  name, DRM(proc_list)[i].name);
+			for (j = 0; j < i; j++)
+				remove_proc_entry(DRM(proc_list)[i].name,
+						  *dev_root);
+			remove_proc_entry(name, root);
+			if (!minor) remove_proc_entry("dri", NULL);
+			return NULL;
+		}
+		ent->read_proc = DRM(proc_list)[i].f;
+		ent->data      = dev;
+	}
+
+	return root;
+}
+
+
+int DRM(proc_cleanup)(int minor, struct proc_dir_entry *root,
+		      struct proc_dir_entry *dev_root)
+{
+	int  i;
+	char name[64];
+
+	if (!root || !dev_root) return 0;
+
+	for (i = 0; i < DRM_PROC_ENTRIES; i++)
+		remove_proc_entry(DRM(proc_list)[i].name, dev_root);
+	sprintf(name, "%d", minor);
+	remove_proc_entry(name, root);
+	if (!minor) remove_proc_entry("dri", NULL);
+
+	return 0;
+}
+
+static int DRM(name_info)(char *buf, char **start, off_t offset, int request,
+			  int *eof, void *data)
+{
+	drm_device_t *dev = (drm_device_t *)data;
+	int          len  = 0;
+
+	if (offset > DRM_PROC_LIMIT) {
+		*eof = 1;
+		return 0;
+	}
+
+	*start = &buf[offset];
+	*eof   = 0;
+
+	if (dev->unique) {
+		DRM_PROC_PRINT("%s 0x%lx %s\n",
+			       dev->name, (long)dev->device, dev->unique);
+	} else {
+		DRM_PROC_PRINT("%s 0x%lx\n", dev->name, (long)dev->device);
+	}
+
+	if (len > request + offset) return request;
+	*eof = 1;
+	return len - offset;
+}
+
+static int DRM(_vm_info)(char *buf, char **start, off_t offset, int request,
+			 int *eof, void *data)
+{
+	drm_device_t *dev = (drm_device_t *)data;
+	int          len  = 0;
+	drm_map_t    *map;
+	drm_map_list_t *r_list;
+	struct list_head *list;
+
+				/* Hardcoded from _DRM_FRAME_BUFFER,
+                                   _DRM_REGISTERS, _DRM_SHM, and
+                                   _DRM_AGP. */
+	const char   *types[] = { "FB", "REG", "SHM", "AGP" };
+	const char   *type;
+	int	     i;
+
+	if (offset > DRM_PROC_LIMIT) {
+		*eof = 1;
+		return 0;
+	}
+
+	*start = &buf[offset];
+	*eof   = 0;
+
+	DRM_PROC_PRINT("slot	 offset	      size type flags	 "
+		       "address mtrr\n\n");
+	i = 0;
+	if (dev->maplist != NULL) list_for_each(list, &dev->maplist->head) {
+		r_list = (drm_map_list_t *)list;
+		map = r_list->map;
+		if(!map) continue;
+		if (map->type < 0 || map->type > 3) type = "??";
+		else				    type = types[map->type];
+		DRM_PROC_PRINT("%4d 0x%08lx 0x%08lx %4.4s  0x%02x 0x%08lx ",
+			       i,
+			       map->offset,
+			       map->size,
+			       type,
+			       map->flags,
+			       (unsigned long)map->handle);
+		if (map->mtrr < 0) {
+			DRM_PROC_PRINT("none\n");
+		} else {
+			DRM_PROC_PRINT("%4d\n", map->mtrr);
+		}
+		i++;
+	}
+
+	if (len > request + offset) return request;
+	*eof = 1;
+	return len - offset;
+}
+
+static int DRM(vm_info)(char *buf, char **start, off_t offset, int request,
+			int *eof, void *data)
+{
+	drm_device_t *dev = (drm_device_t *)data;
+	int	     ret;
+
+	down(&dev->struct_sem);
+	ret = DRM(_vm_info)(buf, start, offset, request, eof, data);
+	up(&dev->struct_sem);
+	return ret;
+}
+
+
+static int DRM(_queues_info)(char *buf, char **start, off_t offset,
+			     int request, int *eof, void *data)
+{
+	drm_device_t *dev = (drm_device_t *)data;
+	int          len  = 0;
+	int	     i;
+	drm_queue_t  *q;
+
+	if (offset > DRM_PROC_LIMIT) {
+		*eof = 1;
+		return 0;
+	}
+
+	*start = &buf[offset];
+	*eof   = 0;
+
+	DRM_PROC_PRINT("  ctx/flags   use   fin"
+		       "   blk/rw/rwf  wait    flushed	   queued"
+		       "      locks\n\n");
+	for (i = 0; i < dev->queue_count; i++) {
+		q = dev->queuelist[i];
+		atomic_inc(&q->use_count);
+		DRM_PROC_PRINT_RET(atomic_dec(&q->use_count),
+				   "%5d/0x%03x %5d %5d"
+				   " %5d/%c%c/%c%c%c %5Zd\n",
+				   i,
+				   q->flags,
+				   atomic_read(&q->use_count),
+				   atomic_read(&q->finalization),
+				   atomic_read(&q->block_count),
+				   atomic_read(&q->block_read) ? 'r' : '-',
+				   atomic_read(&q->block_write) ? 'w' : '-',
+				   waitqueue_active(&q->read_queue) ? 'r':'-',
+				   waitqueue_active(&q->write_queue) ? 'w':'-',
+				   waitqueue_active(&q->flush_queue) ? 'f':'-',
+				   DRM_BUFCOUNT(&q->waitlist));
+		atomic_dec(&q->use_count);
+	}
+
+	if (len > request + offset) return request;
+	*eof = 1;
+	return len - offset;
+}
+
+static int DRM(queues_info)(char *buf, char **start, off_t offset, int request,
+			    int *eof, void *data)
+{
+	drm_device_t *dev = (drm_device_t *)data;
+	int	     ret;
+
+	down(&dev->struct_sem);
+	ret = DRM(_queues_info)(buf, start, offset, request, eof, data);
+	up(&dev->struct_sem);
+	return ret;
+}
+
+/* drm_bufs_info is called whenever a process reads
+   /dev/dri/<dev>/bufs. */
+
+static int DRM(_bufs_info)(char *buf, char **start, off_t offset, int request,
+			   int *eof, void *data)
+{
+	drm_device_t	 *dev = (drm_device_t *)data;
+	int              len  = 0;
+	drm_device_dma_t *dma = dev->dma;
+	int		 i;
+
+	if (!dma || offset > DRM_PROC_LIMIT) {
+		*eof = 1;
+		return 0;
+	}
+
+	*start = &buf[offset];
+	*eof   = 0;
+
+	DRM_PROC_PRINT(" o     size count  free	 segs pages    kB\n\n");
+	for (i = 0; i <= DRM_MAX_ORDER; i++) {
+		if (dma->bufs[i].buf_count)
+			DRM_PROC_PRINT("%2d %8d %5d %5d %5d %5d %5ld\n",
+				       i,
+				       dma->bufs[i].buf_size,
+				       dma->bufs[i].buf_count,
+				       atomic_read(&dma->bufs[i]
+						   .freelist.count),
+				       dma->bufs[i].seg_count,
+				       dma->bufs[i].seg_count
+				       *(1 << dma->bufs[i].page_order),
+				       (dma->bufs[i].seg_count
+					* (1 << dma->bufs[i].page_order))
+				       * PAGE_SIZE / 1024);
+	}
+	DRM_PROC_PRINT("\n");
+	for (i = 0; i < dma->buf_count; i++) {
+		if (i && !(i%32)) DRM_PROC_PRINT("\n");
+		DRM_PROC_PRINT(" %d", dma->buflist[i]->list);
+	}
+	DRM_PROC_PRINT("\n");
+
+	if (len > request + offset) return request;
+	*eof = 1;
+	return len - offset;
+}
+
+static int DRM(bufs_info)(char *buf, char **start, off_t offset, int request,
+			  int *eof, void *data)
+{
+	drm_device_t *dev = (drm_device_t *)data;
+	int	     ret;
+
+	down(&dev->struct_sem);
+	ret = DRM(_bufs_info)(buf, start, offset, request, eof, data);
+	up(&dev->struct_sem);
+	return ret;
+}
+
+
+static int DRM(_clients_info)(char *buf, char **start, off_t offset,
+			      int request, int *eof, void *data)
+{
+	drm_device_t *dev = (drm_device_t *)data;
+	int          len  = 0;
+	drm_file_t   *priv;
+
+	if (offset > DRM_PROC_LIMIT) {
+		*eof = 1;
+		return 0;
+	}
+
+	*start = &buf[offset];
+	*eof   = 0;
+
+	DRM_PROC_PRINT("a dev	pid    uid	magic	  ioctls\n\n");
+	for (priv = dev->file_first; priv; priv = priv->next) {
+		DRM_PROC_PRINT("%c %3d %5d %5d %10u %10lu\n",
+			       priv->authenticated ? 'y' : 'n',
+			       priv->minor,
+			       priv->pid,
+			       priv->uid,
+			       priv->magic,
+			       priv->ioctl_count);
+	}
+
+	if (len > request + offset) return request;
+	*eof = 1;
+	return len - offset;
+}
+
+static int DRM(clients_info)(char *buf, char **start, off_t offset,
+			     int request, int *eof, void *data)
+{
+	drm_device_t *dev = (drm_device_t *)data;
+	int	     ret;
+
+	down(&dev->struct_sem);
+	ret = DRM(_clients_info)(buf, start, offset, request, eof, data);
+	up(&dev->struct_sem);
+	return ret;
+}
+
+#if DRM_DEBUG_CODE
+
+#define DRM_VMA_VERBOSE 0
+
+static int DRM(_vma_info)(char *buf, char **start, off_t offset, int request,
+			  int *eof, void *data)
+{
+	drm_device_t	      *dev = (drm_device_t *)data;
+	int                   len  = 0;
+	drm_vma_entry_t	      *pt;
+	struct vm_area_struct *vma;
+#if DRM_VMA_VERBOSE
+	unsigned long	      i;
+	unsigned long	      address;
+	pgd_t		      *pgd;
+	pmd_t		      *pmd;
+	pte_t		      *pte;
+#endif
+#if defined(__i386__)
+	unsigned int	      pgprot;
+#endif
+
+	if (offset > DRM_PROC_LIMIT) {
+		*eof = 1;
+		return 0;
+	}
+
+	*start = &buf[offset];
+	*eof   = 0;
+
+	DRM_PROC_PRINT("vma use count: %d, high_memory = %p, 0x%08lx\n",
+		       atomic_read(&dev->vma_count),
+		       high_memory, virt_to_phys(high_memory));
+	for (pt = dev->vmalist; pt; pt = pt->next) {
+		if (!(vma = pt->vma)) continue;
+		DRM_PROC_PRINT("\n%5d 0x%08lx-0x%08lx %c%c%c%c%c%c 0x%08lx",
+			       pt->pid,
+			       vma->vm_start,
+			       vma->vm_end,
+			       vma->vm_flags & VM_READ	   ? 'r' : '-',
+			       vma->vm_flags & VM_WRITE	   ? 'w' : '-',
+			       vma->vm_flags & VM_EXEC	   ? 'x' : '-',
+			       vma->vm_flags & VM_MAYSHARE ? 's' : 'p',
+			       vma->vm_flags & VM_LOCKED   ? 'l' : '-',
+			       vma->vm_flags & VM_IO	   ? 'i' : '-',
+			       VM_OFFSET(vma));
+
+#if defined(__i386__)
+		pgprot = pgprot_val(vma->vm_page_prot);
+		DRM_PROC_PRINT(" %c%c%c%c%c%c%c%c%c",
+			       pgprot & _PAGE_PRESENT  ? 'p' : '-',
+			       pgprot & _PAGE_RW       ? 'w' : 'r',
+			       pgprot & _PAGE_USER     ? 'u' : 's',
+			       pgprot & _PAGE_PWT      ? 't' : 'b',
+			       pgprot & _PAGE_PCD      ? 'u' : 'c',
+			       pgprot & _PAGE_ACCESSED ? 'a' : '-',
+			       pgprot & _PAGE_DIRTY    ? 'd' : '-',
+			       pgprot & _PAGE_PSE      ? 'm' : 'k',
+			       pgprot & _PAGE_GLOBAL   ? 'g' : 'l' );
+#endif
+		DRM_PROC_PRINT("\n");
+#if 0
+		for (i = vma->vm_start; i < vma->vm_end; i += PAGE_SIZE) {
+			pgd = pgd_offset(vma->vm_mm, i);
+			pmd = pmd_offset(pgd, i);
+			preempt_disable();
+			pte = pte_offset_map(pmd, i);
+			if (pte_present(*pte)) {
+				address = __pa(pte_page(*pte))
+					+ (i & (PAGE_SIZE-1));
+				DRM_PROC_PRINT("      0x%08lx -> 0x%08lx"
+					       " %c%c%c%c%c\n",
+					       i,
+					       address,
+					       pte_read(*pte)  ? 'r' : '-',
+					       pte_write(*pte) ? 'w' : '-',
+					       pte_exec(*pte)  ? 'x' : '-',
+					       pte_dirty(*pte) ? 'd' : '-',
+					       pte_young(*pte) ? 'a' : '-' );
+			} else {
+				DRM_PROC_PRINT("      0x%08lx\n", i);
+			}
+			pte_unmap(pte);
+			preempt_enable();
+		}
+#endif
+	}
+
+	if (len > request + offset) return request;
+	*eof = 1;
+	return len - offset;
+}
+
+static int DRM(vma_info)(char *buf, char **start, off_t offset, int request,
+			 int *eof, void *data)
+{
+	drm_device_t *dev = (drm_device_t *)data;
+	int	     ret;
+
+	down(&dev->struct_sem);
+	ret = DRM(_vma_info)(buf, start, offset, request, eof, data);
+	up(&dev->struct_sem);
+	return ret;
+}
+#endif
+
+
+#if __HAVE_DMA_HISTOGRAM
+static int DRM(_histo_info)(char *buf, char **start, off_t offset, int request,
+			    int *eof, void *data)
+{
+	drm_device_t	 *dev = (drm_device_t *)data;
+	int              len  = 0;
+	drm_device_dma_t *dma = dev->dma;
+	int		 i;
+	unsigned long	 slot_value = DRM_DMA_HISTOGRAM_INITIAL;
+	unsigned long	 prev_value = 0;
+	drm_buf_t	 *buffer;
+
+	if (offset > DRM_PROC_LIMIT) {
+		*eof = 1;
+		return 0;
+	}
+
+	*start = &buf[offset];
+	*eof   = 0;
+
+	DRM_PROC_PRINT("general statistics:\n");
+	DRM_PROC_PRINT("total	 %10u\n", atomic_read(&dev->histo.total));
+	DRM_PROC_PRINT("open	 %10u\n",
+		       atomic_read(&dev->counts[_DRM_STAT_OPENS]));
+	DRM_PROC_PRINT("close	 %10u\n",
+		       atomic_read(&dev->counts[_DRM_STAT_CLOSES]));
+	DRM_PROC_PRINT("ioctl	 %10u\n",
+		       atomic_read(&dev->counts[_DRM_STAT_IOCTLS]));
+
+	DRM_PROC_PRINT("\nlock statistics:\n");
+	DRM_PROC_PRINT("locks	 %10u\n",
+		       atomic_read(&dev->counts[_DRM_STAT_LOCKS]));
+	DRM_PROC_PRINT("unlocks	 %10u\n",
+		       atomic_read(&dev->counts[_DRM_STAT_UNLOCKS]));
+
+	if (dma) {
+#if 0
+		DRM_PROC_PRINT("\ndma statistics:\n");
+		DRM_PROC_PRINT("prio	 %10u\n",
+			       atomic_read(&dma->total_prio));
+		DRM_PROC_PRINT("bytes	 %10u\n",
+			       atomic_read(&dma->total_bytes));
+		DRM_PROC_PRINT("dmas	 %10u\n",
+			       atomic_read(&dma->total_dmas));
+		DRM_PROC_PRINT("missed:\n");
+		DRM_PROC_PRINT("  dma	 %10u\n",
+			       atomic_read(&dma->total_missed_dma));
+		DRM_PROC_PRINT("  lock	 %10u\n",
+			       atomic_read(&dma->total_missed_lock));
+		DRM_PROC_PRINT("  free	 %10u\n",
+			       atomic_read(&dma->total_missed_free));
+		DRM_PROC_PRINT("  sched	 %10u\n",
+			       atomic_read(&dma->total_missed_sched));
+		DRM_PROC_PRINT("tried	 %10u\n",
+			       atomic_read(&dma->total_tried));
+		DRM_PROC_PRINT("hit	 %10u\n",
+			       atomic_read(&dma->total_hit));
+		DRM_PROC_PRINT("lost	 %10u\n",
+			       atomic_read(&dma->total_lost));
+#endif
+
+		buffer = dma->next_buffer;
+		if (buffer) {
+			DRM_PROC_PRINT("next_buffer %7d\n", buffer->idx);
+		} else {
+			DRM_PROC_PRINT("next_buffer    none\n");
+		}
+		buffer = dma->this_buffer;
+		if (buffer) {
+			DRM_PROC_PRINT("this_buffer %7d\n", buffer->idx);
+		} else {
+			DRM_PROC_PRINT("this_buffer    none\n");
+		}
+	}
+
+
+	DRM_PROC_PRINT("\nvalues:\n");
+	if (dev->lock.hw_lock) {
+		DRM_PROC_PRINT("lock	       0x%08x\n",
+			       dev->lock.hw_lock->lock);
+	} else {
+		DRM_PROC_PRINT("lock		     none\n");
+	}
+	DRM_PROC_PRINT("context_flag   0x%08lx\n", dev->context_flag);
+	DRM_PROC_PRINT("interrupt_flag 0x%08lx\n", dev->interrupt_flag);
+	DRM_PROC_PRINT("dma_flag       0x%08lx\n", dev->dma_flag);
+
+	DRM_PROC_PRINT("queue_count    %10d\n",	 dev->queue_count);
+	DRM_PROC_PRINT("last_context   %10d\n",	 dev->last_context);
+	DRM_PROC_PRINT("last_switch    %10lu\n", dev->last_switch);
+	DRM_PROC_PRINT("last_checked   %10d\n",	 dev->last_checked);
+
+
+	DRM_PROC_PRINT("\n		       q2d	  d2c	     c2f"
+		       "	q2c	   q2f	      dma	 sch"
+		       "	ctx	  lacq	     lhld\n\n");
+	for (i = 0; i < DRM_DMA_HISTOGRAM_SLOTS; i++) {
+		DRM_PROC_PRINT("%s %10lu %10u %10u %10u %10u %10u"
+			       " %10u %10u %10u %10u %10u\n",
+			       i == DRM_DMA_HISTOGRAM_SLOTS - 1 ? ">=" : "< ",
+			       i == DRM_DMA_HISTOGRAM_SLOTS - 1
+			       ? prev_value : slot_value ,
+
+			       atomic_read(&dev->histo
+					   .queued_to_dispatched[i]),
+			       atomic_read(&dev->histo
+					   .dispatched_to_completed[i]),
+			       atomic_read(&dev->histo
+					   .completed_to_freed[i]),
+
+			       atomic_read(&dev->histo
+					   .queued_to_completed[i]),
+			       atomic_read(&dev->histo
+					   .queued_to_freed[i]),
+			       atomic_read(&dev->histo.dma[i]),
+			       atomic_read(&dev->histo.schedule[i]),
+			       atomic_read(&dev->histo.ctx[i]),
+			       atomic_read(&dev->histo.lacq[i]),
+			       atomic_read(&dev->histo.lhld[i]));
+		prev_value = slot_value;
+		slot_value = DRM_DMA_HISTOGRAM_NEXT(slot_value);
+	}
+
+	if (len > request + offset) return request;
+	*eof = 1;
+	return len - offset;
+}
+
+static int DRM(histo_info)(char *buf, char **start, off_t offset, int request,
+			   int *eof, void *data)
+{
+	drm_device_t *dev = (drm_device_t *)data;
+	int	     ret;
+
+	down(&dev->struct_sem);
+	ret = DRM(_histo_info)(buf, start, offset, request, eof, data);
+	up(&dev->struct_sem);
+	return ret;
+}
+#endif
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/drm_sarea.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/drm_sarea.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/drm_sarea.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/drm_sarea.h	2003-07-30 11:18:33.000000000 +0200
@@ -0,0 +1,57 @@
+/* sarea.h -- SAREA definitions -*- linux-c -*-
+ *
+ * Copyright 2002 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Michel Dänzer <michel@daenzer.net>
+ */
+
+#ifndef _DRM_SAREA_H_
+#define _DRM_SAREA_H_
+
+#define SAREA_MAX_DRAWABLES 		256
+
+typedef struct _drm_sarea_drawable_t {
+    unsigned int	stamp;
+    unsigned int	flags;
+} drm_sarea_drawable_t;
+
+typedef struct _dri_sarea_frame_t {
+    unsigned int        x;
+    unsigned int        y;
+    unsigned int        width;
+    unsigned int        height;
+    unsigned int        fullscreen;
+} drm_sarea_frame_t;
+
+typedef struct _drm_sarea_t {
+    /* first thing is always the drm locking structure */
+    drm_hw_lock_t		lock;
+		/* NOT_DONE: Use readers/writer lock for drawable_lock */
+    drm_hw_lock_t		drawable_lock;
+    drm_sarea_drawable_t	drawableTable[SAREA_MAX_DRAWABLES];
+    drm_sarea_frame_t		frame;
+    drm_context_t		dummy_context;
+} drm_sarea_t;
+
+#endif	/* _DRM_SAREA_H_ */
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/drm_scatter.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/drm_scatter.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/drm_scatter.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/drm_scatter.h	2003-07-30 11:18:33.000000000 +0200
@@ -0,0 +1,225 @@
+/* drm_scatter.h -- IOCTLs to manage scatter/gather memory -*- linux-c -*-
+ * Created: Mon Dec 18 23:20:54 2000 by gareth@valinux.com
+ *
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *   Gareth Hughes <gareth@valinux.com>
+ */
+
+#define __NO_VERSION__
+#include <linux/config.h>
+#include <linux/vmalloc.h>
+#include "drmP.h"
+
+#define DEBUG_SCATTER 0
+
+void DRM(sg_cleanup)( drm_sg_mem_t *entry )
+{
+	struct page *page;
+	int i;
+
+	for ( i = 0 ; i < entry->pages ; i++ ) {
+		page = entry->pagelist[i];
+		if ( page )
+			ClearPageReserved( page );
+	}
+
+	vfree( entry->virtual );
+
+	DRM(free)( entry->busaddr,
+		   entry->pages * sizeof(*entry->busaddr),
+		   DRM_MEM_PAGES );
+	DRM(free)( entry->pagelist,
+		   entry->pages * sizeof(*entry->pagelist),
+		   DRM_MEM_PAGES );
+	DRM(free)( entry,
+		   sizeof(*entry),
+		   DRM_MEM_SGLISTS );
+}
+
+int DRM(sg_alloc)( struct inode *inode, struct file *filp,
+		   unsigned int cmd, unsigned long arg )
+{
+	drm_file_t *priv = filp->private_data;
+	drm_device_t *dev = priv->dev;
+	drm_scatter_gather_t request;
+	drm_sg_mem_t *entry;
+	unsigned long pages, i, j;
+
+	DRM_DEBUG( "%s\n", __FUNCTION__ );
+
+	if ( dev->sg )
+		return -EINVAL;
+
+	if ( copy_from_user( &request,
+			     (drm_scatter_gather_t *)arg,
+			     sizeof(request) ) )
+		return -EFAULT;
+
+	entry = DRM(alloc)( sizeof(*entry), DRM_MEM_SGLISTS );
+	if ( !entry )
+		return -ENOMEM;
+
+   	memset( entry, 0, sizeof(*entry) );
+
+	pages = (request.size + PAGE_SIZE - 1) / PAGE_SIZE;
+	DRM_DEBUG( "sg size=%ld pages=%ld\n", request.size, pages );
+
+	entry->pages = pages;
+	entry->pagelist = DRM(alloc)( pages * sizeof(*entry->pagelist),
+				     DRM_MEM_PAGES );
+	if ( !entry->pagelist ) {
+		DRM(free)( entry, sizeof(*entry), DRM_MEM_SGLISTS );
+		return -ENOMEM;
+	}
+
+	memset(entry->pagelist, 0, pages * sizeof(*entry->pagelist));
+
+	entry->busaddr = DRM(alloc)( pages * sizeof(*entry->busaddr),
+				     DRM_MEM_PAGES );
+	if ( !entry->busaddr ) {
+		DRM(free)( entry->pagelist,
+			   entry->pages * sizeof(*entry->pagelist),
+			   DRM_MEM_PAGES );
+		DRM(free)( entry,
+			   sizeof(*entry),
+			   DRM_MEM_SGLISTS );
+		return -ENOMEM;
+	}
+	memset( (void *)entry->busaddr, 0, pages * sizeof(*entry->busaddr) );
+
+	entry->virtual = vmalloc_32( pages << PAGE_SHIFT );
+	if ( !entry->virtual ) {
+		DRM(free)( entry->busaddr,
+			   entry->pages * sizeof(*entry->busaddr),
+			   DRM_MEM_PAGES );
+		DRM(free)( entry->pagelist,
+			   entry->pages * sizeof(*entry->pagelist),
+			   DRM_MEM_PAGES );
+		DRM(free)( entry,
+			   sizeof(*entry),
+			   DRM_MEM_SGLISTS );
+		return -ENOMEM;
+	}
+
+	/* This also forces the mapping of COW pages, so our page list
+	 * will be valid.  Please don't remove it...
+	 */
+	memset( entry->virtual, 0, pages << PAGE_SHIFT );
+
+	entry->handle = (unsigned long)entry->virtual;
+
+	DRM_DEBUG( "sg alloc handle  = %08lx\n", entry->handle );
+	DRM_DEBUG( "sg alloc virtual = %p\n", entry->virtual );
+
+	for ( i = entry->handle, j = 0 ; j < pages ; i += PAGE_SIZE, j++ ) {
+		entry->pagelist[j] = vmalloc_to_page((void *)i);
+		if (!entry->pagelist[j])
+			goto failed;
+		SetPageReserved(entry->pagelist[j]);
+	}
+
+	request.handle = entry->handle;
+
+	if ( copy_to_user( (drm_scatter_gather_t *)arg,
+			   &request,
+			   sizeof(request) ) ) {
+		DRM(sg_cleanup)( entry );
+		return -EFAULT;
+	}
+
+	dev->sg = entry;
+
+#if DEBUG_SCATTER
+	/* Verify that each page points to its virtual address, and vice
+	 * versa.
+	 */
+	{
+	int error = 0;
+
+	for ( i = 0 ; i < pages ; i++ ) {
+		unsigned long *tmp;
+
+		tmp = page_address( entry->pagelist[i] );
+		for ( j = 0 ;
+		      j < PAGE_SIZE / sizeof(unsigned long) ;
+		      j++, tmp++ ) {
+			*tmp = 0xcafebabe;
+		}
+		tmp = (unsigned long *)((u8 *)entry->virtual +
+					(PAGE_SIZE * i));
+		for( j = 0 ;
+		     j < PAGE_SIZE / sizeof(unsigned long) ;
+		     j++, tmp++ ) {
+			if ( *tmp != 0xcafebabe && error == 0 ) {
+				error = 1;
+				DRM_ERROR( "Scatter allocation error, "
+					   "pagelist does not match "
+					   "virtual mapping\n" );
+			}
+		}
+		tmp = page_address( entry->pagelist[i] );
+		for(j = 0 ;
+		    j < PAGE_SIZE / sizeof(unsigned long) ;
+		    j++, tmp++) {
+			*tmp = 0;
+		}
+	}
+	if (error == 0)
+		DRM_ERROR( "Scatter allocation matches pagelist\n" );
+	}
+#endif
+
+	return 0;
+
+ failed:
+	DRM(sg_cleanup)( entry );
+	return -ENOMEM;
+}
+
+int DRM(sg_free)( struct inode *inode, struct file *filp,
+		 unsigned int cmd, unsigned long arg )
+{
+	drm_file_t *priv = filp->private_data;
+	drm_device_t *dev = priv->dev;
+	drm_scatter_gather_t request;
+	drm_sg_mem_t *entry;
+
+	if ( copy_from_user( &request,
+			     (drm_scatter_gather_t *)arg,
+			     sizeof(request) ) )
+		return -EFAULT;
+
+	entry = dev->sg;
+	dev->sg = NULL;
+
+	if ( !entry || entry->handle != request.handle )
+		return -EINVAL;
+
+	DRM_DEBUG( "sg free virtual  = %p\n", entry->virtual );
+
+	DRM(sg_cleanup)( entry );
+
+	return 0;
+}
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/drm_stub.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/drm_stub.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/drm_stub.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/drm_stub.h	2003-07-30 11:18:33.000000000 +0200
@@ -0,0 +1,151 @@
+/* drm_stub.h -- -*- linux-c -*-
+ * Created: Fri Jan 19 10:48:35 2001 by faith@acm.org
+ *
+ * Copyright 2001 VA Linux Systems, Inc., Sunnyvale, California.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Rickard E. (Rik) Faith <faith@valinux.com>
+ *
+ */
+
+#define __NO_VERSION__
+#include "drmP.h"
+
+#define DRM_STUB_MAXCARDS 16	/* Enough for one machine */
+
+static struct drm_stub_list {
+	const char             *name;
+	struct file_operations *fops;
+	struct proc_dir_entry  *dev_root;
+} *DRM(stub_list);
+
+static struct proc_dir_entry *DRM(stub_root);
+
+static struct drm_stub_info {
+	int (*info_register)(const char *name, struct file_operations *fops,
+			     drm_device_t *dev);
+	int (*info_unregister)(int minor);
+} DRM(stub_info);
+
+static int DRM(stub_open)(struct inode *inode, struct file *filp)
+{
+	int                    minor = minor(inode->i_rdev);
+	int                    err   = -ENODEV;
+	struct file_operations *old_fops;
+
+	if (!DRM(stub_list) || !DRM(stub_list)[minor].fops) return -ENODEV;
+	old_fops   = filp->f_op;
+	filp->f_op = fops_get(DRM(stub_list)[minor].fops);
+	if (filp->f_op->open && (err = filp->f_op->open(inode, filp))) {
+		fops_put(filp->f_op);
+		filp->f_op = fops_get(old_fops);
+	}
+	fops_put(old_fops);
+
+	return err;
+}
+
+static struct file_operations DRM(stub_fops) = {
+	.owner = THIS_MODULE,
+	.open  = DRM(stub_open)
+};
+
+static int DRM(stub_getminor)(const char *name, struct file_operations *fops,
+			      drm_device_t *dev)
+{
+	int i;
+
+	if (!DRM(stub_list)) {
+		DRM(stub_list) = DRM(alloc)(sizeof(*DRM(stub_list))
+					    * DRM_STUB_MAXCARDS, DRM_MEM_STUB);
+		if(!DRM(stub_list)) return -1;
+		for (i = 0; i < DRM_STUB_MAXCARDS; i++) {
+			DRM(stub_list)[i].name = NULL;
+			DRM(stub_list)[i].fops = NULL;
+		}
+	}
+	for (i = 0; i < DRM_STUB_MAXCARDS; i++) {
+		if (!DRM(stub_list)[i].fops) {
+			DRM(stub_list)[i].name = name;
+			DRM(stub_list)[i].fops = fops;
+			DRM(stub_root) = DRM(proc_init)(dev, i, DRM(stub_root),
+							&DRM(stub_list)[i]
+							.dev_root);
+			return i;
+		}
+	}
+	return -1;
+}
+
+static int DRM(stub_putminor)(int minor)
+{
+	if (minor < 0 || minor >= DRM_STUB_MAXCARDS) return -1;
+	DRM(stub_list)[minor].name = NULL;
+	DRM(stub_list)[minor].fops = NULL;
+	DRM(proc_cleanup)(minor, DRM(stub_root),
+			  DRM(stub_list)[minor].dev_root);
+	if (minor) {
+		inter_module_put("drm");
+	} else {
+		inter_module_unregister("drm");
+		DRM(free)(DRM(stub_list),
+			  sizeof(*DRM(stub_list)) * DRM_STUB_MAXCARDS,
+			  DRM_MEM_STUB);
+		unregister_chrdev(DRM_MAJOR, "drm");
+	}
+	return 0;
+}
+
+
+int DRM(stub_register)(const char *name, struct file_operations *fops,
+		       drm_device_t *dev)
+{
+	struct drm_stub_info *i = NULL;
+
+	DRM_DEBUG("\n");
+	if (register_chrdev(DRM_MAJOR, "drm", &DRM(stub_fops)))
+		i = (struct drm_stub_info *)inter_module_get("drm");
+
+	if (i) {
+				/* Already registered */
+		DRM(stub_info).info_register   = i->info_register;
+		DRM(stub_info).info_unregister = i->info_unregister;
+		DRM_DEBUG("already registered\n");
+	} else if (DRM(stub_info).info_register != DRM(stub_getminor)) {
+		DRM(stub_info).info_register   = DRM(stub_getminor);
+		DRM(stub_info).info_unregister = DRM(stub_putminor);
+		DRM_DEBUG("calling inter_module_register\n");
+		inter_module_register("drm", THIS_MODULE, &DRM(stub_info));
+	}
+	if (DRM(stub_info).info_register)
+		return DRM(stub_info).info_register(name, fops, dev);
+	return -1;
+}
+
+int DRM(stub_unregister)(int minor)
+{
+	DRM_DEBUG("%d\n", minor);
+	if (DRM(stub_info).info_unregister)
+		return DRM(stub_info).info_unregister(minor);
+	return -1;
+}
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/drm_vm.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/drm_vm.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/drm_vm.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/drm_vm.h	2003-07-30 11:18:33.000000000 +0200
@@ -0,0 +1,503 @@
+/* drm_vm.h -- Memory mapping for DRM -*- linux-c -*-
+ * Created: Mon Jan  4 08:58:31 1999 by faith@valinux.com
+ *
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Rickard E. (Rik) Faith <faith@valinux.com>
+ *    Gareth Hughes <gareth@valinux.com>
+ */
+
+#define __NO_VERSION__
+#include "drmP.h"
+
+struct vm_operations_struct   DRM(vm_ops) = {
+	.nopage = DRM(vm_nopage),
+	.open	= DRM(vm_open),
+	.close	= DRM(vm_close),
+};
+
+struct vm_operations_struct   DRM(vm_shm_ops) = {
+	.nopage = DRM(vm_shm_nopage),
+	.open	= DRM(vm_open),
+	.close	= DRM(vm_shm_close),
+};
+
+struct vm_operations_struct   DRM(vm_dma_ops) = {
+	.nopage = DRM(vm_dma_nopage),
+	.open	= DRM(vm_open),
+	.close	= DRM(vm_close),
+};
+
+struct vm_operations_struct   DRM(vm_sg_ops) = {
+	.nopage = DRM(vm_sg_nopage),
+	.open   = DRM(vm_open),
+	.close  = DRM(vm_close),
+};
+
+struct page *DRM(vm_nopage)(struct vm_area_struct *vma,
+			    unsigned long address,
+			    int write_access)
+{
+#if __REALLY_HAVE_AGP
+	drm_file_t *priv  = vma->vm_file->private_data;
+	drm_device_t *dev = priv->dev;
+	drm_map_t *map    = NULL;
+	drm_map_list_t  *r_list;
+	struct list_head *list;
+
+	/*
+         * Find the right map
+         */
+
+	if(!dev->agp || !dev->agp->cant_use_aperture) goto vm_nopage_error;
+
+	list_for_each(list, &dev->maplist->head) {
+		r_list = (drm_map_list_t *)list;
+		map = r_list->map;
+		if (!map) continue;
+		if (map->offset == VM_OFFSET(vma)) break;
+	}
+
+	if (map && map->type == _DRM_AGP) {
+		unsigned long offset = address - vma->vm_start;
+		unsigned long baddr = VM_OFFSET(vma) + offset;
+		struct drm_agp_mem *agpmem;
+		struct page *page;
+
+#if __alpha__
+		/*
+                 * Adjust to a bus-relative address
+                 */
+		baddr -= dev->hose->mem_space->start;
+#endif
+
+		/*
+                 * It's AGP memory - find the real physical page to map
+                 */
+		for(agpmem = dev->agp->memory; agpmem; agpmem = agpmem->next) {
+			if (agpmem->bound <= baddr &&
+			    agpmem->bound + agpmem->pages * PAGE_SIZE > baddr) 
+				break;
+		}
+
+		if (!agpmem) goto vm_nopage_error;
+
+		/*
+                 * Get the page, inc the use count, and return it
+                 */
+		offset = (baddr - agpmem->bound) >> PAGE_SHIFT;
+		agpmem->memory->memory[offset] &= dev->agp->page_mask;
+		page = virt_to_page(__va(agpmem->memory->memory[offset]));
+		get_page(page);
+
+		DRM_DEBUG("baddr = 0x%lx page = 0x%p, offset = 0x%lx\n",
+			  baddr, __va(agpmem->memory->memory[offset]), offset);
+
+		return page;
+        }
+vm_nopage_error:
+#endif /* __REALLY_HAVE_AGP */
+
+	return NOPAGE_SIGBUS;		/* Disallow mremap */
+}
+
+struct page *DRM(vm_shm_nopage)(struct vm_area_struct *vma,
+				unsigned long address,
+				int write_access)
+{
+	drm_map_t	 *map	 = (drm_map_t *)vma->vm_private_data;
+	unsigned long	 offset;
+	unsigned long	 i;
+	struct page	 *page;
+
+	if (address > vma->vm_end) return NOPAGE_SIGBUS; /* Disallow mremap */
+	if (!map)    		   return NOPAGE_OOM;  /* Nothing allocated */
+
+	offset	 = address - vma->vm_start;
+	i = (unsigned long)map->handle + offset;
+	page = vmalloc_to_page((void *)i);
+	if (!page)
+		return NOPAGE_OOM;
+	get_page(page);
+
+	DRM_DEBUG("shm_nopage 0x%lx\n", address);
+	return page;
+}
+
+/* Special close routine which deletes map information if we are the last
+ * person to close a mapping and its not in the global maplist.
+ */
+
+void DRM(vm_shm_close)(struct vm_area_struct *vma)
+{
+	drm_file_t	*priv	= vma->vm_file->private_data;
+	drm_device_t	*dev	= priv->dev;
+	drm_vma_entry_t *pt, *prev, *next;
+	drm_map_t *map;
+	drm_map_list_t *r_list;
+	struct list_head *list;
+	int found_maps = 0;
+
+	DRM_DEBUG("0x%08lx,0x%08lx\n",
+		  vma->vm_start, vma->vm_end - vma->vm_start);
+	atomic_dec(&dev->vma_count);
+
+	map = vma->vm_private_data;
+
+	down(&dev->struct_sem);
+	for (pt = dev->vmalist, prev = NULL; pt; pt = next) {
+		next = pt->next;
+		if (pt->vma->vm_private_data == map) found_maps++;
+		if (pt->vma == vma) {
+			if (prev) {
+				prev->next = pt->next;
+			} else {
+				dev->vmalist = pt->next;
+			}
+			DRM(free)(pt, sizeof(*pt), DRM_MEM_VMAS);
+		} else {
+			prev = pt;
+		}
+	}
+	/* We were the only map that was found */
+	if(found_maps == 1 &&
+	   map->flags & _DRM_REMOVABLE) {
+		/* Check to see if we are in the maplist, if we are not, then
+		 * we delete this mappings information.
+		 */
+		found_maps = 0;
+		list = &dev->maplist->head;
+		list_for_each(list, &dev->maplist->head) {
+			r_list = (drm_map_list_t *) list;
+			if (r_list->map == map) found_maps++;
+		}
+
+		if(!found_maps) {
+			switch (map->type) {
+			case _DRM_REGISTERS:
+			case _DRM_FRAME_BUFFER:
+#if __REALLY_HAVE_MTRR
+				if (map->mtrr >= 0) {
+					int retcode;
+					retcode = mtrr_del(map->mtrr,
+							   map->offset,
+							   map->size);
+					DRM_DEBUG("mtrr_del = %d\n", retcode);
+				}
+#endif
+				DRM(ioremapfree)(map->handle, map->size);
+				break;
+			case _DRM_SHM:
+				vfree(map->handle);
+				break;
+			case _DRM_AGP:
+			case _DRM_SCATTER_GATHER:
+				break;
+			}
+			DRM(free)(map, sizeof(*map), DRM_MEM_MAPS);
+		}
+	}
+	up(&dev->struct_sem);
+}
+
+struct page *DRM(vm_dma_nopage)(struct vm_area_struct *vma,
+				unsigned long address,
+				int write_access)
+{
+	drm_file_t	 *priv	 = vma->vm_file->private_data;
+	drm_device_t	 *dev	 = priv->dev;
+	drm_device_dma_t *dma	 = dev->dma;
+	unsigned long	 offset;
+	unsigned long	 page_nr;
+	struct page	 *page;
+
+	if (!dma)		   return NOPAGE_SIGBUS; /* Error */
+	if (address > vma->vm_end) return NOPAGE_SIGBUS; /* Disallow mremap */
+	if (!dma->pagelist)	   return NOPAGE_OOM ; /* Nothing allocated */
+
+	offset	 = address - vma->vm_start; /* vm_[pg]off[set] should be 0 */
+	page_nr  = offset >> PAGE_SHIFT;
+	page = virt_to_page((dma->pagelist[page_nr] + 
+			     (offset & (~PAGE_MASK))));
+
+	get_page(page);
+
+	DRM_DEBUG("dma_nopage 0x%lx (page %lu)\n", address, page_nr);
+	return page;
+}
+
+struct page *DRM(vm_sg_nopage)(struct vm_area_struct *vma,
+			       unsigned long address,
+			       int write_access)
+{
+	drm_map_t        *map    = (drm_map_t *)vma->vm_private_data;
+	drm_file_t *priv = vma->vm_file->private_data;
+	drm_device_t *dev = priv->dev;
+	drm_sg_mem_t *entry = dev->sg;
+	unsigned long offset;
+	unsigned long map_offset;
+	unsigned long page_offset;
+	struct page *page;
+
+	if (!entry)                return NOPAGE_SIGBUS; /* Error */
+	if (address > vma->vm_end) return NOPAGE_SIGBUS; /* Disallow mremap */
+	if (!entry->pagelist)      return NOPAGE_OOM ;  /* Nothing allocated */
+
+
+	offset = address - vma->vm_start;
+	map_offset = map->offset - dev->sg->handle;
+	page_offset = (offset >> PAGE_SHIFT) + (map_offset >> PAGE_SHIFT);
+	page = entry->pagelist[page_offset];
+	get_page(page);
+
+	return page;
+}
+
+void DRM(vm_open)(struct vm_area_struct *vma)
+{
+	drm_file_t	*priv	= vma->vm_file->private_data;
+	drm_device_t	*dev	= priv->dev;
+	drm_vma_entry_t *vma_entry;
+
+	DRM_DEBUG("0x%08lx,0x%08lx\n",
+		  vma->vm_start, vma->vm_end - vma->vm_start);
+	atomic_inc(&dev->vma_count);
+
+	vma_entry = DRM(alloc)(sizeof(*vma_entry), DRM_MEM_VMAS);
+	if (vma_entry) {
+		down(&dev->struct_sem);
+		vma_entry->vma	= vma;
+		vma_entry->next = dev->vmalist;
+		vma_entry->pid	= current->pid;
+		dev->vmalist	= vma_entry;
+		up(&dev->struct_sem);
+	}
+}
+
+void DRM(vm_close)(struct vm_area_struct *vma)
+{
+	drm_file_t	*priv	= vma->vm_file->private_data;
+	drm_device_t	*dev	= priv->dev;
+	drm_vma_entry_t *pt, *prev;
+
+	DRM_DEBUG("0x%08lx,0x%08lx\n",
+		  vma->vm_start, vma->vm_end - vma->vm_start);
+	atomic_dec(&dev->vma_count);
+
+	down(&dev->struct_sem);
+	for (pt = dev->vmalist, prev = NULL; pt; prev = pt, pt = pt->next) {
+		if (pt->vma == vma) {
+			if (prev) {
+				prev->next = pt->next;
+			} else {
+				dev->vmalist = pt->next;
+			}
+			DRM(free)(pt, sizeof(*pt), DRM_MEM_VMAS);
+			break;
+		}
+	}
+	up(&dev->struct_sem);
+}
+
+int DRM(mmap_dma)(struct file *filp, struct vm_area_struct *vma)
+{
+	drm_file_t	 *priv	 = filp->private_data;
+	drm_device_t	 *dev;
+	drm_device_dma_t *dma;
+	unsigned long	 length	 = vma->vm_end - vma->vm_start;
+
+	lock_kernel();
+	dev	 = priv->dev;
+	dma	 = dev->dma;
+	DRM_DEBUG("start = 0x%lx, end = 0x%lx, offset = 0x%lx\n",
+		  vma->vm_start, vma->vm_end, VM_OFFSET(vma));
+
+				/* Length must match exact page count */
+	if (!dma || (length >> PAGE_SHIFT) != dma->page_count) {
+		unlock_kernel();
+		return -EINVAL;
+	}
+	unlock_kernel();
+
+	vma->vm_ops   = &DRM(vm_dma_ops);
+
+#if LINUX_VERSION_CODE <= 0x02040e /* KERNEL_VERSION(2,4,14) */
+	vma->vm_flags |= VM_LOCKED | VM_SHM; /* Don't swap */
+#else
+	vma->vm_flags |= VM_RESERVED; /* Don't swap */
+#endif
+
+	vma->vm_file  =	 filp;	/* Needed for drm_vm_open() */
+	DRM(vm_open)(vma);
+	return 0;
+}
+
+#ifndef DRIVER_GET_MAP_OFS
+#define DRIVER_GET_MAP_OFS()	(map->offset)
+#endif
+
+#ifndef DRIVER_GET_REG_OFS
+#ifdef __alpha__
+#define DRIVER_GET_REG_OFS()	(dev->hose->dense_mem_base -	\
+				 dev->hose->mem_space->start)
+#else
+#define DRIVER_GET_REG_OFS()	0
+#endif
+#endif
+
+int DRM(mmap)(struct file *filp, struct vm_area_struct *vma)
+{
+	drm_file_t	*priv	= filp->private_data;
+	drm_device_t	*dev	= priv->dev;
+	drm_map_t	*map	= NULL;
+	drm_map_list_t  *r_list;
+	unsigned long   offset  = 0;
+	struct list_head *list;
+
+	DRM_DEBUG("start = 0x%lx, end = 0x%lx, offset = 0x%lx\n",
+		  vma->vm_start, vma->vm_end, VM_OFFSET(vma));
+
+	if ( !priv->authenticated ) return -EACCES;
+
+	if (!VM_OFFSET(vma)) return DRM(mmap_dma)(filp, vma);
+
+				/* A sequential search of a linked list is
+				   fine here because: 1) there will only be
+				   about 5-10 entries in the list and, 2) a
+				   DRI client only has to do this mapping
+				   once, so it doesn't have to be optimized
+				   for performance, even if the list was a
+				   bit longer. */
+	list_for_each(list, &dev->maplist->head) {
+		unsigned long off;
+
+		r_list = (drm_map_list_t *)list;
+		map = r_list->map;
+		if (!map) continue;
+		off = DRIVER_GET_MAP_OFS();
+		if (off == VM_OFFSET(vma)) break;
+	}
+
+	if (!map || ((map->flags&_DRM_RESTRICTED) && !capable(CAP_SYS_ADMIN)))
+		return -EPERM;
+
+				/* Check for valid size. */
+	if (map->size != vma->vm_end - vma->vm_start) return -EINVAL;
+
+	if (!capable(CAP_SYS_ADMIN) && (map->flags & _DRM_READ_ONLY)) {
+		vma->vm_flags &= VM_MAYWRITE;
+#if defined(__i386__) || defined(__x86_64__)
+		pgprot_val(vma->vm_page_prot) &= ~_PAGE_RW;
+#else
+				/* Ye gads this is ugly.  With more thought
+                                   we could move this up higher and use
+                                   `protection_map' instead.  */
+		vma->vm_page_prot = __pgprot(pte_val(pte_wrprotect(
+			__pte(pgprot_val(vma->vm_page_prot)))));
+#endif
+	}
+
+	switch (map->type) {
+        case _DRM_AGP:
+#if defined(__alpha__)
+                /*
+                 * On Alpha we can't talk to bus dma address from the
+                 * CPU, so for memory of type DRM_AGP, we'll deal with
+                 * sorting out the real physical pages and mappings
+                 * in nopage()
+                 */
+                vma->vm_ops = &DRM(vm_ops);
+                break;
+#endif
+                /* fall through to _DRM_FRAME_BUFFER... */        
+	case _DRM_FRAME_BUFFER:
+	case _DRM_REGISTERS:
+		if (VM_OFFSET(vma) >= __pa(high_memory)) {
+#if defined(__i386__) || defined(__x86_64__)
+			if (boot_cpu_data.x86 > 3 && map->type != _DRM_AGP) {
+				pgprot_val(vma->vm_page_prot) |= _PAGE_PCD;
+				pgprot_val(vma->vm_page_prot) &= ~_PAGE_PWT;
+			}
+#elif defined(__ia64__)
+			if (map->type != _DRM_AGP)
+				vma->vm_page_prot =
+					pgprot_writecombine(vma->vm_page_prot);
+#elif defined(__powerpc__)
+			pgprot_val(vma->vm_page_prot) |= _PAGE_NO_CACHE | _PAGE_GUARDED;
+#endif
+			vma->vm_flags |= VM_IO;	/* not in core dump */
+		}
+		offset = DRIVER_GET_REG_OFS();
+#ifdef __sparc__
+		if (io_remap_page_range(DRM_RPR_ARG(vma) vma->vm_start,
+					VM_OFFSET(vma) + offset,
+					vma->vm_end - vma->vm_start,
+					vma->vm_page_prot, 0))
+#else
+		if (remap_page_range(DRM_RPR_ARG(vma) vma->vm_start,
+				     VM_OFFSET(vma) + offset,
+				     vma->vm_end - vma->vm_start,
+				     vma->vm_page_prot))
+#endif
+				return -EAGAIN;
+		DRM_DEBUG("   Type = %d; start = 0x%lx, end = 0x%lx,"
+			  " offset = 0x%lx\n",
+			  map->type,
+			  vma->vm_start, vma->vm_end, VM_OFFSET(vma) + offset);
+		vma->vm_ops = &DRM(vm_ops);
+		break;
+	case _DRM_SHM:
+		vma->vm_ops = &DRM(vm_shm_ops);
+		vma->vm_private_data = (void *)map;
+				/* Don't let this area swap.  Change when
+				   DRM_KERNEL advisory is supported. */
+#if LINUX_VERSION_CODE <= 0x02040e /* KERNEL_VERSION(2,4,14) */
+		vma->vm_flags |= VM_LOCKED;
+#else
+		vma->vm_flags |= VM_RESERVED;
+#endif
+		break;
+	case _DRM_SCATTER_GATHER:
+		vma->vm_ops = &DRM(vm_sg_ops);
+		vma->vm_private_data = (void *)map;
+#if LINUX_VERSION_CODE <= 0x02040e /* KERNEL_VERSION(2,4,14) */
+		vma->vm_flags |= VM_LOCKED;
+#else
+		vma->vm_flags |= VM_RESERVED;
+#endif
+                break;
+	default:
+		return -EINVAL;	/* This should never happen. */
+	}
+#if LINUX_VERSION_CODE <= 0x02040e /* KERNEL_VERSION(2,4,14) */
+	vma->vm_flags |= VM_LOCKED | VM_SHM; /* Don't swap */
+#else
+	vma->vm_flags |= VM_RESERVED; /* Don't swap */
+#endif
+
+	vma->vm_file  =	 filp;	/* Needed for drm_vm_open() */
+	DRM(vm_open)(vma);
+	return 0;
+}
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/drmstat.c linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/drmstat.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/drmstat.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/drmstat.c	2003-07-30 11:18:33.000000000 +0200
@@ -0,0 +1,416 @@
+/* drmstat.c -- DRM device status and testing program
+ * Created: Tue Jan  5 08:19:24 1999 by faith@precisioninsight.com
+ *
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ * 
+ * Authors: Rickard E. (Rik) Faith <faith@valinux.com>
+ * 
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/time.h>
+#include <sys/mman.h>
+#include <getopt.h>
+#include <strings.h>
+#include <errno.h>
+#include <signal.h>
+#include <fcntl.h>
+#include "xf86drm.h"
+
+int sigio_fd;
+
+static double usec(struct timeval *end, struct timeval *start)
+{
+    double e = end->tv_sec   * 1000000 + end->tv_usec;
+    double s = start->tv_sec * 1000000 + start->tv_usec;
+
+    return e - s;
+}
+
+static void getversion(int fd)
+{
+    drmVersionPtr version;
+    
+    version = drmGetVersion(fd);
+    if (version) {
+	printf( "Name: %s\n", version->name ? version->name : "?" );
+	printf( "    Version: %d.%d.%d\n",
+		version->version_major,
+		version->version_minor,
+		version->version_patchlevel );
+	printf( "    Date: %s\n", version->date ? version->date : "?" );
+	printf( "    Desc: %s\n", version->desc ? version->desc : "?" );
+	drmFreeVersion(version);
+    } else {
+	printf( "No driver available\n" );
+    }
+}
+	
+void handler(int fd, void *oldctx, void *newctx)
+{
+    printf("Got fd %d\n", fd);
+}
+
+void process_sigio(char *device)
+{
+    int              fd;
+
+    if ((fd = open(device, 0)) < 0) {
+	drmError(-errno, __FUNCTION__);
+	exit(1);
+    }
+
+    sigio_fd = fd;
+    drmInstallSIGIOHandler(fd, handler);
+    for (;;) sleep(60);
+}
+
+int main(int argc, char **argv)
+{
+    int            c;
+    int            r  = 0;
+    int            fd = -1;
+    drmHandle      handle;
+    void           *address;
+    char           *pt;
+    unsigned long  count;
+    unsigned long  offset;
+    unsigned long  size;
+    drmContext     context;
+    int            loops;
+    char           buf[1024];
+    int            i;
+    drmBufInfoPtr  info;
+    drmBufMapPtr   bufs;
+    drmLockPtr     lock;
+    int            secs;
+
+    while ((c = getopt(argc, argv,
+		       "lc:vo:O:f:s:w:W:b:r:R:P:L:C:XS:B:F:")) != EOF)
+	switch (c) {
+	case 'F':
+	    count  = strtoul(optarg, NULL, 0);
+	    if (!fork()) {
+		dup(fd);
+		sleep(count);
+	    }
+	    close(fd);
+	    break;
+	case 'v': getversion(fd);                                        break;
+	case 'X':
+	    if ((r = drmCreateContext(fd, &context))) {
+		drmError(r, argv[0]);
+		return 1;
+	    }
+	    printf( "Got %d\n", context);
+	    break;
+	case 'S':
+	    process_sigio(optarg);
+	    break;
+	case 'C':
+	    if ((r = drmSwitchToContext(fd, strtoul(optarg, NULL, 0)))) {
+		drmError(r, argv[0]);
+		return 1;
+	    }
+	    break;
+	case 'c':
+	    if ((r = drmSetBusid(fd,optarg))) {
+		drmError(r, argv[0]);
+		return 1;
+	    }
+	    break;
+	case 'o':
+	    if ((fd = drmOpen(optarg, NULL)) < 0) {
+		drmError(fd, argv[0]);
+		return 1;
+	    }
+	    break;
+	case 'O':
+	    if ((fd = drmOpen(NULL, optarg)) < 0) {
+		drmError(fd, argv[0]);
+		return 1;
+	    }
+	    break;
+	case 'B':		/* Test buffer allocation */
+	    count  = strtoul(optarg, &pt, 0);
+	    size   = strtoul(pt+1, &pt, 0);
+	    secs   = strtoul(pt+1, NULL, 0);
+	    {
+		drmDMAReq      dma;
+		int            *indices, *sizes;
+
+		indices = alloca(sizeof(*indices) * count);
+		sizes   = alloca(sizeof(*sizes)   * count);
+		dma.context         = context;
+		dma.send_count      = 0;
+		dma.request_count   = count;
+		dma.request_size    = size;
+		dma.request_list    = indices;
+		dma.request_sizes   = sizes;
+		dma.flags           = DRM_DMA_WAIT;
+		if ((r = drmDMA(fd, &dma))) {
+		    drmError(r, argv[0]);
+		    return 1;
+		}
+		for (i = 0; i < dma.granted_count; i++) {
+		    printf("%5d: index = %d, size = %d\n",
+			   i, dma.request_list[i], dma.request_sizes[i]);
+		}
+		sleep(secs);
+		drmFreeBufs(fd, dma.granted_count, indices);
+	    }
+	    break;
+	case 'b':
+	    count   = strtoul(optarg, &pt, 0);
+	    size    = strtoul(pt+1, NULL, 0);
+	    if ((r = drmAddBufs(fd, count, size, 0, 65536)) < 0) {
+		drmError(r, argv[0]);
+		return 1;
+	    }
+	    if (!(info = drmGetBufInfo(fd))) {
+		drmError(0, argv[0]);
+		return 1;
+	    }
+	    for (i = 0; i < info->count; i++) {
+		printf("%5d buffers of size %6d (low = %d, high = %d)\n",
+		       info->list[i].count,
+		       info->list[i].size,
+		       info->list[i].low_mark,
+		       info->list[i].high_mark);
+	    }
+	    if ((r = drmMarkBufs(fd, 0.50, 0.80))) {
+		drmError(r, argv[0]);
+		return 1;
+	    }
+	    if (!(info = drmGetBufInfo(fd))) {
+		drmError(0, argv[0]);
+		return 1;
+	    }
+	    for (i = 0; i < info->count; i++) {
+		printf("%5d buffers of size %6d (low = %d, high = %d)\n",
+		       info->list[i].count,
+		       info->list[i].size,
+		       info->list[i].low_mark,
+		       info->list[i].high_mark);
+	    }
+	    printf("===== /proc/dri/0/mem =====\n");
+	    sprintf(buf, "cat /proc/dri/0/mem");
+	    system(buf);
+#if 1
+	    if (!(bufs = drmMapBufs(fd))) {
+		drmError(0, argv[0]);
+		return 1;
+	    }
+	    printf("===============================\n");
+	    printf( "%d bufs\n", bufs->count);
+	    for (i = 0; i < bufs->count; i++) {
+		printf( "  %4d: %8d bytes at %p\n",
+			i,
+			bufs->list[i].total,
+			bufs->list[i].address);
+	    }
+	    printf("===== /proc/dri/0/vma =====\n");
+	    sprintf(buf, "cat /proc/dri/0/vma");
+	    system(buf);
+#endif
+	    break;
+	case 'f':
+	    offset  = strtoul(optarg, &pt, 0);
+	    size    = strtoul(pt+1, NULL, 0);
+	    handle  = 0;
+	    if ((r = drmAddMap(fd, offset, size,
+			       DRM_FRAME_BUFFER, 0, &handle))) {
+		drmError(r, argv[0]);
+		return 1;
+	    }
+	    printf("0x%08lx:0x%04lx added\n", offset, size);
+	    printf("===== /proc/dri/0/mem =====\n");
+	    sprintf(buf, "cat /proc/dri/0/mem");
+	    system(buf);
+	    break;
+	case 'r':
+	case 'R':
+	    offset  = strtoul(optarg, &pt, 0);
+	    size    = strtoul(pt+1, NULL, 0);
+	    handle  = 0;
+	    if ((r = drmAddMap(fd, offset, size,
+			       DRM_REGISTERS,
+			       c == 'R' ? DRM_READ_ONLY : 0,
+			       &handle))) {
+		drmError(r, argv[0]);
+		return 1;
+	    }
+	    printf("0x%08lx:0x%04lx added\n", offset, size);
+	    printf("===== /proc/dri/0/mem =====\n");
+	    sprintf(buf, "cat /proc/dri/0/mem");
+	    system(buf);
+	    break;
+	case 's':
+	    size = strtoul(optarg, &pt, 0);
+	    handle = 0;
+	    if ((r = drmAddMap(fd, 0, size,
+			       DRM_SHM, DRM_CONTAINS_LOCK,
+			       &handle))) {
+		drmError(r, argv[0]);
+		return 1;
+	    }
+	    printf("0x%04lx byte shm added at 0x%08lx\n", size, handle);
+	    sprintf(buf, "cat /proc/dri/0/vm");
+	    system(buf);
+	    break;
+	case 'P':
+	    offset  = strtoul(optarg, &pt, 0);
+	    size    = strtoul(pt+1, NULL, 0);
+	    address = NULL;
+	    if ((r = drmMap(fd, offset, size, &address))) {
+		drmError(r, argv[0]);
+		return 1;
+	    }
+	    printf("0x%08lx:0x%04lx mapped at %p for pid %d\n",
+		   offset, size, address, getpid());
+	    printf("===== /proc/dri/0/vma =====\n");
+	    sprintf(buf, "cat /proc/dri/0/vma");
+	    system(buf);
+	    mprotect((void *)offset, size, PROT_READ);
+	    printf("===== /proc/dri/0/vma =====\n");
+	    sprintf(buf, "cat /proc/dri/0/vma");
+	    system(buf);
+	    break;
+	case 'w':
+	case 'W':
+	    offset  = strtoul(optarg, &pt, 0);
+	    size    = strtoul(pt+1, NULL, 0);
+	    address = NULL;
+	    if ((r = drmMap(fd, offset, size, &address))) {
+		drmError(r, argv[0]);
+		return 1;
+	    }
+	    printf("0x%08lx:0x%04lx mapped at %p for pid %d\n",
+		   offset, size, address, getpid());
+	    printf("===== /proc/%d/maps =====\n", getpid());
+	    sprintf(buf, "cat /proc/%d/maps", getpid());
+	    system(buf);
+	    printf("===== /proc/grphics/0/mem =====\n");
+	    sprintf(buf, "cat /proc/dri/0/mem");
+	    system(buf);
+	    printf("===== /proc/dri/0/vma =====\n");
+	    sprintf(buf, "cat /proc/dri/0/vma");
+	    system(buf);
+	    printf("===== READING =====\n");
+	    for (i = 0; i < 0x10; i++)
+		printf("%02x ", (unsigned int)((unsigned char *)address)[i]);
+	    printf("\n");
+	    if (c == 'w') {
+		printf("===== WRITING =====\n");
+		for (i = 0; i < size; i+=2) {
+		    ((char *)address)[i]   = i & 0xff;
+		    ((char *)address)[i+1] = i & 0xff;
+		}
+	    }
+	    printf("===== READING =====\n");
+	    for (i = 0; i < 0x10; i++)
+		printf("%02x ", (unsigned int)((unsigned char *)address)[i]);
+	    printf("\n");
+	    printf("===== /proc/dri/0/vma =====\n");
+	    sprintf(buf, "cat /proc/dri/0/vma");
+	    system(buf);
+	    break;
+	case 'L':
+	    context = strtoul(optarg, &pt, 0);
+	    offset  = strtoul(pt+1, &pt, 0);
+	    size    = strtoul(pt+1, &pt, 0);
+	    loops   = strtoul(pt+1, NULL, 0);
+	    address = NULL;
+	    if ((r = drmMap(fd, offset, size, &address))) {
+		drmError(r, argv[0]);
+		return 1;
+	    }
+	    lock       = address;
+#if 1
+	    {
+		int            counter = 0;
+		struct timeval loop_start, loop_end;
+		struct timeval lock_start, lock_end;
+		double         wt;
+#define HISTOSIZE 9
+		int            histo[HISTOSIZE];
+		int            output = 0;
+		int            fast   = 0;
+
+		if (loops < 0) {
+		    loops = -loops;
+		    ++output;
+		}
+
+		for (i = 0; i < HISTOSIZE; i++) histo[i] = 0;
+
+		gettimeofday(&loop_start, NULL);
+		for (i = 0; i < loops; i++) {
+		    gettimeofday(&lock_start, NULL);
+		    DRM_LIGHT_LOCK_COUNT(fd,lock,context,fast);
+		    gettimeofday(&lock_end, NULL);
+		    DRM_UNLOCK(fd,lock,context);
+		    ++counter;
+		    wt = usec(&lock_end, &lock_start);
+		    if      (wt <=      2.5) ++histo[8];
+		    if      (wt <       5.0) ++histo[0];
+		    else if (wt <      50.0) ++histo[1];
+		    else if (wt <     500.0) ++histo[2];
+		    else if (wt <    5000.0) ++histo[3];
+		    else if (wt <   50000.0) ++histo[4];
+		    else if (wt <  500000.0) ++histo[5];
+		    else if (wt < 5000000.0) ++histo[6];
+		    else                     ++histo[7];
+		    if (output) printf( "%.2f uSec, %d fast\n", wt, fast);
+		}
+		gettimeofday(&loop_end, NULL);
+		printf( "Average wait time = %.2f usec, %d fast\n",
+			usec(&loop_end, &loop_start) /  counter, fast);
+		printf( "%9d <=     2.5 uS\n", histo[8]);
+		printf( "%9d <        5 uS\n", histo[0]);
+		printf( "%9d <       50 uS\n", histo[1]);
+		printf( "%9d <      500 uS\n", histo[2]);
+		printf( "%9d <     5000 uS\n", histo[3]);
+		printf( "%9d <    50000 uS\n", histo[4]);
+		printf( "%9d <   500000 uS\n", histo[5]);
+		printf( "%9d <  5000000 uS\n", histo[6]);
+		printf( "%9d >= 5000000 uS\n", histo[7]);
+	    }
+#else
+	    printf( "before lock: 0x%08x\n", lock->lock);
+	    printf( "lock: 0x%08x\n", lock->lock);
+	    sleep(5);
+	    printf( "unlock: 0x%08x\n", lock->lock);
+#endif
+	    break;
+	default:
+	    fprintf( stderr, "Usage: drmstat [options]\n" );
+	    return 1;
+	}
+
+    return r; 
+}
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/gamma.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/gamma.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/gamma.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/gamma.h	2003-07-30 11:18:33.000000000 +0200
@@ -0,0 +1,148 @@
+/* gamma.c -- 3dlabs GMX 2000 driver -*- linux-c -*-
+ * Created: Mon Jan  4 08:58:31 1999 by gareth@valinux.com
+ *
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Gareth Hughes <gareth@valinux.com>
+ */
+
+#ifndef __GAMMA_H__
+#define __GAMMA_H__
+
+/* This remains constant for all DRM template files.
+ */
+#define DRM(x) gamma_##x
+
+/* General customization:
+ */
+#define __HAVE_MTRR			1
+
+#define DRIVER_AUTHOR		"VA Linux Systems Inc."
+
+#define DRIVER_NAME		"gamma"
+#define DRIVER_DESC		"3DLabs gamma"
+#define DRIVER_DATE		"20010624"
+
+#define DRIVER_MAJOR		2
+#define DRIVER_MINOR		0
+#define DRIVER_PATCHLEVEL	0
+
+#define DRIVER_IOCTLS							  \
+	[DRM_IOCTL_NR(DRM_IOCTL_DMA)]	     = { gamma_dma,	  1, 0 }, \
+	[DRM_IOCTL_NR(DRM_IOCTL_GAMMA_INIT)] = { gamma_dma_init,  1, 1 }, \
+	[DRM_IOCTL_NR(DRM_IOCTL_GAMMA_COPY)] = { gamma_dma_copy,  1, 1 }
+
+#define IOCTL_TABLE_NAME	DRM(ioctls)
+#define IOCTL_FUNC_NAME 	DRM(ioctl)
+
+#define __HAVE_COUNTERS		5
+#define __HAVE_COUNTER6		_DRM_STAT_IRQ
+#define __HAVE_COUNTER7		_DRM_STAT_DMA
+#define __HAVE_COUNTER8		_DRM_STAT_PRIMARY
+#define __HAVE_COUNTER9		_DRM_STAT_SPECIAL
+#define __HAVE_COUNTER10	_DRM_STAT_MISSED
+
+/* DMA customization:
+ */
+#define __HAVE_DMA			1
+#define __HAVE_AGP			1
+#define __MUST_HAVE_AGP			0
+#define __HAVE_OLD_DMA			1
+#define __HAVE_PCI_DMA			1
+
+#define __HAVE_MULTIPLE_DMA_QUEUES	1
+#define __HAVE_DMA_WAITQUEUE		1
+
+#define __HAVE_DMA_WAITLIST		1
+#define __HAVE_DMA_FREELIST		1
+
+#define __HAVE_DMA_FLUSH		1
+#define __HAVE_DMA_SCHEDULE		1
+
+#define __HAVE_DMA_READY		1
+#define DRIVER_DMA_READY() do {						\
+	gamma_dma_ready(dev);						\
+} while (0)
+
+#define __HAVE_DMA_QUIESCENT		1
+#define DRIVER_DMA_QUIESCENT() do {					\
+	/* FIXME ! */ 							\
+	gamma_dma_quiescent_single(dev);					\
+	return 0;							\
+} while (0)
+
+#define __HAVE_DMA_IRQ			1
+#define __HAVE_DMA_IRQ_BH		1
+
+#if 1
+#define DRIVER_PREINSTALL() do {					\
+	drm_gamma_private_t *dev_priv =					\
+				(drm_gamma_private_t *)dev->dev_private;\
+	while(GAMMA_READ(GAMMA_INFIFOSPACE) < 2);			\
+	GAMMA_WRITE( GAMMA_GCOMMANDMODE,	0x00000004 );		\
+	GAMMA_WRITE( GAMMA_GDMACONTROL,		0x00000000 );		\
+} while (0)
+#define DRIVER_POSTINSTALL() do {					\
+	drm_gamma_private_t *dev_priv =					\
+				(drm_gamma_private_t *)dev->dev_private;\
+	while(GAMMA_READ(GAMMA_INFIFOSPACE) < 2);			\
+	while(GAMMA_READ(GAMMA_INFIFOSPACE) < 3);			\
+	GAMMA_WRITE( GAMMA_GINTENABLE,		0x00002001 );		\
+	GAMMA_WRITE( GAMMA_COMMANDINTENABLE,	0x00000008 );		\
+	GAMMA_WRITE( GAMMA_GDELAYTIMER,		0x00039090 );		\
+} while (0)
+#else
+#define DRIVER_POSTINSTALL() do {					\
+	drm_gamma_private_t *dev_priv =					\
+				(drm_gamma_private_t *)dev->dev_private;\
+	while(GAMMA_READ(GAMMA_INFIFOSPACE) < 2);			\
+	while(GAMMA_READ(GAMMA_INFIFOSPACE) < 2);			\
+	GAMMA_WRITE( GAMMA_GINTENABLE,		0x00002000 );		\
+	GAMMA_WRITE( GAMMA_COMMANDINTENABLE,	0x00000004 );		\
+} while (0)
+
+#define DRIVER_PREINSTALL() do {					\
+	drm_gamma_private_t *dev_priv =					\
+				(drm_gamma_private_t *)dev->dev_private;\
+	while(GAMMA_READ(GAMMA_INFIFOSPACE) < 2);			\
+	while(GAMMA_READ(GAMMA_INFIFOSPACE) < 2);			\
+	GAMMA_WRITE( GAMMA_GCOMMANDMODE,	GAMMA_QUEUED_DMA_MODE );\
+	GAMMA_WRITE( GAMMA_GDMACONTROL,		0x00000000 );\
+} while (0)
+#endif
+
+#define DRIVER_UNINSTALL() do {						\
+	drm_gamma_private_t *dev_priv =					\
+				(drm_gamma_private_t *)dev->dev_private;\
+	while(GAMMA_READ(GAMMA_INFIFOSPACE) < 2);			\
+	while(GAMMA_READ(GAMMA_INFIFOSPACE) < 3);			\
+	GAMMA_WRITE( GAMMA_GDELAYTIMER,		0x00000000 );		\
+	GAMMA_WRITE( GAMMA_COMMANDINTENABLE,	0x00000000 );		\
+	GAMMA_WRITE( GAMMA_GINTENABLE,		0x00000000 );		\
+} while (0)
+
+#define DRIVER_AGP_BUFFERS_MAP( dev )					\
+	((drm_gamma_private_t *)((dev)->dev_private))->buffers
+
+#endif /* __GAMMA_H__ */
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/gamma_dma.c linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/gamma_dma.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/gamma_dma.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/gamma_dma.c	2003-07-30 11:18:33.000000000 +0200
@@ -0,0 +1,834 @@
+/* gamma_dma.c -- DMA support for GMX 2000 -*- linux-c -*-
+ * Created: Fri Mar 19 14:30:16 1999 by faith@precisioninsight.com
+ *
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Rickard E. (Rik) Faith <faith@valinux.com>
+ *
+ */
+
+#define __NO_VERSION__
+#include "gamma.h"
+#include "drmP.h"
+#include "drm.h"
+#include "gamma_drm.h"
+#include "gamma_drv.h"
+
+#include <linux/interrupt.h>	/* For task queue support */
+#include <linux/delay.h>
+
+static inline void gamma_dma_dispatch(drm_device_t *dev, unsigned long address,
+				      unsigned long length)
+{
+	drm_gamma_private_t *dev_priv =
+				(drm_gamma_private_t *)dev->dev_private;
+	mb();
+	while ( GAMMA_READ(GAMMA_INFIFOSPACE) < 2);
+	GAMMA_WRITE(GAMMA_DMAADDRESS, address);
+	while (GAMMA_READ(GAMMA_GCOMMANDSTATUS) != 4);
+	GAMMA_WRITE(GAMMA_DMACOUNT, length / 4);
+}
+
+void gamma_dma_quiescent_single(drm_device_t *dev)
+{
+	drm_gamma_private_t *dev_priv =
+				(drm_gamma_private_t *)dev->dev_private;
+	while (GAMMA_READ(GAMMA_DMACOUNT));
+
+	while (GAMMA_READ(GAMMA_INFIFOSPACE) < 2);
+
+	GAMMA_WRITE(GAMMA_FILTERMODE, 1 << 10);
+	GAMMA_WRITE(GAMMA_SYNC, 0);
+
+	do {
+		while (!GAMMA_READ(GAMMA_OUTFIFOWORDS))
+			;
+	} while (GAMMA_READ(GAMMA_OUTPUTFIFO) != GAMMA_SYNC_TAG);
+}
+
+void gamma_dma_quiescent_dual(drm_device_t *dev)
+{
+	drm_gamma_private_t *dev_priv =
+				(drm_gamma_private_t *)dev->dev_private;
+	while (GAMMA_READ(GAMMA_DMACOUNT));
+
+	while (GAMMA_READ(GAMMA_INFIFOSPACE) < 3);
+
+	GAMMA_WRITE(GAMMA_BROADCASTMASK, 3);
+	GAMMA_WRITE(GAMMA_FILTERMODE, 1 << 10);
+	GAMMA_WRITE(GAMMA_SYNC, 0);
+
+	/* Read from first MX */
+	do {
+		while (!GAMMA_READ(GAMMA_OUTFIFOWORDS));
+	} while (GAMMA_READ(GAMMA_OUTPUTFIFO) != GAMMA_SYNC_TAG);
+
+	/* Read from second MX */
+	do {
+		while (!GAMMA_READ(GAMMA_OUTFIFOWORDS + 0x10000));
+	} while (GAMMA_READ(GAMMA_OUTPUTFIFO + 0x10000) != GAMMA_SYNC_TAG);
+}
+
+void gamma_dma_ready(drm_device_t *dev)
+{
+	drm_gamma_private_t *dev_priv =
+				(drm_gamma_private_t *)dev->dev_private;
+	while (GAMMA_READ(GAMMA_DMACOUNT));
+}
+
+static inline int gamma_dma_is_ready(drm_device_t *dev)
+{
+	drm_gamma_private_t *dev_priv =
+				(drm_gamma_private_t *)dev->dev_private;
+	return(!GAMMA_READ(GAMMA_DMACOUNT));
+}
+
+void gamma_dma_service(int irq, void *device, struct pt_regs *regs)
+{
+	drm_device_t	 *dev = (drm_device_t *)device;
+	drm_device_dma_t *dma = dev->dma;
+	drm_gamma_private_t *dev_priv =
+				(drm_gamma_private_t *)dev->dev_private;
+
+	atomic_inc(&dev->counts[6]); /* _DRM_STAT_IRQ */
+
+	while (GAMMA_READ(GAMMA_INFIFOSPACE) < 3);
+	GAMMA_WRITE(GAMMA_GDELAYTIMER, 0xc350/2); /* 0x05S */
+	GAMMA_WRITE(GAMMA_GCOMMANDINTFLAGS, 8);
+	GAMMA_WRITE(GAMMA_GINTFLAGS, 0x2001);
+	if (gamma_dma_is_ready(dev)) {
+				/* Free previous buffer */
+		if (test_and_set_bit(0, &dev->dma_flag)) return;
+		if (dma->this_buffer) {
+			gamma_free_buffer(dev, dma->this_buffer);
+			dma->this_buffer = NULL;
+		}
+		clear_bit(0, &dev->dma_flag);
+
+				/* Dispatch new buffer */
+		queue_task(&dev->tq, &tq_immediate);
+		mark_bh(IMMEDIATE_BH);
+	}
+}
+
+/* Only called by gamma_dma_schedule. */
+static int gamma_do_dma(drm_device_t *dev, int locked)
+{
+	unsigned long	 address;
+	unsigned long	 length;
+	drm_buf_t	 *buf;
+	int		 retcode = 0;
+	drm_device_dma_t *dma = dev->dma;
+#if DRM_DMA_HISTOGRAM
+	cycles_t	 dma_start, dma_stop;
+#endif
+
+	if (test_and_set_bit(0, &dev->dma_flag)) return -EBUSY;
+
+#if DRM_DMA_HISTOGRAM
+	dma_start = get_cycles();
+#endif
+
+	if (!dma->next_buffer) {
+		DRM_ERROR("No next_buffer\n");
+		clear_bit(0, &dev->dma_flag);
+		return -EINVAL;
+	}
+
+	buf	= dma->next_buffer;
+	/* WE NOW ARE ON LOGICAL PAGES!! - using page table setup in dma_init */
+	/* So we pass the buffer index value into the physical page offset */
+	address = buf->idx << 12;
+	length	= buf->used;
+
+	DRM_DEBUG("context %d, buffer %d (%ld bytes)\n",
+		  buf->context, buf->idx, length);
+
+	if (buf->list == DRM_LIST_RECLAIM) {
+		gamma_clear_next_buffer(dev);
+		gamma_free_buffer(dev, buf);
+		clear_bit(0, &dev->dma_flag);
+		return -EINVAL;
+	}
+
+	if (!length) {
+		DRM_ERROR("0 length buffer\n");
+		gamma_clear_next_buffer(dev);
+		gamma_free_buffer(dev, buf);
+		clear_bit(0, &dev->dma_flag);
+		return 0;
+	}
+
+	if (!gamma_dma_is_ready(dev)) {
+		clear_bit(0, &dev->dma_flag);
+		return -EBUSY;
+	}
+
+	if (buf->while_locked) {
+		if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
+			DRM_ERROR("Dispatching buffer %d from pid %d"
+				  " \"while locked\", but no lock held\n",
+				  buf->idx, buf->pid);
+		}
+	} else {
+		if (!locked && !gamma_lock_take(&dev->lock.hw_lock->lock,
+					      DRM_KERNEL_CONTEXT)) {
+			clear_bit(0, &dev->dma_flag);
+			return -EBUSY;
+		}
+	}
+
+	if (dev->last_context != buf->context
+	    && !(dev->queuelist[buf->context]->flags
+		 & _DRM_CONTEXT_PRESERVED)) {
+				/* PRE: dev->last_context != buf->context */
+		if (DRM(context_switch)(dev, dev->last_context,
+					buf->context)) {
+			DRM(clear_next_buffer)(dev);
+			DRM(free_buffer)(dev, buf);
+		}
+		retcode = -EBUSY;
+		goto cleanup;
+
+				/* POST: we will wait for the context
+				   switch and will dispatch on a later call
+				   when dev->last_context == buf->context.
+				   NOTE WE HOLD THE LOCK THROUGHOUT THIS
+				   TIME! */
+	}
+
+	gamma_clear_next_buffer(dev);
+	buf->pending	 = 1;
+	buf->waiting	 = 0;
+	buf->list	 = DRM_LIST_PEND;
+#if DRM_DMA_HISTOGRAM
+	buf->time_dispatched = get_cycles();
+#endif
+
+	/* WE NOW ARE ON LOGICAL PAGES!!! - overriding address */
+	address = buf->idx << 12;
+
+	gamma_dma_dispatch(dev, address, length);
+	gamma_free_buffer(dev, dma->this_buffer);
+	dma->this_buffer = buf;
+
+	atomic_inc(&dev->counts[7]); /* _DRM_STAT_DMA */
+	atomic_add(length, &dev->counts[8]); /* _DRM_STAT_PRIMARY */
+
+	if (!buf->while_locked && !dev->context_flag && !locked) {
+		if (gamma_lock_free(dev, &dev->lock.hw_lock->lock,
+				  DRM_KERNEL_CONTEXT)) {
+			DRM_ERROR("\n");
+		}
+	}
+cleanup:
+
+	clear_bit(0, &dev->dma_flag);
+
+#if DRM_DMA_HISTOGRAM
+	dma_stop = get_cycles();
+	atomic_inc(&dev->histo.dma[gamma_histogram_slot(dma_stop - dma_start)]);
+#endif
+
+	return retcode;
+}
+
+static void gamma_dma_timer_bh(unsigned long dev)
+{
+	gamma_dma_schedule((drm_device_t *)dev, 0);
+}
+
+void gamma_dma_immediate_bh(void *dev)
+{
+	gamma_dma_schedule(dev, 0);
+}
+
+int gamma_dma_schedule(drm_device_t *dev, int locked)
+{
+	int		 next;
+	drm_queue_t	 *q;
+	drm_buf_t	 *buf;
+	int		 retcode   = 0;
+	int		 processed = 0;
+	int		 missed;
+	int		 expire	   = 20;
+	drm_device_dma_t *dma	   = dev->dma;
+#if DRM_DMA_HISTOGRAM
+	cycles_t	 schedule_start;
+#endif
+
+	if (test_and_set_bit(0, &dev->interrupt_flag)) {
+				/* Not reentrant */
+		atomic_inc(&dev->counts[10]); /* _DRM_STAT_MISSED */
+		return -EBUSY;
+	}
+	missed = atomic_read(&dev->counts[10]);
+
+#if DRM_DMA_HISTOGRAM
+	schedule_start = get_cycles();
+#endif
+
+again:
+	if (dev->context_flag) {
+		clear_bit(0, &dev->interrupt_flag);
+		return -EBUSY;
+	}
+	if (dma->next_buffer) {
+				/* Unsent buffer that was previously
+				   selected, but that couldn't be sent
+				   because the lock could not be obtained
+				   or the DMA engine wasn't ready.  Try
+				   again. */
+		if (!(retcode = gamma_do_dma(dev, locked))) ++processed;
+	} else {
+		do {
+			next = gamma_select_queue(dev, gamma_dma_timer_bh);
+			if (next >= 0) {
+				q   = dev->queuelist[next];
+				buf = gamma_waitlist_get(&q->waitlist);
+				dma->next_buffer = buf;
+				dma->next_queue	 = q;
+				if (buf && buf->list == DRM_LIST_RECLAIM) {
+					gamma_clear_next_buffer(dev);
+					gamma_free_buffer(dev, buf);
+				}
+			}
+		} while (next >= 0 && !dma->next_buffer);
+		if (dma->next_buffer) {
+			if (!(retcode = gamma_do_dma(dev, locked))) {
+				++processed;
+			}
+		}
+	}
+
+	if (--expire) {
+		if (missed != atomic_read(&dev->counts[10])) {
+			if (gamma_dma_is_ready(dev)) goto again;
+		}
+		if (processed && gamma_dma_is_ready(dev)) {
+			processed = 0;
+			goto again;
+		}
+	}
+
+	clear_bit(0, &dev->interrupt_flag);
+
+#if DRM_DMA_HISTOGRAM
+	atomic_inc(&dev->histo.schedule[gamma_histogram_slot(get_cycles()
+							   - schedule_start)]);
+#endif
+	return retcode;
+}
+
+static int gamma_dma_priority(drm_device_t *dev, drm_dma_t *d)
+{
+	unsigned long	  address;
+	unsigned long	  length;
+	int		  must_free = 0;
+	int		  retcode   = 0;
+	int		  i;
+	int		  idx;
+	drm_buf_t	  *buf;
+	drm_buf_t	  *last_buf = NULL;
+	drm_device_dma_t  *dma	    = dev->dma;
+	DECLARE_WAITQUEUE(entry, current);
+
+				/* Turn off interrupt handling */
+	while (test_and_set_bit(0, &dev->interrupt_flag)) {
+		schedule();
+		if (signal_pending(current)) return -EINTR;
+	}
+	if (!(d->flags & _DRM_DMA_WHILE_LOCKED)) {
+		while (!gamma_lock_take(&dev->lock.hw_lock->lock,
+				      DRM_KERNEL_CONTEXT)) {
+			schedule();
+			if (signal_pending(current)) {
+				clear_bit(0, &dev->interrupt_flag);
+				return -EINTR;
+			}
+		}
+		++must_free;
+	}
+
+	for (i = 0; i < d->send_count; i++) {
+		idx = d->send_indices[i];
+		if (idx < 0 || idx >= dma->buf_count) {
+			DRM_ERROR("Index %d (of %d max)\n",
+				  d->send_indices[i], dma->buf_count - 1);
+			continue;
+		}
+		buf = dma->buflist[ idx ];
+		if (buf->pid != current->pid) {
+			DRM_ERROR("Process %d using buffer owned by %d\n",
+				  current->pid, buf->pid);
+			retcode = -EINVAL;
+			goto cleanup;
+		}
+		if (buf->list != DRM_LIST_NONE) {
+			DRM_ERROR("Process %d using %d's buffer on list %d\n",
+				  current->pid, buf->pid, buf->list);
+			retcode = -EINVAL;
+			goto cleanup;
+		}
+				/* This isn't a race condition on
+				   buf->list, since our concern is the
+				   buffer reclaim during the time the
+				   process closes the /dev/drm? handle, so
+				   it can't also be doing DMA. */
+		buf->list	  = DRM_LIST_PRIO;
+		buf->used	  = d->send_sizes[i];
+		buf->context	  = d->context;
+		buf->while_locked = d->flags & _DRM_DMA_WHILE_LOCKED;
+		address		  = (unsigned long)buf->address;
+		length		  = buf->used;
+		if (!length) {
+			DRM_ERROR("0 length buffer\n");
+		}
+		if (buf->pending) {
+			DRM_ERROR("Sending pending buffer:"
+				  " buffer %d, offset %d\n",
+				  d->send_indices[i], i);
+			retcode = -EINVAL;
+			goto cleanup;
+		}
+		if (buf->waiting) {
+			DRM_ERROR("Sending waiting buffer:"
+				  " buffer %d, offset %d\n",
+				  d->send_indices[i], i);
+			retcode = -EINVAL;
+			goto cleanup;
+		}
+		buf->pending = 1;
+
+		if (dev->last_context != buf->context
+		    && !(dev->queuelist[buf->context]->flags
+			 & _DRM_CONTEXT_PRESERVED)) {
+			add_wait_queue(&dev->context_wait, &entry);
+			current->state = TASK_INTERRUPTIBLE;
+				/* PRE: dev->last_context != buf->context */
+			DRM(context_switch)(dev, dev->last_context,
+					    buf->context);
+				/* POST: we will wait for the context
+				   switch and will dispatch on a later call
+				   when dev->last_context == buf->context.
+				   NOTE WE HOLD THE LOCK THROUGHOUT THIS
+				   TIME! */
+			schedule();
+			current->state = TASK_RUNNING;
+			remove_wait_queue(&dev->context_wait, &entry);
+			if (signal_pending(current)) {
+				retcode = -EINTR;
+				goto cleanup;
+			}
+			if (dev->last_context != buf->context) {
+				DRM_ERROR("Context mismatch: %d %d\n",
+					  dev->last_context,
+					  buf->context);
+			}
+		}
+
+#if DRM_DMA_HISTOGRAM
+		buf->time_queued     = get_cycles();
+		buf->time_dispatched = buf->time_queued;
+#endif
+		gamma_dma_dispatch(dev, address, length);
+		atomic_inc(&dev->counts[9]); /* _DRM_STAT_SPECIAL */
+		atomic_add(length, &dev->counts[8]); /* _DRM_STAT_PRIMARY */
+
+		if (last_buf) {
+			gamma_free_buffer(dev, last_buf);
+		}
+		last_buf = buf;
+	}
+
+
+cleanup:
+	if (last_buf) {
+		gamma_dma_ready(dev);
+		gamma_free_buffer(dev, last_buf);
+	}
+
+	if (must_free && !dev->context_flag) {
+		if (gamma_lock_free(dev, &dev->lock.hw_lock->lock,
+				  DRM_KERNEL_CONTEXT)) {
+			DRM_ERROR("\n");
+		}
+	}
+	clear_bit(0, &dev->interrupt_flag);
+	return retcode;
+}
+
+static int gamma_dma_send_buffers(drm_device_t *dev, drm_dma_t *d)
+{
+	DECLARE_WAITQUEUE(entry, current);
+	drm_buf_t	  *last_buf = NULL;
+	int		  retcode   = 0;
+	drm_device_dma_t  *dma	    = dev->dma;
+
+	if (d->flags & _DRM_DMA_BLOCK) {
+		last_buf = dma->buflist[d->send_indices[d->send_count-1]];
+		add_wait_queue(&last_buf->dma_wait, &entry);
+	}
+
+	if ((retcode = gamma_dma_enqueue(dev, d))) {
+		if (d->flags & _DRM_DMA_BLOCK)
+			remove_wait_queue(&last_buf->dma_wait, &entry);
+		return retcode;
+	}
+
+	gamma_dma_schedule(dev, 0);
+
+	if (d->flags & _DRM_DMA_BLOCK) {
+		DRM_DEBUG("%d waiting\n", current->pid);
+		for (;;) {
+			current->state = TASK_INTERRUPTIBLE;
+			if (!last_buf->waiting && !last_buf->pending)
+				break; /* finished */
+			schedule();
+			if (signal_pending(current)) {
+				retcode = -EINTR; /* Can't restart */
+				break;
+			}
+		}
+		current->state = TASK_RUNNING;
+		DRM_DEBUG("%d running\n", current->pid);
+		remove_wait_queue(&last_buf->dma_wait, &entry);
+		if (!retcode
+		    || (last_buf->list==DRM_LIST_PEND && !last_buf->pending)) {
+			if (!waitqueue_active(&last_buf->dma_wait)) {
+				gamma_free_buffer(dev, last_buf);
+			}
+		}
+		if (retcode) {
+			DRM_ERROR("ctx%d w%d p%d c%ld i%d l%d %d/%d\n",
+				  d->context,
+				  last_buf->waiting,
+				  last_buf->pending,
+				  (long)DRM_WAITCOUNT(dev, d->context),
+				  last_buf->idx,
+				  last_buf->list,
+				  last_buf->pid,
+				  current->pid);
+		}
+	}
+	return retcode;
+}
+
+int gamma_dma(struct inode *inode, struct file *filp, unsigned int cmd,
+	      unsigned long arg)
+{
+	drm_file_t	  *priv	    = filp->private_data;
+	drm_device_t	  *dev	    = priv->dev;
+	drm_device_dma_t  *dma	    = dev->dma;
+	int		  retcode   = 0;
+	drm_dma_t	  d;
+
+	if (copy_from_user(&d, (drm_dma_t *)arg, sizeof(d)))
+		return -EFAULT;
+
+	if (d.send_count < 0 || d.send_count > dma->buf_count) {
+		DRM_ERROR("Process %d trying to send %d buffers (of %d max)\n",
+			  current->pid, d.send_count, dma->buf_count);
+		return -EINVAL;
+	}
+
+	if (d.request_count < 0 || d.request_count > dma->buf_count) {
+		DRM_ERROR("Process %d trying to get %d buffers (of %d max)\n",
+			  current->pid, d.request_count, dma->buf_count);
+		return -EINVAL;
+	}
+
+	if (d.send_count) {
+		if (d.flags & _DRM_DMA_PRIORITY)
+			retcode = gamma_dma_priority(dev, &d);
+		else
+			retcode = gamma_dma_send_buffers(dev, &d);
+	}
+
+	d.granted_count = 0;
+
+	if (!retcode && d.request_count) {
+		retcode = gamma_dma_get_buffers(dev, &d);
+	}
+
+	DRM_DEBUG("%d returning, granted = %d\n",
+		  current->pid, d.granted_count);
+	if (copy_to_user((drm_dma_t *)arg, &d, sizeof(d)))
+		return -EFAULT;
+
+	return retcode;
+}
+
+/* =============================================================
+ * DMA initialization, cleanup
+ */
+
+static int gamma_do_init_dma( drm_device_t *dev, drm_gamma_init_t *init )
+{
+	drm_gamma_private_t *dev_priv;
+	drm_device_dma_t    *dma = dev->dma;
+	drm_buf_t	    *buf;
+	int i;
+	struct list_head    *list;
+	unsigned long	    *pgt;
+
+	DRM_DEBUG( "%s\n", __FUNCTION__ );
+
+	dev_priv = DRM(alloc)( sizeof(drm_gamma_private_t),
+							DRM_MEM_DRIVER );
+	if ( !dev_priv )
+		return -ENOMEM;
+
+	dev->dev_private = (void *)dev_priv;
+
+	memset( dev_priv, 0, sizeof(drm_gamma_private_t) );
+
+	list_for_each(list, &dev->maplist->head) {
+		drm_map_list_t *r_list = (drm_map_list_t *)list;
+		if( r_list->map &&
+		    r_list->map->type == _DRM_SHM &&
+		    r_list->map->flags & _DRM_CONTAINS_LOCK ) {
+			dev_priv->sarea = r_list->map;
+ 			break;
+ 		}
+ 	}
+
+	DRM_FIND_MAP( dev_priv->mmio0, init->mmio0 );
+	DRM_FIND_MAP( dev_priv->mmio1, init->mmio1 );
+	DRM_FIND_MAP( dev_priv->mmio2, init->mmio2 );
+	DRM_FIND_MAP( dev_priv->mmio3, init->mmio3 );
+
+	dev_priv->sarea_priv = (drm_gamma_sarea_t *)
+		((u8 *)dev_priv->sarea->handle +
+		 init->sarea_priv_offset);
+
+	if (init->pcimode) {
+		buf = dma->buflist[GLINT_DRI_BUF_COUNT];
+		pgt = buf->address;
+
+ 		for (i = 0; i < GLINT_DRI_BUF_COUNT; i++) {
+			buf = dma->buflist[i];
+			*pgt = virt_to_phys((void*)buf->address) | 0x07;
+			pgt++;
+		}
+
+		buf = dma->buflist[GLINT_DRI_BUF_COUNT];
+	} else {
+		DRM_FIND_MAP( dev_priv->buffers, init->buffers_offset );
+
+		DRM_IOREMAP( dev_priv->buffers );
+
+		buf = dma->buflist[GLINT_DRI_BUF_COUNT];
+		pgt = buf->address;
+
+ 		for (i = 0; i < GLINT_DRI_BUF_COUNT; i++) {
+			buf = dma->buflist[i];
+			*pgt = (unsigned long)buf->address + 0x07;
+			pgt++;
+		}
+
+		buf = dma->buflist[GLINT_DRI_BUF_COUNT];
+
+		while (GAMMA_READ(GAMMA_INFIFOSPACE) < 1);
+		GAMMA_WRITE( GAMMA_GDMACONTROL, 0xe);
+	}
+	while (GAMMA_READ(GAMMA_INFIFOSPACE) < 2);
+	GAMMA_WRITE( GAMMA_PAGETABLEADDR, virt_to_phys((void*)buf->address) );
+	GAMMA_WRITE( GAMMA_PAGETABLELENGTH, 2 );
+
+	return 0;
+}
+
+int gamma_do_cleanup_dma( drm_device_t *dev )
+{
+	DRM_DEBUG( "%s\n", __FUNCTION__ );
+
+	if ( dev->dev_private ) {
+		drm_gamma_private_t *dev_priv = dev->dev_private;
+
+		DRM_IOREMAPFREE( dev_priv->buffers );
+
+		DRM(free)( dev->dev_private, sizeof(drm_gamma_private_t),
+			   DRM_MEM_DRIVER );
+		dev->dev_private = NULL;
+	}
+
+	return 0;
+}
+
+int gamma_dma_init( struct inode *inode, struct file *filp,
+		  unsigned int cmd, unsigned long arg )
+{
+	drm_file_t *priv = filp->private_data;
+	drm_device_t *dev = priv->dev;
+	drm_gamma_init_t init;
+
+	if ( copy_from_user( &init, (drm_gamma_init_t *)arg, sizeof(init) ) )
+		return -EFAULT;
+
+	switch ( init.func ) {
+	case GAMMA_INIT_DMA:
+		return gamma_do_init_dma( dev, &init );
+	case GAMMA_CLEANUP_DMA:
+		return gamma_do_cleanup_dma( dev );
+	}
+
+	return -EINVAL;
+}
+
+static int gamma_do_copy_dma( drm_device_t *dev, drm_gamma_copy_t *copy )
+{
+	drm_device_dma_t    *dma = dev->dma;
+	unsigned int        *screenbuf;
+
+	DRM_DEBUG( "%s\n", __FUNCTION__ );
+
+	/* We've DRM_RESTRICTED this DMA buffer */
+
+	screenbuf = dma->buflist[ GLINT_DRI_BUF_COUNT + 1 ]->address;
+
+#if 0
+	*buffer++ = 0x180;	/* Tag (FilterMode) */
+	*buffer++ = 0x200;	/* Allow FBColor through */
+	*buffer++ = 0x53B;	/* Tag */
+	*buffer++ = copy->Pitch;
+	*buffer++ = 0x53A;	/* Tag */
+	*buffer++ = copy->SrcAddress;
+	*buffer++ = 0x539;	/* Tag */
+	*buffer++ = copy->WidthHeight; /* Initiates transfer */
+	*buffer++ = 0x53C;	/* Tag - DMAOutputAddress */
+	*buffer++ = virt_to_phys((void*)screenbuf);
+	*buffer++ = 0x53D;	/* Tag - DMAOutputCount */
+	*buffer++ = copy->Count; /* Reads HostOutFifo BLOCKS until ..*/
+
+	/* Data now sitting in dma->buflist[ GLINT_DRI_BUF_COUNT + 1 ] */
+	/* Now put it back to the screen */
+
+	*buffer++ = 0x180;	/* Tag (FilterMode) */
+	*buffer++ = 0x400;	/* Allow Sync through */
+	*buffer++ = 0x538;	/* Tag - DMARectangleReadTarget */
+	*buffer++ = 0x155;	/* FBSourceData | count */
+	*buffer++ = 0x537;	/* Tag */
+	*buffer++ = copy->Pitch;
+	*buffer++ = 0x536;	/* Tag */
+	*buffer++ = copy->DstAddress;
+	*buffer++ = 0x535;	/* Tag */
+	*buffer++ = copy->WidthHeight; /* Initiates transfer */
+	*buffer++ = 0x530;	/* Tag - DMAAddr */
+	*buffer++ = virt_to_phys((void*)screenbuf);
+	*buffer++ = 0x531;
+	*buffer++ = copy->Count; /* initiates DMA transfer of color data */
+#endif
+
+	/* need to dispatch it now */
+
+	return 0;
+}
+
+int gamma_dma_copy( struct inode *inode, struct file *filp,
+		  unsigned int cmd, unsigned long arg )
+{
+	drm_file_t *priv = filp->private_data;
+	drm_device_t *dev = priv->dev;
+	drm_gamma_copy_t copy;
+
+	if ( copy_from_user( &copy, (drm_gamma_copy_t *)arg, sizeof(copy) ) )
+		return -EFAULT;
+
+	return gamma_do_copy_dma( dev, &copy );
+}
+
+/* =============================================================
+ * Per Context SAREA Support
+ */
+
+int gamma_getsareactx(struct inode *inode, struct file *filp,
+		     unsigned int cmd, unsigned long arg)
+{
+	drm_file_t	*priv	= filp->private_data;
+	drm_device_t	*dev	= priv->dev;
+	drm_ctx_priv_map_t request;
+	drm_map_t *map;
+
+	if (copy_from_user(&request,
+			   (drm_ctx_priv_map_t *)arg,
+			   sizeof(request)))
+		return -EFAULT;
+
+	down(&dev->struct_sem);
+	if ((int)request.ctx_id >= dev->max_context) {
+		up(&dev->struct_sem);
+		return -EINVAL;
+	}
+
+	map = dev->context_sareas[request.ctx_id];
+	up(&dev->struct_sem);
+
+	request.handle = map->handle;
+	if (copy_to_user((drm_ctx_priv_map_t *)arg, &request, sizeof(request)))
+		return -EFAULT;
+	return 0;
+}
+
+int gamma_setsareactx(struct inode *inode, struct file *filp,
+		     unsigned int cmd, unsigned long arg)
+{
+	drm_file_t	*priv	= filp->private_data;
+	drm_device_t	*dev	= priv->dev;
+	drm_ctx_priv_map_t request;
+	drm_map_t *map = NULL;
+	drm_map_list_t *r_list;
+	struct list_head *list;
+
+	if (copy_from_user(&request,
+			   (drm_ctx_priv_map_t *)arg,
+			   sizeof(request)))
+		return -EFAULT;
+
+	down(&dev->struct_sem);
+	r_list = NULL;
+	list_for_each(list, &dev->maplist->head) {
+		r_list = (drm_map_list_t *)list;
+		if(r_list->map &&
+		   r_list->map->handle == request.handle) break;
+	}
+	if (list == &(dev->maplist->head)) {
+		up(&dev->struct_sem);
+		return -EINVAL;
+	}
+	map = r_list->map;
+	up(&dev->struct_sem);
+
+	if (!map) return -EINVAL;
+
+	down(&dev->struct_sem);
+	if ((int)request.ctx_id >= dev->max_context) {
+		up(&dev->struct_sem);
+		return -EINVAL;
+	}
+	dev->context_sareas[request.ctx_id] = map;
+	up(&dev->struct_sem);
+	return 0;
+}
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/gamma_drm.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/gamma_drm.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/gamma_drm.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/gamma_drm.h	2003-07-30 11:18:33.000000000 +0200
@@ -0,0 +1,89 @@
+#ifndef _GAMMA_DRM_H_
+#define _GAMMA_DRM_H_
+
+typedef struct _drm_gamma_tex_region {
+	unsigned char next, prev; /* indices to form a circular LRU  */
+	unsigned char in_use;	/* owned by a client, or free? */
+	int age;		/* tracked by clients to update local LRU's */
+} drm_gamma_tex_region_t;
+
+typedef struct {
+	unsigned int	GDeltaMode;
+	unsigned int	GDepthMode;
+	unsigned int	GGeometryMode;
+	unsigned int	GTransformMode;
+} drm_gamma_context_regs_t;
+
+typedef struct _drm_gamma_sarea {
+   	drm_gamma_context_regs_t context_state;
+
+	unsigned int dirty;
+
+
+	/* Maintain an LRU of contiguous regions of texture space.  If
+	 * you think you own a region of texture memory, and it has an
+	 * age different to the one you set, then you are mistaken and
+	 * it has been stolen by another client.  If global texAge
+	 * hasn't changed, there is no need to walk the list.
+	 *
+	 * These regions can be used as a proxy for the fine-grained
+	 * texture information of other clients - by maintaining them
+	 * in the same lru which is used to age their own textures,
+	 * clients have an approximate lru for the whole of global
+	 * texture space, and can make informed decisions as to which
+	 * areas to kick out.  There is no need to choose whether to
+	 * kick out your own texture or someone else's - simply eject
+	 * them all in LRU order.  
+	 */
+   
+#define GAMMA_NR_TEX_REGIONS 64
+	drm_gamma_tex_region_t texList[GAMMA_NR_TEX_REGIONS+1]; 
+				/* Last elt is sentinal */
+        int texAge;		/* last time texture was uploaded */
+        int last_enqueue;	/* last time a buffer was enqueued */
+	int last_dispatch;	/* age of the most recently dispatched buffer */
+	int last_quiescent;     /*  */
+	int ctxOwner;		/* last context to upload state */
+
+	int vertex_prim;
+} drm_gamma_sarea_t;
+
+/* WARNING: If you change any of these defines, make sure to change the
+ * defines in the Xserver file (xf86drmGamma.h)
+ */
+
+/* Gamma specific ioctls
+ * The device specific ioctl range is 0x40 to 0x79.
+ */
+#define DRM_IOCTL_GAMMA_INIT		DRM_IOW( 0x40, drm_gamma_init_t)
+#define DRM_IOCTL_GAMMA_COPY		DRM_IOW( 0x41, drm_gamma_copy_t)
+
+typedef struct drm_gamma_copy {
+	unsigned int	DMAOutputAddress;
+	unsigned int	DMAOutputCount;
+	unsigned int	DMAReadGLINTSource;
+	unsigned int	DMARectangleWriteAddress;
+	unsigned int	DMARectangleWriteLinePitch;
+	unsigned int	DMARectangleWrite;
+	unsigned int	DMARectangleReadAddress;
+	unsigned int	DMARectangleReadLinePitch;
+	unsigned int	DMARectangleRead;
+	unsigned int	DMARectangleReadTarget;
+} drm_gamma_copy_t;
+
+typedef struct drm_gamma_init {
+   	enum {
+	   	GAMMA_INIT_DMA    = 0x01,
+	       	GAMMA_CLEANUP_DMA = 0x02
+	} func;
+
+   	int sarea_priv_offset;
+	int pcimode;
+	unsigned int mmio0;
+	unsigned int mmio1;
+	unsigned int mmio2;
+	unsigned int mmio3;
+	unsigned int buffers_offset;
+} drm_gamma_init_t;
+
+#endif /* _GAMMA_DRM_H_ */
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/gamma_drv.c linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/gamma_drv.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/gamma_drv.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/gamma_drv.c	2003-07-30 11:18:33.000000000 +0200
@@ -0,0 +1,55 @@
+/* gamma.c -- 3dlabs GMX 2000 driver -*- linux-c -*-
+ * Created: Mon Jan  4 08:58:31 1999 by faith@precisioninsight.com
+ *
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Rickard E. (Rik) Faith <faith@valinux.com>
+ *    Gareth Hughes <gareth@valinux.com>
+ */
+
+#include <linux/config.h>
+#include "gamma.h"
+#include "drmP.h"
+#include "drm.h"
+#include "gamma_drm.h"
+#include "gamma_drv.h"
+
+#include "drm_auth.h"
+#include "drm_agpsupport.h"
+#include "drm_bufs.h"
+#include "drm_context.h"
+#include "drm_dma.h"
+#include "drm_drawable.h"
+#include "drm_drv.h"
+
+#include "drm_fops.h"
+#include "drm_init.h"
+#include "drm_ioctl.h"
+#include "drm_lists.h"
+#include "drm_lock.h"
+#include "drm_memory.h"
+#include "drm_proc.h"
+#include "drm_vm.h"
+#include "drm_stub.h"
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/gamma_drv.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/gamma_drv.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/gamma_drv.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/gamma_drv.h	2003-07-30 11:18:33.000000000 +0200
@@ -0,0 +1,120 @@
+/* gamma_drv.h -- Private header for 3dlabs GMX 2000 driver -*- linux-c -*-
+ * Created: Mon Jan  4 10:05:05 1999 by faith@precisioninsight.com
+ *
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Rickard E. (Rik) Faith <faith@valinux.com>
+ *
+ */
+
+#ifndef _GAMMA_DRV_H_
+#define _GAMMA_DRV_H_
+
+typedef struct drm_gamma_private {
+	drm_gamma_sarea_t *sarea_priv;
+	drm_map_t *sarea;
+	drm_map_t *buffers;
+	drm_map_t *mmio0;
+	drm_map_t *mmio1;
+	drm_map_t *mmio2;
+	drm_map_t *mmio3;
+} drm_gamma_private_t;
+
+#define LOCK_TEST_WITH_RETURN( dev )					\
+do {									\
+	if ( !_DRM_LOCK_IS_HELD( dev->lock.hw_lock->lock ) ||		\
+	     dev->lock.pid != current->pid ) {				\
+		DRM_ERROR( "%s called without lock held\n",		\
+			   __FUNCTION__ );				\
+		return -EINVAL;						\
+	}								\
+} while (0)
+
+				/* gamma_dma.c */
+extern int gamma_dma_init( struct inode *inode, struct file *filp,
+			 unsigned int cmd, unsigned long arg );
+extern int gamma_dma_copy( struct inode *inode, struct file *filp,
+			 unsigned int cmd, unsigned long arg );
+
+extern void gamma_dma_ready(drm_device_t *dev);
+extern void gamma_dma_quiescent_single(drm_device_t *dev);
+extern void gamma_dma_quiescent_dual(drm_device_t *dev);
+
+				/* gamma_dma.c */
+extern int  gamma_dma_schedule(drm_device_t *dev, int locked);
+extern int  gamma_dma(struct inode *inode, struct file *filp,
+		      unsigned int cmd, unsigned long arg);
+extern int  gamma_find_devices(void);
+extern int  gamma_found(void);
+
+#define GLINT_DRI_BUF_COUNT 256
+
+#define GAMMA_OFF(reg)						   \
+	((reg < 0x1000)						   \
+	 ? reg							   \
+	 : ((reg < 0x10000)					   \
+	    ? (reg - 0x1000)					   \
+	    : ((reg < 0x11000)					   \
+	       ? (reg - 0x10000)				   \
+	       : (reg - 0x11000))))
+
+#define GAMMA_BASE(reg)	 ((unsigned long)				     \
+			  ((reg < 0x1000)    ? dev_priv->mmio0->handle :     \
+			   ((reg < 0x10000)  ? dev_priv->mmio1->handle :     \
+			    ((reg < 0x11000) ? dev_priv->mmio2->handle :     \
+					       dev_priv->mmio3->handle))))
+#define GAMMA_ADDR(reg)	 (GAMMA_BASE(reg) + GAMMA_OFF(reg))
+#define GAMMA_DEREF(reg) *(__volatile__ int *)GAMMA_ADDR(reg)
+#define GAMMA_READ(reg)	 GAMMA_DEREF(reg)
+#define GAMMA_WRITE(reg,val) do { GAMMA_DEREF(reg) = val; } while (0)
+
+#define GAMMA_BROADCASTMASK    0x9378
+#define GAMMA_COMMANDINTENABLE 0x0c48
+#define GAMMA_DMAADDRESS       0x0028
+#define GAMMA_DMACOUNT	       0x0030
+#define GAMMA_FILTERMODE       0x8c00
+#define GAMMA_GCOMMANDINTFLAGS 0x0c50
+#define GAMMA_GCOMMANDMODE     0x0c40
+#define		GAMMA_QUEUED_DMA_MODE		1<<1
+#define GAMMA_GCOMMANDSTATUS   0x0c60
+#define GAMMA_GDELAYTIMER      0x0c38
+#define GAMMA_GDMACONTROL      0x0060
+#define 	GAMMA_USE_AGP			1<<1
+#define GAMMA_GINTENABLE       0x0808
+#define GAMMA_GINTFLAGS	       0x0810
+#define GAMMA_INFIFOSPACE      0x0018
+#define GAMMA_OUTFIFOWORDS     0x0020
+#define GAMMA_OUTPUTFIFO       0x2000
+#define GAMMA_SYNC	       0x8c40
+#define GAMMA_SYNC_TAG	       0x0188
+#define GAMMA_PAGETABLEADDR    0x0C00
+#define GAMMA_PAGETABLELENGTH  0x0C08
+
+#define GAMMA_PASSTHROUGH	0x1FE
+#define GAMMA_DMAADDRTAG	0x530
+#define GAMMA_DMACOUNTTAG	0x531
+#define GAMMA_COMMANDINTTAG	0x532
+
+#endif
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/i810.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/i810.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/i810.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/i810.h	2003-07-30 11:18:33.000000000 +0200
@@ -0,0 +1,117 @@
+/* i810.h -- Intel i810/i815 DRM template customization -*- linux-c -*-
+ * Created: Thu Feb 15 00:01:12 2001 by gareth@valinux.com
+ *
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Gareth Hughes <gareth@valinux.com>
+ */
+
+#ifndef __I810_H__
+#define __I810_H__
+
+/* This remains constant for all DRM template files.
+ */
+#define DRM(x) i810_##x
+
+/* General customization:
+ */
+#define __HAVE_AGP		1
+#define __MUST_HAVE_AGP		1
+#define __HAVE_MTRR		1
+#define __HAVE_CTX_BITMAP	1
+
+#define DRIVER_AUTHOR		"VA Linux Systems Inc."
+
+#define DRIVER_NAME		"i810"
+#define DRIVER_DESC		"Intel i810"
+#define DRIVER_DATE		"20020211"
+
+/* Interface history
+ *
+ * 1.1   - XFree86 4.1
+ * 1.2   - XvMC interfaces
+ *       - XFree86 4.2
+ * 1.2.1 - Disable copying code (leave stub ioctls for backwards compatibility)
+ *       - Remove requirement for interrupt (leave stubs again)
+ */
+#define DRIVER_MAJOR		1
+#define DRIVER_MINOR		2
+#define DRIVER_PATCHLEVEL	1
+
+#define DRIVER_IOCTLS							    \
+	[DRM_IOCTL_NR(DRM_IOCTL_I810_INIT)]   = { i810_dma_init,    1, 1 }, \
+   	[DRM_IOCTL_NR(DRM_IOCTL_I810_VERTEX)] = { i810_dma_vertex,  1, 0 }, \
+   	[DRM_IOCTL_NR(DRM_IOCTL_I810_CLEAR)]  = { i810_clear_bufs,  1, 0 }, \
+      	[DRM_IOCTL_NR(DRM_IOCTL_I810_FLUSH)]  = { i810_flush_ioctl, 1, 0 }, \
+   	[DRM_IOCTL_NR(DRM_IOCTL_I810_GETAGE)] = { i810_getage,      1, 0 }, \
+	[DRM_IOCTL_NR(DRM_IOCTL_I810_GETBUF)] = { i810_getbuf,      1, 0 }, \
+   	[DRM_IOCTL_NR(DRM_IOCTL_I810_SWAP)]   = { i810_swap_bufs,   1, 0 }, \
+   	[DRM_IOCTL_NR(DRM_IOCTL_I810_COPY)]   = { i810_copybuf,     1, 0 }, \
+   	[DRM_IOCTL_NR(DRM_IOCTL_I810_DOCOPY)] = { i810_docopy,      1, 0 }, \
+	[DRM_IOCTL_NR(DRM_IOCTL_I810_OV0INFO)] = { i810_ov0_info,   1, 0 }, \
+	[DRM_IOCTL_NR(DRM_IOCTL_I810_FSTATUS)] = { i810_fstatus,    1, 0 }, \
+	[DRM_IOCTL_NR(DRM_IOCTL_I810_OV0FLIP)] = { i810_ov0_flip,   1, 0 }, \
+	[DRM_IOCTL_NR(DRM_IOCTL_I810_MC)]      = { i810_dma_mc,     1, 1 }, \
+	[DRM_IOCTL_NR(DRM_IOCTL_I810_RSTATUS)] = { i810_rstatus,    1, 0 }
+
+
+#define __HAVE_COUNTERS         4
+#define __HAVE_COUNTER6         _DRM_STAT_IRQ
+#define __HAVE_COUNTER7         _DRM_STAT_PRIMARY
+#define __HAVE_COUNTER8         _DRM_STAT_SECONDARY
+#define __HAVE_COUNTER9         _DRM_STAT_DMA
+
+/* Driver customization:
+ */
+#define __HAVE_RELEASE		1
+#define DRIVER_RELEASE() do {						\
+	i810_reclaim_buffers( dev, priv->pid );				\
+} while (0)
+
+/* DMA customization:
+ */
+#define __HAVE_DMA		1
+#define __HAVE_DMA_QUEUE	1
+#define __HAVE_DMA_WAITLIST	1
+#define __HAVE_DMA_RECLAIM	1
+
+#define __HAVE_DMA_QUIESCENT	1
+#define DRIVER_DMA_QUIESCENT() do {					\
+	i810_dma_quiescent( dev );					\
+} while (0)
+
+/* Don't need an irq any more.  The template code will make sure that
+ * a noop stub is generated for compatibility.
+ */
+#define __HAVE_DMA_IRQ		0
+
+/* Buffer customization:
+ */
+
+#define DRIVER_BUF_PRIV_T	drm_i810_buf_priv_t
+
+#define DRIVER_AGP_BUFFERS_MAP( dev )					\
+	((drm_i810_private_t *)((dev)->dev_private))->buffer_map
+
+#endif
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/i810_dma.c linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/i810_dma.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/i810_dma.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/i810_dma.c	2003-07-30 11:18:33.000000000 +0200
@@ -0,0 +1,1192 @@
+/* i810_dma.c -- DMA support for the i810 -*- linux-c -*-
+ * Created: Mon Dec 13 01:50:01 1999 by jhartmann@precisioninsight.com
+ *
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Authors: Rickard E. (Rik) Faith <faith@valinux.com>
+ *	    Jeff Hartmann <jhartmann@valinux.com>
+ *          Keith Whitwell <keith@tungstengraphics.com>
+ *
+ */
+
+#define __NO_VERSION__
+#include "i810.h"
+#include "drmP.h"
+#include "drm.h"
+#include "i810_drm.h"
+#include "i810_drv.h"
+#include <linux/interrupt.h>	/* For task queue support */
+#include <linux/delay.h>
+#include <linux/pagemap.h>
+
+#ifdef DO_MUNMAP_4_ARGS
+#define DO_MUNMAP(m, a, l)	do_munmap(m, a, l, 1)
+#else
+#define DO_MUNMAP(m, a, l)	do_munmap(m, a, l)
+#endif
+
+#define I810_BUF_FREE		2
+#define I810_BUF_CLIENT		1
+#define I810_BUF_HARDWARE      	0
+
+#define I810_BUF_UNMAPPED 0
+#define I810_BUF_MAPPED   1
+
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,4,2)
+#define down_write down
+#define up_write up
+#endif
+
+static inline void i810_print_status_page(drm_device_t *dev)
+{
+   	drm_device_dma_t *dma = dev->dma;
+      	drm_i810_private_t *dev_priv = dev->dev_private;
+	u32 *temp = (u32 *)dev_priv->hw_status_page;
+   	int i;
+
+   	DRM_DEBUG(  "hw_status: Interrupt Status : %x\n", temp[0]);
+   	DRM_DEBUG(  "hw_status: LpRing Head ptr : %x\n", temp[1]);
+   	DRM_DEBUG(  "hw_status: IRing Head ptr : %x\n", temp[2]);
+      	DRM_DEBUG(  "hw_status: Reserved : %x\n", temp[3]);
+	DRM_DEBUG(  "hw_status: Last Render: %x\n", temp[4]);
+   	DRM_DEBUG(  "hw_status: Driver Counter : %d\n", temp[5]);
+   	for(i = 6; i < dma->buf_count + 6; i++) {
+	   	DRM_DEBUG( "buffer status idx : %d used: %d\n", i - 6, temp[i]);
+	}
+}
+
+static drm_buf_t *i810_freelist_get(drm_device_t *dev)
+{
+   	drm_device_dma_t *dma = dev->dma;
+	int		 i;
+   	int 		 used;
+
+	/* Linear search might not be the best solution */
+
+   	for (i = 0; i < dma->buf_count; i++) {
+	   	drm_buf_t *buf = dma->buflist[ i ];
+	   	drm_i810_buf_priv_t *buf_priv = buf->dev_private;
+		/* In use is already a pointer */
+	   	used = cmpxchg(buf_priv->in_use, I810_BUF_FREE,
+			       I810_BUF_CLIENT);
+	   	if(used == I810_BUF_FREE) {
+			return buf;
+		}
+	}
+   	return NULL;
+}
+
+/* This should only be called if the buffer is not sent to the hardware
+ * yet, the hardware updates in use for us once its on the ring buffer.
+ */
+
+static int i810_freelist_put(drm_device_t *dev, drm_buf_t *buf)
+{
+   	drm_i810_buf_priv_t *buf_priv = buf->dev_private;
+   	int used;
+
+   	/* In use is already a pointer */
+   	used = cmpxchg(buf_priv->in_use, I810_BUF_CLIENT, I810_BUF_FREE);
+   	if(used != I810_BUF_CLIENT) {
+	   	DRM_ERROR("Freeing buffer thats not in use : %d\n", buf->idx);
+	   	return -EINVAL;
+	}
+
+   	return 0;
+}
+
+static struct file_operations i810_buffer_fops = {
+	.open	 = DRM(open),
+	.flush	 = DRM(flush),
+	.release = DRM(release),
+	.ioctl	 = DRM(ioctl),
+	.mmap	 = i810_mmap_buffers,
+	.read	 = DRM(read),
+	.fasync  = DRM(fasync),
+      	.poll	 = DRM(poll),
+};
+
+int i810_mmap_buffers(struct file *filp, struct vm_area_struct *vma)
+{
+	drm_file_t	    *priv	  = filp->private_data;
+	drm_device_t	    *dev;
+	drm_i810_private_t  *dev_priv;
+	drm_buf_t           *buf;
+	drm_i810_buf_priv_t *buf_priv;
+
+	lock_kernel();
+	dev	 = priv->dev;
+	dev_priv = dev->dev_private;
+	buf      = dev_priv->mmap_buffer;
+	buf_priv = buf->dev_private;
+
+	vma->vm_flags |= (VM_IO | VM_DONTCOPY);
+	vma->vm_file = filp;
+
+   	buf_priv->currently_mapped = I810_BUF_MAPPED;
+	unlock_kernel();
+
+	if (remap_page_range(DRM_RPR_ARG(vma) vma->vm_start,
+			     VM_OFFSET(vma),
+			     vma->vm_end - vma->vm_start,
+			     vma->vm_page_prot)) return -EAGAIN;
+	return 0;
+}
+
+static int i810_map_buffer(drm_buf_t *buf, struct file *filp)
+{
+	drm_file_t	  *priv	  = filp->private_data;
+	drm_device_t	  *dev	  = priv->dev;
+	drm_i810_buf_priv_t *buf_priv = buf->dev_private;
+      	drm_i810_private_t *dev_priv = dev->dev_private;
+   	struct file_operations *old_fops;
+	int retcode = 0;
+
+	if(buf_priv->currently_mapped == I810_BUF_MAPPED) return -EINVAL;
+
+	down_write( &current->mm->mmap_sem );
+	old_fops = filp->f_op;
+	filp->f_op = &i810_buffer_fops;
+	dev_priv->mmap_buffer = buf;
+	buf_priv->virtual = (void *)do_mmap(filp, 0, buf->total,
+					    PROT_READ|PROT_WRITE,
+					    MAP_SHARED,
+					    buf->bus_address);
+	dev_priv->mmap_buffer = NULL;
+	filp->f_op = old_fops;
+	if ((unsigned long)buf_priv->virtual > -1024UL) {
+		/* Real error */
+		DRM_ERROR("mmap error\n");
+		retcode = (signed int)buf_priv->virtual;
+		buf_priv->virtual = 0;
+	}
+	up_write( &current->mm->mmap_sem );
+
+	return retcode;
+}
+
+static int i810_unmap_buffer(drm_buf_t *buf)
+{
+	drm_i810_buf_priv_t *buf_priv = buf->dev_private;
+	int retcode = 0;
+
+	if(buf_priv->currently_mapped != I810_BUF_MAPPED)
+		return -EINVAL;
+
+	down_write(&current->mm->mmap_sem);
+	retcode = DO_MUNMAP(current->mm,
+			    (unsigned long)buf_priv->virtual,
+			    (size_t) buf->total);
+	up_write(&current->mm->mmap_sem);
+
+   	buf_priv->currently_mapped = I810_BUF_UNMAPPED;
+   	buf_priv->virtual = 0;
+
+	return retcode;
+}
+
+static int i810_dma_get_buffer(drm_device_t *dev, drm_i810_dma_t *d,
+			       struct file *filp)
+{
+	drm_file_t	  *priv	  = filp->private_data;
+	drm_buf_t	  *buf;
+	drm_i810_buf_priv_t *buf_priv;
+	int retcode = 0;
+
+	buf = i810_freelist_get(dev);
+	if (!buf) {
+		retcode = -ENOMEM;
+	   	DRM_DEBUG("retcode=%d\n", retcode);
+		return retcode;
+	}
+
+	retcode = i810_map_buffer(buf, filp);
+	if(retcode) {
+		i810_freelist_put(dev, buf);
+	   	DRM_ERROR("mapbuf failed, retcode %d\n", retcode);
+		return retcode;
+	}
+	buf->pid     = priv->pid;
+	buf_priv = buf->dev_private;
+	d->granted = 1;
+   	d->request_idx = buf->idx;
+   	d->request_size = buf->total;
+   	d->virtual = buf_priv->virtual;
+
+	return retcode;
+}
+
+static int i810_dma_cleanup(drm_device_t *dev)
+{
+	drm_device_dma_t *dma = dev->dma;
+
+	if(dev->dev_private) {
+		int i;
+	   	drm_i810_private_t *dev_priv =
+	     		(drm_i810_private_t *) dev->dev_private;
+
+	   	if(dev_priv->ring.virtual_start) {
+		   	DRM(ioremapfree)((void *) dev_priv->ring.virtual_start,
+					 dev_priv->ring.Size);
+		}
+	   	if(dev_priv->hw_status_page != 0UL) {
+		   	pci_free_consistent(dev->pdev, PAGE_SIZE,
+					    (void *)dev_priv->hw_status_page,
+					    dev_priv->dma_status_page);
+		   	/* Need to rewrite hardware status page */
+		   	I810_WRITE(0x02080, 0x1ffff000);
+		}
+	   	DRM(free)(dev->dev_private, sizeof(drm_i810_private_t),
+			 DRM_MEM_DRIVER);
+	   	dev->dev_private = NULL;
+
+		for (i = 0; i < dma->buf_count; i++) {
+			drm_buf_t *buf = dma->buflist[ i ];
+			drm_i810_buf_priv_t *buf_priv = buf->dev_private;
+			DRM(ioremapfree)(buf_priv->kernel_virtual, buf->total);
+		}
+	}
+   	return 0;
+}
+
+static int i810_wait_ring(drm_device_t *dev, int n)
+{
+   	drm_i810_private_t *dev_priv = dev->dev_private;
+   	drm_i810_ring_buffer_t *ring = &(dev_priv->ring);
+   	int iters = 0;
+   	unsigned long end;
+	unsigned int last_head = I810_READ(LP_RING + RING_HEAD) & HEAD_ADDR;
+
+	end = jiffies + (HZ*3);
+   	while (ring->space < n) {
+	   	ring->head = I810_READ(LP_RING + RING_HEAD) & HEAD_ADDR;
+	   	ring->space = ring->head - (ring->tail+8);
+		if (ring->space < 0) ring->space += ring->Size;
+
+		if (ring->head != last_head)
+		   end = jiffies + (HZ*3);
+
+	   	iters++;
+		if(time_before(end, jiffies)) {
+		   	DRM_ERROR("space: %d wanted %d\n", ring->space, n);
+		   	DRM_ERROR("lockup\n");
+		   	goto out_wait_ring;
+		}
+		udelay(1);
+	}
+
+out_wait_ring:
+   	return iters;
+}
+
+static void i810_kernel_lost_context(drm_device_t *dev)
+{
+      	drm_i810_private_t *dev_priv = dev->dev_private;
+   	drm_i810_ring_buffer_t *ring = &(dev_priv->ring);
+
+   	ring->head = I810_READ(LP_RING + RING_HEAD) & HEAD_ADDR;
+     	ring->tail = I810_READ(LP_RING + RING_TAIL);
+     	ring->space = ring->head - (ring->tail+8);
+     	if (ring->space < 0) ring->space += ring->Size;
+}
+
+static int i810_freelist_init(drm_device_t *dev, drm_i810_private_t *dev_priv)
+{
+      	drm_device_dma_t *dma = dev->dma;
+   	int my_idx = 24;
+   	u32 *hw_status = (u32 *)(dev_priv->hw_status_page + my_idx);
+   	int i;
+
+   	if(dma->buf_count > 1019) {
+	   	/* Not enough space in the status page for the freelist */
+	   	return -EINVAL;
+	}
+
+   	for (i = 0; i < dma->buf_count; i++) {
+	   	drm_buf_t *buf = dma->buflist[ i ];
+	   	drm_i810_buf_priv_t *buf_priv = buf->dev_private;
+
+	   	buf_priv->in_use = hw_status++;
+	   	buf_priv->my_use_idx = my_idx;
+	   	my_idx += 4;
+
+	   	*buf_priv->in_use = I810_BUF_FREE;
+
+		buf_priv->kernel_virtual = DRM(ioremap)(buf->bus_address,
+							buf->total);
+	}
+	return 0;
+}
+
+static int i810_dma_initialize(drm_device_t *dev,
+			       drm_i810_private_t *dev_priv,
+			       drm_i810_init_t *init)
+{
+	struct list_head *list;
+
+   	memset(dev_priv, 0, sizeof(drm_i810_private_t));
+
+	list_for_each(list, &dev->maplist->head) {
+		drm_map_list_t *r_list = (drm_map_list_t *)list;
+		if( r_list->map &&
+		    r_list->map->type == _DRM_SHM &&
+		    r_list->map->flags & _DRM_CONTAINS_LOCK ) {
+			dev_priv->sarea_map = r_list->map;
+ 			break;
+ 		}
+ 	}
+	if(!dev_priv->sarea_map) {
+		dev->dev_private = (void *)dev_priv;
+	   	i810_dma_cleanup(dev);
+	   	DRM_ERROR("can not find sarea!\n");
+	   	return -EINVAL;
+	}
+	DRM_FIND_MAP( dev_priv->mmio_map, init->mmio_offset );
+	if(!dev_priv->mmio_map) {
+		dev->dev_private = (void *)dev_priv;
+	   	i810_dma_cleanup(dev);
+	   	DRM_ERROR("can not find mmio map!\n");
+	   	return -EINVAL;
+	}
+	DRM_FIND_MAP( dev_priv->buffer_map, init->buffers_offset );
+	if(!dev_priv->buffer_map) {
+		dev->dev_private = (void *)dev_priv;
+	   	i810_dma_cleanup(dev);
+	   	DRM_ERROR("can not find dma buffer map!\n");
+	   	return -EINVAL;
+	}
+
+	dev_priv->sarea_priv = (drm_i810_sarea_t *)
+		((u8 *)dev_priv->sarea_map->handle +
+		 init->sarea_priv_offset);
+
+   	dev_priv->ring.Start = init->ring_start;
+   	dev_priv->ring.End = init->ring_end;
+   	dev_priv->ring.Size = init->ring_size;
+
+   	dev_priv->ring.virtual_start = DRM(ioremap)(dev->agp->base +
+						    init->ring_start,
+						    init->ring_size);
+
+   	if (dev_priv->ring.virtual_start == NULL) {
+		dev->dev_private = (void *) dev_priv;
+	   	i810_dma_cleanup(dev);
+	   	DRM_ERROR("can not ioremap virtual address for"
+			  " ring buffer\n");
+	   	return -ENOMEM;
+	}
+
+   	dev_priv->ring.tail_mask = dev_priv->ring.Size - 1;
+
+	dev_priv->w = init->w;
+	dev_priv->h = init->h;
+	dev_priv->pitch = init->pitch;
+	dev_priv->back_offset = init->back_offset;
+	dev_priv->depth_offset = init->depth_offset;
+
+	dev_priv->overlay_offset = init->overlay_offset;
+	dev_priv->overlay_physical = init->overlay_physical;
+
+	dev_priv->front_di1 = init->front_offset | init->pitch_bits;
+	dev_priv->back_di1 = init->back_offset | init->pitch_bits;
+	dev_priv->zi1 = init->depth_offset | init->pitch_bits;
+
+   	/* Program Hardware Status Page */
+   	dev_priv->hw_status_page =
+		(unsigned long) pci_alloc_consistent(dev->pdev, PAGE_SIZE,
+						&dev_priv->dma_status_page);
+   	if(dev_priv->hw_status_page == 0UL) {
+		dev->dev_private = (void *)dev_priv;
+		i810_dma_cleanup(dev);
+		DRM_ERROR("Can not allocate hardware status page\n");
+		return -ENOMEM;
+	}
+   	memset((void *) dev_priv->hw_status_page, 0, PAGE_SIZE);
+   	DRM_DEBUG("hw status page @ %lx\n", dev_priv->hw_status_page);
+
+	I810_WRITE(0x02080, dev_priv->dma_status_page);
+   	DRM_DEBUG("Enabled hardware status page\n");
+
+   	/* Now we need to init our freelist */
+   	if(i810_freelist_init(dev, dev_priv) != 0) {
+		dev->dev_private = (void *)dev_priv;
+	   	i810_dma_cleanup(dev);
+	   	DRM_ERROR("Not enough space in the status page for"
+			  " the freelist\n");
+	   	return -ENOMEM;
+	}
+	dev->dev_private = (void *)dev_priv;
+
+   	return 0;
+}
+
+int i810_dma_init(struct inode *inode, struct file *filp,
+		  unsigned int cmd, unsigned long arg)
+{
+   	drm_file_t *priv = filp->private_data;
+   	drm_device_t *dev = priv->dev;
+   	drm_i810_private_t *dev_priv;
+   	drm_i810_init_t init;
+   	int retcode = 0;
+
+  	if (copy_from_user(&init, (drm_i810_init_t *)arg, sizeof(init)))
+		return -EFAULT;
+
+   	switch(init.func) {
+	 	case I810_INIT_DMA:
+	   		dev_priv = DRM(alloc)(sizeof(drm_i810_private_t),
+					     DRM_MEM_DRIVER);
+	   		if(dev_priv == NULL) return -ENOMEM;
+	   		retcode = i810_dma_initialize(dev, dev_priv, &init);
+	   	break;
+	 	case I810_CLEANUP_DMA:
+	   		retcode = i810_dma_cleanup(dev);
+	   	break;
+	 	default:
+	   		retcode = -EINVAL;
+	   	break;
+	}
+
+   	return retcode;
+}
+
+
+
+/* Most efficient way to verify state for the i810 is as it is
+ * emitted.  Non-conformant state is silently dropped.
+ */
+static void i810EmitContextVerified( drm_device_t *dev,
+				     unsigned int *code )
+{
+   	drm_i810_private_t *dev_priv = dev->dev_private;
+	int i, j = 0;
+	RING_LOCALS;
+
+	BEGIN_LP_RING( I810_CTX_SETUP_SIZE );
+
+	OUT_RING( GFX_OP_COLOR_FACTOR );
+	OUT_RING( code[I810_CTXREG_CF1] );
+
+	OUT_RING( GFX_OP_STIPPLE );
+	OUT_RING( code[I810_CTXREG_ST1] );
+
+	for ( i = 4 ; i < I810_CTX_SETUP_SIZE ; i++ ) {
+		if ((code[i] & (7<<29)) == (3<<29) &&
+		    (code[i] & (0x1f<<24)) < (0x1d<<24))
+		{
+			OUT_RING( code[i] );
+			j++;
+		}
+		else printk("constext state dropped!!!\n");
+	}
+
+	if (j & 1)
+		OUT_RING( 0 );
+
+	ADVANCE_LP_RING();
+}
+
+static void i810EmitTexVerified( drm_device_t *dev,
+				 volatile unsigned int *code )
+{
+   	drm_i810_private_t *dev_priv = dev->dev_private;
+	int i, j = 0;
+	RING_LOCALS;
+
+	BEGIN_LP_RING( I810_TEX_SETUP_SIZE );
+
+	OUT_RING( GFX_OP_MAP_INFO );
+	OUT_RING( code[I810_TEXREG_MI1] );
+	OUT_RING( code[I810_TEXREG_MI2] );
+	OUT_RING( code[I810_TEXREG_MI3] );
+
+	for ( i = 4 ; i < I810_TEX_SETUP_SIZE ; i++ ) {
+
+		if ((code[i] & (7<<29)) == (3<<29) &&
+		    (code[i] & (0x1f<<24)) < (0x1d<<24))
+		{
+			OUT_RING( code[i] );
+			j++;
+		}
+		else printk("texture state dropped!!!\n");
+	}
+
+	if (j & 1)
+		OUT_RING( 0 );
+
+	ADVANCE_LP_RING();
+}
+
+
+/* Need to do some additional checking when setting the dest buffer.
+ */
+static void i810EmitDestVerified( drm_device_t *dev,
+				  volatile unsigned int *code )
+{
+   	drm_i810_private_t *dev_priv = dev->dev_private;
+	unsigned int tmp;
+	RING_LOCALS;
+
+	BEGIN_LP_RING( I810_DEST_SETUP_SIZE + 2 );
+
+	tmp = code[I810_DESTREG_DI1];
+	if (tmp == dev_priv->front_di1 || tmp == dev_priv->back_di1) {
+		OUT_RING( CMD_OP_DESTBUFFER_INFO );
+		OUT_RING( tmp );
+	} 
+	else
+	   printk("buffer state dropped\n");
+
+	/* invarient:
+	 */
+	OUT_RING( CMD_OP_Z_BUFFER_INFO );
+	OUT_RING( dev_priv->zi1 );
+
+	OUT_RING( GFX_OP_DESTBUFFER_VARS );
+	OUT_RING( code[I810_DESTREG_DV1] );
+
+	OUT_RING( GFX_OP_DRAWRECT_INFO );
+	OUT_RING( code[I810_DESTREG_DR1] );
+	OUT_RING( code[I810_DESTREG_DR2] );
+	OUT_RING( code[I810_DESTREG_DR3] );
+	OUT_RING( code[I810_DESTREG_DR4] );
+	OUT_RING( 0 );
+
+	ADVANCE_LP_RING();
+}
+
+
+
+static void i810EmitState( drm_device_t *dev )
+{
+   	drm_i810_private_t *dev_priv = dev->dev_private;
+      	drm_i810_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	unsigned int dirty = sarea_priv->dirty;
+
+	if (dirty & I810_UPLOAD_BUFFERS) {
+		i810EmitDestVerified( dev, sarea_priv->BufferState );
+		sarea_priv->dirty &= ~I810_UPLOAD_BUFFERS;
+	}
+
+	if (dirty & I810_UPLOAD_CTX) {
+		i810EmitContextVerified( dev, sarea_priv->ContextState );
+		sarea_priv->dirty &= ~I810_UPLOAD_CTX;
+	}
+
+	if (dirty & I810_UPLOAD_TEX0) {
+		i810EmitTexVerified( dev, sarea_priv->TexState[0] );
+		sarea_priv->dirty &= ~I810_UPLOAD_TEX0;
+	}
+
+	if (dirty & I810_UPLOAD_TEX1) {
+		i810EmitTexVerified( dev, sarea_priv->TexState[1] );
+		sarea_priv->dirty &= ~I810_UPLOAD_TEX1;
+	}
+}
+
+
+
+/* need to verify
+ */
+static void i810_dma_dispatch_clear( drm_device_t *dev, int flags,
+				     unsigned int clear_color,
+				     unsigned int clear_zval )
+{
+   	drm_i810_private_t *dev_priv = dev->dev_private;
+      	drm_i810_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	int nbox = sarea_priv->nbox;
+	drm_clip_rect_t *pbox = sarea_priv->boxes;
+	int pitch = dev_priv->pitch;
+	int cpp = 2;
+	int i;
+	RING_LOCALS;
+
+  	i810_kernel_lost_context(dev);
+
+      	if (nbox > I810_NR_SAREA_CLIPRECTS)
+     		nbox = I810_NR_SAREA_CLIPRECTS;
+
+	for (i = 0 ; i < nbox ; i++, pbox++) {
+		unsigned int x = pbox->x1;
+		unsigned int y = pbox->y1;
+		unsigned int width = (pbox->x2 - x) * cpp;
+		unsigned int height = pbox->y2 - y;
+		unsigned int start = y * pitch + x * cpp;
+
+		if (pbox->x1 > pbox->x2 ||
+		    pbox->y1 > pbox->y2 ||
+		    pbox->x2 > dev_priv->w ||
+		    pbox->y2 > dev_priv->h)
+			continue;
+
+	   	if ( flags & I810_FRONT ) {
+			BEGIN_LP_RING( 6 );
+			OUT_RING( BR00_BITBLT_CLIENT |
+				  BR00_OP_COLOR_BLT | 0x3 );
+			OUT_RING( BR13_SOLID_PATTERN | (0xF0 << 16) | pitch );
+			OUT_RING( (height << 16) | width );
+			OUT_RING( start );
+			OUT_RING( clear_color );
+			OUT_RING( 0 );
+			ADVANCE_LP_RING();
+		}
+
+		if ( flags & I810_BACK ) {
+			BEGIN_LP_RING( 6 );
+			OUT_RING( BR00_BITBLT_CLIENT |
+				  BR00_OP_COLOR_BLT | 0x3 );
+			OUT_RING( BR13_SOLID_PATTERN | (0xF0 << 16) | pitch );
+			OUT_RING( (height << 16) | width );
+			OUT_RING( dev_priv->back_offset + start );
+			OUT_RING( clear_color );
+			OUT_RING( 0 );
+			ADVANCE_LP_RING();
+		}
+
+		if ( flags & I810_DEPTH ) {
+			BEGIN_LP_RING( 6 );
+			OUT_RING( BR00_BITBLT_CLIENT |
+				  BR00_OP_COLOR_BLT | 0x3 );
+			OUT_RING( BR13_SOLID_PATTERN | (0xF0 << 16) | pitch );
+			OUT_RING( (height << 16) | width );
+			OUT_RING( dev_priv->depth_offset + start );
+			OUT_RING( clear_zval );
+			OUT_RING( 0 );
+			ADVANCE_LP_RING();
+		}
+	}
+}
+
+static void i810_dma_dispatch_swap( drm_device_t *dev )
+{
+   	drm_i810_private_t *dev_priv = dev->dev_private;
+      	drm_i810_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	int nbox = sarea_priv->nbox;
+	drm_clip_rect_t *pbox = sarea_priv->boxes;
+	int pitch = dev_priv->pitch;
+	int cpp = 2;
+	int ofs = dev_priv->back_offset;
+	int i;
+	RING_LOCALS;
+
+  	i810_kernel_lost_context(dev);
+
+      	if (nbox > I810_NR_SAREA_CLIPRECTS)
+     		nbox = I810_NR_SAREA_CLIPRECTS;
+
+	for (i = 0 ; i < nbox; i++, pbox++)
+	{
+		unsigned int w = pbox->x2 - pbox->x1;
+		unsigned int h = pbox->y2 - pbox->y1;
+		unsigned int dst = pbox->x1*cpp + pbox->y1*pitch;
+		unsigned int start = ofs + dst;
+
+		if (pbox->x1 > pbox->x2 ||
+		    pbox->y1 > pbox->y2 ||
+		    pbox->x2 > dev_priv->w ||
+		    pbox->y2 > dev_priv->h)
+			continue;
+
+		BEGIN_LP_RING( 6 );
+		OUT_RING( BR00_BITBLT_CLIENT | BR00_OP_SRC_COPY_BLT | 0x4 );
+		OUT_RING( pitch | (0xCC << 16));
+		OUT_RING( (h << 16) | (w * cpp));
+		OUT_RING( dst );
+		OUT_RING( pitch );
+		OUT_RING( start );
+		ADVANCE_LP_RING();
+	}
+}
+
+
+static void i810_dma_dispatch_vertex(drm_device_t *dev,
+				     drm_buf_t *buf,
+				     int discard,
+				     int used)
+{
+   	drm_i810_private_t *dev_priv = dev->dev_private;
+	drm_i810_buf_priv_t *buf_priv = buf->dev_private;
+   	drm_i810_sarea_t *sarea_priv = dev_priv->sarea_priv;
+   	drm_clip_rect_t *box = sarea_priv->boxes;
+   	int nbox = sarea_priv->nbox;
+	unsigned long address = (unsigned long)buf->bus_address;
+	unsigned long start = address - dev->agp->base;
+	int i = 0;
+   	RING_LOCALS;
+
+   	i810_kernel_lost_context(dev);
+
+   	if (nbox > I810_NR_SAREA_CLIPRECTS)
+		nbox = I810_NR_SAREA_CLIPRECTS;
+
+	if (used > 4*1024)
+		used = 0;
+
+	if (sarea_priv->dirty)
+	   i810EmitState( dev );
+
+	if (buf_priv->currently_mapped == I810_BUF_MAPPED) {
+		unsigned int prim = (sarea_priv->vertex_prim & PR_MASK);
+
+		*(u32 *)buf_priv->virtual = (GFX_OP_PRIMITIVE | prim | 
+					     ((used/4)-2));
+
+		if (used & 4) {
+			*(u32 *)((u32)buf_priv->virtual + used) = 0;
+			used += 4;
+		}
+
+		i810_unmap_buffer(buf);
+	}
+
+	if (used) {
+		do {
+			if (i < nbox) {
+				BEGIN_LP_RING(4);
+				OUT_RING( GFX_OP_SCISSOR | SC_UPDATE_SCISSOR |
+					  SC_ENABLE );
+				OUT_RING( GFX_OP_SCISSOR_INFO );
+				OUT_RING( box[i].x1 | (box[i].y1<<16) );
+				OUT_RING( (box[i].x2-1) | ((box[i].y2-1)<<16) );
+				ADVANCE_LP_RING();
+			}
+
+			BEGIN_LP_RING(4);
+			OUT_RING( CMD_OP_BATCH_BUFFER );
+			OUT_RING( start | BB1_PROTECTED );
+			OUT_RING( start + used - 4 );
+			OUT_RING( 0 );
+			ADVANCE_LP_RING();
+
+		} while (++i < nbox);
+	}
+
+	if (discard) {
+		dev_priv->counter++;
+
+		(void) cmpxchg(buf_priv->in_use, I810_BUF_CLIENT,
+			       I810_BUF_HARDWARE);
+
+		BEGIN_LP_RING(8);
+		OUT_RING( CMD_STORE_DWORD_IDX );
+		OUT_RING( 20 );
+		OUT_RING( dev_priv->counter );
+		OUT_RING( CMD_STORE_DWORD_IDX );
+		OUT_RING( buf_priv->my_use_idx );
+		OUT_RING( I810_BUF_FREE );
+		OUT_RING( CMD_REPORT_HEAD );
+		OUT_RING( 0 );
+		ADVANCE_LP_RING();
+	}
+}
+
+
+void i810_dma_quiescent(drm_device_t *dev)
+{
+      	drm_i810_private_t *dev_priv = dev->dev_private;
+   	RING_LOCALS;
+
+/*  	printk("%s\n", __FUNCTION__); */
+
+  	i810_kernel_lost_context(dev);
+
+   	BEGIN_LP_RING(4);
+   	OUT_RING( INST_PARSER_CLIENT | INST_OP_FLUSH | INST_FLUSH_MAP_CACHE );
+   	OUT_RING( CMD_REPORT_HEAD );
+      	OUT_RING( 0 );
+      	OUT_RING( 0 );
+   	ADVANCE_LP_RING();
+
+	i810_wait_ring( dev, dev_priv->ring.Size - 8 );
+}
+
+static int i810_flush_queue(drm_device_t *dev)
+{
+   	drm_i810_private_t *dev_priv = dev->dev_private;
+	drm_device_dma_t *dma = dev->dma;
+   	int i, ret = 0;
+   	RING_LOCALS;
+	
+/*  	printk("%s\n", __FUNCTION__); */
+
+   	i810_kernel_lost_context(dev);
+
+   	BEGIN_LP_RING(2);
+      	OUT_RING( CMD_REPORT_HEAD );
+      	OUT_RING( 0 );
+      	ADVANCE_LP_RING();
+
+	i810_wait_ring( dev, dev_priv->ring.Size - 8 );
+
+   	for (i = 0; i < dma->buf_count; i++) {
+	   	drm_buf_t *buf = dma->buflist[ i ];
+	   	drm_i810_buf_priv_t *buf_priv = buf->dev_private;
+
+		int used = cmpxchg(buf_priv->in_use, I810_BUF_HARDWARE,
+				   I810_BUF_FREE);
+
+		if (used == I810_BUF_HARDWARE)
+			DRM_DEBUG("reclaimed from HARDWARE\n");
+		if (used == I810_BUF_CLIENT)
+			DRM_DEBUG("still on client\n");
+	}
+
+   	return ret;
+}
+
+/* Must be called with the lock held */
+void i810_reclaim_buffers(drm_device_t *dev, pid_t pid)
+{
+	drm_device_dma_t *dma = dev->dma;
+	int		 i;
+
+	if (!dma) return;
+      	if (!dev->dev_private) return;
+	if (!dma->buflist) return;
+
+        i810_flush_queue(dev);
+
+	for (i = 0; i < dma->buf_count; i++) {
+	   	drm_buf_t *buf = dma->buflist[ i ];
+	   	drm_i810_buf_priv_t *buf_priv = buf->dev_private;
+
+		if (buf->pid == pid && buf_priv) {
+			int used = cmpxchg(buf_priv->in_use, I810_BUF_CLIENT,
+					   I810_BUF_FREE);
+
+			if (used == I810_BUF_CLIENT)
+				DRM_DEBUG("reclaimed from client\n");
+		   	if(buf_priv->currently_mapped == I810_BUF_MAPPED)
+		     		buf_priv->currently_mapped = I810_BUF_UNMAPPED;
+		}
+	}
+}
+
+int i810_flush_ioctl(struct inode *inode, struct file *filp,
+		     unsigned int cmd, unsigned long arg)
+{
+   	drm_file_t	  *priv	  = filp->private_data;
+   	drm_device_t	  *dev	  = priv->dev;
+
+   	if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
+		DRM_ERROR("i810_flush_ioctl called without lock held\n");
+		return -EINVAL;
+	}
+
+   	i810_flush_queue(dev);
+   	return 0;
+}
+
+
+int i810_dma_vertex(struct inode *inode, struct file *filp,
+	       unsigned int cmd, unsigned long arg)
+{
+	drm_file_t *priv = filp->private_data;
+	drm_device_t *dev = priv->dev;
+	drm_device_dma_t *dma = dev->dma;
+   	drm_i810_private_t *dev_priv = (drm_i810_private_t *)dev->dev_private;
+      	u32 *hw_status = (u32 *)dev_priv->hw_status_page;
+   	drm_i810_sarea_t *sarea_priv = (drm_i810_sarea_t *)
+     					dev_priv->sarea_priv;
+	drm_i810_vertex_t vertex;
+
+	if (copy_from_user(&vertex, (drm_i810_vertex_t *)arg, sizeof(vertex)))
+		return -EFAULT;
+
+   	if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
+		DRM_ERROR("i810_dma_vertex called without lock held\n");
+		return -EINVAL;
+	}
+
+	if(vertex.idx < 0 || vertex.idx > dma->buf_count) return -EINVAL;
+
+	i810_dma_dispatch_vertex( dev,
+				  dma->buflist[ vertex.idx ],
+				  vertex.discard, vertex.used );
+
+   	atomic_add(vertex.used, &dev->counts[_DRM_STAT_SECONDARY]);
+	atomic_inc(&dev->counts[_DRM_STAT_DMA]);
+	sarea_priv->last_enqueue = dev_priv->counter-1;
+   	sarea_priv->last_dispatch = (int) hw_status[5];
+
+	return 0;
+}
+
+
+
+int i810_clear_bufs(struct inode *inode, struct file *filp,
+		   unsigned int cmd, unsigned long arg)
+{
+	drm_file_t *priv = filp->private_data;
+	drm_device_t *dev = priv->dev;
+	drm_i810_clear_t clear;
+
+   	if (copy_from_user(&clear, (drm_i810_clear_t *)arg, sizeof(clear)))
+		return -EFAULT;
+
+   	if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
+		DRM_ERROR("i810_clear_bufs called without lock held\n");
+		return -EINVAL;
+	}
+
+ 	/* GH: Someone's doing nasty things... */
+ 	if (!dev->dev_private) {
+ 		return -EINVAL;
+ 	}
+
+	i810_dma_dispatch_clear( dev, clear.flags,
+				 clear.clear_color,
+				 clear.clear_depth );
+   	return 0;
+}
+
+int i810_swap_bufs(struct inode *inode, struct file *filp,
+		  unsigned int cmd, unsigned long arg)
+{
+	drm_file_t *priv = filp->private_data;
+	drm_device_t *dev = priv->dev;
+
+   	if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
+		DRM_ERROR("i810_swap_buf called without lock held\n");
+		return -EINVAL;
+	}
+
+	i810_dma_dispatch_swap( dev );
+   	return 0;
+}
+
+int i810_getage(struct inode *inode, struct file *filp, unsigned int cmd,
+		unsigned long arg)
+{
+   	drm_file_t	  *priv	    = filp->private_data;
+	drm_device_t	  *dev	    = priv->dev;
+   	drm_i810_private_t *dev_priv = (drm_i810_private_t *)dev->dev_private;
+      	u32 *hw_status = (u32 *)dev_priv->hw_status_page;
+   	drm_i810_sarea_t *sarea_priv = (drm_i810_sarea_t *)
+     					dev_priv->sarea_priv;
+
+      	sarea_priv->last_dispatch = (int) hw_status[5];
+	return 0;
+}
+
+int i810_getbuf(struct inode *inode, struct file *filp, unsigned int cmd,
+		unsigned long arg)
+{
+	drm_file_t	  *priv	    = filp->private_data;
+	drm_device_t	  *dev	    = priv->dev;
+	int		  retcode   = 0;
+	drm_i810_dma_t	  d;
+   	drm_i810_private_t *dev_priv = (drm_i810_private_t *)dev->dev_private;
+   	u32 *hw_status = (u32 *)dev_priv->hw_status_page;
+   	drm_i810_sarea_t *sarea_priv = (drm_i810_sarea_t *)
+     					dev_priv->sarea_priv;
+
+   	if (copy_from_user(&d, (drm_i810_dma_t *)arg, sizeof(d)))
+		return -EFAULT;
+
+	if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
+		DRM_ERROR("i810_dma called without lock held\n");
+		return -EINVAL;
+	}
+
+	d.granted = 0;
+
+	retcode = i810_dma_get_buffer(dev, &d, filp);
+
+	if (copy_to_user((drm_dma_t *)arg, &d, sizeof(d)))
+		return -EFAULT;
+   	sarea_priv->last_dispatch = (int) hw_status[5];
+
+	return retcode;
+}
+
+int i810_copybuf(struct inode *inode,
+		 struct file *filp, 
+		 unsigned int cmd,
+		 unsigned long arg)
+{
+	/* Never copy - 2.4.x doesn't need it */
+	return 0;
+}
+
+int i810_docopy(struct inode *inode, struct file *filp, unsigned int cmd,
+		unsigned long arg)
+{
+	/* Never copy - 2.4.x doesn't need it */
+	return 0;
+}
+
+static void i810_dma_dispatch_mc(drm_device_t *dev, drm_buf_t *buf, int used,
+		unsigned int last_render)
+{
+	drm_i810_private_t *dev_priv = dev->dev_private;
+	drm_i810_buf_priv_t *buf_priv = buf->dev_private;
+	drm_i810_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	unsigned long address = (unsigned long)buf->bus_address;
+	unsigned long start = address - dev->agp->base;
+	int u;
+	RING_LOCALS;
+
+	i810_kernel_lost_context(dev);
+
+	u = cmpxchg(buf_priv->in_use, I810_BUF_CLIENT,
+		I810_BUF_HARDWARE);
+	if(u != I810_BUF_CLIENT) {
+		DRM_DEBUG("MC found buffer that isn't mine!\n");
+	}
+
+	if (used > 4*1024)
+		used = 0;
+
+	sarea_priv->dirty = 0x7f;
+
+	DRM_DEBUG("dispatch mc addr 0x%lx, used 0x%x\n",
+		address, used);
+
+	dev_priv->counter++;
+	DRM_DEBUG("dispatch counter : %ld\n", dev_priv->counter);
+	DRM_DEBUG("i810_dma_dispatch_mc\n");
+	DRM_DEBUG("start : %lx\n", start);
+	DRM_DEBUG("used : %d\n", used);
+	DRM_DEBUG("start + used - 4 : %ld\n", start + used - 4);
+
+	if (buf_priv->currently_mapped == I810_BUF_MAPPED) {
+		if (used & 4) {
+			*(u32 *)((u32)buf_priv->virtual + used) = 0;
+			used += 4;
+		}
+
+		i810_unmap_buffer(buf);
+	}
+	BEGIN_LP_RING(4);
+	OUT_RING( CMD_OP_BATCH_BUFFER );
+	OUT_RING( start | BB1_PROTECTED );
+	OUT_RING( start + used - 4 );
+	OUT_RING( 0 );
+	ADVANCE_LP_RING();
+
+
+	BEGIN_LP_RING(8);
+	OUT_RING( CMD_STORE_DWORD_IDX );
+	OUT_RING( buf_priv->my_use_idx );
+	OUT_RING( I810_BUF_FREE );
+	OUT_RING( 0 );
+
+	OUT_RING( CMD_STORE_DWORD_IDX );
+	OUT_RING( 16 );
+	OUT_RING( last_render );
+	OUT_RING( 0 );
+	ADVANCE_LP_RING();
+}
+
+int i810_dma_mc(struct inode *inode, struct file *filp,
+	unsigned int cmd, unsigned long arg)
+{
+	drm_file_t *priv = filp->private_data;
+	drm_device_t *dev = priv->dev;
+	drm_device_dma_t *dma = dev->dma;
+	drm_i810_private_t *dev_priv = (drm_i810_private_t *)dev->dev_private;
+	u32 *hw_status = (u32 *)dev_priv->hw_status_page;
+	drm_i810_sarea_t *sarea_priv = (drm_i810_sarea_t *)
+		dev_priv->sarea_priv;
+	drm_i810_mc_t mc;
+
+	if (copy_from_user(&mc, (drm_i810_mc_t *)arg, sizeof(mc)))
+		return -EFAULT;
+
+
+	if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
+		DRM_ERROR("i810_dma_mc called without lock held\n");
+		return -EINVAL;
+	}
+
+	i810_dma_dispatch_mc(dev, dma->buflist[mc.idx], mc.used,
+		mc.last_render );
+
+	atomic_add(mc.used, &dev->counts[_DRM_STAT_SECONDARY]);
+	atomic_inc(&dev->counts[_DRM_STAT_DMA]);
+	sarea_priv->last_enqueue = dev_priv->counter-1;
+	sarea_priv->last_dispatch = (int) hw_status[5];
+
+	return 0;
+}
+
+int i810_rstatus(struct inode *inode, struct file *filp,
+		unsigned int cmd, unsigned long arg)
+{
+	drm_file_t *priv = filp->private_data;
+	drm_device_t *dev = priv->dev;
+	drm_i810_private_t *dev_priv = (drm_i810_private_t *)dev->dev_private;
+
+	return (int)(((u32 *)(dev_priv->hw_status_page))[4]);
+}
+
+int i810_ov0_info(struct inode *inode, struct file *filp,
+		unsigned int cmd, unsigned long arg)
+{
+	drm_file_t *priv = filp->private_data;
+	drm_device_t *dev = priv->dev;
+	drm_i810_private_t *dev_priv = (drm_i810_private_t *)dev->dev_private;
+	drm_i810_overlay_t data;
+
+	data.offset = dev_priv->overlay_offset;
+	data.physical = dev_priv->overlay_physical;
+	if (copy_to_user((drm_i810_overlay_t *)arg,&data,sizeof(data)))
+		return -EFAULT;
+	return 0;
+}
+
+int i810_fstatus(struct inode *inode, struct file *filp,
+		unsigned int cmd, unsigned long arg)
+{
+	drm_file_t *priv = filp->private_data;
+	drm_device_t *dev = priv->dev;
+	drm_i810_private_t *dev_priv = (drm_i810_private_t *)dev->dev_private;
+
+	if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
+		DRM_ERROR("i810_fstatus called without lock held\n");
+		return -EINVAL;
+	}
+	return I810_READ(0x30008);
+}
+
+int i810_ov0_flip(struct inode *inode, struct file *filp,
+		unsigned int cmd, unsigned long arg)
+{
+	drm_file_t *priv = filp->private_data;
+	drm_device_t *dev = priv->dev;
+	drm_i810_private_t *dev_priv = (drm_i810_private_t *)dev->dev_private;
+
+	if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
+		DRM_ERROR("i810_ov0_flip called without lock held\n");
+		return -EINVAL;
+	}
+
+	//Tell the overlay to update
+	I810_WRITE(0x30000,dev_priv->overlay_physical | 0x80000000);
+
+	return 0;
+}
+
+
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/i810_drm.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/i810_drm.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/i810_drm.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/i810_drm.h	2003-07-30 11:18:33.000000000 +0200
@@ -0,0 +1,248 @@
+#ifndef _I810_DRM_H_
+#define _I810_DRM_H_
+
+/* WARNING: These defines must be the same as what the Xserver uses.
+ * if you change them, you must change the defines in the Xserver.
+ */
+
+#ifndef _I810_DEFINES_
+#define _I810_DEFINES_
+
+#define I810_DMA_BUF_ORDER		12
+#define I810_DMA_BUF_SZ 		(1<<I810_DMA_BUF_ORDER)
+#define I810_DMA_BUF_NR 		256
+#define I810_NR_SAREA_CLIPRECTS 	8
+
+/* Each region is a minimum of 64k, and there are at most 64 of them.
+ */
+#define I810_NR_TEX_REGIONS 64
+#define I810_LOG_MIN_TEX_REGION_SIZE 16
+#endif
+
+#define I810_UPLOAD_TEX0IMAGE  0x1 /* handled clientside */
+#define I810_UPLOAD_TEX1IMAGE  0x2 /* handled clientside */
+#define I810_UPLOAD_CTX        0x4
+#define I810_UPLOAD_BUFFERS    0x8
+#define I810_UPLOAD_TEX0       0x10
+#define I810_UPLOAD_TEX1       0x20
+#define I810_UPLOAD_CLIPRECTS  0x40
+
+
+/* Indices into buf.Setup where various bits of state are mirrored per
+ * context and per buffer.  These can be fired at the card as a unit,
+ * or in a piecewise fashion as required.
+ */
+
+/* Destbuffer state 
+ *    - backbuffer linear offset and pitch -- invarient in the current dri
+ *    - zbuffer linear offset and pitch -- also invarient
+ *    - drawing origin in back and depth buffers.
+ *
+ * Keep the depth/back buffer state here to acommodate private buffers
+ * in the future.
+ */
+#define I810_DESTREG_DI0  0	/* CMD_OP_DESTBUFFER_INFO (2 dwords) */
+#define I810_DESTREG_DI1  1
+#define I810_DESTREG_DV0  2	/* GFX_OP_DESTBUFFER_VARS (2 dwords) */
+#define I810_DESTREG_DV1  3
+#define I810_DESTREG_DR0  4	/* GFX_OP_DRAWRECT_INFO (4 dwords) */
+#define I810_DESTREG_DR1  5
+#define I810_DESTREG_DR2  6
+#define I810_DESTREG_DR3  7
+#define I810_DESTREG_DR4  8
+#define I810_DEST_SETUP_SIZE 10
+
+/* Context state
+ */
+#define I810_CTXREG_CF0   0	/* GFX_OP_COLOR_FACTOR */
+#define I810_CTXREG_CF1   1	
+#define I810_CTXREG_ST0   2     /* GFX_OP_STIPPLE */
+#define I810_CTXREG_ST1   3
+#define I810_CTXREG_VF    4	/* GFX_OP_VERTEX_FMT */
+#define I810_CTXREG_MT    5	/* GFX_OP_MAP_TEXELS */
+#define I810_CTXREG_MC0   6	/* GFX_OP_MAP_COLOR_STAGES - stage 0 */
+#define I810_CTXREG_MC1   7     /* GFX_OP_MAP_COLOR_STAGES - stage 1 */
+#define I810_CTXREG_MC2   8	/* GFX_OP_MAP_COLOR_STAGES - stage 2 */
+#define I810_CTXREG_MA0   9	/* GFX_OP_MAP_ALPHA_STAGES - stage 0 */
+#define I810_CTXREG_MA1   10	/* GFX_OP_MAP_ALPHA_STAGES - stage 1 */
+#define I810_CTXREG_MA2   11	/* GFX_OP_MAP_ALPHA_STAGES - stage 2 */
+#define I810_CTXREG_SDM   12	/* GFX_OP_SRC_DEST_MONO */
+#define I810_CTXREG_FOG   13	/* GFX_OP_FOG_COLOR */
+#define I810_CTXREG_B1    14	/* GFX_OP_BOOL_1 */
+#define I810_CTXREG_B2    15	/* GFX_OP_BOOL_2 */
+#define I810_CTXREG_LCS   16	/* GFX_OP_LINEWIDTH_CULL_SHADE_MODE */
+#define I810_CTXREG_PV    17	/* GFX_OP_PV_RULE -- Invarient! */
+#define I810_CTXREG_ZA    18	/* GFX_OP_ZBIAS_ALPHAFUNC */
+#define I810_CTXREG_AA    19	/* GFX_OP_ANTIALIAS */
+#define I810_CTX_SETUP_SIZE 20 
+
+/* Texture state (per tex unit)
+ */
+#define I810_TEXREG_MI0  0	/* GFX_OP_MAP_INFO (4 dwords) */
+#define I810_TEXREG_MI1  1	
+#define I810_TEXREG_MI2  2	
+#define I810_TEXREG_MI3  3	
+#define I810_TEXREG_MF   4	/* GFX_OP_MAP_FILTER */
+#define I810_TEXREG_MLC  5	/* GFX_OP_MAP_LOD_CTL */
+#define I810_TEXREG_MLL  6	/* GFX_OP_MAP_LOD_LIMITS */
+#define I810_TEXREG_MCS  7	/* GFX_OP_MAP_COORD_SETS ??? */
+#define I810_TEX_SETUP_SIZE 8
+
+/* Flags for clear ioctl
+ */
+#define I810_FRONT   0x1
+#define I810_BACK    0x2
+#define I810_DEPTH   0x4
+
+
+typedef struct _drm_i810_init {
+	enum {
+		I810_INIT_DMA = 0x01,
+		I810_CLEANUP_DMA = 0x02
+	} func;
+#if CONFIG_XFREE86_VERSION < XFREE86_VERSION(4,1,0,0)
+	int ring_map_idx;
+	int buffer_map_idx;
+#else
+	unsigned int mmio_offset;
+	unsigned int buffers_offset;
+#endif
+	int sarea_priv_offset;
+	unsigned int ring_start;
+	unsigned int ring_end;
+	unsigned int ring_size;
+	unsigned int front_offset;
+	unsigned int back_offset;
+	unsigned int depth_offset;
+	unsigned int overlay_offset;
+	unsigned int overlay_physical;
+	unsigned int w;
+	unsigned int h;
+	unsigned int pitch;
+	unsigned int pitch_bits; 
+} drm_i810_init_t;
+
+/* Warning: If you change the SAREA structure you must change the Xserver
+ * structure as well */
+
+typedef struct _drm_i810_tex_region {
+	unsigned char next, prev; /* indices to form a circular LRU  */
+	unsigned char in_use;	/* owned by a client, or free? */
+	int age;		/* tracked by clients to update local LRU's */
+} drm_i810_tex_region_t;
+
+typedef struct _drm_i810_sarea {
+   	unsigned int ContextState[I810_CTX_SETUP_SIZE];
+   	unsigned int BufferState[I810_DEST_SETUP_SIZE];
+   	unsigned int TexState[2][I810_TEX_SETUP_SIZE];
+   	unsigned int dirty;
+
+	unsigned int nbox;
+	drm_clip_rect_t boxes[I810_NR_SAREA_CLIPRECTS];
+
+	/* Maintain an LRU of contiguous regions of texture space.  If
+	 * you think you own a region of texture memory, and it has an
+	 * age different to the one you set, then you are mistaken and
+	 * it has been stolen by another client.  If global texAge
+	 * hasn't changed, there is no need to walk the list.
+	 *
+	 * These regions can be used as a proxy for the fine-grained
+	 * texture information of other clients - by maintaining them
+	 * in the same lru which is used to age their own textures,
+	 * clients have an approximate lru for the whole of global
+	 * texture space, and can make informed decisions as to which
+	 * areas to kick out.  There is no need to choose whether to
+	 * kick out your own texture or someone else's - simply eject
+	 * them all in LRU order.  
+	 */
+   
+	drm_i810_tex_region_t texList[I810_NR_TEX_REGIONS+1]; 
+				/* Last elt is sentinal */
+        int texAge;		/* last time texture was uploaded */
+        int last_enqueue;	/* last time a buffer was enqueued */
+	int last_dispatch;	/* age of the most recently dispatched buffer */
+	int last_quiescent;     /*  */
+	int ctxOwner;		/* last context to upload state */
+
+	int vertex_prim;
+
+} drm_i810_sarea_t;
+
+/* WARNING: If you change any of these defines, make sure to change the
+ * defines in the Xserver file (xf86drmMga.h)
+ */
+
+/* i810 specific ioctls
+ * The device specific ioctl range is 0x40 to 0x79.
+ */
+#define DRM_IOCTL_I810_INIT		DRM_IOW( 0x40, drm_i810_init_t)
+#define DRM_IOCTL_I810_VERTEX		DRM_IOW( 0x41, drm_i810_vertex_t)
+#define DRM_IOCTL_I810_CLEAR		DRM_IOW( 0x42, drm_i810_clear_t)
+#define DRM_IOCTL_I810_FLUSH		DRM_IO(  0x43)
+#define DRM_IOCTL_I810_GETAGE		DRM_IO(  0x44)
+#define DRM_IOCTL_I810_GETBUF		DRM_IOWR(0x45, drm_i810_dma_t)
+#define DRM_IOCTL_I810_SWAP		DRM_IO(  0x46)
+#define DRM_IOCTL_I810_COPY		DRM_IOW( 0x47, drm_i810_copy_t)
+#define DRM_IOCTL_I810_DOCOPY		DRM_IO(  0x48)
+#define DRM_IOCTL_I810_OV0INFO		DRM_IOR( 0x49, drm_i810_overlay_t)
+#define DRM_IOCTL_I810_FSTATUS		DRM_IO ( 0x4a)
+#define DRM_IOCTL_I810_OV0FLIP		DRM_IO ( 0x4b)
+#define DRM_IOCTL_I810_MC		DRM_IOW( 0x4c, drm_i810_mc_t)
+#define DRM_IOCTL_I810_RSTATUS		DRM_IO ( 0x4d )
+
+typedef struct _drm_i810_clear {
+	int clear_color;
+	int clear_depth;
+	int flags;
+} drm_i810_clear_t;
+
+/* These may be placeholders if we have more cliprects than
+ * I810_NR_SAREA_CLIPRECTS.  In that case, the client sets discard to
+ * false, indicating that the buffer will be dispatched again with a
+ * new set of cliprects.
+ */
+typedef struct _drm_i810_vertex {
+   	int idx;		/* buffer index */
+	int used;		/* nr bytes in use */
+	int discard;		/* client is finished with the buffer? */
+} drm_i810_vertex_t;
+
+typedef struct _drm_i810_copy_t {
+   	int idx;		/* buffer index */
+	int used;		/* nr bytes in use */
+	void *address;		/* Address to copy from */
+} drm_i810_copy_t;
+
+#define PR_TRIANGLES         (0x0<<18)
+#define PR_TRISTRIP_0        (0x1<<18)
+#define PR_TRISTRIP_1        (0x2<<18)
+#define PR_TRIFAN            (0x3<<18)
+#define PR_POLYGON           (0x4<<18)
+#define PR_LINES             (0x5<<18)
+#define PR_LINESTRIP         (0x6<<18)
+#define PR_RECTS             (0x7<<18)
+#define PR_MASK              (0x7<<18)
+
+
+typedef struct drm_i810_dma {
+	void *virtual;
+	int request_idx;
+	int request_size;
+	int granted;
+} drm_i810_dma_t;
+
+typedef struct _drm_i810_overlay_t {
+	unsigned int offset;    /* Address of the Overlay Regs */
+	unsigned int physical;
+} drm_i810_overlay_t;
+
+typedef struct _drm_i810_mc {
+	int idx;                /* buffer index */
+	int used;               /* nr bytes in use */
+	int num_blocks;         /* number of GFXBlocks */
+	int *length;            /* List of lengths for GFXBlocks (FUTURE)*/
+	unsigned int last_render; /* Last Render Request */
+} drm_i810_mc_t;
+
+
+#endif /* _I810_DRM_H_ */
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/i810_drv.c linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/i810_drv.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/i810_drv.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/i810_drv.c	2003-07-30 11:18:33.000000000 +0200
@@ -0,0 +1,56 @@
+/* i810_drv.c -- I810 driver -*- linux-c -*-
+ * Created: Mon Dec 13 01:56:22 1999 by jhartmann@precisioninsight.com
+ *
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Rickard E. (Rik) Faith <faith@valinux.com>
+ *    Jeff Hartmann <jhartmann@valinux.com>
+ *    Gareth Hughes <gareth@valinux.com>
+ */
+
+#include <linux/config.h>
+#include "i810.h"
+#include "drmP.h"
+#include "drm.h"
+#include "i810_drm.h"
+#include "i810_drv.h"
+
+#include "drm_agpsupport.h"
+#include "drm_auth.h"
+#include "drm_bufs.h"
+#include "drm_context.h"
+#include "drm_dma.h"
+#include "drm_drawable.h"
+#include "drm_drv.h"
+
+#include "drm_fops.h"
+#include "drm_init.h"
+#include "drm_ioctl.h"
+#include "drm_lock.h"
+#include "drm_lists.h"
+#include "drm_memory.h"
+#include "drm_proc.h"
+#include "drm_vm.h"
+#include "drm_stub.h"
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/i810_drv.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/i810_drv.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/i810_drv.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/i810_drv.h	2003-07-30 11:18:33.000000000 +0200
@@ -0,0 +1,237 @@
+/* i810_drv.h -- Private header for the Matrox g200/g400 driver -*- linux-c -*-
+ * Created: Mon Dec 13 01:50:01 1999 by jhartmann@precisioninsight.com
+ *
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Authors: Rickard E. (Rik) Faith <faith@valinux.com>
+ * 	    Jeff Hartmann <jhartmann@valinux.com>
+ *
+ */
+
+#ifndef _I810_DRV_H_
+#define _I810_DRV_H_
+
+typedef struct drm_i810_buf_priv {
+   	u32 *in_use;
+   	int my_use_idx;
+	int currently_mapped;
+	void *virtual;
+	void *kernel_virtual;
+	int map_count;
+   	struct vm_area_struct *vma;
+} drm_i810_buf_priv_t;
+
+typedef struct _drm_i810_ring_buffer{
+	int tail_mask;
+	unsigned long Start;
+	unsigned long End;
+	unsigned long Size;
+	u8 *virtual_start;
+	int head;
+	int tail;
+	int space;
+} drm_i810_ring_buffer_t;
+
+typedef struct drm_i810_private {
+	drm_map_t *sarea_map;
+	drm_map_t *buffer_map;
+	drm_map_t *mmio_map;
+
+	drm_i810_sarea_t *sarea_priv;
+   	drm_i810_ring_buffer_t ring;
+
+      	unsigned long hw_status_page;
+   	unsigned long counter;
+
+	dma_addr_t dma_status_page;
+
+	drm_buf_t *mmap_buffer;
+
+
+	u32 front_di1, back_di1, zi1;
+
+	int back_offset;
+	int depth_offset;
+	int overlay_offset;
+	int overlay_physical;
+	int w, h;
+	int pitch;
+
+} drm_i810_private_t;
+
+				/* i810_dma.c */
+extern int  i810_dma_schedule(drm_device_t *dev, int locked);
+extern int  i810_getbuf(struct inode *inode, struct file *filp,
+			unsigned int cmd, unsigned long arg);
+extern int  i810_dma_init(struct inode *inode, struct file *filp,
+			  unsigned int cmd, unsigned long arg);
+extern int  i810_flush_ioctl(struct inode *inode, struct file *filp,
+			     unsigned int cmd, unsigned long arg);
+extern void i810_reclaim_buffers(drm_device_t *dev, pid_t pid);
+extern int  i810_getage(struct inode *inode, struct file *filp,
+			unsigned int cmd, unsigned long arg);
+extern int i810_mmap_buffers(struct file *filp, struct vm_area_struct *vma);
+
+/* Obsolete:
+ */
+extern int i810_copybuf(struct inode *inode, struct file *filp,
+			unsigned int cmd, unsigned long arg);
+/* Obsolete:
+ */
+extern int i810_docopy(struct inode *inode, struct file *filp,
+		       unsigned int cmd, unsigned long arg);
+
+extern int i810_rstatus(struct inode *inode, struct file *filp,
+			unsigned int cmd, unsigned long arg);
+extern int i810_ov0_info(struct inode *inode, struct file *filp,
+			unsigned int cmd, unsigned long arg);
+extern int i810_fstatus(struct inode *inode, struct file *filp,
+			unsigned int cmd, unsigned long arg);
+extern int i810_ov0_flip(struct inode *inode, struct file *filp,
+			unsigned int cmd, unsigned long arg);
+extern int i810_dma_mc(struct inode *inode, struct file *filp,
+			unsigned int cmd, unsigned long arg);
+
+
+extern void i810_dma_quiescent(drm_device_t *dev);
+
+int i810_dma_vertex(struct inode *inode, struct file *filp,
+		    unsigned int cmd, unsigned long arg);
+
+int i810_swap_bufs(struct inode *inode, struct file *filp,
+		   unsigned int cmd, unsigned long arg);
+
+int i810_clear_bufs(struct inode *inode, struct file *filp,
+		    unsigned int cmd, unsigned long arg);
+
+
+#define I810_BASE(reg)		((unsigned long) \
+				dev_priv->mmio_map->handle)
+#define I810_ADDR(reg)		(I810_BASE(reg) + reg)
+#define I810_DEREF(reg)		*(__volatile__ int *)I810_ADDR(reg)
+#define I810_READ(reg)		I810_DEREF(reg)
+#define I810_WRITE(reg,val) 	do { I810_DEREF(reg) = val; } while (0)
+#define I810_DEREF16(reg)	*(__volatile__ u16 *)I810_ADDR(reg)
+#define I810_READ16(reg)	I810_DEREF16(reg)
+#define I810_WRITE16(reg,val)	do { I810_DEREF16(reg) = val; } while (0)
+
+#define I810_VERBOSE 0
+#define RING_LOCALS	unsigned int outring, ringmask; \
+                        volatile char *virt;
+
+#define BEGIN_LP_RING(n) do {						\
+	if (I810_VERBOSE)                                               \
+           DRM_DEBUG("BEGIN_LP_RING(%d) in %s\n", n, __FUNCTION__);	\
+	if (dev_priv->ring.space < n*4)					\
+		i810_wait_ring(dev, n*4);				\
+	dev_priv->ring.space -= n*4;					\
+	outring = dev_priv->ring.tail;					\
+	ringmask = dev_priv->ring.tail_mask;				\
+	virt = dev_priv->ring.virtual_start;				\
+} while (0)
+
+#define ADVANCE_LP_RING() do {				        \
+	if (I810_VERBOSE) DRM_DEBUG("ADVANCE_LP_RING\n");    	\
+	dev_priv->ring.tail = outring;		        	\
+	I810_WRITE(LP_RING + RING_TAIL, outring);	        \
+} while(0)
+
+#define OUT_RING(n) do {  				                \
+	if (I810_VERBOSE) DRM_DEBUG("   OUT_RING %x\n", (int)(n));	\
+	*(volatile unsigned int *)(virt + outring) = n;	                \
+	outring += 4;					                \
+	outring &= ringmask;			                        \
+} while (0)
+
+#define GFX_OP_USER_INTERRUPT 		((0<<29)|(2<<23))
+#define GFX_OP_BREAKPOINT_INTERRUPT	((0<<29)|(1<<23))
+#define CMD_REPORT_HEAD			(7<<23)
+#define CMD_STORE_DWORD_IDX		((0x21<<23) | 0x1)
+#define CMD_OP_BATCH_BUFFER  ((0x0<<29)|(0x30<<23)|0x1)
+
+#define INST_PARSER_CLIENT   0x00000000
+#define INST_OP_FLUSH        0x02000000
+#define INST_FLUSH_MAP_CACHE 0x00000001
+
+
+#define BB1_START_ADDR_MASK   (~0x7)
+#define BB1_PROTECTED         (1<<0)
+#define BB1_UNPROTECTED       (0<<0)
+#define BB2_END_ADDR_MASK     (~0x7)
+
+#define I810REG_HWSTAM		0x02098
+#define I810REG_INT_IDENTITY_R	0x020a4
+#define I810REG_INT_MASK_R 	0x020a8
+#define I810REG_INT_ENABLE_R	0x020a0
+
+#define LP_RING     		0x2030
+#define HP_RING     		0x2040
+#define RING_TAIL      		0x00
+#define TAIL_ADDR		0x000FFFF8
+#define RING_HEAD      		0x04
+#define HEAD_WRAP_COUNT     	0xFFE00000
+#define HEAD_WRAP_ONE       	0x00200000
+#define HEAD_ADDR           	0x001FFFFC
+#define RING_START     		0x08
+#define START_ADDR          	0x00FFFFF8
+#define RING_LEN       		0x0C
+#define RING_NR_PAGES       	0x000FF000
+#define RING_REPORT_MASK    	0x00000006
+#define RING_REPORT_64K     	0x00000002
+#define RING_REPORT_128K    	0x00000004
+#define RING_NO_REPORT      	0x00000000
+#define RING_VALID_MASK     	0x00000001
+#define RING_VALID          	0x00000001
+#define RING_INVALID        	0x00000000
+
+#define GFX_OP_SCISSOR         ((0x3<<29)|(0x1c<<24)|(0x10<<19))
+#define SC_UPDATE_SCISSOR       (0x1<<1)
+#define SC_ENABLE_MASK          (0x1<<0)
+#define SC_ENABLE               (0x1<<0)
+
+#define GFX_OP_SCISSOR_INFO    ((0x3<<29)|(0x1d<<24)|(0x81<<16)|(0x1))
+#define SCI_YMIN_MASK      (0xffff<<16)
+#define SCI_XMIN_MASK      (0xffff<<0)
+#define SCI_YMAX_MASK      (0xffff<<16)
+#define SCI_XMAX_MASK      (0xffff<<0)
+
+#define GFX_OP_COLOR_FACTOR      ((0x3<<29)|(0x1d<<24)|(0x1<<16)|0x0)
+#define GFX_OP_STIPPLE           ((0x3<<29)|(0x1d<<24)|(0x83<<16))
+#define GFX_OP_MAP_INFO          ((0x3<<29)|(0x1d<<24)|0x2)
+#define GFX_OP_DESTBUFFER_VARS   ((0x3<<29)|(0x1d<<24)|(0x85<<16)|0x0)
+#define GFX_OP_DRAWRECT_INFO     ((0x3<<29)|(0x1d<<24)|(0x80<<16)|(0x3))
+#define GFX_OP_PRIMITIVE         ((0x3<<29)|(0x1f<<24))
+
+#define CMD_OP_Z_BUFFER_INFO     ((0x0<<29)|(0x16<<23))
+#define CMD_OP_DESTBUFFER_INFO   ((0x0<<29)|(0x15<<23))
+#define CMD_OP_FRONTBUFFER_INFO  ((0x0<<29)|(0x14<<23))
+
+#define BR00_BITBLT_CLIENT   0x40000000
+#define BR00_OP_COLOR_BLT    0x10000000
+#define BR00_OP_SRC_COPY_BLT 0x10C00000
+#define BR13_SOLID_PATTERN   0x80000000
+
+
+
+#endif
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/i830.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/i830.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/i830.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/i830.h	2003-07-30 11:18:33.000000000 +0200
@@ -0,0 +1,157 @@
+/* i830.h -- Intel I830 DRM template customization -*- linux-c -*-
+ * Created: Thu Feb 15 00:01:12 2001 by gareth@valinux.com
+ *
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Gareth Hughes <gareth@valinux.com>
+ */
+
+#ifndef __I830_H__
+#define __I830_H__
+
+/* This remains constant for all DRM template files.
+ */
+#define DRM(x) i830_##x
+
+/* General customization:
+ */
+#define __HAVE_AGP		1
+#define __MUST_HAVE_AGP		1
+#define __HAVE_MTRR		1
+#define __HAVE_CTX_BITMAP	1
+
+#define DRIVER_AUTHOR		"VA Linux Systems Inc."
+
+#define DRIVER_NAME		"i830"
+#define DRIVER_DESC		"Intel 830M"
+#define DRIVER_DATE		"20021108"
+
+/* Interface history:
+ *
+ * 1.1: Original.
+ * 1.2: ?
+ * 1.3: New irq emit/wait ioctls.
+ *      New pageflip ioctl.
+ *      New getparam ioctl.
+ *      State for texunits 3&4 in sarea.
+ *      New (alternative) layout for texture state.
+ */
+#define DRIVER_MAJOR		1
+#define DRIVER_MINOR		3
+#define DRIVER_PATCHLEVEL	2
+
+#define DRIVER_IOCTLS							    \
+	[DRM_IOCTL_NR(DRM_IOCTL_I830_INIT)]   = { i830_dma_init,    1, 1 }, \
+	[DRM_IOCTL_NR(DRM_IOCTL_I830_VERTEX)] = { i830_dma_vertex,  1, 0 }, \
+	[DRM_IOCTL_NR(DRM_IOCTL_I830_CLEAR)]  = { i830_clear_bufs,  1, 0 }, \
+	[DRM_IOCTL_NR(DRM_IOCTL_I830_FLUSH)]  = { i830_flush_ioctl, 1, 0 }, \
+	[DRM_IOCTL_NR(DRM_IOCTL_I830_GETAGE)] = { i830_getage,      1, 0 }, \
+	[DRM_IOCTL_NR(DRM_IOCTL_I830_GETBUF)] = { i830_getbuf,      1, 0 }, \
+	[DRM_IOCTL_NR(DRM_IOCTL_I830_SWAP)]   = { i830_swap_bufs,   1, 0 }, \
+	[DRM_IOCTL_NR(DRM_IOCTL_I830_COPY)]   = { i830_copybuf,     1, 0 }, \
+	[DRM_IOCTL_NR(DRM_IOCTL_I830_DOCOPY)] = { i830_docopy,      1, 0 }, \
+	[DRM_IOCTL_NR(DRM_IOCTL_I830_FLIP)]   = { i830_flip_bufs,   1, 0 }, \
+	[DRM_IOCTL_NR(DRM_IOCTL_I830_IRQ_EMIT)] = { i830_irq_emit,  1, 0 }, \
+	[DRM_IOCTL_NR(DRM_IOCTL_I830_IRQ_WAIT)] = { i830_irq_wait,  1, 0 }, \
+	[DRM_IOCTL_NR(DRM_IOCTL_I830_GETPARAM)] = { i830_getparam,  1, 0 }, \
+	[DRM_IOCTL_NR(DRM_IOCTL_I830_SETPARAM)] = { i830_setparam,  1, 0 } 
+
+#define __HAVE_COUNTERS         4
+#define __HAVE_COUNTER6         _DRM_STAT_IRQ
+#define __HAVE_COUNTER7         _DRM_STAT_PRIMARY
+#define __HAVE_COUNTER8         _DRM_STAT_SECONDARY
+#define __HAVE_COUNTER9         _DRM_STAT_DMA
+
+/* Driver customization:
+ */
+#define __HAVE_RELEASE		1
+#define DRIVER_RELEASE() do {						\
+	i830_reclaim_buffers( dev, priv->pid );				\
+} while (0)
+
+/* DMA customization:
+ */
+#define __HAVE_DMA		1
+#define __HAVE_DMA_QUEUE	1
+#define __HAVE_DMA_WAITLIST	1
+#define __HAVE_DMA_RECLAIM	1
+
+#define __HAVE_DMA_QUIESCENT	1
+#define DRIVER_DMA_QUIESCENT() do {					\
+	i830_dma_quiescent( dev );					\
+} while (0)
+
+
+/* Driver will work either way: IRQ's save cpu time when waiting for
+ * the card, but are subject to subtle interactions between bios,
+ * hardware and the driver.
+ */
+#define USE_IRQS 0
+
+
+#if USE_IRQS
+#define __HAVE_DMA_IRQ		1
+#define __HAVE_SHARED_IRQ	1
+
+#define DRIVER_PREINSTALL() do {			\
+	drm_i830_private_t *dev_priv =			\
+		(drm_i830_private_t *)dev->dev_private;	\
+							\
+   	I830_WRITE16( I830REG_HWSTAM, 0xffff );	\
+        I830_WRITE16( I830REG_INT_MASK_R, 0x0 );	\
+      	I830_WRITE16( I830REG_INT_ENABLE_R, 0x0 );	\
+} while (0)
+
+
+#define DRIVER_POSTINSTALL() do {				\
+	drm_i830_private_t *dev_priv =				\
+		(drm_i830_private_t *)dev->dev_private;		\
+   	I830_WRITE16( I830REG_INT_ENABLE_R, 0x2 );		\
+   	atomic_set(&dev_priv->irq_received, 0);			\
+   	atomic_set(&dev_priv->irq_emitted, 0);			\
+	init_waitqueue_head(&dev_priv->irq_queue);		\
+} while (0)
+
+
+/* This gets called too late to be useful: dev_priv has already been
+ * freed.
+ */
+#define DRIVER_UNINSTALL() do {					\
+} while (0)
+
+#else
+#define __HAVE_DMA_IRQ          0
+#endif
+
+
+
+/* Buffer customization:
+ */
+
+#define DRIVER_BUF_PRIV_T	drm_i830_buf_priv_t
+
+#define DRIVER_AGP_BUFFERS_MAP( dev )					\
+	((drm_i830_private_t *)((dev)->dev_private))->buffer_map
+
+#endif
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/i830_dma.c linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/i830_dma.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/i830_dma.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/i830_dma.c	2003-07-30 11:18:33.000000000 +0200
@@ -0,0 +1,1597 @@
+/* i830_dma.c -- DMA support for the I830 -*- linux-c -*-
+ * Created: Mon Dec 13 01:50:01 1999 by jhartmann@precisioninsight.com
+ *
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Authors: Rickard E. (Rik) Faith <faith@valinux.com>
+ *	    Jeff Hartmann <jhartmann@valinux.com>
+ *	    Keith Whitwell <keith@tungstengraphics.com>
+ *	    Abraham vd Merwe <abraham@2d3d.co.za>
+ *
+ */
+
+#define __NO_VERSION__
+#include "i830.h"
+#include "drmP.h"
+#include "drm.h"
+#include "i830_drm.h"
+#include "i830_drv.h"
+#include <linux/interrupt.h>	/* For task queue support */
+#include <linux/pagemap.h>     /* For FASTCALL on unlock_page() */
+#include <linux/delay.h>
+
+#ifdef DO_MUNMAP_4_ARGS
+#define DO_MUNMAP(m, a, l)	do_munmap(m, a, l, 1)
+#else
+#define DO_MUNMAP(m, a, l)	do_munmap(m, a, l)
+#endif
+
+#define I830_BUF_FREE		2
+#define I830_BUF_CLIENT		1
+#define I830_BUF_HARDWARE      	0
+
+#define I830_BUF_UNMAPPED 0
+#define I830_BUF_MAPPED   1
+
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,4,2)
+#define down_write down
+#define up_write up
+#endif
+
+#ifndef LockPage
+#define LockPage(page)		set_bit(PG_locked, &(page)->flags)
+#endif
+#ifndef UnlockPage
+#define UnlockPage(page)	unlock_page(page)
+#endif
+
+
+static inline void i830_print_status_page(drm_device_t *dev)
+{
+   	drm_device_dma_t *dma = dev->dma;
+      	drm_i830_private_t *dev_priv = dev->dev_private;
+	u32 *temp = (u32 *)dev_priv->hw_status_page;
+   	int i;
+
+   	DRM_DEBUG(  "hw_status: Interrupt Status : %x\n", temp[0]);
+   	DRM_DEBUG(  "hw_status: LpRing Head ptr : %x\n", temp[1]);
+   	DRM_DEBUG(  "hw_status: IRing Head ptr : %x\n", temp[2]);
+      	DRM_DEBUG(  "hw_status: Reserved : %x\n", temp[3]);
+   	DRM_DEBUG(  "hw_status: Driver Counter : %d\n", temp[5]);
+   	for(i = 9; i < dma->buf_count + 9; i++) {
+	   	DRM_DEBUG( "buffer status idx : %d used: %d\n", i - 9, temp[i]);
+	}
+}
+
+static drm_buf_t *i830_freelist_get(drm_device_t *dev)
+{
+   	drm_device_dma_t *dma = dev->dma;
+	int		 i;
+   	int 		 used;
+   
+	/* Linear search might not be the best solution */
+
+   	for (i = 0; i < dma->buf_count; i++) {
+	   	drm_buf_t *buf = dma->buflist[ i ];
+	   	drm_i830_buf_priv_t *buf_priv = buf->dev_private;
+		/* In use is already a pointer */
+	   	used = cmpxchg(buf_priv->in_use, I830_BUF_FREE, 
+			       I830_BUF_CLIENT);
+	   	if(used == I830_BUF_FREE) {
+			return buf;
+		}
+	}
+   	return NULL;
+}
+
+/* This should only be called if the buffer is not sent to the hardware
+ * yet, the hardware updates in use for us once its on the ring buffer.
+ */
+
+static int i830_freelist_put(drm_device_t *dev, drm_buf_t *buf)
+{
+   	drm_i830_buf_priv_t *buf_priv = buf->dev_private;
+   	int used;
+   
+   	/* In use is already a pointer */
+   	used = cmpxchg(buf_priv->in_use, I830_BUF_CLIENT, I830_BUF_FREE);
+   	if(used != I830_BUF_CLIENT) {
+	   	DRM_ERROR("Freeing buffer thats not in use : %d\n", buf->idx);
+	   	return -EINVAL;
+	}
+   
+   	return 0;
+}
+
+static struct file_operations i830_buffer_fops = {
+	.open	 = DRM(open),
+	.flush	 = DRM(flush),
+	.release = DRM(release),
+	.ioctl	 = DRM(ioctl),
+	.mmap	 = i830_mmap_buffers,
+	.read	 = DRM(read),
+	.fasync	 = DRM(fasync),
+      	.poll	 = DRM(poll),
+};
+
+int i830_mmap_buffers(struct file *filp, struct vm_area_struct *vma)
+{
+	drm_file_t	    *priv	  = filp->private_data;
+	drm_device_t	    *dev;
+	drm_i830_private_t  *dev_priv;
+	drm_buf_t           *buf;
+	drm_i830_buf_priv_t *buf_priv;
+
+	lock_kernel();
+	dev	 = priv->dev;
+	dev_priv = dev->dev_private;
+	buf      = dev_priv->mmap_buffer;
+	buf_priv = buf->dev_private;
+   
+	vma->vm_flags |= (VM_IO | VM_DONTCOPY);
+	vma->vm_file = filp;
+   
+   	buf_priv->currently_mapped = I830_BUF_MAPPED;
+	unlock_kernel();
+
+	if (remap_page_range(DRM_RPR_ARG(vma) vma->vm_start,
+			     VM_OFFSET(vma),
+			     vma->vm_end - vma->vm_start,
+			     vma->vm_page_prot)) return -EAGAIN;
+	return 0;
+}
+
+static int i830_map_buffer(drm_buf_t *buf, struct file *filp)
+{
+	drm_file_t	  *priv	  = filp->private_data;
+	drm_device_t	  *dev	  = priv->dev;
+	drm_i830_buf_priv_t *buf_priv = buf->dev_private;
+      	drm_i830_private_t *dev_priv = dev->dev_private;
+   	struct file_operations *old_fops;
+	int retcode = 0;
+
+	if(buf_priv->currently_mapped == I830_BUF_MAPPED) return -EINVAL;
+
+	down_write( &current->mm->mmap_sem );
+	old_fops = filp->f_op;
+	filp->f_op = &i830_buffer_fops;
+	dev_priv->mmap_buffer = buf;
+	buf_priv->virtual = (void *)do_mmap(filp, 0, buf->total, 
+					    PROT_READ|PROT_WRITE,
+					    MAP_SHARED, 
+					    buf->bus_address);
+	dev_priv->mmap_buffer = NULL;
+	filp->f_op = old_fops;
+	if ((unsigned long)buf_priv->virtual > -1024UL) {
+		/* Real error */
+		DRM_ERROR("mmap error\n");
+		retcode = (signed int)buf_priv->virtual;
+		buf_priv->virtual = 0;
+	}
+	up_write( &current->mm->mmap_sem );
+
+	return retcode;
+}
+
+static int i830_unmap_buffer(drm_buf_t *buf)
+{
+	drm_i830_buf_priv_t *buf_priv = buf->dev_private;
+	int retcode = 0;
+
+	if(buf_priv->currently_mapped != I830_BUF_MAPPED) 
+		return -EINVAL;
+
+	down_write(&current->mm->mmap_sem);
+	retcode = DO_MUNMAP(current->mm,
+			    (unsigned long)buf_priv->virtual,
+			    (size_t) buf->total);
+	up_write(&current->mm->mmap_sem);
+
+   	buf_priv->currently_mapped = I830_BUF_UNMAPPED;
+   	buf_priv->virtual = 0;
+
+	return retcode;
+}
+
+static int i830_dma_get_buffer(drm_device_t *dev, drm_i830_dma_t *d, 
+			       struct file *filp)
+{
+	drm_file_t	  *priv	  = filp->private_data;
+	drm_buf_t	  *buf;
+	drm_i830_buf_priv_t *buf_priv;
+	int retcode = 0;
+
+	buf = i830_freelist_get(dev);
+	if (!buf) {
+		retcode = -ENOMEM;
+	   	DRM_DEBUG("retcode=%d\n", retcode);
+		return retcode;
+	}
+   
+	retcode = i830_map_buffer(buf, filp);
+	if(retcode) {
+		i830_freelist_put(dev, buf);
+	   	DRM_ERROR("mapbuf failed, retcode %d\n", retcode);
+		return retcode;
+	}
+	buf->pid     = priv->pid;
+	buf_priv = buf->dev_private;	
+	d->granted = 1;
+   	d->request_idx = buf->idx;
+   	d->request_size = buf->total;
+   	d->virtual = buf_priv->virtual;
+
+	return retcode;
+}
+
+static int i830_dma_cleanup(drm_device_t *dev)
+{
+	drm_device_dma_t *dma = dev->dma;
+
+	if(dev->dev_private) {
+		int i;
+	   	drm_i830_private_t *dev_priv = 
+	     		(drm_i830_private_t *) dev->dev_private;
+	   
+	   	if(dev_priv->ring.virtual_start) {
+		   	DRM(ioremapfree)((void *) dev_priv->ring.virtual_start,
+					 dev_priv->ring.Size);
+		}
+	   	if(dev_priv->hw_status_page != 0UL) {
+			pci_free_consistent(dev->pdev, PAGE_SIZE,
+					    (void *)dev_priv->hw_status_page,
+					    dev_priv->dma_status_page);
+		   	/* Need to rewrite hardware status page */
+		   	I830_WRITE(0x02080, 0x1ffff000);
+		}
+
+		/* Disable interrupts here because after dev_private
+		 * is freed, it's too late.
+		 */
+		if (dev->irq) {
+			I830_WRITE16( I830REG_INT_MASK_R, 0xffff );
+			I830_WRITE16( I830REG_INT_ENABLE_R, 0x0 );
+		}
+
+	   	DRM(free)(dev->dev_private, sizeof(drm_i830_private_t), 
+			 DRM_MEM_DRIVER);
+	   	dev->dev_private = NULL;
+
+		for (i = 0; i < dma->buf_count; i++) {
+			drm_buf_t *buf = dma->buflist[ i ];
+			drm_i830_buf_priv_t *buf_priv = buf->dev_private;
+			DRM(ioremapfree)(buf_priv->kernel_virtual, buf->total);
+		}
+	}
+   	return 0;
+}
+
+int i830_wait_ring(drm_device_t *dev, int n, const char *caller)
+{
+   	drm_i830_private_t *dev_priv = dev->dev_private;
+   	drm_i830_ring_buffer_t *ring = &(dev_priv->ring);
+   	int iters = 0;
+   	unsigned long end;
+	unsigned int last_head = I830_READ(LP_RING + RING_HEAD) & HEAD_ADDR;
+
+	end = jiffies + (HZ*3);
+   	while (ring->space < n) {	
+	   	ring->head = I830_READ(LP_RING + RING_HEAD) & HEAD_ADDR;
+	   	ring->space = ring->head - (ring->tail+8);
+		if (ring->space < 0) ring->space += ring->Size;
+	   
+		if (ring->head != last_head) {
+			end = jiffies + (HZ*3);
+			last_head = ring->head;
+		}
+	  
+	   	iters++;
+		if(time_before(end, jiffies)) {
+		   	DRM_ERROR("space: %d wanted %d\n", ring->space, n);
+		   	DRM_ERROR("lockup\n");
+		   	goto out_wait_ring;
+		}
+		udelay(1);
+		dev_priv->sarea_priv->perf_boxes |= I830_BOX_WAIT;
+	}
+
+out_wait_ring:   
+   	return iters;
+}
+
+static void i830_kernel_lost_context(drm_device_t *dev)
+{
+      	drm_i830_private_t *dev_priv = dev->dev_private;
+   	drm_i830_ring_buffer_t *ring = &(dev_priv->ring);
+      
+   	ring->head = I830_READ(LP_RING + RING_HEAD) & HEAD_ADDR;
+     	ring->tail = I830_READ(LP_RING + RING_TAIL) & TAIL_ADDR;
+     	ring->space = ring->head - (ring->tail+8);
+     	if (ring->space < 0) ring->space += ring->Size;
+
+	if (ring->head == ring->tail)
+		dev_priv->sarea_priv->perf_boxes |= I830_BOX_RING_EMPTY;
+}
+
+static int i830_freelist_init(drm_device_t *dev, drm_i830_private_t *dev_priv)
+{
+      	drm_device_dma_t *dma = dev->dma;
+   	int my_idx = 36;
+   	u32 *hw_status = (u32 *)(dev_priv->hw_status_page + my_idx);
+   	int i;
+
+   	if(dma->buf_count > 1019) {
+	   	/* Not enough space in the status page for the freelist */
+	   	return -EINVAL;
+	}
+
+   	for (i = 0; i < dma->buf_count; i++) {
+	   	drm_buf_t *buf = dma->buflist[ i ];
+	   	drm_i830_buf_priv_t *buf_priv = buf->dev_private;
+
+	   	buf_priv->in_use = hw_status++;
+	   	buf_priv->my_use_idx = my_idx;
+	   	my_idx += 4;
+
+	   	*buf_priv->in_use = I830_BUF_FREE;
+
+		buf_priv->kernel_virtual = DRM(ioremap)(buf->bus_address, 
+							buf->total);
+	}
+	return 0;
+}
+
+static int i830_dma_initialize(drm_device_t *dev, 
+			       drm_i830_private_t *dev_priv,
+			       drm_i830_init_t *init)
+{
+	struct list_head *list;
+
+   	memset(dev_priv, 0, sizeof(drm_i830_private_t));
+
+	list_for_each(list, &dev->maplist->head) {
+		drm_map_list_t *r_list = (drm_map_list_t *)list;
+		if( r_list->map &&
+		    r_list->map->type == _DRM_SHM &&
+		    r_list->map->flags & _DRM_CONTAINS_LOCK ) {
+			dev_priv->sarea_map = r_list->map;
+ 			break;
+ 		}
+ 	}
+
+	if(!dev_priv->sarea_map) {
+		dev->dev_private = (void *)dev_priv;
+		i830_dma_cleanup(dev);
+		DRM_ERROR("can not find sarea!\n");
+		return -EINVAL;
+	}
+	DRM_FIND_MAP( dev_priv->mmio_map, init->mmio_offset );
+	if(!dev_priv->mmio_map) {
+		dev->dev_private = (void *)dev_priv;
+		i830_dma_cleanup(dev);
+		DRM_ERROR("can not find mmio map!\n");
+		return -EINVAL;
+	}
+	DRM_FIND_MAP( dev_priv->buffer_map, init->buffers_offset );
+	if(!dev_priv->buffer_map) {
+		dev->dev_private = (void *)dev_priv;
+		i830_dma_cleanup(dev);
+		DRM_ERROR("can not find dma buffer map!\n");
+		return -EINVAL;
+	}
+
+	dev_priv->sarea_priv = (drm_i830_sarea_t *)
+		((u8 *)dev_priv->sarea_map->handle +
+		 init->sarea_priv_offset);
+
+   	dev_priv->ring.Start = init->ring_start;
+   	dev_priv->ring.End = init->ring_end;
+   	dev_priv->ring.Size = init->ring_size;
+
+   	dev_priv->ring.virtual_start = DRM(ioremap)(dev->agp->base + 
+						    init->ring_start, 
+						    init->ring_size);
+
+   	if (dev_priv->ring.virtual_start == NULL) {
+		dev->dev_private = (void *) dev_priv;
+	   	i830_dma_cleanup(dev);
+	   	DRM_ERROR("can not ioremap virtual address for"
+			  " ring buffer\n");
+	   	return -ENOMEM;
+	}
+
+   	dev_priv->ring.tail_mask = dev_priv->ring.Size - 1;
+   
+	dev_priv->w = init->w;
+	dev_priv->h = init->h;
+	dev_priv->pitch = init->pitch;
+	dev_priv->back_offset = init->back_offset;
+	dev_priv->depth_offset = init->depth_offset;
+	dev_priv->front_offset = init->front_offset;
+
+	dev_priv->front_di1 = init->front_offset | init->pitch_bits;
+	dev_priv->back_di1 = init->back_offset | init->pitch_bits;
+	dev_priv->zi1 = init->depth_offset | init->pitch_bits;
+
+	DRM_DEBUG("front_di1 %x\n",    dev_priv->front_di1);
+	DRM_DEBUG("back_offset %x\n", dev_priv->back_offset);
+	DRM_DEBUG("back_di1 %x\n",    dev_priv->back_di1);
+	DRM_DEBUG("pitch_bits %x\n",    init->pitch_bits);
+
+	dev_priv->cpp = init->cpp;
+	/* We are using seperate values as placeholders for mechanisms for
+	 * private backbuffer/depthbuffer usage.
+	 */
+
+	dev_priv->back_pitch = init->back_pitch;
+	dev_priv->depth_pitch = init->depth_pitch;
+	dev_priv->do_boxes = 0;
+	dev_priv->use_mi_batchbuffer_start = 0;
+
+   	/* Program Hardware Status Page */
+   	dev_priv->hw_status_page =
+		(unsigned long) pci_alloc_consistent(dev->pdev, PAGE_SIZE,
+						&dev_priv->dma_status_page);
+   	if(dev_priv->hw_status_page == 0UL) {
+		dev->dev_private = (void *)dev_priv;
+		i830_dma_cleanup(dev);
+		DRM_ERROR("Can not allocate hardware status page\n");
+		return -ENOMEM;
+	}
+   	memset((void *) dev_priv->hw_status_page, 0, PAGE_SIZE);
+	DRM_DEBUG("hw status page @ %lx\n", dev_priv->hw_status_page);
+   
+   	I830_WRITE(0x02080, virt_to_bus((void *)dev_priv->hw_status_page));
+	DRM_DEBUG("Enabled hardware status page\n");
+   
+   	/* Now we need to init our freelist */
+   	if(i830_freelist_init(dev, dev_priv) != 0) {
+		dev->dev_private = (void *)dev_priv;
+	   	i830_dma_cleanup(dev);
+	   	DRM_ERROR("Not enough space in the status page for"
+			  " the freelist\n");
+	   	return -ENOMEM;
+	}
+	dev->dev_private = (void *)dev_priv;
+
+   	return 0;
+}
+
+int i830_dma_init(struct inode *inode, struct file *filp,
+		  unsigned int cmd, unsigned long arg)
+{
+   	drm_file_t *priv = filp->private_data;
+   	drm_device_t *dev = priv->dev;
+   	drm_i830_private_t *dev_priv;
+   	drm_i830_init_t init;
+   	int retcode = 0;
+	
+  	if (copy_from_user(&init, (drm_i830_init_t *)arg, sizeof(init)))
+		return -EFAULT;
+	
+   	switch(init.func) {
+	 	case I830_INIT_DMA:
+			dev_priv = DRM(alloc)(sizeof(drm_i830_private_t), 
+					      DRM_MEM_DRIVER);
+	   		if(dev_priv == NULL) return -ENOMEM;
+	   		retcode = i830_dma_initialize(dev, dev_priv, &init);
+	   	break;
+	 	case I830_CLEANUP_DMA:
+	   		retcode = i830_dma_cleanup(dev);
+	   	break;
+	 	default:
+	   		retcode = -EINVAL;
+	   	break;
+	}
+   
+   	return retcode;
+}
+
+#define GFX_OP_STIPPLE           ((0x3<<29)|(0x1d<<24)|(0x83<<16))
+#define ST1_ENABLE               (1<<16)
+#define ST1_MASK                 (0xffff)
+
+/* Most efficient way to verify state for the i830 is as it is
+ * emitted.  Non-conformant state is silently dropped.
+ */
+static void i830EmitContextVerified( drm_device_t *dev,
+				     unsigned int *code )
+{
+   	drm_i830_private_t *dev_priv = dev->dev_private;
+	int i, j = 0;
+	unsigned int tmp;
+	RING_LOCALS;
+
+	BEGIN_LP_RING( I830_CTX_SETUP_SIZE + 4 );
+
+	for ( i = 0 ; i < I830_CTXREG_BLENDCOLR0 ; i++ ) {
+		tmp = code[i];
+		if ((tmp & (7<<29)) == CMD_3D &&
+		    (tmp & (0x1f<<24)) < (0x1d<<24)) {
+			OUT_RING( tmp ); 
+			j++;
+		} else {
+			DRM_ERROR("Skipping %d\n", i);
+		}
+	}
+
+	OUT_RING( STATE3D_CONST_BLEND_COLOR_CMD ); 
+	OUT_RING( code[I830_CTXREG_BLENDCOLR] ); 
+	j += 2;
+
+	for ( i = I830_CTXREG_VF ; i < I830_CTXREG_MCSB0 ; i++ ) {
+		tmp = code[i];
+		if ((tmp & (7<<29)) == CMD_3D &&
+		    (tmp & (0x1f<<24)) < (0x1d<<24)) {
+			OUT_RING( tmp ); 
+			j++;
+		} else {
+			DRM_ERROR("Skipping %d\n", i);
+		}
+	}
+
+	OUT_RING( STATE3D_MAP_COORD_SETBIND_CMD ); 
+	OUT_RING( code[I830_CTXREG_MCSB1] ); 
+	j += 2;
+
+	if (j & 1) 
+		OUT_RING( 0 ); 
+
+	ADVANCE_LP_RING();
+}
+
+static void i830EmitTexVerified( drm_device_t *dev, unsigned int *code ) 
+{
+   	drm_i830_private_t *dev_priv = dev->dev_private;
+	int i, j = 0;
+	unsigned int tmp;
+	RING_LOCALS;
+
+	if (code[I830_TEXREG_MI0] == GFX_OP_MAP_INFO ||
+	    (code[I830_TEXREG_MI0] & ~(0xf*LOAD_TEXTURE_MAP0)) == 
+	    (STATE3D_LOAD_STATE_IMMEDIATE_2|4)) {
+
+		BEGIN_LP_RING( I830_TEX_SETUP_SIZE );
+
+		OUT_RING( code[I830_TEXREG_MI0] ); /* TM0LI */
+		OUT_RING( code[I830_TEXREG_MI1] ); /* TM0S0 */
+		OUT_RING( code[I830_TEXREG_MI2] ); /* TM0S1 */
+		OUT_RING( code[I830_TEXREG_MI3] ); /* TM0S2 */
+		OUT_RING( code[I830_TEXREG_MI4] ); /* TM0S3 */
+		OUT_RING( code[I830_TEXREG_MI5] ); /* TM0S4 */
+		
+		for ( i = 6 ; i < I830_TEX_SETUP_SIZE ; i++ ) {
+			tmp = code[i];
+			OUT_RING( tmp ); 
+			j++;
+		} 
+
+		if (j & 1) 
+			OUT_RING( 0 ); 
+
+		ADVANCE_LP_RING();
+	}
+	else
+		printk("rejected packet %x\n", code[0]);
+}
+
+static void i830EmitTexBlendVerified( drm_device_t *dev, 
+				      unsigned int *code,
+				      unsigned int num)
+{
+   	drm_i830_private_t *dev_priv = dev->dev_private;
+	int i, j = 0;
+	unsigned int tmp;
+	RING_LOCALS;
+
+	if (!num)
+		return;
+
+	BEGIN_LP_RING( num + 1 );
+
+	for ( i = 0 ; i < num ; i++ ) {
+		tmp = code[i];
+		OUT_RING( tmp );
+		j++;
+	}
+
+	if (j & 1) 
+		OUT_RING( 0 ); 
+
+	ADVANCE_LP_RING();
+}
+
+static void i830EmitTexPalette( drm_device_t *dev,
+			        unsigned int *palette,
+			        int number,
+			        int is_shared )
+{
+   	drm_i830_private_t *dev_priv = dev->dev_private;
+	int i;
+	RING_LOCALS;
+
+	return;
+
+	BEGIN_LP_RING( 258 );
+
+	if(is_shared == 1) {
+		OUT_RING(CMD_OP_MAP_PALETTE_LOAD |
+			 MAP_PALETTE_NUM(0) |
+			 MAP_PALETTE_BOTH);
+	} else {
+		OUT_RING(CMD_OP_MAP_PALETTE_LOAD | MAP_PALETTE_NUM(number));
+	}
+	for(i = 0; i < 256; i++) {
+		OUT_RING(palette[i]);
+	}
+	OUT_RING(0);
+	/* KW:  WHERE IS THE ADVANCE_LP_RING?  This is effectively a noop! 
+	 */
+}
+
+/* Need to do some additional checking when setting the dest buffer.
+ */
+static void i830EmitDestVerified( drm_device_t *dev, 
+				  unsigned int *code ) 
+{	
+   	drm_i830_private_t *dev_priv = dev->dev_private;
+	unsigned int tmp;
+	RING_LOCALS;
+
+	BEGIN_LP_RING( I830_DEST_SETUP_SIZE + 10 );
+
+
+	tmp = code[I830_DESTREG_CBUFADDR];
+	if (tmp == dev_priv->front_di1 || tmp == dev_priv->back_di1) {
+		if (((int)outring) & 8) {
+			OUT_RING(0);
+			OUT_RING(0);
+		}
+
+		OUT_RING( CMD_OP_DESTBUFFER_INFO );
+		OUT_RING( BUF_3D_ID_COLOR_BACK | 
+			  BUF_3D_PITCH(dev_priv->back_pitch * dev_priv->cpp) |
+			  BUF_3D_USE_FENCE);
+		OUT_RING( tmp );
+		OUT_RING( 0 );
+
+		OUT_RING( CMD_OP_DESTBUFFER_INFO );
+		OUT_RING( BUF_3D_ID_DEPTH | BUF_3D_USE_FENCE | 
+			  BUF_3D_PITCH(dev_priv->depth_pitch * dev_priv->cpp));
+		OUT_RING( dev_priv->zi1 );
+		OUT_RING( 0 );
+	} else {
+		DRM_ERROR("bad di1 %x (allow %x or %x)\n",
+			  tmp, dev_priv->front_di1, dev_priv->back_di1);
+	}
+
+	/* invarient:
+	 */
+
+
+	OUT_RING( GFX_OP_DESTBUFFER_VARS );
+	OUT_RING( code[I830_DESTREG_DV1] );
+
+	OUT_RING( GFX_OP_DRAWRECT_INFO );
+	OUT_RING( code[I830_DESTREG_DR1] );
+	OUT_RING( code[I830_DESTREG_DR2] );
+	OUT_RING( code[I830_DESTREG_DR3] );
+	OUT_RING( code[I830_DESTREG_DR4] );
+
+	/* Need to verify this */
+	tmp = code[I830_DESTREG_SENABLE];
+	if((tmp & ~0x3) == GFX_OP_SCISSOR_ENABLE) {
+		OUT_RING( tmp );
+	} else {
+		DRM_ERROR("bad scissor enable\n");
+		OUT_RING( 0 );
+	}
+
+	OUT_RING( GFX_OP_SCISSOR_RECT );
+	OUT_RING( code[I830_DESTREG_SR1] );
+	OUT_RING( code[I830_DESTREG_SR2] );
+	OUT_RING( 0 );
+
+	ADVANCE_LP_RING();
+}
+
+static void i830EmitStippleVerified( drm_device_t *dev, 
+				     unsigned int *code ) 
+{
+   	drm_i830_private_t *dev_priv = dev->dev_private;
+	RING_LOCALS;
+
+	BEGIN_LP_RING( 2 );
+	OUT_RING( GFX_OP_STIPPLE );
+	OUT_RING( code[1] );
+	ADVANCE_LP_RING();	
+}
+
+
+static void i830EmitState( drm_device_t *dev )
+{
+   	drm_i830_private_t *dev_priv = dev->dev_private;
+      	drm_i830_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	unsigned int dirty = sarea_priv->dirty;
+
+	DRM_DEBUG("%s %x\n", __FUNCTION__, dirty);
+
+	if (dirty & I830_UPLOAD_BUFFERS) {
+		i830EmitDestVerified( dev, sarea_priv->BufferState );
+		sarea_priv->dirty &= ~I830_UPLOAD_BUFFERS;
+	}
+
+	if (dirty & I830_UPLOAD_CTX) {
+		i830EmitContextVerified( dev, sarea_priv->ContextState );
+		sarea_priv->dirty &= ~I830_UPLOAD_CTX;
+	}
+
+	if (dirty & I830_UPLOAD_TEX0) {
+		i830EmitTexVerified( dev, sarea_priv->TexState[0] );
+		sarea_priv->dirty &= ~I830_UPLOAD_TEX0;
+	}
+
+	if (dirty & I830_UPLOAD_TEX1) {
+		i830EmitTexVerified( dev, sarea_priv->TexState[1] );
+		sarea_priv->dirty &= ~I830_UPLOAD_TEX1;
+	}
+
+	if (dirty & I830_UPLOAD_TEXBLEND0) {
+		i830EmitTexBlendVerified( dev, sarea_priv->TexBlendState[0],
+				sarea_priv->TexBlendStateWordsUsed[0]);
+		sarea_priv->dirty &= ~I830_UPLOAD_TEXBLEND0;
+	}
+
+	if (dirty & I830_UPLOAD_TEXBLEND1) {
+		i830EmitTexBlendVerified( dev, sarea_priv->TexBlendState[1],
+				sarea_priv->TexBlendStateWordsUsed[1]);
+		sarea_priv->dirty &= ~I830_UPLOAD_TEXBLEND1;
+	}
+
+	if (dirty & I830_UPLOAD_TEX_PALETTE_SHARED) {
+		i830EmitTexPalette(dev, sarea_priv->Palette[0], 0, 1);
+	} else {
+		if (dirty & I830_UPLOAD_TEX_PALETTE_N(0)) {
+			i830EmitTexPalette(dev, sarea_priv->Palette[0], 0, 0);
+			sarea_priv->dirty &= ~I830_UPLOAD_TEX_PALETTE_N(0);
+		}
+		if (dirty & I830_UPLOAD_TEX_PALETTE_N(1)) {
+			i830EmitTexPalette(dev, sarea_priv->Palette[1], 1, 0);
+			sarea_priv->dirty &= ~I830_UPLOAD_TEX_PALETTE_N(1);
+		}
+
+		/* 1.3:
+		 */
+#if 0
+		if (dirty & I830_UPLOAD_TEX_PALETTE_N(2)) {
+			i830EmitTexPalette(dev, sarea_priv->Palette2[0], 0, 0);
+			sarea_priv->dirty &= ~I830_UPLOAD_TEX_PALETTE_N(2);
+		}
+		if (dirty & I830_UPLOAD_TEX_PALETTE_N(3)) {
+			i830EmitTexPalette(dev, sarea_priv->Palette2[1], 1, 0);
+			sarea_priv->dirty &= ~I830_UPLOAD_TEX_PALETTE_N(2);
+		}
+#endif
+	}
+
+	/* 1.3:
+	 */
+	if (dirty & I830_UPLOAD_STIPPLE) {
+		i830EmitStippleVerified( dev, 
+					 sarea_priv->StippleState);
+		sarea_priv->dirty &= ~I830_UPLOAD_STIPPLE;
+	}
+
+	if (dirty & I830_UPLOAD_TEX2) {
+		i830EmitTexVerified( dev, sarea_priv->TexState2 );
+		sarea_priv->dirty &= ~I830_UPLOAD_TEX2;
+	}
+
+	if (dirty & I830_UPLOAD_TEX3) {
+		i830EmitTexVerified( dev, sarea_priv->TexState3 );
+		sarea_priv->dirty &= ~I830_UPLOAD_TEX3;
+	}
+
+
+	if (dirty & I830_UPLOAD_TEXBLEND2) {
+		i830EmitTexBlendVerified( 
+			dev, 
+			sarea_priv->TexBlendState2,
+			sarea_priv->TexBlendStateWordsUsed2);
+
+		sarea_priv->dirty &= ~I830_UPLOAD_TEXBLEND2;
+	}
+
+	if (dirty & I830_UPLOAD_TEXBLEND3) {
+		i830EmitTexBlendVerified( 
+			dev, 
+			sarea_priv->TexBlendState3,
+			sarea_priv->TexBlendStateWordsUsed3);
+		sarea_priv->dirty &= ~I830_UPLOAD_TEXBLEND3;
+	}
+}
+
+/* ================================================================
+ * Performance monitoring functions
+ */
+
+static void i830_fill_box( drm_device_t *dev,
+			   int x, int y, int w, int h,
+			   int r, int g, int b )
+{
+   	drm_i830_private_t *dev_priv = dev->dev_private;
+	u32 color;
+	unsigned int BR13, CMD;
+	RING_LOCALS;
+
+	BR13 = (0xF0 << 16) | (dev_priv->pitch * dev_priv->cpp) | (1<<24);
+	CMD = XY_COLOR_BLT_CMD;
+	x += dev_priv->sarea_priv->boxes[0].x1;
+	y += dev_priv->sarea_priv->boxes[0].y1;
+
+	if (dev_priv->cpp == 4) {
+		BR13 |= (1<<25);
+		CMD |= (XY_COLOR_BLT_WRITE_ALPHA | XY_COLOR_BLT_WRITE_RGB);
+		color = (((0xff) << 24) | (r << 16) | (g <<  8) | b);	
+	} else {
+		color = (((r & 0xf8) << 8) |
+			 ((g & 0xfc) << 3) |
+			 ((b & 0xf8) >> 3));
+	}
+
+	BEGIN_LP_RING( 6 );	    
+	OUT_RING( CMD );
+	OUT_RING( BR13 );
+	OUT_RING( (y << 16) | x );
+	OUT_RING( ((y+h) << 16) | (x+w) );
+
+ 	if ( dev_priv->current_page == 1 ) { 
+		OUT_RING( dev_priv->front_offset );
+ 	} else {	 
+		OUT_RING( dev_priv->back_offset );
+ 	} 
+
+	OUT_RING( color );
+	ADVANCE_LP_RING();
+}
+
+static void i830_cp_performance_boxes( drm_device_t *dev )
+{
+   	drm_i830_private_t *dev_priv = dev->dev_private;
+
+	/* Purple box for page flipping
+	 */
+	if ( dev_priv->sarea_priv->perf_boxes & I830_BOX_FLIP ) 
+		i830_fill_box( dev, 4, 4, 8, 8, 255, 0, 255 );
+
+	/* Red box if we have to wait for idle at any point
+	 */
+	if ( dev_priv->sarea_priv->perf_boxes & I830_BOX_WAIT ) 
+		i830_fill_box( dev, 16, 4, 8, 8, 255, 0, 0 );
+
+	/* Blue box: lost context?
+	 */
+	if ( dev_priv->sarea_priv->perf_boxes & I830_BOX_LOST_CONTEXT ) 
+		i830_fill_box( dev, 28, 4, 8, 8, 0, 0, 255 );
+
+	/* Yellow box for texture swaps
+	 */
+	if ( dev_priv->sarea_priv->perf_boxes & I830_BOX_TEXTURE_LOAD ) 
+		i830_fill_box( dev, 40, 4, 8, 8, 255, 255, 0 );
+
+	/* Green box if hardware never idles (as far as we can tell)
+	 */
+	if ( !(dev_priv->sarea_priv->perf_boxes & I830_BOX_RING_EMPTY) ) 
+		i830_fill_box( dev, 64, 4, 8, 8, 0, 255, 0 );
+
+
+	/* Draw bars indicating number of buffers allocated 
+	 * (not a great measure, easily confused)
+	 */
+	if (dev_priv->dma_used) {
+		int bar = dev_priv->dma_used / 10240;
+		if (bar > 100) bar = 100;
+		if (bar < 1) bar = 1;
+		i830_fill_box( dev, 4, 16, bar, 4, 196, 128, 128 );
+		dev_priv->dma_used = 0;
+	}
+
+	dev_priv->sarea_priv->perf_boxes = 0;
+}
+
+static void i830_dma_dispatch_clear( drm_device_t *dev, int flags, 
+				    unsigned int clear_color,
+				    unsigned int clear_zval,
+				    unsigned int clear_depthmask)
+{
+   	drm_i830_private_t *dev_priv = dev->dev_private;
+      	drm_i830_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	int nbox = sarea_priv->nbox;
+	drm_clip_rect_t *pbox = sarea_priv->boxes;
+	int pitch = dev_priv->pitch;
+	int cpp = dev_priv->cpp;
+	int i;
+	unsigned int BR13, CMD, D_CMD;
+	RING_LOCALS;
+
+
+	if ( dev_priv->current_page == 1 ) {
+		unsigned int tmp = flags;
+
+		flags &= ~(I830_FRONT | I830_BACK);
+		if ( tmp & I830_FRONT ) flags |= I830_BACK;
+		if ( tmp & I830_BACK )  flags |= I830_FRONT;
+	}
+
+  	i830_kernel_lost_context(dev);
+
+	switch(cpp) {
+	case 2: 
+		BR13 = (0xF0 << 16) | (pitch * cpp) | (1<<24);
+		D_CMD = CMD = XY_COLOR_BLT_CMD;
+		break;
+	case 4:
+		BR13 = (0xF0 << 16) | (pitch * cpp) | (1<<24) | (1<<25);
+		CMD = (XY_COLOR_BLT_CMD | XY_COLOR_BLT_WRITE_ALPHA | 
+		       XY_COLOR_BLT_WRITE_RGB);
+		D_CMD = XY_COLOR_BLT_CMD;
+		if(clear_depthmask & 0x00ffffff)
+			D_CMD |= XY_COLOR_BLT_WRITE_RGB;
+		if(clear_depthmask & 0xff000000)
+			D_CMD |= XY_COLOR_BLT_WRITE_ALPHA;
+		break;
+	default:
+		BR13 = (0xF0 << 16) | (pitch * cpp) | (1<<24);
+		D_CMD = CMD = XY_COLOR_BLT_CMD;
+		break;
+	}
+
+      	if (nbox > I830_NR_SAREA_CLIPRECTS)
+     		nbox = I830_NR_SAREA_CLIPRECTS;
+
+	for (i = 0 ; i < nbox ; i++, pbox++) {
+		if (pbox->x1 > pbox->x2 ||
+		    pbox->y1 > pbox->y2 ||
+		    pbox->x2 > dev_priv->w ||
+		    pbox->y2 > dev_priv->h)
+			continue;
+
+	   	if ( flags & I830_FRONT ) {	    
+		   	DRM_DEBUG("clear front\n");
+			BEGIN_LP_RING( 6 );	    
+			OUT_RING( CMD );
+			OUT_RING( BR13 );
+			OUT_RING( (pbox->y1 << 16) | pbox->x1 );
+			OUT_RING( (pbox->y2 << 16) | pbox->x2 );
+			OUT_RING( dev_priv->front_offset );
+			OUT_RING( clear_color );
+			ADVANCE_LP_RING();
+		}
+
+		if ( flags & I830_BACK ) {
+			DRM_DEBUG("clear back\n");
+			BEGIN_LP_RING( 6 );	    
+			OUT_RING( CMD );
+			OUT_RING( BR13 );
+			OUT_RING( (pbox->y1 << 16) | pbox->x1 );
+			OUT_RING( (pbox->y2 << 16) | pbox->x2 );
+			OUT_RING( dev_priv->back_offset );
+			OUT_RING( clear_color );
+			ADVANCE_LP_RING();
+		}
+
+		if ( flags & I830_DEPTH ) {
+			DRM_DEBUG("clear depth\n");
+			BEGIN_LP_RING( 6 );
+			OUT_RING( D_CMD );
+			OUT_RING( BR13 );
+			OUT_RING( (pbox->y1 << 16) | pbox->x1 );
+			OUT_RING( (pbox->y2 << 16) | pbox->x2 );
+			OUT_RING( dev_priv->depth_offset );
+			OUT_RING( clear_zval );
+			ADVANCE_LP_RING();
+		}
+	}
+}
+
+static void i830_dma_dispatch_swap( drm_device_t *dev )
+{
+   	drm_i830_private_t *dev_priv = dev->dev_private;
+      	drm_i830_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	int nbox = sarea_priv->nbox;
+	drm_clip_rect_t *pbox = sarea_priv->boxes;
+	int pitch = dev_priv->pitch;
+	int cpp = dev_priv->cpp;
+	int i;
+	unsigned int CMD, BR13;
+	RING_LOCALS;
+
+	DRM_DEBUG("swapbuffers\n");
+
+  	i830_kernel_lost_context(dev);
+
+	if (dev_priv->do_boxes)
+		i830_cp_performance_boxes( dev );
+
+	switch(cpp) {
+	case 2: 
+		BR13 = (pitch * cpp) | (0xCC << 16) | (1<<24);
+		CMD = XY_SRC_COPY_BLT_CMD;
+		break;
+	case 4:
+		BR13 = (pitch * cpp) | (0xCC << 16) | (1<<24) | (1<<25);
+		CMD = (XY_SRC_COPY_BLT_CMD | XY_SRC_COPY_BLT_WRITE_ALPHA |
+		       XY_SRC_COPY_BLT_WRITE_RGB);
+		break;
+	default:
+		BR13 = (pitch * cpp) | (0xCC << 16) | (1<<24);
+		CMD = XY_SRC_COPY_BLT_CMD;
+		break;
+	}
+
+
+      	if (nbox > I830_NR_SAREA_CLIPRECTS)
+     		nbox = I830_NR_SAREA_CLIPRECTS;
+
+	for (i = 0 ; i < nbox; i++, pbox++) 
+	{
+		if (pbox->x1 > pbox->x2 ||
+		    pbox->y1 > pbox->y2 ||
+		    pbox->x2 > dev_priv->w ||
+		    pbox->y2 > dev_priv->h)
+			continue;
+ 
+		DRM_DEBUG("dispatch swap %d,%d-%d,%d!\n",
+			  pbox->x1, pbox->y1,
+			  pbox->x2, pbox->y2);
+
+		BEGIN_LP_RING( 8 );
+		OUT_RING( CMD );
+		OUT_RING( BR13 );
+		OUT_RING( (pbox->y1 << 16) | pbox->x1 );
+		OUT_RING( (pbox->y2 << 16) | pbox->x2 );
+
+		if (dev_priv->current_page == 0) 
+			OUT_RING( dev_priv->front_offset );
+		else
+			OUT_RING( dev_priv->back_offset );			
+
+		OUT_RING( (pbox->y1 << 16) | pbox->x1 );
+		OUT_RING( BR13 & 0xffff );
+
+		if (dev_priv->current_page == 0) 
+			OUT_RING( dev_priv->back_offset );			
+		else
+			OUT_RING( dev_priv->front_offset );
+
+		ADVANCE_LP_RING();
+	}
+}
+
+static void i830_dma_dispatch_flip( drm_device_t *dev )
+{
+   	drm_i830_private_t *dev_priv = dev->dev_private;
+	RING_LOCALS;
+
+	DRM_DEBUG( "%s: page=%d pfCurrentPage=%d\n", 
+		   __FUNCTION__, 
+		   dev_priv->current_page,
+		   dev_priv->sarea_priv->pf_current_page);
+
+  	i830_kernel_lost_context(dev);
+
+	if (dev_priv->do_boxes) {
+		dev_priv->sarea_priv->perf_boxes |= I830_BOX_FLIP;
+		i830_cp_performance_boxes( dev );
+	}
+
+
+	BEGIN_LP_RING( 2 );
+    	OUT_RING( INST_PARSER_CLIENT | INST_OP_FLUSH | INST_FLUSH_MAP_CACHE ); 
+	OUT_RING( 0 );
+	ADVANCE_LP_RING();
+
+	BEGIN_LP_RING( 6 );
+	OUT_RING( CMD_OP_DISPLAYBUFFER_INFO | ASYNC_FLIP );	
+	OUT_RING( 0 );
+	if ( dev_priv->current_page == 0 ) {
+		OUT_RING( dev_priv->back_offset );
+		dev_priv->current_page = 1;
+	} else {
+		OUT_RING( dev_priv->front_offset );
+		dev_priv->current_page = 0;
+	}
+	OUT_RING(0);
+	ADVANCE_LP_RING();
+
+
+	BEGIN_LP_RING( 2 );
+	OUT_RING( MI_WAIT_FOR_EVENT |
+		  MI_WAIT_FOR_PLANE_A_FLIP );
+	OUT_RING( 0 );
+	ADVANCE_LP_RING();
+	
+
+	dev_priv->sarea_priv->pf_current_page = dev_priv->current_page;
+}
+
+static void i830_dma_dispatch_vertex(drm_device_t *dev, 
+				     drm_buf_t *buf,
+				     int discard,
+				     int used)
+{
+   	drm_i830_private_t *dev_priv = dev->dev_private;
+	drm_i830_buf_priv_t *buf_priv = buf->dev_private;
+   	drm_i830_sarea_t *sarea_priv = dev_priv->sarea_priv;
+   	drm_clip_rect_t *box = sarea_priv->boxes;
+   	int nbox = sarea_priv->nbox;
+	unsigned long address = (unsigned long)buf->bus_address;
+	unsigned long start = address - dev->agp->base;     
+	int i = 0, u;
+   	RING_LOCALS;
+
+   	i830_kernel_lost_context(dev);
+
+   	if (nbox > I830_NR_SAREA_CLIPRECTS) 
+		nbox = I830_NR_SAREA_CLIPRECTS;
+
+	if (discard) {
+		u = cmpxchg(buf_priv->in_use, I830_BUF_CLIENT, 
+			    I830_BUF_HARDWARE);
+		if(u != I830_BUF_CLIENT) {
+			DRM_DEBUG("xxxx 2\n");
+		}
+	}
+
+	if (used > 4*1023) 
+		used = 0;
+
+	if (sarea_priv->dirty)
+	   i830EmitState( dev );
+
+  	DRM_DEBUG("dispatch vertex addr 0x%lx, used 0x%x nbox %d\n", 
+		  address, used, nbox);
+
+   	dev_priv->counter++;
+   	DRM_DEBUG(  "dispatch counter : %ld\n", dev_priv->counter);
+   	DRM_DEBUG(  "i830_dma_dispatch\n");
+   	DRM_DEBUG(  "start : %lx\n", start);
+	DRM_DEBUG(  "used : %d\n", used);
+   	DRM_DEBUG(  "start + used - 4 : %ld\n", start + used - 4);
+
+	if (buf_priv->currently_mapped == I830_BUF_MAPPED) {
+		u32 *vp = buf_priv->virtual;
+
+		vp[0] = (GFX_OP_PRIMITIVE |
+			 sarea_priv->vertex_prim |
+			 ((used/4)-2));
+
+		if (dev_priv->use_mi_batchbuffer_start) {
+			vp[used/4] = MI_BATCH_BUFFER_END; 
+			used += 4; 
+		}
+		
+		if (used & 4) {
+			vp[used/4] = 0;
+			used += 4;
+		}
+
+		i830_unmap_buffer(buf);
+	}
+		   
+	if (used) {
+		do {
+			if (i < nbox) {
+				BEGIN_LP_RING(6);
+				OUT_RING( GFX_OP_DRAWRECT_INFO );
+				OUT_RING( sarea_priv->BufferState[I830_DESTREG_DR1] );
+				OUT_RING( box[i].x1 | (box[i].y1<<16) );
+				OUT_RING( box[i].x2 | (box[i].y2<<16) );
+				OUT_RING( sarea_priv->BufferState[I830_DESTREG_DR4] );
+				OUT_RING( 0 );
+				ADVANCE_LP_RING();
+			}
+
+			if (dev_priv->use_mi_batchbuffer_start) {
+				BEGIN_LP_RING(2);
+				OUT_RING( MI_BATCH_BUFFER_START | (2<<6) );
+				OUT_RING( start | MI_BATCH_NON_SECURE );
+				ADVANCE_LP_RING();
+			} 
+			else {
+				BEGIN_LP_RING(4);
+				OUT_RING( MI_BATCH_BUFFER );
+				OUT_RING( start | MI_BATCH_NON_SECURE );
+				OUT_RING( start + used - 4 );
+				OUT_RING( 0 );
+				ADVANCE_LP_RING();
+			}
+
+		} while (++i < nbox);
+	}
+
+	if (discard) {
+		dev_priv->counter++;
+
+		(void) cmpxchg(buf_priv->in_use, I830_BUF_CLIENT,
+			       I830_BUF_HARDWARE);
+
+		BEGIN_LP_RING(8);
+		OUT_RING( CMD_STORE_DWORD_IDX );
+		OUT_RING( 20 );
+		OUT_RING( dev_priv->counter );
+		OUT_RING( CMD_STORE_DWORD_IDX );
+		OUT_RING( buf_priv->my_use_idx );
+		OUT_RING( I830_BUF_FREE );
+		OUT_RING( CMD_REPORT_HEAD );
+		OUT_RING( 0 );
+		ADVANCE_LP_RING();
+	}
+}
+
+
+void i830_dma_quiescent(drm_device_t *dev)
+{
+      	drm_i830_private_t *dev_priv = dev->dev_private;
+   	RING_LOCALS;
+
+  	i830_kernel_lost_context(dev);
+
+   	BEGIN_LP_RING(4);
+   	OUT_RING( INST_PARSER_CLIENT | INST_OP_FLUSH | INST_FLUSH_MAP_CACHE );
+   	OUT_RING( CMD_REPORT_HEAD );
+      	OUT_RING( 0 );
+      	OUT_RING( 0 );
+   	ADVANCE_LP_RING();
+
+	i830_wait_ring( dev, dev_priv->ring.Size - 8, __FUNCTION__ );
+}
+
+static int i830_flush_queue(drm_device_t *dev)
+{
+   	drm_i830_private_t *dev_priv = dev->dev_private;
+	drm_device_dma_t *dma = dev->dma;
+   	int i, ret = 0;
+   	RING_LOCALS;
+	
+   	i830_kernel_lost_context(dev);
+
+   	BEGIN_LP_RING(2);
+      	OUT_RING( CMD_REPORT_HEAD );
+      	OUT_RING( 0 );
+      	ADVANCE_LP_RING();
+
+	i830_wait_ring( dev, dev_priv->ring.Size - 8, __FUNCTION__ );
+
+   	for (i = 0; i < dma->buf_count; i++) {
+	   	drm_buf_t *buf = dma->buflist[ i ];
+	   	drm_i830_buf_priv_t *buf_priv = buf->dev_private;
+	   
+		int used = cmpxchg(buf_priv->in_use, I830_BUF_HARDWARE, 
+				   I830_BUF_FREE);
+
+		if (used == I830_BUF_HARDWARE)
+			DRM_DEBUG("reclaimed from HARDWARE\n");
+		if (used == I830_BUF_CLIENT)
+			DRM_DEBUG("still on client\n");
+	}
+
+   	return ret;
+}
+
+/* Must be called with the lock held */
+void i830_reclaim_buffers(drm_device_t *dev, pid_t pid)
+{
+	drm_device_dma_t *dma = dev->dma;
+	int		 i;
+
+	if (!dma) return;
+      	if (!dev->dev_private) return;
+	if (!dma->buflist) return;
+
+        i830_flush_queue(dev);
+
+	for (i = 0; i < dma->buf_count; i++) {
+	   	drm_buf_t *buf = dma->buflist[ i ];
+	   	drm_i830_buf_priv_t *buf_priv = buf->dev_private;
+	   
+		if (buf->pid == pid && buf_priv) {
+			int used = cmpxchg(buf_priv->in_use, I830_BUF_CLIENT, 
+					   I830_BUF_FREE);
+
+			if (used == I830_BUF_CLIENT)
+				DRM_DEBUG("reclaimed from client\n");
+		   	if(buf_priv->currently_mapped == I830_BUF_MAPPED)
+		     		buf_priv->currently_mapped = I830_BUF_UNMAPPED;
+		}
+	}
+}
+
+int i830_flush_ioctl(struct inode *inode, struct file *filp, 
+		     unsigned int cmd, unsigned long arg)
+{
+   	drm_file_t	  *priv	  = filp->private_data;
+   	drm_device_t	  *dev	  = priv->dev;
+
+   	if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
+		DRM_ERROR("i830_flush_ioctl called without lock held\n");
+		return -EINVAL;
+	}
+
+   	i830_flush_queue(dev);
+   	return 0;
+}
+
+int i830_dma_vertex(struct inode *inode, struct file *filp,
+	       unsigned int cmd, unsigned long arg)
+{
+	drm_file_t *priv = filp->private_data;
+	drm_device_t *dev = priv->dev;
+	drm_device_dma_t *dma = dev->dma;
+   	drm_i830_private_t *dev_priv = (drm_i830_private_t *)dev->dev_private;
+      	u32 *hw_status = (u32 *)dev_priv->hw_status_page;
+   	drm_i830_sarea_t *sarea_priv = (drm_i830_sarea_t *) 
+     					dev_priv->sarea_priv; 
+	drm_i830_vertex_t vertex;
+
+	if (copy_from_user(&vertex, (drm_i830_vertex_t *)arg, sizeof(vertex)))
+		return -EFAULT;
+
+   	if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
+		DRM_ERROR("i830_dma_vertex called without lock held\n");
+		return -EINVAL;
+	}
+
+	DRM_DEBUG("i830 dma vertex, idx %d used %d discard %d\n",
+		  vertex.idx, vertex.used, vertex.discard);
+
+	if(vertex.idx < 0 || vertex.idx > dma->buf_count) return -EINVAL;
+
+	i830_dma_dispatch_vertex( dev, 
+				  dma->buflist[ vertex.idx ], 
+				  vertex.discard, vertex.used );
+
+	sarea_priv->last_enqueue = dev_priv->counter-1;
+   	sarea_priv->last_dispatch = (int) hw_status[5];
+   
+	return 0;
+}
+
+int i830_clear_bufs(struct inode *inode, struct file *filp,
+		   unsigned int cmd, unsigned long arg)
+{
+	drm_file_t *priv = filp->private_data;
+	drm_device_t *dev = priv->dev;
+	drm_i830_clear_t clear;
+
+   	if (copy_from_user(&clear, (drm_i830_clear_t *)arg, sizeof(clear)))
+		return -EFAULT;
+   
+   	if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
+		DRM_ERROR("i830_clear_bufs called without lock held\n");
+		return -EINVAL;
+	}
+
+	/* GH: Someone's doing nasty things... */
+	if (!dev->dev_private) {
+		return -EINVAL;
+	}
+
+	i830_dma_dispatch_clear( dev, clear.flags, 
+				 clear.clear_color, 
+				 clear.clear_depth,
+			         clear.clear_depthmask);
+   	return 0;
+}
+
+int i830_swap_bufs(struct inode *inode, struct file *filp,
+		  unsigned int cmd, unsigned long arg)
+{
+	drm_file_t *priv = filp->private_data;
+	drm_device_t *dev = priv->dev;
+   
+	DRM_DEBUG("i830_swap_bufs\n");
+
+   	if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
+		DRM_ERROR("i830_swap_buf called without lock held\n");
+		return -EINVAL;
+	}
+
+	i830_dma_dispatch_swap( dev );
+   	return 0;
+}
+
+
+
+/* Not sure why this isn't set all the time:
+ */ 
+static void i830_do_init_pageflip( drm_device_t *dev )
+{
+	drm_i830_private_t *dev_priv = dev->dev_private;
+
+	DRM_DEBUG("%s\n", __FUNCTION__);
+	dev_priv->page_flipping = 1;
+	dev_priv->current_page = 0;
+	dev_priv->sarea_priv->pf_current_page = dev_priv->current_page;
+}
+
+int i830_do_cleanup_pageflip( drm_device_t *dev )
+{
+	drm_i830_private_t *dev_priv = dev->dev_private;
+
+	DRM_DEBUG("%s\n", __FUNCTION__);
+	if (dev_priv->current_page != 0)
+		i830_dma_dispatch_flip( dev );
+
+	dev_priv->page_flipping = 0;
+	return 0;
+}
+
+int i830_flip_bufs(struct inode *inode, struct file *filp,
+		   unsigned int cmd, unsigned long arg)
+{
+	drm_file_t *priv = filp->private_data;
+	drm_device_t *dev = priv->dev;
+	drm_i830_private_t *dev_priv = dev->dev_private;
+
+	DRM_DEBUG("%s\n", __FUNCTION__);
+
+   	if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
+		DRM_ERROR("i830_flip_buf called without lock held\n");
+		return -EINVAL;
+	}
+
+	if (!dev_priv->page_flipping) 
+		i830_do_init_pageflip( dev );
+
+	i830_dma_dispatch_flip( dev );
+   	return 0;
+}
+
+int i830_getage(struct inode *inode, struct file *filp, unsigned int cmd,
+		unsigned long arg)
+{
+   	drm_file_t	  *priv	    = filp->private_data;
+	drm_device_t	  *dev	    = priv->dev;
+   	drm_i830_private_t *dev_priv = (drm_i830_private_t *)dev->dev_private;
+      	u32 *hw_status = (u32 *)dev_priv->hw_status_page;
+   	drm_i830_sarea_t *sarea_priv = (drm_i830_sarea_t *) 
+     					dev_priv->sarea_priv; 
+
+      	sarea_priv->last_dispatch = (int) hw_status[5];
+	return 0;
+}
+
+int i830_getbuf(struct inode *inode, struct file *filp, unsigned int cmd,
+		unsigned long arg)
+{
+	drm_file_t	  *priv	    = filp->private_data;
+	drm_device_t	  *dev	    = priv->dev;
+	int		  retcode   = 0;
+	drm_i830_dma_t	  d;
+   	drm_i830_private_t *dev_priv = (drm_i830_private_t *)dev->dev_private;
+   	u32 *hw_status = (u32 *)dev_priv->hw_status_page;
+   	drm_i830_sarea_t *sarea_priv = (drm_i830_sarea_t *) 
+     					dev_priv->sarea_priv; 
+
+	DRM_DEBUG("getbuf\n");
+   	if (copy_from_user(&d, (drm_i830_dma_t *)arg, sizeof(d)))
+		return -EFAULT;
+   
+	if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
+		DRM_ERROR("i830_dma called without lock held\n");
+		return -EINVAL;
+	}
+	
+	d.granted = 0;
+
+	retcode = i830_dma_get_buffer(dev, &d, filp);
+
+	DRM_DEBUG("i830_dma: %d returning %d, granted = %d\n",
+		  current->pid, retcode, d.granted);
+
+	if (copy_to_user((drm_dma_t *)arg, &d, sizeof(d)))
+		return -EFAULT;
+   	sarea_priv->last_dispatch = (int) hw_status[5];
+
+	return retcode;
+}
+
+int i830_copybuf(struct inode *inode,
+		 struct file *filp, 
+		 unsigned int cmd,
+		 unsigned long arg)
+{
+	/* Never copy - 2.4.x doesn't need it */
+	return 0;
+}
+
+int i830_docopy(struct inode *inode, struct file *filp, unsigned int cmd,
+		unsigned long arg)
+{
+	return 0;
+}
+
+
+
+int i830_getparam( struct inode *inode, struct file *filp, unsigned int cmd,
+		      unsigned long arg )
+{
+	drm_file_t	  *priv	    = filp->private_data;
+	drm_device_t	  *dev	    = priv->dev;
+	drm_i830_private_t *dev_priv = dev->dev_private;
+	drm_i830_getparam_t param;
+	int value;
+
+	if ( !dev_priv ) {
+		DRM_ERROR( "%s called with no initialization\n", __FUNCTION__ );
+		return -EINVAL;
+	}
+
+	if (copy_from_user(&param, (drm_i830_getparam_t *)arg, sizeof(param) ))
+		return -EFAULT;
+
+	switch( param.param ) {
+	case I830_PARAM_IRQ_ACTIVE:
+		value = dev->irq ? 1 : 0;
+		break;
+	default:
+		return -EINVAL;
+	}
+
+	if ( copy_to_user( param.value, &value, sizeof(int) ) ) {
+		DRM_ERROR( "copy_to_user\n" );
+		return -EFAULT;
+	}
+	
+	return 0;
+}
+
+
+int i830_setparam( struct inode *inode, struct file *filp, unsigned int cmd,
+		   unsigned long arg )
+{
+	drm_file_t	  *priv	    = filp->private_data;
+	drm_device_t	  *dev	    = priv->dev;
+	drm_i830_private_t *dev_priv = dev->dev_private;
+	drm_i830_setparam_t param;
+
+	if ( !dev_priv ) {
+		DRM_ERROR( "%s called with no initialization\n", __FUNCTION__ );
+		return -EINVAL;
+	}
+
+	if (copy_from_user(&param, (drm_i830_setparam_t *)arg, sizeof(param) ))
+		return -EFAULT;
+
+	switch( param.param ) {
+	case I830_SETPARAM_USE_MI_BATCHBUFFER_START:
+		dev_priv->use_mi_batchbuffer_start = param.value;
+		break;
+	default:
+		return -EINVAL;
+	}
+
+	return 0;
+}
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/i830_drm.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/i830_drm.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/i830_drm.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/i830_drm.h	2003-07-30 11:18:33.000000000 +0200
@@ -0,0 +1,335 @@
+#ifndef _I830_DRM_H_
+#define _I830_DRM_H_
+
+/* WARNING: These defines must be the same as what the Xserver uses.
+ * if you change them, you must change the defines in the Xserver.
+ *
+ * KW: Actually, you can't ever change them because doing so would
+ * break backwards compatibility.
+ */
+
+#ifndef _I830_DEFINES_
+#define _I830_DEFINES_
+
+#define I830_DMA_BUF_ORDER		12
+#define I830_DMA_BUF_SZ 		(1<<I830_DMA_BUF_ORDER)
+#define I830_DMA_BUF_NR 		256
+#define I830_NR_SAREA_CLIPRECTS 	8
+
+/* Each region is a minimum of 64k, and there are at most 64 of them.
+ */
+#define I830_NR_TEX_REGIONS 64
+#define I830_LOG_MIN_TEX_REGION_SIZE 16
+
+/* KW: These aren't correct but someone set them to two and then
+ * released the module.  Now we can't change them as doing so would
+ * break backwards compatibility.
+ */
+#define I830_TEXTURE_COUNT	2
+#define I830_TEXBLEND_COUNT	I830_TEXTURE_COUNT
+
+#define I830_TEXBLEND_SIZE	12	/* (4 args + op) * 2 + COLOR_FACTOR */
+
+#define I830_UPLOAD_CTX			0x1
+#define I830_UPLOAD_BUFFERS		0x2
+#define I830_UPLOAD_CLIPRECTS		0x4
+#define I830_UPLOAD_TEX0_IMAGE		0x100 /* handled clientside */
+#define I830_UPLOAD_TEX0_CUBE		0x200 /* handled clientside */
+#define I830_UPLOAD_TEX1_IMAGE		0x400 /* handled clientside */
+#define I830_UPLOAD_TEX1_CUBE		0x800 /* handled clientside */
+#define I830_UPLOAD_TEX2_IMAGE		0x1000 /* handled clientside */
+#define I830_UPLOAD_TEX2_CUBE		0x2000 /* handled clientside */
+#define I830_UPLOAD_TEX3_IMAGE		0x4000 /* handled clientside */
+#define I830_UPLOAD_TEX3_CUBE		0x8000 /* handled clientside */
+#define I830_UPLOAD_TEX_N_IMAGE(n)	(0x100 << (n * 2))
+#define I830_UPLOAD_TEX_N_CUBE(n)	(0x200 << (n * 2))
+#define I830_UPLOAD_TEXIMAGE_MASK	0xff00
+#define I830_UPLOAD_TEX0			0x10000
+#define I830_UPLOAD_TEX1			0x20000
+#define I830_UPLOAD_TEX2			0x40000
+#define I830_UPLOAD_TEX3			0x80000
+#define I830_UPLOAD_TEX_N(n)		(0x10000 << (n))
+#define I830_UPLOAD_TEX_MASK		0xf0000
+#define I830_UPLOAD_TEXBLEND0		0x100000
+#define I830_UPLOAD_TEXBLEND1		0x200000
+#define I830_UPLOAD_TEXBLEND2		0x400000
+#define I830_UPLOAD_TEXBLEND3		0x800000
+#define I830_UPLOAD_TEXBLEND_N(n)	(0x100000 << (n))
+#define I830_UPLOAD_TEXBLEND_MASK	0xf00000
+#define I830_UPLOAD_TEX_PALETTE_N(n)    (0x1000000 << (n))
+#define I830_UPLOAD_TEX_PALETTE_SHARED	0x4000000
+#define I830_UPLOAD_STIPPLE         	0x8000000
+
+/* Indices into buf.Setup where various bits of state are mirrored per
+ * context and per buffer.  These can be fired at the card as a unit,
+ * or in a piecewise fashion as required.
+ */
+
+/* Destbuffer state 
+ *    - backbuffer linear offset and pitch -- invarient in the current dri
+ *    - zbuffer linear offset and pitch -- also invarient
+ *    - drawing origin in back and depth buffers.
+ *
+ * Keep the depth/back buffer state here to acommodate private buffers
+ * in the future.
+ */
+
+#define I830_DESTREG_CBUFADDR 0
+#define I830_DESTREG_DBUFADDR 1
+#define I830_DESTREG_DV0 2
+#define I830_DESTREG_DV1 3
+#define I830_DESTREG_SENABLE 4
+#define I830_DESTREG_SR0 5
+#define I830_DESTREG_SR1 6
+#define I830_DESTREG_SR2 7
+#define I830_DESTREG_DR0 8
+#define I830_DESTREG_DR1 9
+#define I830_DESTREG_DR2 10
+#define I830_DESTREG_DR3 11
+#define I830_DESTREG_DR4 12
+#define I830_DEST_SETUP_SIZE 13
+
+/* Context state
+ */
+#define I830_CTXREG_STATE1		0
+#define I830_CTXREG_STATE2		1
+#define I830_CTXREG_STATE3		2
+#define I830_CTXREG_STATE4		3
+#define I830_CTXREG_STATE5		4
+#define I830_CTXREG_IALPHAB		5
+#define I830_CTXREG_STENCILTST		6
+#define I830_CTXREG_ENABLES_1		7
+#define I830_CTXREG_ENABLES_2		8
+#define I830_CTXREG_AA			9
+#define I830_CTXREG_FOGCOLOR		10
+#define I830_CTXREG_BLENDCOLR0		11
+#define I830_CTXREG_BLENDCOLR		12 /* Dword 1 of 2 dword command */
+#define I830_CTXREG_VF			13
+#define I830_CTXREG_VF2			14
+#define I830_CTXREG_MCSB0		15
+#define I830_CTXREG_MCSB1		16
+#define I830_CTX_SETUP_SIZE		17
+
+/* 1.3: Stipple state
+ */ 
+#define I830_STPREG_ST0 0
+#define I830_STPREG_ST1 1
+#define I830_STP_SETUP_SIZE 2
+
+
+/* Texture state (per tex unit)
+ */
+
+#define I830_TEXREG_MI0	0	/* GFX_OP_MAP_INFO (6 dwords) */
+#define I830_TEXREG_MI1	1
+#define I830_TEXREG_MI2	2
+#define I830_TEXREG_MI3	3
+#define I830_TEXREG_MI4	4
+#define I830_TEXREG_MI5	5
+#define I830_TEXREG_MF	6	/* GFX_OP_MAP_FILTER */
+#define I830_TEXREG_MLC	7	/* GFX_OP_MAP_LOD_CTL */
+#define I830_TEXREG_MLL	8	/* GFX_OP_MAP_LOD_LIMITS */
+#define I830_TEXREG_MCS	9	/* GFX_OP_MAP_COORD_SETS */
+#define I830_TEX_SETUP_SIZE 10
+
+#define I830_TEXREG_TM0LI      0 /* load immediate 2 texture map n */
+#define I830_TEXREG_TM0S0      1
+#define I830_TEXREG_TM0S1      2
+#define I830_TEXREG_TM0S2      3
+#define I830_TEXREG_TM0S3      4
+#define I830_TEXREG_TM0S4      5
+#define I830_TEXREG_NOP0       6       /* noop */
+#define I830_TEXREG_NOP1       7       /* noop */
+#define I830_TEXREG_NOP2       8       /* noop */
+#define __I830_TEXREG_MCS      9       /* GFX_OP_MAP_COORD_SETS -- shared */
+#define __I830_TEX_SETUP_SIZE   10
+
+#define I830_FRONT   0x1
+#define I830_BACK    0x2
+#define I830_DEPTH   0x4
+
+#endif /* _I830_DEFINES_ */
+
+typedef struct _drm_i830_init {
+	enum {
+		I830_INIT_DMA = 0x01,
+		I830_CLEANUP_DMA = 0x02
+	} func;
+	unsigned int mmio_offset;
+	unsigned int buffers_offset;
+	int sarea_priv_offset;
+	unsigned int ring_start;
+	unsigned int ring_end;
+	unsigned int ring_size;
+	unsigned int front_offset;
+	unsigned int back_offset;
+	unsigned int depth_offset;
+	unsigned int w;
+	unsigned int h;
+	unsigned int pitch;
+	unsigned int pitch_bits;
+	unsigned int back_pitch;
+	unsigned int depth_pitch;
+	unsigned int cpp;
+} drm_i830_init_t;
+
+/* Warning: If you change the SAREA structure you must change the Xserver
+ * structure as well */
+
+typedef struct _drm_i830_tex_region {
+	unsigned char next, prev; /* indices to form a circular LRU  */
+	unsigned char in_use;	/* owned by a client, or free? */
+	int age;		/* tracked by clients to update local LRU's */
+} drm_i830_tex_region_t;
+
+typedef struct _drm_i830_sarea {
+	unsigned int ContextState[I830_CTX_SETUP_SIZE];
+   	unsigned int BufferState[I830_DEST_SETUP_SIZE];
+	unsigned int TexState[I830_TEXTURE_COUNT][I830_TEX_SETUP_SIZE];
+	unsigned int TexBlendState[I830_TEXBLEND_COUNT][I830_TEXBLEND_SIZE];
+	unsigned int TexBlendStateWordsUsed[I830_TEXBLEND_COUNT];
+	unsigned int Palette[2][256];
+   	unsigned int dirty;
+
+	unsigned int nbox;
+	drm_clip_rect_t boxes[I830_NR_SAREA_CLIPRECTS];
+
+	/* Maintain an LRU of contiguous regions of texture space.  If
+	 * you think you own a region of texture memory, and it has an
+	 * age different to the one you set, then you are mistaken and
+	 * it has been stolen by another client.  If global texAge
+	 * hasn't changed, there is no need to walk the list.
+	 *
+	 * These regions can be used as a proxy for the fine-grained
+	 * texture information of other clients - by maintaining them
+	 * in the same lru which is used to age their own textures,
+	 * clients have an approximate lru for the whole of global
+	 * texture space, and can make informed decisions as to which
+	 * areas to kick out.  There is no need to choose whether to
+	 * kick out your own texture or someone else's - simply eject
+	 * them all in LRU order.  
+	 */
+
+	drm_i830_tex_region_t texList[I830_NR_TEX_REGIONS+1]; 
+				/* Last elt is sentinal */
+        int texAge;		/* last time texture was uploaded */
+        int last_enqueue;	/* last time a buffer was enqueued */
+	int last_dispatch;	/* age of the most recently dispatched buffer */
+	int last_quiescent;     /*  */
+	int ctxOwner;		/* last context to upload state */
+
+	int vertex_prim;
+
+        int pf_enabled;               /* is pageflipping allowed? */
+        int pf_active;               
+        int pf_current_page;	    /* which buffer is being displayed? */
+
+        int perf_boxes;             /* performance boxes to be displayed */
+   
+        /* Here's the state for texunits 2,3:
+	 */
+	unsigned int TexState2[I830_TEX_SETUP_SIZE];
+	unsigned int TexBlendState2[I830_TEXBLEND_SIZE];
+	unsigned int TexBlendStateWordsUsed2;
+
+	unsigned int TexState3[I830_TEX_SETUP_SIZE];
+	unsigned int TexBlendState3[I830_TEXBLEND_SIZE];
+	unsigned int TexBlendStateWordsUsed3;
+
+	unsigned int StippleState[I830_STP_SETUP_SIZE];
+} drm_i830_sarea_t;
+
+/* Flags for perf_boxes
+ */
+#define I830_BOX_RING_EMPTY    0x1 /* populated by kernel */
+#define I830_BOX_FLIP          0x2 /* populated by kernel */
+#define I830_BOX_WAIT          0x4 /* populated by kernel & client */
+#define I830_BOX_TEXTURE_LOAD  0x8 /* populated by kernel */
+#define I830_BOX_LOST_CONTEXT  0x10 /* populated by client */
+
+
+/* I830 specific ioctls
+ * The device specific ioctl range is 0x40 to 0x79.
+ */
+#define DRM_IOCTL_I830_INIT		DRM_IOW( 0x40, drm_i830_init_t)
+#define DRM_IOCTL_I830_VERTEX		DRM_IOW( 0x41, drm_i830_vertex_t)
+#define DRM_IOCTL_I830_CLEAR		DRM_IOW( 0x42, drm_i830_clear_t)
+#define DRM_IOCTL_I830_FLUSH		DRM_IO ( 0x43)
+#define DRM_IOCTL_I830_GETAGE		DRM_IO ( 0x44)
+#define DRM_IOCTL_I830_GETBUF		DRM_IOWR(0x45, drm_i830_dma_t)
+#define DRM_IOCTL_I830_SWAP		DRM_IO ( 0x46)
+#define DRM_IOCTL_I830_COPY		DRM_IOW( 0x47, drm_i830_copy_t)
+#define DRM_IOCTL_I830_DOCOPY		DRM_IO ( 0x48)
+#define DRM_IOCTL_I830_FLIP		DRM_IO ( 0x49)
+#define DRM_IOCTL_I830_IRQ_EMIT         DRM_IOWR(0x4a, drm_i830_irq_emit_t)
+#define DRM_IOCTL_I830_IRQ_WAIT         DRM_IOW( 0x4b, drm_i830_irq_wait_t)
+#define DRM_IOCTL_I830_GETPARAM         DRM_IOWR(0x4c, drm_i830_getparam_t)
+#define DRM_IOCTL_I830_SETPARAM         DRM_IOWR(0x4d, drm_i830_setparam_t)
+
+typedef struct _drm_i830_clear {
+	int clear_color;
+	int clear_depth;
+	int flags;
+	unsigned int clear_colormask;
+	unsigned int clear_depthmask;
+} drm_i830_clear_t;
+
+
+
+/* These may be placeholders if we have more cliprects than
+ * I830_NR_SAREA_CLIPRECTS.  In that case, the client sets discard to
+ * false, indicating that the buffer will be dispatched again with a
+ * new set of cliprects.
+ */
+typedef struct _drm_i830_vertex {
+   	int idx;		/* buffer index */
+	int used;		/* nr bytes in use */
+	int discard;		/* client is finished with the buffer? */
+} drm_i830_vertex_t;
+
+typedef struct _drm_i830_copy_t {
+   	int idx;		/* buffer index */
+	int used;		/* nr bytes in use */
+	void *address;		/* Address to copy from */
+} drm_i830_copy_t;
+
+typedef struct drm_i830_dma {
+	void *virtual;
+	int request_idx;
+	int request_size;
+	int granted;
+} drm_i830_dma_t;
+
+
+/* 1.3: Userspace can request & wait on irq's:
+ */
+typedef struct drm_i830_irq_emit {
+	int *irq_seq;
+} drm_i830_irq_emit_t;
+
+typedef struct drm_i830_irq_wait {
+	int irq_seq;
+} drm_i830_irq_wait_t;
+
+
+/* 1.3: New ioctl to query kernel params:
+ */
+#define I830_PARAM_IRQ_ACTIVE            1
+
+typedef struct drm_i830_getparam {
+	int param;
+	int *value;
+} drm_i830_getparam_t;
+
+
+/* 1.3: New ioctl to set kernel params:
+ */
+#define I830_SETPARAM_USE_MI_BATCHBUFFER_START            1
+
+typedef struct drm_i830_setparam {
+	int param;
+	int value;
+} drm_i830_setparam_t;
+
+
+#endif /* _I830_DRM_H_ */
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/i830_drv.c linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/i830_drv.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/i830_drv.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/i830_drv.c	2003-07-30 11:18:33.000000000 +0200
@@ -0,0 +1,58 @@
+/* i830_drv.c -- I810 driver -*- linux-c -*-
+ * Created: Mon Dec 13 01:56:22 1999 by jhartmann@precisioninsight.com
+ *
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Rickard E. (Rik) Faith <faith@valinux.com>
+ *    Jeff Hartmann <jhartmann@valinux.com>
+ *    Gareth Hughes <gareth@valinux.com>
+ *    Abraham vd Merwe <abraham@2d3d.co.za>
+ *    Keith Whitwell <keith@tungstengraphics.com>
+ */
+
+#include <linux/config.h>
+#include "i830.h"
+#include "drmP.h"
+#include "drm.h"
+#include "i830_drm.h"
+#include "i830_drv.h"
+
+#include "drm_agpsupport.h"
+#include "drm_auth.h"
+#include "drm_bufs.h"
+#include "drm_context.h"
+#include "drm_dma.h"
+#include "drm_drawable.h"
+#include "drm_drv.h"
+
+#include "drm_fops.h"
+#include "drm_init.h"
+#include "drm_ioctl.h"
+#include "drm_lock.h"
+#include "drm_lists.h"
+#include "drm_memory.h"
+#include "drm_proc.h"
+#include "drm_vm.h"
+#include "drm_stub.h"
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/i830_drv.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/i830_drv.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/i830_drv.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/i830_drv.h	2003-07-30 11:18:33.000000000 +0200
@@ -0,0 +1,300 @@
+/* i830_drv.h -- Private header for the I830 driver -*- linux-c -*-
+ * Created: Mon Dec 13 01:50:01 1999 by jhartmann@precisioninsight.com
+ *
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Authors: Rickard E. (Rik) Faith <faith@valinux.com>
+ * 	    Jeff Hartmann <jhartmann@valinux.com>
+ *
+ */
+
+#ifndef _I830_DRV_H_
+#define _I830_DRV_H_
+
+typedef struct drm_i830_buf_priv {
+   	u32 *in_use;
+   	int my_use_idx;
+	int currently_mapped;
+	void *virtual;
+	void *kernel_virtual;
+	int map_count;
+   	struct vm_area_struct *vma;
+} drm_i830_buf_priv_t;
+
+typedef struct _drm_i830_ring_buffer{
+	int tail_mask;
+	unsigned long Start;
+	unsigned long End;
+	unsigned long Size;
+	u8 *virtual_start;
+	int head;
+	int tail;
+	int space;
+} drm_i830_ring_buffer_t;
+
+typedef struct drm_i830_private {
+	drm_map_t *sarea_map;
+	drm_map_t *buffer_map;
+	drm_map_t *mmio_map;
+
+	drm_i830_sarea_t *sarea_priv;
+   	drm_i830_ring_buffer_t ring;
+
+      	unsigned long hw_status_page;
+   	unsigned long counter;
+
+	dma_addr_t dma_status_page;
+
+	drm_buf_t *mmap_buffer;
+	
+	u32 front_di1, back_di1, zi1;
+	
+	int back_offset;
+	int depth_offset;
+	int front_offset;
+	int w, h;
+	int pitch;
+	int back_pitch;
+	int depth_pitch;
+	unsigned int cpp;
+
+	int do_boxes;
+	int dma_used;
+
+	int current_page;
+	int page_flipping;
+
+	wait_queue_head_t irq_queue;
+   	atomic_t irq_received;
+   	atomic_t irq_emitted;
+
+	int use_mi_batchbuffer_start;
+
+} drm_i830_private_t;
+
+				/* i830_dma.c */
+extern int  i830_dma_schedule(drm_device_t *dev, int locked);
+extern int  i830_getbuf(struct inode *inode, struct file *filp,
+			unsigned int cmd, unsigned long arg);
+extern int  i830_dma_init(struct inode *inode, struct file *filp,
+			  unsigned int cmd, unsigned long arg);
+extern int  i830_flush_ioctl(struct inode *inode, struct file *filp,
+			     unsigned int cmd, unsigned long arg);
+extern void i830_reclaim_buffers(drm_device_t *dev, pid_t pid);
+extern int  i830_getage(struct inode *inode, struct file *filp, unsigned int cmd,
+			unsigned long arg);
+extern int i830_mmap_buffers(struct file *filp, struct vm_area_struct *vma);
+extern int i830_copybuf(struct inode *inode, struct file *filp, 
+			unsigned int cmd, unsigned long arg);
+extern int i830_docopy(struct inode *inode, struct file *filp, 
+		       unsigned int cmd, unsigned long arg);
+
+extern void i830_dma_quiescent(drm_device_t *dev);
+
+extern int i830_dma_vertex(struct inode *inode, struct file *filp,
+			  unsigned int cmd, unsigned long arg);
+
+extern int i830_swap_bufs(struct inode *inode, struct file *filp,
+			 unsigned int cmd, unsigned long arg);
+
+extern int i830_clear_bufs(struct inode *inode, struct file *filp,
+			  unsigned int cmd, unsigned long arg);
+
+extern int i830_flip_bufs(struct inode *inode, struct file *filp,
+			 unsigned int cmd, unsigned long arg);
+
+extern int i830_getparam( struct inode *inode, struct file *filp,
+			  unsigned int cmd, unsigned long arg );
+
+extern int i830_setparam( struct inode *inode, struct file *filp,
+			  unsigned int cmd, unsigned long arg );
+
+/* i830_irq.c */
+extern int i830_irq_emit( struct inode *inode, struct file *filp, 
+			  unsigned int cmd, unsigned long arg );
+extern int i830_irq_wait( struct inode *inode, struct file *filp,
+			  unsigned int cmd, unsigned long arg );
+extern int i830_wait_irq(drm_device_t *dev, int irq_nr);
+extern int i830_emit_irq(drm_device_t *dev);
+
+
+#define I830_BASE(reg)		((unsigned long) \
+				dev_priv->mmio_map->handle)
+#define I830_ADDR(reg)		(I830_BASE(reg) + reg)
+#define I830_DEREF(reg)		*(__volatile__ unsigned int *)I830_ADDR(reg)
+#define I830_READ(reg)		readl((volatile u32 *)I830_ADDR(reg))
+#define I830_WRITE(reg,val) 	writel(val, (volatile u32 *)I830_ADDR(reg))
+#define I830_DEREF16(reg)	*(__volatile__ u16 *)I830_ADDR(reg)
+#define I830_READ16(reg) 	I830_DEREF16(reg)
+#define I830_WRITE16(reg,val)	do { I830_DEREF16(reg) = val; } while (0)
+
+
+
+#define I830_VERBOSE 0
+
+#define RING_LOCALS	unsigned int outring, ringmask, outcount; \
+                        volatile char *virt;
+
+#define BEGIN_LP_RING(n) do {				\
+	if (I830_VERBOSE)				\
+		printk("BEGIN_LP_RING(%d) in %s\n",	\
+			  n, __FUNCTION__);		\
+	if (dev_priv->ring.space < n*4)			\
+		i830_wait_ring(dev, n*4, __FUNCTION__);		\
+	outcount = 0;					\
+	outring = dev_priv->ring.tail;			\
+	ringmask = dev_priv->ring.tail_mask;		\
+	virt = dev_priv->ring.virtual_start;		\
+} while (0)
+
+
+#define OUT_RING(n) do {					\
+	if (I830_VERBOSE) printk("   OUT_RING %x\n", (int)(n));	\
+	*(volatile unsigned int *)(virt + outring) = n;		\
+        outcount++;						\
+	outring += 4;						\
+	outring &= ringmask;					\
+} while (0)
+
+#define ADVANCE_LP_RING() do {						\
+	if (I830_VERBOSE) printk("ADVANCE_LP_RING %x\n", outring);	\
+	dev_priv->ring.tail = outring;					\
+	dev_priv->ring.space -= outcount * 4;				\
+	I830_WRITE(LP_RING + RING_TAIL, outring);			\
+} while(0)
+
+extern int i830_wait_ring(drm_device_t *dev, int n, const char *caller);
+
+
+#define GFX_OP_USER_INTERRUPT 		((0<<29)|(2<<23))
+#define GFX_OP_BREAKPOINT_INTERRUPT	((0<<29)|(1<<23))
+#define CMD_REPORT_HEAD			(7<<23)
+#define CMD_STORE_DWORD_IDX		((0x21<<23) | 0x1)
+#define CMD_OP_BATCH_BUFFER  ((0x0<<29)|(0x30<<23)|0x1)
+
+#define STATE3D_LOAD_STATE_IMMEDIATE_2      ((0x3<<29)|(0x1d<<24)|(0x03<<16))
+#define LOAD_TEXTURE_MAP0                   (1<<11)
+
+#define INST_PARSER_CLIENT   0x00000000
+#define INST_OP_FLUSH        0x02000000
+#define INST_FLUSH_MAP_CACHE 0x00000001
+
+
+#define BB1_START_ADDR_MASK   (~0x7)
+#define BB1_PROTECTED         (1<<0)
+#define BB1_UNPROTECTED       (0<<0)
+#define BB2_END_ADDR_MASK     (~0x7)
+
+#define I830REG_HWSTAM		0x02098
+#define I830REG_INT_IDENTITY_R	0x020a4
+#define I830REG_INT_MASK_R 	0x020a8
+#define I830REG_INT_ENABLE_R	0x020a0
+
+#define I830_IRQ_RESERVED ((1<<13)|(3<<2))
+
+
+#define LP_RING     		0x2030
+#define HP_RING     		0x2040
+#define RING_TAIL      		0x00
+#define TAIL_ADDR		0x001FFFF8
+#define RING_HEAD      		0x04
+#define HEAD_WRAP_COUNT     	0xFFE00000
+#define HEAD_WRAP_ONE       	0x00200000
+#define HEAD_ADDR           	0x001FFFFC
+#define RING_START     		0x08
+#define START_ADDR          	0x0xFFFFF000
+#define RING_LEN       		0x0C
+#define RING_NR_PAGES       	0x001FF000 
+#define RING_REPORT_MASK    	0x00000006
+#define RING_REPORT_64K     	0x00000002
+#define RING_REPORT_128K    	0x00000004
+#define RING_NO_REPORT      	0x00000000
+#define RING_VALID_MASK     	0x00000001
+#define RING_VALID          	0x00000001
+#define RING_INVALID        	0x00000000
+
+#define GFX_OP_SCISSOR         ((0x3<<29)|(0x1c<<24)|(0x10<<19))
+#define SC_UPDATE_SCISSOR       (0x1<<1)
+#define SC_ENABLE_MASK          (0x1<<0)
+#define SC_ENABLE               (0x1<<0)
+
+#define GFX_OP_SCISSOR_INFO    ((0x3<<29)|(0x1d<<24)|(0x81<<16)|(0x1))
+#define SCI_YMIN_MASK      (0xffff<<16)
+#define SCI_XMIN_MASK      (0xffff<<0)
+#define SCI_YMAX_MASK      (0xffff<<16)
+#define SCI_XMAX_MASK      (0xffff<<0)
+
+#define GFX_OP_SCISSOR_ENABLE	 ((0x3<<29)|(0x1c<<24)|(0x10<<19))
+#define GFX_OP_SCISSOR_RECT	 ((0x3<<29)|(0x1d<<24)|(0x81<<16)|1)
+#define GFX_OP_COLOR_FACTOR      ((0x3<<29)|(0x1d<<24)|(0x1<<16)|0x0)
+#define GFX_OP_STIPPLE           ((0x3<<29)|(0x1d<<24)|(0x83<<16))
+#define GFX_OP_MAP_INFO          ((0x3<<29)|(0x1d<<24)|0x4)
+#define GFX_OP_DESTBUFFER_VARS   ((0x3<<29)|(0x1d<<24)|(0x85<<16)|0x0)
+#define GFX_OP_DRAWRECT_INFO     ((0x3<<29)|(0x1d<<24)|(0x80<<16)|(0x3))
+#define GFX_OP_PRIMITIVE         ((0x3<<29)|(0x1f<<24))
+
+#define CMD_OP_DESTBUFFER_INFO	 ((0x3<<29)|(0x1d<<24)|(0x8e<<16)|1)
+
+#define CMD_OP_DISPLAYBUFFER_INFO ((0x0<<29)|(0x14<<23)|2)
+#define ASYNC_FLIP                (1<<22)
+
+#define CMD_3D                          (0x3<<29)
+#define STATE3D_CONST_BLEND_COLOR_CMD   (CMD_3D|(0x1d<<24)|(0x88<<16))
+#define STATE3D_MAP_COORD_SETBIND_CMD   (CMD_3D|(0x1d<<24)|(0x02<<16))
+
+#define BR00_BITBLT_CLIENT   0x40000000
+#define BR00_OP_COLOR_BLT    0x10000000
+#define BR00_OP_SRC_COPY_BLT 0x10C00000
+#define BR13_SOLID_PATTERN   0x80000000
+
+#define BUF_3D_ID_COLOR_BACK    (0x3<<24)
+#define BUF_3D_ID_DEPTH         (0x7<<24)
+#define BUF_3D_USE_FENCE        (1<<23)
+#define BUF_3D_PITCH(x)         (((x)/4)<<2)
+
+#define CMD_OP_MAP_PALETTE_LOAD	((3<<29)|(0x1d<<24)|(0x82<<16)|255)
+#define MAP_PALETTE_NUM(x)	((x<<8) & (1<<8))
+#define MAP_PALETTE_BOTH	(1<<11)
+
+#define XY_COLOR_BLT_CMD		((2<<29)|(0x50<<22)|0x4)
+#define XY_COLOR_BLT_WRITE_ALPHA	(1<<21)
+#define XY_COLOR_BLT_WRITE_RGB		(1<<20)
+
+#define XY_SRC_COPY_BLT_CMD             ((2<<29)|(0x53<<22)|6)
+#define XY_SRC_COPY_BLT_WRITE_ALPHA     (1<<21)
+#define XY_SRC_COPY_BLT_WRITE_RGB       (1<<20)
+
+#define MI_BATCH_BUFFER 	((0x30<<23)|1)
+#define MI_BATCH_BUFFER_START 	(0x31<<23)
+#define MI_BATCH_BUFFER_END 	(0xA<<23)
+#define MI_BATCH_NON_SECURE	(1)
+
+#define MI_WAIT_FOR_EVENT       ((0x3<<23))
+#define MI_WAIT_FOR_PLANE_A_FLIP      (1<<2) 
+#define MI_WAIT_FOR_PLANE_A_SCANLINES (1<<1) 
+
+#define MI_LOAD_SCAN_LINES_INCL  ((0x12<<23))
+
+#endif
+
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/i830_irq.c linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/i830_irq.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/i830_irq.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/i830_irq.c	2003-07-30 11:18:33.000000000 +0200
@@ -0,0 +1,178 @@
+/* i830_dma.c -- DMA support for the I830 -*- linux-c -*-
+ *
+ * Copyright 2002 Tungsten Graphics, Inc.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Authors: Keith Whitwell <keith@tungstengraphics.com>
+ *
+ */
+
+#define __NO_VERSION__
+#include "i830.h"
+#include "drmP.h"
+#include "drm.h"
+#include "i830_drm.h"
+#include "i830_drv.h"
+#include <linux/interrupt.h>	/* For task queue support */
+#include <linux/delay.h>
+
+
+void DRM(dma_service)(int irq, void *device, struct pt_regs *regs)
+{
+	drm_device_t	 *dev = (drm_device_t *)device;
+      	drm_i830_private_t *dev_priv = (drm_i830_private_t *)dev->dev_private;
+   	u16 temp;
+   
+      	temp = I830_READ16(I830REG_INT_IDENTITY_R);
+	printk("%s: %x\n", __FUNCTION__, temp);
+	
+   	if(temp == 0) 
+	   return;
+
+	I830_WRITE16(I830REG_INT_IDENTITY_R, temp); 
+
+	if (temp & 2) {
+		atomic_inc(&dev_priv->irq_received);
+		wake_up_interruptible(&dev_priv->irq_queue); 
+	}
+}
+
+
+int i830_emit_irq(drm_device_t *dev)
+{
+	drm_i830_private_t *dev_priv = dev->dev_private;
+	RING_LOCALS;
+
+	DRM_DEBUG("%s\n", __FUNCTION__);
+
+	atomic_inc(&dev_priv->irq_emitted);
+
+   	BEGIN_LP_RING(2);
+      	OUT_RING( 0 );
+      	OUT_RING( GFX_OP_USER_INTERRUPT );
+      	ADVANCE_LP_RING();
+
+	return atomic_read(&dev_priv->irq_emitted);
+}
+
+
+int i830_wait_irq(drm_device_t *dev, int irq_nr)
+{
+  	drm_i830_private_t *dev_priv = 
+	   (drm_i830_private_t *)dev->dev_private;
+	DECLARE_WAITQUEUE(entry, current);
+	unsigned long end = jiffies + HZ*3;
+	int ret = 0;
+
+	DRM_DEBUG("%s\n", __FUNCTION__);
+
+ 	if (atomic_read(&dev_priv->irq_received) >= irq_nr)  
+ 		return 0; 
+
+	dev_priv->sarea_priv->perf_boxes |= I830_BOX_WAIT;
+
+	add_wait_queue(&dev_priv->irq_queue, &entry);
+
+	for (;;) {
+		current->state = TASK_INTERRUPTIBLE;
+	   	if (atomic_read(&dev_priv->irq_received) >= irq_nr) 
+		   break;
+		if((signed)(end - jiffies) <= 0) {
+			DRM_ERROR("timeout iir %x imr %x ier %x hwstam %x\n",
+				  I830_READ16( I830REG_INT_IDENTITY_R ),
+				  I830_READ16( I830REG_INT_MASK_R ),
+				  I830_READ16( I830REG_INT_ENABLE_R ),
+				  I830_READ16( I830REG_HWSTAM ));
+
+		   	ret = -EBUSY;	/* Lockup?  Missed irq? */
+			break;
+		}
+	      	schedule_timeout(HZ*3);
+	      	if (signal_pending(current)) {
+		   	ret = -EINTR;
+			break;
+		}
+	}
+
+	current->state = TASK_RUNNING;
+	remove_wait_queue(&dev_priv->irq_queue, &entry);
+	return ret;
+}
+
+
+/* Needs the lock as it touches the ring.
+ */
+int i830_irq_emit( struct inode *inode, struct file *filp, unsigned int cmd,
+		   unsigned long arg )
+{
+	drm_file_t	  *priv	    = filp->private_data;
+	drm_device_t	  *dev	    = priv->dev;
+	drm_i830_private_t *dev_priv = dev->dev_private;
+	drm_i830_irq_emit_t emit;
+	int result;
+
+   	if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
+		DRM_ERROR("i830_irq_emit called without lock held\n");
+		return -EINVAL;
+	}
+
+	if ( !dev_priv ) {
+		DRM_ERROR( "%s called with no initialization\n", __FUNCTION__ );
+		return -EINVAL;
+	}
+
+	if (copy_from_user( &emit, (drm_i830_irq_emit_t *)arg, sizeof(emit) ))
+		return -EFAULT;
+
+	result = i830_emit_irq( dev );
+
+	if ( copy_to_user( emit.irq_seq, &result, sizeof(int) ) ) {
+		DRM_ERROR( "copy_to_user\n" );
+		return -EFAULT;
+	}
+
+	return 0;
+}
+
+
+/* Doesn't need the hardware lock.
+ */
+int i830_irq_wait( struct inode *inode, struct file *filp, unsigned int cmd,
+		   unsigned long arg )
+{
+	drm_file_t	  *priv	    = filp->private_data;
+	drm_device_t	  *dev	    = priv->dev;
+	drm_i830_private_t *dev_priv = dev->dev_private;
+	drm_i830_irq_wait_t irqwait;
+
+	if ( !dev_priv ) {
+		DRM_ERROR( "%s called with no initialization\n", __FUNCTION__ );
+		return -EINVAL;
+	}
+
+	if (copy_from_user( &irqwait, (drm_i830_irq_wait_t *)arg, 
+			    sizeof(irqwait) ))
+		return -EFAULT;
+
+	return i830_wait_irq( dev, irqwait.irq_seq );
+}
+
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/mga.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/mga.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/mga.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/mga.h	2003-07-30 11:18:33.000000000 +0200
@@ -0,0 +1,98 @@
+/* mga.h -- Matrox G200/G400 DRM template customization -*- linux-c -*-
+ * Created: Thu Jan 11 21:29:32 2001 by gareth@valinux.com
+ *
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Gareth Hughes <gareth@valinux.com>
+ */
+
+#ifndef __MGA_H__
+#define __MGA_H__
+
+/* This remains constant for all DRM template files.
+ */
+#define DRM(x) mga_##x
+
+/* General customization:
+ */
+#define __HAVE_AGP		1
+#define __MUST_HAVE_AGP		1
+#define __HAVE_MTRR		1
+#define __HAVE_CTX_BITMAP	1
+
+#define DRIVER_AUTHOR		"Gareth Hughes, VA Linux Systems Inc."
+
+#define DRIVER_NAME		"mga"
+#define DRIVER_DESC		"Matrox G200/G400"
+#define DRIVER_DATE		"20021029"
+
+#define DRIVER_MAJOR		3
+#define DRIVER_MINOR		1
+#define DRIVER_PATCHLEVEL	0
+
+#define DRIVER_IOCTLS							   \
+	[DRM_IOCTL_NR(DRM_IOCTL_DMA)]	      = { mga_dma_buffers, 1, 0 }, \
+	[DRM_IOCTL_NR(DRM_IOCTL_MGA_INIT)]    = { mga_dma_init,    1, 1 }, \
+	[DRM_IOCTL_NR(DRM_IOCTL_MGA_FLUSH)]   = { mga_dma_flush,   1, 0 }, \
+	[DRM_IOCTL_NR(DRM_IOCTL_MGA_RESET)]   = { mga_dma_reset,   1, 0 }, \
+	[DRM_IOCTL_NR(DRM_IOCTL_MGA_SWAP)]    = { mga_dma_swap,    1, 0 }, \
+	[DRM_IOCTL_NR(DRM_IOCTL_MGA_CLEAR)]   = { mga_dma_clear,   1, 0 }, \
+	[DRM_IOCTL_NR(DRM_IOCTL_MGA_VERTEX)]  = { mga_dma_vertex,  1, 0 }, \
+	[DRM_IOCTL_NR(DRM_IOCTL_MGA_INDICES)] = { mga_dma_indices, 1, 0 }, \
+	[DRM_IOCTL_NR(DRM_IOCTL_MGA_ILOAD)]   = { mga_dma_iload,   1, 0 }, \
+	[DRM_IOCTL_NR(DRM_IOCTL_MGA_BLIT)]    = { mga_dma_blit,    1, 0 }, \
+	[DRM_IOCTL_NR(DRM_IOCTL_MGA_GETPARAM)]= { mga_getparam,    1, 0 },
+
+#define __HAVE_COUNTERS         3
+#define __HAVE_COUNTER6         _DRM_STAT_IRQ
+#define __HAVE_COUNTER7         _DRM_STAT_PRIMARY
+#define __HAVE_COUNTER8         _DRM_STAT_SECONDARY
+
+/* Driver customization:
+ */
+#define DRIVER_PRETAKEDOWN() do {					\
+	if ( dev->dev_private ) mga_do_cleanup_dma( dev );		\
+} while (0)
+
+/* DMA customization:
+ */
+#define __HAVE_DMA		1
+#define __HAVE_DMA_IRQ		1
+#define __HAVE_VBL_IRQ		1
+#define __HAVE_SHARED_IRQ       1
+
+#define __HAVE_DMA_QUIESCENT	1
+#define DRIVER_DMA_QUIESCENT() do {					\
+	drm_mga_private_t *dev_priv = dev->dev_private;			\
+	return mga_do_wait_for_idle( dev_priv );			\
+} while (0)
+
+/* Buffer customization:
+ */
+#define DRIVER_BUF_PRIV_T	drm_mga_buf_priv_t
+
+#define DRIVER_AGP_BUFFERS_MAP( dev )					\
+	((drm_mga_private_t *)((dev)->dev_private))->buffers
+
+#endif
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/mga_dma.c linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/mga_dma.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/mga_dma.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/mga_dma.c	2003-07-30 11:18:33.000000000 +0200
@@ -0,0 +1,795 @@
+/* mga_dma.c -- DMA support for mga g200/g400 -*- linux-c -*-
+ * Created: Mon Dec 13 01:50:01 1999 by jhartmann@precisioninsight.com
+ *
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Rickard E. (Rik) Faith <faith@valinux.com>
+ *    Jeff Hartmann <jhartmann@valinux.com>
+ *    Keith Whitwell <keith@tungstengraphics.com>
+ *
+ * Rewritten by:
+ *    Gareth Hughes <gareth@valinux.com>
+ */
+
+#include "mga.h"
+#include "drmP.h"
+#include "drm.h"
+#include "mga_drm.h"
+#include "mga_drv.h"
+
+#define MGA_DEFAULT_USEC_TIMEOUT	10000
+#define MGA_FREELIST_DEBUG		0
+
+
+/* ================================================================
+ * Engine control
+ */
+
+int mga_do_wait_for_idle( drm_mga_private_t *dev_priv )
+{
+	u32 status = 0;
+	int i;
+	DRM_DEBUG( "\n" );
+
+	for ( i = 0 ; i < dev_priv->usec_timeout ; i++ ) {
+		status = MGA_READ( MGA_STATUS ) & MGA_ENGINE_IDLE_MASK;
+		if ( status == MGA_ENDPRDMASTS ) {
+			MGA_WRITE8( MGA_CRTC_INDEX, 0 );
+			return 0;
+		}
+		DRM_UDELAY( 1 );
+	}
+
+#if MGA_DMA_DEBUG
+	DRM_ERROR( "failed!\n" );
+	DRM_INFO( "   status=0x%08x\n", status );
+#endif
+	return DRM_ERR(EBUSY);
+}
+
+int mga_do_dma_idle( drm_mga_private_t *dev_priv )
+{
+	u32 status = 0;
+	int i;
+	DRM_DEBUG( "\n" );
+
+	for ( i = 0 ; i < dev_priv->usec_timeout ; i++ ) {
+		status = MGA_READ( MGA_STATUS ) & MGA_DMA_IDLE_MASK;
+		if ( status == MGA_ENDPRDMASTS ) return 0;
+		DRM_UDELAY( 1 );
+	}
+
+#if MGA_DMA_DEBUG
+	DRM_ERROR( "failed! status=0x%08x\n", status );
+#endif
+	return DRM_ERR(EBUSY);
+}
+
+int mga_do_dma_reset( drm_mga_private_t *dev_priv )
+{
+	drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	drm_mga_primary_buffer_t *primary = &dev_priv->prim;
+
+	DRM_DEBUG( "\n" );
+
+	/* The primary DMA stream should look like new right about now.
+	 */
+	primary->tail = 0;
+	primary->space = primary->size;
+	primary->last_flush = 0;
+
+	sarea_priv->last_wrap = 0;
+
+	/* FIXME: Reset counters, buffer ages etc...
+	 */
+
+	/* FIXME: What else do we need to reinitialize?  WARP stuff?
+	 */
+
+	return 0;
+}
+
+int mga_do_engine_reset( drm_mga_private_t *dev_priv )
+{
+	DRM_DEBUG( "\n" );
+
+	/* Okay, so we've completely screwed up and locked the engine.
+	 * How about we clean up after ourselves?
+	 */
+	MGA_WRITE( MGA_RST, MGA_SOFTRESET );
+	DRM_UDELAY( 15 );				/* Wait at least 10 usecs */
+	MGA_WRITE( MGA_RST, 0 );
+
+	/* Initialize the registers that get clobbered by the soft
+	 * reset.  Many of the core register values survive a reset,
+	 * but the drawing registers are basically all gone.
+	 *
+	 * 3D clients should probably die after calling this.  The X
+	 * server should reset the engine state to known values.
+	 */
+#if 0
+	MGA_WRITE( MGA_PRIMPTR,
+		   virt_to_bus((void *)dev_priv->prim.status_page) |
+		   MGA_PRIMPTREN0 |
+		   MGA_PRIMPTREN1 );
+#endif
+
+	MGA_WRITE( MGA_ICLEAR, MGA_SOFTRAPICLR );
+	MGA_WRITE( MGA_IEN,    MGA_SOFTRAPIEN );
+
+	/* The primary DMA stream should look like new right about now.
+	 */
+	mga_do_dma_reset( dev_priv );
+
+	/* This bad boy will never fail.
+	 */
+	return 0;
+}
+
+
+/* ================================================================
+ * Primary DMA stream
+ */
+
+void mga_do_dma_flush( drm_mga_private_t *dev_priv )
+{
+	drm_mga_primary_buffer_t *primary = &dev_priv->prim;
+	u32 head, tail;
+	u32 status = 0;
+	int i;
+ 	DMA_LOCALS;
+	DRM_DEBUG( "\n" );
+
+        /* We need to wait so that we can do an safe flush */
+	for ( i = 0 ; i < dev_priv->usec_timeout ; i++ ) {
+		status = MGA_READ( MGA_STATUS ) & MGA_ENGINE_IDLE_MASK;
+		if ( status == MGA_ENDPRDMASTS ) break;
+		DRM_UDELAY( 1 );
+	}
+
+	if ( primary->tail == primary->last_flush ) {
+		DRM_DEBUG( "   bailing out...\n" );
+		return;
+	}
+
+	tail = primary->tail + dev_priv->primary->offset;
+
+	/* We need to pad the stream between flushes, as the card
+	 * actually (partially?) reads the first of these commands.
+	 * See page 4-16 in the G400 manual, middle of the page or so.
+	 */
+	BEGIN_DMA( 1 );
+
+	DMA_BLOCK( MGA_DMAPAD,  0x00000000,
+		   MGA_DMAPAD,  0x00000000,
+		   MGA_DMAPAD,  0x00000000,
+		   MGA_DMAPAD,	0x00000000 );
+
+	ADVANCE_DMA();
+
+	primary->last_flush = primary->tail;
+
+	head = MGA_READ( MGA_PRIMADDRESS );
+
+	if ( head <= tail ) {
+		primary->space = primary->size - primary->tail;
+	} else {
+		primary->space = head - tail;
+	}
+
+	DRM_DEBUG( "   head = 0x%06lx\n", head - dev_priv->primary->offset );
+	DRM_DEBUG( "   tail = 0x%06lx\n", tail - dev_priv->primary->offset );
+	DRM_DEBUG( "  space = 0x%06x\n", primary->space );
+
+	mga_flush_write_combine();
+	MGA_WRITE( MGA_PRIMEND, tail | MGA_PAGPXFER );
+
+	DRM_DEBUG( "done.\n" );
+}
+
+void mga_do_dma_wrap_start( drm_mga_private_t *dev_priv )
+{
+	drm_mga_primary_buffer_t *primary = &dev_priv->prim;
+	u32 head, tail;
+	DMA_LOCALS;
+	DRM_DEBUG( "\n" );
+
+	BEGIN_DMA_WRAP();
+
+	DMA_BLOCK( MGA_DMAPAD,	0x00000000,
+		   MGA_DMAPAD,	0x00000000,
+		   MGA_DMAPAD,	0x00000000,
+		   MGA_DMAPAD,	0x00000000 );
+
+	ADVANCE_DMA();
+
+	tail = primary->tail + dev_priv->primary->offset;
+
+	primary->tail = 0;
+	primary->last_flush = 0;
+	primary->last_wrap++;
+
+	head = MGA_READ( MGA_PRIMADDRESS );
+
+	if ( head == dev_priv->primary->offset ) {
+		primary->space = primary->size;
+	} else {
+		primary->space = head - dev_priv->primary->offset;
+	}
+
+	DRM_DEBUG( "   head = 0x%06lx\n",
+		  head - dev_priv->primary->offset );
+	DRM_DEBUG( "   tail = 0x%06x\n", primary->tail );
+	DRM_DEBUG( "   wrap = %d\n", primary->last_wrap );
+	DRM_DEBUG( "  space = 0x%06x\n", primary->space );
+
+	mga_flush_write_combine();
+	MGA_WRITE( MGA_PRIMEND, tail | MGA_PAGPXFER );
+
+	set_bit( 0, &primary->wrapped );
+	DRM_DEBUG( "done.\n" );
+}
+
+void mga_do_dma_wrap_end( drm_mga_private_t *dev_priv )
+{
+	drm_mga_primary_buffer_t *primary = &dev_priv->prim;
+	drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	u32 head = dev_priv->primary->offset;
+	DRM_DEBUG( "\n" );
+
+	sarea_priv->last_wrap++;
+	DRM_DEBUG( "   wrap = %d\n", sarea_priv->last_wrap );
+
+	mga_flush_write_combine();
+	MGA_WRITE( MGA_PRIMADDRESS, head | MGA_DMA_GENERAL );
+
+	clear_bit( 0, &primary->wrapped );
+	DRM_DEBUG( "done.\n" );
+}
+
+
+/* ================================================================
+ * Freelist management
+ */
+
+#define MGA_BUFFER_USED		~0
+#define MGA_BUFFER_FREE		0
+
+#if MGA_FREELIST_DEBUG
+static void mga_freelist_print( drm_device_t *dev )
+{
+	drm_mga_private_t *dev_priv = dev->dev_private;
+	drm_mga_freelist_t *entry;
+
+	DRM_INFO( "\n" );
+	DRM_INFO( "current dispatch: last=0x%x done=0x%x\n",
+		  dev_priv->sarea_priv->last_dispatch,
+		  (unsigned int)(MGA_READ( MGA_PRIMADDRESS ) -
+				 dev_priv->primary->offset) );
+	DRM_INFO( "current freelist:\n" );
+
+	for ( entry = dev_priv->head->next ; entry ; entry = entry->next ) {
+		DRM_INFO( "   %p   idx=%2d  age=0x%x 0x%06lx\n",
+			  entry, entry->buf->idx, entry->age.head,
+			  entry->age.head - dev_priv->primary->offset );
+	}
+	DRM_INFO( "\n" );
+}
+#endif
+
+static int mga_freelist_init( drm_device_t *dev, drm_mga_private_t *dev_priv )
+{
+	drm_device_dma_t *dma = dev->dma;
+	drm_buf_t *buf;
+	drm_mga_buf_priv_t *buf_priv;
+	drm_mga_freelist_t *entry;
+	int i;
+	DRM_DEBUG( "count=%d\n", dma->buf_count );
+
+	dev_priv->head = DRM(alloc)( sizeof(drm_mga_freelist_t),
+				     DRM_MEM_DRIVER );
+	if ( dev_priv->head == NULL )
+		return DRM_ERR(ENOMEM);
+
+	memset( dev_priv->head, 0, sizeof(drm_mga_freelist_t) );
+	SET_AGE( &dev_priv->head->age, MGA_BUFFER_USED, 0 );
+
+	for ( i = 0 ; i < dma->buf_count ; i++ ) {
+		buf = dma->buflist[i];
+	        buf_priv = buf->dev_private;
+
+		entry = DRM(alloc)( sizeof(drm_mga_freelist_t),
+				    DRM_MEM_DRIVER );
+		if ( entry == NULL )
+			return DRM_ERR(ENOMEM);
+
+		memset( entry, 0, sizeof(drm_mga_freelist_t) );
+
+		entry->next = dev_priv->head->next;
+		entry->prev = dev_priv->head;
+		SET_AGE( &entry->age, MGA_BUFFER_FREE, 0 );
+		entry->buf = buf;
+
+		if ( dev_priv->head->next != NULL )
+			dev_priv->head->next->prev = entry;
+		if ( entry->next == NULL )
+			dev_priv->tail = entry;
+
+		buf_priv->list_entry = entry;
+		buf_priv->discard = 0;
+		buf_priv->dispatched = 0;
+
+		dev_priv->head->next = entry;
+	}
+
+	return 0;
+}
+
+static void mga_freelist_cleanup( drm_device_t *dev )
+{
+	drm_mga_private_t *dev_priv = dev->dev_private;
+	drm_mga_freelist_t *entry;
+	drm_mga_freelist_t *next;
+	DRM_DEBUG( "\n" );
+
+	entry = dev_priv->head;
+	while ( entry ) {
+		next = entry->next;
+		DRM(free)( entry, sizeof(drm_mga_freelist_t), DRM_MEM_DRIVER );
+		entry = next;
+	}
+
+	dev_priv->head = dev_priv->tail = NULL;
+}
+
+#if 0
+/* FIXME: Still needed?
+ */
+static void mga_freelist_reset( drm_device_t *dev )
+{
+	drm_device_dma_t *dma = dev->dma;
+	drm_buf_t *buf;
+	drm_mga_buf_priv_t *buf_priv;
+	int i;
+
+	for ( i = 0 ; i < dma->buf_count ; i++ ) {
+		buf = dma->buflist[i];
+	        buf_priv = buf->dev_private;
+		SET_AGE( &buf_priv->list_entry->age,
+			 MGA_BUFFER_FREE, 0 );
+	}
+}
+#endif
+
+static drm_buf_t *mga_freelist_get( drm_device_t *dev )
+{
+	drm_mga_private_t *dev_priv = dev->dev_private;
+	drm_mga_freelist_t *next;
+	drm_mga_freelist_t *prev;
+	drm_mga_freelist_t *tail = dev_priv->tail;
+	u32 head, wrap;
+	DRM_DEBUG( "\n" );
+
+	head = MGA_READ( MGA_PRIMADDRESS );
+	wrap = dev_priv->sarea_priv->last_wrap;
+
+	DRM_DEBUG( "   tail=0x%06lx %d\n",
+		   tail->age.head ?
+		   tail->age.head - dev_priv->primary->offset : 0,
+		   tail->age.wrap );
+	DRM_DEBUG( "   head=0x%06lx %d\n",
+		   head - dev_priv->primary->offset, wrap );
+
+	if ( TEST_AGE( &tail->age, head, wrap ) ) {
+		prev = dev_priv->tail->prev;
+		next = dev_priv->tail;
+		prev->next = NULL;
+		next->prev = next->next = NULL;
+		dev_priv->tail = prev;
+		SET_AGE( &next->age, MGA_BUFFER_USED, 0 );
+		return next->buf;
+	}
+
+	DRM_DEBUG( "returning NULL!\n" );
+	return NULL;
+}
+
+int mga_freelist_put( drm_device_t *dev, drm_buf_t *buf )
+{
+	drm_mga_private_t *dev_priv = dev->dev_private;
+	drm_mga_buf_priv_t *buf_priv = buf->dev_private;
+	drm_mga_freelist_t *head, *entry, *prev;
+
+	DRM_DEBUG( "age=0x%06lx wrap=%d\n",
+		   buf_priv->list_entry->age.head -
+		   dev_priv->primary->offset,
+		   buf_priv->list_entry->age.wrap );
+
+	entry = buf_priv->list_entry;
+	head = dev_priv->head;
+
+	if ( buf_priv->list_entry->age.head == MGA_BUFFER_USED ) {
+		SET_AGE( &entry->age, MGA_BUFFER_FREE, 0 );
+		prev = dev_priv->tail;
+		prev->next = entry;
+		entry->prev = prev;
+		entry->next = NULL;
+	} else {
+		prev = head->next;
+		head->next = entry;
+		prev->prev = entry;
+		entry->prev = head;
+		entry->next = prev;
+	}
+
+	return 0;
+}
+
+
+/* ================================================================
+ * DMA initialization, cleanup
+ */
+
+static int mga_do_init_dma( drm_device_t *dev, drm_mga_init_t *init )
+{
+	drm_mga_private_t *dev_priv;
+	int ret;
+	DRM_DEBUG( "\n" );
+
+	dev_priv = DRM(alloc)( sizeof(drm_mga_private_t), DRM_MEM_DRIVER );
+	if ( !dev_priv )
+		return DRM_ERR(ENOMEM);
+
+	memset( dev_priv, 0, sizeof(drm_mga_private_t) );
+
+	dev_priv->chipset = init->chipset;
+
+	dev_priv->usec_timeout = MGA_DEFAULT_USEC_TIMEOUT;
+
+	if ( init->sgram ) {
+		dev_priv->clear_cmd = MGA_DWGCTL_CLEAR | MGA_ATYPE_BLK;
+	} else {
+		dev_priv->clear_cmd = MGA_DWGCTL_CLEAR | MGA_ATYPE_RSTR;
+	}
+	dev_priv->maccess	= init->maccess;
+
+	dev_priv->fb_cpp	= init->fb_cpp;
+	dev_priv->front_offset	= init->front_offset;
+	dev_priv->front_pitch	= init->front_pitch;
+	dev_priv->back_offset	= init->back_offset;
+	dev_priv->back_pitch	= init->back_pitch;
+
+	dev_priv->depth_cpp	= init->depth_cpp;
+	dev_priv->depth_offset	= init->depth_offset;
+	dev_priv->depth_pitch	= init->depth_pitch;
+
+	/* FIXME: Need to support AGP textures...
+	 */
+	dev_priv->texture_offset = init->texture_offset[0];
+	dev_priv->texture_size = init->texture_size[0];
+
+	DRM_GETSAREA();
+
+	if(!dev_priv->sarea) {
+		DRM_ERROR( "failed to find sarea!\n" );
+		/* Assign dev_private so we can do cleanup. */
+		dev->dev_private = (void *)dev_priv;
+		mga_do_cleanup_dma( dev );
+		return DRM_ERR(EINVAL);
+	}
+
+	DRM_FIND_MAP( dev_priv->fb, init->fb_offset );
+	if(!dev_priv->fb) {
+		DRM_ERROR( "failed to find framebuffer!\n" );
+		/* Assign dev_private so we can do cleanup. */
+		dev->dev_private = (void *)dev_priv;
+		mga_do_cleanup_dma( dev );
+		return DRM_ERR(EINVAL);
+	}
+	DRM_FIND_MAP( dev_priv->mmio, init->mmio_offset );
+	if(!dev_priv->mmio) {
+		DRM_ERROR( "failed to find mmio region!\n" );
+		/* Assign dev_private so we can do cleanup. */
+		dev->dev_private = (void *)dev_priv;
+		mga_do_cleanup_dma( dev );
+		return DRM_ERR(EINVAL);
+	}
+	DRM_FIND_MAP( dev_priv->status, init->status_offset );
+	if(!dev_priv->status) {
+		DRM_ERROR( "failed to find status page!\n" );
+		/* Assign dev_private so we can do cleanup. */
+		dev->dev_private = (void *)dev_priv;
+		mga_do_cleanup_dma( dev );
+		return DRM_ERR(EINVAL);
+	}
+
+	DRM_FIND_MAP( dev_priv->warp, init->warp_offset );
+	if(!dev_priv->warp) {
+		DRM_ERROR( "failed to find warp microcode region!\n" );
+		/* Assign dev_private so we can do cleanup. */
+		dev->dev_private = (void *)dev_priv;
+		mga_do_cleanup_dma( dev );
+		return DRM_ERR(EINVAL);
+	}
+	DRM_FIND_MAP( dev_priv->primary, init->primary_offset );
+	if(!dev_priv->primary) {
+		DRM_ERROR( "failed to find primary dma region!\n" );
+		/* Assign dev_private so we can do cleanup. */
+		dev->dev_private = (void *)dev_priv;
+		mga_do_cleanup_dma( dev );
+		return DRM_ERR(EINVAL);
+	}
+	DRM_FIND_MAP( dev_priv->buffers, init->buffers_offset );
+	if(!dev_priv->buffers) {
+		DRM_ERROR( "failed to find dma buffer region!\n" );
+		/* Assign dev_private so we can do cleanup. */
+		dev->dev_private = (void *)dev_priv;
+		mga_do_cleanup_dma( dev );
+		return DRM_ERR(EINVAL);
+	}
+
+	dev_priv->sarea_priv =
+		(drm_mga_sarea_t *)((u8 *)dev_priv->sarea->handle +
+				    init->sarea_priv_offset);
+
+	DRM_IOREMAP( dev_priv->warp );
+	DRM_IOREMAP( dev_priv->primary );
+	DRM_IOREMAP( dev_priv->buffers );
+
+	if(!dev_priv->warp->handle ||
+	   !dev_priv->primary->handle ||
+	   !dev_priv->buffers->handle ) {
+		DRM_ERROR( "failed to ioremap agp regions!\n" );
+		/* Assign dev_private so we can do cleanup. */
+		dev->dev_private = (void *)dev_priv;
+		mga_do_cleanup_dma( dev );
+		return DRM_ERR(ENOMEM);
+	}
+
+	ret = mga_warp_install_microcode( dev_priv );
+	if ( ret < 0 ) {
+		DRM_ERROR( "failed to install WARP ucode!\n" );
+		/* Assign dev_private so we can do cleanup. */
+		dev->dev_private = (void *)dev_priv;
+		mga_do_cleanup_dma( dev );
+		return ret;
+	}
+
+	ret = mga_warp_init( dev_priv );
+	if ( ret < 0 ) {
+		DRM_ERROR( "failed to init WARP engine!\n" );
+		/* Assign dev_private so we can do cleanup. */
+		dev->dev_private = (void *)dev_priv;
+		mga_do_cleanup_dma( dev );
+		return ret;
+	}
+
+	dev_priv->prim.status = (u32 *)dev_priv->status->handle;
+
+	mga_do_wait_for_idle( dev_priv );
+
+	/* Init the primary DMA registers.
+	 */
+	MGA_WRITE( MGA_PRIMADDRESS,
+		   dev_priv->primary->offset | MGA_DMA_GENERAL );
+#if 0
+	MGA_WRITE( MGA_PRIMPTR,
+		   virt_to_bus((void *)dev_priv->prim.status) |
+		   MGA_PRIMPTREN0 |	/* Soft trap, SECEND, SETUPEND */
+		   MGA_PRIMPTREN1 );	/* DWGSYNC */
+#endif
+
+	dev_priv->prim.start = (u8 *)dev_priv->primary->handle;
+	dev_priv->prim.end = ((u8 *)dev_priv->primary->handle
+			      + dev_priv->primary->size);
+	dev_priv->prim.size = dev_priv->primary->size;
+
+	dev_priv->prim.tail = 0;
+	dev_priv->prim.space = dev_priv->prim.size;
+	dev_priv->prim.wrapped = 0;
+
+	dev_priv->prim.last_flush = 0;
+	dev_priv->prim.last_wrap = 0;
+
+	dev_priv->prim.high_mark = 256 * DMA_BLOCK_SIZE;
+
+	dev_priv->prim.status[0] = dev_priv->primary->offset;
+	dev_priv->prim.status[1] = 0;
+
+	dev_priv->sarea_priv->last_wrap = 0;
+	dev_priv->sarea_priv->last_frame.head = 0;
+	dev_priv->sarea_priv->last_frame.wrap = 0;
+
+	if ( mga_freelist_init( dev, dev_priv ) < 0 ) {
+		DRM_ERROR( "could not initialize freelist\n" );
+		/* Assign dev_private so we can do cleanup. */
+		dev->dev_private = (void *)dev_priv;
+		mga_do_cleanup_dma( dev );
+		return DRM_ERR(ENOMEM);
+	}
+
+	/* Make dev_private visable to others. */
+	dev->dev_private = (void *)dev_priv;
+	return 0;
+}
+
+int mga_do_cleanup_dma( drm_device_t *dev )
+{
+	DRM_DEBUG( "\n" );
+
+	if ( dev->dev_private ) {
+		drm_mga_private_t *dev_priv = dev->dev_private;
+
+		DRM_IOREMAPFREE( dev_priv->warp );
+		DRM_IOREMAPFREE( dev_priv->primary );
+		DRM_IOREMAPFREE( dev_priv->buffers );
+
+		if ( dev_priv->head != NULL ) {
+			mga_freelist_cleanup( dev );
+		}
+
+		DRM(free)( dev->dev_private, sizeof(drm_mga_private_t),
+			   DRM_MEM_DRIVER );
+		dev->dev_private = NULL;
+	}
+
+	return 0;
+}
+
+int mga_dma_init( DRM_IOCTL_ARGS )
+{
+	DRM_DEVICE;
+	drm_mga_init_t init;
+
+	DRM_COPY_FROM_USER_IOCTL( init, (drm_mga_init_t *)data, sizeof(init) );
+
+	switch ( init.func ) {
+	case MGA_INIT_DMA:
+		return mga_do_init_dma( dev, &init );
+	case MGA_CLEANUP_DMA:
+		return mga_do_cleanup_dma( dev );
+	}
+
+	return DRM_ERR(EINVAL);
+}
+
+
+/* ================================================================
+ * Primary DMA stream management
+ */
+
+int mga_dma_flush( DRM_IOCTL_ARGS )
+{
+	DRM_DEVICE;
+	drm_mga_private_t *dev_priv = (drm_mga_private_t *)dev->dev_private;
+	drm_lock_t lock;
+
+	LOCK_TEST_WITH_RETURN( dev );
+
+	DRM_COPY_FROM_USER_IOCTL( lock, (drm_lock_t *)data, sizeof(lock) );
+
+	DRM_DEBUG( "%s%s%s\n",
+		   (lock.flags & _DRM_LOCK_FLUSH) ?	"flush, " : "",
+		   (lock.flags & _DRM_LOCK_FLUSH_ALL) ?	"flush all, " : "",
+		   (lock.flags & _DRM_LOCK_QUIESCENT) ?	"idle, " : "" );
+
+	WRAP_WAIT_WITH_RETURN( dev_priv );
+
+	if ( lock.flags & (_DRM_LOCK_FLUSH | _DRM_LOCK_FLUSH_ALL) ) {
+		mga_do_dma_flush( dev_priv );
+	}
+
+	if ( lock.flags & _DRM_LOCK_QUIESCENT ) {
+#if MGA_DMA_DEBUG
+		int ret = mga_do_wait_for_idle( dev_priv );
+		if ( ret < 0 )
+			DRM_INFO( "%s: -EBUSY\n", __FUNCTION__ );
+		return ret;
+#else
+		return mga_do_wait_for_idle( dev_priv );
+#endif
+	} else {
+		return 0;
+	}
+}
+
+int mga_dma_reset( DRM_IOCTL_ARGS )
+{
+	DRM_DEVICE;
+	drm_mga_private_t *dev_priv = (drm_mga_private_t *)dev->dev_private;
+
+	LOCK_TEST_WITH_RETURN( dev );
+
+	return mga_do_dma_reset( dev_priv );
+}
+
+
+/* ================================================================
+ * DMA buffer management
+ */
+
+static int mga_dma_get_buffers( drm_device_t *dev, drm_dma_t *d )
+{
+	drm_buf_t *buf;
+	int i;
+
+	for ( i = d->granted_count ; i < d->request_count ; i++ ) {
+		buf = mga_freelist_get( dev );
+		if ( !buf ) return DRM_ERR(EAGAIN);
+
+		buf->pid = DRM_CURRENTPID;
+
+		if ( DRM_COPY_TO_USER( &d->request_indices[i],
+				   &buf->idx, sizeof(buf->idx) ) )
+			return DRM_ERR(EFAULT);
+		if ( DRM_COPY_TO_USER( &d->request_sizes[i],
+				   &buf->total, sizeof(buf->total) ) )
+			return DRM_ERR(EFAULT);
+
+		d->granted_count++;
+	}
+	return 0;
+}
+
+int mga_dma_buffers( DRM_IOCTL_ARGS )
+{
+	DRM_DEVICE;
+	drm_device_dma_t *dma = dev->dma;
+	drm_mga_private_t *dev_priv = (drm_mga_private_t *)dev->dev_private;
+	drm_dma_t d;
+	int ret = 0;
+
+	LOCK_TEST_WITH_RETURN( dev );
+
+	DRM_COPY_FROM_USER_IOCTL( d, (drm_dma_t *)data, sizeof(d) );
+
+	/* Please don't send us buffers.
+	 */
+	if ( d.send_count != 0 ) {
+		DRM_ERROR( "Process %d trying to send %d buffers via drmDMA\n",
+			   DRM_CURRENTPID, d.send_count );
+		return DRM_ERR(EINVAL);
+	}
+
+	/* We'll send you buffers.
+	 */
+	if ( d.request_count < 0 || d.request_count > dma->buf_count ) {
+		DRM_ERROR( "Process %d trying to get %d buffers (of %d max)\n",
+			   DRM_CURRENTPID, d.request_count, dma->buf_count );
+		return DRM_ERR(EINVAL);
+	}
+
+	WRAP_TEST_WITH_RETURN( dev_priv );
+
+	d.granted_count = 0;
+
+	if ( d.request_count ) {
+		ret = mga_dma_get_buffers( dev, &d );
+	}
+
+	DRM_COPY_TO_USER_IOCTL( (drm_dma_t *)data, d, sizeof(d) );
+
+	return ret;
+}
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/mga_drm.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/mga_drm.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/mga_drm.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/mga_drm.h	2003-07-30 11:18:33.000000000 +0200
@@ -0,0 +1,336 @@
+/* mga_drm.h -- Public header for the Matrox g200/g400 driver -*- linux-c -*-
+ * Created: Tue Jan 25 01:50:01 1999 by jhartmann@precisioninsight.com
+ *
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Jeff Hartmann <jhartmann@valinux.com>
+ *    Keith Whitwell <keith@tungstengraphics.com>
+ *
+ * Rewritten by:
+ *    Gareth Hughes <gareth@valinux.com>
+ */
+
+#ifndef __MGA_DRM_H__
+#define __MGA_DRM_H__
+
+/* WARNING: If you change any of these defines, make sure to change the
+ * defines in the Xserver file (mga_sarea.h)
+ */
+
+#ifndef __MGA_SAREA_DEFINES__
+#define __MGA_SAREA_DEFINES__
+
+/* WARP pipe flags
+ */
+#define MGA_F			0x1		/* fog */
+#define MGA_A			0x2		/* alpha */
+#define MGA_S			0x4		/* specular */
+#define MGA_T2			0x8		/* multitexture */
+
+#define MGA_WARP_TGZ		0
+#define MGA_WARP_TGZF		(MGA_F)
+#define MGA_WARP_TGZA		(MGA_A)
+#define MGA_WARP_TGZAF		(MGA_F|MGA_A)
+#define MGA_WARP_TGZS		(MGA_S)
+#define MGA_WARP_TGZSF		(MGA_S|MGA_F)
+#define MGA_WARP_TGZSA		(MGA_S|MGA_A)
+#define MGA_WARP_TGZSAF		(MGA_S|MGA_F|MGA_A)
+#define MGA_WARP_T2GZ		(MGA_T2)
+#define MGA_WARP_T2GZF		(MGA_T2|MGA_F)
+#define MGA_WARP_T2GZA		(MGA_T2|MGA_A)
+#define MGA_WARP_T2GZAF		(MGA_T2|MGA_A|MGA_F)
+#define MGA_WARP_T2GZS		(MGA_T2|MGA_S)
+#define MGA_WARP_T2GZSF		(MGA_T2|MGA_S|MGA_F)
+#define MGA_WARP_T2GZSA		(MGA_T2|MGA_S|MGA_A)
+#define MGA_WARP_T2GZSAF	(MGA_T2|MGA_S|MGA_F|MGA_A)
+
+#define MGA_MAX_G200_PIPES	8		/* no multitex */
+#define MGA_MAX_G400_PIPES	16
+#define MGA_MAX_WARP_PIPES	MGA_MAX_G400_PIPES
+#define MGA_WARP_UCODE_SIZE	32768		/* in bytes */
+
+#define MGA_CARD_TYPE_G200	1
+#define MGA_CARD_TYPE_G400	2
+
+
+#define MGA_FRONT		0x1
+#define MGA_BACK		0x2
+#define MGA_DEPTH		0x4
+
+/* What needs to be changed for the current vertex dma buffer?
+ */
+#define MGA_UPLOAD_CONTEXT	0x1
+#define MGA_UPLOAD_TEX0		0x2
+#define MGA_UPLOAD_TEX1		0x4
+#define MGA_UPLOAD_PIPE		0x8
+#define MGA_UPLOAD_TEX0IMAGE	0x10 /* handled client-side */
+#define MGA_UPLOAD_TEX1IMAGE	0x20 /* handled client-side */
+#define MGA_UPLOAD_2D		0x40
+#define MGA_WAIT_AGE		0x80 /* handled client-side */
+#define MGA_UPLOAD_CLIPRECTS	0x100 /* handled client-side */
+#if 0
+#define MGA_DMA_FLUSH		0x200 /* set when someone gets the lock
+					 quiescent */
+#endif
+
+/* 32 buffers of 64k each, total 2 meg.
+ */
+#define MGA_BUFFER_SIZE		(1 << 16)
+#define MGA_NUM_BUFFERS		128
+
+/* Keep these small for testing.
+ */
+#define MGA_NR_SAREA_CLIPRECTS	8
+
+/* 2 heaps (1 for card, 1 for agp), each divided into upto 128
+ * regions, subject to a minimum region size of (1<<16) == 64k.
+ *
+ * Clients may subdivide regions internally, but when sharing between
+ * clients, the region size is the minimum granularity.
+ */
+
+#define MGA_CARD_HEAP			0
+#define MGA_AGP_HEAP			1
+#define MGA_NR_TEX_HEAPS		2
+#define MGA_NR_TEX_REGIONS		16
+#define MGA_LOG_MIN_TEX_REGION_SIZE	16
+
+#endif /* __MGA_SAREA_DEFINES__ */
+
+
+/* Setup registers for 3D context
+ */
+typedef struct {
+	unsigned int dstorg;
+	unsigned int maccess;
+	unsigned int plnwt;
+	unsigned int dwgctl;
+	unsigned int alphactrl;
+	unsigned int fogcolor;
+	unsigned int wflag;
+	unsigned int tdualstage0;
+	unsigned int tdualstage1;
+	unsigned int fcol;
+	unsigned int stencil;
+	unsigned int stencilctl;
+} drm_mga_context_regs_t;
+
+/* Setup registers for 2D, X server
+ */
+typedef struct {
+	unsigned int pitch;
+} drm_mga_server_regs_t;
+
+/* Setup registers for each texture unit
+ */
+typedef struct {
+	unsigned int texctl;
+	unsigned int texctl2;
+	unsigned int texfilter;
+	unsigned int texbordercol;
+	unsigned int texorg;
+	unsigned int texwidth;
+	unsigned int texheight;
+	unsigned int texorg1;
+	unsigned int texorg2;
+	unsigned int texorg3;
+	unsigned int texorg4;
+} drm_mga_texture_regs_t;
+
+/* General aging mechanism
+ */
+typedef struct {
+	unsigned int head;		/* Position of head pointer          */
+	unsigned int wrap;		/* Primary DMA wrap count            */
+} drm_mga_age_t;
+
+typedef struct _drm_mga_sarea {
+	/* The channel for communication of state information to the kernel
+	 * on firing a vertex dma buffer.
+	 */
+   	drm_mga_context_regs_t context_state;
+   	drm_mga_server_regs_t server_state;
+   	drm_mga_texture_regs_t tex_state[2];
+   	unsigned int warp_pipe;
+   	unsigned int dirty;
+   	unsigned int vertsize;
+
+	/* The current cliprects, or a subset thereof.
+	 */
+   	drm_clip_rect_t boxes[MGA_NR_SAREA_CLIPRECTS];
+   	unsigned int nbox;
+
+	/* Information about the most recently used 3d drawable.  The
+	 * client fills in the req_* fields, the server fills in the
+	 * exported_ fields and puts the cliprects into boxes, above.
+	 *
+	 * The client clears the exported_drawable field before
+	 * clobbering the boxes data.
+	 */
+        unsigned int req_drawable;	 /* the X drawable id */
+	unsigned int req_draw_buffer;	 /* MGA_FRONT or MGA_BACK */
+
+        unsigned int exported_drawable;
+	unsigned int exported_index;
+        unsigned int exported_stamp;
+        unsigned int exported_buffers;
+        unsigned int exported_nfront;
+        unsigned int exported_nback;
+	int exported_back_x, exported_front_x, exported_w;
+	int exported_back_y, exported_front_y, exported_h;
+   	drm_clip_rect_t exported_boxes[MGA_NR_SAREA_CLIPRECTS];
+
+	/* Counters for aging textures and for client-side throttling.
+	 */
+	unsigned int status[4];
+	unsigned int last_wrap;
+
+	drm_mga_age_t last_frame;
+        unsigned int last_enqueue;	/* last time a buffer was enqueued */
+	unsigned int last_dispatch;	/* age of the most recently dispatched buffer */
+	unsigned int last_quiescent;     /*  */
+
+	/* LRU lists for texture memory in agp space and on the card.
+	 */
+	drm_tex_region_t texList[MGA_NR_TEX_HEAPS][MGA_NR_TEX_REGIONS+1];
+	unsigned int texAge[MGA_NR_TEX_HEAPS];
+
+	/* Mechanism to validate card state.
+	 */
+   	int ctxOwner;
+} drm_mga_sarea_t;
+
+
+/* WARNING: If you change any of these defines, make sure to change the
+ * defines in the Xserver file (xf86drmMga.h)
+ */
+
+/* MGA specific ioctls
+ * The device specific ioctl range is 0x40 to 0x79.
+ */
+#define DRM_IOCTL_MGA_INIT		DRM_IOW( 0x40, drm_mga_init_t)
+#define DRM_IOCTL_MGA_FLUSH		DRM_IOW( 0x41, drm_lock_t)
+#define DRM_IOCTL_MGA_RESET		DRM_IO(  0x42)
+#define DRM_IOCTL_MGA_SWAP		DRM_IO(  0x43)
+#define DRM_IOCTL_MGA_CLEAR		DRM_IOW( 0x44, drm_mga_clear_t)
+#define DRM_IOCTL_MGA_VERTEX		DRM_IOW( 0x45, drm_mga_vertex_t)
+#define DRM_IOCTL_MGA_INDICES		DRM_IOW( 0x46, drm_mga_indices_t)
+#define DRM_IOCTL_MGA_ILOAD		DRM_IOW( 0x47, drm_mga_iload_t)
+#define DRM_IOCTL_MGA_BLIT		DRM_IOW( 0x48, drm_mga_blit_t)
+#define DRM_IOCTL_MGA_GETPARAM		DRM_IOWR(0x49, drm_mga_getparam_t)
+
+typedef struct _drm_mga_warp_index {
+   	int installed;
+   	unsigned long phys_addr;
+   	int size;
+} drm_mga_warp_index_t;
+
+typedef struct drm_mga_init {
+   	enum {
+	   	MGA_INIT_DMA    = 0x01,
+	       	MGA_CLEANUP_DMA = 0x02
+	} func;
+
+   	unsigned long sarea_priv_offset;
+
+	int chipset;
+   	int sgram;
+
+	unsigned int maccess;
+
+   	unsigned int fb_cpp;
+	unsigned int front_offset, front_pitch;
+   	unsigned int back_offset, back_pitch;
+
+   	unsigned int depth_cpp;
+   	unsigned int depth_offset, depth_pitch;
+
+   	unsigned int texture_offset[MGA_NR_TEX_HEAPS];
+   	unsigned int texture_size[MGA_NR_TEX_HEAPS];
+
+	unsigned long fb_offset;
+	unsigned long mmio_offset;
+	unsigned long status_offset;
+	unsigned long warp_offset;
+	unsigned long primary_offset;
+	unsigned long buffers_offset;
+} drm_mga_init_t;
+
+typedef struct drm_mga_fullscreen {
+	enum {
+		MGA_INIT_FULLSCREEN    = 0x01,
+		MGA_CLEANUP_FULLSCREEN = 0x02
+	} func;
+} drm_mga_fullscreen_t;
+
+typedef struct drm_mga_clear {
+	unsigned int flags;
+	unsigned int clear_color;
+	unsigned int clear_depth;
+	unsigned int color_mask;
+	unsigned int depth_mask;
+} drm_mga_clear_t;
+
+typedef struct drm_mga_vertex {
+   	int idx;			/* buffer to queue */
+	int used;			/* bytes in use */
+	int discard;			/* client finished with buffer?  */
+} drm_mga_vertex_t;
+
+typedef struct drm_mga_indices {
+   	int idx;			/* buffer to queue */
+	unsigned int start;
+	unsigned int end;
+	int discard;			/* client finished with buffer?  */
+} drm_mga_indices_t;
+
+typedef struct drm_mga_iload {
+	int idx;
+	unsigned int dstorg;
+	unsigned int length;
+} drm_mga_iload_t;
+
+typedef struct _drm_mga_blit {
+	unsigned int planemask;
+	unsigned int srcorg;
+	unsigned int dstorg;
+	int src_pitch, dst_pitch;
+	int delta_sx, delta_sy;
+	int delta_dx, delta_dy;
+	int height, ydir;		/* flip image vertically */
+	int source_pitch, dest_pitch;
+} drm_mga_blit_t;
+
+/* 3.1: An ioctl to get parameters that aren't available to the 3d
+ * client any other way.  
+ */
+#define MGA_PARAM_IRQ_NR            1
+
+typedef struct drm_mga_getparam {
+	int param;
+	int *value;
+} drm_mga_getparam_t;
+
+#endif
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/mga_drv.c linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/mga_drv.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/mga_drv.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/mga_drv.c	2003-07-30 11:18:33.000000000 +0200
@@ -0,0 +1,52 @@
+/* mga_drv.c -- Matrox G200/G400 driver -*- linux-c -*-
+ * Created: Mon Dec 13 01:56:22 1999 by jhartmann@precisioninsight.com
+ *
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Rickard E. (Rik) Faith <faith@valinux.com>
+ *    Gareth Hughes <gareth@valinux.com>
+ */
+
+#include <linux/config.h>
+#include "mga.h"
+#include "drmP.h"
+#include "drm.h"
+#include "mga_drm.h"
+#include "mga_drv.h"
+#include "drm_agpsupport.h"
+#include "drm_auth.h"
+#include "drm_bufs.h"
+#include "drm_context.h"
+#include "drm_dma.h"
+#include "drm_drawable.h"
+#include "drm_drv.h"
+#include "drm_fops.h"
+#include "drm_init.h"
+#include "drm_ioctl.h"
+#include "drm_lock.h"
+#include "drm_memory.h"
+#include "drm_proc.h"
+#include "drm_vm.h"
+#include "drm_stub.h"
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/mga_drv.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/mga_drv.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/mga_drv.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/mga_drv.h	2003-07-30 11:18:33.000000000 +0200
@@ -0,0 +1,643 @@
+/* mga_drv.h -- Private header for the Matrox G200/G400 driver -*- linux-c -*-
+ * Created: Mon Dec 13 01:50:01 1999 by jhartmann@precisioninsight.com
+ *
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Gareth Hughes <gareth@valinux.com>
+ */
+
+#ifndef __MGA_DRV_H__
+#define __MGA_DRV_H__
+
+typedef struct drm_mga_primary_buffer {
+	u8 *start;
+	u8 *end;
+	int size;
+
+	u32 tail;
+	int space;
+	volatile long wrapped;
+
+	volatile u32 *status;
+
+	u32 last_flush;
+	u32 last_wrap;
+
+	u32 high_mark;
+} drm_mga_primary_buffer_t;
+
+typedef struct drm_mga_freelist {
+   	struct drm_mga_freelist *next;
+   	struct drm_mga_freelist *prev;
+	drm_mga_age_t age;
+   	drm_buf_t *buf;
+} drm_mga_freelist_t;
+
+typedef struct {
+   	drm_mga_freelist_t *list_entry;
+	int discard;
+	int dispatched;
+} drm_mga_buf_priv_t;
+
+typedef struct drm_mga_private {
+	drm_mga_primary_buffer_t prim;
+	drm_mga_sarea_t *sarea_priv;
+
+   	drm_mga_freelist_t *head;
+   	drm_mga_freelist_t *tail;
+
+	unsigned int warp_pipe;
+	unsigned long warp_pipe_phys[MGA_MAX_WARP_PIPES];
+
+	int chipset;
+	int usec_timeout;
+
+	u32 clear_cmd;
+	u32 maccess;
+
+	unsigned int fb_cpp;
+	unsigned int front_offset;
+	unsigned int front_pitch;
+	unsigned int back_offset;
+	unsigned int back_pitch;
+
+	unsigned int depth_cpp;
+	unsigned int depth_offset;
+	unsigned int depth_pitch;
+
+	unsigned int texture_offset;
+	unsigned int texture_size;
+
+	drm_map_t *sarea;
+	drm_map_t *fb;
+	drm_map_t *mmio;
+	drm_map_t *status;
+	drm_map_t *warp;
+	drm_map_t *primary;
+	drm_map_t *buffers;
+	drm_map_t *agp_textures;
+} drm_mga_private_t;
+
+				/* mga_dma.c */
+extern int mga_dma_init( DRM_IOCTL_ARGS );
+extern int mga_dma_flush( DRM_IOCTL_ARGS );
+extern int mga_dma_reset( DRM_IOCTL_ARGS );
+extern int mga_dma_buffers( DRM_IOCTL_ARGS );
+
+extern int mga_do_wait_for_idle( drm_mga_private_t *dev_priv );
+extern int mga_do_dma_idle( drm_mga_private_t *dev_priv );
+extern int mga_do_dma_reset( drm_mga_private_t *dev_priv );
+extern int mga_do_engine_reset( drm_mga_private_t *dev_priv );
+extern int mga_do_cleanup_dma( drm_device_t *dev );
+
+extern void mga_do_dma_flush( drm_mga_private_t *dev_priv );
+extern void mga_do_dma_wrap_start( drm_mga_private_t *dev_priv );
+extern void mga_do_dma_wrap_end( drm_mga_private_t *dev_priv );
+
+extern int mga_freelist_put( drm_device_t *dev, drm_buf_t *buf );
+
+				/* mga_state.c */
+extern int  mga_dma_clear( DRM_IOCTL_ARGS );
+extern int  mga_dma_swap( DRM_IOCTL_ARGS );
+extern int  mga_dma_vertex( DRM_IOCTL_ARGS );
+extern int  mga_dma_indices( DRM_IOCTL_ARGS );
+extern int  mga_dma_iload( DRM_IOCTL_ARGS );
+extern int  mga_dma_blit( DRM_IOCTL_ARGS );
+extern int  mga_getparam( DRM_IOCTL_ARGS );
+
+				/* mga_warp.c */
+extern int mga_warp_install_microcode( drm_mga_private_t *dev_priv );
+extern int mga_warp_init( drm_mga_private_t *dev_priv );
+
+#define mga_flush_write_combine()	DRM_WRITEMEMORYBARRIER()
+
+
+#define MGA_BASE( reg )		((unsigned long)(dev_priv->mmio->handle))
+#define MGA_ADDR( reg )		(MGA_BASE(reg) + reg)
+
+#define MGA_DEREF( reg )	*(volatile u32 *)MGA_ADDR( reg )
+#define MGA_DEREF8( reg )	*(volatile u8 *)MGA_ADDR( reg )
+
+#ifdef __alpha__
+#define MGA_READ( reg )		(_MGA_READ((u32 *)MGA_ADDR(reg)))
+#define MGA_READ8( reg )	(_MGA_READ((u8 *)MGA_ADDR(reg)))
+#define MGA_WRITE( reg, val )	do { DRM_WRITEMEMORYBARRIER(); MGA_DEREF( reg ) = val; } while (0)
+#define MGA_WRITE8( reg, val )  do { DRM_WRITEMEMORYBARRIER(); MGA_DEREF8( reg ) = val; } while (0)
+
+static inline u32 _MGA_READ(u32 *addr)
+{
+	DRM_READMEMORYBARRIER();
+	return *(volatile u32 *)addr;
+}
+
+#else
+#define MGA_READ( reg )		MGA_DEREF( reg )
+#define MGA_READ8( reg )	MGA_DEREF8( reg )
+#define MGA_WRITE( reg, val )	do { MGA_DEREF( reg ) = val; } while (0)
+#define MGA_WRITE8( reg, val )  do { MGA_DEREF8( reg ) = val; } while (0)
+#endif
+
+#define DWGREG0 	0x1c00
+#define DWGREG0_END 	0x1dff
+#define DWGREG1		0x2c00
+#define DWGREG1_END	0x2dff
+
+#define ISREG0(r)	(r >= DWGREG0 && r <= DWGREG0_END)
+#define DMAREG0(r)	(u8)((r - DWGREG0) >> 2)
+#define DMAREG1(r)	(u8)(((r - DWGREG1) >> 2) | 0x80)
+#define DMAREG(r)	(ISREG0(r) ? DMAREG0(r) : DMAREG1(r))
+
+
+
+/* ================================================================
+ * Helper macross...
+ */
+
+#define MGA_EMIT_STATE( dev_priv, dirty )				\
+do {									\
+	if ( (dirty) & ~MGA_UPLOAD_CLIPRECTS ) {			\
+		if ( dev_priv->chipset == MGA_CARD_TYPE_G400 ) {	\
+			mga_g400_emit_state( dev_priv );		\
+		} else {						\
+			mga_g200_emit_state( dev_priv );		\
+		}							\
+	}								\
+} while (0)
+
+#define LOCK_TEST_WITH_RETURN( dev )					\
+do {									\
+	if ( !_DRM_LOCK_IS_HELD( dev->lock.hw_lock->lock ) ||		\
+	     dev->lock.pid != DRM_CURRENTPID ) {				\
+		DRM_ERROR( "%s called without lock held\n",		\
+			   __FUNCTION__ );					\
+		return DRM_ERR(EINVAL);				\
+	}								\
+} while (0)
+
+#define WRAP_TEST_WITH_RETURN( dev_priv )				\
+do {									\
+	if ( test_bit( 0, &dev_priv->prim.wrapped ) ) {			\
+		if ( mga_is_idle( dev_priv ) ) {			\
+			mga_do_dma_wrap_end( dev_priv );		\
+		} else if ( dev_priv->prim.space <			\
+			    dev_priv->prim.high_mark ) {		\
+			if ( MGA_DMA_DEBUG )				\
+				DRM_INFO( "%s: wrap...\n", __FUNCTION__ );	\
+			return DRM_ERR(EBUSY);			\
+		}							\
+	}								\
+} while (0)
+
+#define WRAP_WAIT_WITH_RETURN( dev_priv )				\
+do {									\
+	if ( test_bit( 0, &dev_priv->prim.wrapped ) ) {			\
+		if ( mga_do_wait_for_idle( dev_priv ) < 0 ) {		\
+			if ( MGA_DMA_DEBUG )				\
+				DRM_INFO( "%s: wrap...\n", __FUNCTION__ );	\
+			return DRM_ERR(EBUSY);			\
+		}							\
+		mga_do_dma_wrap_end( dev_priv );			\
+	}								\
+} while (0)
+
+
+/* ================================================================
+ * Primary DMA command stream
+ */
+
+#define MGA_VERBOSE	0
+
+#define DMA_LOCALS	unsigned int write; volatile u8 *prim;
+
+#define DMA_BLOCK_SIZE	(5 * sizeof(u32))
+
+#define BEGIN_DMA( n )							\
+do {									\
+	if ( MGA_VERBOSE ) {						\
+		DRM_INFO( "BEGIN_DMA( %d ) in %s\n",			\
+			  (n), __FUNCTION__ );				\
+		DRM_INFO( "   space=0x%x req=0x%x\n",			\
+			  dev_priv->prim.space, (n) * DMA_BLOCK_SIZE );	\
+	}								\
+	prim = dev_priv->prim.start;					\
+	write = dev_priv->prim.tail;					\
+} while (0)
+
+#define BEGIN_DMA_WRAP()						\
+do {									\
+	if ( MGA_VERBOSE ) {						\
+		DRM_INFO( "BEGIN_DMA() in %s\n", __FUNCTION__ );		\
+		DRM_INFO( "   space=0x%x\n", dev_priv->prim.space );	\
+	}								\
+	prim = dev_priv->prim.start;					\
+	write = dev_priv->prim.tail;					\
+} while (0)
+
+#define ADVANCE_DMA()							\
+do {									\
+	dev_priv->prim.tail = write;					\
+	if ( MGA_VERBOSE ) {						\
+		DRM_INFO( "ADVANCE_DMA() tail=0x%05x sp=0x%x\n",	\
+			  write, dev_priv->prim.space );		\
+	}								\
+} while (0)
+
+#define FLUSH_DMA()							\
+do {									\
+	if ( 0 ) {							\
+		DRM_INFO( "%s:\n", __FUNCTION__ );				\
+		DRM_INFO( "   tail=0x%06x head=0x%06lx\n",		\
+			  dev_priv->prim.tail,				\
+			  MGA_READ( MGA_PRIMADDRESS ) -			\
+			  dev_priv->primary->offset );			\
+	}								\
+	if ( !test_bit( 0, &dev_priv->prim.wrapped ) ) {		\
+		if ( dev_priv->prim.space <				\
+		     dev_priv->prim.high_mark ) {			\
+			mga_do_dma_wrap_start( dev_priv );		\
+		} else {						\
+			mga_do_dma_flush( dev_priv );			\
+		}							\
+	}								\
+} while (0)
+
+/* Never use this, always use DMA_BLOCK(...) for primary DMA output.
+ */
+#define DMA_WRITE( offset, val )					\
+do {									\
+	if ( MGA_VERBOSE ) {						\
+		DRM_INFO( "   DMA_WRITE( 0x%08x ) at 0x%04x\n",		\
+			  (u32)(val), write + (offset) * sizeof(u32) );	\
+	}								\
+	*(volatile u32 *)(prim + write + (offset) * sizeof(u32)) = val;	\
+} while (0)
+
+#define DMA_BLOCK( reg0, val0, reg1, val1, reg2, val2, reg3, val3 )	\
+do {									\
+	DMA_WRITE( 0, ((DMAREG( reg0 ) << 0) |				\
+		       (DMAREG( reg1 ) << 8) |				\
+		       (DMAREG( reg2 ) << 16) |				\
+		       (DMAREG( reg3 ) << 24)) );			\
+	DMA_WRITE( 1, val0 );						\
+	DMA_WRITE( 2, val1 );						\
+	DMA_WRITE( 3, val2 );						\
+	DMA_WRITE( 4, val3 );						\
+	write += DMA_BLOCK_SIZE;					\
+} while (0)
+
+
+/* Buffer aging via primary DMA stream head pointer.
+ */
+
+#define SET_AGE( age, h, w )						\
+do {									\
+	(age)->head = h;						\
+	(age)->wrap = w;						\
+} while (0)
+
+#define TEST_AGE( age, h, w )		( (age)->wrap < w ||		\
+					  ( (age)->wrap == w &&		\
+					    (age)->head < h ) )
+
+#define AGE_BUFFER( buf_priv )						\
+do {									\
+	drm_mga_freelist_t *entry = (buf_priv)->list_entry;		\
+	if ( (buf_priv)->dispatched ) {					\
+		entry->age.head = (dev_priv->prim.tail +		\
+				   dev_priv->primary->offset);		\
+		entry->age.wrap = dev_priv->sarea_priv->last_wrap;	\
+	} else {							\
+		entry->age.head = 0;					\
+		entry->age.wrap = 0;					\
+	}								\
+} while (0)
+
+
+#define MGA_ENGINE_IDLE_MASK		(MGA_SOFTRAPEN |		\
+					 MGA_DWGENGSTS |		\
+					 MGA_ENDPRDMASTS)
+#define MGA_DMA_IDLE_MASK		(MGA_SOFTRAPEN |		\
+					 MGA_ENDPRDMASTS)
+
+#define MGA_DMA_DEBUG			0
+
+
+
+/* A reduced set of the mga registers.
+ */
+#define MGA_CRTC_INDEX			0x1fd4
+#define MGA_CRTC_DATA			0x1fd5
+
+/* CRTC11 */
+#define MGA_VINTCLR			(1 << 4)
+#define MGA_VINTEN			(1 << 5)
+
+#define MGA_ALPHACTRL 			0x2c7c
+#define MGA_AR0 			0x1c60
+#define MGA_AR1 			0x1c64
+#define MGA_AR2 			0x1c68
+#define MGA_AR3 			0x1c6c
+#define MGA_AR4 			0x1c70
+#define MGA_AR5 			0x1c74
+#define MGA_AR6 			0x1c78
+
+#define MGA_CXBNDRY			0x1c80
+#define MGA_CXLEFT 			0x1ca0
+#define MGA_CXRIGHT			0x1ca4
+
+#define MGA_DMAPAD 			0x1c54
+#define MGA_DSTORG 			0x2cb8
+#define MGA_DWGCTL 			0x1c00
+#	define MGA_OPCOD_MASK			(15 << 0)
+#	define MGA_OPCOD_TRAP			(4 << 0)
+#	define MGA_OPCOD_TEXTURE_TRAP		(6 << 0)
+#	define MGA_OPCOD_BITBLT			(8 << 0)
+#	define MGA_OPCOD_ILOAD			(9 << 0)
+#	define MGA_ATYPE_MASK			(7 << 4)
+#	define MGA_ATYPE_RPL			(0 << 4)
+#	define MGA_ATYPE_RSTR			(1 << 4)
+#	define MGA_ATYPE_ZI			(3 << 4)
+#	define MGA_ATYPE_BLK			(4 << 4)
+#	define MGA_ATYPE_I			(7 << 4)
+#	define MGA_LINEAR			(1 << 7)
+#	define MGA_ZMODE_MASK			(7 << 8)
+#	define MGA_ZMODE_NOZCMP			(0 << 8)
+#	define MGA_ZMODE_ZE			(2 << 8)
+#	define MGA_ZMODE_ZNE			(3 << 8)
+#	define MGA_ZMODE_ZLT			(4 << 8)
+#	define MGA_ZMODE_ZLTE			(5 << 8)
+#	define MGA_ZMODE_ZGT			(6 << 8)
+#	define MGA_ZMODE_ZGTE			(7 << 8)
+#	define MGA_SOLID			(1 << 11)
+#	define MGA_ARZERO			(1 << 12)
+#	define MGA_SGNZERO			(1 << 13)
+#	define MGA_SHIFTZERO			(1 << 14)
+#	define MGA_BOP_MASK			(15 << 16)
+#	define MGA_BOP_ZERO			(0 << 16)
+#	define MGA_BOP_DST			(10 << 16)
+#	define MGA_BOP_SRC			(12 << 16)
+#	define MGA_BOP_ONE			(15 << 16)
+#	define MGA_TRANS_SHIFT			20
+#	define MGA_TRANS_MASK			(15 << 20)
+#	define MGA_BLTMOD_MASK			(15 << 25)
+#	define MGA_BLTMOD_BMONOLEF		(0 << 25)
+#	define MGA_BLTMOD_BMONOWF		(4 << 25)
+#	define MGA_BLTMOD_PLAN			(1 << 25)
+#	define MGA_BLTMOD_BFCOL			(2 << 25)
+#	define MGA_BLTMOD_BU32BGR		(3 << 25)
+#	define MGA_BLTMOD_BU32RGB		(7 << 25)
+#	define MGA_BLTMOD_BU24BGR		(11 << 25)
+#	define MGA_BLTMOD_BU24RGB		(15 << 25)
+#	define MGA_PATTERN			(1 << 29)
+#	define MGA_TRANSC			(1 << 30)
+#	define MGA_CLIPDIS			(1 << 31)
+#define MGA_DWGSYNC			0x2c4c
+
+#define MGA_FCOL 			0x1c24
+#define MGA_FIFOSTATUS 			0x1e10
+#define MGA_FOGCOL 			0x1cf4
+#define MGA_FXBNDRY			0x1c84
+#define MGA_FXLEFT 			0x1ca8
+#define MGA_FXRIGHT			0x1cac
+
+#define MGA_ICLEAR 			0x1e18
+#	define MGA_SOFTRAPICLR			(1 << 0)
+#	define MGA_VLINEICLR			(1 << 5)
+#define MGA_IEN 			0x1e1c
+#	define MGA_SOFTRAPIEN			(1 << 0)
+#	define MGA_VLINEIEN			(1 << 5)
+
+#define MGA_LEN 			0x1c5c
+
+#define MGA_MACCESS			0x1c04
+
+#define MGA_PITCH 			0x1c8c
+#define MGA_PLNWT 			0x1c1c
+#define MGA_PRIMADDRESS 		0x1e58
+#	define MGA_DMA_GENERAL			(0 << 0)
+#	define MGA_DMA_BLIT			(1 << 0)
+#	define MGA_DMA_VECTOR			(2 << 0)
+#	define MGA_DMA_VERTEX			(3 << 0)
+#define MGA_PRIMEND			0x1e5c
+#	define MGA_PRIMNOSTART			(1 << 0)
+#	define MGA_PAGPXFER			(1 << 1)
+#define MGA_PRIMPTR			0x1e50
+#	define MGA_PRIMPTREN0			(1 << 0)
+#	define MGA_PRIMPTREN1			(1 << 1)
+
+#define MGA_RST 			0x1e40
+#	define MGA_SOFTRESET			(1 << 0)
+#	define MGA_SOFTEXTRST			(1 << 1)
+
+#define MGA_SECADDRESS 			0x2c40
+#define MGA_SECEND 			0x2c44
+#define MGA_SETUPADDRESS 		0x2cd0
+#define MGA_SETUPEND 			0x2cd4
+#define MGA_SGN				0x1c58
+#define MGA_SOFTRAP			0x2c48
+#define MGA_SRCORG 			0x2cb4
+#	define MGA_SRMMAP_MASK			(1 << 0)
+#	define MGA_SRCMAP_FB			(0 << 0)
+#	define MGA_SRCMAP_SYSMEM		(1 << 0)
+#	define MGA_SRCACC_MASK			(1 << 1)
+#	define MGA_SRCACC_PCI			(0 << 1)
+#	define MGA_SRCACC_AGP			(1 << 1)
+#define MGA_STATUS 			0x1e14
+#	define MGA_SOFTRAPEN			(1 << 0)
+#	define MGA_VSYNCPEN			(1 << 4)
+#	define MGA_VLINEPEN			(1 << 5)
+#	define MGA_DWGENGSTS			(1 << 16)
+#	define MGA_ENDPRDMASTS			(1 << 17)
+#define MGA_STENCIL			0x2cc8
+#define MGA_STENCILCTL 			0x2ccc
+
+#define MGA_TDUALSTAGE0 		0x2cf8
+#define MGA_TDUALSTAGE1 		0x2cfc
+#define MGA_TEXBORDERCOL 		0x2c5c
+#define MGA_TEXCTL 			0x2c30
+#define MGA_TEXCTL2			0x2c3c
+#	define MGA_DUALTEX			(1 << 7)
+#	define MGA_G400_TC2_MAGIC		(1 << 15)
+#	define MGA_MAP1_ENABLE			(1 << 31)
+#define MGA_TEXFILTER 			0x2c58
+#define MGA_TEXHEIGHT 			0x2c2c
+#define MGA_TEXORG 			0x2c24
+#	define MGA_TEXORGMAP_MASK		(1 << 0)
+#	define MGA_TEXORGMAP_FB			(0 << 0)
+#	define MGA_TEXORGMAP_SYSMEM		(1 << 0)
+#	define MGA_TEXORGACC_MASK		(1 << 1)
+#	define MGA_TEXORGACC_PCI		(0 << 1)
+#	define MGA_TEXORGACC_AGP		(1 << 1)
+#define MGA_TEXORG1			0x2ca4
+#define MGA_TEXORG2			0x2ca8
+#define MGA_TEXORG3			0x2cac
+#define MGA_TEXORG4			0x2cb0
+#define MGA_TEXTRANS 			0x2c34
+#define MGA_TEXTRANSHIGH 		0x2c38
+#define MGA_TEXWIDTH 			0x2c28
+
+#define MGA_WACCEPTSEQ 			0x1dd4
+#define MGA_WCODEADDR 			0x1e6c
+#define MGA_WFLAG 			0x1dc4
+#define MGA_WFLAG1 			0x1de0
+#define MGA_WFLAGNB			0x1e64
+#define MGA_WFLAGNB1 			0x1e08
+#define MGA_WGETMSB			0x1dc8
+#define MGA_WIADDR 			0x1dc0
+#define MGA_WIADDR2			0x1dd8
+#	define MGA_WMODE_SUSPEND		(0 << 0)
+#	define MGA_WMODE_RESUME			(1 << 0)
+#	define MGA_WMODE_JUMP			(2 << 0)
+#	define MGA_WMODE_START			(3 << 0)
+#	define MGA_WAGP_ENABLE			(1 << 2)
+#define MGA_WMISC 			0x1e70
+#	define MGA_WUCODECACHE_ENABLE		(1 << 0)
+#	define MGA_WMASTER_ENABLE		(1 << 1)
+#	define MGA_WCACHEFLUSH_ENABLE		(1 << 3)
+#define MGA_WVRTXSZ			0x1dcc
+
+#define MGA_YBOT 			0x1c9c
+#define MGA_YDST 			0x1c90
+#define MGA_YDSTLEN			0x1c88
+#define MGA_YDSTORG			0x1c94
+#define MGA_YTOP 			0x1c98
+
+#define MGA_ZORG 			0x1c0c
+
+/* This finishes the current batch of commands
+ */
+#define MGA_EXEC 			0x0100
+
+/* Warp registers
+ */
+#define MGA_WR0				0x2d00
+#define MGA_WR1				0x2d04
+#define MGA_WR2				0x2d08
+#define MGA_WR3				0x2d0c
+#define MGA_WR4				0x2d10
+#define MGA_WR5				0x2d14
+#define MGA_WR6				0x2d18
+#define MGA_WR7				0x2d1c
+#define MGA_WR8				0x2d20
+#define MGA_WR9				0x2d24
+#define MGA_WR10			0x2d28
+#define MGA_WR11			0x2d2c
+#define MGA_WR12			0x2d30
+#define MGA_WR13			0x2d34
+#define MGA_WR14			0x2d38
+#define MGA_WR15			0x2d3c
+#define MGA_WR16			0x2d40
+#define MGA_WR17			0x2d44
+#define MGA_WR18			0x2d48
+#define MGA_WR19			0x2d4c
+#define MGA_WR20			0x2d50
+#define MGA_WR21			0x2d54
+#define MGA_WR22			0x2d58
+#define MGA_WR23			0x2d5c
+#define MGA_WR24			0x2d60
+#define MGA_WR25			0x2d64
+#define MGA_WR26			0x2d68
+#define MGA_WR27			0x2d6c
+#define MGA_WR28			0x2d70
+#define MGA_WR29			0x2d74
+#define MGA_WR30			0x2d78
+#define MGA_WR31			0x2d7c
+#define MGA_WR32			0x2d80
+#define MGA_WR33			0x2d84
+#define MGA_WR34			0x2d88
+#define MGA_WR35			0x2d8c
+#define MGA_WR36			0x2d90
+#define MGA_WR37			0x2d94
+#define MGA_WR38			0x2d98
+#define MGA_WR39			0x2d9c
+#define MGA_WR40			0x2da0
+#define MGA_WR41			0x2da4
+#define MGA_WR42			0x2da8
+#define MGA_WR43			0x2dac
+#define MGA_WR44			0x2db0
+#define MGA_WR45			0x2db4
+#define MGA_WR46			0x2db8
+#define MGA_WR47			0x2dbc
+#define MGA_WR48			0x2dc0
+#define MGA_WR49			0x2dc4
+#define MGA_WR50			0x2dc8
+#define MGA_WR51			0x2dcc
+#define MGA_WR52			0x2dd0
+#define MGA_WR53			0x2dd4
+#define MGA_WR54			0x2dd8
+#define MGA_WR55			0x2ddc
+#define MGA_WR56			0x2de0
+#define MGA_WR57			0x2de4
+#define MGA_WR58			0x2de8
+#define MGA_WR59			0x2dec
+#define MGA_WR60			0x2df0
+#define MGA_WR61			0x2df4
+#define MGA_WR62			0x2df8
+#define MGA_WR63			0x2dfc
+#	define MGA_G400_WR_MAGIC		(1 << 6)
+#	define MGA_G400_WR56_MAGIC		0x46480000	/* 12800.0f */
+
+
+#define MGA_ILOAD_ALIGN		64
+#define MGA_ILOAD_MASK		(MGA_ILOAD_ALIGN - 1)
+
+#define MGA_DWGCTL_FLUSH	(MGA_OPCOD_TEXTURE_TRAP |		\
+				 MGA_ATYPE_I |				\
+				 MGA_ZMODE_NOZCMP |			\
+				 MGA_ARZERO |				\
+				 MGA_SGNZERO |				\
+				 MGA_BOP_SRC |				\
+				 (15 << MGA_TRANS_SHIFT))
+
+#define MGA_DWGCTL_CLEAR	(MGA_OPCOD_TRAP |			\
+				 MGA_ZMODE_NOZCMP |			\
+				 MGA_SOLID |				\
+				 MGA_ARZERO |				\
+				 MGA_SGNZERO |				\
+				 MGA_SHIFTZERO |			\
+				 MGA_BOP_SRC |				\
+				 (0 << MGA_TRANS_SHIFT) |		\
+				 MGA_BLTMOD_BMONOLEF |			\
+				 MGA_TRANSC |				\
+				 MGA_CLIPDIS)
+
+#define MGA_DWGCTL_COPY		(MGA_OPCOD_BITBLT |			\
+				 MGA_ATYPE_RPL |			\
+				 MGA_SGNZERO |				\
+				 MGA_SHIFTZERO |			\
+				 MGA_BOP_SRC |				\
+				 (0 << MGA_TRANS_SHIFT) |		\
+				 MGA_BLTMOD_BFCOL |			\
+				 MGA_CLIPDIS)
+
+/* Simple idle test.
+ */
+static __inline__ int mga_is_idle( drm_mga_private_t *dev_priv )
+{
+	u32 status = MGA_READ( MGA_STATUS ) & MGA_ENGINE_IDLE_MASK;
+	return ( status == MGA_ENDPRDMASTS );
+}
+
+#endif
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/mga_irq.c linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/mga_irq.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/mga_irq.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/mga_irq.c	2003-07-30 11:18:33.000000000 +0200
@@ -0,0 +1,100 @@
+/* mga_irq.c -- IRQ handling for radeon -*- linux-c -*-
+ *
+ * Copyright (C) The Weather Channel, Inc.  2002.  All Rights Reserved.
+ * 
+ * The Weather Channel (TM) funded Tungsten Graphics to develop the
+ * initial release of the Radeon 8500 driver under the XFree86 license.
+ * This notice must be preserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Keith Whitwell <keith@tungstengraphics.com>
+ *    Eric Anholt <anholt@FreeBSD.org>
+ */
+
+#include "mga.h"
+#include "drmP.h"
+#include "drm.h"
+#include "mga_drm.h"
+#include "mga_drv.h"
+
+void mga_dma_service( DRM_IRQ_ARGS )
+{
+	drm_device_t *dev = (drm_device_t *) arg;
+	drm_mga_private_t *dev_priv = 
+	   (drm_mga_private_t *)dev->dev_private;
+	int status;
+
+	status = MGA_READ( MGA_STATUS );
+	
+	/* VBLANK interrupt */
+	if ( status & MGA_VLINEPEN ) {
+		MGA_WRITE( MGA_ICLEAR, MGA_VLINEICLR );
+		atomic_inc(&dev->vbl_received);
+		DRM_WAKEUP(&dev->vbl_queue);
+		DRM(vbl_send_signals)( dev );
+	}
+}
+
+int mga_vblank_wait(drm_device_t *dev, unsigned int *sequence)
+{
+	unsigned int cur_vblank;
+	int ret = 0;
+
+	/* Assume that the user has missed the current sequence number
+	 * by about a day rather than she wants to wait for years
+	 * using vertical blanks... 
+	 */
+	DRM_WAIT_ON( ret, dev->vbl_queue, 3*DRM_HZ, 
+		     ( ( ( cur_vblank = atomic_read(&dev->vbl_received ) )
+			 - *sequence ) <= (1<<23) ) );
+
+	*sequence = cur_vblank;
+
+	return ret;
+}
+
+void mga_driver_irq_preinstall( drm_device_t *dev ) {
+  	drm_mga_private_t *dev_priv = 
+	   (drm_mga_private_t *)dev->dev_private;
+
+	/* Disable *all* interrupts */
+      	MGA_WRITE( MGA_IEN, 0 );
+	/* Clear bits if they're already high */
+   	MGA_WRITE( MGA_ICLEAR, ~0 );
+}
+
+void mga_driver_irq_postinstall( drm_device_t *dev ) {
+  	drm_mga_private_t *dev_priv = 
+	   (drm_mga_private_t *)dev->dev_private;
+
+	/* Turn on VBL interrupt */
+   	MGA_WRITE( MGA_IEN, MGA_VLINEIEN );
+}
+
+void mga_driver_irq_uninstall( drm_device_t *dev ) {
+  	drm_mga_private_t *dev_priv = 
+	   (drm_mga_private_t *)dev->dev_private;
+	if ( dev_priv ) {
+		/* Disable *all* interrupts */
+		MGA_WRITE( MGA_IEN, 0 );
+	}
+}
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/mga_state.c linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/mga_state.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/mga_state.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/mga_state.c	2003-07-30 11:18:33.000000000 +0200
@@ -0,0 +1,1110 @@
+/* mga_state.c -- State support for MGA G200/G400 -*- linux-c -*-
+ * Created: Thu Jan 27 02:53:43 2000 by jhartmann@precisioninsight.com
+ *
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Jeff Hartmann <jhartmann@valinux.com>
+ *    Keith Whitwell <keith@tungstengraphics.com>
+ *
+ * Rewritten by:
+ *    Gareth Hughes <gareth@valinux.com>
+ */
+
+#include "mga.h"
+#include "drmP.h"
+#include "drm.h"
+#include "mga_drm.h"
+#include "mga_drv.h"
+
+
+/* ================================================================
+ * DMA hardware state programming functions
+ */
+
+static void mga_emit_clip_rect( drm_mga_private_t *dev_priv,
+				drm_clip_rect_t *box )
+{
+	drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	drm_mga_context_regs_t *ctx = &sarea_priv->context_state;
+	unsigned int pitch = dev_priv->front_pitch;
+	DMA_LOCALS;
+
+	BEGIN_DMA( 2 );
+
+	/* Force reset of DWGCTL on G400 (eliminates clip disable bit).
+	 */
+	if ( dev_priv->chipset == MGA_CARD_TYPE_G400 ) {
+		DMA_BLOCK( MGA_DWGCTL,		ctx->dwgctl,
+			   MGA_LEN + MGA_EXEC,	0x80000000,
+			   MGA_DWGCTL,		ctx->dwgctl,
+			   MGA_LEN + MGA_EXEC,	0x80000000 );
+	}
+	DMA_BLOCK( MGA_DMAPAD,	0x00000000,
+		   MGA_CXBNDRY,	(box->x2 << 16) | box->x1,
+		   MGA_YTOP,	box->y1 * pitch,
+		   MGA_YBOT,	box->y2 * pitch );
+
+	ADVANCE_DMA();
+}
+
+static __inline__ void mga_g200_emit_context( drm_mga_private_t *dev_priv )
+{
+	drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	drm_mga_context_regs_t *ctx = &sarea_priv->context_state;
+	DMA_LOCALS;
+
+	BEGIN_DMA( 3 );
+
+	DMA_BLOCK( MGA_DSTORG,		ctx->dstorg,
+		   MGA_MACCESS,		ctx->maccess,
+		   MGA_PLNWT,		ctx->plnwt,
+		   MGA_DWGCTL,		ctx->dwgctl );
+
+	DMA_BLOCK( MGA_ALPHACTRL,	ctx->alphactrl,
+		   MGA_FOGCOL,		ctx->fogcolor,
+		   MGA_WFLAG,		ctx->wflag,
+		   MGA_ZORG,		dev_priv->depth_offset );
+
+	DMA_BLOCK( MGA_FCOL,		ctx->fcol,
+		   MGA_DMAPAD,		0x00000000,
+		   MGA_DMAPAD,		0x00000000,
+		   MGA_DMAPAD,		0x00000000 );
+
+	ADVANCE_DMA();
+}
+
+static __inline__ void mga_g400_emit_context( drm_mga_private_t *dev_priv )
+{
+	drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	drm_mga_context_regs_t *ctx = &sarea_priv->context_state;
+	DMA_LOCALS;
+
+	BEGIN_DMA( 4 );
+
+	DMA_BLOCK( MGA_DSTORG,		ctx->dstorg,
+		   MGA_MACCESS,		ctx->maccess,
+		   MGA_PLNWT,		ctx->plnwt,
+		   MGA_DWGCTL,		ctx->dwgctl );
+
+	DMA_BLOCK( MGA_ALPHACTRL,	ctx->alphactrl,
+		   MGA_FOGCOL,		ctx->fogcolor,
+		   MGA_WFLAG,		ctx->wflag,
+		   MGA_ZORG,		dev_priv->depth_offset );
+
+	DMA_BLOCK( MGA_WFLAG1,		ctx->wflag,
+		   MGA_TDUALSTAGE0,	ctx->tdualstage0,
+		   MGA_TDUALSTAGE1,	ctx->tdualstage1,
+		   MGA_FCOL,		ctx->fcol );
+
+	DMA_BLOCK( MGA_STENCIL,		ctx->stencil,
+		   MGA_STENCILCTL,	ctx->stencilctl,
+		   MGA_DMAPAD,		0x00000000,
+		   MGA_DMAPAD,		0x00000000 );
+
+	ADVANCE_DMA();
+}
+
+static __inline__ void mga_g200_emit_tex0( drm_mga_private_t *dev_priv )
+{
+	drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	drm_mga_texture_regs_t *tex = &sarea_priv->tex_state[0];
+	DMA_LOCALS;
+
+	BEGIN_DMA( 4 );
+
+	DMA_BLOCK( MGA_TEXCTL2,		tex->texctl2,
+		   MGA_TEXCTL,		tex->texctl,
+		   MGA_TEXFILTER,	tex->texfilter,
+		   MGA_TEXBORDERCOL,	tex->texbordercol );
+
+	DMA_BLOCK( MGA_TEXORG,		tex->texorg,
+		   MGA_TEXORG1,		tex->texorg1,
+		   MGA_TEXORG2,		tex->texorg2,
+		   MGA_TEXORG3,		tex->texorg3 );
+
+	DMA_BLOCK( MGA_TEXORG4,		tex->texorg4,
+		   MGA_TEXWIDTH,	tex->texwidth,
+		   MGA_TEXHEIGHT,	tex->texheight,
+		   MGA_WR24,		tex->texwidth );
+
+	DMA_BLOCK( MGA_WR34,		tex->texheight,
+		   MGA_TEXTRANS,	0x0000ffff,
+		   MGA_TEXTRANSHIGH,	0x0000ffff,
+		   MGA_DMAPAD,		0x00000000 );
+
+	ADVANCE_DMA();
+}
+
+static __inline__ void mga_g400_emit_tex0( drm_mga_private_t *dev_priv )
+{
+	drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	drm_mga_texture_regs_t *tex = &sarea_priv->tex_state[0];
+	DMA_LOCALS;
+
+/*  	printk("mga_g400_emit_tex0 %x %x %x\n", tex->texorg, */
+/*  	       tex->texctl, tex->texctl2); */
+
+	BEGIN_DMA( 6 );
+
+	DMA_BLOCK( MGA_TEXCTL2,		tex->texctl2 | MGA_G400_TC2_MAGIC,
+		   MGA_TEXCTL,		tex->texctl,
+		   MGA_TEXFILTER,	tex->texfilter,
+		   MGA_TEXBORDERCOL,	tex->texbordercol );
+
+	DMA_BLOCK( MGA_TEXORG,		tex->texorg,
+		   MGA_TEXORG1,		tex->texorg1,
+		   MGA_TEXORG2,		tex->texorg2,
+		   MGA_TEXORG3,		tex->texorg3 );
+
+	DMA_BLOCK( MGA_TEXORG4,		tex->texorg4,
+		   MGA_TEXWIDTH,	tex->texwidth,
+		   MGA_TEXHEIGHT,	tex->texheight,
+		   MGA_WR49,		0x00000000 );
+
+	DMA_BLOCK( MGA_WR57,		0x00000000,
+		   MGA_WR53,		0x00000000,
+		   MGA_WR61,		0x00000000,
+		   MGA_WR52,		MGA_G400_WR_MAGIC );
+
+	DMA_BLOCK( MGA_WR60,		MGA_G400_WR_MAGIC,
+		   MGA_WR54,		tex->texwidth | MGA_G400_WR_MAGIC,
+		   MGA_WR62,		tex->texheight | MGA_G400_WR_MAGIC,
+		   MGA_DMAPAD,		0x00000000 );
+
+	DMA_BLOCK( MGA_DMAPAD,		0x00000000,
+		   MGA_DMAPAD,		0x00000000,
+		   MGA_TEXTRANS,	0x0000ffff,
+		   MGA_TEXTRANSHIGH,	0x0000ffff );
+
+	ADVANCE_DMA();
+}
+
+static __inline__ void mga_g400_emit_tex1( drm_mga_private_t *dev_priv )
+{
+	drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	drm_mga_texture_regs_t *tex = &sarea_priv->tex_state[1];
+	DMA_LOCALS;
+
+/*  	printk("mga_g400_emit_tex1 %x %x %x\n", tex->texorg,  */
+/*  	       tex->texctl, tex->texctl2); */
+
+	BEGIN_DMA( 5 );
+
+	DMA_BLOCK( MGA_TEXCTL2,		(tex->texctl2 |
+					 MGA_MAP1_ENABLE |
+					 MGA_G400_TC2_MAGIC),
+		   MGA_TEXCTL,		tex->texctl,
+		   MGA_TEXFILTER,	tex->texfilter,
+		   MGA_TEXBORDERCOL,	tex->texbordercol );
+
+	DMA_BLOCK( MGA_TEXORG,		tex->texorg,
+		   MGA_TEXORG1,		tex->texorg1,
+		   MGA_TEXORG2,		tex->texorg2,
+		   MGA_TEXORG3,		tex->texorg3 );
+
+	DMA_BLOCK( MGA_TEXORG4,		tex->texorg4,
+		   MGA_TEXWIDTH,	tex->texwidth,
+		   MGA_TEXHEIGHT,	tex->texheight,
+		   MGA_WR49,		0x00000000 );
+
+	DMA_BLOCK( MGA_WR57,		0x00000000,
+		   MGA_WR53,		0x00000000,
+		   MGA_WR61,		0x00000000,
+		   MGA_WR52,		tex->texwidth | MGA_G400_WR_MAGIC );
+
+	DMA_BLOCK( MGA_WR60,		tex->texheight | MGA_G400_WR_MAGIC,
+		   MGA_TEXTRANS,	0x0000ffff,
+		   MGA_TEXTRANSHIGH,	0x0000ffff,
+		   MGA_TEXCTL2,		tex->texctl2 | MGA_G400_TC2_MAGIC );
+
+	ADVANCE_DMA();
+}
+
+static __inline__ void mga_g200_emit_pipe( drm_mga_private_t *dev_priv )
+{
+	drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	unsigned int pipe = sarea_priv->warp_pipe;
+	DMA_LOCALS;
+
+	BEGIN_DMA( 3 );
+
+	DMA_BLOCK( MGA_WIADDR,	MGA_WMODE_SUSPEND,
+		   MGA_WVRTXSZ,	0x00000007,
+		   MGA_WFLAG,	0x00000000,
+		   MGA_WR24,	0x00000000 );
+
+	DMA_BLOCK( MGA_WR25,	0x00000100,
+		   MGA_WR34,	0x00000000,
+		   MGA_WR42,	0x0000ffff,
+		   MGA_WR60,	0x0000ffff );
+
+	/* Padding required to to hardware bug.
+	 */
+	DMA_BLOCK( MGA_DMAPAD,	0xffffffff,
+		   MGA_DMAPAD,	0xffffffff,
+		   MGA_DMAPAD,	0xffffffff,
+		   MGA_WIADDR,	(dev_priv->warp_pipe_phys[pipe] |
+				 MGA_WMODE_START |
+				 MGA_WAGP_ENABLE) );
+
+	ADVANCE_DMA();
+}
+
+static __inline__ void mga_g400_emit_pipe( drm_mga_private_t *dev_priv )
+{
+	drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	unsigned int pipe = sarea_priv->warp_pipe;
+	DMA_LOCALS;
+
+/*  	printk("mga_g400_emit_pipe %x\n", pipe); */
+
+	BEGIN_DMA( 10 );
+
+	DMA_BLOCK( MGA_WIADDR2,	MGA_WMODE_SUSPEND,
+		   MGA_DMAPAD,	0x00000000,
+		   MGA_DMAPAD,	0x00000000,
+		   MGA_DMAPAD,	0x00000000 );
+
+	if ( pipe & MGA_T2 ) {
+		DMA_BLOCK( MGA_WVRTXSZ,		0x00001e09,
+			   MGA_DMAPAD,		0x00000000,
+			   MGA_DMAPAD,		0x00000000,
+			   MGA_DMAPAD,		0x00000000 );
+
+		DMA_BLOCK( MGA_WACCEPTSEQ,	0x00000000,
+			   MGA_WACCEPTSEQ,	0x00000000,
+			   MGA_WACCEPTSEQ,	0x00000000,
+			   MGA_WACCEPTSEQ,	0x1e000000 );
+	} else {
+		if ( dev_priv->warp_pipe & MGA_T2 ) {
+			/* Flush the WARP pipe */
+			DMA_BLOCK( MGA_YDST,		0x00000000,
+				   MGA_FXLEFT,		0x00000000,
+				   MGA_FXRIGHT,		0x00000001,
+				   MGA_DWGCTL,		MGA_DWGCTL_FLUSH );
+
+			DMA_BLOCK( MGA_LEN + MGA_EXEC,	0x00000001,
+				   MGA_DWGSYNC,		0x00007000,
+				   MGA_TEXCTL2,		MGA_G400_TC2_MAGIC,
+				   MGA_LEN + MGA_EXEC,	0x00000000 );
+
+			DMA_BLOCK( MGA_TEXCTL2,		(MGA_DUALTEX |
+							 MGA_G400_TC2_MAGIC),
+				   MGA_LEN + MGA_EXEC,	0x00000000,
+				   MGA_TEXCTL2,		MGA_G400_TC2_MAGIC,
+				   MGA_DMAPAD,		0x00000000 );
+		}
+
+		DMA_BLOCK( MGA_WVRTXSZ,		0x00001807,
+			   MGA_DMAPAD,		0x00000000,
+			   MGA_DMAPAD,		0x00000000,
+			   MGA_DMAPAD,		0x00000000 );
+
+		DMA_BLOCK( MGA_WACCEPTSEQ,	0x00000000,
+			   MGA_WACCEPTSEQ,	0x00000000,
+			   MGA_WACCEPTSEQ,	0x00000000,
+			   MGA_WACCEPTSEQ,	0x18000000 );
+	}
+
+	DMA_BLOCK( MGA_WFLAG,	0x00000000,
+		   MGA_WFLAG1,	0x00000000,
+		   MGA_WR56,	MGA_G400_WR56_MAGIC,
+		   MGA_DMAPAD,	0x00000000 );
+
+	DMA_BLOCK( MGA_WR49,	0x00000000,		/* tex0              */
+		   MGA_WR57,	0x00000000,		/* tex0              */
+		   MGA_WR53,	0x00000000,		/* tex1              */
+		   MGA_WR61,	0x00000000 );		/* tex1              */
+
+	DMA_BLOCK( MGA_WR54,	MGA_G400_WR_MAGIC,	/* tex0 width        */
+		   MGA_WR62,	MGA_G400_WR_MAGIC,	/* tex0 height       */
+		   MGA_WR52,	MGA_G400_WR_MAGIC,	/* tex1 width        */
+		   MGA_WR60,	MGA_G400_WR_MAGIC );	/* tex1 height       */
+
+	/* Padding required to to hardware bug */
+	DMA_BLOCK( MGA_DMAPAD,	0xffffffff,
+		   MGA_DMAPAD,	0xffffffff,
+		   MGA_DMAPAD,	0xffffffff,
+		   MGA_WIADDR2,	(dev_priv->warp_pipe_phys[pipe] |
+				 MGA_WMODE_START |
+				 MGA_WAGP_ENABLE) );
+
+	ADVANCE_DMA();
+}
+
+static void mga_g200_emit_state( drm_mga_private_t *dev_priv )
+{
+	drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	unsigned int dirty = sarea_priv->dirty;
+
+	if ( sarea_priv->warp_pipe != dev_priv->warp_pipe ) {
+		mga_g200_emit_pipe( dev_priv );
+		dev_priv->warp_pipe = sarea_priv->warp_pipe;
+	}
+
+	if ( dirty & MGA_UPLOAD_CONTEXT ) {
+		mga_g200_emit_context( dev_priv );
+		sarea_priv->dirty &= ~MGA_UPLOAD_CONTEXT;
+	}
+
+	if ( dirty & MGA_UPLOAD_TEX0 ) {
+		mga_g200_emit_tex0( dev_priv );
+		sarea_priv->dirty &= ~MGA_UPLOAD_TEX0;
+	}
+}
+
+static void mga_g400_emit_state( drm_mga_private_t *dev_priv )
+{
+	drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	unsigned int dirty = sarea_priv->dirty;
+	int multitex = sarea_priv->warp_pipe & MGA_T2;
+
+	if ( sarea_priv->warp_pipe != dev_priv->warp_pipe ) {
+		mga_g400_emit_pipe( dev_priv );
+		dev_priv->warp_pipe = sarea_priv->warp_pipe;
+	}
+
+	if ( dirty & MGA_UPLOAD_CONTEXT ) {
+		mga_g400_emit_context( dev_priv );
+		sarea_priv->dirty &= ~MGA_UPLOAD_CONTEXT;
+	}
+
+	if ( dirty & MGA_UPLOAD_TEX0 ) {
+		mga_g400_emit_tex0( dev_priv );
+		sarea_priv->dirty &= ~MGA_UPLOAD_TEX0;
+	}
+
+	if ( (dirty & MGA_UPLOAD_TEX1) && multitex ) {
+		mga_g400_emit_tex1( dev_priv );
+		sarea_priv->dirty &= ~MGA_UPLOAD_TEX1;
+	}
+}
+
+
+/* ================================================================
+ * SAREA state verification
+ */
+
+/* Disallow all write destinations except the front and backbuffer.
+ */
+static int mga_verify_context( drm_mga_private_t *dev_priv )
+{
+	drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	drm_mga_context_regs_t *ctx = &sarea_priv->context_state;
+
+	if ( ctx->dstorg != dev_priv->front_offset &&
+	     ctx->dstorg != dev_priv->back_offset ) {
+		DRM_ERROR( "*** bad DSTORG: %x (front %x, back %x)\n\n",
+			   ctx->dstorg, dev_priv->front_offset,
+			   dev_priv->back_offset );
+		ctx->dstorg = 0;
+		return DRM_ERR(EINVAL);
+	}
+
+	return 0;
+}
+
+/* Disallow texture reads from PCI space.
+ */
+static int mga_verify_tex( drm_mga_private_t *dev_priv, int unit )
+{
+	drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	drm_mga_texture_regs_t *tex = &sarea_priv->tex_state[unit];
+	unsigned int org;
+
+	org = tex->texorg & (MGA_TEXORGMAP_MASK | MGA_TEXORGACC_MASK);
+
+	if ( org == (MGA_TEXORGMAP_SYSMEM | MGA_TEXORGACC_PCI) ) {
+		DRM_ERROR( "*** bad TEXORG: 0x%x, unit %d\n",
+			   tex->texorg, unit );
+		tex->texorg = 0;
+		return DRM_ERR(EINVAL);
+	}
+
+	return 0;
+}
+
+static int mga_verify_state( drm_mga_private_t *dev_priv )
+{
+	drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	unsigned int dirty = sarea_priv->dirty;
+	int ret = 0;
+
+	if ( sarea_priv->nbox > MGA_NR_SAREA_CLIPRECTS )
+		sarea_priv->nbox = MGA_NR_SAREA_CLIPRECTS;
+
+	if ( dirty & MGA_UPLOAD_CONTEXT )
+		ret |= mga_verify_context( dev_priv );
+
+	if ( dirty & MGA_UPLOAD_TEX0 )
+		ret |= mga_verify_tex( dev_priv, 0 );
+
+	if ( dev_priv->chipset == MGA_CARD_TYPE_G400 ) {
+		if ( dirty & MGA_UPLOAD_TEX1 )
+			ret |= mga_verify_tex( dev_priv, 1 );
+
+		if ( dirty & MGA_UPLOAD_PIPE )
+			ret |= ( sarea_priv->warp_pipe > MGA_MAX_G400_PIPES );
+	} else {
+		if ( dirty & MGA_UPLOAD_PIPE )
+			ret |= ( sarea_priv->warp_pipe > MGA_MAX_G200_PIPES );
+	}
+
+	return ( ret == 0 );
+}
+
+static int mga_verify_iload( drm_mga_private_t *dev_priv,
+			     unsigned int dstorg, unsigned int length )
+{
+	if ( dstorg < dev_priv->texture_offset ||
+	     dstorg + length > (dev_priv->texture_offset +
+				dev_priv->texture_size) ) {
+		DRM_ERROR( "*** bad iload DSTORG: 0x%x\n", dstorg );
+		return DRM_ERR(EINVAL);
+	}
+
+	if ( length & MGA_ILOAD_MASK ) {
+		DRM_ERROR( "*** bad iload length: 0x%x\n",
+			   length & MGA_ILOAD_MASK );
+		return DRM_ERR(EINVAL);
+	}
+
+	return 0;
+}
+
+static int mga_verify_blit( drm_mga_private_t *dev_priv,
+			    unsigned int srcorg, unsigned int dstorg )
+{
+	if ( (srcorg & 0x3) == (MGA_SRCACC_PCI | MGA_SRCMAP_SYSMEM) ||
+	     (dstorg & 0x3) == (MGA_SRCACC_PCI | MGA_SRCMAP_SYSMEM) ) {
+		DRM_ERROR( "*** bad blit: src=0x%x dst=0x%x\n",
+			   srcorg, dstorg );
+		return DRM_ERR(EINVAL);
+	}
+	return 0;
+}
+
+
+/* ================================================================
+ *
+ */
+
+static void mga_dma_dispatch_clear( drm_device_t *dev,
+				    drm_mga_clear_t *clear )
+{
+	drm_mga_private_t *dev_priv = dev->dev_private;
+	drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	drm_mga_context_regs_t *ctx = &sarea_priv->context_state;
+	drm_clip_rect_t *pbox = sarea_priv->boxes;
+	int nbox = sarea_priv->nbox;
+	int i;
+	DMA_LOCALS;
+	DRM_DEBUG( "\n" );
+
+	BEGIN_DMA( 1 );
+
+	DMA_BLOCK( MGA_DMAPAD,	0x00000000,
+		   MGA_DMAPAD,	0x00000000,
+		   MGA_DWGSYNC,	0x00007100,
+		   MGA_DWGSYNC,	0x00007000 );
+
+	ADVANCE_DMA();
+
+	for ( i = 0 ; i < nbox ; i++ ) {
+		drm_clip_rect_t *box = &pbox[i];
+		u32 height = box->y2 - box->y1;
+
+		DRM_DEBUG( "   from=%d,%d to=%d,%d\n",
+			   box->x1, box->y1, box->x2, box->y2 );
+
+		if ( clear->flags & MGA_FRONT ) {
+			BEGIN_DMA( 2 );
+
+			DMA_BLOCK( MGA_DMAPAD,	0x00000000,
+				   MGA_PLNWT,	clear->color_mask,
+				   MGA_YDSTLEN, (box->y1 << 16) | height,
+				   MGA_FXBNDRY, (box->x2 << 16) | box->x1 );
+
+			DMA_BLOCK( MGA_DMAPAD,	0x00000000,
+				   MGA_FCOL,	clear->clear_color,
+				   MGA_DSTORG,	dev_priv->front_offset,
+				   MGA_DWGCTL + MGA_EXEC,
+						dev_priv->clear_cmd );
+
+			ADVANCE_DMA();
+		}
+
+
+		if ( clear->flags & MGA_BACK ) {
+			BEGIN_DMA( 2 );
+
+			DMA_BLOCK( MGA_DMAPAD,	0x00000000,
+				   MGA_PLNWT,	clear->color_mask,
+				   MGA_YDSTLEN, (box->y1 << 16) | height,
+				   MGA_FXBNDRY, (box->x2 << 16) | box->x1 );
+
+			DMA_BLOCK( MGA_DMAPAD,	0x00000000,
+				   MGA_FCOL,	clear->clear_color,
+				   MGA_DSTORG,	dev_priv->back_offset,
+				   MGA_DWGCTL + MGA_EXEC,
+						dev_priv->clear_cmd );
+
+			ADVANCE_DMA();
+		}
+
+		if ( clear->flags & MGA_DEPTH ) {
+			BEGIN_DMA( 2 );
+
+			DMA_BLOCK( MGA_DMAPAD,	0x00000000,
+				   MGA_PLNWT,	clear->depth_mask,
+				   MGA_YDSTLEN, (box->y1 << 16) | height,
+				   MGA_FXBNDRY, (box->x2 << 16) | box->x1 );
+
+			DMA_BLOCK( MGA_DMAPAD,	0x00000000,
+				   MGA_FCOL,	clear->clear_depth,
+				   MGA_DSTORG,	dev_priv->depth_offset,
+				   MGA_DWGCTL + MGA_EXEC,
+						dev_priv->clear_cmd );
+
+			ADVANCE_DMA();
+		}
+
+	}
+
+	BEGIN_DMA( 1 );
+
+	/* Force reset of DWGCTL */
+	DMA_BLOCK( MGA_DMAPAD,	0x00000000,
+		   MGA_DMAPAD,	0x00000000,
+		   MGA_PLNWT,	ctx->plnwt,
+		   MGA_DWGCTL,	ctx->dwgctl );
+
+	ADVANCE_DMA();
+
+	FLUSH_DMA();
+}
+
+static void mga_dma_dispatch_swap( drm_device_t *dev )
+{
+	drm_mga_private_t *dev_priv = dev->dev_private;
+	drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	drm_mga_context_regs_t *ctx = &sarea_priv->context_state;
+	drm_clip_rect_t *pbox = sarea_priv->boxes;
+	int nbox = sarea_priv->nbox;
+	int i;
+	DMA_LOCALS;
+	DRM_DEBUG( "\n" );
+
+	sarea_priv->last_frame.head = dev_priv->prim.tail;
+	sarea_priv->last_frame.wrap = dev_priv->prim.last_wrap;
+
+	BEGIN_DMA( 4 + nbox );
+
+	DMA_BLOCK( MGA_DMAPAD,	0x00000000,
+		   MGA_DMAPAD,	0x00000000,
+		   MGA_DWGSYNC,	0x00007100,
+		   MGA_DWGSYNC,	0x00007000 );
+
+	DMA_BLOCK( MGA_DSTORG,	dev_priv->front_offset,
+		   MGA_MACCESS,	dev_priv->maccess,
+		   MGA_SRCORG,	dev_priv->back_offset,
+		   MGA_AR5,	dev_priv->front_pitch );
+
+	DMA_BLOCK( MGA_DMAPAD,	0x00000000,
+		   MGA_DMAPAD,	0x00000000,
+		   MGA_PLNWT,	0xffffffff,
+		   MGA_DWGCTL,	MGA_DWGCTL_COPY );
+
+	for ( i = 0 ; i < nbox ; i++ ) {
+		drm_clip_rect_t *box = &pbox[i];
+		u32 height = box->y2 - box->y1;
+		u32 start = box->y1 * dev_priv->front_pitch;
+
+		DRM_DEBUG( "   from=%d,%d to=%d,%d\n",
+			   box->x1, box->y1, box->x2, box->y2 );
+
+		DMA_BLOCK( MGA_AR0,	start + box->x2 - 1,
+			   MGA_AR3,	start + box->x1,
+			   MGA_FXBNDRY,	((box->x2 - 1) << 16) | box->x1,
+			   MGA_YDSTLEN + MGA_EXEC,
+					(box->y1 << 16) | height );
+	}
+
+	DMA_BLOCK( MGA_DMAPAD,	0x00000000,
+		   MGA_PLNWT,	ctx->plnwt,
+		   MGA_SRCORG,	dev_priv->front_offset,
+		   MGA_DWGCTL,	ctx->dwgctl );
+
+	ADVANCE_DMA();
+
+	FLUSH_DMA();
+
+	DRM_DEBUG( "%s... done.\n", __FUNCTION__ );
+}
+
+static void mga_dma_dispatch_vertex( drm_device_t *dev, drm_buf_t *buf )
+{
+	drm_mga_private_t *dev_priv = dev->dev_private;
+	drm_mga_buf_priv_t *buf_priv = buf->dev_private;
+	drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	u32 address = (u32) buf->bus_address;
+	u32 length = (u32) buf->used;
+	int i = 0;
+	DMA_LOCALS;
+	DRM_DEBUG( "vertex: buf=%d used=%d\n", buf->idx, buf->used );
+
+	if ( buf->used ) {
+		buf_priv->dispatched = 1;
+
+		MGA_EMIT_STATE( dev_priv, sarea_priv->dirty );
+
+		do {
+			if ( i < sarea_priv->nbox ) {
+				mga_emit_clip_rect( dev_priv,
+						    &sarea_priv->boxes[i] );
+			}
+
+			BEGIN_DMA( 1 );
+
+			DMA_BLOCK( MGA_DMAPAD,		0x00000000,
+				   MGA_DMAPAD,		0x00000000,
+				   MGA_SECADDRESS,	(address |
+							 MGA_DMA_VERTEX),
+				   MGA_SECEND,		((address + length) |
+							 MGA_PAGPXFER) );
+
+			ADVANCE_DMA();
+		} while ( ++i < sarea_priv->nbox );
+	}
+
+	if ( buf_priv->discard ) {
+		AGE_BUFFER( buf_priv );
+		buf->pending = 0;
+		buf->used = 0;
+		buf_priv->dispatched = 0;
+
+		mga_freelist_put( dev, buf );
+	}
+
+	FLUSH_DMA();
+}
+
+static void mga_dma_dispatch_indices( drm_device_t *dev, drm_buf_t *buf,
+				      unsigned int start, unsigned int end )
+{
+	drm_mga_private_t *dev_priv = dev->dev_private;
+	drm_mga_buf_priv_t *buf_priv = buf->dev_private;
+	drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	u32 address = (u32) buf->bus_address;
+	int i = 0;
+	DMA_LOCALS;
+	DRM_DEBUG( "indices: buf=%d start=%d end=%d\n", buf->idx, start, end );
+
+	if ( start != end ) {
+		buf_priv->dispatched = 1;
+
+		MGA_EMIT_STATE( dev_priv, sarea_priv->dirty );
+
+		do {
+			if ( i < sarea_priv->nbox ) {
+				mga_emit_clip_rect( dev_priv,
+						    &sarea_priv->boxes[i] );
+			}
+
+			BEGIN_DMA( 1 );
+
+			DMA_BLOCK( MGA_DMAPAD,		0x00000000,
+				   MGA_DMAPAD,		0x00000000,
+				   MGA_SETUPADDRESS,	address + start,
+				   MGA_SETUPEND,	((address + end) |
+							 MGA_PAGPXFER) );
+
+			ADVANCE_DMA();
+		} while ( ++i < sarea_priv->nbox );
+	}
+
+	if ( buf_priv->discard ) {
+		AGE_BUFFER( buf_priv );
+		buf->pending = 0;
+		buf->used = 0;
+		buf_priv->dispatched = 0;
+
+		mga_freelist_put( dev, buf );
+	}
+
+	FLUSH_DMA();
+}
+
+/* This copies a 64 byte aligned agp region to the frambuffer with a
+ * standard blit, the ioctl needs to do checking.
+ */
+static void mga_dma_dispatch_iload( drm_device_t *dev, drm_buf_t *buf,
+				    unsigned int dstorg, unsigned int length )
+{
+	drm_mga_private_t *dev_priv = dev->dev_private;
+	drm_mga_buf_priv_t *buf_priv = buf->dev_private;
+	drm_mga_context_regs_t *ctx = &dev_priv->sarea_priv->context_state;
+	u32 srcorg = buf->bus_address | MGA_SRCACC_AGP | MGA_SRCMAP_SYSMEM;
+	u32 y2;
+	DMA_LOCALS;
+	DRM_DEBUG( "buf=%d used=%d\n", buf->idx, buf->used );
+
+	y2 = length / 64;
+
+	BEGIN_DMA( 5 );
+
+	DMA_BLOCK( MGA_DMAPAD,	0x00000000,
+		   MGA_DMAPAD,	0x00000000,
+		   MGA_DWGSYNC,	0x00007100,
+		   MGA_DWGSYNC,	0x00007000 );
+
+	DMA_BLOCK( MGA_DSTORG,	dstorg,
+		   MGA_MACCESS,	0x00000000,
+		   MGA_SRCORG,	srcorg,
+		   MGA_AR5,	64 );
+
+	DMA_BLOCK( MGA_PITCH,	64,
+		   MGA_PLNWT,	0xffffffff,
+		   MGA_DMAPAD,	0x00000000,
+		   MGA_DWGCTL,	MGA_DWGCTL_COPY );
+
+	DMA_BLOCK( MGA_AR0,	63,
+		   MGA_AR3,	0,
+		   MGA_FXBNDRY,	(63 << 16) | 0,
+		   MGA_YDSTLEN + MGA_EXEC, y2 );
+
+	DMA_BLOCK( MGA_PLNWT,	ctx->plnwt,
+		   MGA_SRCORG,	dev_priv->front_offset,
+		   MGA_PITCH,	dev_priv->front_pitch,
+		   MGA_DWGSYNC,	0x00007000 );
+
+	ADVANCE_DMA();
+
+	AGE_BUFFER( buf_priv );
+
+	buf->pending = 0;
+	buf->used = 0;
+	buf_priv->dispatched = 0;
+
+	mga_freelist_put( dev, buf );
+
+	FLUSH_DMA();
+}
+
+static void mga_dma_dispatch_blit( drm_device_t *dev,
+				   drm_mga_blit_t *blit )
+{
+	drm_mga_private_t *dev_priv = dev->dev_private;
+	drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	drm_mga_context_regs_t *ctx = &sarea_priv->context_state;
+	drm_clip_rect_t *pbox = sarea_priv->boxes;
+	int nbox = sarea_priv->nbox;
+	u32 scandir = 0, i;
+	DMA_LOCALS;
+	DRM_DEBUG( "\n" );
+
+	BEGIN_DMA( 4 + nbox );
+
+	DMA_BLOCK( MGA_DMAPAD,	0x00000000,
+		   MGA_DMAPAD,	0x00000000,
+		   MGA_DWGSYNC,	0x00007100,
+		   MGA_DWGSYNC,	0x00007000 );
+
+	DMA_BLOCK( MGA_DWGCTL,	MGA_DWGCTL_COPY,
+		   MGA_PLNWT,	blit->planemask,
+		   MGA_SRCORG,	blit->srcorg,
+		   MGA_DSTORG,	blit->dstorg );
+
+	DMA_BLOCK( MGA_SGN,	scandir,
+		   MGA_MACCESS,	dev_priv->maccess,
+		   MGA_AR5,	blit->ydir * blit->src_pitch,
+		   MGA_PITCH,	blit->dst_pitch );
+
+	for ( i = 0 ; i < nbox ; i++ ) {
+		int srcx = pbox[i].x1 + blit->delta_sx;
+		int srcy = pbox[i].y1 + blit->delta_sy;
+		int dstx = pbox[i].x1 + blit->delta_dx;
+		int dsty = pbox[i].y1 + blit->delta_dy;
+		int h = pbox[i].y2 - pbox[i].y1;
+		int w = pbox[i].x2 - pbox[i].x1 - 1;
+		int start;
+
+		if ( blit->ydir == -1 ) {
+			srcy = blit->height - srcy - 1;
+		}
+
+		start = srcy * blit->src_pitch + srcx;
+
+		DMA_BLOCK( MGA_AR0,	start + w,
+			   MGA_AR3,	start,
+			   MGA_FXBNDRY,	((dstx + w) << 16) | (dstx & 0xffff),
+			   MGA_YDSTLEN + MGA_EXEC, (dsty << 16) | h );
+	}
+
+	/* Do something to flush AGP?
+	 */
+
+	/* Force reset of DWGCTL */
+	DMA_BLOCK( MGA_DMAPAD,	0x00000000,
+		   MGA_PLNWT,	ctx->plnwt,
+		   MGA_PITCH,	dev_priv->front_pitch,
+		   MGA_DWGCTL,	ctx->dwgctl );
+
+	ADVANCE_DMA();
+}
+
+
+/* ================================================================
+ *
+ */
+
+int mga_dma_clear( DRM_IOCTL_ARGS )
+{
+	DRM_DEVICE;
+	drm_mga_private_t *dev_priv = dev->dev_private;
+	drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	drm_mga_clear_t clear;
+
+	LOCK_TEST_WITH_RETURN( dev );
+
+	DRM_COPY_FROM_USER_IOCTL( clear, (drm_mga_clear_t *)data, sizeof(clear) );
+
+	if ( sarea_priv->nbox > MGA_NR_SAREA_CLIPRECTS )
+		sarea_priv->nbox = MGA_NR_SAREA_CLIPRECTS;
+
+	WRAP_TEST_WITH_RETURN( dev_priv );
+
+	mga_dma_dispatch_clear( dev, &clear );
+
+	/* Make sure we restore the 3D state next time.
+	 */
+	dev_priv->sarea_priv->dirty |= MGA_UPLOAD_CONTEXT;
+
+	return 0;
+}
+
+int mga_dma_swap( DRM_IOCTL_ARGS )
+{
+	DRM_DEVICE;
+	drm_mga_private_t *dev_priv = dev->dev_private;
+	drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
+
+	LOCK_TEST_WITH_RETURN( dev );
+
+	if ( sarea_priv->nbox > MGA_NR_SAREA_CLIPRECTS )
+		sarea_priv->nbox = MGA_NR_SAREA_CLIPRECTS;
+
+	WRAP_TEST_WITH_RETURN( dev_priv );
+
+	mga_dma_dispatch_swap( dev );
+
+	/* Make sure we restore the 3D state next time.
+	 */
+	dev_priv->sarea_priv->dirty |= MGA_UPLOAD_CONTEXT;
+
+	return 0;
+}
+
+int mga_dma_vertex( DRM_IOCTL_ARGS )
+{
+	DRM_DEVICE;
+	drm_mga_private_t *dev_priv = dev->dev_private;
+	drm_device_dma_t *dma = dev->dma;
+	drm_buf_t *buf;
+	drm_mga_buf_priv_t *buf_priv;
+	drm_mga_vertex_t vertex;
+
+	LOCK_TEST_WITH_RETURN( dev );
+
+	DRM_COPY_FROM_USER_IOCTL( vertex,
+			     (drm_mga_vertex_t *)data,
+			     sizeof(vertex) );
+
+        if(vertex.idx < 0 || vertex.idx > dma->buf_count) return DRM_ERR(EINVAL);
+	buf = dma->buflist[vertex.idx];
+	buf_priv = buf->dev_private;
+
+	buf->used = vertex.used;
+	buf_priv->discard = vertex.discard;
+
+	if ( !mga_verify_state( dev_priv ) ) {
+		if ( vertex.discard ) {
+			if ( buf_priv->dispatched == 1 )
+				AGE_BUFFER( buf_priv );
+			buf_priv->dispatched = 0;
+			mga_freelist_put( dev, buf );
+		}
+		return DRM_ERR(EINVAL);
+	}
+
+	WRAP_TEST_WITH_RETURN( dev_priv );
+
+	mga_dma_dispatch_vertex( dev, buf );
+
+	return 0;
+}
+
+int mga_dma_indices( DRM_IOCTL_ARGS )
+{
+	DRM_DEVICE;
+	drm_mga_private_t *dev_priv = dev->dev_private;
+	drm_device_dma_t *dma = dev->dma;
+	drm_buf_t *buf;
+	drm_mga_buf_priv_t *buf_priv;
+	drm_mga_indices_t indices;
+
+	LOCK_TEST_WITH_RETURN( dev );
+
+	DRM_COPY_FROM_USER_IOCTL( indices,
+			     (drm_mga_indices_t *)data,
+			     sizeof(indices) );
+
+        if(indices.idx < 0 || indices.idx > dma->buf_count) return DRM_ERR(EINVAL);
+
+	buf = dma->buflist[indices.idx];
+	buf_priv = buf->dev_private;
+
+	buf_priv->discard = indices.discard;
+
+	if ( !mga_verify_state( dev_priv ) ) {
+		if ( indices.discard ) {
+			if ( buf_priv->dispatched == 1 )
+				AGE_BUFFER( buf_priv );
+			buf_priv->dispatched = 0;
+			mga_freelist_put( dev, buf );
+		}
+		return DRM_ERR(EINVAL);
+	}
+
+	WRAP_TEST_WITH_RETURN( dev_priv );
+
+	mga_dma_dispatch_indices( dev, buf, indices.start, indices.end );
+
+	return 0;
+}
+
+int mga_dma_iload( DRM_IOCTL_ARGS )
+{
+	DRM_DEVICE;
+	drm_device_dma_t *dma = dev->dma;
+	drm_mga_private_t *dev_priv = dev->dev_private;
+	drm_buf_t *buf;
+	drm_mga_buf_priv_t *buf_priv;
+	drm_mga_iload_t iload;
+	DRM_DEBUG( "\n" );
+
+	LOCK_TEST_WITH_RETURN( dev );
+
+	DRM_COPY_FROM_USER_IOCTL( iload, (drm_mga_iload_t *)data, sizeof(iload) );
+
+#if 0
+	if ( mga_do_wait_for_idle( dev_priv ) < 0 ) {
+		if ( MGA_DMA_DEBUG )
+			DRM_INFO( "%s: -EBUSY\n", __FUNCTION__ );
+		return DRM_ERR(EBUSY);
+	}
+#endif
+        if(iload.idx < 0 || iload.idx > dma->buf_count) return DRM_ERR(EINVAL);
+
+	buf = dma->buflist[iload.idx];
+	buf_priv = buf->dev_private;
+
+	if ( mga_verify_iload( dev_priv, iload.dstorg, iload.length ) ) {
+		mga_freelist_put( dev, buf );
+		return DRM_ERR(EINVAL);
+	}
+
+	WRAP_TEST_WITH_RETURN( dev_priv );
+
+	mga_dma_dispatch_iload( dev, buf, iload.dstorg, iload.length );
+
+	/* Make sure we restore the 3D state next time.
+	 */
+	dev_priv->sarea_priv->dirty |= MGA_UPLOAD_CONTEXT;
+
+	return 0;
+}
+
+int mga_dma_blit( DRM_IOCTL_ARGS )
+{
+	DRM_DEVICE;
+	drm_mga_private_t *dev_priv = dev->dev_private;
+	drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	drm_mga_blit_t blit;
+	DRM_DEBUG( "\n" );
+
+	LOCK_TEST_WITH_RETURN( dev );
+
+	DRM_COPY_FROM_USER_IOCTL( blit, (drm_mga_blit_t *)data, sizeof(blit) );
+
+	if ( sarea_priv->nbox > MGA_NR_SAREA_CLIPRECTS )
+		sarea_priv->nbox = MGA_NR_SAREA_CLIPRECTS;
+
+	if ( mga_verify_blit( dev_priv, blit.srcorg, blit.dstorg ) )
+		return DRM_ERR(EINVAL);
+
+	WRAP_TEST_WITH_RETURN( dev_priv );
+
+	mga_dma_dispatch_blit( dev, &blit );
+
+	/* Make sure we restore the 3D state next time.
+	 */
+	dev_priv->sarea_priv->dirty |= MGA_UPLOAD_CONTEXT;
+
+	return 0;
+}
+
+int mga_getparam( DRM_IOCTL_ARGS )
+{
+	DRM_DEVICE;
+	drm_mga_private_t *dev_priv = dev->dev_private;
+	drm_mga_getparam_t param;
+	int value;
+
+	if ( !dev_priv ) {
+		DRM_ERROR( "%s called with no initialization\n", __FUNCTION__ );
+		return DRM_ERR(EINVAL);
+	}
+
+	DRM_COPY_FROM_USER_IOCTL( param, (drm_mga_getparam_t *)data,
+			     sizeof(param) );
+
+	DRM_DEBUG( "pid=%d\n", DRM_CURRENTPID );
+
+	switch( param.param ) {
+	case MGA_PARAM_IRQ_NR:
+		value = dev->irq;
+		break;
+	default:
+		return DRM_ERR(EINVAL);
+	}
+
+	if ( DRM_COPY_TO_USER( param.value, &value, sizeof(int) ) ) {
+		DRM_ERROR( "copy_to_user\n" );
+		return DRM_ERR(EFAULT);
+	}
+	
+	return 0;
+}
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/mga_ucode.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/mga_ucode.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/mga_ucode.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/mga_ucode.h	2003-07-30 11:18:33.000000000 +0200
@@ -0,0 +1,11645 @@
+/* mga_ucode.h -- Matrox G200/G400 WARP engine microcode -*- linux-c -*-
+ * Created: Thu Jan 11 21:20:43 2001 by gareth@valinux.com
+ *
+ * Copyright 1999 Matrox Graphics Inc.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * MATROX GRAPHICS INC., OR ANY OTHER CONTRIBUTORS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Kernel-based WARP engine management:
+ *    Gareth Hughes <gareth@valinux.com>
+ */
+
+/*
+ * WARP pipes are named according to the functions they perform, where:
+ *
+ *   - T stands for computation of texture stage 0
+ *   - T2 stands for computation of both texture stage 0 and texture stage 1
+ *   - G stands for computation of triangle intensity (Gouraud interpolation)
+ *   - Z stands for computation of Z buffer interpolation
+ *   - S stands for computation of specular highlight
+ *   - A stands for computation of the alpha channel
+ *   - F stands for computation of vertex fog interpolation
+ */
+
+static unsigned char warp_g200_tgz[] = {
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x98, 0xA0, 0xE9,
+0x40, 0x40, 0xD8, 0xEC,
+
+0xFF, 0x80, 0xC0, 0xE9,
+0x00, 0x80, 0x00, 0xE8,
+
+0x1F, 0xD7, 0x18, 0xBD,
+0x3F, 0xD7, 0x22, 0xBD,
+
+0x81, 0x04,
+0x89, 0x04,
+0x01, 0x04,
+0x09, 0x04,
+
+0xC9, 0x41, 0xC0, 0xEC,
+0x11, 0x04,
+0x00, 0xE0,
+
+0x41, 0xCC, 0x41, 0xCD,
+0x49, 0xCC, 0x49, 0xCD,
+
+0xD1, 0x41, 0xC0, 0xEC,
+0x51, 0xCC, 0x51, 0xCD,
+
+0x80, 0x04,
+0x10, 0x04,
+0x08, 0x04,
+0x00, 0xE0,
+
+0x00, 0xCC, 0xC0, 0xCD,
+0xD1, 0x49, 0xC0, 0xEC,
+
+0x8A, 0x1F, 0x20, 0xE9,
+0x8B, 0x3F, 0x20, 0xE9,
+
+0x41, 0x3C, 0x41, 0xAD,
+0x49, 0x3C, 0x49, 0xAD,
+
+0x10, 0xCC, 0x10, 0xCD,
+0x08, 0xCC, 0x08, 0xCD,
+
+0xB9, 0x41, 0x49, 0xBB,
+0x1F, 0xF0, 0x41, 0xCD,
+
+0x51, 0x3C, 0x51, 0xAD,
+0x00, 0x98, 0x80, 0xE9,
+
+0x72, 0x80, 0x07, 0xEA,
+0x24, 0x1F, 0x20, 0xE9,
+
+0x15, 0x41, 0x49, 0xBD,
+0x1D, 0x41, 0x51, 0xBD,
+
+0x2E, 0x41, 0x2A, 0xB8,
+0x34, 0x53, 0xA0, 0xE8,
+
+0x15, 0x30,
+0x1D, 0x30,
+0x58, 0xE3,
+0x00, 0xE0,
+
+0xB5, 0x40, 0x48, 0xBD,
+0x3D, 0x40, 0x50, 0xBD,
+
+0x24, 0x43, 0xA0, 0xE8,
+0x2C, 0x4B, 0xA0, 0xE8,
+
+0x15, 0x72,
+0x09, 0xE3,
+0x00, 0xE0,
+0x1D, 0x72,
+
+0x35, 0x30,
+0xB5, 0x30,
+0xBD, 0x30,
+0x3D, 0x30,
+
+0x9C, 0x97, 0x57, 0x9F,
+0x00, 0x80, 0x00, 0xE8,
+
+0x6C, 0x64, 0xC8, 0xEC,
+0x98, 0xE1,
+0xB5, 0x05,
+
+0xBD, 0x05,
+0x2E, 0x30,
+0x32, 0xC0, 0xA0, 0xE8,
+
+0x33, 0xC0, 0xA0, 0xE8,
+0x74, 0x64, 0xC8, 0xEC,
+
+0x40, 0x3C, 0x40, 0xAD,
+0x32, 0x6A,
+0x2A, 0x30,
+
+0x20, 0x73,
+0x33, 0x6A,
+0x00, 0xE0,
+0x28, 0x73,
+
+0x1C, 0x72,
+0x83, 0xE2,
+0x60, 0x80, 0x15, 0xEA,
+
+0xB8, 0x3D, 0x28, 0xDF,
+0x30, 0x35, 0x20, 0xDF,
+
+0x40, 0x30,
+0x00, 0xE0,
+0xCC, 0xE2,
+0x64, 0x72,
+
+0x25, 0x42, 0x52, 0xBF,
+0x2D, 0x42, 0x4A, 0xBF,
+
+0x30, 0x2E, 0x30, 0xDF,
+0x38, 0x2E, 0x38, 0xDF,
+
+0x18, 0x1D, 0x45, 0xE9,
+0x1E, 0x15, 0x45, 0xE9,
+
+0x2B, 0x49, 0x51, 0xBD,
+0x00, 0xE0,
+0x1F, 0x73,
+
+0x38, 0x38, 0x40, 0xAF,
+0x30, 0x30, 0x40, 0xAF,
+
+0x24, 0x1F, 0x24, 0xDF,
+0x1D, 0x32, 0x20, 0xE9,
+
+0x2C, 0x1F, 0x2C, 0xDF,
+0x1A, 0x33, 0x20, 0xE9,
+
+0xB0, 0x10,
+0x08, 0xE3,
+0x40, 0x10,
+0xB8, 0x10,
+
+0x26, 0xF0, 0x30, 0xCD,
+0x2F, 0xF0, 0x38, 0xCD,
+
+0x2B, 0x80, 0x20, 0xE9,
+0x2A, 0x80, 0x20, 0xE9,
+
+0xA6, 0x20,
+0x88, 0xE2,
+0x00, 0xE0,
+0xAF, 0x20,
+
+0x28, 0x2A, 0x26, 0xAF,
+0x20, 0x2A, 0xC0, 0xAF,
+
+0x34, 0x1F, 0x34, 0xDF,
+0x46, 0x24, 0x46, 0xDF,
+
+0x28, 0x30, 0x80, 0xBF,
+0x20, 0x38, 0x80, 0xBF,
+
+0x47, 0x24, 0x47, 0xDF,
+0x4E, 0x2C, 0x4E, 0xDF,
+
+0x4F, 0x2C, 0x4F, 0xDF,
+0x56, 0x34, 0x56, 0xDF,
+
+0x28, 0x15, 0x28, 0xDF,
+0x20, 0x1D, 0x20, 0xDF,
+
+0x57, 0x34, 0x57, 0xDF,
+0x00, 0xE0,
+0x1D, 0x05,
+
+0x04, 0x80, 0x10, 0xEA,
+0x89, 0xE2,
+0x2B, 0x30,
+
+0x3F, 0xC1, 0x1D, 0xBD,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0xA0, 0x68,
+0xBF, 0x25,
+0x00, 0x80, 0x00, 0xE8,
+
+0x20, 0xC0, 0x20, 0xAF,
+0x28, 0x05,
+0x97, 0x74,
+
+0x00, 0xE0,
+0x2A, 0x10,
+0x16, 0xC0, 0x20, 0xE9,
+
+0x04, 0x80, 0x10, 0xEA,
+0x8C, 0xE2,
+0x95, 0x05,
+
+0x28, 0xC1, 0x28, 0xAD,
+0x1F, 0xC1, 0x15, 0xBD,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0xA8, 0x67,
+0x9F, 0x6B,
+0x00, 0x80, 0x00, 0xE8,
+
+0x28, 0xC0, 0x28, 0xAD,
+0x1D, 0x25,
+0x20, 0x05,
+
+0x28, 0x32, 0x80, 0xAD,
+0x40, 0x2A, 0x40, 0xBD,
+
+0x1C, 0x80, 0x20, 0xE9,
+0x20, 0x33, 0x20, 0xAD,
+
+0x20, 0x73,
+0x00, 0xE0,
+0xB6, 0x49, 0x51, 0xBB,
+
+0x26, 0x2F, 0xB0, 0xE8,
+0x19, 0x20, 0x20, 0xE9,
+
+0x35, 0x20, 0x35, 0xDF,
+0x3D, 0x20, 0x3D, 0xDF,
+
+0x15, 0x20, 0x15, 0xDF,
+0x1D, 0x20, 0x1D, 0xDF,
+
+0x26, 0xD0, 0x26, 0xCD,
+0x29, 0x49, 0x2A, 0xB8,
+
+0x26, 0x40, 0x80, 0xBD,
+0x3B, 0x48, 0x50, 0xBD,
+
+0x3E, 0x54, 0x57, 0x9F,
+0x00, 0xE0,
+0x82, 0xE1,
+
+0x1E, 0xAF, 0x59, 0x9F,
+0x00, 0x80, 0x00, 0xE8,
+
+0x26, 0x30,
+0x29, 0x30,
+0x48, 0x3C, 0x48, 0xAD,
+
+0x2B, 0x72,
+0xC2, 0xE1,
+0x2C, 0xC0, 0x44, 0xC2,
+
+0x05, 0x24, 0x34, 0xBF,
+0x0D, 0x24, 0x2C, 0xBF,
+
+0x2D, 0x46, 0x4E, 0xBF,
+0x25, 0x46, 0x56, 0xBF,
+
+0x20, 0x1D, 0x6F, 0x8F,
+0x32, 0x3E, 0x5F, 0xE9,
+
+0x3E, 0x50, 0x56, 0x9F,
+0x00, 0xE0,
+0x3B, 0x30,
+
+0x1E, 0x8F, 0x51, 0x9F,
+0x33, 0x1E, 0x5F, 0xE9,
+
+0x05, 0x44, 0x54, 0xB2,
+0x0D, 0x44, 0x4C, 0xB2,
+
+0x19, 0xC0, 0xB0, 0xE8,
+0x34, 0xC0, 0x44, 0xC4,
+
+0x33, 0x73,
+0x00, 0xE0,
+0x3E, 0x62, 0x57, 0x9F,
+
+0x1E, 0xAF, 0x59, 0x9F,
+0x00, 0xE0,
+0x0D, 0x20,
+
+0x84, 0x3E, 0x58, 0xE9,
+0x28, 0x1D, 0x6F, 0x8F,
+
+0x05, 0x20,
+0x00, 0xE0,
+0x85, 0x1E, 0x58, 0xE9,
+
+0x9B, 0x3B, 0x33, 0xDF,
+0x20, 0x20, 0x42, 0xAF,
+
+0x30, 0x42, 0x56, 0x9F,
+0x80, 0x3E, 0x57, 0xE9,
+
+0x3F, 0x8F, 0x51, 0x9F,
+0x30, 0x80, 0x5F, 0xE9,
+
+0x28, 0x28, 0x24, 0xAF,
+0x81, 0x1E, 0x57, 0xE9,
+
+0x05, 0x47, 0x57, 0xBF,
+0x0D, 0x47, 0x4F, 0xBF,
+
+0x88, 0x80, 0x58, 0xE9,
+0x1B, 0x29, 0x1B, 0xDF,
+
+0x30, 0x1D, 0x6F, 0x8F,
+0x3A, 0x30, 0x4F, 0xE9,
+
+0x1C, 0x30, 0x26, 0xDF,
+0x09, 0xE3,
+0x3B, 0x05,
+
+0x3E, 0x50, 0x56, 0x9F,
+0x3B, 0x3F, 0x4F, 0xE9,
+
+0x1E, 0x8F, 0x51, 0x9F,
+0x00, 0xE0,
+0xAC, 0x20,
+
+0x2D, 0x44, 0x4C, 0xB4,
+0x2C, 0x1C, 0xC0, 0xAF,
+
+0x25, 0x44, 0x54, 0xB4,
+0x00, 0xE0,
+0xC8, 0x30,
+
+0x30, 0x46, 0x30, 0xAF,
+0x1B, 0x1B, 0x48, 0xAF,
+
+0x00, 0xE0,
+0x25, 0x20,
+0x38, 0x2C, 0x4F, 0xE9,
+
+0x86, 0x80, 0x57, 0xE9,
+0x38, 0x1D, 0x6F, 0x8F,
+
+0x28, 0x74,
+0x00, 0xE0,
+0x0D, 0x44, 0x4C, 0xB0,
+
+0x05, 0x44, 0x54, 0xB0,
+0x2D, 0x20,
+0x9B, 0x10,
+
+0x82, 0x3E, 0x57, 0xE9,
+0x32, 0xF0, 0x1B, 0xCD,
+
+0x1E, 0xBD, 0x59, 0x9F,
+0x83, 0x1E, 0x57, 0xE9,
+
+0x38, 0x47, 0x38, 0xAF,
+0x34, 0x20,
+0x2A, 0x30,
+
+0x00, 0xE0,
+0x0D, 0x20,
+0x32, 0x20,
+0x05, 0x20,
+
+0x87, 0x80, 0x57, 0xE9,
+0x1F, 0x54, 0x57, 0x9F,
+
+0x17, 0x42, 0x56, 0x9F,
+0x00, 0xE0,
+0x3B, 0x6A,
+
+0x3F, 0x8F, 0x51, 0x9F,
+0x37, 0x1E, 0x4F, 0xE9,
+
+0x37, 0x32, 0x2A, 0xAF,
+0x00, 0xE0,
+0x32, 0x00,
+
+0x00, 0x80, 0x00, 0xE8,
+0x27, 0xC0, 0x44, 0xC0,
+
+0x36, 0x1F, 0x4F, 0xE9,
+0x1F, 0x1F, 0x26, 0xDF,
+
+0x37, 0x1B, 0x37, 0xBF,
+0x17, 0x26, 0x17, 0xDF,
+
+0x3E, 0x17, 0x4F, 0xE9,
+0x3F, 0x3F, 0x4F, 0xE9,
+
+0x34, 0x1F, 0x34, 0xAF,
+0x2B, 0x05,
+0xA7, 0x20,
+
+0x33, 0x2B, 0x37, 0xDF,
+0x27, 0x17, 0xC0, 0xAF,
+
+0x34, 0x80, 0x4F, 0xE9,
+0x00, 0x80, 0x00, 0xE8,
+
+0x03, 0x80, 0x0A, 0xEA,
+0x17, 0xC1, 0x2B, 0xBD,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0xB3, 0x68,
+0x97, 0x25,
+0x00, 0x80, 0x00, 0xE8,
+
+0x33, 0xC0, 0x33, 0xAF,
+0x3C, 0x27, 0x4F, 0xE9,
+
+0x57, 0x39, 0x20, 0xE9,
+0x28, 0x19, 0x60, 0xEC,
+
+0x2B, 0x32, 0x20, 0xE9,
+0x1D, 0x3B, 0x20, 0xE9,
+
+0xB3, 0x05,
+0x00, 0xE0,
+0x16, 0x28, 0x20, 0xE9,
+
+0x23, 0x3B, 0x33, 0xAD,
+0x1E, 0x2B, 0x20, 0xE9,
+
+0x1C, 0x80, 0x20, 0xE9,
+0x57, 0x36, 0x20, 0xE9,
+
+0x00, 0x80, 0xA0, 0xE9,
+0x40, 0x40, 0xD8, 0xEC,
+
+0xFF, 0x80, 0xC0, 0xE9,
+0x90, 0xE2,
+0x00, 0xE0,
+
+0x85, 0xFF, 0x20, 0xEA,
+0x19, 0xC8, 0xC1, 0xCD,
+
+0x1F, 0xD7, 0x18, 0xBD,
+0x3F, 0xD7, 0x22, 0xBD,
+
+0x9F, 0x41, 0x49, 0xBD,
+0x00, 0x80, 0x00, 0xE8,
+
+0x25, 0x41, 0x49, 0xBD,
+0x2D, 0x41, 0x51, 0xBD,
+
+0x0D, 0x80, 0x07, 0xEA,
+0x00, 0x80, 0x00, 0xE8,
+
+0x35, 0x40, 0x48, 0xBD,
+0x3D, 0x40, 0x50, 0xBD,
+
+0x00, 0x80, 0x00, 0xE8,
+0x25, 0x30,
+0x2D, 0x30,
+
+0x35, 0x30,
+0xB5, 0x30,
+0xBD, 0x30,
+0x3D, 0x30,
+
+0x9C, 0xA7, 0x5B, 0x9F,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x84, 0xFF, 0x0A, 0xEA,
+0x00, 0x80, 0x00, 0xE8,
+
+0xC9, 0x41, 0xC8, 0xEC,
+0x42, 0xE1,
+0x00, 0xE0,
+
+0x82, 0xFF, 0x20, 0xEA,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0xC8, 0x40, 0xC0, 0xEC,
+0x00, 0x80, 0x00, 0xE8,
+
+0x7F, 0xFF, 0x20, 0xEA,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+};
+
+static unsigned char warp_g200_tgza[] = {
+
+0x00, 0x98, 0xA0, 0xE9,
+0x40, 0x40, 0xD8, 0xEC,
+
+0xFF, 0x80, 0xC0, 0xE9,
+0x00, 0x80, 0x00, 0xE8,
+
+0x1F, 0xD7, 0x18, 0xBD,
+0x3F, 0xD7, 0x22, 0xBD,
+
+0x81, 0x04,
+0x89, 0x04,
+0x01, 0x04,
+0x09, 0x04,
+
+0xC9, 0x41, 0xC0, 0xEC,
+0x11, 0x04,
+0x00, 0xE0,
+
+0x41, 0xCC, 0x41, 0xCD,
+0x49, 0xCC, 0x49, 0xCD,
+
+0xD1, 0x41, 0xC0, 0xEC,
+0x51, 0xCC, 0x51, 0xCD,
+
+0x80, 0x04,
+0x10, 0x04,
+0x08, 0x04,
+0x00, 0xE0,
+
+0x00, 0xCC, 0xC0, 0xCD,
+0xD1, 0x49, 0xC0, 0xEC,
+
+0x8A, 0x1F, 0x20, 0xE9,
+0x8B, 0x3F, 0x20, 0xE9,
+
+0x41, 0x3C, 0x41, 0xAD,
+0x49, 0x3C, 0x49, 0xAD,
+
+0x10, 0xCC, 0x10, 0xCD,
+0x08, 0xCC, 0x08, 0xCD,
+
+0xB9, 0x41, 0x49, 0xBB,
+0x1F, 0xF0, 0x41, 0xCD,
+
+0x51, 0x3C, 0x51, 0xAD,
+0x00, 0x98, 0x80, 0xE9,
+
+0x7D, 0x80, 0x07, 0xEA,
+0x24, 0x1F, 0x20, 0xE9,
+
+0x15, 0x41, 0x49, 0xBD,
+0x1D, 0x41, 0x51, 0xBD,
+
+0x2E, 0x41, 0x2A, 0xB8,
+0x34, 0x53, 0xA0, 0xE8,
+
+0x15, 0x30,
+0x1D, 0x30,
+0x58, 0xE3,
+0x00, 0xE0,
+
+0xB5, 0x40, 0x48, 0xBD,
+0x3D, 0x40, 0x50, 0xBD,
+
+0x24, 0x43, 0xA0, 0xE8,
+0x2C, 0x4B, 0xA0, 0xE8,
+
+0x15, 0x72,
+0x09, 0xE3,
+0x00, 0xE0,
+0x1D, 0x72,
+
+0x35, 0x30,
+0xB5, 0x30,
+0xBD, 0x30,
+0x3D, 0x30,
+
+0x9C, 0x97, 0x57, 0x9F,
+0x00, 0x80, 0x00, 0xE8,
+
+0x6C, 0x64, 0xC8, 0xEC,
+0x98, 0xE1,
+0xB5, 0x05,
+
+0xBD, 0x05,
+0x2E, 0x30,
+0x32, 0xC0, 0xA0, 0xE8,
+
+0x33, 0xC0, 0xA0, 0xE8,
+0x74, 0x64, 0xC8, 0xEC,
+
+0x40, 0x3C, 0x40, 0xAD,
+0x32, 0x6A,
+0x2A, 0x30,
+
+0x20, 0x73,
+0x33, 0x6A,
+0x00, 0xE0,
+0x28, 0x73,
+
+0x1C, 0x72,
+0x83, 0xE2,
+0x6B, 0x80, 0x15, 0xEA,
+
+0xB8, 0x3D, 0x28, 0xDF,
+0x30, 0x35, 0x20, 0xDF,
+
+0x40, 0x30,
+0x00, 0xE0,
+0xCC, 0xE2,
+0x64, 0x72,
+
+0x25, 0x42, 0x52, 0xBF,
+0x2D, 0x42, 0x4A, 0xBF,
+
+0x30, 0x2E, 0x30, 0xDF,
+0x38, 0x2E, 0x38, 0xDF,
+
+0x18, 0x1D, 0x45, 0xE9,
+0x1E, 0x15, 0x45, 0xE9,
+
+0x2B, 0x49, 0x51, 0xBD,
+0x00, 0xE0,
+0x1F, 0x73,
+
+0x38, 0x38, 0x40, 0xAF,
+0x30, 0x30, 0x40, 0xAF,
+
+0x24, 0x1F, 0x24, 0xDF,
+0x1D, 0x32, 0x20, 0xE9,
+
+0x2C, 0x1F, 0x2C, 0xDF,
+0x1A, 0x33, 0x20, 0xE9,
+
+0xB0, 0x10,
+0x08, 0xE3,
+0x40, 0x10,
+0xB8, 0x10,
+
+0x26, 0xF0, 0x30, 0xCD,
+0x2F, 0xF0, 0x38, 0xCD,
+
+0x2B, 0x80, 0x20, 0xE9,
+0x2A, 0x80, 0x20, 0xE9,
+
+0xA6, 0x20,
+0x88, 0xE2,
+0x00, 0xE0,
+0xAF, 0x20,
+
+0x28, 0x2A, 0x26, 0xAF,
+0x20, 0x2A, 0xC0, 0xAF,
+
+0x34, 0x1F, 0x34, 0xDF,
+0x46, 0x24, 0x46, 0xDF,
+
+0x28, 0x30, 0x80, 0xBF,
+0x20, 0x38, 0x80, 0xBF,
+
+0x47, 0x24, 0x47, 0xDF,
+0x4E, 0x2C, 0x4E, 0xDF,
+
+0x4F, 0x2C, 0x4F, 0xDF,
+0x56, 0x34, 0x56, 0xDF,
+
+0x28, 0x15, 0x28, 0xDF,
+0x20, 0x1D, 0x20, 0xDF,
+
+0x57, 0x34, 0x57, 0xDF,
+0x00, 0xE0,
+0x1D, 0x05,
+
+0x04, 0x80, 0x10, 0xEA,
+0x89, 0xE2,
+0x2B, 0x30,
+
+0x3F, 0xC1, 0x1D, 0xBD,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0xA0, 0x68,
+0xBF, 0x25,
+0x00, 0x80, 0x00, 0xE8,
+
+0x20, 0xC0, 0x20, 0xAF,
+0x28, 0x05,
+0x97, 0x74,
+
+0x00, 0xE0,
+0x2A, 0x10,
+0x16, 0xC0, 0x20, 0xE9,
+
+0x04, 0x80, 0x10, 0xEA,
+0x8C, 0xE2,
+0x95, 0x05,
+
+0x28, 0xC1, 0x28, 0xAD,
+0x1F, 0xC1, 0x15, 0xBD,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0xA8, 0x67,
+0x9F, 0x6B,
+0x00, 0x80, 0x00, 0xE8,
+
+0x28, 0xC0, 0x28, 0xAD,
+0x1D, 0x25,
+0x20, 0x05,
+
+0x28, 0x32, 0x80, 0xAD,
+0x40, 0x2A, 0x40, 0xBD,
+
+0x1C, 0x80, 0x20, 0xE9,
+0x20, 0x33, 0x20, 0xAD,
+
+0x20, 0x73,
+0x00, 0xE0,
+0xB6, 0x49, 0x51, 0xBB,
+
+0x26, 0x2F, 0xB0, 0xE8,
+0x19, 0x20, 0x20, 0xE9,
+
+0x35, 0x20, 0x35, 0xDF,
+0x3D, 0x20, 0x3D, 0xDF,
+
+0x15, 0x20, 0x15, 0xDF,
+0x1D, 0x20, 0x1D, 0xDF,
+
+0x26, 0xD0, 0x26, 0xCD,
+0x29, 0x49, 0x2A, 0xB8,
+
+0x26, 0x40, 0x80, 0xBD,
+0x3B, 0x48, 0x50, 0xBD,
+
+0x3E, 0x54, 0x57, 0x9F,
+0x00, 0xE0,
+0x82, 0xE1,
+
+0x1E, 0xAF, 0x59, 0x9F,
+0x00, 0x80, 0x00, 0xE8,
+
+0x26, 0x30,
+0x29, 0x30,
+0x48, 0x3C, 0x48, 0xAD,
+
+0x2B, 0x72,
+0xC2, 0xE1,
+0x2C, 0xC0, 0x44, 0xC2,
+
+0x05, 0x24, 0x34, 0xBF,
+0x0D, 0x24, 0x2C, 0xBF,
+
+0x2D, 0x46, 0x4E, 0xBF,
+0x25, 0x46, 0x56, 0xBF,
+
+0x20, 0x1D, 0x6F, 0x8F,
+0x32, 0x3E, 0x5F, 0xE9,
+
+0x3E, 0x50, 0x56, 0x9F,
+0x00, 0xE0,
+0x3B, 0x30,
+
+0x1E, 0x8F, 0x51, 0x9F,
+0x33, 0x1E, 0x5F, 0xE9,
+
+0x05, 0x44, 0x54, 0xB2,
+0x0D, 0x44, 0x4C, 0xB2,
+
+0x19, 0xC0, 0xB0, 0xE8,
+0x34, 0xC0, 0x44, 0xC4,
+
+0x33, 0x73,
+0x00, 0xE0,
+0x3E, 0x62, 0x57, 0x9F,
+
+0x1E, 0xAF, 0x59, 0x9F,
+0x00, 0xE0,
+0x0D, 0x20,
+
+0x84, 0x3E, 0x58, 0xE9,
+0x28, 0x1D, 0x6F, 0x8F,
+
+0x05, 0x20,
+0x00, 0xE0,
+0x85, 0x1E, 0x58, 0xE9,
+
+0x9B, 0x3B, 0x33, 0xDF,
+0x20, 0x20, 0x42, 0xAF,
+
+0x30, 0x42, 0x56, 0x9F,
+0x80, 0x3E, 0x57, 0xE9,
+
+0x3F, 0x8F, 0x51, 0x9F,
+0x30, 0x80, 0x5F, 0xE9,
+
+0x28, 0x28, 0x24, 0xAF,
+0x81, 0x1E, 0x57, 0xE9,
+
+0x05, 0x47, 0x57, 0xBF,
+0x0D, 0x47, 0x4F, 0xBF,
+
+0x88, 0x80, 0x58, 0xE9,
+0x1B, 0x29, 0x1B, 0xDF,
+
+0x30, 0x1D, 0x6F, 0x8F,
+0x3A, 0x30, 0x4F, 0xE9,
+
+0x1C, 0x30, 0x26, 0xDF,
+0x09, 0xE3,
+0x3B, 0x05,
+
+0x3E, 0x50, 0x56, 0x9F,
+0x3B, 0x3F, 0x4F, 0xE9,
+
+0x1E, 0x8F, 0x51, 0x9F,
+0x00, 0xE0,
+0xAC, 0x20,
+
+0x2D, 0x44, 0x4C, 0xB4,
+0x2C, 0x1C, 0xC0, 0xAF,
+
+0x25, 0x44, 0x54, 0xB4,
+0x00, 0xE0,
+0xC8, 0x30,
+
+0x30, 0x46, 0x30, 0xAF,
+0x1B, 0x1B, 0x48, 0xAF,
+
+0x00, 0xE0,
+0x25, 0x20,
+0x38, 0x2C, 0x4F, 0xE9,
+
+0x86, 0x80, 0x57, 0xE9,
+0x38, 0x1D, 0x6F, 0x8F,
+
+0x28, 0x74,
+0x00, 0xE0,
+0x0D, 0x44, 0x4C, 0xB0,
+
+0x05, 0x44, 0x54, 0xB0,
+0x2D, 0x20,
+0x9B, 0x10,
+
+0x82, 0x3E, 0x57, 0xE9,
+0x32, 0xF0, 0x1B, 0xCD,
+
+0x1E, 0xBD, 0x59, 0x9F,
+0x83, 0x1E, 0x57, 0xE9,
+
+0x38, 0x47, 0x38, 0xAF,
+0x34, 0x20,
+0x2A, 0x30,
+
+0x00, 0xE0,
+0x0D, 0x20,
+0x32, 0x20,
+0x05, 0x20,
+
+0x87, 0x80, 0x57, 0xE9,
+0x1F, 0x54, 0x57, 0x9F,
+
+0x17, 0x42, 0x56, 0x9F,
+0x00, 0xE0,
+0x3B, 0x6A,
+
+0x3F, 0x8F, 0x51, 0x9F,
+0x37, 0x1E, 0x4F, 0xE9,
+
+0x37, 0x32, 0x2A, 0xAF,
+0x00, 0xE0,
+0x32, 0x00,
+
+0x00, 0x80, 0x00, 0xE8,
+0x27, 0xC0, 0x44, 0xC0,
+
+0x36, 0x1F, 0x4F, 0xE9,
+0x1F, 0x1F, 0x26, 0xDF,
+
+0x37, 0x1B, 0x37, 0xBF,
+0x17, 0x26, 0x17, 0xDF,
+
+0x3E, 0x17, 0x4F, 0xE9,
+0x3F, 0x3F, 0x4F, 0xE9,
+
+0x34, 0x1F, 0x34, 0xAF,
+0x2B, 0x05,
+0xA7, 0x20,
+
+0x33, 0x2B, 0x37, 0xDF,
+0x27, 0x17, 0xC0, 0xAF,
+
+0x34, 0x80, 0x4F, 0xE9,
+0x00, 0x80, 0x00, 0xE8,
+
+0x2D, 0x44, 0x4C, 0xB6,
+0x25, 0x44, 0x54, 0xB6,
+
+0x03, 0x80, 0x2A, 0xEA,
+0x17, 0xC1, 0x2B, 0xBD,
+
+0x2D, 0x20,
+0x25, 0x20,
+0x07, 0xC0, 0x44, 0xC6,
+
+0xB3, 0x68,
+0x97, 0x25,
+0x00, 0x80, 0x00, 0xE8,
+
+0x33, 0xC0, 0x33, 0xAF,
+0x3C, 0x27, 0x4F, 0xE9,
+
+0x1F, 0x62, 0x57, 0x9F,
+0x00, 0x80, 0x00, 0xE8,
+
+0x3F, 0x3D, 0x5D, 0x9F,
+0x00, 0xE0,
+0x07, 0x20,
+
+0x00, 0x80, 0x00, 0xE8,
+0x28, 0x19, 0x60, 0xEC,
+
+0xB3, 0x05,
+0x00, 0xE0,
+0x00, 0x80, 0x00, 0xE8,
+
+0x23, 0x3B, 0x33, 0xAD,
+0x00, 0x80, 0x00, 0xE8,
+
+0x1F, 0x26, 0x1F, 0xDF,
+0x9D, 0x1F, 0x4F, 0xE9,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x9E, 0x3F, 0x4F, 0xE9,
+
+0x07, 0x07, 0x1F, 0xAF,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x9C, 0x80, 0x4F, 0xE9,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x57, 0x39, 0x20, 0xE9,
+
+0x16, 0x28, 0x20, 0xE9,
+0x1D, 0x3B, 0x20, 0xE9,
+
+0x1E, 0x2B, 0x20, 0xE9,
+0x2B, 0x32, 0x20, 0xE9,
+
+0x1C, 0x23, 0x20, 0xE9,
+0x57, 0x36, 0x20, 0xE9,
+
+0x00, 0x80, 0xA0, 0xE9,
+0x40, 0x40, 0xD8, 0xEC,
+
+0xFF, 0x80, 0xC0, 0xE9,
+0x90, 0xE2,
+0x00, 0xE0,
+
+0x7A, 0xFF, 0x20, 0xEA,
+0x19, 0xC8, 0xC1, 0xCD,
+
+0x1F, 0xD7, 0x18, 0xBD,
+0x3F, 0xD7, 0x22, 0xBD,
+
+0x9F, 0x41, 0x49, 0xBD,
+0x00, 0x80, 0x00, 0xE8,
+
+0x25, 0x41, 0x49, 0xBD,
+0x2D, 0x41, 0x51, 0xBD,
+
+0x0D, 0x80, 0x07, 0xEA,
+0x00, 0x80, 0x00, 0xE8,
+
+0x35, 0x40, 0x48, 0xBD,
+0x3D, 0x40, 0x50, 0xBD,
+
+0x00, 0x80, 0x00, 0xE8,
+0x25, 0x30,
+0x2D, 0x30,
+
+0x35, 0x30,
+0xB5, 0x30,
+0xBD, 0x30,
+0x3D, 0x30,
+
+0x9C, 0xA7, 0x5B, 0x9F,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x79, 0xFF, 0x0A, 0xEA,
+0x00, 0x80, 0x00, 0xE8,
+
+0xC9, 0x41, 0xC8, 0xEC,
+0x42, 0xE1,
+0x00, 0xE0,
+
+0x77, 0xFF, 0x20, 0xEA,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0xC8, 0x40, 0xC0, 0xEC,
+0x00, 0x80, 0x00, 0xE8,
+
+0x74, 0xFF, 0x20, 0xEA,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+};
+
+static unsigned char warp_g200_tgzaf[] = {
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x98, 0xA0, 0xE9,
+0x40, 0x40, 0xD8, 0xEC,
+
+0xFF, 0x80, 0xC0, 0xE9,
+0x00, 0x80, 0x00, 0xE8,
+
+0x1F, 0xD7, 0x18, 0xBD,
+0x3F, 0xD7, 0x22, 0xBD,
+
+0x81, 0x04,
+0x89, 0x04,
+0x01, 0x04,
+0x09, 0x04,
+
+0xC9, 0x41, 0xC0, 0xEC,
+0x11, 0x04,
+0x00, 0xE0,
+
+0x41, 0xCC, 0x41, 0xCD,
+0x49, 0xCC, 0x49, 0xCD,
+
+0xD1, 0x41, 0xC0, 0xEC,
+0x51, 0xCC, 0x51, 0xCD,
+
+0x80, 0x04,
+0x10, 0x04,
+0x08, 0x04,
+0x00, 0xE0,
+
+0x00, 0xCC, 0xC0, 0xCD,
+0xD1, 0x49, 0xC0, 0xEC,
+
+0x8A, 0x1F, 0x20, 0xE9,
+0x8B, 0x3F, 0x20, 0xE9,
+
+0x41, 0x3C, 0x41, 0xAD,
+0x49, 0x3C, 0x49, 0xAD,
+
+0x10, 0xCC, 0x10, 0xCD,
+0x08, 0xCC, 0x08, 0xCD,
+
+0xB9, 0x41, 0x49, 0xBB,
+0x1F, 0xF0, 0x41, 0xCD,
+
+0x51, 0x3C, 0x51, 0xAD,
+0x00, 0x98, 0x80, 0xE9,
+
+0x83, 0x80, 0x07, 0xEA,
+0x24, 0x1F, 0x20, 0xE9,
+
+0x21, 0x45, 0x80, 0xE8,
+0x1A, 0x4D, 0x80, 0xE8,
+
+0x31, 0x55, 0x80, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x15, 0x41, 0x49, 0xBD,
+0x1D, 0x41, 0x51, 0xBD,
+
+0x2E, 0x41, 0x2A, 0xB8,
+0x34, 0x53, 0xA0, 0xE8,
+
+0x15, 0x30,
+0x1D, 0x30,
+0x58, 0xE3,
+0x00, 0xE0,
+
+0xB5, 0x40, 0x48, 0xBD,
+0x3D, 0x40, 0x50, 0xBD,
+
+0x24, 0x43, 0xA0, 0xE8,
+0x2C, 0x4B, 0xA0, 0xE8,
+
+0x15, 0x72,
+0x09, 0xE3,
+0x00, 0xE0,
+0x1D, 0x72,
+
+0x35, 0x30,
+0xB5, 0x30,
+0xBD, 0x30,
+0x3D, 0x30,
+
+0x9C, 0x97, 0x57, 0x9F,
+0x00, 0x80, 0x00, 0xE8,
+
+0x6C, 0x64, 0xC8, 0xEC,
+0x98, 0xE1,
+0xB5, 0x05,
+
+0xBD, 0x05,
+0x2E, 0x30,
+0x32, 0xC0, 0xA0, 0xE8,
+
+0x33, 0xC0, 0xA0, 0xE8,
+0x74, 0x64, 0xC8, 0xEC,
+
+0x40, 0x3C, 0x40, 0xAD,
+0x32, 0x6A,
+0x2A, 0x30,
+
+0x20, 0x73,
+0x33, 0x6A,
+0x00, 0xE0,
+0x28, 0x73,
+
+0x1C, 0x72,
+0x83, 0xE2,
+0x6F, 0x80, 0x15, 0xEA,
+
+0xB8, 0x3D, 0x28, 0xDF,
+0x30, 0x35, 0x20, 0xDF,
+
+0x40, 0x30,
+0x00, 0xE0,
+0xCC, 0xE2,
+0x64, 0x72,
+
+0x25, 0x42, 0x52, 0xBF,
+0x2D, 0x42, 0x4A, 0xBF,
+
+0x30, 0x2E, 0x30, 0xDF,
+0x38, 0x2E, 0x38, 0xDF,
+
+0x18, 0x1D, 0x45, 0xE9,
+0x1E, 0x15, 0x45, 0xE9,
+
+0x2B, 0x49, 0x51, 0xBD,
+0x00, 0xE0,
+0x1F, 0x73,
+
+0x38, 0x38, 0x40, 0xAF,
+0x30, 0x30, 0x40, 0xAF,
+
+0x24, 0x1F, 0x24, 0xDF,
+0x1D, 0x32, 0x20, 0xE9,
+
+0x2C, 0x1F, 0x2C, 0xDF,
+0x1A, 0x33, 0x20, 0xE9,
+
+0xB0, 0x10,
+0x08, 0xE3,
+0x40, 0x10,
+0xB8, 0x10,
+
+0x26, 0xF0, 0x30, 0xCD,
+0x2F, 0xF0, 0x38, 0xCD,
+
+0x2B, 0x80, 0x20, 0xE9,
+0x2A, 0x80, 0x20, 0xE9,
+
+0xA6, 0x20,
+0x88, 0xE2,
+0x00, 0xE0,
+0xAF, 0x20,
+
+0x28, 0x2A, 0x26, 0xAF,
+0x20, 0x2A, 0xC0, 0xAF,
+
+0x34, 0x1F, 0x34, 0xDF,
+0x46, 0x24, 0x46, 0xDF,
+
+0x28, 0x30, 0x80, 0xBF,
+0x20, 0x38, 0x80, 0xBF,
+
+0x47, 0x24, 0x47, 0xDF,
+0x4E, 0x2C, 0x4E, 0xDF,
+
+0x4F, 0x2C, 0x4F, 0xDF,
+0x56, 0x34, 0x56, 0xDF,
+
+0x28, 0x15, 0x28, 0xDF,
+0x20, 0x1D, 0x20, 0xDF,
+
+0x57, 0x34, 0x57, 0xDF,
+0x00, 0xE0,
+0x1D, 0x05,
+
+0x04, 0x80, 0x10, 0xEA,
+0x89, 0xE2,
+0x2B, 0x30,
+
+0x3F, 0xC1, 0x1D, 0xBD,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0xA0, 0x68,
+0xBF, 0x25,
+0x00, 0x80, 0x00, 0xE8,
+
+0x20, 0xC0, 0x20, 0xAF,
+0x28, 0x05,
+0x97, 0x74,
+
+0x00, 0xE0,
+0x2A, 0x10,
+0x16, 0xC0, 0x20, 0xE9,
+
+0x04, 0x80, 0x10, 0xEA,
+0x8C, 0xE2,
+0x95, 0x05,
+
+0x28, 0xC1, 0x28, 0xAD,
+0x1F, 0xC1, 0x15, 0xBD,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0xA8, 0x67,
+0x9F, 0x6B,
+0x00, 0x80, 0x00, 0xE8,
+
+0x28, 0xC0, 0x28, 0xAD,
+0x1D, 0x25,
+0x20, 0x05,
+
+0x28, 0x32, 0x80, 0xAD,
+0x40, 0x2A, 0x40, 0xBD,
+
+0x1C, 0x80, 0x20, 0xE9,
+0x20, 0x33, 0x20, 0xAD,
+
+0x20, 0x73,
+0x00, 0xE0,
+0xB6, 0x49, 0x51, 0xBB,
+
+0x26, 0x2F, 0xB0, 0xE8,
+0x19, 0x20, 0x20, 0xE9,
+
+0x35, 0x20, 0x35, 0xDF,
+0x3D, 0x20, 0x3D, 0xDF,
+
+0x15, 0x20, 0x15, 0xDF,
+0x1D, 0x20, 0x1D, 0xDF,
+
+0x26, 0xD0, 0x26, 0xCD,
+0x29, 0x49, 0x2A, 0xB8,
+
+0x26, 0x40, 0x80, 0xBD,
+0x3B, 0x48, 0x50, 0xBD,
+
+0x3E, 0x54, 0x57, 0x9F,
+0x00, 0xE0,
+0x82, 0xE1,
+
+0x1E, 0xAF, 0x59, 0x9F,
+0x00, 0x80, 0x00, 0xE8,
+
+0x26, 0x30,
+0x29, 0x30,
+0x48, 0x3C, 0x48, 0xAD,
+
+0x2B, 0x72,
+0xC2, 0xE1,
+0x2C, 0xC0, 0x44, 0xC2,
+
+0x05, 0x24, 0x34, 0xBF,
+0x0D, 0x24, 0x2C, 0xBF,
+
+0x2D, 0x46, 0x4E, 0xBF,
+0x25, 0x46, 0x56, 0xBF,
+
+0x20, 0x1D, 0x6F, 0x8F,
+0x32, 0x3E, 0x5F, 0xE9,
+
+0x3E, 0x50, 0x56, 0x9F,
+0x00, 0xE0,
+0x3B, 0x30,
+
+0x1E, 0x8F, 0x51, 0x9F,
+0x33, 0x1E, 0x5F, 0xE9,
+
+0x05, 0x44, 0x54, 0xB2,
+0x0D, 0x44, 0x4C, 0xB2,
+
+0x19, 0xC0, 0xB0, 0xE8,
+0x34, 0xC0, 0x44, 0xC4,
+
+0x33, 0x73,
+0x00, 0xE0,
+0x3E, 0x62, 0x57, 0x9F,
+
+0x1E, 0xAF, 0x59, 0x9F,
+0x00, 0xE0,
+0x0D, 0x20,
+
+0x84, 0x3E, 0x58, 0xE9,
+0x28, 0x1D, 0x6F, 0x8F,
+
+0x05, 0x20,
+0x00, 0xE0,
+0x85, 0x1E, 0x58, 0xE9,
+
+0x9B, 0x3B, 0x33, 0xDF,
+0x20, 0x20, 0x42, 0xAF,
+
+0x30, 0x42, 0x56, 0x9F,
+0x80, 0x3E, 0x57, 0xE9,
+
+0x3F, 0x8F, 0x51, 0x9F,
+0x30, 0x80, 0x5F, 0xE9,
+
+0x28, 0x28, 0x24, 0xAF,
+0x81, 0x1E, 0x57, 0xE9,
+
+0x05, 0x47, 0x57, 0xBF,
+0x0D, 0x47, 0x4F, 0xBF,
+
+0x88, 0x80, 0x58, 0xE9,
+0x1B, 0x29, 0x1B, 0xDF,
+
+0x30, 0x1D, 0x6F, 0x8F,
+0x3A, 0x30, 0x4F, 0xE9,
+
+0x1C, 0x30, 0x26, 0xDF,
+0x09, 0xE3,
+0x3B, 0x05,
+
+0x3E, 0x50, 0x56, 0x9F,
+0x3B, 0x3F, 0x4F, 0xE9,
+
+0x1E, 0x8F, 0x51, 0x9F,
+0x00, 0xE0,
+0xAC, 0x20,
+
+0x2D, 0x44, 0x4C, 0xB4,
+0x2C, 0x1C, 0xC0, 0xAF,
+
+0x25, 0x44, 0x54, 0xB4,
+0x00, 0xE0,
+0xC8, 0x30,
+
+0x30, 0x46, 0x30, 0xAF,
+0x1B, 0x1B, 0x48, 0xAF,
+
+0x00, 0xE0,
+0x25, 0x20,
+0x38, 0x2C, 0x4F, 0xE9,
+
+0x86, 0x80, 0x57, 0xE9,
+0x38, 0x1D, 0x6F, 0x8F,
+
+0x28, 0x74,
+0x00, 0xE0,
+0x0D, 0x44, 0x4C, 0xB0,
+
+0x05, 0x44, 0x54, 0xB0,
+0x2D, 0x20,
+0x9B, 0x10,
+
+0x82, 0x3E, 0x57, 0xE9,
+0x32, 0xF0, 0x1B, 0xCD,
+
+0x1E, 0xBD, 0x59, 0x9F,
+0x83, 0x1E, 0x57, 0xE9,
+
+0x38, 0x47, 0x38, 0xAF,
+0x34, 0x20,
+0x2A, 0x30,
+
+0x00, 0xE0,
+0x0D, 0x20,
+0x32, 0x20,
+0x05, 0x20,
+
+0x87, 0x80, 0x57, 0xE9,
+0x1F, 0x54, 0x57, 0x9F,
+
+0x17, 0x42, 0x56, 0x9F,
+0x00, 0xE0,
+0x3B, 0x6A,
+
+0x3F, 0x8F, 0x51, 0x9F,
+0x37, 0x1E, 0x4F, 0xE9,
+
+0x37, 0x32, 0x2A, 0xAF,
+0x00, 0xE0,
+0x32, 0x00,
+
+0x00, 0x80, 0x00, 0xE8,
+0x27, 0xC0, 0x44, 0xC0,
+
+0x36, 0x1F, 0x4F, 0xE9,
+0x1F, 0x1F, 0x26, 0xDF,
+
+0x37, 0x1B, 0x37, 0xBF,
+0x17, 0x26, 0x17, 0xDF,
+
+0x3E, 0x17, 0x4F, 0xE9,
+0x3F, 0x3F, 0x4F, 0xE9,
+
+0x34, 0x1F, 0x34, 0xAF,
+0x2B, 0x05,
+0xA7, 0x20,
+
+0x33, 0x2B, 0x37, 0xDF,
+0x27, 0x17, 0xC0, 0xAF,
+
+0x34, 0x80, 0x4F, 0xE9,
+0x00, 0x80, 0x00, 0xE8,
+
+0x0D, 0x21, 0x1A, 0xB6,
+0x05, 0x21, 0x31, 0xB6,
+
+0x2D, 0x44, 0x4C, 0xB6,
+0x25, 0x44, 0x54, 0xB6,
+
+0x03, 0x80, 0x2A, 0xEA,
+0x17, 0xC1, 0x2B, 0xBD,
+
+0x0D, 0x20,
+0x05, 0x20,
+0x2F, 0xC0, 0x21, 0xC6,
+
+0xB3, 0x68,
+0x97, 0x25,
+0x00, 0x80, 0x00, 0xE8,
+
+0x33, 0xC0, 0x33, 0xAF,
+0x3C, 0x27, 0x4F, 0xE9,
+
+0x00, 0xE0,
+0x25, 0x20,
+0x07, 0xC0, 0x44, 0xC6,
+
+0x17, 0x50, 0x56, 0x9F,
+0x00, 0xE0,
+0x2D, 0x20,
+
+0x37, 0x0F, 0x5C, 0x9F,
+0x00, 0xE0,
+0x2F, 0x20,
+
+0x1F, 0x62, 0x57, 0x9F,
+0x00, 0xE0,
+0x07, 0x20,
+
+0x3F, 0x3D, 0x5D, 0x9F,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x28, 0x19, 0x60, 0xEC,
+
+0xB3, 0x05,
+0x00, 0xE0,
+0x17, 0x26, 0x17, 0xDF,
+
+0x23, 0x3B, 0x33, 0xAD,
+0x35, 0x17, 0x4F, 0xE9,
+
+0x1F, 0x26, 0x1F, 0xDF,
+0x9D, 0x1F, 0x4F, 0xE9,
+
+0x9E, 0x3F, 0x4F, 0xE9,
+0x39, 0x37, 0x4F, 0xE9,
+
+0x2F, 0x2F, 0x17, 0xAF,
+0x00, 0x80, 0x00, 0xE8,
+
+0x07, 0x07, 0x1F, 0xAF,
+0x00, 0x80, 0x00, 0xE8,
+
+0x31, 0x80, 0x4F, 0xE9,
+0x00, 0x80, 0x00, 0xE8,
+
+0x9C, 0x80, 0x4F, 0xE9,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x57, 0x39, 0x20, 0xE9,
+
+0x16, 0x28, 0x20, 0xE9,
+0x1D, 0x3B, 0x20, 0xE9,
+
+0x1E, 0x2B, 0x20, 0xE9,
+0x2B, 0x32, 0x20, 0xE9,
+
+0x1C, 0x23, 0x20, 0xE9,
+0x57, 0x36, 0x20, 0xE9,
+
+0x00, 0x80, 0xA0, 0xE9,
+0x40, 0x40, 0xD8, 0xEC,
+
+0xFF, 0x80, 0xC0, 0xE9,
+0x90, 0xE2,
+0x00, 0xE0,
+
+0x74, 0xFF, 0x20, 0xEA,
+0x19, 0xC8, 0xC1, 0xCD,
+
+0x1F, 0xD7, 0x18, 0xBD,
+0x3F, 0xD7, 0x22, 0xBD,
+
+0x9F, 0x41, 0x49, 0xBD,
+0x00, 0x80, 0x00, 0xE8,
+
+0x25, 0x41, 0x49, 0xBD,
+0x2D, 0x41, 0x51, 0xBD,
+
+0x0D, 0x80, 0x07, 0xEA,
+0x00, 0x80, 0x00, 0xE8,
+
+0x35, 0x40, 0x48, 0xBD,
+0x3D, 0x40, 0x50, 0xBD,
+
+0x00, 0x80, 0x00, 0xE8,
+0x25, 0x30,
+0x2D, 0x30,
+
+0x35, 0x30,
+0xB5, 0x30,
+0xBD, 0x30,
+0x3D, 0x30,
+
+0x9C, 0xA7, 0x5B, 0x9F,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x73, 0xFF, 0x0A, 0xEA,
+0x00, 0x80, 0x00, 0xE8,
+
+0xC9, 0x41, 0xC8, 0xEC,
+0x42, 0xE1,
+0x00, 0xE0,
+
+0x71, 0xFF, 0x20, 0xEA,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0xC8, 0x40, 0xC0, 0xEC,
+0x00, 0x80, 0x00, 0xE8,
+
+0x6E, 0xFF, 0x20, 0xEA,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+};
+
+static unsigned char warp_g200_tgzf[] = {
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x98, 0xA0, 0xE9,
+0x40, 0x40, 0xD8, 0xEC,
+
+0xFF, 0x80, 0xC0, 0xE9,
+0x00, 0x80, 0x00, 0xE8,
+
+0x1F, 0xD7, 0x18, 0xBD,
+0x3F, 0xD7, 0x22, 0xBD,
+
+0x81, 0x04,
+0x89, 0x04,
+0x01, 0x04,
+0x09, 0x04,
+
+0xC9, 0x41, 0xC0, 0xEC,
+0x11, 0x04,
+0x00, 0xE0,
+
+0x41, 0xCC, 0x41, 0xCD,
+0x49, 0xCC, 0x49, 0xCD,
+
+0xD1, 0x41, 0xC0, 0xEC,
+0x51, 0xCC, 0x51, 0xCD,
+
+0x80, 0x04,
+0x10, 0x04,
+0x08, 0x04,
+0x00, 0xE0,
+
+0x00, 0xCC, 0xC0, 0xCD,
+0xD1, 0x49, 0xC0, 0xEC,
+
+0x8A, 0x1F, 0x20, 0xE9,
+0x8B, 0x3F, 0x20, 0xE9,
+
+0x41, 0x3C, 0x41, 0xAD,
+0x49, 0x3C, 0x49, 0xAD,
+
+0x10, 0xCC, 0x10, 0xCD,
+0x08, 0xCC, 0x08, 0xCD,
+
+0xB9, 0x41, 0x49, 0xBB,
+0x1F, 0xF0, 0x41, 0xCD,
+
+0x51, 0x3C, 0x51, 0xAD,
+0x00, 0x98, 0x80, 0xE9,
+
+0x7F, 0x80, 0x07, 0xEA,
+0x24, 0x1F, 0x20, 0xE9,
+
+0x21, 0x45, 0x80, 0xE8,
+0x1A, 0x4D, 0x80, 0xE8,
+
+0x31, 0x55, 0x80, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x15, 0x41, 0x49, 0xBD,
+0x1D, 0x41, 0x51, 0xBD,
+
+0x2E, 0x41, 0x2A, 0xB8,
+0x34, 0x53, 0xA0, 0xE8,
+
+0x15, 0x30,
+0x1D, 0x30,
+0x58, 0xE3,
+0x00, 0xE0,
+
+0xB5, 0x40, 0x48, 0xBD,
+0x3D, 0x40, 0x50, 0xBD,
+
+0x24, 0x43, 0xA0, 0xE8,
+0x2C, 0x4B, 0xA0, 0xE8,
+
+0x15, 0x72,
+0x09, 0xE3,
+0x00, 0xE0,
+0x1D, 0x72,
+
+0x35, 0x30,
+0xB5, 0x30,
+0xBD, 0x30,
+0x3D, 0x30,
+
+0x9C, 0x97, 0x57, 0x9F,
+0x00, 0x80, 0x00, 0xE8,
+
+0x6C, 0x64, 0xC8, 0xEC,
+0x98, 0xE1,
+0xB5, 0x05,
+
+0xBD, 0x05,
+0x2E, 0x30,
+0x32, 0xC0, 0xA0, 0xE8,
+
+0x33, 0xC0, 0xA0, 0xE8,
+0x74, 0x64, 0xC8, 0xEC,
+
+0x40, 0x3C, 0x40, 0xAD,
+0x32, 0x6A,
+0x2A, 0x30,
+
+0x20, 0x73,
+0x33, 0x6A,
+0x00, 0xE0,
+0x28, 0x73,
+
+0x1C, 0x72,
+0x83, 0xE2,
+0x6B, 0x80, 0x15, 0xEA,
+
+0xB8, 0x3D, 0x28, 0xDF,
+0x30, 0x35, 0x20, 0xDF,
+
+0x40, 0x30,
+0x00, 0xE0,
+0xCC, 0xE2,
+0x64, 0x72,
+
+0x25, 0x42, 0x52, 0xBF,
+0x2D, 0x42, 0x4A, 0xBF,
+
+0x30, 0x2E, 0x30, 0xDF,
+0x38, 0x2E, 0x38, 0xDF,
+
+0x18, 0x1D, 0x45, 0xE9,
+0x1E, 0x15, 0x45, 0xE9,
+
+0x2B, 0x49, 0x51, 0xBD,
+0x00, 0xE0,
+0x1F, 0x73,
+
+0x38, 0x38, 0x40, 0xAF,
+0x30, 0x30, 0x40, 0xAF,
+
+0x24, 0x1F, 0x24, 0xDF,
+0x1D, 0x32, 0x20, 0xE9,
+
+0x2C, 0x1F, 0x2C, 0xDF,
+0x1A, 0x33, 0x20, 0xE9,
+
+0xB0, 0x10,
+0x08, 0xE3,
+0x40, 0x10,
+0xB8, 0x10,
+
+0x26, 0xF0, 0x30, 0xCD,
+0x2F, 0xF0, 0x38, 0xCD,
+
+0x2B, 0x80, 0x20, 0xE9,
+0x2A, 0x80, 0x20, 0xE9,
+
+0xA6, 0x20,
+0x88, 0xE2,
+0x00, 0xE0,
+0xAF, 0x20,
+
+0x28, 0x2A, 0x26, 0xAF,
+0x20, 0x2A, 0xC0, 0xAF,
+
+0x34, 0x1F, 0x34, 0xDF,
+0x46, 0x24, 0x46, 0xDF,
+
+0x28, 0x30, 0x80, 0xBF,
+0x20, 0x38, 0x80, 0xBF,
+
+0x47, 0x24, 0x47, 0xDF,
+0x4E, 0x2C, 0x4E, 0xDF,
+
+0x4F, 0x2C, 0x4F, 0xDF,
+0x56, 0x34, 0x56, 0xDF,
+
+0x28, 0x15, 0x28, 0xDF,
+0x20, 0x1D, 0x20, 0xDF,
+
+0x57, 0x34, 0x57, 0xDF,
+0x00, 0xE0,
+0x1D, 0x05,
+
+0x04, 0x80, 0x10, 0xEA,
+0x89, 0xE2,
+0x2B, 0x30,
+
+0x3F, 0xC1, 0x1D, 0xBD,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0xA0, 0x68,
+0xBF, 0x25,
+0x00, 0x80, 0x00, 0xE8,
+
+0x20, 0xC0, 0x20, 0xAF,
+0x28, 0x05,
+0x97, 0x74,
+
+0x00, 0xE0,
+0x2A, 0x10,
+0x16, 0xC0, 0x20, 0xE9,
+
+0x04, 0x80, 0x10, 0xEA,
+0x8C, 0xE2,
+0x95, 0x05,
+
+0x28, 0xC1, 0x28, 0xAD,
+0x1F, 0xC1, 0x15, 0xBD,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0xA8, 0x67,
+0x9F, 0x6B,
+0x00, 0x80, 0x00, 0xE8,
+
+0x28, 0xC0, 0x28, 0xAD,
+0x1D, 0x25,
+0x20, 0x05,
+
+0x28, 0x32, 0x80, 0xAD,
+0x40, 0x2A, 0x40, 0xBD,
+
+0x1C, 0x80, 0x20, 0xE9,
+0x20, 0x33, 0x20, 0xAD,
+
+0x20, 0x73,
+0x00, 0xE0,
+0xB6, 0x49, 0x51, 0xBB,
+
+0x26, 0x2F, 0xB0, 0xE8,
+0x19, 0x20, 0x20, 0xE9,
+
+0x35, 0x20, 0x35, 0xDF,
+0x3D, 0x20, 0x3D, 0xDF,
+
+0x15, 0x20, 0x15, 0xDF,
+0x1D, 0x20, 0x1D, 0xDF,
+
+0x26, 0xD0, 0x26, 0xCD,
+0x29, 0x49, 0x2A, 0xB8,
+
+0x26, 0x40, 0x80, 0xBD,
+0x3B, 0x48, 0x50, 0xBD,
+
+0x3E, 0x54, 0x57, 0x9F,
+0x00, 0xE0,
+0x82, 0xE1,
+
+0x1E, 0xAF, 0x59, 0x9F,
+0x00, 0x80, 0x00, 0xE8,
+
+0x26, 0x30,
+0x29, 0x30,
+0x48, 0x3C, 0x48, 0xAD,
+
+0x2B, 0x72,
+0xC2, 0xE1,
+0x2C, 0xC0, 0x44, 0xC2,
+
+0x05, 0x24, 0x34, 0xBF,
+0x0D, 0x24, 0x2C, 0xBF,
+
+0x2D, 0x46, 0x4E, 0xBF,
+0x25, 0x46, 0x56, 0xBF,
+
+0x20, 0x1D, 0x6F, 0x8F,
+0x32, 0x3E, 0x5F, 0xE9,
+
+0x3E, 0x50, 0x56, 0x9F,
+0x00, 0xE0,
+0x3B, 0x30,
+
+0x1E, 0x8F, 0x51, 0x9F,
+0x33, 0x1E, 0x5F, 0xE9,
+
+0x05, 0x44, 0x54, 0xB2,
+0x0D, 0x44, 0x4C, 0xB2,
+
+0x19, 0xC0, 0xB0, 0xE8,
+0x34, 0xC0, 0x44, 0xC4,
+
+0x33, 0x73,
+0x00, 0xE0,
+0x3E, 0x62, 0x57, 0x9F,
+
+0x1E, 0xAF, 0x59, 0x9F,
+0x00, 0xE0,
+0x0D, 0x20,
+
+0x84, 0x3E, 0x58, 0xE9,
+0x28, 0x1D, 0x6F, 0x8F,
+
+0x05, 0x20,
+0x00, 0xE0,
+0x85, 0x1E, 0x58, 0xE9,
+
+0x9B, 0x3B, 0x33, 0xDF,
+0x20, 0x20, 0x42, 0xAF,
+
+0x30, 0x42, 0x56, 0x9F,
+0x80, 0x3E, 0x57, 0xE9,
+
+0x3F, 0x8F, 0x51, 0x9F,
+0x30, 0x80, 0x5F, 0xE9,
+
+0x28, 0x28, 0x24, 0xAF,
+0x81, 0x1E, 0x57, 0xE9,
+
+0x05, 0x47, 0x57, 0xBF,
+0x0D, 0x47, 0x4F, 0xBF,
+
+0x88, 0x80, 0x58, 0xE9,
+0x1B, 0x29, 0x1B, 0xDF,
+
+0x30, 0x1D, 0x6F, 0x8F,
+0x3A, 0x30, 0x4F, 0xE9,
+
+0x1C, 0x30, 0x26, 0xDF,
+0x09, 0xE3,
+0x3B, 0x05,
+
+0x3E, 0x50, 0x56, 0x9F,
+0x3B, 0x3F, 0x4F, 0xE9,
+
+0x1E, 0x8F, 0x51, 0x9F,
+0x00, 0xE0,
+0xAC, 0x20,
+
+0x2D, 0x44, 0x4C, 0xB4,
+0x2C, 0x1C, 0xC0, 0xAF,
+
+0x25, 0x44, 0x54, 0xB4,
+0x00, 0xE0,
+0xC8, 0x30,
+
+0x30, 0x46, 0x30, 0xAF,
+0x1B, 0x1B, 0x48, 0xAF,
+
+0x00, 0xE0,
+0x25, 0x20,
+0x38, 0x2C, 0x4F, 0xE9,
+
+0x86, 0x80, 0x57, 0xE9,
+0x38, 0x1D, 0x6F, 0x8F,
+
+0x28, 0x74,
+0x00, 0xE0,
+0x0D, 0x44, 0x4C, 0xB0,
+
+0x05, 0x44, 0x54, 0xB0,
+0x2D, 0x20,
+0x9B, 0x10,
+
+0x82, 0x3E, 0x57, 0xE9,
+0x32, 0xF0, 0x1B, 0xCD,
+
+0x1E, 0xBD, 0x59, 0x9F,
+0x83, 0x1E, 0x57, 0xE9,
+
+0x38, 0x47, 0x38, 0xAF,
+0x34, 0x20,
+0x2A, 0x30,
+
+0x00, 0xE0,
+0x0D, 0x20,
+0x32, 0x20,
+0x05, 0x20,
+
+0x87, 0x80, 0x57, 0xE9,
+0x1F, 0x54, 0x57, 0x9F,
+
+0x17, 0x42, 0x56, 0x9F,
+0x00, 0xE0,
+0x3B, 0x6A,
+
+0x3F, 0x8F, 0x51, 0x9F,
+0x37, 0x1E, 0x4F, 0xE9,
+
+0x37, 0x32, 0x2A, 0xAF,
+0x00, 0xE0,
+0x32, 0x00,
+
+0x00, 0x80, 0x00, 0xE8,
+0x27, 0xC0, 0x44, 0xC0,
+
+0x36, 0x1F, 0x4F, 0xE9,
+0x1F, 0x1F, 0x26, 0xDF,
+
+0x37, 0x1B, 0x37, 0xBF,
+0x17, 0x26, 0x17, 0xDF,
+
+0x3E, 0x17, 0x4F, 0xE9,
+0x3F, 0x3F, 0x4F, 0xE9,
+
+0x34, 0x1F, 0x34, 0xAF,
+0x2B, 0x05,
+0xA7, 0x20,
+
+0x33, 0x2B, 0x37, 0xDF,
+0x27, 0x17, 0xC0, 0xAF,
+
+0x34, 0x80, 0x4F, 0xE9,
+0x00, 0x80, 0x00, 0xE8,
+
+0x0D, 0x21, 0x1A, 0xB6,
+0x05, 0x21, 0x31, 0xB6,
+
+0x03, 0x80, 0x2A, 0xEA,
+0x17, 0xC1, 0x2B, 0xBD,
+
+0x0D, 0x20,
+0x05, 0x20,
+0x2F, 0xC0, 0x21, 0xC6,
+
+0xB3, 0x68,
+0x97, 0x25,
+0x00, 0x80, 0x00, 0xE8,
+
+0x33, 0xC0, 0x33, 0xAF,
+0x3C, 0x27, 0x4F, 0xE9,
+
+0x17, 0x50, 0x56, 0x9F,
+0x00, 0x80, 0x00, 0xE8,
+
+0x37, 0x0F, 0x5C, 0x9F,
+0x00, 0xE0,
+0x2F, 0x20,
+
+0x00, 0x80, 0x00, 0xE8,
+0x28, 0x19, 0x60, 0xEC,
+
+0xB3, 0x05,
+0x00, 0xE0,
+0x00, 0x80, 0x00, 0xE8,
+
+0x23, 0x3B, 0x33, 0xAD,
+0x00, 0x80, 0x00, 0xE8,
+
+0x17, 0x26, 0x17, 0xDF,
+0x35, 0x17, 0x4F, 0xE9,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x39, 0x37, 0x4F, 0xE9,
+
+0x2F, 0x2F, 0x17, 0xAF,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x31, 0x80, 0x4F, 0xE9,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x57, 0x39, 0x20, 0xE9,
+
+0x16, 0x28, 0x20, 0xE9,
+0x1D, 0x3B, 0x20, 0xE9,
+
+0x1E, 0x2B, 0x20, 0xE9,
+0x2B, 0x32, 0x20, 0xE9,
+
+0x1C, 0x23, 0x20, 0xE9,
+0x57, 0x36, 0x20, 0xE9,
+
+0x00, 0x80, 0xA0, 0xE9,
+0x40, 0x40, 0xD8, 0xEC,
+
+0xFF, 0x80, 0xC0, 0xE9,
+0x90, 0xE2,
+0x00, 0xE0,
+
+0x78, 0xFF, 0x20, 0xEA,
+0x19, 0xC8, 0xC1, 0xCD,
+
+0x1F, 0xD7, 0x18, 0xBD,
+0x3F, 0xD7, 0x22, 0xBD,
+
+0x9F, 0x41, 0x49, 0xBD,
+0x00, 0x80, 0x00, 0xE8,
+
+0x25, 0x41, 0x49, 0xBD,
+0x2D, 0x41, 0x51, 0xBD,
+
+0x0D, 0x80, 0x07, 0xEA,
+0x00, 0x80, 0x00, 0xE8,
+
+0x35, 0x40, 0x48, 0xBD,
+0x3D, 0x40, 0x50, 0xBD,
+
+0x00, 0x80, 0x00, 0xE8,
+0x25, 0x30,
+0x2D, 0x30,
+
+0x35, 0x30,
+0xB5, 0x30,
+0xBD, 0x30,
+0x3D, 0x30,
+
+0x9C, 0xA7, 0x5B, 0x9F,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x77, 0xFF, 0x0A, 0xEA,
+0x00, 0x80, 0x00, 0xE8,
+
+0xC9, 0x41, 0xC8, 0xEC,
+0x42, 0xE1,
+0x00, 0xE0,
+
+0x75, 0xFF, 0x20, 0xEA,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0xC8, 0x40, 0xC0, 0xEC,
+0x00, 0x80, 0x00, 0xE8,
+
+0x72, 0xFF, 0x20, 0xEA,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+};
+
+static unsigned char warp_g200_tgzs[] = {
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x98, 0xA0, 0xE9,
+0x40, 0x40, 0xD8, 0xEC,
+
+0xFF, 0x80, 0xC0, 0xE9,
+0x00, 0x80, 0x00, 0xE8,
+
+0x1F, 0xD7, 0x18, 0xBD,
+0x3F, 0xD7, 0x22, 0xBD,
+
+0x81, 0x04,
+0x89, 0x04,
+0x01, 0x04,
+0x09, 0x04,
+
+0xC9, 0x41, 0xC0, 0xEC,
+0x11, 0x04,
+0x00, 0xE0,
+
+0x41, 0xCC, 0x41, 0xCD,
+0x49, 0xCC, 0x49, 0xCD,
+
+0xD1, 0x41, 0xC0, 0xEC,
+0x51, 0xCC, 0x51, 0xCD,
+
+0x80, 0x04,
+0x10, 0x04,
+0x08, 0x04,
+0x00, 0xE0,
+
+0x00, 0xCC, 0xC0, 0xCD,
+0xD1, 0x49, 0xC0, 0xEC,
+
+0x8A, 0x1F, 0x20, 0xE9,
+0x8B, 0x3F, 0x20, 0xE9,
+
+0x41, 0x3C, 0x41, 0xAD,
+0x49, 0x3C, 0x49, 0xAD,
+
+0x10, 0xCC, 0x10, 0xCD,
+0x08, 0xCC, 0x08, 0xCD,
+
+0xB9, 0x41, 0x49, 0xBB,
+0x1F, 0xF0, 0x41, 0xCD,
+
+0x51, 0x3C, 0x51, 0xAD,
+0x00, 0x98, 0x80, 0xE9,
+
+0x8B, 0x80, 0x07, 0xEA,
+0x24, 0x1F, 0x20, 0xE9,
+
+0x21, 0x45, 0x80, 0xE8,
+0x1A, 0x4D, 0x80, 0xE8,
+
+0x31, 0x55, 0x80, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x15, 0x41, 0x49, 0xBD,
+0x1D, 0x41, 0x51, 0xBD,
+
+0x2E, 0x41, 0x2A, 0xB8,
+0x34, 0x53, 0xA0, 0xE8,
+
+0x15, 0x30,
+0x1D, 0x30,
+0x58, 0xE3,
+0x00, 0xE0,
+
+0xB5, 0x40, 0x48, 0xBD,
+0x3D, 0x40, 0x50, 0xBD,
+
+0x24, 0x43, 0xA0, 0xE8,
+0x2C, 0x4B, 0xA0, 0xE8,
+
+0x15, 0x72,
+0x09, 0xE3,
+0x00, 0xE0,
+0x1D, 0x72,
+
+0x35, 0x30,
+0xB5, 0x30,
+0xBD, 0x30,
+0x3D, 0x30,
+
+0x9C, 0x97, 0x57, 0x9F,
+0x00, 0x80, 0x00, 0xE8,
+
+0x6C, 0x64, 0xC8, 0xEC,
+0x98, 0xE1,
+0xB5, 0x05,
+
+0xBD, 0x05,
+0x2E, 0x30,
+0x32, 0xC0, 0xA0, 0xE8,
+
+0x33, 0xC0, 0xA0, 0xE8,
+0x74, 0x64, 0xC8, 0xEC,
+
+0x40, 0x3C, 0x40, 0xAD,
+0x32, 0x6A,
+0x2A, 0x30,
+
+0x20, 0x73,
+0x33, 0x6A,
+0x00, 0xE0,
+0x28, 0x73,
+
+0x1C, 0x72,
+0x83, 0xE2,
+0x77, 0x80, 0x15, 0xEA,
+
+0xB8, 0x3D, 0x28, 0xDF,
+0x30, 0x35, 0x20, 0xDF,
+
+0x40, 0x30,
+0x00, 0xE0,
+0xCC, 0xE2,
+0x64, 0x72,
+
+0x25, 0x42, 0x52, 0xBF,
+0x2D, 0x42, 0x4A, 0xBF,
+
+0x30, 0x2E, 0x30, 0xDF,
+0x38, 0x2E, 0x38, 0xDF,
+
+0x18, 0x1D, 0x45, 0xE9,
+0x1E, 0x15, 0x45, 0xE9,
+
+0x2B, 0x49, 0x51, 0xBD,
+0x00, 0xE0,
+0x1F, 0x73,
+
+0x38, 0x38, 0x40, 0xAF,
+0x30, 0x30, 0x40, 0xAF,
+
+0x24, 0x1F, 0x24, 0xDF,
+0x1D, 0x32, 0x20, 0xE9,
+
+0x2C, 0x1F, 0x2C, 0xDF,
+0x1A, 0x33, 0x20, 0xE9,
+
+0xB0, 0x10,
+0x08, 0xE3,
+0x40, 0x10,
+0xB8, 0x10,
+
+0x26, 0xF0, 0x30, 0xCD,
+0x2F, 0xF0, 0x38, 0xCD,
+
+0x2B, 0x80, 0x20, 0xE9,
+0x2A, 0x80, 0x20, 0xE9,
+
+0xA6, 0x20,
+0x88, 0xE2,
+0x00, 0xE0,
+0xAF, 0x20,
+
+0x28, 0x2A, 0x26, 0xAF,
+0x20, 0x2A, 0xC0, 0xAF,
+
+0x34, 0x1F, 0x34, 0xDF,
+0x46, 0x24, 0x46, 0xDF,
+
+0x28, 0x30, 0x80, 0xBF,
+0x20, 0x38, 0x80, 0xBF,
+
+0x47, 0x24, 0x47, 0xDF,
+0x4E, 0x2C, 0x4E, 0xDF,
+
+0x4F, 0x2C, 0x4F, 0xDF,
+0x56, 0x34, 0x56, 0xDF,
+
+0x28, 0x15, 0x28, 0xDF,
+0x20, 0x1D, 0x20, 0xDF,
+
+0x57, 0x34, 0x57, 0xDF,
+0x00, 0xE0,
+0x1D, 0x05,
+
+0x04, 0x80, 0x10, 0xEA,
+0x89, 0xE2,
+0x2B, 0x30,
+
+0x3F, 0xC1, 0x1D, 0xBD,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0xA0, 0x68,
+0xBF, 0x25,
+0x00, 0x80, 0x00, 0xE8,
+
+0x20, 0xC0, 0x20, 0xAF,
+0x28, 0x05,
+0x97, 0x74,
+
+0x00, 0xE0,
+0x2A, 0x10,
+0x16, 0xC0, 0x20, 0xE9,
+
+0x04, 0x80, 0x10, 0xEA,
+0x8C, 0xE2,
+0x95, 0x05,
+
+0x28, 0xC1, 0x28, 0xAD,
+0x1F, 0xC1, 0x15, 0xBD,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0xA8, 0x67,
+0x9F, 0x6B,
+0x00, 0x80, 0x00, 0xE8,
+
+0x28, 0xC0, 0x28, 0xAD,
+0x1D, 0x25,
+0x20, 0x05,
+
+0x28, 0x32, 0x80, 0xAD,
+0x40, 0x2A, 0x40, 0xBD,
+
+0x1C, 0x80, 0x20, 0xE9,
+0x20, 0x33, 0x20, 0xAD,
+
+0x20, 0x73,
+0x00, 0xE0,
+0xB6, 0x49, 0x51, 0xBB,
+
+0x26, 0x2F, 0xB0, 0xE8,
+0x19, 0x20, 0x20, 0xE9,
+
+0x35, 0x20, 0x35, 0xDF,
+0x3D, 0x20, 0x3D, 0xDF,
+
+0x15, 0x20, 0x15, 0xDF,
+0x1D, 0x20, 0x1D, 0xDF,
+
+0x26, 0xD0, 0x26, 0xCD,
+0x29, 0x49, 0x2A, 0xB8,
+
+0x26, 0x40, 0x80, 0xBD,
+0x3B, 0x48, 0x50, 0xBD,
+
+0x3E, 0x54, 0x57, 0x9F,
+0x00, 0xE0,
+0x82, 0xE1,
+
+0x1E, 0xAF, 0x59, 0x9F,
+0x00, 0x80, 0x00, 0xE8,
+
+0x26, 0x30,
+0x29, 0x30,
+0x48, 0x3C, 0x48, 0xAD,
+
+0x2B, 0x72,
+0xC2, 0xE1,
+0x2C, 0xC0, 0x44, 0xC2,
+
+0x05, 0x24, 0x34, 0xBF,
+0x0D, 0x24, 0x2C, 0xBF,
+
+0x2D, 0x46, 0x4E, 0xBF,
+0x25, 0x46, 0x56, 0xBF,
+
+0x20, 0x1D, 0x6F, 0x8F,
+0x32, 0x3E, 0x5F, 0xE9,
+
+0x3E, 0x50, 0x56, 0x9F,
+0x00, 0xE0,
+0x3B, 0x30,
+
+0x1E, 0x8F, 0x51, 0x9F,
+0x33, 0x1E, 0x5F, 0xE9,
+
+0x05, 0x44, 0x54, 0xB2,
+0x0D, 0x44, 0x4C, 0xB2,
+
+0x19, 0xC0, 0xB0, 0xE8,
+0x34, 0xC0, 0x44, 0xC4,
+
+0x33, 0x73,
+0x00, 0xE0,
+0x3E, 0x62, 0x57, 0x9F,
+
+0x1E, 0xAF, 0x59, 0x9F,
+0x00, 0xE0,
+0x0D, 0x20,
+
+0x84, 0x3E, 0x58, 0xE9,
+0x28, 0x1D, 0x6F, 0x8F,
+
+0x05, 0x20,
+0x00, 0xE0,
+0x85, 0x1E, 0x58, 0xE9,
+
+0x9B, 0x3B, 0x33, 0xDF,
+0x20, 0x20, 0x42, 0xAF,
+
+0x30, 0x42, 0x56, 0x9F,
+0x80, 0x3E, 0x57, 0xE9,
+
+0x3F, 0x8F, 0x51, 0x9F,
+0x30, 0x80, 0x5F, 0xE9,
+
+0x28, 0x28, 0x24, 0xAF,
+0x81, 0x1E, 0x57, 0xE9,
+
+0x05, 0x47, 0x57, 0xBF,
+0x0D, 0x47, 0x4F, 0xBF,
+
+0x88, 0x80, 0x58, 0xE9,
+0x1B, 0x29, 0x1B, 0xDF,
+
+0x30, 0x1D, 0x6F, 0x8F,
+0x3A, 0x30, 0x4F, 0xE9,
+
+0x1C, 0x30, 0x26, 0xDF,
+0x09, 0xE3,
+0x3B, 0x05,
+
+0x3E, 0x50, 0x56, 0x9F,
+0x3B, 0x3F, 0x4F, 0xE9,
+
+0x1E, 0x8F, 0x51, 0x9F,
+0x00, 0xE0,
+0xAC, 0x20,
+
+0x2D, 0x44, 0x4C, 0xB4,
+0x2C, 0x1C, 0xC0, 0xAF,
+
+0x25, 0x44, 0x54, 0xB4,
+0x00, 0xE0,
+0xC8, 0x30,
+
+0x30, 0x46, 0x30, 0xAF,
+0x1B, 0x1B, 0x48, 0xAF,
+
+0x00, 0xE0,
+0x25, 0x20,
+0x38, 0x2C, 0x4F, 0xE9,
+
+0x86, 0x80, 0x57, 0xE9,
+0x38, 0x1D, 0x6F, 0x8F,
+
+0x28, 0x74,
+0x00, 0xE0,
+0x0D, 0x44, 0x4C, 0xB0,
+
+0x05, 0x44, 0x54, 0xB0,
+0x2D, 0x20,
+0x9B, 0x10,
+
+0x82, 0x3E, 0x57, 0xE9,
+0x32, 0xF0, 0x1B, 0xCD,
+
+0x1E, 0xBD, 0x59, 0x9F,
+0x83, 0x1E, 0x57, 0xE9,
+
+0x38, 0x47, 0x38, 0xAF,
+0x34, 0x20,
+0x2A, 0x30,
+
+0x00, 0xE0,
+0x0D, 0x20,
+0x32, 0x20,
+0x05, 0x20,
+
+0x87, 0x80, 0x57, 0xE9,
+0x1F, 0x54, 0x57, 0x9F,
+
+0x17, 0x42, 0x56, 0x9F,
+0x00, 0xE0,
+0x3B, 0x6A,
+
+0x3F, 0x8F, 0x51, 0x9F,
+0x37, 0x1E, 0x4F, 0xE9,
+
+0x37, 0x32, 0x2A, 0xAF,
+0x00, 0xE0,
+0x32, 0x00,
+
+0x00, 0x80, 0x00, 0xE8,
+0x27, 0xC0, 0x44, 0xC0,
+
+0x36, 0x1F, 0x4F, 0xE9,
+0x1F, 0x1F, 0x26, 0xDF,
+
+0x37, 0x1B, 0x37, 0xBF,
+0x17, 0x26, 0x17, 0xDF,
+
+0x3E, 0x17, 0x4F, 0xE9,
+0x3F, 0x3F, 0x4F, 0xE9,
+
+0x34, 0x1F, 0x34, 0xAF,
+0x2B, 0x05,
+0xA7, 0x20,
+
+0x33, 0x2B, 0x37, 0xDF,
+0x27, 0x17, 0xC0, 0xAF,
+
+0x34, 0x80, 0x4F, 0xE9,
+0x00, 0x80, 0x00, 0xE8,
+
+0x2D, 0x21, 0x1A, 0xB0,
+0x25, 0x21, 0x31, 0xB0,
+
+0x0D, 0x21, 0x1A, 0xB2,
+0x05, 0x21, 0x31, 0xB2,
+
+0x03, 0x80, 0x2A, 0xEA,
+0x17, 0xC1, 0x2B, 0xBD,
+
+0x2D, 0x20,
+0x25, 0x20,
+0x05, 0x20,
+0x0D, 0x20,
+
+0xB3, 0x68,
+0x97, 0x25,
+0x00, 0x80, 0x00, 0xE8,
+
+0x33, 0xC0, 0x33, 0xAF,
+0x2F, 0xC0, 0x21, 0xC0,
+
+0x16, 0x42, 0x56, 0x9F,
+0x3C, 0x27, 0x4F, 0xE9,
+
+0x1E, 0x62, 0x57, 0x9F,
+0x00, 0x80, 0x00, 0xE8,
+
+0x25, 0x21, 0x31, 0xB4,
+0x2D, 0x21, 0x1A, 0xB4,
+
+0x3F, 0x2F, 0x5D, 0x9F,
+0x00, 0x80, 0x00, 0xE8,
+
+0x33, 0x05,
+0x00, 0xE0,
+0x28, 0x19, 0x60, 0xEC,
+
+0x37, 0x0F, 0x5C, 0x9F,
+0x00, 0xE0,
+0x2F, 0x20,
+
+0x23, 0x3B, 0x33, 0xAD,
+0x1E, 0x26, 0x1E, 0xDF,
+
+0xA7, 0x1E, 0x4F, 0xE9,
+0x17, 0x26, 0x16, 0xDF,
+
+0x2D, 0x20,
+0x00, 0xE0,
+0xA8, 0x3F, 0x4F, 0xE9,
+
+0x2F, 0x2F, 0x1E, 0xAF,
+0x25, 0x20,
+0x00, 0xE0,
+
+0xA4, 0x16, 0x4F, 0xE9,
+0x0F, 0xC0, 0x21, 0xC2,
+
+0xA6, 0x80, 0x4F, 0xE9,
+0x1F, 0x62, 0x57, 0x9F,
+
+0x3F, 0x2F, 0x5D, 0x9F,
+0x00, 0xE0,
+0x8F, 0x20,
+
+0xA5, 0x37, 0x4F, 0xE9,
+0x0F, 0x17, 0x0F, 0xAF,
+
+0x06, 0xC0, 0x21, 0xC4,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0xA3, 0x80, 0x4F, 0xE9,
+
+0x06, 0x20,
+0x00, 0xE0,
+0x1F, 0x26, 0x1F, 0xDF,
+
+0xA1, 0x1F, 0x4F, 0xE9,
+0xA2, 0x3F, 0x4F, 0xE9,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x06, 0x06, 0x1F, 0xAF,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0xA0, 0x80, 0x4F, 0xE9,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x57, 0x39, 0x20, 0xE9,
+
+0x16, 0x28, 0x20, 0xE9,
+0x1D, 0x3B, 0x20, 0xE9,
+
+0x1E, 0x2B, 0x20, 0xE9,
+0x2B, 0x32, 0x20, 0xE9,
+
+0x1C, 0x23, 0x20, 0xE9,
+0x57, 0x36, 0x20, 0xE9,
+
+0x00, 0x80, 0xA0, 0xE9,
+0x40, 0x40, 0xD8, 0xEC,
+
+0xFF, 0x80, 0xC0, 0xE9,
+0x90, 0xE2,
+0x00, 0xE0,
+
+0x6C, 0xFF, 0x20, 0xEA,
+0x19, 0xC8, 0xC1, 0xCD,
+
+0x1F, 0xD7, 0x18, 0xBD,
+0x3F, 0xD7, 0x22, 0xBD,
+
+0x9F, 0x41, 0x49, 0xBD,
+0x00, 0x80, 0x00, 0xE8,
+
+0x25, 0x41, 0x49, 0xBD,
+0x2D, 0x41, 0x51, 0xBD,
+
+0x0D, 0x80, 0x07, 0xEA,
+0x00, 0x80, 0x00, 0xE8,
+
+0x35, 0x40, 0x48, 0xBD,
+0x3D, 0x40, 0x50, 0xBD,
+
+0x00, 0x80, 0x00, 0xE8,
+0x25, 0x30,
+0x2D, 0x30,
+
+0x35, 0x30,
+0xB5, 0x30,
+0xBD, 0x30,
+0x3D, 0x30,
+
+0x9C, 0xA7, 0x5B, 0x9F,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x6B, 0xFF, 0x0A, 0xEA,
+0x00, 0x80, 0x00, 0xE8,
+
+0xC9, 0x41, 0xC8, 0xEC,
+0x42, 0xE1,
+0x00, 0xE0,
+
+0x69, 0xFF, 0x20, 0xEA,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0xC8, 0x40, 0xC0, 0xEC,
+0x00, 0x80, 0x00, 0xE8,
+
+0x66, 0xFF, 0x20, 0xEA,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+};
+
+static unsigned char warp_g200_tgzsa[] = {
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x98, 0xA0, 0xE9,
+0x40, 0x40, 0xD8, 0xEC,
+
+0xFF, 0x80, 0xC0, 0xE9,
+0x00, 0x80, 0x00, 0xE8,
+
+0x1F, 0xD7, 0x18, 0xBD,
+0x3F, 0xD7, 0x22, 0xBD,
+
+0x81, 0x04,
+0x89, 0x04,
+0x01, 0x04,
+0x09, 0x04,
+
+0xC9, 0x41, 0xC0, 0xEC,
+0x11, 0x04,
+0x00, 0xE0,
+
+0x41, 0xCC, 0x41, 0xCD,
+0x49, 0xCC, 0x49, 0xCD,
+
+0xD1, 0x41, 0xC0, 0xEC,
+0x51, 0xCC, 0x51, 0xCD,
+
+0x80, 0x04,
+0x10, 0x04,
+0x08, 0x04,
+0x00, 0xE0,
+
+0x00, 0xCC, 0xC0, 0xCD,
+0xD1, 0x49, 0xC0, 0xEC,
+
+0x8A, 0x1F, 0x20, 0xE9,
+0x8B, 0x3F, 0x20, 0xE9,
+
+0x41, 0x3C, 0x41, 0xAD,
+0x49, 0x3C, 0x49, 0xAD,
+
+0x10, 0xCC, 0x10, 0xCD,
+0x08, 0xCC, 0x08, 0xCD,
+
+0xB9, 0x41, 0x49, 0xBB,
+0x1F, 0xF0, 0x41, 0xCD,
+
+0x51, 0x3C, 0x51, 0xAD,
+0x00, 0x98, 0x80, 0xE9,
+
+0x8F, 0x80, 0x07, 0xEA,
+0x24, 0x1F, 0x20, 0xE9,
+
+0x21, 0x45, 0x80, 0xE8,
+0x1A, 0x4D, 0x80, 0xE8,
+
+0x31, 0x55, 0x80, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x15, 0x41, 0x49, 0xBD,
+0x1D, 0x41, 0x51, 0xBD,
+
+0x2E, 0x41, 0x2A, 0xB8,
+0x34, 0x53, 0xA0, 0xE8,
+
+0x15, 0x30,
+0x1D, 0x30,
+0x58, 0xE3,
+0x00, 0xE0,
+
+0xB5, 0x40, 0x48, 0xBD,
+0x3D, 0x40, 0x50, 0xBD,
+
+0x24, 0x43, 0xA0, 0xE8,
+0x2C, 0x4B, 0xA0, 0xE8,
+
+0x15, 0x72,
+0x09, 0xE3,
+0x00, 0xE0,
+0x1D, 0x72,
+
+0x35, 0x30,
+0xB5, 0x30,
+0xBD, 0x30,
+0x3D, 0x30,
+
+0x9C, 0x97, 0x57, 0x9F,
+0x00, 0x80, 0x00, 0xE8,
+
+0x6C, 0x64, 0xC8, 0xEC,
+0x98, 0xE1,
+0xB5, 0x05,
+
+0xBD, 0x05,
+0x2E, 0x30,
+0x32, 0xC0, 0xA0, 0xE8,
+
+0x33, 0xC0, 0xA0, 0xE8,
+0x74, 0x64, 0xC8, 0xEC,
+
+0x40, 0x3C, 0x40, 0xAD,
+0x32, 0x6A,
+0x2A, 0x30,
+
+0x20, 0x73,
+0x33, 0x6A,
+0x00, 0xE0,
+0x28, 0x73,
+
+0x1C, 0x72,
+0x83, 0xE2,
+0x7B, 0x80, 0x15, 0xEA,
+
+0xB8, 0x3D, 0x28, 0xDF,
+0x30, 0x35, 0x20, 0xDF,
+
+0x40, 0x30,
+0x00, 0xE0,
+0xCC, 0xE2,
+0x64, 0x72,
+
+0x25, 0x42, 0x52, 0xBF,
+0x2D, 0x42, 0x4A, 0xBF,
+
+0x30, 0x2E, 0x30, 0xDF,
+0x38, 0x2E, 0x38, 0xDF,
+
+0x18, 0x1D, 0x45, 0xE9,
+0x1E, 0x15, 0x45, 0xE9,
+
+0x2B, 0x49, 0x51, 0xBD,
+0x00, 0xE0,
+0x1F, 0x73,
+
+0x38, 0x38, 0x40, 0xAF,
+0x30, 0x30, 0x40, 0xAF,
+
+0x24, 0x1F, 0x24, 0xDF,
+0x1D, 0x32, 0x20, 0xE9,
+
+0x2C, 0x1F, 0x2C, 0xDF,
+0x1A, 0x33, 0x20, 0xE9,
+
+0xB0, 0x10,
+0x08, 0xE3,
+0x40, 0x10,
+0xB8, 0x10,
+
+0x26, 0xF0, 0x30, 0xCD,
+0x2F, 0xF0, 0x38, 0xCD,
+
+0x2B, 0x80, 0x20, 0xE9,
+0x2A, 0x80, 0x20, 0xE9,
+
+0xA6, 0x20,
+0x88, 0xE2,
+0x00, 0xE0,
+0xAF, 0x20,
+
+0x28, 0x2A, 0x26, 0xAF,
+0x20, 0x2A, 0xC0, 0xAF,
+
+0x34, 0x1F, 0x34, 0xDF,
+0x46, 0x24, 0x46, 0xDF,
+
+0x28, 0x30, 0x80, 0xBF,
+0x20, 0x38, 0x80, 0xBF,
+
+0x47, 0x24, 0x47, 0xDF,
+0x4E, 0x2C, 0x4E, 0xDF,
+
+0x4F, 0x2C, 0x4F, 0xDF,
+0x56, 0x34, 0x56, 0xDF,
+
+0x28, 0x15, 0x28, 0xDF,
+0x20, 0x1D, 0x20, 0xDF,
+
+0x57, 0x34, 0x57, 0xDF,
+0x00, 0xE0,
+0x1D, 0x05,
+
+0x04, 0x80, 0x10, 0xEA,
+0x89, 0xE2,
+0x2B, 0x30,
+
+0x3F, 0xC1, 0x1D, 0xBD,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0xA0, 0x68,
+0xBF, 0x25,
+0x00, 0x80, 0x00, 0xE8,
+
+0x20, 0xC0, 0x20, 0xAF,
+0x28, 0x05,
+0x97, 0x74,
+
+0x00, 0xE0,
+0x2A, 0x10,
+0x16, 0xC0, 0x20, 0xE9,
+
+0x04, 0x80, 0x10, 0xEA,
+0x8C, 0xE2,
+0x95, 0x05,
+
+0x28, 0xC1, 0x28, 0xAD,
+0x1F, 0xC1, 0x15, 0xBD,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0xA8, 0x67,
+0x9F, 0x6B,
+0x00, 0x80, 0x00, 0xE8,
+
+0x28, 0xC0, 0x28, 0xAD,
+0x1D, 0x25,
+0x20, 0x05,
+
+0x28, 0x32, 0x80, 0xAD,
+0x40, 0x2A, 0x40, 0xBD,
+
+0x1C, 0x80, 0x20, 0xE9,
+0x20, 0x33, 0x20, 0xAD,
+
+0x20, 0x73,
+0x00, 0xE0,
+0xB6, 0x49, 0x51, 0xBB,
+
+0x26, 0x2F, 0xB0, 0xE8,
+0x19, 0x20, 0x20, 0xE9,
+
+0x35, 0x20, 0x35, 0xDF,
+0x3D, 0x20, 0x3D, 0xDF,
+
+0x15, 0x20, 0x15, 0xDF,
+0x1D, 0x20, 0x1D, 0xDF,
+
+0x26, 0xD0, 0x26, 0xCD,
+0x29, 0x49, 0x2A, 0xB8,
+
+0x26, 0x40, 0x80, 0xBD,
+0x3B, 0x48, 0x50, 0xBD,
+
+0x3E, 0x54, 0x57, 0x9F,
+0x00, 0xE0,
+0x82, 0xE1,
+
+0x1E, 0xAF, 0x59, 0x9F,
+0x00, 0x80, 0x00, 0xE8,
+
+0x26, 0x30,
+0x29, 0x30,
+0x48, 0x3C, 0x48, 0xAD,
+
+0x2B, 0x72,
+0xC2, 0xE1,
+0x2C, 0xC0, 0x44, 0xC2,
+
+0x05, 0x24, 0x34, 0xBF,
+0x0D, 0x24, 0x2C, 0xBF,
+
+0x2D, 0x46, 0x4E, 0xBF,
+0x25, 0x46, 0x56, 0xBF,
+
+0x20, 0x1D, 0x6F, 0x8F,
+0x32, 0x3E, 0x5F, 0xE9,
+
+0x3E, 0x50, 0x56, 0x9F,
+0x00, 0xE0,
+0x3B, 0x30,
+
+0x1E, 0x8F, 0x51, 0x9F,
+0x33, 0x1E, 0x5F, 0xE9,
+
+0x05, 0x44, 0x54, 0xB2,
+0x0D, 0x44, 0x4C, 0xB2,
+
+0x19, 0xC0, 0xB0, 0xE8,
+0x34, 0xC0, 0x44, 0xC4,
+
+0x33, 0x73,
+0x00, 0xE0,
+0x3E, 0x62, 0x57, 0x9F,
+
+0x1E, 0xAF, 0x59, 0x9F,
+0x00, 0xE0,
+0x0D, 0x20,
+
+0x84, 0x3E, 0x58, 0xE9,
+0x28, 0x1D, 0x6F, 0x8F,
+
+0x05, 0x20,
+0x00, 0xE0,
+0x85, 0x1E, 0x58, 0xE9,
+
+0x9B, 0x3B, 0x33, 0xDF,
+0x20, 0x20, 0x42, 0xAF,
+
+0x30, 0x42, 0x56, 0x9F,
+0x80, 0x3E, 0x57, 0xE9,
+
+0x3F, 0x8F, 0x51, 0x9F,
+0x30, 0x80, 0x5F, 0xE9,
+
+0x28, 0x28, 0x24, 0xAF,
+0x81, 0x1E, 0x57, 0xE9,
+
+0x05, 0x47, 0x57, 0xBF,
+0x0D, 0x47, 0x4F, 0xBF,
+
+0x88, 0x80, 0x58, 0xE9,
+0x1B, 0x29, 0x1B, 0xDF,
+
+0x30, 0x1D, 0x6F, 0x8F,
+0x3A, 0x30, 0x4F, 0xE9,
+
+0x1C, 0x30, 0x26, 0xDF,
+0x09, 0xE3,
+0x3B, 0x05,
+
+0x3E, 0x50, 0x56, 0x9F,
+0x3B, 0x3F, 0x4F, 0xE9,
+
+0x1E, 0x8F, 0x51, 0x9F,
+0x00, 0xE0,
+0xAC, 0x20,
+
+0x2D, 0x44, 0x4C, 0xB4,
+0x2C, 0x1C, 0xC0, 0xAF,
+
+0x25, 0x44, 0x54, 0xB4,
+0x00, 0xE0,
+0xC8, 0x30,
+
+0x30, 0x46, 0x30, 0xAF,
+0x1B, 0x1B, 0x48, 0xAF,
+
+0x00, 0xE0,
+0x25, 0x20,
+0x38, 0x2C, 0x4F, 0xE9,
+
+0x86, 0x80, 0x57, 0xE9,
+0x38, 0x1D, 0x6F, 0x8F,
+
+0x28, 0x74,
+0x00, 0xE0,
+0x0D, 0x44, 0x4C, 0xB0,
+
+0x05, 0x44, 0x54, 0xB0,
+0x2D, 0x20,
+0x9B, 0x10,
+
+0x82, 0x3E, 0x57, 0xE9,
+0x32, 0xF0, 0x1B, 0xCD,
+
+0x1E, 0xBD, 0x59, 0x9F,
+0x83, 0x1E, 0x57, 0xE9,
+
+0x38, 0x47, 0x38, 0xAF,
+0x34, 0x20,
+0x2A, 0x30,
+
+0x00, 0xE0,
+0x0D, 0x20,
+0x32, 0x20,
+0x05, 0x20,
+
+0x87, 0x80, 0x57, 0xE9,
+0x1F, 0x54, 0x57, 0x9F,
+
+0x17, 0x42, 0x56, 0x9F,
+0x00, 0xE0,
+0x3B, 0x6A,
+
+0x3F, 0x8F, 0x51, 0x9F,
+0x37, 0x1E, 0x4F, 0xE9,
+
+0x37, 0x32, 0x2A, 0xAF,
+0x00, 0xE0,
+0x32, 0x00,
+
+0x00, 0x80, 0x00, 0xE8,
+0x27, 0xC0, 0x44, 0xC0,
+
+0x36, 0x1F, 0x4F, 0xE9,
+0x1F, 0x1F, 0x26, 0xDF,
+
+0x37, 0x1B, 0x37, 0xBF,
+0x17, 0x26, 0x17, 0xDF,
+
+0x3E, 0x17, 0x4F, 0xE9,
+0x3F, 0x3F, 0x4F, 0xE9,
+
+0x34, 0x1F, 0x34, 0xAF,
+0x2B, 0x05,
+0xA7, 0x20,
+
+0x33, 0x2B, 0x37, 0xDF,
+0x27, 0x17, 0xC0, 0xAF,
+
+0x34, 0x80, 0x4F, 0xE9,
+0x00, 0x80, 0x00, 0xE8,
+
+0x2D, 0x21, 0x1A, 0xB0,
+0x25, 0x21, 0x31, 0xB0,
+
+0x0D, 0x21, 0x1A, 0xB2,
+0x05, 0x21, 0x31, 0xB2,
+
+0x03, 0x80, 0x2A, 0xEA,
+0x17, 0xC1, 0x2B, 0xBD,
+
+0x2D, 0x20,
+0x25, 0x20,
+0x05, 0x20,
+0x0D, 0x20,
+
+0xB3, 0x68,
+0x97, 0x25,
+0x00, 0x80, 0x00, 0xE8,
+
+0x33, 0xC0, 0x33, 0xAF,
+0x2F, 0xC0, 0x21, 0xC0,
+
+0x16, 0x42, 0x56, 0x9F,
+0x3C, 0x27, 0x4F, 0xE9,
+
+0x1E, 0x62, 0x57, 0x9F,
+0x00, 0x80, 0x00, 0xE8,
+
+0x25, 0x21, 0x31, 0xB4,
+0x2D, 0x21, 0x1A, 0xB4,
+
+0x3F, 0x2F, 0x5D, 0x9F,
+0x00, 0x80, 0x00, 0xE8,
+
+0x33, 0x05,
+0x00, 0xE0,
+0x28, 0x19, 0x60, 0xEC,
+
+0x0D, 0x44, 0x4C, 0xB6,
+0x05, 0x44, 0x54, 0xB6,
+
+0x37, 0x0F, 0x5C, 0x9F,
+0x00, 0xE0,
+0x2F, 0x20,
+
+0x23, 0x3B, 0x33, 0xAD,
+0x1E, 0x26, 0x1E, 0xDF,
+
+0xA7, 0x1E, 0x4F, 0xE9,
+0x17, 0x26, 0x16, 0xDF,
+
+0x2D, 0x20,
+0x00, 0xE0,
+0xA8, 0x3F, 0x4F, 0xE9,
+
+0x2F, 0x2F, 0x1E, 0xAF,
+0x25, 0x20,
+0x00, 0xE0,
+
+0xA4, 0x16, 0x4F, 0xE9,
+0x0F, 0xC0, 0x21, 0xC2,
+
+0xA6, 0x80, 0x4F, 0xE9,
+0x1F, 0x62, 0x57, 0x9F,
+
+0x0D, 0x20,
+0x05, 0x20,
+0x00, 0x80, 0x00, 0xE8,
+
+0x3F, 0x2F, 0x5D, 0x9F,
+0x00, 0xE0,
+0x0F, 0x20,
+
+0x17, 0x50, 0x56, 0x9F,
+0xA5, 0x37, 0x4F, 0xE9,
+
+0x06, 0xC0, 0x21, 0xC4,
+0x0F, 0x17, 0x0F, 0xAF,
+
+0x37, 0x0F, 0x5C, 0x9F,
+0x00, 0x80, 0x00, 0xE8,
+
+0x2F, 0xC0, 0x44, 0xC6,
+0xA3, 0x80, 0x4F, 0xE9,
+
+0x06, 0x20,
+0x00, 0xE0,
+0x1F, 0x26, 0x1F, 0xDF,
+
+0x17, 0x26, 0x17, 0xDF,
+0x9D, 0x17, 0x4F, 0xE9,
+
+0xA1, 0x1F, 0x4F, 0xE9,
+0xA2, 0x3F, 0x4F, 0xE9,
+
+0x06, 0x06, 0x1F, 0xAF,
+0x00, 0xE0,
+0xAF, 0x20,
+
+0x9E, 0x37, 0x4F, 0xE9,
+0x2F, 0x17, 0x2F, 0xAF,
+
+0xA0, 0x80, 0x4F, 0xE9,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x9C, 0x80, 0x4F, 0xE9,
+
+0x00, 0x80, 0x00, 0xE8,
+0x57, 0x39, 0x20, 0xE9,
+
+0x16, 0x28, 0x20, 0xE9,
+0x1D, 0x3B, 0x20, 0xE9,
+
+0x1E, 0x2B, 0x20, 0xE9,
+0x2B, 0x32, 0x20, 0xE9,
+
+0x1C, 0x23, 0x20, 0xE9,
+0x57, 0x36, 0x20, 0xE9,
+
+0x00, 0x80, 0xA0, 0xE9,
+0x40, 0x40, 0xD8, 0xEC,
+
+0xFF, 0x80, 0xC0, 0xE9,
+0x90, 0xE2,
+0x00, 0xE0,
+
+0x68, 0xFF, 0x20, 0xEA,
+0x19, 0xC8, 0xC1, 0xCD,
+
+0x1F, 0xD7, 0x18, 0xBD,
+0x3F, 0xD7, 0x22, 0xBD,
+
+0x9F, 0x41, 0x49, 0xBD,
+0x00, 0x80, 0x00, 0xE8,
+
+0x25, 0x41, 0x49, 0xBD,
+0x2D, 0x41, 0x51, 0xBD,
+
+0x0D, 0x80, 0x07, 0xEA,
+0x00, 0x80, 0x00, 0xE8,
+
+0x35, 0x40, 0x48, 0xBD,
+0x3D, 0x40, 0x50, 0xBD,
+
+0x00, 0x80, 0x00, 0xE8,
+0x25, 0x30,
+0x2D, 0x30,
+
+0x35, 0x30,
+0xB5, 0x30,
+0xBD, 0x30,
+0x3D, 0x30,
+
+0x9C, 0xA7, 0x5B, 0x9F,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x67, 0xFF, 0x0A, 0xEA,
+0x00, 0x80, 0x00, 0xE8,
+
+0xC9, 0x41, 0xC8, 0xEC,
+0x42, 0xE1,
+0x00, 0xE0,
+
+0x65, 0xFF, 0x20, 0xEA,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0xC8, 0x40, 0xC0, 0xEC,
+0x00, 0x80, 0x00, 0xE8,
+
+0x62, 0xFF, 0x20, 0xEA,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+};
+
+static unsigned char warp_g200_tgzsaf[] = {
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x98, 0xA0, 0xE9,
+0x40, 0x40, 0xD8, 0xEC,
+
+0xFF, 0x80, 0xC0, 0xE9,
+0x00, 0x80, 0x00, 0xE8,
+
+0x1F, 0xD7, 0x18, 0xBD,
+0x3F, 0xD7, 0x22, 0xBD,
+
+0x81, 0x04,
+0x89, 0x04,
+0x01, 0x04,
+0x09, 0x04,
+
+0xC9, 0x41, 0xC0, 0xEC,
+0x11, 0x04,
+0x00, 0xE0,
+
+0x41, 0xCC, 0x41, 0xCD,
+0x49, 0xCC, 0x49, 0xCD,
+
+0xD1, 0x41, 0xC0, 0xEC,
+0x51, 0xCC, 0x51, 0xCD,
+
+0x80, 0x04,
+0x10, 0x04,
+0x08, 0x04,
+0x00, 0xE0,
+
+0x00, 0xCC, 0xC0, 0xCD,
+0xD1, 0x49, 0xC0, 0xEC,
+
+0x8A, 0x1F, 0x20, 0xE9,
+0x8B, 0x3F, 0x20, 0xE9,
+
+0x41, 0x3C, 0x41, 0xAD,
+0x49, 0x3C, 0x49, 0xAD,
+
+0x10, 0xCC, 0x10, 0xCD,
+0x08, 0xCC, 0x08, 0xCD,
+
+0xB9, 0x41, 0x49, 0xBB,
+0x1F, 0xF0, 0x41, 0xCD,
+
+0x51, 0x3C, 0x51, 0xAD,
+0x00, 0x98, 0x80, 0xE9,
+
+0x94, 0x80, 0x07, 0xEA,
+0x24, 0x1F, 0x20, 0xE9,
+
+0x21, 0x45, 0x80, 0xE8,
+0x1A, 0x4D, 0x80, 0xE8,
+
+0x31, 0x55, 0x80, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x15, 0x41, 0x49, 0xBD,
+0x1D, 0x41, 0x51, 0xBD,
+
+0x2E, 0x41, 0x2A, 0xB8,
+0x34, 0x53, 0xA0, 0xE8,
+
+0x15, 0x30,
+0x1D, 0x30,
+0x58, 0xE3,
+0x00, 0xE0,
+
+0xB5, 0x40, 0x48, 0xBD,
+0x3D, 0x40, 0x50, 0xBD,
+
+0x24, 0x43, 0xA0, 0xE8,
+0x2C, 0x4B, 0xA0, 0xE8,
+
+0x15, 0x72,
+0x09, 0xE3,
+0x00, 0xE0,
+0x1D, 0x72,
+
+0x35, 0x30,
+0xB5, 0x30,
+0xBD, 0x30,
+0x3D, 0x30,
+
+0x9C, 0x97, 0x57, 0x9F,
+0x00, 0x80, 0x00, 0xE8,
+
+0x6C, 0x64, 0xC8, 0xEC,
+0x98, 0xE1,
+0xB5, 0x05,
+
+0xBD, 0x05,
+0x2E, 0x30,
+0x32, 0xC0, 0xA0, 0xE8,
+
+0x33, 0xC0, 0xA0, 0xE8,
+0x74, 0x64, 0xC8, 0xEC,
+
+0x40, 0x3C, 0x40, 0xAD,
+0x32, 0x6A,
+0x2A, 0x30,
+
+0x20, 0x73,
+0x33, 0x6A,
+0x00, 0xE0,
+0x28, 0x73,
+
+0x1C, 0x72,
+0x83, 0xE2,
+0x80, 0x80, 0x15, 0xEA,
+
+0xB8, 0x3D, 0x28, 0xDF,
+0x30, 0x35, 0x20, 0xDF,
+
+0x40, 0x30,
+0x00, 0xE0,
+0xCC, 0xE2,
+0x64, 0x72,
+
+0x25, 0x42, 0x52, 0xBF,
+0x2D, 0x42, 0x4A, 0xBF,
+
+0x30, 0x2E, 0x30, 0xDF,
+0x38, 0x2E, 0x38, 0xDF,
+
+0x18, 0x1D, 0x45, 0xE9,
+0x1E, 0x15, 0x45, 0xE9,
+
+0x2B, 0x49, 0x51, 0xBD,
+0x00, 0xE0,
+0x1F, 0x73,
+
+0x38, 0x38, 0x40, 0xAF,
+0x30, 0x30, 0x40, 0xAF,
+
+0x24, 0x1F, 0x24, 0xDF,
+0x1D, 0x32, 0x20, 0xE9,
+
+0x2C, 0x1F, 0x2C, 0xDF,
+0x1A, 0x33, 0x20, 0xE9,
+
+0xB0, 0x10,
+0x08, 0xE3,
+0x40, 0x10,
+0xB8, 0x10,
+
+0x26, 0xF0, 0x30, 0xCD,
+0x2F, 0xF0, 0x38, 0xCD,
+
+0x2B, 0x80, 0x20, 0xE9,
+0x2A, 0x80, 0x20, 0xE9,
+
+0xA6, 0x20,
+0x88, 0xE2,
+0x00, 0xE0,
+0xAF, 0x20,
+
+0x28, 0x2A, 0x26, 0xAF,
+0x20, 0x2A, 0xC0, 0xAF,
+
+0x34, 0x1F, 0x34, 0xDF,
+0x46, 0x24, 0x46, 0xDF,
+
+0x28, 0x30, 0x80, 0xBF,
+0x20, 0x38, 0x80, 0xBF,
+
+0x47, 0x24, 0x47, 0xDF,
+0x4E, 0x2C, 0x4E, 0xDF,
+
+0x4F, 0x2C, 0x4F, 0xDF,
+0x56, 0x34, 0x56, 0xDF,
+
+0x28, 0x15, 0x28, 0xDF,
+0x20, 0x1D, 0x20, 0xDF,
+
+0x57, 0x34, 0x57, 0xDF,
+0x00, 0xE0,
+0x1D, 0x05,
+
+0x04, 0x80, 0x10, 0xEA,
+0x89, 0xE2,
+0x2B, 0x30,
+
+0x3F, 0xC1, 0x1D, 0xBD,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0xA0, 0x68,
+0xBF, 0x25,
+0x00, 0x80, 0x00, 0xE8,
+
+0x20, 0xC0, 0x20, 0xAF,
+0x28, 0x05,
+0x97, 0x74,
+
+0x00, 0xE0,
+0x2A, 0x10,
+0x16, 0xC0, 0x20, 0xE9,
+
+0x04, 0x80, 0x10, 0xEA,
+0x8C, 0xE2,
+0x95, 0x05,
+
+0x28, 0xC1, 0x28, 0xAD,
+0x1F, 0xC1, 0x15, 0xBD,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0xA8, 0x67,
+0x9F, 0x6B,
+0x00, 0x80, 0x00, 0xE8,
+
+0x28, 0xC0, 0x28, 0xAD,
+0x1D, 0x25,
+0x20, 0x05,
+
+0x28, 0x32, 0x80, 0xAD,
+0x40, 0x2A, 0x40, 0xBD,
+
+0x1C, 0x80, 0x20, 0xE9,
+0x20, 0x33, 0x20, 0xAD,
+
+0x20, 0x73,
+0x00, 0xE0,
+0xB6, 0x49, 0x51, 0xBB,
+
+0x26, 0x2F, 0xB0, 0xE8,
+0x19, 0x20, 0x20, 0xE9,
+
+0x35, 0x20, 0x35, 0xDF,
+0x3D, 0x20, 0x3D, 0xDF,
+
+0x15, 0x20, 0x15, 0xDF,
+0x1D, 0x20, 0x1D, 0xDF,
+
+0x26, 0xD0, 0x26, 0xCD,
+0x29, 0x49, 0x2A, 0xB8,
+
+0x26, 0x40, 0x80, 0xBD,
+0x3B, 0x48, 0x50, 0xBD,
+
+0x3E, 0x54, 0x57, 0x9F,
+0x00, 0xE0,
+0x82, 0xE1,
+
+0x1E, 0xAF, 0x59, 0x9F,
+0x00, 0x80, 0x00, 0xE8,
+
+0x26, 0x30,
+0x29, 0x30,
+0x48, 0x3C, 0x48, 0xAD,
+
+0x2B, 0x72,
+0xC2, 0xE1,
+0x2C, 0xC0, 0x44, 0xC2,
+
+0x05, 0x24, 0x34, 0xBF,
+0x0D, 0x24, 0x2C, 0xBF,
+
+0x2D, 0x46, 0x4E, 0xBF,
+0x25, 0x46, 0x56, 0xBF,
+
+0x20, 0x1D, 0x6F, 0x8F,
+0x32, 0x3E, 0x5F, 0xE9,
+
+0x3E, 0x50, 0x56, 0x9F,
+0x00, 0xE0,
+0x3B, 0x30,
+
+0x1E, 0x8F, 0x51, 0x9F,
+0x33, 0x1E, 0x5F, 0xE9,
+
+0x05, 0x44, 0x54, 0xB2,
+0x0D, 0x44, 0x4C, 0xB2,
+
+0x19, 0xC0, 0xB0, 0xE8,
+0x34, 0xC0, 0x44, 0xC4,
+
+0x33, 0x73,
+0x00, 0xE0,
+0x3E, 0x62, 0x57, 0x9F,
+
+0x1E, 0xAF, 0x59, 0x9F,
+0x00, 0xE0,
+0x0D, 0x20,
+
+0x84, 0x3E, 0x58, 0xE9,
+0x28, 0x1D, 0x6F, 0x8F,
+
+0x05, 0x20,
+0x00, 0xE0,
+0x85, 0x1E, 0x58, 0xE9,
+
+0x9B, 0x3B, 0x33, 0xDF,
+0x20, 0x20, 0x42, 0xAF,
+
+0x30, 0x42, 0x56, 0x9F,
+0x80, 0x3E, 0x57, 0xE9,
+
+0x3F, 0x8F, 0x51, 0x9F,
+0x30, 0x80, 0x5F, 0xE9,
+
+0x28, 0x28, 0x24, 0xAF,
+0x81, 0x1E, 0x57, 0xE9,
+
+0x05, 0x47, 0x57, 0xBF,
+0x0D, 0x47, 0x4F, 0xBF,
+
+0x88, 0x80, 0x58, 0xE9,
+0x1B, 0x29, 0x1B, 0xDF,
+
+0x30, 0x1D, 0x6F, 0x8F,
+0x3A, 0x30, 0x4F, 0xE9,
+
+0x1C, 0x30, 0x26, 0xDF,
+0x09, 0xE3,
+0x3B, 0x05,
+
+0x3E, 0x50, 0x56, 0x9F,
+0x3B, 0x3F, 0x4F, 0xE9,
+
+0x1E, 0x8F, 0x51, 0x9F,
+0x00, 0xE0,
+0xAC, 0x20,
+
+0x2D, 0x44, 0x4C, 0xB4,
+0x2C, 0x1C, 0xC0, 0xAF,
+
+0x25, 0x44, 0x54, 0xB4,
+0x00, 0xE0,
+0xC8, 0x30,
+
+0x30, 0x46, 0x30, 0xAF,
+0x1B, 0x1B, 0x48, 0xAF,
+
+0x00, 0xE0,
+0x25, 0x20,
+0x38, 0x2C, 0x4F, 0xE9,
+
+0x86, 0x80, 0x57, 0xE9,
+0x38, 0x1D, 0x6F, 0x8F,
+
+0x28, 0x74,
+0x00, 0xE0,
+0x0D, 0x44, 0x4C, 0xB0,
+
+0x05, 0x44, 0x54, 0xB0,
+0x2D, 0x20,
+0x9B, 0x10,
+
+0x82, 0x3E, 0x57, 0xE9,
+0x32, 0xF0, 0x1B, 0xCD,
+
+0x1E, 0xBD, 0x59, 0x9F,
+0x83, 0x1E, 0x57, 0xE9,
+
+0x38, 0x47, 0x38, 0xAF,
+0x34, 0x20,
+0x2A, 0x30,
+
+0x00, 0xE0,
+0x0D, 0x20,
+0x32, 0x20,
+0x05, 0x20,
+
+0x87, 0x80, 0x57, 0xE9,
+0x1F, 0x54, 0x57, 0x9F,
+
+0x17, 0x42, 0x56, 0x9F,
+0x00, 0xE0,
+0x3B, 0x6A,
+
+0x3F, 0x8F, 0x51, 0x9F,
+0x37, 0x1E, 0x4F, 0xE9,
+
+0x37, 0x32, 0x2A, 0xAF,
+0x00, 0xE0,
+0x32, 0x00,
+
+0x00, 0x80, 0x00, 0xE8,
+0x27, 0xC0, 0x44, 0xC0,
+
+0x36, 0x1F, 0x4F, 0xE9,
+0x1F, 0x1F, 0x26, 0xDF,
+
+0x37, 0x1B, 0x37, 0xBF,
+0x17, 0x26, 0x17, 0xDF,
+
+0x3E, 0x17, 0x4F, 0xE9,
+0x3F, 0x3F, 0x4F, 0xE9,
+
+0x34, 0x1F, 0x34, 0xAF,
+0x2B, 0x05,
+0xA7, 0x20,
+
+0x33, 0x2B, 0x37, 0xDF,
+0x27, 0x17, 0xC0, 0xAF,
+
+0x34, 0x80, 0x4F, 0xE9,
+0x00, 0x80, 0x00, 0xE8,
+
+0x2D, 0x21, 0x1A, 0xB0,
+0x25, 0x21, 0x31, 0xB0,
+
+0x0D, 0x21, 0x1A, 0xB2,
+0x05, 0x21, 0x31, 0xB2,
+
+0x03, 0x80, 0x2A, 0xEA,
+0x17, 0xC1, 0x2B, 0xBD,
+
+0x2D, 0x20,
+0x25, 0x20,
+0x05, 0x20,
+0x0D, 0x20,
+
+0xB3, 0x68,
+0x97, 0x25,
+0x00, 0x80, 0x00, 0xE8,
+
+0x33, 0xC0, 0x33, 0xAF,
+0x2F, 0xC0, 0x21, 0xC0,
+
+0x16, 0x42, 0x56, 0x9F,
+0x3C, 0x27, 0x4F, 0xE9,
+
+0x1E, 0x62, 0x57, 0x9F,
+0x00, 0x80, 0x00, 0xE8,
+
+0x25, 0x21, 0x31, 0xB4,
+0x2D, 0x21, 0x1A, 0xB4,
+
+0x3F, 0x2F, 0x5D, 0x9F,
+0x00, 0x80, 0x00, 0xE8,
+
+0x33, 0x05,
+0x00, 0xE0,
+0x28, 0x19, 0x60, 0xEC,
+
+0x0D, 0x21, 0x1A, 0xB6,
+0x05, 0x21, 0x31, 0xB6,
+
+0x37, 0x0F, 0x5C, 0x9F,
+0x00, 0xE0,
+0x2F, 0x20,
+
+0x23, 0x3B, 0x33, 0xAD,
+0x1E, 0x26, 0x1E, 0xDF,
+
+0xA7, 0x1E, 0x4F, 0xE9,
+0x17, 0x26, 0x16, 0xDF,
+
+0x2D, 0x20,
+0x00, 0xE0,
+0xA8, 0x3F, 0x4F, 0xE9,
+
+0x2F, 0x2F, 0x1E, 0xAF,
+0x25, 0x20,
+0x00, 0xE0,
+
+0xA4, 0x16, 0x4F, 0xE9,
+0x0F, 0xC0, 0x21, 0xC2,
+
+0xA6, 0x80, 0x4F, 0xE9,
+0x1F, 0x62, 0x57, 0x9F,
+
+0x0D, 0x20,
+0x05, 0x20,
+0x2F, 0xC0, 0x21, 0xC6,
+
+0x2D, 0x44, 0x4C, 0xB6,
+0x25, 0x44, 0x54, 0xB6,
+
+0x3F, 0x2F, 0x5D, 0x9F,
+0x00, 0xE0,
+0x0F, 0x20,
+
+0x2D, 0x20,
+0x25, 0x20,
+0x07, 0xC0, 0x44, 0xC6,
+
+0x17, 0x50, 0x56, 0x9F,
+0xA5, 0x37, 0x4F, 0xE9,
+
+0x06, 0xC0, 0x21, 0xC4,
+0x0F, 0x17, 0x0F, 0xAF,
+
+0x37, 0x0F, 0x5C, 0x9F,
+0x00, 0x80, 0x00, 0xE8,
+
+0x1E, 0x62, 0x57, 0x9F,
+0x00, 0x80, 0x00, 0xE8,
+
+0x3E, 0x3D, 0x5D, 0x9F,
+0x00, 0xE0,
+0x07, 0x20,
+
+0x2F, 0x20,
+0x00, 0xE0,
+0xA3, 0x0F, 0x4F, 0xE9,
+
+0x06, 0x20,
+0x00, 0xE0,
+0x1F, 0x26, 0x1F, 0xDF,
+
+0x17, 0x26, 0x17, 0xDF,
+0xA1, 0x1F, 0x4F, 0xE9,
+
+0x1E, 0x26, 0x1E, 0xDF,
+0x9D, 0x1E, 0x4F, 0xE9,
+
+0x35, 0x17, 0x4F, 0xE9,
+0xA2, 0x3F, 0x4F, 0xE9,
+
+0x06, 0x06, 0x1F, 0xAF,
+0x39, 0x37, 0x4F, 0xE9,
+
+0x2F, 0x2F, 0x17, 0xAF,
+0x07, 0x07, 0x1E, 0xAF,
+
+0xA0, 0x80, 0x4F, 0xE9,
+0x9E, 0x3E, 0x4F, 0xE9,
+
+0x31, 0x80, 0x4F, 0xE9,
+0x9C, 0x80, 0x4F, 0xE9,
+
+0x00, 0x80, 0x00, 0xE8,
+0x57, 0x39, 0x20, 0xE9,
+
+0x16, 0x28, 0x20, 0xE9,
+0x1D, 0x3B, 0x20, 0xE9,
+
+0x1E, 0x2B, 0x20, 0xE9,
+0x2B, 0x32, 0x20, 0xE9,
+
+0x1C, 0x23, 0x20, 0xE9,
+0x57, 0x36, 0x20, 0xE9,
+
+0x00, 0x80, 0xA0, 0xE9,
+0x40, 0x40, 0xD8, 0xEC,
+
+0xFF, 0x80, 0xC0, 0xE9,
+0x90, 0xE2,
+0x00, 0xE0,
+
+0x63, 0xFF, 0x20, 0xEA,
+0x19, 0xC8, 0xC1, 0xCD,
+
+0x1F, 0xD7, 0x18, 0xBD,
+0x3F, 0xD7, 0x22, 0xBD,
+
+0x9F, 0x41, 0x49, 0xBD,
+0x00, 0x80, 0x00, 0xE8,
+
+0x25, 0x41, 0x49, 0xBD,
+0x2D, 0x41, 0x51, 0xBD,
+
+0x0D, 0x80, 0x07, 0xEA,
+0x00, 0x80, 0x00, 0xE8,
+
+0x35, 0x40, 0x48, 0xBD,
+0x3D, 0x40, 0x50, 0xBD,
+
+0x00, 0x80, 0x00, 0xE8,
+0x25, 0x30,
+0x2D, 0x30,
+
+0x35, 0x30,
+0xB5, 0x30,
+0xBD, 0x30,
+0x3D, 0x30,
+
+0x9C, 0xA7, 0x5B, 0x9F,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x62, 0xFF, 0x0A, 0xEA,
+0x00, 0x80, 0x00, 0xE8,
+
+0xC9, 0x41, 0xC8, 0xEC,
+0x42, 0xE1,
+0x00, 0xE0,
+
+0x60, 0xFF, 0x20, 0xEA,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0xC8, 0x40, 0xC0, 0xEC,
+0x00, 0x80, 0x00, 0xE8,
+
+0x5D, 0xFF, 0x20, 0xEA,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+};
+
+static unsigned char warp_g200_tgzsf[] = {
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x98, 0xA0, 0xE9,
+0x40, 0x40, 0xD8, 0xEC,
+
+0xFF, 0x80, 0xC0, 0xE9,
+0x00, 0x80, 0x00, 0xE8,
+
+0x1F, 0xD7, 0x18, 0xBD,
+0x3F, 0xD7, 0x22, 0xBD,
+
+0x81, 0x04,
+0x89, 0x04,
+0x01, 0x04,
+0x09, 0x04,
+
+0xC9, 0x41, 0xC0, 0xEC,
+0x11, 0x04,
+0x00, 0xE0,
+
+0x41, 0xCC, 0x41, 0xCD,
+0x49, 0xCC, 0x49, 0xCD,
+
+0xD1, 0x41, 0xC0, 0xEC,
+0x51, 0xCC, 0x51, 0xCD,
+
+0x80, 0x04,
+0x10, 0x04,
+0x08, 0x04,
+0x00, 0xE0,
+
+0x00, 0xCC, 0xC0, 0xCD,
+0xD1, 0x49, 0xC0, 0xEC,
+
+0x8A, 0x1F, 0x20, 0xE9,
+0x8B, 0x3F, 0x20, 0xE9,
+
+0x41, 0x3C, 0x41, 0xAD,
+0x49, 0x3C, 0x49, 0xAD,
+
+0x10, 0xCC, 0x10, 0xCD,
+0x08, 0xCC, 0x08, 0xCD,
+
+0xB9, 0x41, 0x49, 0xBB,
+0x1F, 0xF0, 0x41, 0xCD,
+
+0x51, 0x3C, 0x51, 0xAD,
+0x00, 0x98, 0x80, 0xE9,
+
+0x8F, 0x80, 0x07, 0xEA,
+0x24, 0x1F, 0x20, 0xE9,
+
+0x21, 0x45, 0x80, 0xE8,
+0x1A, 0x4D, 0x80, 0xE8,
+
+0x31, 0x55, 0x80, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x15, 0x41, 0x49, 0xBD,
+0x1D, 0x41, 0x51, 0xBD,
+
+0x2E, 0x41, 0x2A, 0xB8,
+0x34, 0x53, 0xA0, 0xE8,
+
+0x15, 0x30,
+0x1D, 0x30,
+0x58, 0xE3,
+0x00, 0xE0,
+
+0xB5, 0x40, 0x48, 0xBD,
+0x3D, 0x40, 0x50, 0xBD,
+
+0x24, 0x43, 0xA0, 0xE8,
+0x2C, 0x4B, 0xA0, 0xE8,
+
+0x15, 0x72,
+0x09, 0xE3,
+0x00, 0xE0,
+0x1D, 0x72,
+
+0x35, 0x30,
+0xB5, 0x30,
+0xBD, 0x30,
+0x3D, 0x30,
+
+0x9C, 0x97, 0x57, 0x9F,
+0x00, 0x80, 0x00, 0xE8,
+
+0x6C, 0x64, 0xC8, 0xEC,
+0x98, 0xE1,
+0xB5, 0x05,
+
+0xBD, 0x05,
+0x2E, 0x30,
+0x32, 0xC0, 0xA0, 0xE8,
+
+0x33, 0xC0, 0xA0, 0xE8,
+0x74, 0x64, 0xC8, 0xEC,
+
+0x40, 0x3C, 0x40, 0xAD,
+0x32, 0x6A,
+0x2A, 0x30,
+
+0x20, 0x73,
+0x33, 0x6A,
+0x00, 0xE0,
+0x28, 0x73,
+
+0x1C, 0x72,
+0x83, 0xE2,
+0x7B, 0x80, 0x15, 0xEA,
+
+0xB8, 0x3D, 0x28, 0xDF,
+0x30, 0x35, 0x20, 0xDF,
+
+0x40, 0x30,
+0x00, 0xE0,
+0xCC, 0xE2,
+0x64, 0x72,
+
+0x25, 0x42, 0x52, 0xBF,
+0x2D, 0x42, 0x4A, 0xBF,
+
+0x30, 0x2E, 0x30, 0xDF,
+0x38, 0x2E, 0x38, 0xDF,
+
+0x18, 0x1D, 0x45, 0xE9,
+0x1E, 0x15, 0x45, 0xE9,
+
+0x2B, 0x49, 0x51, 0xBD,
+0x00, 0xE0,
+0x1F, 0x73,
+
+0x38, 0x38, 0x40, 0xAF,
+0x30, 0x30, 0x40, 0xAF,
+
+0x24, 0x1F, 0x24, 0xDF,
+0x1D, 0x32, 0x20, 0xE9,
+
+0x2C, 0x1F, 0x2C, 0xDF,
+0x1A, 0x33, 0x20, 0xE9,
+
+0xB0, 0x10,
+0x08, 0xE3,
+0x40, 0x10,
+0xB8, 0x10,
+
+0x26, 0xF0, 0x30, 0xCD,
+0x2F, 0xF0, 0x38, 0xCD,
+
+0x2B, 0x80, 0x20, 0xE9,
+0x2A, 0x80, 0x20, 0xE9,
+
+0xA6, 0x20,
+0x88, 0xE2,
+0x00, 0xE0,
+0xAF, 0x20,
+
+0x28, 0x2A, 0x26, 0xAF,
+0x20, 0x2A, 0xC0, 0xAF,
+
+0x34, 0x1F, 0x34, 0xDF,
+0x46, 0x24, 0x46, 0xDF,
+
+0x28, 0x30, 0x80, 0xBF,
+0x20, 0x38, 0x80, 0xBF,
+
+0x47, 0x24, 0x47, 0xDF,
+0x4E, 0x2C, 0x4E, 0xDF,
+
+0x4F, 0x2C, 0x4F, 0xDF,
+0x56, 0x34, 0x56, 0xDF,
+
+0x28, 0x15, 0x28, 0xDF,
+0x20, 0x1D, 0x20, 0xDF,
+
+0x57, 0x34, 0x57, 0xDF,
+0x00, 0xE0,
+0x1D, 0x05,
+
+0x04, 0x80, 0x10, 0xEA,
+0x89, 0xE2,
+0x2B, 0x30,
+
+0x3F, 0xC1, 0x1D, 0xBD,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0xA0, 0x68,
+0xBF, 0x25,
+0x00, 0x80, 0x00, 0xE8,
+
+0x20, 0xC0, 0x20, 0xAF,
+0x28, 0x05,
+0x97, 0x74,
+
+0x00, 0xE0,
+0x2A, 0x10,
+0x16, 0xC0, 0x20, 0xE9,
+
+0x04, 0x80, 0x10, 0xEA,
+0x8C, 0xE2,
+0x95, 0x05,
+
+0x28, 0xC1, 0x28, 0xAD,
+0x1F, 0xC1, 0x15, 0xBD,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0xA8, 0x67,
+0x9F, 0x6B,
+0x00, 0x80, 0x00, 0xE8,
+
+0x28, 0xC0, 0x28, 0xAD,
+0x1D, 0x25,
+0x20, 0x05,
+
+0x28, 0x32, 0x80, 0xAD,
+0x40, 0x2A, 0x40, 0xBD,
+
+0x1C, 0x80, 0x20, 0xE9,
+0x20, 0x33, 0x20, 0xAD,
+
+0x20, 0x73,
+0x00, 0xE0,
+0xB6, 0x49, 0x51, 0xBB,
+
+0x26, 0x2F, 0xB0, 0xE8,
+0x19, 0x20, 0x20, 0xE9,
+
+0x35, 0x20, 0x35, 0xDF,
+0x3D, 0x20, 0x3D, 0xDF,
+
+0x15, 0x20, 0x15, 0xDF,
+0x1D, 0x20, 0x1D, 0xDF,
+
+0x26, 0xD0, 0x26, 0xCD,
+0x29, 0x49, 0x2A, 0xB8,
+
+0x26, 0x40, 0x80, 0xBD,
+0x3B, 0x48, 0x50, 0xBD,
+
+0x3E, 0x54, 0x57, 0x9F,
+0x00, 0xE0,
+0x82, 0xE1,
+
+0x1E, 0xAF, 0x59, 0x9F,
+0x00, 0x80, 0x00, 0xE8,
+
+0x26, 0x30,
+0x29, 0x30,
+0x48, 0x3C, 0x48, 0xAD,
+
+0x2B, 0x72,
+0xC2, 0xE1,
+0x2C, 0xC0, 0x44, 0xC2,
+
+0x05, 0x24, 0x34, 0xBF,
+0x0D, 0x24, 0x2C, 0xBF,
+
+0x2D, 0x46, 0x4E, 0xBF,
+0x25, 0x46, 0x56, 0xBF,
+
+0x20, 0x1D, 0x6F, 0x8F,
+0x32, 0x3E, 0x5F, 0xE9,
+
+0x3E, 0x50, 0x56, 0x9F,
+0x00, 0xE0,
+0x3B, 0x30,
+
+0x1E, 0x8F, 0x51, 0x9F,
+0x33, 0x1E, 0x5F, 0xE9,
+
+0x05, 0x44, 0x54, 0xB2,
+0x0D, 0x44, 0x4C, 0xB2,
+
+0x19, 0xC0, 0xB0, 0xE8,
+0x34, 0xC0, 0x44, 0xC4,
+
+0x33, 0x73,
+0x00, 0xE0,
+0x3E, 0x62, 0x57, 0x9F,
+
+0x1E, 0xAF, 0x59, 0x9F,
+0x00, 0xE0,
+0x0D, 0x20,
+
+0x84, 0x3E, 0x58, 0xE9,
+0x28, 0x1D, 0x6F, 0x8F,
+
+0x05, 0x20,
+0x00, 0xE0,
+0x85, 0x1E, 0x58, 0xE9,
+
+0x9B, 0x3B, 0x33, 0xDF,
+0x20, 0x20, 0x42, 0xAF,
+
+0x30, 0x42, 0x56, 0x9F,
+0x80, 0x3E, 0x57, 0xE9,
+
+0x3F, 0x8F, 0x51, 0x9F,
+0x30, 0x80, 0x5F, 0xE9,
+
+0x28, 0x28, 0x24, 0xAF,
+0x81, 0x1E, 0x57, 0xE9,
+
+0x05, 0x47, 0x57, 0xBF,
+0x0D, 0x47, 0x4F, 0xBF,
+
+0x88, 0x80, 0x58, 0xE9,
+0x1B, 0x29, 0x1B, 0xDF,
+
+0x30, 0x1D, 0x6F, 0x8F,
+0x3A, 0x30, 0x4F, 0xE9,
+
+0x1C, 0x30, 0x26, 0xDF,
+0x09, 0xE3,
+0x3B, 0x05,
+
+0x3E, 0x50, 0x56, 0x9F,
+0x3B, 0x3F, 0x4F, 0xE9,
+
+0x1E, 0x8F, 0x51, 0x9F,
+0x00, 0xE0,
+0xAC, 0x20,
+
+0x2D, 0x44, 0x4C, 0xB4,
+0x2C, 0x1C, 0xC0, 0xAF,
+
+0x25, 0x44, 0x54, 0xB4,
+0x00, 0xE0,
+0xC8, 0x30,
+
+0x30, 0x46, 0x30, 0xAF,
+0x1B, 0x1B, 0x48, 0xAF,
+
+0x00, 0xE0,
+0x25, 0x20,
+0x38, 0x2C, 0x4F, 0xE9,
+
+0x86, 0x80, 0x57, 0xE9,
+0x38, 0x1D, 0x6F, 0x8F,
+
+0x28, 0x74,
+0x00, 0xE0,
+0x0D, 0x44, 0x4C, 0xB0,
+
+0x05, 0x44, 0x54, 0xB0,
+0x2D, 0x20,
+0x9B, 0x10,
+
+0x82, 0x3E, 0x57, 0xE9,
+0x32, 0xF0, 0x1B, 0xCD,
+
+0x1E, 0xBD, 0x59, 0x9F,
+0x83, 0x1E, 0x57, 0xE9,
+
+0x38, 0x47, 0x38, 0xAF,
+0x34, 0x20,
+0x2A, 0x30,
+
+0x00, 0xE0,
+0x0D, 0x20,
+0x32, 0x20,
+0x05, 0x20,
+
+0x87, 0x80, 0x57, 0xE9,
+0x1F, 0x54, 0x57, 0x9F,
+
+0x17, 0x42, 0x56, 0x9F,
+0x00, 0xE0,
+0x3B, 0x6A,
+
+0x3F, 0x8F, 0x51, 0x9F,
+0x37, 0x1E, 0x4F, 0xE9,
+
+0x37, 0x32, 0x2A, 0xAF,
+0x00, 0xE0,
+0x32, 0x00,
+
+0x00, 0x80, 0x00, 0xE8,
+0x27, 0xC0, 0x44, 0xC0,
+
+0x36, 0x1F, 0x4F, 0xE9,
+0x1F, 0x1F, 0x26, 0xDF,
+
+0x37, 0x1B, 0x37, 0xBF,
+0x17, 0x26, 0x17, 0xDF,
+
+0x3E, 0x17, 0x4F, 0xE9,
+0x3F, 0x3F, 0x4F, 0xE9,
+
+0x34, 0x1F, 0x34, 0xAF,
+0x2B, 0x05,
+0xA7, 0x20,
+
+0x33, 0x2B, 0x37, 0xDF,
+0x27, 0x17, 0xC0, 0xAF,
+
+0x34, 0x80, 0x4F, 0xE9,
+0x00, 0x80, 0x00, 0xE8,
+
+0x2D, 0x21, 0x1A, 0xB0,
+0x25, 0x21, 0x31, 0xB0,
+
+0x0D, 0x21, 0x1A, 0xB2,
+0x05, 0x21, 0x31, 0xB2,
+
+0x03, 0x80, 0x2A, 0xEA,
+0x17, 0xC1, 0x2B, 0xBD,
+
+0x2D, 0x20,
+0x25, 0x20,
+0x05, 0x20,
+0x0D, 0x20,
+
+0xB3, 0x68,
+0x97, 0x25,
+0x00, 0x80, 0x00, 0xE8,
+
+0x33, 0xC0, 0x33, 0xAF,
+0x2F, 0xC0, 0x21, 0xC0,
+
+0x16, 0x42, 0x56, 0x9F,
+0x3C, 0x27, 0x4F, 0xE9,
+
+0x1E, 0x62, 0x57, 0x9F,
+0x00, 0x80, 0x00, 0xE8,
+
+0x25, 0x21, 0x31, 0xB4,
+0x2D, 0x21, 0x1A, 0xB4,
+
+0x3F, 0x2F, 0x5D, 0x9F,
+0x00, 0x80, 0x00, 0xE8,
+
+0x33, 0x05,
+0x00, 0xE0,
+0x28, 0x19, 0x60, 0xEC,
+
+0x0D, 0x21, 0x1A, 0xB6,
+0x05, 0x21, 0x31, 0xB6,
+
+0x37, 0x0F, 0x5C, 0x9F,
+0x00, 0xE0,
+0x2F, 0x20,
+
+0x23, 0x3B, 0x33, 0xAD,
+0x1E, 0x26, 0x1E, 0xDF,
+
+0xA7, 0x1E, 0x4F, 0xE9,
+0x17, 0x26, 0x16, 0xDF,
+
+0x2D, 0x20,
+0x00, 0xE0,
+0xA8, 0x3F, 0x4F, 0xE9,
+
+0x2F, 0x2F, 0x1E, 0xAF,
+0x25, 0x20,
+0x00, 0xE0,
+
+0xA4, 0x16, 0x4F, 0xE9,
+0x0F, 0xC0, 0x21, 0xC2,
+
+0xA6, 0x80, 0x4F, 0xE9,
+0x1F, 0x62, 0x57, 0x9F,
+
+0x0D, 0x20,
+0x05, 0x20,
+0x2F, 0xC0, 0x21, 0xC6,
+
+0x3F, 0x2F, 0x5D, 0x9F,
+0x00, 0xE0,
+0x0F, 0x20,
+
+0x17, 0x50, 0x56, 0x9F,
+0xA5, 0x37, 0x4F, 0xE9,
+
+0x06, 0xC0, 0x21, 0xC4,
+0x0F, 0x17, 0x0F, 0xAF,
+
+0x37, 0x0F, 0x5C, 0x9F,
+0x00, 0x80, 0x00, 0xE8,
+
+0x2F, 0x20,
+0x00, 0xE0,
+0xA3, 0x80, 0x4F, 0xE9,
+
+0x06, 0x20,
+0x00, 0xE0,
+0x1F, 0x26, 0x1F, 0xDF,
+
+0x17, 0x26, 0x17, 0xDF,
+0x35, 0x17, 0x4F, 0xE9,
+
+0xA1, 0x1F, 0x4F, 0xE9,
+0xA2, 0x3F, 0x4F, 0xE9,
+
+0x06, 0x06, 0x1F, 0xAF,
+0x39, 0x37, 0x4F, 0xE9,
+
+0x2F, 0x2F, 0x17, 0xAF,
+0x00, 0x80, 0x00, 0xE8,
+
+0xA0, 0x80, 0x4F, 0xE9,
+0x00, 0x80, 0x00, 0xE8,
+
+0x31, 0x80, 0x4F, 0xE9,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x57, 0x39, 0x20, 0xE9,
+
+0x16, 0x28, 0x20, 0xE9,
+0x1D, 0x3B, 0x20, 0xE9,
+
+0x1E, 0x2B, 0x20, 0xE9,
+0x2B, 0x32, 0x20, 0xE9,
+
+0x1C, 0x23, 0x20, 0xE9,
+0x57, 0x36, 0x20, 0xE9,
+
+0x00, 0x80, 0xA0, 0xE9,
+0x40, 0x40, 0xD8, 0xEC,
+
+0xFF, 0x80, 0xC0, 0xE9,
+0x90, 0xE2,
+0x00, 0xE0,
+
+0x68, 0xFF, 0x20, 0xEA,
+0x19, 0xC8, 0xC1, 0xCD,
+
+0x1F, 0xD7, 0x18, 0xBD,
+0x3F, 0xD7, 0x22, 0xBD,
+
+0x9F, 0x41, 0x49, 0xBD,
+0x00, 0x80, 0x00, 0xE8,
+
+0x25, 0x41, 0x49, 0xBD,
+0x2D, 0x41, 0x51, 0xBD,
+
+0x0D, 0x80, 0x07, 0xEA,
+0x00, 0x80, 0x00, 0xE8,
+
+0x35, 0x40, 0x48, 0xBD,
+0x3D, 0x40, 0x50, 0xBD,
+
+0x00, 0x80, 0x00, 0xE8,
+0x25, 0x30,
+0x2D, 0x30,
+
+0x35, 0x30,
+0xB5, 0x30,
+0xBD, 0x30,
+0x3D, 0x30,
+
+0x9C, 0xA7, 0x5B, 0x9F,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x67, 0xFF, 0x0A, 0xEA,
+0x00, 0x80, 0x00, 0xE8,
+
+0xC9, 0x41, 0xC8, 0xEC,
+0x42, 0xE1,
+0x00, 0xE0,
+
+0x65, 0xFF, 0x20, 0xEA,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0xC8, 0x40, 0xC0, 0xEC,
+0x00, 0x80, 0x00, 0xE8,
+
+0x62, 0xFF, 0x20, 0xEA,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+};
+
+static unsigned char warp_g400_t2gz[] = {
+
+0x00, 0x8A, 0x98, 0xE9,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0xA0, 0xE9,
+0x00, 0x00, 0xD8, 0xEC,
+
+0xFF, 0x80, 0xC0, 0xE9,
+0x00, 0x80, 0x00, 0xE8,
+
+0x0A, 0x40, 0x50, 0xBF,
+0x2A, 0x40, 0x60, 0xBF,
+
+0x32, 0x41, 0x51, 0xBF,
+0x3A, 0x41, 0x61, 0xBF,
+
+0xC3, 0x6B,
+0xD3, 0x6B,
+0x00, 0x8A, 0x98, 0xE9,
+
+0x73, 0x7B, 0xC8, 0xEC,
+0x96, 0xE2,
+0x41, 0x04,
+
+0x7B, 0x43, 0xA0, 0xE8,
+0x73, 0x53, 0xA0, 0xE8,
+
+0xAD, 0xEE, 0x23, 0x9F,
+0x00, 0xE0,
+0x51, 0x04,
+
+0x90, 0xE2,
+0x61, 0x04,
+0x31, 0x46, 0xB1, 0xE8,
+
+0x51, 0x41, 0xE0, 0xEC,
+0x39, 0x67, 0xB1, 0xE8,
+
+0x00, 0x04,
+0x46, 0xE2,
+0x73, 0x63, 0xA0, 0xE8,
+
+0x61, 0x41, 0xE0, 0xEC,
+0x31, 0x00,
+0x39, 0x00,
+
+0x78, 0x80, 0x15, 0xEA,
+0x10, 0x04,
+0x20, 0x04,
+
+0x61, 0x51, 0xE0, 0xEC,
+0x2F, 0x41, 0x60, 0xEA,
+
+0x31, 0x20,
+0x39, 0x20,
+0x1F, 0x42, 0xA0, 0xE8,
+
+0x2A, 0x42, 0x52, 0xBF,
+0x0F, 0x52, 0xA0, 0xE8,
+
+0x1A, 0x42, 0x62, 0xBF,
+0x1E, 0x51, 0x60, 0xEA,
+
+0x73, 0x7B, 0xC8, 0xEC,
+0x0E, 0x61, 0x60, 0xEA,
+
+0x32, 0x40, 0x50, 0xBD,
+0x22, 0x40, 0x60, 0xBD,
+
+0x12, 0x41, 0x51, 0xBD,
+0x3A, 0x41, 0x61, 0xBD,
+
+0xBF, 0x2F, 0x0E, 0xBD,
+0x97, 0xE2,
+0x7B, 0x72,
+
+0x32, 0x20,
+0x22, 0x20,
+0x12, 0x20,
+0x3A, 0x20,
+
+0x35, 0x48, 0xB1, 0xE8,
+0x3D, 0x59, 0xB1, 0xE8,
+
+0x46, 0x31, 0x46, 0xBF,
+0x56, 0x31, 0x56, 0xBF,
+
+0xB3, 0xE2, 0x2D, 0x9F,
+0x00, 0x80, 0x00, 0xE8,
+
+0x66, 0x31, 0x66, 0xBF,
+0x47, 0x39, 0x47, 0xBF,
+
+0x57, 0x39, 0x57, 0xBF,
+0x67, 0x39, 0x67, 0xBF,
+
+0x69, 0x80, 0x07, 0xEA,
+0x24, 0x41, 0x20, 0xE9,
+
+0x35, 0x00,
+0x3D, 0x00,
+0x00, 0xE0,
+0x2D, 0x73,
+
+0x33, 0x72,
+0x0C, 0xE3,
+0x8D, 0x2F, 0x1E, 0xBD,
+
+0x43, 0x75, 0xF8, 0xEC,
+0x35, 0x20,
+0x3D, 0x20,
+
+0x43, 0x43, 0x2D, 0xDF,
+0x53, 0x53, 0x2D, 0xDF,
+
+0xAE, 0x1E, 0x0E, 0xBD,
+0x58, 0xE3,
+0x33, 0x66,
+
+0x48, 0x35, 0x48, 0xBF,
+0x58, 0x35, 0x58, 0xBF,
+
+0x68, 0x35, 0x68, 0xBF,
+0x49, 0x3D, 0x49, 0xBF,
+
+0x59, 0x3D, 0x59, 0xBF,
+0x69, 0x3D, 0x69, 0xBF,
+
+0x63, 0x63, 0x2D, 0xDF,
+0x4D, 0x7D, 0xF8, 0xEC,
+
+0x59, 0xE3,
+0x00, 0xE0,
+0xB8, 0x38, 0x33, 0xBF,
+
+0x2D, 0x73,
+0x30, 0x76,
+0x18, 0x3A, 0x41, 0xE9,
+
+0x3F, 0x53, 0xA0, 0xE8,
+0x05, 0x80, 0x3D, 0xEA,
+
+0x37, 0x43, 0xA0, 0xE8,
+0x3D, 0x63, 0xA0, 0xE8,
+
+0x50, 0x70, 0xF8, 0xEC,
+0x2B, 0x50, 0x3C, 0xE9,
+
+0x1F, 0x0F, 0xBC, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x59, 0x78, 0xF8, 0xEC,
+0x00, 0x80, 0x00, 0xE8,
+
+0x15, 0xC0, 0x20, 0xE9,
+0x15, 0xC0, 0x20, 0xE9,
+
+0x15, 0xC0, 0x20, 0xE9,
+0x15, 0xC0, 0x20, 0xE9,
+
+0x1E, 0x12, 0x41, 0xE9,
+0x1A, 0x22, 0x41, 0xE9,
+
+0x46, 0x37, 0x46, 0xDF,
+0x56, 0x3F, 0x56, 0xDF,
+
+0x2B, 0x40, 0x3D, 0xE9,
+0x66, 0x3D, 0x66, 0xDF,
+
+0x1D, 0x32, 0x41, 0xE9,
+0x67, 0x3D, 0x67, 0xDF,
+
+0x47, 0x37, 0x47, 0xDF,
+0x57, 0x3F, 0x57, 0xDF,
+
+0x2A, 0x40, 0x20, 0xE9,
+0x59, 0x3F, 0x59, 0xDF,
+
+0x16, 0x30, 0x20, 0xE9,
+0x69, 0x3D, 0x69, 0xDF,
+
+0x48, 0x37, 0x48, 0xDF,
+0x58, 0x3F, 0x58, 0xDF,
+
+0x12, 0x12, 0x2D, 0xDF,
+0x22, 0x22, 0x2D, 0xDF,
+
+0x32, 0x32, 0x2D, 0xDF,
+0x3A, 0x3A, 0x2D, 0xDF,
+
+0x68, 0x3D, 0x68, 0xDF,
+0x49, 0x37, 0x49, 0xDF,
+
+0x3D, 0xCF, 0x74, 0xC0,
+0x37, 0xCF, 0x74, 0xC4,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x34, 0x80, 0x20, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0x3C, 0x3D, 0x20, 0xE9,
+
+0x0A, 0x44, 0x54, 0xB0,
+0x02, 0x44, 0x64, 0xB0,
+
+0x2A, 0x44, 0x54, 0xB2,
+0x1A, 0x44, 0x64, 0xB2,
+
+0x25, 0x80, 0x3A, 0xEA,
+0x0A, 0x20,
+0x02, 0x20,
+
+0x3D, 0xCF, 0x74, 0xC2,
+0x2A, 0x20,
+0x1A, 0x20,
+
+0x30, 0x50, 0x2E, 0x9F,
+0x32, 0x31, 0x5F, 0xE9,
+
+0x38, 0x21, 0x2C, 0x9F,
+0x33, 0x39, 0x5F, 0xE9,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x00, 0x80, 0x00, 0xE8,
+
+0x2A, 0x44, 0x54, 0xB4,
+0x1A, 0x44, 0x64, 0xB4,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0x38, 0x3D, 0x20, 0xE9,
+
+0x88, 0x73, 0x5E, 0xE9,
+0x2A, 0x20,
+0x1A, 0x20,
+
+0x2A, 0x46, 0x56, 0xBF,
+0x1A, 0x46, 0x66, 0xBF,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x3E, 0x30, 0x4F, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0x3F, 0x38, 0x4F, 0xE9,
+
+0x0A, 0x47, 0x57, 0xBF,
+0x02, 0x47, 0x67, 0xBF,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x3A, 0x31, 0x4F, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0x3B, 0x39, 0x4F, 0xE9,
+
+0x2A, 0x43, 0x53, 0xBF,
+0x1A, 0x43, 0x63, 0xBF,
+
+0x30, 0x50, 0x2E, 0x9F,
+0x36, 0x31, 0x4F, 0xE9,
+
+0x38, 0x21, 0x2C, 0x9F,
+0x37, 0x39, 0x4F, 0xE9,
+
+0x0A, 0x48, 0x58, 0xBF,
+0x02, 0x48, 0x68, 0xBF,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x80, 0x31, 0x57, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0x81, 0x39, 0x57, 0xE9,
+
+0x2A, 0x49, 0x59, 0xBF,
+0x1A, 0x49, 0x69, 0xBF,
+
+0x30, 0x50, 0x2E, 0x9F,
+0x82, 0x30, 0x57, 0xE9,
+
+0x38, 0x21, 0x2C, 0x9F,
+0x83, 0x38, 0x57, 0xE9,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x84, 0x31, 0x5E, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0x85, 0x39, 0x5E, 0xE9,
+
+0x86, 0x76, 0x57, 0xE9,
+0x8A, 0x36, 0x20, 0xE9,
+
+0x87, 0x77, 0x57, 0xE9,
+0x8B, 0x3E, 0xBF, 0xEA,
+
+0x80, 0x30, 0x57, 0xE9,
+0x81, 0x38, 0x57, 0xE9,
+
+0x82, 0x31, 0x57, 0xE9,
+0x86, 0x78, 0x57, 0xE9,
+
+0x83, 0x39, 0x57, 0xE9,
+0x87, 0x79, 0x57, 0xE9,
+
+0x30, 0x1F, 0x5F, 0xE9,
+0x8A, 0x34, 0x20, 0xE9,
+
+0x8B, 0x3C, 0x20, 0xE9,
+0x37, 0x50, 0x60, 0xBD,
+
+0x57, 0x0D, 0x20, 0xE9,
+0x35, 0x51, 0x61, 0xBD,
+
+0x2B, 0x50, 0x20, 0xE9,
+0x1D, 0x37, 0xE1, 0xEA,
+
+0x1E, 0x35, 0xE1, 0xEA,
+0x00, 0xE0,
+0x0E, 0x77,
+
+0x24, 0x51, 0x20, 0xE9,
+0x9F, 0xFF, 0x20, 0xEA,
+
+0x16, 0x0E, 0x20, 0xE9,
+0x57, 0x2E, 0xBF, 0xEA,
+
+0x0B, 0x46, 0xA0, 0xE8,
+0x1B, 0x56, 0xA0, 0xE8,
+
+0x2B, 0x66, 0xA0, 0xE8,
+0x0C, 0x47, 0xA0, 0xE8,
+
+0x1C, 0x57, 0xA0, 0xE8,
+0x2C, 0x67, 0xA0, 0xE8,
+
+0x0B, 0x00,
+0x1B, 0x00,
+0x2B, 0x00,
+0x00, 0xE0,
+
+0x0C, 0x00,
+0x1C, 0x00,
+0x2C, 0x00,
+0x00, 0xE0,
+
+0x0B, 0x65,
+0x1B, 0x65,
+0x2B, 0x65,
+0x00, 0xE0,
+
+0x0C, 0x65,
+0x1C, 0x65,
+0x2C, 0x65,
+0x00, 0xE0,
+
+0x0B, 0x1B, 0x60, 0xEC,
+0x36, 0xD7, 0x36, 0xAD,
+
+0x2B, 0x80, 0x60, 0xEC,
+0x0C, 0x1C, 0x60, 0xEC,
+
+0x3E, 0xD7, 0x3E, 0xAD,
+0x2C, 0x80, 0x60, 0xEC,
+
+0x0B, 0x2B, 0xDE, 0xE8,
+0x1B, 0x80, 0xDE, 0xE8,
+
+0x36, 0x80, 0x36, 0xBD,
+0x3E, 0x80, 0x3E, 0xBD,
+
+0x33, 0xD7, 0x0B, 0xBD,
+0x3B, 0xD7, 0x1B, 0xBD,
+
+0x46, 0x80, 0x46, 0xCF,
+0x57, 0x80, 0x57, 0xCF,
+
+0x66, 0x33, 0x66, 0xCF,
+0x47, 0x3B, 0x47, 0xCF,
+
+0x56, 0x33, 0x56, 0xCF,
+0x67, 0x3B, 0x67, 0xCF,
+
+0x0B, 0x48, 0xA0, 0xE8,
+0x1B, 0x58, 0xA0, 0xE8,
+
+0x2B, 0x68, 0xA0, 0xE8,
+0x0C, 0x49, 0xA0, 0xE8,
+
+0x1C, 0x59, 0xA0, 0xE8,
+0x2C, 0x69, 0xA0, 0xE8,
+
+0x0B, 0x00,
+0x1B, 0x00,
+0x2B, 0x00,
+0x00, 0xE0,
+
+0x0C, 0x00,
+0x1C, 0x00,
+0x2C, 0x00,
+0x00, 0xE0,
+
+0x0B, 0x65,
+0x1B, 0x65,
+0x2B, 0x65,
+0x00, 0xE0,
+
+0x0C, 0x65,
+0x1C, 0x65,
+0x2C, 0x65,
+0x00, 0xE0,
+
+0x0B, 0x1B, 0x60, 0xEC,
+0x34, 0xD7, 0x34, 0xAD,
+
+0x2B, 0x80, 0x60, 0xEC,
+0x0C, 0x1C, 0x60, 0xEC,
+
+0x3C, 0xD7, 0x3C, 0xAD,
+0x2C, 0x80, 0x60, 0xEC,
+
+0x0B, 0x2B, 0xDE, 0xE8,
+0x1B, 0x80, 0xDE, 0xE8,
+
+0x34, 0x80, 0x34, 0xBD,
+0x3C, 0x80, 0x3C, 0xBD,
+
+0x33, 0xD7, 0x0B, 0xBD,
+0x3B, 0xD7, 0x1B, 0xBD,
+
+0x48, 0x80, 0x48, 0xCF,
+0x59, 0x80, 0x59, 0xCF,
+
+0x68, 0x33, 0x68, 0xCF,
+0x49, 0x3B, 0x49, 0xCF,
+
+0xBE, 0xFF, 0x20, 0xEA,
+0x00, 0x80, 0x00, 0xE8,
+
+0x58, 0x33, 0x58, 0xCF,
+0x69, 0x3B, 0x69, 0xCF,
+
+0x7D, 0xFF, 0x20, 0xEA,
+0x57, 0xC0, 0xBF, 0xEA,
+
+0x00, 0x80, 0xA0, 0xE9,
+0x00, 0x00, 0xD8, 0xEC,
+
+};
+
+static unsigned char warp_g400_t2gza[] = {
+
+0x00, 0x8A, 0x98, 0xE9,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0xA0, 0xE9,
+0x00, 0x00, 0xD8, 0xEC,
+
+0xFF, 0x80, 0xC0, 0xE9,
+0x00, 0x80, 0x00, 0xE8,
+
+0x0A, 0x40, 0x50, 0xBF,
+0x2A, 0x40, 0x60, 0xBF,
+
+0x32, 0x41, 0x51, 0xBF,
+0x3A, 0x41, 0x61, 0xBF,
+
+0xC3, 0x6B,
+0xD3, 0x6B,
+0x00, 0x8A, 0x98, 0xE9,
+
+0x73, 0x7B, 0xC8, 0xEC,
+0x96, 0xE2,
+0x41, 0x04,
+
+0x7B, 0x43, 0xA0, 0xE8,
+0x73, 0x53, 0xA0, 0xE8,
+
+0xAD, 0xEE, 0x23, 0x9F,
+0x00, 0xE0,
+0x51, 0x04,
+
+0x90, 0xE2,
+0x61, 0x04,
+0x31, 0x46, 0xB1, 0xE8,
+
+0x51, 0x41, 0xE0, 0xEC,
+0x39, 0x67, 0xB1, 0xE8,
+
+0x00, 0x04,
+0x46, 0xE2,
+0x73, 0x63, 0xA0, 0xE8,
+
+0x61, 0x41, 0xE0, 0xEC,
+0x31, 0x00,
+0x39, 0x00,
+
+0x7C, 0x80, 0x15, 0xEA,
+0x10, 0x04,
+0x20, 0x04,
+
+0x61, 0x51, 0xE0, 0xEC,
+0x2F, 0x41, 0x60, 0xEA,
+
+0x31, 0x20,
+0x39, 0x20,
+0x1F, 0x42, 0xA0, 0xE8,
+
+0x2A, 0x42, 0x52, 0xBF,
+0x0F, 0x52, 0xA0, 0xE8,
+
+0x1A, 0x42, 0x62, 0xBF,
+0x1E, 0x51, 0x60, 0xEA,
+
+0x73, 0x7B, 0xC8, 0xEC,
+0x0E, 0x61, 0x60, 0xEA,
+
+0x32, 0x40, 0x50, 0xBD,
+0x22, 0x40, 0x60, 0xBD,
+
+0x12, 0x41, 0x51, 0xBD,
+0x3A, 0x41, 0x61, 0xBD,
+
+0xBF, 0x2F, 0x0E, 0xBD,
+0x97, 0xE2,
+0x7B, 0x72,
+
+0x32, 0x20,
+0x22, 0x20,
+0x12, 0x20,
+0x3A, 0x20,
+
+0x35, 0x48, 0xB1, 0xE8,
+0x3D, 0x59, 0xB1, 0xE8,
+
+0x46, 0x31, 0x46, 0xBF,
+0x56, 0x31, 0x56, 0xBF,
+
+0xB3, 0xE2, 0x2D, 0x9F,
+0x00, 0x80, 0x00, 0xE8,
+
+0x66, 0x31, 0x66, 0xBF,
+0x47, 0x39, 0x47, 0xBF,
+
+0x57, 0x39, 0x57, 0xBF,
+0x67, 0x39, 0x67, 0xBF,
+
+0x6D, 0x80, 0x07, 0xEA,
+0x24, 0x41, 0x20, 0xE9,
+
+0x35, 0x00,
+0x3D, 0x00,
+0x00, 0xE0,
+0x2D, 0x73,
+
+0x33, 0x72,
+0x0C, 0xE3,
+0x8D, 0x2F, 0x1E, 0xBD,
+
+0x43, 0x75, 0xF8, 0xEC,
+0x35, 0x20,
+0x3D, 0x20,
+
+0x43, 0x43, 0x2D, 0xDF,
+0x53, 0x53, 0x2D, 0xDF,
+
+0xAE, 0x1E, 0x0E, 0xBD,
+0x58, 0xE3,
+0x33, 0x66,
+
+0x48, 0x35, 0x48, 0xBF,
+0x58, 0x35, 0x58, 0xBF,
+
+0x68, 0x35, 0x68, 0xBF,
+0x49, 0x3D, 0x49, 0xBF,
+
+0x59, 0x3D, 0x59, 0xBF,
+0x69, 0x3D, 0x69, 0xBF,
+
+0x63, 0x63, 0x2D, 0xDF,
+0x4D, 0x7D, 0xF8, 0xEC,
+
+0x59, 0xE3,
+0x00, 0xE0,
+0xB8, 0x38, 0x33, 0xBF,
+
+0x2D, 0x73,
+0x30, 0x76,
+0x18, 0x3A, 0x41, 0xE9,
+
+0x3F, 0x53, 0xA0, 0xE8,
+0x05, 0x80, 0x3D, 0xEA,
+
+0x37, 0x43, 0xA0, 0xE8,
+0x3D, 0x63, 0xA0, 0xE8,
+
+0x50, 0x70, 0xF8, 0xEC,
+0x2B, 0x50, 0x3C, 0xE9,
+
+0x1F, 0x0F, 0xBC, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x59, 0x78, 0xF8, 0xEC,
+0x00, 0x80, 0x00, 0xE8,
+
+0x15, 0xC0, 0x20, 0xE9,
+0x15, 0xC0, 0x20, 0xE9,
+
+0x15, 0xC0, 0x20, 0xE9,
+0x15, 0xC0, 0x20, 0xE9,
+
+0x1E, 0x12, 0x41, 0xE9,
+0x1A, 0x22, 0x41, 0xE9,
+
+0x46, 0x37, 0x46, 0xDF,
+0x56, 0x3F, 0x56, 0xDF,
+
+0x2B, 0x40, 0x3D, 0xE9,
+0x66, 0x3D, 0x66, 0xDF,
+
+0x1D, 0x32, 0x41, 0xE9,
+0x67, 0x3D, 0x67, 0xDF,
+
+0x47, 0x37, 0x47, 0xDF,
+0x57, 0x3F, 0x57, 0xDF,
+
+0x2A, 0x40, 0x20, 0xE9,
+0x59, 0x3F, 0x59, 0xDF,
+
+0x16, 0x30, 0x20, 0xE9,
+0x69, 0x3D, 0x69, 0xDF,
+
+0x48, 0x37, 0x48, 0xDF,
+0x58, 0x3F, 0x58, 0xDF,
+
+0x12, 0x12, 0x2D, 0xDF,
+0x22, 0x22, 0x2D, 0xDF,
+
+0x32, 0x32, 0x2D, 0xDF,
+0x3A, 0x3A, 0x2D, 0xDF,
+
+0x68, 0x3D, 0x68, 0xDF,
+0x49, 0x37, 0x49, 0xDF,
+
+0x3D, 0xCF, 0x74, 0xC0,
+0x37, 0xCF, 0x74, 0xC4,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x34, 0x80, 0x20, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0x3C, 0x3D, 0x20, 0xE9,
+
+0x0A, 0x44, 0x54, 0xB0,
+0x02, 0x44, 0x64, 0xB0,
+
+0x2A, 0x44, 0x54, 0xB2,
+0x1A, 0x44, 0x64, 0xB2,
+
+0x29, 0x80, 0x3A, 0xEA,
+0x0A, 0x20,
+0x02, 0x20,
+
+0x0F, 0xCF, 0x74, 0xC6,
+0x3D, 0xCF, 0x74, 0xC2,
+
+0x88, 0x73, 0x5E, 0xE9,
+0x2A, 0x20,
+0x1A, 0x20,
+
+0x30, 0x50, 0x2E, 0x9F,
+0x32, 0x31, 0x5F, 0xE9,
+
+0x38, 0x21, 0x2C, 0x9F,
+0x33, 0x39, 0x5F, 0xE9,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x9C, 0x0F, 0x20, 0xE9,
+
+0x0A, 0x44, 0x54, 0xB4,
+0x02, 0x44, 0x64, 0xB4,
+
+0x2A, 0x44, 0x54, 0xB6,
+0x1A, 0x44, 0x64, 0xB6,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0x38, 0x3D, 0x20, 0xE9,
+
+0x0A, 0x20,
+0x02, 0x20,
+0x2A, 0x20,
+0x1A, 0x20,
+
+0x0A, 0x47, 0x57, 0xBF,
+0x02, 0x47, 0x67, 0xBF,
+
+0x30, 0x50, 0x2E, 0x9F,
+0x3E, 0x30, 0x4F, 0xE9,
+
+0x38, 0x21, 0x2C, 0x9F,
+0x3F, 0x38, 0x4F, 0xE9,
+
+0x2A, 0x46, 0x56, 0xBF,
+0x1A, 0x46, 0x66, 0xBF,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x3A, 0x31, 0x4F, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0x3B, 0x39, 0x4F, 0xE9,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x36, 0x30, 0x4F, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0x37, 0x38, 0x4F, 0xE9,
+
+0x2A, 0x43, 0x53, 0xBF,
+0x1A, 0x43, 0x63, 0xBF,
+
+0x30, 0x50, 0x2E, 0x9F,
+0x9D, 0x31, 0x4F, 0xE9,
+
+0x38, 0x21, 0x2C, 0x9F,
+0x9E, 0x39, 0x4F, 0xE9,
+
+0x0A, 0x48, 0x58, 0xBF,
+0x02, 0x48, 0x68, 0xBF,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x80, 0x31, 0x57, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0x81, 0x39, 0x57, 0xE9,
+
+0x2A, 0x49, 0x59, 0xBF,
+0x1A, 0x49, 0x69, 0xBF,
+
+0x30, 0x50, 0x2E, 0x9F,
+0x82, 0x30, 0x57, 0xE9,
+
+0x38, 0x21, 0x2C, 0x9F,
+0x83, 0x38, 0x57, 0xE9,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x84, 0x31, 0x5E, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0x85, 0x39, 0x5E, 0xE9,
+
+0x86, 0x76, 0x57, 0xE9,
+0x8A, 0x36, 0x20, 0xE9,
+
+0x87, 0x77, 0x57, 0xE9,
+0x8B, 0x3E, 0xBF, 0xEA,
+
+0x80, 0x30, 0x57, 0xE9,
+0x81, 0x38, 0x57, 0xE9,
+
+0x82, 0x31, 0x57, 0xE9,
+0x86, 0x78, 0x57, 0xE9,
+
+0x83, 0x39, 0x57, 0xE9,
+0x87, 0x79, 0x57, 0xE9,
+
+0x30, 0x1F, 0x5F, 0xE9,
+0x8A, 0x34, 0x20, 0xE9,
+
+0x8B, 0x3C, 0x20, 0xE9,
+0x37, 0x50, 0x60, 0xBD,
+
+0x57, 0x0D, 0x20, 0xE9,
+0x35, 0x51, 0x61, 0xBD,
+
+0x2B, 0x50, 0x20, 0xE9,
+0x1D, 0x37, 0xE1, 0xEA,
+
+0x1E, 0x35, 0xE1, 0xEA,
+0x00, 0xE0,
+0x0E, 0x77,
+
+0x24, 0x51, 0x20, 0xE9,
+0x9B, 0xFF, 0x20, 0xEA,
+
+0x16, 0x0E, 0x20, 0xE9,
+0x57, 0x2E, 0xBF, 0xEA,
+
+0x0B, 0x46, 0xA0, 0xE8,
+0x1B, 0x56, 0xA0, 0xE8,
+
+0x2B, 0x66, 0xA0, 0xE8,
+0x0C, 0x47, 0xA0, 0xE8,
+
+0x1C, 0x57, 0xA0, 0xE8,
+0x2C, 0x67, 0xA0, 0xE8,
+
+0x0B, 0x00,
+0x1B, 0x00,
+0x2B, 0x00,
+0x00, 0xE0,
+
+0x0C, 0x00,
+0x1C, 0x00,
+0x2C, 0x00,
+0x00, 0xE0,
+
+0x0B, 0x65,
+0x1B, 0x65,
+0x2B, 0x65,
+0x00, 0xE0,
+
+0x0C, 0x65,
+0x1C, 0x65,
+0x2C, 0x65,
+0x00, 0xE0,
+
+0x0B, 0x1B, 0x60, 0xEC,
+0x36, 0xD7, 0x36, 0xAD,
+
+0x2B, 0x80, 0x60, 0xEC,
+0x0C, 0x1C, 0x60, 0xEC,
+
+0x3E, 0xD7, 0x3E, 0xAD,
+0x2C, 0x80, 0x60, 0xEC,
+
+0x0B, 0x2B, 0xDE, 0xE8,
+0x1B, 0x80, 0xDE, 0xE8,
+
+0x36, 0x80, 0x36, 0xBD,
+0x3E, 0x80, 0x3E, 0xBD,
+
+0x33, 0xD7, 0x0B, 0xBD,
+0x3B, 0xD7, 0x1B, 0xBD,
+
+0x46, 0x80, 0x46, 0xCF,
+0x57, 0x80, 0x57, 0xCF,
+
+0x66, 0x33, 0x66, 0xCF,
+0x47, 0x3B, 0x47, 0xCF,
+
+0x56, 0x33, 0x56, 0xCF,
+0x67, 0x3B, 0x67, 0xCF,
+
+0x0B, 0x48, 0xA0, 0xE8,
+0x1B, 0x58, 0xA0, 0xE8,
+
+0x2B, 0x68, 0xA0, 0xE8,
+0x0C, 0x49, 0xA0, 0xE8,
+
+0x1C, 0x59, 0xA0, 0xE8,
+0x2C, 0x69, 0xA0, 0xE8,
+
+0x0B, 0x00,
+0x1B, 0x00,
+0x2B, 0x00,
+0x00, 0xE0,
+
+0x0C, 0x00,
+0x1C, 0x00,
+0x2C, 0x00,
+0x00, 0xE0,
+
+0x0B, 0x65,
+0x1B, 0x65,
+0x2B, 0x65,
+0x00, 0xE0,
+
+0x0C, 0x65,
+0x1C, 0x65,
+0x2C, 0x65,
+0x00, 0xE0,
+
+0x0B, 0x1B, 0x60, 0xEC,
+0x34, 0xD7, 0x34, 0xAD,
+
+0x2B, 0x80, 0x60, 0xEC,
+0x0C, 0x1C, 0x60, 0xEC,
+
+0x3C, 0xD7, 0x3C, 0xAD,
+0x2C, 0x80, 0x60, 0xEC,
+
+0x0B, 0x2B, 0xDE, 0xE8,
+0x1B, 0x80, 0xDE, 0xE8,
+
+0x34, 0x80, 0x34, 0xBD,
+0x3C, 0x80, 0x3C, 0xBD,
+
+0x33, 0xD7, 0x0B, 0xBD,
+0x3B, 0xD7, 0x1B, 0xBD,
+
+0x48, 0x80, 0x48, 0xCF,
+0x59, 0x80, 0x59, 0xCF,
+
+0x68, 0x33, 0x68, 0xCF,
+0x49, 0x3B, 0x49, 0xCF,
+
+0xBA, 0xFF, 0x20, 0xEA,
+0x00, 0x80, 0x00, 0xE8,
+
+0x58, 0x33, 0x58, 0xCF,
+0x69, 0x3B, 0x69, 0xCF,
+
+0x79, 0xFF, 0x20, 0xEA,
+0x57, 0xC0, 0xBF, 0xEA,
+
+0x00, 0x80, 0xA0, 0xE9,
+0x00, 0x00, 0xD8, 0xEC,
+
+};
+
+static unsigned char warp_g400_t2gzaf[] = {
+
+0x00, 0x8A, 0x98, 0xE9,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0xA0, 0xE9,
+0x00, 0x00, 0xD8, 0xEC,
+
+0xFF, 0x80, 0xC0, 0xE9,
+0x00, 0x80, 0x00, 0xE8,
+
+0x0A, 0x40, 0x50, 0xBF,
+0x2A, 0x40, 0x60, 0xBF,
+
+0x32, 0x41, 0x51, 0xBF,
+0x3A, 0x41, 0x61, 0xBF,
+
+0xC3, 0x6B,
+0xD3, 0x6B,
+0x00, 0x8A, 0x98, 0xE9,
+
+0x73, 0x7B, 0xC8, 0xEC,
+0x96, 0xE2,
+0x41, 0x04,
+
+0x7B, 0x43, 0xA0, 0xE8,
+0x73, 0x53, 0xA0, 0xE8,
+
+0xAD, 0xEE, 0x23, 0x9F,
+0x00, 0xE0,
+0x51, 0x04,
+
+0x90, 0xE2,
+0x61, 0x04,
+0x31, 0x46, 0xB1, 0xE8,
+
+0x51, 0x41, 0xE0, 0xEC,
+0x39, 0x67, 0xB1, 0xE8,
+
+0x00, 0x04,
+0x46, 0xE2,
+0x73, 0x63, 0xA0, 0xE8,
+
+0x61, 0x41, 0xE0, 0xEC,
+0x31, 0x00,
+0x39, 0x00,
+
+0x81, 0x80, 0x15, 0xEA,
+0x10, 0x04,
+0x20, 0x04,
+
+0x61, 0x51, 0xE0, 0xEC,
+0x2F, 0x41, 0x60, 0xEA,
+
+0x31, 0x20,
+0x39, 0x20,
+0x1F, 0x42, 0xA0, 0xE8,
+
+0x2A, 0x42, 0x52, 0xBF,
+0x0F, 0x52, 0xA0, 0xE8,
+
+0x1A, 0x42, 0x62, 0xBF,
+0x1E, 0x51, 0x60, 0xEA,
+
+0x73, 0x7B, 0xC8, 0xEC,
+0x0E, 0x61, 0x60, 0xEA,
+
+0x32, 0x40, 0x50, 0xBD,
+0x22, 0x40, 0x60, 0xBD,
+
+0x12, 0x41, 0x51, 0xBD,
+0x3A, 0x41, 0x61, 0xBD,
+
+0xBF, 0x2F, 0x0E, 0xBD,
+0x97, 0xE2,
+0x7B, 0x72,
+
+0x32, 0x20,
+0x22, 0x20,
+0x12, 0x20,
+0x3A, 0x20,
+
+0x35, 0x48, 0xB1, 0xE8,
+0x3D, 0x59, 0xB1, 0xE8,
+
+0x46, 0x31, 0x46, 0xBF,
+0x56, 0x31, 0x56, 0xBF,
+
+0xB3, 0xE2, 0x2D, 0x9F,
+0x00, 0x80, 0x00, 0xE8,
+
+0x66, 0x31, 0x66, 0xBF,
+0x47, 0x39, 0x47, 0xBF,
+
+0x57, 0x39, 0x57, 0xBF,
+0x67, 0x39, 0x67, 0xBF,
+
+0x72, 0x80, 0x07, 0xEA,
+0x24, 0x41, 0x20, 0xE9,
+
+0x35, 0x00,
+0x3D, 0x00,
+0x00, 0xE0,
+0x2D, 0x73,
+
+0x33, 0x72,
+0x0C, 0xE3,
+0x8D, 0x2F, 0x1E, 0xBD,
+
+0x43, 0x75, 0xF8, 0xEC,
+0x35, 0x20,
+0x3D, 0x20,
+
+0x43, 0x43, 0x2D, 0xDF,
+0x53, 0x53, 0x2D, 0xDF,
+
+0xAE, 0x1E, 0x0E, 0xBD,
+0x58, 0xE3,
+0x33, 0x66,
+
+0x48, 0x35, 0x48, 0xBF,
+0x58, 0x35, 0x58, 0xBF,
+
+0x68, 0x35, 0x68, 0xBF,
+0x49, 0x3D, 0x49, 0xBF,
+
+0x59, 0x3D, 0x59, 0xBF,
+0x69, 0x3D, 0x69, 0xBF,
+
+0x63, 0x63, 0x2D, 0xDF,
+0x4D, 0x7D, 0xF8, 0xEC,
+
+0x59, 0xE3,
+0x00, 0xE0,
+0xB8, 0x38, 0x33, 0xBF,
+
+0x2D, 0x73,
+0x30, 0x76,
+0x18, 0x3A, 0x41, 0xE9,
+
+0x3F, 0x53, 0xA0, 0xE8,
+0x05, 0x80, 0x3D, 0xEA,
+
+0x37, 0x43, 0xA0, 0xE8,
+0x3D, 0x63, 0xA0, 0xE8,
+
+0x50, 0x70, 0xF8, 0xEC,
+0x2B, 0x50, 0x3C, 0xE9,
+
+0x1F, 0x0F, 0xBC, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x59, 0x78, 0xF8, 0xEC,
+0x00, 0x80, 0x00, 0xE8,
+
+0x15, 0xC0, 0x20, 0xE9,
+0x15, 0xC0, 0x20, 0xE9,
+
+0x15, 0xC0, 0x20, 0xE9,
+0x15, 0xC0, 0x20, 0xE9,
+
+0x1E, 0x12, 0x41, 0xE9,
+0x1A, 0x22, 0x41, 0xE9,
+
+0x46, 0x37, 0x46, 0xDF,
+0x56, 0x3F, 0x56, 0xDF,
+
+0x2B, 0x40, 0x3D, 0xE9,
+0x66, 0x3D, 0x66, 0xDF,
+
+0x1D, 0x32, 0x41, 0xE9,
+0x67, 0x3D, 0x67, 0xDF,
+
+0x47, 0x37, 0x47, 0xDF,
+0x57, 0x3F, 0x57, 0xDF,
+
+0x2A, 0x40, 0x20, 0xE9,
+0x59, 0x3F, 0x59, 0xDF,
+
+0x16, 0x30, 0x20, 0xE9,
+0x69, 0x3D, 0x69, 0xDF,
+
+0x48, 0x37, 0x48, 0xDF,
+0x58, 0x3F, 0x58, 0xDF,
+
+0x12, 0x12, 0x2D, 0xDF,
+0x22, 0x22, 0x2D, 0xDF,
+
+0x32, 0x32, 0x2D, 0xDF,
+0x3A, 0x3A, 0x2D, 0xDF,
+
+0x68, 0x3D, 0x68, 0xDF,
+0x49, 0x37, 0x49, 0xDF,
+
+0x3D, 0xCF, 0x74, 0xC0,
+0x37, 0xCF, 0x74, 0xC4,
+
+0x0A, 0x44, 0x54, 0xB0,
+0x02, 0x44, 0x64, 0xB0,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x34, 0x37, 0x20, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0x3C, 0x3D, 0x20, 0xE9,
+
+0x2A, 0x44, 0x54, 0xB2,
+0x1A, 0x44, 0x64, 0xB2,
+
+0x2E, 0x80, 0x3A, 0xEA,
+0x0A, 0x20,
+0x02, 0x20,
+
+0x88, 0x73, 0x5E, 0xE9,
+0x2A, 0x20,
+0x1A, 0x20,
+
+0x3D, 0xCF, 0x74, 0xC2,
+0x0F, 0xCF, 0x74, 0xC6,
+
+0x30, 0x50, 0x2E, 0x9F,
+0x32, 0x31, 0x5F, 0xE9,
+
+0x38, 0x21, 0x2C, 0x9F,
+0x33, 0x39, 0x5F, 0xE9,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x9C, 0x0F, 0x20, 0xE9,
+
+0x0A, 0x44, 0x54, 0xB4,
+0x02, 0x44, 0x64, 0xB4,
+
+0x2A, 0x44, 0x54, 0xB6,
+0x1A, 0x44, 0x64, 0xB6,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0x38, 0x3D, 0x20, 0xE9,
+
+0x0A, 0x20,
+0x02, 0x20,
+0x2A, 0x20,
+0x1A, 0x20,
+
+0x3D, 0xCF, 0x75, 0xC6,
+0x00, 0x80, 0x00, 0xE8,
+
+0x30, 0x50, 0x2E, 0x9F,
+0x3E, 0x30, 0x4F, 0xE9,
+
+0x38, 0x21, 0x2C, 0x9F,
+0x3F, 0x38, 0x4F, 0xE9,
+
+0x0A, 0x45, 0x55, 0xB6,
+0x02, 0x45, 0x65, 0xB6,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x3A, 0x31, 0x4F, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0x3B, 0x39, 0x4F, 0xE9,
+
+0x31, 0x3D, 0x20, 0xE9,
+0x0A, 0x20,
+0x02, 0x20,
+
+0x2A, 0x46, 0x56, 0xBF,
+0x1A, 0x46, 0x66, 0xBF,
+
+0x0A, 0x47, 0x57, 0xBF,
+0x02, 0x47, 0x67, 0xBF,
+
+0x30, 0x50, 0x2E, 0x9F,
+0x36, 0x30, 0x4F, 0xE9,
+
+0x38, 0x21, 0x2C, 0x9F,
+0x37, 0x38, 0x4F, 0xE9,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x9D, 0x31, 0x4F, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0x9E, 0x39, 0x4F, 0xE9,
+
+0x2A, 0x43, 0x53, 0xBF,
+0x1A, 0x43, 0x63, 0xBF,
+
+0x30, 0x50, 0x2E, 0x9F,
+0x35, 0x30, 0x4F, 0xE9,
+
+0x38, 0x21, 0x2C, 0x9F,
+0x39, 0x38, 0x4F, 0xE9,
+
+0x0A, 0x48, 0x58, 0xBF,
+0x02, 0x48, 0x68, 0xBF,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x80, 0x31, 0x57, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0x81, 0x39, 0x57, 0xE9,
+
+0x2A, 0x49, 0x59, 0xBF,
+0x1A, 0x49, 0x69, 0xBF,
+
+0x30, 0x50, 0x2E, 0x9F,
+0x82, 0x30, 0x57, 0xE9,
+
+0x38, 0x21, 0x2C, 0x9F,
+0x83, 0x38, 0x57, 0xE9,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x84, 0x31, 0x5E, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0x85, 0x39, 0x5E, 0xE9,
+
+0x86, 0x76, 0x57, 0xE9,
+0x8A, 0x36, 0x20, 0xE9,
+
+0x87, 0x77, 0x57, 0xE9,
+0x8B, 0x3E, 0xBF, 0xEA,
+
+0x80, 0x30, 0x57, 0xE9,
+0x81, 0x38, 0x57, 0xE9,
+
+0x82, 0x31, 0x57, 0xE9,
+0x86, 0x78, 0x57, 0xE9,
+
+0x83, 0x39, 0x57, 0xE9,
+0x87, 0x79, 0x57, 0xE9,
+
+0x30, 0x1F, 0x5F, 0xE9,
+0x8A, 0x34, 0x20, 0xE9,
+
+0x8B, 0x3C, 0x20, 0xE9,
+0x37, 0x50, 0x60, 0xBD,
+
+0x57, 0x0D, 0x20, 0xE9,
+0x35, 0x51, 0x61, 0xBD,
+
+0x2B, 0x50, 0x20, 0xE9,
+0x1D, 0x37, 0xE1, 0xEA,
+
+0x1E, 0x35, 0xE1, 0xEA,
+0x00, 0xE0,
+0x0E, 0x77,
+
+0x24, 0x51, 0x20, 0xE9,
+0x96, 0xFF, 0x20, 0xEA,
+
+0x16, 0x0E, 0x20, 0xE9,
+0x57, 0x2E, 0xBF, 0xEA,
+
+0x0B, 0x46, 0xA0, 0xE8,
+0x1B, 0x56, 0xA0, 0xE8,
+
+0x2B, 0x66, 0xA0, 0xE8,
+0x0C, 0x47, 0xA0, 0xE8,
+
+0x1C, 0x57, 0xA0, 0xE8,
+0x2C, 0x67, 0xA0, 0xE8,
+
+0x0B, 0x00,
+0x1B, 0x00,
+0x2B, 0x00,
+0x00, 0xE0,
+
+0x0C, 0x00,
+0x1C, 0x00,
+0x2C, 0x00,
+0x00, 0xE0,
+
+0x0B, 0x65,
+0x1B, 0x65,
+0x2B, 0x65,
+0x00, 0xE0,
+
+0x0C, 0x65,
+0x1C, 0x65,
+0x2C, 0x65,
+0x00, 0xE0,
+
+0x0B, 0x1B, 0x60, 0xEC,
+0x36, 0xD7, 0x36, 0xAD,
+
+0x2B, 0x80, 0x60, 0xEC,
+0x0C, 0x1C, 0x60, 0xEC,
+
+0x3E, 0xD7, 0x3E, 0xAD,
+0x2C, 0x80, 0x60, 0xEC,
+
+0x0B, 0x2B, 0xDE, 0xE8,
+0x1B, 0x80, 0xDE, 0xE8,
+
+0x36, 0x80, 0x36, 0xBD,
+0x3E, 0x80, 0x3E, 0xBD,
+
+0x33, 0xD7, 0x0B, 0xBD,
+0x3B, 0xD7, 0x1B, 0xBD,
+
+0x46, 0x80, 0x46, 0xCF,
+0x57, 0x80, 0x57, 0xCF,
+
+0x66, 0x33, 0x66, 0xCF,
+0x47, 0x3B, 0x47, 0xCF,
+
+0x56, 0x33, 0x56, 0xCF,
+0x67, 0x3B, 0x67, 0xCF,
+
+0x0B, 0x48, 0xA0, 0xE8,
+0x1B, 0x58, 0xA0, 0xE8,
+
+0x2B, 0x68, 0xA0, 0xE8,
+0x0C, 0x49, 0xA0, 0xE8,
+
+0x1C, 0x59, 0xA0, 0xE8,
+0x2C, 0x69, 0xA0, 0xE8,
+
+0x0B, 0x00,
+0x1B, 0x00,
+0x2B, 0x00,
+0x00, 0xE0,
+
+0x0C, 0x00,
+0x1C, 0x00,
+0x2C, 0x00,
+0x00, 0xE0,
+
+0x0B, 0x65,
+0x1B, 0x65,
+0x2B, 0x65,
+0x00, 0xE0,
+
+0x0C, 0x65,
+0x1C, 0x65,
+0x2C, 0x65,
+0x00, 0xE0,
+
+0x0B, 0x1B, 0x60, 0xEC,
+0x34, 0xD7, 0x34, 0xAD,
+
+0x2B, 0x80, 0x60, 0xEC,
+0x0C, 0x1C, 0x60, 0xEC,
+
+0x3C, 0xD7, 0x3C, 0xAD,
+0x2C, 0x80, 0x60, 0xEC,
+
+0x0B, 0x2B, 0xDE, 0xE8,
+0x1B, 0x80, 0xDE, 0xE8,
+
+0x34, 0x80, 0x34, 0xBD,
+0x3C, 0x80, 0x3C, 0xBD,
+
+0x33, 0xD7, 0x0B, 0xBD,
+0x3B, 0xD7, 0x1B, 0xBD,
+
+0x48, 0x80, 0x48, 0xCF,
+0x59, 0x80, 0x59, 0xCF,
+
+0x68, 0x33, 0x68, 0xCF,
+0x49, 0x3B, 0x49, 0xCF,
+
+0xB5, 0xFF, 0x20, 0xEA,
+0x00, 0x80, 0x00, 0xE8,
+
+0x58, 0x33, 0x58, 0xCF,
+0x69, 0x3B, 0x69, 0xCF,
+
+0x74, 0xFF, 0x20, 0xEA,
+0x57, 0xC0, 0xBF, 0xEA,
+
+0x00, 0x80, 0xA0, 0xE9,
+0x00, 0x00, 0xD8, 0xEC,
+
+};
+
+static unsigned char warp_g400_t2gzf[] = {
+
+0x00, 0x8A, 0x98, 0xE9,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0xA0, 0xE9,
+0x00, 0x00, 0xD8, 0xEC,
+
+0xFF, 0x80, 0xC0, 0xE9,
+0x00, 0x80, 0x00, 0xE8,
+
+0x0A, 0x40, 0x50, 0xBF,
+0x2A, 0x40, 0x60, 0xBF,
+
+0x32, 0x41, 0x51, 0xBF,
+0x3A, 0x41, 0x61, 0xBF,
+
+0xC3, 0x6B,
+0xD3, 0x6B,
+0x00, 0x8A, 0x98, 0xE9,
+
+0x73, 0x7B, 0xC8, 0xEC,
+0x96, 0xE2,
+0x41, 0x04,
+
+0x7B, 0x43, 0xA0, 0xE8,
+0x73, 0x53, 0xA0, 0xE8,
+
+0xAD, 0xEE, 0x23, 0x9F,
+0x00, 0xE0,
+0x51, 0x04,
+
+0x90, 0xE2,
+0x61, 0x04,
+0x31, 0x46, 0xB1, 0xE8,
+
+0x51, 0x41, 0xE0, 0xEC,
+0x39, 0x67, 0xB1, 0xE8,
+
+0x00, 0x04,
+0x46, 0xE2,
+0x73, 0x63, 0xA0, 0xE8,
+
+0x61, 0x41, 0xE0, 0xEC,
+0x31, 0x00,
+0x39, 0x00,
+
+0x7D, 0x80, 0x15, 0xEA,
+0x10, 0x04,
+0x20, 0x04,
+
+0x61, 0x51, 0xE0, 0xEC,
+0x2F, 0x41, 0x60, 0xEA,
+
+0x31, 0x20,
+0x39, 0x20,
+0x1F, 0x42, 0xA0, 0xE8,
+
+0x2A, 0x42, 0x52, 0xBF,
+0x0F, 0x52, 0xA0, 0xE8,
+
+0x1A, 0x42, 0x62, 0xBF,
+0x1E, 0x51, 0x60, 0xEA,
+
+0x73, 0x7B, 0xC8, 0xEC,
+0x0E, 0x61, 0x60, 0xEA,
+
+0x32, 0x40, 0x50, 0xBD,
+0x22, 0x40, 0x60, 0xBD,
+
+0x12, 0x41, 0x51, 0xBD,
+0x3A, 0x41, 0x61, 0xBD,
+
+0xBF, 0x2F, 0x0E, 0xBD,
+0x97, 0xE2,
+0x7B, 0x72,
+
+0x32, 0x20,
+0x22, 0x20,
+0x12, 0x20,
+0x3A, 0x20,
+
+0x35, 0x48, 0xB1, 0xE8,
+0x3D, 0x59, 0xB1, 0xE8,
+
+0x46, 0x31, 0x46, 0xBF,
+0x56, 0x31, 0x56, 0xBF,
+
+0xB3, 0xE2, 0x2D, 0x9F,
+0x00, 0x80, 0x00, 0xE8,
+
+0x66, 0x31, 0x66, 0xBF,
+0x47, 0x39, 0x47, 0xBF,
+
+0x57, 0x39, 0x57, 0xBF,
+0x67, 0x39, 0x67, 0xBF,
+
+0x6E, 0x80, 0x07, 0xEA,
+0x24, 0x41, 0x20, 0xE9,
+
+0x35, 0x00,
+0x3D, 0x00,
+0x00, 0xE0,
+0x2D, 0x73,
+
+0x33, 0x72,
+0x0C, 0xE3,
+0x8D, 0x2F, 0x1E, 0xBD,
+
+0x43, 0x75, 0xF8, 0xEC,
+0x35, 0x20,
+0x3D, 0x20,
+
+0x43, 0x43, 0x2D, 0xDF,
+0x53, 0x53, 0x2D, 0xDF,
+
+0xAE, 0x1E, 0x0E, 0xBD,
+0x58, 0xE3,
+0x33, 0x66,
+
+0x48, 0x35, 0x48, 0xBF,
+0x58, 0x35, 0x58, 0xBF,
+
+0x68, 0x35, 0x68, 0xBF,
+0x49, 0x3D, 0x49, 0xBF,
+
+0x59, 0x3D, 0x59, 0xBF,
+0x69, 0x3D, 0x69, 0xBF,
+
+0x63, 0x63, 0x2D, 0xDF,
+0x4D, 0x7D, 0xF8, 0xEC,
+
+0x59, 0xE3,
+0x00, 0xE0,
+0xB8, 0x38, 0x33, 0xBF,
+
+0x2D, 0x73,
+0x30, 0x76,
+0x18, 0x3A, 0x41, 0xE9,
+
+0x3F, 0x53, 0xA0, 0xE8,
+0x05, 0x80, 0x3D, 0xEA,
+
+0x37, 0x43, 0xA0, 0xE8,
+0x3D, 0x63, 0xA0, 0xE8,
+
+0x50, 0x70, 0xF8, 0xEC,
+0x2B, 0x50, 0x3C, 0xE9,
+
+0x1F, 0x0F, 0xBC, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x59, 0x78, 0xF8, 0xEC,
+0x00, 0x80, 0x00, 0xE8,
+
+0x15, 0xC0, 0x20, 0xE9,
+0x15, 0xC0, 0x20, 0xE9,
+
+0x15, 0xC0, 0x20, 0xE9,
+0x15, 0xC0, 0x20, 0xE9,
+
+0x1E, 0x12, 0x41, 0xE9,
+0x1A, 0x22, 0x41, 0xE9,
+
+0x46, 0x37, 0x46, 0xDF,
+0x56, 0x3F, 0x56, 0xDF,
+
+0x2B, 0x40, 0x3D, 0xE9,
+0x66, 0x3D, 0x66, 0xDF,
+
+0x1D, 0x32, 0x41, 0xE9,
+0x67, 0x3D, 0x67, 0xDF,
+
+0x47, 0x37, 0x47, 0xDF,
+0x57, 0x3F, 0x57, 0xDF,
+
+0x2A, 0x40, 0x20, 0xE9,
+0x59, 0x3F, 0x59, 0xDF,
+
+0x16, 0x30, 0x20, 0xE9,
+0x69, 0x3D, 0x69, 0xDF,
+
+0x48, 0x37, 0x48, 0xDF,
+0x58, 0x3F, 0x58, 0xDF,
+
+0x12, 0x12, 0x2D, 0xDF,
+0x22, 0x22, 0x2D, 0xDF,
+
+0x32, 0x32, 0x2D, 0xDF,
+0x3A, 0x3A, 0x2D, 0xDF,
+
+0x68, 0x3D, 0x68, 0xDF,
+0x49, 0x37, 0x49, 0xDF,
+
+0x3D, 0xCF, 0x74, 0xC0,
+0x37, 0xCF, 0x74, 0xC4,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0x34, 0x80, 0x20, 0xE9,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x00, 0x80, 0x00, 0xE8,
+
+0x88, 0x73, 0x5E, 0xE9,
+0x00, 0x80, 0x00, 0xE8,
+
+0x0F, 0xCF, 0x75, 0xC6,
+0x3C, 0x3D, 0x20, 0xE9,
+
+0x0A, 0x44, 0x54, 0xB0,
+0x02, 0x44, 0x64, 0xB0,
+
+0x2A, 0x44, 0x54, 0xB2,
+0x1A, 0x44, 0x64, 0xB2,
+
+0x28, 0x80, 0x3A, 0xEA,
+0x0A, 0x20,
+0x02, 0x20,
+
+0x3D, 0xCF, 0x74, 0xC2,
+0x2A, 0x20,
+0x1A, 0x20,
+
+0x30, 0x50, 0x2E, 0x9F,
+0x32, 0x31, 0x5F, 0xE9,
+
+0x38, 0x21, 0x2C, 0x9F,
+0x33, 0x39, 0x5F, 0xE9,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x31, 0x0F, 0x20, 0xE9,
+
+0x0A, 0x44, 0x54, 0xB4,
+0x02, 0x44, 0x64, 0xB4,
+
+0x2A, 0x45, 0x55, 0xB6,
+0x1A, 0x45, 0x65, 0xB6,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0x38, 0x3D, 0x20, 0xE9,
+
+0x0A, 0x20,
+0x02, 0x20,
+0x2A, 0x20,
+0x1A, 0x20,
+
+0x0A, 0x47, 0x57, 0xBF,
+0x02, 0x47, 0x67, 0xBF,
+
+0x30, 0x50, 0x2E, 0x9F,
+0x3E, 0x30, 0x4F, 0xE9,
+
+0x38, 0x21, 0x2C, 0x9F,
+0x3F, 0x38, 0x4F, 0xE9,
+
+0x2A, 0x46, 0x56, 0xBF,
+0x1A, 0x46, 0x66, 0xBF,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x3A, 0x31, 0x4F, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0x3B, 0x39, 0x4F, 0xE9,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x36, 0x30, 0x4F, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0x37, 0x38, 0x4F, 0xE9,
+
+0x2A, 0x43, 0x53, 0xBF,
+0x1A, 0x43, 0x63, 0xBF,
+
+0x30, 0x50, 0x2E, 0x9F,
+0x35, 0x31, 0x4F, 0xE9,
+
+0x38, 0x21, 0x2C, 0x9F,
+0x39, 0x39, 0x4F, 0xE9,
+
+0x0A, 0x48, 0x58, 0xBF,
+0x02, 0x48, 0x68, 0xBF,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x80, 0x31, 0x57, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0x81, 0x39, 0x57, 0xE9,
+
+0x2A, 0x49, 0x59, 0xBF,
+0x1A, 0x49, 0x69, 0xBF,
+
+0x30, 0x50, 0x2E, 0x9F,
+0x82, 0x30, 0x57, 0xE9,
+
+0x38, 0x21, 0x2C, 0x9F,
+0x83, 0x38, 0x57, 0xE9,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x84, 0x31, 0x5E, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0x85, 0x39, 0x5E, 0xE9,
+
+0x86, 0x76, 0x57, 0xE9,
+0x8A, 0x36, 0x20, 0xE9,
+
+0x87, 0x77, 0x57, 0xE9,
+0x8B, 0x3E, 0xBF, 0xEA,
+
+0x80, 0x30, 0x57, 0xE9,
+0x81, 0x38, 0x57, 0xE9,
+
+0x82, 0x31, 0x57, 0xE9,
+0x86, 0x78, 0x57, 0xE9,
+
+0x83, 0x39, 0x57, 0xE9,
+0x87, 0x79, 0x57, 0xE9,
+
+0x30, 0x1F, 0x5F, 0xE9,
+0x8A, 0x34, 0x20, 0xE9,
+
+0x8B, 0x3C, 0x20, 0xE9,
+0x37, 0x50, 0x60, 0xBD,
+
+0x57, 0x0D, 0x20, 0xE9,
+0x35, 0x51, 0x61, 0xBD,
+
+0x2B, 0x50, 0x20, 0xE9,
+0x1D, 0x37, 0xE1, 0xEA,
+
+0x1E, 0x35, 0xE1, 0xEA,
+0x00, 0xE0,
+0x0E, 0x77,
+
+0x24, 0x51, 0x20, 0xE9,
+0x9A, 0xFF, 0x20, 0xEA,
+
+0x16, 0x0E, 0x20, 0xE9,
+0x57, 0x2E, 0xBF, 0xEA,
+
+0x0B, 0x46, 0xA0, 0xE8,
+0x1B, 0x56, 0xA0, 0xE8,
+
+0x2B, 0x66, 0xA0, 0xE8,
+0x0C, 0x47, 0xA0, 0xE8,
+
+0x1C, 0x57, 0xA0, 0xE8,
+0x2C, 0x67, 0xA0, 0xE8,
+
+0x0B, 0x00,
+0x1B, 0x00,
+0x2B, 0x00,
+0x00, 0xE0,
+
+0x0C, 0x00,
+0x1C, 0x00,
+0x2C, 0x00,
+0x00, 0xE0,
+
+0x0B, 0x65,
+0x1B, 0x65,
+0x2B, 0x65,
+0x00, 0xE0,
+
+0x0C, 0x65,
+0x1C, 0x65,
+0x2C, 0x65,
+0x00, 0xE0,
+
+0x0B, 0x1B, 0x60, 0xEC,
+0x36, 0xD7, 0x36, 0xAD,
+
+0x2B, 0x80, 0x60, 0xEC,
+0x0C, 0x1C, 0x60, 0xEC,
+
+0x3E, 0xD7, 0x3E, 0xAD,
+0x2C, 0x80, 0x60, 0xEC,
+
+0x0B, 0x2B, 0xDE, 0xE8,
+0x1B, 0x80, 0xDE, 0xE8,
+
+0x36, 0x80, 0x36, 0xBD,
+0x3E, 0x80, 0x3E, 0xBD,
+
+0x33, 0xD7, 0x0B, 0xBD,
+0x3B, 0xD7, 0x1B, 0xBD,
+
+0x46, 0x80, 0x46, 0xCF,
+0x57, 0x80, 0x57, 0xCF,
+
+0x66, 0x33, 0x66, 0xCF,
+0x47, 0x3B, 0x47, 0xCF,
+
+0x56, 0x33, 0x56, 0xCF,
+0x67, 0x3B, 0x67, 0xCF,
+
+0x0B, 0x48, 0xA0, 0xE8,
+0x1B, 0x58, 0xA0, 0xE8,
+
+0x2B, 0x68, 0xA0, 0xE8,
+0x0C, 0x49, 0xA0, 0xE8,
+
+0x1C, 0x59, 0xA0, 0xE8,
+0x2C, 0x69, 0xA0, 0xE8,
+
+0x0B, 0x00,
+0x1B, 0x00,
+0x2B, 0x00,
+0x00, 0xE0,
+
+0x0C, 0x00,
+0x1C, 0x00,
+0x2C, 0x00,
+0x00, 0xE0,
+
+0x0B, 0x65,
+0x1B, 0x65,
+0x2B, 0x65,
+0x00, 0xE0,
+
+0x0C, 0x65,
+0x1C, 0x65,
+0x2C, 0x65,
+0x00, 0xE0,
+
+0x0B, 0x1B, 0x60, 0xEC,
+0x34, 0xD7, 0x34, 0xAD,
+
+0x2B, 0x80, 0x60, 0xEC,
+0x0C, 0x1C, 0x60, 0xEC,
+
+0x3C, 0xD7, 0x3C, 0xAD,
+0x2C, 0x80, 0x60, 0xEC,
+
+0x0B, 0x2B, 0xDE, 0xE8,
+0x1B, 0x80, 0xDE, 0xE8,
+
+0x34, 0x80, 0x34, 0xBD,
+0x3C, 0x80, 0x3C, 0xBD,
+
+0x33, 0xD7, 0x0B, 0xBD,
+0x3B, 0xD7, 0x1B, 0xBD,
+
+0x48, 0x80, 0x48, 0xCF,
+0x59, 0x80, 0x59, 0xCF,
+
+0x68, 0x33, 0x68, 0xCF,
+0x49, 0x3B, 0x49, 0xCF,
+
+0xBB, 0xFF, 0x20, 0xEA,
+0x00, 0x80, 0x00, 0xE8,
+
+0x58, 0x33, 0x58, 0xCF,
+0x69, 0x3B, 0x69, 0xCF,
+
+0x78, 0xFF, 0x20, 0xEA,
+0x57, 0xC0, 0xBF, 0xEA,
+
+0x00, 0x80, 0xA0, 0xE9,
+0x00, 0x00, 0xD8, 0xEC,
+
+};
+
+static unsigned char warp_g400_t2gzs[] = {
+
+0x00, 0x8A, 0x98, 0xE9,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0xA0, 0xE9,
+0x00, 0x00, 0xD8, 0xEC,
+
+0xFF, 0x80, 0xC0, 0xE9,
+0x00, 0x80, 0x00, 0xE8,
+
+0x0A, 0x40, 0x50, 0xBF,
+0x2A, 0x40, 0x60, 0xBF,
+
+0x32, 0x41, 0x51, 0xBF,
+0x3A, 0x41, 0x61, 0xBF,
+
+0xC3, 0x6B,
+0xD3, 0x6B,
+0x00, 0x8A, 0x98, 0xE9,
+
+0x73, 0x7B, 0xC8, 0xEC,
+0x96, 0xE2,
+0x41, 0x04,
+
+0x7B, 0x43, 0xA0, 0xE8,
+0x73, 0x53, 0xA0, 0xE8,
+
+0xAD, 0xEE, 0x23, 0x9F,
+0x00, 0xE0,
+0x51, 0x04,
+
+0x90, 0xE2,
+0x61, 0x04,
+0x31, 0x46, 0xB1, 0xE8,
+
+0x51, 0x41, 0xE0, 0xEC,
+0x39, 0x67, 0xB1, 0xE8,
+
+0x00, 0x04,
+0x46, 0xE2,
+0x73, 0x63, 0xA0, 0xE8,
+
+0x61, 0x41, 0xE0, 0xEC,
+0x31, 0x00,
+0x39, 0x00,
+
+0x85, 0x80, 0x15, 0xEA,
+0x10, 0x04,
+0x20, 0x04,
+
+0x61, 0x51, 0xE0, 0xEC,
+0x2F, 0x41, 0x60, 0xEA,
+
+0x31, 0x20,
+0x39, 0x20,
+0x1F, 0x42, 0xA0, 0xE8,
+
+0x2A, 0x42, 0x52, 0xBF,
+0x0F, 0x52, 0xA0, 0xE8,
+
+0x1A, 0x42, 0x62, 0xBF,
+0x1E, 0x51, 0x60, 0xEA,
+
+0x73, 0x7B, 0xC8, 0xEC,
+0x0E, 0x61, 0x60, 0xEA,
+
+0x32, 0x40, 0x50, 0xBD,
+0x22, 0x40, 0x60, 0xBD,
+
+0x12, 0x41, 0x51, 0xBD,
+0x3A, 0x41, 0x61, 0xBD,
+
+0xBF, 0x2F, 0x0E, 0xBD,
+0x97, 0xE2,
+0x7B, 0x72,
+
+0x32, 0x20,
+0x22, 0x20,
+0x12, 0x20,
+0x3A, 0x20,
+
+0x35, 0x48, 0xB1, 0xE8,
+0x3D, 0x59, 0xB1, 0xE8,
+
+0x46, 0x31, 0x46, 0xBF,
+0x56, 0x31, 0x56, 0xBF,
+
+0xB3, 0xE2, 0x2D, 0x9F,
+0x00, 0x80, 0x00, 0xE8,
+
+0x66, 0x31, 0x66, 0xBF,
+0x47, 0x39, 0x47, 0xBF,
+
+0x57, 0x39, 0x57, 0xBF,
+0x67, 0x39, 0x67, 0xBF,
+
+0x76, 0x80, 0x07, 0xEA,
+0x24, 0x41, 0x20, 0xE9,
+
+0x35, 0x00,
+0x3D, 0x00,
+0x00, 0xE0,
+0x2D, 0x73,
+
+0x33, 0x72,
+0x0C, 0xE3,
+0x8D, 0x2F, 0x1E, 0xBD,
+
+0x43, 0x75, 0xF8, 0xEC,
+0x35, 0x20,
+0x3D, 0x20,
+
+0x43, 0x43, 0x2D, 0xDF,
+0x53, 0x53, 0x2D, 0xDF,
+
+0xAE, 0x1E, 0x0E, 0xBD,
+0x58, 0xE3,
+0x33, 0x66,
+
+0x48, 0x35, 0x48, 0xBF,
+0x58, 0x35, 0x58, 0xBF,
+
+0x68, 0x35, 0x68, 0xBF,
+0x49, 0x3D, 0x49, 0xBF,
+
+0x59, 0x3D, 0x59, 0xBF,
+0x69, 0x3D, 0x69, 0xBF,
+
+0x63, 0x63, 0x2D, 0xDF,
+0x4D, 0x7D, 0xF8, 0xEC,
+
+0x59, 0xE3,
+0x00, 0xE0,
+0xB8, 0x38, 0x33, 0xBF,
+
+0x2D, 0x73,
+0x30, 0x76,
+0x18, 0x3A, 0x41, 0xE9,
+
+0x3F, 0x53, 0xA0, 0xE8,
+0x05, 0x80, 0x3D, 0xEA,
+
+0x37, 0x43, 0xA0, 0xE8,
+0x3D, 0x63, 0xA0, 0xE8,
+
+0x50, 0x70, 0xF8, 0xEC,
+0x2B, 0x50, 0x3C, 0xE9,
+
+0x1F, 0x0F, 0xBC, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x59, 0x78, 0xF8, 0xEC,
+0x00, 0x80, 0x00, 0xE8,
+
+0x15, 0xC0, 0x20, 0xE9,
+0x15, 0xC0, 0x20, 0xE9,
+
+0x15, 0xC0, 0x20, 0xE9,
+0x15, 0xC0, 0x20, 0xE9,
+
+0x1E, 0x12, 0x41, 0xE9,
+0x1A, 0x22, 0x41, 0xE9,
+
+0x46, 0x37, 0x46, 0xDF,
+0x56, 0x3F, 0x56, 0xDF,
+
+0x2B, 0x40, 0x3D, 0xE9,
+0x66, 0x3D, 0x66, 0xDF,
+
+0x1D, 0x32, 0x41, 0xE9,
+0x67, 0x3D, 0x67, 0xDF,
+
+0x47, 0x37, 0x47, 0xDF,
+0x57, 0x3F, 0x57, 0xDF,
+
+0x2A, 0x40, 0x20, 0xE9,
+0x59, 0x3F, 0x59, 0xDF,
+
+0x16, 0x30, 0x20, 0xE9,
+0x69, 0x3D, 0x69, 0xDF,
+
+0x48, 0x37, 0x48, 0xDF,
+0x58, 0x3F, 0x58, 0xDF,
+
+0x68, 0x3D, 0x68, 0xDF,
+0x49, 0x37, 0x49, 0xDF,
+
+0x32, 0x32, 0x2D, 0xDF,
+0x22, 0x22, 0x2D, 0xDF,
+
+0x12, 0x12, 0x2D, 0xDF,
+0x3A, 0x3A, 0x2D, 0xDF,
+
+0x0F, 0xCF, 0x74, 0xC2,
+0x37, 0xCF, 0x74, 0xC4,
+
+0x0A, 0x44, 0x54, 0xB0,
+0x02, 0x44, 0x64, 0xB0,
+
+0x3D, 0xCF, 0x74, 0xC0,
+0x34, 0x37, 0x20, 0xE9,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x38, 0x0F, 0x20, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0x3C, 0x3D, 0x20, 0xE9,
+
+0x2A, 0x44, 0x54, 0xB2,
+0x1A, 0x44, 0x64, 0xB2,
+
+0x31, 0x80, 0x3A, 0xEA,
+0x0A, 0x20,
+0x02, 0x20,
+
+0x0F, 0xCF, 0x75, 0xC0,
+0x2A, 0x20,
+0x1A, 0x20,
+
+0x30, 0x50, 0x2E, 0x9F,
+0x32, 0x31, 0x5F, 0xE9,
+
+0x38, 0x21, 0x2C, 0x9F,
+0x33, 0x39, 0x5F, 0xE9,
+
+0x3D, 0xCF, 0x75, 0xC2,
+0x37, 0xCF, 0x75, 0xC4,
+
+0x31, 0x53, 0x2F, 0x9F,
+0xA6, 0x0F, 0x20, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0xA3, 0x3D, 0x20, 0xE9,
+
+0x2A, 0x44, 0x54, 0xB4,
+0x1A, 0x44, 0x64, 0xB4,
+
+0x0A, 0x45, 0x55, 0xB0,
+0x02, 0x45, 0x65, 0xB0,
+
+0x88, 0x73, 0x5E, 0xE9,
+0x2A, 0x20,
+0x1A, 0x20,
+
+0xA0, 0x37, 0x20, 0xE9,
+0x0A, 0x20,
+0x02, 0x20,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x3E, 0x30, 0x4F, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0x3F, 0x38, 0x4F, 0xE9,
+
+0x30, 0x50, 0x2E, 0x9F,
+0x3A, 0x31, 0x4F, 0xE9,
+
+0x2A, 0x45, 0x55, 0xB2,
+0x1A, 0x45, 0x65, 0xB2,
+
+0x0A, 0x45, 0x55, 0xB4,
+0x02, 0x45, 0x65, 0xB4,
+
+0x38, 0x21, 0x2C, 0x9F,
+0x3B, 0x39, 0x4F, 0xE9,
+
+0x2A, 0x20,
+0x1A, 0x20,
+0x0A, 0x20,
+0x02, 0x20,
+
+0x2A, 0x46, 0x56, 0xBF,
+0x1A, 0x46, 0x66, 0xBF,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x36, 0x31, 0x4F, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0x37, 0x39, 0x4F, 0xE9,
+
+0x30, 0x50, 0x2E, 0x9F,
+0xA7, 0x30, 0x4F, 0xE9,
+
+0x38, 0x21, 0x2C, 0x9F,
+0xA8, 0x38, 0x4F, 0xE9,
+
+0x0A, 0x47, 0x57, 0xBF,
+0x02, 0x47, 0x67, 0xBF,
+
+0x31, 0x53, 0x2F, 0x9F,
+0xA4, 0x31, 0x4F, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0xA5, 0x39, 0x4F, 0xE9,
+
+0x2A, 0x43, 0x53, 0xBF,
+0x1A, 0x43, 0x63, 0xBF,
+
+0x30, 0x50, 0x2E, 0x9F,
+0xA1, 0x30, 0x4F, 0xE9,
+
+0x38, 0x21, 0x2C, 0x9F,
+0xA2, 0x38, 0x4F, 0xE9,
+
+0x0A, 0x48, 0x58, 0xBF,
+0x02, 0x48, 0x68, 0xBF,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x80, 0x31, 0x57, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0x81, 0x39, 0x57, 0xE9,
+
+0x2A, 0x49, 0x59, 0xBF,
+0x1A, 0x49, 0x69, 0xBF,
+
+0x30, 0x50, 0x2E, 0x9F,
+0x82, 0x30, 0x57, 0xE9,
+
+0x38, 0x21, 0x2C, 0x9F,
+0x83, 0x38, 0x57, 0xE9,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x84, 0x31, 0x5E, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0x85, 0x39, 0x5E, 0xE9,
+
+0x86, 0x76, 0x57, 0xE9,
+0x8A, 0x36, 0x20, 0xE9,
+
+0x87, 0x77, 0x57, 0xE9,
+0x8B, 0x3E, 0xBF, 0xEA,
+
+0x80, 0x30, 0x57, 0xE9,
+0x81, 0x38, 0x57, 0xE9,
+
+0x82, 0x31, 0x57, 0xE9,
+0x86, 0x78, 0x57, 0xE9,
+
+0x83, 0x39, 0x57, 0xE9,
+0x87, 0x79, 0x57, 0xE9,
+
+0x30, 0x1F, 0x5F, 0xE9,
+0x8A, 0x34, 0x20, 0xE9,
+
+0x8B, 0x3C, 0x20, 0xE9,
+0x37, 0x50, 0x60, 0xBD,
+
+0x57, 0x0D, 0x20, 0xE9,
+0x35, 0x51, 0x61, 0xBD,
+
+0x2B, 0x50, 0x20, 0xE9,
+0x1D, 0x37, 0xE1, 0xEA,
+
+0x1E, 0x35, 0xE1, 0xEA,
+0x00, 0xE0,
+0x0E, 0x77,
+
+0x24, 0x51, 0x20, 0xE9,
+0x92, 0xFF, 0x20, 0xEA,
+
+0x16, 0x0E, 0x20, 0xE9,
+0x57, 0x2E, 0xBF, 0xEA,
+
+0x0B, 0x46, 0xA0, 0xE8,
+0x1B, 0x56, 0xA0, 0xE8,
+
+0x2B, 0x66, 0xA0, 0xE8,
+0x0C, 0x47, 0xA0, 0xE8,
+
+0x1C, 0x57, 0xA0, 0xE8,
+0x2C, 0x67, 0xA0, 0xE8,
+
+0x0B, 0x00,
+0x1B, 0x00,
+0x2B, 0x00,
+0x00, 0xE0,
+
+0x0C, 0x00,
+0x1C, 0x00,
+0x2C, 0x00,
+0x00, 0xE0,
+
+0x0B, 0x65,
+0x1B, 0x65,
+0x2B, 0x65,
+0x00, 0xE0,
+
+0x0C, 0x65,
+0x1C, 0x65,
+0x2C, 0x65,
+0x00, 0xE0,
+
+0x0B, 0x1B, 0x60, 0xEC,
+0x36, 0xD7, 0x36, 0xAD,
+
+0x2B, 0x80, 0x60, 0xEC,
+0x0C, 0x1C, 0x60, 0xEC,
+
+0x3E, 0xD7, 0x3E, 0xAD,
+0x2C, 0x80, 0x60, 0xEC,
+
+0x0B, 0x2B, 0xDE, 0xE8,
+0x1B, 0x80, 0xDE, 0xE8,
+
+0x36, 0x80, 0x36, 0xBD,
+0x3E, 0x80, 0x3E, 0xBD,
+
+0x33, 0xD7, 0x0B, 0xBD,
+0x3B, 0xD7, 0x1B, 0xBD,
+
+0x46, 0x80, 0x46, 0xCF,
+0x57, 0x80, 0x57, 0xCF,
+
+0x66, 0x33, 0x66, 0xCF,
+0x47, 0x3B, 0x47, 0xCF,
+
+0x56, 0x33, 0x56, 0xCF,
+0x67, 0x3B, 0x67, 0xCF,
+
+0x0B, 0x48, 0xA0, 0xE8,
+0x1B, 0x58, 0xA0, 0xE8,
+
+0x2B, 0x68, 0xA0, 0xE8,
+0x0C, 0x49, 0xA0, 0xE8,
+
+0x1C, 0x59, 0xA0, 0xE8,
+0x2C, 0x69, 0xA0, 0xE8,
+
+0x0B, 0x00,
+0x1B, 0x00,
+0x2B, 0x00,
+0x00, 0xE0,
+
+0x0C, 0x00,
+0x1C, 0x00,
+0x2C, 0x00,
+0x00, 0xE0,
+
+0x0B, 0x65,
+0x1B, 0x65,
+0x2B, 0x65,
+0x00, 0xE0,
+
+0x0C, 0x65,
+0x1C, 0x65,
+0x2C, 0x65,
+0x00, 0xE0,
+
+0x0B, 0x1B, 0x60, 0xEC,
+0x34, 0xD7, 0x34, 0xAD,
+
+0x2B, 0x80, 0x60, 0xEC,
+0x0C, 0x1C, 0x60, 0xEC,
+
+0x3C, 0xD7, 0x3C, 0xAD,
+0x2C, 0x80, 0x60, 0xEC,
+
+0x0B, 0x2B, 0xDE, 0xE8,
+0x1B, 0x80, 0xDE, 0xE8,
+
+0x34, 0x80, 0x34, 0xBD,
+0x3C, 0x80, 0x3C, 0xBD,
+
+0x33, 0xD7, 0x0B, 0xBD,
+0x3B, 0xD7, 0x1B, 0xBD,
+
+0x48, 0x80, 0x48, 0xCF,
+0x59, 0x80, 0x59, 0xCF,
+
+0x68, 0x33, 0x68, 0xCF,
+0x49, 0x3B, 0x49, 0xCF,
+
+0xB2, 0xFF, 0x20, 0xEA,
+0x00, 0x80, 0x00, 0xE8,
+
+0x58, 0x33, 0x58, 0xCF,
+0x69, 0x3B, 0x69, 0xCF,
+
+0x70, 0xFF, 0x20, 0xEA,
+0x57, 0xC0, 0xBF, 0xEA,
+
+0x00, 0x80, 0xA0, 0xE9,
+0x00, 0x00, 0xD8, 0xEC,
+
+};
+
+static unsigned char warp_g400_t2gzsa[] = {
+
+0x00, 0x8A, 0x98, 0xE9,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0xA0, 0xE9,
+0x00, 0x00, 0xD8, 0xEC,
+
+0xFF, 0x80, 0xC0, 0xE9,
+0x00, 0x80, 0x00, 0xE8,
+
+0x0A, 0x40, 0x50, 0xBF,
+0x2A, 0x40, 0x60, 0xBF,
+
+0x32, 0x41, 0x51, 0xBF,
+0x3A, 0x41, 0x61, 0xBF,
+
+0xC3, 0x6B,
+0xD3, 0x6B,
+0x00, 0x8A, 0x98, 0xE9,
+
+0x73, 0x7B, 0xC8, 0xEC,
+0x96, 0xE2,
+0x41, 0x04,
+
+0x7B, 0x43, 0xA0, 0xE8,
+0x73, 0x53, 0xA0, 0xE8,
+
+0xAD, 0xEE, 0x23, 0x9F,
+0x00, 0xE0,
+0x51, 0x04,
+
+0x90, 0xE2,
+0x61, 0x04,
+0x31, 0x46, 0xB1, 0xE8,
+
+0x51, 0x41, 0xE0, 0xEC,
+0x39, 0x67, 0xB1, 0xE8,
+
+0x00, 0x04,
+0x46, 0xE2,
+0x73, 0x63, 0xA0, 0xE8,
+
+0x61, 0x41, 0xE0, 0xEC,
+0x31, 0x00,
+0x39, 0x00,
+
+0x8A, 0x80, 0x15, 0xEA,
+0x10, 0x04,
+0x20, 0x04,
+
+0x61, 0x51, 0xE0, 0xEC,
+0x2F, 0x41, 0x60, 0xEA,
+
+0x31, 0x20,
+0x39, 0x20,
+0x1F, 0x42, 0xA0, 0xE8,
+
+0x2A, 0x42, 0x52, 0xBF,
+0x0F, 0x52, 0xA0, 0xE8,
+
+0x1A, 0x42, 0x62, 0xBF,
+0x1E, 0x51, 0x60, 0xEA,
+
+0x73, 0x7B, 0xC8, 0xEC,
+0x0E, 0x61, 0x60, 0xEA,
+
+0x32, 0x40, 0x50, 0xBD,
+0x22, 0x40, 0x60, 0xBD,
+
+0x12, 0x41, 0x51, 0xBD,
+0x3A, 0x41, 0x61, 0xBD,
+
+0xBF, 0x2F, 0x0E, 0xBD,
+0x97, 0xE2,
+0x7B, 0x72,
+
+0x32, 0x20,
+0x22, 0x20,
+0x12, 0x20,
+0x3A, 0x20,
+
+0x35, 0x48, 0xB1, 0xE8,
+0x3D, 0x59, 0xB1, 0xE8,
+
+0x46, 0x31, 0x46, 0xBF,
+0x56, 0x31, 0x56, 0xBF,
+
+0xB3, 0xE2, 0x2D, 0x9F,
+0x00, 0x80, 0x00, 0xE8,
+
+0x66, 0x31, 0x66, 0xBF,
+0x47, 0x39, 0x47, 0xBF,
+
+0x57, 0x39, 0x57, 0xBF,
+0x67, 0x39, 0x67, 0xBF,
+
+0x7B, 0x80, 0x07, 0xEA,
+0x24, 0x41, 0x20, 0xE9,
+
+0x35, 0x00,
+0x3D, 0x00,
+0x00, 0xE0,
+0x2D, 0x73,
+
+0x33, 0x72,
+0x0C, 0xE3,
+0x8D, 0x2F, 0x1E, 0xBD,
+
+0x43, 0x75, 0xF8, 0xEC,
+0x35, 0x20,
+0x3D, 0x20,
+
+0x43, 0x43, 0x2D, 0xDF,
+0x53, 0x53, 0x2D, 0xDF,
+
+0xAE, 0x1E, 0x0E, 0xBD,
+0x58, 0xE3,
+0x33, 0x66,
+
+0x48, 0x35, 0x48, 0xBF,
+0x58, 0x35, 0x58, 0xBF,
+
+0x68, 0x35, 0x68, 0xBF,
+0x49, 0x3D, 0x49, 0xBF,
+
+0x59, 0x3D, 0x59, 0xBF,
+0x69, 0x3D, 0x69, 0xBF,
+
+0x63, 0x63, 0x2D, 0xDF,
+0x4D, 0x7D, 0xF8, 0xEC,
+
+0x59, 0xE3,
+0x00, 0xE0,
+0xB8, 0x38, 0x33, 0xBF,
+
+0x2D, 0x73,
+0x30, 0x76,
+0x18, 0x3A, 0x41, 0xE9,
+
+0x3F, 0x53, 0xA0, 0xE8,
+0x05, 0x80, 0x3D, 0xEA,
+
+0x37, 0x43, 0xA0, 0xE8,
+0x3D, 0x63, 0xA0, 0xE8,
+
+0x50, 0x70, 0xF8, 0xEC,
+0x2B, 0x50, 0x3C, 0xE9,
+
+0x1F, 0x0F, 0xBC, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x59, 0x78, 0xF8, 0xEC,
+0x00, 0x80, 0x00, 0xE8,
+
+0x15, 0xC0, 0x20, 0xE9,
+0x15, 0xC0, 0x20, 0xE9,
+
+0x15, 0xC0, 0x20, 0xE9,
+0x15, 0xC0, 0x20, 0xE9,
+
+0x1E, 0x12, 0x41, 0xE9,
+0x1A, 0x22, 0x41, 0xE9,
+
+0x46, 0x37, 0x46, 0xDF,
+0x56, 0x3F, 0x56, 0xDF,
+
+0x2B, 0x40, 0x3D, 0xE9,
+0x66, 0x3D, 0x66, 0xDF,
+
+0x1D, 0x32, 0x41, 0xE9,
+0x67, 0x3D, 0x67, 0xDF,
+
+0x47, 0x37, 0x47, 0xDF,
+0x57, 0x3F, 0x57, 0xDF,
+
+0x2A, 0x40, 0x20, 0xE9,
+0x59, 0x3F, 0x59, 0xDF,
+
+0x16, 0x30, 0x20, 0xE9,
+0x69, 0x3D, 0x69, 0xDF,
+
+0x48, 0x37, 0x48, 0xDF,
+0x58, 0x3F, 0x58, 0xDF,
+
+0x68, 0x3D, 0x68, 0xDF,
+0x49, 0x37, 0x49, 0xDF,
+
+0x32, 0x32, 0x2D, 0xDF,
+0x22, 0x22, 0x2D, 0xDF,
+
+0x12, 0x12, 0x2D, 0xDF,
+0x3A, 0x3A, 0x2D, 0xDF,
+
+0x0F, 0xCF, 0x74, 0xC2,
+0x37, 0xCF, 0x74, 0xC4,
+
+0x0A, 0x44, 0x54, 0xB0,
+0x02, 0x44, 0x64, 0xB0,
+
+0x3D, 0xCF, 0x74, 0xC0,
+0x34, 0x37, 0x20, 0xE9,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x38, 0x0F, 0x20, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0x3C, 0x3D, 0x20, 0xE9,
+
+0x2A, 0x44, 0x54, 0xB2,
+0x1A, 0x44, 0x64, 0xB2,
+
+0x36, 0x80, 0x3A, 0xEA,
+0x0A, 0x20,
+0x02, 0x20,
+
+0x0F, 0xCF, 0x75, 0xC0,
+0x2A, 0x20,
+0x1A, 0x20,
+
+0x30, 0x50, 0x2E, 0x9F,
+0x32, 0x31, 0x5F, 0xE9,
+
+0x38, 0x21, 0x2C, 0x9F,
+0x33, 0x39, 0x5F, 0xE9,
+
+0x3D, 0xCF, 0x75, 0xC2,
+0x37, 0xCF, 0x75, 0xC4,
+
+0x31, 0x53, 0x2F, 0x9F,
+0xA6, 0x0F, 0x20, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0xA3, 0x3D, 0x20, 0xE9,
+
+0x2A, 0x44, 0x54, 0xB4,
+0x1A, 0x44, 0x64, 0xB4,
+
+0x0A, 0x45, 0x55, 0xB0,
+0x02, 0x45, 0x65, 0xB0,
+
+0x88, 0x73, 0x5E, 0xE9,
+0x2A, 0x20,
+0x1A, 0x20,
+
+0xA0, 0x37, 0x20, 0xE9,
+0x0A, 0x20,
+0x02, 0x20,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x3E, 0x30, 0x4F, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0x3F, 0x38, 0x4F, 0xE9,
+
+0x30, 0x50, 0x2E, 0x9F,
+0x3A, 0x31, 0x4F, 0xE9,
+
+0x38, 0x21, 0x2C, 0x9F,
+0x3B, 0x39, 0x4F, 0xE9,
+
+0x2A, 0x45, 0x55, 0xB2,
+0x1A, 0x45, 0x65, 0xB2,
+
+0x0A, 0x45, 0x55, 0xB4,
+0x02, 0x45, 0x65, 0xB4,
+
+0x0F, 0xCF, 0x74, 0xC6,
+0x2A, 0x20,
+0x1A, 0x20,
+
+0xA7, 0x30, 0x4F, 0xE9,
+0x0A, 0x20,
+0x02, 0x20,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x9C, 0x0F, 0x20, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0xA8, 0x38, 0x4F, 0xE9,
+
+0x2A, 0x44, 0x54, 0xB6,
+0x1A, 0x44, 0x64, 0xB6,
+
+0x30, 0x50, 0x2E, 0x9F,
+0x36, 0x31, 0x4F, 0xE9,
+
+0x38, 0x21, 0x2C, 0x9F,
+0x37, 0x39, 0x4F, 0xE9,
+
+0x00, 0x80, 0x00, 0xE8,
+0x2A, 0x20,
+0x1A, 0x20,
+
+0x2A, 0x46, 0x56, 0xBF,
+0x1A, 0x46, 0x66, 0xBF,
+
+0x31, 0x53, 0x2F, 0x9F,
+0xA4, 0x31, 0x4F, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0xA5, 0x39, 0x4F, 0xE9,
+
+0x0A, 0x47, 0x57, 0xBF,
+0x02, 0x47, 0x67, 0xBF,
+
+0x31, 0x53, 0x2F, 0x9F,
+0xA1, 0x30, 0x4F, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0xA2, 0x38, 0x4F, 0xE9,
+
+0x2A, 0x43, 0x53, 0xBF,
+0x1A, 0x43, 0x63, 0xBF,
+
+0x30, 0x50, 0x2E, 0x9F,
+0x9D, 0x31, 0x4F, 0xE9,
+
+0x38, 0x21, 0x2C, 0x9F,
+0x9E, 0x39, 0x4F, 0xE9,
+
+0x0A, 0x48, 0x58, 0xBF,
+0x02, 0x48, 0x68, 0xBF,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x80, 0x31, 0x57, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0x81, 0x39, 0x57, 0xE9,
+
+0x2A, 0x49, 0x59, 0xBF,
+0x1A, 0x49, 0x69, 0xBF,
+
+0x30, 0x50, 0x2E, 0x9F,
+0x82, 0x30, 0x57, 0xE9,
+
+0x38, 0x21, 0x2C, 0x9F,
+0x83, 0x38, 0x57, 0xE9,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x84, 0x31, 0x5E, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0x85, 0x39, 0x5E, 0xE9,
+
+0x86, 0x76, 0x57, 0xE9,
+0x8A, 0x36, 0x20, 0xE9,
+
+0x87, 0x77, 0x57, 0xE9,
+0x8B, 0x3E, 0xBF, 0xEA,
+
+0x80, 0x30, 0x57, 0xE9,
+0x81, 0x38, 0x57, 0xE9,
+
+0x82, 0x31, 0x57, 0xE9,
+0x86, 0x78, 0x57, 0xE9,
+
+0x83, 0x39, 0x57, 0xE9,
+0x87, 0x79, 0x57, 0xE9,
+
+0x30, 0x1F, 0x5F, 0xE9,
+0x8A, 0x34, 0x20, 0xE9,
+
+0x8B, 0x3C, 0x20, 0xE9,
+0x37, 0x50, 0x60, 0xBD,
+
+0x57, 0x0D, 0x20, 0xE9,
+0x35, 0x51, 0x61, 0xBD,
+
+0x2B, 0x50, 0x20, 0xE9,
+0x1D, 0x37, 0xE1, 0xEA,
+
+0x1E, 0x35, 0xE1, 0xEA,
+0x00, 0xE0,
+0x0E, 0x77,
+
+0x24, 0x51, 0x20, 0xE9,
+0x8D, 0xFF, 0x20, 0xEA,
+
+0x16, 0x0E, 0x20, 0xE9,
+0x57, 0x2E, 0xBF, 0xEA,
+
+0x0B, 0x46, 0xA0, 0xE8,
+0x1B, 0x56, 0xA0, 0xE8,
+
+0x2B, 0x66, 0xA0, 0xE8,
+0x0C, 0x47, 0xA0, 0xE8,
+
+0x1C, 0x57, 0xA0, 0xE8,
+0x2C, 0x67, 0xA0, 0xE8,
+
+0x0B, 0x00,
+0x1B, 0x00,
+0x2B, 0x00,
+0x00, 0xE0,
+
+0x0C, 0x00,
+0x1C, 0x00,
+0x2C, 0x00,
+0x00, 0xE0,
+
+0x0B, 0x65,
+0x1B, 0x65,
+0x2B, 0x65,
+0x00, 0xE0,
+
+0x0C, 0x65,
+0x1C, 0x65,
+0x2C, 0x65,
+0x00, 0xE0,
+
+0x0B, 0x1B, 0x60, 0xEC,
+0x36, 0xD7, 0x36, 0xAD,
+
+0x2B, 0x80, 0x60, 0xEC,
+0x0C, 0x1C, 0x60, 0xEC,
+
+0x3E, 0xD7, 0x3E, 0xAD,
+0x2C, 0x80, 0x60, 0xEC,
+
+0x0B, 0x2B, 0xDE, 0xE8,
+0x1B, 0x80, 0xDE, 0xE8,
+
+0x36, 0x80, 0x36, 0xBD,
+0x3E, 0x80, 0x3E, 0xBD,
+
+0x33, 0xD7, 0x0B, 0xBD,
+0x3B, 0xD7, 0x1B, 0xBD,
+
+0x46, 0x80, 0x46, 0xCF,
+0x57, 0x80, 0x57, 0xCF,
+
+0x66, 0x33, 0x66, 0xCF,
+0x47, 0x3B, 0x47, 0xCF,
+
+0x56, 0x33, 0x56, 0xCF,
+0x67, 0x3B, 0x67, 0xCF,
+
+0x0B, 0x48, 0xA0, 0xE8,
+0x1B, 0x58, 0xA0, 0xE8,
+
+0x2B, 0x68, 0xA0, 0xE8,
+0x0C, 0x49, 0xA0, 0xE8,
+
+0x1C, 0x59, 0xA0, 0xE8,
+0x2C, 0x69, 0xA0, 0xE8,
+
+0x0B, 0x00,
+0x1B, 0x00,
+0x2B, 0x00,
+0x00, 0xE0,
+
+0x0C, 0x00,
+0x1C, 0x00,
+0x2C, 0x00,
+0x00, 0xE0,
+
+0x0B, 0x65,
+0x1B, 0x65,
+0x2B, 0x65,
+0x00, 0xE0,
+
+0x0C, 0x65,
+0x1C, 0x65,
+0x2C, 0x65,
+0x00, 0xE0,
+
+0x0B, 0x1B, 0x60, 0xEC,
+0x34, 0xD7, 0x34, 0xAD,
+
+0x2B, 0x80, 0x60, 0xEC,
+0x0C, 0x1C, 0x60, 0xEC,
+
+0x3C, 0xD7, 0x3C, 0xAD,
+0x2C, 0x80, 0x60, 0xEC,
+
+0x0B, 0x2B, 0xDE, 0xE8,
+0x1B, 0x80, 0xDE, 0xE8,
+
+0x34, 0x80, 0x34, 0xBD,
+0x3C, 0x80, 0x3C, 0xBD,
+
+0x33, 0xD7, 0x0B, 0xBD,
+0x3B, 0xD7, 0x1B, 0xBD,
+
+0x48, 0x80, 0x48, 0xCF,
+0x59, 0x80, 0x59, 0xCF,
+
+0x68, 0x33, 0x68, 0xCF,
+0x49, 0x3B, 0x49, 0xCF,
+
+0xAD, 0xFF, 0x20, 0xEA,
+0x00, 0x80, 0x00, 0xE8,
+
+0x58, 0x33, 0x58, 0xCF,
+0x69, 0x3B, 0x69, 0xCF,
+
+0x6B, 0xFF, 0x20, 0xEA,
+0x57, 0xC0, 0xBF, 0xEA,
+
+0x00, 0x80, 0xA0, 0xE9,
+0x00, 0x00, 0xD8, 0xEC,
+
+};
+
+static unsigned char warp_g400_t2gzsaf[] = {
+
+0x00, 0x8A, 0x98, 0xE9,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0xA0, 0xE9,
+0x00, 0x00, 0xD8, 0xEC,
+
+0xFF, 0x80, 0xC0, 0xE9,
+0x00, 0x80, 0x00, 0xE8,
+
+0x0A, 0x40, 0x50, 0xBF,
+0x2A, 0x40, 0x60, 0xBF,
+
+0x32, 0x41, 0x51, 0xBF,
+0x3A, 0x41, 0x61, 0xBF,
+
+0xC3, 0x6B,
+0xD3, 0x6B,
+0x00, 0x8A, 0x98, 0xE9,
+
+0x73, 0x7B, 0xC8, 0xEC,
+0x96, 0xE2,
+0x41, 0x04,
+
+0x7B, 0x43, 0xA0, 0xE8,
+0x73, 0x53, 0xA0, 0xE8,
+
+0xAD, 0xEE, 0x23, 0x9F,
+0x00, 0xE0,
+0x51, 0x04,
+
+0x90, 0xE2,
+0x61, 0x04,
+0x31, 0x46, 0xB1, 0xE8,
+
+0x51, 0x41, 0xE0, 0xEC,
+0x39, 0x67, 0xB1, 0xE8,
+
+0x00, 0x04,
+0x46, 0xE2,
+0x73, 0x63, 0xA0, 0xE8,
+
+0x61, 0x41, 0xE0, 0xEC,
+0x31, 0x00,
+0x39, 0x00,
+
+0x8E, 0x80, 0x15, 0xEA,
+0x10, 0x04,
+0x20, 0x04,
+
+0x61, 0x51, 0xE0, 0xEC,
+0x2F, 0x41, 0x60, 0xEA,
+
+0x31, 0x20,
+0x39, 0x20,
+0x1F, 0x42, 0xA0, 0xE8,
+
+0x2A, 0x42, 0x52, 0xBF,
+0x0F, 0x52, 0xA0, 0xE8,
+
+0x1A, 0x42, 0x62, 0xBF,
+0x1E, 0x51, 0x60, 0xEA,
+
+0x73, 0x7B, 0xC8, 0xEC,
+0x0E, 0x61, 0x60, 0xEA,
+
+0x32, 0x40, 0x50, 0xBD,
+0x22, 0x40, 0x60, 0xBD,
+
+0x12, 0x41, 0x51, 0xBD,
+0x3A, 0x41, 0x61, 0xBD,
+
+0xBF, 0x2F, 0x0E, 0xBD,
+0x97, 0xE2,
+0x7B, 0x72,
+
+0x32, 0x20,
+0x22, 0x20,
+0x12, 0x20,
+0x3A, 0x20,
+
+0x35, 0x48, 0xB1, 0xE8,
+0x3D, 0x59, 0xB1, 0xE8,
+
+0x46, 0x31, 0x46, 0xBF,
+0x56, 0x31, 0x56, 0xBF,
+
+0xB3, 0xE2, 0x2D, 0x9F,
+0x00, 0x80, 0x00, 0xE8,
+
+0x66, 0x31, 0x66, 0xBF,
+0x47, 0x39, 0x47, 0xBF,
+
+0x57, 0x39, 0x57, 0xBF,
+0x67, 0x39, 0x67, 0xBF,
+
+0x7F, 0x80, 0x07, 0xEA,
+0x24, 0x41, 0x20, 0xE9,
+
+0x35, 0x00,
+0x3D, 0x00,
+0x00, 0xE0,
+0x2D, 0x73,
+
+0x33, 0x72,
+0x0C, 0xE3,
+0x8D, 0x2F, 0x1E, 0xBD,
+
+0x43, 0x75, 0xF8, 0xEC,
+0x35, 0x20,
+0x3D, 0x20,
+
+0x43, 0x43, 0x2D, 0xDF,
+0x53, 0x53, 0x2D, 0xDF,
+
+0xAE, 0x1E, 0x0E, 0xBD,
+0x58, 0xE3,
+0x33, 0x66,
+
+0x48, 0x35, 0x48, 0xBF,
+0x58, 0x35, 0x58, 0xBF,
+
+0x68, 0x35, 0x68, 0xBF,
+0x49, 0x3D, 0x49, 0xBF,
+
+0x59, 0x3D, 0x59, 0xBF,
+0x69, 0x3D, 0x69, 0xBF,
+
+0x63, 0x63, 0x2D, 0xDF,
+0x4D, 0x7D, 0xF8, 0xEC,
+
+0x59, 0xE3,
+0x00, 0xE0,
+0xB8, 0x38, 0x33, 0xBF,
+
+0x2D, 0x73,
+0x30, 0x76,
+0x18, 0x3A, 0x41, 0xE9,
+
+0x3F, 0x53, 0xA0, 0xE8,
+0x05, 0x80, 0x3D, 0xEA,
+
+0x37, 0x43, 0xA0, 0xE8,
+0x3D, 0x63, 0xA0, 0xE8,
+
+0x50, 0x70, 0xF8, 0xEC,
+0x2B, 0x50, 0x3C, 0xE9,
+
+0x1F, 0x0F, 0xBC, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x59, 0x78, 0xF8, 0xEC,
+0x00, 0x80, 0x00, 0xE8,
+
+0x15, 0xC0, 0x20, 0xE9,
+0x15, 0xC0, 0x20, 0xE9,
+
+0x15, 0xC0, 0x20, 0xE9,
+0x15, 0xC0, 0x20, 0xE9,
+
+0x1E, 0x12, 0x41, 0xE9,
+0x1A, 0x22, 0x41, 0xE9,
+
+0x46, 0x37, 0x46, 0xDF,
+0x56, 0x3F, 0x56, 0xDF,
+
+0x2B, 0x40, 0x3D, 0xE9,
+0x66, 0x3D, 0x66, 0xDF,
+
+0x1D, 0x32, 0x41, 0xE9,
+0x67, 0x3D, 0x67, 0xDF,
+
+0x47, 0x37, 0x47, 0xDF,
+0x57, 0x3F, 0x57, 0xDF,
+
+0x2A, 0x40, 0x20, 0xE9,
+0x59, 0x3F, 0x59, 0xDF,
+
+0x16, 0x30, 0x20, 0xE9,
+0x69, 0x3D, 0x69, 0xDF,
+
+0x48, 0x37, 0x48, 0xDF,
+0x58, 0x3F, 0x58, 0xDF,
+
+0x68, 0x3D, 0x68, 0xDF,
+0x49, 0x37, 0x49, 0xDF,
+
+0x32, 0x32, 0x2D, 0xDF,
+0x22, 0x22, 0x2D, 0xDF,
+
+0x12, 0x12, 0x2D, 0xDF,
+0x3A, 0x3A, 0x2D, 0xDF,
+
+0x0F, 0xCF, 0x74, 0xC2,
+0x37, 0xCF, 0x74, 0xC4,
+
+0x0A, 0x44, 0x54, 0xB0,
+0x02, 0x44, 0x64, 0xB0,
+
+0x3D, 0xCF, 0x74, 0xC0,
+0x34, 0x37, 0x20, 0xE9,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x38, 0x0F, 0x20, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0x3C, 0x3D, 0x20, 0xE9,
+
+0x2A, 0x44, 0x54, 0xB2,
+0x1A, 0x44, 0x64, 0xB2,
+
+0x3A, 0x80, 0x3A, 0xEA,
+0x0A, 0x20,
+0x02, 0x20,
+
+0x0F, 0xCF, 0x75, 0xC0,
+0x2A, 0x20,
+0x1A, 0x20,
+
+0x30, 0x50, 0x2E, 0x9F,
+0x32, 0x31, 0x5F, 0xE9,
+
+0x38, 0x21, 0x2C, 0x9F,
+0x33, 0x39, 0x5F, 0xE9,
+
+0x3D, 0xCF, 0x75, 0xC2,
+0x37, 0xCF, 0x75, 0xC4,
+
+0x31, 0x53, 0x2F, 0x9F,
+0xA6, 0x0F, 0x20, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0xA3, 0x3D, 0x20, 0xE9,
+
+0x2A, 0x44, 0x54, 0xB4,
+0x1A, 0x44, 0x64, 0xB4,
+
+0x0A, 0x45, 0x55, 0xB0,
+0x02, 0x45, 0x65, 0xB0,
+
+0x88, 0x73, 0x5E, 0xE9,
+0x2A, 0x20,
+0x1A, 0x20,
+
+0xA0, 0x37, 0x20, 0xE9,
+0x0A, 0x20,
+0x02, 0x20,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x3E, 0x30, 0x4F, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0x3F, 0x38, 0x4F, 0xE9,
+
+0x30, 0x50, 0x2E, 0x9F,
+0x3A, 0x31, 0x4F, 0xE9,
+
+0x38, 0x21, 0x2C, 0x9F,
+0x3B, 0x39, 0x4F, 0xE9,
+
+0x2A, 0x45, 0x55, 0xB2,
+0x1A, 0x45, 0x65, 0xB2,
+
+0x0A, 0x45, 0x55, 0xB4,
+0x02, 0x45, 0x65, 0xB4,
+
+0x0F, 0xCF, 0x74, 0xC6,
+0x2A, 0x20,
+0x1A, 0x20,
+
+0xA7, 0x30, 0x4F, 0xE9,
+0x0A, 0x20,
+0x02, 0x20,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x9C, 0x0F, 0x20, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0xA8, 0x38, 0x4F, 0xE9,
+
+0x2A, 0x44, 0x54, 0xB6,
+0x1A, 0x44, 0x64, 0xB6,
+
+0x30, 0x50, 0x2E, 0x9F,
+0x36, 0x31, 0x4F, 0xE9,
+
+0x38, 0x21, 0x2C, 0x9F,
+0x37, 0x39, 0x4F, 0xE9,
+
+0x0A, 0x45, 0x55, 0xB6,
+0x02, 0x45, 0x65, 0xB6,
+
+0x3D, 0xCF, 0x75, 0xC6,
+0x2A, 0x20,
+0x1A, 0x20,
+
+0x2A, 0x46, 0x56, 0xBF,
+0x1A, 0x46, 0x66, 0xBF,
+
+0x31, 0x53, 0x2F, 0x9F,
+0xA4, 0x31, 0x4F, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0xA5, 0x39, 0x4F, 0xE9,
+
+0x31, 0x3D, 0x20, 0xE9,
+0x0A, 0x20,
+0x02, 0x20,
+
+0x0A, 0x47, 0x57, 0xBF,
+0x02, 0x47, 0x67, 0xBF,
+
+0x30, 0x50, 0x2E, 0x9F,
+0xA1, 0x30, 0x4F, 0xE9,
+
+0x38, 0x21, 0x2C, 0x9F,
+0xA2, 0x38, 0x4F, 0xE9,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x9D, 0x31, 0x4F, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0x9E, 0x39, 0x4F, 0xE9,
+
+0x2A, 0x43, 0x53, 0xBF,
+0x1A, 0x43, 0x63, 0xBF,
+
+0x30, 0x50, 0x2E, 0x9F,
+0x35, 0x30, 0x4F, 0xE9,
+
+0x38, 0x21, 0x2C, 0x9F,
+0x39, 0x38, 0x4F, 0xE9,
+
+0x0A, 0x48, 0x58, 0xBF,
+0x02, 0x48, 0x68, 0xBF,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x80, 0x31, 0x57, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0x81, 0x39, 0x57, 0xE9,
+
+0x2A, 0x49, 0x59, 0xBF,
+0x1A, 0x49, 0x69, 0xBF,
+
+0x30, 0x50, 0x2E, 0x9F,
+0x82, 0x30, 0x57, 0xE9,
+
+0x38, 0x21, 0x2C, 0x9F,
+0x83, 0x38, 0x57, 0xE9,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x84, 0x31, 0x5E, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0x85, 0x39, 0x5E, 0xE9,
+
+0x86, 0x76, 0x57, 0xE9,
+0x8A, 0x36, 0x20, 0xE9,
+
+0x87, 0x77, 0x57, 0xE9,
+0x8B, 0x3E, 0xBF, 0xEA,
+
+0x80, 0x30, 0x57, 0xE9,
+0x81, 0x38, 0x57, 0xE9,
+
+0x82, 0x31, 0x57, 0xE9,
+0x86, 0x78, 0x57, 0xE9,
+
+0x83, 0x39, 0x57, 0xE9,
+0x87, 0x79, 0x57, 0xE9,
+
+0x30, 0x1F, 0x5F, 0xE9,
+0x8A, 0x34, 0x20, 0xE9,
+
+0x8B, 0x3C, 0x20, 0xE9,
+0x37, 0x50, 0x60, 0xBD,
+
+0x57, 0x0D, 0x20, 0xE9,
+0x35, 0x51, 0x61, 0xBD,
+
+0x2B, 0x50, 0x20, 0xE9,
+0x1D, 0x37, 0xE1, 0xEA,
+
+0x1E, 0x35, 0xE1, 0xEA,
+0x00, 0xE0,
+0x0E, 0x77,
+
+0x24, 0x51, 0x20, 0xE9,
+0x89, 0xFF, 0x20, 0xEA,
+
+0x16, 0x0E, 0x20, 0xE9,
+0x57, 0x2E, 0xBF, 0xEA,
+
+0x0B, 0x46, 0xA0, 0xE8,
+0x1B, 0x56, 0xA0, 0xE8,
+
+0x2B, 0x66, 0xA0, 0xE8,
+0x0C, 0x47, 0xA0, 0xE8,
+
+0x1C, 0x57, 0xA0, 0xE8,
+0x2C, 0x67, 0xA0, 0xE8,
+
+0x0B, 0x00,
+0x1B, 0x00,
+0x2B, 0x00,
+0x00, 0xE0,
+
+0x0C, 0x00,
+0x1C, 0x00,
+0x2C, 0x00,
+0x00, 0xE0,
+
+0x0B, 0x65,
+0x1B, 0x65,
+0x2B, 0x65,
+0x00, 0xE0,
+
+0x0C, 0x65,
+0x1C, 0x65,
+0x2C, 0x65,
+0x00, 0xE0,
+
+0x0B, 0x1B, 0x60, 0xEC,
+0x36, 0xD7, 0x36, 0xAD,
+
+0x2B, 0x80, 0x60, 0xEC,
+0x0C, 0x1C, 0x60, 0xEC,
+
+0x3E, 0xD7, 0x3E, 0xAD,
+0x2C, 0x80, 0x60, 0xEC,
+
+0x0B, 0x2B, 0xDE, 0xE8,
+0x1B, 0x80, 0xDE, 0xE8,
+
+0x36, 0x80, 0x36, 0xBD,
+0x3E, 0x80, 0x3E, 0xBD,
+
+0x33, 0xD7, 0x0B, 0xBD,
+0x3B, 0xD7, 0x1B, 0xBD,
+
+0x46, 0x80, 0x46, 0xCF,
+0x57, 0x80, 0x57, 0xCF,
+
+0x66, 0x33, 0x66, 0xCF,
+0x47, 0x3B, 0x47, 0xCF,
+
+0x56, 0x33, 0x56, 0xCF,
+0x67, 0x3B, 0x67, 0xCF,
+
+0x0B, 0x48, 0xA0, 0xE8,
+0x1B, 0x58, 0xA0, 0xE8,
+
+0x2B, 0x68, 0xA0, 0xE8,
+0x0C, 0x49, 0xA0, 0xE8,
+
+0x1C, 0x59, 0xA0, 0xE8,
+0x2C, 0x69, 0xA0, 0xE8,
+
+0x0B, 0x00,
+0x1B, 0x00,
+0x2B, 0x00,
+0x00, 0xE0,
+
+0x0C, 0x00,
+0x1C, 0x00,
+0x2C, 0x00,
+0x00, 0xE0,
+
+0x0B, 0x65,
+0x1B, 0x65,
+0x2B, 0x65,
+0x00, 0xE0,
+
+0x0C, 0x65,
+0x1C, 0x65,
+0x2C, 0x65,
+0x00, 0xE0,
+
+0x0B, 0x1B, 0x60, 0xEC,
+0x34, 0xD7, 0x34, 0xAD,
+
+0x2B, 0x80, 0x60, 0xEC,
+0x0C, 0x1C, 0x60, 0xEC,
+
+0x3C, 0xD7, 0x3C, 0xAD,
+0x2C, 0x80, 0x60, 0xEC,
+
+0x0B, 0x2B, 0xDE, 0xE8,
+0x1B, 0x80, 0xDE, 0xE8,
+
+0x34, 0x80, 0x34, 0xBD,
+0x3C, 0x80, 0x3C, 0xBD,
+
+0x33, 0xD7, 0x0B, 0xBD,
+0x3B, 0xD7, 0x1B, 0xBD,
+
+0x48, 0x80, 0x48, 0xCF,
+0x59, 0x80, 0x59, 0xCF,
+
+0x68, 0x33, 0x68, 0xCF,
+0x49, 0x3B, 0x49, 0xCF,
+
+0xA9, 0xFF, 0x20, 0xEA,
+0x00, 0x80, 0x00, 0xE8,
+
+0x58, 0x33, 0x58, 0xCF,
+0x69, 0x3B, 0x69, 0xCF,
+
+0x67, 0xFF, 0x20, 0xEA,
+0x57, 0xC0, 0xBF, 0xEA,
+
+0x00, 0x80, 0xA0, 0xE9,
+0x00, 0x00, 0xD8, 0xEC,
+
+};
+
+static unsigned char warp_g400_t2gzsf[] = {
+
+0x00, 0x8A, 0x98, 0xE9,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0xA0, 0xE9,
+0x00, 0x00, 0xD8, 0xEC,
+
+0xFF, 0x80, 0xC0, 0xE9,
+0x00, 0x80, 0x00, 0xE8,
+
+0x0A, 0x40, 0x50, 0xBF,
+0x2A, 0x40, 0x60, 0xBF,
+
+0x32, 0x41, 0x51, 0xBF,
+0x3A, 0x41, 0x61, 0xBF,
+
+0xC3, 0x6B,
+0xD3, 0x6B,
+0x00, 0x8A, 0x98, 0xE9,
+
+0x73, 0x7B, 0xC8, 0xEC,
+0x96, 0xE2,
+0x41, 0x04,
+
+0x7B, 0x43, 0xA0, 0xE8,
+0x73, 0x53, 0xA0, 0xE8,
+
+0xAD, 0xEE, 0x23, 0x9F,
+0x00, 0xE0,
+0x51, 0x04,
+
+0x90, 0xE2,
+0x61, 0x04,
+0x31, 0x46, 0xB1, 0xE8,
+
+0x51, 0x41, 0xE0, 0xEC,
+0x39, 0x67, 0xB1, 0xE8,
+
+0x00, 0x04,
+0x46, 0xE2,
+0x73, 0x63, 0xA0, 0xE8,
+
+0x61, 0x41, 0xE0, 0xEC,
+0x31, 0x00,
+0x39, 0x00,
+
+0x8A, 0x80, 0x15, 0xEA,
+0x10, 0x04,
+0x20, 0x04,
+
+0x61, 0x51, 0xE0, 0xEC,
+0x2F, 0x41, 0x60, 0xEA,
+
+0x31, 0x20,
+0x39, 0x20,
+0x1F, 0x42, 0xA0, 0xE8,
+
+0x2A, 0x42, 0x52, 0xBF,
+0x0F, 0x52, 0xA0, 0xE8,
+
+0x1A, 0x42, 0x62, 0xBF,
+0x1E, 0x51, 0x60, 0xEA,
+
+0x73, 0x7B, 0xC8, 0xEC,
+0x0E, 0x61, 0x60, 0xEA,
+
+0x32, 0x40, 0x50, 0xBD,
+0x22, 0x40, 0x60, 0xBD,
+
+0x12, 0x41, 0x51, 0xBD,
+0x3A, 0x41, 0x61, 0xBD,
+
+0xBF, 0x2F, 0x0E, 0xBD,
+0x97, 0xE2,
+0x7B, 0x72,
+
+0x32, 0x20,
+0x22, 0x20,
+0x12, 0x20,
+0x3A, 0x20,
+
+0x35, 0x48, 0xB1, 0xE8,
+0x3D, 0x59, 0xB1, 0xE8,
+
+0x46, 0x31, 0x46, 0xBF,
+0x56, 0x31, 0x56, 0xBF,
+
+0xB3, 0xE2, 0x2D, 0x9F,
+0x00, 0x80, 0x00, 0xE8,
+
+0x66, 0x31, 0x66, 0xBF,
+0x47, 0x39, 0x47, 0xBF,
+
+0x57, 0x39, 0x57, 0xBF,
+0x67, 0x39, 0x67, 0xBF,
+
+0x7B, 0x80, 0x07, 0xEA,
+0x24, 0x41, 0x20, 0xE9,
+
+0x35, 0x00,
+0x3D, 0x00,
+0x00, 0xE0,
+0x2D, 0x73,
+
+0x33, 0x72,
+0x0C, 0xE3,
+0x8D, 0x2F, 0x1E, 0xBD,
+
+0x43, 0x75, 0xF8, 0xEC,
+0x35, 0x20,
+0x3D, 0x20,
+
+0x43, 0x43, 0x2D, 0xDF,
+0x53, 0x53, 0x2D, 0xDF,
+
+0xAE, 0x1E, 0x0E, 0xBD,
+0x58, 0xE3,
+0x33, 0x66,
+
+0x48, 0x35, 0x48, 0xBF,
+0x58, 0x35, 0x58, 0xBF,
+
+0x68, 0x35, 0x68, 0xBF,
+0x49, 0x3D, 0x49, 0xBF,
+
+0x59, 0x3D, 0x59, 0xBF,
+0x69, 0x3D, 0x69, 0xBF,
+
+0x63, 0x63, 0x2D, 0xDF,
+0x4D, 0x7D, 0xF8, 0xEC,
+
+0x59, 0xE3,
+0x00, 0xE0,
+0xB8, 0x38, 0x33, 0xBF,
+
+0x2D, 0x73,
+0x30, 0x76,
+0x18, 0x3A, 0x41, 0xE9,
+
+0x3F, 0x53, 0xA0, 0xE8,
+0x05, 0x80, 0x3D, 0xEA,
+
+0x37, 0x43, 0xA0, 0xE8,
+0x3D, 0x63, 0xA0, 0xE8,
+
+0x50, 0x70, 0xF8, 0xEC,
+0x2B, 0x50, 0x3C, 0xE9,
+
+0x1F, 0x0F, 0xBC, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x59, 0x78, 0xF8, 0xEC,
+0x00, 0x80, 0x00, 0xE8,
+
+0x15, 0xC0, 0x20, 0xE9,
+0x15, 0xC0, 0x20, 0xE9,
+
+0x15, 0xC0, 0x20, 0xE9,
+0x15, 0xC0, 0x20, 0xE9,
+
+0x1E, 0x12, 0x41, 0xE9,
+0x1A, 0x22, 0x41, 0xE9,
+
+0x46, 0x37, 0x46, 0xDF,
+0x56, 0x3F, 0x56, 0xDF,
+
+0x2B, 0x40, 0x3D, 0xE9,
+0x66, 0x3D, 0x66, 0xDF,
+
+0x1D, 0x32, 0x41, 0xE9,
+0x67, 0x3D, 0x67, 0xDF,
+
+0x47, 0x37, 0x47, 0xDF,
+0x57, 0x3F, 0x57, 0xDF,
+
+0x2A, 0x40, 0x20, 0xE9,
+0x59, 0x3F, 0x59, 0xDF,
+
+0x16, 0x30, 0x20, 0xE9,
+0x69, 0x3D, 0x69, 0xDF,
+
+0x48, 0x37, 0x48, 0xDF,
+0x58, 0x3F, 0x58, 0xDF,
+
+0x68, 0x3D, 0x68, 0xDF,
+0x49, 0x37, 0x49, 0xDF,
+
+0x32, 0x32, 0x2D, 0xDF,
+0x22, 0x22, 0x2D, 0xDF,
+
+0x12, 0x12, 0x2D, 0xDF,
+0x3A, 0x3A, 0x2D, 0xDF,
+
+0x0F, 0xCF, 0x74, 0xC2,
+0x37, 0xCF, 0x74, 0xC4,
+
+0x0A, 0x44, 0x54, 0xB0,
+0x02, 0x44, 0x64, 0xB0,
+
+0x3D, 0xCF, 0x74, 0xC0,
+0x34, 0x37, 0x20, 0xE9,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x38, 0x0F, 0x20, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0x3C, 0x3D, 0x20, 0xE9,
+
+0x2A, 0x44, 0x54, 0xB2,
+0x1A, 0x44, 0x64, 0xB2,
+
+0x36, 0x80, 0x3A, 0xEA,
+0x0A, 0x20,
+0x02, 0x20,
+
+0x0F, 0xCF, 0x75, 0xC0,
+0x2A, 0x20,
+0x1A, 0x20,
+
+0x30, 0x50, 0x2E, 0x9F,
+0x32, 0x31, 0x5F, 0xE9,
+
+0x38, 0x21, 0x2C, 0x9F,
+0x33, 0x39, 0x5F, 0xE9,
+
+0x3D, 0xCF, 0x75, 0xC2,
+0x37, 0xCF, 0x75, 0xC4,
+
+0x31, 0x53, 0x2F, 0x9F,
+0xA6, 0x0F, 0x20, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0xA3, 0x3D, 0x20, 0xE9,
+
+0x2A, 0x44, 0x54, 0xB4,
+0x1A, 0x44, 0x64, 0xB4,
+
+0x0A, 0x45, 0x55, 0xB0,
+0x02, 0x45, 0x65, 0xB0,
+
+0x88, 0x73, 0x5E, 0xE9,
+0x2A, 0x20,
+0x1A, 0x20,
+
+0xA0, 0x37, 0x20, 0xE9,
+0x0A, 0x20,
+0x02, 0x20,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x3E, 0x30, 0x4F, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0x3F, 0x38, 0x4F, 0xE9,
+
+0x30, 0x50, 0x2E, 0x9F,
+0x3A, 0x31, 0x4F, 0xE9,
+
+0x38, 0x21, 0x2C, 0x9F,
+0x3B, 0x39, 0x4F, 0xE9,
+
+0x2A, 0x45, 0x55, 0xB2,
+0x1A, 0x45, 0x65, 0xB2,
+
+0x0A, 0x45, 0x55, 0xB4,
+0x02, 0x45, 0x65, 0xB4,
+
+0x0F, 0xCF, 0x75, 0xC6,
+0x2A, 0x20,
+0x1A, 0x20,
+
+0xA7, 0x30, 0x4F, 0xE9,
+0x0A, 0x20,
+0x02, 0x20,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x31, 0x0F, 0x20, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0xA8, 0x38, 0x4F, 0xE9,
+
+0x2A, 0x45, 0x55, 0xB6,
+0x1A, 0x45, 0x65, 0xB6,
+
+0x30, 0x50, 0x2E, 0x9F,
+0x36, 0x31, 0x4F, 0xE9,
+
+0x38, 0x21, 0x2C, 0x9F,
+0x37, 0x39, 0x4F, 0xE9,
+
+0x00, 0x80, 0x00, 0xE8,
+0x2A, 0x20,
+0x1A, 0x20,
+
+0x2A, 0x46, 0x56, 0xBF,
+0x1A, 0x46, 0x66, 0xBF,
+
+0x31, 0x53, 0x2F, 0x9F,
+0xA4, 0x31, 0x4F, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0xA5, 0x39, 0x4F, 0xE9,
+
+0x0A, 0x47, 0x57, 0xBF,
+0x02, 0x47, 0x67, 0xBF,
+
+0x31, 0x53, 0x2F, 0x9F,
+0xA1, 0x30, 0x4F, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0xA2, 0x38, 0x4F, 0xE9,
+
+0x2A, 0x43, 0x53, 0xBF,
+0x1A, 0x43, 0x63, 0xBF,
+
+0x30, 0x50, 0x2E, 0x9F,
+0x35, 0x31, 0x4F, 0xE9,
+
+0x38, 0x21, 0x2C, 0x9F,
+0x39, 0x39, 0x4F, 0xE9,
+
+0x0A, 0x48, 0x58, 0xBF,
+0x02, 0x48, 0x68, 0xBF,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x80, 0x31, 0x57, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0x81, 0x39, 0x57, 0xE9,
+
+0x2A, 0x49, 0x59, 0xBF,
+0x1A, 0x49, 0x69, 0xBF,
+
+0x30, 0x50, 0x2E, 0x9F,
+0x82, 0x30, 0x57, 0xE9,
+
+0x38, 0x21, 0x2C, 0x9F,
+0x83, 0x38, 0x57, 0xE9,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x84, 0x31, 0x5E, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0x85, 0x39, 0x5E, 0xE9,
+
+0x86, 0x76, 0x57, 0xE9,
+0x8A, 0x36, 0x20, 0xE9,
+
+0x87, 0x77, 0x57, 0xE9,
+0x8B, 0x3E, 0xBF, 0xEA,
+
+0x80, 0x30, 0x57, 0xE9,
+0x81, 0x38, 0x57, 0xE9,
+
+0x82, 0x31, 0x57, 0xE9,
+0x86, 0x78, 0x57, 0xE9,
+
+0x83, 0x39, 0x57, 0xE9,
+0x87, 0x79, 0x57, 0xE9,
+
+0x30, 0x1F, 0x5F, 0xE9,
+0x8A, 0x34, 0x20, 0xE9,
+
+0x8B, 0x3C, 0x20, 0xE9,
+0x37, 0x50, 0x60, 0xBD,
+
+0x57, 0x0D, 0x20, 0xE9,
+0x35, 0x51, 0x61, 0xBD,
+
+0x2B, 0x50, 0x20, 0xE9,
+0x1D, 0x37, 0xE1, 0xEA,
+
+0x1E, 0x35, 0xE1, 0xEA,
+0x00, 0xE0,
+0x0E, 0x77,
+
+0x24, 0x51, 0x20, 0xE9,
+0x8D, 0xFF, 0x20, 0xEA,
+
+0x16, 0x0E, 0x20, 0xE9,
+0x57, 0x2E, 0xBF, 0xEA,
+
+0x0B, 0x46, 0xA0, 0xE8,
+0x1B, 0x56, 0xA0, 0xE8,
+
+0x2B, 0x66, 0xA0, 0xE8,
+0x0C, 0x47, 0xA0, 0xE8,
+
+0x1C, 0x57, 0xA0, 0xE8,
+0x2C, 0x67, 0xA0, 0xE8,
+
+0x0B, 0x00,
+0x1B, 0x00,
+0x2B, 0x00,
+0x00, 0xE0,
+
+0x0C, 0x00,
+0x1C, 0x00,
+0x2C, 0x00,
+0x00, 0xE0,
+
+0x0B, 0x65,
+0x1B, 0x65,
+0x2B, 0x65,
+0x00, 0xE0,
+
+0x0C, 0x65,
+0x1C, 0x65,
+0x2C, 0x65,
+0x00, 0xE0,
+
+0x0B, 0x1B, 0x60, 0xEC,
+0x36, 0xD7, 0x36, 0xAD,
+
+0x2B, 0x80, 0x60, 0xEC,
+0x0C, 0x1C, 0x60, 0xEC,
+
+0x3E, 0xD7, 0x3E, 0xAD,
+0x2C, 0x80, 0x60, 0xEC,
+
+0x0B, 0x2B, 0xDE, 0xE8,
+0x1B, 0x80, 0xDE, 0xE8,
+
+0x36, 0x80, 0x36, 0xBD,
+0x3E, 0x80, 0x3E, 0xBD,
+
+0x33, 0xD7, 0x0B, 0xBD,
+0x3B, 0xD7, 0x1B, 0xBD,
+
+0x46, 0x80, 0x46, 0xCF,
+0x57, 0x80, 0x57, 0xCF,
+
+0x66, 0x33, 0x66, 0xCF,
+0x47, 0x3B, 0x47, 0xCF,
+
+0x56, 0x33, 0x56, 0xCF,
+0x67, 0x3B, 0x67, 0xCF,
+
+0x0B, 0x48, 0xA0, 0xE8,
+0x1B, 0x58, 0xA0, 0xE8,
+
+0x2B, 0x68, 0xA0, 0xE8,
+0x0C, 0x49, 0xA0, 0xE8,
+
+0x1C, 0x59, 0xA0, 0xE8,
+0x2C, 0x69, 0xA0, 0xE8,
+
+0x0B, 0x00,
+0x1B, 0x00,
+0x2B, 0x00,
+0x00, 0xE0,
+
+0x0C, 0x00,
+0x1C, 0x00,
+0x2C, 0x00,
+0x00, 0xE0,
+
+0x0B, 0x65,
+0x1B, 0x65,
+0x2B, 0x65,
+0x00, 0xE0,
+
+0x0C, 0x65,
+0x1C, 0x65,
+0x2C, 0x65,
+0x00, 0xE0,
+
+0x0B, 0x1B, 0x60, 0xEC,
+0x34, 0xD7, 0x34, 0xAD,
+
+0x2B, 0x80, 0x60, 0xEC,
+0x0C, 0x1C, 0x60, 0xEC,
+
+0x3C, 0xD7, 0x3C, 0xAD,
+0x2C, 0x80, 0x60, 0xEC,
+
+0x0B, 0x2B, 0xDE, 0xE8,
+0x1B, 0x80, 0xDE, 0xE8,
+
+0x34, 0x80, 0x34, 0xBD,
+0x3C, 0x80, 0x3C, 0xBD,
+
+0x33, 0xD7, 0x0B, 0xBD,
+0x3B, 0xD7, 0x1B, 0xBD,
+
+0x48, 0x80, 0x48, 0xCF,
+0x59, 0x80, 0x59, 0xCF,
+
+0x68, 0x33, 0x68, 0xCF,
+0x49, 0x3B, 0x49, 0xCF,
+
+0xAD, 0xFF, 0x20, 0xEA,
+0x00, 0x80, 0x00, 0xE8,
+
+0x58, 0x33, 0x58, 0xCF,
+0x69, 0x3B, 0x69, 0xCF,
+
+0x6B, 0xFF, 0x20, 0xEA,
+0x57, 0xC0, 0xBF, 0xEA,
+
+0x00, 0x80, 0xA0, 0xE9,
+0x00, 0x00, 0xD8, 0xEC,
+
+};
+
+static unsigned char warp_g400_tgz[] = {
+
+0x00, 0x88, 0x98, 0xE9,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0xA0, 0xE9,
+0x00, 0x00, 0xD8, 0xEC,
+
+0xFF, 0x80, 0xC0, 0xE9,
+0x00, 0x80, 0x00, 0xE8,
+
+0x22, 0x40, 0x48, 0xBF,
+0x2A, 0x40, 0x50, 0xBF,
+
+0x32, 0x41, 0x49, 0xBF,
+0x3A, 0x41, 0x51, 0xBF,
+
+0xC3, 0x6B,
+0xCB, 0x6B,
+0x00, 0x88, 0x98, 0xE9,
+
+0x73, 0x7B, 0xC8, 0xEC,
+0x96, 0xE2,
+0x41, 0x04,
+
+0x7B, 0x43, 0xA0, 0xE8,
+0x73, 0x4B, 0xA0, 0xE8,
+
+0xAD, 0xEE, 0x29, 0x9F,
+0x00, 0xE0,
+0x49, 0x04,
+
+0x90, 0xE2,
+0x51, 0x04,
+0x31, 0x46, 0xB1, 0xE8,
+
+0x49, 0x41, 0xC0, 0xEC,
+0x39, 0x57, 0xB1, 0xE8,
+
+0x00, 0x04,
+0x46, 0xE2,
+0x73, 0x53, 0xA0, 0xE8,
+
+0x51, 0x41, 0xC0, 0xEC,
+0x31, 0x00,
+0x39, 0x00,
+
+0x58, 0x80, 0x15, 0xEA,
+0x08, 0x04,
+0x10, 0x04,
+
+0x51, 0x49, 0xC0, 0xEC,
+0x2F, 0x41, 0x60, 0xEA,
+
+0x31, 0x20,
+0x39, 0x20,
+0x1F, 0x42, 0xA0, 0xE8,
+
+0x2A, 0x42, 0x4A, 0xBF,
+0x27, 0x4A, 0xA0, 0xE8,
+
+0x1A, 0x42, 0x52, 0xBF,
+0x1E, 0x49, 0x60, 0xEA,
+
+0x73, 0x7B, 0xC8, 0xEC,
+0x26, 0x51, 0x60, 0xEA,
+
+0x32, 0x40, 0x48, 0xBD,
+0x22, 0x40, 0x50, 0xBD,
+
+0x12, 0x41, 0x49, 0xBD,
+0x3A, 0x41, 0x51, 0xBD,
+
+0xBF, 0x2F, 0x26, 0xBD,
+0x00, 0xE0,
+0x7B, 0x72,
+
+0x32, 0x20,
+0x22, 0x20,
+0x12, 0x20,
+0x3A, 0x20,
+
+0x46, 0x31, 0x46, 0xBF,
+0x4E, 0x31, 0x4E, 0xBF,
+
+0xB3, 0xE2, 0x2D, 0x9F,
+0x00, 0x80, 0x00, 0xE8,
+
+0x56, 0x31, 0x56, 0xBF,
+0x47, 0x39, 0x47, 0xBF,
+
+0x4F, 0x39, 0x4F, 0xBF,
+0x57, 0x39, 0x57, 0xBF,
+
+0x4A, 0x80, 0x07, 0xEA,
+0x24, 0x41, 0x20, 0xE9,
+
+0x42, 0x73, 0xF8, 0xEC,
+0x00, 0xE0,
+0x2D, 0x73,
+
+0x33, 0x72,
+0x0C, 0xE3,
+0xA5, 0x2F, 0x1E, 0xBD,
+
+0x43, 0x43, 0x2D, 0xDF,
+0x4B, 0x4B, 0x2D, 0xDF,
+
+0xAE, 0x1E, 0x26, 0xBD,
+0x58, 0xE3,
+0x33, 0x66,
+
+0x53, 0x53, 0x2D, 0xDF,
+0x00, 0x80, 0x00, 0xE8,
+
+0xB8, 0x38, 0x33, 0xBF,
+0x00, 0xE0,
+0x59, 0xE3,
+
+0x1E, 0x12, 0x41, 0xE9,
+0x1A, 0x22, 0x41, 0xE9,
+
+0x2B, 0x40, 0x3D, 0xE9,
+0x3F, 0x4B, 0xA0, 0xE8,
+
+0x2D, 0x73,
+0x30, 0x76,
+0x05, 0x80, 0x3D, 0xEA,
+
+0x37, 0x43, 0xA0, 0xE8,
+0x3D, 0x53, 0xA0, 0xE8,
+
+0x48, 0x70, 0xF8, 0xEC,
+0x2B, 0x48, 0x3C, 0xE9,
+
+0x1F, 0x27, 0xBC, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x15, 0xC0, 0x20, 0xE9,
+0x15, 0xC0, 0x20, 0xE9,
+
+0x15, 0xC0, 0x20, 0xE9,
+0x15, 0xC0, 0x20, 0xE9,
+
+0x18, 0x3A, 0x41, 0xE9,
+0x1D, 0x32, 0x41, 0xE9,
+
+0x2A, 0x40, 0x20, 0xE9,
+0x56, 0x3D, 0x56, 0xDF,
+
+0x46, 0x37, 0x46, 0xDF,
+0x4E, 0x3F, 0x4E, 0xDF,
+
+0x16, 0x30, 0x20, 0xE9,
+0x4F, 0x3F, 0x4F, 0xDF,
+
+0x32, 0x32, 0x2D, 0xDF,
+0x22, 0x22, 0x2D, 0xDF,
+
+0x12, 0x12, 0x2D, 0xDF,
+0x3A, 0x3A, 0x2D, 0xDF,
+
+0x47, 0x37, 0x47, 0xDF,
+0x57, 0x3D, 0x57, 0xDF,
+
+0x3D, 0xCF, 0x74, 0xC0,
+0x37, 0xCF, 0x74, 0xC4,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x34, 0x80, 0x20, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0x3C, 0x3D, 0x20, 0xE9,
+
+0x0A, 0x44, 0x4C, 0xB0,
+0x02, 0x44, 0x54, 0xB0,
+
+0x2A, 0x44, 0x4C, 0xB2,
+0x1A, 0x44, 0x54, 0xB2,
+
+0x1D, 0x80, 0x3A, 0xEA,
+0x0A, 0x20,
+0x02, 0x20,
+
+0x3D, 0xCF, 0x74, 0xC2,
+0x2A, 0x20,
+0x1A, 0x20,
+
+0x30, 0x50, 0x2E, 0x9F,
+0x32, 0x31, 0x5F, 0xE9,
+
+0x38, 0x21, 0x2C, 0x9F,
+0x33, 0x39, 0x5F, 0xE9,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x00, 0x80, 0x00, 0xE8,
+
+0x2A, 0x44, 0x4C, 0xB4,
+0x1A, 0x44, 0x54, 0xB4,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0x38, 0x3D, 0x20, 0xE9,
+
+0x88, 0x73, 0x5E, 0xE9,
+0x2A, 0x20,
+0x1A, 0x20,
+
+0x2A, 0x46, 0x4E, 0xBF,
+0x1A, 0x46, 0x56, 0xBF,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x3E, 0x30, 0x4F, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0x3F, 0x38, 0x4F, 0xE9,
+
+0x0A, 0x47, 0x4F, 0xBF,
+0x02, 0x47, 0x57, 0xBF,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x3A, 0x31, 0x4F, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0x3B, 0x39, 0x4F, 0xE9,
+
+0x2A, 0x43, 0x4B, 0xBF,
+0x1A, 0x43, 0x53, 0xBF,
+
+0x30, 0x50, 0x2E, 0x9F,
+0x36, 0x31, 0x4F, 0xE9,
+
+0x38, 0x21, 0x2C, 0x9F,
+0x37, 0x39, 0x4F, 0xE9,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x80, 0x31, 0x57, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0x81, 0x39, 0x57, 0xE9,
+
+0x37, 0x48, 0x50, 0xBD,
+0x8A, 0x36, 0x20, 0xE9,
+
+0x86, 0x76, 0x57, 0xE9,
+0x8B, 0x3E, 0x20, 0xE9,
+
+0x82, 0x30, 0x57, 0xE9,
+0x87, 0x77, 0x57, 0xE9,
+
+0x83, 0x38, 0x57, 0xE9,
+0x35, 0x49, 0x51, 0xBD,
+
+0x84, 0x31, 0x5E, 0xE9,
+0x30, 0x1F, 0x5F, 0xE9,
+
+0x85, 0x39, 0x5E, 0xE9,
+0x57, 0x25, 0x20, 0xE9,
+
+0x2B, 0x48, 0x20, 0xE9,
+0x1D, 0x37, 0xE1, 0xEA,
+
+0x1E, 0x35, 0xE1, 0xEA,
+0x00, 0xE0,
+0x26, 0x77,
+
+0x24, 0x49, 0x20, 0xE9,
+0xAF, 0xFF, 0x20, 0xEA,
+
+0x16, 0x26, 0x20, 0xE9,
+0x57, 0x2E, 0xBF, 0xEA,
+
+0x1C, 0x46, 0xA0, 0xE8,
+0x23, 0x4E, 0xA0, 0xE8,
+
+0x2B, 0x56, 0xA0, 0xE8,
+0x1D, 0x47, 0xA0, 0xE8,
+
+0x24, 0x4F, 0xA0, 0xE8,
+0x2C, 0x57, 0xA0, 0xE8,
+
+0x1C, 0x00,
+0x23, 0x00,
+0x2B, 0x00,
+0x00, 0xE0,
+
+0x1D, 0x00,
+0x24, 0x00,
+0x2C, 0x00,
+0x00, 0xE0,
+
+0x1C, 0x65,
+0x23, 0x65,
+0x2B, 0x65,
+0x00, 0xE0,
+
+0x1D, 0x65,
+0x24, 0x65,
+0x2C, 0x65,
+0x00, 0xE0,
+
+0x1C, 0x23, 0x60, 0xEC,
+0x36, 0xD7, 0x36, 0xAD,
+
+0x2B, 0x80, 0x60, 0xEC,
+0x1D, 0x24, 0x60, 0xEC,
+
+0x3E, 0xD7, 0x3E, 0xAD,
+0x2C, 0x80, 0x60, 0xEC,
+
+0x1C, 0x2B, 0xDE, 0xE8,
+0x23, 0x80, 0xDE, 0xE8,
+
+0x36, 0x80, 0x36, 0xBD,
+0x3E, 0x80, 0x3E, 0xBD,
+
+0x33, 0xD7, 0x1C, 0xBD,
+0x3B, 0xD7, 0x23, 0xBD,
+
+0x46, 0x80, 0x46, 0xCF,
+0x4F, 0x80, 0x4F, 0xCF,
+
+0x56, 0x33, 0x56, 0xCF,
+0x47, 0x3B, 0x47, 0xCF,
+
+0xD6, 0xFF, 0x20, 0xEA,
+0x00, 0x80, 0x00, 0xE8,
+
+0x4E, 0x33, 0x4E, 0xCF,
+0x57, 0x3B, 0x57, 0xCF,
+
+0x9D, 0xFF, 0x20, 0xEA,
+0x57, 0xC0, 0xBF, 0xEA,
+
+0x00, 0x80, 0xA0, 0xE9,
+0x00, 0x00, 0xD8, 0xEC,
+
+};
+
+static unsigned char warp_g400_tgza[] = {
+
+0x00, 0x88, 0x98, 0xE9,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0xA0, 0xE9,
+0x00, 0x00, 0xD8, 0xEC,
+
+0xFF, 0x80, 0xC0, 0xE9,
+0x00, 0x80, 0x00, 0xE8,
+
+0x22, 0x40, 0x48, 0xBF,
+0x2A, 0x40, 0x50, 0xBF,
+
+0x32, 0x41, 0x49, 0xBF,
+0x3A, 0x41, 0x51, 0xBF,
+
+0xC3, 0x6B,
+0xCB, 0x6B,
+0x00, 0x88, 0x98, 0xE9,
+
+0x73, 0x7B, 0xC8, 0xEC,
+0x96, 0xE2,
+0x41, 0x04,
+
+0x7B, 0x43, 0xA0, 0xE8,
+0x73, 0x4B, 0xA0, 0xE8,
+
+0xAD, 0xEE, 0x29, 0x9F,
+0x00, 0xE0,
+0x49, 0x04,
+
+0x90, 0xE2,
+0x51, 0x04,
+0x31, 0x46, 0xB1, 0xE8,
+
+0x49, 0x41, 0xC0, 0xEC,
+0x39, 0x57, 0xB1, 0xE8,
+
+0x00, 0x04,
+0x46, 0xE2,
+0x73, 0x53, 0xA0, 0xE8,
+
+0x51, 0x41, 0xC0, 0xEC,
+0x31, 0x00,
+0x39, 0x00,
+
+0x5C, 0x80, 0x15, 0xEA,
+0x08, 0x04,
+0x10, 0x04,
+
+0x51, 0x49, 0xC0, 0xEC,
+0x2F, 0x41, 0x60, 0xEA,
+
+0x31, 0x20,
+0x39, 0x20,
+0x1F, 0x42, 0xA0, 0xE8,
+
+0x2A, 0x42, 0x4A, 0xBF,
+0x27, 0x4A, 0xA0, 0xE8,
+
+0x1A, 0x42, 0x52, 0xBF,
+0x1E, 0x49, 0x60, 0xEA,
+
+0x73, 0x7B, 0xC8, 0xEC,
+0x26, 0x51, 0x60, 0xEA,
+
+0x32, 0x40, 0x48, 0xBD,
+0x22, 0x40, 0x50, 0xBD,
+
+0x12, 0x41, 0x49, 0xBD,
+0x3A, 0x41, 0x51, 0xBD,
+
+0xBF, 0x2F, 0x26, 0xBD,
+0x00, 0xE0,
+0x7B, 0x72,
+
+0x32, 0x20,
+0x22, 0x20,
+0x12, 0x20,
+0x3A, 0x20,
+
+0x46, 0x31, 0x46, 0xBF,
+0x4E, 0x31, 0x4E, 0xBF,
+
+0xB3, 0xE2, 0x2D, 0x9F,
+0x00, 0x80, 0x00, 0xE8,
+
+0x56, 0x31, 0x56, 0xBF,
+0x47, 0x39, 0x47, 0xBF,
+
+0x4F, 0x39, 0x4F, 0xBF,
+0x57, 0x39, 0x57, 0xBF,
+
+0x4E, 0x80, 0x07, 0xEA,
+0x24, 0x41, 0x20, 0xE9,
+
+0x42, 0x73, 0xF8, 0xEC,
+0x00, 0xE0,
+0x2D, 0x73,
+
+0x33, 0x72,
+0x0C, 0xE3,
+0xA5, 0x2F, 0x1E, 0xBD,
+
+0x43, 0x43, 0x2D, 0xDF,
+0x4B, 0x4B, 0x2D, 0xDF,
+
+0xAE, 0x1E, 0x26, 0xBD,
+0x58, 0xE3,
+0x33, 0x66,
+
+0x53, 0x53, 0x2D, 0xDF,
+0x00, 0x80, 0x00, 0xE8,
+
+0xB8, 0x38, 0x33, 0xBF,
+0x00, 0xE0,
+0x59, 0xE3,
+
+0x1E, 0x12, 0x41, 0xE9,
+0x1A, 0x22, 0x41, 0xE9,
+
+0x2B, 0x40, 0x3D, 0xE9,
+0x3F, 0x4B, 0xA0, 0xE8,
+
+0x2D, 0x73,
+0x30, 0x76,
+0x05, 0x80, 0x3D, 0xEA,
+
+0x37, 0x43, 0xA0, 0xE8,
+0x3D, 0x53, 0xA0, 0xE8,
+
+0x48, 0x70, 0xF8, 0xEC,
+0x2B, 0x48, 0x3C, 0xE9,
+
+0x1F, 0x27, 0xBC, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x15, 0xC0, 0x20, 0xE9,
+0x15, 0xC0, 0x20, 0xE9,
+
+0x15, 0xC0, 0x20, 0xE9,
+0x15, 0xC0, 0x20, 0xE9,
+
+0x18, 0x3A, 0x41, 0xE9,
+0x1D, 0x32, 0x41, 0xE9,
+
+0x2A, 0x40, 0x20, 0xE9,
+0x56, 0x3D, 0x56, 0xDF,
+
+0x46, 0x37, 0x46, 0xDF,
+0x4E, 0x3F, 0x4E, 0xDF,
+
+0x16, 0x30, 0x20, 0xE9,
+0x4F, 0x3F, 0x4F, 0xDF,
+
+0x32, 0x32, 0x2D, 0xDF,
+0x22, 0x22, 0x2D, 0xDF,
+
+0x12, 0x12, 0x2D, 0xDF,
+0x3A, 0x3A, 0x2D, 0xDF,
+
+0x47, 0x37, 0x47, 0xDF,
+0x57, 0x3D, 0x57, 0xDF,
+
+0x3D, 0xCF, 0x74, 0xC0,
+0x37, 0xCF, 0x74, 0xC4,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x34, 0x80, 0x20, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0x3C, 0x3D, 0x20, 0xE9,
+
+0x27, 0xCF, 0x74, 0xC6,
+0x3D, 0xCF, 0x74, 0xC2,
+
+0x0A, 0x44, 0x4C, 0xB0,
+0x02, 0x44, 0x54, 0xB0,
+
+0x2A, 0x44, 0x4C, 0xB2,
+0x1A, 0x44, 0x54, 0xB2,
+
+0x20, 0x80, 0x3A, 0xEA,
+0x0A, 0x20,
+0x02, 0x20,
+
+0x88, 0x73, 0x5E, 0xE9,
+0x2A, 0x20,
+0x1A, 0x20,
+
+0x30, 0x50, 0x2E, 0x9F,
+0x32, 0x31, 0x5F, 0xE9,
+
+0x38, 0x21, 0x2C, 0x9F,
+0x33, 0x39, 0x5F, 0xE9,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x9C, 0x27, 0x20, 0xE9,
+
+0x0A, 0x44, 0x4C, 0xB4,
+0x02, 0x44, 0x54, 0xB4,
+
+0x2A, 0x44, 0x4C, 0xB6,
+0x1A, 0x44, 0x54, 0xB6,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0x38, 0x3D, 0x20, 0xE9,
+
+0x0A, 0x20,
+0x02, 0x20,
+0x2A, 0x20,
+0x1A, 0x20,
+
+0x0A, 0x47, 0x4F, 0xBF,
+0x02, 0x47, 0x57, 0xBF,
+
+0x30, 0x50, 0x2E, 0x9F,
+0x3E, 0x30, 0x4F, 0xE9,
+
+0x38, 0x21, 0x2C, 0x9F,
+0x3F, 0x38, 0x4F, 0xE9,
+
+0x2A, 0x46, 0x4E, 0xBF,
+0x1A, 0x46, 0x56, 0xBF,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x3A, 0x31, 0x4F, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0x3B, 0x39, 0x4F, 0xE9,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x36, 0x30, 0x4F, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0x37, 0x38, 0x4F, 0xE9,
+
+0x2A, 0x43, 0x4B, 0xBF,
+0x1A, 0x43, 0x53, 0xBF,
+
+0x30, 0x50, 0x2E, 0x9F,
+0x9D, 0x31, 0x4F, 0xE9,
+
+0x38, 0x21, 0x2C, 0x9F,
+0x9E, 0x39, 0x4F, 0xE9,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x80, 0x31, 0x57, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0x81, 0x39, 0x57, 0xE9,
+
+0x37, 0x48, 0x50, 0xBD,
+0x8A, 0x36, 0x20, 0xE9,
+
+0x86, 0x76, 0x57, 0xE9,
+0x8B, 0x3E, 0x20, 0xE9,
+
+0x82, 0x30, 0x57, 0xE9,
+0x87, 0x77, 0x57, 0xE9,
+
+0x83, 0x38, 0x57, 0xE9,
+0x35, 0x49, 0x51, 0xBD,
+
+0x84, 0x31, 0x5E, 0xE9,
+0x30, 0x1F, 0x5F, 0xE9,
+
+0x85, 0x39, 0x5E, 0xE9,
+0x57, 0x25, 0x20, 0xE9,
+
+0x2B, 0x48, 0x20, 0xE9,
+0x1D, 0x37, 0xE1, 0xEA,
+
+0x1E, 0x35, 0xE1, 0xEA,
+0x00, 0xE0,
+0x26, 0x77,
+
+0x24, 0x49, 0x20, 0xE9,
+0xAB, 0xFF, 0x20, 0xEA,
+
+0x16, 0x26, 0x20, 0xE9,
+0x57, 0x2E, 0xBF, 0xEA,
+
+0x1C, 0x46, 0xA0, 0xE8,
+0x23, 0x4E, 0xA0, 0xE8,
+
+0x2B, 0x56, 0xA0, 0xE8,
+0x1D, 0x47, 0xA0, 0xE8,
+
+0x24, 0x4F, 0xA0, 0xE8,
+0x2C, 0x57, 0xA0, 0xE8,
+
+0x1C, 0x00,
+0x23, 0x00,
+0x2B, 0x00,
+0x00, 0xE0,
+
+0x1D, 0x00,
+0x24, 0x00,
+0x2C, 0x00,
+0x00, 0xE0,
+
+0x1C, 0x65,
+0x23, 0x65,
+0x2B, 0x65,
+0x00, 0xE0,
+
+0x1D, 0x65,
+0x24, 0x65,
+0x2C, 0x65,
+0x00, 0xE0,
+
+0x1C, 0x23, 0x60, 0xEC,
+0x36, 0xD7, 0x36, 0xAD,
+
+0x2B, 0x80, 0x60, 0xEC,
+0x1D, 0x24, 0x60, 0xEC,
+
+0x3E, 0xD7, 0x3E, 0xAD,
+0x2C, 0x80, 0x60, 0xEC,
+
+0x1C, 0x2B, 0xDE, 0xE8,
+0x23, 0x80, 0xDE, 0xE8,
+
+0x36, 0x80, 0x36, 0xBD,
+0x3E, 0x80, 0x3E, 0xBD,
+
+0x33, 0xD7, 0x1C, 0xBD,
+0x3B, 0xD7, 0x23, 0xBD,
+
+0x46, 0x80, 0x46, 0xCF,
+0x4F, 0x80, 0x4F, 0xCF,
+
+0x56, 0x33, 0x56, 0xCF,
+0x47, 0x3B, 0x47, 0xCF,
+
+0xD3, 0xFF, 0x20, 0xEA,
+0x00, 0x80, 0x00, 0xE8,
+
+0x4E, 0x33, 0x4E, 0xCF,
+0x57, 0x3B, 0x57, 0xCF,
+
+0x99, 0xFF, 0x20, 0xEA,
+0x57, 0xC0, 0xBF, 0xEA,
+
+0x00, 0x80, 0xA0, 0xE9,
+0x00, 0x00, 0xD8, 0xEC,
+
+};
+
+static unsigned char warp_g400_tgzaf[] = {
+
+0x00, 0x88, 0x98, 0xE9,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0xA0, 0xE9,
+0x00, 0x00, 0xD8, 0xEC,
+
+0xFF, 0x80, 0xC0, 0xE9,
+0x00, 0x80, 0x00, 0xE8,
+
+0x22, 0x40, 0x48, 0xBF,
+0x2A, 0x40, 0x50, 0xBF,
+
+0x32, 0x41, 0x49, 0xBF,
+0x3A, 0x41, 0x51, 0xBF,
+
+0xC3, 0x6B,
+0xCB, 0x6B,
+0x00, 0x88, 0x98, 0xE9,
+
+0x73, 0x7B, 0xC8, 0xEC,
+0x96, 0xE2,
+0x41, 0x04,
+
+0x7B, 0x43, 0xA0, 0xE8,
+0x73, 0x4B, 0xA0, 0xE8,
+
+0xAD, 0xEE, 0x29, 0x9F,
+0x00, 0xE0,
+0x49, 0x04,
+
+0x90, 0xE2,
+0x51, 0x04,
+0x31, 0x46, 0xB1, 0xE8,
+
+0x49, 0x41, 0xC0, 0xEC,
+0x39, 0x57, 0xB1, 0xE8,
+
+0x00, 0x04,
+0x46, 0xE2,
+0x73, 0x53, 0xA0, 0xE8,
+
+0x51, 0x41, 0xC0, 0xEC,
+0x31, 0x00,
+0x39, 0x00,
+
+0x61, 0x80, 0x15, 0xEA,
+0x08, 0x04,
+0x10, 0x04,
+
+0x51, 0x49, 0xC0, 0xEC,
+0x2F, 0x41, 0x60, 0xEA,
+
+0x31, 0x20,
+0x39, 0x20,
+0x1F, 0x42, 0xA0, 0xE8,
+
+0x2A, 0x42, 0x4A, 0xBF,
+0x27, 0x4A, 0xA0, 0xE8,
+
+0x1A, 0x42, 0x52, 0xBF,
+0x1E, 0x49, 0x60, 0xEA,
+
+0x73, 0x7B, 0xC8, 0xEC,
+0x26, 0x51, 0x60, 0xEA,
+
+0x32, 0x40, 0x48, 0xBD,
+0x22, 0x40, 0x50, 0xBD,
+
+0x12, 0x41, 0x49, 0xBD,
+0x3A, 0x41, 0x51, 0xBD,
+
+0xBF, 0x2F, 0x26, 0xBD,
+0x00, 0xE0,
+0x7B, 0x72,
+
+0x32, 0x20,
+0x22, 0x20,
+0x12, 0x20,
+0x3A, 0x20,
+
+0x46, 0x31, 0x46, 0xBF,
+0x4E, 0x31, 0x4E, 0xBF,
+
+0xB3, 0xE2, 0x2D, 0x9F,
+0x00, 0x80, 0x00, 0xE8,
+
+0x56, 0x31, 0x56, 0xBF,
+0x47, 0x39, 0x47, 0xBF,
+
+0x4F, 0x39, 0x4F, 0xBF,
+0x57, 0x39, 0x57, 0xBF,
+
+0x53, 0x80, 0x07, 0xEA,
+0x24, 0x41, 0x20, 0xE9,
+
+0x42, 0x73, 0xF8, 0xEC,
+0x00, 0xE0,
+0x2D, 0x73,
+
+0x33, 0x72,
+0x0C, 0xE3,
+0xA5, 0x2F, 0x1E, 0xBD,
+
+0x43, 0x43, 0x2D, 0xDF,
+0x4B, 0x4B, 0x2D, 0xDF,
+
+0xAE, 0x1E, 0x26, 0xBD,
+0x58, 0xE3,
+0x33, 0x66,
+
+0x53, 0x53, 0x2D, 0xDF,
+0x00, 0x80, 0x00, 0xE8,
+
+0xB8, 0x38, 0x33, 0xBF,
+0x00, 0xE0,
+0x59, 0xE3,
+
+0x1E, 0x12, 0x41, 0xE9,
+0x1A, 0x22, 0x41, 0xE9,
+
+0x2B, 0x40, 0x3D, 0xE9,
+0x3F, 0x4B, 0xA0, 0xE8,
+
+0x2D, 0x73,
+0x30, 0x76,
+0x05, 0x80, 0x3D, 0xEA,
+
+0x37, 0x43, 0xA0, 0xE8,
+0x3D, 0x53, 0xA0, 0xE8,
+
+0x48, 0x70, 0xF8, 0xEC,
+0x2B, 0x48, 0x3C, 0xE9,
+
+0x1F, 0x27, 0xBC, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x15, 0xC0, 0x20, 0xE9,
+0x15, 0xC0, 0x20, 0xE9,
+
+0x15, 0xC0, 0x20, 0xE9,
+0x15, 0xC0, 0x20, 0xE9,
+
+0x18, 0x3A, 0x41, 0xE9,
+0x1D, 0x32, 0x41, 0xE9,
+
+0x2A, 0x40, 0x20, 0xE9,
+0x56, 0x3D, 0x56, 0xDF,
+
+0x46, 0x37, 0x46, 0xDF,
+0x4E, 0x3F, 0x4E, 0xDF,
+
+0x16, 0x30, 0x20, 0xE9,
+0x4F, 0x3F, 0x4F, 0xDF,
+
+0x32, 0x32, 0x2D, 0xDF,
+0x22, 0x22, 0x2D, 0xDF,
+
+0x12, 0x12, 0x2D, 0xDF,
+0x3A, 0x3A, 0x2D, 0xDF,
+
+0x47, 0x37, 0x47, 0xDF,
+0x57, 0x3D, 0x57, 0xDF,
+
+0x3D, 0xCF, 0x74, 0xC0,
+0x37, 0xCF, 0x74, 0xC4,
+
+0x0A, 0x44, 0x4C, 0xB0,
+0x02, 0x44, 0x54, 0xB0,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x34, 0x37, 0x20, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0x3C, 0x3D, 0x20, 0xE9,
+
+0x2A, 0x44, 0x4C, 0xB2,
+0x1A, 0x44, 0x54, 0xB2,
+
+0x26, 0x80, 0x3A, 0xEA,
+0x0A, 0x20,
+0x02, 0x20,
+
+0x88, 0x73, 0x5E, 0xE9,
+0x2A, 0x20,
+0x1A, 0x20,
+
+0x3D, 0xCF, 0x74, 0xC2,
+0x27, 0xCF, 0x74, 0xC6,
+
+0x30, 0x50, 0x2E, 0x9F,
+0x32, 0x31, 0x5F, 0xE9,
+
+0x38, 0x21, 0x2C, 0x9F,
+0x33, 0x39, 0x5F, 0xE9,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x9C, 0x27, 0x20, 0xE9,
+
+0x0A, 0x44, 0x4C, 0xB4,
+0x02, 0x44, 0x54, 0xB4,
+
+0x2A, 0x44, 0x4C, 0xB6,
+0x1A, 0x44, 0x54, 0xB6,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0x38, 0x3D, 0x20, 0xE9,
+
+0x0A, 0x20,
+0x02, 0x20,
+0x2A, 0x20,
+0x1A, 0x20,
+
+0x3D, 0xCF, 0x75, 0xC6,
+0x00, 0x80, 0x00, 0xE8,
+
+0x30, 0x50, 0x2E, 0x9F,
+0x3E, 0x30, 0x4F, 0xE9,
+
+0x38, 0x21, 0x2C, 0x9F,
+0x3F, 0x38, 0x4F, 0xE9,
+
+0x0A, 0x45, 0x4D, 0xB6,
+0x02, 0x45, 0x55, 0xB6,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x3A, 0x31, 0x4F, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0x3B, 0x39, 0x4F, 0xE9,
+
+0x31, 0x3D, 0x20, 0xE9,
+0x0A, 0x20,
+0x02, 0x20,
+
+0x2A, 0x46, 0x4E, 0xBF,
+0x1A, 0x46, 0x56, 0xBF,
+
+0x0A, 0x47, 0x4F, 0xBF,
+0x02, 0x47, 0x57, 0xBF,
+
+0x30, 0x50, 0x2E, 0x9F,
+0x36, 0x30, 0x4F, 0xE9,
+
+0x38, 0x21, 0x2C, 0x9F,
+0x37, 0x38, 0x4F, 0xE9,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x9D, 0x31, 0x4F, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0x9E, 0x39, 0x4F, 0xE9,
+
+0x2A, 0x43, 0x4B, 0xBF,
+0x1A, 0x43, 0x53, 0xBF,
+
+0x30, 0x50, 0x2E, 0x9F,
+0x35, 0x30, 0x4F, 0xE9,
+
+0x38, 0x21, 0x2C, 0x9F,
+0x39, 0x38, 0x4F, 0xE9,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x80, 0x31, 0x57, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0x81, 0x39, 0x57, 0xE9,
+
+0x37, 0x48, 0x50, 0xBD,
+0x8A, 0x36, 0x20, 0xE9,
+
+0x86, 0x76, 0x57, 0xE9,
+0x8B, 0x3E, 0x20, 0xE9,
+
+0x82, 0x30, 0x57, 0xE9,
+0x87, 0x77, 0x57, 0xE9,
+
+0x83, 0x38, 0x57, 0xE9,
+0x35, 0x49, 0x51, 0xBD,
+
+0x84, 0x31, 0x5E, 0xE9,
+0x30, 0x1F, 0x5F, 0xE9,
+
+0x85, 0x39, 0x5E, 0xE9,
+0x57, 0x25, 0x20, 0xE9,
+
+0x2B, 0x48, 0x20, 0xE9,
+0x1D, 0x37, 0xE1, 0xEA,
+
+0x1E, 0x35, 0xE1, 0xEA,
+0x00, 0xE0,
+0x26, 0x77,
+
+0x24, 0x49, 0x20, 0xE9,
+0xA6, 0xFF, 0x20, 0xEA,
+
+0x16, 0x26, 0x20, 0xE9,
+0x57, 0x2E, 0xBF, 0xEA,
+
+0x1C, 0x46, 0xA0, 0xE8,
+0x23, 0x4E, 0xA0, 0xE8,
+
+0x2B, 0x56, 0xA0, 0xE8,
+0x1D, 0x47, 0xA0, 0xE8,
+
+0x24, 0x4F, 0xA0, 0xE8,
+0x2C, 0x57, 0xA0, 0xE8,
+
+0x1C, 0x00,
+0x23, 0x00,
+0x2B, 0x00,
+0x00, 0xE0,
+
+0x1D, 0x00,
+0x24, 0x00,
+0x2C, 0x00,
+0x00, 0xE0,
+
+0x1C, 0x65,
+0x23, 0x65,
+0x2B, 0x65,
+0x00, 0xE0,
+
+0x1D, 0x65,
+0x24, 0x65,
+0x2C, 0x65,
+0x00, 0xE0,
+
+0x1C, 0x23, 0x60, 0xEC,
+0x36, 0xD7, 0x36, 0xAD,
+
+0x2B, 0x80, 0x60, 0xEC,
+0x1D, 0x24, 0x60, 0xEC,
+
+0x3E, 0xD7, 0x3E, 0xAD,
+0x2C, 0x80, 0x60, 0xEC,
+
+0x1C, 0x2B, 0xDE, 0xE8,
+0x23, 0x80, 0xDE, 0xE8,
+
+0x36, 0x80, 0x36, 0xBD,
+0x3E, 0x80, 0x3E, 0xBD,
+
+0x33, 0xD7, 0x1C, 0xBD,
+0x3B, 0xD7, 0x23, 0xBD,
+
+0x46, 0x80, 0x46, 0xCF,
+0x4F, 0x80, 0x4F, 0xCF,
+
+0x56, 0x33, 0x56, 0xCF,
+0x47, 0x3B, 0x47, 0xCF,
+
+0xCD, 0xFF, 0x20, 0xEA,
+0x00, 0x80, 0x00, 0xE8,
+
+0x4E, 0x33, 0x4E, 0xCF,
+0x57, 0x3B, 0x57, 0xCF,
+
+0x94, 0xFF, 0x20, 0xEA,
+0x57, 0xC0, 0xBF, 0xEA,
+
+0x00, 0x80, 0xA0, 0xE9,
+0x00, 0x00, 0xD8, 0xEC,
+
+};
+
+static unsigned char warp_g400_tgzf[] = {
+
+0x00, 0x88, 0x98, 0xE9,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0xA0, 0xE9,
+0x00, 0x00, 0xD8, 0xEC,
+
+0xFF, 0x80, 0xC0, 0xE9,
+0x00, 0x80, 0x00, 0xE8,
+
+0x22, 0x40, 0x48, 0xBF,
+0x2A, 0x40, 0x50, 0xBF,
+
+0x32, 0x41, 0x49, 0xBF,
+0x3A, 0x41, 0x51, 0xBF,
+
+0xC3, 0x6B,
+0xCB, 0x6B,
+0x00, 0x88, 0x98, 0xE9,
+
+0x73, 0x7B, 0xC8, 0xEC,
+0x96, 0xE2,
+0x41, 0x04,
+
+0x7B, 0x43, 0xA0, 0xE8,
+0x73, 0x4B, 0xA0, 0xE8,
+
+0xAD, 0xEE, 0x29, 0x9F,
+0x00, 0xE0,
+0x49, 0x04,
+
+0x90, 0xE2,
+0x51, 0x04,
+0x31, 0x46, 0xB1, 0xE8,
+
+0x49, 0x41, 0xC0, 0xEC,
+0x39, 0x57, 0xB1, 0xE8,
+
+0x00, 0x04,
+0x46, 0xE2,
+0x73, 0x53, 0xA0, 0xE8,
+
+0x51, 0x41, 0xC0, 0xEC,
+0x31, 0x00,
+0x39, 0x00,
+
+0x5D, 0x80, 0x15, 0xEA,
+0x08, 0x04,
+0x10, 0x04,
+
+0x51, 0x49, 0xC0, 0xEC,
+0x2F, 0x41, 0x60, 0xEA,
+
+0x31, 0x20,
+0x39, 0x20,
+0x1F, 0x42, 0xA0, 0xE8,
+
+0x2A, 0x42, 0x4A, 0xBF,
+0x27, 0x4A, 0xA0, 0xE8,
+
+0x1A, 0x42, 0x52, 0xBF,
+0x1E, 0x49, 0x60, 0xEA,
+
+0x73, 0x7B, 0xC8, 0xEC,
+0x26, 0x51, 0x60, 0xEA,
+
+0x32, 0x40, 0x48, 0xBD,
+0x22, 0x40, 0x50, 0xBD,
+
+0x12, 0x41, 0x49, 0xBD,
+0x3A, 0x41, 0x51, 0xBD,
+
+0xBF, 0x2F, 0x26, 0xBD,
+0x00, 0xE0,
+0x7B, 0x72,
+
+0x32, 0x20,
+0x22, 0x20,
+0x12, 0x20,
+0x3A, 0x20,
+
+0x46, 0x31, 0x46, 0xBF,
+0x4E, 0x31, 0x4E, 0xBF,
+
+0xB3, 0xE2, 0x2D, 0x9F,
+0x00, 0x80, 0x00, 0xE8,
+
+0x56, 0x31, 0x56, 0xBF,
+0x47, 0x39, 0x47, 0xBF,
+
+0x4F, 0x39, 0x4F, 0xBF,
+0x57, 0x39, 0x57, 0xBF,
+
+0x4F, 0x80, 0x07, 0xEA,
+0x24, 0x41, 0x20, 0xE9,
+
+0x42, 0x73, 0xF8, 0xEC,
+0x00, 0xE0,
+0x2D, 0x73,
+
+0x33, 0x72,
+0x0C, 0xE3,
+0xA5, 0x2F, 0x1E, 0xBD,
+
+0x43, 0x43, 0x2D, 0xDF,
+0x4B, 0x4B, 0x2D, 0xDF,
+
+0xAE, 0x1E, 0x26, 0xBD,
+0x58, 0xE3,
+0x33, 0x66,
+
+0x53, 0x53, 0x2D, 0xDF,
+0x00, 0x80, 0x00, 0xE8,
+
+0xB8, 0x38, 0x33, 0xBF,
+0x00, 0xE0,
+0x59, 0xE3,
+
+0x1E, 0x12, 0x41, 0xE9,
+0x1A, 0x22, 0x41, 0xE9,
+
+0x2B, 0x40, 0x3D, 0xE9,
+0x3F, 0x4B, 0xA0, 0xE8,
+
+0x2D, 0x73,
+0x30, 0x76,
+0x05, 0x80, 0x3D, 0xEA,
+
+0x37, 0x43, 0xA0, 0xE8,
+0x3D, 0x53, 0xA0, 0xE8,
+
+0x48, 0x70, 0xF8, 0xEC,
+0x2B, 0x48, 0x3C, 0xE9,
+
+0x1F, 0x27, 0xBC, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x15, 0xC0, 0x20, 0xE9,
+0x15, 0xC0, 0x20, 0xE9,
+
+0x15, 0xC0, 0x20, 0xE9,
+0x15, 0xC0, 0x20, 0xE9,
+
+0x18, 0x3A, 0x41, 0xE9,
+0x1D, 0x32, 0x41, 0xE9,
+
+0x2A, 0x40, 0x20, 0xE9,
+0x56, 0x3D, 0x56, 0xDF,
+
+0x46, 0x37, 0x46, 0xDF,
+0x4E, 0x3F, 0x4E, 0xDF,
+
+0x16, 0x30, 0x20, 0xE9,
+0x4F, 0x3F, 0x4F, 0xDF,
+
+0x32, 0x32, 0x2D, 0xDF,
+0x22, 0x22, 0x2D, 0xDF,
+
+0x12, 0x12, 0x2D, 0xDF,
+0x3A, 0x3A, 0x2D, 0xDF,
+
+0x47, 0x37, 0x47, 0xDF,
+0x57, 0x3D, 0x57, 0xDF,
+
+0x3D, 0xCF, 0x74, 0xC0,
+0x37, 0xCF, 0x74, 0xC4,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0x34, 0x80, 0x20, 0xE9,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x00, 0x80, 0x00, 0xE8,
+
+0x88, 0x73, 0x5E, 0xE9,
+0x00, 0x80, 0x00, 0xE8,
+
+0x27, 0xCF, 0x75, 0xC6,
+0x3C, 0x3D, 0x20, 0xE9,
+
+0x0A, 0x44, 0x4C, 0xB0,
+0x02, 0x44, 0x54, 0xB0,
+
+0x2A, 0x44, 0x4C, 0xB2,
+0x1A, 0x44, 0x54, 0xB2,
+
+0x20, 0x80, 0x3A, 0xEA,
+0x0A, 0x20,
+0x02, 0x20,
+
+0x3D, 0xCF, 0x74, 0xC2,
+0x2A, 0x20,
+0x1A, 0x20,
+
+0x30, 0x50, 0x2E, 0x9F,
+0x32, 0x31, 0x5F, 0xE9,
+
+0x38, 0x21, 0x2C, 0x9F,
+0x33, 0x39, 0x5F, 0xE9,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x31, 0x27, 0x20, 0xE9,
+
+0x0A, 0x44, 0x4C, 0xB4,
+0x02, 0x44, 0x54, 0xB4,
+
+0x2A, 0x45, 0x4D, 0xB6,
+0x1A, 0x45, 0x55, 0xB6,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0x38, 0x3D, 0x20, 0xE9,
+
+0x0A, 0x20,
+0x02, 0x20,
+0x2A, 0x20,
+0x1A, 0x20,
+
+0x0A, 0x47, 0x4F, 0xBF,
+0x02, 0x47, 0x57, 0xBF,
+
+0x30, 0x50, 0x2E, 0x9F,
+0x3E, 0x30, 0x4F, 0xE9,
+
+0x38, 0x21, 0x2C, 0x9F,
+0x3F, 0x38, 0x4F, 0xE9,
+
+0x2A, 0x46, 0x4E, 0xBF,
+0x1A, 0x46, 0x56, 0xBF,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x3A, 0x31, 0x4F, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0x3B, 0x39, 0x4F, 0xE9,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x36, 0x30, 0x4F, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0x37, 0x38, 0x4F, 0xE9,
+
+0x2A, 0x43, 0x4B, 0xBF,
+0x1A, 0x43, 0x53, 0xBF,
+
+0x30, 0x50, 0x2E, 0x9F,
+0x35, 0x31, 0x4F, 0xE9,
+
+0x38, 0x21, 0x2C, 0x9F,
+0x39, 0x39, 0x4F, 0xE9,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x80, 0x31, 0x57, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0x81, 0x39, 0x57, 0xE9,
+
+0x37, 0x48, 0x50, 0xBD,
+0x8A, 0x36, 0x20, 0xE9,
+
+0x86, 0x76, 0x57, 0xE9,
+0x8B, 0x3E, 0x20, 0xE9,
+
+0x82, 0x30, 0x57, 0xE9,
+0x87, 0x77, 0x57, 0xE9,
+
+0x83, 0x38, 0x57, 0xE9,
+0x35, 0x49, 0x51, 0xBD,
+
+0x84, 0x31, 0x5E, 0xE9,
+0x30, 0x1F, 0x5F, 0xE9,
+
+0x85, 0x39, 0x5E, 0xE9,
+0x57, 0x25, 0x20, 0xE9,
+
+0x2B, 0x48, 0x20, 0xE9,
+0x1D, 0x37, 0xE1, 0xEA,
+
+0x1E, 0x35, 0xE1, 0xEA,
+0x00, 0xE0,
+0x26, 0x77,
+
+0x24, 0x49, 0x20, 0xE9,
+0xAA, 0xFF, 0x20, 0xEA,
+
+0x16, 0x26, 0x20, 0xE9,
+0x57, 0x2E, 0xBF, 0xEA,
+
+0x1C, 0x46, 0xA0, 0xE8,
+0x23, 0x4E, 0xA0, 0xE8,
+
+0x2B, 0x56, 0xA0, 0xE8,
+0x1D, 0x47, 0xA0, 0xE8,
+
+0x24, 0x4F, 0xA0, 0xE8,
+0x2C, 0x57, 0xA0, 0xE8,
+
+0x1C, 0x00,
+0x23, 0x00,
+0x2B, 0x00,
+0x00, 0xE0,
+
+0x1D, 0x00,
+0x24, 0x00,
+0x2C, 0x00,
+0x00, 0xE0,
+
+0x1C, 0x65,
+0x23, 0x65,
+0x2B, 0x65,
+0x00, 0xE0,
+
+0x1D, 0x65,
+0x24, 0x65,
+0x2C, 0x65,
+0x00, 0xE0,
+
+0x1C, 0x23, 0x60, 0xEC,
+0x36, 0xD7, 0x36, 0xAD,
+
+0x2B, 0x80, 0x60, 0xEC,
+0x1D, 0x24, 0x60, 0xEC,
+
+0x3E, 0xD7, 0x3E, 0xAD,
+0x2C, 0x80, 0x60, 0xEC,
+
+0x1C, 0x2B, 0xDE, 0xE8,
+0x23, 0x80, 0xDE, 0xE8,
+
+0x36, 0x80, 0x36, 0xBD,
+0x3E, 0x80, 0x3E, 0xBD,
+
+0x33, 0xD7, 0x1C, 0xBD,
+0x3B, 0xD7, 0x23, 0xBD,
+
+0x46, 0x80, 0x46, 0xCF,
+0x4F, 0x80, 0x4F, 0xCF,
+
+0x56, 0x33, 0x56, 0xCF,
+0x47, 0x3B, 0x47, 0xCF,
+
+0xD3, 0xFF, 0x20, 0xEA,
+0x00, 0x80, 0x00, 0xE8,
+
+0x4E, 0x33, 0x4E, 0xCF,
+0x57, 0x3B, 0x57, 0xCF,
+
+0x98, 0xFF, 0x20, 0xEA,
+0x57, 0xC0, 0xBF, 0xEA,
+
+0x00, 0x80, 0xA0, 0xE9,
+0x00, 0x00, 0xD8, 0xEC,
+
+};
+
+static unsigned char warp_g400_tgzs[] = {
+
+0x00, 0x88, 0x98, 0xE9,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0xA0, 0xE9,
+0x00, 0x00, 0xD8, 0xEC,
+
+0xFF, 0x80, 0xC0, 0xE9,
+0x00, 0x80, 0x00, 0xE8,
+
+0x22, 0x40, 0x48, 0xBF,
+0x2A, 0x40, 0x50, 0xBF,
+
+0x32, 0x41, 0x49, 0xBF,
+0x3A, 0x41, 0x51, 0xBF,
+
+0xC3, 0x6B,
+0xCB, 0x6B,
+0x00, 0x88, 0x98, 0xE9,
+
+0x73, 0x7B, 0xC8, 0xEC,
+0x96, 0xE2,
+0x41, 0x04,
+
+0x7B, 0x43, 0xA0, 0xE8,
+0x73, 0x4B, 0xA0, 0xE8,
+
+0xAD, 0xEE, 0x29, 0x9F,
+0x00, 0xE0,
+0x49, 0x04,
+
+0x90, 0xE2,
+0x51, 0x04,
+0x31, 0x46, 0xB1, 0xE8,
+
+0x49, 0x41, 0xC0, 0xEC,
+0x39, 0x57, 0xB1, 0xE8,
+
+0x00, 0x04,
+0x46, 0xE2,
+0x73, 0x53, 0xA0, 0xE8,
+
+0x51, 0x41, 0xC0, 0xEC,
+0x31, 0x00,
+0x39, 0x00,
+
+0x65, 0x80, 0x15, 0xEA,
+0x08, 0x04,
+0x10, 0x04,
+
+0x51, 0x49, 0xC0, 0xEC,
+0x2F, 0x41, 0x60, 0xEA,
+
+0x31, 0x20,
+0x39, 0x20,
+0x1F, 0x42, 0xA0, 0xE8,
+
+0x2A, 0x42, 0x4A, 0xBF,
+0x27, 0x4A, 0xA0, 0xE8,
+
+0x1A, 0x42, 0x52, 0xBF,
+0x1E, 0x49, 0x60, 0xEA,
+
+0x73, 0x7B, 0xC8, 0xEC,
+0x26, 0x51, 0x60, 0xEA,
+
+0x32, 0x40, 0x48, 0xBD,
+0x22, 0x40, 0x50, 0xBD,
+
+0x12, 0x41, 0x49, 0xBD,
+0x3A, 0x41, 0x51, 0xBD,
+
+0xBF, 0x2F, 0x26, 0xBD,
+0x00, 0xE0,
+0x7B, 0x72,
+
+0x32, 0x20,
+0x22, 0x20,
+0x12, 0x20,
+0x3A, 0x20,
+
+0x46, 0x31, 0x46, 0xBF,
+0x4E, 0x31, 0x4E, 0xBF,
+
+0xB3, 0xE2, 0x2D, 0x9F,
+0x00, 0x80, 0x00, 0xE8,
+
+0x56, 0x31, 0x56, 0xBF,
+0x47, 0x39, 0x47, 0xBF,
+
+0x4F, 0x39, 0x4F, 0xBF,
+0x57, 0x39, 0x57, 0xBF,
+
+0x57, 0x80, 0x07, 0xEA,
+0x24, 0x41, 0x20, 0xE9,
+
+0x42, 0x73, 0xF8, 0xEC,
+0x00, 0xE0,
+0x2D, 0x73,
+
+0x33, 0x72,
+0x0C, 0xE3,
+0xA5, 0x2F, 0x1E, 0xBD,
+
+0x43, 0x43, 0x2D, 0xDF,
+0x4B, 0x4B, 0x2D, 0xDF,
+
+0xAE, 0x1E, 0x26, 0xBD,
+0x58, 0xE3,
+0x33, 0x66,
+
+0x53, 0x53, 0x2D, 0xDF,
+0x00, 0x80, 0x00, 0xE8,
+
+0xB8, 0x38, 0x33, 0xBF,
+0x00, 0xE0,
+0x59, 0xE3,
+
+0x1E, 0x12, 0x41, 0xE9,
+0x1A, 0x22, 0x41, 0xE9,
+
+0x2B, 0x40, 0x3D, 0xE9,
+0x3F, 0x4B, 0xA0, 0xE8,
+
+0x2D, 0x73,
+0x30, 0x76,
+0x05, 0x80, 0x3D, 0xEA,
+
+0x37, 0x43, 0xA0, 0xE8,
+0x3D, 0x53, 0xA0, 0xE8,
+
+0x48, 0x70, 0xF8, 0xEC,
+0x2B, 0x48, 0x3C, 0xE9,
+
+0x1F, 0x27, 0xBC, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x15, 0xC0, 0x20, 0xE9,
+0x15, 0xC0, 0x20, 0xE9,
+
+0x15, 0xC0, 0x20, 0xE9,
+0x15, 0xC0, 0x20, 0xE9,
+
+0x18, 0x3A, 0x41, 0xE9,
+0x1D, 0x32, 0x41, 0xE9,
+
+0x2A, 0x40, 0x20, 0xE9,
+0x56, 0x3D, 0x56, 0xDF,
+
+0x46, 0x37, 0x46, 0xDF,
+0x4E, 0x3F, 0x4E, 0xDF,
+
+0x16, 0x30, 0x20, 0xE9,
+0x4F, 0x3F, 0x4F, 0xDF,
+
+0x47, 0x37, 0x47, 0xDF,
+0x57, 0x3D, 0x57, 0xDF,
+
+0x32, 0x32, 0x2D, 0xDF,
+0x22, 0x22, 0x2D, 0xDF,
+
+0x12, 0x12, 0x2D, 0xDF,
+0x3A, 0x3A, 0x2D, 0xDF,
+
+0x27, 0xCF, 0x74, 0xC2,
+0x37, 0xCF, 0x74, 0xC4,
+
+0x0A, 0x44, 0x4C, 0xB0,
+0x02, 0x44, 0x54, 0xB0,
+
+0x3D, 0xCF, 0x74, 0xC0,
+0x34, 0x37, 0x20, 0xE9,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x38, 0x27, 0x20, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0x3C, 0x3D, 0x20, 0xE9,
+
+0x2A, 0x44, 0x4C, 0xB2,
+0x1A, 0x44, 0x54, 0xB2,
+
+0x29, 0x80, 0x3A, 0xEA,
+0x0A, 0x20,
+0x02, 0x20,
+
+0x27, 0xCF, 0x75, 0xC0,
+0x2A, 0x20,
+0x1A, 0x20,
+
+0x30, 0x50, 0x2E, 0x9F,
+0x32, 0x31, 0x5F, 0xE9,
+
+0x38, 0x21, 0x2C, 0x9F,
+0x33, 0x39, 0x5F, 0xE9,
+
+0x3D, 0xCF, 0x75, 0xC2,
+0x37, 0xCF, 0x75, 0xC4,
+
+0x31, 0x53, 0x2F, 0x9F,
+0xA6, 0x27, 0x20, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0xA3, 0x3D, 0x20, 0xE9,
+
+0x2A, 0x44, 0x4C, 0xB4,
+0x1A, 0x44, 0x54, 0xB4,
+
+0x0A, 0x45, 0x4D, 0xB0,
+0x02, 0x45, 0x55, 0xB0,
+
+0x88, 0x73, 0x5E, 0xE9,
+0x2A, 0x20,
+0x1A, 0x20,
+
+0xA0, 0x37, 0x20, 0xE9,
+0x0A, 0x20,
+0x02, 0x20,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x3E, 0x30, 0x4F, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0x3F, 0x38, 0x4F, 0xE9,
+
+0x30, 0x50, 0x2E, 0x9F,
+0x3A, 0x31, 0x4F, 0xE9,
+
+0x2A, 0x45, 0x4D, 0xB2,
+0x1A, 0x45, 0x55, 0xB2,
+
+0x0A, 0x45, 0x4D, 0xB4,
+0x02, 0x45, 0x55, 0xB4,
+
+0x38, 0x21, 0x2C, 0x9F,
+0x3B, 0x39, 0x4F, 0xE9,
+
+0x0A, 0x20,
+0x02, 0x20,
+0x2A, 0x20,
+0x1A, 0x20,
+
+0x2A, 0x46, 0x4E, 0xBF,
+0x1A, 0x46, 0x56, 0xBF,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x36, 0x31, 0x4F, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0x37, 0x39, 0x4F, 0xE9,
+
+0x30, 0x50, 0x2E, 0x9F,
+0xA7, 0x30, 0x4F, 0xE9,
+
+0x38, 0x21, 0x2C, 0x9F,
+0xA8, 0x38, 0x4F, 0xE9,
+
+0x0A, 0x47, 0x4F, 0xBF,
+0x02, 0x47, 0x57, 0xBF,
+
+0x31, 0x53, 0x2F, 0x9F,
+0xA4, 0x31, 0x4F, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0xA5, 0x39, 0x4F, 0xE9,
+
+0x2A, 0x43, 0x4B, 0xBF,
+0x1A, 0x43, 0x53, 0xBF,
+
+0x30, 0x50, 0x2E, 0x9F,
+0xA1, 0x30, 0x4F, 0xE9,
+
+0x38, 0x21, 0x2C, 0x9F,
+0xA2, 0x38, 0x4F, 0xE9,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x80, 0x31, 0x57, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0x81, 0x39, 0x57, 0xE9,
+
+0x37, 0x48, 0x50, 0xBD,
+0x8A, 0x36, 0x20, 0xE9,
+
+0x86, 0x76, 0x57, 0xE9,
+0x8B, 0x3E, 0x20, 0xE9,
+
+0x82, 0x30, 0x57, 0xE9,
+0x87, 0x77, 0x57, 0xE9,
+
+0x83, 0x38, 0x57, 0xE9,
+0x35, 0x49, 0x51, 0xBD,
+
+0x84, 0x31, 0x5E, 0xE9,
+0x30, 0x1F, 0x5F, 0xE9,
+
+0x85, 0x39, 0x5E, 0xE9,
+0x57, 0x25, 0x20, 0xE9,
+
+0x2B, 0x48, 0x20, 0xE9,
+0x1D, 0x37, 0xE1, 0xEA,
+
+0x1E, 0x35, 0xE1, 0xEA,
+0x00, 0xE0,
+0x26, 0x77,
+
+0x24, 0x49, 0x20, 0xE9,
+0xA2, 0xFF, 0x20, 0xEA,
+
+0x16, 0x26, 0x20, 0xE9,
+0x57, 0x2E, 0xBF, 0xEA,
+
+0x1C, 0x46, 0xA0, 0xE8,
+0x23, 0x4E, 0xA0, 0xE8,
+
+0x2B, 0x56, 0xA0, 0xE8,
+0x1D, 0x47, 0xA0, 0xE8,
+
+0x24, 0x4F, 0xA0, 0xE8,
+0x2C, 0x57, 0xA0, 0xE8,
+
+0x1C, 0x00,
+0x23, 0x00,
+0x2B, 0x00,
+0x00, 0xE0,
+
+0x1D, 0x00,
+0x24, 0x00,
+0x2C, 0x00,
+0x00, 0xE0,
+
+0x1C, 0x65,
+0x23, 0x65,
+0x2B, 0x65,
+0x00, 0xE0,
+
+0x1D, 0x65,
+0x24, 0x65,
+0x2C, 0x65,
+0x00, 0xE0,
+
+0x1C, 0x23, 0x60, 0xEC,
+0x36, 0xD7, 0x36, 0xAD,
+
+0x2B, 0x80, 0x60, 0xEC,
+0x1D, 0x24, 0x60, 0xEC,
+
+0x3E, 0xD7, 0x3E, 0xAD,
+0x2C, 0x80, 0x60, 0xEC,
+
+0x1C, 0x2B, 0xDE, 0xE8,
+0x23, 0x80, 0xDE, 0xE8,
+
+0x36, 0x80, 0x36, 0xBD,
+0x3E, 0x80, 0x3E, 0xBD,
+
+0x33, 0xD7, 0x1C, 0xBD,
+0x3B, 0xD7, 0x23, 0xBD,
+
+0x46, 0x80, 0x46, 0xCF,
+0x4F, 0x80, 0x4F, 0xCF,
+
+0x56, 0x33, 0x56, 0xCF,
+0x47, 0x3B, 0x47, 0xCF,
+
+0xCA, 0xFF, 0x20, 0xEA,
+0x00, 0x80, 0x00, 0xE8,
+
+0x4E, 0x33, 0x4E, 0xCF,
+0x57, 0x3B, 0x57, 0xCF,
+
+0x90, 0xFF, 0x20, 0xEA,
+0x57, 0xC0, 0xBF, 0xEA,
+
+0x00, 0x80, 0xA0, 0xE9,
+0x00, 0x00, 0xD8, 0xEC,
+
+};
+
+static unsigned char warp_g400_tgzsa[] = {
+
+0x00, 0x88, 0x98, 0xE9,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0xA0, 0xE9,
+0x00, 0x00, 0xD8, 0xEC,
+
+0xFF, 0x80, 0xC0, 0xE9,
+0x00, 0x80, 0x00, 0xE8,
+
+0x22, 0x40, 0x48, 0xBF,
+0x2A, 0x40, 0x50, 0xBF,
+
+0x32, 0x41, 0x49, 0xBF,
+0x3A, 0x41, 0x51, 0xBF,
+
+0xC3, 0x6B,
+0xCB, 0x6B,
+0x00, 0x88, 0x98, 0xE9,
+
+0x73, 0x7B, 0xC8, 0xEC,
+0x96, 0xE2,
+0x41, 0x04,
+
+0x7B, 0x43, 0xA0, 0xE8,
+0x73, 0x4B, 0xA0, 0xE8,
+
+0xAD, 0xEE, 0x29, 0x9F,
+0x00, 0xE0,
+0x49, 0x04,
+
+0x90, 0xE2,
+0x51, 0x04,
+0x31, 0x46, 0xB1, 0xE8,
+
+0x49, 0x41, 0xC0, 0xEC,
+0x39, 0x57, 0xB1, 0xE8,
+
+0x00, 0x04,
+0x46, 0xE2,
+0x73, 0x53, 0xA0, 0xE8,
+
+0x51, 0x41, 0xC0, 0xEC,
+0x31, 0x00,
+0x39, 0x00,
+
+0x6A, 0x80, 0x15, 0xEA,
+0x08, 0x04,
+0x10, 0x04,
+
+0x51, 0x49, 0xC0, 0xEC,
+0x2F, 0x41, 0x60, 0xEA,
+
+0x31, 0x20,
+0x39, 0x20,
+0x1F, 0x42, 0xA0, 0xE8,
+
+0x2A, 0x42, 0x4A, 0xBF,
+0x27, 0x4A, 0xA0, 0xE8,
+
+0x1A, 0x42, 0x52, 0xBF,
+0x1E, 0x49, 0x60, 0xEA,
+
+0x73, 0x7B, 0xC8, 0xEC,
+0x26, 0x51, 0x60, 0xEA,
+
+0x32, 0x40, 0x48, 0xBD,
+0x22, 0x40, 0x50, 0xBD,
+
+0x12, 0x41, 0x49, 0xBD,
+0x3A, 0x41, 0x51, 0xBD,
+
+0xBF, 0x2F, 0x26, 0xBD,
+0x00, 0xE0,
+0x7B, 0x72,
+
+0x32, 0x20,
+0x22, 0x20,
+0x12, 0x20,
+0x3A, 0x20,
+
+0x46, 0x31, 0x46, 0xBF,
+0x4E, 0x31, 0x4E, 0xBF,
+
+0xB3, 0xE2, 0x2D, 0x9F,
+0x00, 0x80, 0x00, 0xE8,
+
+0x56, 0x31, 0x56, 0xBF,
+0x47, 0x39, 0x47, 0xBF,
+
+0x4F, 0x39, 0x4F, 0xBF,
+0x57, 0x39, 0x57, 0xBF,
+
+0x5C, 0x80, 0x07, 0xEA,
+0x24, 0x41, 0x20, 0xE9,
+
+0x42, 0x73, 0xF8, 0xEC,
+0x00, 0xE0,
+0x2D, 0x73,
+
+0x33, 0x72,
+0x0C, 0xE3,
+0xA5, 0x2F, 0x1E, 0xBD,
+
+0x43, 0x43, 0x2D, 0xDF,
+0x4B, 0x4B, 0x2D, 0xDF,
+
+0xAE, 0x1E, 0x26, 0xBD,
+0x58, 0xE3,
+0x33, 0x66,
+
+0x53, 0x53, 0x2D, 0xDF,
+0x00, 0x80, 0x00, 0xE8,
+
+0xB8, 0x38, 0x33, 0xBF,
+0x00, 0xE0,
+0x59, 0xE3,
+
+0x1E, 0x12, 0x41, 0xE9,
+0x1A, 0x22, 0x41, 0xE9,
+
+0x2B, 0x40, 0x3D, 0xE9,
+0x3F, 0x4B, 0xA0, 0xE8,
+
+0x2D, 0x73,
+0x30, 0x76,
+0x05, 0x80, 0x3D, 0xEA,
+
+0x37, 0x43, 0xA0, 0xE8,
+0x3D, 0x53, 0xA0, 0xE8,
+
+0x48, 0x70, 0xF8, 0xEC,
+0x2B, 0x48, 0x3C, 0xE9,
+
+0x1F, 0x27, 0xBC, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x15, 0xC0, 0x20, 0xE9,
+0x15, 0xC0, 0x20, 0xE9,
+
+0x15, 0xC0, 0x20, 0xE9,
+0x15, 0xC0, 0x20, 0xE9,
+
+0x18, 0x3A, 0x41, 0xE9,
+0x1D, 0x32, 0x41, 0xE9,
+
+0x2A, 0x40, 0x20, 0xE9,
+0x56, 0x3D, 0x56, 0xDF,
+
+0x46, 0x37, 0x46, 0xDF,
+0x4E, 0x3F, 0x4E, 0xDF,
+
+0x16, 0x30, 0x20, 0xE9,
+0x4F, 0x3F, 0x4F, 0xDF,
+
+0x47, 0x37, 0x47, 0xDF,
+0x57, 0x3D, 0x57, 0xDF,
+
+0x32, 0x32, 0x2D, 0xDF,
+0x22, 0x22, 0x2D, 0xDF,
+
+0x12, 0x12, 0x2D, 0xDF,
+0x3A, 0x3A, 0x2D, 0xDF,
+
+0x27, 0xCF, 0x74, 0xC2,
+0x37, 0xCF, 0x74, 0xC4,
+
+0x0A, 0x44, 0x4C, 0xB0,
+0x02, 0x44, 0x54, 0xB0,
+
+0x3D, 0xCF, 0x74, 0xC0,
+0x34, 0x37, 0x20, 0xE9,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x38, 0x27, 0x20, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0x3C, 0x3D, 0x20, 0xE9,
+
+0x2A, 0x44, 0x4C, 0xB2,
+0x1A, 0x44, 0x54, 0xB2,
+
+0x2E, 0x80, 0x3A, 0xEA,
+0x0A, 0x20,
+0x02, 0x20,
+
+0x27, 0xCF, 0x75, 0xC0,
+0x2A, 0x20,
+0x1A, 0x20,
+
+0x30, 0x50, 0x2E, 0x9F,
+0x32, 0x31, 0x5F, 0xE9,
+
+0x38, 0x21, 0x2C, 0x9F,
+0x33, 0x39, 0x5F, 0xE9,
+
+0x3D, 0xCF, 0x75, 0xC2,
+0x37, 0xCF, 0x75, 0xC4,
+
+0x31, 0x53, 0x2F, 0x9F,
+0xA6, 0x27, 0x20, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0xA3, 0x3D, 0x20, 0xE9,
+
+0x2A, 0x44, 0x4C, 0xB4,
+0x1A, 0x44, 0x54, 0xB4,
+
+0x0A, 0x45, 0x4D, 0xB0,
+0x02, 0x45, 0x55, 0xB0,
+
+0x88, 0x73, 0x5E, 0xE9,
+0x2A, 0x20,
+0x1A, 0x20,
+
+0xA0, 0x37, 0x20, 0xE9,
+0x0A, 0x20,
+0x02, 0x20,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x3E, 0x30, 0x4F, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0x3F, 0x38, 0x4F, 0xE9,
+
+0x30, 0x50, 0x2E, 0x9F,
+0x3A, 0x31, 0x4F, 0xE9,
+
+0x38, 0x21, 0x2C, 0x9F,
+0x3B, 0x39, 0x4F, 0xE9,
+
+0x2A, 0x45, 0x4D, 0xB2,
+0x1A, 0x45, 0x55, 0xB2,
+
+0x0A, 0x45, 0x4D, 0xB4,
+0x02, 0x45, 0x55, 0xB4,
+
+0x27, 0xCF, 0x74, 0xC6,
+0x2A, 0x20,
+0x1A, 0x20,
+
+0xA7, 0x30, 0x4F, 0xE9,
+0x0A, 0x20,
+0x02, 0x20,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x9C, 0x27, 0x20, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0xA8, 0x38, 0x4F, 0xE9,
+
+0x2A, 0x44, 0x4C, 0xB6,
+0x1A, 0x44, 0x54, 0xB6,
+
+0x30, 0x50, 0x2E, 0x9F,
+0x36, 0x31, 0x4F, 0xE9,
+
+0x38, 0x21, 0x2C, 0x9F,
+0x37, 0x39, 0x4F, 0xE9,
+
+0x00, 0x80, 0x00, 0xE8,
+0x2A, 0x20,
+0x1A, 0x20,
+
+0x2A, 0x46, 0x4E, 0xBF,
+0x1A, 0x46, 0x56, 0xBF,
+
+0x31, 0x53, 0x2F, 0x9F,
+0xA4, 0x31, 0x4F, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0xA5, 0x39, 0x4F, 0xE9,
+
+0x0A, 0x47, 0x4F, 0xBF,
+0x02, 0x47, 0x57, 0xBF,
+
+0x31, 0x53, 0x2F, 0x9F,
+0xA1, 0x30, 0x4F, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0xA2, 0x38, 0x4F, 0xE9,
+
+0x2A, 0x43, 0x4B, 0xBF,
+0x1A, 0x43, 0x53, 0xBF,
+
+0x30, 0x50, 0x2E, 0x9F,
+0x9D, 0x31, 0x4F, 0xE9,
+
+0x38, 0x21, 0x2C, 0x9F,
+0x9E, 0x39, 0x4F, 0xE9,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x80, 0x31, 0x57, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0x81, 0x39, 0x57, 0xE9,
+
+0x37, 0x48, 0x50, 0xBD,
+0x8A, 0x36, 0x20, 0xE9,
+
+0x86, 0x76, 0x57, 0xE9,
+0x8B, 0x3E, 0x20, 0xE9,
+
+0x82, 0x30, 0x57, 0xE9,
+0x87, 0x77, 0x57, 0xE9,
+
+0x83, 0x38, 0x57, 0xE9,
+0x35, 0x49, 0x51, 0xBD,
+
+0x84, 0x31, 0x5E, 0xE9,
+0x30, 0x1F, 0x5F, 0xE9,
+
+0x85, 0x39, 0x5E, 0xE9,
+0x57, 0x25, 0x20, 0xE9,
+
+0x2B, 0x48, 0x20, 0xE9,
+0x1D, 0x37, 0xE1, 0xEA,
+
+0x1E, 0x35, 0xE1, 0xEA,
+0x00, 0xE0,
+0x26, 0x77,
+
+0x24, 0x49, 0x20, 0xE9,
+0x9D, 0xFF, 0x20, 0xEA,
+
+0x16, 0x26, 0x20, 0xE9,
+0x57, 0x2E, 0xBF, 0xEA,
+
+0x1C, 0x46, 0xA0, 0xE8,
+0x23, 0x4E, 0xA0, 0xE8,
+
+0x2B, 0x56, 0xA0, 0xE8,
+0x1D, 0x47, 0xA0, 0xE8,
+
+0x24, 0x4F, 0xA0, 0xE8,
+0x2C, 0x57, 0xA0, 0xE8,
+
+0x1C, 0x00,
+0x23, 0x00,
+0x2B, 0x00,
+0x00, 0xE0,
+
+0x1D, 0x00,
+0x24, 0x00,
+0x2C, 0x00,
+0x00, 0xE0,
+
+0x1C, 0x65,
+0x23, 0x65,
+0x2B, 0x65,
+0x00, 0xE0,
+
+0x1D, 0x65,
+0x24, 0x65,
+0x2C, 0x65,
+0x00, 0xE0,
+
+0x1C, 0x23, 0x60, 0xEC,
+0x36, 0xD7, 0x36, 0xAD,
+
+0x2B, 0x80, 0x60, 0xEC,
+0x1D, 0x24, 0x60, 0xEC,
+
+0x3E, 0xD7, 0x3E, 0xAD,
+0x2C, 0x80, 0x60, 0xEC,
+
+0x1C, 0x2B, 0xDE, 0xE8,
+0x23, 0x80, 0xDE, 0xE8,
+
+0x36, 0x80, 0x36, 0xBD,
+0x3E, 0x80, 0x3E, 0xBD,
+
+0x33, 0xD7, 0x1C, 0xBD,
+0x3B, 0xD7, 0x23, 0xBD,
+
+0x46, 0x80, 0x46, 0xCF,
+0x4F, 0x80, 0x4F, 0xCF,
+
+0x56, 0x33, 0x56, 0xCF,
+0x47, 0x3B, 0x47, 0xCF,
+
+0xC5, 0xFF, 0x20, 0xEA,
+0x00, 0x80, 0x00, 0xE8,
+
+0x4E, 0x33, 0x4E, 0xCF,
+0x57, 0x3B, 0x57, 0xCF,
+
+0x8B, 0xFF, 0x20, 0xEA,
+0x57, 0xC0, 0xBF, 0xEA,
+
+0x00, 0x80, 0xA0, 0xE9,
+0x00, 0x00, 0xD8, 0xEC,
+
+};
+
+static unsigned char warp_g400_tgzsaf[] = {
+
+0x00, 0x88, 0x98, 0xE9,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0xA0, 0xE9,
+0x00, 0x00, 0xD8, 0xEC,
+
+0xFF, 0x80, 0xC0, 0xE9,
+0x00, 0x80, 0x00, 0xE8,
+
+0x22, 0x40, 0x48, 0xBF,
+0x2A, 0x40, 0x50, 0xBF,
+
+0x32, 0x41, 0x49, 0xBF,
+0x3A, 0x41, 0x51, 0xBF,
+
+0xC3, 0x6B,
+0xCB, 0x6B,
+0x00, 0x88, 0x98, 0xE9,
+
+0x73, 0x7B, 0xC8, 0xEC,
+0x96, 0xE2,
+0x41, 0x04,
+
+0x7B, 0x43, 0xA0, 0xE8,
+0x73, 0x4B, 0xA0, 0xE8,
+
+0xAD, 0xEE, 0x29, 0x9F,
+0x00, 0xE0,
+0x49, 0x04,
+
+0x90, 0xE2,
+0x51, 0x04,
+0x31, 0x46, 0xB1, 0xE8,
+
+0x49, 0x41, 0xC0, 0xEC,
+0x39, 0x57, 0xB1, 0xE8,
+
+0x00, 0x04,
+0x46, 0xE2,
+0x73, 0x53, 0xA0, 0xE8,
+
+0x51, 0x41, 0xC0, 0xEC,
+0x31, 0x00,
+0x39, 0x00,
+
+0x6E, 0x80, 0x15, 0xEA,
+0x08, 0x04,
+0x10, 0x04,
+
+0x51, 0x49, 0xC0, 0xEC,
+0x2F, 0x41, 0x60, 0xEA,
+
+0x31, 0x20,
+0x39, 0x20,
+0x1F, 0x42, 0xA0, 0xE8,
+
+0x2A, 0x42, 0x4A, 0xBF,
+0x27, 0x4A, 0xA0, 0xE8,
+
+0x1A, 0x42, 0x52, 0xBF,
+0x1E, 0x49, 0x60, 0xEA,
+
+0x73, 0x7B, 0xC8, 0xEC,
+0x26, 0x51, 0x60, 0xEA,
+
+0x32, 0x40, 0x48, 0xBD,
+0x22, 0x40, 0x50, 0xBD,
+
+0x12, 0x41, 0x49, 0xBD,
+0x3A, 0x41, 0x51, 0xBD,
+
+0xBF, 0x2F, 0x26, 0xBD,
+0x00, 0xE0,
+0x7B, 0x72,
+
+0x32, 0x20,
+0x22, 0x20,
+0x12, 0x20,
+0x3A, 0x20,
+
+0x46, 0x31, 0x46, 0xBF,
+0x4E, 0x31, 0x4E, 0xBF,
+
+0xB3, 0xE2, 0x2D, 0x9F,
+0x00, 0x80, 0x00, 0xE8,
+
+0x56, 0x31, 0x56, 0xBF,
+0x47, 0x39, 0x47, 0xBF,
+
+0x4F, 0x39, 0x4F, 0xBF,
+0x57, 0x39, 0x57, 0xBF,
+
+0x60, 0x80, 0x07, 0xEA,
+0x24, 0x41, 0x20, 0xE9,
+
+0x42, 0x73, 0xF8, 0xEC,
+0x00, 0xE0,
+0x2D, 0x73,
+
+0x33, 0x72,
+0x0C, 0xE3,
+0xA5, 0x2F, 0x1E, 0xBD,
+
+0x43, 0x43, 0x2D, 0xDF,
+0x4B, 0x4B, 0x2D, 0xDF,
+
+0xAE, 0x1E, 0x26, 0xBD,
+0x58, 0xE3,
+0x33, 0x66,
+
+0x53, 0x53, 0x2D, 0xDF,
+0x00, 0x80, 0x00, 0xE8,
+
+0xB8, 0x38, 0x33, 0xBF,
+0x00, 0xE0,
+0x59, 0xE3,
+
+0x1E, 0x12, 0x41, 0xE9,
+0x1A, 0x22, 0x41, 0xE9,
+
+0x2B, 0x40, 0x3D, 0xE9,
+0x3F, 0x4B, 0xA0, 0xE8,
+
+0x2D, 0x73,
+0x30, 0x76,
+0x05, 0x80, 0x3D, 0xEA,
+
+0x37, 0x43, 0xA0, 0xE8,
+0x3D, 0x53, 0xA0, 0xE8,
+
+0x48, 0x70, 0xF8, 0xEC,
+0x2B, 0x48, 0x3C, 0xE9,
+
+0x1F, 0x27, 0xBC, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x15, 0xC0, 0x20, 0xE9,
+0x15, 0xC0, 0x20, 0xE9,
+
+0x15, 0xC0, 0x20, 0xE9,
+0x15, 0xC0, 0x20, 0xE9,
+
+0x18, 0x3A, 0x41, 0xE9,
+0x1D, 0x32, 0x41, 0xE9,
+
+0x2A, 0x40, 0x20, 0xE9,
+0x56, 0x3D, 0x56, 0xDF,
+
+0x46, 0x37, 0x46, 0xDF,
+0x4E, 0x3F, 0x4E, 0xDF,
+
+0x16, 0x30, 0x20, 0xE9,
+0x4F, 0x3F, 0x4F, 0xDF,
+
+0x47, 0x37, 0x47, 0xDF,
+0x57, 0x3D, 0x57, 0xDF,
+
+0x32, 0x32, 0x2D, 0xDF,
+0x22, 0x22, 0x2D, 0xDF,
+
+0x12, 0x12, 0x2D, 0xDF,
+0x3A, 0x3A, 0x2D, 0xDF,
+
+0x27, 0xCF, 0x74, 0xC2,
+0x37, 0xCF, 0x74, 0xC4,
+
+0x0A, 0x44, 0x4C, 0xB0,
+0x02, 0x44, 0x54, 0xB0,
+
+0x3D, 0xCF, 0x74, 0xC0,
+0x34, 0x37, 0x20, 0xE9,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x38, 0x27, 0x20, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0x3C, 0x3D, 0x20, 0xE9,
+
+0x2A, 0x44, 0x4C, 0xB2,
+0x1A, 0x44, 0x54, 0xB2,
+
+0x32, 0x80, 0x3A, 0xEA,
+0x0A, 0x20,
+0x02, 0x20,
+
+0x27, 0xCF, 0x75, 0xC0,
+0x2A, 0x20,
+0x1A, 0x20,
+
+0x30, 0x50, 0x2E, 0x9F,
+0x32, 0x31, 0x5F, 0xE9,
+
+0x38, 0x21, 0x2C, 0x9F,
+0x33, 0x39, 0x5F, 0xE9,
+
+0x3D, 0xCF, 0x75, 0xC2,
+0x37, 0xCF, 0x75, 0xC4,
+
+0x31, 0x53, 0x2F, 0x9F,
+0xA6, 0x27, 0x20, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0xA3, 0x3D, 0x20, 0xE9,
+
+0x2A, 0x44, 0x4C, 0xB4,
+0x1A, 0x44, 0x54, 0xB4,
+
+0x0A, 0x45, 0x4D, 0xB0,
+0x02, 0x45, 0x55, 0xB0,
+
+0x88, 0x73, 0x5E, 0xE9,
+0x2A, 0x20,
+0x1A, 0x20,
+
+0xA0, 0x37, 0x20, 0xE9,
+0x0A, 0x20,
+0x02, 0x20,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x3E, 0x30, 0x4F, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0x3F, 0x38, 0x4F, 0xE9,
+
+0x30, 0x50, 0x2E, 0x9F,
+0x3A, 0x31, 0x4F, 0xE9,
+
+0x38, 0x21, 0x2C, 0x9F,
+0x3B, 0x39, 0x4F, 0xE9,
+
+0x2A, 0x45, 0x4D, 0xB2,
+0x1A, 0x45, 0x55, 0xB2,
+
+0x0A, 0x45, 0x4D, 0xB4,
+0x02, 0x45, 0x55, 0xB4,
+
+0x27, 0xCF, 0x74, 0xC6,
+0x2A, 0x20,
+0x1A, 0x20,
+
+0xA7, 0x30, 0x4F, 0xE9,
+0x0A, 0x20,
+0x02, 0x20,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x9C, 0x27, 0x20, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0xA8, 0x38, 0x4F, 0xE9,
+
+0x2A, 0x44, 0x4C, 0xB6,
+0x1A, 0x44, 0x54, 0xB6,
+
+0x30, 0x50, 0x2E, 0x9F,
+0x36, 0x31, 0x4F, 0xE9,
+
+0x38, 0x21, 0x2C, 0x9F,
+0x37, 0x39, 0x4F, 0xE9,
+
+0x0A, 0x45, 0x4D, 0xB6,
+0x02, 0x45, 0x55, 0xB6,
+
+0x3D, 0xCF, 0x75, 0xC6,
+0x2A, 0x20,
+0x1A, 0x20,
+
+0x2A, 0x46, 0x4E, 0xBF,
+0x1A, 0x46, 0x56, 0xBF,
+
+0x31, 0x53, 0x2F, 0x9F,
+0xA4, 0x31, 0x4F, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0xA5, 0x39, 0x4F, 0xE9,
+
+0x31, 0x3D, 0x20, 0xE9,
+0x0A, 0x20,
+0x02, 0x20,
+
+0x0A, 0x47, 0x4F, 0xBF,
+0x02, 0x47, 0x57, 0xBF,
+
+0x30, 0x50, 0x2E, 0x9F,
+0xA1, 0x30, 0x4F, 0xE9,
+
+0x38, 0x21, 0x2C, 0x9F,
+0xA2, 0x38, 0x4F, 0xE9,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x9D, 0x31, 0x4F, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0x9E, 0x39, 0x4F, 0xE9,
+
+0x2A, 0x43, 0x4B, 0xBF,
+0x1A, 0x43, 0x53, 0xBF,
+
+0x30, 0x50, 0x2E, 0x9F,
+0x35, 0x30, 0x4F, 0xE9,
+
+0x38, 0x21, 0x2C, 0x9F,
+0x39, 0x38, 0x4F, 0xE9,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x80, 0x31, 0x57, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0x81, 0x39, 0x57, 0xE9,
+
+0x37, 0x48, 0x50, 0xBD,
+0x8A, 0x36, 0x20, 0xE9,
+
+0x86, 0x76, 0x57, 0xE9,
+0x8B, 0x3E, 0x20, 0xE9,
+
+0x82, 0x30, 0x57, 0xE9,
+0x87, 0x77, 0x57, 0xE9,
+
+0x83, 0x38, 0x57, 0xE9,
+0x35, 0x49, 0x51, 0xBD,
+
+0x84, 0x31, 0x5E, 0xE9,
+0x30, 0x1F, 0x5F, 0xE9,
+
+0x85, 0x39, 0x5E, 0xE9,
+0x57, 0x25, 0x20, 0xE9,
+
+0x2B, 0x48, 0x20, 0xE9,
+0x1D, 0x37, 0xE1, 0xEA,
+
+0x1E, 0x35, 0xE1, 0xEA,
+0x00, 0xE0,
+0x26, 0x77,
+
+0x24, 0x49, 0x20, 0xE9,
+0x99, 0xFF, 0x20, 0xEA,
+
+0x16, 0x26, 0x20, 0xE9,
+0x57, 0x2E, 0xBF, 0xEA,
+
+0x1C, 0x46, 0xA0, 0xE8,
+0x23, 0x4E, 0xA0, 0xE8,
+
+0x2B, 0x56, 0xA0, 0xE8,
+0x1D, 0x47, 0xA0, 0xE8,
+
+0x24, 0x4F, 0xA0, 0xE8,
+0x2C, 0x57, 0xA0, 0xE8,
+
+0x1C, 0x00,
+0x23, 0x00,
+0x2B, 0x00,
+0x00, 0xE0,
+
+0x1D, 0x00,
+0x24, 0x00,
+0x2C, 0x00,
+0x00, 0xE0,
+
+0x1C, 0x65,
+0x23, 0x65,
+0x2B, 0x65,
+0x00, 0xE0,
+
+0x1D, 0x65,
+0x24, 0x65,
+0x2C, 0x65,
+0x00, 0xE0,
+
+0x1C, 0x23, 0x60, 0xEC,
+0x36, 0xD7, 0x36, 0xAD,
+
+0x2B, 0x80, 0x60, 0xEC,
+0x1D, 0x24, 0x60, 0xEC,
+
+0x3E, 0xD7, 0x3E, 0xAD,
+0x2C, 0x80, 0x60, 0xEC,
+
+0x1C, 0x2B, 0xDE, 0xE8,
+0x23, 0x80, 0xDE, 0xE8,
+
+0x36, 0x80, 0x36, 0xBD,
+0x3E, 0x80, 0x3E, 0xBD,
+
+0x33, 0xD7, 0x1C, 0xBD,
+0x3B, 0xD7, 0x23, 0xBD,
+
+0x46, 0x80, 0x46, 0xCF,
+0x4F, 0x80, 0x4F, 0xCF,
+
+0x56, 0x33, 0x56, 0xCF,
+0x47, 0x3B, 0x47, 0xCF,
+
+0xC1, 0xFF, 0x20, 0xEA,
+0x00, 0x80, 0x00, 0xE8,
+
+0x4E, 0x33, 0x4E, 0xCF,
+0x57, 0x3B, 0x57, 0xCF,
+
+0x87, 0xFF, 0x20, 0xEA,
+0x57, 0xC0, 0xBF, 0xEA,
+
+0x00, 0x80, 0xA0, 0xE9,
+0x00, 0x00, 0xD8, 0xEC,
+
+};
+
+static unsigned char warp_g400_tgzsf[] = {
+
+0x00, 0x88, 0x98, 0xE9,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0xA0, 0xE9,
+0x00, 0x00, 0xD8, 0xEC,
+
+0xFF, 0x80, 0xC0, 0xE9,
+0x00, 0x80, 0x00, 0xE8,
+
+0x22, 0x40, 0x48, 0xBF,
+0x2A, 0x40, 0x50, 0xBF,
+
+0x32, 0x41, 0x49, 0xBF,
+0x3A, 0x41, 0x51, 0xBF,
+
+0xC3, 0x6B,
+0xCB, 0x6B,
+0x00, 0x88, 0x98, 0xE9,
+
+0x73, 0x7B, 0xC8, 0xEC,
+0x96, 0xE2,
+0x41, 0x04,
+
+0x7B, 0x43, 0xA0, 0xE8,
+0x73, 0x4B, 0xA0, 0xE8,
+
+0xAD, 0xEE, 0x29, 0x9F,
+0x00, 0xE0,
+0x49, 0x04,
+
+0x90, 0xE2,
+0x51, 0x04,
+0x31, 0x46, 0xB1, 0xE8,
+
+0x49, 0x41, 0xC0, 0xEC,
+0x39, 0x57, 0xB1, 0xE8,
+
+0x00, 0x04,
+0x46, 0xE2,
+0x73, 0x53, 0xA0, 0xE8,
+
+0x51, 0x41, 0xC0, 0xEC,
+0x31, 0x00,
+0x39, 0x00,
+
+0x6A, 0x80, 0x15, 0xEA,
+0x08, 0x04,
+0x10, 0x04,
+
+0x51, 0x49, 0xC0, 0xEC,
+0x2F, 0x41, 0x60, 0xEA,
+
+0x31, 0x20,
+0x39, 0x20,
+0x1F, 0x42, 0xA0, 0xE8,
+
+0x2A, 0x42, 0x4A, 0xBF,
+0x27, 0x4A, 0xA0, 0xE8,
+
+0x1A, 0x42, 0x52, 0xBF,
+0x1E, 0x49, 0x60, 0xEA,
+
+0x73, 0x7B, 0xC8, 0xEC,
+0x26, 0x51, 0x60, 0xEA,
+
+0x32, 0x40, 0x48, 0xBD,
+0x22, 0x40, 0x50, 0xBD,
+
+0x12, 0x41, 0x49, 0xBD,
+0x3A, 0x41, 0x51, 0xBD,
+
+0xBF, 0x2F, 0x26, 0xBD,
+0x00, 0xE0,
+0x7B, 0x72,
+
+0x32, 0x20,
+0x22, 0x20,
+0x12, 0x20,
+0x3A, 0x20,
+
+0x46, 0x31, 0x46, 0xBF,
+0x4E, 0x31, 0x4E, 0xBF,
+
+0xB3, 0xE2, 0x2D, 0x9F,
+0x00, 0x80, 0x00, 0xE8,
+
+0x56, 0x31, 0x56, 0xBF,
+0x47, 0x39, 0x47, 0xBF,
+
+0x4F, 0x39, 0x4F, 0xBF,
+0x57, 0x39, 0x57, 0xBF,
+
+0x5C, 0x80, 0x07, 0xEA,
+0x24, 0x41, 0x20, 0xE9,
+
+0x42, 0x73, 0xF8, 0xEC,
+0x00, 0xE0,
+0x2D, 0x73,
+
+0x33, 0x72,
+0x0C, 0xE3,
+0xA5, 0x2F, 0x1E, 0xBD,
+
+0x43, 0x43, 0x2D, 0xDF,
+0x4B, 0x4B, 0x2D, 0xDF,
+
+0xAE, 0x1E, 0x26, 0xBD,
+0x58, 0xE3,
+0x33, 0x66,
+
+0x53, 0x53, 0x2D, 0xDF,
+0x00, 0x80, 0x00, 0xE8,
+
+0xB8, 0x38, 0x33, 0xBF,
+0x00, 0xE0,
+0x59, 0xE3,
+
+0x1E, 0x12, 0x41, 0xE9,
+0x1A, 0x22, 0x41, 0xE9,
+
+0x2B, 0x40, 0x3D, 0xE9,
+0x3F, 0x4B, 0xA0, 0xE8,
+
+0x2D, 0x73,
+0x30, 0x76,
+0x05, 0x80, 0x3D, 0xEA,
+
+0x37, 0x43, 0xA0, 0xE8,
+0x3D, 0x53, 0xA0, 0xE8,
+
+0x48, 0x70, 0xF8, 0xEC,
+0x2B, 0x48, 0x3C, 0xE9,
+
+0x1F, 0x27, 0xBC, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x00, 0x80, 0x00, 0xE8,
+0x00, 0x80, 0x00, 0xE8,
+
+0x15, 0xC0, 0x20, 0xE9,
+0x15, 0xC0, 0x20, 0xE9,
+
+0x15, 0xC0, 0x20, 0xE9,
+0x15, 0xC0, 0x20, 0xE9,
+
+0x18, 0x3A, 0x41, 0xE9,
+0x1D, 0x32, 0x41, 0xE9,
+
+0x2A, 0x40, 0x20, 0xE9,
+0x56, 0x3D, 0x56, 0xDF,
+
+0x46, 0x37, 0x46, 0xDF,
+0x4E, 0x3F, 0x4E, 0xDF,
+
+0x16, 0x30, 0x20, 0xE9,
+0x4F, 0x3F, 0x4F, 0xDF,
+
+0x47, 0x37, 0x47, 0xDF,
+0x57, 0x3D, 0x57, 0xDF,
+
+0x32, 0x32, 0x2D, 0xDF,
+0x22, 0x22, 0x2D, 0xDF,
+
+0x12, 0x12, 0x2D, 0xDF,
+0x3A, 0x3A, 0x2D, 0xDF,
+
+0x27, 0xCF, 0x74, 0xC2,
+0x37, 0xCF, 0x74, 0xC4,
+
+0x0A, 0x44, 0x4C, 0xB0,
+0x02, 0x44, 0x54, 0xB0,
+
+0x3D, 0xCF, 0x74, 0xC0,
+0x34, 0x37, 0x20, 0xE9,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x38, 0x27, 0x20, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0x3C, 0x3D, 0x20, 0xE9,
+
+0x2A, 0x44, 0x4C, 0xB2,
+0x1A, 0x44, 0x54, 0xB2,
+
+0x2E, 0x80, 0x3A, 0xEA,
+0x0A, 0x20,
+0x02, 0x20,
+
+0x27, 0xCF, 0x75, 0xC0,
+0x2A, 0x20,
+0x1A, 0x20,
+
+0x30, 0x50, 0x2E, 0x9F,
+0x32, 0x31, 0x5F, 0xE9,
+
+0x38, 0x21, 0x2C, 0x9F,
+0x33, 0x39, 0x5F, 0xE9,
+
+0x3D, 0xCF, 0x75, 0xC2,
+0x37, 0xCF, 0x75, 0xC4,
+
+0x31, 0x53, 0x2F, 0x9F,
+0xA6, 0x27, 0x20, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0xA3, 0x3D, 0x20, 0xE9,
+
+0x2A, 0x44, 0x4C, 0xB4,
+0x1A, 0x44, 0x54, 0xB4,
+
+0x0A, 0x45, 0x4D, 0xB0,
+0x02, 0x45, 0x55, 0xB0,
+
+0x88, 0x73, 0x5E, 0xE9,
+0x2A, 0x20,
+0x1A, 0x20,
+
+0xA0, 0x37, 0x20, 0xE9,
+0x0A, 0x20,
+0x02, 0x20,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x3E, 0x30, 0x4F, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0x3F, 0x38, 0x4F, 0xE9,
+
+0x30, 0x50, 0x2E, 0x9F,
+0x3A, 0x31, 0x4F, 0xE9,
+
+0x38, 0x21, 0x2C, 0x9F,
+0x3B, 0x39, 0x4F, 0xE9,
+
+0x2A, 0x45, 0x4D, 0xB2,
+0x1A, 0x45, 0x55, 0xB2,
+
+0x0A, 0x45, 0x4D, 0xB4,
+0x02, 0x45, 0x55, 0xB4,
+
+0x27, 0xCF, 0x75, 0xC6,
+0x2A, 0x20,
+0x1A, 0x20,
+
+0xA7, 0x30, 0x4F, 0xE9,
+0x0A, 0x20,
+0x02, 0x20,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x31, 0x27, 0x20, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0xA8, 0x38, 0x4F, 0xE9,
+
+0x2A, 0x45, 0x4D, 0xB6,
+0x1A, 0x45, 0x55, 0xB6,
+
+0x30, 0x50, 0x2E, 0x9F,
+0x36, 0x31, 0x4F, 0xE9,
+
+0x38, 0x21, 0x2C, 0x9F,
+0x37, 0x39, 0x4F, 0xE9,
+
+0x00, 0x80, 0x00, 0xE8,
+0x2A, 0x20,
+0x1A, 0x20,
+
+0x2A, 0x46, 0x4E, 0xBF,
+0x1A, 0x46, 0x56, 0xBF,
+
+0x31, 0x53, 0x2F, 0x9F,
+0xA4, 0x31, 0x4F, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0xA5, 0x39, 0x4F, 0xE9,
+
+0x0A, 0x47, 0x4F, 0xBF,
+0x02, 0x47, 0x57, 0xBF,
+
+0x31, 0x53, 0x2F, 0x9F,
+0xA1, 0x30, 0x4F, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0xA2, 0x38, 0x4F, 0xE9,
+
+0x2A, 0x43, 0x4B, 0xBF,
+0x1A, 0x43, 0x53, 0xBF,
+
+0x30, 0x50, 0x2E, 0x9F,
+0x35, 0x31, 0x4F, 0xE9,
+
+0x38, 0x21, 0x2C, 0x9F,
+0x39, 0x39, 0x4F, 0xE9,
+
+0x31, 0x53, 0x2F, 0x9F,
+0x80, 0x31, 0x57, 0xE9,
+
+0x39, 0xE5, 0x2C, 0x9F,
+0x81, 0x39, 0x57, 0xE9,
+
+0x37, 0x48, 0x50, 0xBD,
+0x8A, 0x36, 0x20, 0xE9,
+
+0x86, 0x76, 0x57, 0xE9,
+0x8B, 0x3E, 0x20, 0xE9,
+
+0x82, 0x30, 0x57, 0xE9,
+0x87, 0x77, 0x57, 0xE9,
+
+0x83, 0x38, 0x57, 0xE9,
+0x35, 0x49, 0x51, 0xBD,
+
+0x84, 0x31, 0x5E, 0xE9,
+0x30, 0x1F, 0x5F, 0xE9,
+
+0x85, 0x39, 0x5E, 0xE9,
+0x57, 0x25, 0x20, 0xE9,
+
+0x2B, 0x48, 0x20, 0xE9,
+0x1D, 0x37, 0xE1, 0xEA,
+
+0x1E, 0x35, 0xE1, 0xEA,
+0x00, 0xE0,
+0x26, 0x77,
+
+0x24, 0x49, 0x20, 0xE9,
+0x9D, 0xFF, 0x20, 0xEA,
+
+0x16, 0x26, 0x20, 0xE9,
+0x57, 0x2E, 0xBF, 0xEA,
+
+0x1C, 0x46, 0xA0, 0xE8,
+0x23, 0x4E, 0xA0, 0xE8,
+
+0x2B, 0x56, 0xA0, 0xE8,
+0x1D, 0x47, 0xA0, 0xE8,
+
+0x24, 0x4F, 0xA0, 0xE8,
+0x2C, 0x57, 0xA0, 0xE8,
+
+0x1C, 0x00,
+0x23, 0x00,
+0x2B, 0x00,
+0x00, 0xE0,
+
+0x1D, 0x00,
+0x24, 0x00,
+0x2C, 0x00,
+0x00, 0xE0,
+
+0x1C, 0x65,
+0x23, 0x65,
+0x2B, 0x65,
+0x00, 0xE0,
+
+0x1D, 0x65,
+0x24, 0x65,
+0x2C, 0x65,
+0x00, 0xE0,
+
+0x1C, 0x23, 0x60, 0xEC,
+0x36, 0xD7, 0x36, 0xAD,
+
+0x2B, 0x80, 0x60, 0xEC,
+0x1D, 0x24, 0x60, 0xEC,
+
+0x3E, 0xD7, 0x3E, 0xAD,
+0x2C, 0x80, 0x60, 0xEC,
+
+0x1C, 0x2B, 0xDE, 0xE8,
+0x23, 0x80, 0xDE, 0xE8,
+
+0x36, 0x80, 0x36, 0xBD,
+0x3E, 0x80, 0x3E, 0xBD,
+
+0x33, 0xD7, 0x1C, 0xBD,
+0x3B, 0xD7, 0x23, 0xBD,
+
+0x46, 0x80, 0x46, 0xCF,
+0x4F, 0x80, 0x4F, 0xCF,
+
+0x56, 0x33, 0x56, 0xCF,
+0x47, 0x3B, 0x47, 0xCF,
+
+0xC5, 0xFF, 0x20, 0xEA,
+0x00, 0x80, 0x00, 0xE8,
+
+0x4E, 0x33, 0x4E, 0xCF,
+0x57, 0x3B, 0x57, 0xCF,
+
+0x8B, 0xFF, 0x20, 0xEA,
+0x57, 0xC0, 0xBF, 0xEA,
+
+0x00, 0x80, 0xA0, 0xE9,
+0x00, 0x00, 0xD8, 0xEC,
+
+};
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/mga_warp.c linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/mga_warp.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/mga_warp.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/mga_warp.c	2003-07-30 11:18:33.000000000 +0200
@@ -0,0 +1,212 @@
+/* mga_warp.c -- Matrox G200/G400 WARP engine management -*- linux-c -*-
+ * Created: Thu Jan 11 21:29:32 2001 by gareth@valinux.com
+ *
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Gareth Hughes <gareth@valinux.com>
+ */
+
+#define __NO_VERSION__
+#include "mga.h"
+#include "drmP.h"
+#include "drm.h"
+#include "mga_drm.h"
+#include "mga_drv.h"
+#include "mga_ucode.h"
+
+
+#define MGA_WARP_CODE_ALIGN		256		/* in bytes */
+
+#define WARP_UCODE_SIZE( which )					\
+	((sizeof(which) / MGA_WARP_CODE_ALIGN + 1) * MGA_WARP_CODE_ALIGN)
+
+#define WARP_UCODE_INSTALL( which, where )				\
+do {									\
+	DRM_DEBUG( " pcbase = 0x%08lx  vcbase = %p\n", pcbase, vcbase );\
+	dev_priv->warp_pipe_phys[where] = pcbase;			\
+	memcpy( vcbase, which, sizeof(which) );				\
+	pcbase += WARP_UCODE_SIZE( which );				\
+	vcbase += WARP_UCODE_SIZE( which );				\
+} while (0)
+
+
+static unsigned int mga_warp_g400_microcode_size( drm_mga_private_t *dev_priv )
+{
+	unsigned int size;
+
+	size = ( WARP_UCODE_SIZE( warp_g400_tgz ) +
+		 WARP_UCODE_SIZE( warp_g400_tgza ) +
+		 WARP_UCODE_SIZE( warp_g400_tgzaf ) +
+		 WARP_UCODE_SIZE( warp_g400_tgzf ) +
+		 WARP_UCODE_SIZE( warp_g400_tgzs ) +
+		 WARP_UCODE_SIZE( warp_g400_tgzsa ) +
+		 WARP_UCODE_SIZE( warp_g400_tgzsaf ) +
+		 WARP_UCODE_SIZE( warp_g400_tgzsf ) +
+		 WARP_UCODE_SIZE( warp_g400_t2gz ) +
+		 WARP_UCODE_SIZE( warp_g400_t2gza ) +
+		 WARP_UCODE_SIZE( warp_g400_t2gzaf ) +
+		 WARP_UCODE_SIZE( warp_g400_t2gzf ) +
+		 WARP_UCODE_SIZE( warp_g400_t2gzs ) +
+		 WARP_UCODE_SIZE( warp_g400_t2gzsa ) +
+		 WARP_UCODE_SIZE( warp_g400_t2gzsaf ) +
+		 WARP_UCODE_SIZE( warp_g400_t2gzsf ) );
+
+	size = PAGE_ALIGN( size );
+
+	DRM_DEBUG( "G400 ucode size = %d bytes\n", size );
+	return size;
+}
+
+static unsigned int mga_warp_g200_microcode_size( drm_mga_private_t *dev_priv )
+{
+	unsigned int size;
+
+	size = ( WARP_UCODE_SIZE( warp_g200_tgz ) +
+		 WARP_UCODE_SIZE( warp_g200_tgza ) +
+		 WARP_UCODE_SIZE( warp_g200_tgzaf ) +
+		 WARP_UCODE_SIZE( warp_g200_tgzf ) +
+		 WARP_UCODE_SIZE( warp_g200_tgzs ) +
+		 WARP_UCODE_SIZE( warp_g200_tgzsa ) +
+		 WARP_UCODE_SIZE( warp_g200_tgzsaf ) +
+		 WARP_UCODE_SIZE( warp_g200_tgzsf ) );
+
+	size = PAGE_ALIGN( size );
+
+	DRM_DEBUG( "G200 ucode size = %d bytes\n", size );
+	return size;
+}
+
+static int mga_warp_install_g400_microcode( drm_mga_private_t *dev_priv )
+{
+	unsigned char *vcbase = dev_priv->warp->handle;
+	unsigned long pcbase = dev_priv->warp->offset;
+	unsigned int size;
+
+	size = mga_warp_g400_microcode_size( dev_priv );
+	if ( size > dev_priv->warp->size ) {
+		DRM_ERROR( "microcode too large! (%u > %lu)\n",
+			   size, dev_priv->warp->size );
+		return DRM_ERR(ENOMEM);
+	}
+
+	memset( dev_priv->warp_pipe_phys, 0,
+		sizeof(dev_priv->warp_pipe_phys) );
+
+	WARP_UCODE_INSTALL( warp_g400_tgz,	MGA_WARP_TGZ );
+	WARP_UCODE_INSTALL( warp_g400_tgzf,	MGA_WARP_TGZF );
+	WARP_UCODE_INSTALL( warp_g400_tgza,	MGA_WARP_TGZA );
+	WARP_UCODE_INSTALL( warp_g400_tgzaf,	MGA_WARP_TGZAF );
+	WARP_UCODE_INSTALL( warp_g400_tgzs,	MGA_WARP_TGZS );
+	WARP_UCODE_INSTALL( warp_g400_tgzsf,	MGA_WARP_TGZSF );
+	WARP_UCODE_INSTALL( warp_g400_tgzsa,	MGA_WARP_TGZSA );
+	WARP_UCODE_INSTALL( warp_g400_tgzsaf,	MGA_WARP_TGZSAF );
+
+	WARP_UCODE_INSTALL( warp_g400_t2gz,	MGA_WARP_T2GZ );
+	WARP_UCODE_INSTALL( warp_g400_t2gzf,	MGA_WARP_T2GZF );
+	WARP_UCODE_INSTALL( warp_g400_t2gza,	MGA_WARP_T2GZA );
+	WARP_UCODE_INSTALL( warp_g400_t2gzaf,	MGA_WARP_T2GZAF );
+	WARP_UCODE_INSTALL( warp_g400_t2gzs,	MGA_WARP_T2GZS );
+	WARP_UCODE_INSTALL( warp_g400_t2gzsf,	MGA_WARP_T2GZSF );
+	WARP_UCODE_INSTALL( warp_g400_t2gzsa,	MGA_WARP_T2GZSA );
+	WARP_UCODE_INSTALL( warp_g400_t2gzsaf,	MGA_WARP_T2GZSAF );
+
+	return 0;
+}
+
+static int mga_warp_install_g200_microcode( drm_mga_private_t *dev_priv )
+{
+	unsigned char *vcbase = dev_priv->warp->handle;
+	unsigned long pcbase = dev_priv->warp->offset;
+	unsigned int size;
+
+	size = mga_warp_g200_microcode_size( dev_priv );
+	if ( size > dev_priv->warp->size ) {
+		DRM_ERROR( "microcode too large! (%u > %lu)\n",
+			   size, dev_priv->warp->size );
+		return DRM_ERR(ENOMEM);
+	}
+
+	memset( dev_priv->warp_pipe_phys, 0,
+		sizeof(dev_priv->warp_pipe_phys) );
+
+	WARP_UCODE_INSTALL( warp_g200_tgz,	MGA_WARP_TGZ );
+	WARP_UCODE_INSTALL( warp_g200_tgzf,	MGA_WARP_TGZF );
+	WARP_UCODE_INSTALL( warp_g200_tgza,	MGA_WARP_TGZA );
+	WARP_UCODE_INSTALL( warp_g200_tgzaf,	MGA_WARP_TGZAF );
+	WARP_UCODE_INSTALL( warp_g200_tgzs,	MGA_WARP_TGZS );
+	WARP_UCODE_INSTALL( warp_g200_tgzsf,	MGA_WARP_TGZSF );
+	WARP_UCODE_INSTALL( warp_g200_tgzsa,	MGA_WARP_TGZSA );
+	WARP_UCODE_INSTALL( warp_g200_tgzsaf,	MGA_WARP_TGZSAF );
+
+	return 0;
+}
+
+int mga_warp_install_microcode(	drm_mga_private_t *dev_priv )
+{
+	switch ( dev_priv->chipset ) {
+	case MGA_CARD_TYPE_G400:
+		return mga_warp_install_g400_microcode( dev_priv );
+	case MGA_CARD_TYPE_G200:
+		return mga_warp_install_g200_microcode( dev_priv );
+	default:
+		return DRM_ERR(EINVAL);
+	}
+}
+
+#define WMISC_EXPECTED		(MGA_WUCODECACHE_ENABLE | MGA_WMASTER_ENABLE)
+
+int mga_warp_init( drm_mga_private_t *dev_priv )
+{
+	u32 wmisc;
+
+	/* FIXME: Get rid of these damned magic numbers...
+	 */
+	switch ( dev_priv->chipset ) {
+	case MGA_CARD_TYPE_G400:
+		MGA_WRITE( MGA_WIADDR2, MGA_WMODE_SUSPEND );
+		MGA_WRITE( MGA_WGETMSB, 0x00000E00 );
+		MGA_WRITE( MGA_WVRTXSZ, 0x00001807 );
+		MGA_WRITE( MGA_WACCEPTSEQ, 0x18000000 );
+		break;
+	case MGA_CARD_TYPE_G200:
+		MGA_WRITE( MGA_WIADDR, MGA_WMODE_SUSPEND );
+		MGA_WRITE( MGA_WGETMSB, 0x1606 );
+		MGA_WRITE( MGA_WVRTXSZ, 7 );
+		break;
+	default:
+		return DRM_ERR(EINVAL);
+	}
+
+	MGA_WRITE( MGA_WMISC, (MGA_WUCODECACHE_ENABLE |
+			       MGA_WMASTER_ENABLE |
+			       MGA_WCACHEFLUSH_ENABLE) );
+	wmisc = MGA_READ( MGA_WMISC );
+	if ( wmisc != WMISC_EXPECTED ) {
+		DRM_ERROR( "WARP engine config failed! 0x%x != 0x%x\n",
+			   wmisc, WMISC_EXPECTED );
+		return DRM_ERR(EINVAL);
+	}
+
+	return 0;
+}
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/picker.c linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/picker.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/picker.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/picker.c	2003-07-30 11:18:33.000000000 +0200
@@ -0,0 +1,30 @@
+
+#include <linux/config.h>
+#include <linux/version.h>
+
+#ifndef CONFIG_SMP
+#define CONFIG_SMP 0
+#endif
+
+#ifndef CONFIG_MODULES
+#define CONFIG_MODULES 0
+#endif
+
+#ifndef CONFIG_MODVERSIONS
+#define CONFIG_MODVERSIONS 0
+#endif
+
+#ifndef CONFIG_AGP_MODULE
+#define CONFIG_AGP_MODULE 0
+#endif
+
+#ifndef CONFIG_AGP
+#define CONFIG_AGP 0
+#endif
+
+SMP = CONFIG_SMP
+MODULES = CONFIG_MODULES
+MODVERSIONS = CONFIG_MODVERSIONS
+AGP = CONFIG_AGP
+AGP_MODULE = CONFIG_AGP_MODULE
+RELEASE = UTS_RELEASE
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/r128.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/r128.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/r128.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/r128.h	2003-07-30 11:18:33.000000000 +0200
@@ -0,0 +1,114 @@
+/* r128.h -- ATI Rage 128 DRM template customization -*- linux-c -*-
+ * Created: Wed Feb 14 16:07:10 2001 by gareth@valinux.com
+ *
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Gareth Hughes <gareth@valinux.com>
+ */
+
+#ifndef __R128_H__
+#define __R128_H__
+
+/* This remains constant for all DRM template files.
+ */
+#define DRM(x) r128_##x
+
+/* General customization:
+ */
+#define __HAVE_AGP		1
+#define __MUST_HAVE_AGP		0
+#define __HAVE_MTRR		1
+#define __HAVE_CTX_BITMAP	1
+#define __HAVE_SG		1
+#define __HAVE_PCI_DMA		1
+
+#define DRIVER_AUTHOR		"Gareth Hughes, VA Linux Systems Inc."
+
+#define DRIVER_NAME		"r128"
+#define DRIVER_DESC		"ATI Rage 128"
+#define DRIVER_DATE		"20021029"
+
+#define DRIVER_MAJOR		2
+#define DRIVER_MINOR		3
+#define DRIVER_PATCHLEVEL	0
+
+
+#define DRIVER_IOCTLS							    \
+   [DRM_IOCTL_NR(DRM_IOCTL_DMA)]             = { r128_cce_buffers,  1, 0 }, \
+   [DRM_IOCTL_NR(DRM_IOCTL_R128_INIT)]       = { r128_cce_init,     1, 1 }, \
+   [DRM_IOCTL_NR(DRM_IOCTL_R128_CCE_START)]  = { r128_cce_start,    1, 1 }, \
+   [DRM_IOCTL_NR(DRM_IOCTL_R128_CCE_STOP)]   = { r128_cce_stop,     1, 1 }, \
+   [DRM_IOCTL_NR(DRM_IOCTL_R128_CCE_RESET)]  = { r128_cce_reset,    1, 1 }, \
+   [DRM_IOCTL_NR(DRM_IOCTL_R128_CCE_IDLE)]   = { r128_cce_idle,     1, 0 }, \
+   [DRM_IOCTL_NR(DRM_IOCTL_R128_RESET)]      = { r128_engine_reset, 1, 0 }, \
+   [DRM_IOCTL_NR(DRM_IOCTL_R128_FULLSCREEN)] = { r128_fullscreen,   1, 0 }, \
+   [DRM_IOCTL_NR(DRM_IOCTL_R128_SWAP)]       = { r128_cce_swap,     1, 0 }, \
+   [DRM_IOCTL_NR(DRM_IOCTL_R128_CLEAR)]      = { r128_cce_clear,    1, 0 }, \
+   [DRM_IOCTL_NR(DRM_IOCTL_R128_VERTEX)]     = { r128_cce_vertex,   1, 0 }, \
+   [DRM_IOCTL_NR(DRM_IOCTL_R128_INDICES)]    = { r128_cce_indices,  1, 0 }, \
+   [DRM_IOCTL_NR(DRM_IOCTL_R128_BLIT)]       = { r128_cce_blit,     1, 0 }, \
+   [DRM_IOCTL_NR(DRM_IOCTL_R128_DEPTH)]      = { r128_cce_depth,    1, 0 }, \
+   [DRM_IOCTL_NR(DRM_IOCTL_R128_STIPPLE)]    = { r128_cce_stipple,  1, 0 }, \
+   [DRM_IOCTL_NR(DRM_IOCTL_R128_INDIRECT)]   = { r128_cce_indirect, 1, 1 }, \
+   [DRM_IOCTL_NR(DRM_IOCTL_R128_GETPARAM)]   = { r128_getparam, 1, 0 },
+
+/* Driver customization:
+ */
+#define DRIVER_PRERELEASE() do {					\
+	if ( dev->dev_private ) {					\
+		drm_r128_private_t *dev_priv = dev->dev_private;	\
+		if ( dev_priv->page_flipping ) {			\
+			r128_do_cleanup_pageflip( dev );		\
+		}							\
+	}								\
+} while (0)
+
+#define DRIVER_PRETAKEDOWN() do {					\
+	if ( dev->dev_private ) r128_do_cleanup_cce( dev );		\
+} while (0)
+
+/* DMA customization:
+ */
+#define __HAVE_DMA		1
+#define __HAVE_DMA_IRQ		1
+#define __HAVE_VBL_IRQ		1
+#define __HAVE_SHARED_IRQ       1
+
+#if 0
+/* GH: Remove this for now... */
+#define __HAVE_DMA_QUIESCENT	1
+#define DRIVER_DMA_QUIESCENT() do {					\
+	drm_r128_private_t *dev_priv = dev->dev_private;		\
+	return r128_do_cce_idle( dev_priv );				\
+} while (0)
+#endif
+
+/* Buffer customization:
+ */
+#define DRIVER_BUF_PRIV_T	drm_r128_buf_priv_t
+
+#define DRIVER_AGP_BUFFERS_MAP( dev )					\
+	((drm_r128_private_t *)((dev)->dev_private))->buffers
+
+#endif
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/r128_cce.c linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/r128_cce.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/r128_cce.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/r128_cce.c	2003-07-30 11:18:33.000000000 +0200
@@ -0,0 +1,1010 @@
+/* r128_cce.c -- ATI Rage 128 driver -*- linux-c -*-
+ * Created: Wed Apr  5 19:24:19 2000 by kevin@precisioninsight.com
+ *
+ * Copyright 2000 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Gareth Hughes <gareth@valinux.com>
+ */
+
+#include "r128.h"
+#include "drmP.h"
+#include "drm.h"
+#include "r128_drm.h"
+#include "r128_drv.h"
+
+#define R128_FIFO_DEBUG		0
+
+/* CCE microcode (from ATI) */
+static u32 r128_cce_microcode[] = {
+	0, 276838400, 0, 268449792, 2, 142, 2, 145, 0, 1076765731, 0,
+	1617039951, 0, 774592877, 0, 1987540286, 0, 2307490946U, 0,
+	599558925, 0, 589505315, 0, 596487092, 0, 589505315, 1,
+	11544576, 1, 206848, 1, 311296, 1, 198656, 2, 912273422, 11,
+	262144, 0, 0, 1, 33559837, 1, 7438, 1, 14809, 1, 6615, 12, 28,
+	1, 6614, 12, 28, 2, 23, 11, 18874368, 0, 16790922, 1, 409600, 9,
+	30, 1, 147854772, 16, 420483072, 3, 8192, 0, 10240, 1, 198656,
+	1, 15630, 1, 51200, 10, 34858, 9, 42, 1, 33559823, 2, 10276, 1,
+	15717, 1, 15718, 2, 43, 1, 15936948, 1, 570480831, 1, 14715071,
+	12, 322123831, 1, 33953125, 12, 55, 1, 33559908, 1, 15718, 2,
+	46, 4, 2099258, 1, 526336, 1, 442623, 4, 4194365, 1, 509952, 1,
+	459007, 3, 0, 12, 92, 2, 46, 12, 176, 1, 15734, 1, 206848, 1,
+	18432, 1, 133120, 1, 100670734, 1, 149504, 1, 165888, 1,
+	15975928, 1, 1048576, 6, 3145806, 1, 15715, 16, 2150645232U, 2,
+	268449859, 2, 10307, 12, 176, 1, 15734, 1, 15735, 1, 15630, 1,
+	15631, 1, 5253120, 6, 3145810, 16, 2150645232U, 1, 15864, 2, 82,
+	1, 343310, 1, 1064207, 2, 3145813, 1, 15728, 1, 7817, 1, 15729,
+	3, 15730, 12, 92, 2, 98, 1, 16168, 1, 16167, 1, 16002, 1, 16008,
+	1, 15974, 1, 15975, 1, 15990, 1, 15976, 1, 15977, 1, 15980, 0,
+	15981, 1, 10240, 1, 5253120, 1, 15720, 1, 198656, 6, 110, 1,
+	180224, 1, 103824738, 2, 112, 2, 3145839, 0, 536885440, 1,
+	114880, 14, 125, 12, 206975, 1, 33559995, 12, 198784, 0,
+	33570236, 1, 15803, 0, 15804, 3, 294912, 1, 294912, 3, 442370,
+	1, 11544576, 0, 811612160, 1, 12593152, 1, 11536384, 1,
+	14024704, 7, 310382726, 0, 10240, 1, 14796, 1, 14797, 1, 14793,
+	1, 14794, 0, 14795, 1, 268679168, 1, 9437184, 1, 268449792, 1,
+	198656, 1, 9452827, 1, 1075854602, 1, 1075854603, 1, 557056, 1,
+	114880, 14, 159, 12, 198784, 1, 1109409213, 12, 198783, 1,
+	1107312059, 12, 198784, 1, 1109409212, 2, 162, 1, 1075854781, 1,
+	1073757627, 1, 1075854780, 1, 540672, 1, 10485760, 6, 3145894,
+	16, 274741248, 9, 168, 3, 4194304, 3, 4209949, 0, 0, 0, 256, 14,
+	174, 1, 114857, 1, 33560007, 12, 176, 0, 10240, 1, 114858, 1,
+	33560018, 1, 114857, 3, 33560007, 1, 16008, 1, 114874, 1,
+	33560360, 1, 114875, 1, 33560154, 0, 15963, 0, 256, 0, 4096, 1,
+	409611, 9, 188, 0, 10240, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+};
+
+int r128_do_wait_for_idle( drm_r128_private_t *dev_priv );
+
+int R128_READ_PLL(drm_device_t *dev, int addr)
+{
+	drm_r128_private_t *dev_priv = dev->dev_private;
+
+	R128_WRITE8(R128_CLOCK_CNTL_INDEX, addr & 0x1f);
+	return R128_READ(R128_CLOCK_CNTL_DATA);
+}
+
+#if R128_FIFO_DEBUG
+static void r128_status( drm_r128_private_t *dev_priv )
+{
+	printk( "GUI_STAT           = 0x%08x\n",
+		(unsigned int)R128_READ( R128_GUI_STAT ) );
+	printk( "PM4_STAT           = 0x%08x\n",
+		(unsigned int)R128_READ( R128_PM4_STAT ) );
+	printk( "PM4_BUFFER_DL_WPTR = 0x%08x\n",
+		(unsigned int)R128_READ( R128_PM4_BUFFER_DL_WPTR ) );
+	printk( "PM4_BUFFER_DL_RPTR = 0x%08x\n",
+		(unsigned int)R128_READ( R128_PM4_BUFFER_DL_RPTR ) );
+	printk( "PM4_MICRO_CNTL     = 0x%08x\n",
+		(unsigned int)R128_READ( R128_PM4_MICRO_CNTL ) );
+	printk( "PM4_BUFFER_CNTL    = 0x%08x\n",
+		(unsigned int)R128_READ( R128_PM4_BUFFER_CNTL ) );
+}
+#endif
+
+
+/* ================================================================
+ * Engine, FIFO control
+ */
+
+static int r128_do_pixcache_flush( drm_r128_private_t *dev_priv )
+{
+	u32 tmp;
+	int i;
+
+	tmp = R128_READ( R128_PC_NGUI_CTLSTAT ) | R128_PC_FLUSH_ALL;
+	R128_WRITE( R128_PC_NGUI_CTLSTAT, tmp );
+
+	for ( i = 0 ; i < dev_priv->usec_timeout ; i++ ) {
+		if ( !(R128_READ( R128_PC_NGUI_CTLSTAT ) & R128_PC_BUSY) ) {
+			return 0;
+		}
+		DRM_UDELAY( 1 );
+	}
+
+#if R128_FIFO_DEBUG
+	DRM_ERROR( "failed!\n" );
+#endif
+	return DRM_ERR(EBUSY);
+}
+
+static int r128_do_wait_for_fifo( drm_r128_private_t *dev_priv, int entries )
+{
+	int i;
+
+	for ( i = 0 ; i < dev_priv->usec_timeout ; i++ ) {
+		int slots = R128_READ( R128_GUI_STAT ) & R128_GUI_FIFOCNT_MASK;
+		if ( slots >= entries ) return 0;
+		DRM_UDELAY( 1 );
+	}
+
+#if R128_FIFO_DEBUG
+	DRM_ERROR( "failed!\n" );
+#endif
+	return DRM_ERR(EBUSY);
+}
+
+int r128_do_wait_for_idle( drm_r128_private_t *dev_priv )
+{
+	int i, ret;
+
+	ret = r128_do_wait_for_fifo( dev_priv, 64 );
+	if ( ret ) return ret;
+
+	for ( i = 0 ; i < dev_priv->usec_timeout ; i++ ) {
+		if ( !(R128_READ( R128_GUI_STAT ) & R128_GUI_ACTIVE) ) {
+			r128_do_pixcache_flush( dev_priv );
+			return 0;
+		}
+		DRM_UDELAY( 1 );
+	}
+
+#if R128_FIFO_DEBUG
+	DRM_ERROR( "failed!\n" );
+#endif
+	return DRM_ERR(EBUSY);
+}
+
+
+/* ================================================================
+ * CCE control, initialization
+ */
+
+/* Load the microcode for the CCE */
+static void r128_cce_load_microcode( drm_r128_private_t *dev_priv )
+{
+	int i;
+
+	DRM_DEBUG( "\n" );
+
+	r128_do_wait_for_idle( dev_priv );
+
+	R128_WRITE( R128_PM4_MICROCODE_ADDR, 0 );
+	for ( i = 0 ; i < 256 ; i++ ) {
+		R128_WRITE( R128_PM4_MICROCODE_DATAH,
+			    r128_cce_microcode[i * 2] );
+		R128_WRITE( R128_PM4_MICROCODE_DATAL,
+			    r128_cce_microcode[i * 2 + 1] );
+	}
+}
+
+/* Flush any pending commands to the CCE.  This should only be used just
+ * prior to a wait for idle, as it informs the engine that the command
+ * stream is ending.
+ */
+static void r128_do_cce_flush( drm_r128_private_t *dev_priv )
+{
+	u32 tmp;
+
+	tmp = R128_READ( R128_PM4_BUFFER_DL_WPTR ) | R128_PM4_BUFFER_DL_DONE;
+	R128_WRITE( R128_PM4_BUFFER_DL_WPTR, tmp );
+}
+
+/* Wait for the CCE to go idle.
+ */
+int r128_do_cce_idle( drm_r128_private_t *dev_priv )
+{
+	int i;
+
+	for ( i = 0 ; i < dev_priv->usec_timeout ; i++ ) {
+		if ( GET_RING_HEAD( &dev_priv->ring ) == dev_priv->ring.tail ) {
+			int pm4stat = R128_READ( R128_PM4_STAT );
+			if ( ( (pm4stat & R128_PM4_FIFOCNT_MASK) >=
+			       dev_priv->cce_fifo_size ) &&
+			     !(pm4stat & (R128_PM4_BUSY |
+					  R128_PM4_GUI_ACTIVE)) ) {
+				return r128_do_pixcache_flush( dev_priv );
+			}
+		}
+		DRM_UDELAY( 1 );
+	}
+
+#if R128_FIFO_DEBUG
+	DRM_ERROR( "failed!\n" );
+	r128_status( dev_priv );
+#endif
+	return DRM_ERR(EBUSY);
+}
+
+/* Start the Concurrent Command Engine.
+ */
+static void r128_do_cce_start( drm_r128_private_t *dev_priv )
+{
+	r128_do_wait_for_idle( dev_priv );
+
+	R128_WRITE( R128_PM4_BUFFER_CNTL,
+		    dev_priv->cce_mode | dev_priv->ring.size_l2qw );
+	R128_READ( R128_PM4_BUFFER_ADDR ); /* as per the sample code */
+	R128_WRITE( R128_PM4_MICRO_CNTL, R128_PM4_MICRO_FREERUN );
+
+	dev_priv->cce_running = 1;
+}
+
+/* Reset the Concurrent Command Engine.  This will not flush any pending
+ * commands, so you must wait for the CCE command stream to complete
+ * before calling this routine.
+ */
+static void r128_do_cce_reset( drm_r128_private_t *dev_priv )
+{
+	R128_WRITE( R128_PM4_BUFFER_DL_WPTR, 0 );
+	R128_WRITE( R128_PM4_BUFFER_DL_RPTR, 0 );
+	SET_RING_HEAD( &dev_priv->ring, 0 );
+	dev_priv->ring.tail = 0;
+}
+
+/* Stop the Concurrent Command Engine.  This will not flush any pending
+ * commands, so you must flush the command stream and wait for the CCE
+ * to go idle before calling this routine.
+ */
+static void r128_do_cce_stop( drm_r128_private_t *dev_priv )
+{
+	R128_WRITE( R128_PM4_MICRO_CNTL, 0 );
+	R128_WRITE( R128_PM4_BUFFER_CNTL, R128_PM4_NONPM4 );
+
+	dev_priv->cce_running = 0;
+}
+
+/* Reset the engine.  This will stop the CCE if it is running.
+ */
+static int r128_do_engine_reset( drm_device_t *dev )
+{
+	drm_r128_private_t *dev_priv = dev->dev_private;
+	u32 clock_cntl_index, mclk_cntl, gen_reset_cntl;
+
+	r128_do_pixcache_flush( dev_priv );
+
+	clock_cntl_index = R128_READ( R128_CLOCK_CNTL_INDEX );
+	mclk_cntl = R128_READ_PLL( dev, R128_MCLK_CNTL );
+
+	R128_WRITE_PLL( R128_MCLK_CNTL,
+			mclk_cntl | R128_FORCE_GCP | R128_FORCE_PIPE3D_CP );
+
+	gen_reset_cntl = R128_READ( R128_GEN_RESET_CNTL );
+
+	/* Taken from the sample code - do not change */
+	R128_WRITE( R128_GEN_RESET_CNTL,
+		    gen_reset_cntl | R128_SOFT_RESET_GUI );
+	R128_READ( R128_GEN_RESET_CNTL );
+	R128_WRITE( R128_GEN_RESET_CNTL,
+		    gen_reset_cntl & ~R128_SOFT_RESET_GUI );
+	R128_READ( R128_GEN_RESET_CNTL );
+
+	R128_WRITE_PLL( R128_MCLK_CNTL, mclk_cntl );
+	R128_WRITE( R128_CLOCK_CNTL_INDEX, clock_cntl_index );
+	R128_WRITE( R128_GEN_RESET_CNTL, gen_reset_cntl );
+
+	/* Reset the CCE ring */
+	r128_do_cce_reset( dev_priv );
+
+	/* The CCE is no longer running after an engine reset */
+	dev_priv->cce_running = 0;
+
+	/* Reset any pending vertex, indirect buffers */
+	r128_freelist_reset( dev );
+
+	return 0;
+}
+
+static void r128_cce_init_ring_buffer( drm_device_t *dev,
+				       drm_r128_private_t *dev_priv )
+{
+	u32 ring_start;
+	u32 tmp;
+
+	DRM_DEBUG( "\n" );
+
+	/* The manual (p. 2) says this address is in "VM space".  This
+	 * means it's an offset from the start of AGP space.
+	 */
+#if __REALLY_HAVE_AGP
+	if ( !dev_priv->is_pci )
+		ring_start = dev_priv->cce_ring->offset - dev->agp->base;
+	else
+#endif
+		ring_start = dev_priv->cce_ring->offset - dev->sg->handle;
+
+	R128_WRITE( R128_PM4_BUFFER_OFFSET, ring_start | R128_AGP_OFFSET );
+
+	R128_WRITE( R128_PM4_BUFFER_DL_WPTR, 0 );
+	R128_WRITE( R128_PM4_BUFFER_DL_RPTR, 0 );
+
+	/* DL_RPTR_ADDR is a physical address in AGP space. */
+	SET_RING_HEAD( &dev_priv->ring, 0 );
+
+	if ( !dev_priv->is_pci ) {
+		R128_WRITE( R128_PM4_BUFFER_DL_RPTR_ADDR,
+			    dev_priv->ring_rptr->offset );
+	} else {
+		drm_sg_mem_t *entry = dev->sg;
+		unsigned long tmp_ofs, page_ofs;
+
+		tmp_ofs = dev_priv->ring_rptr->offset - dev->sg->handle;
+		page_ofs = tmp_ofs >> PAGE_SHIFT;
+
+		R128_WRITE( R128_PM4_BUFFER_DL_RPTR_ADDR,
+     			    entry->busaddr[page_ofs]);
+		DRM_DEBUG( "ring rptr: offset=0x%08x handle=0x%08lx\n",
+			   entry->busaddr[page_ofs],
+     			   entry->handle + tmp_ofs );
+	}
+
+	/* Set watermark control */
+	R128_WRITE( R128_PM4_BUFFER_WM_CNTL,
+		    ((R128_WATERMARK_L/4) << R128_WMA_SHIFT)
+		    | ((R128_WATERMARK_M/4) << R128_WMB_SHIFT)
+		    | ((R128_WATERMARK_N/4) << R128_WMC_SHIFT)
+		    | ((R128_WATERMARK_K/64) << R128_WB_WM_SHIFT) );
+
+	/* Force read.  Why?  Because it's in the examples... */
+	R128_READ( R128_PM4_BUFFER_ADDR );
+
+	/* Turn on bus mastering */
+	tmp = R128_READ( R128_BUS_CNTL ) & ~R128_BUS_MASTER_DIS;
+	R128_WRITE( R128_BUS_CNTL, tmp );
+}
+
+static int r128_do_init_cce( drm_device_t *dev, drm_r128_init_t *init )
+{
+	drm_r128_private_t *dev_priv;
+
+	DRM_DEBUG( "\n" );
+
+	dev_priv = DRM(alloc)( sizeof(drm_r128_private_t), DRM_MEM_DRIVER );
+	if ( dev_priv == NULL )
+		return DRM_ERR(ENOMEM);
+
+	memset( dev_priv, 0, sizeof(drm_r128_private_t) );
+
+	dev_priv->is_pci = init->is_pci;
+
+	if ( dev_priv->is_pci && !dev->sg ) {
+		DRM_ERROR( "PCI GART memory not allocated!\n" );
+		dev->dev_private = (void *)dev_priv;
+		r128_do_cleanup_cce( dev );
+		return DRM_ERR(EINVAL);
+	}
+
+	dev_priv->usec_timeout = init->usec_timeout;
+	if ( dev_priv->usec_timeout < 1 ||
+	     dev_priv->usec_timeout > R128_MAX_USEC_TIMEOUT ) {
+		DRM_DEBUG( "TIMEOUT problem!\n" );
+		dev->dev_private = (void *)dev_priv;
+		r128_do_cleanup_cce( dev );
+		return DRM_ERR(EINVAL);
+	}
+
+	dev_priv->cce_mode = init->cce_mode;
+
+	/* GH: Simple idle check.
+	 */
+	atomic_set( &dev_priv->idle_count, 0 );
+
+	/* We don't support anything other than bus-mastering ring mode,
+	 * but the ring can be in either AGP or PCI space for the ring
+	 * read pointer.
+	 */
+	if ( ( init->cce_mode != R128_PM4_192BM ) &&
+	     ( init->cce_mode != R128_PM4_128BM_64INDBM ) &&
+	     ( init->cce_mode != R128_PM4_64BM_128INDBM ) &&
+	     ( init->cce_mode != R128_PM4_64BM_64VCBM_64INDBM ) ) {
+		DRM_DEBUG( "Bad cce_mode!\n" );
+		dev->dev_private = (void *)dev_priv;
+		r128_do_cleanup_cce( dev );
+		return DRM_ERR(EINVAL);
+	}
+
+	switch ( init->cce_mode ) {
+	case R128_PM4_NONPM4:
+		dev_priv->cce_fifo_size = 0;
+		break;
+	case R128_PM4_192PIO:
+	case R128_PM4_192BM:
+		dev_priv->cce_fifo_size = 192;
+		break;
+	case R128_PM4_128PIO_64INDBM:
+	case R128_PM4_128BM_64INDBM:
+		dev_priv->cce_fifo_size = 128;
+		break;
+	case R128_PM4_64PIO_128INDBM:
+	case R128_PM4_64BM_128INDBM:
+	case R128_PM4_64PIO_64VCBM_64INDBM:
+	case R128_PM4_64BM_64VCBM_64INDBM:
+	case R128_PM4_64PIO_64VCPIO_64INDPIO:
+		dev_priv->cce_fifo_size = 64;
+		break;
+	}
+
+	switch ( init->fb_bpp ) {
+	case 16:
+		dev_priv->color_fmt = R128_DATATYPE_RGB565;
+		break;
+	case 32:
+	default:
+		dev_priv->color_fmt = R128_DATATYPE_ARGB8888;
+		break;
+	}
+	dev_priv->front_offset	= init->front_offset;
+	dev_priv->front_pitch	= init->front_pitch;
+	dev_priv->back_offset	= init->back_offset;
+	dev_priv->back_pitch	= init->back_pitch;
+
+	switch ( init->depth_bpp ) {
+	case 16:
+		dev_priv->depth_fmt = R128_DATATYPE_RGB565;
+		break;
+	case 24:
+	case 32:
+	default:
+		dev_priv->depth_fmt = R128_DATATYPE_ARGB8888;
+		break;
+	}
+	dev_priv->depth_offset	= init->depth_offset;
+	dev_priv->depth_pitch	= init->depth_pitch;
+	dev_priv->span_offset	= init->span_offset;
+
+	dev_priv->front_pitch_offset_c = (((dev_priv->front_pitch/8) << 21) |
+					  (dev_priv->front_offset >> 5));
+	dev_priv->back_pitch_offset_c = (((dev_priv->back_pitch/8) << 21) |
+					 (dev_priv->back_offset >> 5));
+	dev_priv->depth_pitch_offset_c = (((dev_priv->depth_pitch/8) << 21) |
+					  (dev_priv->depth_offset >> 5) |
+					  R128_DST_TILE);
+	dev_priv->span_pitch_offset_c = (((dev_priv->depth_pitch/8) << 21) |
+					 (dev_priv->span_offset >> 5));
+
+	DRM_GETSAREA();
+	
+	if(!dev_priv->sarea) {
+		DRM_ERROR("could not find sarea!\n");
+		dev->dev_private = (void *)dev_priv;
+		r128_do_cleanup_cce( dev );
+		return DRM_ERR(EINVAL);
+	}
+
+	DRM_FIND_MAP( dev_priv->fb, init->fb_offset );
+	if(!dev_priv->fb) {
+		DRM_ERROR("could not find framebuffer!\n");
+		dev->dev_private = (void *)dev_priv;
+		r128_do_cleanup_cce( dev );
+		return DRM_ERR(EINVAL);
+	}
+	DRM_FIND_MAP( dev_priv->mmio, init->mmio_offset );
+	if(!dev_priv->mmio) {
+		DRM_ERROR("could not find mmio region!\n");
+		dev->dev_private = (void *)dev_priv;
+		r128_do_cleanup_cce( dev );
+		return DRM_ERR(EINVAL);
+	}
+	DRM_FIND_MAP( dev_priv->cce_ring, init->ring_offset );
+	if(!dev_priv->cce_ring) {
+		DRM_ERROR("could not find cce ring region!\n");
+		dev->dev_private = (void *)dev_priv;
+		r128_do_cleanup_cce( dev );
+		return DRM_ERR(EINVAL);
+	}
+	DRM_FIND_MAP( dev_priv->ring_rptr, init->ring_rptr_offset );
+	if(!dev_priv->ring_rptr) {
+		DRM_ERROR("could not find ring read pointer!\n");
+		dev->dev_private = (void *)dev_priv;
+		r128_do_cleanup_cce( dev );
+		return DRM_ERR(EINVAL);
+	}
+	DRM_FIND_MAP( dev_priv->buffers, init->buffers_offset );
+	if(!dev_priv->buffers) {
+		DRM_ERROR("could not find dma buffer region!\n");
+		dev->dev_private = (void *)dev_priv;
+		r128_do_cleanup_cce( dev );
+		return DRM_ERR(EINVAL);
+	}
+
+	if ( !dev_priv->is_pci ) {
+		DRM_FIND_MAP( dev_priv->agp_textures,
+			      init->agp_textures_offset );
+		if(!dev_priv->agp_textures) {
+			DRM_ERROR("could not find agp texture region!\n");
+			dev->dev_private = (void *)dev_priv;
+			r128_do_cleanup_cce( dev );
+			return DRM_ERR(EINVAL);
+		}
+	}
+
+	dev_priv->sarea_priv =
+		(drm_r128_sarea_t *)((u8 *)dev_priv->sarea->handle +
+				     init->sarea_priv_offset);
+
+	if ( !dev_priv->is_pci ) {
+		DRM_IOREMAP( dev_priv->cce_ring );
+		DRM_IOREMAP( dev_priv->ring_rptr );
+		DRM_IOREMAP( dev_priv->buffers );
+		if(!dev_priv->cce_ring->handle ||
+		   !dev_priv->ring_rptr->handle ||
+		   !dev_priv->buffers->handle) {
+			DRM_ERROR("Could not ioremap agp regions!\n");
+			dev->dev_private = (void *)dev_priv;
+			r128_do_cleanup_cce( dev );
+			return DRM_ERR(ENOMEM);
+		}
+	} else {
+		dev_priv->cce_ring->handle =
+			(void *)dev_priv->cce_ring->offset;
+		dev_priv->ring_rptr->handle =
+			(void *)dev_priv->ring_rptr->offset;
+		dev_priv->buffers->handle = (void *)dev_priv->buffers->offset;
+	}
+
+#if __REALLY_HAVE_AGP
+	if ( !dev_priv->is_pci )
+		dev_priv->cce_buffers_offset = dev->agp->base;
+	else
+#endif
+		dev_priv->cce_buffers_offset = dev->sg->handle;
+
+	dev_priv->ring.head = ((__volatile__ u32 *)
+			       dev_priv->ring_rptr->handle);
+
+	dev_priv->ring.start = (u32 *)dev_priv->cce_ring->handle;
+	dev_priv->ring.end = ((u32 *)dev_priv->cce_ring->handle
+			      + init->ring_size / sizeof(u32));
+	dev_priv->ring.size = init->ring_size;
+	dev_priv->ring.size_l2qw = DRM(order)( init->ring_size / 8 );
+
+	dev_priv->ring.tail_mask =
+		(dev_priv->ring.size / sizeof(u32)) - 1;
+
+	dev_priv->ring.high_mark = 128;
+
+	dev_priv->sarea_priv->last_frame = 0;
+	R128_WRITE( R128_LAST_FRAME_REG, dev_priv->sarea_priv->last_frame );
+
+	dev_priv->sarea_priv->last_dispatch = 0;
+	R128_WRITE( R128_LAST_DISPATCH_REG,
+		    dev_priv->sarea_priv->last_dispatch );
+
+#if __REALLY_HAVE_SG
+	if ( dev_priv->is_pci ) {
+		if (!DRM(ati_pcigart_init)( dev, &dev_priv->phys_pci_gart,
+     					    &dev_priv->bus_pci_gart) ) {
+			DRM_ERROR( "failed to init PCI GART!\n" );
+			dev->dev_private = (void *)dev_priv;
+			r128_do_cleanup_cce( dev );
+			return DRM_ERR(ENOMEM);
+		}
+		R128_WRITE( R128_PCI_GART_PAGE, dev_priv->bus_pci_gart );
+	}
+#endif
+
+	r128_cce_init_ring_buffer( dev, dev_priv );
+	r128_cce_load_microcode( dev_priv );
+
+	dev->dev_private = (void *)dev_priv;
+
+	r128_do_engine_reset( dev );
+
+	return 0;
+}
+
+int r128_do_cleanup_cce( drm_device_t *dev )
+{
+	if ( dev->dev_private ) {
+		drm_r128_private_t *dev_priv = dev->dev_private;
+
+#if __REALLY_HAVE_SG
+		if ( !dev_priv->is_pci ) {
+#endif
+			DRM_IOREMAPFREE( dev_priv->cce_ring );
+			DRM_IOREMAPFREE( dev_priv->ring_rptr );
+			DRM_IOREMAPFREE( dev_priv->buffers );
+#if __REALLY_HAVE_SG
+		} else {
+			if (!DRM(ati_pcigart_cleanup)( dev,
+						dev_priv->phys_pci_gart,
+						dev_priv->bus_pci_gart ))
+				DRM_ERROR( "failed to cleanup PCI GART!\n" );
+		}
+#endif
+
+		DRM(free)( dev->dev_private, sizeof(drm_r128_private_t),
+			   DRM_MEM_DRIVER );
+		dev->dev_private = NULL;
+	}
+
+	return 0;
+}
+
+int r128_cce_init( DRM_IOCTL_ARGS )
+{
+	DRM_DEVICE;
+	drm_r128_init_t init;
+
+	DRM_DEBUG( "\n" );
+
+	DRM_COPY_FROM_USER_IOCTL( init, (drm_r128_init_t *)data, sizeof(init) );
+
+	switch ( init.func ) {
+	case R128_INIT_CCE:
+		return r128_do_init_cce( dev, &init );
+	case R128_CLEANUP_CCE:
+		return r128_do_cleanup_cce( dev );
+	}
+
+	return DRM_ERR(EINVAL);
+}
+
+int r128_cce_start( DRM_IOCTL_ARGS )
+{
+	DRM_DEVICE;
+	drm_r128_private_t *dev_priv = dev->dev_private;
+	DRM_DEBUG( "\n" );
+
+	LOCK_TEST_WITH_RETURN( dev );
+
+	if ( dev_priv->cce_running || dev_priv->cce_mode == R128_PM4_NONPM4 ) {
+		DRM_DEBUG( "%s while CCE running\n", __FUNCTION__ );
+		return 0;
+	}
+
+	r128_do_cce_start( dev_priv );
+
+	return 0;
+}
+
+/* Stop the CCE.  The engine must have been idled before calling this
+ * routine.
+ */
+int r128_cce_stop( DRM_IOCTL_ARGS )
+{
+	DRM_DEVICE;
+	drm_r128_private_t *dev_priv = dev->dev_private;
+	drm_r128_cce_stop_t stop;
+	int ret;
+	DRM_DEBUG( "\n" );
+
+	LOCK_TEST_WITH_RETURN( dev );
+
+	DRM_COPY_FROM_USER_IOCTL(stop, (drm_r128_cce_stop_t *)data, sizeof(stop) );
+
+	/* Flush any pending CCE commands.  This ensures any outstanding
+	 * commands are exectuted by the engine before we turn it off.
+	 */
+	if ( stop.flush ) {
+		r128_do_cce_flush( dev_priv );
+	}
+
+	/* If we fail to make the engine go idle, we return an error
+	 * code so that the DRM ioctl wrapper can try again.
+	 */
+	if ( stop.idle ) {
+		ret = r128_do_cce_idle( dev_priv );
+		if ( ret ) return ret;
+	}
+
+	/* Finally, we can turn off the CCE.  If the engine isn't idle,
+	 * we will get some dropped triangles as they won't be fully
+	 * rendered before the CCE is shut down.
+	 */
+	r128_do_cce_stop( dev_priv );
+
+	/* Reset the engine */
+	r128_do_engine_reset( dev );
+
+	return 0;
+}
+
+/* Just reset the CCE ring.  Called as part of an X Server engine reset.
+ */
+int r128_cce_reset( DRM_IOCTL_ARGS )
+{
+	DRM_DEVICE;
+	drm_r128_private_t *dev_priv = dev->dev_private;
+	DRM_DEBUG( "\n" );
+
+	LOCK_TEST_WITH_RETURN( dev );
+
+	if ( !dev_priv ) {
+		DRM_DEBUG( "%s called before init done\n", __FUNCTION__ );
+		return DRM_ERR(EINVAL);
+	}
+
+	r128_do_cce_reset( dev_priv );
+
+	/* The CCE is no longer running after an engine reset */
+	dev_priv->cce_running = 0;
+
+	return 0;
+}
+
+int r128_cce_idle( DRM_IOCTL_ARGS )
+{
+	DRM_DEVICE;
+	drm_r128_private_t *dev_priv = dev->dev_private;
+	DRM_DEBUG( "\n" );
+
+	LOCK_TEST_WITH_RETURN( dev );
+
+	if ( dev_priv->cce_running ) {
+		r128_do_cce_flush( dev_priv );
+	}
+
+	return r128_do_cce_idle( dev_priv );
+}
+
+int r128_engine_reset( DRM_IOCTL_ARGS )
+{
+	DRM_DEVICE;
+	DRM_DEBUG( "\n" );
+
+	LOCK_TEST_WITH_RETURN( dev );
+
+	return r128_do_engine_reset( dev );
+}
+
+
+/* ================================================================
+ * Fullscreen mode
+ */
+
+static int r128_do_init_pageflip( drm_device_t *dev )
+{
+	drm_r128_private_t *dev_priv = dev->dev_private;
+	DRM_DEBUG( "\n" );
+
+	dev_priv->crtc_offset =      R128_READ( R128_CRTC_OFFSET );
+	dev_priv->crtc_offset_cntl = R128_READ( R128_CRTC_OFFSET_CNTL );
+
+	R128_WRITE( R128_CRTC_OFFSET, dev_priv->front_offset );
+	R128_WRITE( R128_CRTC_OFFSET_CNTL,
+		    dev_priv->crtc_offset_cntl | R128_CRTC_OFFSET_FLIP_CNTL );
+
+	dev_priv->page_flipping = 1;
+	dev_priv->current_page = 0;
+
+	return 0;
+}
+
+int r128_do_cleanup_pageflip( drm_device_t *dev )
+{
+	drm_r128_private_t *dev_priv = dev->dev_private;
+	DRM_DEBUG( "\n" );
+
+	R128_WRITE( R128_CRTC_OFFSET,      dev_priv->crtc_offset );
+	R128_WRITE( R128_CRTC_OFFSET_CNTL, dev_priv->crtc_offset_cntl );
+
+	dev_priv->page_flipping = 0;
+	dev_priv->current_page = 0;
+
+	return 0;
+}
+
+int r128_fullscreen( DRM_IOCTL_ARGS )
+{
+	DRM_DEVICE;
+	drm_r128_fullscreen_t fs;
+
+	LOCK_TEST_WITH_RETURN( dev );
+
+	DRM_COPY_FROM_USER_IOCTL( fs, (drm_r128_fullscreen_t *)data, sizeof(fs) );
+
+	switch ( fs.func ) {
+	case R128_INIT_FULLSCREEN:
+		return r128_do_init_pageflip( dev );
+	case R128_CLEANUP_FULLSCREEN:
+		return r128_do_cleanup_pageflip( dev );
+	}
+
+	return DRM_ERR(EINVAL);
+}
+
+
+/* ================================================================
+ * Freelist management
+ */
+#define R128_BUFFER_USED	0xffffffff
+#define R128_BUFFER_FREE	0
+
+#if 0
+static int r128_freelist_init( drm_device_t *dev )
+{
+	drm_device_dma_t *dma = dev->dma;
+	drm_r128_private_t *dev_priv = dev->dev_private;
+	drm_buf_t *buf;
+	drm_r128_buf_priv_t *buf_priv;
+	drm_r128_freelist_t *entry;
+	int i;
+
+	dev_priv->head = DRM(alloc)( sizeof(drm_r128_freelist_t),
+				     DRM_MEM_DRIVER );
+	if ( dev_priv->head == NULL )
+		return DRM_ERR(ENOMEM);
+
+	memset( dev_priv->head, 0, sizeof(drm_r128_freelist_t) );
+	dev_priv->head->age = R128_BUFFER_USED;
+
+	for ( i = 0 ; i < dma->buf_count ; i++ ) {
+		buf = dma->buflist[i];
+		buf_priv = buf->dev_private;
+
+		entry = DRM(alloc)( sizeof(drm_r128_freelist_t),
+				    DRM_MEM_DRIVER );
+		if ( !entry ) return DRM_ERR(ENOMEM);
+
+		entry->age = R128_BUFFER_FREE;
+		entry->buf = buf;
+		entry->prev = dev_priv->head;
+		entry->next = dev_priv->head->next;
+		if ( !entry->next )
+			dev_priv->tail = entry;
+
+		buf_priv->discard = 0;
+		buf_priv->dispatched = 0;
+		buf_priv->list_entry = entry;
+
+		dev_priv->head->next = entry;
+
+		if ( dev_priv->head->next )
+			dev_priv->head->next->prev = entry;
+	}
+
+	return 0;
+
+}
+#endif
+
+drm_buf_t *r128_freelist_get( drm_device_t *dev )
+{
+	drm_device_dma_t *dma = dev->dma;
+	drm_r128_private_t *dev_priv = dev->dev_private;
+	drm_r128_buf_priv_t *buf_priv;
+	drm_buf_t *buf;
+	int i, t;
+
+	/* FIXME: Optimize -- use freelist code */
+
+	for ( i = 0 ; i < dma->buf_count ; i++ ) {
+		buf = dma->buflist[i];
+		buf_priv = buf->dev_private;
+		if ( buf->pid == 0 )
+			return buf;
+	}
+
+	for ( t = 0 ; t < dev_priv->usec_timeout ; t++ ) {
+		u32 done_age = R128_READ( R128_LAST_DISPATCH_REG );
+
+		for ( i = 0 ; i < dma->buf_count ; i++ ) {
+			buf = dma->buflist[i];
+			buf_priv = buf->dev_private;
+			if ( buf->pending && buf_priv->age <= done_age ) {
+				/* The buffer has been processed, so it
+				 * can now be used.
+				 */
+				buf->pending = 0;
+				return buf;
+			}
+		}
+		DRM_UDELAY( 1 );
+	}
+
+	DRM_ERROR( "returning NULL!\n" );
+	return NULL;
+}
+
+void r128_freelist_reset( drm_device_t *dev )
+{
+	drm_device_dma_t *dma = dev->dma;
+	int i;
+
+	for ( i = 0 ; i < dma->buf_count ; i++ ) {
+		drm_buf_t *buf = dma->buflist[i];
+		drm_r128_buf_priv_t *buf_priv = buf->dev_private;
+		buf_priv->age = 0;
+	}
+}
+
+
+/* ================================================================
+ * CCE command submission
+ */
+
+int r128_wait_ring( drm_r128_private_t *dev_priv, int n )
+{
+	drm_r128_ring_buffer_t *ring = &dev_priv->ring;
+	int i;
+
+	for ( i = 0 ; i < dev_priv->usec_timeout ; i++ ) {
+		r128_update_ring_snapshot( ring );
+		if ( ring->space >= n )
+			return 0;
+		DRM_UDELAY( 1 );
+	}
+
+	/* FIXME: This is being ignored... */
+	DRM_ERROR( "failed!\n" );
+	return DRM_ERR(EBUSY);
+}
+
+static int r128_cce_get_buffers( drm_device_t *dev, drm_dma_t *d )
+{
+	int i;
+	drm_buf_t *buf;
+
+	for ( i = d->granted_count ; i < d->request_count ; i++ ) {
+		buf = r128_freelist_get( dev );
+		if ( !buf ) return DRM_ERR(EAGAIN);
+
+		buf->pid = DRM_CURRENTPID;
+
+		if ( DRM_COPY_TO_USER( &d->request_indices[i], &buf->idx,
+				   sizeof(buf->idx) ) )
+			return DRM_ERR(EFAULT);
+		if ( DRM_COPY_TO_USER( &d->request_sizes[i], &buf->total,
+				   sizeof(buf->total) ) )
+			return DRM_ERR(EFAULT);
+
+		d->granted_count++;
+	}
+	return 0;
+}
+
+int r128_cce_buffers( DRM_IOCTL_ARGS )
+{
+	DRM_DEVICE;
+	drm_device_dma_t *dma = dev->dma;
+	int ret = 0;
+	drm_dma_t d;
+
+	LOCK_TEST_WITH_RETURN( dev );
+
+	DRM_COPY_FROM_USER_IOCTL( d, (drm_dma_t *) data, sizeof(d) );
+
+	/* Please don't send us buffers.
+	 */
+	if ( d.send_count != 0 ) {
+		DRM_ERROR( "Process %d trying to send %d buffers via drmDMA\n",
+			   DRM_CURRENTPID, d.send_count );
+		return DRM_ERR(EINVAL);
+	}
+
+	/* We'll send you buffers.
+	 */
+	if ( d.request_count < 0 || d.request_count > dma->buf_count ) {
+		DRM_ERROR( "Process %d trying to get %d buffers (of %d max)\n",
+			   DRM_CURRENTPID, d.request_count, dma->buf_count );
+		return DRM_ERR(EINVAL);
+	}
+
+	d.granted_count = 0;
+
+	if ( d.request_count ) {
+		ret = r128_cce_get_buffers( dev, &d );
+	}
+
+	DRM_COPY_TO_USER_IOCTL((drm_dma_t *) data, d, sizeof(d) );
+
+	return ret;
+}
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/r128_drm.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/r128_drm.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/r128_drm.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/r128_drm.h	2003-07-30 11:18:33.000000000 +0200
@@ -0,0 +1,319 @@
+/* r128_drm.h -- Public header for the r128 driver -*- linux-c -*-
+ * Created: Wed Apr  5 19:24:19 2000 by kevin@precisioninsight.com
+ *
+ * Copyright 2000 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Gareth Hughes <gareth@valinux.com>
+ *    Kevin E. Martin <martin@valinux.com>
+ */
+
+#ifndef __R128_DRM_H__
+#define __R128_DRM_H__
+
+/* WARNING: If you change any of these defines, make sure to change the
+ * defines in the X server file (r128_sarea.h)
+ */
+#ifndef __R128_SAREA_DEFINES__
+#define __R128_SAREA_DEFINES__
+
+/* What needs to be changed for the current vertex buffer?
+ */
+#define R128_UPLOAD_CONTEXT		0x001
+#define R128_UPLOAD_SETUP		0x002
+#define R128_UPLOAD_TEX0		0x004
+#define R128_UPLOAD_TEX1		0x008
+#define R128_UPLOAD_TEX0IMAGES		0x010
+#define R128_UPLOAD_TEX1IMAGES		0x020
+#define R128_UPLOAD_CORE		0x040
+#define R128_UPLOAD_MASKS		0x080
+#define R128_UPLOAD_WINDOW		0x100
+#define R128_UPLOAD_CLIPRECTS		0x200	/* handled client-side */
+#define R128_REQUIRE_QUIESCENCE		0x400
+#define R128_UPLOAD_ALL			0x7ff
+
+#define R128_FRONT			0x1
+#define R128_BACK			0x2
+#define R128_DEPTH			0x4
+
+/* Primitive types
+ */
+#define R128_POINTS			0x1
+#define R128_LINES			0x2
+#define R128_LINE_STRIP			0x3
+#define R128_TRIANGLES			0x4
+#define R128_TRIANGLE_FAN		0x5
+#define R128_TRIANGLE_STRIP		0x6
+
+/* Vertex/indirect buffer size
+ */
+#define R128_BUFFER_SIZE		16384
+
+/* Byte offsets for indirect buffer data
+ */
+#define R128_INDEX_PRIM_OFFSET		20
+#define R128_HOSTDATA_BLIT_OFFSET	32
+
+/* Keep these small for testing.
+ */
+#define R128_NR_SAREA_CLIPRECTS		12
+
+/* There are 2 heaps (local/AGP).  Each region within a heap is a
+ *  minimum of 64k, and there are at most 64 of them per heap.
+ */
+#define R128_LOCAL_TEX_HEAP		0
+#define R128_AGP_TEX_HEAP		1
+#define R128_NR_TEX_HEAPS		2
+#define R128_NR_TEX_REGIONS		64
+#define R128_LOG_TEX_GRANULARITY	16
+
+#define R128_NR_CONTEXT_REGS		12
+
+#define R128_MAX_TEXTURE_LEVELS		11
+#define R128_MAX_TEXTURE_UNITS		2
+
+#endif /* __R128_SAREA_DEFINES__ */
+
+typedef struct {
+	/* Context state - can be written in one large chunk */
+	unsigned int dst_pitch_offset_c;
+	unsigned int dp_gui_master_cntl_c;
+	unsigned int sc_top_left_c;
+	unsigned int sc_bottom_right_c;
+	unsigned int z_offset_c;
+	unsigned int z_pitch_c;
+	unsigned int z_sten_cntl_c;
+	unsigned int tex_cntl_c;
+	unsigned int misc_3d_state_cntl_reg;
+	unsigned int texture_clr_cmp_clr_c;
+	unsigned int texture_clr_cmp_msk_c;
+	unsigned int fog_color_c;
+
+	/* Texture state */
+	unsigned int tex_size_pitch_c;
+	unsigned int constant_color_c;
+
+	/* Setup state */
+	unsigned int pm4_vc_fpu_setup;
+	unsigned int setup_cntl;
+
+	/* Mask state */
+	unsigned int dp_write_mask;
+	unsigned int sten_ref_mask_c;
+	unsigned int plane_3d_mask_c;
+
+	/* Window state */
+	unsigned int window_xy_offset;
+
+	/* Core state */
+	unsigned int scale_3d_cntl;
+} drm_r128_context_regs_t;
+
+/* Setup registers for each texture unit
+ */
+typedef struct {
+	unsigned int tex_cntl;
+	unsigned int tex_combine_cntl;
+	unsigned int tex_size_pitch;
+	unsigned int tex_offset[R128_MAX_TEXTURE_LEVELS];
+	unsigned int tex_border_color;
+} drm_r128_texture_regs_t;
+
+
+typedef struct drm_r128_sarea {
+	/* The channel for communication of state information to the kernel
+	 * on firing a vertex buffer.
+	 */
+	drm_r128_context_regs_t context_state;
+	drm_r128_texture_regs_t tex_state[R128_MAX_TEXTURE_UNITS];
+	unsigned int dirty;
+	unsigned int vertsize;
+	unsigned int vc_format;
+
+	/* The current cliprects, or a subset thereof.
+	 */
+	drm_clip_rect_t boxes[R128_NR_SAREA_CLIPRECTS];
+	unsigned int nbox;
+
+	/* Counters for client-side throttling of rendering clients.
+	 */
+	unsigned int last_frame;
+	unsigned int last_dispatch;
+
+	drm_tex_region_t tex_list[R128_NR_TEX_HEAPS][R128_NR_TEX_REGIONS+1];
+	int tex_age[R128_NR_TEX_HEAPS];
+	int ctx_owner;
+} drm_r128_sarea_t;
+
+
+/* WARNING: If you change any of these defines, make sure to change the
+ * defines in the Xserver file (xf86drmR128.h)
+ */
+
+/* Rage 128 specific ioctls
+ * The device specific ioctl range is 0x40 to 0x79.
+ */
+#define DRM_IOCTL_R128_INIT		DRM_IOW( 0x40, drm_r128_init_t)
+#define DRM_IOCTL_R128_CCE_START	DRM_IO(  0x41)
+#define DRM_IOCTL_R128_CCE_STOP		DRM_IOW( 0x42, drm_r128_cce_stop_t)
+#define DRM_IOCTL_R128_CCE_RESET	DRM_IO(  0x43)
+#define DRM_IOCTL_R128_CCE_IDLE		DRM_IO(  0x44)
+#define DRM_IOCTL_R128_RESET		DRM_IO(  0x46)
+#define DRM_IOCTL_R128_SWAP		DRM_IO(  0x47)
+#define DRM_IOCTL_R128_CLEAR		DRM_IOW( 0x48, drm_r128_clear_t)
+#define DRM_IOCTL_R128_VERTEX		DRM_IOW( 0x49, drm_r128_vertex_t)
+#define DRM_IOCTL_R128_INDICES		DRM_IOW( 0x4a, drm_r128_indices_t)
+#define DRM_IOCTL_R128_BLIT		DRM_IOW( 0x4b, drm_r128_blit_t)
+#define DRM_IOCTL_R128_DEPTH		DRM_IOW( 0x4c, drm_r128_depth_t)
+#define DRM_IOCTL_R128_STIPPLE		DRM_IOW( 0x4d, drm_r128_stipple_t)
+#define DRM_IOCTL_R128_INDIRECT		DRM_IOWR(0x4f, drm_r128_indirect_t)
+#define DRM_IOCTL_R128_FULLSCREEN	DRM_IOW( 0x50, drm_r128_fullscreen_t)
+#define DRM_IOCTL_R128_CLEAR2		DRM_IOW( 0x51, drm_r128_clear2_t)
+#define DRM_IOCTL_R128_GETPARAM		DRM_IOW( 0x52, drm_r128_getparam_t)
+
+typedef struct drm_r128_init {
+	enum {
+		R128_INIT_CCE    = 0x01,
+		R128_CLEANUP_CCE = 0x02
+	} func;
+#if CONFIG_XFREE86_VERSION < XFREE86_VERSION(4,1,0,0)
+	int sarea_priv_offset;
+#else
+	unsigned long sarea_priv_offset;
+#endif
+	int is_pci;
+	int cce_mode;
+	int cce_secure;
+	int ring_size;
+	int usec_timeout;
+
+	unsigned int fb_bpp;
+	unsigned int front_offset, front_pitch;
+	unsigned int back_offset, back_pitch;
+	unsigned int depth_bpp;
+	unsigned int depth_offset, depth_pitch;
+	unsigned int span_offset;
+
+#if CONFIG_XFREE86_VERSION < XFREE86_VERSION(4,1,0,0)
+	unsigned int fb_offset;
+	unsigned int mmio_offset;
+	unsigned int ring_offset;
+	unsigned int ring_rptr_offset;
+	unsigned int buffers_offset;
+	unsigned int agp_textures_offset;
+#else
+	unsigned long fb_offset;
+	unsigned long mmio_offset;
+	unsigned long ring_offset;
+	unsigned long ring_rptr_offset;
+	unsigned long buffers_offset;
+	unsigned long agp_textures_offset;
+#endif
+} drm_r128_init_t;
+
+typedef struct drm_r128_cce_stop {
+	int flush;
+	int idle;
+} drm_r128_cce_stop_t;
+
+typedef struct drm_r128_clear {
+	unsigned int flags;
+#if CONFIG_XFREE86_VERSION < XFREE86_VERSION(4,1,0,0)
+	int x, y, w, h;
+#endif
+	unsigned int clear_color;
+	unsigned int clear_depth;
+#if CONFIG_XFREE86_VERSION >= XFREE86_VERSION(4,1,0,0)
+	unsigned int color_mask;
+	unsigned int depth_mask;
+#endif
+} drm_r128_clear_t;
+
+typedef struct drm_r128_vertex {
+	int prim;
+	int idx;			/* Index of vertex buffer */
+	int count;			/* Number of vertices in buffer */
+	int discard;			/* Client finished with buffer? */
+} drm_r128_vertex_t;
+
+typedef struct drm_r128_indices {
+	int prim;
+	int idx;
+	int start;
+	int end;
+	int discard;			/* Client finished with buffer? */
+} drm_r128_indices_t;
+
+typedef struct drm_r128_blit {
+	int idx;
+	int pitch;
+	int offset;
+	int format;
+	unsigned short x, y;
+	unsigned short width, height;
+} drm_r128_blit_t;
+
+typedef struct drm_r128_depth {
+	enum {
+		R128_WRITE_SPAN		= 0x01,
+		R128_WRITE_PIXELS	= 0x02,
+		R128_READ_SPAN		= 0x03,
+		R128_READ_PIXELS	= 0x04
+	} func;
+	int n;
+	int *x;
+	int *y;
+	unsigned int *buffer;
+	unsigned char *mask;
+} drm_r128_depth_t;
+
+typedef struct drm_r128_stipple {
+	unsigned int *mask;
+} drm_r128_stipple_t;
+
+typedef struct drm_r128_indirect {
+	int idx;
+	int start;
+	int end;
+	int discard;
+} drm_r128_indirect_t;
+
+typedef struct drm_r128_fullscreen {
+	enum {
+		R128_INIT_FULLSCREEN    = 0x01,
+		R128_CLEANUP_FULLSCREEN = 0x02
+	} func;
+} drm_r128_fullscreen_t;
+
+/* 2.3: An ioctl to get parameters that aren't available to the 3d
+ * client any other way.  
+ */
+#define R128_PARAM_IRQ_NR            1
+
+typedef struct drm_r128_getparam {
+	int param;
+	int *value;
+} drm_r128_getparam_t;
+
+#endif
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/r128_drv.c linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/r128_drv.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/r128_drv.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/r128_drv.c	2003-07-30 11:18:33.000000000 +0200
@@ -0,0 +1,55 @@
+/* r128_drv.c -- ATI Rage 128 driver -*- linux-c -*-
+ * Created: Mon Dec 13 09:47:27 1999 by faith@precisioninsight.com
+ *
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Rickard E. (Rik) Faith <faith@valinux.com>
+ *    Gareth Hughes <gareth@valinux.com>
+ */
+
+#include <linux/config.h>
+#include "r128.h"
+#include "drmP.h"
+#include "drm.h"
+#include "r128_drm.h"
+#include "r128_drv.h"
+#include "ati_pcigart.h"
+
+#include "drm_agpsupport.h"
+#include "drm_auth.h"
+#include "drm_bufs.h"
+#include "drm_context.h"
+#include "drm_dma.h"
+#include "drm_drawable.h"
+#include "drm_drv.h"
+#include "drm_fops.h"
+#include "drm_init.h"
+#include "drm_ioctl.h"
+#include "drm_lock.h"
+#include "drm_memory.h"
+#include "drm_proc.h"
+#include "drm_vm.h"
+#include "drm_stub.h"
+#include "drm_scatter.h"
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/r128_drv.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/r128_drv.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/r128_drv.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/r128_drv.h	2003-07-30 11:18:33.000000000 +0200
@@ -0,0 +1,510 @@
+/* r128_drv.h -- Private header for r128 driver -*- linux-c -*-
+ * Created: Mon Dec 13 09:51:11 1999 by faith@precisioninsight.com
+ *
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Rickard E. (Rik) Faith <faith@valinux.com>
+ *    Kevin E. Martin <martin@valinux.com>
+ *    Gareth Hughes <gareth@valinux.com>
+ *    Michel Dänzer <daenzerm@student.ethz.ch>
+ */
+
+#ifndef __R128_DRV_H__
+#define __R128_DRV_H__
+
+#define GET_RING_HEAD(ring)		DRM_READ32(  (volatile u32 *) (ring)->head )
+#define SET_RING_HEAD(ring,val)		DRM_WRITE32( (volatile u32 *) (ring)->head, (val) )
+
+typedef struct drm_r128_freelist {
+   	unsigned int age;
+   	drm_buf_t *buf;
+   	struct drm_r128_freelist *next;
+   	struct drm_r128_freelist *prev;
+} drm_r128_freelist_t;
+
+typedef struct drm_r128_ring_buffer {
+	u32 *start;
+	u32 *end;
+	int size;
+	int size_l2qw;
+
+	volatile u32 *head;
+	u32 tail;
+	u32 tail_mask;
+	int space;
+
+	int high_mark;
+} drm_r128_ring_buffer_t;
+
+typedef struct drm_r128_private {
+	drm_r128_ring_buffer_t ring;
+	drm_r128_sarea_t *sarea_priv;
+
+	int cce_mode;
+	int cce_fifo_size;
+	int cce_running;
+
+   	drm_r128_freelist_t *head;
+   	drm_r128_freelist_t *tail;
+
+	int usec_timeout;
+	int is_pci;
+	unsigned long phys_pci_gart;
+	dma_addr_t bus_pci_gart;
+	unsigned long cce_buffers_offset;
+
+	atomic_t idle_count;
+
+	int page_flipping;
+	int current_page;
+	u32 crtc_offset;
+	u32 crtc_offset_cntl;
+
+	u32 color_fmt;
+	unsigned int front_offset;
+	unsigned int front_pitch;
+	unsigned int back_offset;
+	unsigned int back_pitch;
+
+	u32 depth_fmt;
+	unsigned int depth_offset;
+	unsigned int depth_pitch;
+	unsigned int span_offset;
+
+	u32 front_pitch_offset_c;
+	u32 back_pitch_offset_c;
+	u32 depth_pitch_offset_c;
+	u32 span_pitch_offset_c;
+
+	drm_map_t *sarea;
+	drm_map_t *fb;
+	drm_map_t *mmio;
+	drm_map_t *cce_ring;
+	drm_map_t *ring_rptr;
+	drm_map_t *buffers;
+	drm_map_t *agp_textures;
+} drm_r128_private_t;
+
+typedef struct drm_r128_buf_priv {
+	u32 age;
+	int prim;
+	int discard;
+	int dispatched;
+   	drm_r128_freelist_t *list_entry;
+} drm_r128_buf_priv_t;
+
+				/* r128_cce.c */
+extern int r128_cce_init( DRM_IOCTL_ARGS );
+extern int r128_cce_start( DRM_IOCTL_ARGS );
+extern int r128_cce_stop( DRM_IOCTL_ARGS );
+extern int r128_cce_reset( DRM_IOCTL_ARGS );
+extern int r128_cce_idle( DRM_IOCTL_ARGS );
+extern int r128_engine_reset( DRM_IOCTL_ARGS );
+extern int r128_fullscreen( DRM_IOCTL_ARGS );
+extern int r128_cce_buffers( DRM_IOCTL_ARGS );
+extern int r128_getparam( DRM_IOCTL_ARGS );
+
+extern void r128_freelist_reset( drm_device_t *dev );
+extern drm_buf_t *r128_freelist_get( drm_device_t *dev );
+
+extern int r128_wait_ring( drm_r128_private_t *dev_priv, int n );
+
+static __inline__ void
+r128_update_ring_snapshot( drm_r128_ring_buffer_t *ring )
+{
+	ring->space = (GET_RING_HEAD( ring ) - ring->tail) * sizeof(u32);
+	if ( ring->space <= 0 )
+		ring->space += ring->size;
+}
+
+extern int r128_do_cce_idle( drm_r128_private_t *dev_priv );
+extern int r128_do_cleanup_cce( drm_device_t *dev );
+extern int r128_do_cleanup_pageflip( drm_device_t *dev );
+
+				/* r128_state.c */
+extern int r128_cce_clear( DRM_IOCTL_ARGS );
+extern int r128_cce_swap( DRM_IOCTL_ARGS );
+extern int r128_cce_vertex( DRM_IOCTL_ARGS );
+extern int r128_cce_indices( DRM_IOCTL_ARGS );
+extern int r128_cce_blit( DRM_IOCTL_ARGS );
+extern int r128_cce_depth( DRM_IOCTL_ARGS );
+extern int r128_cce_stipple( DRM_IOCTL_ARGS );
+extern int r128_cce_indirect( DRM_IOCTL_ARGS );
+
+
+/* Register definitions, register access macros and drmAddMap constants
+ * for Rage 128 kernel driver.
+ */
+
+#define R128_AUX_SC_CNTL		0x1660
+#	define R128_AUX1_SC_EN			(1 << 0)
+#	define R128_AUX1_SC_MODE_OR		(0 << 1)
+#	define R128_AUX1_SC_MODE_NAND		(1 << 1)
+#	define R128_AUX2_SC_EN			(1 << 2)
+#	define R128_AUX2_SC_MODE_OR		(0 << 3)
+#	define R128_AUX2_SC_MODE_NAND		(1 << 3)
+#	define R128_AUX3_SC_EN			(1 << 4)
+#	define R128_AUX3_SC_MODE_OR		(0 << 5)
+#	define R128_AUX3_SC_MODE_NAND		(1 << 5)
+#define R128_AUX1_SC_LEFT		0x1664
+#define R128_AUX1_SC_RIGHT		0x1668
+#define R128_AUX1_SC_TOP		0x166c
+#define R128_AUX1_SC_BOTTOM		0x1670
+#define R128_AUX2_SC_LEFT		0x1674
+#define R128_AUX2_SC_RIGHT		0x1678
+#define R128_AUX2_SC_TOP		0x167c
+#define R128_AUX2_SC_BOTTOM		0x1680
+#define R128_AUX3_SC_LEFT		0x1684
+#define R128_AUX3_SC_RIGHT		0x1688
+#define R128_AUX3_SC_TOP		0x168c
+#define R128_AUX3_SC_BOTTOM		0x1690
+
+#define R128_BRUSH_DATA0		0x1480
+#define R128_BUS_CNTL			0x0030
+#	define R128_BUS_MASTER_DIS		(1 << 6)
+
+#define R128_CLOCK_CNTL_INDEX		0x0008
+#define R128_CLOCK_CNTL_DATA		0x000c
+#	define R128_PLL_WR_EN			(1 << 7)
+#define R128_CONSTANT_COLOR_C		0x1d34
+#define R128_CRTC_OFFSET		0x0224
+#define R128_CRTC_OFFSET_CNTL		0x0228
+#	define R128_CRTC_OFFSET_FLIP_CNTL	(1 << 16)
+
+#define R128_DP_GUI_MASTER_CNTL		0x146c
+#       define R128_GMC_SRC_PITCH_OFFSET_CNTL	(1    <<  0)
+#       define R128_GMC_DST_PITCH_OFFSET_CNTL	(1    <<  1)
+#	define R128_GMC_BRUSH_SOLID_COLOR	(13   <<  4)
+#	define R128_GMC_BRUSH_NONE		(15   <<  4)
+#	define R128_GMC_DST_16BPP		(4    <<  8)
+#	define R128_GMC_DST_24BPP		(5    <<  8)
+#	define R128_GMC_DST_32BPP		(6    <<  8)
+#       define R128_GMC_DST_DATATYPE_SHIFT	8
+#	define R128_GMC_SRC_DATATYPE_COLOR	(3    << 12)
+#	define R128_DP_SRC_SOURCE_MEMORY	(2    << 24)
+#	define R128_DP_SRC_SOURCE_HOST_DATA	(3    << 24)
+#	define R128_GMC_CLR_CMP_CNTL_DIS	(1    << 28)
+#	define R128_GMC_AUX_CLIP_DIS		(1    << 29)
+#	define R128_GMC_WR_MSK_DIS		(1    << 30)
+#	define R128_ROP3_S			0x00cc0000
+#	define R128_ROP3_P			0x00f00000
+#define R128_DP_WRITE_MASK		0x16cc
+#define R128_DST_PITCH_OFFSET_C		0x1c80
+#	define R128_DST_TILE			(1 << 31)
+
+#define R128_GEN_INT_CNTL		0x0040
+#	define R128_CRTC_VBLANK_INT_EN		(1 <<  0)
+#define R128_GEN_INT_STATUS		0x0044
+#	define R128_CRTC_VBLANK_INT		(1 <<  0)
+#	define R128_CRTC_VBLANK_INT_AK		(1 <<  0)
+#define R128_GEN_RESET_CNTL		0x00f0
+#	define R128_SOFT_RESET_GUI		(1 <<  0)
+
+#define R128_GUI_SCRATCH_REG0		0x15e0
+#define R128_GUI_SCRATCH_REG1		0x15e4
+#define R128_GUI_SCRATCH_REG2		0x15e8
+#define R128_GUI_SCRATCH_REG3		0x15ec
+#define R128_GUI_SCRATCH_REG4		0x15f0
+#define R128_GUI_SCRATCH_REG5		0x15f4
+
+#define R128_GUI_STAT			0x1740
+#	define R128_GUI_FIFOCNT_MASK		0x0fff
+#	define R128_GUI_ACTIVE			(1 << 31)
+
+#define R128_MCLK_CNTL			0x000f
+#	define R128_FORCE_GCP			(1 << 16)
+#	define R128_FORCE_PIPE3D_CP		(1 << 17)
+#	define R128_FORCE_RCP			(1 << 18)
+
+#define R128_PC_GUI_CTLSTAT		0x1748
+#define R128_PC_NGUI_CTLSTAT		0x0184
+#	define R128_PC_FLUSH_GUI		(3 << 0)
+#	define R128_PC_RI_GUI			(1 << 2)
+#	define R128_PC_FLUSH_ALL		0x00ff
+#	define R128_PC_BUSY			(1 << 31)
+
+#define R128_PCI_GART_PAGE		0x017c
+#define R128_PRIM_TEX_CNTL_C		0x1cb0
+
+#define R128_SCALE_3D_CNTL		0x1a00
+#define R128_SEC_TEX_CNTL_C		0x1d00
+#define R128_SEC_TEXTURE_BORDER_COLOR_C	0x1d3c
+#define R128_SETUP_CNTL			0x1bc4
+#define R128_STEN_REF_MASK_C		0x1d40
+
+#define R128_TEX_CNTL_C			0x1c9c
+#	define R128_TEX_CACHE_FLUSH		(1 << 23)
+
+#define R128_WAIT_UNTIL			0x1720
+#	define R128_EVENT_CRTC_OFFSET		(1 << 0)
+#define R128_WINDOW_XY_OFFSET		0x1bcc
+
+
+/* CCE registers
+ */
+#define R128_PM4_BUFFER_OFFSET		0x0700
+#define R128_PM4_BUFFER_CNTL		0x0704
+#	define R128_PM4_MASK			(15 << 28)
+#	define R128_PM4_NONPM4			(0  << 28)
+#	define R128_PM4_192PIO			(1  << 28)
+#	define R128_PM4_192BM			(2  << 28)
+#	define R128_PM4_128PIO_64INDBM		(3  << 28)
+#	define R128_PM4_128BM_64INDBM		(4  << 28)
+#	define R128_PM4_64PIO_128INDBM		(5  << 28)
+#	define R128_PM4_64BM_128INDBM		(6  << 28)
+#	define R128_PM4_64PIO_64VCBM_64INDBM	(7  << 28)
+#	define R128_PM4_64BM_64VCBM_64INDBM	(8  << 28)
+#	define R128_PM4_64PIO_64VCPIO_64INDPIO	(15 << 28)
+
+#define R128_PM4_BUFFER_WM_CNTL		0x0708
+#	define R128_WMA_SHIFT			0
+#	define R128_WMB_SHIFT			8
+#	define R128_WMC_SHIFT			16
+#	define R128_WB_WM_SHIFT			24
+
+#define R128_PM4_BUFFER_DL_RPTR_ADDR	0x070c
+#define R128_PM4_BUFFER_DL_RPTR		0x0710
+#define R128_PM4_BUFFER_DL_WPTR		0x0714
+#	define R128_PM4_BUFFER_DL_DONE		(1 << 31)
+
+#define R128_PM4_VC_FPU_SETUP		0x071c
+
+#define R128_PM4_IW_INDOFF		0x0738
+#define R128_PM4_IW_INDSIZE		0x073c
+
+#define R128_PM4_STAT			0x07b8
+#	define R128_PM4_FIFOCNT_MASK		0x0fff
+#	define R128_PM4_BUSY			(1 << 16)
+#	define R128_PM4_GUI_ACTIVE		(1 << 31)
+
+#define R128_PM4_MICROCODE_ADDR		0x07d4
+#define R128_PM4_MICROCODE_RADDR	0x07d8
+#define R128_PM4_MICROCODE_DATAH	0x07dc
+#define R128_PM4_MICROCODE_DATAL	0x07e0
+
+#define R128_PM4_BUFFER_ADDR		0x07f0
+#define R128_PM4_MICRO_CNTL		0x07fc
+#	define R128_PM4_MICRO_FREERUN		(1 << 30)
+
+#define R128_PM4_FIFO_DATA_EVEN		0x1000
+#define R128_PM4_FIFO_DATA_ODD		0x1004
+
+
+/* CCE command packets
+ */
+#define R128_CCE_PACKET0		0x00000000
+#define R128_CCE_PACKET1		0x40000000
+#define R128_CCE_PACKET2		0x80000000
+#define R128_CCE_PACKET3		0xC0000000
+#	define R128_CNTL_HOSTDATA_BLT		0x00009400
+#	define R128_CNTL_PAINT_MULTI		0x00009A00
+#	define R128_CNTL_BITBLT_MULTI		0x00009B00
+#	define R128_3D_RNDR_GEN_INDX_PRIM	0x00002300
+
+#define R128_CCE_PACKET_MASK		0xC0000000
+#define R128_CCE_PACKET_COUNT_MASK	0x3fff0000
+#define R128_CCE_PACKET0_REG_MASK	0x000007ff
+#define R128_CCE_PACKET1_REG0_MASK	0x000007ff
+#define R128_CCE_PACKET1_REG1_MASK	0x003ff800
+
+#define R128_CCE_VC_CNTL_PRIM_TYPE_NONE		0x00000000
+#define R128_CCE_VC_CNTL_PRIM_TYPE_POINT	0x00000001
+#define R128_CCE_VC_CNTL_PRIM_TYPE_LINE		0x00000002
+#define R128_CCE_VC_CNTL_PRIM_TYPE_POLY_LINE	0x00000003
+#define R128_CCE_VC_CNTL_PRIM_TYPE_TRI_LIST	0x00000004
+#define R128_CCE_VC_CNTL_PRIM_TYPE_TRI_FAN	0x00000005
+#define R128_CCE_VC_CNTL_PRIM_TYPE_TRI_STRIP	0x00000006
+#define R128_CCE_VC_CNTL_PRIM_TYPE_TRI_TYPE2	0x00000007
+#define R128_CCE_VC_CNTL_PRIM_WALK_IND		0x00000010
+#define R128_CCE_VC_CNTL_PRIM_WALK_LIST		0x00000020
+#define R128_CCE_VC_CNTL_PRIM_WALK_RING		0x00000030
+#define R128_CCE_VC_CNTL_NUM_SHIFT		16
+
+#define R128_DATATYPE_CI8		2
+#define R128_DATATYPE_ARGB1555		3
+#define R128_DATATYPE_RGB565		4
+#define R128_DATATYPE_RGB888		5
+#define R128_DATATYPE_ARGB8888		6
+#define R128_DATATYPE_RGB332		7
+#define R128_DATATYPE_RGB8		9
+#define R128_DATATYPE_ARGB4444		15
+
+/* Constants */
+#define R128_AGP_OFFSET			0x02000000
+
+#define R128_WATERMARK_L		16
+#define R128_WATERMARK_M		8
+#define R128_WATERMARK_N		8
+#define R128_WATERMARK_K		128
+
+#define R128_MAX_USEC_TIMEOUT		100000	/* 100 ms */
+
+#define R128_LAST_FRAME_REG		R128_GUI_SCRATCH_REG0
+#define R128_LAST_DISPATCH_REG		R128_GUI_SCRATCH_REG1
+#define R128_MAX_VB_AGE			0x7fffffff
+#define R128_MAX_VB_VERTS		(0xffff)
+
+#define R128_RING_HIGH_MARK		128
+
+#define R128_PERFORMANCE_BOXES		0
+
+
+#define R128_BASE(reg)		((unsigned long)(dev_priv->mmio->handle))
+#define R128_ADDR(reg)		(R128_BASE( reg ) + reg)
+
+#define R128_READ(reg)		DRM_READ32(  (volatile u32 *) R128_ADDR(reg) )
+#define R128_WRITE(reg,val)	DRM_WRITE32( (volatile u32 *) R128_ADDR(reg), (val) )
+
+#define R128_READ8(reg)		DRM_READ8(  (volatile u8 *) R128_ADDR(reg) )
+#define R128_WRITE8(reg,val)	DRM_WRITE8( (volatile u8 *) R128_ADDR(reg), (val) )
+
+#define R128_WRITE_PLL(addr,val)					\
+do {									\
+	R128_WRITE8(R128_CLOCK_CNTL_INDEX,				\
+		    ((addr) & 0x1f) | R128_PLL_WR_EN);			\
+	R128_WRITE(R128_CLOCK_CNTL_DATA, (val));			\
+} while (0)
+
+extern int R128_READ_PLL(drm_device_t *dev, int addr);
+
+
+#define CCE_PACKET0( reg, n )		(R128_CCE_PACKET0 |		\
+					 ((n) << 16) | ((reg) >> 2))
+#define CCE_PACKET1( reg0, reg1 )	(R128_CCE_PACKET1 |		\
+					 (((reg1) >> 2) << 11) | ((reg0) >> 2))
+#define CCE_PACKET2()			(R128_CCE_PACKET2)
+#define CCE_PACKET3( pkt, n )		(R128_CCE_PACKET3 |		\
+					 (pkt) | ((n) << 16))
+
+
+/* ================================================================
+ * Misc helper macros
+ */
+
+#define LOCK_TEST_WITH_RETURN( dev )					\
+do {									\
+	if ( !_DRM_LOCK_IS_HELD( dev->lock.hw_lock->lock ) ||		\
+	     dev->lock.pid != DRM_CURRENTPID ) {			\
+		DRM_ERROR( "%s called without lock held\n", __FUNCTION__ );	\
+		return DRM_ERR(EINVAL);				\
+	}								\
+} while (0)
+
+#define RING_SPACE_TEST_WITH_RETURN( dev_priv )				\
+do {									\
+	drm_r128_ring_buffer_t *ring = &dev_priv->ring; int i;		\
+	if ( ring->space < ring->high_mark ) {				\
+		for ( i = 0 ; i < dev_priv->usec_timeout ; i++ ) {	\
+			r128_update_ring_snapshot( ring );		\
+			if ( ring->space >= ring->high_mark )		\
+				goto __ring_space_done;			\
+			DRM_UDELAY(1);				\
+		}							\
+		DRM_ERROR( "ring space check failed!\n" );		\
+		return DRM_ERR(EBUSY);				\
+	}								\
+ __ring_space_done:							\
+	;								\
+} while (0)
+
+#define VB_AGE_TEST_WITH_RETURN( dev_priv )				\
+do {									\
+	drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv;		\
+	if ( sarea_priv->last_dispatch >= R128_MAX_VB_AGE ) {		\
+		int __ret = r128_do_cce_idle( dev_priv );		\
+		if ( __ret ) return __ret;				\
+		sarea_priv->last_dispatch = 0;				\
+		r128_freelist_reset( dev );				\
+	}								\
+} while (0)
+
+#define R128_WAIT_UNTIL_PAGE_FLIPPED() do {				\
+	OUT_RING( CCE_PACKET0( R128_WAIT_UNTIL, 0 ) );			\
+	OUT_RING( R128_EVENT_CRTC_OFFSET );				\
+} while (0)
+
+
+/* ================================================================
+ * Ring control
+ */
+
+#if defined(__powerpc__)
+#define r128_flush_write_combine()	(void) GET_RING_HEAD( &dev_priv->ring )
+#else
+#define r128_flush_write_combine()	DRM_WRITEMEMORYBARRIER()
+#endif
+
+
+#define R128_VERBOSE	0
+
+#define RING_LOCALS							\
+	int write; unsigned int tail_mask; volatile u32 *ring;
+
+#define BEGIN_RING( n ) do {						\
+	if ( R128_VERBOSE ) {						\
+		DRM_INFO( "BEGIN_RING( %d ) in %s\n",			\
+			   (n), __FUNCTION__ );				\
+	}								\
+	if ( dev_priv->ring.space <= (n) * sizeof(u32) ) {		\
+		r128_wait_ring( dev_priv, (n) * sizeof(u32) );		\
+	}								\
+	dev_priv->ring.space -= (n) * sizeof(u32);			\
+	ring = dev_priv->ring.start;					\
+	write = dev_priv->ring.tail;					\
+	tail_mask = dev_priv->ring.tail_mask;				\
+} while (0)
+
+/* You can set this to zero if you want.  If the card locks up, you'll
+ * need to keep this set.  It works around a bug in early revs of the
+ * Rage 128 chipset, where the CCE would read 32 dwords past the end of
+ * the ring buffer before wrapping around.
+ */
+#define R128_BROKEN_CCE	1
+
+#define ADVANCE_RING() do {						\
+	if ( R128_VERBOSE ) {						\
+		DRM_INFO( "ADVANCE_RING() wr=0x%06x tail=0x%06x\n",	\
+			  write, dev_priv->ring.tail );			\
+	}								\
+	if ( R128_BROKEN_CCE && write < 32 ) {				\
+		memcpy( dev_priv->ring.end,				\
+			dev_priv->ring.start,				\
+			write * sizeof(u32) );				\
+	}								\
+	r128_flush_write_combine();					\
+	dev_priv->ring.tail = write;					\
+	R128_WRITE( R128_PM4_BUFFER_DL_WPTR, write );			\
+} while (0)
+
+#define OUT_RING( x ) do {						\
+	if ( R128_VERBOSE ) {						\
+		DRM_INFO( "   OUT_RING( 0x%08x ) at 0x%x\n",		\
+			   (unsigned int)(x), write );			\
+	}								\
+	ring[write++] = cpu_to_le32( x );				\
+	write &= tail_mask;						\
+} while (0)
+
+#endif /* __R128_DRV_H__ */
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/r128_irq.c linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/r128_irq.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/r128_irq.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/r128_irq.c	2003-07-30 11:18:33.000000000 +0200
@@ -0,0 +1,100 @@
+/* r128_irq.c -- IRQ handling for radeon -*- linux-c -*-
+ *
+ * Copyright (C) The Weather Channel, Inc.  2002.  All Rights Reserved.
+ * 
+ * The Weather Channel (TM) funded Tungsten Graphics to develop the
+ * initial release of the Radeon 8500 driver under the XFree86 license.
+ * This notice must be preserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Keith Whitwell <keith@tungstengraphics.com>
+ *    Eric Anholt <anholt@FreeBSD.org>
+ */
+
+#include "r128.h"
+#include "drmP.h"
+#include "drm.h"
+#include "r128_drm.h"
+#include "r128_drv.h"
+
+void r128_dma_service( DRM_IRQ_ARGS )
+{
+	drm_device_t *dev = (drm_device_t *) arg;
+	drm_r128_private_t *dev_priv = 
+	   (drm_r128_private_t *)dev->dev_private;
+	int status;
+
+	status = R128_READ( R128_GEN_INT_STATUS );
+	
+	/* VBLANK interrupt */
+	if ( status & R128_CRTC_VBLANK_INT ) {
+		R128_WRITE( R128_GEN_INT_STATUS, R128_CRTC_VBLANK_INT_AK );
+		atomic_inc(&dev->vbl_received);
+		DRM_WAKEUP(&dev->vbl_queue);
+		DRM(vbl_send_signals)( dev );
+	}
+}
+
+int DRM(vblank_wait)(drm_device_t *dev, unsigned int *sequence)
+{
+	unsigned int cur_vblank;
+	int ret = 0;
+
+	/* Assume that the user has missed the current sequence number
+	 * by about a day rather than she wants to wait for years
+	 * using vertical blanks... 
+	 */
+	DRM_WAIT_ON( ret, dev->vbl_queue, 3*DRM_HZ, 
+		     ( ( ( cur_vblank = atomic_read(&dev->vbl_received ) )
+			 - *sequence ) <= (1<<23) ) );
+
+	*sequence = cur_vblank;
+
+	return ret;
+}
+
+void r128_driver_irq_preinstall( drm_device_t *dev ) {
+  	drm_r128_private_t *dev_priv = 
+	   (drm_r128_private_t *)dev->dev_private;
+
+	/* Disable *all* interrupts */
+      	R128_WRITE( R128_GEN_INT_CNTL, 0 );
+	/* Clear vblank bit if it's already high */
+   	R128_WRITE( R128_GEN_INT_STATUS, R128_CRTC_VBLANK_INT_AK );
+}
+
+void r128_driver_irq_postinstall( drm_device_t *dev ) {
+  	drm_r128_private_t *dev_priv = 
+	   (drm_r128_private_t *)dev->dev_private;
+
+	/* Turn on VBL interrupt */
+   	R128_WRITE( R128_GEN_INT_CNTL, R128_CRTC_VBLANK_INT_EN );
+}
+
+void r128_driver_irq_uninstall( drm_device_t *dev ) {
+  	drm_r128_private_t *dev_priv = 
+	   (drm_r128_private_t *)dev->dev_private;
+	if ( dev_priv ) {
+		/* Disable *all* interrupts */
+		R128_WRITE( R128_GEN_INT_CNTL, 0 );
+	}
+}
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/r128_state.c linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/r128_state.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/r128_state.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/r128_state.c	2003-07-30 11:18:33.000000000 +0200
@@ -0,0 +1,1599 @@
+/* r128_state.c -- State support for r128 -*- linux-c -*-
+ * Created: Thu Jan 27 02:53:43 2000 by gareth@valinux.com
+ *
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Gareth Hughes <gareth@valinux.com>
+ */
+
+#include "r128.h"
+#include "drmP.h"
+#include "drm.h"
+#include "r128_drm.h"
+#include "r128_drv.h"
+
+
+/* ================================================================
+ * CCE hardware state programming functions
+ */
+
+static void r128_emit_clip_rects( drm_r128_private_t *dev_priv,
+				  drm_clip_rect_t *boxes, int count )
+{
+	u32 aux_sc_cntl = 0x00000000;
+	RING_LOCALS;
+	DRM_DEBUG( "    %s\n", __FUNCTION__ );
+
+	BEGIN_RING( 17 );
+
+	if ( count >= 1 ) {
+		OUT_RING( CCE_PACKET0( R128_AUX1_SC_LEFT, 3 ) );
+		OUT_RING( boxes[0].x1 );
+		OUT_RING( boxes[0].x2 - 1 );
+		OUT_RING( boxes[0].y1 );
+		OUT_RING( boxes[0].y2 - 1 );
+
+		aux_sc_cntl |= (R128_AUX1_SC_EN | R128_AUX1_SC_MODE_OR);
+	}
+	if ( count >= 2 ) {
+		OUT_RING( CCE_PACKET0( R128_AUX2_SC_LEFT, 3 ) );
+		OUT_RING( boxes[1].x1 );
+		OUT_RING( boxes[1].x2 - 1 );
+		OUT_RING( boxes[1].y1 );
+		OUT_RING( boxes[1].y2 - 1 );
+
+		aux_sc_cntl |= (R128_AUX2_SC_EN | R128_AUX2_SC_MODE_OR);
+	}
+	if ( count >= 3 ) {
+		OUT_RING( CCE_PACKET0( R128_AUX3_SC_LEFT, 3 ) );
+		OUT_RING( boxes[2].x1 );
+		OUT_RING( boxes[2].x2 - 1 );
+		OUT_RING( boxes[2].y1 );
+		OUT_RING( boxes[2].y2 - 1 );
+
+		aux_sc_cntl |= (R128_AUX3_SC_EN | R128_AUX3_SC_MODE_OR);
+	}
+
+	OUT_RING( CCE_PACKET0( R128_AUX_SC_CNTL, 0 ) );
+	OUT_RING( aux_sc_cntl );
+
+	ADVANCE_RING();
+}
+
+static __inline__ void r128_emit_core( drm_r128_private_t *dev_priv )
+{
+	drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	drm_r128_context_regs_t *ctx = &sarea_priv->context_state;
+	RING_LOCALS;
+	DRM_DEBUG( "    %s\n", __FUNCTION__ );
+
+	BEGIN_RING( 2 );
+
+	OUT_RING( CCE_PACKET0( R128_SCALE_3D_CNTL, 0 ) );
+	OUT_RING( ctx->scale_3d_cntl );
+
+	ADVANCE_RING();
+}
+
+static __inline__ void r128_emit_context( drm_r128_private_t *dev_priv )
+{
+	drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	drm_r128_context_regs_t *ctx = &sarea_priv->context_state;
+	RING_LOCALS;
+	DRM_DEBUG( "    %s\n", __FUNCTION__ );
+
+	BEGIN_RING( 13 );
+
+	OUT_RING( CCE_PACKET0( R128_DST_PITCH_OFFSET_C, 11 ) );
+	OUT_RING( ctx->dst_pitch_offset_c );
+	OUT_RING( ctx->dp_gui_master_cntl_c );
+	OUT_RING( ctx->sc_top_left_c );
+	OUT_RING( ctx->sc_bottom_right_c );
+	OUT_RING( ctx->z_offset_c );
+	OUT_RING( ctx->z_pitch_c );
+	OUT_RING( ctx->z_sten_cntl_c );
+	OUT_RING( ctx->tex_cntl_c );
+	OUT_RING( ctx->misc_3d_state_cntl_reg );
+	OUT_RING( ctx->texture_clr_cmp_clr_c );
+	OUT_RING( ctx->texture_clr_cmp_msk_c );
+	OUT_RING( ctx->fog_color_c );
+
+	ADVANCE_RING();
+}
+
+static __inline__ void r128_emit_setup( drm_r128_private_t *dev_priv )
+{
+	drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	drm_r128_context_regs_t *ctx = &sarea_priv->context_state;
+	RING_LOCALS;
+	DRM_DEBUG( "    %s\n", __FUNCTION__ );
+
+	BEGIN_RING( 3 );
+
+	OUT_RING( CCE_PACKET1( R128_SETUP_CNTL, R128_PM4_VC_FPU_SETUP ) );
+	OUT_RING( ctx->setup_cntl );
+	OUT_RING( ctx->pm4_vc_fpu_setup );
+
+	ADVANCE_RING();
+}
+
+static __inline__ void r128_emit_masks( drm_r128_private_t *dev_priv )
+{
+	drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	drm_r128_context_regs_t *ctx = &sarea_priv->context_state;
+	RING_LOCALS;
+	DRM_DEBUG( "    %s\n", __FUNCTION__ );
+
+	BEGIN_RING( 5 );
+
+	OUT_RING( CCE_PACKET0( R128_DP_WRITE_MASK, 0 ) );
+	OUT_RING( ctx->dp_write_mask );
+
+	OUT_RING( CCE_PACKET0( R128_STEN_REF_MASK_C, 1 ) );
+	OUT_RING( ctx->sten_ref_mask_c );
+	OUT_RING( ctx->plane_3d_mask_c );
+
+	ADVANCE_RING();
+}
+
+static __inline__ void r128_emit_window( drm_r128_private_t *dev_priv )
+{
+	drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	drm_r128_context_regs_t *ctx = &sarea_priv->context_state;
+	RING_LOCALS;
+	DRM_DEBUG( "    %s\n", __FUNCTION__ );
+
+	BEGIN_RING( 2 );
+
+	OUT_RING( CCE_PACKET0( R128_WINDOW_XY_OFFSET, 0 ) );
+	OUT_RING( ctx->window_xy_offset );
+
+	ADVANCE_RING();
+}
+
+static __inline__ void r128_emit_tex0( drm_r128_private_t *dev_priv )
+{
+	drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	drm_r128_context_regs_t *ctx = &sarea_priv->context_state;
+	drm_r128_texture_regs_t *tex = &sarea_priv->tex_state[0];
+	int i;
+	RING_LOCALS;
+	DRM_DEBUG( "    %s\n", __FUNCTION__ );
+
+	BEGIN_RING( 7 + R128_MAX_TEXTURE_LEVELS );
+
+	OUT_RING( CCE_PACKET0( R128_PRIM_TEX_CNTL_C,
+			       2 + R128_MAX_TEXTURE_LEVELS ) );
+	OUT_RING( tex->tex_cntl );
+	OUT_RING( tex->tex_combine_cntl );
+	OUT_RING( ctx->tex_size_pitch_c );
+	for ( i = 0 ; i < R128_MAX_TEXTURE_LEVELS ; i++ ) {
+		OUT_RING( tex->tex_offset[i] );
+	}
+
+	OUT_RING( CCE_PACKET0( R128_CONSTANT_COLOR_C, 1 ) );
+	OUT_RING( ctx->constant_color_c );
+	OUT_RING( tex->tex_border_color );
+
+	ADVANCE_RING();
+}
+
+static __inline__ void r128_emit_tex1( drm_r128_private_t *dev_priv )
+{
+	drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	drm_r128_texture_regs_t *tex = &sarea_priv->tex_state[1];
+	int i;
+	RING_LOCALS;
+	DRM_DEBUG( "    %s\n", __FUNCTION__ );
+
+	BEGIN_RING( 5 + R128_MAX_TEXTURE_LEVELS );
+
+	OUT_RING( CCE_PACKET0( R128_SEC_TEX_CNTL_C,
+			       1 + R128_MAX_TEXTURE_LEVELS ) );
+	OUT_RING( tex->tex_cntl );
+	OUT_RING( tex->tex_combine_cntl );
+	for ( i = 0 ; i < R128_MAX_TEXTURE_LEVELS ; i++ ) {
+		OUT_RING( tex->tex_offset[i] );
+	}
+
+	OUT_RING( CCE_PACKET0( R128_SEC_TEXTURE_BORDER_COLOR_C, 0 ) );
+	OUT_RING( tex->tex_border_color );
+
+	ADVANCE_RING();
+}
+
+static __inline__ void r128_emit_state( drm_r128_private_t *dev_priv )
+{
+	drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	unsigned int dirty = sarea_priv->dirty;
+
+	DRM_DEBUG( "%s: dirty=0x%08x\n", __FUNCTION__, dirty );
+
+	if ( dirty & R128_UPLOAD_CORE ) {
+		r128_emit_core( dev_priv );
+		sarea_priv->dirty &= ~R128_UPLOAD_CORE;
+	}
+
+	if ( dirty & R128_UPLOAD_CONTEXT ) {
+		r128_emit_context( dev_priv );
+		sarea_priv->dirty &= ~R128_UPLOAD_CONTEXT;
+	}
+
+	if ( dirty & R128_UPLOAD_SETUP ) {
+		r128_emit_setup( dev_priv );
+		sarea_priv->dirty &= ~R128_UPLOAD_SETUP;
+	}
+
+	if ( dirty & R128_UPLOAD_MASKS ) {
+		r128_emit_masks( dev_priv );
+		sarea_priv->dirty &= ~R128_UPLOAD_MASKS;
+	}
+
+	if ( dirty & R128_UPLOAD_WINDOW ) {
+		r128_emit_window( dev_priv );
+		sarea_priv->dirty &= ~R128_UPLOAD_WINDOW;
+	}
+
+	if ( dirty & R128_UPLOAD_TEX0 ) {
+		r128_emit_tex0( dev_priv );
+		sarea_priv->dirty &= ~R128_UPLOAD_TEX0;
+	}
+
+	if ( dirty & R128_UPLOAD_TEX1 ) {
+		r128_emit_tex1( dev_priv );
+		sarea_priv->dirty &= ~R128_UPLOAD_TEX1;
+	}
+
+	/* Turn off the texture cache flushing */
+	sarea_priv->context_state.tex_cntl_c &= ~R128_TEX_CACHE_FLUSH;
+
+	sarea_priv->dirty &= ~R128_REQUIRE_QUIESCENCE;
+}
+
+
+#if R128_PERFORMANCE_BOXES
+/* ================================================================
+ * Performance monitoring functions
+ */
+
+static void r128_clear_box( drm_r128_private_t *dev_priv,
+			    int x, int y, int w, int h,
+			    int r, int g, int b )
+{
+	u32 pitch, offset;
+	u32 fb_bpp, color;
+	RING_LOCALS;
+
+	switch ( dev_priv->fb_bpp ) {
+	case 16:
+		fb_bpp = R128_GMC_DST_16BPP;
+		color = (((r & 0xf8) << 8) |
+			 ((g & 0xfc) << 3) |
+			 ((b & 0xf8) >> 3));
+		break;
+	case 24:
+		fb_bpp = R128_GMC_DST_24BPP;
+		color = ((r << 16) | (g << 8) | b);
+		break;
+	case 32:
+		fb_bpp = R128_GMC_DST_32BPP;
+		color = (((0xff) << 24) | (r << 16) | (g <<  8) | b);
+		break;
+	default:
+		return;
+	}
+
+	offset = dev_priv->back_offset;
+	pitch = dev_priv->back_pitch >> 3;
+
+	BEGIN_RING( 6 );
+
+	OUT_RING( CCE_PACKET3( R128_CNTL_PAINT_MULTI, 4 ) );
+	OUT_RING( R128_GMC_DST_PITCH_OFFSET_CNTL |
+		  R128_GMC_BRUSH_SOLID_COLOR |
+		  fb_bpp |
+		  R128_GMC_SRC_DATATYPE_COLOR |
+		  R128_ROP3_P |
+		  R128_GMC_CLR_CMP_CNTL_DIS |
+		  R128_GMC_AUX_CLIP_DIS );
+
+	OUT_RING( (pitch << 21) | (offset >> 5) );
+	OUT_RING( color );
+
+	OUT_RING( (x << 16) | y );
+	OUT_RING( (w << 16) | h );
+
+	ADVANCE_RING();
+}
+
+static void r128_cce_performance_boxes( drm_r128_private_t *dev_priv )
+{
+	if ( atomic_read( &dev_priv->idle_count ) == 0 ) {
+		r128_clear_box( dev_priv, 64, 4, 8, 8, 0, 255, 0 );
+	} else {
+		atomic_set( &dev_priv->idle_count, 0 );
+	}
+}
+
+#endif
+
+
+/* ================================================================
+ * CCE command dispatch functions
+ */
+
+static void r128_print_dirty( const char *msg, unsigned int flags )
+{
+	DRM_INFO( "%s: (0x%x) %s%s%s%s%s%s%s%s%s\n",
+		  msg,
+		  flags,
+		  (flags & R128_UPLOAD_CORE)        ? "core, " : "",
+		  (flags & R128_UPLOAD_CONTEXT)     ? "context, " : "",
+		  (flags & R128_UPLOAD_SETUP)       ? "setup, " : "",
+		  (flags & R128_UPLOAD_TEX0)        ? "tex0, " : "",
+		  (flags & R128_UPLOAD_TEX1)        ? "tex1, " : "",
+		  (flags & R128_UPLOAD_MASKS)       ? "masks, " : "",
+		  (flags & R128_UPLOAD_WINDOW)      ? "window, " : "",
+		  (flags & R128_UPLOAD_CLIPRECTS)   ? "cliprects, " : "",
+		  (flags & R128_REQUIRE_QUIESCENCE) ? "quiescence, " : "" );
+}
+
+static void r128_cce_dispatch_clear( drm_device_t *dev,
+				     drm_r128_clear_t *clear )
+{
+	drm_r128_private_t *dev_priv = dev->dev_private;
+	drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	int nbox = sarea_priv->nbox;
+	drm_clip_rect_t *pbox = sarea_priv->boxes;
+	unsigned int flags = clear->flags;
+	int i;
+	RING_LOCALS;
+	DRM_DEBUG( "%s\n", __FUNCTION__ );
+
+	if ( dev_priv->page_flipping && dev_priv->current_page == 1 ) {
+		unsigned int tmp = flags;
+
+		flags &= ~(R128_FRONT | R128_BACK);
+		if ( tmp & R128_FRONT ) flags |= R128_BACK;
+		if ( tmp & R128_BACK )  flags |= R128_FRONT;
+	}
+
+	for ( i = 0 ; i < nbox ; i++ ) {
+		int x = pbox[i].x1;
+		int y = pbox[i].y1;
+		int w = pbox[i].x2 - x;
+		int h = pbox[i].y2 - y;
+
+		DRM_DEBUG( "dispatch clear %d,%d-%d,%d flags 0x%x\n",
+			   pbox[i].x1, pbox[i].y1, pbox[i].x2,
+			   pbox[i].y2, flags );
+
+		if ( flags & (R128_FRONT | R128_BACK) ) {
+			BEGIN_RING( 2 );
+
+			OUT_RING( CCE_PACKET0( R128_DP_WRITE_MASK, 0 ) );
+			OUT_RING( clear->color_mask );
+
+			ADVANCE_RING();
+		}
+
+		if ( flags & R128_FRONT ) {
+			BEGIN_RING( 6 );
+
+			OUT_RING( CCE_PACKET3( R128_CNTL_PAINT_MULTI, 4 ) );
+			OUT_RING( R128_GMC_DST_PITCH_OFFSET_CNTL |
+				  R128_GMC_BRUSH_SOLID_COLOR |
+				  (dev_priv->color_fmt << 8) |
+				  R128_GMC_SRC_DATATYPE_COLOR |
+				  R128_ROP3_P |
+				  R128_GMC_CLR_CMP_CNTL_DIS |
+				  R128_GMC_AUX_CLIP_DIS );
+
+			OUT_RING( dev_priv->front_pitch_offset_c );
+			OUT_RING( clear->clear_color );
+
+			OUT_RING( (x << 16) | y );
+			OUT_RING( (w << 16) | h );
+
+			ADVANCE_RING();
+		}
+
+		if ( flags & R128_BACK ) {
+			BEGIN_RING( 6 );
+
+			OUT_RING( CCE_PACKET3( R128_CNTL_PAINT_MULTI, 4 ) );
+			OUT_RING( R128_GMC_DST_PITCH_OFFSET_CNTL |
+				  R128_GMC_BRUSH_SOLID_COLOR |
+				  (dev_priv->color_fmt << 8) |
+				  R128_GMC_SRC_DATATYPE_COLOR |
+				  R128_ROP3_P |
+				  R128_GMC_CLR_CMP_CNTL_DIS |
+				  R128_GMC_AUX_CLIP_DIS );
+
+			OUT_RING( dev_priv->back_pitch_offset_c );
+			OUT_RING( clear->clear_color );
+
+			OUT_RING( (x << 16) | y );
+			OUT_RING( (w << 16) | h );
+
+			ADVANCE_RING();
+		}
+
+		if ( flags & R128_DEPTH ) {
+			BEGIN_RING( 6 );
+
+			OUT_RING( CCE_PACKET3( R128_CNTL_PAINT_MULTI, 4 ) );
+			OUT_RING( R128_GMC_DST_PITCH_OFFSET_CNTL |
+				  R128_GMC_BRUSH_SOLID_COLOR |
+				  (dev_priv->depth_fmt << 8) |
+				  R128_GMC_SRC_DATATYPE_COLOR |
+				  R128_ROP3_P |
+				  R128_GMC_CLR_CMP_CNTL_DIS |
+				  R128_GMC_AUX_CLIP_DIS |
+				  R128_GMC_WR_MSK_DIS );
+
+			OUT_RING( dev_priv->depth_pitch_offset_c );
+			OUT_RING( clear->clear_depth );
+
+			OUT_RING( (x << 16) | y );
+			OUT_RING( (w << 16) | h );
+
+			ADVANCE_RING();
+		}
+	}
+}
+
+static void r128_cce_dispatch_swap( drm_device_t *dev )
+{
+	drm_r128_private_t *dev_priv = dev->dev_private;
+	drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	int nbox = sarea_priv->nbox;
+	drm_clip_rect_t *pbox = sarea_priv->boxes;
+	int i;
+	RING_LOCALS;
+	DRM_DEBUG( "%s\n", __FUNCTION__ );
+
+#if R128_PERFORMANCE_BOXES
+	/* Do some trivial performance monitoring...
+	 */
+	r128_cce_performance_boxes( dev_priv );
+#endif
+
+	for ( i = 0 ; i < nbox ; i++ ) {
+		int x = pbox[i].x1;
+		int y = pbox[i].y1;
+		int w = pbox[i].x2 - x;
+		int h = pbox[i].y2 - y;
+
+		BEGIN_RING( 7 );
+
+		OUT_RING( CCE_PACKET3( R128_CNTL_BITBLT_MULTI, 5 ) );
+		OUT_RING( R128_GMC_SRC_PITCH_OFFSET_CNTL |
+			  R128_GMC_DST_PITCH_OFFSET_CNTL |
+			  R128_GMC_BRUSH_NONE |
+			  (dev_priv->color_fmt << 8) |
+			  R128_GMC_SRC_DATATYPE_COLOR |
+			  R128_ROP3_S |
+			  R128_DP_SRC_SOURCE_MEMORY |
+			  R128_GMC_CLR_CMP_CNTL_DIS |
+			  R128_GMC_AUX_CLIP_DIS |
+			  R128_GMC_WR_MSK_DIS );
+
+		OUT_RING( dev_priv->back_pitch_offset_c );
+		OUT_RING( dev_priv->front_pitch_offset_c );
+
+		OUT_RING( (x << 16) | y );
+		OUT_RING( (x << 16) | y );
+		OUT_RING( (w << 16) | h );
+
+		ADVANCE_RING();
+	}
+
+	/* Increment the frame counter.  The client-side 3D driver must
+	 * throttle the framerate by waiting for this value before
+	 * performing the swapbuffer ioctl.
+	 */
+	dev_priv->sarea_priv->last_frame++;
+
+	BEGIN_RING( 2 );
+
+	OUT_RING( CCE_PACKET0( R128_LAST_FRAME_REG, 0 ) );
+	OUT_RING( dev_priv->sarea_priv->last_frame );
+
+	ADVANCE_RING();
+}
+
+static void r128_cce_dispatch_flip( drm_device_t *dev )
+{
+	drm_r128_private_t *dev_priv = dev->dev_private;
+	RING_LOCALS;
+	DRM_DEBUG( "page=%d\n", dev_priv->current_page );
+
+#if R128_PERFORMANCE_BOXES
+	/* Do some trivial performance monitoring...
+	 */
+	r128_cce_performance_boxes( dev_priv );
+#endif
+
+	BEGIN_RING( 4 );
+
+	R128_WAIT_UNTIL_PAGE_FLIPPED();
+	OUT_RING( CCE_PACKET0( R128_CRTC_OFFSET, 0 ) );
+
+	if ( dev_priv->current_page == 0 ) {
+		OUT_RING( dev_priv->back_offset );
+		dev_priv->current_page = 1;
+	} else {
+		OUT_RING( dev_priv->front_offset );
+		dev_priv->current_page = 0;
+	}
+
+	ADVANCE_RING();
+
+	/* Increment the frame counter.  The client-side 3D driver must
+	 * throttle the framerate by waiting for this value before
+	 * performing the swapbuffer ioctl.
+	 */
+	dev_priv->sarea_priv->last_frame++;
+
+	BEGIN_RING( 2 );
+
+	OUT_RING( CCE_PACKET0( R128_LAST_FRAME_REG, 0 ) );
+	OUT_RING( dev_priv->sarea_priv->last_frame );
+
+	ADVANCE_RING();
+}
+
+static void r128_cce_dispatch_vertex( drm_device_t *dev,
+				      drm_buf_t *buf )
+{
+	drm_r128_private_t *dev_priv = dev->dev_private;
+	drm_r128_buf_priv_t *buf_priv = buf->dev_private;
+	drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	int format = sarea_priv->vc_format;
+	int offset = buf->bus_address;
+	int size = buf->used;
+	int prim = buf_priv->prim;
+	int i = 0;
+	RING_LOCALS;
+	DRM_DEBUG( "buf=%d nbox=%d\n", buf->idx, sarea_priv->nbox );
+
+	if ( 0 )
+		r128_print_dirty( "dispatch_vertex", sarea_priv->dirty );
+
+	if ( buf->used ) {
+		buf_priv->dispatched = 1;
+
+		if ( sarea_priv->dirty & ~R128_UPLOAD_CLIPRECTS ) {
+			r128_emit_state( dev_priv );
+		}
+
+		do {
+			/* Emit the next set of up to three cliprects */
+			if ( i < sarea_priv->nbox ) {
+				r128_emit_clip_rects( dev_priv,
+						      &sarea_priv->boxes[i],
+						      sarea_priv->nbox - i );
+			}
+
+			/* Emit the vertex buffer rendering commands */
+			BEGIN_RING( 5 );
+
+			OUT_RING( CCE_PACKET3( R128_3D_RNDR_GEN_INDX_PRIM, 3 ) );
+			OUT_RING( offset );
+			OUT_RING( size );
+			OUT_RING( format );
+			OUT_RING( prim | R128_CCE_VC_CNTL_PRIM_WALK_LIST |
+				  (size << R128_CCE_VC_CNTL_NUM_SHIFT) );
+
+			ADVANCE_RING();
+
+			i += 3;
+		} while ( i < sarea_priv->nbox );
+	}
+
+	if ( buf_priv->discard ) {
+		buf_priv->age = dev_priv->sarea_priv->last_dispatch;
+
+		/* Emit the vertex buffer age */
+		BEGIN_RING( 2 );
+
+		OUT_RING( CCE_PACKET0( R128_LAST_DISPATCH_REG, 0 ) );
+		OUT_RING( buf_priv->age );
+
+		ADVANCE_RING();
+
+		buf->pending = 1;
+		buf->used = 0;
+		/* FIXME: Check dispatched field */
+		buf_priv->dispatched = 0;
+	}
+
+	dev_priv->sarea_priv->last_dispatch++;
+
+	sarea_priv->dirty &= ~R128_UPLOAD_CLIPRECTS;
+	sarea_priv->nbox = 0;
+}
+
+static void r128_cce_dispatch_indirect( drm_device_t *dev,
+					drm_buf_t *buf,
+					int start, int end )
+{
+	drm_r128_private_t *dev_priv = dev->dev_private;
+	drm_r128_buf_priv_t *buf_priv = buf->dev_private;
+	RING_LOCALS;
+	DRM_DEBUG( "indirect: buf=%d s=0x%x e=0x%x\n",
+		   buf->idx, start, end );
+
+	if ( start != end ) {
+		int offset = buf->bus_address + start;
+		int dwords = (end - start + 3) / sizeof(u32);
+
+		/* Indirect buffer data must be an even number of
+		 * dwords, so if we've been given an odd number we must
+		 * pad the data with a Type-2 CCE packet.
+		 */
+		if ( dwords & 1 ) {
+			u32 *data = (u32 *)
+				((char *)dev_priv->buffers->handle
+				 + buf->offset + start);
+			data[dwords++] = cpu_to_le32( R128_CCE_PACKET2 );
+		}
+
+		buf_priv->dispatched = 1;
+
+		/* Fire off the indirect buffer */
+		BEGIN_RING( 3 );
+
+		OUT_RING( CCE_PACKET0( R128_PM4_IW_INDOFF, 1 ) );
+		OUT_RING( offset );
+		OUT_RING( dwords );
+
+		ADVANCE_RING();
+	}
+
+	if ( buf_priv->discard ) {
+		buf_priv->age = dev_priv->sarea_priv->last_dispatch;
+
+		/* Emit the indirect buffer age */
+		BEGIN_RING( 2 );
+
+		OUT_RING( CCE_PACKET0( R128_LAST_DISPATCH_REG, 0 ) );
+		OUT_RING( buf_priv->age );
+
+		ADVANCE_RING();
+
+		buf->pending = 1;
+		buf->used = 0;
+		/* FIXME: Check dispatched field */
+		buf_priv->dispatched = 0;
+	}
+
+	dev_priv->sarea_priv->last_dispatch++;
+}
+
+static void r128_cce_dispatch_indices( drm_device_t *dev,
+				       drm_buf_t *buf,
+				       int start, int end,
+				       int count )
+{
+	drm_r128_private_t *dev_priv = dev->dev_private;
+	drm_r128_buf_priv_t *buf_priv = buf->dev_private;
+	drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	int format = sarea_priv->vc_format;
+	int offset = dev_priv->buffers->offset - dev_priv->cce_buffers_offset;
+	int prim = buf_priv->prim;
+	u32 *data;
+	int dwords;
+	int i = 0;
+	RING_LOCALS;
+	DRM_DEBUG( "indices: s=%d e=%d c=%d\n", start, end, count );
+
+	if ( 0 )
+		r128_print_dirty( "dispatch_indices", sarea_priv->dirty );
+
+	if ( start != end ) {
+		buf_priv->dispatched = 1;
+
+		if ( sarea_priv->dirty & ~R128_UPLOAD_CLIPRECTS ) {
+			r128_emit_state( dev_priv );
+		}
+
+		dwords = (end - start + 3) / sizeof(u32);
+
+		data = (u32 *)((char *)dev_priv->buffers->handle
+			       + buf->offset + start);
+
+		data[0] = cpu_to_le32( CCE_PACKET3( R128_3D_RNDR_GEN_INDX_PRIM,
+						    dwords-2 ) );
+
+		data[1] = cpu_to_le32( offset );
+		data[2] = cpu_to_le32( R128_MAX_VB_VERTS );
+		data[3] = cpu_to_le32( format );
+		data[4] = cpu_to_le32( (prim | R128_CCE_VC_CNTL_PRIM_WALK_IND |
+					(count << 16)) );
+
+		if ( count & 0x1 ) {
+#ifdef __LITTLE_ENDIAN
+			data[dwords-1] &= 0x0000ffff;
+#else
+			data[dwords-1] &= 0xffff0000;
+#endif
+		}
+
+		do {
+			/* Emit the next set of up to three cliprects */
+			if ( i < sarea_priv->nbox ) {
+				r128_emit_clip_rects( dev_priv,
+						      &sarea_priv->boxes[i],
+						      sarea_priv->nbox - i );
+			}
+
+			r128_cce_dispatch_indirect( dev, buf, start, end );
+
+			i += 3;
+		} while ( i < sarea_priv->nbox );
+	}
+
+	if ( buf_priv->discard ) {
+		buf_priv->age = dev_priv->sarea_priv->last_dispatch;
+
+		/* Emit the vertex buffer age */
+		BEGIN_RING( 2 );
+
+		OUT_RING( CCE_PACKET0( R128_LAST_DISPATCH_REG, 0 ) );
+		OUT_RING( buf_priv->age );
+
+		ADVANCE_RING();
+
+		buf->pending = 1;
+		/* FIXME: Check dispatched field */
+		buf_priv->dispatched = 0;
+	}
+
+	dev_priv->sarea_priv->last_dispatch++;
+
+	sarea_priv->dirty &= ~R128_UPLOAD_CLIPRECTS;
+	sarea_priv->nbox = 0;
+}
+
+static int r128_cce_dispatch_blit( drm_device_t *dev,
+				   drm_r128_blit_t *blit )
+{
+	drm_r128_private_t *dev_priv = dev->dev_private;
+	drm_device_dma_t *dma = dev->dma;
+	drm_buf_t *buf;
+	drm_r128_buf_priv_t *buf_priv;
+	u32 *data;
+	int dword_shift, dwords;
+	RING_LOCALS;
+	DRM_DEBUG( "\n" );
+
+	/* The compiler won't optimize away a division by a variable,
+	 * even if the only legal values are powers of two.  Thus, we'll
+	 * use a shift instead.
+	 */
+	switch ( blit->format ) {
+	case R128_DATATYPE_ARGB8888:
+		dword_shift = 0;
+		break;
+	case R128_DATATYPE_ARGB1555:
+	case R128_DATATYPE_RGB565:
+	case R128_DATATYPE_ARGB4444:
+		dword_shift = 1;
+		break;
+	case R128_DATATYPE_CI8:
+	case R128_DATATYPE_RGB8:
+		dword_shift = 2;
+		break;
+	default:
+		DRM_ERROR( "invalid blit format %d\n", blit->format );
+		return DRM_ERR(EINVAL);
+	}
+
+	/* Flush the pixel cache, and mark the contents as Read Invalid.
+	 * This ensures no pixel data gets mixed up with the texture
+	 * data from the host data blit, otherwise part of the texture
+	 * image may be corrupted.
+	 */
+	BEGIN_RING( 2 );
+
+	OUT_RING( CCE_PACKET0( R128_PC_GUI_CTLSTAT, 0 ) );
+	OUT_RING( R128_PC_RI_GUI | R128_PC_FLUSH_GUI );
+
+	ADVANCE_RING();
+
+	/* Dispatch the indirect buffer.
+	 */
+	buf = dma->buflist[blit->idx];
+	buf_priv = buf->dev_private;
+
+	if ( buf->pid != DRM_CURRENTPID ) {
+		DRM_ERROR( "process %d using buffer owned by %d\n",
+			   DRM_CURRENTPID, buf->pid );
+		return DRM_ERR(EINVAL);
+	}
+	if ( buf->pending ) {
+		DRM_ERROR( "sending pending buffer %d\n", blit->idx );
+		return DRM_ERR(EINVAL);
+	}
+
+	buf_priv->discard = 1;
+
+	dwords = (blit->width * blit->height) >> dword_shift;
+
+	data = (u32 *)((char *)dev_priv->buffers->handle + buf->offset);
+
+	data[0] = cpu_to_le32( CCE_PACKET3( R128_CNTL_HOSTDATA_BLT, dwords + 6 ) );
+	data[1] = cpu_to_le32( (R128_GMC_DST_PITCH_OFFSET_CNTL |
+				R128_GMC_BRUSH_NONE |
+				(blit->format << 8) |
+				R128_GMC_SRC_DATATYPE_COLOR |
+				R128_ROP3_S |
+				R128_DP_SRC_SOURCE_HOST_DATA |
+				R128_GMC_CLR_CMP_CNTL_DIS |
+				R128_GMC_AUX_CLIP_DIS |
+				R128_GMC_WR_MSK_DIS) );
+
+	data[2] = cpu_to_le32( (blit->pitch << 21) | (blit->offset >> 5) );
+	data[3] = cpu_to_le32( 0xffffffff );
+	data[4] = cpu_to_le32( 0xffffffff );
+	data[5] = cpu_to_le32( (blit->y << 16) | blit->x );
+	data[6] = cpu_to_le32( (blit->height << 16) | blit->width );
+	data[7] = cpu_to_le32( dwords );
+
+	buf->used = (dwords + 8) * sizeof(u32);
+
+	r128_cce_dispatch_indirect( dev, buf, 0, buf->used );
+
+	/* Flush the pixel cache after the blit completes.  This ensures
+	 * the texture data is written out to memory before rendering
+	 * continues.
+	 */
+	BEGIN_RING( 2 );
+
+	OUT_RING( CCE_PACKET0( R128_PC_GUI_CTLSTAT, 0 ) );
+	OUT_RING( R128_PC_FLUSH_GUI );
+
+	ADVANCE_RING();
+
+	return 0;
+}
+
+
+/* ================================================================
+ * Tiled depth buffer management
+ *
+ * FIXME: These should all set the destination write mask for when we
+ * have hardware stencil support.
+ */
+
+static int r128_cce_dispatch_write_span( drm_device_t *dev,
+					 drm_r128_depth_t *depth )
+{
+	drm_r128_private_t *dev_priv = dev->dev_private;
+	int count, x, y;
+	u32 *buffer;
+	u8 *mask;
+	int i;
+	RING_LOCALS;
+	DRM_DEBUG( "\n" );
+
+	count = depth->n;
+	if ( DRM_COPY_FROM_USER( &x, depth->x, sizeof(x) ) ) {
+		return DRM_ERR(EFAULT);
+	}
+	if ( DRM_COPY_FROM_USER( &y, depth->y, sizeof(y) ) ) {
+		return DRM_ERR(EFAULT);
+	}
+
+	buffer = DRM_MALLOC( depth->n * sizeof(u32) );
+	if ( buffer == NULL )
+		return DRM_ERR(ENOMEM);
+	if ( DRM_COPY_FROM_USER( buffer, depth->buffer,
+			     depth->n * sizeof(u32) ) ) {
+		DRM_FREE( buffer );
+		return DRM_ERR(EFAULT);
+	}
+
+	if ( depth->mask ) {
+		mask = DRM_MALLOC( depth->n * sizeof(u8) );
+		if ( mask == NULL ) {
+			DRM_FREE( buffer );
+			return DRM_ERR(ENOMEM);
+		}
+		if ( DRM_COPY_FROM_USER( mask, depth->mask,
+				     depth->n * sizeof(u8) ) ) {
+			DRM_FREE( buffer );
+			DRM_FREE( mask );
+			return DRM_ERR(EFAULT);
+		}
+
+		for ( i = 0 ; i < count ; i++, x++ ) {
+			if ( mask[i] ) {
+				BEGIN_RING( 6 );
+
+				OUT_RING( CCE_PACKET3( R128_CNTL_PAINT_MULTI, 4 ) );
+				OUT_RING( R128_GMC_DST_PITCH_OFFSET_CNTL |
+					  R128_GMC_BRUSH_SOLID_COLOR |
+					  (dev_priv->depth_fmt << 8) |
+					  R128_GMC_SRC_DATATYPE_COLOR |
+					  R128_ROP3_P |
+					  R128_GMC_CLR_CMP_CNTL_DIS |
+					  R128_GMC_WR_MSK_DIS );
+
+				OUT_RING( dev_priv->depth_pitch_offset_c );
+				OUT_RING( buffer[i] );
+
+				OUT_RING( (x << 16) | y );
+				OUT_RING( (1 << 16) | 1 );
+
+				ADVANCE_RING();
+			}
+		}
+
+		DRM_FREE( mask );
+	} else {
+		for ( i = 0 ; i < count ; i++, x++ ) {
+			BEGIN_RING( 6 );
+
+			OUT_RING( CCE_PACKET3( R128_CNTL_PAINT_MULTI, 4 ) );
+			OUT_RING( R128_GMC_DST_PITCH_OFFSET_CNTL |
+				  R128_GMC_BRUSH_SOLID_COLOR |
+				  (dev_priv->depth_fmt << 8) |
+				  R128_GMC_SRC_DATATYPE_COLOR |
+				  R128_ROP3_P |
+				  R128_GMC_CLR_CMP_CNTL_DIS |
+				  R128_GMC_WR_MSK_DIS );
+
+			OUT_RING( dev_priv->depth_pitch_offset_c );
+			OUT_RING( buffer[i] );
+
+			OUT_RING( (x << 16) | y );
+			OUT_RING( (1 << 16) | 1 );
+
+			ADVANCE_RING();
+		}
+	}
+
+	DRM_FREE( buffer );
+
+	return 0;
+}
+
+static int r128_cce_dispatch_write_pixels( drm_device_t *dev,
+					   drm_r128_depth_t *depth )
+{
+	drm_r128_private_t *dev_priv = dev->dev_private;
+	int count, *x, *y;
+	u32 *buffer;
+	u8 *mask;
+	int i;
+	RING_LOCALS;
+	DRM_DEBUG( "\n" );
+
+	count = depth->n;
+
+	x = DRM_MALLOC( count * sizeof(*x) );
+	if ( x == NULL ) {
+		return DRM_ERR(ENOMEM);
+	}
+	y = DRM_MALLOC( count * sizeof(*y) );
+	if ( y == NULL ) {
+		DRM_FREE( x );
+		return DRM_ERR(ENOMEM);
+	}
+	if ( DRM_COPY_FROM_USER( x, depth->x, count * sizeof(int) ) ) {
+		DRM_FREE( x );
+		DRM_FREE( y );
+		return DRM_ERR(EFAULT);
+	}
+	if ( DRM_COPY_FROM_USER( y, depth->y, count * sizeof(int) ) ) {
+		DRM_FREE( x );
+		DRM_FREE( y );
+		return DRM_ERR(EFAULT);
+	}
+
+	buffer = DRM_MALLOC( depth->n * sizeof(u32) );
+	if ( buffer == NULL ) {
+		DRM_FREE( x );
+		DRM_FREE( y );
+		return DRM_ERR(ENOMEM);
+	}
+	if ( DRM_COPY_FROM_USER( buffer, depth->buffer,
+			     depth->n * sizeof(u32) ) ) {
+		DRM_FREE( x );
+		DRM_FREE( y );
+		DRM_FREE( buffer );
+		return DRM_ERR(EFAULT);
+	}
+
+	if ( depth->mask ) {
+		mask = DRM_MALLOC( depth->n * sizeof(u8) );
+		if ( mask == NULL ) {
+			DRM_FREE( x );
+			DRM_FREE( y );
+			DRM_FREE( buffer );
+			return DRM_ERR(ENOMEM);
+		}
+		if ( DRM_COPY_FROM_USER( mask, depth->mask,
+				     depth->n * sizeof(u8) ) ) {
+			DRM_FREE( x );
+			DRM_FREE( y );
+			DRM_FREE( buffer );
+			DRM_FREE( mask );
+			return DRM_ERR(EFAULT);
+		}
+
+		for ( i = 0 ; i < count ; i++ ) {
+			if ( mask[i] ) {
+				BEGIN_RING( 6 );
+
+				OUT_RING( CCE_PACKET3( R128_CNTL_PAINT_MULTI, 4 ) );
+				OUT_RING( R128_GMC_DST_PITCH_OFFSET_CNTL |
+					  R128_GMC_BRUSH_SOLID_COLOR |
+					  (dev_priv->depth_fmt << 8) |
+					  R128_GMC_SRC_DATATYPE_COLOR |
+					  R128_ROP3_P |
+					  R128_GMC_CLR_CMP_CNTL_DIS |
+					  R128_GMC_WR_MSK_DIS );
+
+				OUT_RING( dev_priv->depth_pitch_offset_c );
+				OUT_RING( buffer[i] );
+
+				OUT_RING( (x[i] << 16) | y[i] );
+				OUT_RING( (1 << 16) | 1 );
+
+				ADVANCE_RING();
+			}
+		}
+
+		DRM_FREE( mask );
+	} else {
+		for ( i = 0 ; i < count ; i++ ) {
+			BEGIN_RING( 6 );
+
+			OUT_RING( CCE_PACKET3( R128_CNTL_PAINT_MULTI, 4 ) );
+			OUT_RING( R128_GMC_DST_PITCH_OFFSET_CNTL |
+				  R128_GMC_BRUSH_SOLID_COLOR |
+				  (dev_priv->depth_fmt << 8) |
+				  R128_GMC_SRC_DATATYPE_COLOR |
+				  R128_ROP3_P |
+				  R128_GMC_CLR_CMP_CNTL_DIS |
+				  R128_GMC_WR_MSK_DIS );
+
+			OUT_RING( dev_priv->depth_pitch_offset_c );
+			OUT_RING( buffer[i] );
+
+			OUT_RING( (x[i] << 16) | y[i] );
+			OUT_RING( (1 << 16) | 1 );
+
+			ADVANCE_RING();
+		}
+	}
+
+	DRM_FREE( x );
+	DRM_FREE( y );
+	DRM_FREE( buffer );
+
+	return 0;
+}
+
+static int r128_cce_dispatch_read_span( drm_device_t *dev,
+					drm_r128_depth_t *depth )
+{
+	drm_r128_private_t *dev_priv = dev->dev_private;
+	int count, x, y;
+	RING_LOCALS;
+	DRM_DEBUG( "\n" );
+
+	count = depth->n;
+	if ( DRM_COPY_FROM_USER( &x, depth->x, sizeof(x) ) ) {
+		return DRM_ERR(EFAULT);
+	}
+	if ( DRM_COPY_FROM_USER( &y, depth->y, sizeof(y) ) ) {
+		return DRM_ERR(EFAULT);
+	}
+
+	BEGIN_RING( 7 );
+
+	OUT_RING( CCE_PACKET3( R128_CNTL_BITBLT_MULTI, 5 ) );
+	OUT_RING( R128_GMC_SRC_PITCH_OFFSET_CNTL |
+		  R128_GMC_DST_PITCH_OFFSET_CNTL |
+		  R128_GMC_BRUSH_NONE |
+		  (dev_priv->depth_fmt << 8) |
+		  R128_GMC_SRC_DATATYPE_COLOR |
+		  R128_ROP3_S |
+		  R128_DP_SRC_SOURCE_MEMORY |
+		  R128_GMC_CLR_CMP_CNTL_DIS |
+		  R128_GMC_WR_MSK_DIS );
+
+	OUT_RING( dev_priv->depth_pitch_offset_c );
+	OUT_RING( dev_priv->span_pitch_offset_c );
+
+	OUT_RING( (x << 16) | y );
+	OUT_RING( (0 << 16) | 0 );
+	OUT_RING( (count << 16) | 1 );
+
+	ADVANCE_RING();
+
+	return 0;
+}
+
+static int r128_cce_dispatch_read_pixels( drm_device_t *dev,
+					  drm_r128_depth_t *depth )
+{
+	drm_r128_private_t *dev_priv = dev->dev_private;
+	int count, *x, *y;
+	int i;
+	RING_LOCALS;
+	DRM_DEBUG( "%s\n", __FUNCTION__ );
+
+	count = depth->n;
+	if ( count > dev_priv->depth_pitch ) {
+		count = dev_priv->depth_pitch;
+	}
+
+	x = DRM_MALLOC( count * sizeof(*x) );
+	if ( x == NULL ) {
+		return DRM_ERR(ENOMEM);
+	}
+	y = DRM_MALLOC( count * sizeof(*y) );
+	if ( y == NULL ) {
+		DRM_FREE( x );
+		return DRM_ERR(ENOMEM);
+	}
+	if ( DRM_COPY_FROM_USER( x, depth->x, count * sizeof(int) ) ) {
+		DRM_FREE( x );
+		DRM_FREE( y );
+		return DRM_ERR(EFAULT);
+	}
+	if ( DRM_COPY_FROM_USER( y, depth->y, count * sizeof(int) ) ) {
+		DRM_FREE( x );
+		DRM_FREE( y );
+		return DRM_ERR(EFAULT);
+	}
+
+	for ( i = 0 ; i < count ; i++ ) {
+		BEGIN_RING( 7 );
+
+		OUT_RING( CCE_PACKET3( R128_CNTL_BITBLT_MULTI, 5 ) );
+		OUT_RING( R128_GMC_SRC_PITCH_OFFSET_CNTL |
+			  R128_GMC_DST_PITCH_OFFSET_CNTL |
+			  R128_GMC_BRUSH_NONE |
+			  (dev_priv->depth_fmt << 8) |
+			  R128_GMC_SRC_DATATYPE_COLOR |
+			  R128_ROP3_S |
+			  R128_DP_SRC_SOURCE_MEMORY |
+			  R128_GMC_CLR_CMP_CNTL_DIS |
+			  R128_GMC_WR_MSK_DIS );
+
+		OUT_RING( dev_priv->depth_pitch_offset_c );
+		OUT_RING( dev_priv->span_pitch_offset_c );
+
+		OUT_RING( (x[i] << 16) | y[i] );
+		OUT_RING( (i << 16) | 0 );
+		OUT_RING( (1 << 16) | 1 );
+
+		ADVANCE_RING();
+	}
+
+	DRM_FREE( x );
+	DRM_FREE( y );
+
+	return 0;
+}
+
+
+/* ================================================================
+ * Polygon stipple
+ */
+
+static void r128_cce_dispatch_stipple( drm_device_t *dev, u32 *stipple )
+{
+	drm_r128_private_t *dev_priv = dev->dev_private;
+	int i;
+	RING_LOCALS;
+	DRM_DEBUG( "%s\n", __FUNCTION__ );
+
+	BEGIN_RING( 33 );
+
+	OUT_RING( CCE_PACKET0( R128_BRUSH_DATA0, 31 ) );
+	for ( i = 0 ; i < 32 ; i++ ) {
+		OUT_RING( stipple[i] );
+	}
+
+	ADVANCE_RING();
+}
+
+
+/* ================================================================
+ * IOCTL functions
+ */
+
+int r128_cce_clear( DRM_IOCTL_ARGS )
+{
+	DRM_DEVICE;
+	drm_r128_private_t *dev_priv = dev->dev_private;
+	drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	drm_r128_clear_t clear;
+	DRM_DEBUG( "\n" );
+
+	LOCK_TEST_WITH_RETURN( dev );
+
+	DRM_COPY_FROM_USER_IOCTL( clear, (drm_r128_clear_t *) data,
+			     sizeof(clear) );
+
+	RING_SPACE_TEST_WITH_RETURN( dev_priv );
+
+	if ( sarea_priv->nbox > R128_NR_SAREA_CLIPRECTS )
+		sarea_priv->nbox = R128_NR_SAREA_CLIPRECTS;
+
+	r128_cce_dispatch_clear( dev, &clear );
+
+	/* Make sure we restore the 3D state next time.
+	 */
+	dev_priv->sarea_priv->dirty |= R128_UPLOAD_CONTEXT | R128_UPLOAD_MASKS;
+
+	return 0;
+}
+
+int r128_cce_swap( DRM_IOCTL_ARGS )
+{
+	DRM_DEVICE;
+	drm_r128_private_t *dev_priv = dev->dev_private;
+	drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	DRM_DEBUG( "%s\n", __FUNCTION__ );
+
+	LOCK_TEST_WITH_RETURN( dev );
+
+	RING_SPACE_TEST_WITH_RETURN( dev_priv );
+
+	if ( sarea_priv->nbox > R128_NR_SAREA_CLIPRECTS )
+		sarea_priv->nbox = R128_NR_SAREA_CLIPRECTS;
+
+	if ( !dev_priv->page_flipping ) {
+		r128_cce_dispatch_swap( dev );
+		dev_priv->sarea_priv->dirty |= (R128_UPLOAD_CONTEXT |
+						R128_UPLOAD_MASKS);
+	} else {
+		r128_cce_dispatch_flip( dev );
+	}
+
+	return 0;
+}
+
+int r128_cce_vertex( DRM_IOCTL_ARGS )
+{
+	DRM_DEVICE;
+	drm_r128_private_t *dev_priv = dev->dev_private;
+	drm_device_dma_t *dma = dev->dma;
+	drm_buf_t *buf;
+	drm_r128_buf_priv_t *buf_priv;
+	drm_r128_vertex_t vertex;
+
+	LOCK_TEST_WITH_RETURN( dev );
+
+	if ( !dev_priv ) {
+		DRM_ERROR( "%s called with no initialization\n", __FUNCTION__ );
+		return DRM_ERR(EINVAL);
+	}
+
+	DRM_COPY_FROM_USER_IOCTL( vertex, (drm_r128_vertex_t *) data,
+			     sizeof(vertex) );
+
+	DRM_DEBUG( "pid=%d index=%d count=%d discard=%d\n",
+		   DRM_CURRENTPID,
+		   vertex.idx, vertex.count, vertex.discard );
+
+	if ( vertex.idx < 0 || vertex.idx >= dma->buf_count ) {
+		DRM_ERROR( "buffer index %d (of %d max)\n",
+			   vertex.idx, dma->buf_count - 1 );
+		return DRM_ERR(EINVAL);
+	}
+	if ( vertex.prim < 0 ||
+	     vertex.prim > R128_CCE_VC_CNTL_PRIM_TYPE_TRI_TYPE2 ) {
+		DRM_ERROR( "buffer prim %d\n", vertex.prim );
+		return DRM_ERR(EINVAL);
+	}
+
+	RING_SPACE_TEST_WITH_RETURN( dev_priv );
+	VB_AGE_TEST_WITH_RETURN( dev_priv );
+
+	buf = dma->buflist[vertex.idx];
+	buf_priv = buf->dev_private;
+
+	if ( buf->pid != DRM_CURRENTPID ) {
+		DRM_ERROR( "process %d using buffer owned by %d\n",
+			   DRM_CURRENTPID, buf->pid );
+		return DRM_ERR(EINVAL);
+	}
+	if ( buf->pending ) {
+		DRM_ERROR( "sending pending buffer %d\n", vertex.idx );
+		return DRM_ERR(EINVAL);
+	}
+
+	buf->used = vertex.count;
+	buf_priv->prim = vertex.prim;
+	buf_priv->discard = vertex.discard;
+
+	r128_cce_dispatch_vertex( dev, buf );
+
+	return 0;
+}
+
+int r128_cce_indices( DRM_IOCTL_ARGS )
+{
+	DRM_DEVICE;
+	drm_r128_private_t *dev_priv = dev->dev_private;
+	drm_device_dma_t *dma = dev->dma;
+	drm_buf_t *buf;
+	drm_r128_buf_priv_t *buf_priv;
+	drm_r128_indices_t elts;
+	int count;
+
+	LOCK_TEST_WITH_RETURN( dev );
+
+	if ( !dev_priv ) {
+		DRM_ERROR( "%s called with no initialization\n", __FUNCTION__ );
+		return DRM_ERR(EINVAL);
+	}
+
+	DRM_COPY_FROM_USER_IOCTL( elts, (drm_r128_indices_t *) data,
+			     sizeof(elts) );
+
+	DRM_DEBUG( "pid=%d buf=%d s=%d e=%d d=%d\n", DRM_CURRENTPID,
+		   elts.idx, elts.start, elts.end, elts.discard );
+
+	if ( elts.idx < 0 || elts.idx >= dma->buf_count ) {
+		DRM_ERROR( "buffer index %d (of %d max)\n",
+			   elts.idx, dma->buf_count - 1 );
+		return DRM_ERR(EINVAL);
+	}
+	if ( elts.prim < 0 ||
+	     elts.prim > R128_CCE_VC_CNTL_PRIM_TYPE_TRI_TYPE2 ) {
+		DRM_ERROR( "buffer prim %d\n", elts.prim );
+		return DRM_ERR(EINVAL);
+	}
+
+	RING_SPACE_TEST_WITH_RETURN( dev_priv );
+	VB_AGE_TEST_WITH_RETURN( dev_priv );
+
+	buf = dma->buflist[elts.idx];
+	buf_priv = buf->dev_private;
+
+	if ( buf->pid != DRM_CURRENTPID ) {
+		DRM_ERROR( "process %d using buffer owned by %d\n",
+			   DRM_CURRENTPID, buf->pid );
+		return DRM_ERR(EINVAL);
+	}
+	if ( buf->pending ) {
+		DRM_ERROR( "sending pending buffer %d\n", elts.idx );
+		return DRM_ERR(EINVAL);
+	}
+
+	count = (elts.end - elts.start) / sizeof(u16);
+	elts.start -= R128_INDEX_PRIM_OFFSET;
+
+	if ( elts.start & 0x7 ) {
+		DRM_ERROR( "misaligned buffer 0x%x\n", elts.start );
+		return DRM_ERR(EINVAL);
+	}
+	if ( elts.start < buf->used ) {
+		DRM_ERROR( "no header 0x%x - 0x%x\n", elts.start, buf->used );
+		return DRM_ERR(EINVAL);
+	}
+
+	buf->used = elts.end;
+	buf_priv->prim = elts.prim;
+	buf_priv->discard = elts.discard;
+
+	r128_cce_dispatch_indices( dev, buf, elts.start, elts.end, count );
+
+	return 0;
+}
+
+int r128_cce_blit( DRM_IOCTL_ARGS )
+{
+	DRM_DEVICE;
+	drm_device_dma_t *dma = dev->dma;
+	drm_r128_private_t *dev_priv = dev->dev_private;
+	drm_r128_blit_t blit;
+
+	LOCK_TEST_WITH_RETURN( dev );
+
+	DRM_COPY_FROM_USER_IOCTL( blit, (drm_r128_blit_t *) data,
+			     sizeof(blit) );
+
+	DRM_DEBUG( "pid=%d index=%d\n", DRM_CURRENTPID, blit.idx );
+
+	if ( blit.idx < 0 || blit.idx >= dma->buf_count ) {
+		DRM_ERROR( "buffer index %d (of %d max)\n",
+			   blit.idx, dma->buf_count - 1 );
+		return DRM_ERR(EINVAL);
+	}
+
+	RING_SPACE_TEST_WITH_RETURN( dev_priv );
+	VB_AGE_TEST_WITH_RETURN( dev_priv );
+
+	return r128_cce_dispatch_blit( dev, &blit );
+}
+
+int r128_cce_depth( DRM_IOCTL_ARGS )
+{
+	DRM_DEVICE;
+	drm_r128_private_t *dev_priv = dev->dev_private;
+	drm_r128_depth_t depth;
+
+	LOCK_TEST_WITH_RETURN( dev );
+
+	DRM_COPY_FROM_USER_IOCTL( depth, (drm_r128_depth_t *) data,
+			     sizeof(depth) );
+
+	RING_SPACE_TEST_WITH_RETURN( dev_priv );
+
+	switch ( depth.func ) {
+	case R128_WRITE_SPAN:
+		return r128_cce_dispatch_write_span( dev, &depth );
+	case R128_WRITE_PIXELS:
+		return r128_cce_dispatch_write_pixels( dev, &depth );
+	case R128_READ_SPAN:
+		return r128_cce_dispatch_read_span( dev, &depth );
+	case R128_READ_PIXELS:
+		return r128_cce_dispatch_read_pixels( dev, &depth );
+	}
+
+	return DRM_ERR(EINVAL);
+}
+
+int r128_cce_stipple( DRM_IOCTL_ARGS )
+{
+	DRM_DEVICE;
+	drm_r128_private_t *dev_priv = dev->dev_private;
+	drm_r128_stipple_t stipple;
+	u32 mask[32];
+
+	LOCK_TEST_WITH_RETURN( dev );
+
+	DRM_COPY_FROM_USER_IOCTL( stipple, (drm_r128_stipple_t *) data,
+			     sizeof(stipple) );
+
+	if ( DRM_COPY_FROM_USER( &mask, stipple.mask,
+			     32 * sizeof(u32) ) )
+		return DRM_ERR( EFAULT );
+
+	RING_SPACE_TEST_WITH_RETURN( dev_priv );
+
+	r128_cce_dispatch_stipple( dev, mask );
+
+	return 0;
+}
+
+int r128_cce_indirect( DRM_IOCTL_ARGS )
+{
+	DRM_DEVICE;
+	drm_r128_private_t *dev_priv = dev->dev_private;
+	drm_device_dma_t *dma = dev->dma;
+	drm_buf_t *buf;
+	drm_r128_buf_priv_t *buf_priv;
+	drm_r128_indirect_t indirect;
+#if 0
+	RING_LOCALS;
+#endif
+
+	LOCK_TEST_WITH_RETURN( dev );
+
+	if ( !dev_priv ) {
+		DRM_ERROR( "%s called with no initialization\n", __FUNCTION__ );
+		return DRM_ERR(EINVAL);
+	}
+
+	DRM_COPY_FROM_USER_IOCTL( indirect, (drm_r128_indirect_t *) data,
+			     sizeof(indirect) );
+
+	DRM_DEBUG( "indirect: idx=%d s=%d e=%d d=%d\n",
+		   indirect.idx, indirect.start,
+		   indirect.end, indirect.discard );
+
+	if ( indirect.idx < 0 || indirect.idx >= dma->buf_count ) {
+		DRM_ERROR( "buffer index %d (of %d max)\n",
+			   indirect.idx, dma->buf_count - 1 );
+		return DRM_ERR(EINVAL);
+	}
+
+	buf = dma->buflist[indirect.idx];
+	buf_priv = buf->dev_private;
+
+	if ( buf->pid != DRM_CURRENTPID ) {
+		DRM_ERROR( "process %d using buffer owned by %d\n",
+			   DRM_CURRENTPID, buf->pid );
+		return DRM_ERR(EINVAL);
+	}
+	if ( buf->pending ) {
+		DRM_ERROR( "sending pending buffer %d\n", indirect.idx );
+		return DRM_ERR(EINVAL);
+	}
+
+	if ( indirect.start < buf->used ) {
+		DRM_ERROR( "reusing indirect: start=0x%x actual=0x%x\n",
+			   indirect.start, buf->used );
+		return DRM_ERR(EINVAL);
+	}
+
+	RING_SPACE_TEST_WITH_RETURN( dev_priv );
+	VB_AGE_TEST_WITH_RETURN( dev_priv );
+
+	buf->used = indirect.end;
+	buf_priv->discard = indirect.discard;
+
+#if 0
+	/* Wait for the 3D stream to idle before the indirect buffer
+	 * containing 2D acceleration commands is processed.
+	 */
+	BEGIN_RING( 2 );
+	RADEON_WAIT_UNTIL_3D_IDLE();
+	ADVANCE_RING();
+#endif
+
+	/* Dispatch the indirect buffer full of commands from the
+	 * X server.  This is insecure and is thus only available to
+	 * privileged clients.
+	 */
+	r128_cce_dispatch_indirect( dev, buf, indirect.start, indirect.end );
+
+	return 0;
+}
+
+int r128_getparam( DRM_IOCTL_ARGS )
+{
+	DRM_DEVICE;
+	drm_r128_private_t *dev_priv = dev->dev_private;
+	drm_r128_getparam_t param;
+	int value;
+
+	if ( !dev_priv ) {
+		DRM_ERROR( "%s called with no initialization\n", __FUNCTION__ );
+		return DRM_ERR(EINVAL);
+	}
+
+	DRM_COPY_FROM_USER_IOCTL( param, (drm_r128_getparam_t *)data,
+			     sizeof(param) );
+
+	DRM_DEBUG( "pid=%d\n", DRM_CURRENTPID );
+
+	switch( param.param ) {
+	case R128_PARAM_IRQ_NR:
+		value = dev->irq;
+		break;
+	default:
+		return DRM_ERR(EINVAL);
+	}
+
+	if ( DRM_COPY_TO_USER( param.value, &value, sizeof(int) ) ) {
+		DRM_ERROR( "copy_to_user\n" );
+		return DRM_ERR(EFAULT);
+	}
+	
+	return 0;
+}
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/radeon.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/radeon.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/radeon.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/radeon.h	2003-07-30 11:18:33.000000000 +0200
@@ -0,0 +1,159 @@
+/* radeon.h -- ATI Radeon DRM template customization -*- linux-c -*-
+ * Created: Wed Feb 14 17:07:34 2001 by gareth@valinux.com
+ *
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Gareth Hughes <gareth@valinux.com>
+ *    Keith Whitwell <keith@tungstengraphics.com>
+ */
+
+#ifndef __RADEON_H__
+#define __RADEON_H__
+
+/* This remains constant for all DRM template files.
+ */
+#define DRM(x) radeon_##x
+
+/* General customization:
+ */
+#define __HAVE_AGP		1
+#define __MUST_HAVE_AGP		0
+#define __HAVE_MTRR		1
+#define __HAVE_CTX_BITMAP	1
+#define __HAVE_SG		1
+#define __HAVE_PCI_DMA		1
+
+#define DRIVER_AUTHOR		"Gareth Hughes, Keith Whitwell, others."
+
+#define DRIVER_NAME		"radeon"
+#define DRIVER_DESC		"ATI Radeon"
+#define DRIVER_DATE		"20020828"
+
+#define DRIVER_MAJOR		1
+#define DRIVER_MINOR		7
+#define DRIVER_PATCHLEVEL	0
+
+/* Interface history:
+ *
+ * 1.1 - ??
+ * 1.2 - Add vertex2 ioctl (keith)
+ *     - Add stencil capability to clear ioctl (gareth, keith)
+ *     - Increase MAX_TEXTURE_LEVELS (brian)
+ * 1.3 - Add cmdbuf ioctl (keith)
+ *     - Add support for new radeon packets (keith)
+ *     - Add getparam ioctl (keith)
+ *     - Add flip-buffers ioctl, deprecate fullscreen foo (keith).
+ * 1.4 - Add scratch registers to get_param ioctl.
+ * 1.5 - Add r200 packets to cmdbuf ioctl
+ *     - Add r200 function to init ioctl
+ *     - Add 'scalar2' instruction to cmdbuf
+ * 1.6 - Add static agp memory manager
+ *       Add irq handler (won't be turned on unless X server knows to)
+ *       Add irq ioctls and irq_active getparam.
+ *       Add wait command for cmdbuf ioctl
+ *       Add agp offset query for getparam
+ * 1.7 - Add support for cube map registers: R200_PP_CUBIC_FACES_[0..5]
+ *       and R200_PP_CUBIC_OFFSET_F1_[0..5].
+ *       Added packets R200_EMIT_PP_CUBIC_FACES_[0..5] and
+ *       R200_EMIT_PP_CUBIC_OFFSETS_[0..5].  (brian)
+ */
+#define DRIVER_IOCTLS							     \
+ [DRM_IOCTL_NR(DRM_IOCTL_DMA)]               = { radeon_cp_buffers,  1, 0 }, \
+ [DRM_IOCTL_NR(DRM_IOCTL_RADEON_CP_INIT)]    = { radeon_cp_init,     1, 1 }, \
+ [DRM_IOCTL_NR(DRM_IOCTL_RADEON_CP_START)]   = { radeon_cp_start,    1, 1 }, \
+ [DRM_IOCTL_NR(DRM_IOCTL_RADEON_CP_STOP)]    = { radeon_cp_stop,     1, 1 }, \
+ [DRM_IOCTL_NR(DRM_IOCTL_RADEON_CP_RESET)]   = { radeon_cp_reset,    1, 1 }, \
+ [DRM_IOCTL_NR(DRM_IOCTL_RADEON_CP_IDLE)]    = { radeon_cp_idle,     1, 0 }, \
+ [DRM_IOCTL_NR(DRM_IOCTL_RADEON_CP_RESUME)]  = { radeon_cp_resume,   1, 0 }, \
+ [DRM_IOCTL_NR(DRM_IOCTL_RADEON_RESET)]    = { radeon_engine_reset,  1, 0 }, \
+ [DRM_IOCTL_NR(DRM_IOCTL_RADEON_FULLSCREEN)] = { radeon_fullscreen,  1, 0 }, \
+ [DRM_IOCTL_NR(DRM_IOCTL_RADEON_SWAP)]       = { radeon_cp_swap,     1, 0 }, \
+ [DRM_IOCTL_NR(DRM_IOCTL_RADEON_CLEAR)]      = { radeon_cp_clear,    1, 0 }, \
+ [DRM_IOCTL_NR(DRM_IOCTL_RADEON_VERTEX)]     = { radeon_cp_vertex,   1, 0 }, \
+ [DRM_IOCTL_NR(DRM_IOCTL_RADEON_INDICES)]    = { radeon_cp_indices,  1, 0 }, \
+ [DRM_IOCTL_NR(DRM_IOCTL_RADEON_TEXTURE)]    = { radeon_cp_texture,  1, 0 }, \
+ [DRM_IOCTL_NR(DRM_IOCTL_RADEON_STIPPLE)]    = { radeon_cp_stipple,  1, 0 }, \
+ [DRM_IOCTL_NR(DRM_IOCTL_RADEON_INDIRECT)]   = { radeon_cp_indirect, 1, 1 }, \
+ [DRM_IOCTL_NR(DRM_IOCTL_RADEON_VERTEX2)]    = { radeon_cp_vertex2,  1, 0 }, \
+ [DRM_IOCTL_NR(DRM_IOCTL_RADEON_CMDBUF)]     = { radeon_cp_cmdbuf,   1, 0 }, \
+ [DRM_IOCTL_NR(DRM_IOCTL_RADEON_GETPARAM)]   = { radeon_cp_getparam, 1, 0 }, \
+ [DRM_IOCTL_NR(DRM_IOCTL_RADEON_FLIP)]       = { radeon_cp_flip,     1, 0 }, \
+ [DRM_IOCTL_NR(DRM_IOCTL_RADEON_ALLOC)]      = { radeon_mem_alloc,   1, 0 }, \
+ [DRM_IOCTL_NR(DRM_IOCTL_RADEON_FREE)]       = { radeon_mem_free,    1, 0 }, \
+ [DRM_IOCTL_NR(DRM_IOCTL_RADEON_INIT_HEAP)]  = { radeon_mem_init_heap, 1, 1 }, \
+ [DRM_IOCTL_NR(DRM_IOCTL_RADEON_IRQ_EMIT)]   = { radeon_irq_emit, 1, 0 }, \
+ [DRM_IOCTL_NR(DRM_IOCTL_RADEON_IRQ_WAIT)]   = { radeon_irq_wait, 1, 0 },
+
+
+#define USE_IRQS 1
+#if USE_IRQS
+#define __HAVE_DMA_IRQ		1
+#define __HAVE_VBL_IRQ		1
+#define __HAVE_SHARED_IRQ       1
+
+/* When a client dies:
+ *    - Check for and clean up flipped page state
+ *    - Free any alloced agp memory.
+ *
+ * DRM infrastructure takes care of reclaiming dma buffers.
+ */
+#define DRIVER_PRERELEASE() do {					\
+	if ( dev->dev_private ) {					\
+		drm_radeon_private_t *dev_priv = dev->dev_private;	\
+		if ( dev_priv->page_flipping ) {			\
+			radeon_do_cleanup_pageflip( dev );		\
+		}							\
+                radeon_mem_release( dev_priv->agp_heap );		\
+	}								\
+} while (0)
+
+/* On unloading the module:
+ *    - Free memory heap structure
+ *    - Remove mappings made at startup and free dev_private.
+ */
+#define DRIVER_PRETAKEDOWN() do {					\
+	if ( dev->dev_private ) {					\
+		drm_radeon_private_t *dev_priv = dev->dev_private;	\
+		radeon_mem_takedown( &(dev_priv->agp_heap) );		\
+		radeon_do_cleanup_cp( dev );				\
+	}								\
+} while (0)
+
+#else
+#define __HAVE_DMA_IRQ 0
+#endif
+
+/* DMA customization:
+ */
+#define __HAVE_DMA		1
+
+
+/* Buffer customization:
+ */
+#define DRIVER_BUF_PRIV_T	drm_radeon_buf_priv_t
+
+#define DRIVER_AGP_BUFFERS_MAP( dev )				\
+	((drm_radeon_private_t *)((dev)->dev_private))->buffers
+
+#endif
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/radeon_cp.c linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/radeon_cp.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/radeon_cp.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/radeon_cp.c	2003-07-30 11:18:33.000000000 +0200
@@ -0,0 +1,1814 @@
+/* radeon_cp.c -- CP support for Radeon -*- linux-c -*-
+ *
+ * Copyright 2000 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Fremont, California.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Kevin E. Martin <martin@valinux.com>
+ *    Gareth Hughes <gareth@valinux.com>
+ */
+
+#include "radeon.h"
+#include "drmP.h"
+#include "drm.h"
+#include "radeon_drm.h"
+#include "radeon_drv.h"
+
+#define RADEON_FIFO_DEBUG	0
+
+
+
+/* CP microcode (from ATI) */
+static u32 R200_cp_microcode[][2] = {
+	{ 0x21007000, 0000000000 },        
+	{ 0x20007000, 0000000000 }, 
+	{ 0x000000ab, 0x00000004 },
+	{ 0x000000af, 0x00000004 },
+	{ 0x66544a49, 0000000000 },
+	{ 0x49494174, 0000000000 },
+	{ 0x54517d83, 0000000000 },
+	{ 0x498d8b64, 0000000000 },
+	{ 0x49494949, 0000000000 },
+	{ 0x49da493c, 0000000000 },
+	{ 0x49989898, 0000000000 },
+	{ 0xd34949d5, 0000000000 },
+	{ 0x9dc90e11, 0000000000 },
+	{ 0xce9b9b9b, 0000000000 },
+	{ 0x000f0000, 0x00000016 },
+	{ 0x352e232c, 0000000000 },
+	{ 0x00000013, 0x00000004 },
+	{ 0x000f0000, 0x00000016 },
+	{ 0x352e272c, 0000000000 },
+	{ 0x000f0001, 0x00000016 },
+	{ 0x3239362f, 0000000000 },
+	{ 0x000077ef, 0x00000002 },
+	{ 0x00061000, 0x00000002 },
+	{ 0x00000020, 0x0000001a },
+	{ 0x00004000, 0x0000001e },
+	{ 0x00061000, 0x00000002 },
+	{ 0x00000020, 0x0000001a },
+	{ 0x00004000, 0x0000001e },
+	{ 0x00061000, 0x00000002 },
+	{ 0x00000020, 0x0000001a },
+	{ 0x00004000, 0x0000001e },
+	{ 0x00000016, 0x00000004 },
+	{ 0x0003802a, 0x00000002 },
+	{ 0x040067e0, 0x00000002 },
+	{ 0x00000016, 0x00000004 },
+	{ 0x000077e0, 0x00000002 },
+	{ 0x00065000, 0x00000002 },
+	{ 0x000037e1, 0x00000002 },
+	{ 0x040067e1, 0x00000006 },
+	{ 0x000077e0, 0x00000002 },
+	{ 0x000077e1, 0x00000002 },
+	{ 0x000077e1, 0x00000006 },
+	{ 0xffffffff, 0000000000 },
+	{ 0x10000000, 0000000000 },
+	{ 0x0003802a, 0x00000002 },
+	{ 0x040067e0, 0x00000006 },
+	{ 0x00007675, 0x00000002 },
+	{ 0x00007676, 0x00000002 },
+	{ 0x00007677, 0x00000002 },
+	{ 0x00007678, 0x00000006 },
+	{ 0x0003802b, 0x00000002 },
+	{ 0x04002676, 0x00000002 },
+	{ 0x00007677, 0x00000002 },
+	{ 0x00007678, 0x00000006 },
+	{ 0x0000002e, 0x00000018 },
+	{ 0x0000002e, 0x00000018 },
+	{ 0000000000, 0x00000006 },
+	{ 0x0000002f, 0x00000018 },
+	{ 0x0000002f, 0x00000018 },
+	{ 0000000000, 0x00000006 },
+	{ 0x01605000, 0x00000002 },
+	{ 0x00065000, 0x00000002 },
+	{ 0x00098000, 0x00000002 },
+	{ 0x00061000, 0x00000002 },
+	{ 0x64c0603d, 0x00000004 },
+	{ 0x00080000, 0x00000016 },
+	{ 0000000000, 0000000000 },
+	{ 0x0400251d, 0x00000002 },
+	{ 0x00007580, 0x00000002 },
+	{ 0x00067581, 0x00000002 },
+	{ 0x04002580, 0x00000002 },
+	{ 0x00067581, 0x00000002 },
+	{ 0x00000046, 0x00000004 },
+	{ 0x00005000, 0000000000 },
+	{ 0x00061000, 0x00000002 },
+	{ 0x0000750e, 0x00000002 },
+	{ 0x00019000, 0x00000002 },
+	{ 0x00011055, 0x00000014 },
+	{ 0x00000055, 0x00000012 },
+	{ 0x0400250f, 0x00000002 },
+	{ 0x0000504a, 0x00000004 },
+	{ 0x00007565, 0x00000002 },
+	{ 0x00007566, 0x00000002 },
+	{ 0x00000051, 0x00000004 },
+	{ 0x01e655b4, 0x00000002 },
+	{ 0x4401b0dc, 0x00000002 },
+	{ 0x01c110dc, 0x00000002 },
+	{ 0x2666705d, 0x00000018 },
+	{ 0x040c2565, 0x00000002 },
+	{ 0x0000005d, 0x00000018 },
+	{ 0x04002564, 0x00000002 },
+	{ 0x00007566, 0x00000002 },
+	{ 0x00000054, 0x00000004 },
+	{ 0x00401060, 0x00000008 },
+	{ 0x00101000, 0x00000002 },
+	{ 0x000d80ff, 0x00000002 },
+	{ 0x00800063, 0x00000008 },
+	{ 0x000f9000, 0x00000002 },
+	{ 0x000e00ff, 0x00000002 },
+	{ 0000000000, 0x00000006 },
+	{ 0x00000080, 0x00000018 },
+	{ 0x00000054, 0x00000004 },
+	{ 0x00007576, 0x00000002 },
+	{ 0x00065000, 0x00000002 },
+	{ 0x00009000, 0x00000002 },
+	{ 0x00041000, 0x00000002 },
+	{ 0x0c00350e, 0x00000002 },
+	{ 0x00049000, 0x00000002 },
+	{ 0x00051000, 0x00000002 },
+	{ 0x01e785f8, 0x00000002 },
+	{ 0x00200000, 0x00000002 },
+	{ 0x00600073, 0x0000000c },
+	{ 0x00007563, 0x00000002 },
+	{ 0x006075f0, 0x00000021 },
+	{ 0x20007068, 0x00000004 },
+	{ 0x00005068, 0x00000004 },
+	{ 0x00007576, 0x00000002 },
+	{ 0x00007577, 0x00000002 },
+	{ 0x0000750e, 0x00000002 },
+	{ 0x0000750f, 0x00000002 },
+	{ 0x00a05000, 0x00000002 },
+	{ 0x00600076, 0x0000000c },
+	{ 0x006075f0, 0x00000021 },
+	{ 0x000075f8, 0x00000002 },
+	{ 0x00000076, 0x00000004 },
+	{ 0x000a750e, 0x00000002 },
+	{ 0x0020750f, 0x00000002 },
+	{ 0x00600079, 0x00000004 },
+	{ 0x00007570, 0x00000002 },
+	{ 0x00007571, 0x00000002 },
+	{ 0x00007572, 0x00000006 },
+	{ 0x00005000, 0x00000002 },
+	{ 0x00a05000, 0x00000002 },
+	{ 0x00007568, 0x00000002 },
+	{ 0x00061000, 0x00000002 },
+	{ 0x00000084, 0x0000000c },
+	{ 0x00058000, 0x00000002 },
+	{ 0x0c607562, 0x00000002 },
+	{ 0x00000086, 0x00000004 },
+	{ 0x00600085, 0x00000004 },
+	{ 0x400070dd, 0000000000 },
+	{ 0x000380dd, 0x00000002 },
+	{ 0x00000093, 0x0000001c },
+	{ 0x00065095, 0x00000018 },
+	{ 0x040025bb, 0x00000002 },
+	{ 0x00061096, 0x00000018 },
+	{ 0x040075bc, 0000000000 },
+	{ 0x000075bb, 0x00000002 },
+	{ 0x000075bc, 0000000000 },
+	{ 0x00090000, 0x00000006 },
+	{ 0x00090000, 0x00000002 },
+	{ 0x000d8002, 0x00000006 },
+	{ 0x00005000, 0x00000002 },
+	{ 0x00007821, 0x00000002 },
+	{ 0x00007800, 0000000000 },
+	{ 0x00007821, 0x00000002 },
+	{ 0x00007800, 0000000000 },
+	{ 0x01665000, 0x00000002 },
+	{ 0x000a0000, 0x00000002 },
+	{ 0x000671cc, 0x00000002 },
+	{ 0x0286f1cd, 0x00000002 },
+	{ 0x000000a3, 0x00000010 },
+	{ 0x21007000, 0000000000 },
+	{ 0x000000aa, 0x0000001c },
+	{ 0x00065000, 0x00000002 },
+	{ 0x000a0000, 0x00000002 },
+	{ 0x00061000, 0x00000002 },
+	{ 0x000b0000, 0x00000002 },
+	{ 0x38067000, 0x00000002 },
+	{ 0x000a00a6, 0x00000004 },
+	{ 0x20007000, 0000000000 },
+	{ 0x01200000, 0x00000002 },
+	{ 0x20077000, 0x00000002 },
+	{ 0x01200000, 0x00000002 },
+	{ 0x20007000, 0000000000 },
+	{ 0x00061000, 0x00000002 },
+	{ 0x0120751b, 0x00000002 },
+	{ 0x8040750a, 0x00000002 },
+	{ 0x8040750b, 0x00000002 },
+	{ 0x00110000, 0x00000002 },
+	{ 0x000380dd, 0x00000002 },
+	{ 0x000000bd, 0x0000001c },
+	{ 0x00061096, 0x00000018 },
+	{ 0x844075bd, 0x00000002 },
+	{ 0x00061095, 0x00000018 },
+	{ 0x840075bb, 0x00000002 },
+	{ 0x00061096, 0x00000018 },
+	{ 0x844075bc, 0x00000002 },
+	{ 0x000000c0, 0x00000004 },
+	{ 0x804075bd, 0x00000002 },
+	{ 0x800075bb, 0x00000002 },
+	{ 0x804075bc, 0x00000002 },
+	{ 0x00108000, 0x00000002 },
+	{ 0x01400000, 0x00000002 },
+	{ 0x006000c4, 0x0000000c },
+	{ 0x20c07000, 0x00000020 },
+	{ 0x000000c6, 0x00000012 },
+	{ 0x00800000, 0x00000006 },
+	{ 0x0080751d, 0x00000006 },
+	{ 0x000025bb, 0x00000002 },
+	{ 0x000040c0, 0x00000004 },
+	{ 0x0000775c, 0x00000002 },
+	{ 0x00a05000, 0x00000002 },
+	{ 0x00661000, 0x00000002 },
+	{ 0x0460275d, 0x00000020 },
+	{ 0x00004000, 0000000000 },
+	{ 0x00007999, 0x00000002 },
+	{ 0x00a05000, 0x00000002 },
+	{ 0x00661000, 0x00000002 },
+	{ 0x0460299b, 0x00000020 },
+	{ 0x00004000, 0000000000 },
+	{ 0x01e00830, 0x00000002 },
+	{ 0x21007000, 0000000000 },
+	{ 0x00005000, 0x00000002 },
+	{ 0x00038042, 0x00000002 },
+	{ 0x040025e0, 0x00000002 },
+	{ 0x000075e1, 0000000000 },
+	{ 0x00000001, 0000000000 },
+	{ 0x000380d9, 0x00000002 },
+	{ 0x04007394, 0000000000 },
+	{ 0000000000, 0000000000 },
+	{ 0000000000, 0000000000 },
+	{ 0000000000, 0000000000 },
+	{ 0000000000, 0000000000 },
+	{ 0000000000, 0000000000 },
+	{ 0000000000, 0000000000 },
+	{ 0000000000, 0000000000 },
+	{ 0000000000, 0000000000 },
+	{ 0000000000, 0000000000 },
+	{ 0000000000, 0000000000 },
+	{ 0000000000, 0000000000 },
+	{ 0000000000, 0000000000 },
+	{ 0000000000, 0000000000 },
+	{ 0000000000, 0000000000 },
+	{ 0000000000, 0000000000 },
+	{ 0000000000, 0000000000 },
+	{ 0000000000, 0000000000 },
+	{ 0000000000, 0000000000 },
+	{ 0000000000, 0000000000 },
+	{ 0000000000, 0000000000 },
+	{ 0000000000, 0000000000 },
+	{ 0000000000, 0000000000 },
+	{ 0000000000, 0000000000 },
+	{ 0000000000, 0000000000 },
+	{ 0000000000, 0000000000 },
+	{ 0000000000, 0000000000 },
+	{ 0000000000, 0000000000 },
+	{ 0000000000, 0000000000 },
+	{ 0000000000, 0000000000 },
+	{ 0000000000, 0000000000 },
+	{ 0000000000, 0000000000 },
+	{ 0000000000, 0000000000 },
+	{ 0000000000, 0000000000 },
+	{ 0000000000, 0000000000 },
+	{ 0000000000, 0000000000 },
+	{ 0000000000, 0000000000 },
+};
+
+
+static u32 radeon_cp_microcode[][2] = {
+	{ 0x21007000, 0000000000 },
+	{ 0x20007000, 0000000000 },
+	{ 0x000000b4, 0x00000004 },
+	{ 0x000000b8, 0x00000004 },
+	{ 0x6f5b4d4c, 0000000000 },
+	{ 0x4c4c427f, 0000000000 },
+	{ 0x5b568a92, 0000000000 },
+	{ 0x4ca09c6d, 0000000000 },
+	{ 0xad4c4c4c, 0000000000 },
+	{ 0x4ce1af3d, 0000000000 },
+	{ 0xd8afafaf, 0000000000 },
+	{ 0xd64c4cdc, 0000000000 },
+	{ 0x4cd10d10, 0000000000 },
+	{ 0x000f0000, 0x00000016 },
+	{ 0x362f242d, 0000000000 },
+	{ 0x00000012, 0x00000004 },
+	{ 0x000f0000, 0x00000016 },
+	{ 0x362f282d, 0000000000 },
+	{ 0x000380e7, 0x00000002 },
+	{ 0x04002c97, 0x00000002 },
+	{ 0x000f0001, 0x00000016 },
+	{ 0x333a3730, 0000000000 },
+	{ 0x000077ef, 0x00000002 },
+	{ 0x00061000, 0x00000002 },
+	{ 0x00000021, 0x0000001a },
+	{ 0x00004000, 0x0000001e },
+	{ 0x00061000, 0x00000002 },
+	{ 0x00000021, 0x0000001a },
+	{ 0x00004000, 0x0000001e },
+	{ 0x00061000, 0x00000002 },
+	{ 0x00000021, 0x0000001a },
+	{ 0x00004000, 0x0000001e },
+	{ 0x00000017, 0x00000004 },
+	{ 0x0003802b, 0x00000002 },
+	{ 0x040067e0, 0x00000002 },
+	{ 0x00000017, 0x00000004 },
+	{ 0x000077e0, 0x00000002 },
+	{ 0x00065000, 0x00000002 },
+	{ 0x000037e1, 0x00000002 },
+	{ 0x040067e1, 0x00000006 },
+	{ 0x000077e0, 0x00000002 },
+	{ 0x000077e1, 0x00000002 },
+	{ 0x000077e1, 0x00000006 },
+	{ 0xffffffff, 0000000000 },
+	{ 0x10000000, 0000000000 },
+	{ 0x0003802b, 0x00000002 },
+	{ 0x040067e0, 0x00000006 },
+	{ 0x00007675, 0x00000002 },
+	{ 0x00007676, 0x00000002 },
+	{ 0x00007677, 0x00000002 },
+	{ 0x00007678, 0x00000006 },
+	{ 0x0003802c, 0x00000002 },
+	{ 0x04002676, 0x00000002 },
+	{ 0x00007677, 0x00000002 },
+	{ 0x00007678, 0x00000006 },
+	{ 0x0000002f, 0x00000018 },
+	{ 0x0000002f, 0x00000018 },
+	{ 0000000000, 0x00000006 },
+	{ 0x00000030, 0x00000018 },
+	{ 0x00000030, 0x00000018 },
+	{ 0000000000, 0x00000006 },
+	{ 0x01605000, 0x00000002 },
+	{ 0x00065000, 0x00000002 },
+	{ 0x00098000, 0x00000002 },
+	{ 0x00061000, 0x00000002 },
+	{ 0x64c0603e, 0x00000004 },
+	{ 0x000380e6, 0x00000002 },
+	{ 0x040025c5, 0x00000002 },
+	{ 0x00080000, 0x00000016 },
+	{ 0000000000, 0000000000 },
+	{ 0x0400251d, 0x00000002 },
+	{ 0x00007580, 0x00000002 },
+	{ 0x00067581, 0x00000002 },
+	{ 0x04002580, 0x00000002 },
+	{ 0x00067581, 0x00000002 },
+	{ 0x00000049, 0x00000004 },
+	{ 0x00005000, 0000000000 },
+	{ 0x000380e6, 0x00000002 },
+	{ 0x040025c5, 0x00000002 },
+	{ 0x00061000, 0x00000002 },
+	{ 0x0000750e, 0x00000002 },
+	{ 0x00019000, 0x00000002 },
+	{ 0x00011055, 0x00000014 },
+	{ 0x00000055, 0x00000012 },
+	{ 0x0400250f, 0x00000002 },
+	{ 0x0000504f, 0x00000004 },
+	{ 0x000380e6, 0x00000002 },
+	{ 0x040025c5, 0x00000002 },
+	{ 0x00007565, 0x00000002 },
+	{ 0x00007566, 0x00000002 },
+	{ 0x00000058, 0x00000004 },
+	{ 0x000380e6, 0x00000002 },
+	{ 0x040025c5, 0x00000002 },
+	{ 0x01e655b4, 0x00000002 },
+	{ 0x4401b0e4, 0x00000002 },
+	{ 0x01c110e4, 0x00000002 },
+	{ 0x26667066, 0x00000018 },
+	{ 0x040c2565, 0x00000002 },
+	{ 0x00000066, 0x00000018 },
+	{ 0x04002564, 0x00000002 },
+	{ 0x00007566, 0x00000002 },
+	{ 0x0000005d, 0x00000004 },
+	{ 0x00401069, 0x00000008 },
+	{ 0x00101000, 0x00000002 },
+	{ 0x000d80ff, 0x00000002 },
+	{ 0x0080006c, 0x00000008 },
+	{ 0x000f9000, 0x00000002 },
+	{ 0x000e00ff, 0x00000002 },
+	{ 0000000000, 0x00000006 },
+	{ 0x0000008f, 0x00000018 },
+	{ 0x0000005b, 0x00000004 },
+	{ 0x000380e6, 0x00000002 },
+	{ 0x040025c5, 0x00000002 },
+	{ 0x00007576, 0x00000002 },
+	{ 0x00065000, 0x00000002 },
+	{ 0x00009000, 0x00000002 },
+	{ 0x00041000, 0x00000002 },
+	{ 0x0c00350e, 0x00000002 },
+	{ 0x00049000, 0x00000002 },
+	{ 0x00051000, 0x00000002 },
+	{ 0x01e785f8, 0x00000002 },
+	{ 0x00200000, 0x00000002 },
+	{ 0x0060007e, 0x0000000c },
+	{ 0x00007563, 0x00000002 },
+	{ 0x006075f0, 0x00000021 },
+	{ 0x20007073, 0x00000004 },
+	{ 0x00005073, 0x00000004 },
+	{ 0x000380e6, 0x00000002 },
+	{ 0x040025c5, 0x00000002 },
+	{ 0x00007576, 0x00000002 },
+	{ 0x00007577, 0x00000002 },
+	{ 0x0000750e, 0x00000002 },
+	{ 0x0000750f, 0x00000002 },
+	{ 0x00a05000, 0x00000002 },
+	{ 0x00600083, 0x0000000c },
+	{ 0x006075f0, 0x00000021 },
+	{ 0x000075f8, 0x00000002 },
+	{ 0x00000083, 0x00000004 },
+	{ 0x000a750e, 0x00000002 },
+	{ 0x000380e6, 0x00000002 },
+	{ 0x040025c5, 0x00000002 },
+	{ 0x0020750f, 0x00000002 },
+	{ 0x00600086, 0x00000004 },
+	{ 0x00007570, 0x00000002 },
+	{ 0x00007571, 0x00000002 },
+	{ 0x00007572, 0x00000006 },
+	{ 0x000380e6, 0x00000002 },
+	{ 0x040025c5, 0x00000002 },
+	{ 0x00005000, 0x00000002 },
+	{ 0x00a05000, 0x00000002 },
+	{ 0x00007568, 0x00000002 },
+	{ 0x00061000, 0x00000002 },
+	{ 0x00000095, 0x0000000c },
+	{ 0x00058000, 0x00000002 },
+	{ 0x0c607562, 0x00000002 },
+	{ 0x00000097, 0x00000004 },
+	{ 0x000380e6, 0x00000002 },
+	{ 0x040025c5, 0x00000002 },
+	{ 0x00600096, 0x00000004 },
+	{ 0x400070e5, 0000000000 },
+	{ 0x000380e6, 0x00000002 },
+	{ 0x040025c5, 0x00000002 },
+	{ 0x000380e5, 0x00000002 },
+	{ 0x000000a8, 0x0000001c },
+	{ 0x000650aa, 0x00000018 },
+	{ 0x040025bb, 0x00000002 },
+	{ 0x000610ab, 0x00000018 },
+	{ 0x040075bc, 0000000000 },
+	{ 0x000075bb, 0x00000002 },
+	{ 0x000075bc, 0000000000 },
+	{ 0x00090000, 0x00000006 },
+	{ 0x00090000, 0x00000002 },
+	{ 0x000d8002, 0x00000006 },
+	{ 0x00007832, 0x00000002 },
+	{ 0x00005000, 0x00000002 },
+	{ 0x000380e7, 0x00000002 },
+	{ 0x04002c97, 0x00000002 },
+	{ 0x00007820, 0x00000002 },
+	{ 0x00007821, 0x00000002 },
+	{ 0x00007800, 0000000000 },
+	{ 0x01200000, 0x00000002 },
+	{ 0x20077000, 0x00000002 },
+	{ 0x01200000, 0x00000002 },
+	{ 0x20007000, 0x00000002 },
+	{ 0x00061000, 0x00000002 },
+	{ 0x0120751b, 0x00000002 },
+	{ 0x8040750a, 0x00000002 },
+	{ 0x8040750b, 0x00000002 },
+	{ 0x00110000, 0x00000002 },
+	{ 0x000380e5, 0x00000002 },
+	{ 0x000000c6, 0x0000001c },
+	{ 0x000610ab, 0x00000018 },
+	{ 0x844075bd, 0x00000002 },
+	{ 0x000610aa, 0x00000018 },
+	{ 0x840075bb, 0x00000002 },
+	{ 0x000610ab, 0x00000018 },
+	{ 0x844075bc, 0x00000002 },
+	{ 0x000000c9, 0x00000004 },
+	{ 0x804075bd, 0x00000002 },
+	{ 0x800075bb, 0x00000002 },
+	{ 0x804075bc, 0x00000002 },
+	{ 0x00108000, 0x00000002 },
+	{ 0x01400000, 0x00000002 },
+	{ 0x006000cd, 0x0000000c },
+	{ 0x20c07000, 0x00000020 },
+	{ 0x000000cf, 0x00000012 },
+	{ 0x00800000, 0x00000006 },
+	{ 0x0080751d, 0x00000006 },
+	{ 0000000000, 0000000000 },
+	{ 0x0000775c, 0x00000002 },
+	{ 0x00a05000, 0x00000002 },
+	{ 0x00661000, 0x00000002 },
+	{ 0x0460275d, 0x00000020 },
+	{ 0x00004000, 0000000000 },
+	{ 0x01e00830, 0x00000002 },
+	{ 0x21007000, 0000000000 },
+	{ 0x6464614d, 0000000000 },
+	{ 0x69687420, 0000000000 },
+	{ 0x00000073, 0000000000 },
+	{ 0000000000, 0000000000 },
+	{ 0x00005000, 0x00000002 },
+	{ 0x000380d0, 0x00000002 },
+	{ 0x040025e0, 0x00000002 },
+	{ 0x000075e1, 0000000000 },
+	{ 0x00000001, 0000000000 },
+	{ 0x000380e0, 0x00000002 },
+	{ 0x04002394, 0x00000002 },
+	{ 0x00005000, 0000000000 },
+	{ 0000000000, 0000000000 },
+	{ 0000000000, 0000000000 },
+	{ 0x00000008, 0000000000 },
+	{ 0x00000004, 0000000000 },
+	{ 0000000000, 0000000000 },
+	{ 0000000000, 0000000000 },
+	{ 0000000000, 0000000000 },
+	{ 0000000000, 0000000000 },
+	{ 0000000000, 0000000000 },
+	{ 0000000000, 0000000000 },
+	{ 0000000000, 0000000000 },
+	{ 0000000000, 0000000000 },
+	{ 0000000000, 0000000000 },
+	{ 0000000000, 0000000000 },
+	{ 0000000000, 0000000000 },
+	{ 0000000000, 0000000000 },
+	{ 0000000000, 0000000000 },
+	{ 0000000000, 0000000000 },
+	{ 0000000000, 0000000000 },
+	{ 0000000000, 0000000000 },
+	{ 0000000000, 0000000000 },
+	{ 0000000000, 0000000000 },
+	{ 0000000000, 0000000000 },
+	{ 0000000000, 0000000000 },
+	{ 0000000000, 0000000000 },
+	{ 0000000000, 0000000000 },
+	{ 0000000000, 0000000000 },
+	{ 0000000000, 0000000000 },
+};
+
+
+int RADEON_READ_PLL(drm_device_t *dev, int addr)
+{
+	drm_radeon_private_t *dev_priv = dev->dev_private;
+
+	RADEON_WRITE8(RADEON_CLOCK_CNTL_INDEX, addr & 0x1f);
+	return RADEON_READ(RADEON_CLOCK_CNTL_DATA);
+}
+
+#if RADEON_FIFO_DEBUG
+static void radeon_status( drm_radeon_private_t *dev_priv )
+{
+	printk( "%s:\n", __FUNCTION__ );
+	printk( "RBBM_STATUS = 0x%08x\n",
+		(unsigned int)RADEON_READ( RADEON_RBBM_STATUS ) );
+	printk( "CP_RB_RTPR = 0x%08x\n",
+		(unsigned int)RADEON_READ( RADEON_CP_RB_RPTR ) );
+	printk( "CP_RB_WTPR = 0x%08x\n",
+		(unsigned int)RADEON_READ( RADEON_CP_RB_WPTR ) );
+	printk( "AIC_CNTL = 0x%08x\n",
+		(unsigned int)RADEON_READ( RADEON_AIC_CNTL ) );
+	printk( "AIC_STAT = 0x%08x\n",
+		(unsigned int)RADEON_READ( RADEON_AIC_STAT ) );
+	printk( "AIC_PT_BASE = 0x%08x\n",
+		(unsigned int)RADEON_READ( RADEON_AIC_PT_BASE ) );
+	printk( "TLB_ADDR = 0x%08x\n",
+		(unsigned int)RADEON_READ( RADEON_AIC_TLB_ADDR ) );
+	printk( "TLB_DATA = 0x%08x\n",
+		(unsigned int)RADEON_READ( RADEON_AIC_TLB_DATA ) );
+}
+#endif
+
+
+/* ================================================================
+ * Engine, FIFO control
+ */
+
+static int radeon_do_pixcache_flush( drm_radeon_private_t *dev_priv )
+{
+	u32 tmp;
+	int i;
+
+	dev_priv->stats.boxes |= RADEON_BOX_WAIT_IDLE;
+
+	tmp  = RADEON_READ( RADEON_RB2D_DSTCACHE_CTLSTAT );
+	tmp |= RADEON_RB2D_DC_FLUSH_ALL;
+	RADEON_WRITE( RADEON_RB2D_DSTCACHE_CTLSTAT, tmp );
+
+	for ( i = 0 ; i < dev_priv->usec_timeout ; i++ ) {
+		if ( !(RADEON_READ( RADEON_RB2D_DSTCACHE_CTLSTAT )
+		       & RADEON_RB2D_DC_BUSY) ) {
+			return 0;
+		}
+		DRM_UDELAY( 1 );
+	}
+
+#if RADEON_FIFO_DEBUG
+	DRM_ERROR( "failed!\n" );
+	radeon_status( dev_priv );
+#endif
+	return DRM_ERR(EBUSY);
+}
+
+static int radeon_do_wait_for_fifo( drm_radeon_private_t *dev_priv,
+				    int entries )
+{
+	int i;
+
+	dev_priv->stats.boxes |= RADEON_BOX_WAIT_IDLE;
+
+	for ( i = 0 ; i < dev_priv->usec_timeout ; i++ ) {
+		int slots = ( RADEON_READ( RADEON_RBBM_STATUS )
+			      & RADEON_RBBM_FIFOCNT_MASK );
+		if ( slots >= entries ) return 0;
+		DRM_UDELAY( 1 );
+	}
+
+#if RADEON_FIFO_DEBUG
+	DRM_ERROR( "failed!\n" );
+	radeon_status( dev_priv );
+#endif
+	return DRM_ERR(EBUSY);
+}
+
+static int radeon_do_wait_for_idle( drm_radeon_private_t *dev_priv )
+{
+	int i, ret;
+
+	dev_priv->stats.boxes |= RADEON_BOX_WAIT_IDLE;
+
+	ret = radeon_do_wait_for_fifo( dev_priv, 64 );
+	if ( ret ) return ret;
+
+	for ( i = 0 ; i < dev_priv->usec_timeout ; i++ ) {
+		if ( !(RADEON_READ( RADEON_RBBM_STATUS )
+		       & RADEON_RBBM_ACTIVE) ) {
+			radeon_do_pixcache_flush( dev_priv );
+			return 0;
+		}
+		DRM_UDELAY( 1 );
+	}
+
+#if RADEON_FIFO_DEBUG
+	DRM_ERROR( "failed!\n" );
+	radeon_status( dev_priv );
+#endif
+	return DRM_ERR(EBUSY);
+}
+
+
+/* ================================================================
+ * CP control, initialization
+ */
+
+/* Load the microcode for the CP */
+static void radeon_cp_load_microcode( drm_radeon_private_t *dev_priv )
+{
+	int i;
+	DRM_DEBUG( "\n" );
+
+	radeon_do_wait_for_idle( dev_priv );
+
+	RADEON_WRITE( RADEON_CP_ME_RAM_ADDR, 0 );
+
+	if (dev_priv->is_r200)
+	{
+		DRM_INFO("Loading R200 Microcode\n");
+		for ( i = 0 ; i < 256 ; i++ ) 
+		{
+			RADEON_WRITE( RADEON_CP_ME_RAM_DATAH,
+				      R200_cp_microcode[i][1] );
+			RADEON_WRITE( RADEON_CP_ME_RAM_DATAL,
+				      R200_cp_microcode[i][0] );
+		}
+	}
+	else
+	{
+		for ( i = 0 ; i < 256 ; i++ ) {
+			RADEON_WRITE( RADEON_CP_ME_RAM_DATAH,
+				      radeon_cp_microcode[i][1] );
+			RADEON_WRITE( RADEON_CP_ME_RAM_DATAL,
+				      radeon_cp_microcode[i][0] );
+		}
+	}
+}
+
+/* Flush any pending commands to the CP.  This should only be used just
+ * prior to a wait for idle, as it informs the engine that the command
+ * stream is ending.
+ */
+static void radeon_do_cp_flush( drm_radeon_private_t *dev_priv )
+{
+	DRM_DEBUG( "\n" );
+#if 0
+	u32 tmp;
+
+	tmp = RADEON_READ( RADEON_CP_RB_WPTR ) | (1 << 31);
+	RADEON_WRITE( RADEON_CP_RB_WPTR, tmp );
+#endif
+}
+
+/* Wait for the CP to go idle.
+ */
+int radeon_do_cp_idle( drm_radeon_private_t *dev_priv )
+{
+	RING_LOCALS;
+	DRM_DEBUG( "\n" );
+
+	BEGIN_RING( 6 );
+
+	RADEON_PURGE_CACHE();
+	RADEON_PURGE_ZCACHE();
+	RADEON_WAIT_UNTIL_IDLE();
+
+	ADVANCE_RING();
+	COMMIT_RING();
+
+	return radeon_do_wait_for_idle( dev_priv );
+}
+
+/* Start the Command Processor.
+ */
+static void radeon_do_cp_start( drm_radeon_private_t *dev_priv )
+{
+	RING_LOCALS;
+	DRM_DEBUG( "\n" );
+
+	radeon_do_wait_for_idle( dev_priv );
+
+	RADEON_WRITE( RADEON_CP_CSQ_CNTL, dev_priv->cp_mode );
+
+	dev_priv->cp_running = 1;
+
+	BEGIN_RING( 6 );
+
+	RADEON_PURGE_CACHE();
+	RADEON_PURGE_ZCACHE();
+	RADEON_WAIT_UNTIL_IDLE();
+
+	ADVANCE_RING();
+	COMMIT_RING();
+}
+
+/* Reset the Command Processor.  This will not flush any pending
+ * commands, so you must wait for the CP command stream to complete
+ * before calling this routine.
+ */
+static void radeon_do_cp_reset( drm_radeon_private_t *dev_priv )
+{
+	u32 cur_read_ptr;
+	DRM_DEBUG( "\n" );
+
+	cur_read_ptr = RADEON_READ( RADEON_CP_RB_RPTR );
+	RADEON_WRITE( RADEON_CP_RB_WPTR, cur_read_ptr );
+	*dev_priv->ring.head = cur_read_ptr;
+	dev_priv->ring.tail = cur_read_ptr;
+}
+
+/* Stop the Command Processor.  This will not flush any pending
+ * commands, so you must flush the command stream and wait for the CP
+ * to go idle before calling this routine.
+ */
+static void radeon_do_cp_stop( drm_radeon_private_t *dev_priv )
+{
+	DRM_DEBUG( "\n" );
+
+	RADEON_WRITE( RADEON_CP_CSQ_CNTL, RADEON_CSQ_PRIDIS_INDDIS );
+
+	dev_priv->cp_running = 0;
+}
+
+/* Reset the engine.  This will stop the CP if it is running.
+ */
+static int radeon_do_engine_reset( drm_device_t *dev )
+{
+	drm_radeon_private_t *dev_priv = dev->dev_private;
+	u32 clock_cntl_index, mclk_cntl, rbbm_soft_reset;
+	DRM_DEBUG( "\n" );
+
+	radeon_do_pixcache_flush( dev_priv );
+
+	clock_cntl_index = RADEON_READ( RADEON_CLOCK_CNTL_INDEX );
+	mclk_cntl = RADEON_READ_PLL( dev, RADEON_MCLK_CNTL );
+
+	RADEON_WRITE_PLL( RADEON_MCLK_CNTL, ( mclk_cntl |
+					      RADEON_FORCEON_MCLKA |
+					      RADEON_FORCEON_MCLKB |
+ 					      RADEON_FORCEON_YCLKA |
+					      RADEON_FORCEON_YCLKB |
+					      RADEON_FORCEON_MC |
+					      RADEON_FORCEON_AIC ) );
+
+	rbbm_soft_reset = RADEON_READ( RADEON_RBBM_SOFT_RESET );
+
+	RADEON_WRITE( RADEON_RBBM_SOFT_RESET, ( rbbm_soft_reset |
+						RADEON_SOFT_RESET_CP |
+						RADEON_SOFT_RESET_HI |
+						RADEON_SOFT_RESET_SE |
+						RADEON_SOFT_RESET_RE |
+						RADEON_SOFT_RESET_PP |
+						RADEON_SOFT_RESET_E2 |
+						RADEON_SOFT_RESET_RB ) );
+	RADEON_READ( RADEON_RBBM_SOFT_RESET );
+	RADEON_WRITE( RADEON_RBBM_SOFT_RESET, ( rbbm_soft_reset &
+						~( RADEON_SOFT_RESET_CP |
+						   RADEON_SOFT_RESET_HI |
+						   RADEON_SOFT_RESET_SE |
+						   RADEON_SOFT_RESET_RE |
+						   RADEON_SOFT_RESET_PP |
+						   RADEON_SOFT_RESET_E2 |
+						   RADEON_SOFT_RESET_RB ) ) );
+	RADEON_READ( RADEON_RBBM_SOFT_RESET );
+
+
+	RADEON_WRITE_PLL( RADEON_MCLK_CNTL, mclk_cntl );
+	RADEON_WRITE( RADEON_CLOCK_CNTL_INDEX, clock_cntl_index );
+	RADEON_WRITE( RADEON_RBBM_SOFT_RESET,  rbbm_soft_reset );
+
+	/* Reset the CP ring */
+	radeon_do_cp_reset( dev_priv );
+
+	/* The CP is no longer running after an engine reset */
+	dev_priv->cp_running = 0;
+
+	/* Reset any pending vertex, indirect buffers */
+	radeon_freelist_reset( dev );
+
+	return 0;
+}
+
+static void radeon_cp_init_ring_buffer( drm_device_t *dev,
+				        drm_radeon_private_t *dev_priv )
+{
+	u32 ring_start, cur_read_ptr;
+	u32 tmp;
+
+	/* Initialize the memory controller */
+	RADEON_WRITE( RADEON_MC_FB_LOCATION,
+		      (dev_priv->agp_vm_start - 1) & 0xffff0000 );
+
+	if ( !dev_priv->is_pci ) {
+		RADEON_WRITE( RADEON_MC_AGP_LOCATION,
+			      (((dev_priv->agp_vm_start - 1 +
+				 dev_priv->agp_size) & 0xffff0000) |
+			       (dev_priv->agp_vm_start >> 16)) );
+	}
+
+#if __REALLY_HAVE_AGP
+	if ( !dev_priv->is_pci )
+		ring_start = (dev_priv->cp_ring->offset
+			      - dev->agp->base
+			      + dev_priv->agp_vm_start);
+       else
+#endif
+		ring_start = (dev_priv->cp_ring->offset
+			      - dev->sg->handle
+			      + dev_priv->agp_vm_start);
+
+	RADEON_WRITE( RADEON_CP_RB_BASE, ring_start );
+
+	/* Set the write pointer delay */
+	RADEON_WRITE( RADEON_CP_RB_WPTR_DELAY, 0 );
+	RADEON_READ( RADEON_CP_RB_WPTR_DELAY ); /* read back to propagate */
+
+	/* Initialize the ring buffer's read and write pointers */
+	cur_read_ptr = RADEON_READ( RADEON_CP_RB_RPTR );
+	RADEON_WRITE( RADEON_CP_RB_WPTR, cur_read_ptr );
+	*dev_priv->ring.head = cur_read_ptr;
+	dev_priv->ring.tail = cur_read_ptr;
+
+	if ( !dev_priv->is_pci ) {
+		RADEON_WRITE( RADEON_CP_RB_RPTR_ADDR,
+			      dev_priv->ring_rptr->offset );
+	} else {
+		drm_sg_mem_t *entry = dev->sg;
+		unsigned long tmp_ofs, page_ofs;
+
+		tmp_ofs = dev_priv->ring_rptr->offset - dev->sg->handle;
+		page_ofs = tmp_ofs >> PAGE_SHIFT;
+
+		RADEON_WRITE( RADEON_CP_RB_RPTR_ADDR,
+			     entry->busaddr[page_ofs]);
+		DRM_DEBUG( "ring rptr: offset=0x%08x handle=0x%08lx\n",
+			   entry->busaddr[page_ofs],
+			   entry->handle + tmp_ofs );
+	}
+
+	/* Initialize the scratch register pointer.  This will cause
+	 * the scratch register values to be written out to memory
+	 * whenever they are updated.
+	 *
+	 * We simply put this behind the ring read pointer, this works
+	 * with PCI GART as well as (whatever kind of) AGP GART
+	 */
+	RADEON_WRITE( RADEON_SCRATCH_ADDR, RADEON_READ( RADEON_CP_RB_RPTR_ADDR )
+					 + RADEON_SCRATCH_REG_OFFSET );
+
+	dev_priv->scratch = ((__volatile__ u32 *)
+			     dev_priv->ring.head +
+			     (RADEON_SCRATCH_REG_OFFSET / sizeof(u32)));
+
+	RADEON_WRITE( RADEON_SCRATCH_UMSK, 0x7 );
+
+	/* Writeback doesn't seem to work everywhere, test it first */
+	DRM_WRITE32( &dev_priv->scratch[1], 0 );
+	RADEON_WRITE( RADEON_SCRATCH_REG1, 0xdeadbeef );
+
+	for ( tmp = 0 ; tmp < dev_priv->usec_timeout ; tmp++ ) {
+		if ( DRM_READ32( &dev_priv->scratch[1] ) == 0xdeadbeef )
+			break;
+		DRM_UDELAY( 1 );
+	}
+
+	if ( tmp < dev_priv->usec_timeout ) {
+		dev_priv->writeback_works = 1;
+		DRM_DEBUG( "writeback test succeeded, tmp=%d\n", tmp );
+	} else {
+		dev_priv->writeback_works = 0;
+		DRM_DEBUG( "writeback test failed\n" );
+	}
+
+	dev_priv->sarea_priv->last_frame = dev_priv->scratch[0] = 0;
+	RADEON_WRITE( RADEON_LAST_FRAME_REG,
+		      dev_priv->sarea_priv->last_frame );
+
+	dev_priv->sarea_priv->last_dispatch = dev_priv->scratch[1] = 0;
+	RADEON_WRITE( RADEON_LAST_DISPATCH_REG,
+		      dev_priv->sarea_priv->last_dispatch );
+
+	dev_priv->sarea_priv->last_clear = dev_priv->scratch[2] = 0;
+	RADEON_WRITE( RADEON_LAST_CLEAR_REG,
+		      dev_priv->sarea_priv->last_clear );
+
+	/* Set ring buffer size */
+#ifdef __BIG_ENDIAN
+	RADEON_WRITE( RADEON_CP_RB_CNTL, dev_priv->ring.size_l2qw | RADEON_BUF_SWAP_32BIT );
+#else
+	RADEON_WRITE( RADEON_CP_RB_CNTL, dev_priv->ring.size_l2qw );
+#endif
+
+	radeon_do_wait_for_idle( dev_priv );
+
+	/* Turn on bus mastering */
+	tmp = RADEON_READ( RADEON_BUS_CNTL ) & ~RADEON_BUS_MASTER_DIS;
+	RADEON_WRITE( RADEON_BUS_CNTL, tmp );
+
+	/* Sync everything up */
+	RADEON_WRITE( RADEON_ISYNC_CNTL,
+		      (RADEON_ISYNC_ANY2D_IDLE3D |
+		       RADEON_ISYNC_ANY3D_IDLE2D |
+		       RADEON_ISYNC_WAIT_IDLEGUI |
+		       RADEON_ISYNC_CPSCRATCH_IDLEGUI) );
+}
+
+static int radeon_do_init_cp( drm_device_t *dev, drm_radeon_init_t *init )
+{
+	drm_radeon_private_t *dev_priv;
+	u32 tmp;
+	DRM_DEBUG( "\n" );
+
+	dev_priv = DRM(alloc)( sizeof(drm_radeon_private_t), DRM_MEM_DRIVER );
+	if ( dev_priv == NULL )
+		return DRM_ERR(ENOMEM);
+
+	memset( dev_priv, 0, sizeof(drm_radeon_private_t) );
+
+	dev_priv->is_pci = init->is_pci;
+
+	if ( dev_priv->is_pci && !dev->sg ) {
+		DRM_ERROR( "PCI GART memory not allocated!\n" );
+		dev->dev_private = (void *)dev_priv;
+		radeon_do_cleanup_cp(dev);
+		return DRM_ERR(EINVAL);
+	}
+
+	dev_priv->usec_timeout = init->usec_timeout;
+	if ( dev_priv->usec_timeout < 1 ||
+	     dev_priv->usec_timeout > RADEON_MAX_USEC_TIMEOUT ) {
+		DRM_DEBUG( "TIMEOUT problem!\n" );
+		dev->dev_private = (void *)dev_priv;
+		radeon_do_cleanup_cp(dev);
+		return DRM_ERR(EINVAL);
+	}
+
+	dev_priv->is_r200 = (init->func == RADEON_INIT_R200_CP);
+	dev_priv->do_boxes = 0;
+	dev_priv->cp_mode = init->cp_mode;
+
+	/* We don't support anything other than bus-mastering ring mode,
+	 * but the ring can be in either AGP or PCI space for the ring
+	 * read pointer.
+	 */
+	if ( ( init->cp_mode != RADEON_CSQ_PRIBM_INDDIS ) &&
+	     ( init->cp_mode != RADEON_CSQ_PRIBM_INDBM ) ) {
+		DRM_DEBUG( "BAD cp_mode (%x)!\n", init->cp_mode );
+		dev->dev_private = (void *)dev_priv;
+		radeon_do_cleanup_cp(dev);
+		return DRM_ERR(EINVAL);
+	}
+
+	switch ( init->fb_bpp ) {
+	case 16:
+		dev_priv->color_fmt = RADEON_COLOR_FORMAT_RGB565;
+		break;
+	case 32:
+	default:
+		dev_priv->color_fmt = RADEON_COLOR_FORMAT_ARGB8888;
+		break;
+	}
+	dev_priv->front_offset	= init->front_offset;
+	dev_priv->front_pitch	= init->front_pitch;
+	dev_priv->back_offset	= init->back_offset;
+	dev_priv->back_pitch	= init->back_pitch;
+
+	switch ( init->depth_bpp ) {
+	case 16:
+		dev_priv->depth_fmt = RADEON_DEPTH_FORMAT_16BIT_INT_Z;
+		break;
+	case 32:
+	default:
+		dev_priv->depth_fmt = RADEON_DEPTH_FORMAT_24BIT_INT_Z;
+		break;
+	}
+	dev_priv->depth_offset	= init->depth_offset;
+	dev_priv->depth_pitch	= init->depth_pitch;
+
+	dev_priv->front_pitch_offset = (((dev_priv->front_pitch/64) << 22) |
+					(dev_priv->front_offset >> 10));
+	dev_priv->back_pitch_offset = (((dev_priv->back_pitch/64) << 22) |
+				       (dev_priv->back_offset >> 10));
+	dev_priv->depth_pitch_offset = (((dev_priv->depth_pitch/64) << 22) |
+					(dev_priv->depth_offset >> 10));
+
+	/* Hardware state for depth clears.  Remove this if/when we no
+	 * longer clear the depth buffer with a 3D rectangle.  Hard-code
+	 * all values to prevent unwanted 3D state from slipping through
+	 * and screwing with the clear operation.
+	 */
+	dev_priv->depth_clear.rb3d_cntl = (RADEON_PLANE_MASK_ENABLE |
+					   (dev_priv->color_fmt << 10) |
+					   (1<<15));
+
+	dev_priv->depth_clear.rb3d_zstencilcntl = 
+		(dev_priv->depth_fmt |
+		 RADEON_Z_TEST_ALWAYS |
+		 RADEON_STENCIL_TEST_ALWAYS |
+		 RADEON_STENCIL_S_FAIL_REPLACE |
+		 RADEON_STENCIL_ZPASS_REPLACE |
+		 RADEON_STENCIL_ZFAIL_REPLACE |
+		 RADEON_Z_WRITE_ENABLE);
+
+	dev_priv->depth_clear.se_cntl = (RADEON_FFACE_CULL_CW |
+					 RADEON_BFACE_SOLID |
+					 RADEON_FFACE_SOLID |
+					 RADEON_FLAT_SHADE_VTX_LAST |
+					 RADEON_DIFFUSE_SHADE_FLAT |
+					 RADEON_ALPHA_SHADE_FLAT |
+					 RADEON_SPECULAR_SHADE_FLAT |
+					 RADEON_FOG_SHADE_FLAT |
+					 RADEON_VTX_PIX_CENTER_OGL |
+					 RADEON_ROUND_MODE_TRUNC |
+					 RADEON_ROUND_PREC_8TH_PIX);
+
+	DRM_GETSAREA();
+	
+	if(!dev_priv->sarea) {
+		DRM_ERROR("could not find sarea!\n");
+		dev->dev_private = (void *)dev_priv;
+		radeon_do_cleanup_cp(dev);
+		return DRM_ERR(EINVAL);
+	}
+
+	DRM_FIND_MAP( dev_priv->fb, init->fb_offset );
+	if(!dev_priv->fb) {
+		DRM_ERROR("could not find framebuffer!\n");
+		dev->dev_private = (void *)dev_priv;
+		radeon_do_cleanup_cp(dev);
+		return DRM_ERR(EINVAL);
+	}
+	DRM_FIND_MAP( dev_priv->mmio, init->mmio_offset );
+	if(!dev_priv->mmio) {
+		DRM_ERROR("could not find mmio region!\n");
+		dev->dev_private = (void *)dev_priv;
+		radeon_do_cleanup_cp(dev);
+		return DRM_ERR(EINVAL);
+	}
+	DRM_FIND_MAP( dev_priv->cp_ring, init->ring_offset );
+	if(!dev_priv->cp_ring) {
+		DRM_ERROR("could not find cp ring region!\n");
+		dev->dev_private = (void *)dev_priv;
+		radeon_do_cleanup_cp(dev);
+		return DRM_ERR(EINVAL);
+	}
+	DRM_FIND_MAP( dev_priv->ring_rptr, init->ring_rptr_offset );
+	if(!dev_priv->ring_rptr) {
+		DRM_ERROR("could not find ring read pointer!\n");
+		dev->dev_private = (void *)dev_priv;
+		radeon_do_cleanup_cp(dev);
+		return DRM_ERR(EINVAL);
+	}
+	DRM_FIND_MAP( dev_priv->buffers, init->buffers_offset );
+	if(!dev_priv->buffers) {
+		DRM_ERROR("could not find dma buffer region!\n");
+		dev->dev_private = (void *)dev_priv;
+		radeon_do_cleanup_cp(dev);
+		return DRM_ERR(EINVAL);
+	}
+
+	if ( !dev_priv->is_pci ) {
+		DRM_FIND_MAP( dev_priv->agp_textures,
+			      init->agp_textures_offset );
+		if(!dev_priv->agp_textures) {
+			DRM_ERROR("could not find agp texture region!\n");
+			dev->dev_private = (void *)dev_priv;
+			radeon_do_cleanup_cp(dev);
+			return DRM_ERR(EINVAL);
+		}
+	}
+
+	dev_priv->sarea_priv =
+		(drm_radeon_sarea_t *)((u8 *)dev_priv->sarea->handle +
+				       init->sarea_priv_offset);
+
+	if ( !dev_priv->is_pci ) {
+		DRM_IOREMAP( dev_priv->cp_ring );
+		DRM_IOREMAP( dev_priv->ring_rptr );
+		DRM_IOREMAP( dev_priv->buffers );
+		if(!dev_priv->cp_ring->handle ||
+		   !dev_priv->ring_rptr->handle ||
+		   !dev_priv->buffers->handle) {
+			DRM_ERROR("could not find ioremap agp regions!\n");
+			dev->dev_private = (void *)dev_priv;
+			radeon_do_cleanup_cp(dev);
+			return DRM_ERR(EINVAL);
+		}
+	} else {
+		dev_priv->cp_ring->handle =
+			(void *)dev_priv->cp_ring->offset;
+		dev_priv->ring_rptr->handle =
+			(void *)dev_priv->ring_rptr->offset;
+		dev_priv->buffers->handle = (void *)dev_priv->buffers->offset;
+
+		DRM_DEBUG( "dev_priv->cp_ring->handle %p\n",
+			   dev_priv->cp_ring->handle );
+		DRM_DEBUG( "dev_priv->ring_rptr->handle %p\n",
+			   dev_priv->ring_rptr->handle );
+		DRM_DEBUG( "dev_priv->buffers->handle %p\n",
+			   dev_priv->buffers->handle );
+	}
+
+
+	dev_priv->agp_size = init->agp_size;
+	dev_priv->agp_vm_start = RADEON_READ( RADEON_CONFIG_APER_SIZE );
+#if __REALLY_HAVE_AGP
+	if ( !dev_priv->is_pci )
+		dev_priv->agp_buffers_offset = (dev_priv->buffers->offset
+						- dev->agp->base
+						+ dev_priv->agp_vm_start);
+	else
+#endif
+		dev_priv->agp_buffers_offset = (dev_priv->buffers->offset
+						- dev->sg->handle
+						+ dev_priv->agp_vm_start);
+
+	DRM_DEBUG( "dev_priv->agp_size %d\n",
+		   dev_priv->agp_size );
+	DRM_DEBUG( "dev_priv->agp_vm_start 0x%x\n",
+		   dev_priv->agp_vm_start );
+	DRM_DEBUG( "dev_priv->agp_buffers_offset 0x%lx\n",
+		   dev_priv->agp_buffers_offset );
+
+	dev_priv->ring.head = ((__volatile__ u32 *)
+			       dev_priv->ring_rptr->handle);
+
+	dev_priv->ring.start = (u32 *)dev_priv->cp_ring->handle;
+	dev_priv->ring.end = ((u32 *)dev_priv->cp_ring->handle
+			      + init->ring_size / sizeof(u32));
+	dev_priv->ring.size = init->ring_size;
+	dev_priv->ring.size_l2qw = DRM(order)( init->ring_size / 8 );
+
+	dev_priv->ring.tail_mask =
+		(dev_priv->ring.size / sizeof(u32)) - 1;
+
+	dev_priv->ring.high_mark = RADEON_RING_HIGH_MARK;
+
+#if __REALLY_HAVE_SG
+	if ( dev_priv->is_pci ) {
+		if (!DRM(ati_pcigart_init)( dev, &dev_priv->phys_pci_gart,
+					    &dev_priv->bus_pci_gart)) {
+			DRM_ERROR( "failed to init PCI GART!\n" );
+			dev->dev_private = (void *)dev_priv;
+			radeon_do_cleanup_cp(dev);
+			return DRM_ERR(ENOMEM);
+		}
+		/* Turn on PCI GART
+		 */
+		tmp = RADEON_READ( RADEON_AIC_CNTL )
+		      | RADEON_PCIGART_TRANSLATE_EN;
+		RADEON_WRITE( RADEON_AIC_CNTL, tmp );
+
+		/* set PCI GART page-table base address
+		 */
+		RADEON_WRITE( RADEON_AIC_PT_BASE, dev_priv->bus_pci_gart );
+
+		/* set address range for PCI address translate
+		 */
+		RADEON_WRITE( RADEON_AIC_LO_ADDR, dev_priv->agp_vm_start );
+		RADEON_WRITE( RADEON_AIC_HI_ADDR, dev_priv->agp_vm_start
+						  + dev_priv->agp_size - 1);
+
+		/* Turn off AGP aperture -- is this required for PCIGART?
+		 */
+		RADEON_WRITE( RADEON_MC_AGP_LOCATION, 0xffffffc0 ); /* ?? */
+		RADEON_WRITE( RADEON_AGP_COMMAND, 0 ); /* clear AGP_COMMAND */
+	} else {
+#endif /* __REALLY_HAVE_SG */
+		/* Turn off PCI GART
+		 */
+		tmp = RADEON_READ( RADEON_AIC_CNTL )
+		      & ~RADEON_PCIGART_TRANSLATE_EN;
+		RADEON_WRITE( RADEON_AIC_CNTL, tmp );
+#if __REALLY_HAVE_SG
+	}
+#endif /* __REALLY_HAVE_SG */
+
+	radeon_cp_load_microcode( dev_priv );
+	radeon_cp_init_ring_buffer( dev, dev_priv );
+
+	dev_priv->last_buf = 0;
+
+	dev->dev_private = (void *)dev_priv;
+
+	radeon_do_engine_reset( dev );
+
+	return 0;
+}
+
+int radeon_do_cleanup_cp( drm_device_t *dev )
+{
+	DRM_DEBUG( "\n" );
+
+	if ( dev->dev_private ) {
+		drm_radeon_private_t *dev_priv = dev->dev_private;
+
+		if ( !dev_priv->is_pci ) {
+			DRM_IOREMAPFREE( dev_priv->cp_ring );
+			DRM_IOREMAPFREE( dev_priv->ring_rptr );
+			DRM_IOREMAPFREE( dev_priv->buffers );
+		} else {
+#if __REALLY_HAVE_SG
+			if (!DRM(ati_pcigart_cleanup)( dev,
+						dev_priv->phys_pci_gart,
+						dev_priv->bus_pci_gart ))
+				DRM_ERROR( "failed to cleanup PCI GART!\n" );
+#endif /* __REALLY_HAVE_SG */
+		}
+
+		DRM(free)( dev->dev_private, sizeof(drm_radeon_private_t),
+			   DRM_MEM_DRIVER );
+		dev->dev_private = NULL;
+	}
+
+	return 0;
+}
+
+/* This code will reinit the Radeon CP hardware after a resume from disc.  
+ * AFAIK, it would be very difficult to pickle the state at suspend time, so 
+ * here we make sure that all Radeon hardware initialisation is re-done without
+ * affecting running applications.  This function is called radeon_do_resume_cp()
+ * as it was derived from radeon_init_cp, where most of the initialisation takes
+ * place during DRI init.
+ *
+ * This patch is NOT to be confused with my and Michel Daenzer's earlier DRI
+ * reinit work, which de- and re-initialised the complete DRI at every VT
+ * switch.
+ *
+ * Charl P. Botha <http://cpbotha.net>
+ */
+static int radeon_do_resume_cp( drm_device_t *dev)
+{
+	drm_radeon_private_t *dev_priv;
+	u32 tmp;
+	DRM_DEBUG( "\n" );
+	
+	DRM_DEBUG("Starting radeon_do_resume_cp()\n");
+
+	/* get the existing dev_private */
+	dev_priv = dev->dev_private;
+
+#if !defined(PCIGART_ENABLED)
+	/* PCI support is not 100% working, so we disable it here.
+	 */
+	if ( dev_priv->is_pci ) {
+		DRM_ERROR( "PCI GART not yet supported for Radeon!\n" );
+		radeon_do_cleanup_cp(dev);
+		return DRM_ERR(EINVAL);
+	}
+#endif
+
+	if ( dev_priv->is_pci && !dev->sg ) {
+		DRM_ERROR( "PCI GART memory not allocated!\n" );
+		radeon_do_cleanup_cp(dev);
+		return DRM_ERR(EINVAL);
+	}
+
+	if ( dev_priv->usec_timeout < 1 ||
+	     dev_priv->usec_timeout > RADEON_MAX_USEC_TIMEOUT ) {
+		DRM_DEBUG( "TIMEOUT problem!\n" );
+		radeon_do_cleanup_cp(dev);
+		return DRM_ERR(EINVAL);
+	}
+
+	if ( ( dev_priv->cp_mode != RADEON_CSQ_PRIBM_INDDIS ) &&
+	     ( dev_priv->cp_mode != RADEON_CSQ_PRIBM_INDBM ) ) {
+		DRM_DEBUG( "BAD cp_mode (%x)!\n", dev_priv->cp_mode );
+		radeon_do_cleanup_cp(dev);
+		return DRM_ERR(EINVAL);
+	}
+
+	if(!dev_priv->sarea) {
+		DRM_ERROR("could not find sarea!\n");
+		radeon_do_cleanup_cp(dev);
+		return DRM_ERR(EINVAL);
+	}
+
+	if(!dev_priv->fb) {
+		DRM_ERROR("could not find framebuffer!\n");
+		radeon_do_cleanup_cp(dev);
+		return DRM_ERR(EINVAL);
+	}
+
+	if(!dev_priv->mmio) {
+		DRM_ERROR("could not find mmio region!\n");
+		radeon_do_cleanup_cp(dev);
+		return DRM_ERR(EINVAL);
+	}
+
+	if(!dev_priv->cp_ring) {
+		DRM_ERROR("could not find cp ring region!\n");
+		radeon_do_cleanup_cp(dev);
+		return DRM_ERR(EINVAL);
+	}
+
+	if(!dev_priv->ring_rptr) {
+		DRM_ERROR("could not find ring read pointer!\n");
+		radeon_do_cleanup_cp(dev);
+		return DRM_ERR(EINVAL);
+	}
+
+	if(!dev_priv->buffers) {
+		DRM_ERROR("could not find dma buffer region!\n");
+		radeon_do_cleanup_cp(dev);
+		return DRM_ERR(EINVAL);
+	}
+
+	if ( !dev_priv->is_pci ) {
+		if(!dev_priv->agp_textures) {
+			DRM_ERROR("could not find agp texture region!\n");
+			radeon_do_cleanup_cp(dev);
+			return DRM_ERR(EINVAL);
+		}
+	}
+
+	if ( !dev_priv->is_pci ) {
+		if(!dev_priv->cp_ring->handle ||
+		   !dev_priv->ring_rptr->handle ||
+		   !dev_priv->buffers->handle) {
+			DRM_ERROR("could not find ioremap agp regions!\n");
+			radeon_do_cleanup_cp(dev);
+			return DRM_ERR(EINVAL);
+		}
+	} else {
+		DRM_DEBUG( "dev_priv->cp_ring->handle %p\n",
+			   dev_priv->cp_ring->handle );
+		DRM_DEBUG( "dev_priv->ring_rptr->handle %p\n",
+			   dev_priv->ring_rptr->handle );
+		DRM_DEBUG( "dev_priv->buffers->handle %p\n",
+			   dev_priv->buffers->handle );
+	}
+
+
+	DRM_DEBUG( "dev_priv->agp_size %d\n",
+		   dev_priv->agp_size );
+	DRM_DEBUG( "dev_priv->agp_vm_start 0x%x\n",
+		   dev_priv->agp_vm_start );
+	DRM_DEBUG( "dev_priv->agp_buffers_offset 0x%lx\n",
+		   dev_priv->agp_buffers_offset );
+
+#if __REALLY_HAVE_SG
+	if ( dev_priv->is_pci ) {
+	        /* I'm not so sure about this ati_picgart_init after at resume-time... */
+	        if (!DRM(ati_pcigart_init)( dev, &dev_priv->phys_pci_gart,
+					    &dev_priv->bus_pci_gart)) {   
+		    DRM_ERROR( "failed to init PCI GART!\n" );        
+		    radeon_do_cleanup_cp(dev);                        
+		    return DRM_ERR(ENOMEM);                           
+		}
+
+		tmp = RADEON_READ( RADEON_AIC_CNTL )
+		      | RADEON_PCIGART_TRANSLATE_EN;
+		RADEON_WRITE( RADEON_AIC_CNTL, tmp );
+
+		/* set PCI GART page-table base address
+		 */
+		RADEON_WRITE( RADEON_AIC_PT_BASE, dev_priv->bus_pci_gart );
+
+		/* set address range for PCI address translate
+		 */
+		RADEON_WRITE( RADEON_AIC_LO_ADDR, dev_priv->agp_vm_start );
+		RADEON_WRITE( RADEON_AIC_HI_ADDR, dev_priv->agp_vm_start
+						  + dev_priv->agp_size - 1);
+
+		/* Turn off AGP aperture -- is this required for PCIGART?
+		 */
+		RADEON_WRITE( RADEON_MC_AGP_LOCATION, 0xffffffc0 ); /* ?? */
+		RADEON_WRITE( RADEON_AGP_COMMAND, 0 ); /* clear AGP_COMMAND */
+	} else {
+#endif /* __REALLY_HAVE_SG */
+		/* Turn off PCI GART
+		 */
+		tmp = RADEON_READ( RADEON_AIC_CNTL )
+		      & ~RADEON_PCIGART_TRANSLATE_EN;
+		RADEON_WRITE( RADEON_AIC_CNTL, tmp );
+#if __REALLY_HAVE_SG
+	}
+#endif /* __REALLY_HAVE_SG */
+
+	radeon_cp_load_microcode( dev_priv );
+	radeon_cp_init_ring_buffer( dev, dev_priv );
+
+	radeon_do_engine_reset( dev );
+
+	return 0;
+}
+
+
+int radeon_cp_init( DRM_IOCTL_ARGS )
+{
+	DRM_DEVICE;
+	drm_radeon_init_t init;
+
+	DRM_COPY_FROM_USER_IOCTL( init, (drm_radeon_init_t *)data, sizeof(init) );
+
+	switch ( init.func ) {
+	case RADEON_INIT_CP:
+	case RADEON_INIT_R200_CP:
+		return radeon_do_init_cp( dev, &init );
+	case RADEON_CLEANUP_CP:
+		return radeon_do_cleanup_cp( dev );
+	}
+
+	return DRM_ERR(EINVAL);
+}
+
+int radeon_cp_start( DRM_IOCTL_ARGS )
+{
+	DRM_DEVICE;
+	drm_radeon_private_t *dev_priv = dev->dev_private;
+	DRM_DEBUG( "\n" );
+
+	LOCK_TEST_WITH_RETURN( dev );
+
+	if ( dev_priv->cp_running ) {
+		DRM_DEBUG( "%s while CP running\n", __FUNCTION__ );
+		return 0;
+	}
+	if ( dev_priv->cp_mode == RADEON_CSQ_PRIDIS_INDDIS ) {
+		DRM_DEBUG( "%s called with bogus CP mode (%d)\n",
+			   __FUNCTION__, dev_priv->cp_mode );
+		return 0;
+	}
+
+	radeon_do_cp_start( dev_priv );
+
+	return 0;
+}
+
+/* Stop the CP.  The engine must have been idled before calling this
+ * routine.
+ */
+int radeon_cp_stop( DRM_IOCTL_ARGS )
+{
+	DRM_DEVICE;
+	drm_radeon_private_t *dev_priv = dev->dev_private;
+	drm_radeon_cp_stop_t stop;
+	int ret;
+	DRM_DEBUG( "\n" );
+
+	LOCK_TEST_WITH_RETURN( dev );
+
+	DRM_COPY_FROM_USER_IOCTL( stop, (drm_radeon_cp_stop_t *)data, sizeof(stop) );
+
+	/* Flush any pending CP commands.  This ensures any outstanding
+	 * commands are exectuted by the engine before we turn it off.
+	 */
+	if ( stop.flush ) {
+		radeon_do_cp_flush( dev_priv );
+	}
+
+	/* If we fail to make the engine go idle, we return an error
+	 * code so that the DRM ioctl wrapper can try again.
+	 */
+	if ( stop.idle ) {
+		ret = radeon_do_cp_idle( dev_priv );
+		if ( ret ) return ret;
+	}
+
+	/* Finally, we can turn off the CP.  If the engine isn't idle,
+	 * we will get some dropped triangles as they won't be fully
+	 * rendered before the CP is shut down.
+	 */
+	radeon_do_cp_stop( dev_priv );
+
+	/* Reset the engine */
+	radeon_do_engine_reset( dev );
+
+	return 0;
+}
+
+/* Just reset the CP ring.  Called as part of an X Server engine reset.
+ */
+int radeon_cp_reset( DRM_IOCTL_ARGS )
+{
+	DRM_DEVICE;
+	drm_radeon_private_t *dev_priv = dev->dev_private;
+	DRM_DEBUG( "\n" );
+
+	LOCK_TEST_WITH_RETURN( dev );
+
+	if ( !dev_priv ) {
+		DRM_DEBUG( "%s called before init done\n", __FUNCTION__ );
+		return DRM_ERR(EINVAL);
+	}
+
+	radeon_do_cp_reset( dev_priv );
+
+	/* The CP is no longer running after an engine reset */
+	dev_priv->cp_running = 0;
+
+	return 0;
+}
+
+int radeon_cp_idle( DRM_IOCTL_ARGS )
+{
+	DRM_DEVICE;
+	drm_radeon_private_t *dev_priv = dev->dev_private;
+	DRM_DEBUG( "\n" );
+
+	LOCK_TEST_WITH_RETURN( dev );
+
+/* 	if (dev->irq)  */
+/* 		radeon_emit_and_wait_irq( dev ); */
+
+	return radeon_do_cp_idle( dev_priv );
+}
+
+/* Added by Charl P. Botha to call radeon_do_resume_cp().
+ */
+int radeon_cp_resume( DRM_IOCTL_ARGS )
+{
+	DRM_DEVICE;
+
+	return radeon_do_resume_cp(dev);
+}
+
+
+int radeon_engine_reset( DRM_IOCTL_ARGS )
+{
+	DRM_DEVICE;
+	DRM_DEBUG( "\n" );
+
+	LOCK_TEST_WITH_RETURN( dev );
+
+	return radeon_do_engine_reset( dev );
+}
+
+
+/* ================================================================
+ * Fullscreen mode
+ */
+
+/* KW: Deprecated to say the least:
+ */
+int radeon_fullscreen( DRM_IOCTL_ARGS )
+{
+	return 0;
+}
+
+
+/* ================================================================
+ * Freelist management
+ */
+
+/* Original comment: FIXME: ROTATE_BUFS is a hack to cycle through
+ *   bufs until freelist code is used.  Note this hides a problem with
+ *   the scratch register * (used to keep track of last buffer
+ *   completed) being written to before * the last buffer has actually
+ *   completed rendering.  
+ *
+ * KW:  It's also a good way to find free buffers quickly.
+ *
+ * KW: Ideally this loop wouldn't exist, and freelist_get wouldn't
+ * sleep.  However, bugs in older versions of radeon_accel.c mean that
+ * we essentially have to do this, else old clients will break.
+ * 
+ * However, it does leave open a potential deadlock where all the
+ * buffers are held by other clients, which can't release them because
+ * they can't get the lock.  
+ */
+
+drm_buf_t *radeon_freelist_get( drm_device_t *dev )
+{
+	drm_device_dma_t *dma = dev->dma;
+	drm_radeon_private_t *dev_priv = dev->dev_private;
+	drm_radeon_buf_priv_t *buf_priv;
+	drm_buf_t *buf;
+	int i, t;
+	int start;
+
+	if ( ++dev_priv->last_buf >= dma->buf_count )
+		dev_priv->last_buf = 0;
+
+	start = dev_priv->last_buf;
+
+	for ( t = 0 ; t < dev_priv->usec_timeout ; t++ ) {
+		u32 done_age = GET_SCRATCH( 1 );
+		DRM_DEBUG("done_age = %d\n",done_age);
+		for ( i = start ; i < dma->buf_count ; i++ ) {
+			buf = dma->buflist[i];
+			buf_priv = buf->dev_private;
+			if ( buf->pid == 0 || (buf->pending && 
+					       buf_priv->age <= done_age) ) {
+				dev_priv->stats.requested_bufs++;
+				buf->pending = 0;
+				return buf;
+			}
+			start = 0;
+		}
+
+		if (t) {
+			DRM_UDELAY( 1 );
+			dev_priv->stats.freelist_loops++;
+		}
+	}
+
+	DRM_DEBUG( "returning NULL!\n" );
+	return NULL;
+}
+#if 0
+drm_buf_t *radeon_freelist_get( drm_device_t *dev )
+{
+	drm_device_dma_t *dma = dev->dma;
+	drm_radeon_private_t *dev_priv = dev->dev_private;
+	drm_radeon_buf_priv_t *buf_priv;
+	drm_buf_t *buf;
+	int i, t;
+	int start;
+	u32 done_age = DRM_READ32(&dev_priv->scratch[1]);
+
+	if ( ++dev_priv->last_buf >= dma->buf_count )
+		dev_priv->last_buf = 0;
+
+	start = dev_priv->last_buf;
+	dev_priv->stats.freelist_loops++;
+	
+	for ( t = 0 ; t < 2 ; t++ ) {
+		for ( i = start ; i < dma->buf_count ; i++ ) {
+			buf = dma->buflist[i];
+			buf_priv = buf->dev_private;
+			if ( buf->pid == 0 || (buf->pending && 
+					       buf_priv->age <= done_age) ) {
+				dev_priv->stats.requested_bufs++;
+				buf->pending = 0;
+				return buf;
+			}
+		}
+		start = 0;
+	}
+
+	return NULL;
+}
+#endif
+
+void radeon_freelist_reset( drm_device_t *dev )
+{
+	drm_device_dma_t *dma = dev->dma;
+	drm_radeon_private_t *dev_priv = dev->dev_private;
+	int i;
+
+	dev_priv->last_buf = 0;
+	for ( i = 0 ; i < dma->buf_count ; i++ ) {
+		drm_buf_t *buf = dma->buflist[i];
+		drm_radeon_buf_priv_t *buf_priv = buf->dev_private;
+		buf_priv->age = 0;
+	}
+}
+
+
+/* ================================================================
+ * CP command submission
+ */
+
+int radeon_wait_ring( drm_radeon_private_t *dev_priv, int n )
+{
+	drm_radeon_ring_buffer_t *ring = &dev_priv->ring;
+	int i;
+	u32 last_head = GET_RING_HEAD(ring);
+
+	for ( i = 0 ; i < dev_priv->usec_timeout ; i++ ) {
+		u32 head = GET_RING_HEAD(ring);
+
+		ring->space = (head - ring->tail) * sizeof(u32);
+		if ( ring->space <= 0 )
+			ring->space += ring->size;
+		if ( ring->space > n )
+			return 0;
+		
+		dev_priv->stats.boxes |= RADEON_BOX_WAIT_IDLE;
+
+		if (head != last_head)
+			i = 0;
+		last_head = head;
+
+		DRM_UDELAY( 1 );
+	}
+
+	/* FIXME: This return value is ignored in the BEGIN_RING macro! */
+#if RADEON_FIFO_DEBUG
+	radeon_status( dev_priv );
+	DRM_ERROR( "failed!\n" );
+#endif
+	return DRM_ERR(EBUSY);
+}
+
+static int radeon_cp_get_buffers( drm_device_t *dev, drm_dma_t *d )
+{
+	int i;
+	drm_buf_t *buf;
+
+	for ( i = d->granted_count ; i < d->request_count ; i++ ) {
+		buf = radeon_freelist_get( dev );
+		if ( !buf ) return DRM_ERR(EBUSY); /* NOTE: broken client */
+
+		buf->pid = DRM_CURRENTPID;
+
+		if ( DRM_COPY_TO_USER( &d->request_indices[i], &buf->idx,
+				   sizeof(buf->idx) ) )
+			return DRM_ERR(EFAULT);
+		if ( DRM_COPY_TO_USER( &d->request_sizes[i], &buf->total,
+				   sizeof(buf->total) ) )
+			return DRM_ERR(EFAULT);
+
+		d->granted_count++;
+	}
+	return 0;
+}
+
+int radeon_cp_buffers( DRM_IOCTL_ARGS )
+{
+	DRM_DEVICE;
+	drm_device_dma_t *dma = dev->dma;
+	int ret = 0;
+	drm_dma_t d;
+
+	LOCK_TEST_WITH_RETURN( dev );
+
+	DRM_COPY_FROM_USER_IOCTL( d, (drm_dma_t *)data, sizeof(d) );
+
+	/* Please don't send us buffers.
+	 */
+	if ( d.send_count != 0 ) {
+		DRM_ERROR( "Process %d trying to send %d buffers via drmDMA\n",
+			   DRM_CURRENTPID, d.send_count );
+		return DRM_ERR(EINVAL);
+	}
+
+	/* We'll send you buffers.
+	 */
+	if ( d.request_count < 0 || d.request_count > dma->buf_count ) {
+		DRM_ERROR( "Process %d trying to get %d buffers (of %d max)\n",
+			   DRM_CURRENTPID, d.request_count, dma->buf_count );
+		return DRM_ERR(EINVAL);
+	}
+
+	d.granted_count = 0;
+
+	if ( d.request_count ) {
+		ret = radeon_cp_get_buffers( dev, &d );
+	}
+
+	DRM_COPY_TO_USER_IOCTL( (drm_dma_t *)data, d, sizeof(d) );
+
+	return ret;
+}
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/radeon_drm.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/radeon_drm.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/radeon_drm.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/radeon_drm.h	2003-07-30 11:18:33.000000000 +0200
@@ -0,0 +1,578 @@
+/* radeon_drm.h -- Public header for the radeon driver -*- linux-c -*-
+ *
+ * Copyright 2000 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Fremont, California.
+ * Copyright 2002 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Kevin E. Martin <martin@valinux.com>
+ *    Gareth Hughes <gareth@valinux.com>
+ *    Keith Whitwell <keith@tungstengraphics.com>
+ */
+
+#ifndef __RADEON_DRM_H__
+#define __RADEON_DRM_H__
+
+/* WARNING: If you change any of these defines, make sure to change the
+ * defines in the X server file (radeon_sarea.h)
+ */
+#ifndef __RADEON_SAREA_DEFINES__
+#define __RADEON_SAREA_DEFINES__
+
+/* Old style state flags, required for sarea interface (1.1 and 1.2
+ * clears) and 1.2 drm_vertex2 ioctl.
+ */
+#define RADEON_UPLOAD_CONTEXT		0x00000001
+#define RADEON_UPLOAD_VERTFMT		0x00000002
+#define RADEON_UPLOAD_LINE		0x00000004
+#define RADEON_UPLOAD_BUMPMAP		0x00000008
+#define RADEON_UPLOAD_MASKS		0x00000010
+#define RADEON_UPLOAD_VIEWPORT		0x00000020
+#define RADEON_UPLOAD_SETUP		0x00000040
+#define RADEON_UPLOAD_TCL		0x00000080
+#define RADEON_UPLOAD_MISC		0x00000100
+#define RADEON_UPLOAD_TEX0		0x00000200
+#define RADEON_UPLOAD_TEX1		0x00000400
+#define RADEON_UPLOAD_TEX2		0x00000800
+#define RADEON_UPLOAD_TEX0IMAGES	0x00001000
+#define RADEON_UPLOAD_TEX1IMAGES	0x00002000
+#define RADEON_UPLOAD_TEX2IMAGES	0x00004000
+#define RADEON_UPLOAD_CLIPRECTS		0x00008000 /* handled client-side */
+#define RADEON_REQUIRE_QUIESCENCE	0x00010000
+#define RADEON_UPLOAD_ZBIAS		0x00020000 /* version 1.2 and newer */
+#define RADEON_UPLOAD_ALL		0x003effff
+#define RADEON_UPLOAD_CONTEXT_ALL       0x003e01ff
+
+
+/* New style per-packet identifiers for use in cmd_buffer ioctl with
+ * the RADEON_EMIT_PACKET command.  Comments relate new packets to old
+ * state bits and the packet size:
+ */
+#define RADEON_EMIT_PP_MISC                         0 /* context/7 */
+#define RADEON_EMIT_PP_CNTL                         1 /* context/3 */
+#define RADEON_EMIT_RB3D_COLORPITCH                 2 /* context/1 */
+#define RADEON_EMIT_RE_LINE_PATTERN                 3 /* line/2 */
+#define RADEON_EMIT_SE_LINE_WIDTH                   4 /* line/1 */
+#define RADEON_EMIT_PP_LUM_MATRIX                   5 /* bumpmap/1 */
+#define RADEON_EMIT_PP_ROT_MATRIX_0                 6 /* bumpmap/2 */
+#define RADEON_EMIT_RB3D_STENCILREFMASK             7 /* masks/3 */
+#define RADEON_EMIT_SE_VPORT_XSCALE                 8 /* viewport/6 */
+#define RADEON_EMIT_SE_CNTL                         9 /* setup/2 */
+#define RADEON_EMIT_SE_CNTL_STATUS                  10 /* setup/1 */
+#define RADEON_EMIT_RE_MISC                         11 /* misc/1 */
+#define RADEON_EMIT_PP_TXFILTER_0                   12 /* tex0/6 */
+#define RADEON_EMIT_PP_BORDER_COLOR_0               13 /* tex0/1 */
+#define RADEON_EMIT_PP_TXFILTER_1                   14 /* tex1/6 */
+#define RADEON_EMIT_PP_BORDER_COLOR_1               15 /* tex1/1 */
+#define RADEON_EMIT_PP_TXFILTER_2                   16 /* tex2/6 */
+#define RADEON_EMIT_PP_BORDER_COLOR_2               17 /* tex2/1 */
+#define RADEON_EMIT_SE_ZBIAS_FACTOR                 18 /* zbias/2 */
+#define RADEON_EMIT_SE_TCL_OUTPUT_VTX_FMT           19 /* tcl/11 */
+#define RADEON_EMIT_SE_TCL_MATERIAL_EMMISSIVE_RED   20 /* material/17 */
+#define R200_EMIT_PP_TXCBLEND_0                     21 /* tex0/4 */
+#define R200_EMIT_PP_TXCBLEND_1                     22 /* tex1/4 */
+#define R200_EMIT_PP_TXCBLEND_2                     23 /* tex2/4 */
+#define R200_EMIT_PP_TXCBLEND_3                     24 /* tex3/4 */
+#define R200_EMIT_PP_TXCBLEND_4                     25 /* tex4/4 */
+#define R200_EMIT_PP_TXCBLEND_5                     26 /* tex5/4 */
+#define R200_EMIT_PP_TXCBLEND_6                     27 /* /4 */
+#define R200_EMIT_PP_TXCBLEND_7                     28 /* /4 */
+#define R200_EMIT_TCL_LIGHT_MODEL_CTL_0             29 /* tcl/7 */
+#define R200_EMIT_TFACTOR_0                         30 /* tf/7 */
+#define R200_EMIT_VTX_FMT_0                         31 /* vtx/5 */
+#define R200_EMIT_VAP_CTL                           32 /* vap/1 */
+#define R200_EMIT_MATRIX_SELECT_0                   33 /* msl/5 */
+#define R200_EMIT_TEX_PROC_CTL_2                    34 /* tcg/5 */
+#define R200_EMIT_TCL_UCP_VERT_BLEND_CTL            35 /* tcl/1 */
+#define R200_EMIT_PP_TXFILTER_0                     36 /* tex0/6 */
+#define R200_EMIT_PP_TXFILTER_1                     37 /* tex1/6 */
+#define R200_EMIT_PP_TXFILTER_2                     38 /* tex2/6 */
+#define R200_EMIT_PP_TXFILTER_3                     39 /* tex3/6 */
+#define R200_EMIT_PP_TXFILTER_4                     40 /* tex4/6 */
+#define R200_EMIT_PP_TXFILTER_5                     41 /* tex5/6 */
+#define R200_EMIT_PP_TXOFFSET_0                     42 /* tex0/1 */
+#define R200_EMIT_PP_TXOFFSET_1                     43 /* tex1/1 */
+#define R200_EMIT_PP_TXOFFSET_2                     44 /* tex2/1 */
+#define R200_EMIT_PP_TXOFFSET_3                     45 /* tex3/1 */
+#define R200_EMIT_PP_TXOFFSET_4                     46 /* tex4/1 */
+#define R200_EMIT_PP_TXOFFSET_5                     47 /* tex5/1 */
+#define R200_EMIT_VTE_CNTL                          48 /* vte/1 */
+#define R200_EMIT_OUTPUT_VTX_COMP_SEL               49 /* vtx/1 */
+#define R200_EMIT_PP_TAM_DEBUG3                     50 /* tam/1 */
+#define R200_EMIT_PP_CNTL_X                         51 /* cst/1 */
+#define R200_EMIT_RB3D_DEPTHXY_OFFSET               52 /* cst/1 */
+#define R200_EMIT_RE_AUX_SCISSOR_CNTL               53 /* cst/1 */
+#define R200_EMIT_RE_SCISSOR_TL_0                   54 /* cst/2 */
+#define R200_EMIT_RE_SCISSOR_TL_1                   55 /* cst/2 */
+#define R200_EMIT_RE_SCISSOR_TL_2                   56 /* cst/2 */
+#define R200_EMIT_SE_VAP_CNTL_STATUS                57 /* cst/1 */
+#define R200_EMIT_SE_VTX_STATE_CNTL                 58 /* cst/1 */
+#define R200_EMIT_RE_POINTSIZE                      59 /* cst/1 */
+#define R200_EMIT_TCL_INPUT_VTX_VECTOR_ADDR_0       60 /* cst/4 */
+#define R200_EMIT_PP_CUBIC_FACES_0                  61
+#define R200_EMIT_PP_CUBIC_OFFSETS_0                62
+#define R200_EMIT_PP_CUBIC_FACES_1                  63
+#define R200_EMIT_PP_CUBIC_OFFSETS_1                64
+#define R200_EMIT_PP_CUBIC_FACES_2                  65
+#define R200_EMIT_PP_CUBIC_OFFSETS_2                66
+#define R200_EMIT_PP_CUBIC_FACES_3                  67
+#define R200_EMIT_PP_CUBIC_OFFSETS_3                68
+#define R200_EMIT_PP_CUBIC_FACES_4                  69
+#define R200_EMIT_PP_CUBIC_OFFSETS_4                70
+#define R200_EMIT_PP_CUBIC_FACES_5                  71
+#define R200_EMIT_PP_CUBIC_OFFSETS_5                72
+#define RADEON_MAX_STATE_PACKETS                    73
+
+
+/* Commands understood by cmd_buffer ioctl.  More can be added but
+ * obviously these can't be removed or changed:
+ */
+#define RADEON_CMD_PACKET      1 /* emit one of the register packets above */
+#define RADEON_CMD_SCALARS     2 /* emit scalar data */
+#define RADEON_CMD_VECTORS     3 /* emit vector data */
+#define RADEON_CMD_DMA_DISCARD 4 /* discard current dma buf */
+#define RADEON_CMD_PACKET3     5 /* emit hw packet */
+#define RADEON_CMD_PACKET3_CLIP 6 /* emit hw packet wrapped in cliprects */
+#define RADEON_CMD_SCALARS2     7 /* r200 stopgap */
+#define RADEON_CMD_WAIT         8 /* emit hw wait commands -- note:
+				   *  doesn't make the cpu wait, just
+				   *  the graphics hardware */
+
+
+typedef union {
+	int i;
+	struct { 
+		unsigned char cmd_type, pad0, pad1, pad2;
+	} header;
+	struct { 
+		unsigned char cmd_type, packet_id, pad0, pad1;
+	} packet;
+	struct { 
+		unsigned char cmd_type, offset, stride, count; 
+	} scalars;
+	struct { 
+		unsigned char cmd_type, offset, stride, count; 
+	} vectors;
+	struct { 
+		unsigned char cmd_type, buf_idx, pad0, pad1; 
+	} dma;
+	struct { 
+		unsigned char cmd_type, flags, pad0, pad1; 
+	} wait;
+} drm_radeon_cmd_header_t;
+
+#define RADEON_WAIT_2D  0x1
+#define RADEON_WAIT_3D  0x2
+
+
+#define RADEON_FRONT			0x1
+#define RADEON_BACK			0x2
+#define RADEON_DEPTH			0x4
+#define RADEON_STENCIL                  0x8
+
+/* Primitive types
+ */
+#define RADEON_POINTS			0x1
+#define RADEON_LINES			0x2
+#define RADEON_LINE_STRIP		0x3
+#define RADEON_TRIANGLES		0x4
+#define RADEON_TRIANGLE_FAN		0x5
+#define RADEON_TRIANGLE_STRIP		0x6
+
+/* Vertex/indirect buffer size
+ */
+#define RADEON_BUFFER_SIZE		65536
+
+/* Byte offsets for indirect buffer data
+ */
+#define RADEON_INDEX_PRIM_OFFSET	20
+
+#define RADEON_SCRATCH_REG_OFFSET	32
+
+#define RADEON_NR_SAREA_CLIPRECTS	12
+
+/* There are 2 heaps (local/AGP).  Each region within a heap is a
+ * minimum of 64k, and there are at most 64 of them per heap.
+ */
+#define RADEON_LOCAL_TEX_HEAP		0
+#define RADEON_AGP_TEX_HEAP		1
+#define RADEON_NR_TEX_HEAPS		2
+#define RADEON_NR_TEX_REGIONS		64
+#define RADEON_LOG_TEX_GRANULARITY	16
+
+#define RADEON_MAX_TEXTURE_LEVELS	12
+#define RADEON_MAX_TEXTURE_UNITS	3
+
+#endif /* __RADEON_SAREA_DEFINES__ */
+
+typedef struct {
+	unsigned int red;
+	unsigned int green;
+	unsigned int blue;
+	unsigned int alpha;
+} radeon_color_regs_t;
+
+typedef struct {
+	/* Context state */
+	unsigned int pp_misc;				/* 0x1c14 */
+	unsigned int pp_fog_color;
+	unsigned int re_solid_color;
+	unsigned int rb3d_blendcntl;
+	unsigned int rb3d_depthoffset;
+	unsigned int rb3d_depthpitch;
+	unsigned int rb3d_zstencilcntl;
+
+	unsigned int pp_cntl;				/* 0x1c38 */
+	unsigned int rb3d_cntl;
+	unsigned int rb3d_coloroffset;
+	unsigned int re_width_height;
+	unsigned int rb3d_colorpitch;
+	unsigned int se_cntl;
+
+	/* Vertex format state */
+	unsigned int se_coord_fmt;			/* 0x1c50 */
+
+	/* Line state */
+	unsigned int re_line_pattern;			/* 0x1cd0 */
+	unsigned int re_line_state;
+
+	unsigned int se_line_width;			/* 0x1db8 */
+
+	/* Bumpmap state */
+	unsigned int pp_lum_matrix;			/* 0x1d00 */
+
+	unsigned int pp_rot_matrix_0;			/* 0x1d58 */
+	unsigned int pp_rot_matrix_1;
+
+	/* Mask state */
+	unsigned int rb3d_stencilrefmask;		/* 0x1d7c */
+	unsigned int rb3d_ropcntl;
+	unsigned int rb3d_planemask;
+
+	/* Viewport state */
+	unsigned int se_vport_xscale;			/* 0x1d98 */
+	unsigned int se_vport_xoffset;
+	unsigned int se_vport_yscale;
+	unsigned int se_vport_yoffset;
+	unsigned int se_vport_zscale;
+	unsigned int se_vport_zoffset;
+
+	/* Setup state */
+	unsigned int se_cntl_status;			/* 0x2140 */
+
+	/* Misc state */
+	unsigned int re_top_left;			/* 0x26c0 */
+	unsigned int re_misc;
+} drm_radeon_context_regs_t;
+
+typedef struct {
+	/* Zbias state */
+	unsigned int se_zbias_factor;			/* 0x1dac */
+	unsigned int se_zbias_constant;
+} drm_radeon_context2_regs_t;
+
+
+/* Setup registers for each texture unit
+ */
+typedef struct {
+	unsigned int pp_txfilter;
+	unsigned int pp_txformat;
+	unsigned int pp_txoffset;
+	unsigned int pp_txcblend;
+	unsigned int pp_txablend;
+	unsigned int pp_tfactor;
+	unsigned int pp_border_color;
+} drm_radeon_texture_regs_t;
+
+typedef struct {
+	unsigned int start;
+	unsigned int finish;
+	unsigned int prim:8;
+	unsigned int stateidx:8;
+	unsigned int numverts:16; /* overloaded as offset/64 for elt prims */
+        unsigned int vc_format;   /* vertex format */
+} drm_radeon_prim_t;
+
+
+typedef struct {
+	drm_radeon_context_regs_t context;
+	drm_radeon_texture_regs_t tex[RADEON_MAX_TEXTURE_UNITS];
+	drm_radeon_context2_regs_t context2;
+	unsigned int dirty;
+} drm_radeon_state_t;
+
+
+typedef struct {
+	unsigned char next, prev;
+	unsigned char in_use;
+	int age;
+} drm_radeon_tex_region_t;
+
+typedef struct {
+	/* The channel for communication of state information to the
+	 * kernel on firing a vertex buffer with either of the
+	 * obsoleted vertex/index ioctls.
+	 */
+	drm_radeon_context_regs_t context_state;
+	drm_radeon_texture_regs_t tex_state[RADEON_MAX_TEXTURE_UNITS];
+	unsigned int dirty;
+	unsigned int vertsize;
+	unsigned int vc_format;
+
+	/* The current cliprects, or a subset thereof.
+	 */
+	drm_clip_rect_t boxes[RADEON_NR_SAREA_CLIPRECTS];
+	unsigned int nbox;
+
+	/* Counters for client-side throttling of rendering clients.
+	 */
+	unsigned int last_frame;
+	unsigned int last_dispatch;
+	unsigned int last_clear;
+
+	drm_radeon_tex_region_t tex_list[RADEON_NR_TEX_HEAPS][RADEON_NR_TEX_REGIONS+1];
+	int tex_age[RADEON_NR_TEX_HEAPS];
+	int ctx_owner;
+        int pfState;                /* number of 3d windows (0,1,2ormore) */
+        int pfCurrentPage;	    /* which buffer is being displayed? */
+	int crtc2_base;		    /* CRTC2 frame offset */
+} drm_radeon_sarea_t;
+
+
+/* WARNING: If you change any of these defines, make sure to change the
+ * defines in the Xserver file (xf86drmRadeon.h)
+ *
+ * KW: actually it's illegal to change any of this (backwards compatibility).
+ */
+
+/* Radeon specific ioctls
+ * The device specific ioctl range is 0x40 to 0x79.
+ */
+#define DRM_IOCTL_RADEON_CP_INIT    DRM_IOW( 0x40, drm_radeon_init_t)
+#define DRM_IOCTL_RADEON_CP_START   DRM_IO(  0x41)
+#define DRM_IOCTL_RADEON_CP_STOP    DRM_IOW( 0x42, drm_radeon_cp_stop_t)
+#define DRM_IOCTL_RADEON_CP_RESET   DRM_IO(  0x43)
+#define DRM_IOCTL_RADEON_CP_IDLE    DRM_IO(  0x44)
+#define DRM_IOCTL_RADEON_RESET      DRM_IO(  0x45)
+#define DRM_IOCTL_RADEON_FULLSCREEN DRM_IOW( 0x46, drm_radeon_fullscreen_t)
+#define DRM_IOCTL_RADEON_SWAP       DRM_IO(  0x47)
+#define DRM_IOCTL_RADEON_CLEAR      DRM_IOW( 0x48, drm_radeon_clear_t)
+#define DRM_IOCTL_RADEON_VERTEX     DRM_IOW( 0x49, drm_radeon_vertex_t)
+#define DRM_IOCTL_RADEON_INDICES    DRM_IOW( 0x4a, drm_radeon_indices_t)
+#define DRM_IOCTL_RADEON_STIPPLE    DRM_IOW( 0x4c, drm_radeon_stipple_t)
+#define DRM_IOCTL_RADEON_INDIRECT   DRM_IOWR(0x4d, drm_radeon_indirect_t)
+#define DRM_IOCTL_RADEON_TEXTURE    DRM_IOWR(0x4e, drm_radeon_texture_t)
+#define DRM_IOCTL_RADEON_VERTEX2    DRM_IOW( 0x4f, drm_radeon_vertex2_t)
+#define DRM_IOCTL_RADEON_CMDBUF     DRM_IOW( 0x50, drm_radeon_cmd_buffer_t)
+#define DRM_IOCTL_RADEON_GETPARAM   DRM_IOWR(0x51, drm_radeon_getparam_t)
+#define DRM_IOCTL_RADEON_FLIP	    DRM_IO(  0x52)
+#define DRM_IOCTL_RADEON_ALLOC      DRM_IOWR( 0x53, drm_radeon_mem_alloc_t)
+#define DRM_IOCTL_RADEON_FREE       DRM_IOW( 0x54, drm_radeon_mem_free_t)
+#define DRM_IOCTL_RADEON_INIT_HEAP  DRM_IOW( 0x55, drm_radeon_mem_init_heap_t)
+#define DRM_IOCTL_RADEON_IRQ_EMIT   DRM_IOWR( 0x56, drm_radeon_irq_emit_t)
+#define DRM_IOCTL_RADEON_IRQ_WAIT   DRM_IOW( 0x57, drm_radeon_irq_wait_t)
+/* added by Charl P. Botha - see radeon_cp.c for details */
+#define DRM_IOCTL_RADEON_CP_RESUME  DRM_IO(0x58)
+
+typedef struct drm_radeon_init {
+	enum {
+		RADEON_INIT_CP    = 0x01,
+		RADEON_CLEANUP_CP = 0x02,
+		RADEON_INIT_R200_CP = 0x03
+	} func;
+	unsigned long sarea_priv_offset;
+	int is_pci;
+	int cp_mode;
+	int agp_size;
+	int ring_size;
+	int usec_timeout;
+
+	unsigned int fb_bpp;
+	unsigned int front_offset, front_pitch;
+	unsigned int back_offset, back_pitch;
+	unsigned int depth_bpp;
+	unsigned int depth_offset, depth_pitch;
+
+	unsigned long fb_offset;
+	unsigned long mmio_offset;
+	unsigned long ring_offset;
+	unsigned long ring_rptr_offset;
+	unsigned long buffers_offset;
+	unsigned long agp_textures_offset;
+} drm_radeon_init_t;
+
+typedef struct drm_radeon_cp_stop {
+	int flush;
+	int idle;
+} drm_radeon_cp_stop_t;
+
+typedef struct drm_radeon_fullscreen {
+	enum {
+		RADEON_INIT_FULLSCREEN    = 0x01,
+		RADEON_CLEANUP_FULLSCREEN = 0x02
+	} func;
+} drm_radeon_fullscreen_t;
+
+#define CLEAR_X1	0
+#define CLEAR_Y1	1
+#define CLEAR_X2	2
+#define CLEAR_Y2	3
+#define CLEAR_DEPTH	4
+
+typedef union drm_radeon_clear_rect {
+	float f[5];
+	unsigned int ui[5];
+} drm_radeon_clear_rect_t;
+
+typedef struct drm_radeon_clear {
+	unsigned int flags;
+	unsigned int clear_color;
+	unsigned int clear_depth;
+	unsigned int color_mask;
+	unsigned int depth_mask;   /* misnamed field:  should be stencil */
+	drm_radeon_clear_rect_t *depth_boxes;
+} drm_radeon_clear_t;
+
+typedef struct drm_radeon_vertex {
+	int prim;
+	int idx;			/* Index of vertex buffer */
+	int count;			/* Number of vertices in buffer */
+	int discard;			/* Client finished with buffer? */
+} drm_radeon_vertex_t;
+
+typedef struct drm_radeon_indices {
+	int prim;
+	int idx;
+	int start;
+	int end;
+	int discard;			/* Client finished with buffer? */
+} drm_radeon_indices_t;
+
+/* v1.2 - obsoletes drm_radeon_vertex and drm_radeon_indices
+ *      - allows multiple primitives and state changes in a single ioctl
+ *      - supports driver change to emit native primitives
+ */
+typedef struct drm_radeon_vertex2 {
+	int idx;			/* Index of vertex buffer */
+	int discard;			/* Client finished with buffer? */
+	int nr_states;
+	drm_radeon_state_t *state;
+	int nr_prims;
+	drm_radeon_prim_t *prim;
+} drm_radeon_vertex2_t;
+
+/* v1.3 - obsoletes drm_radeon_vertex2
+ *      - allows arbitarily large cliprect list 
+ *      - allows updating of tcl packet, vector and scalar state
+ *      - allows memory-efficient description of state updates
+ *      - allows state to be emitted without a primitive 
+ *           (for clears, ctx switches)
+ *      - allows more than one dma buffer to be referenced per ioctl
+ *      - supports tcl driver
+ *      - may be extended in future versions with new cmd types, packets
+ */
+typedef struct drm_radeon_cmd_buffer {
+	int bufsz;
+	char *buf;
+	int nbox;
+	drm_clip_rect_t *boxes;
+} drm_radeon_cmd_buffer_t;
+
+typedef struct drm_radeon_tex_image {
+	unsigned int x, y;		/* Blit coordinates */
+	unsigned int width, height;
+	const void *data;
+} drm_radeon_tex_image_t;
+
+typedef struct drm_radeon_texture {
+	int offset;
+	int pitch;
+	int format;
+	int width;			/* Texture image coordinates */
+	int height;
+	drm_radeon_tex_image_t *image;
+} drm_radeon_texture_t;
+
+typedef struct drm_radeon_stipple {
+	unsigned int *mask;
+} drm_radeon_stipple_t;
+
+typedef struct drm_radeon_indirect {
+	int idx;
+	int start;
+	int end;
+	int discard;
+} drm_radeon_indirect_t;
+
+
+/* 1.3: An ioctl to get parameters that aren't available to the 3d
+ * client any other way.  
+ */
+#define RADEON_PARAM_AGP_BUFFER_OFFSET     1 /* card offset of 1st agp buffer */
+#define RADEON_PARAM_LAST_FRAME            2
+#define RADEON_PARAM_LAST_DISPATCH         3
+#define RADEON_PARAM_LAST_CLEAR            4
+#define RADEON_PARAM_IRQ_NR                5
+#define RADEON_PARAM_AGP_BASE              6 /* card offset of agp base */
+
+typedef struct drm_radeon_getparam {
+	int param;
+	int *value;
+} drm_radeon_getparam_t;
+
+/* 1.6: Set up a memory manager for regions of shared memory:
+ */
+#define RADEON_MEM_REGION_AGP 1
+#define RADEON_MEM_REGION_FB  2
+
+typedef struct drm_radeon_mem_alloc {
+	int region;
+	int alignment;
+	int size;
+	int *region_offset;	/* offset from start of fb or agp */
+} drm_radeon_mem_alloc_t;
+
+typedef struct drm_radeon_mem_free {
+	int region;
+	int region_offset;
+} drm_radeon_mem_free_t;
+
+typedef struct drm_radeon_mem_init_heap {
+	int region;
+	int size;
+	int start;	
+} drm_radeon_mem_init_heap_t;
+
+
+/* 1.6: Userspace can request & wait on irq's:
+ */
+typedef struct drm_radeon_irq_emit {
+	int *irq_seq;
+} drm_radeon_irq_emit_t;
+
+typedef struct drm_radeon_irq_wait {
+	int irq_seq;
+} drm_radeon_irq_wait_t;
+
+
+#endif
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/radeon_drv.c linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/radeon_drv.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/radeon_drv.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/radeon_drv.c	2003-07-30 11:18:33.000000000 +0200
@@ -0,0 +1,53 @@
+/* radeon_drv.c -- ATI Radeon driver -*- linux-c -*-
+ * Created: Wed Feb 14 17:10:04 2001 by gareth@valinux.com
+ *
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Gareth Hughes <gareth@valinux.com>
+ */
+
+#include <linux/config.h>
+#include "radeon.h"
+#include "drmP.h"
+#include "drm.h"
+#include "radeon_drm.h"
+#include "radeon_drv.h"
+#include "ati_pcigart.h"
+
+#include "drm_agpsupport.h"
+#include "drm_auth.h"
+#include "drm_bufs.h"
+#include "drm_context.h"
+#include "drm_dma.h"
+#include "drm_drawable.h"
+#include "drm_drv.h"
+#include "drm_fops.h"
+#include "drm_init.h"
+#include "drm_ioctl.h"
+#include "drm_lock.h"
+#include "drm_memory.h"
+#include "drm_proc.h"
+#include "drm_vm.h"
+#include "drm_stub.h"
+#include "drm_scatter.h"
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/radeon_drv.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/radeon_drv.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/radeon_drv.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/radeon_drv.h	2003-07-30 11:18:33.000000000 +0200
@@ -0,0 +1,941 @@
+/* radeon_drv.h -- Private header for radeon driver -*- linux-c -*-
+ *
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Fremont, California.
+ * All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Kevin E. Martin <martin@valinux.com>
+ *    Gareth Hughes <gareth@valinux.com>
+ */
+
+#ifndef __RADEON_DRV_H__
+#define __RADEON_DRV_H__
+
+#define GET_RING_HEAD(ring)		DRM_READ32(  (volatile u32 *) (ring)->head )
+#define SET_RING_HEAD(ring,val)		DRM_WRITE32( (volatile u32 *) (ring)->head , (val))
+
+typedef struct drm_radeon_freelist {
+   	unsigned int age;
+   	drm_buf_t *buf;
+   	struct drm_radeon_freelist *next;
+   	struct drm_radeon_freelist *prev;
+} drm_radeon_freelist_t;
+
+typedef struct drm_radeon_ring_buffer {
+	u32 *start;
+	u32 *end;
+	int size;
+	int size_l2qw;
+
+	volatile u32 *head;
+	u32 tail;
+	u32 tail_mask;
+	int space;
+
+	int high_mark;
+} drm_radeon_ring_buffer_t;
+
+typedef struct drm_radeon_depth_clear_t {
+	u32 rb3d_cntl;
+	u32 rb3d_zstencilcntl;
+	u32 se_cntl;
+} drm_radeon_depth_clear_t;
+
+
+struct mem_block {
+	struct mem_block *next;
+	struct mem_block *prev;
+	int start;
+	int size;
+	int pid;		/* 0: free, -1: heap, other: real pids */
+};
+
+typedef struct drm_radeon_private {
+	drm_radeon_ring_buffer_t ring;
+	drm_radeon_sarea_t *sarea_priv;
+
+	int agp_size;
+	u32 agp_vm_start;
+	unsigned long agp_buffers_offset;
+
+	int cp_mode;
+	int cp_running;
+
+   	drm_radeon_freelist_t *head;
+   	drm_radeon_freelist_t *tail;
+	int last_buf;
+	volatile u32 *scratch;
+	int writeback_works;
+
+	int usec_timeout;
+
+	int is_r200;
+
+	int is_pci;
+	unsigned long phys_pci_gart;
+	dma_addr_t bus_pci_gart;
+
+	struct {
+		u32 boxes;
+		int freelist_timeouts;
+		int freelist_loops;
+		int requested_bufs;
+		int last_frame_reads;
+		int last_clear_reads;
+		int clears;
+		int texture_uploads;
+	} stats;
+
+	int do_boxes;
+	int page_flipping;
+	int current_page;
+
+	u32 color_fmt;
+	unsigned int front_offset;
+	unsigned int front_pitch;
+	unsigned int back_offset;
+	unsigned int back_pitch;
+
+	u32 depth_fmt;
+	unsigned int depth_offset;
+	unsigned int depth_pitch;
+
+	u32 front_pitch_offset;
+	u32 back_pitch_offset;
+	u32 depth_pitch_offset;
+
+	drm_radeon_depth_clear_t depth_clear;
+
+	drm_map_t *sarea;
+	drm_map_t *fb;
+	drm_map_t *mmio;
+	drm_map_t *cp_ring;
+	drm_map_t *ring_rptr;
+	drm_map_t *buffers;
+	drm_map_t *agp_textures;
+
+	struct mem_block *agp_heap;
+	struct mem_block *fb_heap;
+
+	/* SW interrupt */
+   	wait_queue_head_t swi_queue;
+   	atomic_t swi_emitted;
+
+} drm_radeon_private_t;
+
+typedef struct drm_radeon_buf_priv {
+	u32 age;
+} drm_radeon_buf_priv_t;
+
+				/* radeon_cp.c */
+extern int radeon_cp_init( DRM_IOCTL_ARGS );
+extern int radeon_cp_start( DRM_IOCTL_ARGS );
+extern int radeon_cp_stop( DRM_IOCTL_ARGS );
+extern int radeon_cp_reset( DRM_IOCTL_ARGS );
+extern int radeon_cp_idle( DRM_IOCTL_ARGS );
+extern int radeon_cp_resume( DRM_IOCTL_ARGS );
+extern int radeon_engine_reset( DRM_IOCTL_ARGS );
+extern int radeon_fullscreen( DRM_IOCTL_ARGS );
+extern int radeon_cp_buffers( DRM_IOCTL_ARGS );
+
+extern void radeon_freelist_reset( drm_device_t *dev );
+extern drm_buf_t *radeon_freelist_get( drm_device_t *dev );
+
+extern int radeon_wait_ring( drm_radeon_private_t *dev_priv, int n );
+
+extern int radeon_do_cp_idle( drm_radeon_private_t *dev_priv );
+extern int radeon_do_cleanup_cp( drm_device_t *dev );
+extern int radeon_do_cleanup_pageflip( drm_device_t *dev );
+
+				/* radeon_state.c */
+extern int radeon_cp_clear( DRM_IOCTL_ARGS );
+extern int radeon_cp_swap( DRM_IOCTL_ARGS );
+extern int radeon_cp_vertex( DRM_IOCTL_ARGS );
+extern int radeon_cp_indices( DRM_IOCTL_ARGS );
+extern int radeon_cp_texture( DRM_IOCTL_ARGS );
+extern int radeon_cp_stipple( DRM_IOCTL_ARGS );
+extern int radeon_cp_indirect( DRM_IOCTL_ARGS );
+extern int radeon_cp_vertex2( DRM_IOCTL_ARGS );
+extern int radeon_cp_cmdbuf( DRM_IOCTL_ARGS );
+extern int radeon_cp_getparam( DRM_IOCTL_ARGS );
+extern int radeon_cp_flip( DRM_IOCTL_ARGS );
+
+extern int radeon_mem_alloc( DRM_IOCTL_ARGS );
+extern int radeon_mem_free( DRM_IOCTL_ARGS );
+extern int radeon_mem_init_heap( DRM_IOCTL_ARGS );
+extern void radeon_mem_takedown( struct mem_block **heap );
+extern void radeon_mem_release( struct mem_block *heap );
+
+				/* radeon_irq.c */
+extern int radeon_irq_emit( DRM_IOCTL_ARGS );
+extern int radeon_irq_wait( DRM_IOCTL_ARGS );
+
+extern int radeon_emit_and_wait_irq(drm_device_t *dev);
+extern int radeon_wait_irq(drm_device_t *dev, int swi_nr);
+extern int radeon_emit_irq(drm_device_t *dev);
+
+
+/* Flags for stats.boxes
+ */
+#define RADEON_BOX_DMA_IDLE      0x1
+#define RADEON_BOX_RING_FULL     0x2
+#define RADEON_BOX_FLIP          0x4
+#define RADEON_BOX_WAIT_IDLE     0x8
+#define RADEON_BOX_TEXTURE_LOAD  0x10
+
+
+
+/* Register definitions, register access macros and drmAddMap constants
+ * for Radeon kernel driver.
+ */
+
+#define RADEON_AGP_COMMAND		0x0f60
+#define RADEON_AUX_SCISSOR_CNTL		0x26f0
+#	define RADEON_EXCLUSIVE_SCISSOR_0	(1 << 24)
+#	define RADEON_EXCLUSIVE_SCISSOR_1	(1 << 25)
+#	define RADEON_EXCLUSIVE_SCISSOR_2	(1 << 26)
+#	define RADEON_SCISSOR_0_ENABLE		(1 << 28)
+#	define RADEON_SCISSOR_1_ENABLE		(1 << 29)
+#	define RADEON_SCISSOR_2_ENABLE		(1 << 30)
+
+#define RADEON_BUS_CNTL			0x0030
+#	define RADEON_BUS_MASTER_DIS		(1 << 6)
+
+#define RADEON_CLOCK_CNTL_DATA		0x000c
+#	define RADEON_PLL_WR_EN			(1 << 7)
+#define RADEON_CLOCK_CNTL_INDEX		0x0008
+#define RADEON_CONFIG_APER_SIZE		0x0108
+#define RADEON_CRTC_OFFSET		0x0224
+#define RADEON_CRTC_OFFSET_CNTL		0x0228
+#	define RADEON_CRTC_TILE_EN		(1 << 15)
+#	define RADEON_CRTC_OFFSET_FLIP_CNTL	(1 << 16)
+#define RADEON_CRTC2_OFFSET		0x0324
+#define RADEON_CRTC2_OFFSET_CNTL	0x0328
+
+#define RADEON_RB3D_COLORPITCH		0x1c48
+
+#define RADEON_DP_GUI_MASTER_CNTL	0x146c
+#	define RADEON_GMC_SRC_PITCH_OFFSET_CNTL	(1 << 0)
+#	define RADEON_GMC_DST_PITCH_OFFSET_CNTL	(1 << 1)
+#	define RADEON_GMC_BRUSH_SOLID_COLOR	(13 << 4)
+#	define RADEON_GMC_BRUSH_NONE		(15 << 4)
+#	define RADEON_GMC_DST_16BPP		(4 << 8)
+#	define RADEON_GMC_DST_24BPP		(5 << 8)
+#	define RADEON_GMC_DST_32BPP		(6 << 8)
+#	define RADEON_GMC_DST_DATATYPE_SHIFT	8
+#	define RADEON_GMC_SRC_DATATYPE_COLOR	(3 << 12)
+#	define RADEON_DP_SRC_SOURCE_MEMORY	(2 << 24)
+#	define RADEON_DP_SRC_SOURCE_HOST_DATA	(3 << 24)
+#	define RADEON_GMC_CLR_CMP_CNTL_DIS	(1 << 28)
+#	define RADEON_GMC_WR_MSK_DIS		(1 << 30)
+#	define RADEON_ROP3_S			0x00cc0000
+#	define RADEON_ROP3_P			0x00f00000
+#define RADEON_DP_WRITE_MASK		0x16cc
+#define RADEON_DST_PITCH_OFFSET		0x142c
+#define RADEON_DST_PITCH_OFFSET_C	0x1c80
+#	define RADEON_DST_TILE_LINEAR		(0 << 30)
+#	define RADEON_DST_TILE_MACRO		(1 << 30)
+#	define RADEON_DST_TILE_MICRO		(2 << 30)
+#	define RADEON_DST_TILE_BOTH		(3 << 30)
+
+#define RADEON_SCRATCH_REG0		0x15e0
+#define RADEON_SCRATCH_REG1		0x15e4
+#define RADEON_SCRATCH_REG2		0x15e8
+#define RADEON_SCRATCH_REG3		0x15ec
+#define RADEON_SCRATCH_REG4		0x15f0
+#define RADEON_SCRATCH_REG5		0x15f4
+#define RADEON_SCRATCH_UMSK		0x0770
+#define RADEON_SCRATCH_ADDR		0x0774
+
+#define GET_SCRATCH( x )	(dev_priv->writeback_works			\
+				? DRM_READ32( &dev_priv->scratch[(x)] )		\
+				: RADEON_READ( RADEON_SCRATCH_REG0 + 4*(x) ) )
+
+
+#define RADEON_GEN_INT_CNTL		0x0040
+#	define RADEON_CRTC_VBLANK_MASK		(1 << 0)
+#	define RADEON_GUI_IDLE_INT_ENABLE	(1 << 19)
+#	define RADEON_SW_INT_ENABLE		(1 << 25)
+
+#define RADEON_GEN_INT_STATUS		0x0044
+#	define RADEON_CRTC_VBLANK_STAT		(1 << 0)
+#	define RADEON_CRTC_VBLANK_STAT_ACK   	(1 << 0)
+#	define RADEON_GUI_IDLE_INT_TEST_ACK     (1 << 19)
+#	define RADEON_SW_INT_TEST		(1 << 25)
+#	define RADEON_SW_INT_TEST_ACK   	(1 << 25)
+#	define RADEON_SW_INT_FIRE		(1 << 26)
+
+#define RADEON_HOST_PATH_CNTL		0x0130
+#	define RADEON_HDP_SOFT_RESET		(1 << 26)
+#	define RADEON_HDP_WC_TIMEOUT_MASK	(7 << 28)
+#	define RADEON_HDP_WC_TIMEOUT_28BCLK	(7 << 28)
+
+#define RADEON_ISYNC_CNTL		0x1724
+#	define RADEON_ISYNC_ANY2D_IDLE3D	(1 << 0)
+#	define RADEON_ISYNC_ANY3D_IDLE2D	(1 << 1)
+#	define RADEON_ISYNC_TRIG2D_IDLE3D	(1 << 2)
+#	define RADEON_ISYNC_TRIG3D_IDLE2D	(1 << 3)
+#	define RADEON_ISYNC_WAIT_IDLEGUI	(1 << 4)
+#	define RADEON_ISYNC_CPSCRATCH_IDLEGUI	(1 << 5)
+
+#define RADEON_RBBM_GUICNTL		0x172c
+#	define RADEON_HOST_DATA_SWAP_NONE	(0 << 0)
+#	define RADEON_HOST_DATA_SWAP_16BIT	(1 << 0)
+#	define RADEON_HOST_DATA_SWAP_32BIT	(2 << 0)
+#	define RADEON_HOST_DATA_SWAP_HDW	(3 << 0)
+
+#define RADEON_MC_AGP_LOCATION		0x014c
+#define RADEON_MC_FB_LOCATION		0x0148
+#define RADEON_MCLK_CNTL		0x0012
+#	define RADEON_FORCEON_MCLKA		(1 << 16)
+#	define RADEON_FORCEON_MCLKB		(1 << 17)
+#	define RADEON_FORCEON_YCLKA		(1 << 18)
+#	define RADEON_FORCEON_YCLKB		(1 << 19)
+#	define RADEON_FORCEON_MC		(1 << 20)
+#	define RADEON_FORCEON_AIC		(1 << 21)
+
+#define RADEON_PP_BORDER_COLOR_0	0x1d40
+#define RADEON_PP_BORDER_COLOR_1	0x1d44
+#define RADEON_PP_BORDER_COLOR_2	0x1d48
+#define RADEON_PP_CNTL			0x1c38
+#	define RADEON_SCISSOR_ENABLE		(1 <<  1)
+#define RADEON_PP_LUM_MATRIX		0x1d00
+#define RADEON_PP_MISC			0x1c14
+#define RADEON_PP_ROT_MATRIX_0		0x1d58
+#define RADEON_PP_TXFILTER_0		0x1c54
+#define RADEON_PP_TXFILTER_1		0x1c6c
+#define RADEON_PP_TXFILTER_2		0x1c84
+
+#define RADEON_RB2D_DSTCACHE_CTLSTAT	0x342c
+#	define RADEON_RB2D_DC_FLUSH		(3 << 0)
+#	define RADEON_RB2D_DC_FREE		(3 << 2)
+#	define RADEON_RB2D_DC_FLUSH_ALL		0xf
+#	define RADEON_RB2D_DC_BUSY		(1 << 31)
+#define RADEON_RB3D_CNTL		0x1c3c
+#	define RADEON_ALPHA_BLEND_ENABLE	(1 << 0)
+#	define RADEON_PLANE_MASK_ENABLE		(1 << 1)
+#	define RADEON_DITHER_ENABLE		(1 << 2)
+#	define RADEON_ROUND_ENABLE		(1 << 3)
+#	define RADEON_SCALE_DITHER_ENABLE	(1 << 4)
+#	define RADEON_DITHER_INIT		(1 << 5)
+#	define RADEON_ROP_ENABLE		(1 << 6)
+#	define RADEON_STENCIL_ENABLE		(1 << 7)
+#	define RADEON_Z_ENABLE			(1 << 8)
+#define RADEON_RB3D_DEPTHOFFSET		0x1c24
+#define RADEON_RB3D_DEPTHPITCH		0x1c28
+#define RADEON_RB3D_PLANEMASK		0x1d84
+#define RADEON_RB3D_STENCILREFMASK	0x1d7c
+#define RADEON_RB3D_ZCACHE_MODE		0x3250
+#define RADEON_RB3D_ZCACHE_CTLSTAT	0x3254
+#	define RADEON_RB3D_ZC_FLUSH		(1 << 0)
+#	define RADEON_RB3D_ZC_FREE		(1 << 2)
+#	define RADEON_RB3D_ZC_FLUSH_ALL		0x5
+#	define RADEON_RB3D_ZC_BUSY		(1 << 31)
+#define RADEON_RB3D_ZSTENCILCNTL	0x1c2c
+#	define RADEON_Z_TEST_MASK		(7 << 4)
+#	define RADEON_Z_TEST_ALWAYS		(7 << 4)
+#	define RADEON_STENCIL_TEST_ALWAYS	(7 << 12)
+#	define RADEON_STENCIL_S_FAIL_REPLACE	(2 << 16)
+#	define RADEON_STENCIL_ZPASS_REPLACE	(2 << 20)
+#	define RADEON_STENCIL_ZFAIL_REPLACE	(2 << 24)
+#	define RADEON_Z_WRITE_ENABLE		(1 << 30)
+#define RADEON_RBBM_SOFT_RESET		0x00f0
+#	define RADEON_SOFT_RESET_CP		(1 <<  0)
+#	define RADEON_SOFT_RESET_HI		(1 <<  1)
+#	define RADEON_SOFT_RESET_SE		(1 <<  2)
+#	define RADEON_SOFT_RESET_RE		(1 <<  3)
+#	define RADEON_SOFT_RESET_PP		(1 <<  4)
+#	define RADEON_SOFT_RESET_E2		(1 <<  5)
+#	define RADEON_SOFT_RESET_RB		(1 <<  6)
+#	define RADEON_SOFT_RESET_HDP		(1 <<  7)
+#define RADEON_RBBM_STATUS		0x0e40
+#	define RADEON_RBBM_FIFOCNT_MASK		0x007f
+#	define RADEON_RBBM_ACTIVE		(1 << 31)
+#define RADEON_RE_LINE_PATTERN		0x1cd0
+#define RADEON_RE_MISC			0x26c4
+#define RADEON_RE_TOP_LEFT		0x26c0
+#define RADEON_RE_WIDTH_HEIGHT		0x1c44
+#define RADEON_RE_STIPPLE_ADDR		0x1cc8
+#define RADEON_RE_STIPPLE_DATA		0x1ccc
+
+#define RADEON_SCISSOR_TL_0		0x1cd8
+#define RADEON_SCISSOR_BR_0		0x1cdc
+#define RADEON_SCISSOR_TL_1		0x1ce0
+#define RADEON_SCISSOR_BR_1		0x1ce4
+#define RADEON_SCISSOR_TL_2		0x1ce8
+#define RADEON_SCISSOR_BR_2		0x1cec
+#define RADEON_SE_COORD_FMT		0x1c50
+#define RADEON_SE_CNTL			0x1c4c
+#	define RADEON_FFACE_CULL_CW		(0 << 0)
+#	define RADEON_BFACE_SOLID		(3 << 1)
+#	define RADEON_FFACE_SOLID		(3 << 3)
+#	define RADEON_FLAT_SHADE_VTX_LAST	(3 << 6)
+#	define RADEON_DIFFUSE_SHADE_FLAT	(1 << 8)
+#	define RADEON_DIFFUSE_SHADE_GOURAUD	(2 << 8)
+#	define RADEON_ALPHA_SHADE_FLAT		(1 << 10)
+#	define RADEON_ALPHA_SHADE_GOURAUD	(2 << 10)
+#	define RADEON_SPECULAR_SHADE_FLAT	(1 << 12)
+#	define RADEON_SPECULAR_SHADE_GOURAUD	(2 << 12)
+#	define RADEON_FOG_SHADE_FLAT		(1 << 14)
+#	define RADEON_FOG_SHADE_GOURAUD		(2 << 14)
+#	define RADEON_VPORT_XY_XFORM_ENABLE	(1 << 24)
+#	define RADEON_VPORT_Z_XFORM_ENABLE	(1 << 25)
+#	define RADEON_VTX_PIX_CENTER_OGL	(1 << 27)
+#	define RADEON_ROUND_MODE_TRUNC		(0 << 28)
+#	define RADEON_ROUND_PREC_8TH_PIX	(1 << 30)
+#define RADEON_SE_CNTL_STATUS		0x2140
+#define RADEON_SE_LINE_WIDTH		0x1db8
+#define RADEON_SE_VPORT_XSCALE		0x1d98
+#define RADEON_SE_ZBIAS_FACTOR		0x1db0
+#define RADEON_SE_TCL_MATERIAL_EMMISSIVE_RED 0x2210
+#define RADEON_SE_TCL_OUTPUT_VTX_FMT         0x2254
+#define RADEON_SE_TCL_VECTOR_INDX_REG        0x2200
+#       define RADEON_VEC_INDX_OCTWORD_STRIDE_SHIFT  16
+#       define RADEON_VEC_INDX_DWORD_COUNT_SHIFT     28
+#define RADEON_SE_TCL_VECTOR_DATA_REG       0x2204
+#define RADEON_SE_TCL_SCALAR_INDX_REG       0x2208
+#       define RADEON_SCAL_INDX_DWORD_STRIDE_SHIFT  16
+#define RADEON_SE_TCL_SCALAR_DATA_REG       0x220C
+#define RADEON_SURFACE_ACCESS_FLAGS	0x0bf8
+#define RADEON_SURFACE_ACCESS_CLR	0x0bfc
+#define RADEON_SURFACE_CNTL		0x0b00
+#	define RADEON_SURF_TRANSLATION_DIS	(1 << 8)
+#	define RADEON_NONSURF_AP0_SWP_MASK	(3 << 20)
+#	define RADEON_NONSURF_AP0_SWP_LITTLE	(0 << 20)
+#	define RADEON_NONSURF_AP0_SWP_BIG16	(1 << 20)
+#	define RADEON_NONSURF_AP0_SWP_BIG32	(2 << 20)
+#	define RADEON_NONSURF_AP1_SWP_MASK	(3 << 22)
+#	define RADEON_NONSURF_AP1_SWP_LITTLE	(0 << 22)
+#	define RADEON_NONSURF_AP1_SWP_BIG16	(1 << 22)
+#	define RADEON_NONSURF_AP1_SWP_BIG32	(2 << 22)
+#define RADEON_SURFACE0_INFO		0x0b0c
+#	define RADEON_SURF_PITCHSEL_MASK	(0x1ff << 0)
+#	define RADEON_SURF_TILE_MODE_MASK	(3 << 16)
+#	define RADEON_SURF_TILE_MODE_MACRO	(0 << 16)
+#	define RADEON_SURF_TILE_MODE_MICRO	(1 << 16)
+#	define RADEON_SURF_TILE_MODE_32BIT_Z	(2 << 16)
+#	define RADEON_SURF_TILE_MODE_16BIT_Z	(3 << 16)
+#define RADEON_SURFACE0_LOWER_BOUND	0x0b04
+#define RADEON_SURFACE0_UPPER_BOUND	0x0b08
+#define RADEON_SURFACE1_INFO		0x0b1c
+#define RADEON_SURFACE1_LOWER_BOUND	0x0b14
+#define RADEON_SURFACE1_UPPER_BOUND	0x0b18
+#define RADEON_SURFACE2_INFO		0x0b2c
+#define RADEON_SURFACE2_LOWER_BOUND	0x0b24
+#define RADEON_SURFACE2_UPPER_BOUND	0x0b28
+#define RADEON_SURFACE3_INFO		0x0b3c
+#define RADEON_SURFACE3_LOWER_BOUND	0x0b34
+#define RADEON_SURFACE3_UPPER_BOUND	0x0b38
+#define RADEON_SURFACE4_INFO		0x0b4c
+#define RADEON_SURFACE4_LOWER_BOUND	0x0b44
+#define RADEON_SURFACE4_UPPER_BOUND	0x0b48
+#define RADEON_SURFACE5_INFO		0x0b5c
+#define RADEON_SURFACE5_LOWER_BOUND	0x0b54
+#define RADEON_SURFACE5_UPPER_BOUND	0x0b58
+#define RADEON_SURFACE6_INFO		0x0b6c
+#define RADEON_SURFACE6_LOWER_BOUND	0x0b64
+#define RADEON_SURFACE6_UPPER_BOUND	0x0b68
+#define RADEON_SURFACE7_INFO		0x0b7c
+#define RADEON_SURFACE7_LOWER_BOUND	0x0b74
+#define RADEON_SURFACE7_UPPER_BOUND	0x0b78
+#define RADEON_SW_SEMAPHORE		0x013c
+
+#define RADEON_WAIT_UNTIL		0x1720
+#	define RADEON_WAIT_CRTC_PFLIP		(1 << 0)
+#	define RADEON_WAIT_2D_IDLECLEAN		(1 << 16)
+#	define RADEON_WAIT_3D_IDLECLEAN		(1 << 17)
+#	define RADEON_WAIT_HOST_IDLECLEAN	(1 << 18)
+
+#define RADEON_RB3D_ZMASKOFFSET		0x1c34
+#define RADEON_RB3D_ZSTENCILCNTL	0x1c2c
+#	define RADEON_DEPTH_FORMAT_16BIT_INT_Z	(0 << 0)
+#	define RADEON_DEPTH_FORMAT_24BIT_INT_Z	(2 << 0)
+
+
+/* CP registers */
+#define RADEON_CP_ME_RAM_ADDR		0x07d4
+#define RADEON_CP_ME_RAM_RADDR		0x07d8
+#define RADEON_CP_ME_RAM_DATAH		0x07dc
+#define RADEON_CP_ME_RAM_DATAL		0x07e0
+
+#define RADEON_CP_RB_BASE		0x0700
+#define RADEON_CP_RB_CNTL		0x0704
+#	define RADEON_BUF_SWAP_32BIT		(2 << 16)
+#define RADEON_CP_RB_RPTR_ADDR		0x070c
+#define RADEON_CP_RB_RPTR		0x0710
+#define RADEON_CP_RB_WPTR		0x0714
+
+#define RADEON_CP_RB_WPTR_DELAY		0x0718
+#	define RADEON_PRE_WRITE_TIMER_SHIFT	0
+#	define RADEON_PRE_WRITE_LIMIT_SHIFT	23
+
+#define RADEON_CP_IB_BASE		0x0738
+
+#define RADEON_CP_CSQ_CNTL		0x0740
+#	define RADEON_CSQ_CNT_PRIMARY_MASK	(0xff << 0)
+#	define RADEON_CSQ_PRIDIS_INDDIS		(0 << 28)
+#	define RADEON_CSQ_PRIPIO_INDDIS		(1 << 28)
+#	define RADEON_CSQ_PRIBM_INDDIS		(2 << 28)
+#	define RADEON_CSQ_PRIPIO_INDBM		(3 << 28)
+#	define RADEON_CSQ_PRIBM_INDBM		(4 << 28)
+#	define RADEON_CSQ_PRIPIO_INDPIO		(15 << 28)
+
+#define RADEON_AIC_CNTL			0x01d0
+#	define RADEON_PCIGART_TRANSLATE_EN	(1 << 0)
+#define RADEON_AIC_STAT			0x01d4
+#define RADEON_AIC_PT_BASE		0x01d8
+#define RADEON_AIC_LO_ADDR		0x01dc
+#define RADEON_AIC_HI_ADDR		0x01e0
+#define RADEON_AIC_TLB_ADDR		0x01e4
+#define RADEON_AIC_TLB_DATA		0x01e8
+
+/* CP command packets */
+#define RADEON_CP_PACKET0		0x00000000
+#	define RADEON_ONE_REG_WR		(1 << 15)
+#define RADEON_CP_PACKET1		0x40000000
+#define RADEON_CP_PACKET2		0x80000000
+#define RADEON_CP_PACKET3		0xC0000000
+#	define RADEON_3D_RNDR_GEN_INDX_PRIM	0x00002300
+#	define RADEON_WAIT_FOR_IDLE		0x00002600
+#	define RADEON_3D_DRAW_VBUF		0x00002800
+#	define RADEON_3D_DRAW_IMMD		0x00002900
+#	define RADEON_3D_DRAW_INDX		0x00002A00
+#	define RADEON_3D_LOAD_VBPNTR		0x00002F00
+#	define RADEON_CNTL_HOSTDATA_BLT		0x00009400
+#	define RADEON_CNTL_PAINT_MULTI		0x00009A00
+#	define RADEON_CNTL_BITBLT_MULTI		0x00009B00
+#	define RADEON_CNTL_SET_SCISSORS		0xC0001E00
+
+#define RADEON_CP_PACKET_MASK		0xC0000000
+#define RADEON_CP_PACKET_COUNT_MASK	0x3fff0000
+#define RADEON_CP_PACKET0_REG_MASK	0x000007ff
+#define RADEON_CP_PACKET1_REG0_MASK	0x000007ff
+#define RADEON_CP_PACKET1_REG1_MASK	0x003ff800
+
+#define RADEON_VTX_Z_PRESENT			(1 << 31)
+#define RADEON_VTX_PKCOLOR_PRESENT		(1 << 3)
+
+#define RADEON_PRIM_TYPE_NONE			(0 << 0)
+#define RADEON_PRIM_TYPE_POINT			(1 << 0)
+#define RADEON_PRIM_TYPE_LINE			(2 << 0)
+#define RADEON_PRIM_TYPE_LINE_STRIP		(3 << 0)
+#define RADEON_PRIM_TYPE_TRI_LIST		(4 << 0)
+#define RADEON_PRIM_TYPE_TRI_FAN		(5 << 0)
+#define RADEON_PRIM_TYPE_TRI_STRIP		(6 << 0)
+#define RADEON_PRIM_TYPE_TRI_TYPE2		(7 << 0)
+#define RADEON_PRIM_TYPE_RECT_LIST		(8 << 0)
+#define RADEON_PRIM_TYPE_3VRT_POINT_LIST	(9 << 0)
+#define RADEON_PRIM_TYPE_3VRT_LINE_LIST		(10 << 0)
+#define RADEON_PRIM_TYPE_MASK                   0xf
+#define RADEON_PRIM_WALK_IND			(1 << 4)
+#define RADEON_PRIM_WALK_LIST			(2 << 4)
+#define RADEON_PRIM_WALK_RING			(3 << 4)
+#define RADEON_COLOR_ORDER_BGRA			(0 << 6)
+#define RADEON_COLOR_ORDER_RGBA			(1 << 6)
+#define RADEON_MAOS_ENABLE			(1 << 7)
+#define RADEON_VTX_FMT_R128_MODE		(0 << 8)
+#define RADEON_VTX_FMT_RADEON_MODE		(1 << 8)
+#define RADEON_NUM_VERTICES_SHIFT		16
+
+#define RADEON_COLOR_FORMAT_CI8		2
+#define RADEON_COLOR_FORMAT_ARGB1555	3
+#define RADEON_COLOR_FORMAT_RGB565	4
+#define RADEON_COLOR_FORMAT_ARGB8888	6
+#define RADEON_COLOR_FORMAT_RGB332	7
+#define RADEON_COLOR_FORMAT_RGB8	9
+#define RADEON_COLOR_FORMAT_ARGB4444	15
+
+#define RADEON_TXFORMAT_I8		0
+#define RADEON_TXFORMAT_AI88		1
+#define RADEON_TXFORMAT_RGB332		2
+#define RADEON_TXFORMAT_ARGB1555	3
+#define RADEON_TXFORMAT_RGB565		4
+#define RADEON_TXFORMAT_ARGB4444	5
+#define RADEON_TXFORMAT_ARGB8888	6
+#define RADEON_TXFORMAT_RGBA8888	7
+#define RADEON_TXFORMAT_VYUY422         10
+#define RADEON_TXFORMAT_YVYU422         11
+#define RADEON_TXFORMAT_DXT1            12
+#define RADEON_TXFORMAT_DXT23           14
+#define RADEON_TXFORMAT_DXT45           15
+
+#define R200_PP_TXCBLEND_0                0x2f00
+#define R200_PP_TXCBLEND_1                0x2f10
+#define R200_PP_TXCBLEND_2                0x2f20
+#define R200_PP_TXCBLEND_3                0x2f30
+#define R200_PP_TXCBLEND_4                0x2f40
+#define R200_PP_TXCBLEND_5                0x2f50
+#define R200_PP_TXCBLEND_6                0x2f60
+#define R200_PP_TXCBLEND_7                0x2f70
+#define R200_SE_TCL_LIGHT_MODEL_CTL_0     0x2268 
+#define R200_PP_TFACTOR_0                 0x2ee0
+#define R200_SE_VTX_FMT_0                 0x2088
+#define R200_SE_VAP_CNTL                  0x2080
+#define R200_SE_TCL_MATRIX_SEL_0          0x2230
+#define R200_SE_TCL_TEX_PROC_CTL_2        0x22a8 
+#define R200_SE_TCL_UCP_VERT_BLEND_CTL    0x22c0 
+#define R200_PP_TXFILTER_5                0x2ca0 
+#define R200_PP_TXFILTER_4                0x2c80 
+#define R200_PP_TXFILTER_3                0x2c60 
+#define R200_PP_TXFILTER_2                0x2c40 
+#define R200_PP_TXFILTER_1                0x2c20 
+#define R200_PP_TXFILTER_0                0x2c00 
+#define R200_PP_TXOFFSET_5                0x2d78
+#define R200_PP_TXOFFSET_4                0x2d60
+#define R200_PP_TXOFFSET_3                0x2d48
+#define R200_PP_TXOFFSET_2                0x2d30
+#define R200_PP_TXOFFSET_1                0x2d18
+#define R200_PP_TXOFFSET_0                0x2d00
+
+#define R200_PP_CUBIC_FACES_0             0x2c18
+#define R200_PP_CUBIC_FACES_1             0x2c38
+#define R200_PP_CUBIC_FACES_2             0x2c58
+#define R200_PP_CUBIC_FACES_3             0x2c78
+#define R200_PP_CUBIC_FACES_4             0x2c98
+#define R200_PP_CUBIC_FACES_5             0x2cb8
+#define R200_PP_CUBIC_OFFSET_F1_0         0x2d04
+#define R200_PP_CUBIC_OFFSET_F2_0         0x2d08
+#define R200_PP_CUBIC_OFFSET_F3_0         0x2d0c
+#define R200_PP_CUBIC_OFFSET_F4_0         0x2d10
+#define R200_PP_CUBIC_OFFSET_F5_0         0x2d14
+#define R200_PP_CUBIC_OFFSET_F1_1         0x2d1c
+#define R200_PP_CUBIC_OFFSET_F2_1         0x2d20
+#define R200_PP_CUBIC_OFFSET_F3_1         0x2d24
+#define R200_PP_CUBIC_OFFSET_F4_1         0x2d28
+#define R200_PP_CUBIC_OFFSET_F5_1         0x2d2c
+#define R200_PP_CUBIC_OFFSET_F1_2         0x2d34
+#define R200_PP_CUBIC_OFFSET_F2_2         0x2d38
+#define R200_PP_CUBIC_OFFSET_F3_2         0x2d3c
+#define R200_PP_CUBIC_OFFSET_F4_2         0x2d40
+#define R200_PP_CUBIC_OFFSET_F5_2         0x2d44
+#define R200_PP_CUBIC_OFFSET_F1_3         0x2d4c
+#define R200_PP_CUBIC_OFFSET_F2_3         0x2d50
+#define R200_PP_CUBIC_OFFSET_F3_3         0x2d54
+#define R200_PP_CUBIC_OFFSET_F4_3         0x2d58
+#define R200_PP_CUBIC_OFFSET_F5_3         0x2d5c
+#define R200_PP_CUBIC_OFFSET_F1_4         0x2d64
+#define R200_PP_CUBIC_OFFSET_F2_4         0x2d68
+#define R200_PP_CUBIC_OFFSET_F3_4         0x2d6c
+#define R200_PP_CUBIC_OFFSET_F4_4         0x2d70
+#define R200_PP_CUBIC_OFFSET_F5_4         0x2d74
+#define R200_PP_CUBIC_OFFSET_F1_5         0x2d7c
+#define R200_PP_CUBIC_OFFSET_F2_5         0x2d80
+#define R200_PP_CUBIC_OFFSET_F3_5         0x2d84
+#define R200_PP_CUBIC_OFFSET_F4_5         0x2d88
+#define R200_PP_CUBIC_OFFSET_F5_5         0x2d8c
+
+#define R200_RE_AUX_SCISSOR_CNTL          0x26f0
+#define R200_SE_VTE_CNTL                  0x20b0
+#define R200_SE_TCL_OUTPUT_VTX_COMP_SEL   0x2250
+#define R200_PP_TAM_DEBUG3                0x2d9c
+#define R200_PP_CNTL_X                    0x2cc4
+#define R200_SE_VAP_CNTL_STATUS           0x2140
+#define R200_RE_SCISSOR_TL_0              0x1cd8
+#define R200_RE_SCISSOR_TL_1              0x1ce0
+#define R200_RE_SCISSOR_TL_2              0x1ce8
+#define R200_RB3D_DEPTHXY_OFFSET          0x1d60 
+#define R200_RE_AUX_SCISSOR_CNTL          0x26f0
+#define R200_SE_VTX_STATE_CNTL            0x2180
+#define R200_RE_POINTSIZE                 0x2648
+#define R200_SE_TCL_INPUT_VTX_VECTOR_ADDR_0 0x2254
+
+
+#define SE_VAP_CNTL__TCL_ENA_MASK                          0x00000001
+#define SE_VAP_CNTL__FORCE_W_TO_ONE_MASK                   0x00010000
+#define SE_VAP_CNTL__VF_MAX_VTX_NUM__SHIFT                 0x00000012
+#define SE_VTE_CNTL__VTX_XY_FMT_MASK                       0x00000100
+#define SE_VTE_CNTL__VTX_Z_FMT_MASK                        0x00000200
+#define SE_VTX_FMT_0__VTX_Z0_PRESENT_MASK                  0x00000001
+#define SE_VTX_FMT_0__VTX_W0_PRESENT_MASK                  0x00000002
+#define SE_VTX_FMT_0__VTX_COLOR_0_FMT__SHIFT               0x0000000b
+#define R200_3D_DRAW_IMMD_2      0xC0003500
+#define R200_SE_VTX_FMT_1                 0x208c
+#define R200_RE_CNTL                      0x1c50 
+
+
+/* Constants */
+#define RADEON_MAX_USEC_TIMEOUT		100000	/* 100 ms */
+
+#define RADEON_LAST_FRAME_REG		RADEON_SCRATCH_REG0
+#define RADEON_LAST_DISPATCH_REG	RADEON_SCRATCH_REG1
+#define RADEON_LAST_CLEAR_REG		RADEON_SCRATCH_REG2
+#define RADEON_LAST_SWI_REG		RADEON_SCRATCH_REG3
+#define RADEON_LAST_DISPATCH		1
+
+#define RADEON_MAX_VB_AGE		0x7fffffff
+#define RADEON_MAX_VB_VERTS		(0xffff)
+
+#define RADEON_RING_HIGH_MARK		128
+
+
+#define RADEON_BASE(reg)	((unsigned long)(dev_priv->mmio->handle))
+#define RADEON_ADDR(reg)	(RADEON_BASE( reg ) + reg)
+
+#define RADEON_READ(reg)	DRM_READ32(  (volatile u32 *) RADEON_ADDR(reg) )
+#define RADEON_WRITE(reg,val)	DRM_WRITE32( (volatile u32 *) RADEON_ADDR(reg), (val) )
+
+#define RADEON_READ8(reg)	DRM_READ8(  (volatile u8 *) RADEON_ADDR(reg) )
+#define RADEON_WRITE8(reg,val)	DRM_WRITE8( (volatile u8 *) RADEON_ADDR(reg), (val) )
+
+#define RADEON_WRITE_PLL( addr, val )					\
+do {									\
+	RADEON_WRITE8( RADEON_CLOCK_CNTL_INDEX,				\
+		       ((addr) & 0x1f) | RADEON_PLL_WR_EN );		\
+	RADEON_WRITE( RADEON_CLOCK_CNTL_DATA, (val) );			\
+} while (0)
+
+extern int RADEON_READ_PLL( drm_device_t *dev, int addr );
+
+
+#define CP_PACKET0( reg, n )						\
+	(RADEON_CP_PACKET0 | ((n) << 16) | ((reg) >> 2))
+#define CP_PACKET0_TABLE( reg, n )					\
+	(RADEON_CP_PACKET0 | RADEON_ONE_REG_WR | ((n) << 16) | ((reg) >> 2))
+#define CP_PACKET1( reg0, reg1 )					\
+	(RADEON_CP_PACKET1 | (((reg1) >> 2) << 15) | ((reg0) >> 2))
+#define CP_PACKET2()							\
+	(RADEON_CP_PACKET2)
+#define CP_PACKET3( pkt, n )						\
+	(RADEON_CP_PACKET3 | (pkt) | ((n) << 16))
+
+
+/* ================================================================
+ * Engine control helper macros
+ */
+
+#define RADEON_WAIT_UNTIL_2D_IDLE() do {				\
+	OUT_RING( CP_PACKET0( RADEON_WAIT_UNTIL, 0 ) );			\
+	OUT_RING( (RADEON_WAIT_2D_IDLECLEAN |				\
+		   RADEON_WAIT_HOST_IDLECLEAN) );			\
+} while (0)
+
+#define RADEON_WAIT_UNTIL_3D_IDLE() do {				\
+	OUT_RING( CP_PACKET0( RADEON_WAIT_UNTIL, 0 ) );			\
+	OUT_RING( (RADEON_WAIT_3D_IDLECLEAN |				\
+		   RADEON_WAIT_HOST_IDLECLEAN) );			\
+} while (0)
+
+#define RADEON_WAIT_UNTIL_IDLE() do {					\
+	OUT_RING( CP_PACKET0( RADEON_WAIT_UNTIL, 0 ) );			\
+	OUT_RING( (RADEON_WAIT_2D_IDLECLEAN |				\
+		   RADEON_WAIT_3D_IDLECLEAN |				\
+		   RADEON_WAIT_HOST_IDLECLEAN) );			\
+} while (0)
+
+#define RADEON_WAIT_UNTIL_PAGE_FLIPPED() do {				\
+	OUT_RING( CP_PACKET0( RADEON_WAIT_UNTIL, 0 ) );			\
+	OUT_RING( RADEON_WAIT_CRTC_PFLIP );				\
+} while (0)
+
+#define RADEON_FLUSH_CACHE() do {					\
+	OUT_RING( CP_PACKET0( RADEON_RB2D_DSTCACHE_CTLSTAT, 0 ) );	\
+	OUT_RING( RADEON_RB2D_DC_FLUSH );				\
+} while (0)
+
+#define RADEON_PURGE_CACHE() do {					\
+	OUT_RING( CP_PACKET0( RADEON_RB2D_DSTCACHE_CTLSTAT, 0 ) );	\
+	OUT_RING( RADEON_RB2D_DC_FLUSH_ALL );				\
+} while (0)
+
+#define RADEON_FLUSH_ZCACHE() do {					\
+	OUT_RING( CP_PACKET0( RADEON_RB3D_ZCACHE_CTLSTAT, 0 ) );	\
+	OUT_RING( RADEON_RB3D_ZC_FLUSH );				\
+} while (0)
+
+#define RADEON_PURGE_ZCACHE() do {					\
+	OUT_RING( CP_PACKET0( RADEON_RB3D_ZCACHE_CTLSTAT, 0 ) );	\
+	OUT_RING( RADEON_RB3D_ZC_FLUSH_ALL );				\
+} while (0)
+
+
+/* ================================================================
+ * Misc helper macros
+ */
+
+#define LOCK_TEST_WITH_RETURN( dev )					\
+do {									\
+	if ( !_DRM_LOCK_IS_HELD( dev->lock.hw_lock->lock ) ||		\
+	     dev->lock.pid != DRM_CURRENTPID ) {			\
+		DRM_ERROR( "%s called without lock held\n", __FUNCTION__ );	\
+		return DRM_ERR(EINVAL);				\
+	}								\
+} while (0)
+
+
+/* Perfbox functionality only.  
+ */
+#define RING_SPACE_TEST_WITH_RETURN( dev_priv )				\
+do {									\
+	if (!(dev_priv->stats.boxes & RADEON_BOX_DMA_IDLE)) {		\
+		u32 head = GET_RING_HEAD(&dev_priv->ring);		\
+		if (head == dev_priv->ring.tail)			\
+			dev_priv->stats.boxes |= RADEON_BOX_DMA_IDLE;	\
+	}								\
+} while (0)
+
+#define VB_AGE_TEST_WITH_RETURN( dev_priv )				\
+do {									\
+	drm_radeon_sarea_t *sarea_priv = dev_priv->sarea_priv;		\
+	if ( sarea_priv->last_dispatch >= RADEON_MAX_VB_AGE ) {		\
+		int __ret = radeon_do_cp_idle( dev_priv );		\
+		if ( __ret ) return __ret;				\
+		sarea_priv->last_dispatch = 0;				\
+		radeon_freelist_reset( dev );				\
+	}								\
+} while (0)
+
+#define RADEON_DISPATCH_AGE( age ) do {					\
+	OUT_RING( CP_PACKET0( RADEON_LAST_DISPATCH_REG, 0 ) );		\
+	OUT_RING( age );						\
+} while (0)
+
+#define RADEON_FRAME_AGE( age ) do {					\
+	OUT_RING( CP_PACKET0( RADEON_LAST_FRAME_REG, 0 ) );		\
+	OUT_RING( age );						\
+} while (0)
+
+#define RADEON_CLEAR_AGE( age ) do {					\
+	OUT_RING( CP_PACKET0( RADEON_LAST_CLEAR_REG, 0 ) );		\
+	OUT_RING( age );						\
+} while (0)
+
+
+/* ================================================================
+ * Ring control
+ */
+
+#define RADEON_VERBOSE	0
+
+#define RING_LOCALS	int write, _nr; unsigned int mask; u32 *ring;
+
+#if defined(__alpha__)
+#  define RADEON_PAD_RING 16 /* pad ring requests to 16 lw boundaries */
+#else
+#  define RADEON_PAD_RING 0
+#endif
+
+#if RADEON_PAD_RING
+# define radeon_pad_size(n) 	\
+	(((RADEON_PAD_RING) - ((n) % (RADEON_PAD_RING))) % (RADEON_PAD_RING))
+# define radeon_pad_ring() do {						\
+	if (RADEON_VERBOSE) {						\
+		DRM_INFO("Padding ring from %d (%x) with %d words\n", 	\
+			 write, write, radeon_pad_size(write));		\
+	}								\
+	switch (radeon_pad_size(write)) {			      	\
+	case 0:  /* aligned */					      	\
+		break;						      	\
+	case 1:  /* 1 word */					      	\
+		OUT_RING(CP_PACKET2());				      	\
+		break;						      	\
+	default: /* >= 2 words */				      	\
+		OUT_RING(CP_PACKET3(0x1000, radeon_pad_size(write) - 1));\
+		write = (write + radeon_pad_size(write)) & mask;	\
+		write &= mask;						\
+		break;						      	\
+	}							      	\
+} while(0)
+#else
+# define radeon_pad_size(n) 0
+# define radeon_pad_ring()
+#endif
+
+#define BEGIN_RING( req_n ) do {					\
+	int n = req_n + radeon_pad_size(req_n);				\
+	if ( RADEON_VERBOSE ) {						\
+		DRM_INFO( "BEGIN_RING( %d (%d) ) in %s\n",		\
+			   n, req_n, __FUNCTION__ );			\
+	}								\
+	if ( dev_priv->ring.space <= (n) * sizeof(u32) ) {		\
+                COMMIT_RING();						\
+		radeon_wait_ring( dev_priv, (n) * sizeof(u32) );	\
+	}								\
+	_nr = n; dev_priv->ring.space -= (n) * sizeof(u32);		\
+	ring = dev_priv->ring.start;					\
+	write = dev_priv->ring.tail;					\
+	mask = dev_priv->ring.tail_mask;				\
+} while (0)
+
+#define ADVANCE_RING() do {						\
+	if ( RADEON_VERBOSE ) {						\
+		DRM_INFO( "ADVANCE_RING() wr=0x%06x tail=0x%06x\n",	\
+			  write, dev_priv->ring.tail );			\
+	}								\
+	radeon_pad_ring();						\
+	if (((dev_priv->ring.tail + _nr) & mask) != write) {		\
+		DRM_ERROR( 						\
+			"ADVANCE_RING(): mismatch: nr: %x write: %x line: %d\n",	\
+			((dev_priv->ring.tail + _nr) & mask),		\
+			write, __LINE__);						\
+	} else								\
+		dev_priv->ring.tail = write;				\
+} while (0)
+
+#define COMMIT_RING() do {						\
+	/* Flush writes to ring */					\
+	DRM_READMEMORYBARRIER();					\
+	GET_RING_HEAD( &dev_priv->ring );				\
+	RADEON_WRITE( RADEON_CP_RB_WPTR, dev_priv->ring.tail );		\
+	/* read from PCI bus to ensure correct posting */		\
+	RADEON_READ( RADEON_CP_RB_RPTR );				\
+} while (0)
+
+#define OUT_RING( x ) do {						\
+	if ( RADEON_VERBOSE ) {						\
+		DRM_INFO( "   OUT_RING( 0x%08x ) at 0x%x\n",		\
+			   (unsigned int)(x), write );			\
+	}								\
+	ring[write++] = (x);						\
+	write &= mask;							\
+} while (0)
+
+#define OUT_RING_REG( reg, val ) do {					\
+	OUT_RING( CP_PACKET0( reg, 0 ) );				\
+	OUT_RING( val );						\
+} while (0)
+
+
+#define OUT_RING_USER_TABLE( tab, sz ) do {			\
+	int _size = (sz);					\
+	int *_tab = (tab);					\
+								\
+	if (write + _size > mask) {				\
+		int i = (mask+1) - write;			\
+		if (DRM_COPY_FROM_USER_UNCHECKED( (int *)(ring+write),	\
+				      _tab, i*4 ))		\
+			return DRM_ERR(EFAULT);		\
+		write = 0;					\
+		_size -= i;					\
+		_tab += i;					\
+	}							\
+								\
+	if (_size && DRM_COPY_FROM_USER_UNCHECKED( (int *)(ring+write),	\
+			               _tab, _size*4 ))		\
+		return DRM_ERR(EFAULT);			\
+								\
+	write += _size;						\
+	write &= mask;						\
+} while (0)
+
+
+#endif /* __RADEON_DRV_H__ */
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/radeon_irq.c linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/radeon_irq.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/radeon_irq.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/radeon_irq.c	2003-07-30 11:18:33.000000000 +0200
@@ -0,0 +1,256 @@
+/* radeon_irq.c -- IRQ handling for radeon -*- linux-c -*-
+ *
+ * Copyright (C) The Weather Channel, Inc.  2002.  All Rights Reserved.
+ * 
+ * The Weather Channel (TM) funded Tungsten Graphics to develop the
+ * initial release of the Radeon 8500 driver under the XFree86 license.
+ * This notice must be preserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Keith Whitwell <keith@tungstengraphics.com>
+ *    Michel Dänzer <michel@daenzer.net>
+ */
+
+#include "radeon.h"
+#include "drmP.h"
+#include "drm.h"
+#include "radeon_drm.h"
+#include "radeon_drv.h"
+
+/* Interrupts - Used for device synchronization and flushing in the
+ * following circumstances:
+ *
+ * - Exclusive FB access with hw idle:
+ *    - Wait for GUI Idle (?) interrupt, then do normal flush.
+ *
+ * - Frame throttling, NV_fence:
+ *    - Drop marker irq's into command stream ahead of time.
+ *    - Wait on irq's with lock *not held*
+ *    - Check each for termination condition
+ *
+ * - Internally in cp_getbuffer, etc:
+ *    - as above, but wait with lock held???
+ *
+ * NOTE: These functions are misleadingly named -- the irq's aren't
+ * tied to dma at all, this is just a hangover from dri prehistory.
+ */
+
+void DRM(dma_service)( DRM_IRQ_ARGS )
+{
+	drm_device_t *dev = (drm_device_t *) arg;
+	drm_radeon_private_t *dev_priv = 
+	   (drm_radeon_private_t *)dev->dev_private;
+   	u32 stat;
+
+	/* Only consider the bits we're interested in - others could be used
+	 * outside the DRM
+	 */
+	stat = RADEON_READ(RADEON_GEN_INT_STATUS)
+	     & (RADEON_SW_INT_TEST | RADEON_CRTC_VBLANK_STAT);
+	if (!stat)
+		return;
+
+	/* SW interrupt */
+	if (stat & RADEON_SW_INT_TEST) {
+		DRM_WAKEUP( &dev_priv->swi_queue );
+	}
+
+	/* VBLANK interrupt */
+	if (stat & RADEON_CRTC_VBLANK_STAT) {
+		atomic_inc(&dev->vbl_received);
+		DRM_WAKEUP(&dev->vbl_queue);
+		DRM(vbl_send_signals)( dev );
+	}
+
+	/* Acknowledge interrupts we handle */
+	RADEON_WRITE(RADEON_GEN_INT_STATUS, stat);
+}
+
+static __inline__ void radeon_acknowledge_irqs(drm_radeon_private_t *dev_priv)
+{
+	u32 tmp = RADEON_READ( RADEON_GEN_INT_STATUS )
+		& (RADEON_SW_INT_TEST_ACK | RADEON_CRTC_VBLANK_STAT);
+	if (tmp)
+		RADEON_WRITE( RADEON_GEN_INT_STATUS, tmp );
+}
+
+int radeon_emit_irq(drm_device_t *dev)
+{
+	drm_radeon_private_t *dev_priv = dev->dev_private;
+	unsigned int ret;
+	RING_LOCALS;
+
+	atomic_inc(&dev_priv->swi_emitted);
+	ret = atomic_read(&dev_priv->swi_emitted);
+
+	BEGIN_RING( 4 );
+	OUT_RING_REG( RADEON_LAST_SWI_REG, ret );
+	OUT_RING_REG( RADEON_GEN_INT_STATUS, RADEON_SW_INT_FIRE );
+	ADVANCE_RING(); 
+ 	COMMIT_RING();
+
+	return ret;
+}
+
+
+int radeon_wait_irq(drm_device_t *dev, int swi_nr)
+{
+  	drm_radeon_private_t *dev_priv = 
+	   (drm_radeon_private_t *)dev->dev_private;
+	int ret = 0;
+
+ 	if (RADEON_READ( RADEON_LAST_SWI_REG ) >= swi_nr)  
+ 		return 0; 
+
+	dev_priv->stats.boxes |= RADEON_BOX_WAIT_IDLE;
+
+	/* This is a hack to work around mysterious freezes on certain
+	 * systems:
+	 */ 
+	radeon_acknowledge_irqs( dev_priv );
+
+	DRM_WAIT_ON( ret, dev_priv->swi_queue, 3 * DRM_HZ, 
+		     RADEON_READ( RADEON_LAST_SWI_REG ) >= swi_nr );
+
+	return ret;
+}
+
+int radeon_emit_and_wait_irq(drm_device_t *dev)
+{
+	return radeon_wait_irq( dev, radeon_emit_irq(dev) );
+}
+
+
+int DRM(vblank_wait)(drm_device_t *dev, unsigned int *sequence)
+{
+  	drm_radeon_private_t *dev_priv = 
+	   (drm_radeon_private_t *)dev->dev_private;
+	unsigned int cur_vblank;
+	int ret = 0;
+
+	if ( !dev_priv ) {
+		DRM_ERROR( "%s called with no initialization\n", __FUNCTION__ );
+		return DRM_ERR(EINVAL);
+	}
+
+	radeon_acknowledge_irqs( dev_priv );
+
+	dev_priv->stats.boxes |= RADEON_BOX_WAIT_IDLE;
+
+	/* Assume that the user has missed the current sequence number
+	 * by about a day rather than she wants to wait for years
+	 * using vertical blanks... 
+	 */
+	DRM_WAIT_ON( ret, dev->vbl_queue, 3*DRM_HZ, 
+		     ( ( ( cur_vblank = atomic_read(&dev->vbl_received ) )
+			 - *sequence ) <= (1<<23) ) );
+
+	*sequence = cur_vblank;
+
+	return ret;
+}
+
+
+/* Needs the lock as it touches the ring.
+ */
+int radeon_irq_emit( DRM_IOCTL_ARGS )
+{
+	DRM_DEVICE;
+	drm_radeon_private_t *dev_priv = dev->dev_private;
+	drm_radeon_irq_emit_t emit;
+	int result;
+
+	LOCK_TEST_WITH_RETURN( dev );
+
+	if ( !dev_priv ) {
+		DRM_ERROR( "%s called with no initialization\n", __FUNCTION__ );
+		return DRM_ERR(EINVAL);
+	}
+
+	DRM_COPY_FROM_USER_IOCTL( emit, (drm_radeon_irq_emit_t *)data,
+				  sizeof(emit) );
+
+	result = radeon_emit_irq( dev );
+
+	if ( DRM_COPY_TO_USER( emit.irq_seq, &result, sizeof(int) ) ) {
+		DRM_ERROR( "copy_to_user\n" );
+		return DRM_ERR(EFAULT);
+	}
+
+	return 0;
+}
+
+
+/* Doesn't need the hardware lock.
+ */
+int radeon_irq_wait( DRM_IOCTL_ARGS )
+{
+	DRM_DEVICE;
+	drm_radeon_private_t *dev_priv = dev->dev_private;
+	drm_radeon_irq_wait_t irqwait;
+
+	if ( !dev_priv ) {
+		DRM_ERROR( "%s called with no initialization\n", __FUNCTION__ );
+		return DRM_ERR(EINVAL);
+	}
+
+	DRM_COPY_FROM_USER_IOCTL( irqwait, (drm_radeon_irq_wait_t *)data,
+				  sizeof(irqwait) );
+
+	return radeon_wait_irq( dev, irqwait.irq_seq );
+}
+
+
+/* drm_dma.h hooks
+*/
+void DRM(driver_irq_preinstall)( drm_device_t *dev ) {
+	drm_radeon_private_t *dev_priv =
+		(drm_radeon_private_t *)dev->dev_private;
+
+ 	/* Disable *all* interrupts */
+      	RADEON_WRITE( RADEON_GEN_INT_CNTL, 0 );
+
+	/* Clear bits if they're already high */
+	radeon_acknowledge_irqs( dev_priv );
+}
+
+void DRM(driver_irq_postinstall)( drm_device_t *dev ) {
+	drm_radeon_private_t *dev_priv =
+		(drm_radeon_private_t *)dev->dev_private;
+
+   	atomic_set(&dev_priv->swi_emitted, 0);
+	DRM_INIT_WAITQUEUE( &dev_priv->swi_queue );
+
+	/* Turn on SW and VBL ints */
+   	RADEON_WRITE( RADEON_GEN_INT_CNTL,
+		      RADEON_CRTC_VBLANK_MASK |	
+		      RADEON_SW_INT_ENABLE );
+}
+
+void DRM(driver_irq_uninstall)( drm_device_t *dev ) {
+	drm_radeon_private_t *dev_priv =
+		(drm_radeon_private_t *)dev->dev_private;
+	if ( dev_priv ) {
+		/* Disable *all* interrupts */
+		RADEON_WRITE( RADEON_GEN_INT_CNTL, 0 );
+	}
+}
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/radeon_mem.c linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/radeon_mem.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/radeon_mem.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/radeon_mem.c	2003-07-30 11:18:33.000000000 +0200
@@ -0,0 +1,334 @@
+/* radeon_mem.c -- Simple agp/fb memory manager for radeon -*- linux-c -*-
+ *
+ * Copyright (C) The Weather Channel, Inc.  2002.  All Rights Reserved.
+ * 
+ * The Weather Channel (TM) funded Tungsten Graphics to develop the
+ * initial release of the Radeon 8500 driver under the XFree86 license.
+ * This notice must be preserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Keith Whitwell <keith@tungstengraphics.com>
+ */
+
+#include "radeon.h"
+#include "drmP.h"
+#include "drm.h"
+#include "radeon_drm.h"
+#include "radeon_drv.h"
+
+/* Very simple allocator for agp memory, working on a static range
+ * already mapped into each client's address space.  
+ */
+
+static struct mem_block *split_block(struct mem_block *p, int start, int size,
+				     int pid )
+{
+	/* Maybe cut off the start of an existing block */
+	if (start > p->start) {
+		struct mem_block *newblock = DRM_MALLOC(sizeof(*newblock));
+		if (!newblock) 
+			goto out;
+		newblock->start = start;
+		newblock->size = p->size - (start - p->start);
+		newblock->pid = 0;
+		newblock->next = p->next;
+		newblock->prev = p;
+		p->next->prev = newblock;
+		p->next = newblock;
+		p->size -= newblock->size;
+		p = newblock;
+	}
+   
+	/* Maybe cut off the end of an existing block */
+	if (size < p->size) {
+		struct mem_block *newblock = DRM_MALLOC(sizeof(*newblock));
+		if (!newblock)
+			goto out;
+		newblock->start = start + size;
+		newblock->size = p->size - size;
+		newblock->pid = 0;
+		newblock->next = p->next;
+		newblock->prev = p;
+		p->next->prev = newblock;
+		p->next = newblock;
+		p->size = size;
+	}
+
+ out:
+	/* Our block is in the middle */
+	p->pid = pid;
+	return p;
+}
+
+static struct mem_block *alloc_block( struct mem_block *heap, int size, 
+				      int align2, int pid )
+{
+	struct mem_block *p;
+	int mask = (1 << align2)-1;
+
+	for (p = heap->next ; p != heap ; p = p->next) {
+		int start = (p->start + mask) & ~mask;
+		if (p->pid == 0 && start + size <= p->start + p->size)
+			return split_block( p, start, size, pid );
+	}
+
+	return NULL;
+}
+
+static struct mem_block *find_block( struct mem_block *heap, int start )
+{
+	struct mem_block *p;
+
+	for (p = heap->next ; p != heap ; p = p->next) 
+		if (p->start == start)
+			return p;
+
+	return NULL;
+}
+
+
+static void free_block( struct mem_block *p )
+{
+	p->pid = 0;
+
+	/* Assumes a single contiguous range.  Needs a special pid in
+	 * 'heap' to stop it being subsumed.
+	 */
+	if (p->next->pid == 0) {
+		struct mem_block *q = p->next;
+		p->size += q->size;
+		p->next = q->next;
+		p->next->prev = p;
+		DRM_FREE(q);
+	}
+
+	if (p->prev->pid == 0) {
+		struct mem_block *q = p->prev;
+		q->size += p->size;
+		q->next = p->next;
+		q->next->prev = q;
+		DRM_FREE(p);
+	}
+}
+
+static void print_heap( struct mem_block *heap )
+{
+	struct mem_block *p;
+
+	for (p = heap->next ; p != heap ; p = p->next) 
+		DRM_DEBUG("0x%x..0x%x (0x%x) -- owner %d\n",
+			  p->start, p->start + p->size,
+			  p->size, p->pid);
+}
+
+/* Initialize.  How to check for an uninitialized heap?
+ */
+static int init_heap(struct mem_block **heap, int start, int size)
+{
+	struct mem_block *blocks = DRM_MALLOC(sizeof(*blocks));
+
+	if (!blocks) 
+		return -ENOMEM;
+	
+	*heap = DRM_MALLOC(sizeof(**heap));
+	if (!*heap) {
+		DRM_FREE( blocks );
+		return -ENOMEM;
+	}
+
+	blocks->start = start;
+	blocks->size = size;
+	blocks->pid = 0;
+	blocks->next = blocks->prev = *heap;
+
+	memset( *heap, 0, sizeof(**heap) );
+	(*heap)->pid = -1;
+	(*heap)->next = (*heap)->prev = blocks;
+	return 0;
+}
+
+
+/* Free all blocks associated with the releasing pid.
+ */
+void radeon_mem_release( struct mem_block *heap )
+{
+	int pid = DRM_CURRENTPID;
+	struct mem_block *p;
+
+	if (!heap || !heap->next)
+		return;
+
+	for (p = heap->next ; p != heap ; p = p->next) {
+		if (p->pid == pid) 
+			p->pid = 0;
+	}
+
+	/* Assumes a single contiguous range.  Needs a special pid in
+	 * 'heap' to stop it being subsumed.
+	 */
+	for (p = heap->next ; p != heap ; p = p->next) {
+		while (p->pid == 0 && p->next->pid == 0) {
+			struct mem_block *q = p->next;
+			p->size += q->size;
+			p->next = q->next;
+			p->next->prev = p;
+			DRM_FREE(q);
+		}
+	}
+}
+
+/* Shutdown.
+ */
+void radeon_mem_takedown( struct mem_block **heap )
+{
+	struct mem_block *p;
+	
+	if (!*heap)
+		return;
+
+	for (p = (*heap)->next ; p != *heap ; ) {
+		struct mem_block *q = p;
+		p = p->next;
+		DRM_FREE(q);
+	}
+
+	DRM_FREE( *heap );
+	*heap = 0;
+}
+
+
+
+/* IOCTL HANDLERS */
+
+static struct mem_block **get_heap( drm_radeon_private_t *dev_priv,
+				   int region )
+{
+	switch( region ) {
+	case RADEON_MEM_REGION_AGP:
+ 		return &dev_priv->agp_heap; 
+	case RADEON_MEM_REGION_FB:
+		return &dev_priv->fb_heap;
+	default:
+		return 0;
+	}
+}
+
+int radeon_mem_alloc( DRM_IOCTL_ARGS )
+{
+	DRM_DEVICE;
+	drm_radeon_private_t *dev_priv = dev->dev_private;
+	drm_radeon_mem_alloc_t alloc;
+	struct mem_block *block, **heap;
+
+	if ( !dev_priv ) {
+		DRM_ERROR( "%s called with no initialization\n", __FUNCTION__ );
+		return DRM_ERR(EINVAL);
+	}
+
+	DRM_COPY_FROM_USER_IOCTL( alloc, (drm_radeon_mem_alloc_t *)data,
+				  sizeof(alloc) );
+
+	heap = get_heap( dev_priv, alloc.region );
+	if (!heap || !*heap)
+		return DRM_ERR(EFAULT);
+	
+	/* Make things easier on ourselves: all allocations at least
+	 * 4k aligned.
+	 */
+	if (alloc.alignment < 12)
+		alloc.alignment = 12;
+
+	block = alloc_block( *heap, alloc.size, alloc.alignment,
+			     DRM_CURRENTPID );
+
+	if (!block) 
+		return DRM_ERR(ENOMEM);
+
+	if ( DRM_COPY_TO_USER( alloc.region_offset, &block->start, 
+			       sizeof(int) ) ) {
+		DRM_ERROR( "copy_to_user\n" );
+		return DRM_ERR(EFAULT);
+	}
+	
+	return 0;
+}
+
+
+
+int radeon_mem_free( DRM_IOCTL_ARGS )
+{
+	DRM_DEVICE;
+	drm_radeon_private_t *dev_priv = dev->dev_private;
+	drm_radeon_mem_free_t memfree;
+	struct mem_block *block, **heap;
+
+	if ( !dev_priv ) {
+		DRM_ERROR( "%s called with no initialization\n", __FUNCTION__ );
+		return DRM_ERR(EINVAL);
+	}
+
+	DRM_COPY_FROM_USER_IOCTL( memfree, (drm_radeon_mem_free_t *)data,
+				  sizeof(memfree) );
+
+	heap = get_heap( dev_priv, memfree.region );
+	if (!heap || !*heap)
+		return DRM_ERR(EFAULT);
+	
+	block = find_block( *heap, memfree.region_offset );
+	if (!block)
+		return DRM_ERR(EFAULT);
+
+	if (block->pid != DRM_CURRENTPID)
+		return DRM_ERR(EPERM);
+
+	free_block( block );	
+	return 0;
+}
+
+int radeon_mem_init_heap( DRM_IOCTL_ARGS )
+{
+	DRM_DEVICE;
+	drm_radeon_private_t *dev_priv = dev->dev_private;
+	drm_radeon_mem_init_heap_t initheap;
+	struct mem_block **heap;
+
+	if ( !dev_priv ) {
+		DRM_ERROR( "%s called with no initialization\n", __FUNCTION__ );
+		return DRM_ERR(EINVAL);
+	}
+
+	DRM_COPY_FROM_USER_IOCTL( initheap, (drm_radeon_mem_init_heap_t *)data,
+				  sizeof(initheap) );
+
+	heap = get_heap( dev_priv, initheap.region );
+	if (!heap) 
+		return DRM_ERR(EFAULT);
+	
+	if (*heap) {
+		DRM_ERROR("heap already initialized?");
+		return DRM_ERR(EFAULT);
+	}
+		
+	return init_heap( heap, initheap.start, initheap.size );
+}
+
+
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/radeon_state.c linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/radeon_state.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/radeon_state.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/radeon_state.c	2003-07-30 11:18:33.000000000 +0200
@@ -0,0 +1,2202 @@
+/* radeon_state.c -- State support for Radeon -*- linux-c -*-
+ *
+ * Copyright 2000 VA Linux Systems, Inc., Fremont, California.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Gareth Hughes <gareth@valinux.com>
+ *    Kevin E. Martin <martin@valinux.com>
+ */
+
+#include "radeon.h"
+#include "drmP.h"
+#include "drm.h"
+#include "drm_sarea.h"
+#include "radeon_drm.h"
+#include "radeon_drv.h"
+
+
+/* ================================================================
+ * CP hardware state programming functions
+ */
+
+static __inline__ void radeon_emit_clip_rect( drm_radeon_private_t *dev_priv,
+					  drm_clip_rect_t *box )
+{
+	RING_LOCALS;
+
+	DRM_DEBUG( "   box:  x1=%d y1=%d  x2=%d y2=%d\n",
+		   box->x1, box->y1, box->x2, box->y2 );
+
+	BEGIN_RING( 4 );
+	OUT_RING( CP_PACKET0( RADEON_RE_TOP_LEFT, 0 ) );
+	OUT_RING( (box->y1 << 16) | box->x1 );
+	OUT_RING( CP_PACKET0( RADEON_RE_WIDTH_HEIGHT, 0 ) );
+	OUT_RING( ((box->y2 - 1) << 16) | (box->x2 - 1) );
+	ADVANCE_RING();
+}
+
+/* Emit 1.1 state
+ */
+static void radeon_emit_state( drm_radeon_private_t *dev_priv,
+			       drm_radeon_context_regs_t *ctx,
+			       drm_radeon_texture_regs_t *tex,
+			       unsigned int dirty )
+{
+	RING_LOCALS;
+	DRM_DEBUG( "dirty=0x%08x\n", dirty );
+
+	if ( dirty & RADEON_UPLOAD_CONTEXT ) {
+		BEGIN_RING( 14 );
+		OUT_RING( CP_PACKET0( RADEON_PP_MISC, 6 ) );
+		OUT_RING( ctx->pp_misc );
+		OUT_RING( ctx->pp_fog_color );
+		OUT_RING( ctx->re_solid_color );
+		OUT_RING( ctx->rb3d_blendcntl );
+		OUT_RING( ctx->rb3d_depthoffset );
+		OUT_RING( ctx->rb3d_depthpitch );
+		OUT_RING( ctx->rb3d_zstencilcntl );
+		OUT_RING( CP_PACKET0( RADEON_PP_CNTL, 2 ) );
+		OUT_RING( ctx->pp_cntl );
+		OUT_RING( ctx->rb3d_cntl );
+		OUT_RING( ctx->rb3d_coloroffset );
+		OUT_RING( CP_PACKET0( RADEON_RB3D_COLORPITCH, 0 ) );
+		OUT_RING( ctx->rb3d_colorpitch );
+		ADVANCE_RING();
+	}
+
+	if ( dirty & RADEON_UPLOAD_VERTFMT ) {
+		BEGIN_RING( 2 );
+		OUT_RING( CP_PACKET0( RADEON_SE_COORD_FMT, 0 ) );
+		OUT_RING( ctx->se_coord_fmt );
+		ADVANCE_RING();
+	}
+
+	if ( dirty & RADEON_UPLOAD_LINE ) {
+		BEGIN_RING( 5 );
+		OUT_RING( CP_PACKET0( RADEON_RE_LINE_PATTERN, 1 ) );
+		OUT_RING( ctx->re_line_pattern );
+		OUT_RING( ctx->re_line_state );
+		OUT_RING( CP_PACKET0( RADEON_SE_LINE_WIDTH, 0 ) );
+		OUT_RING( ctx->se_line_width );
+		ADVANCE_RING();
+	}
+
+	if ( dirty & RADEON_UPLOAD_BUMPMAP ) {
+		BEGIN_RING( 5 );
+		OUT_RING( CP_PACKET0( RADEON_PP_LUM_MATRIX, 0 ) );
+		OUT_RING( ctx->pp_lum_matrix );
+		OUT_RING( CP_PACKET0( RADEON_PP_ROT_MATRIX_0, 1 ) );
+		OUT_RING( ctx->pp_rot_matrix_0 );
+		OUT_RING( ctx->pp_rot_matrix_1 );
+		ADVANCE_RING();
+	}
+
+	if ( dirty & RADEON_UPLOAD_MASKS ) {
+		BEGIN_RING( 4 );
+		OUT_RING( CP_PACKET0( RADEON_RB3D_STENCILREFMASK, 2 ) );
+		OUT_RING( ctx->rb3d_stencilrefmask );
+		OUT_RING( ctx->rb3d_ropcntl );
+		OUT_RING( ctx->rb3d_planemask );
+		ADVANCE_RING();
+	}
+
+	if ( dirty & RADEON_UPLOAD_VIEWPORT ) {
+		BEGIN_RING( 7 );
+		OUT_RING( CP_PACKET0( RADEON_SE_VPORT_XSCALE, 5 ) );
+		OUT_RING( ctx->se_vport_xscale );
+		OUT_RING( ctx->se_vport_xoffset );
+		OUT_RING( ctx->se_vport_yscale );
+		OUT_RING( ctx->se_vport_yoffset );
+		OUT_RING( ctx->se_vport_zscale );
+		OUT_RING( ctx->se_vport_zoffset );
+		ADVANCE_RING();
+	}
+
+	if ( dirty & RADEON_UPLOAD_SETUP ) {
+		BEGIN_RING( 4 );
+		OUT_RING( CP_PACKET0( RADEON_SE_CNTL, 0 ) );
+		OUT_RING( ctx->se_cntl );
+		OUT_RING( CP_PACKET0( RADEON_SE_CNTL_STATUS, 0 ) );
+		OUT_RING( ctx->se_cntl_status );
+		ADVANCE_RING();
+	}
+
+	if ( dirty & RADEON_UPLOAD_MISC ) {
+		BEGIN_RING( 2 );
+		OUT_RING( CP_PACKET0( RADEON_RE_MISC, 0 ) );
+		OUT_RING( ctx->re_misc );
+		ADVANCE_RING();
+	}
+
+	if ( dirty & RADEON_UPLOAD_TEX0 ) {
+		BEGIN_RING( 9 );
+		OUT_RING( CP_PACKET0( RADEON_PP_TXFILTER_0, 5 ) );
+		OUT_RING( tex[0].pp_txfilter );
+		OUT_RING( tex[0].pp_txformat );
+		OUT_RING( tex[0].pp_txoffset );
+		OUT_RING( tex[0].pp_txcblend );
+		OUT_RING( tex[0].pp_txablend );
+		OUT_RING( tex[0].pp_tfactor );
+		OUT_RING( CP_PACKET0( RADEON_PP_BORDER_COLOR_0, 0 ) );
+		OUT_RING( tex[0].pp_border_color );
+		ADVANCE_RING();
+	}
+
+	if ( dirty & RADEON_UPLOAD_TEX1 ) {
+		BEGIN_RING( 9 );
+		OUT_RING( CP_PACKET0( RADEON_PP_TXFILTER_1, 5 ) );
+		OUT_RING( tex[1].pp_txfilter );
+		OUT_RING( tex[1].pp_txformat );
+		OUT_RING( tex[1].pp_txoffset );
+		OUT_RING( tex[1].pp_txcblend );
+		OUT_RING( tex[1].pp_txablend );
+		OUT_RING( tex[1].pp_tfactor );
+		OUT_RING( CP_PACKET0( RADEON_PP_BORDER_COLOR_1, 0 ) );
+		OUT_RING( tex[1].pp_border_color );
+		ADVANCE_RING();
+	}
+
+	if ( dirty & RADEON_UPLOAD_TEX2 ) {
+		BEGIN_RING( 9 );
+		OUT_RING( CP_PACKET0( RADEON_PP_TXFILTER_2, 5 ) );
+		OUT_RING( tex[2].pp_txfilter );
+		OUT_RING( tex[2].pp_txformat );
+		OUT_RING( tex[2].pp_txoffset );
+		OUT_RING( tex[2].pp_txcblend );
+		OUT_RING( tex[2].pp_txablend );
+		OUT_RING( tex[2].pp_tfactor );
+		OUT_RING( CP_PACKET0( RADEON_PP_BORDER_COLOR_2, 0 ) );
+		OUT_RING( tex[2].pp_border_color );
+		ADVANCE_RING();
+	}
+}
+
+/* Emit 1.2 state
+ */
+static void radeon_emit_state2( drm_radeon_private_t *dev_priv,
+				drm_radeon_state_t *state )
+{
+	RING_LOCALS;
+
+	if (state->dirty & RADEON_UPLOAD_ZBIAS) {
+		BEGIN_RING( 3 );
+		OUT_RING( CP_PACKET0( RADEON_SE_ZBIAS_FACTOR, 1 ) );
+		OUT_RING( state->context2.se_zbias_factor ); 
+		OUT_RING( state->context2.se_zbias_constant ); 
+		ADVANCE_RING();
+	}
+
+	radeon_emit_state( dev_priv, &state->context, 
+			   state->tex, state->dirty );
+}
+
+/* New (1.3) state mechanism.  3 commands (packet, scalar, vector) in
+ * 1.3 cmdbuffers allow all previous state to be updated as well as
+ * the tcl scalar and vector areas.  
+ */
+static struct { 
+	int start; 
+	int len; 
+	const char *name;
+} packet[RADEON_MAX_STATE_PACKETS] = {
+	{ RADEON_PP_MISC,7,"RADEON_PP_MISC" },
+	{ RADEON_PP_CNTL,3,"RADEON_PP_CNTL" },
+	{ RADEON_RB3D_COLORPITCH,1,"RADEON_RB3D_COLORPITCH" },
+	{ RADEON_RE_LINE_PATTERN,2,"RADEON_RE_LINE_PATTERN" },
+	{ RADEON_SE_LINE_WIDTH,1,"RADEON_SE_LINE_WIDTH" },
+	{ RADEON_PP_LUM_MATRIX,1,"RADEON_PP_LUM_MATRIX" },
+	{ RADEON_PP_ROT_MATRIX_0,2,"RADEON_PP_ROT_MATRIX_0" },
+	{ RADEON_RB3D_STENCILREFMASK,3,"RADEON_RB3D_STENCILREFMASK" },
+	{ RADEON_SE_VPORT_XSCALE,6,"RADEON_SE_VPORT_XSCALE" },
+	{ RADEON_SE_CNTL,2,"RADEON_SE_CNTL" },
+	{ RADEON_SE_CNTL_STATUS,1,"RADEON_SE_CNTL_STATUS" },
+	{ RADEON_RE_MISC,1,"RADEON_RE_MISC" },
+	{ RADEON_PP_TXFILTER_0,6,"RADEON_PP_TXFILTER_0" },
+	{ RADEON_PP_BORDER_COLOR_0,1,"RADEON_PP_BORDER_COLOR_0" },
+	{ RADEON_PP_TXFILTER_1,6,"RADEON_PP_TXFILTER_1" },
+	{ RADEON_PP_BORDER_COLOR_1,1,"RADEON_PP_BORDER_COLOR_1" },
+	{ RADEON_PP_TXFILTER_2,6,"RADEON_PP_TXFILTER_2" },
+	{ RADEON_PP_BORDER_COLOR_2,1,"RADEON_PP_BORDER_COLOR_2" },
+	{ RADEON_SE_ZBIAS_FACTOR,2,"RADEON_SE_ZBIAS_FACTOR" },
+	{ RADEON_SE_TCL_OUTPUT_VTX_FMT,11,"RADEON_SE_TCL_OUTPUT_VTX_FMT" },
+	{ RADEON_SE_TCL_MATERIAL_EMMISSIVE_RED,17,"RADEON_SE_TCL_MATERIAL_EMMISSIVE_RED" },
+	{ R200_PP_TXCBLEND_0, 4, "R200_PP_TXCBLEND_0" },
+	{ R200_PP_TXCBLEND_1, 4, "R200_PP_TXCBLEND_1" },
+	{ R200_PP_TXCBLEND_2, 4, "R200_PP_TXCBLEND_2" },
+	{ R200_PP_TXCBLEND_3, 4, "R200_PP_TXCBLEND_3" },
+	{ R200_PP_TXCBLEND_4, 4, "R200_PP_TXCBLEND_4" },
+	{ R200_PP_TXCBLEND_5, 4, "R200_PP_TXCBLEND_5" },
+	{ R200_PP_TXCBLEND_6, 4, "R200_PP_TXCBLEND_6" },
+	{ R200_PP_TXCBLEND_7, 4, "R200_PP_TXCBLEND_7" },
+	{ R200_SE_TCL_LIGHT_MODEL_CTL_0, 6, "R200_SE_TCL_LIGHT_MODEL_CTL_0" },
+	{ R200_PP_TFACTOR_0, 6, "R200_PP_TFACTOR_0" },
+	{ R200_SE_VTX_FMT_0, 4, "R200_SE_VTX_FMT_0" },
+	{ R200_SE_VAP_CNTL, 1, "R200_SE_VAP_CNTL" },
+	{ R200_SE_TCL_MATRIX_SEL_0, 5, "R200_SE_TCL_MATRIX_SEL_0" },
+	{ R200_SE_TCL_TEX_PROC_CTL_2, 5, "R200_SE_TCL_TEX_PROC_CTL_2" },
+	{ R200_SE_TCL_UCP_VERT_BLEND_CTL, 1, "R200_SE_TCL_UCP_VERT_BLEND_CTL" },
+	{ R200_PP_TXFILTER_0, 6, "R200_PP_TXFILTER_0" },
+	{ R200_PP_TXFILTER_1, 6, "R200_PP_TXFILTER_1" },
+	{ R200_PP_TXFILTER_2, 6, "R200_PP_TXFILTER_2" },
+	{ R200_PP_TXFILTER_3, 6, "R200_PP_TXFILTER_3" },
+	{ R200_PP_TXFILTER_4, 6, "R200_PP_TXFILTER_4" },
+	{ R200_PP_TXFILTER_5, 6, "R200_PP_TXFILTER_5" },
+	{ R200_PP_TXOFFSET_0, 1, "R200_PP_TXOFFSET_0" },
+	{ R200_PP_TXOFFSET_1, 1, "R200_PP_TXOFFSET_1" },
+	{ R200_PP_TXOFFSET_2, 1, "R200_PP_TXOFFSET_2" },
+	{ R200_PP_TXOFFSET_3, 1, "R200_PP_TXOFFSET_3" },
+	{ R200_PP_TXOFFSET_4, 1, "R200_PP_TXOFFSET_4" },
+	{ R200_PP_TXOFFSET_5, 1, "R200_PP_TXOFFSET_5" },
+	{ R200_SE_VTE_CNTL, 1, "R200_SE_VTE_CNTL" },
+	{ R200_SE_TCL_OUTPUT_VTX_COMP_SEL, 1, "R200_SE_TCL_OUTPUT_VTX_COMP_SEL" },
+	{ R200_PP_TAM_DEBUG3, 1, "R200_PP_TAM_DEBUG3" },
+	{ R200_PP_CNTL_X, 1, "R200_PP_CNTL_X" }, 
+	{ R200_RB3D_DEPTHXY_OFFSET, 1, "R200_RB3D_DEPTHXY_OFFSET" }, 
+	{ R200_RE_AUX_SCISSOR_CNTL, 1, "R200_RE_AUX_SCISSOR_CNTL" }, 
+	{ R200_RE_SCISSOR_TL_0, 2, "R200_RE_SCISSOR_TL_0" }, 
+	{ R200_RE_SCISSOR_TL_1, 2, "R200_RE_SCISSOR_TL_1" }, 
+	{ R200_RE_SCISSOR_TL_2, 2, "R200_RE_SCISSOR_TL_2" }, 
+	{ R200_SE_VAP_CNTL_STATUS, 1, "R200_SE_VAP_CNTL_STATUS" }, 
+	{ R200_SE_VTX_STATE_CNTL, 1, "R200_SE_VTX_STATE_CNTL" }, 
+	{ R200_RE_POINTSIZE, 1, "R200_RE_POINTSIZE" }, 
+	{ R200_SE_TCL_INPUT_VTX_VECTOR_ADDR_0, 4, "R200_SE_TCL_INPUT_VTX_VECTOR_ADDR_0" },
+	{ R200_PP_CUBIC_FACES_0, 1, "R200_PP_CUBIC_FACES_0" }, /* 61 */
+	{ R200_PP_CUBIC_OFFSET_F1_0, 5, "R200_PP_CUBIC_OFFSET_F1_0" }, /* 62 */
+	{ R200_PP_CUBIC_FACES_1, 1, "R200_PP_CUBIC_FACES_1" },
+	{ R200_PP_CUBIC_OFFSET_F1_1, 5, "R200_PP_CUBIC_OFFSET_F1_1" },
+	{ R200_PP_CUBIC_FACES_2, 1, "R200_PP_CUBIC_FACES_2" },
+	{ R200_PP_CUBIC_OFFSET_F1_2, 5, "R200_PP_CUBIC_OFFSET_F1_2" },
+	{ R200_PP_CUBIC_FACES_3, 1, "R200_PP_CUBIC_FACES_3" },
+	{ R200_PP_CUBIC_OFFSET_F1_3, 5, "R200_PP_CUBIC_OFFSET_F1_3" },
+	{ R200_PP_CUBIC_FACES_4, 1, "R200_PP_CUBIC_FACES_4" },
+	{ R200_PP_CUBIC_OFFSET_F1_4, 5, "R200_PP_CUBIC_OFFSET_F1_4" },
+	{ R200_PP_CUBIC_FACES_5, 1, "R200_PP_CUBIC_FACES_5" },
+	{ R200_PP_CUBIC_OFFSET_F1_5, 5, "R200_PP_CUBIC_OFFSET_F1_5" },
+};
+
+
+
+/* ================================================================
+ * Performance monitoring functions
+ */
+
+static void radeon_clear_box( drm_radeon_private_t *dev_priv,
+			      int x, int y, int w, int h,
+			      int r, int g, int b )
+{
+	u32 color;
+	RING_LOCALS;
+
+	x += dev_priv->sarea_priv->boxes[0].x1;
+	y += dev_priv->sarea_priv->boxes[0].y1;
+
+	switch ( dev_priv->color_fmt ) {
+	case RADEON_COLOR_FORMAT_RGB565:
+		color = (((r & 0xf8) << 8) |
+			 ((g & 0xfc) << 3) |
+			 ((b & 0xf8) >> 3));
+		break;
+	case RADEON_COLOR_FORMAT_ARGB8888:
+	default:
+		color = (((0xff) << 24) | (r << 16) | (g <<  8) | b);
+		break;
+	}
+
+	BEGIN_RING( 4 );
+	RADEON_WAIT_UNTIL_3D_IDLE();		
+	OUT_RING( CP_PACKET0( RADEON_DP_WRITE_MASK, 0 ) );
+	OUT_RING( 0xffffffff );
+	ADVANCE_RING();
+
+	BEGIN_RING( 6 );
+
+	OUT_RING( CP_PACKET3( RADEON_CNTL_PAINT_MULTI, 4 ) );
+	OUT_RING( RADEON_GMC_DST_PITCH_OFFSET_CNTL |
+		  RADEON_GMC_BRUSH_SOLID_COLOR |
+		  (dev_priv->color_fmt << 8) |
+		  RADEON_GMC_SRC_DATATYPE_COLOR |
+		  RADEON_ROP3_P |
+		  RADEON_GMC_CLR_CMP_CNTL_DIS );
+
+ 	if ( dev_priv->page_flipping && dev_priv->current_page == 1 ) { 
+		OUT_RING( dev_priv->front_pitch_offset );
+ 	} else {	 
+		OUT_RING( dev_priv->back_pitch_offset );
+ 	} 
+
+	OUT_RING( color );
+
+	OUT_RING( (x << 16) | y );
+	OUT_RING( (w << 16) | h );
+
+	ADVANCE_RING();
+}
+
+static void radeon_cp_performance_boxes( drm_radeon_private_t *dev_priv )
+{
+	/* Collapse various things into a wait flag -- trying to
+	 * guess if userspase slept -- better just to have them tell us.
+	 */
+	if (dev_priv->stats.last_frame_reads > 1 ||
+	    dev_priv->stats.last_clear_reads > dev_priv->stats.clears) {
+		dev_priv->stats.boxes |= RADEON_BOX_WAIT_IDLE;
+	}
+
+	if (dev_priv->stats.freelist_loops) {
+		dev_priv->stats.boxes |= RADEON_BOX_WAIT_IDLE;
+	}
+
+	/* Purple box for page flipping
+	 */
+	if ( dev_priv->stats.boxes & RADEON_BOX_FLIP ) 
+		radeon_clear_box( dev_priv, 4, 4, 8, 8, 255, 0, 255 );
+
+	/* Red box if we have to wait for idle at any point
+	 */
+	if ( dev_priv->stats.boxes & RADEON_BOX_WAIT_IDLE ) 
+		radeon_clear_box( dev_priv, 16, 4, 8, 8, 255, 0, 0 );
+
+	/* Blue box: lost context?
+	 */
+
+	/* Yellow box for texture swaps
+	 */
+	if ( dev_priv->stats.boxes & RADEON_BOX_TEXTURE_LOAD ) 
+		radeon_clear_box( dev_priv, 40, 4, 8, 8, 255, 255, 0 );
+
+	/* Green box if hardware never idles (as far as we can tell)
+	 */
+	if ( !(dev_priv->stats.boxes & RADEON_BOX_DMA_IDLE) ) 
+		radeon_clear_box( dev_priv, 64, 4, 8, 8, 0, 255, 0 );
+
+
+	/* Draw bars indicating number of buffers allocated 
+	 * (not a great measure, easily confused)
+	 */
+	if (dev_priv->stats.requested_bufs) {
+		if (dev_priv->stats.requested_bufs > 100)
+			dev_priv->stats.requested_bufs = 100;
+
+		radeon_clear_box( dev_priv, 4, 16,  
+				  dev_priv->stats.requested_bufs, 4,
+				  196, 128, 128 );
+	}
+
+	memset( &dev_priv->stats, 0, sizeof(dev_priv->stats) );
+
+}
+/* ================================================================
+ * CP command dispatch functions
+ */
+
+static void radeon_cp_dispatch_clear( drm_device_t *dev,
+				      drm_radeon_clear_t *clear,
+				      drm_radeon_clear_rect_t *depth_boxes )
+{
+	drm_radeon_private_t *dev_priv = dev->dev_private;
+	drm_radeon_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	drm_radeon_depth_clear_t *depth_clear = &dev_priv->depth_clear;
+	int nbox = sarea_priv->nbox;
+	drm_clip_rect_t *pbox = sarea_priv->boxes;
+	unsigned int flags = clear->flags;
+	u32 rb3d_cntl = 0, rb3d_stencilrefmask= 0;
+	int i;
+	RING_LOCALS;
+	DRM_DEBUG( "flags = 0x%x\n", flags );
+
+	dev_priv->stats.clears++;
+
+	if ( dev_priv->page_flipping && dev_priv->current_page == 1 ) {
+		unsigned int tmp = flags;
+
+		flags &= ~(RADEON_FRONT | RADEON_BACK);
+		if ( tmp & RADEON_FRONT ) flags |= RADEON_BACK;
+		if ( tmp & RADEON_BACK )  flags |= RADEON_FRONT;
+	}
+
+	if ( flags & (RADEON_FRONT | RADEON_BACK) ) {
+
+		BEGIN_RING( 4 );
+
+		/* Ensure the 3D stream is idle before doing a
+		 * 2D fill to clear the front or back buffer.
+		 */
+		RADEON_WAIT_UNTIL_3D_IDLE();
+		
+		OUT_RING( CP_PACKET0( RADEON_DP_WRITE_MASK, 0 ) );
+		OUT_RING( clear->color_mask );
+
+		ADVANCE_RING();
+
+		/* Make sure we restore the 3D state next time.
+		 */
+		dev_priv->sarea_priv->ctx_owner = 0;
+
+		for ( i = 0 ; i < nbox ; i++ ) {
+			int x = pbox[i].x1;
+			int y = pbox[i].y1;
+			int w = pbox[i].x2 - x;
+			int h = pbox[i].y2 - y;
+
+			DRM_DEBUG( "dispatch clear %d,%d-%d,%d flags 0x%x\n",
+				   x, y, w, h, flags );
+
+			if ( flags & RADEON_FRONT ) {
+				BEGIN_RING( 6 );
+				
+				OUT_RING( CP_PACKET3( RADEON_CNTL_PAINT_MULTI, 4 ) );
+				OUT_RING( RADEON_GMC_DST_PITCH_OFFSET_CNTL |
+					  RADEON_GMC_BRUSH_SOLID_COLOR |
+					  (dev_priv->color_fmt << 8) |
+					  RADEON_GMC_SRC_DATATYPE_COLOR |
+					  RADEON_ROP3_P |
+					  RADEON_GMC_CLR_CMP_CNTL_DIS );
+
+				OUT_RING( dev_priv->front_pitch_offset );
+				OUT_RING( clear->clear_color );
+				
+				OUT_RING( (x << 16) | y );
+				OUT_RING( (w << 16) | h );
+				
+				ADVANCE_RING();
+			}
+			
+			if ( flags & RADEON_BACK ) {
+				BEGIN_RING( 6 );
+				
+				OUT_RING( CP_PACKET3( RADEON_CNTL_PAINT_MULTI, 4 ) );
+				OUT_RING( RADEON_GMC_DST_PITCH_OFFSET_CNTL |
+					  RADEON_GMC_BRUSH_SOLID_COLOR |
+					  (dev_priv->color_fmt << 8) |
+					  RADEON_GMC_SRC_DATATYPE_COLOR |
+					  RADEON_ROP3_P |
+					  RADEON_GMC_CLR_CMP_CNTL_DIS );
+				
+				OUT_RING( dev_priv->back_pitch_offset );
+				OUT_RING( clear->clear_color );
+
+				OUT_RING( (x << 16) | y );
+				OUT_RING( (w << 16) | h );
+
+				ADVANCE_RING();
+			}
+		}
+	}
+
+	/* We have to clear the depth and/or stencil buffers by
+	 * rendering a quad into just those buffers.  Thus, we have to
+	 * make sure the 3D engine is configured correctly.
+	 */
+	if ( dev_priv->is_r200 &&
+	     (flags & (RADEON_DEPTH | RADEON_STENCIL)) ) {
+
+		int tempPP_CNTL;
+		int tempRE_CNTL;
+		int tempRB3D_CNTL;
+		int tempRB3D_ZSTENCILCNTL;
+		int tempRB3D_STENCILREFMASK;
+		int tempRB3D_PLANEMASK;
+		int tempSE_CNTL;
+		int tempSE_VTE_CNTL;
+		int tempSE_VTX_FMT_0;
+		int tempSE_VTX_FMT_1;
+		int tempSE_VAP_CNTL;
+		int tempRE_AUX_SCISSOR_CNTL;
+
+		tempPP_CNTL = 0;
+		tempRE_CNTL = 0;
+
+		tempRB3D_CNTL = depth_clear->rb3d_cntl;
+		tempRB3D_CNTL &= ~(1<<15); /* unset radeon magic flag */
+
+		tempRB3D_ZSTENCILCNTL = depth_clear->rb3d_zstencilcntl;
+		tempRB3D_STENCILREFMASK = 0x0;
+
+		tempSE_CNTL = depth_clear->se_cntl;
+
+
+
+		/* Disable TCL */
+
+		tempSE_VAP_CNTL = (/* SE_VAP_CNTL__FORCE_W_TO_ONE_MASK |  */
+				   (0x9 << SE_VAP_CNTL__VF_MAX_VTX_NUM__SHIFT));
+
+		tempRB3D_PLANEMASK = 0x0;
+
+		tempRE_AUX_SCISSOR_CNTL = 0x0;
+
+		tempSE_VTE_CNTL =
+			SE_VTE_CNTL__VTX_XY_FMT_MASK |
+			SE_VTE_CNTL__VTX_Z_FMT_MASK;
+
+		/* Vertex format (X, Y, Z, W)*/
+		tempSE_VTX_FMT_0 =
+			SE_VTX_FMT_0__VTX_Z0_PRESENT_MASK |
+			SE_VTX_FMT_0__VTX_W0_PRESENT_MASK;
+		tempSE_VTX_FMT_1 = 0x0;
+
+
+		/* 
+		 * Depth buffer specific enables 
+		 */
+		if (flags & RADEON_DEPTH) {
+			/* Enable depth buffer */
+			tempRB3D_CNTL |= RADEON_Z_ENABLE;
+		} else {
+			/* Disable depth buffer */
+			tempRB3D_CNTL &= ~RADEON_Z_ENABLE;
+		}
+
+		/* 
+		 * Stencil buffer specific enables
+		 */
+		if ( flags & RADEON_STENCIL ) {
+			tempRB3D_CNTL |=  RADEON_STENCIL_ENABLE;
+			tempRB3D_STENCILREFMASK = clear->depth_mask; 
+		} else {
+			tempRB3D_CNTL &= ~RADEON_STENCIL_ENABLE;
+			tempRB3D_STENCILREFMASK = 0x00000000;
+		}
+
+		BEGIN_RING( 26 );
+		RADEON_WAIT_UNTIL_2D_IDLE();
+
+		OUT_RING_REG( RADEON_PP_CNTL, tempPP_CNTL );
+		OUT_RING_REG( R200_RE_CNTL, tempRE_CNTL );
+		OUT_RING_REG( RADEON_RB3D_CNTL, tempRB3D_CNTL );
+		OUT_RING_REG( RADEON_RB3D_ZSTENCILCNTL,
+			      tempRB3D_ZSTENCILCNTL );
+		OUT_RING_REG( RADEON_RB3D_STENCILREFMASK, 
+			      tempRB3D_STENCILREFMASK );
+		OUT_RING_REG( RADEON_RB3D_PLANEMASK, tempRB3D_PLANEMASK );
+		OUT_RING_REG( RADEON_SE_CNTL, tempSE_CNTL );
+		OUT_RING_REG( R200_SE_VTE_CNTL, tempSE_VTE_CNTL );
+		OUT_RING_REG( R200_SE_VTX_FMT_0, tempSE_VTX_FMT_0 );
+		OUT_RING_REG( R200_SE_VTX_FMT_1, tempSE_VTX_FMT_1 );
+		OUT_RING_REG( R200_SE_VAP_CNTL, tempSE_VAP_CNTL );
+		OUT_RING_REG( R200_RE_AUX_SCISSOR_CNTL, 
+			      tempRE_AUX_SCISSOR_CNTL );
+		ADVANCE_RING();
+
+		/* Make sure we restore the 3D state next time.
+		 */
+		dev_priv->sarea_priv->ctx_owner = 0;
+
+		for ( i = 0 ; i < nbox ; i++ ) {
+			
+			/* Funny that this should be required -- 
+			 *  sets top-left?
+			 */
+			radeon_emit_clip_rect( dev_priv,
+					       &sarea_priv->boxes[i] );
+
+			BEGIN_RING( 14 );
+			OUT_RING( CP_PACKET3( R200_3D_DRAW_IMMD_2, 12 ) );
+			OUT_RING( (RADEON_PRIM_TYPE_RECT_LIST |
+				   RADEON_PRIM_WALK_RING |
+				   (3 << RADEON_NUM_VERTICES_SHIFT)) );
+			OUT_RING( depth_boxes[i].ui[CLEAR_X1] );
+			OUT_RING( depth_boxes[i].ui[CLEAR_Y1] );
+			OUT_RING( depth_boxes[i].ui[CLEAR_DEPTH] );
+			OUT_RING( 0x3f800000 );
+			OUT_RING( depth_boxes[i].ui[CLEAR_X1] );
+			OUT_RING( depth_boxes[i].ui[CLEAR_Y2] );
+			OUT_RING( depth_boxes[i].ui[CLEAR_DEPTH] );
+			OUT_RING( 0x3f800000 );
+			OUT_RING( depth_boxes[i].ui[CLEAR_X2] );
+			OUT_RING( depth_boxes[i].ui[CLEAR_Y2] );
+			OUT_RING( depth_boxes[i].ui[CLEAR_DEPTH] );
+			OUT_RING( 0x3f800000 );
+			ADVANCE_RING();
+		}
+	} 
+	else if ( (flags & (RADEON_DEPTH | RADEON_STENCIL)) ) {
+
+		rb3d_cntl = depth_clear->rb3d_cntl;
+
+		if ( flags & RADEON_DEPTH ) {
+			rb3d_cntl |=  RADEON_Z_ENABLE;
+		} else {
+			rb3d_cntl &= ~RADEON_Z_ENABLE;
+		}
+
+		if ( flags & RADEON_STENCIL ) {
+			rb3d_cntl |=  RADEON_STENCIL_ENABLE;
+			rb3d_stencilrefmask = clear->depth_mask; /* misnamed field */
+		} else {
+			rb3d_cntl &= ~RADEON_STENCIL_ENABLE;
+			rb3d_stencilrefmask = 0x00000000;
+		}
+
+		BEGIN_RING( 13 );
+		RADEON_WAIT_UNTIL_2D_IDLE();
+
+		OUT_RING( CP_PACKET0( RADEON_PP_CNTL, 1 ) );
+		OUT_RING( 0x00000000 );
+		OUT_RING( rb3d_cntl );
+		
+		OUT_RING_REG( RADEON_RB3D_ZSTENCILCNTL,
+			      depth_clear->rb3d_zstencilcntl );
+		OUT_RING_REG( RADEON_RB3D_STENCILREFMASK,
+			      rb3d_stencilrefmask );
+		OUT_RING_REG( RADEON_RB3D_PLANEMASK,
+			      0x00000000 );
+		OUT_RING_REG( RADEON_SE_CNTL,
+			      depth_clear->se_cntl );
+		ADVANCE_RING();
+
+		/* Make sure we restore the 3D state next time.
+		 */
+		dev_priv->sarea_priv->ctx_owner = 0;
+
+		for ( i = 0 ; i < nbox ; i++ ) {
+			
+			/* Funny that this should be required -- 
+			 *  sets top-left?
+			 */
+			radeon_emit_clip_rect( dev_priv,
+					       &sarea_priv->boxes[i] );
+
+			BEGIN_RING( 15 );
+
+			OUT_RING( CP_PACKET3( RADEON_3D_DRAW_IMMD, 13 ) );
+			OUT_RING( RADEON_VTX_Z_PRESENT |
+				  RADEON_VTX_PKCOLOR_PRESENT);
+			OUT_RING( (RADEON_PRIM_TYPE_RECT_LIST |
+				   RADEON_PRIM_WALK_RING |
+				   RADEON_MAOS_ENABLE |
+				   RADEON_VTX_FMT_RADEON_MODE |
+				   (3 << RADEON_NUM_VERTICES_SHIFT)) );
+
+
+			OUT_RING( depth_boxes[i].ui[CLEAR_X1] );
+			OUT_RING( depth_boxes[i].ui[CLEAR_Y1] );
+			OUT_RING( depth_boxes[i].ui[CLEAR_DEPTH] );
+			OUT_RING( 0x0 );
+
+			OUT_RING( depth_boxes[i].ui[CLEAR_X1] );
+			OUT_RING( depth_boxes[i].ui[CLEAR_Y2] );
+			OUT_RING( depth_boxes[i].ui[CLEAR_DEPTH] );
+			OUT_RING( 0x0 );
+
+			OUT_RING( depth_boxes[i].ui[CLEAR_X2] );
+			OUT_RING( depth_boxes[i].ui[CLEAR_Y2] );
+			OUT_RING( depth_boxes[i].ui[CLEAR_DEPTH] );
+			OUT_RING( 0x0 );
+
+			ADVANCE_RING();
+		}
+	}
+
+	/* Increment the clear counter.  The client-side 3D driver must
+	 * wait on this value before performing the clear ioctl.  We
+	 * need this because the card's so damned fast...
+	 */
+	dev_priv->sarea_priv->last_clear++;
+
+	BEGIN_RING( 4 );
+
+	RADEON_CLEAR_AGE( dev_priv->sarea_priv->last_clear );
+	RADEON_WAIT_UNTIL_IDLE();
+
+	ADVANCE_RING();
+}
+
+static void radeon_cp_dispatch_swap( drm_device_t *dev )
+{
+	drm_radeon_private_t *dev_priv = dev->dev_private;
+	drm_radeon_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	int nbox = sarea_priv->nbox;
+	drm_clip_rect_t *pbox = sarea_priv->boxes;
+	int i;
+	RING_LOCALS;
+	DRM_DEBUG( "\n" );
+
+	/* Do some trivial performance monitoring...
+	 */
+	if (dev_priv->do_boxes)
+		radeon_cp_performance_boxes( dev_priv );
+
+
+	/* Wait for the 3D stream to idle before dispatching the bitblt.
+	 * This will prevent data corruption between the two streams.
+	 */
+	BEGIN_RING( 2 );
+
+	RADEON_WAIT_UNTIL_3D_IDLE();
+
+	ADVANCE_RING();
+
+	for ( i = 0 ; i < nbox ; i++ ) {
+		int x = pbox[i].x1;
+		int y = pbox[i].y1;
+		int w = pbox[i].x2 - x;
+		int h = pbox[i].y2 - y;
+
+		DRM_DEBUG( "dispatch swap %d,%d-%d,%d\n",
+			   x, y, w, h );
+
+		BEGIN_RING( 7 );
+
+		OUT_RING( CP_PACKET3( RADEON_CNTL_BITBLT_MULTI, 5 ) );
+		OUT_RING( RADEON_GMC_SRC_PITCH_OFFSET_CNTL |
+			  RADEON_GMC_DST_PITCH_OFFSET_CNTL |
+			  RADEON_GMC_BRUSH_NONE |
+			  (dev_priv->color_fmt << 8) |
+			  RADEON_GMC_SRC_DATATYPE_COLOR |
+			  RADEON_ROP3_S |
+			  RADEON_DP_SRC_SOURCE_MEMORY |
+			  RADEON_GMC_CLR_CMP_CNTL_DIS |
+			  RADEON_GMC_WR_MSK_DIS );
+		
+		/* Make this work even if front & back are flipped:
+		 */
+		if (dev_priv->current_page == 0) {
+			OUT_RING( dev_priv->back_pitch_offset );
+			OUT_RING( dev_priv->front_pitch_offset );
+		} 
+		else {
+			OUT_RING( dev_priv->front_pitch_offset );
+			OUT_RING( dev_priv->back_pitch_offset );
+		}
+
+		OUT_RING( (x << 16) | y );
+		OUT_RING( (x << 16) | y );
+		OUT_RING( (w << 16) | h );
+
+		ADVANCE_RING();
+	}
+
+	/* Increment the frame counter.  The client-side 3D driver must
+	 * throttle the framerate by waiting for this value before
+	 * performing the swapbuffer ioctl.
+	 */
+	dev_priv->sarea_priv->last_frame++;
+
+	BEGIN_RING( 4 );
+
+	RADEON_FRAME_AGE( dev_priv->sarea_priv->last_frame );
+	RADEON_WAIT_UNTIL_2D_IDLE();
+
+	ADVANCE_RING();
+}
+
+static void radeon_cp_dispatch_flip( drm_device_t *dev )
+{
+	drm_radeon_private_t *dev_priv = dev->dev_private;
+	drm_sarea_t *sarea = (drm_sarea_t *)dev_priv->sarea->handle;
+	int offset = (dev_priv->current_page == 1)
+		   ? dev_priv->front_offset : dev_priv->back_offset;
+	RING_LOCALS;
+	DRM_DEBUG( "%s: page=%d pfCurrentPage=%d\n", 
+		__FUNCTION__, 
+		dev_priv->current_page,
+		dev_priv->sarea_priv->pfCurrentPage);
+
+	/* Do some trivial performance monitoring...
+	 */
+	if (dev_priv->do_boxes) {
+		dev_priv->stats.boxes |= RADEON_BOX_FLIP;
+		radeon_cp_performance_boxes( dev_priv );
+	}
+
+	/* Update the frame offsets for both CRTCs
+	 */
+	BEGIN_RING( 6 );
+
+	RADEON_WAIT_UNTIL_3D_IDLE();
+	OUT_RING_REG( RADEON_CRTC_OFFSET, ( ( sarea->frame.y * dev_priv->front_pitch
+					      + sarea->frame.x 
+					      * ( dev_priv->color_fmt - 2 ) ) & ~7 )
+					  + offset );
+	OUT_RING_REG( RADEON_CRTC2_OFFSET, dev_priv->sarea_priv->crtc2_base
+					   + offset );
+
+	ADVANCE_RING();
+
+	/* Increment the frame counter.  The client-side 3D driver must
+	 * throttle the framerate by waiting for this value before
+	 * performing the swapbuffer ioctl.
+	 */
+	dev_priv->sarea_priv->last_frame++;
+	dev_priv->sarea_priv->pfCurrentPage = dev_priv->current_page =
+					      1 - dev_priv->current_page;
+
+	BEGIN_RING( 2 );
+
+	RADEON_FRAME_AGE( dev_priv->sarea_priv->last_frame );
+
+	ADVANCE_RING();
+}
+
+static int bad_prim_vertex_nr( int primitive, int nr )
+{
+	switch (primitive & RADEON_PRIM_TYPE_MASK) {
+	case RADEON_PRIM_TYPE_NONE:
+	case RADEON_PRIM_TYPE_POINT:
+		return nr < 1;
+	case RADEON_PRIM_TYPE_LINE:
+		return (nr & 1) || nr == 0;
+	case RADEON_PRIM_TYPE_LINE_STRIP:
+		return nr < 2;
+	case RADEON_PRIM_TYPE_TRI_LIST:
+	case RADEON_PRIM_TYPE_3VRT_POINT_LIST:
+	case RADEON_PRIM_TYPE_3VRT_LINE_LIST:
+	case RADEON_PRIM_TYPE_RECT_LIST:
+		return nr % 3 || nr == 0;
+	case RADEON_PRIM_TYPE_TRI_FAN:
+	case RADEON_PRIM_TYPE_TRI_STRIP:
+		return nr < 3;
+	default:
+		return 1;
+	}	
+}
+
+
+
+typedef struct {
+	unsigned int start;
+	unsigned int finish;
+	unsigned int prim;
+	unsigned int numverts;
+	unsigned int offset;   
+        unsigned int vc_format;
+} drm_radeon_tcl_prim_t;
+
+static void radeon_cp_dispatch_vertex( drm_device_t *dev,
+				       drm_buf_t *buf,
+				       drm_radeon_tcl_prim_t *prim,
+				       drm_clip_rect_t *boxes,
+				       int nbox )
+
+{
+	drm_radeon_private_t *dev_priv = dev->dev_private;
+	drm_clip_rect_t box;
+	int offset = dev_priv->agp_buffers_offset + buf->offset + prim->start;
+	int numverts = (int)prim->numverts;
+	int i = 0;
+	RING_LOCALS;
+
+	DRM_DEBUG("hwprim 0x%x vfmt 0x%x %d..%d %d verts\n",
+		  prim->prim,
+		  prim->vc_format,
+		  prim->start,
+		  prim->finish,
+		  prim->numverts);
+
+	if (bad_prim_vertex_nr( prim->prim, prim->numverts )) {
+		DRM_ERROR( "bad prim %x numverts %d\n", 
+			   prim->prim, prim->numverts );
+		return;
+	}
+
+	do {
+		/* Emit the next cliprect */
+		if ( i < nbox ) {
+			if (DRM_COPY_FROM_USER_UNCHECKED( &box, &boxes[i], sizeof(box) ))
+				return;
+
+			radeon_emit_clip_rect( dev_priv, &box );
+		}
+
+		/* Emit the vertex buffer rendering commands */
+		BEGIN_RING( 5 );
+
+		OUT_RING( CP_PACKET3( RADEON_3D_RNDR_GEN_INDX_PRIM, 3 ) );
+		OUT_RING( offset );
+		OUT_RING( numverts );
+		OUT_RING( prim->vc_format );
+		OUT_RING( prim->prim | RADEON_PRIM_WALK_LIST |
+			  RADEON_COLOR_ORDER_RGBA |
+			  RADEON_VTX_FMT_RADEON_MODE |
+			  (numverts << RADEON_NUM_VERTICES_SHIFT) );
+
+		ADVANCE_RING();
+
+		i++;
+	} while ( i < nbox );
+}
+
+
+
+static void radeon_cp_discard_buffer( drm_device_t *dev, drm_buf_t *buf )
+{
+	drm_radeon_private_t *dev_priv = dev->dev_private;
+	drm_radeon_buf_priv_t *buf_priv = buf->dev_private;
+	RING_LOCALS;
+
+	buf_priv->age = ++dev_priv->sarea_priv->last_dispatch;
+
+	/* Emit the vertex buffer age */
+	BEGIN_RING( 2 );
+	RADEON_DISPATCH_AGE( buf_priv->age );
+	ADVANCE_RING();
+
+	buf->pending = 1;
+	buf->used = 0;
+}
+
+static void radeon_cp_dispatch_indirect( drm_device_t *dev,
+					 drm_buf_t *buf,
+					 int start, int end )
+{
+	drm_radeon_private_t *dev_priv = dev->dev_private;
+	RING_LOCALS;
+	DRM_DEBUG( "indirect: buf=%d s=0x%x e=0x%x\n",
+		   buf->idx, start, end );
+
+	if ( start != end ) {
+		int offset = (dev_priv->agp_buffers_offset
+			      + buf->offset + start);
+		int dwords = (end - start + 3) / sizeof(u32);
+
+		/* Indirect buffer data must be an even number of
+		 * dwords, so if we've been given an odd number we must
+		 * pad the data with a Type-2 CP packet.
+		 */
+		if ( dwords & 1 ) {
+			u32 *data = (u32 *)
+				((char *)dev_priv->buffers->handle
+				 + buf->offset + start);
+			data[dwords++] = RADEON_CP_PACKET2;
+		}
+
+		/* Fire off the indirect buffer */
+		BEGIN_RING( 3 );
+
+		OUT_RING( CP_PACKET0( RADEON_CP_IB_BASE, 1 ) );
+		OUT_RING( offset );
+		OUT_RING( dwords );
+
+		ADVANCE_RING();
+	}
+}
+
+
+static void radeon_cp_dispatch_indices( drm_device_t *dev,
+					drm_buf_t *elt_buf,
+					drm_radeon_tcl_prim_t *prim, 
+					drm_clip_rect_t *boxes,
+					int nbox )
+{
+	drm_radeon_private_t *dev_priv = dev->dev_private;
+	drm_clip_rect_t box;
+	int offset = dev_priv->agp_buffers_offset + prim->offset;
+	u32 *data;
+	int dwords;
+	int i = 0;
+	int start = prim->start + RADEON_INDEX_PRIM_OFFSET;
+	int count = (prim->finish - start) / sizeof(u16);
+
+	DRM_DEBUG("hwprim 0x%x vfmt 0x%x %d..%d offset: %x nr %d\n",
+		  prim->prim,
+		  prim->vc_format,
+		  prim->start,
+		  prim->finish,
+		  prim->offset,
+		  prim->numverts);
+
+	if (bad_prim_vertex_nr( prim->prim, count )) {
+		DRM_ERROR( "bad prim %x count %d\n", 
+			   prim->prim, count );
+		return;
+	}
+
+
+	if ( start >= prim->finish ||
+	     (prim->start & 0x7) ) {
+		DRM_ERROR( "buffer prim %d\n", prim->prim );
+		return;
+	}
+
+	dwords = (prim->finish - prim->start + 3) / sizeof(u32);
+
+	data = (u32 *)((char *)dev_priv->buffers->handle +
+		       elt_buf->offset + prim->start);
+
+	data[0] = CP_PACKET3( RADEON_3D_RNDR_GEN_INDX_PRIM, dwords-2 );
+	data[1] = offset;
+	data[2] = prim->numverts;
+	data[3] = prim->vc_format;
+	data[4] = (prim->prim |
+		   RADEON_PRIM_WALK_IND |
+		   RADEON_COLOR_ORDER_RGBA |
+		   RADEON_VTX_FMT_RADEON_MODE |
+		   (count << RADEON_NUM_VERTICES_SHIFT) );
+
+	do {
+		if ( i < nbox ) {
+			if (DRM_COPY_FROM_USER_UNCHECKED( &box, &boxes[i], sizeof(box) ))
+				return;
+			
+			radeon_emit_clip_rect( dev_priv, &box );
+		}
+
+		radeon_cp_dispatch_indirect( dev, elt_buf,
+					     prim->start,
+					     prim->finish );
+
+		i++;
+	} while ( i < nbox );
+
+}
+
+#define RADEON_MAX_TEXTURE_SIZE (RADEON_BUFFER_SIZE - 8 * sizeof(u32))
+
+static int radeon_cp_dispatch_texture( drm_device_t *dev,
+				       drm_radeon_texture_t *tex,
+				       drm_radeon_tex_image_t *image )
+{
+	drm_radeon_private_t *dev_priv = dev->dev_private;
+	drm_buf_t *buf;
+	u32 format;
+	u32 *buffer;
+	const u8 *data;
+	int size, dwords, tex_width, blit_width;
+	u32 height;
+	int i;
+	RING_LOCALS;
+
+	dev_priv->stats.boxes |= RADEON_BOX_TEXTURE_LOAD;
+
+	/* Flush the pixel cache.  This ensures no pixel data gets mixed
+	 * up with the texture data from the host data blit, otherwise
+	 * part of the texture image may be corrupted.
+	 */
+	BEGIN_RING( 4 );
+	RADEON_FLUSH_CACHE();
+	RADEON_WAIT_UNTIL_IDLE();
+	ADVANCE_RING();
+
+#ifdef __BIG_ENDIAN
+	/* The Mesa texture functions provide the data in little endian as the
+	 * chip wants it, but we need to compensate for the fact that the CP
+	 * ring gets byte-swapped
+	 */
+	BEGIN_RING( 2 );
+	OUT_RING_REG( RADEON_RBBM_GUICNTL, RADEON_HOST_DATA_SWAP_32BIT );
+	ADVANCE_RING();
+#endif
+
+
+	/* The compiler won't optimize away a division by a variable,
+	 * even if the only legal values are powers of two.  Thus, we'll
+	 * use a shift instead.
+	 */
+	switch ( tex->format ) {
+	case RADEON_TXFORMAT_ARGB8888:
+	case RADEON_TXFORMAT_RGBA8888:
+		format = RADEON_COLOR_FORMAT_ARGB8888;
+		tex_width = tex->width * 4;
+		blit_width = image->width * 4;
+		break;
+	case RADEON_TXFORMAT_AI88:
+	case RADEON_TXFORMAT_ARGB1555:
+	case RADEON_TXFORMAT_RGB565:
+	case RADEON_TXFORMAT_ARGB4444:
+	case RADEON_TXFORMAT_VYUY422:
+	case RADEON_TXFORMAT_YVYU422:
+		format = RADEON_COLOR_FORMAT_RGB565;
+		tex_width = tex->width * 2;
+		blit_width = image->width * 2;
+		break;
+	case RADEON_TXFORMAT_I8:
+	case RADEON_TXFORMAT_RGB332:
+		format = RADEON_COLOR_FORMAT_CI8;
+		tex_width = tex->width * 1;
+		blit_width = image->width * 1;
+		break;
+	default:
+		DRM_ERROR( "invalid texture format %d\n", tex->format );
+		return DRM_ERR(EINVAL);
+	}
+
+	DRM_DEBUG("tex=%dx%d blit=%d\n", tex_width, tex->height, blit_width );
+
+	do {
+		DRM_DEBUG( "tex: ofs=0x%x p=%d f=%d x=%hd y=%hd w=%hd h=%hd\n",
+			   tex->offset >> 10, tex->pitch, tex->format,
+			   image->x, image->y, image->width, image->height );
+
+		/* Make a copy of some parameters in case we have to
+		 * update them for a multi-pass texture blit.
+		 */
+		height = image->height;
+		data = (const u8 *)image->data;
+		
+		size = height * blit_width;
+
+		if ( size > RADEON_MAX_TEXTURE_SIZE ) {
+			height = RADEON_MAX_TEXTURE_SIZE / blit_width;
+			size = height * blit_width;
+		} else if ( size < 4 && size > 0 ) {
+			size = 4;
+		} else if ( size == 0 ) {
+			return 0;
+		}
+
+		buf = radeon_freelist_get( dev );
+		if ( 0 && !buf ) {
+			radeon_do_cp_idle( dev_priv );
+			buf = radeon_freelist_get( dev );
+		}
+		if ( !buf ) {
+			DRM_DEBUG("radeon_cp_dispatch_texture: EAGAIN\n");
+			DRM_COPY_TO_USER( tex->image, image, sizeof(*image) );
+			return DRM_ERR(EAGAIN);
+		}
+
+
+		/* Dispatch the indirect buffer.
+		 */
+		buffer = (u32*)((char*)dev_priv->buffers->handle + buf->offset);
+		dwords = size / 4;
+		buffer[0] = CP_PACKET3( RADEON_CNTL_HOSTDATA_BLT, dwords + 6 );
+		buffer[1] = (RADEON_GMC_DST_PITCH_OFFSET_CNTL |
+			     RADEON_GMC_BRUSH_NONE |
+			     (format << 8) |
+			     RADEON_GMC_SRC_DATATYPE_COLOR |
+			     RADEON_ROP3_S |
+			     RADEON_DP_SRC_SOURCE_HOST_DATA |
+			     RADEON_GMC_CLR_CMP_CNTL_DIS |
+			     RADEON_GMC_WR_MSK_DIS);
+		
+		buffer[2] = (tex->pitch << 22) | (tex->offset >> 10);
+		buffer[3] = 0xffffffff;
+		buffer[4] = 0xffffffff;
+		buffer[5] = (image->y << 16) | image->x;
+		buffer[6] = (height << 16) | image->width;
+		buffer[7] = dwords;
+		buffer += 8;
+
+		if ( tex_width >= 32 ) {
+			/* Texture image width is larger than the minimum, so we
+			 * can upload it directly.
+			 */
+			if ( DRM_COPY_FROM_USER( buffer, data, 
+						 dwords * sizeof(u32) ) ) {
+				DRM_ERROR( "EFAULT on data, %d dwords\n", 
+					   dwords );
+				return DRM_ERR(EFAULT);
+			}
+		} else {
+			/* Texture image width is less than the minimum, so we
+			 * need to pad out each image scanline to the minimum
+			 * width.
+			 */
+			for ( i = 0 ; i < tex->height ; i++ ) {
+				if ( DRM_COPY_FROM_USER( buffer, data, 
+							 tex_width ) ) {
+					DRM_ERROR( "EFAULT on pad, %d bytes\n",
+						   tex_width );
+					return DRM_ERR(EFAULT);
+				}
+				buffer += 8;
+				data += tex_width;
+			}
+		}
+
+		buf->pid = DRM_CURRENTPID;
+		buf->used = (dwords + 8) * sizeof(u32);
+		radeon_cp_dispatch_indirect( dev, buf, 0, buf->used );
+		radeon_cp_discard_buffer( dev, buf );
+
+		/* Update the input parameters for next time */
+		image->y += height;
+		image->height -= height;
+		(const u8 *)image->data += size;
+	} while (image->height > 0);
+
+	/* Flush the pixel cache after the blit completes.  This ensures
+	 * the texture data is written out to memory before rendering
+	 * continues.
+	 */
+	BEGIN_RING( 4 );
+	RADEON_FLUSH_CACHE();
+	RADEON_WAIT_UNTIL_2D_IDLE();
+	ADVANCE_RING();
+	return 0;
+}
+
+
+static void radeon_cp_dispatch_stipple( drm_device_t *dev, u32 *stipple )
+{
+	drm_radeon_private_t *dev_priv = dev->dev_private;
+	int i;
+	RING_LOCALS;
+	DRM_DEBUG( "\n" );
+
+	BEGIN_RING( 35 );
+
+	OUT_RING( CP_PACKET0( RADEON_RE_STIPPLE_ADDR, 0 ) );
+	OUT_RING( 0x00000000 );
+
+	OUT_RING( CP_PACKET0_TABLE( RADEON_RE_STIPPLE_DATA, 31 ) );
+	for ( i = 0 ; i < 32 ; i++ ) {
+		OUT_RING( stipple[i] );
+	}
+
+	ADVANCE_RING();
+}
+
+
+/* ================================================================
+ * IOCTL functions
+ */
+
+int radeon_cp_clear( DRM_IOCTL_ARGS )
+{
+	DRM_DEVICE;
+	drm_radeon_private_t *dev_priv = dev->dev_private;
+	drm_radeon_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	drm_radeon_clear_t clear;
+	drm_radeon_clear_rect_t depth_boxes[RADEON_NR_SAREA_CLIPRECTS];
+	DRM_DEBUG( "\n" );
+
+	LOCK_TEST_WITH_RETURN( dev );
+
+	DRM_COPY_FROM_USER_IOCTL( clear, (drm_radeon_clear_t *)data,
+			     sizeof(clear) );
+
+	RING_SPACE_TEST_WITH_RETURN( dev_priv );
+
+	if ( sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS )
+		sarea_priv->nbox = RADEON_NR_SAREA_CLIPRECTS;
+
+	if ( DRM_COPY_FROM_USER( &depth_boxes, clear.depth_boxes,
+			     sarea_priv->nbox * sizeof(depth_boxes[0]) ) )
+		return DRM_ERR(EFAULT);
+
+	radeon_cp_dispatch_clear( dev, &clear, depth_boxes );
+
+	COMMIT_RING();
+	return 0;
+}
+
+
+/* Not sure why this isn't set all the time:
+ */ 
+static int radeon_do_init_pageflip( drm_device_t *dev )
+{
+	drm_radeon_private_t *dev_priv = dev->dev_private;
+	RING_LOCALS;
+
+	DRM_DEBUG( "\n" );
+
+	BEGIN_RING( 6 );
+	RADEON_WAIT_UNTIL_3D_IDLE();
+	OUT_RING( CP_PACKET0( RADEON_CRTC_OFFSET_CNTL, 0 ) );
+	OUT_RING( RADEON_READ( RADEON_CRTC_OFFSET_CNTL ) | RADEON_CRTC_OFFSET_FLIP_CNTL );
+	OUT_RING( CP_PACKET0( RADEON_CRTC2_OFFSET_CNTL, 0 ) );
+	OUT_RING( RADEON_READ( RADEON_CRTC2_OFFSET_CNTL ) | RADEON_CRTC_OFFSET_FLIP_CNTL );
+	ADVANCE_RING();
+
+	dev_priv->page_flipping = 1;
+	dev_priv->current_page = 0;
+	dev_priv->sarea_priv->pfCurrentPage = dev_priv->current_page;
+
+	return 0;
+}
+
+/* Called whenever a client dies, from DRM(release).
+ * NOTE:  Lock isn't necessarily held when this is called!
+ */
+int radeon_do_cleanup_pageflip( drm_device_t *dev )
+{
+	drm_radeon_private_t *dev_priv = dev->dev_private;
+	DRM_DEBUG( "\n" );
+
+	if (dev_priv->current_page != 0)
+		radeon_cp_dispatch_flip( dev );
+
+	dev_priv->page_flipping = 0;
+	return 0;
+}
+
+/* Swapping and flipping are different operations, need different ioctls.
+ * They can & should be intermixed to support multiple 3d windows.  
+ */
+int radeon_cp_flip( DRM_IOCTL_ARGS )
+{
+	DRM_DEVICE;
+	drm_radeon_private_t *dev_priv = dev->dev_private;
+	DRM_DEBUG( "\n" );
+
+	LOCK_TEST_WITH_RETURN( dev );
+
+	RING_SPACE_TEST_WITH_RETURN( dev_priv );
+
+	if (!dev_priv->page_flipping) 
+		radeon_do_init_pageflip( dev );
+		
+	radeon_cp_dispatch_flip( dev );
+
+	COMMIT_RING();
+	return 0;
+}
+
+int radeon_cp_swap( DRM_IOCTL_ARGS )
+{
+	DRM_DEVICE;
+	drm_radeon_private_t *dev_priv = dev->dev_private;
+	drm_radeon_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	DRM_DEBUG( "\n" );
+
+	LOCK_TEST_WITH_RETURN( dev );
+
+	RING_SPACE_TEST_WITH_RETURN( dev_priv );
+
+	if ( sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS )
+		sarea_priv->nbox = RADEON_NR_SAREA_CLIPRECTS;
+
+	radeon_cp_dispatch_swap( dev );
+	dev_priv->sarea_priv->ctx_owner = 0;
+
+	COMMIT_RING();
+	return 0;
+}
+
+int radeon_cp_vertex( DRM_IOCTL_ARGS )
+{
+	DRM_DEVICE;
+	drm_radeon_private_t *dev_priv = dev->dev_private;
+	drm_radeon_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	drm_device_dma_t *dma = dev->dma;
+	drm_buf_t *buf;
+	drm_radeon_vertex_t vertex;
+	drm_radeon_tcl_prim_t prim;
+
+	LOCK_TEST_WITH_RETURN( dev );
+
+	if ( !dev_priv ) {
+		DRM_ERROR( "%s called with no initialization\n", __FUNCTION__ );
+		return DRM_ERR(EINVAL);
+	}
+
+	DRM_COPY_FROM_USER_IOCTL( vertex, (drm_radeon_vertex_t *)data,
+			     sizeof(vertex) );
+
+	DRM_DEBUG( "pid=%d index=%d count=%d discard=%d\n",
+		   DRM_CURRENTPID,
+		   vertex.idx, vertex.count, vertex.discard );
+
+	if ( vertex.idx < 0 || vertex.idx >= dma->buf_count ) {
+		DRM_ERROR( "buffer index %d (of %d max)\n",
+			   vertex.idx, dma->buf_count - 1 );
+		return DRM_ERR(EINVAL);
+	}
+	if ( vertex.prim < 0 ||
+	     vertex.prim > RADEON_PRIM_TYPE_3VRT_LINE_LIST ) {
+		DRM_ERROR( "buffer prim %d\n", vertex.prim );
+		return DRM_ERR(EINVAL);
+	}
+
+	RING_SPACE_TEST_WITH_RETURN( dev_priv );
+	VB_AGE_TEST_WITH_RETURN( dev_priv );
+
+	buf = dma->buflist[vertex.idx];
+
+	if ( buf->pid != DRM_CURRENTPID ) {
+		DRM_ERROR( "process %d using buffer owned by %d\n",
+			   DRM_CURRENTPID, buf->pid );
+		return DRM_ERR(EINVAL);
+	}
+	if ( buf->pending ) {
+		DRM_ERROR( "sending pending buffer %d\n", vertex.idx );
+		return DRM_ERR(EINVAL);
+	}
+
+	/* Build up a prim_t record:
+	 */
+	if (vertex.count) {
+		buf->used = vertex.count; /* not used? */
+
+		if ( sarea_priv->dirty & ~RADEON_UPLOAD_CLIPRECTS ) {
+			radeon_emit_state( dev_priv,
+					   &sarea_priv->context_state,
+					   sarea_priv->tex_state,
+					   sarea_priv->dirty );
+			
+			sarea_priv->dirty &= ~(RADEON_UPLOAD_TEX0IMAGES |
+					       RADEON_UPLOAD_TEX1IMAGES |
+					       RADEON_UPLOAD_TEX2IMAGES |
+					       RADEON_REQUIRE_QUIESCENCE);
+		}
+
+		prim.start = 0;
+		prim.finish = vertex.count; /* unused */
+		prim.prim = vertex.prim;
+		prim.numverts = vertex.count;
+		prim.vc_format = dev_priv->sarea_priv->vc_format;
+		
+		radeon_cp_dispatch_vertex( dev, buf, &prim,
+					   dev_priv->sarea_priv->boxes,
+					   dev_priv->sarea_priv->nbox );
+	}
+
+	if (vertex.discard) {
+		radeon_cp_discard_buffer( dev, buf );
+	}
+
+	COMMIT_RING();
+	return 0;
+}
+
+int radeon_cp_indices( DRM_IOCTL_ARGS )
+{
+	DRM_DEVICE;
+	drm_radeon_private_t *dev_priv = dev->dev_private;
+	drm_radeon_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	drm_device_dma_t *dma = dev->dma;
+	drm_buf_t *buf;
+	drm_radeon_indices_t elts;
+	drm_radeon_tcl_prim_t prim;
+	int count;
+
+	LOCK_TEST_WITH_RETURN( dev );
+
+	if ( !dev_priv ) {
+		DRM_ERROR( "%s called with no initialization\n", __FUNCTION__ );
+		return DRM_ERR(EINVAL);
+	}
+
+	DRM_COPY_FROM_USER_IOCTL( elts, (drm_radeon_indices_t *)data,
+			     sizeof(elts) );
+
+	DRM_DEBUG( "pid=%d index=%d start=%d end=%d discard=%d\n",
+		   DRM_CURRENTPID,
+		   elts.idx, elts.start, elts.end, elts.discard );
+
+	if ( elts.idx < 0 || elts.idx >= dma->buf_count ) {
+		DRM_ERROR( "buffer index %d (of %d max)\n",
+			   elts.idx, dma->buf_count - 1 );
+		return DRM_ERR(EINVAL);
+	}
+	if ( elts.prim < 0 ||
+	     elts.prim > RADEON_PRIM_TYPE_3VRT_LINE_LIST ) {
+		DRM_ERROR( "buffer prim %d\n", elts.prim );
+		return DRM_ERR(EINVAL);
+	}
+
+	RING_SPACE_TEST_WITH_RETURN( dev_priv );
+	VB_AGE_TEST_WITH_RETURN( dev_priv );
+
+	buf = dma->buflist[elts.idx];
+
+	if ( buf->pid != DRM_CURRENTPID ) {
+		DRM_ERROR( "process %d using buffer owned by %d\n",
+			   DRM_CURRENTPID, buf->pid );
+		return DRM_ERR(EINVAL);
+	}
+	if ( buf->pending ) {
+		DRM_ERROR( "sending pending buffer %d\n", elts.idx );
+		return DRM_ERR(EINVAL);
+	}
+
+	count = (elts.end - elts.start) / sizeof(u16);
+	elts.start -= RADEON_INDEX_PRIM_OFFSET;
+
+	if ( elts.start & 0x7 ) {
+		DRM_ERROR( "misaligned buffer 0x%x\n", elts.start );
+		return DRM_ERR(EINVAL);
+	}
+	if ( elts.start < buf->used ) {
+		DRM_ERROR( "no header 0x%x - 0x%x\n", elts.start, buf->used );
+		return DRM_ERR(EINVAL);
+	}
+
+	buf->used = elts.end;
+
+	if ( sarea_priv->dirty & ~RADEON_UPLOAD_CLIPRECTS ) {
+		radeon_emit_state( dev_priv,
+				   &sarea_priv->context_state,
+				   sarea_priv->tex_state,
+				   sarea_priv->dirty );
+
+		sarea_priv->dirty &= ~(RADEON_UPLOAD_TEX0IMAGES |
+				       RADEON_UPLOAD_TEX1IMAGES |
+				       RADEON_UPLOAD_TEX2IMAGES |
+				       RADEON_REQUIRE_QUIESCENCE);
+	}
+
+
+	/* Build up a prim_t record:
+	 */
+	prim.start = elts.start;
+	prim.finish = elts.end; 
+	prim.prim = elts.prim;
+	prim.offset = 0;	/* offset from start of dma buffers */
+	prim.numverts = RADEON_MAX_VB_VERTS; /* duh */
+	prim.vc_format = dev_priv->sarea_priv->vc_format;
+	
+	radeon_cp_dispatch_indices( dev, buf, &prim,
+				   dev_priv->sarea_priv->boxes,
+				   dev_priv->sarea_priv->nbox );
+	if (elts.discard) {
+		radeon_cp_discard_buffer( dev, buf );
+	}
+
+	COMMIT_RING();
+	return 0;
+}
+
+int radeon_cp_texture( DRM_IOCTL_ARGS )
+{
+	DRM_DEVICE;
+	drm_radeon_private_t *dev_priv = dev->dev_private;
+	drm_radeon_texture_t tex;
+	drm_radeon_tex_image_t image;
+	int ret;
+
+	LOCK_TEST_WITH_RETURN( dev );
+
+	DRM_COPY_FROM_USER_IOCTL( tex, (drm_radeon_texture_t *)data, sizeof(tex) );
+
+	if ( tex.image == NULL ) {
+		DRM_ERROR( "null texture image!\n" );
+		return DRM_ERR(EINVAL);
+	}
+
+	if ( DRM_COPY_FROM_USER( &image,
+			     (drm_radeon_tex_image_t *)tex.image,
+			     sizeof(image) ) )
+		return DRM_ERR(EFAULT);
+
+	RING_SPACE_TEST_WITH_RETURN( dev_priv );
+	VB_AGE_TEST_WITH_RETURN( dev_priv );
+
+	ret = radeon_cp_dispatch_texture( dev, &tex, &image );
+
+	COMMIT_RING();
+	return ret;
+}
+
+int radeon_cp_stipple( DRM_IOCTL_ARGS )
+{
+	DRM_DEVICE;
+	drm_radeon_private_t *dev_priv = dev->dev_private;
+	drm_radeon_stipple_t stipple;
+	u32 mask[32];
+
+	LOCK_TEST_WITH_RETURN( dev );
+
+	DRM_COPY_FROM_USER_IOCTL( stipple, (drm_radeon_stipple_t *)data,
+			     sizeof(stipple) );
+
+	if ( DRM_COPY_FROM_USER( &mask, stipple.mask, 32 * sizeof(u32) ) )
+		return DRM_ERR(EFAULT);
+
+	RING_SPACE_TEST_WITH_RETURN( dev_priv );
+
+	radeon_cp_dispatch_stipple( dev, mask );
+
+	COMMIT_RING();
+	return 0;
+}
+
+int radeon_cp_indirect( DRM_IOCTL_ARGS )
+{
+	DRM_DEVICE;
+	drm_radeon_private_t *dev_priv = dev->dev_private;
+	drm_device_dma_t *dma = dev->dma;
+	drm_buf_t *buf;
+	drm_radeon_indirect_t indirect;
+	RING_LOCALS;
+
+	LOCK_TEST_WITH_RETURN( dev );
+
+	if ( !dev_priv ) {
+		DRM_ERROR( "%s called with no initialization\n", __FUNCTION__ );
+		return DRM_ERR(EINVAL);
+	}
+
+	DRM_COPY_FROM_USER_IOCTL( indirect, (drm_radeon_indirect_t *)data,
+			     sizeof(indirect) );
+
+	DRM_DEBUG( "indirect: idx=%d s=%d e=%d d=%d\n",
+		   indirect.idx, indirect.start,
+		   indirect.end, indirect.discard );
+
+	if ( indirect.idx < 0 || indirect.idx >= dma->buf_count ) {
+		DRM_ERROR( "buffer index %d (of %d max)\n",
+			   indirect.idx, dma->buf_count - 1 );
+		return DRM_ERR(EINVAL);
+	}
+
+	buf = dma->buflist[indirect.idx];
+
+	if ( buf->pid != DRM_CURRENTPID ) {
+		DRM_ERROR( "process %d using buffer owned by %d\n",
+			   DRM_CURRENTPID, buf->pid );
+		return DRM_ERR(EINVAL);
+	}
+	if ( buf->pending ) {
+		DRM_ERROR( "sending pending buffer %d\n", indirect.idx );
+		return DRM_ERR(EINVAL);
+	}
+
+	if ( indirect.start < buf->used ) {
+		DRM_ERROR( "reusing indirect: start=0x%x actual=0x%x\n",
+			   indirect.start, buf->used );
+		return DRM_ERR(EINVAL);
+	}
+
+	RING_SPACE_TEST_WITH_RETURN( dev_priv );
+	VB_AGE_TEST_WITH_RETURN( dev_priv );
+
+	buf->used = indirect.end;
+
+	/* Wait for the 3D stream to idle before the indirect buffer
+	 * containing 2D acceleration commands is processed.
+	 */
+	BEGIN_RING( 2 );
+
+	RADEON_WAIT_UNTIL_3D_IDLE();
+
+	ADVANCE_RING();
+
+	/* Dispatch the indirect buffer full of commands from the
+	 * X server.  This is insecure and is thus only available to
+	 * privileged clients.
+	 */
+	radeon_cp_dispatch_indirect( dev, buf, indirect.start, indirect.end );
+	if (indirect.discard) {
+		radeon_cp_discard_buffer( dev, buf );
+	}
+
+
+	COMMIT_RING();
+	return 0;
+}
+
+int radeon_cp_vertex2( DRM_IOCTL_ARGS )
+{
+	DRM_DEVICE;
+	drm_radeon_private_t *dev_priv = dev->dev_private;
+	drm_radeon_sarea_t *sarea_priv = dev_priv->sarea_priv;
+	drm_device_dma_t *dma = dev->dma;
+	drm_buf_t *buf;
+	drm_radeon_vertex2_t vertex;
+	int i;
+	unsigned char laststate;
+
+	LOCK_TEST_WITH_RETURN( dev );
+
+	if ( !dev_priv ) {
+		DRM_ERROR( "%s called with no initialization\n", __FUNCTION__ );
+		return DRM_ERR(EINVAL);
+	}
+
+	DRM_COPY_FROM_USER_IOCTL( vertex, (drm_radeon_vertex2_t *)data,
+			     sizeof(vertex) );
+
+	DRM_DEBUG( "pid=%d index=%d discard=%d\n",
+		   DRM_CURRENTPID,
+		   vertex.idx, vertex.discard );
+
+	if ( vertex.idx < 0 || vertex.idx >= dma->buf_count ) {
+		DRM_ERROR( "buffer index %d (of %d max)\n",
+			   vertex.idx, dma->buf_count - 1 );
+		return DRM_ERR(EINVAL);
+	}
+
+	RING_SPACE_TEST_WITH_RETURN( dev_priv );
+	VB_AGE_TEST_WITH_RETURN( dev_priv );
+
+	buf = dma->buflist[vertex.idx];
+
+	if ( buf->pid != DRM_CURRENTPID ) {
+		DRM_ERROR( "process %d using buffer owned by %d\n",
+			   DRM_CURRENTPID, buf->pid );
+		return DRM_ERR(EINVAL);
+	}
+
+	if ( buf->pending ) {
+		DRM_ERROR( "sending pending buffer %d\n", vertex.idx );
+		return DRM_ERR(EINVAL);
+	}
+	
+	if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS)
+		return DRM_ERR(EINVAL);
+
+	for (laststate = 0xff, i = 0 ; i < vertex.nr_prims ; i++) {
+		drm_radeon_prim_t prim;
+		drm_radeon_tcl_prim_t tclprim;
+		
+		if ( DRM_COPY_FROM_USER( &prim, &vertex.prim[i], sizeof(prim) ) )
+			return DRM_ERR(EFAULT);
+		
+		if ( prim.stateidx != laststate ) {
+			drm_radeon_state_t state;			       
+				
+			if ( DRM_COPY_FROM_USER( &state, 
+					     &vertex.state[prim.stateidx], 
+					     sizeof(state) ) )
+				return DRM_ERR(EFAULT);
+
+			radeon_emit_state2( dev_priv, &state );
+
+			laststate = prim.stateidx;
+		}
+
+		tclprim.start = prim.start;
+		tclprim.finish = prim.finish;
+		tclprim.prim = prim.prim;
+		tclprim.vc_format = prim.vc_format;
+
+		if ( prim.prim & RADEON_PRIM_WALK_IND ) {
+			tclprim.offset = prim.numverts * 64;
+			tclprim.numverts = RADEON_MAX_VB_VERTS; /* duh */
+
+			radeon_cp_dispatch_indices( dev, buf, &tclprim,
+						    sarea_priv->boxes,
+						    sarea_priv->nbox);
+		} else {
+			tclprim.numverts = prim.numverts;
+			tclprim.offset = 0; /* not used */
+
+			radeon_cp_dispatch_vertex( dev, buf, &tclprim,
+						   sarea_priv->boxes,
+						   sarea_priv->nbox);
+		}
+		
+		if (sarea_priv->nbox == 1)
+			sarea_priv->nbox = 0;
+	}
+
+	if ( vertex.discard ) {
+		radeon_cp_discard_buffer( dev, buf );
+	}
+
+	COMMIT_RING();
+	return 0;
+}
+
+
+static int radeon_emit_packets( 
+	drm_radeon_private_t *dev_priv,
+	drm_radeon_cmd_header_t header,
+	drm_radeon_cmd_buffer_t *cmdbuf )
+{
+	int id = (int)header.packet.packet_id;
+	int sz, reg;
+	int *data = (int *)cmdbuf->buf;
+	RING_LOCALS;
+   
+	if (id >= RADEON_MAX_STATE_PACKETS)
+		return DRM_ERR(EINVAL);
+
+	sz = packet[id].len;
+	reg = packet[id].start;
+
+	if (sz * sizeof(int) > cmdbuf->bufsz) 
+		return DRM_ERR(EINVAL);
+
+	BEGIN_RING(sz+1);
+	OUT_RING( CP_PACKET0( reg, (sz-1) ) );
+	OUT_RING_USER_TABLE( data, sz );
+	ADVANCE_RING();
+
+	cmdbuf->buf += sz * sizeof(int);
+	cmdbuf->bufsz -= sz * sizeof(int);
+	return 0;
+}
+
+static __inline__ int radeon_emit_scalars( 
+	drm_radeon_private_t *dev_priv,
+	drm_radeon_cmd_header_t header,
+	drm_radeon_cmd_buffer_t *cmdbuf )
+{
+	int sz = header.scalars.count;
+	int *data = (int *)cmdbuf->buf;
+	int start = header.scalars.offset;
+	int stride = header.scalars.stride;
+	RING_LOCALS;
+
+	BEGIN_RING( 3+sz );
+	OUT_RING( CP_PACKET0( RADEON_SE_TCL_SCALAR_INDX_REG, 0 ) );
+	OUT_RING( start | (stride << RADEON_SCAL_INDX_DWORD_STRIDE_SHIFT));
+	OUT_RING( CP_PACKET0_TABLE( RADEON_SE_TCL_SCALAR_DATA_REG, sz-1 ) );
+	OUT_RING_USER_TABLE( data, sz );
+	ADVANCE_RING();
+	cmdbuf->buf += sz * sizeof(int);
+	cmdbuf->bufsz -= sz * sizeof(int);
+	return 0;
+}
+
+/* God this is ugly
+ */
+static __inline__ int radeon_emit_scalars2( 
+	drm_radeon_private_t *dev_priv,
+	drm_radeon_cmd_header_t header,
+	drm_radeon_cmd_buffer_t *cmdbuf )
+{
+	int sz = header.scalars.count;
+	int *data = (int *)cmdbuf->buf;
+	int start = ((unsigned int)header.scalars.offset) + 0x100;
+	int stride = header.scalars.stride;
+	RING_LOCALS;
+
+	BEGIN_RING( 3+sz );
+	OUT_RING( CP_PACKET0( RADEON_SE_TCL_SCALAR_INDX_REG, 0 ) );
+	OUT_RING( start | (stride << RADEON_SCAL_INDX_DWORD_STRIDE_SHIFT));
+	OUT_RING( CP_PACKET0_TABLE( RADEON_SE_TCL_SCALAR_DATA_REG, sz-1 ) );
+	OUT_RING_USER_TABLE( data, sz );
+	ADVANCE_RING();
+	cmdbuf->buf += sz * sizeof(int);
+	cmdbuf->bufsz -= sz * sizeof(int);
+	return 0;
+}
+
+static __inline__ int radeon_emit_vectors( 
+	drm_radeon_private_t *dev_priv,
+	drm_radeon_cmd_header_t header,
+	drm_radeon_cmd_buffer_t *cmdbuf )
+{
+	int sz = header.vectors.count;
+	int *data = (int *)cmdbuf->buf;
+	int start = header.vectors.offset;
+	int stride = header.vectors.stride;
+	RING_LOCALS;
+
+	BEGIN_RING( 3+sz );
+	OUT_RING( CP_PACKET0( RADEON_SE_TCL_VECTOR_INDX_REG, 0 ) );
+	OUT_RING( start | (stride << RADEON_VEC_INDX_OCTWORD_STRIDE_SHIFT));
+	OUT_RING( CP_PACKET0_TABLE( RADEON_SE_TCL_VECTOR_DATA_REG, (sz-1) ) );
+	OUT_RING_USER_TABLE( data, sz );
+	ADVANCE_RING();
+
+	cmdbuf->buf += sz * sizeof(int);
+	cmdbuf->bufsz -= sz * sizeof(int);
+	return 0;
+}
+
+
+static int radeon_emit_packet3( drm_device_t *dev,
+				drm_radeon_cmd_buffer_t *cmdbuf )
+{
+	drm_radeon_private_t *dev_priv = dev->dev_private;
+	int cmdsz, tmp;
+	int *cmd = (int *)cmdbuf->buf;
+	RING_LOCALS;
+
+
+	DRM_DEBUG("\n");
+
+	if (DRM_GET_USER_UNCHECKED( tmp, &cmd[0]))
+		return DRM_ERR(EFAULT);
+
+	cmdsz = 2 + ((tmp & RADEON_CP_PACKET_COUNT_MASK) >> 16);
+
+	if ((tmp & 0xc0000000) != RADEON_CP_PACKET3 ||
+	    cmdsz * 4 > cmdbuf->bufsz)
+		return DRM_ERR(EINVAL);
+
+	BEGIN_RING( cmdsz );
+	OUT_RING_USER_TABLE( cmd, cmdsz );
+	ADVANCE_RING();
+
+	cmdbuf->buf += cmdsz * 4;
+	cmdbuf->bufsz -= cmdsz * 4;
+	return 0;
+}
+
+
+static int radeon_emit_packet3_cliprect( drm_device_t *dev,
+					 drm_radeon_cmd_buffer_t *cmdbuf,
+					 int orig_nbox )
+{
+	drm_radeon_private_t *dev_priv = dev->dev_private;
+	drm_clip_rect_t box;
+	int cmdsz, tmp;
+	int *cmd = (int *)cmdbuf->buf;
+	drm_clip_rect_t *boxes = cmdbuf->boxes;
+	int i = 0;
+	RING_LOCALS;
+
+	DRM_DEBUG("\n");
+
+	if (DRM_GET_USER_UNCHECKED( tmp, &cmd[0]))
+		return DRM_ERR(EFAULT);
+
+	cmdsz = 2 + ((tmp & RADEON_CP_PACKET_COUNT_MASK) >> 16);
+
+	if ((tmp & 0xc0000000) != RADEON_CP_PACKET3 ||
+	    cmdsz * 4 > cmdbuf->bufsz)
+		return DRM_ERR(EINVAL);
+
+	if (!orig_nbox)
+		goto out;
+
+	do {
+		if ( i < cmdbuf->nbox ) {
+			if (DRM_COPY_FROM_USER_UNCHECKED( &box, &boxes[i], sizeof(box) ))
+				return DRM_ERR(EFAULT);
+			/* FIXME The second and subsequent times round
+			 * this loop, send a WAIT_UNTIL_3D_IDLE before
+			 * calling emit_clip_rect(). This fixes a
+			 * lockup on fast machines when sending
+			 * several cliprects with a cmdbuf, as when
+			 * waving a 2D window over a 3D
+			 * window. Something in the commands from user
+			 * space seems to hang the card when they're
+			 * sent several times in a row. That would be
+			 * the correct place to fix it but this works
+			 * around it until I can figure that out - Tim
+			 * Smith */
+			if ( i ) {
+				BEGIN_RING( 2 );
+				RADEON_WAIT_UNTIL_3D_IDLE();
+				ADVANCE_RING();
+			}
+			radeon_emit_clip_rect( dev_priv, &box );
+		}
+		
+		BEGIN_RING( cmdsz );
+		OUT_RING_USER_TABLE( cmd, cmdsz );
+		ADVANCE_RING();
+
+	} while ( ++i < cmdbuf->nbox );
+ 	if (cmdbuf->nbox == 1)
+		cmdbuf->nbox = 0;
+
+ out:
+	cmdbuf->buf += cmdsz * 4;
+	cmdbuf->bufsz -= cmdsz * 4;
+	return 0;
+}
+
+
+static int radeon_emit_wait( drm_device_t *dev, int flags )
+{
+	drm_radeon_private_t *dev_priv = dev->dev_private;
+	RING_LOCALS;
+
+	DRM_DEBUG("%s: %x\n", __FUNCTION__, flags);
+	switch (flags) {
+	case RADEON_WAIT_2D:
+		BEGIN_RING( 2 );
+		RADEON_WAIT_UNTIL_2D_IDLE(); 
+		ADVANCE_RING();
+		break;
+	case RADEON_WAIT_3D:
+		BEGIN_RING( 2 );
+		RADEON_WAIT_UNTIL_3D_IDLE(); 
+		ADVANCE_RING();
+		break;
+	case RADEON_WAIT_2D|RADEON_WAIT_3D:
+		BEGIN_RING( 2 );
+		RADEON_WAIT_UNTIL_IDLE(); 
+		ADVANCE_RING();
+		break;
+	default:
+		return DRM_ERR(EINVAL);
+	}
+
+	return 0;
+}
+
+int radeon_cp_cmdbuf( DRM_IOCTL_ARGS )
+{
+	DRM_DEVICE;
+	drm_radeon_private_t *dev_priv = dev->dev_private;
+	drm_device_dma_t *dma = dev->dma;
+	drm_buf_t *buf = 0;
+	int idx;
+	drm_radeon_cmd_buffer_t cmdbuf;
+	drm_radeon_cmd_header_t header;
+	int orig_nbox;
+
+	LOCK_TEST_WITH_RETURN( dev );
+
+	if ( !dev_priv ) {
+		DRM_ERROR( "%s called with no initialization\n", __FUNCTION__ );
+		return DRM_ERR(EINVAL);
+	}
+
+	DRM_COPY_FROM_USER_IOCTL( cmdbuf, (drm_radeon_cmd_buffer_t *)data,
+			     sizeof(cmdbuf) );
+
+	RING_SPACE_TEST_WITH_RETURN( dev_priv );
+	VB_AGE_TEST_WITH_RETURN( dev_priv );
+
+
+	if (DRM_VERIFYAREA_READ( cmdbuf.buf, cmdbuf.bufsz ))
+		return DRM_ERR(EFAULT);
+
+	if (cmdbuf.nbox &&
+	    DRM_VERIFYAREA_READ(cmdbuf.boxes, 
+			 cmdbuf.nbox * sizeof(drm_clip_rect_t)))
+		return DRM_ERR(EFAULT);
+
+	orig_nbox = cmdbuf.nbox;
+
+	while ( cmdbuf.bufsz >= sizeof(header) ) {
+		
+		if (DRM_GET_USER_UNCHECKED( header.i, (int *)cmdbuf.buf )) {
+			DRM_ERROR("__get_user %p\n", cmdbuf.buf);
+			return DRM_ERR(EFAULT);
+		}
+
+		cmdbuf.buf += sizeof(header);
+		cmdbuf.bufsz -= sizeof(header);
+
+		switch (header.header.cmd_type) {
+		case RADEON_CMD_PACKET: 
+			DRM_DEBUG("RADEON_CMD_PACKET\n");
+			if (radeon_emit_packets( dev_priv, header, &cmdbuf )) {
+				DRM_ERROR("radeon_emit_packets failed\n");
+				return DRM_ERR(EINVAL);
+			}
+			break;
+
+		case RADEON_CMD_SCALARS:
+			DRM_DEBUG("RADEON_CMD_SCALARS\n");
+			if (radeon_emit_scalars( dev_priv, header, &cmdbuf )) {
+				DRM_ERROR("radeon_emit_scalars failed\n");
+				return DRM_ERR(EINVAL);
+			}
+			break;
+
+		case RADEON_CMD_VECTORS:
+			DRM_DEBUG("RADEON_CMD_VECTORS\n");
+			if (radeon_emit_vectors( dev_priv, header, &cmdbuf )) {
+				DRM_ERROR("radeon_emit_vectors failed\n");
+				return DRM_ERR(EINVAL);
+			}
+			break;
+
+		case RADEON_CMD_DMA_DISCARD:
+			DRM_DEBUG("RADEON_CMD_DMA_DISCARD\n");
+			idx = header.dma.buf_idx;
+			if ( idx < 0 || idx >= dma->buf_count ) {
+				DRM_ERROR( "buffer index %d (of %d max)\n",
+					   idx, dma->buf_count - 1 );
+				return DRM_ERR(EINVAL);
+			}
+
+			buf = dma->buflist[idx];
+			if ( buf->pid != DRM_CURRENTPID || buf->pending ) {
+				DRM_ERROR( "bad buffer\n" );
+				return DRM_ERR(EINVAL);
+			}
+
+			radeon_cp_discard_buffer( dev, buf );
+			break;
+
+		case RADEON_CMD_PACKET3:
+			DRM_DEBUG("RADEON_CMD_PACKET3\n");
+			if (radeon_emit_packet3( dev, &cmdbuf )) {
+				DRM_ERROR("radeon_emit_packet3 failed\n");
+				return DRM_ERR(EINVAL);
+			}
+			break;
+
+		case RADEON_CMD_PACKET3_CLIP:
+			DRM_DEBUG("RADEON_CMD_PACKET3_CLIP\n");
+			if (radeon_emit_packet3_cliprect( dev, &cmdbuf, orig_nbox )) {
+				DRM_ERROR("radeon_emit_packet3_clip failed\n");
+				return DRM_ERR(EINVAL);
+			}
+			break;
+
+		case RADEON_CMD_SCALARS2:
+			DRM_DEBUG("RADEON_CMD_SCALARS2\n");
+			if (radeon_emit_scalars2( dev_priv, header, &cmdbuf )) {
+				DRM_ERROR("radeon_emit_scalars2 failed\n");
+				return DRM_ERR(EINVAL);
+			}
+			break;
+
+		case RADEON_CMD_WAIT:
+			DRM_DEBUG("RADEON_CMD_WAIT\n");
+			if (radeon_emit_wait( dev, header.wait.flags )) {
+				DRM_ERROR("radeon_emit_wait failed\n");
+				return DRM_ERR(EINVAL);
+			}
+			break;
+		default:
+			DRM_ERROR("bad cmd_type %d at %p\n", 
+				  header.header.cmd_type,
+				  cmdbuf.buf - sizeof(header));
+			return DRM_ERR(EINVAL);
+		}
+	}
+
+
+	DRM_DEBUG("DONE\n");
+	COMMIT_RING();
+	return 0;
+}
+
+
+
+int radeon_cp_getparam( DRM_IOCTL_ARGS )
+{
+	DRM_DEVICE;
+	drm_radeon_private_t *dev_priv = dev->dev_private;
+	drm_radeon_getparam_t param;
+	int value;
+
+	if ( !dev_priv ) {
+		DRM_ERROR( "%s called with no initialization\n", __FUNCTION__ );
+		return DRM_ERR(EINVAL);
+	}
+
+	DRM_COPY_FROM_USER_IOCTL( param, (drm_radeon_getparam_t *)data,
+			     sizeof(param) );
+
+	DRM_DEBUG( "pid=%d\n", DRM_CURRENTPID );
+
+	switch( param.param ) {
+	case RADEON_PARAM_AGP_BUFFER_OFFSET:
+		value = dev_priv->agp_buffers_offset;
+		break;
+	case RADEON_PARAM_LAST_FRAME:
+		dev_priv->stats.last_frame_reads++;
+		value = GET_SCRATCH( 0 );
+		break;
+	case RADEON_PARAM_LAST_DISPATCH:
+		value = GET_SCRATCH( 1 );
+		break;
+	case RADEON_PARAM_LAST_CLEAR:
+		dev_priv->stats.last_clear_reads++;
+		value = GET_SCRATCH( 2 );
+		break;
+	case RADEON_PARAM_IRQ_NR:
+		value = dev->irq;
+		break;
+	case RADEON_PARAM_AGP_BASE:
+		value = dev_priv->agp_vm_start;
+		break;
+	default:
+		return DRM_ERR(EINVAL);
+	}
+
+	if ( DRM_COPY_TO_USER( param.value, &value, sizeof(int) ) ) {
+		DRM_ERROR( "copy_to_user\n" );
+		return DRM_ERR(EFAULT);
+	}
+	
+	return 0;
+}
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/sis.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/sis.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/sis.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/sis.h	2003-07-30 11:18:33.000000000 +0200
@@ -0,0 +1,81 @@
+/* sis_drv.h -- Private header for sis driver -*- linux-c -*-
+ *
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ * 
+ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/sis.h,v 1.3 2002/10/30 12:52:38 alanh Exp $ */
+
+#ifndef __SIS_H__
+#define __SIS_H__
+
+/* This remains constant for all DRM template files.
+ * Name it sisdrv_##x as there's a conflict with sis_free/malloc in the kernel
+ * that's used for fb devices 
+ */
+#define DRM(x) sisdrv_##x
+
+/* General customization:
+ */
+#define __HAVE_AGP		1
+#define __MUST_HAVE_AGP		0
+#define __HAVE_MTRR		1
+#define __HAVE_CTX_BITMAP	1
+
+#define DRIVER_AUTHOR	 "SIS"
+#define DRIVER_NAME	 "sis"
+#define DRIVER_DESC	 "SIS 300/630/540"
+#define DRIVER_DATE	 "20010503"
+#define DRIVER_MAJOR	 1
+#define DRIVER_MINOR	 0
+#define DRIVER_PATCHLEVEL  0
+
+#define DRIVER_IOCTLS \
+        [DRM_IOCTL_NR(SIS_IOCTL_FB_ALLOC)]   = { sis_fb_alloc,	  1, 0 }, \
+        [DRM_IOCTL_NR(SIS_IOCTL_FB_FREE)]    = { sis_fb_free,	  1, 0 }, \
+        /* AGP Memory Management */					  \
+        [DRM_IOCTL_NR(SIS_IOCTL_AGP_INIT)]   = { sisp_agp_init,	  1, 0 }, \
+        [DRM_IOCTL_NR(SIS_IOCTL_AGP_ALLOC)]  = { sisp_agp_alloc,  1, 0 }, \
+        [DRM_IOCTL_NR(SIS_IOCTL_AGP_FREE)]   = { sisp_agp_free,	  1, 0 }
+#if 0 /* these don't appear to be defined */
+	/* SIS Stereo */						 
+	[DRM_IOCTL_NR(DRM_IOCTL_CONTROL)]    = { sis_control,	  1, 1 }, 
+        [DRM_IOCTL_NR(SIS_IOCTL_FLIP)]       = { sis_flip,	  1, 1 }, 
+        [DRM_IOCTL_NR(SIS_IOCTL_FLIP_INIT)]  = { sis_flip_init,	  1, 1 }, 
+        [DRM_IOCTL_NR(SIS_IOCTL_FLIP_FINAL)] = { sis_flip_final,  1, 1 }
+#endif
+
+#define __HAVE_COUNTERS		5
+
+/* Buffer customization:
+ */
+#define DRIVER_AGP_BUFFERS_MAP( dev )					\
+	((drm_sis_private_t *)((dev)->dev_private))->buffers
+
+extern int sis_init_context(int context);
+extern int sis_final_context(int context);
+
+#define DRIVER_CTX_CTOR sis_init_context
+#define DRIVER_CTX_DTOR sis_final_context
+
+#endif
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/sis_drm.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/sis_drm.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/sis_drm.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/sis_drm.h	2003-07-30 11:18:33.000000000 +0200
@@ -0,0 +1,46 @@
+
+#ifndef _sis_drm_public_h_
+#define _sis_drm_public_h_
+
+/* SiS specific ioctls */
+#define SIS_IOCTL_FB_ALLOC		DRM_IOWR(0x44, drm_sis_mem_t)
+#define SIS_IOCTL_FB_FREE		DRM_IOW( 0x45, drm_sis_mem_t)
+#define SIS_IOCTL_AGP_INIT		DRM_IOWR(0x53, drm_sis_agp_t)
+#define SIS_IOCTL_AGP_ALLOC		DRM_IOWR(0x54, drm_sis_mem_t)
+#define SIS_IOCTL_AGP_FREE		DRM_IOW( 0x55, drm_sis_mem_t)
+#define SIS_IOCTL_FLIP			DRM_IOW( 0x48, drm_sis_flip_t)
+#define SIS_IOCTL_FLIP_INIT		DRM_IO(  0x49)
+#define SIS_IOCTL_FLIP_FINAL		DRM_IO(  0x50)
+
+typedef struct {
+  int context;
+  unsigned int offset;
+  unsigned int size;
+  unsigned int free;
+} drm_sis_mem_t;
+
+typedef struct {
+  unsigned int offset, size;
+} drm_sis_agp_t;
+
+typedef struct {
+  unsigned int left, right;
+} drm_sis_flip_t;
+
+#ifdef __KERNEL__
+
+int sis_fb_alloc(struct inode *inode, struct file *filp, unsigned int cmd,
+		  unsigned long arg);
+int sis_fb_free(struct inode *inode, struct file *filp, unsigned int cmd,
+		  unsigned long arg);
+
+int sisp_agp_init(struct inode *inode, struct file *filp, unsigned int cmd,
+		  unsigned long arg);
+int sisp_agp_alloc(struct inode *inode, struct file *filp, unsigned int cmd,
+		  unsigned long arg);
+int sisp_agp_free(struct inode *inode, struct file *filp, unsigned int cmd,
+		  unsigned long arg);
+
+#endif
+
+#endif
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/sis_drv.c linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/sis_drv.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/sis_drv.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/sis_drv.c	2003-07-30 11:18:33.000000000 +0200
@@ -0,0 +1,49 @@
+/* sis.c -- sis driver -*- linux-c -*-
+ *
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ */
+
+#include <linux/config.h>
+#include "sis.h"
+#include "drmP.h"
+#include "sis_drm.h"
+#include "sis_drv.h"
+
+#include "drm_auth.h"
+#include "drm_agpsupport.h"
+#include "drm_bufs.h"
+#include "drm_context.h"
+#include "drm_dma.h"
+#include "drm_drawable.h"
+#include "drm_drv.h"
+#include "drm_fops.h"
+#include "drm_init.h"
+#include "drm_ioctl.h"
+#include "drm_lists.h"
+#include "drm_lock.h"
+#include "drm_memory.h"
+#include "drm_proc.h"
+#include "drm_vm.h"
+#include "drm_stub.h"
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/sis_drv.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/sis_drv.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/sis_drv.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/sis_drv.h	2003-07-30 11:18:33.000000000 +0200
@@ -0,0 +1,45 @@
+/* sis_drv.h -- Private header for sis driver -*- linux-c -*-
+ *
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ * 
+ */
+
+#ifndef _SIS_DRV_H_
+#define _SIS_DRV_H_
+
+typedef struct drm_sis_private {
+	drm_map_t *buffers;
+} drm_sis_private_t;
+
+/* Stereo ? - this was never committed */
+
+int sis_flip(struct inode *inode, struct file *filp, unsigned int cmd,
+		  unsigned long arg);
+int sis_flip_init(struct inode *inode, struct file *filp, unsigned int cmd,
+		  unsigned long arg);
+int sis_flip_final(struct inode *inode, struct file *filp, unsigned int cmd,
+		  unsigned long arg);
+void flip_final(void);
+
+#endif
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/sis_ds.c linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/sis_ds.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/sis_ds.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/sis_ds.c	2003-07-30 11:18:33.000000000 +0200
@@ -0,0 +1,408 @@
+/* sis_ds.c -- Private header for Direct Rendering Manager -*- linux-c -*-
+ * Created: Mon Jan  4 10:05:05 1999 by sclin@sis.com.tw
+ *
+ * Copyright 2000 Silicon Integrated Systems Corp, Inc., HsinChu, Taiwan.
+ * All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ * 
+ * Authors:
+ *    Sung-Ching Lin <sclin@sis.com.tw>
+ * 
+ */
+
+#define __NO_VERSION__
+#include <linux/module.h>
+#include <linux/delay.h>
+#include <linux/errno.h>
+#include <linux/kernel.h>
+#include <linux/slab.h>
+#include <linux/poll.h>
+#include <asm/io.h>
+#include <linux/pci.h>
+
+#include "sis_ds.h"
+
+/* Set Data Structure, not check repeated value
+ * temporarily used
+ */
+
+set_t *setInit(void)
+{
+  int i;
+  set_t *set;
+
+  set = (set_t *)MALLOC(sizeof(set_t));
+  if (set) {
+    for(i = 0; i < SET_SIZE; i++){
+      set->list[i].free_next = i+1;    
+      set->list[i].alloc_next = -1;
+    }    
+    set->list[SET_SIZE-1].free_next = -1;
+    set->free = 0;
+    set->alloc = -1;
+    set->trace = -1;
+  }  
+  return set;
+}
+
+int setAdd(set_t *set, ITEM_TYPE item)
+{
+  int free = set->free;
+  
+  if(free != -1){
+    set->list[free].val = item;
+    set->free = set->list[free].free_next;
+  }
+  else{
+    return 0;
+  }
+
+  set->list[free].alloc_next = set->alloc;
+  set->alloc = free;  
+  set->list[free].free_next = -1;    
+
+  return 1;
+}
+
+int setDel(set_t *set, ITEM_TYPE item)
+{
+  int alloc = set->alloc;
+  int prev = -1;  
+  
+  while(alloc != -1){
+    if(set->list[alloc].val == item){
+      if(prev != -1)      
+        set->list[prev].alloc_next = set->list[alloc].alloc_next; 
+      else
+        set->alloc = set->list[alloc].alloc_next;
+      break;
+    }
+    prev = alloc;
+    alloc = set->list[alloc].alloc_next;      
+  }
+
+  if(alloc == -1)
+    return 0;
+  
+  set->list[alloc].free_next = set->free;
+  set->free = alloc;
+  set->list[alloc].alloc_next = -1;   
+
+  return 1;
+}
+
+/* setFirst -> setAdd -> setNext is wrong */
+
+int setFirst(set_t *set, ITEM_TYPE *item)
+{
+  if(set->alloc == -1)
+    return 0;
+
+  *item = set->list[set->alloc].val;
+  set->trace = set->list[set->alloc].alloc_next; 
+
+  return 1;
+}
+
+int setNext(set_t *set, ITEM_TYPE *item)
+{
+  if(set->trace == -1)
+    return 0;
+  
+  *item = set->list[set->trace].val;
+  set->trace = set->list[set->trace].alloc_next;      
+
+  return 1;
+}
+
+int setDestroy(set_t *set)
+{
+  FREE(set);
+
+  return 1;
+}
+
+/*
+ * GLX Hardware Device Driver common code
+ * Copyright (C) 1999 Keith Whitwell
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * KEITH WHITWELL, OR ANY OTHER CONTRIBUTORS BE LIABLE FOR ANY CLAIM, 
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR 
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE 
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+
+#define ISFREE(bptr) ((bptr)->free)
+
+#define PRINTF(fmt, arg...) do{}while(0)
+#define fprintf(fmt, arg...) do{}while(0)
+
+static void *calloc(size_t nmemb, size_t size)
+{
+  void *addr;
+  addr = kmalloc(nmemb*size, GFP_KERNEL);
+  if (addr)
+    memset(addr, 0, nmemb*size);
+  return addr;
+}
+#define free(n) kfree(n)
+           
+void mmDumpMemInfo( memHeap_t *heap )
+{
+  TMemBlock *p;
+
+  PRINTF ("Memory heap %p:\n", heap);
+  if (heap == 0) {
+    PRINTF ("  heap == 0\n");
+  } else {
+    p = (TMemBlock *)heap;
+    while (p) {
+      PRINTF ("  Offset:%08x, Size:%08x, %c%c\n",p->ofs,p->size,
+	     p->free ? '.':'U',
+	     p->reserved ? 'R':'.');
+      p = p->next;
+    }
+  }
+  PRINTF ("End of memory blocks\n");
+}
+
+memHeap_t *mmInit(int ofs,
+		  int size)
+{
+   PMemBlock blocks;
+  
+   if (size <= 0) {
+      return 0;
+   }
+   blocks = (TMemBlock *) calloc(1,sizeof(TMemBlock));
+   if (blocks) {
+      blocks->ofs = ofs;
+      blocks->size = size;
+      blocks->free = 1;
+      return (memHeap_t *)blocks;
+   } else
+      return 0;
+}
+
+/* Kludgey workaround for existing i810 server.  Remove soon.
+ */
+memHeap_t *mmAddRange( memHeap_t *heap,
+		       int ofs,
+		       int size )
+{
+   PMemBlock blocks;
+   blocks = (TMemBlock *) calloc(2,sizeof(TMemBlock));
+   if (blocks) {
+      blocks[0].size = size;
+      blocks[0].free = 1;
+      blocks[0].ofs = ofs;
+      blocks[0].next = &blocks[1];
+
+      /* Discontinuity - stops JoinBlock from trying to join non-adjacent
+       * ranges.
+       */
+      blocks[1].size = 0;
+      blocks[1].free = 0;
+      blocks[1].ofs = ofs+size;
+      blocks[1].next = (PMemBlock) heap;      
+      return (memHeap_t *)blocks;
+   } 
+   else
+      return heap;
+}
+
+static TMemBlock* SliceBlock(TMemBlock *p, 
+			     int startofs, int size, 
+			     int reserved, int alignment)
+{
+  TMemBlock *newblock;
+
+  /* break left */
+  if (startofs > p->ofs) {
+    newblock = (TMemBlock*) calloc(1,sizeof(TMemBlock));
+    newblock->ofs = startofs;
+    newblock->size = p->size - (startofs - p->ofs);
+    newblock->free = 1;
+    newblock->next = p->next;
+    p->size -= newblock->size;
+    p->next = newblock;
+    p = newblock;
+  }
+
+  /* break right */
+  if (size < p->size) {
+    newblock = (TMemBlock*) calloc(1,sizeof(TMemBlock));
+    newblock->ofs = startofs + size;
+    newblock->size = p->size - size;
+    newblock->free = 1;
+    newblock->next = p->next;
+    p->size = size;
+    p->next = newblock;
+  }
+
+  /* p = middle block */
+  p->align = alignment;
+  p->free = 0;
+  p->reserved = reserved;
+  return p;
+}
+
+PMemBlock mmAllocMem( memHeap_t *heap, int size, int align2, int startSearch)
+{
+  int mask,startofs,endofs;
+  TMemBlock *p;
+
+  if (!heap || align2 < 0 || size <= 0)
+    return NULL;
+  mask = (1 << align2)-1;
+  startofs = 0;
+  p = (TMemBlock *)heap;
+  while (p) {
+    if (ISFREE(p)) {
+      startofs = (p->ofs + mask) & ~mask;
+      if ( startofs < startSearch ) {
+      	startofs = startSearch;
+      }
+      endofs = startofs+size;
+      if (endofs <= (p->ofs+p->size))
+	break;
+    }
+    p = p->next;
+  }
+  if (!p)
+    return NULL;
+  p = SliceBlock(p,startofs,size,0,mask+1);
+  p->heap = heap;
+  return p;
+}
+
+static __inline__ int Join2Blocks(TMemBlock *p)
+{
+  if (p->free && p->next && p->next->free) {
+    TMemBlock *q = p->next;
+    p->size += q->size;
+    p->next = q->next;
+    free(q);
+    return 1;
+  }
+  return 0;
+}
+
+int mmFreeMem(PMemBlock b)
+{
+  TMemBlock *p,*prev;
+
+  if (!b)
+    return 0;
+  if (!b->heap) {
+     fprintf(stderr, "no heap\n");
+     return -1;
+  }
+  p = b->heap;
+  prev = NULL;
+  while (p && p != b) {
+    prev = p;
+    p = p->next;
+  }
+  if (!p || p->free || p->reserved) {
+     if (!p)
+	fprintf(stderr, "block not found in heap\n");
+     else if (p->free)
+	fprintf(stderr, "block already free\n");
+     else
+	fprintf(stderr, "block is reserved\n");
+    return -1;
+  }
+  p->free = 1;
+  Join2Blocks(p);
+  if (prev)
+    Join2Blocks(prev);
+  return 0;
+}
+
+int mmReserveMem(memHeap_t *heap, int offset,int size)
+{
+  int endofs;
+  TMemBlock *p;
+
+  if (!heap || size <= 0)
+    return -1;
+  endofs = offset+size;
+  p = (TMemBlock *)heap;
+  while (p && p->ofs <= offset) {
+    if (ISFREE(p) && endofs <= (p->ofs+p->size)) {
+      SliceBlock(p,offset,size,1,1);
+      return 0;
+    }
+    p = p->next;
+  }
+  return -1;
+}
+
+int mmFreeReserved(memHeap_t *heap, int offset)
+{
+  TMemBlock *p,*prev;
+
+  if (!heap)
+    return -1;
+  p = (TMemBlock *)heap;
+  prev = NULL;
+  while (p && p->ofs != offset) {
+    prev = p;
+    p = p->next;
+  }
+  if (!p || !p->reserved)
+    return -1;
+  p->free = 1;
+  p->reserved = 0;
+  Join2Blocks(p);
+  if (prev)
+    Join2Blocks(prev);
+  return 0;
+}
+
+void mmDestroy(memHeap_t *heap)
+{
+  TMemBlock *p,*q;
+
+  if (!heap)
+    return;
+  p = (TMemBlock *)heap;
+  while (p) {
+    q = p->next;
+    free(p);
+    p = q;
+  }
+}
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/sis_ds.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/sis_ds.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/sis_ds.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/sis_ds.h	2003-07-30 11:18:33.000000000 +0200
@@ -0,0 +1,163 @@
+/* sis_ds.h -- Private header for Direct Rendering Manager -*- linux-c -*-
+ * Created: Mon Jan  4 10:05:05 1999 by sclin@sis.com.tw
+ *
+ * Copyright 2000 Silicon Integrated Systems Corp, Inc., HsinChu, Taiwan.
+ * All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ * 
+ * Authors:
+ *    Sung-Ching Lin <sclin@sis.com.tw>
+ * 
+ */
+
+#ifndef _sis_ds_h_
+#define _sis_ds_h_
+
+/* Set Data Structure */
+
+#define SET_SIZE 5000
+#define MALLOC(s) kmalloc(s, GFP_KERNEL)
+#define FREE(s) kfree(s)
+
+typedef unsigned int ITEM_TYPE;
+
+typedef struct {
+  ITEM_TYPE val;
+  int alloc_next, free_next;
+} list_item_t;
+
+typedef struct {
+  int alloc;
+  int free;
+  int trace;
+  list_item_t list[SET_SIZE];
+} set_t;
+
+set_t *setInit(void);
+int setAdd(set_t *set, ITEM_TYPE item);
+int setDel(set_t *set, ITEM_TYPE item);
+int setFirst(set_t *set, ITEM_TYPE *item);
+int setNext(set_t *set, ITEM_TYPE *item);
+int setDestroy(set_t *set);
+
+#endif
+
+/*
+ * GLX Hardware Device Driver common code
+ * Copyright (C) 1999 Keith Whitwell
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * KEITH WHITWELL, OR ANY OTHER CONTRIBUTORS BE LIABLE FOR ANY CLAIM, 
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR 
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE 
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+
+#ifndef MM_INC
+#define MM_INC
+
+struct mem_block_t {
+  struct mem_block_t *next;
+  struct mem_block_t *heap;
+  int ofs,size;
+  int align;
+  int free:1;
+  int reserved:1;
+};
+typedef struct mem_block_t TMemBlock;
+typedef struct mem_block_t *PMemBlock;
+
+/* a heap is just the first block in a chain */
+typedef struct mem_block_t memHeap_t;
+
+static __inline__ int mmBlockSize(PMemBlock b)
+{ return b->size; }
+
+static __inline__ int mmOffset(PMemBlock b)
+{ return b->ofs; }
+
+static __inline__ void mmMarkReserved(PMemBlock b)
+{ b->reserved = 1; }
+
+/* 
+ * input: total size in bytes
+ * return: a heap pointer if OK, NULL if error
+ */
+memHeap_t *mmInit( int ofs, int size );
+
+
+
+memHeap_t *mmAddRange( memHeap_t *heap,
+		       int ofs,
+		       int size );
+
+
+/*
+ * Allocate 'size' bytes with 2^align2 bytes alignment,
+ * restrict the search to free memory after 'startSearch'
+ * depth and back buffers should be in different 4mb banks
+ * to get better page hits if possible
+ * input:	size = size of block
+ *       	align2 = 2^align2 bytes alignment
+ *		startSearch = linear offset from start of heap to begin search
+ * return: pointer to the allocated block, 0 if error
+ */
+PMemBlock  mmAllocMem( memHeap_t *heap, int size, int align2, int startSearch );
+
+/*
+ * Free block starts at offset
+ * input: pointer to a block
+ * return: 0 if OK, -1 if error
+ */
+int  mmFreeMem( PMemBlock b );
+
+/*
+ * Reserve 'size' bytes block start at offset
+ * This is used to prevent allocation of memory already used
+ * by the X server for the front buffer, pixmaps, and cursor
+ * input: size, offset
+ * output: 0 if OK, -1 if error
+ */
+int mmReserveMem( memHeap_t *heap, int offset,int size );
+int mmFreeReserved( memHeap_t *heap, int offset );
+
+/*
+ * destroy MM
+ */
+void mmDestroy( memHeap_t *mmInit );
+
+/* For debuging purpose. */
+void mmDumpMemInfo( memHeap_t *mmInit );
+
+#endif
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/sis_mm.c linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/sis_mm.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/sis_mm.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/sis_mm.c	2003-07-30 11:18:33.000000000 +0200
@@ -0,0 +1,307 @@
+/* sis_mm.c -- Private header for Direct Rendering Manager -*- linux-c -*-
+ * Created: Mon Jan  4 10:05:05 1999 by sclin@sis.com.tw
+ *
+ * Copyright 2000 Silicon Integrated Systems Corp, Inc., HsinChu, Taiwan.
+ * All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ * 
+ * Authors:
+ *    Sung-Ching Lin <sclin@sis.com.tw>
+ * 
+ */
+
+#define __NO_VERSION__
+#include "sis.h"
+#include <linux/sisfb.h>
+#include "drmP.h"
+#include "sis_drm.h"
+#include "sis_drv.h"
+#include "sis_ds.h"
+
+#define MAX_CONTEXT 100
+#define VIDEO_TYPE 0 
+#define AGP_TYPE 1
+
+typedef struct {
+  int used;
+  int context;
+  set_t *sets[2]; /* 0 for video, 1 for AGP */
+} sis_context_t;
+
+static sis_context_t global_ppriv[MAX_CONTEXT];
+
+static int add_alloc_set(int context, int type, unsigned int val)
+{
+  int i, retval = 0;
+  
+  for(i = 0; i < MAX_CONTEXT; i++)
+    if(global_ppriv[i].used && global_ppriv[i].context == context){
+      retval = setAdd(global_ppriv[i].sets[type], val);
+      break;
+    }
+  return retval;
+}
+
+static int del_alloc_set(int context, int type, unsigned int val)
+{  
+  int i, retval = 0;
+  for(i = 0; i < MAX_CONTEXT; i++)
+    if(global_ppriv[i].used && global_ppriv[i].context == context){
+      retval = setDel(global_ppriv[i].sets[type], val);
+      break;
+    }
+  return retval;
+}
+
+/* fb management via fb device */ 
+#if 1
+int sis_fb_alloc(struct inode *inode, struct file *filp, unsigned int cmd,
+		  unsigned long arg)
+{
+  drm_sis_mem_t fb;
+  struct sis_memreq req;
+  int retval = 0;
+   
+  if (copy_from_user(&fb, (drm_sis_mem_t *)arg, sizeof(fb)))
+	  return -EFAULT;
+  
+  req.size = fb.size;
+  sis_malloc(&req);
+  if(req.offset){
+    /* TODO */
+    fb.offset = req.offset;
+    fb.free = req.offset;
+    if(!add_alloc_set(fb.context, VIDEO_TYPE, fb.free)){
+      DRM_DEBUG("adding to allocation set fails\n");
+      sis_free(req.offset);
+      retval = -1;
+    }
+  }
+  else{  
+    fb.offset = 0;
+    fb.size = 0;
+    fb.free = 0;
+  }
+   
+  if (copy_to_user((drm_sis_mem_t *)arg, &fb, sizeof(fb))) return -EFAULT;
+
+  DRM_DEBUG("alloc fb, size = %d, offset = %ld\n", fb.size, req.offset);
+
+  return retval;
+}
+
+int sis_fb_free(struct inode *inode, struct file *filp, unsigned int cmd,
+		  unsigned long arg)
+{
+  drm_sis_mem_t fb;
+  int retval = 0;
+    
+  if (copy_from_user(&fb, (drm_sis_mem_t *)arg, sizeof(fb)))
+	  return -EFAULT;
+  
+  if(!fb.free){
+    return -1;
+  }
+
+  sis_free(fb.free);
+  if(!del_alloc_set(fb.context, VIDEO_TYPE, fb.free))
+    retval = -1;
+
+  DRM_DEBUG("free fb, offset = %d\n", fb.free);
+  
+  return retval;
+}
+
+#else
+
+int sis_fb_alloc(struct inode *inode, struct file *filp, unsigned int cmd,
+		  unsigned long arg)
+{
+  return -1;
+}
+
+int sis_fb_free(struct inode *inode, struct file *filp, unsigned int cmd,
+		  unsigned long arg)
+{
+  return 0;
+}
+
+#endif
+
+/* agp memory management */ 
+#if 1
+
+static memHeap_t *AgpHeap = NULL;
+
+int sisp_agp_init(struct inode *inode, struct file *filp, unsigned int cmd,
+		  unsigned long arg)
+{
+  drm_sis_agp_t agp;
+   
+  if (copy_from_user(&agp, (drm_sis_agp_t *)arg, sizeof(agp)))
+	  return -EFAULT;
+
+  AgpHeap = mmInit(agp.offset, agp.size);
+
+  DRM_DEBUG("offset = %u, size = %u", agp.offset, agp.size);
+  
+  return 0;
+}
+
+int sisp_agp_alloc(struct inode *inode, struct file *filp, unsigned int cmd,
+		  unsigned long arg)
+{
+  drm_sis_mem_t agp;
+  PMemBlock block;
+  int retval = 0;
+   
+  if(!AgpHeap)
+    return -1;
+  
+  if (copy_from_user(&agp, (drm_sis_mem_t *)arg, sizeof(agp)))
+	  return -EFAULT;
+  
+  block = mmAllocMem(AgpHeap, agp.size, 0, 0);
+  if(block){
+    /* TODO */
+    agp.offset = block->ofs;
+    agp.free = (unsigned long)block;
+    if(!add_alloc_set(agp.context, AGP_TYPE, agp.free)){
+      DRM_DEBUG("adding to allocation set fails\n");
+      mmFreeMem((PMemBlock)(unsigned long)agp.free);
+      retval = -1;
+    }
+  }
+  else{  
+    agp.offset = 0;
+    agp.size = 0;
+    agp.free = 0;
+  }
+   
+  if (copy_to_user((drm_sis_mem_t *)arg, &agp, sizeof(agp))) return -EFAULT;
+
+  DRM_DEBUG("alloc agp, size = %d, offset = %d\n", agp.size, agp.offset);
+
+  return retval;
+}
+
+int sisp_agp_free(struct inode *inode, struct file *filp, unsigned int cmd,
+		  unsigned long arg)
+{
+  drm_sis_mem_t agp;
+  int retval = 0;
+
+  if(!AgpHeap)
+    return -1;
+    
+  if (copy_from_user(&agp, (drm_sis_mem_t *)arg, sizeof(agp)))
+	  return -EFAULT;
+  
+  if(!agp.free){
+    return -1;
+  }
+
+  mmFreeMem((PMemBlock)(unsigned long)agp.free);
+  if(!del_alloc_set(agp.context, AGP_TYPE, agp.free))
+    retval = -1;
+
+  DRM_DEBUG("free agp, free = %d\n", agp.free);
+  
+  return retval;
+}
+
+#endif
+
+int sis_init_context(int context)
+{
+	int i;
+	
+	for(i = 0; i < MAX_CONTEXT ; i++)
+	  if(global_ppriv[i].used && (global_ppriv[i].context == context))
+	    break;
+
+	if(i >= MAX_CONTEXT){
+	  for(i = 0; i < MAX_CONTEXT ; i++){
+	    if(!global_ppriv[i].used){
+	      global_ppriv[i].context = context;
+	      global_ppriv[i].used = 1;
+	      global_ppriv[i].sets[0] = setInit();
+	      global_ppriv[i].sets[1] = setInit();
+	      DRM_DEBUG("init allocation set, socket=%d, context = %d\n", 
+	                 i, context);
+	      break;
+	    }	
+	  }
+	  if((i >= MAX_CONTEXT) || (global_ppriv[i].sets[0] == NULL) ||
+	     (global_ppriv[i].sets[1] == NULL)){
+	    return 0;
+	  }
+	}
+	
+	return 1;
+}
+
+int sis_final_context(int context)
+{
+	int i;
+
+	for(i=0; i<MAX_CONTEXT; i++)
+	  if(global_ppriv[i].used && (global_ppriv[i].context == context))
+	    break;
+          
+	if(i < MAX_CONTEXT){
+	  set_t *set;
+	  unsigned int item;
+	  int retval;
+	  
+  	  DRM_DEBUG("find socket %d, context = %d\n", i, context);
+
+	  /* Video Memory */
+	  set = global_ppriv[i].sets[0];
+	  retval = setFirst(set, &item);
+	  while(retval){
+   	    DRM_DEBUG("free video memory 0x%x\n", item);
+            sis_free(item);
+	    retval = setNext(set, &item);
+	  }
+	  setDestroy(set);
+
+	  /* AGP Memory */
+	  set = global_ppriv[i].sets[1];
+	  retval = setFirst(set, &item);
+	  while(retval){
+   	    DRM_DEBUG("free agp memory 0x%x\n", item);
+	    mmFreeMem((PMemBlock)(unsigned long)item);
+	    retval = setNext(set, &item);
+	  }
+	  setDestroy(set);
+	  
+	  global_ppriv[i].used = 0;	  
+        }
+
+	/* turn-off auto-flip */
+	/* TODO */
+#if defined(SIS_STEREO)
+	flip_final();
+#endif
+	
+	return 1;
+}
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/tdfx.h linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/tdfx.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/tdfx.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/tdfx.h	2003-07-30 11:18:33.000000000 +0200
@@ -0,0 +1,42 @@
+/* tdfx.h -- 3dfx DRM template customization -*- linux-c -*-
+ * Created: Wed Feb 14 12:32:32 2001 by gareth@valinux.com
+ *
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Gareth Hughes <gareth@valinux.com>
+ */
+
+#ifndef __TDFX_H__
+#define __TDFX_H__
+
+/* This remains constant for all DRM template files.
+ */
+#define DRM(x) tdfx_##x
+
+/* General customization:
+ */
+#define __HAVE_MTRR		1
+#define __HAVE_CTX_BITMAP	1
+
+#endif
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/tdfx_drv.c linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/tdfx_drv.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/drm-4.3/tdfx_drv.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/drm-4.3/tdfx_drv.c	2003-07-30 11:18:33.000000000 +0200
@@ -0,0 +1,92 @@
+/* tdfx_drv.c -- tdfx driver -*- linux-c -*-
+ * Created: Thu Oct  7 10:38:32 1999 by faith@precisioninsight.com
+ *
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Rickard E. (Rik) Faith <faith@valinux.com>
+ *    Daryll Strauss <daryll@valinux.com>
+ *    Gareth Hughes <gareth@valinux.com>
+ */
+
+#include <linux/config.h>
+#include "tdfx.h"
+#include "drmP.h"
+
+#define DRIVER_AUTHOR		"VA Linux Systems Inc."
+
+#define DRIVER_NAME		"tdfx"
+#define DRIVER_DESC		"3dfx Banshee/Voodoo3+"
+#define DRIVER_DATE		"20010216"
+
+#define DRIVER_MAJOR		1
+#define DRIVER_MINOR		0
+#define DRIVER_PATCHLEVEL	0
+
+#ifndef PCI_VENDOR_ID_3DFX
+#define PCI_VENDOR_ID_3DFX 0x121A
+#endif
+#ifndef PCI_DEVICE_ID_3DFX_VOODOO5
+#define PCI_DEVICE_ID_3DFX_VOODOO5 0x0009
+#endif
+#ifndef PCI_DEVICE_ID_3DFX_VOODOO4
+#define PCI_DEVICE_ID_3DFX_VOODOO4 0x0007
+#endif
+#ifndef PCI_DEVICE_ID_3DFX_VOODOO3_3000 /* Voodoo3 3000 */
+#define PCI_DEVICE_ID_3DFX_VOODOO3_3000 0x0005
+#endif
+#ifndef PCI_DEVICE_ID_3DFX_VOODOO3_2000 /* Voodoo3 3000 */
+#define PCI_DEVICE_ID_3DFX_VOODOO3_2000 0x0004
+#endif
+#ifndef PCI_DEVICE_ID_3DFX_BANSHEE
+#define PCI_DEVICE_ID_3DFX_BANSHEE 0x0003
+#endif
+
+static drm_pci_list_t DRM(idlist)[] = {
+	{ PCI_VENDOR_ID_3DFX, PCI_DEVICE_ID_3DFX_BANSHEE },
+	{ PCI_VENDOR_ID_3DFX, PCI_DEVICE_ID_3DFX_VOODOO3_2000 },
+	{ PCI_VENDOR_ID_3DFX, PCI_DEVICE_ID_3DFX_VOODOO3_3000 },
+	{ PCI_VENDOR_ID_3DFX, PCI_DEVICE_ID_3DFX_VOODOO4 },
+	{ PCI_VENDOR_ID_3DFX, PCI_DEVICE_ID_3DFX_VOODOO5 },
+	{ 0, 0 }
+};
+
+#define DRIVER_CARD_LIST DRM(idlist)
+
+
+#include "drm_auth.h"
+#include "drm_bufs.h"
+#include "drm_context.h"
+#include "drm_dma.h"
+#include "drm_drawable.h"
+#include "drm_drv.h"
+
+#include "drm_fops.h"
+#include "drm_init.h"
+#include "drm_ioctl.h"
+#include "drm_lock.h"
+#include "drm_memory.h"
+#include "drm_proc.h"
+#include "drm_vm.h"
+#include "drm_stub.h"
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/keyboard.c linux-2.4.20-wolk4.4-fullkernel/drivers/char/keyboard.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/keyboard.c	2003-07-30 13:51:24.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/keyboard.c	2003-07-30 11:12:51.000000000 +0200
@@ -560,6 +560,16 @@ static void do_spec(unsigned char value,
 	if ((kbd->kbdmode == VC_RAW || kbd->kbdmode == VC_MEDIUMRAW) &&
 	    !(SPECIALS_ALLOWED_IN_RAW_MODE & (1 << value)))
 		return;
+
+#if defined(CONFIG_GRKERNSEC_PROC) || defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
+	{
+		void *func = spec_fn_table[value];
+		if (func == show_state || func == show_ptregs ||
+		    func == show_mem)
+			return;
+	}
+#endif
+
 	spec_fn_table[value]();
 }
 
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/char/random.c linux-2.4.20-wolk4.4-fullkernel/drivers/char/random.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/char/random.c	2003-07-30 13:51:24.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/char/random.c	2003-07-30 11:23:32.000000000 +0200
@@ -251,6 +251,8 @@
 #include <linux/random.h>
 #include <linux/poll.h>
 #include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/spinlock.h>
 
 #include <asm/processor.h>
 #include <asm/uaccess.h>
@@ -1242,10 +1244,8 @@ static ssize_t extract_entropy(struct en
  * at which point we do a "catastrophic reseeding".
  */
 static inline void xfer_secondary_pool(struct entropy_store *r,
-				       size_t nbytes)
+				       size_t nbytes, __u32 *tmp)
 {
-	__u32	tmp[TMP_BUF_SIZE];
-
 	if (r->entropy_count < nbytes * 8 &&
 	    r->entropy_count < r->poolinfo.POOLBITS) {
 		int nwords = min_t(int,
@@ -1298,7 +1298,7 @@ static ssize_t extract_entropy(struct en
 		r->entropy_count = r->poolinfo.POOLBITS;
 
 	if (flags & EXTRACT_ENTROPY_SECONDARY)
-		xfer_secondary_pool(r, nbytes);
+		xfer_secondary_pool(r, nbytes, tmp);
 
 	DEBUG_ENT("%s has %d bits, want %d bits\n",
 		  r == sec_random_state ? "secondary" :
@@ -2042,56 +2042,102 @@ static __u32 twothirdsMD4Transform (__u3
 
 /* This should not be decreased so low that ISNs wrap too fast. */
 #define REKEY_INTERVAL	300
-#define HASH_BITS 24
+/*
+ * Bit layout of the tcp sequence numbers (before adding current time):
+ * bit 24-31: increased after every key exchange
+ * bit 0-23: hash(source,dest)
+ *
+ * The implementation is similar to the algorithm described
+ * in the Appendix of RFC 1185, except that
+ * - it uses a 1 MHz clock instead of a 250 kHz clock
+ * - it performs a rekey every 5 minutes, which is equivalent
+ * 	to a (source,dest) tulple dependent forward jump of the
+ * 	clock by 0..2^(HASH_BITS+1)
+ *
+ * Thus the average ISN wraparound time is 68 minutes instead of
+ * 4.55 hours.
+ *
+ * SMP cleanup and lock avoidance with poor man's RCU.
+ * 			Manfred Spraul <manfred@colorfullife.com>
+ * 		
+ */
+#define COUNT_BITS	8
+#define COUNT_MASK	( (1<<COUNT_BITS)-1)
+#define HASH_BITS	24
+#define HASH_MASK	( (1<<HASH_BITS)-1 )
+
+static struct keydata {
+	time_t rekey_time;
+	__u32	count;		// already shifted to the final position
+	__u32	secret[12];
+} ____cacheline_aligned ip_keydata[2];
+
+static spinlock_t ip_lock = SPIN_LOCK_UNLOCKED;
+static unsigned int ip_cnt;
+
+static struct keydata *__check_and_rekey(time_t time)
+{
+	struct keydata *keyptr;
+	spin_lock_bh(&ip_lock);
+	keyptr = &ip_keydata[ip_cnt&1];
+	if (!keyptr->rekey_time || (time - keyptr->rekey_time) > REKEY_INTERVAL) {
+		keyptr = &ip_keydata[1^(ip_cnt&1)];
+		keyptr->rekey_time = time;
+		get_random_bytes(keyptr->secret, sizeof(keyptr->secret));
+		keyptr->count = (ip_cnt&COUNT_MASK)<<HASH_BITS;
+		mb();
+		ip_cnt++;
+	}
+	spin_unlock_bh(&ip_lock);
+	return keyptr;
+}
+
+static inline struct keydata *check_and_rekey(time_t time)
+{
+	struct keydata *keyptr = &ip_keydata[ip_cnt&1];
+
+	rmb();
+	if (!keyptr->rekey_time || (time - keyptr->rekey_time) > REKEY_INTERVAL) {
+		keyptr = __check_and_rekey(time);
+	}
+
+	return keyptr;
+}
 
 #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
 __u32 secure_tcpv6_sequence_number(__u32 *saddr, __u32 *daddr,
 				   __u16 sport, __u16 dport)
 {
-	static __u32	rekey_time;
-	static __u32	count;
-	static __u32	secret[12];
 	struct timeval 	tv;
 	__u32		seq;
+	__u32		hash[12];
+	struct keydata *keyptr;
 
-	/* The procedure is the same as for IPv4, but addresses are longer. */
+	/* The procedure is the same as for IPv4, but addresses are longer.
+	 * Thus we must use twothirdsMD4Transform.
+	 */
 
 	do_gettimeofday(&tv);	/* We need the usecs below... */
+	keyptr = check_and_rekey(tv.tv_sec);
 
-	if (!rekey_time || (tv.tv_sec - rekey_time) > REKEY_INTERVAL) {
-		rekey_time = tv.tv_sec;
-		/* First five words are overwritten below. */
-		get_random_bytes(&secret[5], sizeof(secret)-5*4);
-		count = (tv.tv_sec/REKEY_INTERVAL) << HASH_BITS;
-	}
-
-	memcpy(secret, saddr, 16);
-	secret[4]=(sport << 16) + dport;
-
-	seq = (twothirdsMD4Transform(daddr, secret) &
-	       ((1<<HASH_BITS)-1)) + count;
+	memcpy(hash, saddr, 16);
+	hash[4]=(sport << 16) + dport;
+	memcpy(&hash[5],keyptr->secret,sizeof(__u32)*7);
 
+	seq = twothirdsMD4Transform(daddr, hash) & HASH_MASK;
+	seq += keyptr->count;
 	seq += tv.tv_usec + tv.tv_sec*1000000;
+
 	return seq;
 }
 
 __u32 secure_ipv6_id(__u32 *daddr)
 {
-	static time_t	rekey_time;
-	static __u32	secret[12];
-	time_t		t;
+	struct keydata *keyptr;
 
-	/*
-	 * Pick a random secret every REKEY_INTERVAL seconds.
-	 */
-	t = CURRENT_TIME;
-	if (!rekey_time || (t - rekey_time) > REKEY_INTERVAL) {
-		rekey_time = t;
-		/* First word is overwritten below. */
-		get_random_bytes(secret, sizeof(secret));
-	}
+	keyptr = check_and_rekey(CURRENT_TIME);
 
-	return twothirdsMD4Transform(daddr, secret);
+	return halfMD4Transform(daddr, keyptr->secret);
 }
 
 #endif
@@ -2100,40 +2146,30 @@ __u32 secure_ipv6_id(__u32 *daddr)
 __u32 secure_tcp_sequence_number(__u32 saddr, __u32 daddr,
 				 __u16 sport, __u16 dport)
 {
-	static __u32	rekey_time;
-	static __u32	count;
-	static __u32	secret[12];
 	struct timeval 	tv;
 	__u32		seq;
+	__u32	hash[4];
+	struct keydata *keyptr;
 
 	/*
 	 * Pick a random secret every REKEY_INTERVAL seconds.
 	 */
 	do_gettimeofday(&tv);	/* We need the usecs below... */
-
-	if (!rekey_time || (tv.tv_sec - rekey_time) > REKEY_INTERVAL) {
-		rekey_time = tv.tv_sec;
-		/* First three words are overwritten below. */
-		get_random_bytes(&secret[3], sizeof(secret)-12);
-		count = (tv.tv_sec/REKEY_INTERVAL) << HASH_BITS;
-	}
+	keyptr = check_and_rekey(tv.tv_sec);
 
 	/*
 	 *  Pick a unique starting offset for each TCP connection endpoints
 	 *  (saddr, daddr, sport, dport).
-	 *  Note that the words are placed into the first words to be
-	 *  mixed in with the halfMD4.  This is because the starting
-	 *  vector is also a random secret (at secret+8), and further
-	 *  hashing fixed data into it isn't going to improve anything,
-	 *  so we should get started with the variable data.
+	 *  Note that the words are placed into the starting vector, which is 
+	 *  then mixed with a partial MD4 over random data.
 	 */
-	secret[0]=saddr;
-	secret[1]=daddr;
-	secret[2]=(sport << 16) + dport;
-
-	seq = (halfMD4Transform(secret+8, secret) &
-	       ((1<<HASH_BITS)-1)) + count;
+	hash[0]=saddr;
+	hash[1]=daddr;
+	hash[2]=(sport << 16) + dport;
+	hash[3]=keyptr->secret[11];
 
+	seq = halfMD4Transform(hash, keyptr->secret) & HASH_MASK;
+	seq += keyptr->count;
 	/*
 	 *	As close as possible to RFC 793, which
 	 *	suggests using a 250 kHz clock.
@@ -2155,31 +2191,22 @@ __u32 secure_tcp_sequence_number(__u32 s
  */
 __u32 secure_ip_id(__u32 daddr)
 {
-	static time_t	rekey_time;
-	static __u32	secret[12];
-	time_t		t;
+	struct keydata *keyptr;
+	__u32 hash[4];
 
-	/*
-	 * Pick a random secret every REKEY_INTERVAL seconds.
-	 */
-	t = CURRENT_TIME;
-	if (!rekey_time || (t - rekey_time) > REKEY_INTERVAL) {
-		rekey_time = t;
-		/* First word is overwritten below. */
-		get_random_bytes(secret+1, sizeof(secret)-4);
-	}
+	keyptr = check_and_rekey(CURRENT_TIME);
 
 	/*
 	 *  Pick a unique starting offset for each IP destination.
-	 *  Note that the words are placed into the first words to be
-	 *  mixed in with the halfMD4.  This is because the starting
-	 *  vector is also a random secret (at secret+8), and further
-	 *  hashing fixed data into it isn't going to improve anything,
-	 *  so we should get started with the variable data.
+	 *  The dest ip address is placed in the starting vector,
+	 *  which is then hashed with random data.
 	 */
-	secret[0]=daddr;
+	hash[0] = daddr;
+	hash[1] = keyptr->secret[9];
+	hash[2] = keyptr->secret[10];
+	hash[3] = keyptr->secret[11];
 
-	return halfMD4Transform(secret+8, secret);
+	return halfMD4Transform(hash, keyptr->secret);
 }
 
 #ifdef CONFIG_SYN_COOKIES
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/ide/ide-probe.c linux-2.4.20-wolk4.4-fullkernel/drivers/ide/ide-probe.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/ide/ide-probe.c	2003-07-30 13:51:25.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/ide/ide-probe.c	2003-07-30 10:28:47.000000000 +0200
@@ -623,6 +623,7 @@ static void ide_init_queue(ide_drive_t *
 
 	q->queuedata = HWGROUP(drive);
 	blk_init_queue(q, do_ide_request);
+	blk_queue_throttle_sectors(q, 1);
 
 	if (drive->media == ide_disk) {
 #ifdef CONFIG_BLK_DEV_ELEVATOR_NOOP
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/net/3c59x.c linux-2.4.20-wolk4.4-fullkernel/drivers/net/3c59x.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/net/3c59x.c	2003-07-30 13:51:26.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/net/3c59x.c	2003-07-30 12:53:03.000000000 +0200
@@ -1,316 +1,180 @@
 /* EtherLinkXL.c: A 3Com EtherLink PCI III/XL ethernet driver for linux. */
 /*
-	Written 1996-1999 by Donald Becker.
+	Written 1996-2003 by Donald Becker.
 
-	This software may be used and distributed according to the terms
-	of the GNU General Public License, incorporated herein by reference.
+	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.
 
 	This driver is for the 3Com "Vortex" and "Boomerang" series ethercards.
 	Members of the series include Fast EtherLink 3c590/3c592/3c595/3c597
 	and the EtherLink XL 3c900 and 3c905 cards.
 
-	Problem reports and questions should be directed to
-	vortex@scyld.com
-
-	The author may be reached as becker@scyld.com, or C/O
+	The original author may be reached as becker@scyld.com, or C/O
 	Scyld Computing Corporation
 	410 Severn Ave., Suite 210
 	Annapolis MD 21403
 
-	Linux Kernel Additions:
-	
- 	0.99H+lk0.9 - David S. Miller - softnet, PCI DMA updates
- 	0.99H+lk1.0 - Jeff Garzik <jgarzik@mandrakesoft.com>
-		Remove compatibility defines for kernel versions < 2.2.x.
-		Update for new 2.3.x module interface
-	LK1.1.2 (March 19, 2000)
-	* New PCI interface (jgarzik)
-
-    LK1.1.3 25 April 2000, Andrew Morton <andrewm@uow.edu.au>
-    - Merged with 3c575_cb.c
-    - Don't set RxComplete in boomerang interrupt enable reg
-    - spinlock in vortex_timer to protect mdio functions
-    - disable local interrupts around call to vortex_interrupt in
-      vortex_tx_timeout() (So vortex_interrupt can use spin_lock())
-    - Select window 3 in vortex_timer()'s write to Wn3_MAC_Ctrl
-    - In vortex_start_xmit(), move the lock to _after_ we've altered
-      vp->cur_tx and vp->tx_full.  This defeats the race between
-      vortex_start_xmit() and vortex_interrupt which was identified
-      by Bogdan Costescu.
-    - Merged back support for six new cards from various sources
-    - Set vortex_have_pci if pci_module_init returns zero (fixes cardbus
-      insertion oops)
-    - Tell it that 3c905C has NWAY for 100bT autoneg
-    - Fix handling of SetStatusEnd in 'Too much work..' code, as
-      per 2.3.99's 3c575_cb (Dave Hinds).
-    - Split ISR into two for vortex & boomerang
-    - Fix MOD_INC/DEC races
-    - Handle resource allocation failures.
-    - Fix 3CCFE575CT LED polarity
-    - Make tx_interrupt_mitigation the default
-
-    LK1.1.4 25 April 2000, Andrew Morton <andrewm@uow.edu.au>    
-    - Add extra TxReset to vortex_up() to fix 575_cb hotplug initialisation probs.
-    - Put vortex_info_tbl into __devinitdata
-    - In the vortex_error StatsFull HACK, disable stats in vp->intr_enable as well
-      as in the hardware.
-    - Increased the loop counter in issue_and_wait from 2,000 to 4,000.
-
-    LK1.1.5 28 April 2000, andrewm
-    - Added powerpc defines (John Daniel <jdaniel@etresoft.com> said these work...)
-    - Some extra diagnostics
-    - In vortex_error(), reset the Tx on maxCollisions.  Otherwise most
-      chips usually get a Tx timeout.
-    - Added extra_reset module parm
-    - Replaced some inline timer manip with mod_timer
-      (Franois romieu <Francois.Romieu@nic.fr>)
-    - In vortex_up(), don't make Wn3_config initialisation dependent upon has_nway
-      (this came across from 3c575_cb).
-
-    LK1.1.6 06 Jun 2000, andrewm
-    - Backed out the PPC defines.
-    - Use del_timer_sync(), mod_timer().
-    - Fix wrapped ulong comparison in boomerang_rx()
-    - Add IS_TORNADO, use it to suppress 3c905C checksum error msg
-      (Donald Becker, I Lee Hetherington <ilh@sls.lcs.mit.edu>)
-    - Replace union wn3_config with BFINS/BFEXT manipulation for
-      sparc64 (Pete Zaitcev, Peter Jones)
-    - In vortex_error, do_tx_reset and vortex_tx_timeout(Vortex):
-      do a netif_wake_queue() to better recover from errors. (Anders Pedersen,
-      Donald Becker)
-    - Print a warning on out-of-memory (rate limited to 1 per 10 secs)
-    - Added two more Cardbus 575 NICs: 5b57 and 6564 (Paul Wagland)
-
-    LK1.1.7 2 Jul 2000 andrewm
-    - Better handling of shared IRQs
-    - Reset the transmitter on a Tx reclaim error
-    - Fixed crash under OOM during vortex_open() (Mark Hemment)
-    - Fix Rx cessation problem during OOM (help from Mark Hemment)
-    - The spinlocks around the mdio access were blocking interrupts for 300uS.
-      Fix all this to use spin_lock_bh() within mdio_read/write
-    - Only write to TxFreeThreshold if it's a boomerang - other NICs don't
-      have one.
-    - Added 802.3x MAC-layer flow control support
-
-   LK1.1.8 13 Aug 2000 andrewm
-    - Ignore request_region() return value - already reserved if Cardbus.
-    - Merged some additional Cardbus flags from Don's 0.99Qk
-    - Some fixes for 3c556 (Fred Maciel)
-    - Fix for EISA initialisation (Jan Rekorajski)
-    - Renamed MII_XCVR_PWR and EEPROM_230 to align with 3c575_cb and D. Becker's drivers
-    - Fixed MII_XCVR_PWR for 3CCFE575CT
-    - Added INVERT_LED_PWR, used it.
-    - Backed out the extra_reset stuff
-
-   LK1.1.9 12 Sep 2000 andrewm
-    - Backed out the tx_reset_resume flags.  It was a no-op.
-    - In vortex_error, don't reset the Tx on txReclaim errors
-    - In vortex_error, don't reset the Tx on maxCollisions errors.
-      Hence backed out all the DownListPtr logic here.
-    - In vortex_error, give Tornado cards a partial TxReset on
-      maxCollisions (David Hinds).  Defined MAX_COLLISION_RESET for this.
-    - Redid some driver flags and device names based on pcmcia_cs-3.1.20.
-    - Fixed a bug where, if vp->tx_full is set when the interface
-      is downed, it remains set when the interface is upped.  Bad
-      things happen.
-
-   LK1.1.10 17 Sep 2000 andrewm
-    - Added EEPROM_8BIT for 3c555 (Fred Maciel)
-    - Added experimental support for the 3c556B Laptop Hurricane (Louis Gerbarg)
-    - Add HAS_NWAY to "3c900 Cyclone 10Mbps TPO"
-
-   LK1.1.11 13 Nov 2000 andrewm
-    - Dump MOD_INC/DEC_USE_COUNT, use SET_MODULE_OWNER
-
-   LK1.1.12 1 Jan 2001 andrewm (2.4.0-pre1)
-    - Call pci_enable_device before we request our IRQ (Tobias Ringstrom)
-    - Add 3c590 PCI latency timer hack to vortex_probe1 (from 0.99Ra)
-    - Added extended issue_and_wait for the 3c905CX.
-    - Look for an MII on PHY index 24 first (3c905CX oddity).
-    - Add HAS_NWAY to 3cSOHO100-TX (Brett Frankenberger)
-    - Don't free skbs we don't own on oom path in vortex_open().
-
-   LK1.1.13 27 Jan 2001
-    - Added explicit `medialock' flag so we can truly
-      lock the media type down with `options'.
-    - "check ioremap return and some tidbits" (Arnaldo Carvalho de Melo <acme@conectiva.com.br>)
-    - Added and used EEPROM_NORESET for 3c556B PM resumes.
-    - Fixed leakage of vp->rx_ring.
-    - Break out separate HAS_HWCKSM device capability flag.
-    - Kill vp->tx_full (ANK)
-    - Merge zerocopy fragment handling (ANK?)
-
-   LK1.1.14 15 Feb 2001
-    - Enable WOL.  Can be turned on with `enable_wol' module option.
-    - EISA and PCI initialisation fixes (jgarzik, Manfred Spraul)
-    - If a device's internalconfig register reports it has NWAY,
-      use it, even if autoselect is enabled.
-
-   LK1.1.15 6 June 2001 akpm
-    - Prevent double counting of received bytes (Lars Christensen)
-    - Add ethtool support (jgarzik)
-    - Add module parm descriptions (Andrzej M. Krzysztofowicz)
-    - Implemented alloc_etherdev() API
-    - Special-case the 'Tx error 82' message.
-
-   LK1.1.16 18 July 2001 akpm
-    - Make NETIF_F_SG dependent upon nr_free_highpages(), not on CONFIG_HIGHMEM
-    - Lessen verbosity of bootup messages
-    - Fix WOL - use new PM API functions.
-    - Use netif_running() instead of vp->open in suspend/resume.
-    - Don't reset the interface logic on open/close/rmmod.  It upsets
-      autonegotiation, and hence DHCP (from 0.99T).
-    - Back out EEPROM_NORESET flag because of the above (we do it for all
-      NICs).
-    - Correct 3c982 identification string
-    - Rename wait_for_completion() to issue_and_wait() to avoid completion.h
-      clash.
-
-    - See http://www.uow.edu.au/~andrewm/linux/#3c59x-2.3 for more details.
-    - Also see Documentation/networking/vortex.txt
+	Support information and updates are available at
+	http://www.scyld.com/network/vortex.html
 */
 
-/*
- * FIXME: This driver _could_ support MTU changing, but doesn't.  See Don's hamachi.c implementation
- * as well as other drivers
- *
- * NOTE: If you make 'vortex_debug' a constant (#define vortex_debug 0) the driver shrinks by 2k
- * due to dead code elimination.  There will be some performance benefits from this due to
- * elimination of all the tests and reduced cache footprint.
- */
-
+static const char versionA[] =
+"3c59x.c:v0.99Za 4/17/2003 Donald Becker, becker@scyld.com\n";
+static const char versionB[] =
+"  http://www.scyld.com/network/vortex.html\n";
+
+/* The user-configurable values.
+   These may be modified when a driver module is loaded.*/
+
+/* Message enable level: 0..31 = no..all messages.  See NETIF_MSG docs. */
+static int debug = 2;
+
+/* This driver uses 'options' to pass the media type, full-duplex flag, etc.
+   See media_tbl[] and the web page for the possible types.
+   There is no limit on card count, MAX_UNITS limits only module options. */
+#define MAX_UNITS 8
+static int options[MAX_UNITS] = { -1, -1, -1, -1, -1, -1, -1, -1,};
+static int full_duplex[MAX_UNITS] = {-1, -1, -1, -1, -1, -1, -1, -1};
 
-#define DRV_NAME	"3c59x"
-#define DRV_VERSION	"LK1.1.16"
-#define DRV_RELDATE	"19 July 2001"
+/* Maximum events (Rx packets, etc.) to handle at each interrupt. */
+static int max_interrupt_work = 20;
 
+/* Set the copy breakpoint for the copy-only-tiny-frames scheme.
+   Setting to > 1512 effectively disables this feature. */
+static const int rx_copybreak = 200;
 
+/* Allow setting MTU to a larger size, bypassing the normal Ethernet setup. */
+static const int mtu = 1500;
 
-/* A few values that may be tweaked. */
-/* Keep the ring sizes a power of two for efficiency. */
+/* Maximum number of multicast addresses to filter (vs. rx-all-multicast).
+   Cyclones and later have a 64 or 256 element hash table based on the
+   Ethernet CRC. */
+static int multicast_filter_limit = 64;
+
+/* Operational parameters that are set at compile time. */
+
+/* Keep the ring sizes a power of two for compile efficiency.
+   The compiler will convert <unsigned>'%'<2^N> into a bit mask.
+   Making the Tx ring too large decreases the effectiveness of channel
+   bonding and packet priority.
+   Do not increase the Tx ring beyond 256.
+   Large receive rings waste memory and confound network buffer limits.
+   These values have been carefully studied: changing these might mask a
+   problem, it won't fix it.
+ */
 #define TX_RING_SIZE	16
+#define TX_QUEUE_LEN	10		/* Limit ring entries actually used.  */
 #define RX_RING_SIZE	32
-#define PKT_BUF_SZ		1536			/* Size of each temporary Rx buffer.*/
 
-/* "Knobs" that adjust features and parameters. */
-/* Set the copy breakpoint for the copy-only-tiny-frames scheme.
-   Setting to > 1512 effectively disables this feature. */
-#ifndef __arm__
-static const int rx_copybreak = 200;
-#else
-/* ARM systems perform better by disregarding the bus-master
-   transfer capability of these cards. -- rmk */
-static const int rx_copybreak = 1513;
-#endif
-/* Allow setting MTU to a larger size, bypassing the normal ethernet setup. */
-static const int mtu = 1500;
-/* Maximum events (Rx packets, etc.) to handle at each interrupt. */
-static int max_interrupt_work = 32;
-/* Tx timeout interval (millisecs) */
-static int watchdog = 5000;
-
-/* Allow aggregation of Tx interrupts.  Saves CPU load at the cost
- * of possible Tx stalls if the system is blocking interrupts
- * somewhere else.  Undefine this to disable.
+/* Operational parameters that usually are not changed. */
+/* Time in jiffies before concluding the transmitter is hung. */
+#define TX_TIMEOUT  (6*HZ)
+
+/* Allocation size of Rx buffers with normal sized Ethernet frames.
+   Do not change this value without good reason.  The 1536 value is not
+   a limit, or directly related to MTU, but rather a way to keep a
+   consistent allocation size among drivers.
  */
-#define tx_interrupt_mitigation 1
+#define PKT_BUF_SZ		1536
 
-/* Put out somewhat more debugging messages. (0: no msg, 1 minimal .. 6). */
-#define vortex_debug debug
-#ifdef VORTEX_DEBUG
-static int vortex_debug = VORTEX_DEBUG;
-#else
-static int vortex_debug = 1;
+#ifndef __KERNEL__
+#define __KERNEL__
 #endif
-
-#ifndef __OPTIMIZE__
-#error You must compile this file with the correct options!
-#error See the last lines of the source file.
+#if !defined(__OPTIMIZE__)
+#warning  You must compile this file with the correct options!
+#warning  See the last lines of the source file.
 #error You must compile this driver with "-O".
 #endif
 
 #include <linux/config.h>
+#if defined(CONFIG_SMP) && ! defined(__SMP__)
+#define __SMP__
+#endif
+#if defined(MODULE) && defined(CONFIG_MODVERSIONS) && ! defined(MODVERSIONS)
+#define MODVERSIONS
+#endif
+
+#include <linux/version.h>
+#if LINUX_VERSION_CODE < 0x20300  &&  defined(MODVERSIONS)
+#include <linux/module.h>
+#include <linux/modversions.h>
+#else
+#include <linux/modversions.h>
 #include <linux/module.h>
+#endif
+
 #include <linux/kernel.h>
-#include <linux/sched.h>
 #include <linux/string.h>
 #include <linux/timer.h>
 #include <linux/errno.h>
-#include <linux/in.h>
 #include <linux/ioport.h>
+#if LINUX_VERSION_CODE >= 0x20400
 #include <linux/slab.h>
+#else
+#include <linux/malloc.h>
+#endif
 #include <linux/interrupt.h>
 #include <linux/pci.h>
-#include <linux/mii.h>
-#include <linux/init.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
-#include <linux/ethtool.h>
-#include <linux/highmem.h>
-#include <asm/irq.h>			/* For NR_IRQS only. */
+#include <asm/irq.h>
+#include <asm/byteorder.h>
 #include <asm/bitops.h>
 #include <asm/io.h>
-#include <asm/uaccess.h>
 
-/* Kernel compatibility defines, some common to David Hinds' PCMCIA package.
-   This is only in the support-all-kernels source code. */
-
-#define RUN_AT(x) (jiffies + (x))
+#ifdef INLINE_PCISCAN
+#include "k_compat.h"
+#else
+#include "pci-scan.h"
+#include "kern_compat.h"
+#endif
 
-#include <linux/delay.h>
+/* Condensed operations for readability.
+   Compatibility defines are now in kern_compat.h */
 
+#define virt_to_le32desc(addr)  cpu_to_le32(virt_to_bus(addr))
+#define le32desc_to_virt(addr)  bus_to_virt(le32_to_cpu(addr))
 
-static char version[] __devinitdata =
-DRV_NAME ": Donald Becker and others. www.scyld.com/network/vortex.html\n";
+#if (LINUX_VERSION_CODE >= 0x20100)  &&  defined(MODULE)
+char kernel_version[] = UTS_RELEASE;
+#endif
 
 MODULE_AUTHOR("Donald Becker <becker@scyld.com>");
-MODULE_DESCRIPTION("3Com 3c59x/3c9xx ethernet driver "
-					DRV_VERSION " " DRV_RELDATE);
+MODULE_DESCRIPTION("3Com EtherLink XL (3c590/3c900 series) driver");
 MODULE_LICENSE("GPL");
-
 MODULE_PARM(debug, "i");
-MODULE_PARM(options, "1-" __MODULE_STRING(8) "i");
-MODULE_PARM(full_duplex, "1-" __MODULE_STRING(8) "i");
-MODULE_PARM(hw_checksums, "1-" __MODULE_STRING(8) "i");
-MODULE_PARM(flow_ctrl, "1-" __MODULE_STRING(8) "i");
-MODULE_PARM(enable_wol, "1-" __MODULE_STRING(8) "i");
+MODULE_PARM(options, "1-" __MODULE_STRING(MAX_UNITS) "i");
+MODULE_PARM(full_duplex, "1-" __MODULE_STRING(MAX_UNITS) "i");
 MODULE_PARM(rx_copybreak, "i");
 MODULE_PARM(max_interrupt_work, "i");
-MODULE_PARM(compaq_ioaddr, "i");
-MODULE_PARM(compaq_irq, "i");
-MODULE_PARM(compaq_device_id, "i");
-MODULE_PARM(watchdog, "i");
-MODULE_PARM_DESC(debug, "3c59x debug level (0-6)");
-MODULE_PARM_DESC(options, "3c59x: Bits 0-3: media type, bit 4: bus mastering, bit 9: full duplex");
-MODULE_PARM_DESC(full_duplex, "3c59x full duplex setting(s) (1)");
-MODULE_PARM_DESC(hw_checksums, "3c59x Hardware checksum checking by adapter(s) (0-1)");
-MODULE_PARM_DESC(flow_ctrl, "3c59x 802.3x flow control usage (PAUSE only) (0-1)");
-MODULE_PARM_DESC(enable_wol, "3c59x: Turn on Wake-on-LAN for adapter(s) (0-1)");
-MODULE_PARM_DESC(rx_copybreak, "3c59x copy breakpoint for copy-only-tiny-frames");
-MODULE_PARM_DESC(max_interrupt_work, "3c59x maximum events handled per interrupt");
-MODULE_PARM_DESC(compaq_ioaddr, "3c59x PCI I/O base address (Compaq BIOS problem workaround)");
-MODULE_PARM_DESC(compaq_irq, "3c59x PCI IRQ number (Compaq BIOS problem workaround)");
-MODULE_PARM_DESC(compaq_device_id, "3c59x PCI device ID (Compaq BIOS problem workaround)");
-MODULE_PARM_DESC(watchdog, "3c59x transmit timeout in milliseconds");
+MODULE_PARM(multicast_filter_limit, "i");
+#ifdef MODULE_PARM_DESC
+MODULE_PARM_DESC(debug, "3c59x message level (0-31)");
+MODULE_PARM_DESC(options, "3c59x force fixed media type");
+MODULE_PARM_DESC(full_duplex,
+				 "3c59x set to 1 to force full duplex (deprecated)");
+MODULE_PARM_DESC(rx_copybreak,
+				 "3c59x copy breakpoint for copy-only-tiny-frames");
+MODULE_PARM_DESC(max_interrupt_work,
+				 "3c59x maximum events handled per interrupt");
+MODULE_PARM_DESC(multicast_filter_limit,
+				 "Multicast address count before switching to Rx-all-multicast");
+#endif
 
 /* Operational parameter that usually are not changed. */
 
-/* The Vortex size is twice that of the original EtherLinkIII series: the
-   runtime register window, window 1, is now always mapped in.
-   The Boomerang size is twice as large as the Vortex -- it has additional
-   bus master control registers. */
-#define VORTEX_TOTAL_SIZE 0x20
-#define BOOMERANG_TOTAL_SIZE 0x40
-
 /* Set iff a MII transceiver on any interface requires mdio preamble.
    This only set with the original DP83840 on older 3c905 boards, so the extra
    code size of a per-interface flag is not worthwhile. */
-static char mii_preamble_required;
-
-#define PFX DRV_NAME ": "
-
+static char mii_preamble_required = 0;
 
+/* Performance and path-coverage information. */
+static int rx_nocopy = 0, rx_copy = 0, queued_packet = 0, rx_csumhits;
 
 /*
 				Theory of Operation
@@ -320,11 +184,10 @@ I. Board Compatibility
 This device driver is designed for the 3Com FastEtherLink and FastEtherLink
 XL, 3Com's PCI to 10/100baseT adapters.  It also works with the 10Mbs
 versions of the FastEtherLink cards.  The supported product IDs are
-  3c590, 3c592, 3c595, 3c597, 3c900, 3c905
+in the pci_tbl[] list.
 
 The related ISA 3c515 is supported with a separate driver, 3c515.c, included
-with the kernel source or available from
-    cesdis.gsfc.nasa.gov:/pub/linux/drivers/3c515.html
+with the kernel source.
 
 II. Board-specific settings
 
@@ -369,6 +232,7 @@ the copying breakpoint: it is chosen to 
 passing the full-sized skbuff to the queue layer for all frames vs. the
 copying cost of copying a frame to a correctly-sized skbuff.
 
+
 IIIC. Synchronization
 The driver runs as two independent, single-threaded flows of control.  One
 is the send-packet routine, which enforces single-threaded use by the
@@ -383,210 +247,151 @@ The name "Vortex" is the internal 3Com p
 the EISA version is called "Demon".  According to Terry these names come
 from rides at the local amusement park.
 
-The new chips support both ethernet (1.5K) and FDDI (4.5K) packet sizes!
-This driver only supports ethernet packets because of the skbuff allocation
-limit of 4K.
-*/
-
-/* This table drives the PCI probe routines.  It's mostly boilerplate in all
-   of the drivers, and will likely be provided by some future kernel.
+The new chips support both ethernet (1.5K) and FDDI (4.5K) packet sizes.
+This driver only supports ethernet packets on some kernels because of the
+skbuff allocation limit of 4K.
 */
-enum pci_flags_bit {
-	PCI_USES_IO=1, PCI_USES_MEM=2, PCI_USES_MASTER=4,
-	PCI_ADDR0=0x10<<0, PCI_ADDR1=0x10<<1, PCI_ADDR2=0x10<<2, PCI_ADDR3=0x10<<3,
-};
-
-enum {	IS_VORTEX=1, IS_BOOMERANG=2, IS_CYCLONE=4, IS_TORNADO=8,
-	EEPROM_8BIT=0x10,	/* AKPM: Uses 0x230 as the base bitmaps for EEPROM reads */
-	HAS_PWR_CTRL=0x20, HAS_MII=0x40, HAS_NWAY=0x80, HAS_CB_FNS=0x100,
-	INVERT_MII_PWR=0x200, INVERT_LED_PWR=0x400, MAX_COLLISION_RESET=0x800,
-	EEPROM_OFFSET=0x1000, HAS_HWCKSM=0x2000 };
-
-enum vortex_chips {
-	CH_3C590 = 0,
-	CH_3C592,
-	CH_3C597,
-	CH_3C595_1,
-	CH_3C595_2,
-
-	CH_3C595_3,
-	CH_3C900_1,
-	CH_3C900_2,
-	CH_3C900_3,
-	CH_3C900_4,
-
-	CH_3C900_5,
-	CH_3C900B_FL,
-	CH_3C905_1,
-	CH_3C905_2,
-	CH_3C905B_1,
-
-	CH_3C905B_2,
-	CH_3C905B_FX,
-	CH_3C905C,
-	CH_3C905C2,
-	CH_3C980,
-	CH_3C9805,
-
-	CH_3CSOHO100_TX,
-	CH_3C555,
-	CH_3C556,
-	CH_3C556B,
-	CH_3C575,
-
-	CH_3C575_1,
-	CH_3CCFE575,
-	CH_3CCFE575CT,
-	CH_3CCFE656,
-	CH_3CCFEM656,
-
-	CH_3CCFEM656_1,
-	CH_3C450,
-	CH_3C920,
-};
-
 
-/* note: this array directly indexed by above enums, and MUST
- * be kept in sync with both the enums above, and the PCI device
- * table below
- */
-static struct vortex_chip_info {
-	const char *name;
-	int flags;
-	int drv_flags;
-	int io_size;
-} vortex_info_tbl[] __devinitdata = {
-#define EISA_TBL_OFFSET	0		/* Offset of this entry for vortex_eisa_init */
-	{"3c590 Vortex 10Mbps",
-	 PCI_USES_IO|PCI_USES_MASTER, IS_VORTEX, 32, },
-	{"3c592 EISA 10Mbps Demon/Vortex",					/* AKPM: from Don's 3c59x_cb.c 0.49H */
-	 PCI_USES_IO|PCI_USES_MASTER, IS_VORTEX, 32, },
-	{"3c597 EISA Fast Demon/Vortex",					/* AKPM: from Don's 3c59x_cb.c 0.49H */
-	 PCI_USES_IO|PCI_USES_MASTER, IS_VORTEX, 32, },
-	{"3c595 Vortex 100baseTx",
-	 PCI_USES_IO|PCI_USES_MASTER, IS_VORTEX, 32, },
-	{"3c595 Vortex 100baseT4",
-	 PCI_USES_IO|PCI_USES_MASTER, IS_VORTEX, 32, },
-
-	{"3c595 Vortex 100base-MII",
-	 PCI_USES_IO|PCI_USES_MASTER, IS_VORTEX, 32, },
-	{"3c900 Boomerang 10baseT",
-	 PCI_USES_IO|PCI_USES_MASTER, IS_BOOMERANG, 64, },
-	{"3c900 Boomerang 10Mbps Combo",
-	 PCI_USES_IO|PCI_USES_MASTER, IS_BOOMERANG, 64, },
-	{"3c900 Cyclone 10Mbps TPO",						/* AKPM: from Don's 0.99M */
-	 PCI_USES_IO|PCI_USES_MASTER, IS_CYCLONE|HAS_NWAY|HAS_HWCKSM, 128, },
-	{"3c900 Cyclone 10Mbps Combo",
-	 PCI_USES_IO|PCI_USES_MASTER, IS_CYCLONE|HAS_HWCKSM, 128, },
-
-	{"3c900 Cyclone 10Mbps TPC",						/* AKPM: from Don's 0.99M */
-	 PCI_USES_IO|PCI_USES_MASTER, IS_CYCLONE|HAS_HWCKSM, 128, },
-	{"3c900B-FL Cyclone 10base-FL",
-	 PCI_USES_IO|PCI_USES_MASTER, IS_CYCLONE|HAS_HWCKSM, 128, },
-	{"3c905 Boomerang 100baseTx",
-	 PCI_USES_IO|PCI_USES_MASTER, IS_BOOMERANG|HAS_MII, 64, },
-	{"3c905 Boomerang 100baseT4",
-	 PCI_USES_IO|PCI_USES_MASTER, IS_BOOMERANG|HAS_MII, 64, },
-	{"3c905B Cyclone 100baseTx",
-	 PCI_USES_IO|PCI_USES_MASTER, IS_CYCLONE|HAS_NWAY|HAS_HWCKSM, 128, },
-
-	{"3c905B Cyclone 10/100/BNC",
-	 PCI_USES_IO|PCI_USES_MASTER, IS_CYCLONE|HAS_NWAY|HAS_HWCKSM, 128, },
-	{"3c905B-FX Cyclone 100baseFx",
-	 PCI_USES_IO|PCI_USES_MASTER, IS_CYCLONE|HAS_HWCKSM, 128, },
-	{"3c905C Tornado",
-	 PCI_USES_IO|PCI_USES_MASTER, IS_TORNADO|HAS_NWAY|HAS_HWCKSM, 128, },
-	{"3c905C Tornado 2",
-	 PCI_USES_IO|PCI_USES_MASTER, IS_TORNADO|HAS_NWAY|HAS_HWCKSM, 128, },
-	{"3c980 Cyclone",
-	 PCI_USES_IO|PCI_USES_MASTER, IS_CYCLONE|HAS_HWCKSM, 128, },
-	{"3c982 Dual Port Server Cyclone",
-	 PCI_USES_IO|PCI_USES_MASTER, IS_CYCLONE|HAS_HWCKSM, 128, },
-
-	{"3cSOHO100-TX Hurricane",
-	 PCI_USES_IO|PCI_USES_MASTER, IS_CYCLONE|HAS_NWAY|HAS_HWCKSM, 128, },
-	{"3c555 Laptop Hurricane",
-	 PCI_USES_IO|PCI_USES_MASTER, IS_CYCLONE|EEPROM_8BIT|HAS_HWCKSM, 128, },
-	{"3c556 Laptop Tornado",
-	 PCI_USES_IO|PCI_USES_MASTER, IS_TORNADO|HAS_NWAY|EEPROM_8BIT|HAS_CB_FNS|INVERT_MII_PWR|
-									HAS_HWCKSM, 128, },
-	{"3c556B Laptop Hurricane",
-	 PCI_USES_IO|PCI_USES_MASTER, IS_TORNADO|HAS_NWAY|EEPROM_OFFSET|HAS_CB_FNS|INVERT_MII_PWR|
-									HAS_HWCKSM, 128, },
-	{"3c575 [Megahertz] 10/100 LAN 	CardBus",
-	PCI_USES_IO|PCI_USES_MASTER, IS_BOOMERANG|HAS_MII|EEPROM_8BIT, 128, },
-
-	{"3c575 Boomerang CardBus",
-	 PCI_USES_IO|PCI_USES_MASTER, IS_BOOMERANG|HAS_MII|EEPROM_8BIT, 128, },
-	{"3CCFE575BT Cyclone CardBus",
-	 PCI_USES_IO|PCI_USES_MASTER, IS_CYCLONE|HAS_NWAY|HAS_CB_FNS|EEPROM_8BIT|
-									INVERT_LED_PWR|HAS_HWCKSM, 128, },
-	{"3CCFE575CT Tornado CardBus",
-	 PCI_USES_IO|PCI_USES_MASTER, IS_TORNADO|HAS_NWAY|HAS_CB_FNS|EEPROM_8BIT|INVERT_MII_PWR|
-									MAX_COLLISION_RESET|HAS_HWCKSM, 128, },
-	{"3CCFE656 Cyclone CardBus",
-	 PCI_USES_IO|PCI_USES_MASTER, IS_CYCLONE|HAS_NWAY|HAS_CB_FNS|EEPROM_8BIT|INVERT_MII_PWR|
-									INVERT_LED_PWR|HAS_HWCKSM, 128, },
-	{"3CCFEM656B Cyclone+Winmodem CardBus",
-	 PCI_USES_IO|PCI_USES_MASTER, IS_CYCLONE|HAS_NWAY|HAS_CB_FNS|EEPROM_8BIT|INVERT_MII_PWR|
-									INVERT_LED_PWR|HAS_HWCKSM, 128, },
-
-	{"3CXFEM656C Tornado+Winmodem CardBus",			/* From pcmcia-cs-3.1.5 */
-	 PCI_USES_IO|PCI_USES_MASTER, IS_TORNADO|HAS_NWAY|HAS_CB_FNS|EEPROM_8BIT|INVERT_MII_PWR|
-									MAX_COLLISION_RESET|HAS_HWCKSM, 128, },
-	{"3c450 HomePNA Tornado",						/* AKPM: from Don's 0.99Q */
-	 PCI_USES_IO|PCI_USES_MASTER, IS_TORNADO|HAS_NWAY|HAS_HWCKSM, 128, },
-	{"3c920 Revolution",
-	 PCI_USES_IO|PCI_USES_MASTER, IS_TORNADO|HAS_NWAY|HAS_HWCKSM, 128, },
-	{0,}, /* 0 terminated list. */
-};
-
-
-static struct pci_device_id vortex_pci_tbl[] __devinitdata = {
-	{ 0x10B7, 0x5900, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C590 },
-	{ 0x10B7, 0x5920, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C592 },
-	{ 0x10B7, 0x5970, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C597 },
-	{ 0x10B7, 0x5950, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C595_1 },
-	{ 0x10B7, 0x5951, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C595_2 },
-
-	{ 0x10B7, 0x5952, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C595_3 },
-	{ 0x10B7, 0x9000, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C900_1 },
-	{ 0x10B7, 0x9001, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C900_2 },
-	{ 0x10B7, 0x9004, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C900_3 },
-	{ 0x10B7, 0x9005, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C900_4 },
-
-	{ 0x10B7, 0x9006, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C900_5 },
-	{ 0x10B7, 0x900A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C900B_FL },
-	{ 0x10B7, 0x9050, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C905_1 },
-	{ 0x10B7, 0x9051, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C905_2 },
-	{ 0x10B7, 0x9055, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C905B_1 },
-
-	{ 0x10B7, 0x9058, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C905B_2 },
-	{ 0x10B7, 0x905A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C905B_FX },
-	{ 0x10B7, 0x9200, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C905C },
-	{ 0x10B7, 0x9201, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C905C2 },
-	{ 0x10B7, 0x9800, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C980 },
-	{ 0x10B7, 0x9805, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C9805 },
-
-	{ 0x10B7, 0x7646, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3CSOHO100_TX },
-	{ 0x10B7, 0x5055, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C555 },
-	{ 0x10B7, 0x6055, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C556 },
-	{ 0x10B7, 0x6056, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C556B },
-	{ 0x10B7, 0x5b57, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C575 },
-
-	{ 0x10B7, 0x5057, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C575_1 },
-	{ 0x10B7, 0x5157, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3CCFE575 },
-	{ 0x10B7, 0x5257, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3CCFE575CT },
-	{ 0x10B7, 0x6560, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3CCFE656 },
-	{ 0x10B7, 0x6562, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3CCFEM656 },
-
-	{ 0x10B7, 0x6564, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3CCFEM656_1 },
-	{ 0x10B7, 0x4500, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C450 },
-	{ 0x10B7, 0x9201, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C920 },
-	{0,}						/* 0 terminated list. */
-};
-MODULE_DEVICE_TABLE(pci, vortex_pci_tbl);
+/* The Vortex size is twice that of the original EtherLinkIII series: the
+   runtime register window, window 1, is now always mapped in.
+   The Boomerang size is twice as large as the Vortex -- it has additional
+   bus master control registers. */
+#define VORTEX_SIZE 0x20
+#define BOOMERANG_SIZE 0x40
+#define CYCLONE_SIZE 0x80
+enum { IS_VORTEX=1, IS_BOOMERANG=2, IS_CYCLONE=0x804, IS_TORNADO=0x08,
+	   HAS_PWR_CTRL=0x10, HAS_MII=0x20, HAS_NWAY=0x40, HAS_CB_FNS=0x80,
+	   EEPROM_8BIT=0x200, INVERT_LED_PWR=0x400, MII_XCVR_PWR=0x4000,
+	   HAS_V2_TX=0x800, WN0_XCVR_PWR=0x1000,
+};
+/* Base feature sets for the generations. */
+#define FEATURE_BOOMERANG (HAS_MII)				/* 905 */
+#define FEATURE_CYCLONE  (IS_CYCLONE|HAS_V2_TX) 			/* 905B */
+#define FEATURE_TORNADO  (IS_TORNADO|HAS_NWAY|HAS_V2_TX) 	/* 905C */
+
+static void *vortex_probe1(struct pci_dev *pdev, void *init_dev,
+						   long ioaddr, int irq, int chip_idx, int find_cnt);
+static int pwr_event(void *dev_instance, int event);
+#ifdef USE_MEM_OPS
+#define PCI_IOTYPE (PCI_USES_MASTER | PCI_USES_MEM | PCI_ADDR1)
+#else
+#define PCI_IOTYPE (PCI_USES_MASTER | PCI_USES_IO  | PCI_ADDR0)
+#endif
 
+static struct pci_id_info pci_tbl[] = {
+	{"3c590 Vortex 10Mbps", 	{ 0x590010B7, 0xffffffff },
+	 PCI_IOTYPE, VORTEX_SIZE, IS_VORTEX, },
+	{"3c595 Vortex 100baseTx",	{ 0x595010B7, 0xffffffff },
+	 PCI_IOTYPE, VORTEX_SIZE, IS_VORTEX, },
+	{"3c595 Vortex 100baseT4",	{ 0x595110B7, 0xffffffff },
+	 PCI_IOTYPE, VORTEX_SIZE, IS_VORTEX, },
+	{"3c595 Vortex 100base-MII",{ 0x595210B7, 0xffffffff },
+	 PCI_IOTYPE, VORTEX_SIZE, IS_VORTEX, },
+	/* Change EISA_scan if these move from index 4 and 5. */
+	{"3c592 EISA Vortex",		{ 0x592010B7, 0xffffffff },
+	 PCI_IOTYPE, VORTEX_SIZE, IS_VORTEX, },
+	{"3c597 EISA Vortex",		{ 0x597010B7, 0xffffffff },
+	 PCI_IOTYPE, VORTEX_SIZE, IS_VORTEX, },
+	{"Vortex (unknown)",		{ 0x590010B7, 0xff00ffff },
+	 PCI_IOTYPE, VORTEX_SIZE, IS_VORTEX, },
+	{"3c900 Boomerang 10baseT",	{ 0x900010B7, 0xffffffff },
+	 PCI_IOTYPE, BOOMERANG_SIZE, IS_BOOMERANG, },
+	{"3c900 Boomerang 10Mbps Combo", { 0x900110B7, 0xffffffff },
+	 PCI_IOTYPE,BOOMERANG_SIZE, IS_BOOMERANG, },
+	{"3c900 Cyclone 10Mbps TPO",   { 0x900410B7, 0xffffffff },
+	 PCI_IOTYPE, CYCLONE_SIZE, IS_CYCLONE, },
+	{"3c900 Cyclone 10Mbps Combo", { 0x900510B7, 0xffffffff },
+	 PCI_IOTYPE, CYCLONE_SIZE, IS_CYCLONE, },
+	{"3c900 Cyclone 10Mbps TPC",   { 0x900610B7, 0xffffffff },
+	 PCI_IOTYPE, CYCLONE_SIZE, IS_CYCLONE, },
+	{"3c900B-FL Cyclone 10base-FL",{ 0x900A10B7, 0xffffffff },
+	 PCI_IOTYPE, CYCLONE_SIZE, IS_CYCLONE, },
+	{"3c905 Boomerang 100baseTx",{ 0x905010B7, 0xffffffff },
+	 PCI_IOTYPE,BOOMERANG_SIZE, IS_BOOMERANG|HAS_MII, },
+	{"3c905 Boomerang 100baseT4",{ 0x905110B7, 0xffffffff },
+	 PCI_IOTYPE,BOOMERANG_SIZE, IS_BOOMERANG|HAS_MII, },
+	{"3c905B Cyclone 100baseTx",{ 0x905510B7, 0xffffffff },
+	 PCI_IOTYPE, CYCLONE_SIZE, IS_CYCLONE|HAS_NWAY, },
+	{"3c905B Cyclone 10/100/BNC",{ 0x905810B7, 0xffffffff },
+	 PCI_IOTYPE, CYCLONE_SIZE, IS_CYCLONE|HAS_NWAY, },
+	{"3c905B-FX Cyclone 100baseFx",{ 0x905A10B7, 0xffffffff },
+	 PCI_IOTYPE, CYCLONE_SIZE, IS_CYCLONE, },
+	{"3c905C Tornado",{ 0x920010B7, 0xffffffff },
+	 PCI_IOTYPE, CYCLONE_SIZE, FEATURE_TORNADO, },
+	{"3c920 Tornado",{ 0x920110B7, 0xffffffff },
+	 PCI_IOTYPE, CYCLONE_SIZE, FEATURE_TORNADO, },
+	{"3c920 series Tornado",{ 0x920010B7, 0xfff0ffff },
+	 PCI_IOTYPE, CYCLONE_SIZE, FEATURE_TORNADO, },
+	{"3c982 Server Tornado",{ 0x980510B7, 0xffffffff },
+	 PCI_IOTYPE, CYCLONE_SIZE, FEATURE_TORNADO, },
+	{"3c980 Cyclone",{ 0x980010B7, 0xfff0ffff },
+	 PCI_IOTYPE, CYCLONE_SIZE, FEATURE_CYCLONE|HAS_NWAY, },
+	{"3cSOHO100-TX Hurricane", { 0x764610B7, 0xffffffff },
+	 PCI_IOTYPE, CYCLONE_SIZE, FEATURE_CYCLONE, },
+	{"3c555 Laptop Hurricane", { 0x505510B7, 0xffffffff },
+	 PCI_IOTYPE, CYCLONE_SIZE, FEATURE_CYCLONE, },
+	{"3c556 Laptop Tornado",{ 0x605510B7, 0xffffffff },
+	 PCI_IOTYPE, CYCLONE_SIZE, FEATURE_TORNADO|EEPROM_8BIT, },
+	{"3c556 series Laptop Tornado",{ 0x605510B7, 0xf0ffffff },
+	 PCI_IOTYPE, CYCLONE_SIZE, FEATURE_TORNADO|EEPROM_8BIT, },
+	{"3c1556B-5 mini-PCI",{ 0x605610B7, 0xffffffff, 0x655610b7, 0xffffffff, },
+	 PCI_IOTYPE, CYCLONE_SIZE,
+	 FEATURE_TORNADO|EEPROM_8BIT|INVERT_LED_PWR|WN0_XCVR_PWR, },
+	{"3c1556B mini-PCI",{ 0x605610B7, 0xffffffff },
+	 PCI_IOTYPE, CYCLONE_SIZE,
+	 FEATURE_TORNADO|EEPROM_8BIT|HAS_CB_FNS|INVERT_LED_PWR|MII_XCVR_PWR, },
+	{"3c1556B series mini-PCI",{ 0x605610B7, 0xf0ffffff },
+	 PCI_IOTYPE, CYCLONE_SIZE,
+	 FEATURE_TORNADO|EEPROM_8BIT|HAS_CB_FNS|INVERT_LED_PWR|MII_XCVR_PWR, },
+	{"3c575 Boomerang CardBus",	{ 0x505710B7, 0xffffffff },
+	 PCI_IOTYPE,BOOMERANG_SIZE, IS_BOOMERANG|HAS_MII|EEPROM_8BIT, },
+	{"3CCFE575BT Cyclone CardBus",{ 0x515710B7, 0xffffffff },
+	 PCI_IOTYPE, CYCLONE_SIZE,
+	  FEATURE_CYCLONE | HAS_CB_FNS | EEPROM_8BIT | INVERT_LED_PWR, },
+	{"3CCFE575CT Tornado CardBus",{ 0x525710B7, 0xffffffff },
+	 PCI_IOTYPE, CYCLONE_SIZE,
+	 FEATURE_TORNADO|HAS_CB_FNS|EEPROM_8BIT|MII_XCVR_PWR, },
+	{"3CCFE656 Cyclone CardBus",{ 0x656010B7, 0xffffffff },
+	 PCI_IOTYPE, CYCLONE_SIZE,
+	 IS_CYCLONE|HAS_NWAY|HAS_CB_FNS| INVERT_LED_PWR | MII_XCVR_PWR, },
+	{"3CCFE656B Cyclone+Winmodem CardBus",{ 0x656210B7, 0xffffffff },
+	 PCI_IOTYPE, CYCLONE_SIZE,
+	 FEATURE_CYCLONE/*|HAS_NWAY*/ |HAS_CB_FNS|EEPROM_8BIT|INVERT_LED_PWR|MII_XCVR_PWR, },
+	{"3CCFE656C Tornado+Winmodem CardBus",{ 0x656410B7, 0xffffffff },
+	 PCI_IOTYPE, CYCLONE_SIZE,
+	 (FEATURE_TORNADO & ~HAS_NWAY)|HAS_CB_FNS|EEPROM_8BIT | MII_XCVR_PWR, },
+	{"3c450 HomePNA Tornado",{ 0x450010B7, 0xffffffff },
+	 PCI_IOTYPE, CYCLONE_SIZE, FEATURE_TORNADO, },
+	{"3c575 series CardBus (unknown version)", {0x505710B7, 0xf0ffffff },
+	 PCI_IOTYPE, BOOMERANG_SIZE, IS_BOOMERANG|HAS_MII, },
+	{"3Com Boomerang (unknown version)",{ 0x900010B7, 0xff00ffff },
+	 PCI_IOTYPE, BOOMERANG_SIZE, IS_BOOMERANG, },
+	{0,},						/* 0 terminated list. */
+};
+
+struct drv_id_info vortex_drv_id = {
+	"vortex", PCI_HOTSWAP, PCI_CLASS_NETWORK_ETHERNET<<8, pci_tbl,
+	vortex_probe1, pwr_event };
+
+/* This driver was written to use I/O operations.
+   However there are performance benefits to using memory operations, so
+   that mode is now an options.
+   Compiling for memory ops turns off EISA support.
+*/
+#ifdef USE_MEM_OPS
+#undef inb
+#undef inw
+#undef inl
+#undef outb
+#undef outw
+#undef outl
+#define inb readb
+#define inw readw
+#define inl readl
+#define outb writeb
+#define outw writew
+#define outl writel
+#endif
 
 /* Operational definitions.
    These are not used by other compilation units and thus are not
@@ -619,7 +424,9 @@ enum vortex_cmd {
 
 /* The SetRxFilter command accepts the following classes: */
 enum RxFilter {
-	RxStation = 1, RxMulticast = 2, RxBroadcast = 4, RxProm = 8 };
+	RxStation = 1, RxMulticast = 2, RxBroadcast = 4, RxProm = 8,
+	RxMulticastHash = 0x10,
+};
 
 /* Bits in the general status register. */
 enum vortex_status {
@@ -643,11 +450,7 @@ enum Window0 {
 	Wn0EepromData = 12,		/* Window 0: EEPROM results register. */
 	IntrStatus=0x0E,		/* Valid in all windows. */
 };
-enum Win0_EEPROM_bits {
-	EEPROM_Read = 0x80, EEPROM_WRITE = 0x40, EEPROM_ERASE = 0xC0,
-	EEPROM_EWENB = 0x30,		/* Enable erasing/writing for 10 msec. */
-	EEPROM_EWDIS = 0x00,		/* Disable EWENB before 10 msec timeout. */
-};
+
 /* EEPROM locations. */
 enum eeprom_offset {
 	PhysAddr01=0, PhysAddr23=1, PhysAddr45=2, ModelID=3,
@@ -659,47 +462,41 @@ enum Window2 {			/* Window 2. */
 	Wn2_ResetOptions=12,
 };
 enum Window3 {			/* Window 3: MAC/config bits. */
-	Wn3_Config=0, Wn3_MAC_Ctrl=6, Wn3_Options=8,
+	Wn3_Config=0, Wn3_MaxPktSize=4, Wn3_MAC_Ctrl=6, Wn3_Options=8,
 };
 
-#define BFEXT(value, offset, bitcount)  \
-    ((((unsigned long)(value)) >> (offset)) & ((1 << (bitcount)) - 1))
-
-#define BFINS(lhs, rhs, offset, bitcount)					\
-	(((lhs) & ~((((1 << (bitcount)) - 1)) << (offset))) |	\
-	(((rhs) & ((1 << (bitcount)) - 1)) << (offset)))
-
-#define RAM_SIZE(v)		BFEXT(v, 0, 3)
-#define RAM_WIDTH(v)	BFEXT(v, 3, 1)
-#define RAM_SPEED(v)	BFEXT(v, 4, 2)
-#define ROM_SIZE(v)		BFEXT(v, 6, 2)
-#define RAM_SPLIT(v)	BFEXT(v, 16, 2)
-#define XCVR(v)			BFEXT(v, 20, 4)
-#define AUTOSELECT(v)	BFEXT(v, 24, 1)
-
 enum Window4 {		/* Window 4: Xcvr/media bits. */
 	Wn4_FIFODiag = 4, Wn4_NetDiag = 6, Wn4_PhysicalMgmt=8, Wn4_Media = 10,
 };
+enum Window5 {
+	Wn5_TxThreshold = 0, Wn5_RxFilter = 8,
+};
 enum Win4_Media_bits {
 	Media_SQE = 0x0008,		/* Enable SQE error counting for AUI. */
 	Media_10TP = 0x00C0,	/* Enable link beat and jabber for 10baseT. */
 	Media_Lnk = 0x0080,		/* Enable just link beat for 100TX/100FX. */
 	Media_LnkBeat = 0x0800,
 };
-enum Window7 {					/* Window 7: Bus Master control. */
+enum Window7 {
+	/* Bus Master control on Vortex. */
 	Wn7_MasterAddr = 0, Wn7_MasterLen = 6, Wn7_MasterStatus = 12,
+	/* On Cyclone and later, VLAN and PowerMgt control. */ 
+	Wn7_VLAN_Mask = 0, Wn7_VLAN_EtherType = 4, Wn7_PwrMgmtEvent = 12,
 };
-/* Boomerang bus master control registers. */
+
+/* Boomerang and Cyclone bus master control registers. */
 enum MasterCtrl {
 	PktStatus = 0x20, DownListPtr = 0x24, FragAddr = 0x28, FragLen = 0x2c,
-	TxFreeThreshold = 0x2f, UpPktStatus = 0x30, UpListPtr = 0x38,
+	DownPollRate = 0x2d, TxFreeThreshold = 0x2f,
+	UpPktStatus = 0x30, UpListPtr = 0x38,
+	/* Cyclone+. */
+	TxPktID=0x18, RxPriorityThresh = 0x3c,
 };
 
 /* The Rx and Tx descriptor lists.
    Caution Alpha hackers: these types are 32 bits!  Note also the 8 byte
    alignment contraint on tx_ring[] and rx_ring[]. */
-#define LAST_FRAG 	0x80000000			/* Last Addr/Len pair in descriptor. */
-#define DN_COMPLETE	0x00010000			/* This packet has been downloaded */
+#define LAST_FRAG  0x80000000			/* Last Addr/Len pair in descriptor. */
 struct boom_rx_desc {
 	u32 next;					/* Last entry points to 0.   */
 	s32 status;
@@ -714,90 +511,75 @@ enum rx_desc_status {
 	IPChksumValid=1<<29, TCPChksumValid=1<<30, UDPChksumValid=1<<31,
 };
 
-#ifdef MAX_SKB_FRAGS
-#define DO_ZEROCOPY 1
-#else
-#define DO_ZEROCOPY 0
-#endif
-
 struct boom_tx_desc {
 	u32 next;					/* Last entry points to 0.   */
 	s32 status;					/* bits 0:12 length, others see below.  */
-#if DO_ZEROCOPY
-	struct {
-		u32 addr;
-		s32 length;
-	} frag[1+MAX_SKB_FRAGS];
-#else
-		u32 addr;
-		s32 length;
-#endif
+	u32 addr;
+	s32 length;
 };
 
 /* Values for the Tx status entry. */
 enum tx_desc_status {
-	CRCDisable=0x2000, TxDComplete=0x8000,
+	CRCDisable=0x2000, TxIntrDnComplete=0x8000, TxDownComplete=0x10000,
 	AddIPChksum=0x02000000, AddTCPChksum=0x04000000, AddUDPChksum=0x08000000,
+	TxNoRoundup=0x10000000,		/* HAS_V2_TX should not word-pad packet.  */
 	TxIntrUploaded=0x80000000,		/* IRQ when in FIFO, but maybe not sent. */
 };
 
 /* Chip features we care about in vp->capabilities, read from the EEPROM. */
-enum ChipCaps { CapBusMaster=0x20, CapPwrMgmt=0x2000 };
+enum ChipCaps { CapBusMaster=0x20, CapNoTxLength=0x0200, CapPwrMgmt=0x2000 };
 
+#define PRIV_ALIGN	15 	/* Required alignment mask */
 struct vortex_private {
 	/* The Rx and Tx rings should be quad-word-aligned. */
-	struct boom_rx_desc* rx_ring;
-	struct boom_tx_desc* tx_ring;
-	dma_addr_t rx_ring_dma;
-	dma_addr_t tx_ring_dma;
+	struct boom_rx_desc rx_ring[RX_RING_SIZE];
+	struct boom_tx_desc tx_ring[TX_RING_SIZE];
 	/* The addresses of transmit- and receive-in-place skbuffs. */
 	struct sk_buff* rx_skbuff[RX_RING_SIZE];
 	struct sk_buff* tx_skbuff[TX_RING_SIZE];
-	struct net_device *next_module;		/* NULL if PCI device */
-	unsigned int cur_rx, cur_tx;		/* The next free ring entry */
-	unsigned int dirty_rx, dirty_tx;	/* The ring entries to be free()ed. */
-	struct net_device_stats stats;
-	struct sk_buff *tx_skb;				/* Packet being eaten by bus master ctrl.  */
-	dma_addr_t tx_skb_dma;				/* Allocated DMA address for bus master ctrl DMA.   */
+	struct net_device *next_module;
+	void *priv_addr;
+	/* Keep the Rx and Tx variables grouped on their own cache lines. */
+	struct boom_rx_desc *rx_head_desc;
+	unsigned int cur_rx, dirty_rx;		/* Producer/consumer ring indices */
+	unsigned int rx_buf_sz;				/* Based on MTU+slack. */
+	int rx_copybreak;
+
+	struct boom_tx_desc *tx_desc_tail;
+	struct sk_buff *tx_skb;		/* Packet being eaten by bus master ctrl.  */
+	unsigned int cur_tx, dirty_tx;
+	unsigned int tx_full:1, restart_tx:1;
 
-	/* PCI configuration space information. */
-	struct pci_dev *pdev;
-	char *cb_fn_base;					/* CardBus function status addr space. */
-
-	/* Some values here only for performance evaluation and path-coverage */
-	int rx_nocopy, rx_copy, queued_packet, rx_csumhits;
-	int card_idx;
+	long last_reset;
+	spinlock_t	window_lock;
+	struct net_device_stats stats;
+	char *cb_fn_base;			/* CardBus function status addr space. */
+	int msg_level;
+	int chip_id, drv_flags;
+	struct pci_dev *pci_dev;	/* PCI configuration space information. */
 
 	/* The remainder are related to chip state, mostly media selection. */
-	struct timer_list timer;			/* Media selection timer. */
-	struct timer_list rx_oom_timer;		/* Rx skb allocation retry timer */
-	int options;						/* User-settable misc. driver options. */
-	unsigned int media_override:4, 		/* Passed-in media type. */
+	int multicast_filter_limit;
+	u32 mc_filter[8];
+	int max_interrupt_work;
+	int rx_mode;
+	struct timer_list timer;	/* Media selection timer. */
+	int options;				/* User-settable misc. driver options. */
+	unsigned int media_override:4, 			/* Passed-in media type. */
 		default_media:4,				/* Read from the EEPROM/Wn3_Config. */
-		full_duplex:1, force_fd:1, autoselect:1,
-		bus_master:1,					/* Vortex can only do a fragment bus-m. */
+		full_duplex:1, medialock:1, autoselect:1,
+		bus_master:1,				/* Vortex can only do a fragment bus-m. */
 		full_bus_master_tx:1, full_bus_master_rx:2, /* Boomerang  */
-		flow_ctrl:1,					/* Use 802.3x flow control (PAUSE only) */
-		partner_flow_ctrl:1,			/* Partner supports flow control */
-		has_nway:1,
-		enable_wol:1,					/* Wake-on-LAN is enabled */
-		pm_state_valid:1,				/* power_state[] has sane contents */
-		open:1,
-		medialock:1,
-		must_free_region:1;				/* Flag: if zero, Cardbus owns the I/O region */
-	int drv_flags;
+		hw_csums:1,				/* Has hardware checksums. */
+		restore_intr_mask:1,
+		polling:1;
 	u16 status_enable;
 	u16 intr_enable;
 	u16 available_media;				/* From Wn3_Options. */
+	u16 wn3_mac_ctrl;					/* Current settings. */
 	u16 capabilities, info1, info2;		/* Various, from EEPROM. */
 	u16 advertising;					/* NWay media advertisement */
 	unsigned char phys[2];				/* MII device addresses. */
-	u16 deferred;						/* Resend these interrupts when we
-										 * bale from the ISR */
-	u16 io_size;						/* Size of PCI region (for release_region) */
-	spinlock_t lock;					/* Serialise access to device & its vortex_private */
-	spinlock_t mdio_lock;				/* Serialise access to mdio hardware */
-	u32 power_state[16];
 };
 
 /* The action to take with a media selection timer tick.
@@ -811,9 +593,9 @@ enum xcvr_types {
 static struct media_table {
 	char *name;
 	unsigned int media_bits:16,		/* Bits to set in Wn4_Media register. */
-		mask:8,						/* The transceiver-present bit in Wn3_Config.*/
-		next:8;						/* The media type to try next. */
-	int wait;						/* Time before we check media status. */
+		mask:8,				/* The transceiver-present bit in Wn3_Config.*/
+		next:8;				/* The media type to try next. */
+	int wait;			/* Time before we check media status. */
 } media_tbl[] = {
   {	"10baseT",   Media_10TP,0x08, XCVR_10base2, (14*HZ)/10},
   { "10Mbs AUI", Media_SQE, 0x20, XCVR_Default, (1*HZ)/10},
@@ -828,320 +610,316 @@ static struct media_table {
   { "Default",	 0,			0xFF, XCVR_10baseT, 10000},
 };
 
-static int vortex_probe1(struct pci_dev *pdev, long ioaddr, int irq,
-				   int chip_idx, int card_idx);
-static void vortex_up(struct net_device *dev);
-static void vortex_down(struct net_device *dev);
+#if ! defined(CARDBUS) && ! defined(USE_MEM_OPS)
+static int eisa_scan(struct net_device *dev);
+#endif
 static int vortex_open(struct net_device *dev);
+static void set_media_type(struct net_device *dev);
+static void activate_xcvr(struct net_device *dev);
+static void start_operation(struct net_device *dev);
+static void start_operation1(struct net_device *dev);
 static void mdio_sync(long ioaddr, int bits);
-static int mdio_read(struct net_device *dev, int phy_id, int location);
-static void mdio_write(struct net_device *vp, int phy_id, int location, int value);
+static int mdio_read(long ioaddr, int phy_id, int location);
+static void mdio_write(long ioaddr, int phy_id, int location, int value);
 static void vortex_timer(unsigned long arg);
-static void rx_oom_timer(unsigned long arg);
+static void vortex_tx_timeout(struct net_device *dev);
 static int vortex_start_xmit(struct sk_buff *skb, struct net_device *dev);
 static int boomerang_start_xmit(struct sk_buff *skb, struct net_device *dev);
 static int vortex_rx(struct net_device *dev);
 static int boomerang_rx(struct net_device *dev);
 static void vortex_interrupt(int irq, void *dev_id, struct pt_regs *regs);
-static void boomerang_interrupt(int irq, void *dev_id, struct pt_regs *regs);
 static int vortex_close(struct net_device *dev);
-static void dump_tx_ring(struct net_device *dev);
 static void update_stats(long ioaddr, struct net_device *dev);
 static struct net_device_stats *vortex_get_stats(struct net_device *dev);
 static void set_rx_mode(struct net_device *dev);
 static int vortex_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
-static void vortex_tx_timeout(struct net_device *dev);
+#if defined(NO_PCI)
+#define acpi_set_WOL(dev)	do {} while(0);
+#define acpi_wake(pci_dev)	do {} while(0);
+#define acpi_set_pwr_state(pci_dev, state)	do {} while(0);
+#else
 static void acpi_set_WOL(struct net_device *dev);
-static void vorboom_poll(struct net_device *dev);
+#endif
 
-/* This driver uses 'options' to pass the media type, full-duplex flag, etc. */
-/* Option count limit only -- unlimited interfaces are supported. */
-#define MAX_UNITS 8
-static int options[MAX_UNITS] = { -1, -1, -1, -1, -1, -1, -1, -1,};
-static int full_duplex[MAX_UNITS] = {-1, -1, -1, -1, -1, -1, -1, -1};
-static int hw_checksums[MAX_UNITS] = {-1, -1, -1, -1, -1, -1, -1, -1};
-static int flow_ctrl[MAX_UNITS] = {-1, -1, -1, -1, -1, -1, -1, -1};
-static int enable_wol[MAX_UNITS] = {-1, -1, -1, -1, -1, -1, -1, -1};
 
-/* #define dev_alloc_skb dev_alloc_skb_debug */
+/* A list of all installed Vortex devices, for removing the driver module. */
+static struct net_device *root_vortex_dev = NULL;
 
-/* A list of all installed Vortex EISA devices, for removing the driver module. */
-static struct net_device *root_vortex_eisa_dev;
 
-/* Variables to work-around the Compaq PCI BIOS32 problem. */
-static int compaq_ioaddr, compaq_irq, compaq_device_id = 0x5900;
+#if defined(MODULE) && defined(CARDBUS)
 
-static int vortex_cards_found;
+#include <pcmcia/driver_ops.h>
 
-#ifdef CONFIG_PM
-
-static int vortex_suspend (struct pci_dev *pdev, u32 state)
+static dev_node_t *vortex_attach(dev_locator_t *loc)
 {
-	struct net_device *dev = pci_get_drvdata(pdev);
+	u32 io, pci_id;
+	u8 bus, devfn, irq;
+	struct net_device *dev;
+	int chip_idx;
 
-	if (dev && dev->priv) {
-		if (netif_running(dev)) {
-			netif_device_detach(dev);
-			vortex_down(dev);
-		}
+	if (loc->bus != LOC_PCI) return NULL;
+	bus = loc->b.pci.bus; devfn = loc->b.pci.devfn;
+	pcibios_read_config_dword(bus, devfn, PCI_BASE_ADDRESS_0, &io);
+	pcibios_read_config_byte(bus, devfn, PCI_INTERRUPT_LINE, &irq);
+	pcibios_read_config_dword(bus, devfn, PCI_VENDOR_ID, &pci_id);
+	printk(KERN_INFO "vortex_attach(bus %d, function %d, device %8.8x)\n",
+		   bus, devfn, pci_id);
+	io &= ~3;
+	if (io == 0 || irq == 0) {
+		printk(KERN_ERR "The 3Com CardBus Ethernet interface was not "
+			   "assigned an %s.\n" KERN_ERR "  It will not be activated.\n",
+			   io == 0 ? "I/O address" : "IRQ");
+		return NULL;
+	}
+	for (chip_idx = 0; pci_tbl[chip_idx].id.pci; chip_idx++)
+		if ((pci_id & pci_tbl[chip_idx].id.pci_mask) ==
+			pci_tbl[chip_idx].id.pci)
+			break;
+	if (pci_tbl[chip_idx].id.pci == 0) { 		/* Compiled out! */
+		printk(KERN_INFO "Unable to match chip type %8.8x in "
+			   "vortex_attach().\n", pci_id);
+		return NULL;
+	}
+	dev = vortex_probe1(pci_find_slot(bus, devfn), NULL, io, irq, chip_idx, MAX_UNITS+1);
+	if (dev) {
+		dev_node_t *node = kmalloc(sizeof(dev_node_t), GFP_KERNEL);
+		strcpy(node->dev_name, dev->name);
+		node->major = node->minor = 0;
+		node->next = NULL;
+		MOD_INC_USE_COUNT;
+		return node;
+	}
+	return NULL;
+}
+
+static void vortex_detach(dev_node_t *node)
+{
+	struct net_device **devp, **next;
+	printk(KERN_DEBUG "vortex_detach(%s)\n", node->dev_name);
+	for (devp = &root_vortex_dev; *devp; devp = next) {
+		next = &((struct vortex_private *)(*devp)->priv)->next_module;
+		if (strcmp((*devp)->name, node->dev_name) == 0) break;
+	}
+	if (*devp) {
+		struct net_device *dev = *devp;
+		struct vortex_private *vp = dev->priv;
+		if (dev->flags & IFF_UP)
+			dev_close(dev);
+		dev->flags &= ~(IFF_UP|IFF_RUNNING);
+		unregister_netdev(dev);
+		if (vp->cb_fn_base) iounmap(vp->cb_fn_base);
+		kfree(dev);
+		*devp = *next;
+		kfree(vp->priv_addr);
+		kfree(node);
+		MOD_DEC_USE_COUNT;
 	}
-	return 0;
 }
 
-static int vortex_resume (struct pci_dev *pdev)
-{
-	struct net_device *dev = pci_get_drvdata(pdev);
+struct driver_operations vortex_ops = {
+	"3c575_cb", vortex_attach, NULL, NULL, vortex_detach
+};
+
+#endif  /* Old-style Cardbus module support */
+
+#if defined(MODULE) || (LINUX_VERSION_CODE >= 0x020400)
+
+#if ! defined(MODULE)			/* Must be a 2.4 kernel */
+module_init(init_module);
+module_exit(cleanup_module);
+#endif
 
-	if (dev && dev->priv) {
-		if (netif_running(dev)) {
-			vortex_up(dev);
-			netif_device_attach(dev);
-		}
-	}
+int init_module(void)
+{
+	printk(KERN_INFO "%s" KERN_INFO "%s", versionA, versionB);
+#ifdef CARDBUS
+	register_driver(&vortex_ops);
 	return 0;
-}
+#else
+#ifndef USE_MEM_OPS
+	/* This is not quite correct, but both EISA and PCI cards is unlikely. */
+	if (eisa_scan(0) >= 0)
+		return 0;
+#if defined(NO_PCI)
+	return 0;
+#endif
+#endif
 
-#endif /* CONFIG_PM */
+	return pci_drv_register(&vortex_drv_id, NULL);
+#endif
+}
 
-/* returns count found (>= 0), or negative on error */
-static int __init vortex_eisa_init (void)
+#else
+int tc59x_probe(struct net_device *dev)
 {
-	long ioaddr;
-	int rc;
-	int orig_cards_found = vortex_cards_found;
-
-	/* Now check all slots of the EISA bus. */
-	if (!EISA_bus)
-		return 0;
+	int retval = -ENODEV;
 
-	for (ioaddr = 0x1000; ioaddr < 0x9000; ioaddr += 0x1000) {
-		int device_id;
-
-		if (request_region(ioaddr, VORTEX_TOTAL_SIZE, DRV_NAME) == NULL)
-			continue;
+	/* Allow an EISA-only driver. */
+#if ! defined(NO_PCI)
+	if (pci_drv_register(&vortex_drv_id, dev) >= 0) {
+		retval = 0;
+		dev = 0;
+	}
+#endif
+#ifndef USE_MEM_OPS
+	if (eisa_scan(dev) >= 0)
+		retval = 0;
+#endif
+	if (retval >= 0)
+		printk(KERN_INFO "%s" KERN_INFO "%s", versionA, versionB);
+	return retval;
+}
+#endif  /* not MODULE */
 
-		/* Check the standard EISA ID register for an encoded '3Com'. */
-		if (inw(ioaddr + 0xC80) != 0x6d50) {
-			release_region (ioaddr, VORTEX_TOTAL_SIZE);
-			continue;
-		}
+#if ! defined(CARDBUS) && ! defined(USE_MEM_OPS)
+static int eisa_scan(struct net_device *dev)
+{
+	int cards_found = 0;
 
-		/* Check for a product that we support, 3c59{2,7} any rev. */
-		device_id = (inb(ioaddr + 0xC82)<<8) + inb(ioaddr + 0xC83);
-		if ((device_id & 0xFF00) != 0x5900) {
-			release_region (ioaddr, VORTEX_TOTAL_SIZE);
-			continue;
+	/* Check the slots of the EISA bus. */
+	if (EISA_bus) {
+		static long ioaddr = 0x1000;
+		for ( ; ioaddr < 0x9000; ioaddr += 0x1000) {
+			int device_id;
+			if (check_region(ioaddr, VORTEX_SIZE))
+				continue;
+			/* Check the standard EISA ID register for an encoded '3Com'. */
+			if (inw(ioaddr + 0xC80) != 0x6d50)
+				continue;
+			/* Check for a product that we support, 3c59{2,7} any rev. */
+			device_id = (inb(ioaddr + 0xC82)<<8) + inb(ioaddr + 0xC83);
+			if ((device_id & 0xFF00) != 0x5900)
+				continue;
+			vortex_probe1(0, dev, ioaddr, inw(ioaddr + 0xC88) >> 12,
+						  (device_id & 0xfff0) == 0x5970 ? 5 : 4, cards_found);
+			dev = 0;
+			cards_found++;
 		}
-
-		rc = vortex_probe1(NULL, ioaddr, inw(ioaddr + 0xC88) >> 12,
-				   EISA_TBL_OFFSET, vortex_cards_found);
-		if (rc == 0)
-			vortex_cards_found++;
-		else
-			release_region (ioaddr, VORTEX_TOTAL_SIZE);
-	}
-
-	/* Special code to work-around the Compaq PCI BIOS32 problem. */
-	if (compaq_ioaddr) {
-		vortex_probe1(NULL, compaq_ioaddr, compaq_irq,
-					  compaq_device_id, vortex_cards_found++);
 	}
 
-	return vortex_cards_found - orig_cards_found;
+	return cards_found ? 0 : -ENODEV;
 }
+#endif  /* ! Cardbus */
 
-/* returns count (>= 0), or negative on error */
-static int __devinit vortex_init_one (struct pci_dev *pdev,
-				      const struct pci_device_id *ent)
+static int do_eeprom_op(long ioaddr, int ee_cmd)
 {
-	int rc;
+	int timer;
 
-	/* wake up and enable device */		
-	if (pci_enable_device (pdev)) {
-		rc = -EIO;
-	} else {
-		rc = vortex_probe1 (pdev, pci_resource_start (pdev, 0), pdev->irq,
-				    ent->driver_data, vortex_cards_found);
-		if (rc == 0)
-			vortex_cards_found++;
+	outw(ee_cmd, ioaddr + Wn0EepromCmd);
+ 	/* Wait for the read to take place, worst-case 162 us. */
+	for (timer = 1620; timer >= 0; timer--) {
+		if ((inw(ioaddr + Wn0EepromCmd) & 0x8000) == 0)
+			break;
 	}
-	return rc;
+	return inw(ioaddr + Wn0EepromData);
 }
 
-/*
- * Start up the PCI device which is described by *pdev.
- * Return 0 on success.
- *
- * NOTE: pdev can be NULL, for the case of an EISA driver
- */
-static int __devinit vortex_probe1(struct pci_dev *pdev,
-				   long ioaddr, int irq,
-				   int chip_idx, int card_idx)
+static void *vortex_probe1(struct pci_dev *pdev, void *init_dev,
+						   long ioaddr, int irq, int chip_idx, int find_cnt)
 {
+	struct net_device *dev;
 	struct vortex_private *vp;
+	void *priv_mem;
 	int option;
 	unsigned int eeprom[0x40], checksum = 0;		/* EEPROM contents */
-	int i, step;
-	struct net_device *dev;
-	static int printed_version;
-	int retval, print_info;
-	struct vortex_chip_info * const vci = &vortex_info_tbl[chip_idx];
-	char *print_name;
-
-	if (!printed_version) {
-		printk (version);
-		printed_version = 1;
-	}
-
-	print_name = pdev ? pdev->slot_name : "3c59x";
-
-	dev = alloc_etherdev(sizeof(*vp));
-	retval = -ENOMEM;
-	if (!dev) {
-		printk (KERN_ERR PFX "unable to allocate etherdev, aborting\n");
-		goto out;
-	}
-	SET_MODULE_OWNER(dev);
-	vp = dev->priv;
+	int ee_read_cmd;
+	int drv_flags = pci_tbl[chip_idx].drv_flags;
+	int i;
 
-	/* The lower four bits are the media type. */
-	if (dev->mem_start) {
-		/*
-		 * The 'options' param is passed in as the third arg to the
-		 * LILO 'ether=' argument for non-modular use
-		 */
-		option = dev->mem_start;
+	dev = init_etherdev(init_dev, 0);
+	if (!dev)
+		return NULL;
+
+#if ! defined(NO_PCI)
+	/* Check the PCI latency value.  On the 3c590 series the latency timer
+	   must be set to the maximum value to avoid data corruption that occurs
+	   when the timer expires during a transfer.  This bug exists the Vortex
+	   chip only. */
+	if (pdev) {
+		u8 pci_latency;
+		u8 new_latency = (drv_flags & IS_VORTEX) ? 248 : 32;
+
+		pci_read_config_byte(pdev, PCI_LATENCY_TIMER, &pci_latency);
+		if (pci_latency < new_latency) {
+			printk(KERN_INFO "%s: Overriding PCI latency"
+				   " timer (CFLT) setting of %d, new value is %d.\n",
+				   dev->name, pci_latency, new_latency);
+			pci_write_config_byte(pdev, PCI_LATENCY_TIMER, new_latency);
+		}
 	}
-	else if (card_idx < MAX_UNITS)
-		option = options[card_idx];
-	else
-		option = -1;
+#endif
+
+	printk(KERN_INFO "%s: 3Com %s at 0x%lx, ",
+		   dev->name, pci_tbl[chip_idx].name, ioaddr);
 
-	if (option > 0) {
-		if (option & 0x8000)
-			vortex_debug = 7;
-		if (option & 0x4000)
-			vortex_debug = 2;
-		if (option & 0x0400)
-			vp->enable_wol = 1;
-	}
-
-	print_info = (vortex_debug > 1);
-	if (print_info)
-		printk (KERN_INFO "See Documentation/networking/vortex.txt\n");
-
-	printk(KERN_INFO "%s: 3Com %s %s at 0x%lx. Vers " DRV_VERSION "\n",
-	       print_name,
-	       pdev ? "PCI" : "EISA",
-	       vci->name,
-	       ioaddr);
+	/* Make certain elements e.g. descriptor lists are aligned. */
+	priv_mem = kmalloc(sizeof(*vp) + PRIV_ALIGN, GFP_KERNEL);
+	/* Check for the very unlikely case of no memory. */
+	if (priv_mem == NULL) {
+		printk(" INTERFACE MEMORY ALLOCATION FAILURE.\n");
+		return NULL;
+	}
 
 	dev->base_addr = ioaddr;
 	dev->irq = irq;
 	dev->mtu = mtu;
-	vp->drv_flags = vci->drv_flags;
-	vp->has_nway = (vci->drv_flags & HAS_NWAY) ? 1 : 0;
-	vp->io_size = vci->io_size;
-	vp->card_idx = card_idx;
-
-	/* module list only for EISA devices */
-	if (pdev == NULL) {
-		vp->next_module = root_vortex_eisa_dev;
-		root_vortex_eisa_dev = dev;
-	}
 
-	/* PCI-only startup logic */
-	if (pdev) {
-		/* EISA resources already marked, so only PCI needs to do this here */
-		/* Ignore return value, because Cardbus drivers already allocate for us */
-		if (request_region(ioaddr, vci->io_size, print_name) != NULL)
-			vp->must_free_region = 1;
-
-		/* enable bus-mastering if necessary */		
-		if (vci->flags & PCI_USES_MASTER)
-			pci_set_master (pdev);
-
-		if (vci->drv_flags & IS_VORTEX) {
-			u8 pci_latency;
-			u8 new_latency = 248;
-
-			/* Check the PCI latency value.  On the 3c590 series the latency timer
-			   must be set to the maximum value to avoid data corruption that occurs
-			   when the timer expires during a transfer.  This bug exists the Vortex
-			   chip only. */
-			pci_read_config_byte(pdev, PCI_LATENCY_TIMER, &pci_latency);
-			if (pci_latency < new_latency) {
-				printk(KERN_INFO "%s: Overriding PCI latency"
-					" timer (CFLT) setting of %d, new value is %d.\n",
-					print_name, pci_latency, new_latency);
-					pci_write_config_byte(pdev, PCI_LATENCY_TIMER, new_latency);
-			}
-		}
-	}
+	dev->priv = vp = (void *)(((long)priv_mem + PRIV_ALIGN) & ~PRIV_ALIGN);
+	memset(vp, 0, sizeof(*vp));
+	vp->priv_addr = priv_mem;
+
+	vp->next_module = root_vortex_dev;
+	root_vortex_dev = dev;
+
+	vp->chip_id = chip_idx;
+	vp->pci_dev = pdev;
+	vp->drv_flags = drv_flags;
+	vp->msg_level = (1 << debug) - 1;
+	vp->rx_copybreak = rx_copybreak;
+	vp->max_interrupt_work = max_interrupt_work;
+	vp->multicast_filter_limit = multicast_filter_limit;
 
-	spin_lock_init(&vp->lock);
-	spin_lock_init(&vp->mdio_lock);
-	vp->pdev = pdev;
-
-	/* Makes sure rings are at least 16 byte aligned. */
-	vp->rx_ring = pci_alloc_consistent(pdev, sizeof(struct boom_rx_desc) * RX_RING_SIZE
-					   + sizeof(struct boom_tx_desc) * TX_RING_SIZE,
-					   &vp->rx_ring_dma);
-	retval = -ENOMEM;
-	if (vp->rx_ring == 0)
-		goto free_region;
-
-	vp->tx_ring = (struct boom_tx_desc *)(vp->rx_ring + RX_RING_SIZE);
-	vp->tx_ring_dma = vp->rx_ring_dma + sizeof(struct boom_rx_desc) * RX_RING_SIZE;
-
-	/* if we are a PCI driver, we store info in pdev->driver_data
-	 * instead of a module list */	
-	if (pdev)
-		pci_set_drvdata(pdev, dev);
+	/* The lower four bits are the media type. */
+	if (dev->mem_start)
+		option = dev->mem_start;
+	else if (find_cnt < MAX_UNITS)
+		option = options[find_cnt];
+	else
+		option = -1;
 
-	vp->media_override = 7;
 	if (option >= 0) {
 		vp->media_override = ((option & 7) == 2)  ?  0  :  option & 15;
-		if (vp->media_override != 7)
-			vp->medialock = 1;
 		vp->full_duplex = (option & 0x200) ? 1 : 0;
 		vp->bus_master = (option & 16) ? 1 : 0;
+	} else {
+		vp->media_override = 7;
+		vp->full_duplex = 0;
+		vp->bus_master = 0;
 	}
+	if (find_cnt < MAX_UNITS  &&  full_duplex[find_cnt] > 0)
+		vp->full_duplex = 1;
 
-	if (card_idx < MAX_UNITS) {
-		if (full_duplex[card_idx] > 0)
-			vp->full_duplex = 1;
-		if (flow_ctrl[card_idx] > 0)
-			vp->flow_ctrl = 1;
-		if (enable_wol[card_idx] > 0)
-			vp->enable_wol = 1;
-	}
-
-	vp->force_fd = vp->full_duplex;
 	vp->options = option;
+
 	/* Read the station address from the EEPROM. */
 	EL3WINDOW(0);
-	{
-		int base;
-
-		if (vci->drv_flags & EEPROM_8BIT)
-			base = 0x230;
-		else if (vci->drv_flags & EEPROM_OFFSET)
-			base = EEPROM_Read + 0x30;
-		else
-			base = EEPROM_Read;
+	/* Figure out the size and offset of the EEPROM table.
+	   This is complicated by potential discontiguous address bits.  */
 
-		for (i = 0; i < 0x40; i++) {
-			int timer;
-			outw(base + i, ioaddr + Wn0EepromCmd);
-			/* Pause for at least 162 us. for the read to take place. */
-			for (timer = 10; timer >= 0; timer--) {
-				udelay(162);
-				if ((inw(ioaddr + Wn0EepromCmd) & 0x8000) == 0)
-					break;
-			}
-			eeprom[i] = inw(ioaddr + Wn0EepromData);
+	/* Locate the opcode bits, 0xC0 or 0x300. */
+	outw(0x5555, ioaddr + Wn0EepromData);
+	ee_read_cmd = do_eeprom_op(ioaddr, 0x80) == 0x5555  ?  0x200 : 0x80;
+	/* Locate the table base for CardBus cards. */
+	if (do_eeprom_op(ioaddr, ee_read_cmd + 0x37) == 0x6d50)
+		ee_read_cmd += 0x30;
+
+	for (i = 0; i < 0x40; i++) {
+		int cmd_and_addr = ee_read_cmd + i;
+		if (ee_read_cmd == 0xB0) { 		/* Correct for discontinuity. */
+			int offset = 0x30 + i;
+			cmd_and_addr = 0x80 + (offset & 0x3f) + ((offset<<2) & 0x0f00);
 		}
+		eeprom[i] = do_eeprom_op(ioaddr, cmd_and_addr);
 	}
 	for (i = 0; i < 0x18; i++)
 		checksum ^= eeprom[i];
@@ -1151,134 +929,89 @@ static int __devinit vortex_probe1(struc
 			checksum ^= eeprom[i++];
 		checksum = (checksum ^ (checksum >> 8)) & 0xff;
 	}
-	if ((checksum != 0x00) && !(vci->drv_flags & IS_TORNADO))
+	if (checksum != 0x00  &&  !(drv_flags & IS_TORNADO))
 		printk(" ***INVALID CHECKSUM %4.4x*** ", checksum);
+
 	for (i = 0; i < 3; i++)
 		((u16 *)dev->dev_addr)[i] = htons(eeprom[i + 10]);
-	if (print_info) {
-		for (i = 0; i < 6; i++)
-			printk("%c%2.2x", i ? ':' : ' ', dev->dev_addr[i]);
-	}
+	for (i = 0; i < 6; i++)
+		printk("%c%2.2x", i ? ':' : ' ', dev->dev_addr[i]);
 	EL3WINDOW(2);
 	for (i = 0; i < 6; i++)
 		outb(dev->dev_addr[i], ioaddr + i);
 
-#ifdef __sparc__
-	if (print_info)
-		printk(", IRQ %s\n", __irq_itoa(dev->irq));
-#else
-	if (print_info)
-		printk(", IRQ %d\n", dev->irq);
+	printk(", IRQ %d\n", dev->irq);
 	/* Tell them about an invalid IRQ. */
-	if (dev->irq <= 0 || dev->irq >= NR_IRQS)
+	if (dev->irq <= 0)
 		printk(KERN_WARNING " *** Warning: IRQ %d is unlikely to work! ***\n",
 			   dev->irq);
-#endif
-
-	EL3WINDOW(4);
-	step = (inb(ioaddr + Wn4_NetDiag) & 0x1e) >> 1;
-	if (print_info) {
-		printk(KERN_INFO "  product code %02x%02x rev %02x.%d date %02d-"
-			"%02d-%02d\n", eeprom[6]&0xff, eeprom[6]>>8, eeprom[0x14],
-			step, (eeprom[4]>>5) & 15, eeprom[4] & 31, eeprom[4]>>9);
-	}
-
 
-	if (pdev && vci->drv_flags & HAS_CB_FNS) {
-		unsigned long fn_st_addr;			/* Cardbus function status space */
-		unsigned short n;
-
-		fn_st_addr = pci_resource_start (pdev, 2);
-		if (fn_st_addr) {
-			vp->cb_fn_base = ioremap(fn_st_addr, 128);
-			retval = -ENOMEM;
-			if (!vp->cb_fn_base)
-				goto free_ring;
-		}
-		if (print_info) {
-			printk(KERN_INFO "%s: CardBus functions mapped %8.8lx->%p\n",
-				print_name, fn_st_addr, vp->cb_fn_base);
-		}
-		EL3WINDOW(2);
-
-		n = inw(ioaddr + Wn2_ResetOptions) & ~0x4010;
-		if (vp->drv_flags & INVERT_LED_PWR)
-			n |= 0x10;
-		if (vp->drv_flags & INVERT_MII_PWR)
-			n |= 0x4000;
-		outw(n, ioaddr + Wn2_ResetOptions);
+#if ! defined(NO_PCI)
+	if (drv_flags & HAS_CB_FNS) {
+		u32 fn_st_addr;			/* Cardbus function status space */
+		pci_read_config_dword(pdev, PCI_BASE_ADDRESS_2, &fn_st_addr);
+		if (fn_st_addr)
+			vp->cb_fn_base = ioremap(fn_st_addr & ~3, 128);
+		printk(KERN_INFO "%s: CardBus functions mapped %8.8x->%p.\n",
+			   dev->name, fn_st_addr, vp->cb_fn_base);
 	}
+#endif
 
 	/* Extract our information from the EEPROM data. */
 	vp->info1 = eeprom[13];
 	vp->info2 = eeprom[15];
 	vp->capabilities = eeprom[16];
 
-	if (vp->info1 & 0x8000) {
+	if (vp->info1 & 0x8000)
 		vp->full_duplex = 1;
-		if (print_info)
-			printk(KERN_INFO "Full duplex capable\n");
-	}
+	if (vp->full_duplex)
+		vp->medialock = 1;
+
+	/* Turn on the transceiver. */
+	activate_xcvr(dev);
 
 	{
-		static const char * ram_split[] = {"5:3", "3:1", "1:1", "3:5"};
-		unsigned int config;
+		char *ram_split[] = {"5:3", "3:1", "1:1", "3:5"};
+		int i_cfg;
 		EL3WINDOW(3);
 		vp->available_media = inw(ioaddr + Wn3_Options);
 		if ((vp->available_media & 0xff) == 0)		/* Broken 3c916 */
 			vp->available_media = 0x40;
-		config = inl(ioaddr + Wn3_Config);
-		if (print_info) {
-			printk(KERN_DEBUG "  Internal config register is %4.4x, "
-				   "transceivers %#x.\n", config, inw(ioaddr + Wn3_Options));
-			printk(KERN_INFO "  %dK %s-wide RAM %s Rx:Tx split, %s%s interface.\n",
-				   8 << RAM_SIZE(config),
-				   RAM_WIDTH(config) ? "word" : "byte",
-				   ram_split[RAM_SPLIT(config)],
-				   AUTOSELECT(config) ? "autoselect/" : "",
-				   XCVR(config) > XCVR_ExtMII ? "<invalid transceiver>" :
-				   media_tbl[XCVR(config)].name);
-		}
-		vp->default_media = XCVR(config);
-		if (vp->default_media == XCVR_NWAY)
-			vp->has_nway = 1;
-		vp->autoselect = AUTOSELECT(config);
+		i_cfg = inl(ioaddr + Wn3_Config); /* Internal Configuration */
+		vp->default_media = (i_cfg >> 20) & 15;
+		if (vp->msg_level & NETIF_MSG_LINK)
+			printk(KERN_DEBUG "  Internal config register is %8.8x, "
+				   "transceivers %#x.\n", i_cfg, inw(ioaddr + Wn3_Options));
+		printk(KERN_INFO "  %dK buffer %s Rx:Tx split, %s%s interface.\n",
+			   8 << (i_cfg & 7),
+			   ram_split[(i_cfg >> 16) & 3],
+			   i_cfg & 0x01000000 ? "autoselect/" : "",
+			   vp->default_media > XCVR_ExtMII ? "<invalid transceiver>" :
+			   media_tbl[vp->default_media].name);
+		vp->autoselect = i_cfg & 0x01000000 ? 1 : 0;
 	}
 
 	if (vp->media_override != 7) {
-		printk(KERN_INFO "%s:  Media override to transceiver type %d (%s).\n",
-				print_name, vp->media_override,
-				media_tbl[vp->media_override].name);
+		printk(KERN_INFO "  Media override to transceiver type %d (%s).\n",
+			   vp->media_override, media_tbl[vp->media_override].name);
 		dev->if_port = vp->media_override;
 	} else
 		dev->if_port = vp->default_media;
 
-	if (dev->if_port == XCVR_MII || dev->if_port == XCVR_NWAY) {
+	if ((vp->available_media & 0x41) || (drv_flags & HAS_NWAY) ||
+		dev->if_port == XCVR_MII || dev->if_port == XCVR_NWAY) {
 		int phy, phy_idx = 0;
 		EL3WINDOW(4);
 		mii_preamble_required++;
-		mii_preamble_required++;
-		mdio_read(dev, 24, 1);
-		for (phy = 0; phy < 32 && phy_idx < 1; phy++) {
-			int mii_status, phyx;
-
-			/*
-			 * For the 3c905CX we look at index 24 first, because it bogusly
-			 * reports an external PHY at all indices
-			 */
-			if (phy == 0)
-				phyx = 24;
-			else if (phy <= 24)
-				phyx = phy - 1;
-			else
-				phyx = phy;
-			mii_status = mdio_read(dev, phyx, 1);
-			if (mii_status  &&  mii_status != 0xffff) {
+		mdio_sync(ioaddr, 32);
+		mdio_read(ioaddr, 24, 1);
+		for (phy = 1; phy <= 32 && phy_idx < sizeof(vp->phys); phy++) {
+			int mii_status, phyx = phy & 0x1f;
+			mii_status = mdio_read(ioaddr, phyx, 1);
+			if ((mii_status & 0xf800)  &&  mii_status != 0xffff) {
 				vp->phys[phy_idx++] = phyx;
-				if (print_info) {
-					printk(KERN_INFO "  MII transceiver found at address %d,"
-						" status %4x.\n", phyx, mii_status);
-				}
+				printk(KERN_INFO "  MII transceiver found at address %d,"
+					   " status %4x.\n", phyx, mii_status);
 				if ((mii_status & 0x0040) == 0)
 					mii_preamble_required++;
 			}
@@ -1288,240 +1021,108 @@ static int __devinit vortex_probe1(struc
 			printk(KERN_WARNING"  ***WARNING*** No MII transceivers found!\n");
 			vp->phys[0] = 24;
 		} else {
-			vp->advertising = mdio_read(dev, vp->phys[0], 4);
+			if (mii_preamble_required == 0  &&
+				mdio_read(ioaddr, vp->phys[0], 1) == 0) {
+				printk(KERN_INFO "%s:  MII transceiver has preamble bug.\n",
+					   dev->name);
+				mii_preamble_required = 1;
+			}
+			vp->advertising = mdio_read(ioaddr, vp->phys[0], 4);
 			if (vp->full_duplex) {
 				/* Only advertise the FD media types. */
 				vp->advertising &= ~0x02A0;
-				mdio_write(dev, vp->phys[0], 4, vp->advertising);
+				mdio_write(ioaddr, vp->phys[0], 4, vp->advertising);
 			}
 		}
+	} else {
+		/* We will emulate MII management. */
+		vp->phys[0] = 32;
 	}
 
 	if (vp->capabilities & CapBusMaster) {
 		vp->full_bus_master_tx = 1;
-		if (print_info) {
-			printk(KERN_INFO "  Enabling bus-master transmits and %s receives.\n",
-			(vp->info2 & 1) ? "early" : "whole-frame" );
-		}
+		printk(KERN_INFO"  Using bus-master transmits and %s receives.\n",
+			   (vp->info2 & 1) ? "early" : "whole-frame" );
 		vp->full_bus_master_rx = (vp->info2 & 1) ? 1 : 2;
-		vp->bus_master = 0;		/* AKPM: vortex only */
-	}
-
-	/* The 3c59x-specific entries in the device structure. */
-	dev->open = vortex_open;
-	if (vp->full_bus_master_tx) {
-		dev->hard_start_xmit = boomerang_start_xmit;
-		/* Actually, it still should work with iommu. */
-		dev->features |= NETIF_F_SG;
-		if (((hw_checksums[card_idx] == -1) && (vp->drv_flags & HAS_HWCKSM)) ||
-					(hw_checksums[card_idx] == 1)) {
-				dev->features |= NETIF_F_IP_CSUM;
-		}
-	} else {
-		dev->hard_start_xmit = vortex_start_xmit;
 	}
 
-	if (print_info) {
-		printk(KERN_INFO "%s: scatter/gather %sabled. h/w checksums %sabled\n",
-				print_name,
-				(dev->features & NETIF_F_SG) ? "en":"dis",
-				(dev->features & NETIF_F_IP_CSUM) ? "en":"dis");
-	}
-
-	dev->stop = vortex_close;
-	dev->get_stats = vortex_get_stats;
-	dev->do_ioctl = vortex_ioctl;
-	dev->set_multicast_list = set_rx_mode;
-	dev->tx_timeout = vortex_tx_timeout;
-	dev->watchdog_timeo = (watchdog * HZ) / 1000;
-#ifdef HAVE_POLL_CONTROLLER
-	dev->poll_controller = &vorboom_poll;
-#endif
-	if (pdev && vp->enable_wol) {
-		vp->pm_state_valid = 1;
- 		pci_save_state(vp->pdev, vp->power_state);
- 		acpi_set_WOL(dev);
-	}
-	retval = register_netdev(dev);
-	if (retval == 0)
-		return 0;
-
-free_ring:
-	pci_free_consistent(pdev,
-						sizeof(struct boom_rx_desc) * RX_RING_SIZE
-							+ sizeof(struct boom_tx_desc) * TX_RING_SIZE,
-						vp->rx_ring,
-						vp->rx_ring_dma);
-free_region:
-	if (vp->must_free_region)
-		release_region(ioaddr, vci->io_size);
-	kfree (dev);
-	printk(KERN_ERR PFX "vortex_probe1 fails.  Returns %d\n", retval);
-out:
-	return retval;
-}
+	/* We do a request_region() to register /proc/ioports info. */
+	request_region(ioaddr, pci_tbl[chip_idx].io_size, dev->name);
 
-static void
-issue_and_wait(struct net_device *dev, int cmd)
-{
-	int i;
+	/* The 3c59x-specific entries in the device structure. */
+	dev->open = &vortex_open;
+	dev->hard_start_xmit = &vortex_start_xmit;
+	dev->stop = &vortex_close;
+	dev->get_stats = &vortex_get_stats;
+	dev->do_ioctl = &vortex_ioctl;
+	dev->set_multicast_list = &set_rx_mode;
 
-	outw(cmd, dev->base_addr + EL3_CMD);
-	for (i = 0; i < 2000; i++) {
-		if (!(inw(dev->base_addr + EL3_STATUS) & CmdInProgress))
-			return;
-	}
-
-	/* OK, that didn't work.  Do it the slow way.  One second */
-	for (i = 0; i < 100000; i++) {
-		if (!(inw(dev->base_addr + EL3_STATUS) & CmdInProgress)) {
-			if (vortex_debug > 1)
-				printk(KERN_INFO "%s: command 0x%04x took %d usecs\n",
-					   dev->name, cmd, i * 10);
-			return;
-		}
-		udelay(10);
-	}
-	printk(KERN_ERR "%s: command 0x%04x did not complete! Status=0x%x\n",
-			   dev->name, cmd, inw(dev->base_addr + EL3_STATUS));
+	return dev;
 }
 
-static void
-vortex_up(struct net_device *dev)
+
+static int vortex_open(struct net_device *dev)
 {
-	long ioaddr = dev->base_addr;
 	struct vortex_private *vp = (struct vortex_private *)dev->priv;
-	unsigned int config;
+	long ioaddr = dev->base_addr;
 	int i;
 
-	if (vp->pdev && vp->enable_wol) {
-		pci_set_power_state(vp->pdev, 0);	/* Go active */
-		pci_restore_state(vp->pdev, vp->power_state);
-	}
+	MOD_INC_USE_COUNT;
 
-	/* Before initializing select the active media port. */
-	EL3WINDOW(3);
-	config = inl(ioaddr + Wn3_Config);
+	acpi_wake(vp->pci_dev);
+	vp->window_lock = SPIN_LOCK_UNLOCKED;
+	activate_xcvr(dev);
 
+	/* Before initializing select the active media port. */
 	if (vp->media_override != 7) {
-		printk(KERN_INFO "%s: Media override to transceiver %d (%s).\n",
-			   dev->name, vp->media_override,
-			   media_tbl[vp->media_override].name);
+		if (vp->msg_level & NETIF_MSG_LINK)
+			printk(KERN_INFO "%s: Media override to transceiver %d (%s).\n",
+				   dev->name, vp->media_override,
+				   media_tbl[vp->media_override].name);
 		dev->if_port = vp->media_override;
 	} else if (vp->autoselect) {
-		if (vp->has_nway) {
-			if (vortex_debug > 1)
-				printk(KERN_INFO "%s: using NWAY device table, not %d\n",
-								dev->name, dev->if_port);
+		if (vp->drv_flags & HAS_NWAY)
 			dev->if_port = XCVR_NWAY;
-		} else {
+		else {
 			/* Find first available media type, starting with 100baseTx. */
 			dev->if_port = XCVR_100baseTx;
 			while (! (vp->available_media & media_tbl[dev->if_port].mask))
 				dev->if_port = media_tbl[dev->if_port].next;
-			if (vortex_debug > 1)
-				printk(KERN_INFO "%s: first available media type: %s\n",
-					dev->name, media_tbl[dev->if_port].name);
 		}
-	} else {
+	} else
 		dev->if_port = vp->default_media;
-		if (vortex_debug > 1)
-			printk(KERN_INFO "%s: using default media %s\n",
-				dev->name, media_tbl[dev->if_port].name);
-	}
-
-	init_timer(&vp->timer);
-	vp->timer.expires = RUN_AT(media_tbl[dev->if_port].wait);
-	vp->timer.data = (unsigned long)dev;
-	vp->timer.function = vortex_timer;		/* timer handler */
-	add_timer(&vp->timer);
 
-	init_timer(&vp->rx_oom_timer);
-	vp->rx_oom_timer.data = (unsigned long)dev;
-	vp->rx_oom_timer.function = rx_oom_timer;
-
-	if (vortex_debug > 1)
-		printk(KERN_DEBUG "%s: Initial media type %s.\n",
-			   dev->name, media_tbl[dev->if_port].name);
-
-	vp->full_duplex = vp->force_fd;
-	config = BFINS(config, dev->if_port, 20, 4);
-	if (vortex_debug > 6)
-		printk(KERN_DEBUG "vortex_up(): writing 0x%x to InternalConfig\n", config);
-	outl(config, ioaddr + Wn3_Config);
+	if (! vp->medialock)
+		vp->full_duplex = 0;
 
-	if (dev->if_port == XCVR_MII || dev->if_port == XCVR_NWAY) {
-		int mii_reg1, mii_reg5;
-		EL3WINDOW(4);
-		/* Read BMSR (reg1) only to clear old status. */
-		mii_reg1 = mdio_read(dev, vp->phys[0], 1);
-		mii_reg5 = mdio_read(dev, vp->phys[0], 5);
-		if (mii_reg5 == 0xffff  ||  mii_reg5 == 0x0000) {
-			netif_carrier_off(dev); /* No MII device or no link partner report */
-		} else {
-			if ((mii_reg5 & 0x0100) != 0	/* 100baseTx-FD */
-				 || (mii_reg5 & 0x00C0) == 0x0040) /* 10T-FD, but not 100-HD */
-				vp->full_duplex = 1;
-			netif_carrier_on(dev);
-		}
-		vp->partner_flow_ctrl = ((mii_reg5 & 0x0400) != 0);
-		if (vortex_debug > 1)
-			printk(KERN_INFO "%s: MII #%d status %4.4x, link partner capability %4.4x,"
-				   " info1 %04x, setting %s-duplex.\n",
-					dev->name, vp->phys[0],
-					mii_reg1, mii_reg5,
-					vp->info1, ((vp->info1 & 0x8000) || vp->full_duplex) ? "full" : "half");
-		EL3WINDOW(3);
-	}
+	vp->status_enable = SetStatusEnb | HostError|IntReq|StatsFull|TxComplete|
+		(vp->full_bus_master_tx ? DownComplete : TxAvailable) |
+		(vp->full_bus_master_rx ? UpComplete : RxComplete) |
+		(vp->bus_master ? DMADone : 0);
+	vp->intr_enable = SetIntrEnb | IntLatch | TxAvailable | RxComplete |
+		StatsFull | HostError | TxComplete | IntReq
+		| (vp->bus_master ? DMADone : 0) | UpComplete | DownComplete;
 
-	/* Set the full-duplex bit. */
-	outw(	((vp->info1 & 0x8000) || vp->full_duplex ? 0x20 : 0) |
-		 	(dev->mtu > 1500 ? 0x40 : 0) |
-			((vp->full_duplex && vp->flow_ctrl && vp->partner_flow_ctrl) ? 0x100 : 0),
-			ioaddr + Wn3_MAC_Ctrl);
-
-	if (vortex_debug > 1) {
-		printk(KERN_DEBUG "%s: vortex_up() InternalConfig %8.8x.\n",
-			dev->name, config);
-	}
-
-	issue_and_wait(dev, TxReset);
-	/*
-	 * Don't reset the PHY - that upsets autonegotiation during DHCP operations.
-	 */
-	issue_and_wait(dev, RxReset|0x04);
+	if (vp->msg_level & NETIF_MSG_LINK)
+		printk(KERN_DEBUG "%s: Initial media type %s %s-duplex.\n",
+			   dev->name, media_tbl[dev->if_port].name,
+			   vp->full_duplex ? "full":"half");
 
-	outw(SetStatusEnb | 0x00, ioaddr + EL3_CMD);
+	set_media_type(dev);
+	start_operation(dev);
 
-	if (vortex_debug > 1) {
-		EL3WINDOW(4);
-		printk(KERN_DEBUG "%s: vortex_up() irq %d media status %4.4x.\n",
-			   dev->name, dev->irq, inw(ioaddr + Wn4_Media));
+	/* Use the now-standard shared IRQ implementation. */
+	if (request_irq(dev->irq, &vortex_interrupt, SA_SHIRQ, dev->name, dev)) {
+		MOD_DEC_USE_COUNT;
+		return -EAGAIN;
 	}
 
-	/* Set the station address and mask in window 2 each time opened. */
-	EL3WINDOW(2);
-	for (i = 0; i < 6; i++)
-		outb(dev->dev_addr[i], ioaddr + i);
-	for (; i < 12; i+=2)
-		outw(0, ioaddr + i);
-
-	if (vp->cb_fn_base) {
-		unsigned short n = inw(ioaddr + Wn2_ResetOptions) & ~0x4010;
-		if (vp->drv_flags & INVERT_LED_PWR)
-			n |= 0x10;
-		if (vp->drv_flags & INVERT_MII_PWR)
-			n |= 0x4000;
-		outw(n, ioaddr + Wn2_ResetOptions);
-	}
+	spin_lock(&vp->window_lock);
 
-	if (dev->if_port == XCVR_10base2)
-		/* Start the thinnet transceiver. We should really wait 50ms...*/
-		outw(StartCoax, ioaddr + EL3_CMD);
-	if (dev->if_port != XCVR_NWAY) {
+	if (vp->msg_level & NETIF_MSG_IFUP) {
 		EL3WINDOW(4);
-		outw((inw(ioaddr + Wn4_Media) & ~(Media_10TP|Media_SQE)) |
-			 media_tbl[dev->if_port].media_bits, ioaddr + Wn4_Media);
+		printk(KERN_DEBUG "%s: vortex_open() irq %d media status %4.4x.\n",
+			   dev->name, dev->irq, inw(ioaddr + Wn4_Media));
 	}
 
 	/* Switch to the stats window, and clear all stats by reading. */
@@ -1539,126 +1140,275 @@ vortex_up(struct net_device *dev)
 
 	/* Switch to register set 7 for normal use. */
 	EL3WINDOW(7);
+#if defined(CONFIG_VLAN)
+	/* If this value is set no MTU adjustment is needed for 802.1Q. */
+	outw(0x8100, ioaddr + Wn7_VLAN_EtherType);
+#endif
+	spin_unlock(&vp->window_lock);
 
 	if (vp->full_bus_master_rx) { /* Boomerang bus master. */
 		vp->cur_rx = vp->dirty_rx = 0;
+		/* Use 1518/+18 if the CRC is transferred. */
+		vp->rx_buf_sz = dev->mtu + 14;
+		if (vp->rx_buf_sz < PKT_BUF_SZ)
+			vp->rx_buf_sz = PKT_BUF_SZ;
+
 		/* Initialize the RxEarly register as recommended. */
 		outw(SetRxThreshold + (1536>>2), ioaddr + EL3_CMD);
 		outl(0x0020, ioaddr + PktStatus);
-		outl(vp->rx_ring_dma, ioaddr + UpListPtr);
-	}
-	if (vp->full_bus_master_tx) { 		/* Boomerang bus master Tx. */
-		vp->cur_tx = vp->dirty_tx = 0;
-		if (vp->drv_flags & IS_BOOMERANG)
-			outb(PKT_BUF_SZ>>8, ioaddr + TxFreeThreshold); /* Room for a packet. */
-		/* Clear the Rx, Tx rings. */
-		for (i = 0; i < RX_RING_SIZE; i++)	/* AKPM: this is done in vortex_open, too */
+		for (i = 0; i < RX_RING_SIZE; i++) {
+			vp->rx_ring[i].length = cpu_to_le32(vp->rx_buf_sz | LAST_FRAG);
 			vp->rx_ring[i].status = 0;
-		for (i = 0; i < TX_RING_SIZE; i++)
-			vp->tx_skbuff[i] = 0;
-		outl(0, ioaddr + DownListPtr);
-	}
-	/* Set receiver mode: presumably accept b-case and phys addr only. */
+			vp->rx_ring[i].next = virt_to_le32desc(&vp->rx_ring[i+1]);
+			vp->rx_skbuff[i] = 0;
+		}
+		/* Wrap the ring. */
+		vp->rx_head_desc = &vp->rx_ring[0];
+		vp->rx_ring[i-1].next = virt_to_le32desc(&vp->rx_ring[0]);
+
+		for (i = 0; i < RX_RING_SIZE; i++) {
+			struct sk_buff *skb = dev_alloc_skb(vp->rx_buf_sz);
+			vp->rx_skbuff[i] = skb;
+			if (skb == NULL)
+				break;			/* Bad news!  */
+			skb->dev = dev;			/* Mark as being used by this device. */
+			skb_reserve(skb, 2);	/* Align IP on 16 byte boundaries */
+			vp->rx_ring[i].addr = virt_to_le32desc(skb->tail);
+		}
+		outl(virt_to_bus(vp->rx_head_desc), ioaddr + UpListPtr);
+	}
+	if (vp->full_bus_master_tx) { 		/* Boomerang bus master Tx. */
+		dev->hard_start_xmit = &boomerang_start_xmit;
+		vp->cur_tx = vp->dirty_tx = 0;
+		vp->tx_desc_tail = &vp->tx_ring[TX_RING_SIZE - 1];
+		if (vp->drv_flags & IS_BOOMERANG) {
+			/* Room for a packet, to avoid long DownStall delays. */
+			outb(PKT_BUF_SZ>>8, ioaddr + TxFreeThreshold);
+		} else if (vp->drv_flags & HAS_V2_TX)
+			outb(20, ioaddr + DownPollRate);
+
+		/* Clear the Tx ring. */
+		for (i = 0; i < TX_RING_SIZE; i++)
+			vp->tx_skbuff[i] = 0;
+		outl(0, ioaddr + DownListPtr);
+		vp->tx_full = 0;
+		vp->restart_tx = 1;
+	}
+	/* The multicast filter is an ill-considered, write-only design.
+	   The semantics are not documented, so we assume but do not rely
+	   on the table being cleared with an RxReset.
+	   Here we do an explicit clear of the largest known table.
+	*/
+	if (vp->drv_flags & HAS_V2_TX)
+		for (i = 0; i < 0x100; i++)
+			outw(SetFilterBit | i, ioaddr + EL3_CMD);
+	memset(vp->mc_filter, 0, sizeof vp->mc_filter);
+
+	/* Set receiver mode: presumably accept b-case and phys addr only. */
+	vp->rx_mode = 0;
 	set_rx_mode(dev);
-	outw(StatsEnable, ioaddr + EL3_CMD); /* Turn on statistics. */
 
-//	issue_and_wait(dev, SetTxStart|0x07ff);
-	outw(RxEnable, ioaddr + EL3_CMD); /* Enable the receiver. */
-	outw(TxEnable, ioaddr + EL3_CMD); /* Enable transmitter. */
-	/* Allow status bits to be seen. */
-	vp->status_enable = SetStatusEnb | HostError|IntReq|StatsFull|TxComplete|
-		(vp->full_bus_master_tx ? DownComplete : TxAvailable) |
-		(vp->full_bus_master_rx ? UpComplete : RxComplete) |
-		(vp->bus_master ? DMADone : 0);
-	vp->intr_enable = SetIntrEnb | IntLatch | TxAvailable |
-		(vp->full_bus_master_rx ? 0 : RxComplete) |
-		StatsFull | HostError | TxComplete | IntReq
-		| (vp->bus_master ? DMADone : 0) | UpComplete | DownComplete;
-	outw(vp->status_enable, ioaddr + EL3_CMD);
-	/* Ack all pending events, and set active indicator mask. */
-	outw(AckIntr | IntLatch | TxAvailable | RxEarly | IntReq,
-		 ioaddr + EL3_CMD);
-	outw(vp->intr_enable, ioaddr + EL3_CMD);
-	if (vp->cb_fn_base)			/* The PCMCIA people are idiots.  */
-		writel(0x8000, vp->cb_fn_base + 4);
-	netif_start_queue (dev);
+	start_operation1(dev);
+
+	init_timer(&vp->timer);
+	vp->timer.expires = jiffies + media_tbl[dev->if_port].wait;
+	vp->timer.data = (unsigned long)dev;
+	vp->timer.function = &vortex_timer;		/* timer handler */
+	add_timer(&vp->timer);
+
+	return 0;
 }
 
-static int
-vortex_open(struct net_device *dev)
+static void set_media_type(struct net_device *dev)
 {
 	struct vortex_private *vp = (struct vortex_private *)dev->priv;
-	int i;
-	int retval;
+	long ioaddr = dev->base_addr;
+	int i_cfg;
 
-	/* Use the now-standard shared IRQ implementation. */
-	if ((retval = request_irq(dev->irq, vp->full_bus_master_rx ?
-				&boomerang_interrupt : &vortex_interrupt, SA_SHIRQ, dev->name, dev))) {
-		printk(KERN_ERR "%s: Could not reserve IRQ %d\n", dev->name, dev->irq);
-		goto out;
+	EL3WINDOW(3);
+	i_cfg = inl(ioaddr + Wn3_Config);
+	i_cfg &= ~0x00f00000;
+	if (vp->drv_flags & HAS_NWAY)
+		outl(i_cfg | 0x00800000, ioaddr + Wn3_Config);
+	else
+		outl(i_cfg | (dev->if_port << 20), ioaddr + Wn3_Config);
+
+	if (dev->if_port == XCVR_MII || dev->if_port == XCVR_NWAY) {
+		int mii_reg1, mii_reg5;
+		EL3WINDOW(4);
+		/* Read BMSR (reg1) only to clear old status. */
+		mii_reg1 = mdio_read(ioaddr, vp->phys[0], 1);
+		mii_reg5 = mdio_read(ioaddr, vp->phys[0], 5);
+		if (mii_reg5 == 0xffff  ||  mii_reg5 == 0x0000)
+			;					/* No MII device or no link partner report */
+		else if ((mii_reg5 & 0x0100) != 0	/* 100baseTx-FD */
+				 || (mii_reg5 & 0x00C0) == 0x0040) /* 10T-FD, but not 100-HD */
+			vp->full_duplex = 1;
+		if (vp->msg_level & NETIF_MSG_LINK)
+			printk(KERN_INFO "%s: MII #%d status %4.4x, link partner capability %4.4x,"
+				   " setting %s-duplex.\n", dev->name, vp->phys[0],
+				   mii_reg1, mii_reg5, vp->full_duplex ? "full" : "half");
+		EL3WINDOW(3);
 	}
+	if (dev->if_port == XCVR_10base2)
+		/* Start the thinnet transceiver. We should really wait 50ms...*/
+		outw(StartCoax, ioaddr + EL3_CMD);
+	EL3WINDOW(4);
+	if (dev->if_port != XCVR_NWAY) {
+		outw((inw(ioaddr + Wn4_Media) & ~(Media_10TP|Media_SQE)) |
+			 media_tbl[dev->if_port].media_bits, ioaddr + Wn4_Media);
+	}
+	/* Do we require link beat to transmit? */
+	if (vp->info1 & 0x4000)
+		outw(inw(ioaddr + Wn4_Media) & ~Media_Lnk, ioaddr + Wn4_Media);
 
-	if (vp->full_bus_master_rx) { /* Boomerang bus master. */
-		if (vortex_debug > 2)
-			printk(KERN_DEBUG "%s:  Filling in the Rx ring.\n", dev->name);
-		for (i = 0; i < RX_RING_SIZE; i++) {
-			struct sk_buff *skb;
-			vp->rx_ring[i].next = cpu_to_le32(vp->rx_ring_dma + sizeof(struct boom_rx_desc) * (i+1));
-			vp->rx_ring[i].status = 0;	/* Clear complete bit. */
-			vp->rx_ring[i].length = cpu_to_le32(PKT_BUF_SZ | LAST_FRAG);
-			skb = dev_alloc_skb(PKT_BUF_SZ);
-			vp->rx_skbuff[i] = skb;
-			if (skb == NULL)
-				break;			/* Bad news!  */
-			skb->dev = dev;			/* Mark as being used by this device. */
-			skb_reserve(skb, 2);	/* Align IP on 16 byte boundaries */
-			vp->rx_ring[i].addr = cpu_to_le32(pci_map_single(vp->pdev, skb->tail, PKT_BUF_SZ, PCI_DMA_FROMDEVICE));
-		}
-		if (i != RX_RING_SIZE) {
-			int j;
-			printk(KERN_EMERG "%s: no memory for rx ring\n", dev->name);
-			for (j = 0; j < i; j++) {
-				if (vp->rx_skbuff[j]) {
-					dev_kfree_skb(vp->rx_skbuff[j]);
-					vp->rx_skbuff[j] = 0;
-				}
-			}
-			retval = -ENOMEM;
-			goto out_free_irq;
+	/* Set the full-duplex and oversized frame bits. */
+	EL3WINDOW(3);
+
+	vp->wn3_mac_ctrl = vp->full_duplex ? 0x0120 : 0;
+	if (dev->mtu > 1500)
+		vp->wn3_mac_ctrl |= (dev->mtu == 1504  ?  0x0400 : 0x0040);
+	outb(vp->wn3_mac_ctrl, ioaddr + Wn3_MAC_Ctrl);
+
+	if (vp->drv_flags & HAS_V2_TX)
+		outw(dev->mtu + 14, ioaddr + Wn3_MaxPktSize);
+}
+
+static void activate_xcvr(struct net_device *dev)
+{
+	struct vortex_private *vp = (struct vortex_private *)dev->priv;
+	long ioaddr = dev->base_addr;
+	int reset_opts;
+
+	/* Correct some magic bits. */
+	EL3WINDOW(2);
+	reset_opts = inw(ioaddr + Wn2_ResetOptions);
+	if (vp->drv_flags & INVERT_LED_PWR)
+		reset_opts |= 0x0010;
+	if (vp->drv_flags & MII_XCVR_PWR)
+		reset_opts |= 0x4000;
+	outw(reset_opts, ioaddr + Wn2_ResetOptions);
+	if (vp->drv_flags & WN0_XCVR_PWR) {
+		EL3WINDOW(0);
+		outw(0x0900, ioaddr);
+	}
+}
+
+static void start_operation(struct net_device *dev)
+{
+	struct vortex_private *vp = (struct vortex_private *)dev->priv;
+	long ioaddr = dev->base_addr;
+	int i;
+
+	outw(TxReset, ioaddr + EL3_CMD);
+	for (i = 2000; i >= 0 ; i--)
+		if ( ! (inw(ioaddr + EL3_STATUS) & CmdInProgress))
+			break;
+
+	outw(RxReset | 0x04, ioaddr + EL3_CMD);
+	/* Assume this cleared the filter. */
+	memset(vp->mc_filter, 0, sizeof vp->mc_filter);
+
+	/* Wait a few ticks for the RxReset command to complete. */
+	for (i = 0; i < 200000; i++)
+		if ( ! (inw(ioaddr + EL3_STATUS) & CmdInProgress))
+			break;
+	if (i >= 200  &&  (vp->msg_level & NETIF_MSG_DRV))
+		printk(KERN_DEBUG "%s: Rx Reset took an unexpectedly long time"
+			   " to finish, %d ticks.\n",
+			   dev->name, i);
+
+	outw(SetStatusEnb | 0x00, ioaddr + EL3_CMD);
+	/* Handle VLANs and jumbo frames. */
+	if ((vp->drv_flags & HAS_V2_TX) && dev->mtu > 1500) {
+		EL3WINDOW(3);
+		outw(dev->mtu + 14, ioaddr + Wn3_MaxPktSize);
+		if (dev->mtu > 2033) {
+			outl(inl(ioaddr + Wn3_Config) | 0x0000C000, ioaddr + Wn3_Config);
+			outw(SetTxStart + (2000>>2), ioaddr + EL3_CMD);
 		}
-		/* Wrap the ring. */
-		vp->rx_ring[i-1].next = cpu_to_le32(vp->rx_ring_dma);
 	}
+	/* Reset the station address and mask. */
+	EL3WINDOW(2);
+	for (i = 0; i < 6; i++)
+		outb(dev->dev_addr[i], ioaddr + i);
+	for (; i < 12; i+=2)
+		outw(0, ioaddr + i);
+	if (vp->drv_flags & IS_BOOMERANG) {
+		/* Room for a packet, to avoid long DownStall delays. */
+		outb(PKT_BUF_SZ>>8, ioaddr + TxFreeThreshold);
+	} else if (vp->drv_flags & HAS_V2_TX) {
+		outb(20, ioaddr + DownPollRate);
+		vp->restart_tx = 1;
+	}
+}
 
-	vortex_up(dev);
-	return 0;
+static void start_operation1(struct net_device *dev)
+{
+	struct vortex_private *vp = (struct vortex_private *)dev->priv;
+	long ioaddr = dev->base_addr;
 
-out_free_irq:
-	free_irq(dev->irq, dev);
-out:
-	if (vortex_debug > 1)
-		printk(KERN_ERR "%s: vortex_open() fails: returning %d\n", dev->name, retval);
-	return retval;
+	if (vp->full_bus_master_rx) { /* post-Vortex bus master. */
+		/* Initialize the RxEarly register as recommended. */
+		outw(SetRxThreshold + (1536>>2), ioaddr + EL3_CMD);
+		outl(0x0020, ioaddr + PktStatus);
+		outl(virt_to_bus(&vp->rx_ring[vp->cur_rx % RX_RING_SIZE]),
+			 ioaddr + UpListPtr);
+	}
+
+	outw(StatsEnable, ioaddr + EL3_CMD); /* Turn on statistics. */
+	outw(RxEnable, ioaddr + EL3_CMD); /* Enable the receiver. */
+	outw(TxEnable, ioaddr + EL3_CMD); /* Enable transmitter. */
+	/* Allow status bits to be seen. */
+	outw(vp->status_enable, ioaddr + EL3_CMD);
+	/* Ack all pending events, and set active indicator mask. */
+	outw(AckIntr | IntLatch | TxAvailable | RxEarly | IntReq,
+		 ioaddr + EL3_CMD);
+	outw(vp->intr_enable, ioaddr + EL3_CMD);
+	if (vp->cb_fn_base)			/* The PCMCIA people are idiots.  */
+		writel(0x8000, vp->cb_fn_base + 4);
+	netif_start_tx_queue(dev);
 }
 
-static void
-vortex_timer(unsigned long data)
+static void vortex_timer(unsigned long data)
 {
 	struct net_device *dev = (struct net_device *)data;
 	struct vortex_private *vp = (struct vortex_private *)dev->priv;
 	long ioaddr = dev->base_addr;
 	int next_tick = 60*HZ;
 	int ok = 0;
-	int media_status, mii_status, old_window;
+	int media_status, old_window;
 
-	if (vortex_debug > 2) {
-		printk(KERN_DEBUG "%s: Media selection timer tick happened, %s.\n",
-			   dev->name, media_tbl[dev->if_port].name);
-		printk(KERN_DEBUG "dev->watchdog_timeo=%d\n", dev->watchdog_timeo);
+	if (vp->msg_level & NETIF_MSG_TIMER)
+		printk(KERN_DEBUG "%s: Media selection timer tick happened, "
+			   "%s %s duplex.\n",
+			   dev->name, media_tbl[dev->if_port].name,
+			   vp->full_duplex ? "full" : "half");
+
+	/* This only works with bus-master (non-3c590) chips. */
+	if (vp->cur_tx - vp->dirty_tx > 1  &&
+		(jiffies - dev->trans_start) > TX_TIMEOUT) {
+		/* Check for blocked interrupts. */
+		if (inw(ioaddr + EL3_STATUS) & IntLatch) {
+			/* We have a blocked IRQ line.  This should never happen, but
+			   we recover as best we can.*/
+			if ( ! vp->polling) {
+				if (jiffies - vp->last_reset > 10*HZ) {
+					printk(KERN_ERR "%s: IRQ %d is physically blocked! "
+						   "Failing back to low-rate polling.\n",
+						   dev->name, dev->irq);
+					vp->last_reset = jiffies;
+				}
+				vp->polling = 1;
+			}
+			vortex_interrupt(dev->irq, dev, 0);
+			next_tick = jiffies + 2;
+		} else {
+			vortex_tx_timeout(dev);
+			vp->last_reset = jiffies;
+		}
 	}
 
-	if (vp->medialock)
-		goto leave_media_alone;
 	disable_irq(dev->irq);
 	old_window = inw(ioaddr + EL3_CMD) >> 13;
 	EL3WINDOW(4);
@@ -1666,72 +1416,67 @@ vortex_timer(unsigned long data)
 	switch (dev->if_port) {
 	case XCVR_10baseT:  case XCVR_100baseTx:  case XCVR_100baseFx:
 		if (media_status & Media_LnkBeat) {
-			netif_carrier_on(dev);
 			ok = 1;
-			if (vortex_debug > 1)
+			if (vp->msg_level & NETIF_MSG_LINK)
 				printk(KERN_DEBUG "%s: Media %s has link beat, %x.\n",
 					   dev->name, media_tbl[dev->if_port].name, media_status);
-		} else if (vortex_debug > 1) {
-			netif_carrier_off(dev);
-			printk(KERN_DEBUG "%s: Media %s has no link beat, %x.\n",
+		} else if (vp->msg_level & NETIF_MSG_LINK)
+			printk(KERN_DEBUG "%s: Media %s is has no link beat, %x.\n",
 				   dev->name, media_tbl[dev->if_port].name, media_status);
-		}
 		break;
-	case XCVR_MII: case XCVR_NWAY:
-		{
-			mii_status = mdio_read(dev, vp->phys[0], 1);
-			ok = 1;
-			if (vortex_debug > 2)
-				printk(KERN_DEBUG "%s: MII transceiver has status %4.4x.\n",
-					dev->name, mii_status);
-			if (mii_status & BMSR_LSTATUS) {
-				int mii_reg5 = mdio_read(dev, vp->phys[0], 5);
-				if (! vp->force_fd  &&  mii_reg5 != 0xffff) {
-					int duplex = (mii_reg5&0x0100) ||
-						(mii_reg5 & 0x01C0) == 0x0040;
-					if (vp->full_duplex != duplex) {
-						vp->full_duplex = duplex;
-						printk(KERN_INFO "%s: Setting %s-duplex based on MII "
-							"#%d link partner capability of %4.4x.\n",
-							dev->name, vp->full_duplex ? "full" : "half",
-							vp->phys[0], mii_reg5);
-						/* Set the full-duplex bit. */
-						EL3WINDOW(3);
-						outw(	(vp->full_duplex ? 0x20 : 0) |
-								(dev->mtu > 1500 ? 0x40 : 0) |
-								((vp->full_duplex && vp->flow_ctrl && vp->partner_flow_ctrl) ? 0x100 : 0),
-								ioaddr + Wn3_MAC_Ctrl);
-						if (vortex_debug > 1)
-							printk(KERN_DEBUG "Setting duplex in Wn3_MAC_Ctrl\n");
-						/* AKPM: bug: should reset Tx and Rx after setting Duplex.  Page 180 */
-					}
-				}
-				netif_carrier_on(dev);
-			} else {
-				netif_carrier_off(dev);
-			}
+	case XCVR_MII: case XCVR_NWAY: {
+		int mii_status = mdio_read(ioaddr, vp->phys[0], 1);
+		int mii_reg5, negotiated, duplex;
+		ok = 1;
+		if (vp->msg_level & NETIF_MSG_LINK)
+			printk(KERN_DEBUG "%s: MII transceiver has status %4.4x.\n",
+				   dev->name, mii_status);
+		if (vp->medialock)
+			break;
+		if ((mii_status & 0x0004) == 0) {
+			next_tick = 5*HZ;
+			break;
 		}
+		mii_reg5 = mdio_read(ioaddr, vp->phys[0], 5);
+		negotiated = mii_reg5 & vp->advertising;
+		duplex = (negotiated & 0x0100) || (negotiated & 0x03C0) == 0x0040;
+		if (mii_reg5 == 0xffff  ||  vp->full_duplex == duplex)
+			break;
+		if (vp->msg_level & NETIF_MSG_LINK)
+			printk(KERN_INFO "%s: Setting %s-duplex based on "
+				   "MII #%d link partner capability of %4.4x.\n",
+				   dev->name, vp->full_duplex ? "full" : "half",
+				   vp->phys[0], mii_reg5);
+		vp->full_duplex = duplex;
+		/* Set the full-duplex bit. */
+		EL3WINDOW(3);
+		if (duplex)
+			vp->wn3_mac_ctrl |= 0x120;
+		else
+			vp->wn3_mac_ctrl &= ~0x120;
+		outb(vp->wn3_mac_ctrl, ioaddr + Wn3_MAC_Ctrl);
 		break;
-	  default:					/* Other media types handled by Tx timeouts. */
-		if (vortex_debug > 1)
-		  printk(KERN_DEBUG "%s: Media %s has no indication, %x.\n",
-				 dev->name, media_tbl[dev->if_port].name, media_status);
+	}
+	default:					/* Other media types handled by Tx timeouts. */
+		if (vp->msg_level & NETIF_MSG_LINK)
+			printk(KERN_DEBUG "%s: Media %s is has no indication, %x.\n",
+				   dev->name, media_tbl[dev->if_port].name, media_status);
 		ok = 1;
 	}
 	if ( ! ok) {
-		unsigned int config;
+		int i_cfg;
 
 		do {
 			dev->if_port = media_tbl[dev->if_port].next;
 		} while ( ! (vp->available_media & media_tbl[dev->if_port].mask));
 		if (dev->if_port == XCVR_Default) { /* Go back to default. */
 		  dev->if_port = vp->default_media;
-		  if (vortex_debug > 1)
+		  if (vp->msg_level & NETIF_MSG_LINK)
 			printk(KERN_DEBUG "%s: Media selection failing, using default "
 				   "%s port.\n",
 				   dev->name, media_tbl[dev->if_port].name);
 		} else {
-			if (vortex_debug > 1)
+			if (vp->msg_level & NETIF_MSG_LINK)
 				printk(KERN_DEBUG "%s: Media selection failed, now trying "
 					   "%s port.\n",
 					   dev->name, media_tbl[dev->if_port].name);
@@ -1741,27 +1486,25 @@ vortex_timer(unsigned long data)
 			 media_tbl[dev->if_port].media_bits, ioaddr + Wn4_Media);
 
 		EL3WINDOW(3);
-		config = inl(ioaddr + Wn3_Config);
-		config = BFINS(config, dev->if_port, 20, 4);
-		outl(config, ioaddr + Wn3_Config);
+		i_cfg = inl(ioaddr + Wn3_Config);
+		i_cfg &= ~0x00f00000;
+		i_cfg |= (dev->if_port << 20);
+		outl(i_cfg, ioaddr + Wn3_Config);
 
 		outw(dev->if_port == XCVR_10base2 ? StartCoax : StopCoax,
 			 ioaddr + EL3_CMD);
-		if (vortex_debug > 1)
-			printk(KERN_DEBUG "wrote 0x%08x to Wn3_Config\n", config);
-		/* AKPM: FIXME: Should reset Rx & Tx here.  P60 of 3c90xc.pdf */
 	}
 	EL3WINDOW(old_window);
 	enable_irq(dev->irq);
+	if (vp->restore_intr_mask)
+		outw(FakeIntr, ioaddr + EL3_CMD);
 
-leave_media_alone:
-	if (vortex_debug > 2)
+	if (vp->msg_level & NETIF_MSG_TIMER)
 	  printk(KERN_DEBUG "%s: Media selection timer finished, %s.\n",
 			 dev->name, media_tbl[dev->if_port].name);
 
-	mod_timer(&vp->timer, RUN_AT(next_tick));
-	if (vp->deferred)
-		outw(FakeIntr, ioaddr + EL3_CMD);
+	vp->timer.expires = jiffies + next_tick;
+	add_timer(&vp->timer);
 	return;
 }
 
@@ -1769,61 +1512,82 @@ static void vortex_tx_timeout(struct net
 {
 	struct vortex_private *vp = (struct vortex_private *)dev->priv;
 	long ioaddr = dev->base_addr;
+	int tx_status = inb(ioaddr + TxStatus);
+	int intr_status = inw(ioaddr + EL3_STATUS);
+	int j;
 
 	printk(KERN_ERR "%s: transmit timed out, tx_status %2.2x status %4.4x.\n",
-		   dev->name, inb(ioaddr + TxStatus),
-		   inw(ioaddr + EL3_STATUS));
-	EL3WINDOW(4);
-	printk(KERN_ERR "  diagnostics: net %04x media %04x dma %8.8x.\n",
-		   inw(ioaddr + Wn4_NetDiag), inw(ioaddr + Wn4_Media),
-		   inl(ioaddr + PktStatus));
+		   dev->name, tx_status, intr_status);
 	/* Slight code bloat to be user friendly. */
-	if ((inb(ioaddr + TxStatus) & 0x88) == 0x88)
+	if ((tx_status & 0x88) == 0x88)
 		printk(KERN_ERR "%s: Transmitter encountered 16 collisions --"
 			   " network cable problem?\n", dev->name);
-	if (inw(ioaddr + EL3_STATUS) & IntLatch) {
+	if (intr_status & IntLatch) {
 		printk(KERN_ERR "%s: Interrupt posted but not delivered --"
 			   " IRQ blocked by another device?\n", dev->name);
-		/* Bad idea here.. but we might as well handle a few events. */
-		{
-			/*
-			 * Block interrupts because vortex_interrupt does a bare spin_lock()
-			 */
-			unsigned long flags;
-			local_irq_save(flags);
-			if (vp->full_bus_master_tx)
-				boomerang_interrupt(dev->irq, dev, 0);
-			else
-				vortex_interrupt(dev->irq, dev, 0);
-			local_irq_restore(flags);
-		}
+		/* Race condition possible, but we handle a few events. */
+		vortex_interrupt(dev->irq, dev, 0);
 	}
 
-	if (vortex_debug > 0)
-		dump_tx_ring(dev);
-
-	issue_and_wait(dev, TxReset);
+#if ! defined(final_version) && LINUX_VERSION_CODE >= 0x10300
+	if (vp->full_bus_master_tx) {
+		int i;
+		printk(KERN_DEBUG "  Flags: bus-master %d full %d dirty %d "
+			   "current %d restart_tx %d.\n",
+			   vp->full_bus_master_tx, vp->tx_full, vp->dirty_tx, vp->cur_tx,
+			   vp->restart_tx);
+		printk(KERN_DEBUG "  Transmit list %8.8x vs. %p, packet ID %2.2x.\n",
+			   (int)inl(ioaddr + DownListPtr),
+			   &vp->tx_ring[vp->dirty_tx % TX_RING_SIZE],
+			   inb(ioaddr + TxPktID));
+		for (i = 0; i < TX_RING_SIZE; i++) {
+			printk(KERN_DEBUG "  %d: @%p  length %8.8x status %8.8x\n", i,
+				   &vp->tx_ring[i],
+				   le32_to_cpu(vp->tx_ring[i].length),
+				   le32_to_cpu(vp->tx_ring[i].status));
+		}
+	}
+#endif
+	outw(TxReset, ioaddr + EL3_CMD);
+	for (j = 200; j >= 0 ; j--)
+		if ( ! (inw(ioaddr + EL3_STATUS) & CmdInProgress))
+			break;
 
 	vp->stats.tx_errors++;
+
 	if (vp->full_bus_master_tx) {
-		printk(KERN_DEBUG "%s: Resetting the Tx ring pointer.\n", dev->name);
+		if (vp->drv_flags & HAS_V2_TX)
+			outb(20, ioaddr + DownPollRate);
+		if (vp->msg_level & NETIF_MSG_TX_ERR)
+			printk(KERN_DEBUG "%s: Resetting the Tx ring pointer.\n",
+				   dev->name);
 		if (vp->cur_tx - vp->dirty_tx > 0  &&  inl(ioaddr + DownListPtr) == 0)
-			outl(vp->tx_ring_dma + (vp->dirty_tx % TX_RING_SIZE) * sizeof(struct boom_tx_desc),
+			outl(virt_to_bus(&vp->tx_ring[vp->dirty_tx % TX_RING_SIZE]),
 				 ioaddr + DownListPtr);
-		if (vp->cur_tx - vp->dirty_tx < TX_RING_SIZE)
-			netif_wake_queue (dev);
-		if (vp->drv_flags & IS_BOOMERANG)
+		else
+			vp->restart_tx = 1;
+		if (vp->drv_flags & IS_BOOMERANG) {
+			/* Room for a packet, to avoid long DownStall delays. */
 			outb(PKT_BUF_SZ>>8, ioaddr + TxFreeThreshold);
-		outw(DownUnstall, ioaddr + EL3_CMD);
+			outw(DownUnstall, ioaddr + EL3_CMD);
+		} else {
+			if (dev->mtu > 2033)
+				outw(SetTxStart + (2000>>2), ioaddr + EL3_CMD);
+		}
+
+		if (vp->tx_full && (vp->cur_tx - vp->dirty_tx <= TX_QUEUE_LEN - 1)) {
+			vp->tx_full = 0;
+			netif_unpause_tx_queue(dev);
+		}
 	} else {
+		netif_unpause_tx_queue(dev);
 		vp->stats.tx_dropped++;
-		netif_wake_queue(dev);
 	}
-	
+
 	/* Issue Tx Enable */
 	outw(TxEnable, ioaddr + EL3_CMD);
 	dev->trans_start = jiffies;
-	
+
 	/* Switch to register set 7 for normal use. */
 	EL3WINDOW(7);
 }
@@ -1837,46 +1601,32 @@ vortex_error(struct net_device *dev, int
 {
 	struct vortex_private *vp = (struct vortex_private *)dev->priv;
 	long ioaddr = dev->base_addr;
-	int do_tx_reset = 0, reset_mask = 0;
-	unsigned char tx_status = 0;
-
-	if (vortex_debug > 2) {
-		printk(KERN_ERR "%s: vortex_error(), status=0x%x\n", dev->name, status);
-	}
+	int do_tx_reset = 0;
+	int i;
 
 	if (status & TxComplete) {			/* Really "TxError" for us. */
-		tx_status = inb(ioaddr + TxStatus);
+		unsigned char tx_status = inb(ioaddr + TxStatus);
 		/* Presumably a tx-timeout. We must merely re-enable. */
-		if (vortex_debug > 2
-			|| (tx_status != 0x88 && vortex_debug > 0)) {
-			printk(KERN_ERR "%s: Transmit error, Tx status register %2.2x.\n",
+		if (vp->msg_level & NETIF_MSG_TX_ERR)
+			printk(KERN_DEBUG"%s: Transmit error, Tx status register %2.2x.\n",
 				   dev->name, tx_status);
-			if (tx_status == 0x82) {
-				printk(KERN_ERR "Probably a duplex mismatch.  See "
-						"Documentation/networking/vortex.txt\n");
-			}
-			dump_tx_ring(dev);
-		}
 		if (tx_status & 0x14)  vp->stats.tx_fifo_errors++;
 		if (tx_status & 0x38)  vp->stats.tx_aborted_errors++;
 		outb(0, ioaddr + TxStatus);
-		if (tx_status & 0x30) {			/* txJabber or txUnderrun */
-			do_tx_reset = 1;
-		} else if ((tx_status & 0x08) && (vp->drv_flags & MAX_COLLISION_RESET)) {	/* maxCollisions */
+		if (tx_status & 0x30)
 			do_tx_reset = 1;
-			reset_mask = 0x0108;		/* Reset interface logic, but not download logic */
-		} else {						/* Merely re-enable the transmitter. */
+		else {					/* Merely re-enable the transmitter. */
 			outw(TxEnable, ioaddr + EL3_CMD);
+			vp->restart_tx = 1;
 		}
 	}
-
 	if (status & RxEarly) {				/* Rx early is unused. */
 		vortex_rx(dev);
 		outw(AckIntr | RxEarly, ioaddr + EL3_CMD);
 	}
 	if (status & StatsFull) {			/* Empty statistics. */
-		static int DoneDidThat;
-		if (vortex_debug > 4)
+		static int DoneDidThat = 0;
+		if (vp->msg_level & NETIF_MSG_MISC)
 			printk(KERN_DEBUG "%s: Updating stats.\n", dev->name);
 		update_stats(ioaddr, dev);
 		/* HACK: Disable statistics as an interrupt source. */
@@ -1887,7 +1637,6 @@ vortex_error(struct net_device *dev, int
 				   "stats as an interrupt source.\n", dev->name);
 			EL3WINDOW(5);
 			outw(SetIntrEnb | (inw(ioaddr + 10) & ~StatsFull), ioaddr + EL3_CMD);
-			vp->intr_enable &= ~StatsFull;
 			EL3WINDOW(7);
 			DoneDidThat++;
 		}
@@ -1895,73 +1644,100 @@ vortex_error(struct net_device *dev, int
 	if (status & IntReq) {		/* Restore all interrupt sources.  */
 		outw(vp->status_enable, ioaddr + EL3_CMD);
 		outw(vp->intr_enable, ioaddr + EL3_CMD);
+		vp->restore_intr_mask = 0;
 	}
 	if (status & HostError) {
 		u16 fifo_diag;
 		EL3WINDOW(4);
 		fifo_diag = inw(ioaddr + Wn4_FIFODiag);
-		printk(KERN_ERR "%s: Host error, FIFO diagnostic register %4.4x.\n",
-			   dev->name, fifo_diag);
+		if (vp->msg_level & NETIF_MSG_DRV)
+			printk(KERN_ERR "%s: Host error, status %x, FIFO diagnostic "
+				   "register %4.4x.\n",
+				   dev->name, status, fifo_diag);
 		/* Adapter failure requires Tx/Rx reset and reinit. */
 		if (vp->full_bus_master_tx) {
 			int bus_status = inl(ioaddr + PktStatus);
 			/* 0x80000000 PCI master abort. */
 			/* 0x40000000 PCI target abort. */
-			if (vortex_debug)
-				printk(KERN_ERR "%s: PCI bus error, bus status %8.8x\n", dev->name, bus_status);
-
-			/* In this case, blow the card away */
-			vortex_down(dev);
-			issue_and_wait(dev, TotalReset | 0xff);
-			vortex_up(dev);		/* AKPM: bug.  vortex_up() assumes that the rx ring is full. It may not be. */
+			outw(TotalReset | 0xff, ioaddr + EL3_CMD);
+			for (i = 2000; i >= 0 ; i--)
+				if ( ! (inw(ioaddr + EL3_STATUS) & CmdInProgress))
+					break;
+			if (vp->msg_level & NETIF_MSG_DRV)
+				printk(KERN_ERR "%s: PCI bus error, bus status %8.8x, reset "
+					   "had %d tick left.\n",
+				   dev->name, bus_status, i);
+			/* Re-enable the receiver. */
+			outw(RxEnable, ioaddr + EL3_CMD);
+			outw(TxEnable, ioaddr + EL3_CMD);
+			vp->restart_tx = 1;
 		} else if (fifo_diag & 0x0400)
 			do_tx_reset = 1;
 		if (fifo_diag & 0x3000) {
-			/* Reset Rx fifo and upload logic */
-			issue_and_wait(dev, RxReset|0x07);
+			outw(RxReset | 7, ioaddr + EL3_CMD);
+			for (i = 200000; i >= 0 ; i--)
+				if ( ! (inw(ioaddr + EL3_STATUS) & CmdInProgress))
+					break;
+			if ((vp->drv_flags & HAS_V2_TX) && dev->mtu > 1500) {
+				EL3WINDOW(3);
+				outw(dev->mtu + 14, ioaddr + Wn3_MaxPktSize);
+			}
 			/* Set the Rx filter to the current state. */
+			memset(vp->mc_filter, 0, sizeof vp->mc_filter);
+			vp->rx_mode = 0;
 			set_rx_mode(dev);
 			outw(RxEnable, ioaddr + EL3_CMD); /* Re-enable the receiver. */
 			outw(AckIntr | HostError, ioaddr + EL3_CMD);
 		}
 	}
-
 	if (do_tx_reset) {
-		issue_and_wait(dev, TxReset|reset_mask);
+		int j;
+		outw(TxReset, ioaddr + EL3_CMD);
+		for (j = 200; j >= 0 ; j--)
+			if ( ! (inw(ioaddr + EL3_STATUS) & CmdInProgress))
+				break;
 		outw(TxEnable, ioaddr + EL3_CMD);
-		if (!vp->full_bus_master_tx)
-			netif_wake_queue(dev);
+		vp->restart_tx = 1;
 	}
+
 }
 
+
 static int
 vortex_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
 	struct vortex_private *vp = (struct vortex_private *)dev->priv;
 	long ioaddr = dev->base_addr;
 
+	/* Block a timer-based transmit from overlapping.  This happens when
+	   packets are presumed lost, and we use this check the Tx status. */
+	if (netif_pause_tx_queue(dev) != 0) {
+		/* This watchdog code is redundant with the media monitor timer. */
+		if (jiffies - dev->trans_start > TX_TIMEOUT)
+			vortex_tx_timeout(dev);
+		return 1;
+	}
+
 	/* Put out the doubleword header... */
 	outl(skb->len, ioaddr + TX_FIFO);
 	if (vp->bus_master) {
 		/* Set the bus-master controller to transfer the packet. */
-		int len = (skb->len + 3) & ~3;
-		outl(	vp->tx_skb_dma = pci_map_single(vp->pdev, skb->data, len, PCI_DMA_TODEVICE),
-				ioaddr + Wn7_MasterAddr);
-		outw(len, ioaddr + Wn7_MasterLen);
+		outl(virt_to_bus(skb->data), ioaddr + Wn7_MasterAddr);
+		outw((skb->len + 3) & ~3, ioaddr + Wn7_MasterLen);
 		vp->tx_skb = skb;
 		outw(StartDMADown, ioaddr + EL3_CMD);
-		/* netif_wake_queue() will be called at the DMADone interrupt. */
+		netif_stop_tx_queue(dev);
+		/* Tx busy will be cleared at the DMADone interrupt. */
 	} else {
 		/* ... and the packet rounded to a doubleword. */
 		outsl(ioaddr + TX_FIFO, skb->data, (skb->len + 3) >> 2);
-		dev_kfree_skb (skb);
-		if (inw(ioaddr + TxFree) > 1536) {
-			netif_start_queue (dev);	/* AKPM: redundant? */
-		} else {
+		dev_free_skb(skb);
+		if (inw(ioaddr + TxFree) <= 1536) {
 			/* Interrupt us when the FIFO has room for max-sized packet. */
-			netif_stop_queue(dev);
 			outw(SetTxThreshold + (1536>>2), ioaddr + EL3_CMD);
-		}
+			netif_stop_tx_queue(dev);
+		} else
+			netif_unpause_tx_queue(dev);		/* Typical path */
 	}
 
 	dev->trans_start = jiffies;
@@ -1973,15 +1749,20 @@ vortex_start_xmit(struct sk_buff *skb, s
 
 		while (--i > 0	&&	(tx_status = inb(ioaddr + TxStatus)) > 0) {
 			if (tx_status & 0x3C) {		/* A Tx-disabling error occurred.  */
-				if (vortex_debug > 2)
+				if (vp->msg_level & NETIF_MSG_TX_ERR)
 				  printk(KERN_DEBUG "%s: Tx error, status %2.2x.\n",
 						 dev->name, tx_status);
 				if (tx_status & 0x04) vp->stats.tx_fifo_errors++;
 				if (tx_status & 0x38) vp->stats.tx_aborted_errors++;
 				if (tx_status & 0x30) {
-					issue_and_wait(dev, TxReset);
+					int j;
+					outw(TxReset, ioaddr + EL3_CMD);
+					for (j = 200; j >= 0 ; j--)
+						if ( ! (inw(ioaddr + EL3_STATUS) & CmdInProgress))
+							break;
 				}
 				outw(TxEnable, ioaddr + EL3_CMD);
+				vp->restart_tx = 1;
 			}
 			outb(0x00, ioaddr + TxStatus); /* Pop the status stack. */
 		}
@@ -1994,248 +1775,122 @@ boomerang_start_xmit(struct sk_buff *skb
 {
 	struct vortex_private *vp = (struct vortex_private *)dev->priv;
 	long ioaddr = dev->base_addr;
-	/* Calculate the next Tx descriptor entry. */
-	int entry = vp->cur_tx % TX_RING_SIZE;
-	struct boom_tx_desc *prev_entry = &vp->tx_ring[(vp->cur_tx-1) % TX_RING_SIZE];
+	int entry;
+	struct boom_tx_desc *prev_entry;
 	unsigned long flags;
+	int i;
 
-	if (vortex_debug > 6) {
-		printk(KERN_DEBUG "boomerang_start_xmit()\n");
-		if (vortex_debug > 3)
-			printk(KERN_DEBUG "%s: Trying to send a packet, Tx index %d.\n",
-				   dev->name, vp->cur_tx);
+	if (netif_pause_tx_queue(dev) != 0) {
+		/* This watchdog code is redundant with the media monitor timer. */
+		if (jiffies - dev->trans_start > TX_TIMEOUT)
+			vortex_tx_timeout(dev);
+		return 1;
 	}
 
-	if (vp->cur_tx - vp->dirty_tx >= TX_RING_SIZE) {
-		if (vortex_debug > 0)
-			printk(KERN_WARNING "%s: BUG! Tx Ring full, refusing to send buffer.\n",
-				   dev->name);
-		netif_stop_queue(dev);
+	/* Calculate the next Tx descriptor entry. */
+	entry = vp->cur_tx % TX_RING_SIZE;
+	prev_entry = &vp->tx_ring[(vp->cur_tx-1) % TX_RING_SIZE];
+
+	if (vp->msg_level & NETIF_MSG_TX_QUEUED)
+		printk(KERN_DEBUG "%s: Queuing Tx packet, index %d.\n",
+			   dev->name, vp->cur_tx);
+	/* Impossible error. */
+	if (vp->tx_full) {
+		printk(KERN_WARNING "%s: Tx Ring full, refusing to send buffer.\n",
+			   dev->name);
 		return 1;
 	}
-
 	vp->tx_skbuff[entry] = skb;
-
 	vp->tx_ring[entry].next = 0;
-#if DO_ZEROCOPY
-	if (skb->ip_summed != CHECKSUM_HW)
-			vp->tx_ring[entry].status = cpu_to_le32(skb->len | TxIntrUploaded);
+	vp->tx_ring[entry].addr = virt_to_le32desc(skb->data);
+	vp->tx_ring[entry].length = cpu_to_le32(skb->len | LAST_FRAG);
+	if (vp->capabilities & CapNoTxLength)
+		vp->tx_ring[entry].status =
+			cpu_to_le32(TxNoRoundup | TxIntrUploaded | (entry << 2));
 	else
-			vp->tx_ring[entry].status = cpu_to_le32(skb->len | TxIntrUploaded | AddTCPChksum);
+		vp->tx_ring[entry].status = cpu_to_le32(skb->len | TxIntrUploaded);
 
-	if (!skb_shinfo(skb)->nr_frags) {
-		vp->tx_ring[entry].frag[0].addr = cpu_to_le32(pci_map_single(vp->pdev, skb->data,
-										skb->len, PCI_DMA_TODEVICE));
-		vp->tx_ring[entry].frag[0].length = cpu_to_le32(skb->len | LAST_FRAG);
+	if (vp->drv_flags & IS_BOOMERANG) {
+		save_flags(flags);
+		cli();
+		outw(DownStall, ioaddr + EL3_CMD);
+		/* Wait for the stall to complete. */
+		for (i = 600; i >= 0 ; i--)
+			if ( (inw(ioaddr + EL3_STATUS) & CmdInProgress) == 0)
+				break;
+		vp->tx_desc_tail->next = virt_to_le32desc(&vp->tx_ring[entry]);
+		vp->tx_desc_tail = &vp->tx_ring[entry];
+		if (inl(ioaddr + DownListPtr) == 0) {
+			outl(virt_to_bus(&vp->tx_ring[entry]), ioaddr + DownListPtr);
+			queued_packet++;
+		}
+		outw(DownUnstall, ioaddr + EL3_CMD);
+		restore_flags(flags);
 	} else {
-		int i;
-
-		vp->tx_ring[entry].frag[0].addr = cpu_to_le32(pci_map_single(vp->pdev, skb->data,
-										skb->len-skb->data_len, PCI_DMA_TODEVICE));
-		vp->tx_ring[entry].frag[0].length = cpu_to_le32(skb->len-skb->data_len);
-
-		for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
-			skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
-
-			vp->tx_ring[entry].frag[i+1].addr =
-					cpu_to_le32(pci_map_single(vp->pdev,
-											   (void*)page_address(frag->page) + frag->page_offset,
-											   frag->size, PCI_DMA_TODEVICE));
-
-			if (i == skb_shinfo(skb)->nr_frags-1)
-					vp->tx_ring[entry].frag[i+1].length = cpu_to_le32(frag->size|LAST_FRAG);
-			else
-					vp->tx_ring[entry].frag[i+1].length = cpu_to_le32(frag->size);
+		vp->tx_desc_tail->next = virt_to_le32desc(&vp->tx_ring[entry]);
+		vp->tx_desc_tail = &vp->tx_ring[entry];
+		if (vp->restart_tx) {
+			outl(virt_to_bus(vp->tx_desc_tail), ioaddr + DownListPtr);
+			vp->restart_tx = 0;
+			queued_packet++;
 		}
 	}
-#else
-	vp->tx_ring[entry].addr = cpu_to_le32(pci_map_single(vp->pdev, skb->data, skb->len, PCI_DMA_TODEVICE));
-	vp->tx_ring[entry].length = cpu_to_le32(skb->len | LAST_FRAG);
-	vp->tx_ring[entry].status = cpu_to_le32(skb->len | TxIntrUploaded);
-#endif
-
-	spin_lock_irqsave(&vp->lock, flags);
-	/* Wait for the stall to complete. */
-	issue_and_wait(dev, DownStall);
-	prev_entry->next = cpu_to_le32(vp->tx_ring_dma + entry * sizeof(struct boom_tx_desc));
-	if (inl(ioaddr + DownListPtr) == 0) {
-		outl(vp->tx_ring_dma + entry * sizeof(struct boom_tx_desc), ioaddr + DownListPtr);
-		vp->queued_packet++;
-	}
-
 	vp->cur_tx++;
-	if (vp->cur_tx - vp->dirty_tx > TX_RING_SIZE - 1) {
-		netif_stop_queue (dev);
+	if (vp->cur_tx - vp->dirty_tx >= TX_QUEUE_LEN) {
+		vp->tx_full = 1;
+		/* Check for a just-cleared queue. */
+		if (vp->cur_tx - (volatile unsigned int)vp->dirty_tx
+			< TX_QUEUE_LEN - 2) {
+			vp->tx_full = 0;
+			netif_unpause_tx_queue(dev);
+		} else
+			netif_stop_tx_queue(dev);
 	} else {					/* Clear previous interrupt enable. */
 #if defined(tx_interrupt_mitigation)
-		/* Dubious. If in boomeang_interrupt "faster" cyclone ifdef
-		 * were selected, this would corrupt DN_COMPLETE. No?
-		 */
 		prev_entry->status &= cpu_to_le32(~TxIntrUploaded);
 #endif
+		netif_unpause_tx_queue(dev);		/* Typical path */
 	}
-	outw(DownUnstall, ioaddr + EL3_CMD);
-	spin_unlock_irqrestore(&vp->lock, flags);
 	dev->trans_start = jiffies;
 	return 0;
 }
 
 /* The interrupt handler does all of the Rx thread work and cleans up
    after the Tx thread. */
-
-/*
- * This is the ISR for the vortex series chips.
- * full_bus_master_tx == 0 && full_bus_master_rx == 0
- */
-
 static void vortex_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 {
 	struct net_device *dev = dev_id;
 	struct vortex_private *vp = (struct vortex_private *)dev->priv;
 	long ioaddr;
-	int status;
-	int work_done = max_interrupt_work;
-	
-	ioaddr = dev->base_addr;
-	spin_lock(&vp->lock);
+	int latency, status;
+	int work_done = vp->max_interrupt_work;
 
+	ioaddr = dev->base_addr;
+	latency = inb(ioaddr + Timer);
 	status = inw(ioaddr + EL3_STATUS);
 
-	if (vortex_debug > 6)
-		printk("vortex_interrupt(). status=0x%4x\n", status);
-
-	if ((status & IntLatch) == 0)
-		goto handler_exit;		/* No interrupt: shared IRQs cause this */
-
-	if (status & IntReq) {
-		status |= vp->deferred;
-		vp->deferred = 0;
-	}
-
-	if (status == 0xffff)		/* h/w no longer present (hotplug)? */
+	if (status == 0xffff)
 		goto handler_exit;
-
-	if (vortex_debug > 4)
+	if (vp->msg_level & NETIF_MSG_INTR)
 		printk(KERN_DEBUG "%s: interrupt, status %4.4x, latency %d ticks.\n",
-			   dev->name, status, inb(ioaddr + Timer));
-
+			   dev->name, status, latency);
 	do {
-		if (vortex_debug > 5)
+		if (vp->msg_level & NETIF_MSG_INTR)
 				printk(KERN_DEBUG "%s: In interrupt loop, status %4.4x.\n",
 					   dev->name, status);
 		if (status & RxComplete)
 			vortex_rx(dev);
+		if (status & UpComplete) {
+			outw(AckIntr | UpComplete, ioaddr + EL3_CMD);
+			boomerang_rx(dev);
+		}
 
 		if (status & TxAvailable) {
-			if (vortex_debug > 5)
+			if (vp->msg_level & NETIF_MSG_TX_DONE)
 				printk(KERN_DEBUG "	TX room bit was handled.\n");
 			/* There's room in the FIFO for a full-sized packet. */
 			outw(AckIntr | TxAvailable, ioaddr + EL3_CMD);
-			netif_wake_queue (dev);
-		}
-
-		if (status & DMADone) {
-			if (inw(ioaddr + Wn7_MasterStatus) & 0x1000) {
-				outw(0x1000, ioaddr + Wn7_MasterStatus); /* Ack the event. */
-				pci_unmap_single(vp->pdev, vp->tx_skb_dma, (vp->tx_skb->len + 3) & ~3, PCI_DMA_TODEVICE);
-				dev_kfree_skb_irq(vp->tx_skb); /* Release the transferred buffer */
-				if (inw(ioaddr + TxFree) > 1536) {
-					/*
-					 * AKPM: FIXME: I don't think we need this.  If the queue was stopped due to
-					 * insufficient FIFO room, the TxAvailable test will succeed and call
-					 * netif_wake_queue()
-					 */
-					netif_wake_queue(dev);
-				} else { /* Interrupt when FIFO has room for max-sized packet. */
-					outw(SetTxThreshold + (1536>>2), ioaddr + EL3_CMD);
-					netif_stop_queue(dev);
-				}
-			}
-		}
-		/* Check for all uncommon interrupts at once. */
-		if (status & (HostError | RxEarly | StatsFull | TxComplete | IntReq)) {
-			if (status == 0xffff)
-				break;
-			vortex_error(dev, status);
-		}
-
-		if (--work_done < 0) {
-			printk(KERN_WARNING "%s: Too much work in interrupt, status "
-				   "%4.4x.\n", dev->name, status);
-			/* Disable all pending interrupts. */
-			do {
-				vp->deferred |= status;
-				outw(SetStatusEnb | (~vp->deferred & vp->status_enable),
-					 ioaddr + EL3_CMD);
-				outw(AckIntr | (vp->deferred & 0x7ff), ioaddr + EL3_CMD);
-			} while ((status = inw(ioaddr + EL3_CMD)) & IntLatch);
-			/* The timer will reenable interrupts. */
-			mod_timer(&vp->timer, jiffies + 1*HZ);
-			break;
-		}
-		/* Acknowledge the IRQ. */
-		outw(AckIntr | IntReq | IntLatch, ioaddr + EL3_CMD);
-	} while ((status = inw(ioaddr + EL3_STATUS)) & (IntLatch | RxComplete));
-
-	if (vortex_debug > 4)
-		printk(KERN_DEBUG "%s: exiting interrupt, status %4.4x.\n",
-			   dev->name, status);
-handler_exit:
-	spin_unlock(&vp->lock);
-}
-
-/*
- * This is the ISR for the boomerang series chips.
- * full_bus_master_tx == 1 && full_bus_master_rx == 1
- */
-
-static void boomerang_interrupt(int irq, void *dev_id, struct pt_regs *regs)
-{
-	struct net_device *dev = dev_id;
-	struct vortex_private *vp = (struct vortex_private *)dev->priv;
-	long ioaddr;
-	int status;
-	int work_done = max_interrupt_work;
-
-	ioaddr = dev->base_addr;
-
-	/*
-	 * It seems dopey to put the spinlock this early, but we could race against vortex_tx_timeout
-	 * and boomerang_start_xmit
-	 */
-	spin_lock(&vp->lock);
-
-	status = inw(ioaddr + EL3_STATUS);
-
-	if (vortex_debug > 6)
-		printk(KERN_DEBUG "boomerang_interrupt. status=0x%4x\n", status);
-
-	if ((status & IntLatch) == 0)
-		goto handler_exit;		/* No interrupt: shared IRQs can cause this */
-
-	if (status == 0xffff) {		/* h/w no longer present (hotplug)? */
-		if (vortex_debug > 1)
-			printk(KERN_DEBUG "boomerang_interrupt(1): status = 0xffff\n");
-		goto handler_exit;
-	}
-
-	if (status & IntReq) {
-		status |= vp->deferred;
-		vp->deferred = 0;
-	}
-
-	if (vortex_debug > 4)
-		printk(KERN_DEBUG "%s: interrupt, status %4.4x, latency %d ticks.\n",
-			   dev->name, status, inb(ioaddr + Timer));
-	do {
-		if (vortex_debug > 5)
-				printk(KERN_DEBUG "%s: In interrupt loop, status %4.4x.\n",
-					   dev->name, status);
-		if (status & UpComplete) {
-			outw(AckIntr | UpComplete, ioaddr + EL3_CMD);
-			if (vortex_debug > 5)
-				printk(KERN_DEBUG "boomerang_interrupt->boomerang_rx\n");
-			boomerang_rx(dev);
+			netif_resume_tx_queue(dev);
 		}
 
 		if (status & DownComplete) {
@@ -2244,99 +1899,78 @@ static void boomerang_interrupt(int irq,
 			outw(AckIntr | DownComplete, ioaddr + EL3_CMD);
 			while (vp->cur_tx - dirty_tx > 0) {
 				int entry = dirty_tx % TX_RING_SIZE;
-#if 1	/* AKPM: the latter is faster, but cyclone-only */
-				if (inl(ioaddr + DownListPtr) ==
-					vp->tx_ring_dma + entry * sizeof(struct boom_tx_desc))
-					break;			/* It still hasn't been processed. */
-#else
-				if ((vp->tx_ring[entry].status & DN_COMPLETE) == 0)
+				int tx_status = le32_to_cpu(vp->tx_ring[entry].status);
+				if (vp->capabilities & CapNoTxLength) {
+					if ( ! (tx_status & TxDownComplete))
+						break;
+				} else if (inl(ioaddr + DownListPtr) ==
+						   virt_to_bus(&vp->tx_ring[entry]))
 					break;			/* It still hasn't been processed. */
-#endif
-					
+				if (vp->msg_level & NETIF_MSG_TX_DONE)
+					printk(KERN_DEBUG "%s: Transmit done, Tx status %8.8x.\n",
+						   dev->name, tx_status);
 				if (vp->tx_skbuff[entry]) {
-					struct sk_buff *skb = vp->tx_skbuff[entry];
-#if DO_ZEROCOPY					
-					int i;
-					for (i=0; i<=skb_shinfo(skb)->nr_frags; i++)
-							pci_unmap_single(vp->pdev,
-											 le32_to_cpu(vp->tx_ring[entry].frag[i].addr),
-											 le32_to_cpu(vp->tx_ring[entry].frag[i].length)&0xFFF,
-											 PCI_DMA_TODEVICE);
-#else
-					pci_unmap_single(vp->pdev,
-						le32_to_cpu(vp->tx_ring[entry].addr), skb->len, PCI_DMA_TODEVICE);
-#endif
-					dev_kfree_skb_irq(skb);
+					dev_free_skb_irq(vp->tx_skbuff[entry]);
 					vp->tx_skbuff[entry] = 0;
-				} else {
-					printk(KERN_DEBUG "boomerang_interrupt: no skb!\n");
 				}
 				/* vp->stats.tx_packets++;  Counted below. */
 				dirty_tx++;
 			}
 			vp->dirty_tx = dirty_tx;
-			if (vp->cur_tx - dirty_tx <= TX_RING_SIZE - 1) {
-				if (vortex_debug > 6)
-					printk(KERN_DEBUG "boomerang_interrupt: wake queue\n");
-				netif_wake_queue (dev);
+			/* 4 entry hysteresis before marking the queue non-full. */
+			if (vp->tx_full && (vp->cur_tx - dirty_tx < TX_QUEUE_LEN - 4)) {
+				vp->tx_full = 0;
+				netif_resume_tx_queue(dev);
+			}
+		}
+		if (status & DMADone) {
+			if (inw(ioaddr + Wn7_MasterStatus) & 0x1000) {
+				outw(0x1000, ioaddr + Wn7_MasterStatus); /* Ack the event. */
+				/* Release the transfered buffer */
+				dev_free_skb_irq(vp->tx_skb);
+				if (inw(ioaddr + TxFree) > 1536) {
+					netif_resume_tx_queue(dev);
+				} else /* Interrupt when FIFO has room for max-sized packet. */
+					outw(SetTxThreshold + (1536>>2), ioaddr + EL3_CMD);
 			}
 		}
-
 		/* Check for all uncommon interrupts at once. */
-		if (status & (HostError | RxEarly | StatsFull | TxComplete | IntReq))
+		if (status & (HostError | RxEarly | StatsFull | TxComplete | IntReq)) {
+			if (status == 0xffff)
+				break;
 			vortex_error(dev, status);
+		}
 
 		if (--work_done < 0) {
-			printk(KERN_WARNING "%s: Too much work in interrupt, status "
-				   "%4.4x.\n", dev->name, status);
-			/* Disable all pending interrupts. */
-			do {
-				vp->deferred |= status;
-				outw(SetStatusEnb | (~vp->deferred & vp->status_enable),
-					 ioaddr + EL3_CMD);
-				outw(AckIntr | (vp->deferred & 0x7ff), ioaddr + EL3_CMD);
-			} while ((status = inw(ioaddr + EL3_CMD)) & IntLatch);
-			/* The timer will reenable interrupts. */
-			mod_timer(&vp->timer, jiffies + 1*HZ);
-			break;
+			if ((status & (0x7fe - (UpComplete | DownComplete))) == 0) {
+				/* Just ack these and return. */
+				outw(AckIntr | UpComplete | DownComplete, ioaddr + EL3_CMD);
+			} else {
+				printk(KERN_WARNING "%s: Too much work in interrupt, status "
+					   "%4.4x.  Temporarily disabling functions (%4.4x).\n",
+					   dev->name, status, SetStatusEnb | ((~status) & 0x7FE));
+				/* Disable all pending interrupts. */
+				outw(SetStatusEnb | ((~status) & 0x7FE), ioaddr + EL3_CMD);
+				outw(AckIntr | 0x7FF, ioaddr + EL3_CMD);
+				/* The timer will reenable interrupts. */
+				vp->restore_intr_mask = 1;
+				break;
+			}
 		}
 		/* Acknowledge the IRQ. */
 		outw(AckIntr | IntReq | IntLatch, ioaddr + EL3_CMD);
 		if (vp->cb_fn_base)			/* The PCMCIA people are idiots.  */
 			writel(0x8000, vp->cb_fn_base + 4);
 
-	} while ((status = inw(ioaddr + EL3_STATUS)) & IntLatch);
+	} while ((status = inw(ioaddr + EL3_STATUS)) & (IntLatch | RxComplete));
 
-	if (vortex_debug > 4)
+	if (vp->msg_level & NETIF_MSG_INTR)
 		printk(KERN_DEBUG "%s: exiting interrupt, status %4.4x.\n",
 			   dev->name, status);
 handler_exit:
-	spin_unlock(&vp->lock);
-}
-
-#ifdef HAVE_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 vorboom_poll (struct net_device *dev)
-{
-	struct vortex_private *vp = (struct vortex_private *)dev->priv;
-
-	if (!netdump_mode) disable_irq(dev->irq);
-	if (vp->full_bus_master_tx)
-		boomerang_interrupt(dev->irq, dev, 0);
-	else
-		vortex_interrupt(dev->irq, dev, 0);
-	if (!netdump_mode) enable_irq(dev->irq);
+	return;
 }
 
-#endif
-
-
 static int vortex_rx(struct net_device *dev)
 {
 	struct vortex_private *vp = (struct vortex_private *)dev->priv;
@@ -2344,13 +1978,13 @@ static int vortex_rx(struct net_device *
 	int i;
 	short rx_status;
 
-	if (vortex_debug > 5)
-		printk(KERN_DEBUG "vortex_rx(): status %4.4x, rx_status %4.4x.\n",
+	if (vp->msg_level & NETIF_MSG_RX_STATUS)
+		printk(KERN_DEBUG"   In rx_packet(), status %4.4x, rx_status %4.4x.\n",
 			   inw(ioaddr+EL3_STATUS), inw(ioaddr+RxStatus));
 	while ((rx_status = inw(ioaddr + RxStatus)) > 0) {
 		if (rx_status & 0x4000) { /* Error, update stats. */
 			unsigned char rx_error = inb(ioaddr + RxErrors);
-			if (vortex_debug > 2)
+			if (vp->msg_level & NETIF_MSG_RX_ERR)
 				printk(KERN_DEBUG " Rx error: status %2.2x.\n", rx_error);
 			vp->stats.rx_errors++;
 			if (rx_error & 0x01)  vp->stats.rx_over_errors++;
@@ -2364,7 +1998,7 @@ static int vortex_rx(struct net_device *
 			struct sk_buff *skb;
 
 			skb = dev_alloc_skb(pkt_len + 5);
-			if (vortex_debug > 4)
+			if (vp->msg_level & NETIF_MSG_RX_STATUS)
 				printk(KERN_DEBUG "Receiving packet size %d status %4.4x.\n",
 					   pkt_len, rx_status);
 			if (skb != NULL) {
@@ -2373,14 +2007,12 @@ static int vortex_rx(struct net_device *
 				/* 'skb_put()' points to the start of sk_buff data area. */
 				if (vp->bus_master &&
 					! (inw(ioaddr + Wn7_MasterStatus) & 0x8000)) {
-					dma_addr_t dma = pci_map_single(vp->pdev, skb_put(skb, pkt_len),
-									   pkt_len, PCI_DMA_FROMDEVICE);
-					outl(dma, ioaddr + Wn7_MasterAddr);
+					outl(virt_to_bus(skb_put(skb, pkt_len)),
+						 ioaddr + Wn7_MasterAddr);
 					outw((skb->len + 3) & ~3, ioaddr + Wn7_MasterLen);
 					outw(StartDMAUp, ioaddr + EL3_CMD);
 					while (inw(ioaddr + Wn7_MasterStatus) & 0x8000)
 						;
-					pci_unmap_single(vp->pdev, dma, pkt_len, PCI_DMA_FROMDEVICE);
 				} else {
 					insl(ioaddr + RX_FIFO, skb_put(skb, pkt_len),
 						 (pkt_len + 3) >> 2);
@@ -2390,17 +2022,24 @@ static int vortex_rx(struct net_device *
 				netif_rx(skb);
 				dev->last_rx = jiffies;
 				vp->stats.rx_packets++;
+#if LINUX_VERSION_CODE > 0x20127
+				vp->stats.rx_bytes += pkt_len;
+#endif
 				/* Wait a limited time to go to next packet. */
 				for (i = 200; i >= 0; i--)
 					if ( ! (inw(ioaddr + EL3_STATUS) & CmdInProgress))
 						break;
 				continue;
-			} else if (vortex_debug > 0)
+			} else if (vp->msg_level & NETIF_MSG_RX_ERR)
 				printk(KERN_NOTICE "%s: No memory to allocate a sk_buff of "
 					   "size %d.\n", dev->name, pkt_len);
 		}
+		outw(RxDiscard, ioaddr + EL3_CMD);
 		vp->stats.rx_dropped++;
-		issue_and_wait(dev, RxDiscard);
+		/* Wait a limited time to skip this packet. */
+		for (i = 200; i >= 0; i--)
+			if ( ! (inw(ioaddr + EL3_STATUS) & CmdInProgress))
+				break;
 	}
 
 	return 0;
@@ -2415,50 +2054,65 @@ boomerang_rx(struct net_device *dev)
 	int rx_status;
 	int rx_work_limit = vp->dirty_rx + RX_RING_SIZE - vp->cur_rx;
 
-	if (vortex_debug > 5)
-		printk(KERN_DEBUG "boomerang_rx(): status %4.4x\n", inw(ioaddr+EL3_STATUS));
-
+	if (vp->msg_level & NETIF_MSG_RX_STATUS)
+		printk(KERN_DEBUG "  In boomerang_rx(), status %4.4x, rx_status "
+			   "%8.8x.\n",
+			   inw(ioaddr+EL3_STATUS), (int)inl(ioaddr+UpPktStatus));
 	while ((rx_status = le32_to_cpu(vp->rx_ring[entry].status)) & RxDComplete){
 		if (--rx_work_limit < 0)
 			break;
 		if (rx_status & RxDError) { /* Error, update stats. */
 			unsigned char rx_error = rx_status >> 16;
-			if (vortex_debug > 2)
+			if (vp->msg_level & NETIF_MSG_RX_ERR)
 				printk(KERN_DEBUG " Rx error: status %2.2x.\n", rx_error);
 			vp->stats.rx_errors++;
-			if (rx_error & 0x01)  vp->stats.rx_over_errors++;
 			if (rx_error & 0x02)  vp->stats.rx_length_errors++;
+			if (rx_error & 0x10)  vp->stats.rx_length_errors++;
 			if (rx_error & 0x04)  vp->stats.rx_frame_errors++;
 			if (rx_error & 0x08)  vp->stats.rx_crc_errors++;
-			if (rx_error & 0x10)  vp->stats.rx_length_errors++;
+			if (rx_error & 0x01) {
+				vp->stats.rx_over_errors++;
+				if (vp->drv_flags & HAS_V2_TX) {
+					int cur_rx_thresh = inb(ioaddr + RxPriorityThresh);
+					if (cur_rx_thresh < 0x20)
+						outb(cur_rx_thresh + 1, ioaddr + RxPriorityThresh);
+					else
+						printk(KERN_WARNING "%s: Excessive PCI latency causing"
+							   " packet corruption.\n", dev->name);
+				}
+			}
 		} else {
 			/* The packet length: up to 4.5K!. */
 			int pkt_len = rx_status & 0x1fff;
 			struct sk_buff *skb;
-			dma_addr_t dma = le32_to_cpu(vp->rx_ring[entry].addr);
 
-			if (vortex_debug > 4)
+			if (vp->msg_level & NETIF_MSG_RX_STATUS)
 				printk(KERN_DEBUG "Receiving packet size %d status %4.4x.\n",
 					   pkt_len, rx_status);
 
 			/* Check if the packet is long enough to just accept without
 			   copying to a properly sized skbuff. */
-			if (pkt_len < rx_copybreak && (skb = dev_alloc_skb(pkt_len + 2)) != 0) {
+			if (pkt_len < vp->rx_copybreak
+				&& (skb = dev_alloc_skb(pkt_len + 2)) != 0) {
 				skb->dev = dev;
 				skb_reserve(skb, 2);	/* Align IP on 16 byte boundaries */
-				pci_dma_sync_single(vp->pdev, dma, PKT_BUF_SZ, PCI_DMA_FROMDEVICE);
 				/* 'skb_put()' points to the start of sk_buff data area. */
 				memcpy(skb_put(skb, pkt_len),
-					   vp->rx_skbuff[entry]->tail,
-					   pkt_len);
-				vp->rx_copy++;
+					   le32desc_to_virt(vp->rx_ring[entry].addr), pkt_len);
+				rx_copy++;
 			} else {
+				void *temp;
 				/* Pass up the skbuff already on the Rx ring. */
 				skb = vp->rx_skbuff[entry];
 				vp->rx_skbuff[entry] = NULL;
-				skb_put(skb, pkt_len);
-				pci_unmap_single(vp->pdev, dma, PKT_BUF_SZ, PCI_DMA_FROMDEVICE);
-				vp->rx_nocopy++;
+				temp = skb_put(skb, pkt_len);
+				/* Remove this checking code for final release. */
+				if (le32desc_to_virt(vp->rx_ring[entry].addr) != temp)
+					printk(KERN_ERR "%s: Warning -- the skbuff addresses do not match"
+						   " in boomerang_rx: %p vs. %p.\n", dev->name,
+						   bus_to_virt(le32_to_cpu(vp->rx_ring[entry].addr)),
+						   temp);
+				rx_nocopy++;
 			}
 			skb->protocol = eth_type_trans(skb, dev);
 			{					/* Use hardware checksum info. */
@@ -2467,12 +2121,15 @@ boomerang_rx(struct net_device *dev)
 					(csum_bits == (IPChksumValid | TCPChksumValid) ||
 					 csum_bits == (IPChksumValid | UDPChksumValid))) {
 					skb->ip_summed = CHECKSUM_UNNECESSARY;
-					vp->rx_csumhits++;
+					rx_csumhits++;
 				}
 			}
 			netif_rx(skb);
 			dev->last_rx = jiffies;
 			vp->stats.rx_packets++;
+#if LINUX_VERSION_CODE > 0x20127
+			vp->stats.rx_bytes += pkt_len;
+#endif
 		}
 		entry = (++vp->cur_rx) % RX_RING_SIZE;
 	}
@@ -2481,20 +2138,12 @@ boomerang_rx(struct net_device *dev)
 		struct sk_buff *skb;
 		entry = vp->dirty_rx % RX_RING_SIZE;
 		if (vp->rx_skbuff[entry] == NULL) {
-			skb = dev_alloc_skb(PKT_BUF_SZ);
-			if (skb == NULL) {
-				static unsigned long last_jif;
-				if ((jiffies - last_jif) > 10 * HZ) {
-					printk(KERN_WARNING "%s: memory shortage\n", dev->name);
-					last_jif = jiffies;
-				}
-				if ((vp->cur_rx - vp->dirty_rx) == RX_RING_SIZE)
-					mod_timer(&vp->rx_oom_timer, RUN_AT(HZ * 1));
+			skb = dev_alloc_skb(vp->rx_buf_sz);
+			if (skb == NULL)
 				break;			/* Bad news!  */
-			}
 			skb->dev = dev;			/* Mark as being used by this device. */
 			skb_reserve(skb, 2);	/* Align IP on 16 byte boundaries */
-			vp->rx_ring[entry].addr = cpu_to_le32(pci_map_single(vp->pdev, skb->tail, PKT_BUF_SZ, PCI_DMA_FROMDEVICE));
+			vp->rx_ring[entry].addr = virt_to_le32desc(skb->tail);
 			vp->rx_skbuff[entry] = skb;
 		}
 		vp->rx_ring[entry].status = 0;	/* Clear complete bit. */
@@ -2503,37 +2152,12 @@ boomerang_rx(struct net_device *dev)
 	return 0;
 }
 
-/*
- * If we've hit a total OOM refilling the Rx ring we poll once a second
- * for some memory.  Otherwise there is no way to restart the rx process.
- */
-static void
-rx_oom_timer(unsigned long arg)
-{
-	struct net_device *dev = (struct net_device *)arg;
-	struct vortex_private *vp = (struct vortex_private *)dev->priv;
-
-	spin_lock_irq(&vp->lock);
-	if ((vp->cur_rx - vp->dirty_rx) == RX_RING_SIZE)	/* This test is redundant, but makes me feel good */
-		boomerang_rx(dev);
-	if (vortex_debug > 1) {
-		printk(KERN_DEBUG "%s: rx_oom_timer %s\n", dev->name,
-			((vp->cur_rx - vp->dirty_rx) != RX_RING_SIZE) ? "succeeded" : "retrying");
-	}
-	spin_unlock_irq(&vp->lock);
-}
-
 static void
 vortex_down(struct net_device *dev)
 {
 	struct vortex_private *vp = (struct vortex_private *)dev->priv;
 	long ioaddr = dev->base_addr;
 
-	netif_stop_queue (dev);
-
-	del_timer_sync(&vp->rx_oom_timer);
-	del_timer_sync(&vp->timer);
-
 	/* Turn off statistics ASAP.  We update vp->stats below. */
 	outw(StatsDisable, ioaddr + EL3_CMD);
 
@@ -2552,11 +2176,6 @@ vortex_down(struct net_device *dev)
 		outl(0, ioaddr + UpListPtr);
 	if (vp->full_bus_master_tx)
 		outl(0, ioaddr + DownListPtr);
-
-	if (vp->pdev && vp->enable_wol) {
-		pci_save_state(vp->pdev, vp->power_state);
-		acpi_set_WOL(dev);
-	}
 }
 
 static int
@@ -2566,94 +2185,42 @@ vortex_close(struct net_device *dev)
 	long ioaddr = dev->base_addr;
 	int i;
 
-	if (netif_device_present(dev))
-		vortex_down(dev);
+	netif_stop_tx_queue(dev);
 
-	if (vortex_debug > 1) {
+	if (vp->msg_level & NETIF_MSG_IFDOWN) {
 		printk(KERN_DEBUG"%s: vortex_close() status %4.4x, Tx status %2.2x.\n",
 			   dev->name, inw(ioaddr + EL3_STATUS), inb(ioaddr + TxStatus));
 		printk(KERN_DEBUG "%s: vortex close stats: rx_nocopy %d rx_copy %d"
 			   " tx_queued %d Rx pre-checksummed %d.\n",
-			   dev->name, vp->rx_nocopy, vp->rx_copy, vp->queued_packet, vp->rx_csumhits);
+			   dev->name, rx_nocopy, rx_copy, queued_packet, rx_csumhits);
 	}
 
-#if DO_ZEROCOPY
-	if (	vp->rx_csumhits &&
-			((vp->drv_flags & HAS_HWCKSM) == 0) &&
-			(hw_checksums[vp->card_idx] == -1)) {
-		printk(KERN_WARNING "%s supports hardware checksums, and we're not using them!\n", dev->name);
-		printk(KERN_WARNING "Please see http://www.uow.edu.au/~andrewm/zerocopy.html\n");
-	}
-#endif
-		
+	del_timer(&vp->timer);
+	vortex_down(dev);
 	free_irq(dev->irq, dev);
+	outw(TotalReset | 0x34, ioaddr + EL3_CMD);
 
 	if (vp->full_bus_master_rx) { /* Free Boomerang bus master Rx buffers. */
 		for (i = 0; i < RX_RING_SIZE; i++)
 			if (vp->rx_skbuff[i]) {
-				pci_unmap_single(	vp->pdev, le32_to_cpu(vp->rx_ring[i].addr),
-									PKT_BUF_SZ, PCI_DMA_FROMDEVICE);
-				dev_kfree_skb(vp->rx_skbuff[i]);
+#if LINUX_VERSION_CODE < 0x20100
+				vp->rx_skbuff[i]->free = 1;
+#endif
+				dev_free_skb(vp->rx_skbuff[i]);
 				vp->rx_skbuff[i] = 0;
 			}
 	}
 	if (vp->full_bus_master_tx) { /* Free Boomerang bus master Tx buffers. */
-		for (i = 0; i < TX_RING_SIZE; i++) {
+		for (i = 0; i < TX_RING_SIZE; i++)
 			if (vp->tx_skbuff[i]) {
-				struct sk_buff *skb = vp->tx_skbuff[i];
-#if DO_ZEROCOPY
-				int k;
-
-				for (k=0; k<=skb_shinfo(skb)->nr_frags; k++)
-						pci_unmap_single(vp->pdev,
-										 le32_to_cpu(vp->tx_ring[i].frag[k].addr),
-										 le32_to_cpu(vp->tx_ring[i].frag[k].length)&0xFFF,
-										 PCI_DMA_TODEVICE);
-#else
-				pci_unmap_single(vp->pdev, le32_to_cpu(vp->tx_ring[i].addr), skb->len, PCI_DMA_TODEVICE);
-#endif
-				dev_kfree_skb(skb);
+				dev_free_skb(vp->tx_skbuff[i]);
 				vp->tx_skbuff[i] = 0;
 			}
-		}
 	}
 
-	return 0;
-}
-
-static void
-dump_tx_ring(struct net_device *dev)
-{
-	if (vortex_debug > 0) {
-		struct vortex_private *vp = (struct vortex_private *)dev->priv;
-		long ioaddr = dev->base_addr;
-		
-		if (vp->full_bus_master_tx) {
-			int i;
-			int stalled = inl(ioaddr + PktStatus) & 0x04;	/* Possible racy. But it's only debug stuff */
+	MOD_DEC_USE_COUNT;
 
-			printk(KERN_ERR "  Flags; bus-master %d, dirty %d(%d) current %d(%d)\n",
-					vp->full_bus_master_tx,
-					vp->dirty_tx, vp->dirty_tx % TX_RING_SIZE,
-					vp->cur_tx, vp->cur_tx % TX_RING_SIZE);
-			printk(KERN_ERR "  Transmit list %8.8x vs. %p.\n",
-				   inl(ioaddr + DownListPtr),
-				   &vp->tx_ring[vp->dirty_tx % TX_RING_SIZE]);
-			issue_and_wait(dev, DownStall);
-			for (i = 0; i < TX_RING_SIZE; i++) {
-				printk(KERN_ERR "  %d: @%p  length %8.8x status %8.8x\n", i,
-					   &vp->tx_ring[i],
-#if DO_ZEROCOPY
-					   le32_to_cpu(vp->tx_ring[i].frag[0].length),
-#else
-					   le32_to_cpu(vp->tx_ring[i].length),
-#endif
-					   le32_to_cpu(vp->tx_ring[i].status));
-			}
-			if (!stalled)
-				outw(DownUnstall, ioaddr + EL3_CMD);
-		}
-	}
+	return 0;
 }
 
 static struct net_device_stats *vortex_get_stats(struct net_device *dev)
@@ -2661,10 +2228,11 @@ static struct net_device_stats *vortex_g
 	struct vortex_private *vp = (struct vortex_private *)dev->priv;
 	unsigned long flags;
 
-	if (netif_device_present(dev)) {	/* AKPM: Used to be netif_running */
-		spin_lock_irqsave (&vp->lock, flags);
+	if (netif_running(dev)) {
+		save_flags(flags);
+		cli();
 		update_stats(dev->base_addr, dev);
-		spin_unlock_irqrestore (&vp->lock, flags);
+		restore_flags(flags);
 	}
 	return &vp->stats;
 }
@@ -2699,112 +2267,170 @@ static void update_stats(long ioaddr, st
 	/* Don't bother with register 9, an extension of registers 6&7.
 	   If we do use the 6&7 values the atomic update assumption above
 	   is invalid. */
-	vp->stats.rx_bytes += inw(ioaddr + 10);
+	/* Rx Bytes is unreliable */	inw(ioaddr + 10);
+#if LINUX_VERSION_CODE > 0x020119
 	vp->stats.tx_bytes += inw(ioaddr + 12);
+#else
+	inw(ioaddr + 10);
+	inw(ioaddr + 12);
+#endif
 	/* New: On the Vortex we must also clear the BadSSD counter. */
 	EL3WINDOW(4);
 	inb(ioaddr + 12);
 
-	{
-		u8 up = inb(ioaddr + 13);
-		vp->stats.rx_bytes += (up & 0x0f) << 16;
-		vp->stats.tx_bytes += (up & 0xf0) << 12;
-	}
-
+	/* We change back to window 7 (not 1) with the Vortex. */
 	EL3WINDOW(old_window >> 13);
 	return;
 }
 
-
-static int netdev_ethtool_ioctl(struct net_device *dev, void *useraddr)
-{
-	struct vortex_private *vp = dev->priv;
-	u32 ethcmd;
-		
-	if (copy_from_user(&ethcmd, useraddr, sizeof(ethcmd)))
-		return -EFAULT;
-
-        switch (ethcmd) {
-        case ETHTOOL_GDRVINFO: {
-		struct ethtool_drvinfo info = {ETHTOOL_GDRVINFO};
-		strcpy(info.driver, DRV_NAME);
-		strcpy(info.version, DRV_VERSION);
-		if (vp->pdev)
-			strcpy(info.bus_info, vp->pdev->slot_name);
-		else
-			sprintf(info.bus_info, "EISA 0x%lx %d",
-				dev->base_addr, dev->irq);
-		if (copy_to_user(useraddr, &info, sizeof(info)))
-			return -EFAULT;
-		return 0;
-	}
-
-        }
-	
-	return -EOPNOTSUPP;
-}
-
 static int vortex_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 {
 	struct vortex_private *vp = (struct vortex_private *)dev->priv;
 	long ioaddr = dev->base_addr;
-	struct mii_ioctl_data *data = (struct mii_ioctl_data *)&rq->ifr_data;
-	int phy = vp->phys[0] & 0x1f;
-	int retval;
+	u16 *data = (u16 *)&rq->ifr_data;
+	u32 *data32 = (void *)&rq->ifr_data;
+	int phy = vp->phys[0];
 
 	switch(cmd) {
-	case SIOCETHTOOL:
-		return netdev_ethtool_ioctl(dev, (void *) rq->ifr_data);
-
-	case SIOCGMIIPHY:		/* Get address of MII PHY in use. */
-	case SIOCDEVPRIVATE:		/* for binary compat, remove in 2.5 */
-		data->phy_id = phy;
-
-	case SIOCGMIIREG:		/* Read MII PHY register. */
-	case SIOCDEVPRIVATE+1:		/* for binary compat, remove in 2.5 */
+	case 0x8947: case 0x89F0:
+		/* SIOCGMIIPHY: Get the address of the PHY in use. */
+		data[0] = phy;
+		/* Fall Through */
+	case 0x8948: case 0x89F1:
+		/* SIOCGMIIREG: Read the specified MII register. */
+		if (data[0] == 32) {	/* Emulate MII for 3c59*, 3c900. */
+			data[3] = 0;
+			switch (data[1]) {
+			case 0:
+				if (dev->if_port == XCVR_100baseTx) data[3] |= 0x2000;
+				if (vp->full_duplex) data[3] |= 0x0100;
+				break;
+			case 1:
+				if (vp->available_media & 0x02) data[3] |= 0x6000;
+				if (vp->available_media & 0x08) data[3] |= 0x1800;
+				spin_lock(&vp->window_lock);
+				EL3WINDOW(4);
+				if (inw(ioaddr + Wn4_Media) & Media_LnkBeat) data[3] |= 0x0004;
+				spin_unlock(&vp->window_lock);
+				break;
+			case 2: data[3] = 0x0280; break;	/* OUI 00:a0:24 */
+			case 3: data[3] = 0x9000; break;
+			default: break;
+			}
+			return 0;
+		}
+		spin_lock(&vp->window_lock);
 		EL3WINDOW(4);
-		data->val_out = mdio_read(dev, data->phy_id & 0x1f, data->reg_num & 0x1f);
-		retval = 0;
-		break;
-
-	case SIOCSMIIREG:		/* Write MII PHY register. */
-	case SIOCDEVPRIVATE+2:		/* for binary compat, remove in 2.5 */
-		if (!capable(CAP_NET_ADMIN)) {
-			retval = -EPERM;
-		} else {
-			EL3WINDOW(4);
-			mdio_write(dev, data->phy_id & 0x1f, data->reg_num & 0x1f, data->val_in);
-			retval = 0;
+		data[3] = mdio_read(ioaddr, data[0] & 0x1f, data[1] & 0x1f);
+		spin_unlock(&vp->window_lock);
+		return 0;
+	case 0x8949: case 0x89F2:
+		/* SIOCSMIIREG: Write the specified MII register */
+		if (!capable(CAP_NET_ADMIN))
+			return -EPERM;
+		if (data[0] == vp->phys[0]) {
+			u16 value = data[2];
+			if (vp->phys[0] == 32) {
+				if (data[1] == 0) {
+					vp->media_override = (value & 0x2000) ?
+						XCVR_100baseTx : XCVR_10baseT;
+					vp->full_duplex = (value & 0x0100) ? 1 : 0;
+					vp->medialock = 1;
+				}
+				return 0;
+			}
+			switch (data[1]) {
+			case 0:
+				/* Check for autonegotiation on or reset. */
+				vp->medialock = (value & 0x9000) ? 0 : 1;
+				if (vp->medialock)
+					vp->full_duplex = (value & 0x0100) ? 1 : 0;
+				break;
+			case 4: vp->advertising = value; break;
+			}
+			/* Perhaps check_duplex(dev), depending on chip semantics. */
 		}
-		break;
+		spin_lock(&vp->window_lock);
+		EL3WINDOW(4);
+		mdio_write(ioaddr, data[0] & 0x1f, data[1] & 0x1f, data[2]);
+		spin_unlock(&vp->window_lock);
+		return 0;
+	case SIOCGPARAMS:
+		data32[0] = vp->msg_level;
+		data32[1] = vp->multicast_filter_limit;
+		data32[2] = vp->max_interrupt_work;
+		data32[3] = vp->rx_copybreak;
+		return 0;
+	case SIOCSPARAMS:
+		if (!capable(CAP_NET_ADMIN))
+			return -EPERM;
+		vp->msg_level = data32[0];
+		vp->multicast_filter_limit = data32[1];
+		vp->max_interrupt_work = data32[2];
+		vp->rx_copybreak = data32[3];
+		return 0;
 	default:
-		retval = -EOPNOTSUPP;
-		break;
+		return -EOPNOTSUPP;
 	}
+}
 
-	return retval;
+static unsigned const ethernet_polynomial = 0x04c11db7U;
+static inline u32 ether_crc(int length, unsigned char *data)
+{
+	int crc = -1;
+
+	while(--length >= 0) {
+		unsigned char current_octet = *data++;
+		int bit;
+		for (bit = 0; bit < 8; bit++, current_octet >>= 1)
+			crc = (crc << 1) ^
+				((crc < 0) ^ (current_octet & 1) ? ethernet_polynomial : 0);
+	}
+	return crc;
 }
 
 /* Pre-Cyclone chips have no documented multicast filter, so the only
-   multicast setting is to receive all multicast frames.  At least
-   the chip has a very clean way to set the mode, unlike many others. */
+   multicast setting is to receive all multicast frames.  Cyclone and later
+   chips have a write-only table of unknown size.
+   At least the chip has a very clean way to set the other filter modes. */
 static void set_rx_mode(struct net_device *dev)
 {
+	struct vortex_private *vp = (void *)dev->priv;
 	long ioaddr = dev->base_addr;
 	int new_mode;
 
 	if (dev->flags & IFF_PROMISC) {
-		if (vortex_debug > 0)
-			printk(KERN_NOTICE "%s: Setting promiscuous mode.\n", dev->name);
+		/* Unconditionally log a net tap. */
+		printk(KERN_NOTICE "%s: Setting promiscuous mode.\n", dev->name);
 		new_mode = SetRxFilter|RxStation|RxMulticast|RxBroadcast|RxProm;
-	} else	if ((dev->mc_list)  ||  (dev->flags & IFF_ALLMULTI)) {
+	} else if (dev->flags & IFF_ALLMULTI) {
+		new_mode = SetRxFilter|RxStation|RxMulticast|RxBroadcast;
+	} else if ((vp->drv_flags & HAS_V2_TX) &&
+			   dev->mc_count < vp->multicast_filter_limit) {
+		struct dev_mc_list *mclist;
+		int i;
+		for (i = 0, mclist = dev->mc_list; mclist && i < dev->mc_count;
+			 i++, mclist = mclist->next) {
+			int filter_bit = ether_crc(ETH_ALEN, mclist->dmi_addr) & 0xff;
+			if (test_bit(filter_bit, vp->mc_filter))
+				continue;
+			outw(SetFilterBit | 0x0400 | filter_bit, ioaddr + EL3_CMD);
+			set_bit(filter_bit, vp->mc_filter);
+		}
+
+		new_mode = SetRxFilter|RxStation|RxMulticastHash|RxBroadcast;
+	} else if (dev->mc_count) {
 		new_mode = SetRxFilter|RxStation|RxMulticast|RxBroadcast;
 	} else
 		new_mode = SetRxFilter | RxStation | RxBroadcast;
 
-	outw(new_mode, ioaddr + EL3_CMD);
+	if (vp->rx_mode != new_mode) {
+		vp->rx_mode = new_mode;
+		outw(new_mode, ioaddr + EL3_CMD);
+	}
 }
 
+
 /* MII transceiver control section.
    Read and write the MII registers using software-generated serial
    MDIO protocol.  See the MII specifications or DP83840A data sheet
@@ -2837,17 +2463,13 @@ static void mdio_sync(long ioaddr, int b
 	}
 }
 
-static int mdio_read(struct net_device *dev, int phy_id, int location)
+static int mdio_read(long ioaddr, int phy_id, int location)
 {
-	struct vortex_private *vp = (struct vortex_private *)dev->priv;
 	int i;
-	long ioaddr = dev->base_addr;
 	int read_cmd = (0xf6 << 10) | (phy_id << 5) | location;
 	unsigned int retval = 0;
 	long mdio_addr = ioaddr + Wn4_PhysicalMgmt;
 
-	spin_lock_bh(&vp->mdio_lock);
-
 	if (mii_preamble_required)
 		mdio_sync(ioaddr, 32);
 
@@ -2859,28 +2481,23 @@ static int mdio_read(struct net_device *
 		outw(dataval | MDIO_SHIFT_CLK, mdio_addr);
 		mdio_delay();
 	}
-	/* Read the two transition, 16 data, and wire-idle bits. */
-	for (i = 19; i > 0; i--) {
+	/* Read the two transition and 16 data bits. */
+	for (i = 18; i > 0; i--) {
 		outw(MDIO_ENB_IN, mdio_addr);
 		mdio_delay();
 		retval = (retval << 1) | ((inw(mdio_addr) & MDIO_DATA_READ) ? 1 : 0);
 		outw(MDIO_ENB_IN | MDIO_SHIFT_CLK, mdio_addr);
 		mdio_delay();
 	}
-	spin_unlock_bh(&vp->mdio_lock);
-	return retval & 0x20000 ? 0xffff : retval>>1 & 0xffff;
+	return retval & 0x10000 ? 0xffff : retval & 0xffff;
 }
 
-static void mdio_write(struct net_device *dev, int phy_id, int location, int value)
+static void mdio_write(long ioaddr, int phy_id, int location, int value)
 {
-	struct vortex_private *vp = (struct vortex_private *)dev->priv;
-	long ioaddr = dev->base_addr;
 	int write_cmd = 0x50020000 | (phy_id << 23) | (location << 18) | value;
 	long mdio_addr = ioaddr + Wn4_PhysicalMgmt;
 	int i;
 
-	spin_lock_bh(&vp->mdio_lock);
-
 	if (mii_preamble_required)
 		mdio_sync(ioaddr, 32);
 
@@ -2893,16 +2510,12 @@ static void mdio_write(struct net_device
 		mdio_delay();
 	}
 	/* Leave the interface idle. */
-	for (i = 1; i >= 0; i--) {
-		outw(MDIO_ENB_IN, mdio_addr);
-		mdio_delay();
-		outw(MDIO_ENB_IN | MDIO_SHIFT_CLK, mdio_addr);
-		mdio_delay();
-	}
-	spin_unlock_bh(&vp->mdio_lock);
+	mdio_sync(ioaddr, 32);
+
 	return;
 }
 
+#if ! defined(NO_PCI)
 /* ACPI: Advanced Configuration and Power Interface. */
 /* Set Wake-On-LAN mode and put the board into D3 (power-down) state. */
 static void acpi_set_WOL(struct net_device *dev)
@@ -2916,121 +2529,118 @@ static void acpi_set_WOL(struct net_devi
 	/* The RxFilter must accept the WOL frames. */
 	outw(SetRxFilter|RxStation|RxMulticast|RxBroadcast, ioaddr + EL3_CMD);
 	outw(RxEnable, ioaddr + EL3_CMD);
-
 	/* Change the power state to D3; RxEnable doesn't take effect. */
-	pci_enable_wake(vp->pdev, 0, 1);
-	pci_set_power_state(vp->pdev, 3);
+	pci_write_config_word(vp->pci_dev, 0xe0, 0x8103);
 }
+#endif
 
-
-static void __devexit vortex_remove_one (struct pci_dev *pdev)
+static int pwr_event(void *dev_instance, int event)
 {
-	struct net_device *dev = pci_get_drvdata(pdev);
-	struct vortex_private *vp;
+	struct net_device *dev = dev_instance;
+	struct vortex_private *np = (struct vortex_private *)dev->priv;
+	long ioaddr = dev->base_addr;
 
-	if (!dev) {
-		printk("vortex_remove_one called for EISA device!\n");
-		BUG();
+	if (np->msg_level & NETIF_MSG_LINK)
+		printk(KERN_DEBUG "%s: Handling power event %d.\n", dev->name, event);
+	switch(event) {
+	case DRV_ATTACH:
+		MOD_INC_USE_COUNT;
+		break;
+	case DRV_SUSPEND:
+		vortex_down(dev);
+		netif_stop_tx_queue(dev);
+		if (np->capabilities & CapPwrMgmt)
+			acpi_set_WOL(dev);
+		break;
+	case DRV_RESUME:
+		/* This is incomplete: the actions are very chip specific. */
+		activate_xcvr(dev);
+		set_media_type(dev);
+		start_operation(dev);
+		np->rx_mode = 0;
+		set_rx_mode(dev);
+		start_operation1(dev);
+		break;
+	case DRV_DETACH: {
+		struct net_device **devp, **next;
+		if (dev->flags & IFF_UP) {
+			dev_close(dev);
+			dev->flags &= ~(IFF_UP|IFF_RUNNING);
+		}
+		unregister_netdev(dev);
+		release_region(dev->base_addr, pci_tbl[np->chip_id].io_size);
+#ifndef USE_IO_OPS
+		iounmap((char *)dev->base_addr);
+#endif
+		for (devp = &root_vortex_dev; *devp; devp = next) {
+			next = &((struct vortex_private *)(*devp)->priv)->next_module;
+			if (*devp == dev) {
+				*devp = *next;
+				break;
+			}
+		}
+		if (np->priv_addr)
+			kfree(np->priv_addr);
+		kfree(dev);
+		MOD_DEC_USE_COUNT;
+		break;
 	}
-
-	vp = dev->priv;
-
-	/* AKPM: FIXME: we should have
-	 *	if (vp->cb_fn_base) iounmap(vp->cb_fn_base);
-	 * here
-	 */
-	unregister_netdev(dev);
-	/* Should really use issue_and_wait() here */
-	outw(TotalReset|0x14, dev->base_addr + EL3_CMD);
-
-	if (vp->pdev && vp->enable_wol) {
-		pci_set_power_state(vp->pdev, 0);	/* Go active */
-		if (vp->pm_state_valid)
-			pci_restore_state(vp->pdev, vp->power_state);
+	case DRV_PWR_WakeOn:
+		if ( ! (np->capabilities & CapPwrMgmt))
+			return -1;
+		EL3WINDOW(7);
+		/* Power up on: 1=Downloaded Filter, 2=Magic Packets, 4=Link Status.*/
+		outw(2, ioaddr + 12);
+		/* This RxEnable doesn't take effect if we immediately change to D3. */
+		outw(SetRxFilter|RxStation|RxMulticast|RxBroadcast, ioaddr + EL3_CMD);
+		outw(RxEnable, ioaddr + EL3_CMD);
+		acpi_set_pwr_state(np->pci_dev, ACPI_D3);
+		break;
 	}
-
-	pci_free_consistent(pdev,
-						sizeof(struct boom_rx_desc) * RX_RING_SIZE
-							+ sizeof(struct boom_tx_desc) * TX_RING_SIZE,
-						vp->rx_ring,
-						vp->rx_ring_dma);
-	if (vp->must_free_region)
-		release_region(dev->base_addr, vp->io_size);
-	kfree(dev);
-}
-
-
-static struct pci_driver vortex_driver = {
-	name:		"3c59x",
-	probe:		vortex_init_one,
-	remove:		__devexit_p(vortex_remove_one),
-	id_table:	vortex_pci_tbl,
-#ifdef CONFIG_PM
-	suspend:	vortex_suspend,
-	resume:		vortex_resume,
-#endif
-};
-
-
-static int vortex_have_pci;
-static int vortex_have_eisa;
-
-
-static int __init vortex_init (void)
-{
-	int pci_rc, eisa_rc;
-
-	pci_rc = pci_module_init(&vortex_driver);
-	eisa_rc = vortex_eisa_init();
-
-	if (pci_rc == 0)
-		vortex_have_pci = 1;
-	if (eisa_rc > 0)
-		vortex_have_eisa = 1;
-
-	return (vortex_have_pci + vortex_have_eisa) ? 0 : -ENODEV;
+	return 0;
 }
 
-
-static void __exit vortex_eisa_cleanup (void)
+
+#ifdef MODULE
+void cleanup_module(void)
 {
-	struct net_device *dev, *tmp;
-	struct vortex_private *vp;
-	long ioaddr;
-
-	dev = root_vortex_eisa_dev;
+	struct net_device *next_dev;
 
-	while (dev) {
-		vp = dev->priv;
-		ioaddr = dev->base_addr;
-
-		unregister_netdev (dev);
-		outw (TotalReset, ioaddr + EL3_CMD);
-		release_region (ioaddr, VORTEX_TOTAL_SIZE);
-
-		tmp = dev;
-		dev = vp->next_module;
+#ifdef CARDBUS
+	unregister_driver(&vortex_ops);
+#elif	! defined(NO_PCI)
+	pci_drv_unregister(&vortex_drv_id);
+#endif
 
-		kfree (tmp);
+	/* No need to check MOD_IN_USE, as sys_delete_module() checks. */
+	while (root_vortex_dev) {
+		struct vortex_private *vp=(void *)(root_vortex_dev->priv);
+		unregister_netdev(root_vortex_dev);
+		outw(TotalReset | 0x14, root_vortex_dev->base_addr + EL3_CMD);
+		if (vp->capabilities & CapPwrMgmt)
+			acpi_set_WOL(root_vortex_dev);
+#ifdef USE_MEM_OPS
+		iounmap((char *)root_vortex_dev->base_addr);
+#else
+		release_region(root_vortex_dev->base_addr,
+					   pci_tbl[vp->chip_id].io_size);
+#endif
+		next_dev = vp->next_module;
+		if (vp->priv_addr)
+			kfree(vp->priv_addr);
+		kfree(root_vortex_dev);
+		root_vortex_dev = next_dev;
 	}
 }
 
-
-static void __exit vortex_cleanup (void)
-{
-	if (vortex_have_pci)
-		pci_unregister_driver (&vortex_driver);
-	if (vortex_have_eisa)
-		vortex_eisa_cleanup ();
-}
-
-
-module_init(vortex_init);
-module_exit(vortex_cleanup);
-
+#endif  /* MODULE */
 
 /*
  * Local variables:
+ *  compile-command: "make KERNVER=`uname -r` 3c59x.o"
+ *  compile-cmd: "gcc -DMODULE -Wall -Wstrict-prototypes -O6 -c 3c59x.c"
+ *  cardbus-compile-command: "gcc -DCARDBUS -DMODULE -Wall -Wstrict-prototypes -O6 -c 3c59x.c -o 3c575_cb.o -I/usr/src/pcmcia/include/"
+ *  eisa-only-compile: "gcc -DNO_PCI -DMODULE -O6 -c 3c59x.c -o 3c597.o"
  *  c-indent-level: 4
  *  c-basic-offset: 4
  *  tab-width: 4
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/net/Config.in linux-2.4.20-wolk4.4-fullkernel/drivers/net/Config.in
--- linux-2.4.20-wolk4.3-fullkernel/drivers/net/Config.in	2003-07-30 13:51:26.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/net/Config.in	2003-07-30 11:28:38.000000000 +0200
@@ -190,6 +190,11 @@ if [ "$CONFIG_NET_ETHERNET" = "y" ]; the
       fi
       dep_tristate '    Davicom DM910x/DM980x support' CONFIG_DM9102 $CONFIG_PCI
       dep_tristate '    EtherExpressPro/100 support (eepro100, original Becker driver)' CONFIG_EEPRO100 $CONFIG_PCI
+      if [ "$CONFIG_VISWS" = "y" ]; then
+         define_bool CONFIG_EEPRO100_PIO y
+      else
+         dep_mbool '      Use PIO instead of MMIO' CONFIG_EEPRO100_PIO $CONFIG_EEPRO100
+      fi  
       dep_tristate '    EtherExpressPro/100 support (e100, Alternate Intel driver)' CONFIG_E100 $CONFIG_PCI
       dep_tristate '    Mylex EISA LNE390A/B support (EXPERIMENTAL)' CONFIG_LNE390 $CONFIG_EISA $CONFIG_EXPERIMENTAL
       dep_tristate '    Myson MTD-8xx PCI Ethernet support' CONFIG_FEALNX $CONFIG_PCI
@@ -252,27 +257,36 @@ endmenu
 
 mainmenu_option next_comment
 comment 'Ethernet (1000 Mbit)'
-
 bool 'Ethernet (1000 Mbit)' CONFIG_NET_GIGABIT_ETH
 if [ "$CONFIG_NET_GIGABIT_ETH" = "y" ]; then
 
-   dep_tristate 'Alteon AceNIC/3Com 3C985/NetGear GA620 Gigabit support' CONFIG_ACENIC $CONFIG_PCI
+   dep_tristate '  Alteon AceNIC/3Com 3C985/NetGear GA620 Gigabit support' CONFIG_ACENIC $CONFIG_PCI
    if [ "$CONFIG_ACENIC" != "n" ]; then
-      bool '  Omit support for old Tigon I based AceNICs' CONFIG_ACENIC_OMIT_TIGON_I
+      bool '    Omit support for old Tigon I based AceNICs' CONFIG_ACENIC_OMIT_TIGON_I
    fi
-   dep_tristate 'D-Link DL2000-based Gigabit Ethernet support' CONFIG_DL2K $CONFIG_PCI
-   dep_tristate 'Intel(R) PRO/1000 Gigabit Ethernet support' CONFIG_E1000 $CONFIG_PCI
-   dep_tristate 'MyriCOM Gigabit Ethernet support' CONFIG_MYRI_SBUS $CONFIG_SBUS
-   dep_tristate 'National Semiconductor DP83820 support' CONFIG_NS83820 $CONFIG_PCI
-   dep_tristate 'Netgear GA621 Gigabit Fiber support' CONFIG_NETGEAR_GA621 $CONFIG_PCI
-   dep_tristate 'Netgear GA622T Gigabit UTP support' CONFIG_NETGEAR_GA622 $CONFIG_PCI
-   dep_tristate 'Packet Engines Hamachi GNIC-II support' CONFIG_HAMACHI $CONFIG_PCI
-   dep_tristate 'Packet Engines Yellowfin Gigabit-NIC support (EXPERIMENTAL)' CONFIG_YELLOWFIN $CONFIG_PCI $CONFIG_EXPERIMENTAL
-   dep_tristate 'SysKonnect SK-98xx and SK-95xx Gigabit Ethernet Adapter family support' CONFIG_SK98LIN $CONFIG_PCI
-   dep_tristate 'SysKonnect SK-9Dxx support' CONFIG_SK9DLIN $CONFIG_PCI m
-   dep_tristate 'Broadcom BCM5700 support' CONFIG_NET_BROADCOM $CONFIG_PCI m
-   dep_tristate 'Broadcom Tigon3 support' CONFIG_TIGON3 $CONFIG_PCI
-
+   dep_tristate '  Broadcom BCM5700 support' CONFIG_NET_BROADCOM $CONFIG_PCI m
+   dep_tristate '  Broadcom Tigon3 support' CONFIG_TIGON3 $CONFIG_PCI
+   dep_tristate '  D-Link DL2000-based Gigabit Ethernet support' CONFIG_DL2K $CONFIG_PCI
+   dep_tristate '  Intel(R) PRO/1000 Gigabit Ethernet support' CONFIG_E1000 $CONFIG_PCI
+   dep_tristate '  MyriCOM Gigabit Ethernet support' CONFIG_MYRI_SBUS $CONFIG_SBUS
+   dep_tristate '  National Semiconductor DP83820 support' CONFIG_NS83820 $CONFIG_PCI
+   dep_tristate '  Netgear GA621 Gigabit Fiber support' CONFIG_NETGEAR_GA621 $CONFIG_PCI
+   dep_tristate '  Netgear GA622T Gigabit UTP support' CONFIG_NETGEAR_GA622 $CONFIG_PCI
+   dep_tristate '  Packet Engines Hamachi GNIC-II support' CONFIG_HAMACHI $CONFIG_PCI
+   dep_tristate '  Packet Engines Yellowfin Gigabit-NIC support (EXPERIMENTAL)' CONFIG_YELLOWFIN $CONFIG_PCI $CONFIG_EXPERIMENTAL
+   dep_tristate '  SysKonnect SK-98xx Support / Marvell Yukon Chipset' CONFIG_SK98LIN $CONFIG_PCI
+   if [ "$CONFIG_SK98LIN" != "n" ]; then
+      bool '    SysKonnect SK-98xx Server Gigabit Adapter' CONFIG_SK98LIN_T2
+      bool '    SysKonnect SK-98xx V2.0 Gigabit Ethernet Adapter' CONFIG_SK98LIN_T5
+      bool '    3Com 3C940/3C941 Gigabit Ethernet Adapter' CONFIG_SK98LIN_T1
+      bool '    Allied Telesyn AT-29xx Gigabit Ethernet Adapter' CONFIG_SK98LIN_T3
+      bool '    CNet N-Way Gigabit Ethernet Adapter' CONFIG_SK98LIN_T8
+      bool '    D-Link DGE-530T Gigabit Ethernet Adapter' CONFIG_SK98LIN_T6
+      bool '    Linksys EG10xx Ethernet Server Adapter' CONFIG_SK98LIN_T9
+      bool '    Marvell RDK-80xx Adapter' CONFIG_SK98LIN_T4
+      bool '    Marvell Yukon Gigabit Ethernet Adapter' CONFIG_SK98LIN_T7
+   fi
+   dep_tristate '  SysKonnect SK-9Dxx support' CONFIG_SK9DLIN $CONFIG_PCI m
 fi
 
 endmenu
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/net/Makefile linux-2.4.20-wolk4.4-fullkernel/drivers/net/Makefile
--- linux-2.4.20-wolk4.3-fullkernel/drivers/net/Makefile	2003-07-30 13:51:26.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/net/Makefile	2003-07-30 12:57:45.000000000 +0200
@@ -17,7 +17,7 @@ O_TARGET := net.o
 
 export-objs     :=	8390.o arlan.o aironet4500_core.o aironet4500_card.o \
 			ppp_async.o ppp_generic.o slhc.o pppox.o auto_irq.o \
-			net_init.o mii.o
+			net_init.o mii.o pci-scan.o
 list-multi	:=	rcpci.o
 rcpci-objs	:=	rcpci45.o rclanmtl.o
 
@@ -88,7 +88,7 @@ obj-$(CONFIG_OAKNET) += oaknet.o 8390.o
 
 obj-$(CONFIG_DGRS) += dgrs.o
 obj-$(CONFIG_RCPCI) += rcpci.o
-obj-$(CONFIG_VORTEX) += 3c59x.o mii.o
+obj-$(CONFIG_VORTEX) += 3c59x.o mii.o pci-scan.o
 obj-$(CONFIG_TYPHOON) += typhoon.o
 obj-$(CONFIG_BC90X) += 3c90x.o
 obj-$(CONFIG_NE2K_PCI) += ne2k-pci.o 8390.o
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/net/bcm/b57um.c linux-2.4.20-wolk4.4-fullkernel/drivers/net/bcm/b57um.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/net/bcm/b57um.c	2003-07-30 13:51:28.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/net/bcm/b57um.c	2003-07-30 10:34:46.000000000 +0200
@@ -12,8 +12,8 @@
 
 
 char bcm5700_driver[] = "bcm5700";
-char bcm5700_version[] = "6.2.2";
-char bcm5700_date[] = "(04/09/03)";
+char bcm5700_version[] = "6.2.11";
+char bcm5700_date[] = "(05/16/03)";
 
 #define B57UM
 #include "mm.h"
@@ -423,6 +423,7 @@ typedef enum {
 	BCM5704S,
 	BCM5705,
 	BCM5705M,
+	BCM5901,
 	BCM5782,
 	BCM5788
 } board_t;
@@ -478,6 +479,7 @@ static struct {
 	{ "Broadcom BCM5704 1000Base-SX" },
 	{ "Broadcom BCM5705 1000Base-T" },
 	{ "Broadcom BCM5705M 1000Base-T" },
+	{ "Broadcom BCM5901 100Base-TX" },
 	{ "Broadcom NetXtreme Gigabit Ethernet for hp" },
 	{ "Broadcom BCM5788 1000Base-T" },
 	{ 0 },
@@ -536,6 +538,9 @@ static struct pci_device_id bcm5700_pci_
 	{0x14e4, 0x16a7, 0x0e11, 0xcb, 0, 0, NC7781 },
 	{0x14e4, 0x16a7, 0x1014, 0x0281, 0, 0, BCM5703ARBUCKLE },
 	{0x14e4, 0x16a7, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5703 },
+	{0x14e4, 0x16c7, 0x14e4, 0x000a, 0, 0, BCM5703A31 },
+	{0x14e4, 0x16c7, 0x0e11, 0xca, 0, 0, NC7771 },
+	{0x14e4, 0x16c7, 0x0e11, 0xcb, 0, 0, NC7781 },
 	{0x14e4, 0x16c7, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5703 },
 	{0x14e4, 0x1648, 0x0e11, 0xcf, 0, 0, NC7772 },
 	{0x14e4, 0x1648, 0x0e11, 0xd0, 0, 0, NC7782 },
@@ -555,6 +560,8 @@ static struct pci_device_id bcm5700_pci_
 	{0x14e4, 0x165e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5705M },
 	{0x14e4, 0x1696, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5782 },
 	{0x14e4, 0x169c, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5788 },
+	{0x14e4, 0x170d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5901 },
+	{0x14e4, 0x170e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5901 },
 	{0,}
 };
 
@@ -915,8 +922,8 @@ bcm5700_open(struct net_device *dev)
 	if (pUmDevice->suspended)
 		return -EAGAIN;
 
-	/* delay for 4 seconds */
-	pUmDevice->delayed_link_ind = (4 * HZ) / pUmDevice->timer_interval;
+	/* delay for 6 seconds */
+	pUmDevice->delayed_link_ind = (6 * HZ) / pUmDevice->timer_interval;
 
 #ifdef BCM_INT_COAL
 #ifndef BCM_NAPI_RXPOLL
@@ -948,6 +955,7 @@ bcm5700_open(struct net_device *dev)
 
 	pUmDevice->opened = 1;
 	if (LM_InitializeAdapter(pDevice) != LM_STATUS_SUCCESS) {
+		pUmDevice->opened = 0;
 		free_irq(dev->irq, dev);
 		bcm5700_freemem(dev);
 		return -EAGAIN;
@@ -1016,12 +1024,13 @@ bcm5700_timer(unsigned long data)
 		BCM5700_PHY_LOCK(pUmDevice, flags);
 		value32 = REG_RD(pDevice, MacCtrl.Status);
 		if (((pDevice->LinkStatus == LM_STATUS_LINK_ACTIVE) &&
-			((value32 & MAC_STATUS_LINK_STATE_CHANGED) ||
+			((value32 & (MAC_STATUS_LINK_STATE_CHANGED |
+				MAC_STATUS_CFG_CHANGED)) ||
 			!(value32 & MAC_STATUS_PCS_SYNCED)))
 			||
 			((pDevice->LinkStatus != LM_STATUS_LINK_ACTIVE) &&
 			(value32 & (MAC_STATUS_PCS_SYNCED |
-			MAC_STATUS_SIGNAL_DETECTED))))
+				MAC_STATUS_SIGNAL_DETECTED))))
 		{
 			LM_SetupPhy(pDevice);
 		}
@@ -1473,7 +1482,10 @@ bcm5700_poll(struct net_device *dev, int
 		netif_rx_complete(dev);
 		REG_WR(pDevice, Grc.Mode, pDevice->GrcMode);
 		pDevice->RxPoll = FALSE;
-		if (pDevice->pStatusBlkVirt->Status & STATUS_BLOCK_UPDATED) {
+		if ((pDevice->pStatusBlkVirt->Status & STATUS_BLOCK_UPDATED) ||
+			(pDevice->pStatusBlkVirt->Idx[0].RcvProdIdx !=
+			pDevice->RcvRetConIdx)) {
+
 			REG_WR(pDevice, HostCoalesce.Mode,
 				pDevice->CoalesceMode | HOST_COALESCE_ENABLE |
 				HOST_COALESCE_NOW);
@@ -2036,10 +2048,15 @@ static int netdev_ethtool_ioctl(struct n
 	case ETHTOOL_GLINK: {
 		struct ethtool_value edata = {ETHTOOL_GLINK};
 
-		if (pDevice->LinkStatus == LM_STATUS_LINK_ACTIVE)
+		if (pUmDevice->delayed_link_ind > 0)
+			return -EOPNOTSUPP;
+
+		if (pDevice->LinkStatus == LM_STATUS_LINK_ACTIVE) {
 			edata.data =  1;
-		else
+		}
+		else {
 			edata.data =  0;
+		}
 		if (copy_to_user(useraddr, &edata, sizeof(edata)))
 			return -EFAULT;
 		return 0;
@@ -2057,9 +2074,25 @@ static int netdev_ethtool_ioctl(struct n
 		}
 		BCM5700_PHY_LOCK(pUmDevice, flags);
 		if (pDevice->EnableTbi) {
+			pDevice->RequestedLineSpeed = LM_LINE_SPEED_1000MBPS;
+			pDevice->DisableAutoNeg = TRUE;
+			LM_SetupPhy(pDevice);
+
+			pDevice->RequestedLineSpeed = LM_LINE_SPEED_AUTO;
+			pDevice->DisableAutoNeg = FALSE;
 			LM_SetupPhy(pDevice);
 		}
 		else {
+			if ((T3_ASIC_REV(pDevice->ChipRevId) ==
+					T3_ASIC_REV_5703) ||
+				(T3_ASIC_REV(pDevice->ChipRevId) ==
+					T3_ASIC_REV_5704) ||
+				(T3_ASIC_REV(pDevice->ChipRevId) ==
+					T3_ASIC_REV_5705))
+			{
+				LM_ResetPhy(pDevice);
+				LM_SetupPhy(pDevice);
+			}
 			LM_ReadPhy(pDevice, PHY_CTRL_REG, &phyctrl);
 			LM_WritePhy(pDevice, PHY_CTRL_REG, phyctrl |
 				PHY_CTRL_AUTO_NEG_ENABLE |
@@ -2329,6 +2362,10 @@ STATIC int bcm5700_ioctl(struct net_devi
 		if (pDevice->EnableTbi)
 			return -EOPNOTSUPP;
 
+		if (pUmDevice->delayed_link_ind > 0) {
+			return -EOPNOTSUPP;
+		}
+
 		BCM5700_PHY_LOCK(pUmDevice, flags);
 		LM_ReadPhy(pDevice, data[1] & 0x1f, (LM_UINT32 *) &value);
 		BCM5700_PHY_UNLOCK(pUmDevice, flags);
@@ -2823,8 +2860,9 @@ MM_ScheduleRxPoll(LM_DEVICE_BLOCK *pDevi
 
 	if (netif_rx_schedule_prep(dev)) {
 		__netif_rx_schedule(dev);
+		return LM_STATUS_SUCCESS;
 	}
-	return LM_STATUS_SUCCESS;
+	return LM_STATUS_FAILURE;
 }
 #endif
 
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/net/bcm/lm.h linux-2.4.20-wolk4.4-fullkernel/drivers/net/bcm/lm.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/net/bcm/lm.h	2003-07-30 13:51:28.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/net/bcm/lm.h	2003-07-30 10:34:46.000000000 +0200
@@ -408,6 +408,7 @@ LM_STATUS LM_NvramRead(PLM_DEVICE_BLOCK 
     LM_UINT32 *pData);
 LM_STATUS LM_NvramWriteBlock(PLM_DEVICE_BLOCK pDevice, LM_UINT32 Offset,
     LM_UINT32 *pData, LM_UINT32 Size);
+LM_VOID LM_ResetPhy(PLM_DEVICE_BLOCK pDevice);
 
 
 
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/net/bcm/tigon3.c linux-2.4.20-wolk4.4-fullkernel/drivers/net/bcm/tigon3.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/net/bcm/tigon3.c	2003-07-30 13:51:28.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/net/bcm/tigon3.c	2003-07-30 10:34:46.000000000 +0200
@@ -33,7 +33,6 @@ STATIC LM_STATUS LM_SetFlowControl(PLM_D
     LM_UINT32 LocalPhyAd, LM_UINT32 RemotePhyAd);
 STATIC LM_STATUS LM_SetupFiberPhy(PLM_DEVICE_BLOCK pDevice);
 STATIC LM_STATUS LM_SetupCopperPhy(PLM_DEVICE_BLOCK pDevice);
-STATIC LM_VOID LM_ResetPhy(LM_DEVICE_BLOCK *pDevice);
 STATIC LM_VOID LM_SetEthWireSpeed(LM_DEVICE_BLOCK *pDevice);
 STATIC LM_STATUS LM_PhyAdvertiseAll(LM_DEVICE_BLOCK *pDevice);
 STATIC LM_STATUS LM_InitBcm800xPhy(PLM_DEVICE_BLOCK pDevice);
@@ -1243,7 +1242,7 @@ PLM_DEVICE_BLOCK pDevice)
     pDevice->PhyIntMode = T3_PHY_INT_MODE_AUTO;
     pDevice->LinkChngMode = T3_LINK_CHNG_MODE_AUTO;
     pDevice->LedMode = LED_MODE_AUTO;
-    pDevice->ResetPhyOnInit = TRUE;
+    pDevice->ResetPhyOnInit = FALSE;
     pDevice->ResetPhyOnLinkDown = FALSE;
     pDevice->DelayPciGrant = TRUE;
     pDevice->UseTaggedStatus = FALSE;
@@ -1265,7 +1264,7 @@ PLM_DEVICE_BLOCK pDevice)
 
     if ((T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5703) ||
         (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5704) ||
-        (pDevice->ChipRevId == T3_CHIP_ID_5705_A0))
+        (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5705))
     {
         pDevice->ResetPhyOnLinkDown = TRUE;
     }
@@ -1326,6 +1325,11 @@ PLM_DEVICE_BLOCK pDevice)
         {
             pDevice->Bcm5788 = TRUE;
         }
+        if ((pDevice->PciDeviceId == T3_PCI_DEVICE_ID(T3_PCI_ID_BCM5901)) ||
+            (pDevice->PciDeviceId == T3_PCI_DEVICE_ID(T3_PCI_ID_BCM5901A2)))
+        {
+            pDevice->No1000 = TRUE;
+        }
     }
 
     pDevice->SplitModeEnable = SPLIT_MODE_DISABLE;
@@ -1455,13 +1459,21 @@ PLM_DEVICE_BLOCK pDevice)
     REG_WR(pDevice, MacCtrl.MiMode, pDevice->MiMode);
     MM_Wait(40);
 
-    /* Get the PHY id. */
-    LM_ReadPhy(pDevice, PHY_ID1_REG, &Value32);
-    pDevice->PhyId = (Value32 & PHY_ID1_OUI_MASK) << 10;
-
-    LM_ReadPhy(pDevice, PHY_ID2_REG, &Value32);
-    pDevice->PhyId |= ((Value32 & PHY_ID2_OUI_MASK) << 16) |
-      (Value32 & PHY_ID2_MODEL_MASK) | (Value32 & PHY_ID2_REV_MASK);
+    if (pDevice->EnableAsf)
+    {
+        /* Reading PHY registers will contend with ASF */
+        pDevice->PhyId = 0;
+    }
+    else
+    {
+        /* Get the PHY id. */
+        LM_ReadPhy(pDevice, PHY_ID1_REG, &Value32);
+        pDevice->PhyId = (Value32 & PHY_ID1_OUI_MASK) << 10;
+
+        LM_ReadPhy(pDevice, PHY_ID2_REG, &Value32);
+        pDevice->PhyId |= ((Value32 & PHY_ID2_OUI_MASK) << 16) |
+            (Value32 & PHY_ID2_MODEL_MASK) | (Value32 & PHY_ID2_REV_MASK);
+    }
 
     /* Set the EnableTbi flag to false if we have a copper PHY. */
     switch(pDevice->PhyId & PHY_ID_MASK)
@@ -1557,7 +1569,7 @@ PLM_DEVICE_BLOCK pDevice)
     }
 
     /* Save the current phy link status. */
-    if(!pDevice->EnableTbi)
+    if ((!pDevice->EnableTbi) && (!pDevice->EnableAsf))
     {
         LM_ReadPhy(pDevice, PHY_STATUS_REG, &Value32);
         LM_ReadPhy(pDevice, PHY_STATUS_REG, &Value32);
@@ -1574,7 +1586,6 @@ PLM_DEVICE_BLOCK pDevice)
                     PHY_AN_AD_ALL_SPEEDS;
                 Value32 |= GetPhyAdFlowCntrlSettings(pDevice);
                 LM_WritePhy(pDevice, PHY_AN_AD_REG, Value32);
-                pDevice->advertising = Value32;
 
                 Value32 = BCM540X_AN_AD_ALL_1G_SPEEDS ;
 #if INCLUDE_5701_AX_FIX
@@ -1586,7 +1597,6 @@ PLM_DEVICE_BLOCK pDevice)
                 }
 #endif
                 LM_WritePhy(pDevice, BCM540X_1000BASET_CTRL_REG, Value32);
-                pDevice->advertising1000 = Value32;
 
                 LM_WritePhy(pDevice, PHY_CTRL_REG, PHY_CTRL_AUTO_NEG_ENABLE |
                     PHY_CTRL_RESTART_AUTO_NEG);
@@ -1610,7 +1620,6 @@ PLM_DEVICE_BLOCK pDevice)
         LM_ReadPhy(pDevice, BCM540X_1000BASET_CTRL_REG,
             &pDevice->advertising1000);
     }
-
     /* Turn off tap power management. */
     if((pDevice->PhyId & PHY_ID_MASK) == PHY_BCM5401_PHY_ID)
     {
@@ -3172,7 +3181,10 @@ restart_reset:
 
     pDevice->LinkStatus = LM_STATUS_LINK_DOWN;
 
-    LM_ResetPhy(pDevice);
+    if (!pDevice->EnableTbi)
+    {
+        LM_ResetPhy(pDevice);
+    }
 
     /* Setup the phy chip. */
     LM_SetupPhy(pDevice);
@@ -4168,10 +4180,12 @@ LM_ServiceRxInterrupt(PLM_DEVICE_BLOCK p
     {
         if (SwRcvRetConIdx != HwRcvRetProdIdx)
         {
-            pDevice->RxPoll = TRUE;
-            REG_WR(pDevice, Grc.Mode,
-                pDevice->GrcMode | GRC_MODE_NO_INTERRUPT_ON_RECEIVE);
-            MM_ScheduleRxPoll(pDevice);
+            if (MM_ScheduleRxPoll(pDevice) == LM_STATUS_SUCCESS)
+            {
+                pDevice->RxPoll = TRUE;
+                REG_WR(pDevice, Grc.Mode,
+                    pDevice->GrcMode | GRC_MODE_NO_INTERRUPT_ON_RECEIVE);
+            }
         }
     }
 #else
@@ -5039,6 +5053,7 @@ LM_SetupFiberPhy(
                     BIT_30);
 		MM_Wait(5);
                 REG_WR(pDevice, MacCtrl.SgDigControl, ExpectedSgDigCtrl);
+                pDevice->AutoNegJustInited = TRUE;
             }
             /* If autoneg is off, you only get SD when link is up */
             else if(MacStatus & (MAC_STATUS_PCS_SYNCED |
@@ -5062,32 +5077,42 @@ LM_SetupFiberPhy(
 
                     LM_SetFlowControl(pDevice, LocalPhyAd, RemotePhyAd);
                     CurrentLinkStatus = LM_STATUS_LINK_ACTIVE;
+                    pDevice->AutoNegJustInited = FALSE;
                 }
                 else if (!(SgDigStatus & BIT_1))
                 {
-                    /* autoneg. failed */
-                    if (WorkAround)
+                    if (pDevice->AutoNegJustInited == TRUE)
                     {
-                        if (PortA)
+                        /* we may be checking too soon, so check again */
+                        /* at the next poll interval */
+                        pDevice->AutoNegJustInited = FALSE;
+                    }
+                    else
+                    {
+                        /* autoneg. failed */
+                        if (WorkAround)
                         {
-                            REG_WR(pDevice, MacCtrl.SerdesCfg,
-                                0xc010330 | SerdesCfg);
+                            if (PortA)
+                            {
+                                REG_WR(pDevice, MacCtrl.SerdesCfg,
+                                    0xc010330 | SerdesCfg);
+                            }
+                            else
+                            {
+                                REG_WR(pDevice, MacCtrl.SerdesCfg,
+                                    0x4010330 | SerdesCfg);
+                            }
                         }
-                        else
+                        /* turn off autoneg. to allow traffic to pass */
+                        REG_WR(pDevice, MacCtrl.SgDigControl, 0x01388400);
+                        MM_Wait(40);
+                        MacStatus = REG_RD(pDevice, MacCtrl.Status);
+                        if (MacStatus & MAC_STATUS_PCS_SYNCED)
                         {
-                            REG_WR(pDevice, MacCtrl.SerdesCfg,
-                                0x4010330 | SerdesCfg);
+                            LM_SetFlowControl(pDevice, 0, 0);
+                            CurrentLinkStatus = LM_STATUS_LINK_ACTIVE;
                         }
                     }
-                    /* turn off autoneg. to allow traffic to pass */
-                    REG_WR(pDevice, MacCtrl.SgDigControl, 0x01388400);
-                    MM_Wait(40);
-                    MacStatus = REG_RD(pDevice, MacCtrl.Status);
-                    if (MacStatus & MAC_STATUS_PCS_SYNCED)
-                    {
-                        LM_SetFlowControl(pDevice, 0, 0);
-                        CurrentLinkStatus = LM_STATUS_LINK_ACTIVE;
-                    }
                 }
             }
         }
@@ -5694,23 +5719,315 @@ LM_SetupPhy(
     return LmStatus;
 }
 
-STATIC LM_VOID
+
+/* test data pattern */
+static LM_UINT32 pattern[4][6] = {
+    /* For 5703/04, each DFE TAP has 21-bits (low word 15, hi word 6)
+    For 5705   , each DFE TAP has 19-bits (low word 15, hi word 4)
+    For simplicity, we check only 19-bits, so we don't have to
+    distinguish which chip it is.
+    the LO word contains 15 bits, make sure pattern data is < 0x7fff
+    the HI word contains  6 bits, make sure pattern data is < 0x003f */
+    {0x00005555, 0x00000005, /* ch0, TAP 0, LO/HI pattern */
+    0x00002aaa, 0x0000000a,  /* ch0, TAP 1, LO/HI pattern */
+    0x00003456, 0x00000003}, /* ch0, TAP 2, LO/HI pattern */
+
+    {0x00002aaa, 0x0000000a, /* ch1, TAP 0, LO/HI pattern */
+    0x00003333, 0x00000003,  /* ch1, TAP 1, LO/HI pattern */
+    0x0000789a, 0x00000005}, /* ch1, TAP 2, LO/HI pattern */
+
+    {0x00005a5a, 0x00000005, /* ch2, TAP 0, LO/HI pattern */
+    0x00002a6a, 0x0000000a,  /* ch2, TAP 1, LO/HI pattern */
+    0x00001bcd, 0x00000003}, /* ch2, TAP 2, LO/HI pattern */
+
+    {0x00002a5a, 0x0000000a, /* ch3, TAP 0, LO/HI pattern */
+    0x000033c3, 0x00000003,  /* ch3, TAP 1, LO/HI pattern */
+    0x00002ef1, 0x00000005}, /* ch3, TAP 2, LO/HI pattern */
+};
+
+/********************************************************/
+/* Routine to wait for PHY Macro Command to complete    */
+/*                                                      */
+/* If PHY's Macro operation keeps stay busy, nothing we */
+/* can do anyway.  The timeout is there so we won't     */
+/* stay in this routine indefinitly.                    */
+/********************************************************/
+static LM_UINT32 LM_wait_macro_done(LM_DEVICE_BLOCK *pDevice);
+
+static LM_UINT32
+LM_wait_macro_done(LM_DEVICE_BLOCK *pDevice)
+{
+    LM_UINT32 timeout;
+    LM_UINT32 val32;
+
+    timeout = 100;
+    while (timeout--)
+    {
+        /* make sure the MACRO operation is complete */
+        LM_ReadPhy(pDevice, 0x16, &val32);
+        if ((val32 & 0x1000) == 0) break;
+    }
+
+    return( timeout > 0 );
+}
+
+/********************************************************/
+/* This routine resets the PHY on following chips:      */
+/*      5703, 04, CIOB-E and 5705                       */
+/*                                                      */
+/* This routine will issue PHY_RESET and check if       */
+/* the reset is sucessful.  If not, another PHY RESET   */
+/* will be issued, until max "retry" reaches            */
+/*                                                      */
+/* Input:                                               */
+/*      pDevice - device's context                      */
+/*      retry   - number of retries                     */
+/*      reset   - TRUE=will cause a PHY reset initially */
+/*                FALSE = will not issue a PHY reset    */
+/*                        unless TAP lockup detected    */
+/*                                                      */
+/* Output:                                              */
+/*      TRUE    - PHY Reset is done sucessfully         */
+/*      FALSE   - PHY Reset had failed, after "retry"   */
+/*                has reached                           */
+/*                                                      */
+/* Dependencies:                                        */
+/*      void LM_wait_macro_done()                       */
+/*      u32  pattern[]                                  */
+/*                                                      */
+/* Usage:                                               */
+/*      a. Before calling this routine, caller must     */
+/*         determine if the chip is a 5702/03/04 or     */
+/*         CIOB-E, and only call this routine if the    */
+/*         is one of these.                             */
+/*         or its derivatives.                          */
+/*      b. Instead of using MII register write to reset */
+/*         the PHY, call this routine instead           */
+/*      c. Upon return from this routine, check return  */
+/*         value (TRUE/FALSE) to determine if PHY reset */
+/*         is successful of not and "optionally" take   */
+/*         appropriate action (such as: event log)      */
+/*      d. Regardless of the return TRUE or FALSE,      */
+/*         proceed with PHY setup as you normally would */
+/*         after a PHY_RESET.                           */
+/*      e. It is recommended that the caller will give  */
+/*         10 "retry", however, caller can change to a  */
+/*         different number, depending on you code.     */
+/*                                                      */
+/********************************************************/
+LM_STATUS LM_ResetPhy_5703_4_5(LM_DEVICE_BLOCK *pDevice, int retry, int reset);
+
+LM_STATUS
+LM_ResetPhy_5703_4_5(LM_DEVICE_BLOCK *pDevice, int retry, int reset)
+{
+    LM_UINT32 val32, save9;
+    LM_UINT32 dataLo, dataHi;
+    int i, channel;
+    int      reset_success = LM_STATUS_FAILURE;
+    int      force_reset;
+
+    /* to actually do a PHY_RESET or not is dictated by the caller */
+    force_reset = reset;
+
+    while (retry-- && (reset_success != LM_STATUS_SUCCESS))
+    {
+        if (force_reset)
+        {
+            /* issue a phy reset, and wait for reset to complete */
+            LM_WritePhy(pDevice, PHY_CTRL_REG, PHY_CTRL_PHY_RESET);
+            for(i = 0; i < 100; i++)
+            {
+                MM_Wait(10);
+
+                LM_ReadPhy(pDevice, PHY_CTRL_REG, &val32);
+                if(val32 && !(val32 & PHY_CTRL_PHY_RESET))
+                {
+                    MM_Wait(20);
+                    break;
+                }
+            }
+
+            /* no more phy reset unless lockup detected */
+            force_reset = FALSE;
+        }
+
+        /* assuming reset is successful first */
+        reset_success = LM_STATUS_SUCCESS;
+
+        /* now go check the DFE TAPs to see if locked up, but
+           first, we need to set up PHY so we can read DFE TAPs */
+
+        /* Disable Transmitter and Interrupt, while we play with
+           the PHY registers, so the link partner won't see any
+           strange data and the Driver won't see any interrupts. */
+        LM_ReadPhy(pDevice, 0x10, &val32);
+        LM_WritePhy(pDevice, 0x10, val32 | 0x3000);
+
+        /* Setup Full-Duplex, 1000 mbps */
+        LM_WritePhy(pDevice, 0x0, 0x0140);
+
+        /* Set to Master mode */
+        LM_ReadPhy(pDevice, 0x9, &save9);
+        LM_WritePhy(pDevice, 0x9, 0x1800);
+
+        /* Enable SM_DSP_CLOCK & 6dB */
+        LM_WritePhy(pDevice, 0x18, 0x0c00);
+
+        /* blocks the PHY control access */
+        LM_WritePhy(pDevice, 0x17, 0x8005);
+        LM_WritePhy(pDevice, 0x15, 0x0800);
+
+        /* check TAPs for all 4 channels, as soon
+           as we see a lockup we'll stop checking */
+        for (channel=0; (channel<4) && (reset_success == LM_STATUS_SUCCESS);
+            channel++)
+        {
+            /* select channel and set TAP index to 0 */
+            LM_WritePhy(pDevice, 0x17, (channel * 0x2000) | 0x0200);
+            /* freeze filter again just to be safe */
+            LM_WritePhy(pDevice, 0x16, 0x0002);
+
+            /* write fixed pattern to the RAM, 3 TAPs for
+               each channel, each TAP have 2 WORDs (LO/HI) */
+            for (i=0; i<6; i++)
+                LM_WritePhy(pDevice, 0x15, pattern[channel][i]);
+
+            /* Activate PHY's Macro operation to write DFE TAP from RAM,
+               and wait for Macro to complete */
+            LM_WritePhy(pDevice, 0x16, 0x0202);
+            if (!LM_wait_macro_done(pDevice))
+            {
+                reset_success = LM_STATUS_FAILURE;
+                force_reset = TRUE;
+                break;
+            }
+
+            /* --- done with write phase, now begin read phase --- */
+
+            /* select channel and set TAP index to 0 */
+            LM_WritePhy(pDevice, 0x17, (channel * 0x2000) | 0x0200);
+
+            /* Active PHY's Macro operation to load DFE TAP to RAM,
+               and wait for Macro to complete */
+            LM_WritePhy(pDevice, 0x16, 0x0082);
+            if (!LM_wait_macro_done(pDevice))
+            {
+                reset_success = LM_STATUS_FAILURE;
+                force_reset = TRUE;
+                break;
+            }
+
+            /* enable "pre-fetch" */
+            LM_WritePhy(pDevice, 0x16, 0x0802);
+            if (!LM_wait_macro_done(pDevice))
+            {
+                reset_success = LM_STATUS_FAILURE;
+                force_reset = TRUE;
+                break;
+            }
+
+            /* read back the TAP values.
+               3 TAPs for each channel, each TAP have 2 WORDs (LO/HI) */
+            for (i=0; i<6; i+=2)
+            {
+                /* read Lo/Hi then wait for 'done' is faster */
+                LM_ReadPhy(pDevice, 0x15, &dataLo);
+                LM_ReadPhy(pDevice, 0x15, &dataHi);
+                if (!LM_wait_macro_done(pDevice))
+                {
+                    reset_success = LM_STATUS_FAILURE;
+                    force_reset = TRUE;
+                    break;
+                }
+
+                /* For 5703/04, each DFE TAP has 21-bits (low word 15,
+                 * hi word 6) For 5705, each DFE TAP pas 19-bits (low word 15,
+                 * hi word 4) For simplicity, we check only 19-bits, so we
+                 * don't have to distinguish which chip it is. */
+                dataLo &= 0x7fff;
+                dataHi &= 0x000f;
+            
+                /* check if what we wrote is what we read back */
+                if ( (dataLo != pattern[channel][i]) || (dataHi != pattern[channel][i+1]) )
+                {
+                    /* if failed, then the PHY is locked up,
+                       we need to do PHY reset again */
+                    reset_success = LM_STATUS_FAILURE;
+                    force_reset = TRUE;
+                    /* 04/25/2003. sb. do these writes before issueing a reset. */
+                    /* these steps will reduce the chance of back-to-back
+                     * phy lockup after reset */
+                    LM_WritePhy(pDevice, 0x17, 0x000B);
+                    LM_WritePhy(pDevice, 0x15, 0x4001);
+                    LM_WritePhy(pDevice, 0x15, 0x4005);
+                    break;
+                }
+            } /* for i */
+        } /* for channel */
+    } /* while */
+
+    /* restore dfe coeff back to zeros */
+    for (channel=0; channel<4 ; channel++)
+    {
+        LM_WritePhy(pDevice, 0x17, (channel * 0x2000) | 0x0200);
+        LM_WritePhy(pDevice, 0x16, 0x0002);
+        for (i=0; i<6; i++)
+            LM_WritePhy(pDevice, 0x15, 0x0000);
+        LM_WritePhy(pDevice, 0x16, 0x0202);
+        if (!LM_wait_macro_done(pDevice))
+        {
+            reset_success = LM_STATUS_FAILURE;
+            break;
+        }
+    }
+
+    /* remove block phy control */
+    LM_WritePhy(pDevice, 0x17, 0x8005);
+    LM_WritePhy(pDevice, 0x15, 0x0000);
+
+    /* unfreeze DFE TAP filter for all channels */
+    LM_WritePhy(pDevice, 0x17, 0x8200);
+    LM_WritePhy(pDevice, 0x16, 0x0000);
+
+    /* Restore PHY back to operating state */
+    LM_WritePhy(pDevice, 0x18, 0x0400);
+
+    /* Restore register 9 */
+    LM_WritePhy(pDevice, 0x9, save9);
+
+    /* enable transmitter and interrupt */
+    LM_ReadPhy(pDevice, 0x10, &val32);
+    LM_WritePhy(pDevice, 0x10, (val32 & ~0x3000));
+
+    return reset_success;
+}
+
+LM_VOID
 LM_ResetPhy(LM_DEVICE_BLOCK *pDevice)
 {
     int j;
     LM_UINT32 miireg;
 
-    LM_WritePhy(pDevice, PHY_CTRL_REG, PHY_CTRL_PHY_RESET);
-
-    for(j = 0; j < 100; j++)
+    if ((T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5703) ||
+        (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5704) ||
+        (T3_ASIC_REV(pDevice->ChipRevId) == T3_ASIC_REV_5705))
     {
-        MM_Wait(10);
+        LM_ResetPhy_5703_4_5(pDevice, 5, 1);
+    }
+    else
+    {
+        LM_WritePhy(pDevice, PHY_CTRL_REG, PHY_CTRL_PHY_RESET);
 
-        LM_ReadPhy(pDevice, PHY_CTRL_REG, &miireg);
-        if(miireg && !(miireg & PHY_CTRL_PHY_RESET))
+        for(j = 0; j < 100; j++)
         {
-            MM_Wait(40);
-            break;
+            MM_Wait(10);
+
+            LM_ReadPhy(pDevice, PHY_CTRL_REG, &miireg);
+            if(miireg && !(miireg & PHY_CTRL_PHY_RESET))
+            {
+                MM_Wait(20);
+                break;
+            }
         }
     }
     LM_SetEthWireSpeed(pDevice);
@@ -5780,9 +6097,9 @@ PLM_UINT32 pData32) {
 
     REG_WR(pDevice, MacCtrl.MiCom, Value32);
     
-    for(j = 0; j < 20; j++)
+    for(j = 0; j < 200; j++)
     {
-        MM_Wait(25);
+        MM_Wait(1);
 
         Value32 = REG_RD(pDevice, MacCtrl.MiCom);
 
@@ -5837,9 +6154,9 @@ LM_UINT32 Data32) {
 
     REG_WR(pDevice, MacCtrl.MiCom, Value32);
     
-    for(j = 0; j < 20; j++)
+    for(j = 0; j < 200; j++)
     {
-        MM_Wait(25);
+        MM_Wait(1);
 
         Value32 = REG_RD(pDevice, MacCtrl.MiCom);
 
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/net/bcm/tigon3.h linux-2.4.20-wolk4.4-fullkernel/drivers/net/bcm/tigon3.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/net/bcm/tigon3.h	2003-07-30 13:51:28.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/net/bcm/tigon3.h	2003-07-30 10:34:46.000000000 +0200
@@ -201,7 +201,11 @@
 #define ADAPTIVE_LO_TX_MAX_COALESCED_FRAMES    20
 #define ADAPTIVE_HI_TX_MAX_COALESCED_FRAMES    75
 
+#ifdef BCM_NAPI_RXPOLL
+#define DEFAULT_RX_COALESCING_TICKS_DURING_INT          18
+#else
 #define DEFAULT_RX_COALESCING_TICKS_DURING_INT          25
+#endif
 #define DEFAULT_TX_COALESCING_TICKS_DURING_INT          25
 #define DEFAULT_RX_MAX_COALESCED_FRAMES_DURING_INT      2
 #define ADAPTIVE_LO_RX_MAX_COALESCED_FRAMES_DURING_INT  1
@@ -325,6 +329,8 @@ typedef struct T3_FWIMG_INFO
 #define T3_PCI_ID_BCM5704                   0x164814e4
 #define T3_PCI_ID_BCM5705                   0x165314e4
 #define T3_PCI_ID_BCM5705M                  0x165D14e4
+#define T3_PCI_ID_BCM5901                   0x170D14e4
+#define T3_PCI_ID_BCM5901A2                 0x170E14e4
 
 #define T3_PCI_VENDOR_ID(x)                 ((x) & 0xffff)
 #define T3_PCI_DEVICE_ID(x)                 ((x) >> 16)
@@ -3113,6 +3119,8 @@ typedef struct _LM_DEVICE_BLOCK {
     /* Disable auto-negotiation. */
     LM_UINT32 DisableAutoNeg;
 
+    LM_UINT32 AutoNegJustInited;
+
     /* Ways for the MAC to get link change interrupt. */
     LM_UINT32 PhyIntMode;
     #define T3_PHY_INT_MODE_AUTO                        0
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/net/e100/e100.h linux-2.4.20-wolk4.4-fullkernel/drivers/net/e100/e100.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/net/e100/e100.h	2003-07-30 13:51:28.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/net/e100/e100.h	2003-07-30 11:10:55.000000000 +0200
@@ -60,7 +60,14 @@
 #include <linux/if_vlan.h>
 #include <linux/mii.h>
 
-#define E100_REGS_LEN 1
+#define E100_CABLE_UNKNOWN	0
+#define E100_CABLE_OK		1		
+#define E100_CABLE_OPEN_NEAR	2	/* Open Circuit Near End  */
+#define E100_CABLE_OPEN_FAR	3	/* Open Circuit Far End   */
+#define E100_CABLE_SHORT_NEAR	4	/* Short Circuit Near End */
+#define E100_CABLE_SHORT_FAR	5	/* Short Circuit Far End  */
+
+#define E100_REGS_LEN 2
 /*
  *  Configure parameters for buffers per controller.
  *  If the machine this is being used on is a faster machine (i.e. > 150MHz)
@@ -105,8 +112,6 @@
 #define E100_MAX_CU_IDLE_WAIT	50	/* Max udelays in wait_cus_idle */
 
 /* HWI feature related constant */
-#define HWI_MAX_LOOP                    100
-#define MAX_SAME_RESULTS		3
 #define HWI_REGISTER_GRANULARITY        80	/* register granularity = 80 Cm */
 #define HWI_NEAR_END_BOUNDARY           1000	/* Near end is defined as < 10 meters */
 
@@ -942,7 +947,6 @@ struct e100_private {
 #ifdef CONFIG_PM
 	u32 pci_state[16];
 #endif
-	char ifname[IFNAMSIZ];
 #ifdef E100_CU_DEBUG	
 	u8 last_cmd;
 	u8 last_sub_cmd;
@@ -956,7 +960,10 @@ struct e100_private {
 #define E100_SPEED_100_FULL 4
 
 /********* function prototypes *************/
+extern int e100_open(struct net_device *);
+extern int e100_close(struct net_device *);
 extern void e100_isolate_driver(struct e100_private *bdp);
+extern unsigned char e100_hw_init(struct e100_private *);
 extern void e100_sw_reset(struct e100_private *bdp, u32 reset_cmd);
 extern u8 e100_start_cu(struct e100_private *bdp, tcb_t *tcb);
 extern void e100_free_non_tx_cmd(struct e100_private *bdp,
@@ -981,14 +988,13 @@ extern unsigned char e100_cu_unknown_sta
 #define TEST_TIMEOUT		0x08
 
 enum test_offsets {
-	E100_EEPROM_TEST_FAIL = 0,
-	E100_CHIP_TIMEOUT,
-	E100_ROM_TEST_FAIL,
-	E100_REG_TEST_FAIL,
-	E100_MAC_TEST_FAIL,
-	E100_LPBK_MAC_FAIL,
-	E100_LPBK_PHY_FAIL,
-	E100_MAX_TEST_RES
+	test_link,
+	test_eeprom,
+	test_self_test,
+	test_loopback_mac,
+	test_loopback_phy,
+	cable_diag,
+	max_test_res,  /* must be last */
 };
 
 #endif
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/net/e100/e100_main.c linux-2.4.20-wolk4.4-fullkernel/drivers/net/e100/e100_main.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/net/e100/e100_main.c	2003-07-30 13:51:28.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/net/e100/e100_main.c	2003-07-30 11:18:18.000000000 +0200
@@ -46,36 +46,32 @@
 
 /* Change Log
  * 
- * 2.2.21	02/11/03
- * o Removed marketing brand strings. Instead, Using generic string 
- *   "Intel(R) PRO/100 Network Connection" for all adapters.
- * o Implemented ethtool -S option
- * o Strip /proc/net/PRO_LAN_Adapters files for kernel driver
- * o Bug fix: Read wrong byte in EEPROM when offset is odd number
- * o Bug fix: PHY loopback test fails on ICH devices
- * o Bug fix: System panic on e100_close when repeating Hot Remove and 
- *   Add in a team
- * o Bug fix: Linux Bonding driver claims adapter's link loss because of
- *   not updating last_rx field
- * o Bug fix: e100 does not check validity of MAC address
- * o New feature: added ICH5 support
+ * 2.3.18       07/08/03
+ * o Bug fix: read skb->len after freeing skb
+ *   [Andrew Morton] akpm@zip.com.au
+ * o Bug fix: 82557 (with National PHY) timeout during init
+ *   [Adam Kropelin] akropel1@rochester.rr.com
+ * o Feature add: allow to change Wake On LAN when EEPROM disabled
  * 
- * 2.1.27	11/20/02
- *   o Bug fix: Device command timeout due to SMBus processing during init
- *   o Bug fix: Not setting/clearing I (Interrupt) bit in tcb correctly
- *   o Bug fix: Not using EEPROM WoL setting as default in ethtool
- *   o Bug fix: Not able to set autoneg on using ethtool when interface down
- *   o Bug fix: Not able to change speed/duplex using ethtool/mii
- *     when interface up
- *   o Bug fix: Ethtool shows autoneg on when forced to 100/Full
- *   o Bug fix: Compiler error when CONFIG_PROC_FS not defined
- *   o Bug fix: 2.5.44 e100 doesn't load with preemptive kernel enabled
- *     (sleep while holding spinlock)
- *   o Bug fix: 2.1.24-k1 doesn't display complete statistics
- *   o Bug fix: System panic due to NULL watchdog timer dereference during
- *     ifconfig down, rmmod and insmod
- *
- * 2.1.24       10/7/02
+ * 2.3.13       05/08/03
+ * o Feature remove: /proc/net/PRO_LAN_Adapters support gone completely
+ * o Feature remove: IDIAG support (use ethtool -t instead)
+ * o Cleanup: fixed spelling mistakes found by community
+ * o Feature add: ethtool cable diag test
+ * o Feature add: ethtool parameter support (ring size, xsum, flow ctrl)
+ * o Cleanup: move e100_asf_enable under CONFIG_PM to avoid warning
+ *   [Stephen Rothwell (sfr@canb.auug.org.au)]
+ * o Bug fix: don't call any netif_carrier_* until netdev registered.
+ *   [Andrew Morton (akpm@digeo.com)]
+ * o Cleanup: replace (skb->len - skb->data_len) with skb_headlen(skb)
+ *   [jmorris@intercode.com.au]
+ * o Bug fix: cleanup of Tx skbs after running ethtool diags
+ * o Bug fix: incorrect reporting of ethtool diag overall results
+ * o Bug fix: must hold xmit_lock before stopping queue in ethtool
+ *   operations that require reset h/w and driver structures.
+ * o Bug fix: statistic command failure would stop statistic collection.
+ * 
+ * 2.2.21	02/11/03
  */
  
 #include <linux/config.h>
@@ -121,14 +117,13 @@ extern void e100_config_wol(struct e100_
 extern u32 e100_run_diag(struct net_device *dev, u64 *test_info, u32 flags);
 static int e100_ethtool_test(struct net_device *, struct ifreq *);
 static int e100_ethtool_gstrings(struct net_device *, struct ifreq *);
-static char *test_strings[] = {
-	"E100_EEPROM_TEST_FAIL",
-	"E100_CHIP_TIMEOUT",
-	"E100_ROM_TEST_FAIL",
-	"E100_REG_TEST_FAIL",
-	"E100_MAC_TEST_FAIL",
-	"E100_LPBK_MAC_FAIL",
-	"E100_LPBK_PHY_FAIL"
+static char test_strings[][ETH_GSTRING_LEN] = {
+	"Link test     (on/offline)",
+	"Eeprom test   (on/offline)",
+	"Self test        (offline)",
+	"Mac loopback     (offline)",
+	"Phy loopback     (offline)",
+	"Cable diagnostic (offline)"
 };
 
 static int e100_ethtool_led_blink(struct net_device *, struct ifreq *);
@@ -139,10 +134,10 @@ static unsigned char e100_delayed_exec_n
 						  nxmit_cb_entry_t *);
 static void e100_free_nontx_list(struct e100_private *);
 static void e100_non_tx_background(unsigned long);
-
+static inline void e100_tx_skb_free(struct e100_private *bdp, tcb_t *tcb);
 /* Global Data structures and variables */
 char e100_copyright[] __devinitdata = "Copyright (c) 2003 Intel Corporation";
-char e100_driver_version[]="2.2.21-k1";
+char e100_driver_version[]="2.3.18-k1";
 const char *e100_full_driver_name = "Intel(R) PRO/100 Network Driver";
 char e100_short_driver_name[] = "e100";
 static int e100nics = 0;
@@ -155,6 +150,7 @@ static void e100_vlan_rx_kill_vid(struct
 static int e100_notify_reboot(struct notifier_block *, unsigned long event, void *ptr);
 static int e100_suspend(struct pci_dev *pcid, u32 state);
 static int e100_resume(struct pci_dev *pcid);
+static unsigned char e100_asf_enabled(struct e100_private *bdp);
 struct notifier_block e100_notifier_reboot = {
         .notifier_call  = e100_notify_reboot,
         .next           = NULL,
@@ -182,8 +178,6 @@ struct notifier_block e100_notifier_rebo
 static u8 e100_D101M_checksum(struct e100_private *, struct sk_buff *);
 static u8 e100_D102_check_checksum(rfd_t *);
 static int e100_ioctl(struct net_device *, struct ifreq *, int);
-static int e100_open(struct net_device *);
-static int e100_close(struct net_device *);
 static int e100_change_mtu(struct net_device *, int);
 static int e100_xmit_frame(struct sk_buff *, struct net_device *);
 static unsigned char e100_init(struct e100_private *);
@@ -193,7 +187,6 @@ struct net_device_stats *e100_get_stats(
 static void e100intr(int, void *, struct pt_regs *);
 static void e100_print_brd_conf(struct e100_private *);
 static void e100_set_multi(struct net_device *);
-void e100_set_speed_duplex(struct e100_private *);
 
 static u8 e100_pci_setup(struct pci_dev *, struct e100_private *);
 static u8 e100_sw_init(struct e100_private *);
@@ -215,7 +208,6 @@ u16 e100_eeprom_calculate_chksum(struct 
 
 static unsigned char e100_clr_cntrs(struct e100_private *);
 static unsigned char e100_load_microcode(struct e100_private *);
-static unsigned char e100_hw_init(struct e100_private *);
 static unsigned char e100_setup_iaaddr(struct e100_private *, u8 *);
 static unsigned char e100_update_stats(struct e100_private *bdp);
 
@@ -228,7 +220,6 @@ static void e100_set_bool_option(struct 
 				 char *);
 unsigned char e100_wait_exec_cmplx(struct e100_private *, u32, u8, u8);
 void e100_exec_cmplx(struct e100_private *, u32, u8);
-static unsigned char e100_asf_enabled(struct e100_private *bdp);
 
 /* for netdump / net console */
 static void e100_netpoll (struct net_device *dev);
@@ -641,25 +632,7 @@ e100_found1(struct pci_dev *pcid, const 
 	} else {
 		bdp->rfd_size = 16;
 	}
-	e100_check_options(e100nics, bdp);
 
-	if (!e100_init(bdp)) {
-		printk(KERN_ERR "e100: Failed to initialize, instance #%d\n",
-		       e100nics);
-		rc = -ENODEV;
-		goto err_pci;
-	}
-
-	/* Check if checksum is valid */
-	cal_checksum = e100_eeprom_calculate_chksum(bdp);
-	read_checksum = e100_eeprom_read(bdp, (bdp->eeprom_size - 1));
-	if (cal_checksum != read_checksum) {
-                printk(KERN_ERR "e100: Corrupted EEPROM on instance #%d\n",
-		       e100nics);
-                rc = -ENODEV;
-                goto err_pci;
-	}
-	
 	dev->vlan_rx_register = e100_vlan_rx_register;
 	dev->vlan_rx_add_vid = e100_vlan_rx_add_vid;
 	dev->vlan_rx_kill_vid = e100_vlan_rx_kill_vid;
@@ -676,6 +649,29 @@ e100_found1(struct pci_dev *pcid, const 
 	if (bdp->flags & USE_IPCB)
 	dev->features = NETIF_F_SG | NETIF_F_HW_CSUM |
 			NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
+		
+	if ((rc = register_netdev(dev)) != 0) {
+		goto err_pci;
+	}
+
+	e100_check_options(e100nics, bdp);
+
+	if (!e100_init(bdp)) {
+		printk(KERN_ERR "e100: Failed to initialize, instance #%d\n",
+		       e100nics);
+		rc = -ENODEV;
+		goto err_unregister_netdev;
+	}
+
+	/* Check if checksum is valid */
+	cal_checksum = e100_eeprom_calculate_chksum(bdp);
+	read_checksum = e100_eeprom_read(bdp, (bdp->eeprom_size - 1));
+	if (cal_checksum != read_checksum) {
+                printk(KERN_ERR "e100: Corrupted EEPROM on instance #%d\n",
+		       e100nics);
+                rc = -ENODEV;
+                goto err_unregister_netdev;
+	}
 
 #ifdef HAVE_POLL_CONTROLLER
 	dev->poll_controller = e100_netpoll;
@@ -685,12 +681,6 @@ e100_found1(struct pci_dev *pcid, const 
 
 	e100_get_speed_duplex_caps(bdp);
 
-	if ((rc = register_netdev(dev)) != 0) {
-		goto err_pci;
-	}
-        memcpy(bdp->ifname, dev->name, IFNAMSIZ);
-        bdp->ifname[IFNAMSIZ-1] = 0;	
-
 	printk(KERN_NOTICE
 	       "e100: %s: %s\n", 
 	       bdp->device->name, "Intel(R) PRO/100 Network Connection");
@@ -698,23 +688,24 @@ e100_found1(struct pci_dev *pcid, const 
 
 	bdp->wolsupported = 0;
 	bdp->wolopts = 0;
+	if (bdp->rev_id >= D101A4_REV_ID)
+		bdp->wolsupported = WAKE_PHY | WAKE_MAGIC;
+	if (bdp->rev_id >= D101MA_REV_ID)
+		bdp->wolsupported |= WAKE_UCAST | WAKE_ARP;
 	
 	/* Check if WoL is enabled on EEPROM */
 	if (e100_eeprom_read(bdp, EEPROM_ID_WORD) & BIT_5) {
 		/* Magic Packet WoL is enabled on device by default */
 		/* if EEPROM WoL bit is TRUE                        */
-		bdp->wolsupported = WAKE_MAGIC;
 		bdp->wolopts = WAKE_MAGIC;
-		if (bdp->rev_id >= D101A4_REV_ID)
-			bdp->wolsupported = WAKE_PHY | WAKE_MAGIC;
-		if (bdp->rev_id >= D101MA_REV_ID)
-			bdp->wolsupported |= WAKE_UCAST | WAKE_ARP;
 	}
 
 	printk(KERN_NOTICE "\n");
 
 	goto out;
 
+err_unregister_netdev:
+	unregister_netdev(dev);
 err_pci:
 	iounmap(bdp->scb);
 	pci_release_regions(pcid);
@@ -980,7 +971,7 @@ e100_set_bool_option(struct e100_private
 	}
 }
 
-static int
+int
 e100_open(struct net_device *dev)
 {
 	struct e100_private *bdp;
@@ -1018,7 +1009,11 @@ e100_open(struct net_device *dev)
 
 	mod_timer(&(bdp->watchdog_timer), jiffies + (2 * HZ));
 
-	netif_start_queue(dev);
+	if (dev->flags & IFF_UP)
+		/* Otherwise process may sleep forever */
+		netif_wake_queue(dev);
+	else
+		netif_start_queue(dev);
 
 	e100_start_ru(bdp);
 	if ((rc = request_irq(dev->irq, &e100intr, SA_SHIRQ,
@@ -1039,7 +1034,7 @@ exit:
 	return rc;
 }
 
-static int
+int
 e100_close(struct net_device *dev)
 {
 	struct e100_private *bdp = dev->priv;
@@ -1080,17 +1075,18 @@ e100_xmit_frame(struct sk_buff *skb, str
 		goto exit2;
 	}
 
-	if (!TCBS_AVAIL(bdp->tcb_pool) ||
+	/* tcb list may be empty temporarily during releasing resources */
+	if (!TCBS_AVAIL(bdp->tcb_pool) || (bdp->tcb_phys == 0) ||
 	    (bdp->non_tx_command_state != E100_NON_TX_IDLE)) {
 		notify_stop = true;
 		rc = 1;
 		goto exit1;
 	}
 
-	e100_prepare_xmit_buff(bdp, skb);
-
 	bdp->drv_stats.net_stats.tx_bytes += skb->len;
 
+	e100_prepare_xmit_buff(bdp, skb);
+
 	dev->trans_start = jiffies;
 
 exit1:
@@ -1291,10 +1287,8 @@ e100_init(struct e100_private *bdp)
 	/* read NIC's part number */
 	e100_rd_pwa_no(bdp);
 
-	if (!e100_hw_init(bdp)) {
-		printk(KERN_ERR "e100: hw init failed\n");
+	if (!e100_hw_init(bdp))
 		return false;
-	}
 	/* Interrupts are enabled after device reset */
 	e100_disable_clear_intr(bdp);
 
@@ -1336,6 +1330,8 @@ e100_sw_init(struct e100_private *bdp)
 	spin_lock_init(&(bdp->bd_non_tx_lock));
 	spin_lock_init(&(bdp->config_lock));
 	spin_lock_init(&(bdp->mdi_access_lock));
+	/* Initialize configuration data */
+	e100_config_init(bdp);
 
 	return 1;
 }
@@ -1390,11 +1386,11 @@ e100_tco_workaround(struct e100_private 
  *      true - If the adapter was initialized
  *      false - If the adapter failed initialization
  */
-unsigned char __devinit
+unsigned char
 e100_hw_init(struct e100_private *bdp)
 {
 	if (!e100_phy_init(bdp))
-		return false;
+		goto err;
 
 	e100_sw_reset(bdp, PORT_SELECTIVE_RESET);
 
@@ -1404,27 +1400,25 @@ e100_hw_init(struct e100_private *bdp)
 
 	/* Load the CU BASE (set to 0, because we use linear mode) */
 	if (!e100_wait_exec_cmplx(bdp, 0, SCB_CUC_LOAD_BASE, 0))
-		return false;
+		goto err;
 
 	if (!e100_wait_exec_cmplx(bdp, 0, SCB_RUC_LOAD_BASE, 0))
-		return false;
+		goto err;
 
 	/* Load interrupt microcode  */
 	if (e100_load_microcode(bdp)) {
 		bdp->flags |= DF_UCODE_LOADED;
 	}
 
-	e100_config_init(bdp);
-	if (!e100_config(bdp)) {
-		return false;
-	}
+	if (!e100_config(bdp))
+		goto err;
 
 	if (!e100_setup_iaaddr(bdp, bdp->device->dev_addr))
-		return false;
+		goto err;
 
 	/* Clear the internal counters */
 	if (!e100_clr_cntrs(bdp))
-		return false;
+		goto err;
 
 	/* Change for 82558 enhancement */
 	/* If 82558/9 and if the user has enabled flow control, set up the
@@ -1437,6 +1431,9 @@ e100_hw_init(struct e100_private *bdp)
 	}
 
 	return true;
+err:
+	printk(KERN_ERR "e100: hw init failed\n");
+	return false;
 }
 
 /**
@@ -1597,9 +1594,22 @@ e100_alloc_tcb_pool(struct e100_private 
 void
 e100_free_tcb_pool(struct e100_private *bdp)
 {
+	tcb_t *tcb;
+	int i;
+	/* Return tx skbs */ 
+	for (i = 0; i < bdp->params.TxDescriptors; i++) {
+	  	tcb = bdp->tcb_pool.data;
+		tcb += bdp->tcb_pool.head;
+  		e100_tx_skb_free(bdp, tcb);
+		if (NEXT_TCB_TOUSE(bdp->tcb_pool.head) == bdp->tcb_pool.tail)
+		  	break;
+		bdp->tcb_pool.head = NEXT_TCB_TOUSE(bdp->tcb_pool.head);
+	}
 	pci_free_consistent(bdp->pdev,
 			    sizeof (tcb_t) * bdp->params.TxDescriptors,
 			    bdp->tcb_pool.data, bdp->tcb_phys);
+	bdp->tcb_pool.head = 0;
+	bdp->tcb_pool.tail = 1;	
 	bdp->tcb_phys = 0;
 }
 
@@ -1753,12 +1763,10 @@ e100_watchdog(struct net_device *dev)
 				e100_set_multi(dev);
 			}
 		}
-
-		/* Update the statistics needed by the upper interface */
-		/* This should be the last statistic related command
-		 * as it's async. now */
-		e100_dump_stats_cntrs(bdp);
 	}
+	/* Issue command to dump statistics from device.        */
+	/* Check for command completion on next watchdog timer. */
+	e100_dump_stats_cntrs(bdp);
 
 	wmb();
 
@@ -2057,13 +2065,14 @@ e100_rx_srv(struct e100_private *bdp)
 			skb->ip_summed = CHECKSUM_NONE;
 		}
 
+		bdp->drv_stats.net_stats.rx_bytes += skb->len;
+
 		if(bdp->vlgrp && (rfd_status & CB_STATUS_VLAN)) {
 			vlan_hwaccel_rx(skb, bdp->vlgrp, be16_to_cpu(rfd->vlanid));
 		} else {
 			netif_rx(skb);
 		}
 		dev->last_rx = jiffies;
-		bdp->drv_stats.net_stats.rx_bytes += skb->len;
 		
 		rfd_cnt++;
 	}			/* end of rfd loop */
@@ -2206,10 +2215,10 @@ e100_prepare_xmit_buff(struct e100_priva
 
 		(tcb->tbd_ptr)->tbd_buf_addr =
 			cpu_to_le32(pci_map_single(bdp->pdev, skb->data,
-						   (skb->len - skb->data_len),
+						   skb_headlen(skb),
 						   PCI_DMA_TODEVICE));
 		(tcb->tbd_ptr)->tbd_buf_cnt =
-			cpu_to_le16(skb->len - skb->data_len);
+			cpu_to_le16(skb_headlen(skb));
 
 		for (i = 0; i < skb_shinfo(skb)->nr_frags;
 		     i++, tbd_arr_ptr++, frag++) {
@@ -2549,6 +2558,7 @@ e100_update_stats(struct e100_private *b
 	pcmd_complete = e100_cmd_complete_location(bdp);
 	if (*pcmd_complete != le32_to_cpu(DUMP_RST_STAT_COMPLETED) &&
 	    *pcmd_complete != le32_to_cpu(DUMP_STAT_COMPLETED)) {
+		*pcmd_complete = 0;
 		return false;
 	}
 
@@ -3046,23 +3056,6 @@ e100_isolate_driver(struct e100_private 
 	e100_sw_reset(bdp, PORT_SELECTIVE_RESET);
 }
 
-void
-e100_set_speed_duplex(struct e100_private *bdp)
-{
-	int carrier_ok;
-	/* Device may lose link with some siwtches when */
-	/* changing speed/duplex to non-autoneg. e100   */
-	/* needs to remember carrier state in order to  */
-	/* start watchdog timer for recovering link     */
-	if ((carrier_ok = netif_carrier_ok(bdp->device)))
-		e100_isolate_driver(bdp);
-	e100_phy_set_speed_duplex(bdp, true);
-	e100_config_fc(bdp);	/* re-config flow-control if necessary */
-	e100_config(bdp);	
-	if (carrier_ok)
-		e100_deisolate_driver(bdp, false);
-}
-
 static void
 e100_tcb_add_C_bit(struct e100_private *bdp)
 {
@@ -3218,6 +3211,144 @@ e100_do_ethtool_ioctl(struct net_device 
 	case ETHTOOL_PHYS_ID:
 		rc = e100_ethtool_led_blink(dev,ifr);
 		break;
+#ifdef	ETHTOOL_GRINGPARAM
+	case ETHTOOL_GRINGPARAM: {
+		struct ethtool_ringparam ering;
+		struct e100_private *bdp = dev->priv;
+		memset((void *) &ering, 0, sizeof(ering));
+		ering.rx_max_pending = E100_MAX_RFD;
+		ering.tx_max_pending = E100_MAX_TCB;
+		ering.rx_pending = bdp->params.RxDescriptors;
+		ering.tx_pending = bdp->params.TxDescriptors;
+		rc = copy_to_user(ifr->ifr_data, &ering, sizeof(ering))
+			? -EFAULT : 0;
+		return rc;
+	}
+#endif
+#ifdef	ETHTOOL_SRINGPARAM
+	case ETHTOOL_SRINGPARAM: {
+		struct ethtool_ringparam ering;
+		struct e100_private *bdp = dev->priv;
+		if (copy_from_user(&ering, ifr->ifr_data, sizeof(ering)))
+			return -EFAULT;
+		if (ering.rx_pending > E100_MAX_RFD 
+		    || ering.rx_pending < E100_MIN_RFD)
+			return -EINVAL;
+		if (ering.tx_pending > E100_MAX_TCB 
+		    || ering.tx_pending < E100_MIN_TCB)
+			return -EINVAL;
+		if (netif_running(dev)) {
+			spin_lock_bh(&dev->xmit_lock);
+			e100_close(dev);
+			spin_unlock_bh(&dev->xmit_lock);
+			/* Use new values to open interface */
+			bdp->params.RxDescriptors = ering.rx_pending;
+			bdp->params.TxDescriptors = ering.tx_pending;
+			e100_hw_init(bdp);
+			e100_open(dev);
+		}
+		else {
+			bdp->params.RxDescriptors = ering.rx_pending;
+			bdp->params.TxDescriptors = ering.tx_pending;
+		}
+		return 0;
+	}
+#endif
+#ifdef	ETHTOOL_GPAUSEPARAM
+	case ETHTOOL_GPAUSEPARAM: {
+		struct ethtool_pauseparam epause;
+		struct e100_private *bdp = dev->priv;
+		memset((void *) &epause, 0, sizeof(epause));
+		if ((bdp->flags & IS_BACHELOR)
+		    && (bdp->params.b_params & PRM_FC)) {
+			epause.autoneg = 1;
+			if (bdp->flags && DF_LINK_FC_CAP) {
+				epause.rx_pause = 1;
+				epause.tx_pause = 1;
+			}
+			if (bdp->flags && DF_LINK_FC_TX_ONLY)
+				epause.tx_pause = 1;
+		}
+		rc = copy_to_user(ifr->ifr_data, &epause, sizeof(epause))
+			? -EFAULT : 0;
+		return rc;
+	}
+#endif
+#ifdef	ETHTOOL_SPAUSEPARAM
+	case ETHTOOL_SPAUSEPARAM: {
+		struct ethtool_pauseparam epause;
+		struct e100_private *bdp = dev->priv;
+		if (!(bdp->flags & IS_BACHELOR))
+			return -EINVAL;
+		if (copy_from_user(&epause, ifr->ifr_data, sizeof(epause)))
+			return -EFAULT;
+		if (epause.autoneg == 1)
+			bdp->params.b_params |= PRM_FC;
+		else
+			bdp->params.b_params &= ~PRM_FC;
+		if (netif_running(dev)) {
+			spin_lock_bh(&dev->xmit_lock);
+			e100_close(dev);
+			spin_unlock_bh(&dev->xmit_lock);
+			e100_hw_init(bdp);
+			e100_open(dev);
+		}
+		return 0;
+	}
+#endif
+#ifdef	ETHTOOL_GRXCSUM
+	case ETHTOOL_GRXCSUM:
+	case ETHTOOL_GTXCSUM:
+	case ETHTOOL_GSG:
+	{	struct ethtool_value eval;
+		struct e100_private *bdp = dev->priv;
+		memset((void *) &eval, 0, sizeof(eval));
+		if ((ecmd.cmd == ETHTOOL_GRXCSUM) 
+		    && (bdp->params.b_params & PRM_XSUMRX))
+			eval.data = 1;
+		else
+			eval.data = 0;
+		rc = copy_to_user(ifr->ifr_data, &eval, sizeof(eval))
+			? -EFAULT : 0;
+		return rc;
+	}
+#endif
+#ifdef	ETHTOOL_SRXCSUM
+	case ETHTOOL_SRXCSUM:
+	case ETHTOOL_STXCSUM:
+	case ETHTOOL_SSG:
+	{	struct ethtool_value eval;
+		struct e100_private *bdp = dev->priv;
+		if (copy_from_user(&eval, ifr->ifr_data, sizeof(eval)))
+			return -EFAULT;
+		if (ecmd.cmd == ETHTOOL_SRXCSUM) {
+			if (eval.data == 1) { 
+				if (bdp->rev_id >= D101MA_REV_ID)
+					bdp->params.b_params |= PRM_XSUMRX;
+				else
+					return -EINVAL;
+			} else {
+				if (bdp->rev_id >= D101MA_REV_ID)
+					bdp->params.b_params &= ~PRM_XSUMRX;
+				else
+					return 0;
+			}
+		} else {
+			if (eval.data == 1)
+				return -EINVAL;
+			else
+				return 0;
+		}
+		if (netif_running(dev)) {
+			spin_lock_bh(&dev->xmit_lock);
+			e100_close(dev);
+			spin_unlock_bh(&dev->xmit_lock);
+			e100_hw_init(bdp);
+			e100_open(dev);
+		}
+		return 0;
+	}
+#endif
 	default:
 		break;
 	}			//switch
@@ -3291,10 +3422,6 @@ e100_ethtool_set_settings(struct net_dev
 	int ethtool_new_speed_duplex;
 	struct ethtool_cmd ecmd;
 
-	if (!capable(CAP_NET_ADMIN)) {
-		return -EPERM;
-	}
-
 	bdp = dev->priv;
 	if (copy_from_user(&ecmd, ifr->ifr_data, sizeof (ecmd))) {
 		return -EFAULT;
@@ -3303,7 +3430,13 @@ e100_ethtool_set_settings(struct net_dev
 	if ((ecmd.autoneg == AUTONEG_ENABLE)
 	    && (bdp->speed_duplex_caps & SUPPORTED_Autoneg)) {
 		bdp->params.e100_speed_duplex = E100_AUTONEG;
-		e100_set_speed_duplex(bdp);
+		if (netif_running(dev)) {
+			spin_lock_bh(&dev->xmit_lock);
+			e100_close(dev);
+			spin_unlock_bh(&dev->xmit_lock);
+			e100_hw_init(bdp);
+			e100_open(dev);
+		}
 	} else {
 		if (ecmd.speed == SPEED_10) {
 			if (ecmd.duplex == DUPLEX_HALF) {
@@ -3334,7 +3467,13 @@ e100_ethtool_set_settings(struct net_dev
 		if (bdp->speed_duplex_caps & ethtool_new_speed_duplex) {
 			bdp->params.e100_speed_duplex =
 				e100_new_speed_duplex;
-			e100_set_speed_duplex(bdp);
+			if (netif_running(dev)) {
+				spin_lock_bh(&dev->xmit_lock);
+				e100_close(dev);
+				spin_unlock_bh(&dev->xmit_lock);
+				e100_hw_init(bdp);
+				e100_open(dev);
+			}
 		} else {
 			return -EOPNOTSUPP;
 		} 
@@ -3369,14 +3508,14 @@ e100_ethtool_test(struct net_device *dev
 	struct ethtool_test *info;
 	int rc = -EFAULT;
 
-	info = kmalloc(sizeof(*info) + E100_MAX_TEST_RES * sizeof(u64),
+	info = kmalloc(sizeof(*info) + max_test_res * sizeof(u64),
 		       GFP_ATOMIC);
 
 	if (!info)
 		return -ENOMEM;
 
 	memset((void *) info, 0, sizeof(*info) +
-				 E100_MAX_TEST_RES * sizeof(u64));
+				 max_test_res * sizeof(u64));
 
 	if (copy_from_user(info, ifr->ifr_data, sizeof(*info)))
 		goto exit;
@@ -3384,7 +3523,7 @@ e100_ethtool_test(struct net_device *dev
 	info->flags = e100_run_diag(dev, info->data, info->flags);
 
 	if (!copy_to_user(ifr->ifr_data, info,
-			 sizeof(*info) + E100_MAX_TEST_RES * sizeof(u64)))
+			 sizeof(*info) + max_test_res * sizeof(u64)))
 		rc = 0;
 exit:
 	kfree(info);
@@ -3398,9 +3537,8 @@ e100_ethtool_gregs(struct net_device *de
 	u32 regs_buff[E100_REGS_LEN];
 	struct ethtool_regs regs = {ETHTOOL_GREGS};
 	void *addr = ifr->ifr_data;
+	u16 mdi_reg;
 
-	if (!capable(CAP_NET_ADMIN))
-		return -EPERM;
 	bdp = dev->priv;
 
 	if(copy_from_user(&regs, addr, sizeof(regs)))
@@ -3410,6 +3548,8 @@ e100_ethtool_gregs(struct net_device *de
 	regs_buff[0] = readb(&(bdp->scb->scb_cmd_hi)) << 24 |
 		readb(&(bdp->scb->scb_cmd_low)) << 16 |
 		readw(&(bdp->scb->scb_status));
+	e100_mdi_read(bdp, MII_NCONFIG, bdp->phy_addr, &mdi_reg);
+	regs_buff[1] = mdi_reg;
 
 	if(copy_to_user(addr, &regs, sizeof(regs)))
 		return -EFAULT;
@@ -3426,14 +3566,17 @@ e100_ethtool_nway_rst(struct net_device 
 {
 	struct e100_private *bdp;
 
-	if (!capable(CAP_NET_ADMIN))
-		return -EPERM;
-
 	bdp = dev->priv;
 
 	if ((bdp->speed_duplex_caps & SUPPORTED_Autoneg) &&
 	    (bdp->params.e100_speed_duplex == E100_AUTONEG)) {
-		e100_set_speed_duplex(bdp);
+		if (netif_running(dev)) {
+			spin_lock_bh(&dev->xmit_lock);
+			e100_close(dev);
+			spin_unlock_bh(&dev->xmit_lock);
+			e100_hw_init(bdp);
+			e100_open(dev);
+		}
 	} else {
 		return -EFAULT;
 	}
@@ -3459,7 +3602,7 @@ e100_ethtool_get_drvinfo(struct net_devi
 	info.n_stats = E100_STATS_LEN;
 	info.regdump_len  = E100_REGS_LEN * sizeof(u32);
 	info.eedump_len = (bdp->eeprom_size << 1);	
-	info.testinfo_len = E100_MAX_TEST_RES;
+	info.testinfo_len = max_test_res;
 	if (copy_to_user(ifr->ifr_data, &info, sizeof (info)))
 		return -EFAULT;
 
@@ -3478,9 +3621,6 @@ e100_ethtool_eeprom(struct net_device *d
 	void *ptr;
 	u8 *eeprom_data_bytes = (u8 *)eeprom_data;
 
-	if (!capable(CAP_NET_ADMIN))
-		return -EPERM;
-
 	bdp = dev->priv;
 
 	if (copy_from_user(&ecmd, ifr->ifr_data, sizeof (ecmd)))
@@ -3758,9 +3898,6 @@ e100_ethtool_wol(struct net_device *dev,
 	struct ethtool_wolinfo wolinfo;
 	int res = 0;
 
-	if (!capable(CAP_NET_ADMIN))
-		return -EPERM;
-
 	bdp = dev->priv;
 
 	if (copy_from_user(&wolinfo, ifr->ifr_data, sizeof (wolinfo))) {
@@ -3809,15 +3946,15 @@ static int e100_ethtool_gstrings(struct 
 	switch (info.string_set) {
 	case ETH_SS_TEST: {
 		int ret = 0;
-		if (info.len > E100_MAX_TEST_RES)
-			info.len = E100_MAX_TEST_RES;
+		if (info.len > max_test_res)
+			info.len = max_test_res;
 		strings = kmalloc(info.len * ETH_GSTRING_LEN, GFP_ATOMIC);
 		if (!strings)
 			return -ENOMEM;
 		memset(strings, 0, info.len * ETH_GSTRING_LEN);
 
 		for (i = 0; i < info.len; i++) {
-			sprintf(strings + i * ETH_GSTRING_LEN, "%-31s",
+			sprintf(strings + i * ETH_GSTRING_LEN, "%s",
 				test_strings[i]);
 		}
 		if (copy_to_user(ifr->ifr_data, &info, sizeof (info))) {
@@ -3890,7 +4027,13 @@ e100_mii_ioctl(struct net_device *dev, s
 					bdp->params.e100_speed_duplex = E100_SPEED_10_FULL;
 				else
 					bdp->params.e100_speed_duplex = E100_SPEED_10_HALF;
-				e100_set_speed_duplex(bdp);
+				if (netif_running(dev)) {
+					spin_lock_bh(&dev->xmit_lock);
+					e100_close(dev);
+					spin_unlock_bh(&dev->xmit_lock);
+					e100_hw_init(bdp);
+					e100_open(dev);
+				}
 		}
 		else 
 			/* Only allows changing speed/duplex */
@@ -4116,13 +4259,13 @@ e100_vlan_rx_kill_vid(struct net_device 
 static int
 e100_notify_reboot(struct notifier_block *nb, unsigned long event, void *p)
 {
-        struct pci_dev *pdev;
+        struct pci_dev *pdev = NULL;
 	
         switch(event) {
         case SYS_DOWN:
         case SYS_HALT:
         case SYS_POWER_OFF:
-                pci_for_each_dev(pdev) {
+		while ((pdev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, pdev)) != NULL) {
                         if(pci_dev_driver(pdev) == &e100_driver) {
 				/* If net_device struct is allocated? */
                                 if (pci_get_drvdata(pdev))
@@ -4173,7 +4316,6 @@ e100_resume(struct pci_dev *pcid)
 
 	return 0;
 }
-#endif /* CONFIG_PM */
 
 /**
  * e100_asf_enabled - checks if ASF is configured on the current adaper
@@ -4199,6 +4341,7 @@ e100_asf_enabled(struct e100_private *bd
 	}
 	return false;
 }
+#endif /* CONFIG_PM */
 
 #ifdef E100_CU_DEBUG
 unsigned char
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/net/e100/e100_phy.c linux-2.4.20-wolk4.4-fullkernel/drivers/net/e100/e100_phy.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/net/e100/e100_phy.c	2003-07-30 13:51:28.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/net/e100/e100_phy.c	2003-07-30 11:11:41.000000000 +0200
@@ -628,8 +628,6 @@ e100_force_speed_duplex(struct e100_priv
 	u16 control;
 	unsigned long expires;
 
-	e100_phy_reset(bdp);
-
 	bdp->flags |= DF_SPEED_FORCED;
 
 	e100_mdi_read(bdp, MII_BMCR, bdp->phy_addr, &control);
@@ -912,11 +910,16 @@ e100_phy_reset(struct e100_private *bdp)
 	u16 ctrl_reg;
 	ctrl_reg = BMCR_RESET;
 	e100_mdi_write(bdp, MII_BMCR, bdp->phy_addr, ctrl_reg);
+	/* ieee 802.3 : The reset process shall be completed       */
+	/* within 0.5 seconds from the settting of PHY reset bit.  */
+	set_current_state(TASK_UNINTERRUPTIBLE);
+	schedule_timeout(HZ / 2);
 }
 
 unsigned char __devinit
 e100_phy_init(struct e100_private *bdp)
 {
+	e100_phy_reset(bdp);
 	e100_phy_address_detect(bdp);
 	e100_phy_isolate(bdp);
 	e100_phy_id_detect(bdp);
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/net/e100/e100_test.c linux-2.4.20-wolk4.4-fullkernel/drivers/net/e100/e100_test.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/net/e100/e100_test.c	2003-07-30 13:51:28.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/net/e100/e100_test.c	2003-07-30 11:10:55.000000000 +0200
@@ -25,7 +25,7 @@
   Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
 *******************************************************************************/
 
-#include "e100.h"
+#include "e100_phy.h"
 #include "e100_config.h"
 
 extern u16 e100_eeprom_read(struct e100_private *, u16);
@@ -46,6 +46,7 @@ static u8 e100_diag_loopback_alloc(struc
 static void e100_diag_loopback_cu_ru_exec(struct e100_private *);
 static u8 e100_diag_check_pkt(u8 *);
 static void e100_diag_loopback_free(struct e100_private *);
+static int e100_cable_diag(struct e100_private *bdp);
 
 #define LB_PACKET_SIZE 1500
 
@@ -60,46 +61,52 @@ u32
 e100_run_diag(struct net_device *dev, u64 *test_info, u32 flags)
 {
 	struct e100_private* bdp = dev->priv;
-	u8 test_result = true;
-
-	e100_isolate_driver(bdp);
+	u8 test_result = 0;
 
+	if (!e100_get_link_state(bdp)) {
+		test_result = ETH_TEST_FL_FAILED;
+		test_info[test_link] = true;
+	}
+	if (!e100_diag_eeprom(dev)) {
+		test_result = ETH_TEST_FL_FAILED;
+		test_info[test_eeprom] = true;
+	}
 	if (flags & ETH_TEST_FL_OFFLINE) {
 		u8 fail_mask;
-		
-		fail_mask = e100_diag_selftest(dev);
-		if (fail_mask) {
-			test_result = false;
-			if (fail_mask & REGISTER_TEST_FAIL)
-				test_info [E100_REG_TEST_FAIL] = true;
-			if (fail_mask & ROM_TEST_FAIL)
-				test_info [E100_ROM_TEST_FAIL] = true;
-			if (fail_mask & SELF_TEST_FAIL)
-				test_info [E100_MAC_TEST_FAIL] = true;
-			if (fail_mask & TEST_TIMEOUT)
-				test_info [E100_CHIP_TIMEOUT] = true;
+		if (netif_running(dev)) {
+			spin_lock_bh(&dev->xmit_lock);
+			e100_close(dev);
+			spin_unlock_bh(&dev->xmit_lock);
+		}
+		if (e100_diag_selftest(dev)) {
+			test_result = ETH_TEST_FL_FAILED;
+			test_info[test_self_test] = true;
 		}
 
 		fail_mask = e100_diag_loopback(dev);
 		if (fail_mask) {
-			test_result = false;
+			test_result = ETH_TEST_FL_FAILED;
 			if (fail_mask & PHY_LOOPBACK)
-				test_info [E100_LPBK_PHY_FAIL] = true;
+				test_info[test_loopback_phy] = true;
 			if (fail_mask & MAC_LOOPBACK)
-				test_info [E100_LPBK_MAC_FAIL] = true;
+				test_info[test_loopback_mac] = true;
 		}
-	}
 
-	if (!e100_diag_eeprom(dev)) {
-		test_result = false;
-		test_info [E100_EEPROM_TEST_FAIL] = true;
+		test_info[cable_diag] = e100_cable_diag(bdp);
+		/* Need hw init regardless of netif_running */
+		e100_hw_init(bdp);
+		if (netif_running(dev)) {
+			e100_open(dev);
+		}
+	}
+	else {
+		test_info[test_self_test] = false;
+		test_info[test_loopback_phy] = false;
+		test_info[test_loopback_mac] = false;
+		test_info[cable_diag] = false;
 	}
 
-	set_current_state(TASK_UNINTERRUPTIBLE);
-	schedule_timeout(HZ * 2);
-    	e100_deisolate_driver(bdp, false);
-
-	return flags | (test_result ? 0 : ETH_TEST_FL_FAILED);
+	return flags | test_result;
 }
 
 /**
@@ -126,8 +133,6 @@ e100_diag_selftest(struct net_device *de
 		}
 	}
 
-	e100_configure_device(bdp);
-
 	return retval;
 }
 
@@ -165,14 +170,14 @@ e100_diag_loopback (struct net_device *d
 	u8 rc = 0;
 
 	printk(KERN_DEBUG "%s: PHY loopback test starts\n", dev->name);
-	e100_sw_reset(dev->priv, PORT_SELECTIVE_RESET);
+	e100_hw_init(dev->priv);
 	if (!e100_diag_one_loopback(dev, PHY_LOOPBACK)) {
 		rc |= PHY_LOOPBACK;
 	}
 	printk(KERN_DEBUG "%s: PHY loopback test ends\n", dev->name);
 
 	printk(KERN_DEBUG "%s: MAC loopback test starts\n", dev->name);
-	e100_sw_reset(dev->priv, PORT_SELECTIVE_RESET);
+	e100_hw_init(dev->priv);
 	if (!e100_diag_one_loopback(dev, MAC_LOOPBACK)) {
 		rc |= MAC_LOOPBACK;
 	}
@@ -257,15 +262,10 @@ e100_diag_config_loopback(struct e100_pr
 		if (set_loopback)
                         /* Set PHY loopback mode */
                         e100_phy_set_loopback(bdp);
-                else {	/* Back to normal speed and duplex */
-                	if (bdp->params.e100_speed_duplex == E100_AUTONEG)
-				/* Reset PHY and do autoneg */
-                        	e100_phy_autoneg(bdp);
-			else    
-				/* Reset PHY and force speed and duplex */
-				e100_force_speed_duplex(bdp);
-		}
-                /* Wait for PHY state change */
+		else
+			/* Reset PHY loopback mode */
+			e100_phy_reset(bdp);	
+		/* Wait for PHY state change */
 		set_current_state(TASK_UNINTERRUPTIBLE);
                 schedule_timeout(HZ);
 	} else { /* For MAC loopback wait 500 msec to take effect */
@@ -348,10 +348,6 @@ static void
 e100_diag_loopback_cu_ru_exec(struct e100_private *bdp)
 {
 	/*load CU & RU base */ 
-	if (!e100_wait_exec_cmplx(bdp, 0, SCB_CUC_LOAD_BASE, 0))
-		printk(KERN_ERR "e100: SCB_CUC_LOAD_BASE failed\n");
-	if(!e100_wait_exec_cmplx(bdp, 0, SCB_RUC_LOAD_BASE, 0))
-		printk(KERN_ERR "e100: SCB_RUC_LOAD_BASE failed!\n");
 	if(!e100_wait_exec_cmplx(bdp, bdp->loopback.dma_handle, SCB_RUC_START, 0))
 		printk(KERN_ERR "e100: SCB_RUC_START failed!\n");
 
@@ -433,3 +429,72 @@ e100_diag_loopback_free (struct e100_pri
 			    bdp->loopback.dma_handle);
 }
 
+static int
+e100_cable_diag(struct e100_private *bdp)
+{	
+	int saved_open_circut = 0xffff;
+	int saved_short_circut = 0xffff;
+	int saved_distance = 0xffff;
+	int saved_same = 0;
+	int cable_status = E100_CABLE_UNKNOWN;
+	int i;
+	
+	/* If we have link, */	
+	if (e100_get_link_state(bdp))
+		return E100_CABLE_OK;
+	
+	if (bdp->rev_id < D102_REV_ID)
+		return E100_CABLE_UNKNOWN;
+
+	/* Disable MDI/MDI-X auto switching */
+        e100_mdi_write(bdp, MII_NCONFIG, bdp->phy_addr,
+		MDI_MDIX_RESET_ALL_MASK);
+	/* Set to 100 Full as required by cable test */
+	e100_mdi_write(bdp, MII_BMCR, bdp->phy_addr,
+		BMCR_SPEED100 | BMCR_FULLDPLX);
+
+	/* Test up to 100 times */
+	for (i = 0; i < 100; i++) {
+		u16 ctrl_reg;
+		int distance, open_circut, short_circut, near_end;
+
+		/* Enable and execute cable test */
+		e100_mdi_write(bdp, HWI_CONTROL_REG, bdp->phy_addr,
+			(HWI_TEST_ENABLE | HWI_TEST_EXECUTE));
+		/* Wait for cable test finished */
+		set_current_state(TASK_UNINTERRUPTIBLE);
+		schedule_timeout(HZ/100 + 1);
+		/* Read results */
+		e100_mdi_read(bdp, HWI_CONTROL_REG, bdp->phy_addr, &ctrl_reg);
+		distance = ctrl_reg & HWI_TEST_DISTANCE;
+		open_circut = ctrl_reg & HWI_TEST_HIGHZ_PROBLEM;
+		short_circut = ctrl_reg & HWI_TEST_LOWZ_PROBLEM;
+
+		if ((distance == saved_distance) &&
+	    	    (open_circut == saved_open_circut) &&
+	    	    (short_circut == saved_short_circut)) 
+			saved_same++;
+		else {
+			saved_same = 0;
+			saved_distance = distance;
+			saved_open_circut = open_circut;
+			saved_short_circut = short_circut;
+		}
+		/* If results are the same 3 times */
+		if (saved_same == 3) {
+			near_end = ((distance * HWI_REGISTER_GRANULARITY) <
+			       HWI_NEAR_END_BOUNDARY);
+			if (open_circut)
+				cable_status = (near_end) ? 
+					E100_CABLE_OPEN_NEAR : E100_CABLE_OPEN_FAR;
+			if (short_circut)
+				cable_status = (near_end) ?
+					E100_CABLE_SHORT_NEAR : E100_CABLE_SHORT_FAR;
+			break;
+		}
+	}
+	/* Reset cable test */
+        e100_mdi_write(bdp, HWI_CONTROL_REG, bdp->phy_addr,					       HWI_RESET_ALL_MASK);
+	return cable_status;
+}
+
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/net/e1000/Makefile linux-2.4.20-wolk4.4-fullkernel/drivers/net/e1000/Makefile
--- linux-2.4.20-wolk4.3-fullkernel/drivers/net/e1000/Makefile	2003-07-30 13:51:28.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/net/e1000/Makefile	2003-07-30 11:11:22.000000000 +0200
@@ -1,7 +1,7 @@
 ################################################################################
 #
 # 
-# Copyright(c) 1999 - 2002 Intel Corporation. All rights reserved.
+# Copyright(c) 1999 - 2003 Intel Corporation. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify it 
 # under the terms of the GNU General Public License as published by the Free 
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/net/e1000/e1000.h linux-2.4.20-wolk4.4-fullkernel/drivers/net/e1000/e1000.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/net/e1000/e1000.h	2003-07-30 13:51:28.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/net/e1000/e1000.h	2003-07-30 11:11:43.000000000 +0200
@@ -63,6 +63,9 @@
 #include <net/pkt_sched.h>
 #include <linux/list.h>
 #include <linux/reboot.h>
+#ifdef NETIF_F_TSO
+#include <net/checksum.h>
+#endif
 #include <linux/tqueue.h>
 #include <linux/mii.h>
 #include <linux/ethtool.h>
@@ -131,6 +134,7 @@ struct e1000_buffer {
 	uint64_t dma;
 	unsigned long length;
 	unsigned long time_stamp;
+	unsigned int next_to_watch;
 };
 
 struct e1000_desc_ring {
@@ -166,7 +170,6 @@ struct e1000_adapter {
 	struct timer_list watchdog_timer;
 	struct timer_list phy_info_timer;
 	struct vlan_group *vlgrp;
-	char *id_string;
 	uint32_t bd_number;
 	uint32_t rx_buffer_len;
 	uint32_t part_num;
@@ -215,9 +218,11 @@ struct e1000_adapter {
 	struct e1000_phy_info phy_info;
 	struct e1000_phy_stats phy_stats;
 
+	uint32_t test_icr;
+	struct e1000_desc_ring test_tx_ring;
+	struct e1000_desc_ring test_rx_ring;
 
 
 	uint32_t pci_state[16];
-	char ifname[IFNAMSIZ];
 };
 #endif /* _E1000_H_ */
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/net/e1000/e1000_ethtool.c linux-2.4.20-wolk4.4-fullkernel/drivers/net/e1000/e1000_ethtool.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/net/e1000/e1000_ethtool.c	2003-07-30 13:51:28.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/net/e1000/e1000_ethtool.c	2003-07-30 11:11:42.000000000 +0200
@@ -40,15 +40,60 @@ extern void e1000_down(struct e1000_adap
 extern void e1000_reset(struct e1000_adapter *adapter);
 extern int e1000_set_spd_dplx(struct e1000_adapter *adapter, uint16_t spddplx);
 
-static char e1000_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",
+struct e1000_stats {
+	char stat_string[ETH_GSTRING_LEN];
+	int sizeof_stat;
+	int stat_offset;
 };
-#define E1000_STATS_LEN	sizeof(e1000_gstrings_stats) / ETH_GSTRING_LEN
+
+#define E1000_STAT(m) sizeof(((struct e1000_adapter *)0)->m), \
+		      offsetof(struct e1000_adapter, m)
+static struct e1000_stats e1000_gstrings_stats[] = {
+	{ "rx_packets", E1000_STAT(net_stats.rx_packets) },
+	{ "tx_packets", E1000_STAT(net_stats.tx_packets) },
+	{ "rx_bytes", E1000_STAT(net_stats.rx_bytes) },
+	{ "tx_bytes", E1000_STAT(net_stats.tx_bytes) },
+	{ "rx_errors", E1000_STAT(net_stats.rx_errors) },
+	{ "tx_errors", E1000_STAT(net_stats.tx_errors) },
+	{ "rx_dropped", E1000_STAT(net_stats.rx_dropped) },
+	{ "tx_dropped", E1000_STAT(net_stats.tx_dropped) },
+	{ "multicast", E1000_STAT(net_stats.multicast) },
+	{ "collisions", E1000_STAT(net_stats.collisions) },
+	{ "rx_length_errors", E1000_STAT(net_stats.rx_length_errors) },
+	{ "rx_over_errors", E1000_STAT(net_stats.rx_over_errors) },
+	{ "rx_crc_errors", E1000_STAT(net_stats.rx_crc_errors) },
+	{ "rx_frame_errors", E1000_STAT(net_stats.rx_frame_errors) },
+	{ "rx_fifo_errors", E1000_STAT(net_stats.rx_fifo_errors) },
+	{ "rx_missed_errors", E1000_STAT(net_stats.rx_missed_errors) },
+	{ "tx_aborted_errors", E1000_STAT(net_stats.tx_aborted_errors) },
+	{ "tx_carrier_errors", E1000_STAT(net_stats.tx_carrier_errors) },
+	{ "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(net_stats.tx_window_errors) },
+	{ "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) },
+	{ "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_csum_offload_good", E1000_STAT(hw_csum_good) },
+	{ "rx_csum_offload_errors", E1000_STAT(hw_csum_err) }
+};
+#define E1000_STATS_LEN	\
+	sizeof(e1000_gstrings_stats) / sizeof(struct e1000_stats)
+static 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 sizeof(e1000_gstrings_test) / ETH_GSTRING_LEN
 
 static void
 e1000_ethtool_gset(struct e1000_adapter *adapter, struct ethtool_cmd *ecmd)
@@ -154,6 +199,7 @@ e1000_ethtool_gdrvinfo(struct e1000_adap
 	strncpy(drvinfo->fw_version, "N/A", 32);
 	strncpy(drvinfo->bus_info, adapter->pdev->slot_name, 32);
 	drvinfo->n_stats = E1000_STATS_LEN;
+	drvinfo->testinfo_len = E1000_TEST_LEN;
 #define E1000_REGS_LEN 32
 	drvinfo->regdump_len  = E1000_REGS_LEN * sizeof(uint32_t);
 	drvinfo->eedump_len = adapter->hw.eeprom.word_size * 2;
@@ -164,6 +210,7 @@ e1000_ethtool_gregs(struct e1000_adapter
                     struct ethtool_regs *regs, uint32_t *regs_buff)
 {
 	struct e1000_hw *hw = &adapter->hw;
+	uint16_t phy_data;
 
 	regs->version = (1 << 24) | (hw->revision_id << 16) | hw->device_id;
 
@@ -182,6 +229,62 @@ e1000_ethtool_gregs(struct e1000_adapter
 	regs_buff[10] = E1000_READ_REG(hw, TDT);
 	regs_buff[11] = E1000_READ_REG(hw, TIDV);
 
+	regs_buff[12] = adapter->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] = (uint32_t)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] = (uint32_t)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] = (uint32_t)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] = (uint32_t)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] = (uint32_t)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] = (uint32_t)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] = (uint32_t)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] = (uint32_t)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] = (uint32_t)phy_data;  /* phy local receiver status */
+	regs_buff[25] = regs_buff[24];  /* phy remote receiver status */
+
 	return;
 }
 
@@ -219,7 +322,7 @@ e1000_ethtool_geeprom(struct e1000_adapt
 		uint16_t i;
 		for (i = 0; i < last_word - first_word + 1; i++)
 			if((ret_val = e1000_read_eeprom(hw, first_word + i, 1,
-						       &eeprom_buff[i])))
+							&eeprom_buff[i])))
 				break;
 	}
 geeprom_error:
@@ -249,7 +352,7 @@ e1000_ethtool_seeprom(struct e1000_adapt
 	first_word = eeprom->offset >> 1;
 	last_word = (eeprom->offset + eeprom->len - 1) >> 1;
 	eeprom_buff = kmalloc(max_len, GFP_KERNEL);
-	if(eeprom_buff == NULL)
+	if(!eeprom_buff)
 		return -ENOMEM;
 
 	ptr = (void *)eeprom_buff;
@@ -284,6 +387,766 @@ seeprom_error:
 	return ret_val;
 }
 
+#define REG_PATTERN_TEST(R, M, W)                                              \
+{                                                                              \
+	uint32_t pat, value;                                                   \
+	uint32_t test[] =                                                      \
+		{0x5A5A5A5A, 0xA5A5A5A5, 0x00000000, 0xFFFFFFFF};              \
+	for(pat = 0; pat < sizeof(test)/sizeof(test[0]); pat++) {              \
+		E1000_WRITE_REG(&adapter->hw, R, (test[pat] & W));             \
+		value = E1000_READ_REG(&adapter->hw, R);                       \
+		if(value != (test[pat] & W & M)) {                             \
+			*data = (adapter->hw.mac_type < e1000_82543) ?         \
+				E1000_82542_##R : E1000_##R;                   \
+			return 1;                                              \
+		}                                                              \
+	}                                                                      \
+}
+
+#define REG_SET_AND_CHECK(R, M, W)                                             \
+{                                                                              \
+	uint32_t value;                                                        \
+	E1000_WRITE_REG(&adapter->hw, R, W & M);                               \
+	value = E1000_READ_REG(&adapter->hw, R);                               \
+	if ((W & M) != (value & M)) {                                          \
+		*data = (adapter->hw.mac_type < e1000_82543) ?                 \
+			E1000_82542_##R : E1000_##R;                           \
+		return 1;                                                      \
+	}                                                                      \
+}
+
+static int
+e1000_reg_test(struct e1000_adapter *adapter, uint64_t *data)
+{
+	uint32_t value;
+	uint32_t i;
+
+	/* The status register is Read Only, so a write should fail.
+	 * Some bits that get toggled are ignored.
+	 */
+	value = (E1000_READ_REG(&adapter->hw, STATUS) & (0xFFFFF833));
+	E1000_WRITE_REG(&adapter->hw, STATUS, (0xFFFFFFFF));
+	if(value != (E1000_READ_REG(&adapter->hw, STATUS) & (0xFFFFF833))) {
+		*data = 1;
+		return 1;
+	}
+
+	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);
+	REG_SET_AND_CHECK(RCTL, 0x06DFB3FE, 0x003FFFFB);
+	REG_SET_AND_CHECK(TCTL, 0xFFFFFFFF, 0x00000000);
+
+	if(adapter->hw.mac_type >= e1000_82543) {
+
+		REG_SET_AND_CHECK(RCTL, 0x06DFB3FE, 0xFFFFFFFF);
+		REG_PATTERN_TEST(RDBAL, 0xFFFFFFF0, 0xFFFFFFFF);
+		REG_PATTERN_TEST(TXCW, 0xC000FFFF, 0x0000FFFF);
+		REG_PATTERN_TEST(TDBAL, 0xFFFFFFF0, 0xFFFFFFFF);
+		REG_PATTERN_TEST(TIDV, 0x0000FFFF, 0x0000FFFF);
+
+		for(i = 0; i < E1000_RAR_ENTRIES; i++) {
+			REG_PATTERN_TEST(RA + ((i << 1) << 2), 0xFFFFFFFF,
+					 0xFFFFFFFF);
+			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);
+
+	}
+
+	for(i = 0; i < E1000_MC_TBL_SIZE; i++)
+		REG_PATTERN_TEST(MTA + (i << 2), 0xFFFFFFFF, 0xFFFFFFFF);
+
+	return 0;
+}
+
+static int
+e1000_eeprom_test(struct e1000_adapter *adapter, uint64_t *data)
+{
+	uint16_t temp;
+	uint16_t checksum = 0;
+	uint16_t 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(&adapter->hw, i, 1, &temp)) < 0) {
+			*data = 1;
+			break;
+		}
+		checksum += temp;
+	}
+
+	/* If Checksum is not Correct return error else test passed */
+	if((checksum != (uint16_t) EEPROM_SUM) && !(*data))
+		*data = 2;
+
+	return *data;
+}
+
+static void
+e1000_test_intr(int irq,
+		void *data,
+		struct pt_regs *regs)
+{
+	struct net_device *netdev = (struct net_device *) data;
+	struct e1000_adapter *adapter = netdev->priv;
+
+	adapter->test_icr |= E1000_READ_REG(&adapter->hw, ICR);
+
+	return;
+}
+
+static int
+e1000_intr_test(struct e1000_adapter *adapter, uint64_t *data)
+{
+	struct net_device *netdev = adapter->netdev;
+	uint32_t icr, mask, i=0;
+
+	*data = 0;
+
+	/* Hook up test interrupt handler just for this test */
+	if(request_irq
+	   (netdev->irq, &e1000_test_intr, SA_SHIRQ, netdev->name, netdev)) {
+		*data = 1;
+		return -1;
+	}
+
+	/* Disable all the interrupts */
+	E1000_WRITE_REG(&adapter->hw, IMC, 0xFFFFFFFF);
+	msec_delay(10);
+
+	/* Interrupts are disabled, so read interrupt cause
+	 * register (icr) twice to verify that there are no interrupts
+	 * pending.  icr is clear on read.
+	 */
+	icr = E1000_READ_REG(&adapter->hw, ICR);
+	icr = E1000_READ_REG(&adapter->hw, ICR);
+
+	if(icr != 0) {
+		/* if icr is non-zero, there is no point
+		 * running other interrupt tests.
+		 */
+		*data = 2;
+		i = 10;
+	}
+
+	/* Test each interrupt */
+	for(; i < 10; i++) {
+
+		/* Interrupt to test */
+		mask = 1 << i;
+
+		/* 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;
+		E1000_WRITE_REG(&adapter->hw, IMC, mask);
+		E1000_WRITE_REG(&adapter->hw, ICS, mask);
+		msec_delay(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;
+		E1000_WRITE_REG(&adapter->hw, IMS, mask);
+		E1000_WRITE_REG(&adapter->hw, ICS, mask);
+		msec_delay(10);
+
+		if(!(adapter->test_icr & mask)) {
+			*data = 4;
+			break;
+		}
+
+		/* 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;
+		E1000_WRITE_REG(&adapter->hw, IMC, ~mask);
+		E1000_WRITE_REG(&adapter->hw, ICS, ~mask);
+		msec_delay(10);
+
+		if(adapter->test_icr) {
+			*data = 5;
+			break;
+		}
+	}
+
+	/* Disable all the interrupts */
+	E1000_WRITE_REG(&adapter->hw, IMC, 0xFFFFFFFF);
+	msec_delay(10);
+
+	/* Unhook test interrupt handler */
+	free_irq(netdev->irq, netdev);
+
+	return *data;
+}
+
+static void
+e1000_free_desc_rings(struct e1000_adapter *adapter)
+{
+	struct e1000_desc_ring *txdr = &adapter->test_tx_ring;
+	struct e1000_desc_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);
+	if(rxdr->desc)
+		pci_free_consistent(pdev, rxdr->size, rxdr->desc, rxdr->dma);
+
+	if(txdr->buffer_info)
+		kfree(txdr->buffer_info);
+	if(rxdr->buffer_info)
+		kfree(rxdr->buffer_info);
+
+	return;
+}
+
+static int
+e1000_setup_desc_rings(struct e1000_adapter *adapter)
+{
+	struct e1000_desc_ring *txdr = &adapter->test_tx_ring;
+	struct e1000_desc_ring *rxdr = &adapter->test_rx_ring;
+	struct pci_dev *pdev = adapter->pdev;
+	uint32_t rctl;
+	int size, i, ret_val;
+
+	/* Setup Tx descriptor ring and Tx buffers */
+
+	txdr->count = 80;
+
+	size = txdr->count * sizeof(struct e1000_buffer);
+	if(!(txdr->buffer_info = kmalloc(size, GFP_KERNEL))) {
+		ret_val = 1;
+		goto err_nomem;
+	}
+	memset(txdr->buffer_info, 0, size);
+
+	txdr->size = txdr->count * sizeof(struct e1000_tx_desc);
+	E1000_ROUNDUP(txdr->size, 4096);
+	if(!(txdr->desc = pci_alloc_consistent(pdev, txdr->size, &txdr->dma))) {
+		ret_val = 2;
+		goto err_nomem;
+	}
+	memset(txdr->desc, 0, txdr->size);
+	txdr->next_to_use = txdr->next_to_clean = 0;
+
+	E1000_WRITE_REG(&adapter->hw, TDBAL,
+			((uint64_t) txdr->dma & 0x00000000FFFFFFFF));
+	E1000_WRITE_REG(&adapter->hw, TDBAH, ((uint64_t) txdr->dma >> 32));
+	E1000_WRITE_REG(&adapter->hw, TDLEN,
+			txdr->count * sizeof(struct e1000_tx_desc));
+	E1000_WRITE_REG(&adapter->hw, TDH, 0);
+	E1000_WRITE_REG(&adapter->hw, TDT, 0);
+	E1000_WRITE_REG(&adapter->hw, 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;
+
+		if(!(skb = alloc_skb(size, GFP_KERNEL))) {
+			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 |= E1000_TXD_CMD_EOP;
+		tx_desc->lower.data |= E1000_TXD_CMD_IFCS;
+		tx_desc->lower.data |= E1000_TXD_CMD_RPS;
+		tx_desc->upper.data = 0;
+	}
+
+	/* Setup Rx descriptor ring and Rx buffers */
+
+	rxdr->count = 80;
+
+	size = rxdr->count * sizeof(struct e1000_buffer);
+	if(!(rxdr->buffer_info = kmalloc(size, GFP_KERNEL))) {
+		ret_val = 4;
+		goto err_nomem;
+	}
+	memset(rxdr->buffer_info, 0, size);
+
+	rxdr->size = rxdr->count * sizeof(struct e1000_rx_desc);
+	if(!(rxdr->desc = pci_alloc_consistent(pdev, rxdr->size, &rxdr->dma))) {
+		ret_val = 5;
+		goto err_nomem;
+	}
+	memset(rxdr->desc, 0, rxdr->size);
+	rxdr->next_to_use = rxdr->next_to_clean = 0;
+
+	rctl = E1000_READ_REG(&adapter->hw, RCTL);
+	E1000_WRITE_REG(&adapter->hw, RCTL, rctl & ~E1000_RCTL_EN);
+	E1000_WRITE_REG(&adapter->hw, RDBAL,
+			((uint64_t) rxdr->dma & 0xFFFFFFFF));
+	E1000_WRITE_REG(&adapter->hw, RDBAH, ((uint64_t) rxdr->dma >> 32));
+	E1000_WRITE_REG(&adapter->hw, RDLEN, rxdr->size);
+	E1000_WRITE_REG(&adapter->hw, RDH, 0);
+	E1000_WRITE_REG(&adapter->hw, RDT, 0);
+	rctl = E1000_RCTL_EN | E1000_RCTL_BAM | E1000_RCTL_SZ_2048 |
+		E1000_RCTL_LBM_NO | E1000_RCTL_RDMTS_HALF |
+		(adapter->hw.mc_filter_type << E1000_RCTL_MO_SHIFT);
+	E1000_WRITE_REG(&adapter->hw, RCTL, rctl);
+
+	for(i = 0; i < rxdr->count; i++) {
+		struct e1000_rx_desc *rx_desc = E1000_RX_DESC(*rxdr, i);
+		struct sk_buff *skb;
+
+		if(!(skb = alloc_skb(E1000_RXBUFFER_2048 + 2, GFP_KERNEL))) {
+			ret_val = 6;
+			goto err_nomem;
+		}
+		skb_reserve(skb, 2);
+		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)
+{
+	/* Write out to PHY registers 29 and 30 to disable the Receiver. */
+	e1000_write_phy_reg(&adapter->hw, 29, 0x001F);
+	e1000_write_phy_reg(&adapter->hw, 30, 0x8FFC);
+	e1000_write_phy_reg(&adapter->hw, 29, 0x001A);
+	e1000_write_phy_reg(&adapter->hw, 30, 0x8FF0);
+
+	return;
+}
+
+static void
+e1000_phy_reset_clk_and_crs(struct e1000_adapter *adapter)
+{
+	uint16_t 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(&adapter->hw, M88E1000_EXT_PHY_SPEC_CTRL, &phy_reg);
+	phy_reg |= M88E1000_EPSCR_TX_CLK_25;
+	e1000_write_phy_reg(&adapter->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(&adapter->hw, M88E1000_PHY_SPEC_CTRL, &phy_reg);
+	phy_reg |= M88E1000_PSCR_ASSERT_CRS_ON_TX;
+	e1000_write_phy_reg(&adapter->hw,
+		M88E1000_PHY_SPEC_CTRL, phy_reg);
+}
+
+static int
+e1000_nonintegrated_phy_loopback(struct e1000_adapter *adapter)
+{
+	uint32_t ctrl_reg;
+	uint16_t phy_reg;
+
+	/* Setup the Device Control Register for PHY loopback test. */
+
+	ctrl_reg = E1000_READ_REG(&adapter->hw, 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 */
+
+	E1000_WRITE_REG(&adapter->hw, CTRL, ctrl_reg);
+
+	/* Read the PHY Specific Control Register (0x10) */
+	e1000_read_phy_reg(&adapter->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(&adapter->hw, M88E1000_PHY_SPEC_CTRL, phy_reg);
+
+	/* Perform software reset on the PHY */
+	e1000_phy_reset(&adapter->hw);
+
+	/* Have to setup TX_CLK and TX_CRS after software reset */
+	e1000_phy_reset_clk_and_crs(adapter);
+
+	e1000_write_phy_reg(&adapter->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(&adapter->hw, PHY_CTRL, &phy_reg);
+	phy_reg |= MII_CR_LOOPBACK;
+	e1000_write_phy_reg(&adapter->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(&adapter->hw, PHY_CTRL, &phy_reg);
+	if(phy_reg != 0x4100)
+		 return 9;
+
+	e1000_read_phy_reg(&adapter->hw, M88E1000_EXT_PHY_SPEC_CTRL, &phy_reg);
+	if(phy_reg != 0x0070)
+		return 10;
+
+	e1000_read_phy_reg(&adapter->hw, 29, &phy_reg);
+	if(phy_reg != 0x001A)
+		return 11;
+
+	return 0;
+}
+
+static int
+e1000_integrated_phy_loopback(struct e1000_adapter *adapter)
+{
+	uint32_t ctrl_reg = 0;
+	uint32_t stat_reg = 0;
+
+	adapter->hw.autoneg = FALSE;
+
+	if(adapter->hw.phy_type == e1000_phy_m88) {
+		/* Auto-MDI/MDIX Off */
+		e1000_write_phy_reg(&adapter->hw,
+				    M88E1000_PHY_SPEC_CTRL, 0x0808);
+		/* reset to update Auto-MDI/MDIX */
+		e1000_write_phy_reg(&adapter->hw, PHY_CTRL, 0x9140);
+		/* autoneg off */
+		e1000_write_phy_reg(&adapter->hw, PHY_CTRL, 0x8140);
+	}
+	/* force 1000, set loopback */
+	e1000_write_phy_reg(&adapter->hw, PHY_CTRL, 0x4140);
+
+	/* Now set up the MAC to the same speed/duplex as the PHY. */
+	ctrl_reg = E1000_READ_REG(&adapter->hw, 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(adapter->hw.media_type == e1000_media_type_copper &&
+	   adapter->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 = E1000_READ_REG(&adapter->hw, STATUS);
+		if((stat_reg & E1000_STATUS_FD) == 0)
+			ctrl_reg |= (E1000_CTRL_ILOS | E1000_CTRL_SLU);
+	}
+
+	E1000_WRITE_REG(&adapter->hw, 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(adapter->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)
+{
+	uint16_t phy_reg = 0;
+	uint16_t count = 0;
+
+	switch (adapter->hw.mac_type) {
+	case e1000_82543:
+		if(adapter->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_82546:
+	case e1000_82541:
+	case e1000_82547:
+		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(&adapter->hw, PHY_CTRL, &phy_reg);
+		phy_reg |= MII_CR_LOOPBACK;
+		e1000_write_phy_reg(&adapter->hw, PHY_CTRL, phy_reg);
+		return 0;
+		break;
+	}
+
+	return 8;
+}
+
+static int
+e1000_setup_loopback_test(struct e1000_adapter *adapter)
+{
+	uint32_t rctl;
+
+	if(adapter->hw.media_type == e1000_media_type_fiber) {
+		if(adapter->hw.mac_type == e1000_82545 ||
+		   adapter->hw.mac_type == e1000_82546)
+			return e1000_set_phy_loopback(adapter);
+		else {
+			rctl = E1000_READ_REG(&adapter->hw, RCTL);
+			rctl |= E1000_RCTL_LBM_TCVR;
+			E1000_WRITE_REG(&adapter->hw, RCTL, rctl);
+			return 0;
+		}
+	} else if(adapter->hw.media_type == e1000_media_type_copper)
+		return e1000_set_phy_loopback(adapter);
+
+	return 7;
+}
+
+static void
+e1000_loopback_cleanup(struct e1000_adapter *adapter)
+{
+	uint32_t rctl;
+	uint16_t phy_reg;
+
+	rctl = E1000_READ_REG(&adapter->hw, RCTL);
+	rctl &= ~(E1000_RCTL_LBM_TCVR | E1000_RCTL_LBM_MAC);
+	E1000_WRITE_REG(&adapter->hw, RCTL, rctl);
+
+	if(adapter->hw.media_type == e1000_media_type_copper ||
+	   (adapter->hw.media_type == e1000_media_type_fiber &&
+	    (adapter->hw.mac_type == e1000_82545 ||
+	     adapter->hw.mac_type == e1000_82546))) {
+		adapter->hw.autoneg = TRUE;
+		e1000_read_phy_reg(&adapter->hw, PHY_CTRL, &phy_reg);
+		if(phy_reg & MII_CR_LOOPBACK) {
+			phy_reg &= ~MII_CR_LOOPBACK;
+			e1000_write_phy_reg(&adapter->hw, PHY_CTRL, phy_reg);
+			e1000_phy_reset(&adapter->hw);
+		}
+	}
+}
+
+static void
+e1000_create_lbtest_frame(struct sk_buff *skb, unsigned int frame_size)
+{
+	memset(skb->data, 0xFF, frame_size);
+	frame_size = (frame_size % 2) ? (frame_size - 1) : frame_size;
+	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 = (frame_size % 2) ? (frame_size - 1) : frame_size;
+	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_desc_ring *txdr = &adapter->test_tx_ring;
+	struct e1000_desc_ring *rxdr = &adapter->test_rx_ring;
+	struct pci_dev *pdev = adapter->pdev;
+	int i;
+
+	E1000_WRITE_REG(&adapter->hw, RDT, rxdr->count - 1);
+
+	for(i = 0; i < 64; i++) {
+		e1000_create_lbtest_frame(txdr->buffer_info[i].skb, 1024);
+		pci_dma_sync_single(pdev, txdr->buffer_info[i].dma,
+				    txdr->buffer_info[i].length,
+				    PCI_DMA_TODEVICE);
+	}
+	E1000_WRITE_REG(&adapter->hw, TDT, i);
+
+	msec_delay(200);
+
+	pci_dma_sync_single(pdev, rxdr->buffer_info[0].dma,
+			    rxdr->buffer_info[0].length, PCI_DMA_FROMDEVICE);
+
+	return e1000_check_lbtest_frame(rxdr->buffer_info[0].skb, 1024);
+}
+
+static int
+e1000_loopback_test(struct e1000_adapter *adapter, uint64_t *data)
+{
+	if((*data = e1000_setup_desc_rings(adapter))) goto err_loopback;
+	if((*data = e1000_setup_loopback_test(adapter))) goto err_loopback;
+	*data = e1000_run_loopback_test(adapter);
+	e1000_loopback_cleanup(adapter);
+	e1000_free_desc_rings(adapter);
+err_loopback:
+	return *data;
+}
+
+static int
+e1000_link_test(struct e1000_adapter *adapter, uint64_t *data)
+{
+	*data = 0;
+	e1000_check_for_link(&adapter->hw);
+
+	if(!(E1000_READ_REG(&adapter->hw, STATUS) & E1000_STATUS_LU)) {
+		*data = 1;
+	}
+	return *data;
+}
+
+static int
+e1000_ethtool_test(struct e1000_adapter *adapter,
+		   struct ethtool_test *eth_test, uint64_t *data)
+{
+	boolean_t if_running = netif_running(adapter->netdev);
+
+	if(eth_test->flags == ETH_TEST_FL_OFFLINE) {
+		/* Offline tests */
+
+		/* 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)
+			e1000_down(adapter);
+		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);
+		if(e1000_loopback_test(adapter, &data[3]))
+			eth_test->flags |= ETH_TEST_FL_FAILED;
+
+		e1000_reset(adapter);
+		if(if_running)
+			e1000_up(adapter);
+	} else {
+		/* Online tests */
+		if(e1000_link_test(adapter, &data[4]))
+			eth_test->flags |= ETH_TEST_FL_FAILED;
+
+		/* Offline tests aren't run; pass by default */
+		data[0] = 0;
+		data[1] = 0;
+		data[2] = 0;
+		data[3] = 0;
+	}
+	return 0;
+}
+
 static void
 e1000_ethtool_gwol(struct e1000_adapter *adapter, struct ethtool_wolinfo *wol)
 {
@@ -427,8 +1290,6 @@ e1000_ethtool_ioctl(struct net_device *n
 	}
 	case ETHTOOL_SSET: {
 		struct ethtool_cmd ecmd;
-		if(!capable(CAP_NET_ADMIN))
-			return -EPERM;
 		if(copy_from_user(&ecmd, addr, sizeof(ecmd)))
 			return -EFAULT;
 		return e1000_ethtool_sset(adapter, &ecmd);
@@ -443,24 +1304,46 @@ e1000_ethtool_ioctl(struct net_device *n
 	case ETHTOOL_GSTRINGS: {
 		struct ethtool_gstrings gstrings = { ETHTOOL_GSTRINGS };
 		char *strings = NULL;
+		int err = 0;
 
 		if(copy_from_user(&gstrings, addr, sizeof(gstrings)))
 			return -EFAULT;
 		switch(gstrings.string_set) {
-		case ETH_SS_STATS:
+		case ETH_SS_TEST:
+			gstrings.len = E1000_TEST_LEN;
+			strings = kmalloc(E1000_TEST_LEN * ETH_GSTRING_LEN,
+					  GFP_KERNEL);
+			if(!strings)
+				return -ENOMEM;
+			memcpy(strings, e1000_gstrings_test, E1000_TEST_LEN *
+			       ETH_GSTRING_LEN);
+			break;
+		case ETH_SS_STATS: {
+			int i;
 			gstrings.len = E1000_STATS_LEN;
-			strings = *e1000_gstrings_stats;
+			strings = kmalloc(E1000_STATS_LEN * ETH_GSTRING_LEN,
+					  GFP_KERNEL);
+			if(!strings)
+				return -ENOMEM;
+			for(i=0; i < E1000_STATS_LEN; i++) {
+				memcpy(&strings[i * ETH_GSTRING_LEN],
+				       e1000_gstrings_stats[i].stat_string,
+				       ETH_GSTRING_LEN);
+			}
 			break;
+		}
 		default:
 			return -EOPNOTSUPP;
 		}
 		if(copy_to_user(addr, &gstrings, sizeof(gstrings)))
-			return -EFAULT;
+			err = -EFAULT;
 		addr += offsetof(struct ethtool_gstrings, data);
-		if(copy_to_user(addr, strings,
+		if(!err && copy_to_user(addr, strings,
 		   gstrings.len * ETH_GSTRING_LEN))
-			return -EFAULT;
-		return 0;
+			err = -EFAULT;
+
+		kfree(strings);
+		return err;
 	}
 	case ETHTOOL_GREGS: {
 		struct ethtool_regs regs = {ETHTOOL_GREGS};
@@ -479,8 +1362,6 @@ e1000_ethtool_ioctl(struct net_device *n
 		return 0;
 	}
 	case ETHTOOL_NWAY_RST: {
-		if(!capable(CAP_NET_ADMIN))
-			return -EPERM;
 		if(netif_running(netdev)) {
 			e1000_down(adapter);
 			e1000_up(adapter);
@@ -509,8 +1390,6 @@ e1000_ethtool_ioctl(struct net_device *n
 	}
 	case ETHTOOL_SWOL: {
 		struct ethtool_wolinfo wol;
-		if(!capable(CAP_NET_ADMIN))
-			return -EPERM;
 		if(copy_from_user(&wol, addr, sizeof(wol)) != 0)
 			return -EFAULT;
 		return e1000_ethtool_swol(adapter, &wol);
@@ -522,16 +1401,14 @@ e1000_ethtool_ioctl(struct net_device *n
 		void *ptr;
 		int err = 0;
 
+		if(copy_from_user(&eeprom, addr, sizeof(eeprom)))
+			return -EFAULT;
+
 		eeprom_buff = kmalloc(hw->eeprom.word_size * 2, GFP_KERNEL);
 
-		if(eeprom_buff == NULL)
+		if(!eeprom_buff)
 			return -ENOMEM;
 
-		if(copy_from_user(&eeprom, addr, sizeof(eeprom))) {
-			err = -EFAULT;
-			goto err_geeprom_ioctl;
-		}
-
 		if((err = e1000_ethtool_geeprom(adapter, &eeprom,
 						eeprom_buff)))
 			goto err_geeprom_ioctl;
@@ -554,9 +1431,6 @@ err_geeprom_ioctl:
 	case ETHTOOL_SEEPROM: {
 		struct ethtool_eeprom eeprom;
 
-		if(!capable(CAP_NET_ADMIN))
-			return -EPERM;
-
 		if(copy_from_user(&eeprom, addr, sizeof(eeprom)))
 			return -EFAULT;
 
@@ -565,18 +1439,42 @@ err_geeprom_ioctl:
 	}
 	case ETHTOOL_GSTATS: {
 		struct {
-			struct ethtool_stats cmd;
+			struct ethtool_stats eth_stats;
 			uint64_t data[E1000_STATS_LEN];
 		} stats = { {ETHTOOL_GSTATS, E1000_STATS_LEN} };
 		int i;
 
 		for(i = 0; i < E1000_STATS_LEN; i++)
-			stats.data[i] =
-				((unsigned long *)&adapter->net_stats)[i];
+			stats.data[i] = (e1000_gstrings_stats[i].sizeof_stat ==
+					sizeof(uint64_t)) ?
+				*(uint64_t *)((char *)adapter +
+					e1000_gstrings_stats[i].stat_offset) :
+				*(uint32_t *)((char *)adapter +
+					e1000_gstrings_stats[i].stat_offset);
 		if(copy_to_user(addr, &stats, sizeof(stats)))
 			return -EFAULT;
 		return 0;
 	}
+	case ETHTOOL_TEST: {
+		struct {
+			struct ethtool_test eth_test;
+			uint64_t data[E1000_TEST_LEN];
+		} test = { {ETHTOOL_TEST} };
+		int err;
+
+		if(copy_from_user(&test.eth_test, addr, sizeof(test.eth_test)))
+			return -EFAULT;
+
+		test.eth_test.len = E1000_TEST_LEN;
+
+		if((err = e1000_ethtool_test(adapter, &test.eth_test,
+					     test.data)))
+			return err;
+
+		if(copy_to_user(addr, &test, sizeof(test)) != 0)
+			return -EFAULT;
+		return 0;
+	}
 	default:
 		return -EOPNOTSUPP;
 	}
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/net/e1000/e1000_hw.c linux-2.4.20-wolk4.4-fullkernel/drivers/net/e1000/e1000_hw.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/net/e1000/e1000_hw.c	2003-07-30 13:51:28.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/net/e1000/e1000_hw.c	2003-07-30 11:11:43.000000000 +0200
@@ -135,6 +135,41 @@ e1000_phy_init_script(struct e1000_hw *h
 
         e1000_write_phy_reg(hw,IGP01E1000_PHY_PAGE_SELECT,0x0000);
         e1000_write_phy_reg(hw,0x0000,0x3300);
+
+
+        if(hw->mac_type == e1000_82547) {
+            uint16_t fused, fine, coarse;
+
+            /* Move to analog registers page */
+            e1000_write_phy_reg(hw, IGP01E1000_PHY_PAGE_SELECT, 
+                                IGP01E1000_ANALOG_REGS_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);
+            }
+            /* Return to first page of registers */
+            e1000_write_phy_reg(hw, IGP01E1000_PHY_PAGE_SELECT,
+                                IGP01E1000_IEEE_REGS_PAGE);
+        }
     }
 }
 
@@ -185,6 +220,7 @@ e1000_set_mac_type(struct e1000_hw *hw)
         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_82541EI:
@@ -258,10 +294,20 @@ e1000_reset_hw(struct e1000_hw *hw)
 	msec_delay(5);
     }
 
-    if(hw->mac_type > e1000_82543)
-        E1000_WRITE_REG_IO(hw, CTRL, (ctrl | E1000_CTRL_RST));
-    else
-        E1000_WRITE_REG(hw, CTRL, (ctrl | E1000_CTRL_RST));
+    switch(hw->mac_type) {
+        case e1000_82544:
+        case e1000_82540:
+        case e1000_82545:
+        case e1000_82546:
+        case e1000_82541:
+            /* 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;
+        default:
+            E1000_WRITE_REG(hw, CTRL, (ctrl | E1000_CTRL_RST));
+            break;
+    }
 
     /* Force a reload from the EEPROM if necessary */
     if(hw->mac_type < e1000_82540) {
@@ -288,9 +334,7 @@ e1000_reset_hw(struct e1000_hw *hw)
         /* Configure activity LED after PHY reset */
         led_ctrl = E1000_READ_REG(hw, LEDCTL);
         led_ctrl &= IGP_ACTIVITY_LED_MASK;
-        led_ctrl |= IGP_ACTIVITY_LED_ENABLE;
-        if(hw->mac_type == e1000_82547)
-            led_ctrl |= IGP_LED3_MODE;
+        led_ctrl |= (IGP_ACTIVITY_LED_ENABLE | IGP_LED3_MODE);
         E1000_WRITE_REG(hw, LEDCTL, led_ctrl);
     }
 
@@ -688,7 +732,8 @@ e1000_setup_fiber_link(struct e1000_hw *
 static int32_t
 e1000_setup_copper_link(struct e1000_hw *hw)
 {
-    uint32_t ctrl, led_ctrl;
+    uint32_t ctrl;
+    uint32_t led_ctrl;
     int32_t ret_val;
     uint16_t i;
     uint16_t phy_data;
@@ -737,9 +782,7 @@ e1000_setup_copper_link(struct e1000_hw 
         /* Configure activity LED after PHY reset */
         led_ctrl = E1000_READ_REG(hw, LEDCTL);
         led_ctrl &= IGP_ACTIVITY_LED_MASK;
-        led_ctrl |= IGP_ACTIVITY_LED_ENABLE;
-        if(hw->mac_type == e1000_82547)
-            led_ctrl |= IGP_LED3_MODE;
+        led_ctrl |= (IGP_ACTIVITY_LED_ENABLE | IGP_LED3_MODE);
         E1000_WRITE_REG(hw, LEDCTL, led_ctrl);
 
         if(hw->autoneg_advertised == ADVERTISE_1000_FULL) {
@@ -2252,7 +2295,8 @@ e1000_write_phy_reg(struct e1000_hw *hw,
 void
 e1000_phy_hw_reset(struct e1000_hw *hw)
 {
-    uint32_t ctrl, ctrl_ext, led_ctrl;
+    uint32_t ctrl, ctrl_ext;
+    uint32_t led_ctrl;
 
     DEBUGFUNC("e1000_phy_hw_reset");
 
@@ -2293,9 +2337,7 @@ e1000_phy_hw_reset(struct e1000_hw *hw)
         /* Configure activity LED after PHY reset */
         led_ctrl = E1000_READ_REG(hw, LEDCTL);
         led_ctrl &= IGP_ACTIVITY_LED_MASK;
-        led_ctrl |= IGP_ACTIVITY_LED_ENABLE;
-        if(hw->mac_type == e1000_82547)
-            led_ctrl |= IGP_LED3_MODE;
+        led_ctrl |= (IGP_ACTIVITY_LED_ENABLE | IGP_LED3_MODE);
         E1000_WRITE_REG(hw, LEDCTL, led_ctrl);
     }
 }
@@ -3801,6 +3843,7 @@ e1000_setup_led(struct e1000_hw *hw)
     case E1000_DEV_ID_82540EM_LOM:
     case E1000_DEV_ID_82545EM_COPPER:
     case E1000_DEV_ID_82546EB_COPPER:
+    case E1000_DEV_ID_82546EB_QUAD_COPPER:
     case E1000_DEV_ID_82541EI:
     case E1000_DEV_ID_82541EP:
     case E1000_DEV_ID_82547EI:
@@ -3842,6 +3885,7 @@ e1000_cleanup_led(struct e1000_hw *hw)
     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:
     case E1000_DEV_ID_82541EI:
     case E1000_DEV_ID_82541EP:
     case E1000_DEV_ID_82547EI:
@@ -3896,6 +3940,7 @@ e1000_led_on(struct e1000_hw *hw)
     case E1000_DEV_ID_82540EM_LOM:
     case E1000_DEV_ID_82545EM_COPPER:
     case E1000_DEV_ID_82546EB_COPPER:
+    case E1000_DEV_ID_82546EB_QUAD_COPPER:
     case E1000_DEV_ID_82541EI:
     case E1000_DEV_ID_82541EP:
     case E1000_DEV_ID_82547EI:
@@ -3949,6 +3994,7 @@ e1000_led_off(struct e1000_hw *hw)
     case E1000_DEV_ID_82540EM_LOM:
     case E1000_DEV_ID_82545EM_COPPER:
     case E1000_DEV_ID_82546EB_COPPER:
+    case E1000_DEV_ID_82546EB_QUAD_COPPER:
     case E1000_DEV_ID_82541EI:
     case E1000_DEV_ID_82541EP:
     case E1000_DEV_ID_82547EI:
@@ -4206,7 +4252,11 @@ e1000_get_bus_info(struct e1000_hw *hw)
     status = E1000_READ_REG(hw, STATUS);
     hw->bus_type = (status & E1000_STATUS_PCIX_MODE) ?
                    e1000_bus_type_pcix : e1000_bus_type_pci;
-    if(hw->bus_type == 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 {
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/net/e1000/e1000_hw.h linux-2.4.20-wolk4.4-fullkernel/drivers/net/e1000/e1000_hw.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/net/e1000/e1000_hw.h	2003-07-30 13:51:28.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/net/e1000/e1000_hw.h	2003-07-30 11:11:42.000000000 +0200
@@ -99,6 +99,7 @@ typedef enum {
     e1000_bus_speed_33,
     e1000_bus_speed_66,
     e1000_bus_speed_100,
+    e1000_bus_speed_120,
     e1000_bus_speed_133,
     e1000_bus_speed_reserved
 } e1000_bus_speed;
@@ -314,10 +315,11 @@ void e1000_write_reg_io(struct e1000_hw 
 #define E1000_DEV_ID_82545EM_FIBER       0x1011
 #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_82541EP             0x1018
 #define E1000_DEV_ID_82547EI             0x1019
-#define NUM_DEV_IDS 19
+#define NUM_DEV_IDS 20
 
 #define NODE_ADDRESS_SIZE 6
 #define ETH_LENGTH_OF_ADDRESS 6
@@ -601,7 +603,7 @@ struct e1000_ffvt_entry {
 #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 Register - RW */
+#define E1000_FLA      0x0001C  /* Flash Access - RW */
 #define E1000_MDIC     0x00020  /* MDI Control - RW */
 #define E1000_FCAL     0x00028  /* Flow Control Address Low - RW */
 #define E1000_FCAH     0x0002C  /* Flow Control Address High -RW */
@@ -730,6 +732,7 @@ struct e1000_ffvt_entry {
  * 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
@@ -1485,7 +1488,6 @@ struct e1000_hw {
 #define E1000_COLLISION_DISTANCE        64
 #define E1000_FDX_COLLISION_DISTANCE    E1000_COLLISION_DISTANCE
 #define E1000_HDX_COLLISION_DISTANCE    E1000_COLLISION_DISTANCE
-#define E1000_GB_HDX_COLLISION_DISTANCE 512
 #define E1000_COLD_SHIFT                12
 
 /* The number of Transmit and Receive Descriptors must be a multiple of 8 */
@@ -1666,6 +1668,7 @@ struct e1000_hw {
 #define M88E1000_EXT_PHY_SPEC_CTRL 0x14  /* Extended PHY Specific Control */
 #define M88E1000_RX_ERR_CNTR       0x15  /* Receive Error Counter */
 
+#define IGP01E1000_IEEE_REGS_PAGE  0x0000
 /* IGP01E1000 Specific Registers */
 #define IGP01E1000_PHY_PORT_CONFIG 0x10 /* PHY Specific Port Config Register */
 #define IGP01E1000_PHY_PORT_STATUS 0x11 /* PHY Specific Status Register */
@@ -1688,6 +1691,7 @@ struct e1000_hw {
  * speed = 1000 Mbps. */
 #define IGP01E1000_PHY_PCS_INIT_REG  0x00B4
 
+#define IGP01E1000_ANALOG_REGS_PAGE  0x20C0
 
 #define MAX_PHY_REG_ADDRESS 0x1F        /* 5 bit address bus (0-0x1F) */
 
@@ -1978,6 +1982,22 @@ uint16_t e1000_igp_cable_length_table[IG
 #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         0x0011
+#define IGP01E1000_ANALOG_FUSE_STATUS               0x0010
+#define IGP01E1000_ANALOG_FUSE_CONTROL              0x001C
+#define IGP01E1000_ANALOG_FUSE_BYPASS               0x001E
+
+#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
 
 /* Bit definitions for valid PHY IDs. */
 #define M88E1000_E_PHY_ID  0x01410C50
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/net/e1000/e1000_main.c linux-2.4.20-wolk4.4-fullkernel/drivers/net/e1000/e1000_main.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/net/e1000/e1000_main.c	2003-07-30 13:51:28.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/net/e1000/e1000_main.c	2003-07-30 11:18:18.000000000 +0200
@@ -30,67 +30,38 @@
 
 /* Change Log
  *
- * 5.0.43	3/5/03
- *   o Feature: Added support for 82541 and 82547 hardware.
- *   o Feature: Added support for Intel Gigabit PHY (IGP) and a variety of
- *   eeproms.
- *   o Feature: Added support for TCP Segmentation Offload (TSO).
- *   o Feature: Added MII ioctl.
- *   o Feature: Added support for statistics reporting through ethtool.
- *   o Cleanup: Removed proprietary hooks for ANS.
- *   o Cleanup: Miscellaneous code changes to improve CPU utilization.
- *   	- Replaced "%" with conditionals and "+-" operators.
- *   	- Implemented dynamic Interrupt Throttle Rate (ITR).
- *   	- Reduced expensive PCI reads of ICR in interrupt.
- *   o Bug fix: Request IRQ after descriptor ring setup to avoid panic in
- *   shared interrupt instances.
- *
- * 4.4.18       11/27/02
- *   o Feature: Added user-settable knob for interrupt throttle rate (ITR).
- *   o Cleanup: removed large static array allocations.
- *   o Cleanup: C99 struct initializer format.
- *   o Bug fix: restore VLAN settings when interface is brought up.
- *   o Bug fix: return cleanly in probe if error in detecting MAC type.
- *   o Bug fix: Wake up on magic packet by default only if enabled in eeprom.
- *   o Bug fix: Validate MAC address in set_mac.
- *   o Bug fix: Throw away zero-length Tx skbs.
- *   o Bug fix: Make ethtool EEPROM acceses work on older versions of ethtool.
- * 
- * 4.4.12       10/15/02
+ * 5.1.13	5/28/03
+ *   o Bug fix: request_irq() failure resulted in freeing resources twice!
+ *     [Don Fry (brazilnut@us.ibm.com)]
+ *   o Bug fix: fix VLAN support on ppc64 [Mark Rakes (mrakes@vivato.net)]
+ *   o Bug fix: missing Tx cleanup opportunities during interrupt handling.
+ *   o Bug fix: alloc_etherdev failure didn't cleanup regions in probe.
+ *   o Cleanup: s/int/unsigned int/ for descriptor ring indexes.
+ *   
+ * 5.1.11	5/6/03
+ *   o Feature: Added support for 82546EB (Quad-port) hardware.
+ *   o Feature: Added support for Diagnostics through Ethtool.
+ *   o Cleanup: Removed /proc support.
+ *   o Cleanup: Removed proprietary IDIAG interface.
+ *   o Bug fix: TSO bug fixes.
+ *
+ * 5.0.42	3/5/03
  */
 
 char e1000_driver_name[] = "e1000";
 char e1000_driver_string[] = "Intel(R) PRO/1000 Network Driver";
-char e1000_driver_version[] = "5.0.43-k1";
+char e1000_driver_version[] = "5.1.13-k1";
 char e1000_copyright[] = "Copyright (c) 1999-2003 Intel Corporation.";
 
 /* e1000_pci_tbl - PCI Device ID Table
  *
- * Private driver_data field (last one) stores an index into e1000_strings
  * Wildcard entries (PCI_ANY_ID) should come last
  * Last entry must be all 0s
  *
  * { Vendor ID, Device ID, SubVendor ID, SubDevice ID,
- *   Class, Class Mask, String Index }
+ *   Class, Class Mask, private data (not used) }
  */
 static struct pci_device_id e1000_pci_tbl[] __devinitdata = {
-	/* Intel(R) PRO/1000 Network Connection */
-	{0x8086, 0x1000, 0x8086, 0x1000, 0, 0, 0},
-	{0x8086, 0x1001, 0x8086, 0x1003, 0, 0, 0},
-	{0x8086, 0x1004, 0x8086, 0x1004, 0, 0, 0},
-	{0x8086, 0x1008, 0x8086, 0x1107, 0, 0, 0},
-	{0x8086, 0x1009, 0x8086, 0x1109, 0, 0, 0},
-	{0x8086, 0x100C, 0x8086, 0x1112, 0, 0, 0},
-	{0x8086, 0x100E, 0x8086, 0x001E, 0, 0, 0},
-	/* Compaq Gigabit Ethernet Server Adapter */
-	{0x8086, 0x1000, 0x0E11, PCI_ANY_ID, 0, 0, 1},
-	{0x8086, 0x1001, 0x0E11, PCI_ANY_ID, 0, 0, 1},
-	{0x8086, 0x1004, 0x0E11, PCI_ANY_ID, 0, 0, 1},
-	/* IBM Mobile, Desktop & Server Adapters */
-	{0x8086, 0x1000, 0x1014, PCI_ANY_ID, 0, 0, 2},
-	{0x8086, 0x1001, 0x1014, PCI_ANY_ID, 0, 0, 2},
-	{0x8086, 0x1004, 0x1014, PCI_ANY_ID, 0, 0, 2},
-	/* Generic */
 	{0x8086, 0x1000, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
 	{0x8086, 0x1001, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
 	{0x8086, 0x1004, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
@@ -106,6 +77,7 @@ static struct pci_device_id e1000_pci_tb
 	{0x8086, 0x1016, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
 	{0x8086, 0x1017, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
 	{0x8086, 0x101E, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+	{0x8086, 0x101D, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
 	{0x8086, 0x1013, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
 	{0x8086, 0x1019, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
 	/* required last entry */
@@ -114,12 +86,6 @@ static struct pci_device_id e1000_pci_tb
 
 MODULE_DEVICE_TABLE(pci, e1000_pci_tbl);
 
-static char *e1000_strings[] = {
-	"Intel(R) PRO/1000 Network Connection",
-	"HP Gigabit Ethernet Server Adapter",
-	"IBM Mobile, Desktop & Server Adapters"
-};
-
 /* Local Function Prototypes */
 
 int e1000_up(struct e1000_adapter *adapter);
@@ -130,7 +96,7 @@ int e1000_set_spd_dplx(struct e1000_adap
 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 e1000_remove(struct pci_dev *pdev);
+static void __devexit e1000_remove(struct pci_dev *pdev);
 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);
@@ -156,7 +122,13 @@ static inline void e1000_irq_disable(str
 static inline void e1000_irq_enable(struct e1000_adapter *adapter);
 static void e1000_intr(int irq, void *data, struct pt_regs *regs);
 static boolean_t e1000_clean_tx_irq(struct e1000_adapter *adapter);
+#ifdef CONFIG_E1000_NAPI
+static int e1000_clean(struct net_device *netdev, int *budget);
+static boolean_t e1000_clean_rx_irq(struct e1000_adapter *adapter,
+                                    int *work_done, int work_to_do);
+#else
 static boolean_t e1000_clean_rx_irq(struct e1000_adapter *adapter);
+#endif
 static void e1000_alloc_rx_buffers(struct e1000_adapter *adapter);
 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,
@@ -192,7 +164,6 @@ struct notifier_block e1000_notifier_reb
 	.priority	= 0
 };
 
-
 /* Exported from other modules */
 
 extern void e1000_check_options(struct e1000_adapter *adapter);
@@ -231,8 +202,9 @@ e1000_init_module(void)
 	printk(KERN_INFO "%s\n", e1000_copyright);
 
 	ret = pci_module_init(&e1000_driver);
-	if(ret >= 0)
+	if(ret >= 0) {
 		register_reboot_notifier(&e1000_notifier_reboot);
+	}
 	return ret;
 }
 
@@ -272,12 +244,8 @@ e1000_up(struct e1000_adapter *adapter)
 	e1000_alloc_rx_buffers(adapter);
 
 	if(request_irq(netdev->irq, &e1000_intr, SA_SHIRQ | SA_SAMPLE_RANDOM,
-		       netdev->name, netdev)) {
-		e1000_reset_hw(&adapter->hw);
-		e1000_free_tx_resources(adapter);
-		e1000_free_rx_resources(adapter);
+		       netdev->name, netdev))
 		return -1;
-	}
 
 	mod_timer(&adapter->watchdog_timer, jiffies);
 	e1000_irq_enable(adapter);
@@ -421,6 +389,10 @@ e1000_probe(struct pci_dev *pdev,
 	netdev->do_ioctl = &e1000_ioctl;
 	netdev->tx_timeout = &e1000_tx_timeout;
 	netdev->watchdog_timeo = 5 * HZ;
+#ifdef CONFIG_E1000_NAPI
+	netdev->poll = &e1000_clean;
+	netdev->weight = 64;
+#endif
 	netdev->vlan_rx_register = e1000_vlan_rx_register;
 	netdev->vlan_rx_add_vid = e1000_vlan_rx_add_vid;
 	netdev->vlan_rx_kill_vid = e1000_vlan_rx_kill_vid;
@@ -435,7 +407,6 @@ e1000_probe(struct pci_dev *pdev,
 	netdev->base_addr = adapter->hw.io_base;
 
 	adapter->bd_number = cards_found;
-	adapter->id_string = e1000_strings[ent->driver_data];
 
 	/* setup the private structure */
 
@@ -452,6 +423,12 @@ e1000_probe(struct pci_dev *pdev,
 		netdev->features = NETIF_F_SG;
 	}
 
+#ifdef NETIF_F_TSO
+	if((adapter->hw.mac_type >= e1000_82544) &&
+	   (adapter->hw.mac_type != e1000_82547))
+		netdev->features |= NETIF_F_TSO;
+#endif
+
 	if(pci_using_dac)
 		netdev->features |= NETIF_F_HIGHDMA;
 
@@ -490,15 +467,14 @@ e1000_probe(struct pci_dev *pdev,
 		(void (*)(void *))e1000_tx_timeout_task, netdev);
 
 	register_netdev(netdev);
-	memcpy(adapter->ifname, netdev->name, IFNAMSIZ);
-	adapter->ifname[IFNAMSIZ-1] = 0;
 
 	/* we're going to reset, so assume we have no link for now */
 
 	netif_carrier_off(netdev);
 	netif_stop_queue(netdev);
 
-	printk(KERN_INFO "%s: %s\n", netdev->name, adapter->id_string);
+	printk(KERN_INFO "%s: Intel(R) PRO/1000 Network Connection\n",
+	       netdev->name);
 	e1000_check_options(adapter);
 
 	/* Initial Wake on LAN setting
@@ -523,9 +499,9 @@ err_sw_init:
 err_eeprom:
 	iounmap(adapter->hw.hw_addr);
 err_ioremap:
-	pci_release_regions(pdev);
 	kfree(netdev);
 err_alloc_etherdev:
+	pci_release_regions(pdev);
 	return -ENOMEM;
 }
 
@@ -558,7 +534,6 @@ e1000_remove(struct pci_dev *pdev)
 
 	e1000_phy_hw_reset(&adapter->hw);
 
-
 	iounmap(adapter->hw.hw_addr);
 	pci_release_regions(pdev);
 
@@ -821,8 +796,9 @@ e1000_configure_tx(struct e1000_adapter 
 
 	e1000_config_collision_dist(&adapter->hw);
 
-	/* Setup Transmit Descriptor Settings for this adapter */
-	adapter->txd_cmd = E1000_TXD_CMD_IFCS | E1000_TXD_CMD_IDE;
+	/* Setup Transmit Descriptor Settings for eop descriptor */
+	adapter->txd_cmd = E1000_TXD_CMD_IDE | E1000_TXD_CMD_EOP |
+		E1000_TXD_CMD_IFCS;
 
 	if(adapter->hw.report_tx_early == 1)
 		adapter->txd_cmd |= E1000_TXD_CMD_RS;
@@ -1000,38 +976,41 @@ e1000_free_tx_resources(struct e1000_ada
 static void
 e1000_clean_tx_ring(struct e1000_adapter *adapter)
 {
+	struct e1000_desc_ring *tx_ring = &adapter->tx_ring;
+	struct e1000_buffer *buffer_info;
 	struct pci_dev *pdev = adapter->pdev;
 	unsigned long size;
-	int i;
+	unsigned int i;
 
 	if(!adapter->tx_ring.buffer_info)
 		return;
 
 	/* Free all the Tx ring sk_buffs */
 
-	for(i = 0; i < adapter->tx_ring.count; i++) {
-		if(adapter->tx_ring.buffer_info[i].skb) {
+	for(i = 0; i < tx_ring->count; i++) {
+		buffer_info = &tx_ring->buffer_info[i];
+		if(buffer_info->skb) {
 
 			pci_unmap_page(pdev,
-			               adapter->tx_ring.buffer_info[i].dma,
-			               adapter->tx_ring.buffer_info[i].length,
+			               buffer_info->dma,
+			               buffer_info->length,
 			               PCI_DMA_TODEVICE);
 
-			dev_kfree_skb(adapter->tx_ring.buffer_info[i].skb);
+			dev_kfree_skb(buffer_info->skb);
 
-			adapter->tx_ring.buffer_info[i].skb = NULL;
+			buffer_info->skb = NULL;
 		}
 	}
 
-	size = sizeof(struct e1000_buffer) * adapter->tx_ring.count;
-	memset(adapter->tx_ring.buffer_info, 0, size);
+	size = sizeof(struct e1000_buffer) * tx_ring->count;
+	memset(tx_ring->buffer_info, 0, size);
 
 	/* Zero out the descriptor ring */
 
-	memset(adapter->tx_ring.desc, 0, adapter->tx_ring.size);
+	memset(tx_ring->desc, 0, tx_ring->size);
 
-	adapter->tx_ring.next_to_use = 0;
-	adapter->tx_ring.next_to_clean = 0;
+	tx_ring->next_to_use = 0;
+	tx_ring->next_to_clean = 0;
 
 	E1000_WRITE_REG(&adapter->hw, TDH, 0);
 	E1000_WRITE_REG(&adapter->hw, TDT, 0);
@@ -1047,17 +1026,17 @@ e1000_clean_tx_ring(struct e1000_adapter
 static void
 e1000_free_rx_resources(struct e1000_adapter *adapter)
 {
+	struct e1000_desc_ring *rx_ring = &adapter->rx_ring;
 	struct pci_dev *pdev = adapter->pdev;
 
 	e1000_clean_rx_ring(adapter);
 
-	kfree(adapter->rx_ring.buffer_info);
-	adapter->rx_ring.buffer_info = NULL;
+	kfree(rx_ring->buffer_info);
+	rx_ring->buffer_info = NULL;
 
-	pci_free_consistent(pdev, adapter->rx_ring.size,
-	                    adapter->rx_ring.desc, adapter->rx_ring.dma);
+	pci_free_consistent(pdev, rx_ring->size, rx_ring->desc, rx_ring->dma);
 
-	adapter->rx_ring.desc = NULL;
+	rx_ring->desc = NULL;
 }
 
 /**
@@ -1068,38 +1047,41 @@ e1000_free_rx_resources(struct e1000_ada
 static void
 e1000_clean_rx_ring(struct e1000_adapter *adapter)
 {
+	struct e1000_desc_ring *rx_ring = &adapter->rx_ring;
+	struct e1000_buffer *buffer_info;
 	struct pci_dev *pdev = adapter->pdev;
 	unsigned long size;
-	int i;
+	unsigned int i;
 
 	if(!adapter->rx_ring.buffer_info)
 		return;
 
 	/* Free all the Rx ring sk_buffs */
 
-	for(i = 0; i < adapter->rx_ring.count; i++) {
-		if(adapter->rx_ring.buffer_info[i].skb) {
+	for(i = 0; i < rx_ring->count; i++) {
+		buffer_info = &rx_ring->buffer_info[i];
+		if(buffer_info->skb) {
 
 			pci_unmap_single(pdev,
-			                 adapter->rx_ring.buffer_info[i].dma,
-			                 adapter->rx_ring.buffer_info[i].length,
+			                 buffer_info->dma,
+			                 buffer_info->length,
 			                 PCI_DMA_FROMDEVICE);
 
-			dev_kfree_skb(adapter->rx_ring.buffer_info[i].skb);
+			dev_kfree_skb(buffer_info->skb);
 
-			adapter->rx_ring.buffer_info[i].skb = NULL;
+			buffer_info->skb = NULL;
 		}
 	}
 
-	size = sizeof(struct e1000_buffer) * adapter->rx_ring.count;
-	memset(adapter->rx_ring.buffer_info, 0, size);
+	size = sizeof(struct e1000_buffer) * rx_ring->count;
+	memset(rx_ring->buffer_info, 0, size);
 
 	/* Zero out the descriptor ring */
 
-	memset(adapter->rx_ring.desc, 0, adapter->rx_ring.size);
+	memset(rx_ring->desc, 0, rx_ring->size);
 
-	adapter->rx_ring.next_to_clean = 0;
-	adapter->rx_ring.next_to_use = 0;
+	rx_ring->next_to_clean = 0;
+	rx_ring->next_to_use = 0;
 
 	E1000_WRITE_REG(&adapter->hw, RDH, 0);
 	E1000_WRITE_REG(&adapter->hw, RDT, 0);
@@ -1349,7 +1331,7 @@ e1000_watchdog(unsigned long data)
 	struct e1000_adapter *adapter = (struct e1000_adapter *) data;
 	struct net_device *netdev = adapter->netdev;
 	struct e1000_desc_ring *txdr = &adapter->tx_ring;
-	int i;
+	unsigned int i;
 
 	e1000_check_for_link(&adapter->hw);
 
@@ -1426,14 +1408,67 @@ e1000_watchdog(unsigned long data)
 
 #define E1000_TX_FLAGS_CSUM		0x00000001
 #define E1000_TX_FLAGS_VLAN		0x00000002
+#define E1000_TX_FLAGS_TSO		0x00000004
 #define E1000_TX_FLAGS_VLAN_MASK	0xffff0000
 #define E1000_TX_FLAGS_VLAN_SHIFT	16
 
 static inline boolean_t
+e1000_tso(struct e1000_adapter *adapter, struct sk_buff *skb)
+{
+#ifdef NETIF_F_TSO
+	struct e1000_context_desc *context_desc;
+	unsigned int i;
+	uint8_t ipcss, ipcso, tucss, tucso, hdr_len;
+	uint16_t ipcse, tucse, mss;
+
+	if(skb_shinfo(skb)->tso_size) {
+		hdr_len = ((skb->h.raw - skb->data) + (skb->h.th->doff << 2));
+		mss = skb_shinfo(skb)->tso_size;
+		skb->nh.iph->tot_len = 0;
+		skb->nh.iph->check = 0;
+		skb->h.th->check = ~csum_tcpudp_magic(skb->nh.iph->saddr,
+		                                      skb->nh.iph->daddr,
+		                                      0,
+		                                      IPPROTO_TCP,
+		                                      0);
+		ipcss = skb->nh.raw - skb->data;
+		ipcso = (void *)&(skb->nh.iph->check) - (void *)skb->data;
+		ipcse = skb->h.raw - skb->data - 1;
+		tucss = skb->h.raw - skb->data;
+		tucso = (void *)&(skb->h.th->check) - (void *)skb->data;
+		tucse = 0;
+
+		i = adapter->tx_ring.next_to_use;
+		context_desc = E1000_CONTEXT_DESC(adapter->tx_ring, 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(
+			E1000_TXD_CMD_DEXT | E1000_TXD_CMD_TSE |
+			E1000_TXD_CMD_IP | E1000_TXD_CMD_TCP |
+			(skb->len - (hdr_len)));
+
+		if(++i == adapter->tx_ring.count) i = 0;
+		adapter->tx_ring.next_to_use = i;
+
+		return TRUE;
+	}
+#endif
+
+	return FALSE;
+}
+
+static inline boolean_t
 e1000_tx_csum(struct e1000_adapter *adapter, struct sk_buff *skb)
 {
 	struct e1000_context_desc *context_desc;
-	int i;
+	unsigned int i;
 	uint8_t css, cso;
 
 	if(skb->ip_summed == CHECKSUM_HW) {
@@ -1447,8 +1482,7 @@ e1000_tx_csum(struct e1000_adapter *adap
 		context_desc->upper_setup.tcp_fields.tucso = cso;
 		context_desc->upper_setup.tcp_fields.tucse = 0;
 		context_desc->tcp_seg_setup.data = 0;
-		context_desc->cmd_and_length =
-			cpu_to_le32(adapter->txd_cmd | E1000_TXD_CMD_DEXT);
+		context_desc->cmd_and_length = cpu_to_le32(E1000_TXD_CMD_DEXT);
 
 		if(++i == adapter->tx_ring.count) i = 0;
 		adapter->tx_ring.next_to_use = i;
@@ -1463,25 +1497,39 @@ e1000_tx_csum(struct e1000_adapter *adap
 #define E1000_MAX_DATA_PER_TXD	(1<<E1000_MAX_TXD_PWR)
 
 static inline int
-e1000_tx_map(struct e1000_adapter *adapter, struct sk_buff *skb)
+e1000_tx_map(struct e1000_adapter *adapter, struct sk_buff *skb,
+	unsigned int first)
 {
 	struct e1000_desc_ring *tx_ring = &adapter->tx_ring;
-	int len = skb->len, offset = 0, size, count = 0, i;
+	struct e1000_buffer *buffer_info;
+	int len = skb->len;
+	unsigned int offset = 0, size, count = 0, i;
 
-	int f;
+#ifdef NETIF_F_TSO
+	unsigned int tso = skb_shinfo(skb)->tso_size;
+#endif
+	unsigned int nr_frags = skb_shinfo(skb)->nr_frags;
+	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, E1000_MAX_DATA_PER_TXD);
-		tx_ring->buffer_info[i].length = size;
-		tx_ring->buffer_info[i].dma =
+#ifdef NETIF_F_TSO
+		/* Workaround for premature desc write-backs
+		 * in TSO mode.  Append 4-byte sentinel desc */
+		if(tso && !nr_frags && size == len && size > 4)
+			size -= 4;
+#endif
+		buffer_info->length = size;
+		buffer_info->dma =
 			pci_map_single(adapter->pdev,
 				skb->data + offset,
 				size,
 				PCI_DMA_TODEVICE);
-		tx_ring->buffer_info[i].time_stamp = jiffies;
+		buffer_info->time_stamp = jiffies;
 
 		len -= size;
 		offset += size;
@@ -1489,7 +1537,7 @@ e1000_tx_map(struct e1000_adapter *adapt
 		if(++i == tx_ring->count) i = 0;
 	}
 
-	for(f = 0; f < skb_shinfo(skb)->nr_frags; f++) {
+	for(f = 0; f < nr_frags; f++) {
 		struct skb_frag_struct *frag;
 
 		frag = &skb_shinfo(skb)->frags[f];
@@ -1497,15 +1545,22 @@ e1000_tx_map(struct e1000_adapter *adapt
 		offset = 0;
 
 		while(len) {
+			buffer_info = &tx_ring->buffer_info[i];
 			size = min(len, E1000_MAX_DATA_PER_TXD);
-			tx_ring->buffer_info[i].length = size;
-			tx_ring->buffer_info[i].dma =
+#ifdef NETIF_F_TSO
+			/* Workaround for premature desc write-backs
+			 * in TSO mode.  Append 4-byte sentinel desc */
+			if(tso && f == (nr_frags-1) && size == len && size > 4)
+				size -= 4;
+#endif
+			buffer_info->length = size;
+			buffer_info->dma =
 				pci_map_page(adapter->pdev,
 					frag->page,
 					frag->page_offset + offset,
 					size,
 					PCI_DMA_TODEVICE);
-			tx_ring->buffer_info[i].time_stamp = jiffies;
+			buffer_info->time_stamp = jiffies;
 
 			len -= size;
 			offset += size;
@@ -1513,8 +1568,9 @@ e1000_tx_map(struct e1000_adapter *adapt
 			if(++i == tx_ring->count) i = 0;
 		}
 	}
-	if(--i < 0) i = tx_ring->count - 1;
+	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;
 }
@@ -1524,11 +1580,15 @@ e1000_tx_queue(struct e1000_adapter *ada
 {
 	struct e1000_desc_ring *tx_ring = &adapter->tx_ring;
 	struct e1000_tx_desc *tx_desc = NULL;
-	uint32_t txd_upper, txd_lower;
-	int i;
-
-	txd_upper = 0;
-	txd_lower = adapter->txd_cmd;
+	struct e1000_buffer *buffer_info;
+	uint32_t txd_upper = 0, txd_lower = E1000_TXD_CMD_IFCS;
+	unsigned int i;
+
+	if(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_IXSM | E1000_TXD_POPTS_TXSM) << 8;
+	}
 
 	if(tx_flags & E1000_TX_FLAGS_CSUM) {
 		txd_lower |= E1000_TXD_CMD_DEXT | E1000_TXD_DTYP_D;
@@ -1543,15 +1603,16 @@ e1000_tx_queue(struct e1000_adapter *ada
 	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(tx_ring->buffer_info[i].dma);
+		tx_desc->buffer_addr = cpu_to_le64(buffer_info->dma);
 		tx_desc->lower.data =
-			cpu_to_le32(txd_lower | tx_ring->buffer_info[i].length);
+			cpu_to_le32(txd_lower | buffer_info->length);
 		tx_desc->upper.data = cpu_to_le32(txd_upper);
 		if(++i == tx_ring->count) i = 0;
 	}
 
-	tx_desc->lower.data |= cpu_to_le32(E1000_TXD_CMD_EOP);
+	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
@@ -1611,7 +1672,8 @@ static int
 e1000_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
 {
 	struct e1000_adapter *adapter = netdev->priv;
-	int tx_flags = 0;
+	unsigned int first;
+	unsigned int tx_flags = 0;
 
 	if(skb->len <= 0) {
 		dev_kfree_skb_any(skb);
@@ -1636,10 +1698,14 @@ e1000_xmit_frame(struct sk_buff *skb, st
 		tx_flags |= (vlan_tx_tag_get(skb) << E1000_TX_FLAGS_VLAN_SHIFT);
 	}
 
-	if(e1000_tx_csum(adapter, skb))
+	first = adapter->tx_ring.next_to_use;
+	
+	if(e1000_tso(adapter, skb))
+		tx_flags |= E1000_TX_FLAGS_TSO;
+	else if(e1000_tx_csum(adapter, skb))
 		tx_flags |= E1000_TX_FLAGS_CSUM;
 
-	e1000_tx_queue(adapter, e1000_tx_map(adapter, skb), tx_flags);
+	e1000_tx_queue(adapter, e1000_tx_map(adapter, skb, first), tx_flags);
 
 	netdev->trans_start = jiffies;
 
@@ -1871,6 +1937,7 @@ e1000_update_stats(struct e1000_adapter 
 		}
 
 		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;
 	}
@@ -1917,7 +1984,9 @@ e1000_intr(int irq, void *data, struct p
 	struct net_device *netdev = data;
 	struct e1000_adapter *adapter = netdev->priv;
 	uint32_t icr = E1000_READ_REG(&adapter->hw, ICR);
-	int i;
+#ifndef CONFIG_E1000_NAPI
+	unsigned int i;
+#endif
 
 	if(!icr)
 		return;  /* Not our interrupt */
@@ -1927,12 +1996,52 @@ e1000_intr(int irq, void *data, struct p
 		mod_timer(&adapter->watchdog_timer, jiffies);
 	}
 
+#ifdef CONFIG_E1000_NAPI
+	if(netif_rx_schedule_prep(netdev)) {
+
+		/* Disable interrupts and register for poll. The flush 
+		  of the posted write is intentionally left out.
+		*/
+
+		atomic_inc(&adapter->irq_sem);
+		E1000_WRITE_REG(&adapter->hw, IMC, ~0);
+		__netif_rx_schedule(netdev);
+	}
+#else
 	for(i = 0; i < E1000_MAX_INTR; i++)
-		if(!e1000_clean_rx_irq(adapter) &&
+		if(!e1000_clean_rx_irq(adapter) &
 		   !e1000_clean_tx_irq(adapter))
 			break;
+#endif
+}
 
+#ifdef CONFIG_E1000_NAPI
+/**
+ * e1000_clean - NAPI Rx polling callback
+ * @adapter: board private structure
+ **/
+
+static int
+e1000_clean(struct net_device *netdev, int *budget)
+{
+	struct e1000_adapter *adapter = netdev->priv;
+	int work_to_do = min(*budget, netdev->quota);
+	int work_done = 0;
+	
+	e1000_clean_tx_irq(adapter);
+	e1000_clean_rx_irq(adapter, &work_done, work_to_do);
+
+	*budget -= work_done;
+	netdev->quota -= work_done;
+	
+	if(work_done < work_to_do) {
+		netif_rx_complete(netdev);
+		e1000_irq_enable(adapter);
+	}
+
+	return (work_done >= work_to_do);
 }
+#endif
 
 /**
  * e1000_clean_tx_irq - Reclaim resources after transmit completes
@@ -1945,39 +2054,48 @@ e1000_clean_tx_irq(struct e1000_adapter 
 	struct e1000_desc_ring *tx_ring = &adapter->tx_ring;
 	struct net_device *netdev = adapter->netdev;
 	struct pci_dev *pdev = adapter->pdev;
-	struct e1000_tx_desc *tx_desc;
-	int i, cleaned = FALSE;
+	struct e1000_tx_desc *tx_desc, *eop_desc;
+	struct e1000_buffer *buffer_info;
+	unsigned int i, eop;
+	boolean_t cleaned = FALSE;
 
 	i = tx_ring->next_to_clean;
-	tx_desc = E1000_TX_DESC(*tx_ring, i);
+	eop = tx_ring->buffer_info[i].next_to_watch;
+	eop_desc = E1000_TX_DESC(*tx_ring, eop);
 
-	while(tx_desc->upper.data & cpu_to_le32(E1000_TXD_STAT_DD)) {
+	while(eop_desc->upper.data & cpu_to_le32(E1000_TXD_STAT_DD)) {
 
-		cleaned = TRUE;
+		for(cleaned = FALSE; !cleaned; ) {
+			tx_desc = E1000_TX_DESC(*tx_ring, i);
+			buffer_info = &tx_ring->buffer_info[i];
 
-		if(tx_ring->buffer_info[i].dma) {
+			if(buffer_info->dma) {
 
-			pci_unmap_page(pdev,
-			               tx_ring->buffer_info[i].dma,
-			               tx_ring->buffer_info[i].length,
-			               PCI_DMA_TODEVICE);
+				pci_unmap_page(pdev,
+					       buffer_info->dma,
+					       buffer_info->length,
+					       PCI_DMA_TODEVICE);
 
-			tx_ring->buffer_info[i].dma = 0;
-		}
+				buffer_info->dma = 0;
+			}
 
-		if(tx_ring->buffer_info[i].skb) {
+			if(buffer_info->skb) {
 
-			dev_kfree_skb_any(tx_ring->buffer_info[i].skb);
+				dev_kfree_skb_any(buffer_info->skb);
 
-			tx_ring->buffer_info[i].skb = NULL;
-		}
+				buffer_info->skb = NULL;
+			}
 
-		tx_desc->buffer_addr = 0;
-		tx_desc->lower.data = 0;
-		tx_desc->upper.data = 0;
+			tx_desc->buffer_addr = 0;
+			tx_desc->lower.data = 0;
+			tx_desc->upper.data = 0;
 
-		if(++i == tx_ring->count) i = 0;
-		tx_desc = E1000_TX_DESC(*tx_ring, i);
+			cleaned = (i == eop);
+			if(++i == tx_ring->count) i = 0;
+		}
+		
+		eop = tx_ring->buffer_info[i].next_to_watch;
+		eop_desc = E1000_TX_DESC(*tx_ring, eop);
 	}
 
 	tx_ring->next_to_clean = i;
@@ -1994,31 +2112,46 @@ e1000_clean_tx_irq(struct e1000_adapter 
  **/
 
 static boolean_t
+#ifdef CONFIG_E1000_NAPI
+e1000_clean_rx_irq(struct e1000_adapter *adapter, int *work_done,
+                   int work_to_do)
+#else
 e1000_clean_rx_irq(struct e1000_adapter *adapter)
+#endif
 {
 	struct e1000_desc_ring *rx_ring = &adapter->rx_ring;
 	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 long flags;
 	uint32_t length;
 	uint8_t last_byte;
-	int i, cleaned = FALSE;
+	unsigned int i;
+	boolean_t cleaned = FALSE;
 
 	i = rx_ring->next_to_clean;
 	rx_desc = E1000_RX_DESC(*rx_ring, i);
 
 	while(rx_desc->status & E1000_RXD_STAT_DD) {
+		buffer_info = &rx_ring->buffer_info[i];
+
+#ifdef CONFIG_E1000_NAPI
+		if(*work_done >= work_to_do)
+			break;
+
+		(*work_done)++;
+#endif
 
 		cleaned = TRUE;
 
 		pci_unmap_single(pdev,
-		                 rx_ring->buffer_info[i].dma,
-		                 rx_ring->buffer_info[i].length,
+		                 buffer_info->dma,
+		                 buffer_info->length,
 		                 PCI_DMA_FROMDEVICE);
 
-		skb = rx_ring->buffer_info[i].skb;
+		skb = buffer_info->skb;
 		length = le16_to_cpu(rx_desc->length);
 
 		if(!(rx_desc->status & E1000_RXD_STAT_EOP)) {
@@ -2029,7 +2162,7 @@ e1000_clean_rx_irq(struct e1000_adapter 
 
 			dev_kfree_skb_irq(skb);
 			rx_desc->status = 0;
-			rx_ring->buffer_info[i].skb = NULL;
+			buffer_info->skb = NULL;
 
 			if(++i == rx_ring->count) i = 0;
 
@@ -2057,7 +2190,7 @@ e1000_clean_rx_irq(struct e1000_adapter 
 
 				dev_kfree_skb_irq(skb);
 				rx_desc->status = 0;
-				rx_ring->buffer_info[i].skb = NULL;
+				buffer_info->skb = NULL;
 
 				if(++i == rx_ring->count) i = 0;
 
@@ -2073,16 +2206,27 @@ e1000_clean_rx_irq(struct e1000_adapter 
 		e1000_rx_checksum(adapter, rx_desc, skb);
 
 		skb->protocol = eth_type_trans(skb, netdev);
+#ifdef CONFIG_E1000_NAPI
+		if(adapter->vlgrp && (rx_desc->status & E1000_RXD_STAT_VP)) {
+			vlan_hwaccel_receive_skb(skb, adapter->vlgrp,
+				le16_to_cpu(rx_desc->special &
+					E1000_RXD_SPC_VLAN_MASK));
+		} else {
+			netif_receive_skb(skb);
+		}
+#else /* CONFIG_E1000_NAPI */
 		if(adapter->vlgrp && (rx_desc->status & E1000_RXD_STAT_VP)) {
 			vlan_hwaccel_rx(skb, adapter->vlgrp,
-				(rx_desc->special & E1000_RXD_SPC_VLAN_MASK));
+				le16_to_cpu(rx_desc->special &
+					E1000_RXD_SPC_VLAN_MASK));
 		} else {
 			netif_rx(skb);
 		}
+#endif /* CONFIG_E1000_NAPI */
 		netdev->last_rx = jiffies;
 
 		rx_desc->status = 0;
-		rx_ring->buffer_info[i].skb = NULL;
+		buffer_info->skb = NULL;
 
 		if(++i == rx_ring->count) i = 0;
 
@@ -2108,13 +2252,15 @@ e1000_alloc_rx_buffers(struct e1000_adap
 	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;
 	int reserve_len = 2;
-	int i;
+	unsigned int i;
 
 	i = rx_ring->next_to_use;
+	buffer_info = &rx_ring->buffer_info[i];
 
-	while(!rx_ring->buffer_info[i].skb) {
+	while(!buffer_info->skb) {
 		rx_desc = E1000_RX_DESC(*rx_ring, i);
 
 		skb = dev_alloc_skb(adapter->rx_buffer_len + reserve_len);
@@ -2132,15 +2278,15 @@ e1000_alloc_rx_buffers(struct e1000_adap
 
 		skb->dev = netdev;
 
-		rx_ring->buffer_info[i].skb = skb;
-		rx_ring->buffer_info[i].length = adapter->rx_buffer_len;
-		rx_ring->buffer_info[i].dma =
+		buffer_info->skb = skb;
+		buffer_info->length = adapter->rx_buffer_len;
+		buffer_info->dma =
 			pci_map_single(pdev,
 			               skb->data,
 			               adapter->rx_buffer_len,
 			               PCI_DMA_FROMDEVICE);
 
-		rx_desc->buffer_addr = cpu_to_le64(rx_ring->buffer_info[i].dma);
+		rx_desc->buffer_addr = cpu_to_le64(buffer_info->dma);
 
 		if((i & ~(E1000_RX_BUFFER_WRITE - 1)) == i) {
 			/* Force memory writes to complete before letting h/w
@@ -2153,6 +2299,7 @@ e1000_alloc_rx_buffers(struct e1000_adap
 		}
 
 		if(++i == rx_ring->count) i = 0;
+		buffer_info = &rx_ring->buffer_info[i];
 	}
 
 	rx_ring->next_to_use = i;
@@ -2531,7 +2678,6 @@ e1000_notify_reboot(struct notifier_bloc
 	return NOTIFY_DONE;
 }
 
-
 static int
 e1000_suspend(struct pci_dev *pdev, uint32_t state)
 {
@@ -2640,6 +2786,7 @@ e1000_resume(struct pci_dev *pdev)
 #endif
 
 #ifdef HAVE_POLL_CONTROLLER
+
 /*
  * Polling 'interrupt' - used by things like netconsole to send skbs
  * without having to re-enable interrupts. It's not called while
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/net/e1000/e1000_osdep.h linux-2.4.20-wolk4.4-fullkernel/drivers/net/e1000/e1000_osdep.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/net/e1000/e1000_osdep.h	2003-07-30 13:51:28.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/net/e1000/e1000_osdep.h	2003-07-30 11:11:22.000000000 +0200
@@ -27,7 +27,7 @@
 *******************************************************************************/
 
 
-/* glue for the OS independant part of e1000
+/* glue for the OS independent part of e1000
  * includes register access macros
  */
 
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/net/eepro100.c linux-2.4.20-wolk4.4-fullkernel/drivers/net/eepro100.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/net/eepro100.c	2003-07-30 13:52:43.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/net/eepro100.c	2003-07-30 11:18:44.000000000 +0200
@@ -120,6 +120,11 @@ static int options[] = {-1, -1, -1, -1, 
 #include <linux/ethtool.h>
 #include <linux/mii.h>
 
+/* enable PIO instead of MMIO, if CONFIG_EEPRO100_PIO is selected */
+#ifdef CONFIG_EEPRO100_PIO
+#define USE_IO 1
+#endif
+
 static int debug = -1;
 #define DEBUG_DEFAULT		(NETIF_MSG_DRV		| \
 				 NETIF_MSG_HW		| \
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/net/sk98lin/Makefile linux-2.4.20-wolk4.4-fullkernel/drivers/net/sk98lin/Makefile
--- linux-2.4.20-wolk4.3-fullkernel/drivers/net/sk98lin/Makefile	2001-07-04 20:50:39.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/net/sk98lin/Makefile	2003-07-30 10:31:38.000000000 +0200
@@ -3,11 +3,31 @@
 # Makefile for the SysKonnect SK-98xx device driver.
 #
 
+#
+# Standalone driver params
+# SKPARAM += -DSK_KERNEL_24
+# SKPARAM += -DSK_KERNEL_24_26
+# SKPARAM += -DSK_KERNEL_22_24
+
 O_TARGET := sk98lin.o
 
-obj-y :=     skge.o skaddr.o skgehwt.o skgeinit.o skgepnmi.o skgesirq.o \
-             ski2c.o sklm80.o skqueue.o skrlmt.o sktimer.o skvpd.o \
-             skxmac2.o skproc.o skcsum.o
+obj-y :=	\
+		skge.o		\
+		skdim.o		\
+		skaddr.o	\
+		skgehwt.o	\
+		skgeinit.o	\
+		skgepnmi.o	\
+		skgesirq.o	\
+		ski2c.o		\
+		sklm80.o	\
+		skqueue.o	\
+		skrlmt.o	\
+		sktimer.o	\
+		skvpd.o		\
+		skxmac2.o	\
+		skproc.o	\
+		skcsum.o
 obj-m := $(O_TARGET)
 
 # DBGDEF =  \
@@ -57,7 +77,7 @@ endif
 # SK_DBGCAT_DRV_INT_SRC         0x04000000      interrupts sources
 # SK_DBGCAT_DRV_EVENT           0x08000000      driver events
 
-EXTRA_CFLAGS += -I. -DSK_USE_CSUM $(DBGDEF)
+EXTRA_CFLAGS += -I. -DSK_USE_CSUM -DGENESIS -DYUKON $(DBGDEF) $(SKPARAM)
 
 include $(TOPDIR)/Rules.make
 
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/net/sk98lin/build_no.c linux-2.4.20-wolk4.4-fullkernel/drivers/net/sk98lin/build_no.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/net/sk98lin/build_no.c	2003-07-30 13:51:29.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/net/sk98lin/build_no.c	2003-07-30 10:31:38.000000000 +0200
@@ -1,10 +1,10 @@
-/******************************************************************************
- *
- *	Name:		Build_No.c
- *	Version:	1.01
- *
- */
-
-static const char SysKonnectBuildNumber[] =
-	"@(#)SK-BUILD: 6.03 (20030205) PL: ALL.01";
-
\ No newline at end of file
+/******************************************************************************
+ *
+ *	Name:		Build_No.c
+ *	Version:	1.01
+ *
+ */
+
+static const char SysKonnectBuildNumber[] =
+	"@(#)SK-BUILD: 6.02 (20021219) PL: ALL.01";
+^Z
\ No newline at end of file
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/net/sk98lin/h/lm80.h linux-2.4.20-wolk4.4-fullkernel/drivers/net/sk98lin/h/lm80.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/net/sk98lin/h/lm80.h	2003-07-30 13:51:29.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/net/sk98lin/h/lm80.h	2003-07-30 10:31:38.000000000 +0200
@@ -1,9 +1,9 @@
 /******************************************************************************
  *
  * Name:	lm80.h	
- * Project:	GEnesis, PCI Gigabit Ethernet Adapter
- * Version:	$Revision: 1.4 $
- * Date:	$Date: 2002/04/25 11:04:10 $
+ * Project:	Gigabit Ethernet Adapters, Common Modules
+ * Version:	$Revision: 1.6 $
+ * Date:	$Date: 2003/05/13 17:26:52 $
  * Purpose:	Contains all defines for the LM80 Chip
  *		(National Semiconductor).
  *
@@ -11,7 +11,8 @@
 
 /******************************************************************************
  *
- *	(C)Copyright 1998-2002 SysKonnect GmbH.
+ *	(C)Copyright 1998-2002 SysKonnect.
+ *	(C)Copyright 2002-2003 Marvell.
  *
  *	This program is free software; you can redistribute it and/or modify
  *	it under the terms of the GNU General Public License as published by
@@ -26,6 +27,13 @@
  *
  * History:
  *	$Log: lm80.h,v $
+ *	Revision 1.6  2003/05/13 17:26:52  mkarl
+ *	Editorial changes.
+ *	
+ *	Revision 1.5  2003/03/31 07:15:18  mkarl
+ *	Corrected Copyright.
+ *	Editorial changes.
+ *	
  *	Revision 1.4  2002/04/25 11:04:10  rschmidt
  *	Editorial changes
  *	
@@ -55,8 +63,8 @@ extern "C" {
  *
  * All registers are 8 bit wide
  */
-#define	LM80_CFG			0x00	/* Configuration Register */
-#define	LM80_ISRC_1			0x01	/* Interrupt Status Register 1 */
+#define LM80_CFG			0x00	/* Configuration Register */
+#define LM80_ISRC_1			0x01	/* Interrupt Status Register 1 */
 #define LM80_ISRC_2			0x02	/* Interrupt Status Register 2 */
 #define LM80_IMSK_1			0x03	/* Interrupt Mask Register 1 */
 #define LM80_IMSK_2			0x04	/* Interrupt Mask Register 2 */
@@ -93,8 +101,8 @@ extern "C" {
 #define LM80_THOT_LIM_LO	0x39	/* hot temperature limit (low) */
 #define LM80_TOS_LIM_UP		0x3a	/* OS temperature limit (high) */
 #define LM80_TOS_LIM_LO		0x3b	/* OS temperature limit (low) */
-#define	LM80_FAN1_COUNT_LIM	0x3c	/* Fan 1 count limit (high) */
-#define	LM80_FAN2_COUNT_LIM	0x3d	/* Fan 2 count limit (low) */
+#define LM80_FAN1_COUNT_LIM	0x3c	/* Fan 1 count limit (high) */
+#define LM80_FAN2_COUNT_LIM	0x3d	/* Fan 2 count limit (low) */
 	/* 0x3e - 0x3f reserved	*/
 
 /*
@@ -124,7 +132,7 @@ extern "C" {
 
 /*	LM80_ISRC_2		Interrupt Status Register 2 */
 /*	LM80_IMSK_2		Interrupt Mask Register 2 */
-#define	LM80_IS_TEMP		(1<<0)	/* HOT temperature limit exceeded */
+#define LM80_IS_TEMP		(1<<0)	/* HOT temperature limit exceeded */
 #define LM80_IS_BTI			(1<<1)	/* state of BTI# pin */
 #define LM80_IS_FAN1		(1<<2)	/* count limit exceeded for Fan 1 */
 #define LM80_IS_FAN2		(1<<3)	/* count limit exceeded for Fan 2 */
@@ -143,7 +151,7 @@ extern "C" {
 #define LM80_FAN_RST_ENA	(1<<7)	/* sets RST_OUT#/OS# pins in RST mode */
 
 /*	LM80_TEMP_CTRL		OS# Config, Temp Res. Reg */
-#define	LM80_TEMP_OS_STAT	(1<<0)	/* mirrors the state of RST_OUT#/OS# */
+#define LM80_TEMP_OS_STAT	(1<<0)	/* mirrors the state of RST_OUT#/OS# */
 #define LM80_TEMP_OS_POL	(1<<1)	/* select OS# polarity */
 #define LM80_TEMP_OS_MODE	(1<<2)	/* selects Interrupt mode */
 #define LM80_TEMP_RES		(1<<3)	/* selects 9 or 11 bit temp resulution*/
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/net/sk98lin/h/skaddr.h linux-2.4.20-wolk4.4-fullkernel/drivers/net/sk98lin/h/skaddr.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/net/sk98lin/h/skaddr.h	2003-07-30 13:51:29.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/net/sk98lin/h/skaddr.h	2003-07-30 10:31:38.000000000 +0200
@@ -1,16 +1,17 @@
 /******************************************************************************
  *
  * Name:	skaddr.h
- * Project:	GEnesis, PCI Gigabit Ethernet Adapter
- * Version:	$Revision: 1.26 $
- * Date:	$Date: 2002/11/15 07:24:42 $
+ * Project:	Gigabit Ethernet Adapters, ADDR-Modul
+ * Version:	$Revision: 1.29 $
+ * Date:	$Date: 2003/05/13 16:57:24 $
  * Purpose:	Header file for Address Management (MC, UC, Prom).
  *
  ******************************************************************************/
 
 /******************************************************************************
  *
- *	(C)Copyright 1998-2001 SysKonnect GmbH.
+ *	(C)Copyright 1998-2002 SysKonnect GmbH.
+ *	(C)Copyright 2002-2003 Marvell.
  *
  *	This program is free software; you can redistribute it and/or modify
  *	it under the terms of the GNU General Public License as published by
@@ -26,6 +27,16 @@
  * History:
  *
  *	$Log: skaddr.h,v $
+ *	Revision 1.29  2003/05/13 16:57:24  mkarl
+ *	Changes for SLIM driver.
+ *	Editorial changes.
+ *	
+ *	Revision 1.28  2003/04/15 09:33:22  tschilli
+ *	Copyright messages changed.
+ *	
+ *	Revision 1.27  2003/04/14 15:55:11  tschilli
+ *	"#error C++ is not yet supported." removed.
+ *	
  *	Revision 1.26  2002/11/15 07:24:42  tschilli
  *	SK_ADDR_EQUAL macro fixed.
  *	
@@ -140,7 +151,6 @@
 #define __INC_SKADDR_H
 
 #ifdef __cplusplus
-#error C++ is not yet supported.
 extern "C" {
 #endif	/* cplusplus */
 
@@ -206,7 +216,7 @@ extern "C" {
 
 /* Macros */
 
-#if 0
+#ifdef OLD_STUFF
 #ifndef SK_ADDR_EQUAL
 /*
  * "&" instead of "&&" allows better optimization on IA-64.
@@ -231,16 +241,18 @@ extern "C" {
 #ifndef SK_ADDR_EQUAL
 #ifndef SK_ADDR_DWORD_COMPARE
 #define SK_ADDR_EQUAL(A1,A2)	( \
-	(((SK_U8 *)(A1))[5] == ((SK_U8 *)(A2))[5]) & \
-	(((SK_U8 *)(A1))[4] == ((SK_U8 *)(A2))[4]) & \
-	(((SK_U8 *)(A1))[3] == ((SK_U8 *)(A2))[3]) & \
-	(((SK_U8 *)(A1))[2] == ((SK_U8 *)(A2))[2]) & \
-	(((SK_U8 *)(A1))[1] == ((SK_U8 *)(A2))[1]) & \
-	(((SK_U8 *)(A1))[0] == ((SK_U8 *)(A2))[0]))
+	(((SK_U8 SK_FAR *)(A1))[5] == ((SK_U8 SK_FAR *)(A2))[5]) & \
+	(((SK_U8 SK_FAR *)(A1))[4] == ((SK_U8 SK_FAR *)(A2))[4]) & \
+	(((SK_U8 SK_FAR *)(A1))[3] == ((SK_U8 SK_FAR *)(A2))[3]) & \
+	(((SK_U8 SK_FAR *)(A1))[2] == ((SK_U8 SK_FAR *)(A2))[2]) & \
+	(((SK_U8 SK_FAR *)(A1))[1] == ((SK_U8 SK_FAR *)(A2))[1]) & \
+	(((SK_U8 SK_FAR *)(A1))[0] == ((SK_U8 SK_FAR *)(A2))[0]))
 #else	/* SK_ADDR_DWORD_COMPARE */
 #define SK_ADDR_EQUAL(A1,A2)	( \
-	(*(SK_U16 *)&(((SK_U8 *)(A1))[4]) == *(SK_U16 *)&(((SK_U8 *)(A2))[4])) && \
-	(*(SK_U32 *)&(((SK_U8 *)(A1))[0]) == *(SK_U32 *)&(((SK_U8 *)(A2))[0])))
+	(*(SK_U16 SK_FAR *)&(((SK_U8 SK_FAR *)(A1))[4]) == \
+	*(SK_U16 SK_FAR *)&(((SK_U8 SK_FAR *)(A2))[4])) && \
+	(*(SK_U32 SK_FAR *)&(((SK_U8 SK_FAR *)(A1))[0]) == \
+	*(SK_U32 SK_FAR *)&(((SK_U8 SK_FAR *)(A2))[0])))
 #endif	/* SK_ADDR_DWORD_COMPARE */
 #endif	/* SK_ADDR_EQUAL */
 
@@ -382,7 +394,7 @@ extern	int	SkAddrOverride(
 	SK_AC		*pAC,
 	SK_IOC		IoC,
 	SK_U32		PortNumber,
-	SK_MAC_ADDR	*pNewAddr,
+	SK_MAC_ADDR	SK_FAR *pNewAddr,
 	int		Flags);
 
 extern	int	SkAddrPromiscuousChange(
@@ -403,11 +415,13 @@ extern	int	SkAddrGmacPromiscuousChange(
 	SK_U32	PortNumber,
 	int	NewPromMode);	
 
+#ifndef SK_SLIM
 extern	int	SkAddrSwap(
 	SK_AC	*pAC,
 	SK_IOC	IoC,
 	SK_U32	FromPortNumber,
 	SK_U32	ToPortNumber);
+#endif
 
 #else	/* defined(SK_KR_PROTO)) */
 
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/net/sk98lin/h/skdebug.h linux-2.4.20-wolk4.4-fullkernel/drivers/net/sk98lin/h/skdebug.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/net/sk98lin/h/skdebug.h	2003-07-30 13:51:29.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/net/sk98lin/h/skdebug.h	2003-07-30 10:31:38.000000000 +0200
@@ -1,16 +1,17 @@
 /******************************************************************************
  *
  * Name:	skdebug.h
- * Project:	GEnesis, PCI Gigabit Ethernet Adapter
- * Version:	$Revision: 1.12 $
- * Date:	$Date: 2002/07/15 15:37:13 $
+ * Project:	Gigabit Ethernet Adapters, Common Modules
+ * Version:	$Revision: 1.14 $
+ * Date:	$Date: 2003/05/13 17:26:00 $
  * Purpose:	SK specific DEBUG support
  *
  ******************************************************************************/
 
 /******************************************************************************
  *
- *	(C)Copyright 1998-2002 SysKonnect GmbH.
+ *	(C)Copyright 1998-2002 SysKonnect.
+ *	(C)Copyright 2002-2003 Marvell.
  *
  *	This program is free software; you can redistribute it and/or modify
  *	it under the terms of the GNU General Public License as published by
@@ -25,6 +26,12 @@
  *
  * History:
  *	$Log: skdebug.h,v $
+ *	Revision 1.14  2003/05/13 17:26:00  mkarl
+ *	Editorial changes.
+ *	
+ *	Revision 1.13  2003/03/31 07:16:39  mkarl
+ *	Corrected Copyright.
+ *	
  *	Revision 1.12  2002/07/15 15:37:13  rschmidt
  *	Power Management support
  *	Editorial changes
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/net/sk98lin/h/skdrv1st.h linux-2.4.20-wolk4.4-fullkernel/drivers/net/sk98lin/h/skdrv1st.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/net/sk98lin/h/skdrv1st.h	2003-07-30 13:51:29.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/net/sk98lin/h/skdrv1st.h	2003-07-30 10:31:38.000000000 +0200
@@ -2,16 +2,15 @@
  *
  * Name:	skdrv1st.h
  * Project:	GEnesis, PCI Gigabit Ethernet Adapter
- * Version:	$Revision: 1.9.2.2 $
- * Date:	$Date: 2001/12/07 12:06:42 $
+ * Version:	$Revision: 1.14 $
+ * Date:	$Date: 2003/06/03 14:36:32 $
  * Purpose:	First header file for driver and all other modules
  *
  ******************************************************************************/
 
 /******************************************************************************
  *
- *	(C)Copyright 1998-2001 SysKonnect,
- *	a business unit of Schneider & Koch & Co. Datensysteme GmbH.
+ *	(C)Copyright 1998-2003 SysKonnect GmbH.
  *
  *	This program is free software; you can redistribute it and/or modify
  *	it under the terms of the GNU General Public License as published by
@@ -27,6 +26,24 @@
  * History:
  *
  *	$Log: skdrv1st.h,v $
+ *	Revision 1.14  2003/06/03 14:36:32  mlindner
+ *	Add: Additions for SK_SLIM
+ *	
+ *	Revision 1.13  2003/05/26 14:03:06  mlindner
+ *	Add: Support for SLIM skaddr
+ *	
+ *	Revision 1.12  2003/05/26 12:56:39  mlindner
+ *	Add: Support for Kernel 2.5/2.6
+ *	Add: New SkOsGetTimeCurrent function
+ *	Add: SK_PNMI_HUNDREDS_SEC definition
+ *	Fix: SK_TICKS_PER_SEC on Intel Itanium2
+ *	
+ *	Revision 1.11  2003/02/25 14:16:40  mlindner
+ *	Fix: Copyright statement
+ *	
+ *	Revision 1.10  2002/10/02 12:46:02  mlindner
+ *	Add: Support for Yukon
+ *	
  *	Revision 1.9.2.2  2001/12/07 12:06:42  mlindner
  *	Fix: malloc -> slab changes
  *	
@@ -89,11 +106,12 @@
 
 /* Check kernel version */
 #include <linux/version.h>
-#if (LINUX_VERSION_CODE > 0x020300)
-#endif
 
 typedef struct s_AC	SK_AC;
 
+/* Set card versions */
+#define SK_FAR
+
 /* override some default functions with optimized linux functions */
 
 #define SK_PNMI_STORE_U16(p,v)		memcpy((char*)(p),(char*)&(v),2)
@@ -150,7 +168,7 @@ typedef struct s_AC	SK_AC;
 
 
 /* we use gethrtime(), return unit: nanoseconds */
-#define SK_TICKS_PER_SEC	HZ
+#define SK_TICKS_PER_SEC	100
 
 #define	SK_MEM_MAPPED_IO
 
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/net/sk98lin/h/skdrv2nd.h linux-2.4.20-wolk4.4-fullkernel/drivers/net/sk98lin/h/skdrv2nd.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/net/sk98lin/h/skdrv2nd.h	2003-07-30 13:51:29.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/net/sk98lin/h/skdrv2nd.h	2003-07-30 10:31:38.000000000 +0200
@@ -2,16 +2,15 @@
  *
  * Name:	skdrv2nd.h
  * Project:	GEnesis, PCI Gigabit Ethernet Adapter
- * Version:	$Revision: 1.12.2.2 $
- * Date:	$Date: 2001/09/05 12:14:50 $
+ * Version:	$Revision: 1.18 $
+ * Date:	$Date: 2003/06/12 07:54:14 $
  * Purpose:	Second header file for driver and all other modules
  *
  ******************************************************************************/
 
 /******************************************************************************
  *
- *	(C)Copyright 1998-2001 SysKonnect,
- *	a business unit of Schneider & Koch & Co. Datensysteme GmbH.
+ *	(C)Copyright 1998-2003 SysKonnect GmbH.
  *
  *	This program is free software; you can redistribute it and/or modify
  *	it under the terms of the GNU General Public License as published by
@@ -27,6 +26,27 @@
  * History:
  *
  *	$Log: skdrv2nd.h,v $
+ *	Revision 1.18  2003/06/12 07:54:14  mlindner
+ *	Fix: Changed Descriptor Alignment to 64 Byte
+ *	
+ *	Revision 1.17  2003/05/26 12:56:39  mlindner
+ *	Add: Support for Kernel 2.5/2.6
+ *	Add: New SkOsGetTimeCurrent function
+ *	Add: SK_PNMI_HUNDREDS_SEC definition
+ *	Fix: SK_TICKS_PER_SEC on Intel Itanium2
+ *	
+ *	Revision 1.16  2003/03/21 14:56:18  rroesler
+ *	Added code regarding interrupt moderation
+ *	
+ *	Revision 1.15  2003/02/25 14:16:40  mlindner
+ *	Fix: Copyright statement
+ *	
+ *	Revision 1.14  2003/02/25 13:26:26  mlindner
+ *	Add: Support for various vendors
+ *	
+ *	Revision 1.13  2002/10/02 12:46:02  mlindner
+ *	Add: Support for Yukon
+ *	
  *	Revision 1.12.2.2  2001/09/05 12:14:50  mlindner
  *	add: New hardware revision int
  *	
@@ -114,7 +134,54 @@
 #include "h/skrlmt.h"
 #include "h/skgedrv.h"
 
-/* global function prototypes ******************************************/
+#define SK_PCI_ISCOMPLIANT(result, pdev) {     \
+    result = SK_FALSE; /* default */     \
+    /* 3Com (0x10b7) */     \
+    if (pdev->vendor == 0x10b7) {     \
+        /* Gigabit Ethernet Adapter (0x1700) */     \
+        if ((pdev->device == 0x1700)) { \
+            result = SK_TRUE;     \
+        }     \
+    /* SysKonnect (0x1148) */     \
+    } else if (pdev->vendor == 0x1148) {     \
+        /* SK-98xx Gigabit Ethernet Server Adapter (0x4300) */     \
+        /* SK-98xx V2.0 Gigabit Ethernet Adapter (0x4320) */     \
+        if ((pdev->device == 0x4300) || \
+            (pdev->device == 0x4320)) { \
+            result = SK_TRUE;     \
+        }     \
+    /* D-Link (0x1186) */     \
+    } else if (pdev->vendor == 0x1186) {     \
+        /* Gigabit Ethernet Adapter (0x4c00) */     \
+        if ((pdev->device == 0x4c00)) { \
+            result = SK_TRUE;     \
+        }     \
+    /* Marvell (0x11ab) */     \
+    } else if (pdev->vendor == 0x11ab) {     \
+        /* Gigabit Ethernet Adapter (0x4320) */     \
+        if ((pdev->device == 0x4320)) { \
+            result = SK_TRUE;     \
+        }     \
+    /* CNet (0x1371) */     \
+    } else if (pdev->vendor == 0x1371) {     \
+        /* GigaCard Network Adapter (0x434e) */     \
+        if ((pdev->device == 0x434e)) { \
+            result = SK_TRUE;     \
+        }     \
+    /* Linksys (0x1737) */     \
+    } else if (pdev->vendor == 0x1737) {     \
+        /* Gigabit Network Adapter (0x1032) */     \
+        /* Gigabit Network Adapter (0x1064) */     \
+        if ((pdev->device == 0x1032) || \
+            (pdev->device == 0x1064)) { \
+            result = SK_TRUE;     \
+        }     \
+    } else {     \
+        result = SK_FALSE;     \
+    }     \
+}
+
+
 extern SK_MBUF		*SkDrvAllocRlmtMbuf(SK_AC*, SK_IOC, unsigned);
 extern void		SkDrvFreeRlmtMbuf(SK_AC*, SK_IOC, SK_MBUF*);
 extern SK_U64		SkOsGetTime(SK_AC*);
@@ -139,6 +206,25 @@ struct s_DrvRlmtMbuf {
 };
 
 
+/*
+ * Time macros
+ */
+#if SK_TICKS_PER_SEC == 100
+#define SK_PNMI_HUNDREDS_SEC(t)	(t)
+#else
+#define SK_PNMI_HUNDREDS_SEC(t)	((((unsigned long)t) * 100) / \
+										(SK_TICKS_PER_SEC))
+#endif
+
+/*
+ * New SkOsGetTime
+ */
+#define SkOsGetTimeCurrent(pAC, pUsec) {\
+	struct timeval t;\
+	do_gettimeofday(&t);\
+	*pUsec = ((((t.tv_sec) * 1000000L)+t.tv_usec)/10000);\
+}
+
 
 /*
  * ioctl definitions
@@ -147,6 +233,7 @@ struct s_DrvRlmtMbuf {
 #define		SK_IOCTL_GETMIB		(SK_IOCTL_BASE + 0)
 #define		SK_IOCTL_SETMIB		(SK_IOCTL_BASE + 1)
 #define		SK_IOCTL_PRESETMIB	(SK_IOCTL_BASE + 2)
+#define		SK_IOCTL_GEN		(SK_IOCTL_BASE + 3)
 
 typedef struct s_IOCTL	SK_GE_IOCTL;
 
@@ -181,7 +268,7 @@ struct s_IOCTL {
 /*
  * alignment of rx/tx descriptors
  */
-#define DESCR_ALIGN	8
+#define DESCR_ALIGN	64
 
 /*
  * definitions for pnmi. TODO
@@ -194,6 +281,15 @@ struct s_IOCTL {
 #define SK_DRIVER_SET_MTU(pAc,IoC,i,v)	0
 #define SK_DRIVER_PRESET_MTU(pAc,IoC,i,v)	0
 
+/*
+** Interim definition of SK_DRV_TIMER placed in this file until 
+** common modules have boon finallized
+*/
+#define SK_DRV_TIMER                   11 
+#define	SK_DRV_MODERATION_TIMER		1
+#define SK_DRV_MODERATION_TIMER_LENGTH  1000000  /* 1 second */
+#define SK_DRV_RX_CLEANUP_TIMER		2
+#define SK_DRV_RX_CLEANUP_TIMER_LENGTH	1000000	 /* 100 millisecs */
 
 /* TX and RX descriptors *****************************************************/
 
@@ -420,6 +516,53 @@ struct s_RxPort {
 	int		PortIndex;	/* index number of port (0 or 1) */
 };
 
+#define IRQ_EOF_AS_TX     ((IRQ_EOF_AS_TX1) | (IRQ_EOF_AS_TX2))
+#define IRQ_EOF_SY_TX     ((IRQ_EOF_SY_TX1) | (IRQ_EOF_SY_TX2))
+#define IRQ_MASK_TX_ONLY  ((IRQ_EOF_AS_TX)  | (IRQ_EOF_SY_TX))
+#define IRQ_MASK_RX_ONLY  ((IRQ_EOF_RX1)    | (IRQ_EOF_RX2))
+#define IRQ_MASK_SP_ONLY  (SPECIAL_IRQS)
+#define IRQ_MASK_TX_RX    ((IRQ_MASK_TX_ONLY) | (IRQ_MASK_RX_ONLY))
+#define IRQ_MASK_SP_RX    ((SPECIAL_IRQS)     | (IRQ_MASK_RX_ONLY))
+#define IRQ_MASK_SP_TX    ((SPECIAL_IRQS)     | (IRQ_MASK_TX_ONLY))
+#define IRQ_MASK_RX_TX_SP ((SPECIAL_IRQS)     | (IRQ_MASK_TX_RX))
+ 
+#define C_INT_MOD_NONE                 1
+#define C_INT_MOD_STATIC               2
+#define C_INT_MOD_DYNAMIC              4
+
+#define C_CLK_FREQ_GENESIS      53215000 /* shorter: 53.125 MHz  */
+#define C_CLK_FREQ_YUKON        78215000 /* shorter: 78.125 MHz  */
+
+#define C_INTS_PER_SEC_DEFAULT      2000 
+#define C_INT_MOD_ENABLE_PERCENTAGE   50 /* if higher 50% enable */
+#define C_INT_MOD_DISABLE_PERCENTAGE  50 /* if lower 50% disable */
+
+typedef struct s_DynIrqModInfo  DIM_INFO;
+struct s_DynIrqModInfo {
+	unsigned long   PrevTimeVal;
+	unsigned int    PrevSysLoad;
+	unsigned int    PrevUsedTime;
+	unsigned int    PrevTotalTime;
+	int             PrevUsedDescrRatio;
+	int             NbrProcessedDescr;
+        SK_U64          PrevPort0RxIntrCts;
+        SK_U64          PrevPort1RxIntrCts;
+        SK_U64          PrevPort0TxIntrCts;
+        SK_U64          PrevPort1TxIntrCts;
+	SK_BOOL         ModJustEnabled;     /* Moderation just enabled yes/no */
+
+	int             MaxModIntsPerSec;            /* Moderation Threshold */
+	int             MaxModIntsPerSecUpperLimit;  /* Upper limit for DIM  */
+	int             MaxModIntsPerSecLowerLimit;  /* Lower limit for DIM  */
+
+	long            MaskIrqModeration;   /* ModIrqType (eg. 'TxRx')      */
+	SK_BOOL         DisplayStats;        /* Stats yes/no                 */
+	SK_BOOL         AutoSizing;          /* Resize DIM-timer on/off      */
+	int             IntModTypeSelect;    /* EnableIntMod (eg. 'dynamic') */
+
+	SK_TIMER        ModTimer; /* just some timer */
+};
+
 typedef struct s_PerStrm	PER_STRM;
 
 #define SK_ALLOC_IRQ	0x00000001
@@ -487,11 +630,12 @@ struct s_AC  {
 	SK_U32		CsOfs;		/* for checksum calculation */
 
 	SK_BOOL		CheckQueue;	/* check event queue soon */
+	SK_TIMER        DrvCleanupTimer;/* to check for pending descriptors */
+	DIM_INFO        DynIrqModInfo;  /* all data related to DIM */
 
 	/* Only for tests */
 	int		PortUp;
 	int		PortDown;
-
 };
 
 
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/net/sk98lin/h/skerror.h linux-2.4.20-wolk4.4-fullkernel/drivers/net/sk98lin/h/skerror.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/net/sk98lin/h/skerror.h	2003-07-30 13:51:29.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/net/sk98lin/h/skerror.h	2003-07-30 10:31:38.000000000 +0200
@@ -1,16 +1,17 @@
 /******************************************************************************
  *
  * Name:	skerror.h
- * Project:	GEnesis, PCI Gigabit Ethernet Adapter
- * Version:	$Revision: 1.5 $
- * Date:	$Date: 2002/04/25 11:05:10 $
+ * Project:	Gigabit Ethernet Adapters, Common Modules
+ * Version:	$Revision: 1.7 $
+ * Date:	$Date: 2003/05/13 17:25:13 $
  * Purpose:	SK specific Error log support
  *
  ******************************************************************************/
 
 /******************************************************************************
  *
- *	(C)Copyright 1998-2002 SysKonnect GmbH.
+ *	(C)Copyright 1998-2002 SysKonnect.
+ *	(C)Copyright 2002-2003 Marvell.
  *
  *	This program is free software; you can redistribute it and/or modify
  *	it under the terms of the GNU General Public License as published by
@@ -25,6 +26,12 @@
  *
  * History:
  *	$Log: skerror.h,v $
+ *	Revision 1.7  2003/05/13 17:25:13  mkarl
+ *	Editorial changes.
+ *	
+ *	Revision 1.6  2003/03/31 07:17:48  mkarl
+ *	Corrected Copyright.
+ *	
  *	Revision 1.5  2002/04/25 11:05:10  rschmidt
  *	Editorial changes
  *	
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/net/sk98lin/h/skgedrv.h linux-2.4.20-wolk4.4-fullkernel/drivers/net/sk98lin/h/skgedrv.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/net/sk98lin/h/skgedrv.h	2003-07-30 13:51:29.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/net/sk98lin/h/skgedrv.h	2003-07-30 10:31:38.000000000 +0200
@@ -1,16 +1,17 @@
 /******************************************************************************
  *
  * Name:	skgedrv.h
- * Project:	GEnesis, PCI Gigabit Ethernet Adapter
- * Version:	$Revision: 1.6 $
- * Date:	$Date: 2002/07/15 15:38:01 $
+ * Project:	Gigabit Ethernet Adapters, Common Modules
+ * Version:	$Revision: 1.9 $
+ * Date:	$Date: 2003/05/13 17:24:21 $
  * Purpose:	Interface with the driver
  *
  ******************************************************************************/
 
 /******************************************************************************
  *
- *	(C)Copyright 1998-2002 SysKonnect GmbH.
+ *	(C)Copyright 1998-2002 SysKonnect.
+ *	(C)Copyright 2002-2003 Marvell.
  *
  *	This program is free software; you can redistribute it and/or modify
  *	it under the terms of the GNU General Public License as published by
@@ -26,6 +27,17 @@
  * History:
  *
  *	$Log: skgedrv.h,v $
+ *	Revision 1.9  2003/05/13 17:24:21  mkarl
+ *	Added events SK_DRV_LINK_UP and SK_DRV_LINK_DOWN for drivers not using
+ *	RLMT (SK_NO_RLMT).
+ *	Editorial changes.
+ *	
+ *	Revision 1.8  2003/03/31 07:18:54  mkarl
+ *	Corrected Copyright.
+ *	
+ *	Revision 1.7  2003/03/18 09:43:47  rroesler
+ *	Added new event for timer
+ *	
  *	Revision 1.6  2002/07/15 15:38:01  rschmidt
  *	Power Management support
  *	Editorial changes
@@ -68,5 +80,9 @@
 #define SK_DRV_PORT_FAIL		 8	/* One port fails */
 #define SK_DRV_SWITCH_INTERN	 9	/* Port switch by the driver itself */
 #define SK_DRV_POWER_DOWN		10	/* Power down mode */
-
+#define SK_DRV_TIMER			11	/* Timer for free use */
+#ifdef SK_NO_RLMT
+#define SK_DRV_LINK_UP  		12	/* Link Up event for driver */
+#define SK_DRV_LINK_DOWN		13	/* Link Down event for driver */
+#endif
 #endif	/* __INC_SKGEDRV_H_ */
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/net/sk98lin/h/skgehw.h linux-2.4.20-wolk4.4-fullkernel/drivers/net/sk98lin/h/skgehw.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/net/sk98lin/h/skgehw.h	2003-07-30 13:51:29.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/net/sk98lin/h/skgehw.h	2003-07-30 10:31:38.000000000 +0200
@@ -1,16 +1,17 @@
 /******************************************************************************
  *
  * Name:	skgehw.h
- * Project:	GEnesis, PCI Gigabit Ethernet Adapter
- * Version:	$Revision: 1.49 $
- * Date:	$Date: 2003/01/28 09:43:49 $
+ * Project:	Gigabit Ethernet Adapters, Common Modules
+ * Version:	$Revision: 1.52 $
+ * Date:	$Date: 2003/05/13 17:16:36 $
  * Purpose:	Defines and Macros for the Gigabit Ethernet Adapter Product Family
  *
  ******************************************************************************/
 
 /******************************************************************************
  *
- *	(C)Copyright 1998-2003 SysKonnect GmbH.
+ *	(C)Copyright 1998-2002 SysKonnect.
+ *	(C)Copyright 2002-2003 Marvell.
  *
  *	This program is free software; you can redistribute it and/or modify
  *	it under the terms of the GNU General Public License as published by
@@ -25,6 +26,18 @@
  *
  * History:
  * $Log: skgehw.h,v $
+ * Revision 1.52  2003/05/13 17:16:36  mkarl
+ * Added SK_FAR for PXE.
+ * Editorial changes.
+ *
+ * Revision 1.51  2003/04/08 16:31:50  rschmidt
+ * Added defines for new Chip IDs (YUKON-Lite, YUKON-LP)
+ * Editorial changes
+ *
+ * Revision 1.50  2003/03/31 07:29:45  mkarl
+ * Corrected Copyright.
+ * Editorial changes.
+ *
  * Revision 1.49  2003/01/28 09:43:49  rschmidt
  * Added defines for PCI-Spec. 2.3 IRQ
  * Added defines for CLK_RUN (YUKON-Lite)
@@ -339,7 +352,7 @@ extern "C" {
 #define PCI_SUB_ID		0x2e	/* 16 bit	Subsystem ID */
 #define PCI_BASE_ROM	0x30	/* 32 bit	Expansion ROM Base Address */
 #define PCI_CAP_PTR		0x34	/*  8 bit 	Capabilities Ptr */
-	/* Byte 35..3b:	reserved */
+	/* Byte 0x35..0x3b:	reserved */
 #define PCI_IRQ_LINE	0x3c	/*  8 bit	Interrupt Line */
 #define PCI_IRQ_PIN		0x3d	/*  8 bit	Interrupt Pin */
 #define PCI_MIN_GNT		0x3e	/*  8 bit	Min_Gnt */
@@ -359,7 +372,9 @@ extern "C" {
 #define PCI_VPD_NITEM	0x51	/*  8 bit 	Next Item Ptr */
 #define PCI_VPD_ADR_REG	0x52	/* 16 bit 	VPD Address Register */
 #define PCI_VPD_DAT_REG	0x54	/* 32 bit 	VPD Data Register */
-	/* Byte 0x58..0xff:	reserved */
+	/* Byte 0x58..0x59:	reserved */
+#define PCI_SER_LD_CTRL	0x5a	/* 16 bit 	SEEPROM Loader Ctrl (YUKON only) */
+	/* Byte 0x5c..0xff:	reserved */
 
 /*
  * I2C Address (PCI Config)
@@ -367,7 +382,7 @@ extern "C" {
  * Note: The temperature and voltage sensors are relocated on a different
  *	 I2C bus.
  */
-#define I2C_ADDR_VPD	0xA0	/* I2C address for the VPD EEPROM */
+#define I2C_ADDR_VPD	0xa0	/* I2C address for the VPD EEPROM */
 
 /*
  * Define Bits and Values of the registers
@@ -453,8 +468,8 @@ extern "C" {
 /*	PCI_OUR_REG_1		32 bit	Our Register 1 */
 									/* Bit 31..29:	reserved */
 #define PCI_PHY_COMA	BIT_28		/* Set PHY to Coma Mode */
-#define PCI_EN_CAL		BIT_27		/* Enable  PCI buffer strength calibr. */
-#define PCI_DIS_CAL		BIT_26		/* Disable PCI buffer strength calibr. */
+#define PCI_TEST_CAL	BIT_27		/* Test PCI buffer calib. (YUKON only) */
+#define PCI_EN_CAL		BIT_26		/* Enable PCI buffer calib. (YUKON only) */
 #define PCI_VIO			BIT_25		/* PCI I/O Voltage, 0 = 3.3V, 1 = 5V */
 #define PCI_DIS_BOOT	BIT_24		/* Disable BOOT via ROM */
 #define PCI_EN_IO		BIT_23		/* Mapping to I/O space */
@@ -1111,8 +1126,10 @@ extern "C" {
 #define CFG_SNG_MAC		BIT_0S		/* MAC Config: 0=2 MACs / 1=1 MAC*/
 
 /*	B2_CHIP_ID	 8 bit 	Chip Identification Number */
-#define CHIP_ID_GENESIS	0x0a		/* Chip ID for GENESIS */
-#define CHIP_ID_YUKON	0xb0		/* Chip ID for YUKON */
+#define CHIP_ID_GENESIS		0x0a	/* Chip ID for GENESIS */
+#define CHIP_ID_YUKON		0xb0	/* Chip ID for YUKON */
+#define CHIP_ID_YUKON_LITE	0xb1	/* Chip ID for YUKON-Lite (Rev. A1) */
+#define CHIP_ID_YUKON_LP	0xb2	/* Chip ID for YUKON-LP */
 
 /*	B2_FAR		32 bit	Flash-Prom Addr Reg/Cnt */
 #define FAR_ADDR		0x1ffffL	/* Bit 16.. 0:	FPROM Address mask */
@@ -1867,7 +1884,7 @@ typedef	struct s_HwRxd {
 #define BMU_CHECK		(0x55L<<16)	/* Default BMU check */
 #define BMU_TCP_CHECK	(0x56L<<16)	/* Descr with TCP ext */
 #define BMU_UDP_CHECK	(0x57L<<16)	/* Descr with UDP ext (YUKON only) */
-#define BMU_BBC			0xFFFFL	/* Bit 15.. 0:	Buffer Byte Counter */
+#define BMU_BBC			0xffffL	/* Bit 15.. 0:	Buffer Byte Counter */
 
 /*	TxStat		Transmit Frame Status Word */
 /*	RxStat		Receive Frame Status Word */
@@ -2021,8 +2038,8 @@ typedef	struct s_HwRxd {
 }
 
 #define XM_OUTADDR(IoC, Mac, Reg, pVal) {				\
-	SK_U8	*pByte;										\
-	pByte = (SK_U8 *)&((SK_U8 *)(pVal))[0];				\
+	SK_U8	SK_FAR *pByte;								\
+	pByte = (SK_U8 SK_FAR *)&((SK_U8 SK_FAR *)(pVal))[0];	\
 	SK_OUT16((IoC), XMA((Mac), (Reg)), (SK_U16)			\
 		(((SK_U16)(pByte[0]) & 0x00ff) |				\
 		(((SK_U16)(pByte[1]) << 8) & 0xff00)));			\
@@ -2036,8 +2053,8 @@ typedef	struct s_HwRxd {
 
 #define XM_INHASH(IoC, Mac, Reg, pVal) {				\
 	SK_U16	Word;										\
-	SK_U8	*pByte;										\
-	pByte = (SK_U8 *)&((SK_U8 *)(pVal))[0];				\
+	SK_U8	SK_FAR *pByte;								\
+	pByte = (SK_U8 SK_FAR *)&((SK_U8 SK_FAR *)(pVal))[0];	\
 	SK_IN16((IoC), XMA((Mac), (Reg)), &Word);			\
 	pByte[0] = (SK_U8)(Word  & 0x00ff);					\
 	pByte[1] = (SK_U8)((Word >> 8) & 0x00ff);			\
@@ -2053,8 +2070,8 @@ typedef	struct s_HwRxd {
 }
 
 #define XM_OUTHASH(IoC, Mac, Reg, pVal) {				\
-	SK_U8	*pByte;										\
-	pByte = (SK_U8 *)&((SK_U8 *)(pVal))[0];				\
+	SK_U8	SK_FAR *pByte;								\
+	pByte = (SK_U8 SK_FAR *)&((SK_U8 SK_FAR *)(pVal))[0];	\
 	SK_OUT16((IoC), XMA((Mac), (Reg)), (SK_U16)			\
 		(((SK_U16)(pByte[0]) & 0x00ff)|					\
 		(((SK_U16)(pByte[1]) << 8) & 0xff00)));			\
@@ -2127,8 +2144,8 @@ typedef	struct s_HwRxd {
 }
 
 #define GM_OUTADDR(IoC, Mac, Reg, pVal) {				\
-	SK_U8	*pByte;										\
-	pByte = (SK_U8 *)&((SK_U8 *)(pVal))[0];				\
+	SK_U8	SK_FAR *pByte;								\
+	pByte = (SK_U8 SK_FAR *)&((SK_U8 SK_FAR *)(pVal))[0];	\
 	SK_OUT16((IoC), GMA((Mac), (Reg)), (SK_U16)			\
 		(((SK_U16)(pByte[0]) & 0x00ff) |				\
 		(((SK_U16)(pByte[1]) << 8) & 0xff00)));			\
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/net/sk98lin/h/skgehwt.h linux-2.4.20-wolk4.4-fullkernel/drivers/net/sk98lin/h/skgehwt.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/net/sk98lin/h/skgehwt.h	2003-07-30 13:51:29.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/net/sk98lin/h/skgehwt.h	2003-07-30 10:31:38.000000000 +0200
@@ -1,17 +1,17 @@
 /******************************************************************************
  *
  * Name:	skhwt.h
- * Project:	GEnesis, PCI Gigabit Ethernet Adapter
- * Version:	$Revision: 1.5 $
- * Date:	$Date: 1999/11/22 13:54:24 $
+ * Project:	Gigabit Ethernet Adapters, Schedule-Modul
+ * Version:	$Revision: 1.6 $
+ * Date:	$Date: 2003/05/13 17:57:48 $
  * Purpose:	Defines for the hardware timer functions
  *
  ******************************************************************************/
 
 /******************************************************************************
  *
- *	(C)Copyright 1998,1999 SysKonnect,
- *	a business unit of Schneider & Koch & Co. Datensysteme GmbH.
+ *	(C)Copyright 1998-2002 SysKonnect GmbH.
+ *	(C)Copyright 2002-2003 Marvell.
  *
  *	This program is free software; you can redistribute it and/or modify
  *	it under the terms of the GNU General Public License as published by
@@ -27,6 +27,9 @@
  * History:
  *
  *	$Log: skgehwt.h,v $
+ *	Revision 1.6  2003/05/13 17:57:48  mkarl
+ *	Editorial changes.
+ *	
  *	Revision 1.5  1999/11/22 13:54:24  cgoos
  *	Changed license header to GPL.
  *	
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/net/sk98lin/h/skgeinit.h linux-2.4.20-wolk4.4-fullkernel/drivers/net/sk98lin/h/skgeinit.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/net/sk98lin/h/skgeinit.h	2003-07-30 13:51:29.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/net/sk98lin/h/skgeinit.h	2003-07-30 10:31:38.000000000 +0200
@@ -1,16 +1,17 @@
 /******************************************************************************
  *
  * Name:	skgeinit.h
- * Project:	GEnesis, PCI Gigabit Ethernet Adapter
- * Version:	$Revision: 1.74 $
- * Date:	$Date: 2003/01/28 09:39:16 $
+ * Project:	Gigabit Ethernet Adapters, Common Modules
+ * Version:	$Revision: 1.80 $
+ * Date:	$Date: 2003/05/28 15:25:30 $
  * Purpose:	Structures and prototypes for the GE Init Module
  *
  ******************************************************************************/
 
 /******************************************************************************
  *
- *	(C)Copyright 1998-2003 SysKonnect GmbH.
+ *	(C)Copyright 1998-2002 SysKonnect.
+ *	(C)Copyright 2002-2003 Marvell.
  *
  *	This program is free software; you can redistribute it and/or modify
  *	it under the terms of the GNU General Public License as published by
@@ -26,6 +27,30 @@
  * History:
  *
  *	$Log: skgeinit.h,v $
+ *	Revision 1.80  2003/05/28 15:25:30  rschmidt
+ *	Added SK_FAR to pointers in MAC/PHY read functions (for PXE)
+ *	Minor changes to avoid LINT warnings
+ *	Editorial changes
+ *	
+ *	Revision 1.79  2003/05/06 12:02:33  rschmidt
+ *	Added entry GIYukon in s_GeInit structure
+ *	Editorial changes
+ *	
+ *	Revision 1.78  2003/04/28 08:59:57  rschmidt
+ *	Added entries GIValIrqMask and GITimeStampCnt in s_GeInit structure
+ *	
+ *	Revision 1.77  2003/04/08 16:27:02  rschmidt
+ *	Added entry GILedBlinkCtrl in s_GeInit structure
+ *	Added defines for LED Blink Control
+ *	
+ *	Revision 1.76  2003/03/31 07:21:01  mkarl
+ *	Added PGmANegAdv to SK_GEPORT.
+ *	Corrected Copyright.
+ *	
+ *	Revision 1.75  2003/02/05 13:36:39  rschmidt
+ *	Added define SK_FACT_78	for YUKON's Host Clock of 78.12 MHz
+ *	Editorial changes
+ *	
  *	Revision 1.74  2003/01/28 09:39:16  rschmidt
  *	Added entry GIYukonLite in s_GeInit structure
  *	Editorial changes
@@ -209,10 +234,10 @@
  *	ports are active but differently configured.
  *	
  *	Revision 1.31  1998/12/11 15:17:02  gklug
- *	add: Link partnet autoneg states : Unknown Manual and Autonegotiation
+ *	add: Link partnet autoneg states : Unknown Manual and Auto-negotiation
  *	
  *	Revision 1.30  1998/12/07 12:17:04  gklug
- *	add: Link Partner autonegotiation flag
+ *	add: Link Partner auto-negotiation flag
  *	
  *	Revision 1.29  1998/12/01 10:54:42  gklug
  *	add: variables for XMAC Errata
@@ -332,6 +357,8 @@ extern "C" {
 
 /* defines ********************************************************************/
 
+#define SK_TEST_VAL		0x11335577UL
+	
 /* modifying Link LED behaviour (used with SkGeLinkLED()) */
 #define SK_LNK_OFF		LED_OFF
 #define SK_LNK_ON		(LED_ON | LED_BLK_OFF | LED_SYNC_OFF)	
@@ -356,14 +383,17 @@ extern "C" {
 #define SK_LED_TST	2
 
 /* Counter and Timer constants, for a host clock of 62.5 MHz */
-#define SK_XMIT_DUR		0x002faf08L		/*  50 ms */
-#define SK_BLK_DUR		0x01dcd650L		/* 500 ms */
+#define SK_XMIT_DUR		0x002faf08UL	/*  50 ms */
+#define SK_BLK_DUR		0x01dcd650UL	/* 500 ms */
 
-#define SK_DPOLL_DEF	0x00EE6B28L		/* 250 ms */
-#define SK_DPOLL_MAX	0x00FFFFFFL		/* ca. 268ms */
+#define SK_DPOLL_DEF	0x00ee6b28UL	/* 250 ms at 62.5 MHz */
+
+#define SK_DPOLL_MAX	0x00ffffffUL	/* 268 ms at 62.5 MHz */
+										/* 215 ms at 78.12 MHz */
 
 #define SK_FACT_62		100			/* is given in percent */
-#define SK_FACT_53		 85
+#define SK_FACT_53		 85         /* on GENESIS:	53.12 MHz */
+#define SK_FACT_78		125			/* on YUKON:	78.12 MHz */
 
 /* Timeout values */
 #define SK_MAC_TO_53	72			/* MAC arbiter timeout */
@@ -451,9 +481,7 @@ extern "C" {
 #define SK_LMODE_AUTOFULL	4	/* AutoFull Duplex Mode */
 #define SK_LMODE_AUTOBOTH	5	/* AutoBoth Duplex Mode */
 #define SK_LMODE_AUTOSENSE	6	/* configured mode auto sensing */
-#define SK_LMODE_INDETERMINATED	7	/* Return value for virtual port if
-								* multiple ports are differently configured.
-								*/
+#define SK_LMODE_INDETERMINATED	7	/* indeterminated */
 
 /* Auto-negotiation timeout in 100ms granularity */
 #define SK_AND_MAX_TO		6	/* Wait 600 msec before link comes up */
@@ -469,27 +497,21 @@ extern "C" {
 #define SK_LSPEED_CAP_10MBPS		(1<<1)	/* 10 Mbps */
 #define SK_LSPEED_CAP_100MBPS		(1<<2)	/* 100 Mbps */
 #define SK_LSPEED_CAP_1000MBPS		(1<<3)	/* 1000 Mbps */
-#define SK_LSPEED_CAP_INDETERMINATED (1<<4) /* Return value for virtual port if
-									  * multiple ports are differently configured.
-									  */
+#define SK_LSPEED_CAP_INDETERMINATED (1<<4) /* indeterminated */
 
 /* Link Speed Parameter */
 #define SK_LSPEED_AUTO				1	/* Automatic resolution */
 #define SK_LSPEED_10MBPS			2	/* 10 Mbps */
 #define SK_LSPEED_100MBPS			3	/* 100 Mbps */
 #define SK_LSPEED_1000MBPS			4	/* 1000 Mbps */
-#define SK_LSPEED_INDETERMINATED	5	/* Return value for virtual port if
-					 * multiple ports are differently configured.
-					 */
+#define SK_LSPEED_INDETERMINATED	5	/* indeterminated */
 
 /* Link Speed Current State */
 #define SK_LSPEED_STAT_UNKNOWN		1
 #define SK_LSPEED_STAT_10MBPS		2
 #define SK_LSPEED_STAT_100MBPS 		3
 #define SK_LSPEED_STAT_1000MBPS		4
-#define SK_LSPEED_STAT_INDETERMINATED 5	/* Return value for virtual port if
-					 * multiple ports are differently configured.
-					 */
+#define SK_LSPEED_STAT_INDETERMINATED 5
 
 
 /* Link Capability Parameter */
@@ -497,62 +519,50 @@ extern "C" {
 #define SK_LMODE_CAP_FULL		(1<<1)	/* Full Duplex Mode */
 #define SK_LMODE_CAP_AUTOHALF	(1<<2)	/* AutoHalf Duplex Mode */
 #define SK_LMODE_CAP_AUTOFULL	(1<<3)	/* AutoFull Duplex Mode */
-#define SK_LMODE_CAP_INDETERMINATED (1<<4) /* Return value for virtual port if
-					 * multiple ports are differently configured.
-					 */
+#define SK_LMODE_CAP_INDETERMINATED (1<<4) /* indeterminated */
 
 /* Link Mode Current State */
 #define SK_LMODE_STAT_UNKNOWN	1	/* Unknown Duplex Mode */
 #define SK_LMODE_STAT_HALF		2	/* Half Duplex Mode */
 #define SK_LMODE_STAT_FULL		3	/* Full Duplex Mode */
-#define SK_LMODE_STAT_AUTOHALF	4	/* Half Duplex Mode obtained by AutoNeg */
-#define SK_LMODE_STAT_AUTOFULL	5	/* Full Duplex Mode obtained by AutoNeg */
-#define SK_LMODE_STAT_INDETERMINATED 6	/* Return value for virtual port if
-					 * multiple ports are differently configured.
-					 */
+#define SK_LMODE_STAT_AUTOHALF	4	/* Half Duplex Mode obtained by Auto-Neg */
+#define SK_LMODE_STAT_AUTOFULL	5	/* Full Duplex Mode obtained by Auto-Neg */
+#define SK_LMODE_STAT_INDETERMINATED 6	/* indeterminated */
+
 /* Flow Control Mode Parameter (and capabilities) */
-#define SK_FLOW_MODE_NONE		1	/* No Flow Control */
+#define SK_FLOW_MODE_NONE		1	/* No Flow-Control */
 #define SK_FLOW_MODE_LOC_SEND	2	/* Local station sends PAUSE */
-#define SK_FLOW_MODE_SYMMETRIC	3	/* Both station may send PAUSE */
-#define SK_FLOW_MODE_SYM_OR_REM	4	/* Both station may send PAUSE or
+#define SK_FLOW_MODE_SYMMETRIC	3	/* Both stations may send PAUSE */
+#define SK_FLOW_MODE_SYM_OR_REM	4	/* Both stations may send PAUSE or
 					 * just the remote station may send PAUSE
 					 */
-#define SK_FLOW_MODE_INDETERMINATED 5	/* Return value for virtual port if
-					 * multiple ports are differently configured.
-					 */
+#define SK_FLOW_MODE_INDETERMINATED 5	/* indeterminated */
 
 /* Flow Control Status Parameter */
 #define SK_FLOW_STAT_NONE		1	/* No Flow Control */
 #define SK_FLOW_STAT_REM_SEND	2	/* Remote Station sends PAUSE */
 #define SK_FLOW_STAT_LOC_SEND	3	/* Local station sends PAUSE */
 #define SK_FLOW_STAT_SYMMETRIC	4	/* Both station may send PAUSE */
-#define SK_FLOW_STAT_INDETERMINATED 5	/* Return value for virtual port if
-					 * multiple ports are differently configured.
-					 */
+#define SK_FLOW_STAT_INDETERMINATED 5	/* indeterminated */
+
 /* Master/Slave Mode Capabilities */
 #define SK_MS_CAP_AUTO		(1<<0)	/* Automatic resolution */
 #define SK_MS_CAP_MASTER	(1<<1)	/* This station is master */
 #define SK_MS_CAP_SLAVE		(1<<2)	/* This station is slave */
-#define SK_MS_CAP_INDETERMINATED (1<<3)	/* Return value for virtual port if
-					 * multiple ports are differently configured.
-					 */
+#define SK_MS_CAP_INDETERMINATED (1<<3)	/* indeterminated */
 
 /* Set Master/Slave Mode Parameter (and capabilities) */
 #define SK_MS_MODE_AUTO		1	/* Automatic resolution */
 #define SK_MS_MODE_MASTER	2	/* This station is master */
 #define SK_MS_MODE_SLAVE	3	/* This station is slave */
-#define SK_MS_MODE_INDETERMINATED 4	/* Return value for virtual port if
-					 * multiple ports are differently
-					 */
+#define SK_MS_MODE_INDETERMINATED 4	/* indeterminated */
 
 /* Master/Slave Status Parameter */
-#define SK_MS_STAT_UNSET	1	/* The MS status is never been determ*/
+#define SK_MS_STAT_UNSET	1	/* The M/S status is not set */
 #define SK_MS_STAT_MASTER	2	/* This station is master */
 #define SK_MS_STAT_SLAVE	3	/* This station is slave */
-#define SK_MS_STAT_FAULT	4	/* MS resolution failed */
-#define SK_MS_STAT_INDETERMINATED 5	/* Return value for virtual port if
-					 * multiple ports are differently
-					 */
+#define SK_MS_STAT_FAULT	4	/* M/S resolution failed */
+#define SK_MS_STAT_INDETERMINATED 5	/* indeterminated */
 
 /* parameter 'Mode' when calling SkXmSetRxCmd() */
 #define SK_STRIP_FCS_ON		(1<<0)	/* Enable  FCS stripping of Rx frames */
@@ -561,8 +571,8 @@ extern "C" {
 #define SK_STRIP_PAD_OFF	(1<<3)	/* Disable pad byte stripping of Rx fr */
 #define SK_LENERR_OK_ON		(1<<4)	/* Don't chk fr for in range len error */
 #define SK_LENERR_OK_OFF	(1<<5)	/* Check frames for in range len error */
-#define SK_BIG_PK_OK_ON		(1<<6)	/* Don't set rcvError bit for big fr */
-#define SK_BIG_PK_OK_OFF	(1<<7)	/* Set rcvError bit for big frames */	
+#define SK_BIG_PK_OK_ON		(1<<6)	/* Don't set Rx Error bit for big frames */
+#define SK_BIG_PK_OK_OFF	(1<<7)	/* Set Rx Error bit for big frames */	
 #define SK_SELF_RX_ON		(1<<8)	/* Enable  Rx of own packets */
 #define SK_SELF_RX_OFF		(1<<9)	/* Disable Rx of own packets */
 
@@ -583,6 +593,11 @@ extern "C" {
 /* Default receive frame limit for Workaround of XMAC Errata */
 #define SK_DEF_RX_WA_LIM	SK_CONSTU64(100)
 
+/* values for GILedBlinkCtrl (LED Blink Control) */
+#define SK_ACT_LED_BLINK	(1<<0)	/* Active LED blinking */
+#define SK_DUP_LED_NORMAL	(1<<1)	/* Duplex LED normal */
+#define SK_LED_LINK100_ON	(1<<2)	/* Link 100M LED on */
+
 /* Link Partner Status */
 #define SK_LIPA_UNKNOWN	0	/* Link partner is in unknown state */
 #define SK_LIPA_MANUAL	1	/* Link partner is in detected manual state */
@@ -638,12 +653,13 @@ typedef	struct s_GePort {
 	int		PXsQOff;		/* Synchronous Tx Queue Address Offset */
 	int		PXaQOff;		/* Asynchronous Tx Queue Address Offset */
 	int		PhyType;		/* PHY used on this port */
+	int		PState;			/* Port status (reset, stop, init, run) */
 	SK_U16	PhyId1;			/* PHY Id1 on this port */
 	SK_U16	PhyAddr;		/* MDIO/MDC PHY address */
 	SK_U16	PIsave;			/* Saved Interrupt status word */
 	SK_U16	PSsave;			/* Saved PHY status word */
+	SK_U16	PGmANegAdv;		/* Saved GPhy AutoNegAdvertisment register */
 	SK_BOOL	PHWLinkUp;		/* The hardware Link is up (wiring) */
-	SK_BOOL	PState;			/* Is port initialized ? */
 	SK_BOOL	PLinkBroken;	/* Is Link broken ? */
 	SK_BOOL	PCheckPar;		/* Do we check for parity errors ? */
 	SK_BOOL	HalfDupTimerActive;
@@ -672,25 +688,29 @@ typedef	struct s_GePort {
  * (has to be included in the adapter context)
  */
 typedef	struct s_GeInit {
+	int			GIChipId;		/* Chip Identification Number */
+	int			GIChipRev;		/* Chip Revision Number */
 	SK_U8		GIPciHwRev;		/* PCI HW Revision Number */
-	SK_U8		GIChipId;		/* Chip Identification Number */
-	SK_U8		GIChipRev;		/* Chip Revision Number */
 	SK_BOOL		GIGenesis;		/* Genesis adapter ? */
+	SK_BOOL		GIYukon;		/* YUKON-A1/Bx chip */
+	SK_BOOL		GIYukonLite;	/* YUKON-Lite chip */
 	SK_BOOL		GICopperType;	/* Copper Type adapter ? */
 	SK_BOOL		GIPciSlot64;	/* 64-bit PCI Slot */
 	SK_BOOL		GIPciClock66;	/* 66 MHz PCI Clock */
 	SK_BOOL		GIVauxAvail;	/* VAUX available (YUKON) */
 	SK_BOOL		GIYukon32Bit;	/* 32-Bit YUKON adapter */
-	SK_BOOL		GIYukonLite;	/* YUKON-Lite chip */
+	SK_U16		GILedBlinkCtrl;	/* LED Blink Control */
 	int			GIMacsFound;	/* Number of MACs found on this adapter */
 	int			GIMacType;		/* MAC Type used on this adapter */
 	int			GIHstClkFact;	/* Host Clock Factor (62.5 / HstClk * 100) */
-	int			GIPortUsage;	/* Driver Port Usage: SK_RED_LINK/SK_MUL_LINK */
+	int			GIPortUsage;	/* Driver Port Usage */
 	int			GILevel;		/* Initialization Level completed */
 	int			GIRamSize;		/* The RAM size of the adapter in kB */
-	int			GIWolOffs;		/* WOL Register Offset (HW-Bug in 1st revision) */
+	int			GIWolOffs;		/* WOL Register Offset (HW-Bug in Rev. A) */
 	SK_U32		GIRamOffs;		/* RAM Address Offset for addr calculation */
-	SK_U32		GIPollTimerVal;	/* Descriptor Poll Timer Init Val in clk ticks*/
+	SK_U32		GIPollTimerVal;	/* Descr. Poll Timer Init Val (HstClk ticks) */
+	SK_U32		GIValIrqMask;	/* Value for Interrupt Mask */
+	SK_U32		GITimeStampCnt;	/* Time Stamp High Counter (YUKON only) */
 	SK_GEPORT	GP[SK_MAX_MACS];/* Port Dependent Information */
 	SK_GEMACFUNC GIFunc;		/* MAC depedent functions */
 } SK_GEINIT;
@@ -916,7 +936,7 @@ extern void	SkXmPhyRead(
 	SK_IOC	IoC,
 	int		Port,
 	int		Addr,
-	SK_U16	*pVal);
+	SK_U16	SK_FAR *pVal);
 
 extern void	SkXmPhyWrite(
 	SK_AC	*pAC,
@@ -930,7 +950,7 @@ extern void	SkGmPhyRead(
 	SK_IOC	IoC,
 	int		Port,
 	int		Addr,
-	SK_U16	*pVal);
+	SK_U16	SK_FAR *pVal);
 
 extern void	SkGmPhyWrite(
 	SK_AC	*pAC,
@@ -939,20 +959,6 @@ extern void	SkGmPhyWrite(
 	int		Addr,
 	SK_U16	Val);
 
-extern void	SkGePhyRead(
-	SK_AC	*pAC,
-	SK_IOC	IoC,
-	int		Port,
-	int		Addr,
-	SK_U16	*pVal);
-
-extern void	SkGePhyWrite(
-	SK_AC	*pAC,
-	SK_IOC	IoC,
-	int		Port,
-	int		Addr,
-	SK_U16	Val);
-
 extern void	SkXmClrExactAddr(
 	SK_AC	*pAC,
 	SK_IOC	IoC,
@@ -991,14 +997,14 @@ extern int SkXmMacStatistic(
 	SK_IOC	IoC,
 	unsigned int Port,
 	SK_U16	StatAddr,
-	SK_U32	*pVal);
+	SK_U32	SK_FAR *pVal);
 
 extern int SkGmMacStatistic(
 	SK_AC	*pAC,
 	SK_IOC	IoC,
 	unsigned int Port,
 	SK_U16	StatAddr,
-	SK_U32	*pVal);
+	SK_U32	SK_FAR *pVal);
 
 extern int SkXmResetCounter(
 	SK_AC	*pAC,
@@ -1015,14 +1021,14 @@ extern int SkXmOverflowStatus(
 	SK_IOC	IoC,
 	unsigned int Port,
 	SK_U16  IStatus,
-	SK_U64	*pStatus);
+	SK_U64	SK_FAR *pStatus);
 
 extern int SkGmOverflowStatus(
 	SK_AC	*pAC,
 	SK_IOC	IoC,
 	unsigned int Port,
 	SK_U16	MacStatus,
-	SK_U64	*pStatus);
+	SK_U64	SK_FAR *pStatus);
 
 extern int SkGmCableDiagStatus(
 	SK_AC	*pAC,
@@ -1031,6 +1037,20 @@ extern int SkGmCableDiagStatus(
 	SK_BOOL	StartTest);
 
 #ifdef SK_DIAG
+extern void	SkGePhyRead(
+	SK_AC	*pAC,
+	SK_IOC	IoC,
+	int		Port,
+	int		Addr,
+	SK_U16	*pVal);
+
+extern void	SkGePhyWrite(
+	SK_AC	*pAC,
+	SK_IOC	IoC,
+	int		Port,
+	int		Addr,
+	SK_U16	Val);
+
 extern void	SkMacSetRxCmd(
 	SK_AC	*pAC,
 	SK_IOC	IoC,
@@ -1088,8 +1108,6 @@ extern void	SkMacIrq();
 extern int	SkMacAutoNegDone();
 extern void	SkMacAutoNegLipaPhy();
 extern void SkMacSetRxTxEn();
-extern void	SkGePhyRead();
-extern void	SkGePhyWrite();
 extern void	SkXmInitMac();
 extern void	SkXmPhyRead();
 extern void	SkXmPhyWrite();
@@ -1111,6 +1129,8 @@ extern int	SkGmOverflowStatus();
 extern int	SkGmCableDiagStatus();
 
 #ifdef SK_DIAG
+extern void	SkGePhyRead();
+extern void	SkGePhyWrite();
 extern void	SkMacSetRxCmd();
 extern void	SkMacCrcGener();
 extern void	SkMacTimeStamp();
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/net/sk98lin/h/skgepnm2.h linux-2.4.20-wolk4.4-fullkernel/drivers/net/sk98lin/h/skgepnm2.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/net/sk98lin/h/skgepnm2.h	2003-07-30 13:51:29.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/net/sk98lin/h/skgepnm2.h	2003-07-30 10:31:38.000000000 +0200
@@ -2,15 +2,16 @@
  *
  * Name:	skgepnm2.h
  * Project:	GEnesis, PCI Gigabit Ethernet Adapter
- * Version:	$Revision: 1.34 $
- * Date:	$Date: 2002/12/16 09:05:18 $
+ * Version:	$Revision: 1.36 $
+ * Date:	$Date: 2003/05/23 12:45:13 $
  * Purpose:	Defines for Private Network Management Interface
  *
  ****************************************************************************/
 
 /******************************************************************************
  *
- *	(C)Copyright 1998-2001 SysKonnect GmbH.
+ *	(C)Copyright 1998-2002 SysKonnect GmbH.
+ *	(C)Copyright 2002-2003 Marvell.
  *
  *	This program is free software; you can redistribute it and/or modify
  *	it under the terms of the GNU General Public License as published by
@@ -26,6 +27,13 @@
  * History:
  *
  *	$Log: skgepnm2.h,v $
+ *	Revision 1.36  2003/05/23 12:45:13  tschilli
+ *	#ifndef SK_PNMI_HUNDREDS_SEC added to SK_PNMI_HUNDREDS_SEC definition
+ *	to allow own time macro defines.
+ *	
+ *	Revision 1.35  2003/03/27 11:27:48  tschilli
+ *	Copyright messages changed.
+ *	
  *	Revision 1.34  2002/12/16 09:05:18  tschilli
  *	Code for VCT handling added.
  *	
@@ -359,11 +367,13 @@ typedef struct s_PnmiStatAddr {
 /*
  * Time macros
  */
+#ifndef SK_PNMI_HUNDREDS_SEC
 #if SK_TICKS_PER_SEC == 100
 #define SK_PNMI_HUNDREDS_SEC(t)	(t)
 #else
 #define SK_PNMI_HUNDREDS_SEC(t)	(((t) * 100) / (SK_TICKS_PER_SEC))
-#endif
+#endif /* !SK_TICKS_PER_SEC */
+#endif /* !SK_PNMI_HUNDREDS_SEC */
 
 /*
  * Macros to work around alignment problems
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/net/sk98lin/h/skgepnmi.h linux-2.4.20-wolk4.4-fullkernel/drivers/net/sk98lin/h/skgepnmi.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/net/sk98lin/h/skgepnmi.h	2003-07-30 13:51:29.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/net/sk98lin/h/skgepnmi.h	2003-07-30 10:31:38.000000000 +0200
@@ -2,15 +2,16 @@
  *
  * Name:	skgepnmi.h
  * Project:	GEnesis, PCI Gigabit Ethernet Adapter
- * Version:	$Revision: 1.59 $
- * Date:	$Date: 2002/12/16 14:03:50 $
+ * Version:	$Revision: 1.61 $
+ * Date:	$Date: 2003/05/23 12:53:52 $
  * Purpose:	Defines for Private Network Management Interface
  *
  ****************************************************************************/
 
 /******************************************************************************
  *
- *	(C)Copyright 1998-2001 SysKonnect GmbH.
+ *	(C)Copyright 1998-2002 SysKonnect GmbH.
+ *	(C)Copyright 2002-2003 Marvell.
  *
  *	This program is free software; you can redistribute it and/or modify
  *	it under the terms of the GNU General Public License as published by
@@ -26,6 +27,16 @@
  * History:
  *
  *	$Log: skgepnmi.h,v $
+ *	Revision 1.61  2003/05/23 12:53:52  tschilli
+ *	Generic PNMI IOCTL subcommands added.
+ *	Function prototype SkPnmiGenIoctl() added.
+ *	OID_SKGE_BOARDLEVEL added.
+ *	Return value SK_PNMI_ERR_NOT_SUPPORTED added.
+ *	Editorial changes.
+ *	
+ *	Revision 1.60  2003/03/27 11:27:26  tschilli
+ *	Copyright messages changed.
+ *	
  *	Revision 1.59  2002/12/16 14:03:50  tschilli
  *	New defines for VCT added.
  *	
@@ -284,6 +295,7 @@
 #define SK_PNMI_ERR_UNKNOWN_OID		5
 #define SK_PNMI_ERR_UNKNOWN_INST	6
 #define SK_PNMI_ERR_UNKNOWN_NET 	7
+#define SK_PNMI_ERR_NOT_SUPPORTED	10
 
 
 /*
@@ -436,6 +448,8 @@
 #define OID_SKGE_SPEED_MODE				0xFF010171
 #define OID_SKGE_SPEED_STATUS			0xFF010172
 
+#define OID_SKGE_BOARDLEVEL				0xFF010180
+
 #define OID_SKGE_SENSOR_NUMBER			0xFF020100			
 #define OID_SKGE_SENSOR_INDEX			0xFF020101
 #define OID_SKGE_SENSOR_DESCR			0xFF020102
@@ -558,6 +572,11 @@
 #define OID_SKGE_VCT_SET			0xFF020201
 #define OID_SKGE_VCT_STATUS			0xFF020202
 
+#ifdef SK_DIAG_SUPPORT
+/* Defines for driver DIAG mode. */
+#define OID_SKGE_DIAG_MODE			0xFF020204
+#endif /* SK_DIAG_SUPPORT */
+
 
 /* VCT struct to store a backup copy of VCT data after a port reset. */
 typedef struct s_PnmiVct {
@@ -596,6 +615,17 @@ typedef struct s_PnmiVct {
 
 
 /*
+ * Generic PNMI IOCTL subcommand definitions.
+ */
+#define	SK_GET_SINGLE_VAR		1
+#define	SK_SET_SINGLE_VAR		2
+#define	SK_PRESET_SINGLE_VAR	3
+#define	SK_GET_FULL_MIB			4
+#define	SK_SET_FULL_MIB			5
+#define	SK_PRESET_FULL_MIB		6
+
+
+/*
  * Define error numbers and messages for syslog
  */
 #define SK_PNMI_ERR001		(SK_ERRBASE_PNMI + 1)
@@ -1095,20 +1125,22 @@ typedef struct s_PnmiData {
 /*
  * Function prototypes
  */
-extern int SkPnmiInit(SK_AC *pAc, SK_IOC IoC, int level);
-extern int SkPnmiGetVar(SK_AC *pAc, SK_IOC IoC, SK_U32 Id, void* pBuf,
+extern int SkPnmiInit(SK_AC *pAC, SK_IOC IoC, int Level);
+extern int SkPnmiGetVar(SK_AC *pAC, SK_IOC IoC, SK_U32 Id, void* pBuf,
 	unsigned int* pLen, SK_U32 Instance, SK_U32 NetIndex);
-extern int SkPnmiPreSetVar(SK_AC *pAc, SK_IOC IoC, SK_U32 Id,
+extern int SkPnmiPreSetVar(SK_AC *pAC, SK_IOC IoC, SK_U32 Id,
 	void* pBuf, unsigned int *pLen, SK_U32 Instance, SK_U32 NetIndex);
-extern int SkPnmiSetVar(SK_AC *pAc, SK_IOC IoC, SK_U32 Id, void* pBuf,
+extern int SkPnmiSetVar(SK_AC *pAC, SK_IOC IoC, SK_U32 Id, void* pBuf,
 	unsigned int *pLen, SK_U32 Instance, SK_U32 NetIndex);
-extern int SkPnmiGetStruct(SK_AC *pAc, SK_IOC IoC, void* pBuf,
+extern int SkPnmiGetStruct(SK_AC *pAC, SK_IOC IoC, void* pBuf,
 	unsigned int *pLen, SK_U32 NetIndex);
-extern int SkPnmiPreSetStruct(SK_AC *pAc, SK_IOC IoC, void* pBuf,
+extern int SkPnmiPreSetStruct(SK_AC *pAC, SK_IOC IoC, void* pBuf,
 	unsigned int *pLen, SK_U32 NetIndex);
-extern int SkPnmiSetStruct(SK_AC *pAc, SK_IOC IoC, void* pBuf,
+extern int SkPnmiSetStruct(SK_AC *pAC, SK_IOC IoC, void* pBuf,
 	unsigned int *pLen, SK_U32 NetIndex);
-extern int SkPnmiEvent(SK_AC *pAc, SK_IOC IoC, SK_U32 Event,
+extern int SkPnmiEvent(SK_AC *pAC, SK_IOC IoC, SK_U32 Event,
 	SK_EVPARA Param);
+extern int SkPnmiGenIoctl(SK_AC *pAC, SK_IOC IoC, void * pBuf,
+	unsigned int * pLen, SK_U32 NetIndex);
 
 #endif
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/net/sk98lin/h/skgesirq.h linux-2.4.20-wolk4.4-fullkernel/drivers/net/sk98lin/h/skgesirq.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/net/sk98lin/h/skgesirq.h	2003-07-30 13:51:29.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/net/sk98lin/h/skgesirq.h	2003-07-30 10:31:38.000000000 +0200
@@ -1,16 +1,17 @@
 /******************************************************************************
  *
  * Name:	skgesirq.h
- * Project:	GEnesis, PCI Gigabit Ethernet Adapter
- * Version:	$Revision: 1.26 $
- * Date:	$Date: 2002/10/14 09:52:36 $
+ * Project:	Gigabit Ethernet Adapters, Common Modules
+ * Version:	$Revision: 1.29 $
+ * Date:	$Date: 2003/05/28 15:14:49 $
  * Purpose:	SK specific Gigabit Ethernet special IRQ functions
  *
  ******************************************************************************/
 
 /******************************************************************************
  *
- *	(C)Copyright 1998-2002 SysKonnect GmbH.
+ *	(C)Copyright 1998-2002 SysKonnect.
+ *	(C)Copyright 2002-2003 Marvell.
  *
  *	This program is free software; you can redistribute it and/or modify
  *	it under the terms of the GNU General Public License as published by
@@ -25,8 +26,19 @@
  *
  * History:
  *	$Log: skgesirq.h,v $
+ *	Revision 1.29  2003/05/28 15:14:49  rschmidt
+ *	Moved defines for return codes of SkGePortCheckUp() to header file.
+ *	Minor changes to avoid LINT warnings.
+ *	
+ *	Revision 1.28  2003/05/13 17:22:43  mkarl
+ *	Editorial changes.
+ *	
+ *	Revision 1.27  2003/03/31 07:32:34  mkarl
+ *	Corrected Copyright.
+ *	Editorial changes.
+ *	
  *	Revision 1.26  2002/10/14 09:52:36  rschmidt
- *	Added SKERR_SIRQ_E023 and SKERR_SIRQ_E023 for GPHY (Yukon)
+ *	Added SKERR_SIRQ_E023 and SKERR_SIRQ_E024 for GPHY (Yukon)
  *	Editorial changes
  *	
  *	Revision 1.25  2002/07/15 18:15:52  rwahl
@@ -115,10 +127,15 @@
 #ifndef _INC_SKGESIRQ_H_
 #define _INC_SKGESIRQ_H_
 
+/* Define return codes of SkGePortCheckUp and CheckShort */
+#define	SK_HW_PS_NONE		0	/* No action needed */
+#define	SK_HW_PS_RESTART	1	/* Restart needed */
+#define	SK_HW_PS_LINK		2	/* Link Up actions needed */
+
 /*
  * Define the Event the special IRQ/INI module can handle
  */
-#define SK_HWEV_WATIM			1	/* Timeout for WA errata #2 XMAC */
+#define SK_HWEV_WATIM			1	/* Timeout for WA Errata #2 XMAC */
 #define SK_HWEV_PORT_START		2	/* Port Start Event by RLMT */
 #define SK_HWEV_PORT_STOP		3	/* Port Stop Event by RLMT */
 #define SK_HWEV_CLEAR_STAT		4	/* Clear Statistics by PNMI */
@@ -129,10 +146,10 @@
 #define SK_HWEV_SET_SPEED		9	/* Set Link Speed by PNMI */
 #define SK_HWEV_HALFDUP_CHK		10	/* Half Duplex Hangup Workaround */
 
-#define SK_WA_ACT_TIME		(5000000L)	/* 5 sec */
-#define SK_WA_INA_TIME		(100000L)	/* 100 msec */
+#define SK_WA_ACT_TIME		(5000000UL)	/* 5 sec */
+#define SK_WA_INA_TIME		(100000UL)	/* 100 msec */
 
-#define SK_HALFDUP_CHK_TIME	(10000L)	/* 10 msec */
+#define SK_HALFDUP_CHK_TIME	(10000UL)	/* 10 msec */
 
 /*
  * Define the error numbers and messages
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/net/sk98lin/h/skqueue.h linux-2.4.20-wolk4.4-fullkernel/drivers/net/sk98lin/h/skqueue.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/net/sk98lin/h/skqueue.h	2003-07-30 13:51:29.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/net/sk98lin/h/skqueue.h	2003-07-30 10:31:38.000000000 +0200
@@ -1,17 +1,17 @@
 /******************************************************************************
  *
  * Name:	skqueue.h
- * Project:	GEnesis, PCI Gigabit Ethernet Adapter
- * Version:	$Revision: 1.14 $
- * Date:	$Date: 2002/03/15 10:52:13 $
+ * Project:	Gigabit Ethernet Adapters, Schedule-Modul
+ * Version:	$Revision: 1.15 $
+ * Date:	$Date: 2003/05/13 17:54:57 $
  * Purpose:	Defines for the Event queue
  *
  ******************************************************************************/
 
 /******************************************************************************
  *
- *	(C)Copyright 1998,1999 SysKonnect,
- *	a business unit of Schneider & Koch & Co. Datensysteme GmbH.
+ *	(C)Copyright 1998-2002 SysKonnect GmbH.
+ *	(C)Copyright 2002-2003 Marvell.
  *
  *	This program is free software; you can redistribute it and/or modify
  *	it under the terms of the GNU General Public License as published by
@@ -27,6 +27,9 @@
  * History:
  *
  *	$Log: skqueue.h,v $
+ *	Revision 1.15  2003/05/13 17:54:57  mkarl
+ *	Editorial changes.
+ *	
  *	Revision 1.14  2002/03/15 10:52:13  mkunz
  *	Added event classes for link aggregation
  *	
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/net/sk98lin/h/skrlmt.h linux-2.4.20-wolk4.4-fullkernel/drivers/net/sk98lin/h/skrlmt.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/net/sk98lin/h/skrlmt.h	2003-07-30 13:51:29.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/net/sk98lin/h/skrlmt.h	2003-07-30 10:31:38.000000000 +0200
@@ -2,15 +2,16 @@
  *
  * Name:	skrlmt.h
  * Project:	GEnesis, PCI Gigabit Ethernet Adapter
- * Version:	$Revision: 1.35 $
- * Date:	$Date: 2003/01/31 14:12:41 $
+ * Version:	$Revision: 1.37 $
+ * Date:	$Date: 2003/04/15 09:43:43 $
  * Purpose:	Header file for Redundant Link ManagemenT.
  *
  ******************************************************************************/
 
 /******************************************************************************
  *
- *	(C)Copyright 1998-2001 SysKonnect GmbH.
+ *	(C)Copyright 1998-2002 SysKonnect GmbH.
+ *	(C)Copyright 2002-2003 Marvell.
  *
  *	This program is free software; you can redistribute it and/or modify
  *	it under the terms of the GNU General Public License as published by
@@ -26,6 +27,12 @@
  * History:
  *
  *	$Log: skrlmt.h,v $
+ *	Revision 1.37  2003/04/15 09:43:43  tschilli
+ *	Copyright messages changed.
+ *	
+ *	Revision 1.36  2003/04/14 15:56:22  tschilli
+ *	"#error C++ is not yet supported." removed.
+ *	
  *	Revision 1.35  2003/01/31 14:12:41  mkunz
  *	single port adapter runs now with two identical MAC addresses
  *	
@@ -169,7 +176,6 @@
 #define __INC_SKRLMT_H
 
 #ifdef __cplusplus
-#error C++ is not yet supported.
 extern "C" {
 #endif	/* cplusplus */
 
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/net/sk98lin/h/sktimer.h linux-2.4.20-wolk4.4-fullkernel/drivers/net/sk98lin/h/sktimer.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/net/sk98lin/h/sktimer.h	2003-07-30 13:51:29.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/net/sk98lin/h/sktimer.h	2003-07-30 10:31:38.000000000 +0200
@@ -1,17 +1,17 @@
 /******************************************************************************
  *
  * Name:	sktimer.h
- * Project:	GEnesis, PCI Gigabit Ethernet Adapter
- * Version:	$Revision: 1.9 $
- * Date:	$Date: 1999/11/22 14:00:29 $
+ * Project:	Gigabit Ethernet Adapters, Schedule-Modul
+ * Version:	$Revision: 1.10 $
+ * Date:	$Date: 2003/05/13 17:56:44 $
  * Purpose:	Defines for the timer functions
  *
  ******************************************************************************/
 
 /******************************************************************************
  *
- *	(C)Copyright 1998,1999 SysKonnect,
- *	a business unit of Schneider & Koch & Co. Datensysteme GmbH.
+ *	(C)Copyright 1998-2002 SysKonnect GmbH.
+ *	(C)Copyright 2002-2003 Marvell.
  *
  *	This program is free software; you can redistribute it and/or modify
  *	it under the terms of the GNU General Public License as published by
@@ -27,6 +27,9 @@
  * History:
  *
  *	$Log: sktimer.h,v $
+ *	Revision 1.10  2003/05/13 17:56:44  mkarl
+ *	Editorial changes.
+ *	
  *	Revision 1.9  1999/11/22 14:00:29  cgoos
  *	Changed license header to GPL.
  *	
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/net/sk98lin/h/sktypes.h linux-2.4.20-wolk4.4-fullkernel/drivers/net/sk98lin/h/sktypes.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/net/sk98lin/h/sktypes.h	2000-09-15 23:34:19.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/net/sk98lin/h/sktypes.h	2003-07-30 10:31:38.000000000 +0200
@@ -2,16 +2,15 @@
  *
  * Name:	sktypes.h
  * Project:	GEnesis, PCI Gigabit Ethernet Adapter
- * Version:	$Revision: 1.2 $
- * Date:	$Date: 1999/11/22 14:01:58 $
+ * Version:	$Revision: 1.3 $
+ * Date:	$Date: 2003/02/25 14:16:40 $
  * Purpose:	Define data types for Linux
  *
  ******************************************************************************/
 
 /******************************************************************************
  *
- *	(C)Copyright 1998,1999 SysKonnect,
- *	a business unit of Schneider & Koch & Co. Datensysteme GmbH.
+ *	(C)Copyright 1998-2003 SysKonnect GmbH.
  *
  *	This program is free software; you can redistribute it and/or modify
  *	it under the terms of the GNU General Public License as published by
@@ -27,6 +26,9 @@
  * History:
  *
  *	$Log: sktypes.h,v $
+ *	Revision 1.3  2003/02/25 14:16:40  mlindner
+ *	Fix: Copyright statement
+ *	
  *	Revision 1.2  1999/11/22 14:01:58  cgoos
  *	Changed license header to GPL.
  *	Now using Linux' fixed size types instead of standard types.
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/net/sk98lin/h/skversion.h linux-2.4.20-wolk4.4-fullkernel/drivers/net/sk98lin/h/skversion.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/net/sk98lin/h/skversion.h	2003-07-30 13:51:29.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/net/sk98lin/h/skversion.h	2003-07-30 10:31:38.000000000 +0200
@@ -2,16 +2,15 @@
  *
  * Name:	version.h
  * Project:	GEnesis, PCI Gigabit Ethernet Adapter
- * Version:	$Revision: 1.1.2.1 $
- * Date:	$Date: 2001/09/05 13:38:30 $
+ * Version:	$Revision: 1.4 $
+ * Date:	$Date: 2003/02/25 14:16:40 $
  * Purpose:	SK specific Error log support
  *
  ******************************************************************************/
 
 /******************************************************************************
  *
- *	(C)Copyright 1998-2002 SysKonnect,
- *	a business unit of Schneider & Koch & Co. Datensysteme GmbH.
+ *	(C)Copyright 1998-2003 SysKonnect GmbH.
  *
  *	This program is free software; you can redistribute it and/or modify
  *	it under the terms of the GNU General Public License as published by
@@ -26,6 +25,12 @@
  *
  * History:
  *	$Log: skversion.h,v $
+ *	Revision 1.4  2003/02/25 14:16:40  mlindner
+ *	Fix: Copyright statement
+ *	
+ *	Revision 1.3  2003/02/25 13:30:18  mlindner
+ *	Add: Support for various vendors
+ *	
  *	Revision 1.1.2.1  2001/09/05 13:38:30  mlindner
  *	Removed FILE description
  *	
@@ -39,11 +44,11 @@
  
 static const char SysKonnectFileId[] = "@(#) (C) SysKonnect GmbH.";
 static const char SysKonnectBuildNumber[] =
-	"@(#)SK-BUILD: 6.03 PL: 01"; 
+	"@(#)SK-BUILD: 6.12 PL: 01"; 
 
-#define BOOT_STRING	"sk98lin: Network Device Driver v6.03\n" \
-			"Copyright (C) 2000-2002 SysKonnect GmbH."
+#define BOOT_STRING	"sk98lin: Network Device Driver v6.12\n" \
+			"(C)Copyright 1999-2003 Marvell(R)."
 
-#define VER_STRING	"6.03"
+#define VER_STRING	"6.12"
 
 
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/net/sk98lin/h/xmac_ii.h linux-2.4.20-wolk4.4-fullkernel/drivers/net/sk98lin/h/xmac_ii.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/net/sk98lin/h/xmac_ii.h	2003-07-30 13:51:29.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/net/sk98lin/h/xmac_ii.h	2003-07-30 10:31:38.000000000 +0200
@@ -1,16 +1,17 @@
 /******************************************************************************
  *
  * Name:	xmac_ii.h
- * Project:	GEnesis, PCI Gigabit Ethernet Adapter
- * Version:	$Revision: 1.46 $
- * Date:	$Date: 2003/01/28 09:47:45 $
+ * Project:	Gigabit Ethernet Adapters, Common Modules
+ * Version:	$Revision: 1.48 $
+ * Date:	$Date: 2003/05/13 17:17:55 $
  * Purpose:	Defines and Macros for Gigabit Ethernet Controller
  *
  ******************************************************************************/
 
 /******************************************************************************
  *
- *	(C)Copyright 1998-2003 SysKonnect GmbH.
+ *	(C)Copyright 1998-2002 SysKonnect.
+ *	(C)Copyright 2002-2003 Marvell.
  *
  *	This program is free software; you can redistribute it and/or modify
  *	it under the terms of the GNU General Public License as published by
@@ -26,6 +27,13 @@
  * History:
  *
  *	$Log: xmac_ii.h,v $
+ *	Revision 1.48  2003/05/13 17:17:55  mkarl
+ *	Editorial changes.
+ *	
+ *	Revision 1.47  2003/03/31 07:37:25  mkarl
+ *	Corrected Copyright.
+ *	Editorial changes.
+ *	
  *	Revision 1.46  2003/01/28 09:47:45  rschmidt
  *	Added defines for copper MDI/MDIX configuration
  *	Added defines for LED Control Register
@@ -930,9 +938,9 @@ extern "C" {
 /*****  PHY_BCOM_NEPG_LP	16 bit r/o	Next Page Link Partner *****/
 /*****  PHY_LONE_NEPG_LP	16 bit r/o	Next Page Link Partner *****/
 #define PHY_NP_MORE		(1<<15)	/* Bit 15:	More, Next Pages to follow */
-#define PHY_NP_ACK1		(1<<14)	/* Bit 14: (ro)	Ack 1, for receiving a message*/
+#define PHY_NP_ACK1		(1<<14)	/* Bit 14: (ro)	Ack1, for receiving a message */
 #define PHY_NP_MSG_VAL	(1<<13)	/* Bit 13:	Message Page valid */
-#define PHY_NP_ACK2		(1<<12)	/* Bit 12:	Ack 2, comply with msg content*/
+#define PHY_NP_ACK2		(1<<12)	/* Bit 12:	Ack2, comply with msg content */
 #define PHY_NP_TOG		(1<<11)	/* Bit 11:	Toggle Bit, ensure sync */
 #define PHY_NP_MSG		0x07ff	/* Bit 10..0:	Message from/to Link Partner */
 
@@ -1123,7 +1131,7 @@ extern "C" {
 #define PHY_L_1000S_MSF		(1<<15)	/* Bit 15:	Master/Slave Fault */
 #define PHY_L_1000S_MSR		(1<<14)	/* Bit 14:	Master/Slave Result */
 #define PHY_L_1000S_LRS		(1<<13)	/* Bit 13:	Local Receiver Status */
-#define PHY_L_1000S_RRS		(1<<12)	/* Bit 12:	Remote Receiver Status*/
+#define PHY_L_1000S_RRS		(1<<12)	/* Bit 12:	Remote Receiver Status */
 #define PHY_L_1000S_LP_FD	(1<<11)	/* Bit 11:	Link Partner can FD */
 #define PHY_L_1000S_LP_HD	(1<<10)	/* Bit 10:	Link Partner can HD */
 									/* Bit  9..8:	reserved */
@@ -1175,8 +1183,8 @@ extern "C" {
 #define PHY_L_IS_AN_F		(1<<13)	/* Bit 13:	Auto-Negotiation fault */
 									/* Bit 12:	not described */
 #define PHY_L_IS_CROSS		(1<<11)	/* Bit 11:	Crossover used */
-#define PHY_L_IS_POL		(1<<10)	/* Bit 10:	Polarity correct. used*/
-#define PHY_L_IS_SS			(1<<9)	/* Bit  9:	Smart Speed Downgrade*/
+#define PHY_L_IS_POL		(1<<10)	/* Bit 10:	Polarity correct. used */
+#define PHY_L_IS_SS			(1<<9)	/* Bit  9:	Smart Speed Downgrade */
 #define PHY_L_IS_CFULL		(1<<8)	/* Bit  8:	Counter Full */
 #define PHY_L_IS_AN_C		(1<<7)	/* Bit  7:	AutoNeg Complete */
 #define PHY_L_IS_SPEED		(1<<6)	/* Bit  6:	Speed Changed */
@@ -1460,7 +1468,7 @@ extern "C" {
 #define GM_GP_CTRL		0x0004		/* 16 bit r/w	General Purpose Control */
 #define GM_TX_CTRL		0x0008		/* 16 bit r/w	Transmit Control Reg. */
 #define GM_RX_CTRL		0x000c		/* 16 bit r/w	Receive Control Reg. */
-#define GM_TX_FLOW_CTRL	0x0010		/* 16 bit r/w	Transmit Flow Control */
+#define GM_TX_FLOW_CTRL	0x0010		/* 16 bit r/w	Transmit Flow-Control */
 #define GM_TX_PARAM		0x0014		/* 16 bit r/w	Transmit Parameter Reg. */
 #define GM_SERIAL_MODE	0x0018		/* 16 bit r/w	Serial Mode Register */
 
@@ -1601,7 +1609,7 @@ extern "C" {
 
 #define GM_GPSR_SPEED		(1<<15) /* Bit 15:	Port Speed (1 = 100 Mbps) */
 #define GM_GPSR_DUPLEX		(1<<14) /* Bit 14:	Duplex Mode (1 = Full) */
-#define GM_GPSR_FC_TX_DIS	(1<<13) /* Bit 13:	Tx Flow Control Mode Disabled */
+#define GM_GPSR_FC_TX_DIS	(1<<13) /* Bit 13:	Tx Flow-Control Mode Disabled */
 #define GM_GPSR_LINK_UP		(1<<12)	/* Bit 12:	Link Up Status */
 #define GM_GPSR_PAUSE		(1<<11)	/* Bit 11:	Pause State */
 #define GM_GPSR_TX_ACTIVE	(1<<10)	/* Bit 10:	Tx in Progress */
@@ -1611,14 +1619,14 @@ extern "C" {
 #define GM_GPSR_PHY_ST_CH	(1<<5)	/* Bit  5:	PHY Status Change */
 #define GM_GPSR_GIG_SPEED	(1<<4)	/* Bit  4:	Gigabit Speed (1 = 1000 Mbps) */
 #define GM_GPSR_PART_MODE	(1<<3)	/* Bit  3:	Partition mode */
-#define GM_GPSR_FC_RX_DIS	(1<<2)	/* Bit  2:	Rx Flow Control Mode Disabled */
+#define GM_GPSR_FC_RX_DIS	(1<<2)	/* Bit  2:	Rx Flow-Control Mode Disabled */
 #define GM_GPSR_PROM_EN		(1<<1)	/* Bit  1:	Promiscuous Mode Enabled */
 								/* Bit  0:	reserved */
 	
 /*	GM_GP_CTRL	16 bit r/w	General Purpose Control Register */
 								/* Bit 15:	reserved */
 #define GM_GPCR_PROM_ENA	(1<<14)	/* Bit 14:	Enable Promiscuous Mode */
-#define GM_GPCR_FC_TX_DIS	(1<<13) /* Bit 13:	Disable Tx Flow Control Mode */
+#define GM_GPCR_FC_TX_DIS	(1<<13) /* Bit 13:	Disable Tx Flow-Control Mode */
 #define GM_GPCR_TX_ENA		(1<<12) /* Bit 12:	Enable Transmit */
 #define GM_GPCR_RX_ENA		(1<<11) /* Bit 11:	Enable Receive */
 #define GM_GPCR_BURST_ENA	(1<<10)	/* Bit 10:	Enable Burst Mode */
@@ -1627,11 +1635,11 @@ extern "C" {
 #define GM_GPCR_GIGS_ENA	(1<<7)	/* Bit  7:	Gigabit Speed (1000 Mbps) */
 #define GM_GPCR_FL_PASS		(1<<6)	/* Bit  6:	Force Link Pass */
 #define GM_GPCR_DUP_FULL	(1<<5)	/* Bit  5:	Full Duplex Mode */
-#define GM_GPCR_FC_RX_DIS	(1<<4)	/* Bit  4:	Disable Rx Flow Control Mode */
+#define GM_GPCR_FC_RX_DIS	(1<<4)	/* Bit  4:	Disable Rx Flow-Control Mode */
 #define GM_GPCR_SPEED_100	(1<<3)  /* Bit  3:	Port Speed 100 Mbps */
-#define GM_GPCR_AU_DUP_DIS	(1<<2)	/* Bit  2:	Disable Auto-Update for Duplex */
-#define GM_GPCR_AU_FCT_DIS	(1<<1)	/* Bit  1:	Disable Auto-Update for Flow-c. */
-#define GM_GPCR_AU_SPD_DIS	(1<<0)	/* Bit  0:	Disable Auto-Update for Speed */
+#define GM_GPCR_AU_DUP_DIS	(1<<2)	/* Bit  2:	Disable Auto-Update Duplex */
+#define GM_GPCR_AU_FCT_DIS	(1<<1)	/* Bit  1:	Disable Auto-Update Flow-C. */
+#define GM_GPCR_AU_SPD_DIS	(1<<0)	/* Bit  0:	Disable Auto-Update Speed */
 
 #define GM_GPCR_SPEED_1000	(GM_GPCR_GIGS_ENA | GM_GPCR_SPEED_100)
 #define GM_GPCR_AU_ALL_DIS	(GM_GPCR_AU_DUP_DIS | GM_GPCR_AU_FCT_DIS |\
@@ -1661,9 +1669,9 @@ extern "C" {
 
 /*	GM_SERIAL_MODE			16 bit r/w	Serial Mode Register */
 #define GM_SMOD_DATABL_MSK	(0x1f<<11)	/* Bit 15..11:	Data Blinder */
-#define GM_SMOD_LIMIT_4		(1<<10)	/* Bit 10:	4 consecutive transmit trials */
-#define GM_SMOD_VLAN_ENA	(1<<9)	/* Bit  9:	Enable VLAN  (Max. Frame Length) */
-#define GM_SMOD_JUMBO_ENA	(1<<8)	/* Bit  8:	Enable Jumbo (Max. Frame Length) */
+#define GM_SMOD_LIMIT_4		(1<<10)	/* Bit 10:	4 consecutive Tx trials */
+#define GM_SMOD_VLAN_ENA	(1<<9)	/* Bit  9:	Enable VLAN  (Max. Frame Len) */
+#define GM_SMOD_JUMBO_ENA	(1<<8)	/* Bit  8:	Enable Jumbo (Max. Frame Len) */
 								/* Bit  7..5:	reserved */
 #define GM_SMOD_IPG_MSK		0x1f	/* Bit 4..0:	Inter-Packet Gap (IPG) */
 	
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/net/sk98lin/skaddr.c linux-2.4.20-wolk4.4-fullkernel/drivers/net/sk98lin/skaddr.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/net/sk98lin/skaddr.c	2003-07-30 13:51:29.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/net/sk98lin/skaddr.c	2003-07-30 10:31:38.000000000 +0200
@@ -1,9 +1,9 @@
 /******************************************************************************
  *
  * Name:	skaddr.c
- * Project:	GEnesis, PCI Gigabit Ethernet Adapter
- * Version:	$Revision: 1.47 $
- * Date:	$Date: 2002/09/17 06:31:10 $
+ * Project:	Gigabit Ethernet Adapters, ADDR-Module
+ * Version:	$Revision: 1.52 $
+ * Date:	$Date: 2003/06/02 13:46:15 $
  * Purpose:	Manage Addresses (Multicast and Unicast) and Promiscuous Mode.
  *
  ******************************************************************************/
@@ -11,6 +11,7 @@
 /******************************************************************************
  *
  *	(C)Copyright 1998-2002 SysKonnect GmbH.
+ *	(C)Copyright 2002-2003 Marvell.
  *
  *	This program is free software; you can redistribute it and/or modify
  *	it under the terms of the GNU General Public License as published by
@@ -26,6 +27,30 @@
  * History:
  *
  *	$Log: skaddr.c,v $
+ *	Revision 1.52  2003/06/02 13:46:15  tschilli
+ *	Editorial changes.
+ *	
+ *	Revision 1.51  2003/05/13 17:12:43  mkarl
+ *	Changes for SLIM Driver via SK_SLIM.
+ *	Changes for driver not using RLMT via SK_NO_RLMT.
+ *	Changes for driver not supporting MAC address override via SK_NO_MAO.
+ *	Separeted GENESIS and YUKON only code to reduce code size.
+ *	Editorial changes.
+ *	
+ *	Revision 1.50  2003/05/08 12:29:31  rschmidt
+ *	Replaced all if(GIChipId == CHIP_ID_GENESIS) with new entry GIGenesis.
+ *	Changed initialisation for Next0[SK_MAX_MACS] to avoid
+ *	compiler errors when SK_MAX_MACS=1.
+ *	Editorial changes.
+ *	
+ *	Revision 1.49  2003/04/15 09:30:51  tschilli
+ *	Copyright messages changed.
+ *	"#error C++ is not yet supported." removed.
+ *	
+ *	Revision 1.48  2003/02/12 17:09:37  tschilli
+ *	Fix in SkAddrOverride() to set both (physical and logical) MAC addresses
+ *	in case that both addresses are identical.
+ *	
  *	Revision 1.47  2002/09/17 06:31:10  tschilli
  *	Handling of SK_PROM_MODE_ALL_MC flag in SkAddrGmacMcUpdate()
  *	and SkAddrGmacPromiscuousChange() fixed.
@@ -214,15 +239,14 @@
  *
  ******************************************************************************/
 
-#ifndef	lint
+#if (defined(DEBUG) || ((!defined(LINT)) && (!defined(SK_SLIM))))
 static const char SysKonnectFileId[] =
-	"@(#) $Id: skaddr.c,v 1.47 2002/09/17 06:31:10 tschilli Exp $ (C) SysKonnect.";
-#endif	/* !defined(lint) */
+	"@(#) $Id: skaddr.c,v 1.52 2003/06/02 13:46:15 tschilli Exp $ (C) Marvell.";
+#endif /* DEBUG ||!LINT || !SK_SLIM */
 
 #define __SKADDR_C
 
 #ifdef __cplusplus
-#error C++ is not yet supported.
 extern "C" {
 #endif	/* cplusplus */
 
@@ -257,7 +281,7 @@ SK_U16	OnesHash[4] = {0xFFFF, 0xFFFF, 0x
 /* local variables ************************************************************/
 
 #ifdef DEBUG
-static int	Next0[SK_MAX_MACS] = {0, 0};
+static int	Next0[SK_MAX_MACS] = {0};
 #endif	/* DEBUG */
 
 /* functions ******************************************************************/
@@ -309,7 +333,8 @@ int		Level)	/* initialization level */
 
 	switch (Level) {
 	case SK_INIT_DATA:
-		SK_MEMSET((char *) &pAC->Addr, 0, sizeof(SK_ADDR));
+		SK_MEMSET((char *) &pAC->Addr, (SK_U8) 0,
+            (SK_U16) sizeof(SK_ADDR));
 
 		for (i = 0; i < SK_MAX_MACS; i++) {
 			pAPort = &pAC->Addr.Port[i];
@@ -331,10 +356,12 @@ int		Level)	/* initialization level */
 		/* pAC->Addr.InitDone = SK_INIT_DATA; */
 		break;
 
-	case SK_INIT_IO:
+    case SK_INIT_IO:
+#ifndef SK_NO_RLMT
 		for (i = 0; i < SK_MAX_NETS; i++) {
 			pAC->Addr.Net[i].ActivePort = pAC->Rlmt.Net[i].ActivePort;
 		}
+#endif /* !SK_NO_RLMT */
 #ifdef xDEBUG
 		for (i = 0; i < SK_MAX_MACS; i++) {
 			if (pAC->Addr.Port[i].NextExactMatchRlmt <
@@ -418,13 +445,16 @@ int		Level)	/* initialization level */
 
 			/* Set port's current physical MAC address. */
 			OutAddr = (SK_U16 *) &pAPort->CurrentMacAddress.a[0];
-			
-			if (pAC->GIni.GIChipId == CHIP_ID_GENESIS) {
+#ifdef GENESIS
+			if (pAC->GIni.GIGenesis) {
 				XM_OUTADDR(IoC, i, XM_SA, OutAddr);
 			}
-			else {
+#endif /* GENESIS */
+#ifdef YUKON
+			if (!pAC->GIni.GIGenesis) {
 				GM_OUTADDR(IoC, i, GM_SRC_ADDR_1L, OutAddr);
 			}
+#endif /* YUKON */
 #ifdef DEBUG
 			SK_DBG_MSG(pAC, SK_DBGMOD_ADDR, SK_DBGCAT_INIT,
 				("SkAddrInit: Permanent Physical MAC Address: %02X %02X %02X %02X %02X %02X\n",
@@ -443,7 +473,7 @@ int		Level)	/* initialization level */
 					pAPort->CurrentMacAddress.a[3],
 					pAPort->CurrentMacAddress.a[4],
 					pAPort->CurrentMacAddress.a[5]))
-#endif	/* DEBUG */
+#endif /* DEBUG */
 		}
 		/* pAC->Addr.InitDone = SK_INIT_IO; */
 		break;
@@ -469,6 +499,7 @@ int		Level)	/* initialization level */
 	
 }	/* SkAddrInit */
 
+#ifndef SK_SLIM
 
 /******************************************************************************
  *
@@ -504,7 +535,7 @@ int		Flags)		/* permanent/non-perm, sw-o
 		return (SK_ADDR_ILLEGAL_PORT);
 	}
 	
-	if (pAC->GIni.GIChipId == CHIP_ID_GENESIS) {
+	if (pAC->GIni.GIGenesis) {
 		ReturnCode = SkAddrXmacMcClear(pAC, IoC, PortNumber, Flags);
 	}
 	else {
@@ -515,6 +546,9 @@ int		Flags)		/* permanent/non-perm, sw-o
 
 }	/* SkAddrMcClear */
 
+#endif /* !SK_SLIM */
+
+#ifndef SK_SLIM
 
 /******************************************************************************
  *
@@ -568,6 +602,9 @@ int		Flags)		/* permanent/non-perm, sw-o
 	
 }	/* SkAddrXmacMcClear */
 
+#endif /* !SK_SLIM */
+
+#ifndef SK_SLIM
 
 /******************************************************************************
  *
@@ -758,7 +795,7 @@ unsigned char *pMc)	/* Multicast address
 
 }	/* SkGmacMcHash */
 
-#endif	/* not SK_ADDR_CHEAT */
+#endif	/* !SK_ADDR_CHEAT */
 
 /******************************************************************************
  *
@@ -797,7 +834,7 @@ int			Flags)		/* permanent/non-permanent
 		return (SK_ADDR_ILLEGAL_PORT);
 	}
 	
-	if (pAC->GIni.GIChipId == CHIP_ID_GENESIS) {
+	if (pAC->GIni.GIGenesis) {
 		ReturnCode = SkAddrXmacMcAdd(pAC, IoC, PortNumber, pMc, Flags);
 	}
 	else {
@@ -888,7 +925,7 @@ int		Flags)		/* permanent/non-permanent 
 	}
 	else {
 		if (!(pMc->a[0] & SK_MC_BIT)) {
-			/* Hashing only possible with multicast addresses. */
+			/* Hashing only possible with multicast addresses */
 			return (SK_MC_ILLEGAL_ADDRESS);
 		}
 #ifndef SK_ADDR_CHEAT
@@ -951,7 +988,7 @@ int		Flags)		/* permanent/non-permanent 
 #endif	/* !defined(SK_ADDR_CHEAT) */
 		
 	if (!(pMc->a[0] & SK_MC_BIT)) {
-		/* Hashing only possible with multicast addresses. */
+		/* Hashing only possible with multicast addresses */
 		return (SK_MC_ILLEGAL_ADDRESS);
 	}
 	
@@ -1021,6 +1058,7 @@ int		Flags)		/* permanent/non-permanent 
 	
 }	/* SkAddrGmacMcAdd */
 
+#endif /* !SK_SLIM */
 
 /******************************************************************************
  *
@@ -1052,23 +1090,29 @@ SK_IOC	IoC,		/* I/O context */
 SK_U32	PortNumber)	/* Port Number */
 {
 	int ReturnCode;
-	
+#if (!defined(SK_SLIM) || defined(DEBUG))
 	if (PortNumber >= (SK_U32) pAC->GIni.GIMacsFound) {
 		return (SK_ADDR_ILLEGAL_PORT);
 	}
-	
-	if (pAC->GIni.GIChipId == CHIP_ID_GENESIS) {
+#endif /* !SK_SLIM || DEBUG */
+
+#ifdef GENESIS
+	if (pAC->GIni.GIGenesis) {
 		ReturnCode = SkAddrXmacMcUpdate(pAC, IoC, PortNumber);
 	}
-	else {
+#endif /* GENESIS */
+#ifdef YUKON
+	if (!pAC->GIni.GIGenesis) {
 		ReturnCode = SkAddrGmacMcUpdate(pAC, IoC, PortNumber);
 	}
-	
+#endif /* YUKON */
 	return (ReturnCode);
 
 }	/* SkAddrMcUpdate */
 
 
+#ifdef GENESIS
+
 /******************************************************************************
  *
  *	SkAddrXmacMcUpdate - update the HW MC address table and set the MAC address
@@ -1108,7 +1152,7 @@ SK_U32	PortNumber)	/* Port Number */
 #ifdef DEBUG
 	SK_DBG_MSG(pAC,SK_DBGMOD_ADDR, SK_DBGCAT_CTRL,
 		("Next0 on Port %d: %d\n", PortNumber, Next0[PortNumber]))
-#endif	/* DEBUG */
+#endif /* DEBUG */
 
 	/* Start with 0 to also program the logical MAC address. */
 	for (i = 0; i < pAPort->NextExactMatchRlmt; i++) {
@@ -1146,7 +1190,7 @@ SK_U32	PortNumber)	/* Port Number */
 		XM_OUTHASH(IoC, PortNumber, XM_HSM, &OnesHash);
 		
 		/* Enable Hashing */
-		SkMacHashing(pAC, IoC, PortNumber, SK_TRUE);
+		SkMacHashing(pAC, IoC, (int) PortNumber, SK_TRUE);
 	}
 	else if (Inexact != 0) {
 		
@@ -1154,11 +1198,11 @@ SK_U32	PortNumber)	/* Port Number */
 		XM_OUTHASH(IoC, PortNumber, XM_HSM, &pAPort->InexactFilter.Bytes[0]);
 		
 		/* Enable Hashing */
-		SkMacHashing(pAC, IoC, PortNumber, SK_TRUE);
+		SkMacHashing(pAC, IoC, (int) PortNumber, SK_TRUE);
 	}
 	else {
 		/* Disable Hashing */
-		SkMacHashing(pAC, IoC, PortNumber, SK_FALSE);
+		SkMacHashing(pAC, IoC, (int) PortNumber, SK_FALSE);
 	}
 
 	if (pAPort->PromMode != SK_PROM_MODE_NONE) {
@@ -1198,7 +1242,7 @@ SK_U32	PortNumber)	/* Port Number */
 				pAPort->Exact[i].a[4],
 				pAPort->Exact[i].a[5]))
 	}
-#endif	/* DEBUG */		
+#endif /* DEBUG */
 
 	/* Determine return value. */
 	if (Inexact == 0 && pAPort->PromMode == 0) {
@@ -1210,6 +1254,9 @@ SK_U32	PortNumber)	/* Port Number */
 	
 }	/* SkAddrXmacMcUpdate */
 
+#endif  /* GENESIS */
+
+#ifdef YUKON
 
 /******************************************************************************
  *
@@ -1237,8 +1284,10 @@ SK_AC	*pAC,		/* adapter context */
 SK_IOC	IoC,		/* I/O context */
 SK_U32	PortNumber)	/* Port Number */
 {
+#ifndef SK_SLIM
 	SK_U32		i;
 	SK_U8		Inexact;
+#endif	/* not SK_SLIM */
 	SK_U16		*OutAddr;
 	SK_ADDR_PORT	*pAPort;
 
@@ -1250,8 +1299,9 @@ SK_U32	PortNumber)	/* Port Number */
 #ifdef DEBUG
 	SK_DBG_MSG(pAC,SK_DBGMOD_ADDR, SK_DBGCAT_CTRL,
 		("Next0 on Port %d: %d\n", PortNumber, Next0[PortNumber]))
-#endif	/* DEBUG */
+#endif /* DEBUG */
 	
+#ifndef SK_SLIM
 	for (Inexact = 0, i = 0; i < 8; i++) {
 		Inexact |= pAPort->InexactFilter.Bytes[i];
 	}
@@ -1266,16 +1316,27 @@ SK_U32	PortNumber)	/* Port Number */
 		GM_OUTHASH(IoC, PortNumber, GM_MC_ADDR_H1, &OnesHash);
 		
 		/* Enable Hashing */
-		SkMacHashing(pAC, IoC, PortNumber, SK_TRUE);
+		SkMacHashing(pAC, IoC, (int) PortNumber, SK_TRUE);
 	}
 	else {	
 		/* Enable Hashing. */
-		SkMacHashing(pAC, IoC, PortNumber, SK_TRUE);
+		SkMacHashing(pAC, IoC, (int) PortNumber, SK_TRUE);
 	}
 	
 	if (pAPort->PromMode != SK_PROM_MODE_NONE) {
 		(void) SkAddrGmacPromiscuousChange(pAC, IoC, PortNumber, pAPort->PromMode);
 	}
+#else /* SK_SLIM */
+
+	/* Set all bits in 64-bit hash register. */
+	GM_OUTHASH(IoC, PortNumber, GM_MC_ADDR_H1, &OnesHash);
+
+	/* Enable Hashing */
+	SkMacHashing(pAC, IoC, (int) PortNumber, SK_TRUE);
+	
+	(void) SkAddrGmacPromiscuousChange(pAC, IoC, PortNumber, pAPort->PromMode);
+	
+#endif /* SK_SLIM */
 	
 	/* Set port's current physical MAC address. */
 	OutAddr = (SK_U16 *) &pAPort->CurrentMacAddress.a[0];
@@ -1303,8 +1364,9 @@ SK_U32	PortNumber)	/* Port Number */
 			pAPort->CurrentMacAddress.a[3],
 			pAPort->CurrentMacAddress.a[4],
 			pAPort->CurrentMacAddress.a[5]))
-#endif	/* DEBUG */
+#endif /* DEBUG */
 	
+#ifndef SK_SLIM
 	/* Determine return value. */
 	if (Inexact == 0 && pAPort->PromMode == 0) {
 		return (SK_MC_FILTERING_EXACT);
@@ -1312,9 +1374,15 @@ SK_U32	PortNumber)	/* Port Number */
 	else {
 		return (SK_MC_FILTERING_INEXACT);
 	}
+#else /* SK_SLIM */
+	return (SK_MC_FILTERING_INEXACT);
+#endif /* SK_SLIM */
 	
 }	/* SkAddrGmacMcUpdate */
 
+#endif /* YUKON */
+
+#ifndef SK_NO_MAO
 
 /******************************************************************************
  *
@@ -1334,23 +1402,29 @@ SK_U32	PortNumber)	/* Port Number */
  *	SK_ADDR_TOO_EARLY if SK_INIT_IO was not executed before.
  */
 int	SkAddrOverride(
-SK_AC		*pAC,		/* adapter context */
-SK_IOC		IoC,		/* I/O context */
-SK_U32		PortNumber,	/* Port Number */
-SK_MAC_ADDR	*pNewAddr,	/* new MAC address */
-int			Flags)		/* logical/physical MAC address */
+SK_AC		*pAC,				/* adapter context */
+SK_IOC		IoC,				/* I/O context */
+SK_U32		PortNumber,			/* Port Number */
+SK_MAC_ADDR	SK_FAR *pNewAddr,	/* new MAC address */
+int			Flags)				/* logical/physical MAC address */
 {
+#ifndef SK_NO_RLMT
 	SK_EVPARA	Para;
+#endif /* !SK_NO_RLMT */
 	SK_U32		NetNumber;
 	SK_U32		i;
-	SK_U16		*OutAddr;
+	SK_U16		SK_FAR *OutAddr;
 
+#ifndef SK_NO_RLMT
 	NetNumber = pAC->Rlmt.Port[PortNumber].Net->NetNumber;
-
+#else
+	NetNumber = 0;
+#endif /* SK_NO_RLMT */
+#if (!defined(SK_SLIM) || defined(DEBUG))
 	if (PortNumber >= (SK_U32) pAC->GIni.GIMacsFound) {
 		return (SK_ADDR_ILLEGAL_PORT);
 	}
-
+#endif /* !SK_SLIM || DEBUG */
 	if (pNewAddr != NULL && (pNewAddr->a[0] & SK_MC_BIT) != 0) {
 		return (SK_ADDR_MULTICAST_ADDRESS);
 	}
@@ -1366,11 +1440,11 @@ int			Flags)		/* logical/physical MAC ad
 				return (SK_ADDR_TOO_EARLY);
 			}
 		}
-
+#ifndef SK_NO_RLMT
 		/* Set PortNumber to number of net's active port. */
 		PortNumber = pAC->Rlmt.Net[NetNumber].
 			Port[pAC->Addr.Net[NetNumber].ActivePort]->PortNumber;
-
+#endif /* !SK_NO_RLMT */
 		pAC->Addr.Port[PortNumber].Exact[0] =
 			pAC->Addr.Net[NetNumber].CurrentMacAddress;
 
@@ -1385,11 +1459,11 @@ int			Flags)		/* logical/physical MAC ad
 				return (SK_ADDR_TOO_EARLY);
 			}
 		}
-
+#ifndef SK_NO_RLMT
 		/* Set PortNumber to number of net's active port. */
 		PortNumber = pAC->Rlmt.Net[NetNumber].
 			Port[pAC->Addr.Net[NetNumber].ActivePort]->PortNumber;
-
+#endif /* !SK_NO_RLMT */
 		for (i = 0; i < SK_MAC_ADDR_LEN; i++ ) {
 			pAC->Addr.Port[PortNumber].Exact[0].a[i] = 0;
 		}
@@ -1424,19 +1498,24 @@ int			Flags)		/* logical/physical MAC ad
 		pAC->Addr.Port[PortNumber].CurrentMacAddress = *pNewAddr;
 
 		/* Change port's physical MAC address. */
-		OutAddr = (SK_U16 *) pNewAddr;
-		
-		if (pAC->GIni.GIChipId == CHIP_ID_GENESIS) {
+		OutAddr = (SK_U16 SK_FAR *) pNewAddr;
+#ifdef GENESIS
+		if (pAC->GIni.GIGenesis) {
 			XM_OUTADDR(IoC, PortNumber, XM_SA, OutAddr);
 		}
-		else {
+#endif /* GENESIS */
+#ifdef YUKON
+		if (!pAC->GIni.GIGenesis) {
 			GM_OUTADDR(IoC, PortNumber, GM_SRC_ADDR_1L, OutAddr);
 		}
+#endif /* YUKON */
 
+#ifndef SK_NO_RLMT
 		/* Report address change to RLMT. */
 		Para.Para32[0] = PortNumber;
 		Para.Para32[0] = -1;
 		SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_PORT_ADDR, Para);
+#endif /* !SK_NO_RLMT */
 	}
 	else {	/* Logical MAC address. */
 		if (SK_ADDR_EQUAL(pNewAddr->a,
@@ -1454,11 +1533,33 @@ int			Flags)		/* logical/physical MAC ad
 				return (SK_ADDR_DUPLICATE_ADDRESS);
 			}
 		}
-
+		
+		/*
+		 * In case that the physical and the logical MAC addresses are equal
+		 * we must also change the physical MAC address here.
+		 * In this case we have an adapter which initially was programmed with
+		 * two identical MAC addresses.
+		 */
+		if (SK_ADDR_EQUAL(pAC->Addr.Port[PortNumber].CurrentMacAddress.a,
+				pAC->Addr.Port[PortNumber].Exact[0].a)) {
+			
+			pAC->Addr.Port[PortNumber].PreviousMacAddress =
+				pAC->Addr.Port[PortNumber].CurrentMacAddress;
+			pAC->Addr.Port[PortNumber].CurrentMacAddress = *pNewAddr;
+			
+#ifndef SK_NO_RLMT
+			/* Report address change to RLMT. */
+			Para.Para32[0] = PortNumber;
+			Para.Para32[0] = -1;
+			SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_PORT_ADDR, Para);
+#endif /* !SK_NO_RLMT */
+		}
+		
+#ifndef SK_NO_RLMT
 		/* Set PortNumber to number of net's active port. */
 		PortNumber = pAC->Rlmt.Net[NetNumber].
 			Port[pAC->Addr.Net[NetNumber].ActivePort]->PortNumber;
-
+#endif /* !SK_NO_RLMT */
 		pAC->Addr.Net[NetNumber].CurrentMacAddress = *pNewAddr;
 		pAC->Addr.Port[PortNumber].Exact[0] = *pNewAddr;
 #ifdef DEBUG
@@ -1479,9 +1580,9 @@ int			Flags)		/* logical/physical MAC ad
 				pAC->Addr.Net[NetNumber].CurrentMacAddress.a[3],
 				pAC->Addr.Net[NetNumber].CurrentMacAddress.a[4],
 				pAC->Addr.Net[NetNumber].CurrentMacAddress.a[5]))
-#endif	/* DEBUG */
+#endif /* DEBUG */
 
-		/* Write address to first exact match entry of active port. */
+        /* Write address to first exact match entry of active port. */
 		(void) SkAddrMcUpdate(pAC, IoC, PortNumber);
 	}
 
@@ -1490,6 +1591,8 @@ int			Flags)		/* logical/physical MAC ad
 }	/* SkAddrOverride */
 
 
+#endif /* SK_NO_MAO */
+
 /******************************************************************************
  *
  *	SkAddrPromiscuousChange - set promiscuous mode for given port
@@ -1519,22 +1622,30 @@ SK_U32	PortNumber,		/* port whose promis
 int		NewPromMode)	/* new promiscuous mode */
 {
 	int ReturnCode;
-	
+#if (!defined(SK_SLIM) || defined(DEBUG))
 	if (PortNumber >= (SK_U32) pAC->GIni.GIMacsFound) {
 		return (SK_ADDR_ILLEGAL_PORT);
 	}
-	
-	if (pAC->GIni.GIChipId == CHIP_ID_GENESIS) {
-		ReturnCode = SkAddrXmacPromiscuousChange(pAC, IoC, PortNumber, NewPromMode);
-	}
-	else {
-		ReturnCode = SkAddrGmacPromiscuousChange(pAC, IoC, PortNumber, NewPromMode);
+#endif /* !SK_SLIM || DEBUG */
+
+#ifdef GENESIS
+	if (pAC->GIni.GIGenesis) {
+		ReturnCode =
+			SkAddrXmacPromiscuousChange(pAC, IoC, PortNumber, NewPromMode);
+	}
+#endif /* GENESIS */
+#ifdef YUKON
+	if (!pAC->GIni.GIGenesis) {
+		ReturnCode =
+			SkAddrGmacPromiscuousChange(pAC, IoC, PortNumber, NewPromMode);
 	}
+#endif /* YUKON */
 
 	return (ReturnCode);
 
 }	/* SkAddrPromiscuousChange */
 
+#ifdef GENESIS
 
 /******************************************************************************
  *
@@ -1613,7 +1724,7 @@ int		NewPromMode)	/* new promiscuous mod
 		XM_OUTHASH(IoC, PortNumber, XM_HSM, &OnesHash);
 
 		/* Enable Hashing */
-		SkMacHashing(pAC, IoC, PortNumber, SK_TRUE);
+		SkMacHashing(pAC, IoC, (int) PortNumber, SK_TRUE);
 	}
 	else if ((CurPromMode & SK_PROM_MODE_ALL_MC) &&
 		!(NewPromMode & SK_PROM_MODE_ALL_MC)) {	/* Norm MC. */
@@ -1622,7 +1733,7 @@ int		NewPromMode)	/* new promiscuous mod
 		}
 		if (Inexact == 0) {
 			/* Disable Hashing */
-			SkMacHashing(pAC, IoC, PortNumber, SK_FALSE);
+			SkMacHashing(pAC, IoC, (int) PortNumber, SK_FALSE);
 		}
 		else {
 			/* Set 64-bit hash register to InexactFilter. */
@@ -1630,25 +1741,28 @@ int		NewPromMode)	/* new promiscuous mod
 				&pAC->Addr.Port[PortNumber].InexactFilter.Bytes[0]);
 
 			/* Enable Hashing */
-			SkMacHashing(pAC, IoC, PortNumber, SK_TRUE);
+			SkMacHashing(pAC, IoC, (int) PortNumber, SK_TRUE);
 		}
 	}
 
 	if ((NewPromMode & SK_PROM_MODE_LLC) &&
 		!(CurPromMode & SK_PROM_MODE_LLC)) {	/* Prom. LLC */
 		/* Set the MAC in Promiscuous Mode */
-		SkMacPromiscMode(pAC, IoC, PortNumber, SK_TRUE);
+		SkMacPromiscMode(pAC, IoC, (int) PortNumber, SK_TRUE);
 	}
 	else if ((CurPromMode & SK_PROM_MODE_LLC) &&
 		!(NewPromMode & SK_PROM_MODE_LLC)) {	/* Norm. LLC. */
 		/* Clear Promiscuous Mode */
-		SkMacPromiscMode(pAC, IoC, PortNumber, SK_FALSE);
+		SkMacPromiscMode(pAC, IoC, (int) PortNumber, SK_FALSE);
 	}
 	
 	return (SK_ADDR_SUCCESS);
 	
 }	/* SkAddrXmacPromiscuousChange */
 
+#endif /* GENESIS */
+
+#ifdef YUKON
 
 /******************************************************************************
  *
@@ -1703,7 +1817,7 @@ int		NewPromMode)	/* new promiscuous mod
 		GM_OUTHASH(IoC, PortNumber, GM_MC_ADDR_H1, &OnesHash);
 		
 		/* Enable Hashing */
-		SkMacHashing(pAC, IoC, PortNumber, SK_TRUE);
+		SkMacHashing(pAC, IoC, (int) PortNumber, SK_TRUE);
 	}
 	
 	if ((CurPromMode & SK_PROM_MODE_ALL_MC) &&
@@ -1714,26 +1828,29 @@ int		NewPromMode)	/* new promiscuous mod
 			&pAC->Addr.Port[PortNumber].InexactFilter.Bytes[0]);
 
 		/* Enable Hashing. */
-		SkMacHashing(pAC, IoC, PortNumber, SK_TRUE);
+		SkMacHashing(pAC, IoC, (int) PortNumber, SK_TRUE);
 	}
 
 	if ((NewPromMode & SK_PROM_MODE_LLC) &&
 		!(CurPromMode & SK_PROM_MODE_LLC)) {	/* Prom. LLC */
 		
 		/* Set the MAC to Promiscuous Mode. */
-		SkMacPromiscMode(pAC, IoC, PortNumber, SK_TRUE);
+		SkMacPromiscMode(pAC, IoC, (int) PortNumber, SK_TRUE);
 	}
 	else if ((CurPromMode & SK_PROM_MODE_LLC) &&
 		!(NewPromMode & SK_PROM_MODE_LLC)) {	/* Norm. LLC */
 		
 		/* Clear Promiscuous Mode. */
-		SkMacPromiscMode(pAC, IoC, PortNumber, SK_FALSE);
+		SkMacPromiscMode(pAC, IoC, (int) PortNumber, SK_FALSE);
 	}
 
 	return (SK_ADDR_SUCCESS);
 	
 }	/* SkAddrGmacPromiscuousChange */
 
+#endif /* YUKON */
+
+#ifndef SK_SLIM
 
 /******************************************************************************
  *
@@ -1805,7 +1922,7 @@ SK_U32	ToPortNumber)		/* Port2 Index */
 	pAC->Addr.Port[FromPortNumber].PromMode = pAC->Addr.Port[ToPortNumber].PromMode;
 	pAC->Addr.Port[ToPortNumber].PromMode = i;
 	
-	if (pAC->GIni.GIChipId == CHIP_ID_GENESIS) {
+	if (pAC->GIni.GIGenesis) {
 		DWord = pAC->Addr.Port[FromPortNumber].FirstExactMatchRlmt;
 		pAC->Addr.Port[FromPortNumber].FirstExactMatchRlmt =
 			pAC->Addr.Port[ToPortNumber].FirstExactMatchRlmt;
@@ -1845,6 +1962,8 @@ SK_U32	ToPortNumber)		/* Port2 Index */
 	
 }	/* SkAddrSwap */
 
+#endif /* !SK_SLIM */
+
 #ifdef __cplusplus
 }
 #endif	/* __cplusplus */
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/net/sk98lin/skcsum.c linux-2.4.20-wolk4.4-fullkernel/drivers/net/sk98lin/skcsum.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/net/sk98lin/skcsum.c	2003-07-30 13:51:29.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/net/sk98lin/skcsum.c	2003-07-30 10:31:39.000000000 +0200
@@ -2,15 +2,15 @@
  *
  * Name:	skcsum.c
  * Project:	GEnesis, PCI Gigabit Ethernet Adapter
- * Version:	$Revision: 1.10 $
- * Date:	$Date: 2002/04/11 10:02:04 $
+ * Version:	$Revision: 1.11 $
+ * Date:	$Date: 2003/03/11 14:05:55 $
  * Purpose:	Store/verify Internet checksum in send/receive packets.
  *
  ******************************************************************************/
 
 /******************************************************************************
  *
- *	(C)Copyright 1998-2001 SysKonnect GmbH.
+ *	(C)Copyright 1998-2003 SysKonnect GmbH.
  *
  *	This program is free software; you can redistribute it and/or modify
  *	it under the terms of the GNU General Public License as published by
@@ -26,6 +26,10 @@
  * History:
  *
  *	$Log: skcsum.c,v $
+ *	Revision 1.11  2003/03/11 14:05:55  rschmidt
+ *	Replaced memset() by macro SK_MEMSET()
+ *	Editorial changes
+ *	
  *	Revision 1.10  2002/04/11 10:02:04  rwahl
  *	Fix in SkCsGetSendInfo():
  *	- function did not return ProtocolFlags in every case.
@@ -73,9 +77,8 @@
 #ifdef SK_USE_CSUM	/* Check if CSUM is to be used. */
 
 #ifndef lint
-static const char SysKonnectFileId[] = "@(#)"
-	"$Id: skcsum.c,v 1.10 2002/04/11 10:02:04 rwahl Exp $"
-	" (C) SysKonnect.";
+static const char SysKonnectFileId[] =
+	"@(#) $Id: skcsum.c,v 1.11 2003/03/11 14:05:55 rschmidt Exp $ (C) SysKonnect.";
 #endif	/* !lint */
 
 /******************************************************************************
@@ -107,8 +110,8 @@ static const char SysKonnectFileId[] = "
  *
  *	"h/skdrv1st.h"
  *	"h/skcsum.h"
- *	 "h/sktypes.h"
- *	 "h/skqueue.h"
+ *	"h/sktypes.h"
+ *	"h/skqueue.h"
  *	"h/skdrv2nd.h"
  *
  ******************************************************************************/
@@ -173,7 +176,7 @@ static const char SysKonnectFileId[] = "
  * little/big endian conversion on little endian machines only.
  */
 #ifdef SK_LITTLE_ENDIAN
-#define SKCS_HTON16(Val16)	(((unsigned) (Val16) >> 8) | (((Val16) & 0xFF) << 8))
+#define SKCS_HTON16(Val16)	(((unsigned) (Val16) >> 8) | (((Val16) & 0xff) << 8))
 #endif	/* SK_LITTLE_ENDIAN */
 #ifdef SK_BIG_ENDIAN
 #define SKCS_HTON16(Val16)	(Val16)
@@ -204,7 +207,7 @@ static const char SysKonnectFileId[] = "
  *	zero.)
  *
  * Note:
- *	There is a bug in the ASIC which may lead to wrong checksums.
+ *	There is a bug in the GENESIS ASIC which may lead to wrong checksums.
  *
  * Arguments:
  *	pAc - A pointer to the adapter context struct.
@@ -603,7 +606,7 @@ int			NetNumber)	/* Net number */
 	NextLevelProtocol = *(SK_U8 *)
 		SKCS_IDX(pIpHeader, SKCS_OFS_IP_NEXT_LEVEL_PROTOCOL);
 
-	if (IpHeaderChecksum != 0xFFFF) {
+	if (IpHeaderChecksum != 0xffff) {
 		pAc->Csum.ProtoStats[NetNumber][SKCS_PROTO_STATS_IP].RxErrCts++;
 		/* the NDIS tester wants to know the upper level protocol too */
 		if (NextLevelProtocol == SKCS_PROTO_ID_TCP) {
@@ -721,7 +724,7 @@ int			NetNumber)	/* Net number */
 
 	/* Check if the TCP/UDP checksum is ok. */
 
-	if ((unsigned) NextLevelProtocolChecksum == 0xFFFF) {
+	if ((unsigned) NextLevelProtocolChecksum == 0xffff) {
 
 		/* TCP/UDP checksum ok. */
 
@@ -903,12 +906,12 @@ SK_EVPARA	Param)	/* Event dependent para
 		NetNumber = (int)Param.Para32[0];
 		if (ProtoIndex < 0) {	/* Clear for all protocols. */
 			if (NetNumber >= 0) {
-				memset(&pAc->Csum.ProtoStats[NetNumber][0], 0,
+				SK_MEMSET(&pAc->Csum.ProtoStats[NetNumber][0], 0,
 					sizeof(pAc->Csum.ProtoStats[NetNumber]));
 			}
 		}
 		else {					/* Clear for individual protocol. */
-			memset(&pAc->Csum.ProtoStats[NetNumber][ProtoIndex], 0,
+			SK_MEMSET(&pAc->Csum.ProtoStats[NetNumber][ProtoIndex], 0,
 				sizeof(pAc->Csum.ProtoStats[NetNumber][ProtoIndex]));
 		}
 		break;
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/net/sk98lin/skdim.c linux-2.4.20-wolk4.4-fullkernel/drivers/net/sk98lin/skdim.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/net/sk98lin/skdim.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/net/sk98lin/skdim.c	2003-07-30 10:31:39.000000000 +0200
@@ -0,0 +1,722 @@
+/******************************************************************************
+ *
+ * Name:	skdim.c
+ * Project:	GEnesis, PCI Gigabit Ethernet Adapter
+ * Version:	$Revision: 1.3 $
+ * Date:	$Date: 2003/06/10 09:16:40 $
+ * Purpose:	All functions to maintain interrupt moderation
+ *
+ ******************************************************************************/
+
+/******************************************************************************
+ *
+ *	(C)Copyright 1998-2002 SysKonnect GmbH.
+ *
+ *	This program is free software; you can redistribute it and/or modify
+ *	it under the terms of the GNU General Public License as published by
+ *	the Free Software Foundation; either version 2 of the License, or
+ *	(at your option) any later version.
+ *
+ *	The information in this file is provided "AS IS" without warranty.
+ *
+ ******************************************************************************/
+
+/******************************************************************************
+ *
+ * History:
+ *	
+ *	$Log: skdim.c,v $
+ *	Revision 1.3  2003/06/10 09:16:40  rroesler
+ *	Adapt GetCurrentSystemLoad() to NOT access the kernels
+ *	kstat-structure in kernel 2.5/2.6. This must be done
+ *	due to a not exported symbol. Instead of evaluating the
+ *	SystemLoad directly, the nbr of interrupts is used as
+ *	a rough basis for the load.
+ *	
+ *
+ *
+ ******************************************************************************/
+
+/******************************************************************************
+ *
+ * Description:
+ *
+ * This module is intended to manage the dynamic interrupt moderation on both   
+ * GEnesis and Yukon adapters.
+ *
+ * Include File Hierarchy:
+ *
+ *	"skdrv1st.h"
+ *	"skdrv2nd.h"
+ *
+ ******************************************************************************/
+
+#ifndef	lint
+static const char SysKonnectFileId[] =
+	"@(#) $Id: skdim.c,v 1.3 2003/06/10 09:16:40 rroesler Exp $ (C) SysKonnect.";
+#endif
+
+#define __SKADDR_C
+
+#ifdef __cplusplus
+#error C++ is not yet supported.
+extern "C" {
+#endif
+
+/*******************************************************************************
+**
+** Includes
+**
+*******************************************************************************/
+
+#ifndef __INC_SKDRV1ST_H
+#include "h/skdrv1st.h"
+#endif
+
+#ifndef __INC_SKDRV2ND_H
+#include "h/skdrv2nd.h"
+#endif
+
+#include	<linux/kernel_stat.h>
+
+/*******************************************************************************
+**
+** Defines
+**
+*******************************************************************************/
+
+/*******************************************************************************
+**
+** Typedefs
+**
+*******************************************************************************/
+
+/*******************************************************************************
+**
+** Local function prototypes 
+**
+*******************************************************************************/
+
+static unsigned int GetCurrentSystemLoad(SK_AC *pAC);
+static SK_U64       GetIsrCalls(SK_AC *pAC);
+static SK_BOOL      IsIntModEnabled(SK_AC *pAC);
+static void         SetCurrIntCtr(SK_AC *pAC);
+static void         EnableIntMod(SK_AC *pAC); 
+static void         DisableIntMod(SK_AC *pAC);
+static void         ResizeDimTimerDuration(SK_AC *pAC);
+static void         DisplaySelectedModerationType(SK_AC *pAC);
+static void         DisplaySelectedModerationMask(SK_AC *pAC);
+static void         DisplayDescrRatio(SK_AC *pAC);
+
+/*******************************************************************************
+**
+** Global variables
+**
+*******************************************************************************/
+
+/*******************************************************************************
+**
+** Local variables
+**
+*******************************************************************************/
+
+/*******************************************************************************
+**
+** Global functions 
+**
+*******************************************************************************/
+
+/*******************************************************************************
+** Function     : SkDimModerate
+** Description  : Called in every ISR to check if moderation is to be applied
+**                or not for the current number of interrupts
+** Programmer   : Ralph Roesler
+** Last Modified: 22-mar-03
+** Returns      : void (!)
+** Notes        : -
+*******************************************************************************/
+
+void 
+SkDimModerate(SK_AC *pAC) {
+    unsigned int CurrSysLoad    = 0;  /* expressed in percent */
+    unsigned int LoadIncrease   = 0;  /* expressed in percent */
+    SK_U64       ThresholdInts  = 0;
+    SK_U64       IsrCallsPerSec = 0;
+
+#define M_DIMINFO pAC->DynIrqModInfo
+
+    if (!IsIntModEnabled(pAC)) {
+        if (M_DIMINFO.IntModTypeSelect == C_INT_MOD_DYNAMIC) {
+            CurrSysLoad = GetCurrentSystemLoad(pAC);
+            if (CurrSysLoad > 75) {
+                    /* 
+                    ** More than 75% total system load! Enable the moderation 
+                    ** to shield the system against too many interrupts.
+                    */
+                    EnableIntMod(pAC);
+            } else if (CurrSysLoad > M_DIMINFO.PrevSysLoad) {
+                LoadIncrease = (CurrSysLoad - M_DIMINFO.PrevSysLoad);
+                if (LoadIncrease > ((M_DIMINFO.PrevSysLoad *
+                                         C_INT_MOD_ENABLE_PERCENTAGE) / 100)) {
+                    if (CurrSysLoad > 10) {
+                        /* 
+                        ** More than 50% increase with respect to the 
+                        ** previous load of the system. Most likely this 
+                        ** is due to our ISR-proc...
+                        */
+                        EnableIntMod(pAC);
+                    }
+                }
+            } else {
+                /*
+                ** Neither too much system load at all nor too much increase
+                ** with respect to the previous system load. Hence, we can leave
+                ** the ISR-handling like it is without enabling moderation.
+                */
+            }
+            M_DIMINFO.PrevSysLoad = CurrSysLoad;
+        }   
+    } else {
+        if (M_DIMINFO.IntModTypeSelect == C_INT_MOD_DYNAMIC) {
+            ThresholdInts  = ((M_DIMINFO.MaxModIntsPerSec *
+                                   C_INT_MOD_DISABLE_PERCENTAGE) / 100);
+            IsrCallsPerSec = GetIsrCalls(pAC);
+            if (IsrCallsPerSec <= ThresholdInts) {
+                /* 
+                ** The number of interrupts within the last second is 
+                ** lower than the disable_percentage of the desried 
+                ** maxrate. Therefore we can disable the moderation.
+                */
+                DisableIntMod(pAC);
+                M_DIMINFO.MaxModIntsPerSec = 
+                   (M_DIMINFO.MaxModIntsPerSecUpperLimit +
+                    M_DIMINFO.MaxModIntsPerSecLowerLimit) / 2;
+            } else {
+                /*
+                ** The number of interrupts per sec is the same as expected.
+                ** Evalulate the descriptor-ratio. If it has changed, a resize 
+                ** in the moderation timer might be usefull
+                */
+                if (M_DIMINFO.AutoSizing) {
+                    ResizeDimTimerDuration(pAC);
+                }
+            }
+        }
+    }
+
+    /*
+    ** Some information to the log...
+    */
+    if (M_DIMINFO.DisplayStats) {
+        DisplaySelectedModerationType(pAC);
+        DisplaySelectedModerationMask(pAC);
+        DisplayDescrRatio(pAC);
+    }
+
+    M_DIMINFO.NbrProcessedDescr = 0; 
+    SetCurrIntCtr(pAC);
+}
+
+/*******************************************************************************
+** Function     : SkDimStartModerationTimer
+** Description  : Starts the audit-timer for the dynamic interrupt moderation
+** Programmer   : Ralph Roesler
+** Last Modified: 22-mar-03
+** Returns      : void (!)
+** Notes        : -
+*******************************************************************************/
+
+void 
+SkDimStartModerationTimer(SK_AC *pAC) {
+    SK_EVPARA    EventParam;   /* Event struct for timer event */
+ 
+    SK_MEMSET((char *) &EventParam, 0, sizeof(EventParam));
+    EventParam.Para32[0] = SK_DRV_MODERATION_TIMER;
+    SkTimerStart(pAC, pAC->IoBase, &pAC->DynIrqModInfo.ModTimer,
+                 SK_DRV_MODERATION_TIMER_LENGTH,
+                 SKGE_DRV, SK_DRV_TIMER, EventParam);
+}
+
+/*******************************************************************************
+** Function     : SkDimEnableModerationIfNeeded
+** Description  : Either enables or disables moderation
+** Programmer   : Ralph Roesler
+** Last Modified: 22-mar-03
+** Returns      : void (!)
+** Notes        : This function is called when a particular adapter is opened
+**                There is no Disable function, because when all interrupts 
+**                might be disable, the moderation timer has no meaning at all
+******************************************************************************/
+
+void
+SkDimEnableModerationIfNeeded(SK_AC *pAC) {
+
+    if (M_DIMINFO.IntModTypeSelect == C_INT_MOD_STATIC) {
+        EnableIntMod(pAC);   /* notification print in this function */
+    } else if (M_DIMINFO.IntModTypeSelect == C_INT_MOD_DYNAMIC) {
+        SkDimStartModerationTimer(pAC);
+        if (M_DIMINFO.DisplayStats) {
+            printk("Dynamic moderation has been enabled\n");
+        }
+    } else {
+        if (M_DIMINFO.DisplayStats) {
+            printk("No moderation has been enabled\n");
+        }
+    }
+}
+
+/*******************************************************************************
+** Function     : SkDimDisplayModerationSettings
+** Description  : Displays the current settings regaring interrupt moderation
+** Programmer   : Ralph Roesler
+** Last Modified: 22-mar-03
+** Returns      : void (!)
+** Notes        : -
+*******************************************************************************/
+
+void 
+SkDimDisplayModerationSettings(SK_AC *pAC) {
+    DisplaySelectedModerationType(pAC);
+    DisplaySelectedModerationMask(pAC);
+}
+
+/*******************************************************************************
+**
+** Local functions 
+**
+*******************************************************************************/
+
+/*******************************************************************************
+** Function     : GetCurrentSystemLoad
+** Description  : Retrieves the current system load of the system. This load
+**                is evaluated for all processors within the system.
+** Programmer   : Ralph Roesler
+** Last Modified: 22-mar-03
+** Returns      : unsigned int: load expressed in percentage
+** Notes        : The possible range being returned is from 0 up to 100.
+**                Whereas 0 means 'no load at all' and 100 'system fully loaded'
+**                It is impossible to determine what actually causes the system
+**                to be in 100%, but maybe that is due to too much interrupts.
+*******************************************************************************/
+
+static unsigned int
+GetCurrentSystemLoad(SK_AC *pAC) {
+	unsigned long jif         = jiffies;
+	unsigned int  UserTime    = 0;
+	unsigned int  SystemTime  = 0;
+	unsigned int  NiceTime    = 0;
+	unsigned int  IdleTime    = 0;
+	unsigned int  TotalTime   = 0;
+	unsigned int  UsedTime    = 0;
+	unsigned int  SystemLoad  = 0;
+	unsigned int  NbrCpu      = 0;
+
+    for (NbrCpu = 0; NbrCpu < smp_num_cpus; NbrCpu++) {
+        UserTime   = UserTime   + kstat.per_cpu_user[NbrCpu];
+        NiceTime   = NiceTime   + kstat.per_cpu_nice[NbrCpu];
+        SystemTime = SystemTime + kstat.per_cpu_system[NbrCpu];
+    }
+
+	UsedTime  = UserTime + NiceTime + SystemTime;
+
+	IdleTime  = jif * smp_num_cpus - UsedTime;
+	TotalTime = UsedTime + IdleTime;
+
+	SystemLoad = ( 100 * (UsedTime  - M_DIMINFO.PrevUsedTime) ) /
+						(TotalTime - M_DIMINFO.PrevTotalTime);
+
+	if (M_DIMINFO.DisplayStats) {
+		printk("Current system load is: %u\n", SystemLoad);
+	}
+
+	M_DIMINFO.PrevTotalTime = TotalTime;
+	M_DIMINFO.PrevUsedTime  = UsedTime;
+
+	return (SystemLoad);
+}
+
+/*******************************************************************************
+** Function     : GetIsrCalls
+** Description  : Depending on the selected moderation mask, this function will
+**                return the number of interrupts handled in the previous time-
+**                frame. This evaluated number is based on the current number 
+**                of interrupts stored in PNMI-context and the previous stored 
+**                interrupts.
+** Programmer   : Ralph Roesler
+** Last Modified: 23-mar-03
+** Returns      : int:   the number of interrupts being executed in the last
+**                       timeframe
+** Notes        : It makes only sense to call this function, when dynamic 
+**                interrupt moderation is applied
+*******************************************************************************/
+
+static SK_U64
+GetIsrCalls(SK_AC *pAC) {
+    SK_U64   RxPort0IntDiff = 0;
+    SK_U64   RxPort1IntDiff = 0;
+    SK_U64   TxPort0IntDiff = 0;
+    SK_U64   TxPort1IntDiff = 0;
+
+    if (pAC->DynIrqModInfo.MaskIrqModeration == IRQ_MASK_TX_ONLY) {
+        if (pAC->GIni.GIMacsFound == 2) {
+            TxPort1IntDiff = pAC->Pnmi.Port[1].TxIntrCts - 
+                             pAC->DynIrqModInfo.PrevPort1TxIntrCts;
+        }
+        TxPort0IntDiff = pAC->Pnmi.Port[0].TxIntrCts - 
+                         pAC->DynIrqModInfo.PrevPort0TxIntrCts;
+    } else if (pAC->DynIrqModInfo.MaskIrqModeration == IRQ_MASK_RX_ONLY) {
+        if (pAC->GIni.GIMacsFound == 2) {
+            RxPort1IntDiff = pAC->Pnmi.Port[1].RxIntrCts - 
+                             pAC->DynIrqModInfo.PrevPort1RxIntrCts;
+        }
+        RxPort0IntDiff = pAC->Pnmi.Port[0].RxIntrCts - 
+                         pAC->DynIrqModInfo.PrevPort0RxIntrCts;
+    } else {
+        if (pAC->GIni.GIMacsFound == 2) {
+            RxPort1IntDiff = pAC->Pnmi.Port[1].RxIntrCts - 
+                             pAC->DynIrqModInfo.PrevPort1RxIntrCts;
+            TxPort1IntDiff = pAC->Pnmi.Port[1].TxIntrCts - 
+                             pAC->DynIrqModInfo.PrevPort1TxIntrCts;
+        } 
+        RxPort0IntDiff = pAC->Pnmi.Port[0].RxIntrCts - 
+                         pAC->DynIrqModInfo.PrevPort0RxIntrCts;
+        TxPort0IntDiff = pAC->Pnmi.Port[0].TxIntrCts - 
+                         pAC->DynIrqModInfo.PrevPort0TxIntrCts;
+    }
+
+    return (RxPort0IntDiff + RxPort1IntDiff + TxPort0IntDiff + TxPort1IntDiff);
+}
+
+/*******************************************************************************
+** Function     : GetRxCalls
+** Description  : This function will return the number of times a receive inter-
+**                rupt was processed. This is needed to evaluate any resizing 
+**                factor.
+** Programmer   : Ralph Roesler
+** Last Modified: 23-mar-03
+** Returns      : SK_U64: the number of RX-ints being processed
+** Notes        : It makes only sense to call this function, when dynamic 
+**                interrupt moderation is applied
+*******************************************************************************/
+
+static SK_U64
+GetRxCalls(SK_AC *pAC) {
+    SK_U64   RxPort0IntDiff = 0;
+    SK_U64   RxPort1IntDiff = 0;
+
+    if (pAC->GIni.GIMacsFound == 2) {
+        RxPort1IntDiff = pAC->Pnmi.Port[1].RxIntrCts - 
+                         pAC->DynIrqModInfo.PrevPort1RxIntrCts;
+    }
+    RxPort0IntDiff = pAC->Pnmi.Port[0].RxIntrCts - 
+                     pAC->DynIrqModInfo.PrevPort0RxIntrCts;
+
+    return (RxPort0IntDiff + RxPort1IntDiff);
+}
+
+/*******************************************************************************
+** Function     : SetCurrIntCtr
+** Description  : Will store the current number orf occured interrupts in the 
+**                adapter context. This is needed to evaluated the number of 
+**                interrupts within a current timeframe.
+** Programmer   : Ralph Roesler
+** Last Modified: 23-mar-03
+** Returns      : void (!)
+** Notes        : -
+*******************************************************************************/
+
+static void
+SetCurrIntCtr(SK_AC *pAC) {
+    if (pAC->GIni.GIMacsFound == 2) {
+        pAC->DynIrqModInfo.PrevPort1RxIntrCts = pAC->Pnmi.Port[1].RxIntrCts;
+        pAC->DynIrqModInfo.PrevPort1TxIntrCts = pAC->Pnmi.Port[1].TxIntrCts;
+    } 
+    pAC->DynIrqModInfo.PrevPort0RxIntrCts = pAC->Pnmi.Port[0].RxIntrCts;
+    pAC->DynIrqModInfo.PrevPort0TxIntrCts = pAC->Pnmi.Port[0].TxIntrCts;
+}
+
+/*******************************************************************************
+** Function     : IsIntModEnabled()
+** Description  : Retrieves the current value of the interrupts moderation
+**                command register. Its content determines whether any 
+**                moderation is running or not.
+** Programmer   : Ralph Roesler
+** Last Modified: 23-mar-03
+** Returns      : SK_TRUE  : if mod timer running
+**                SK_FALSE : if no moderation is being performed
+** Notes        : -
+*******************************************************************************/
+
+static SK_BOOL
+IsIntModEnabled(SK_AC *pAC) {
+    unsigned long CtrCmd;
+
+    SK_IN32(pAC->IoBase, B2_IRQM_CTRL, &CtrCmd);
+    if ((CtrCmd & TIM_START) == TIM_START) {
+       return SK_TRUE;
+    } else {
+       return SK_FALSE;
+    }
+}
+
+/*******************************************************************************
+** Function     : EnableIntMod()
+** Description  : Enables the interrupt moderation using the values stored in
+**                in the pAC->DynIntMod data structure
+** Programmer   : Ralph Roesler
+** Last Modified: 22-mar-03
+** Returns      : -
+** Notes        : -
+*******************************************************************************/
+
+static void
+EnableIntMod(SK_AC *pAC) {
+    unsigned long ModBase;
+
+    if (pAC->GIni.GIChipId == CHIP_ID_GENESIS) {
+       ModBase = C_CLK_FREQ_GENESIS / pAC->DynIrqModInfo.MaxModIntsPerSec;
+    } else {
+       ModBase = C_CLK_FREQ_YUKON / pAC->DynIrqModInfo.MaxModIntsPerSec;
+    }
+
+    SK_OUT32(pAC->IoBase, B2_IRQM_INI,  ModBase);
+    SK_OUT32(pAC->IoBase, B2_IRQM_MSK,  pAC->DynIrqModInfo.MaskIrqModeration);
+    SK_OUT32(pAC->IoBase, B2_IRQM_CTRL, TIM_START);
+    if (M_DIMINFO.DisplayStats) {
+        printk("Enabled interrupt moderation (%i ints/sec)\n",
+               M_DIMINFO.MaxModIntsPerSec);
+    }
+}
+
+/*******************************************************************************
+** Function     : DisableIntMod()
+** Description  : Disbles the interrupt moderation independent of what inter-
+**                rupts are running or not
+** Programmer   : Ralph Roesler
+** Last Modified: 23-mar-03
+** Returns      : -
+** Notes        : -
+*******************************************************************************/
+
+static void 
+DisableIntMod(SK_AC *pAC) {
+
+    SK_OUT32(pAC->IoBase, B2_IRQM_CTRL, TIM_STOP);
+    if (M_DIMINFO.DisplayStats) {
+        printk("Disabled interrupt moderation\n");
+    }
+} 
+
+/*******************************************************************************
+** Function     : ResizeDimTimerDuration();
+** Description  : Checks the current used descriptor ratio and resizes the 
+**                duration timer (longer/smaller) if possible. 
+** Programmer   : Ralph Roesler
+** Last Modified: 23-mar-03
+** Returns      : -
+** Notes        : There are both maximum and minimum timer duration value. 
+**                This function assumes that interrupt moderation is already
+**                enabled!
+*******************************************************************************/
+
+static void 
+ResizeDimTimerDuration(SK_AC *pAC) {
+    SK_BOOL IncreaseTimerDuration;
+    int     TotalMaxNbrDescr;
+    int     UsedDescrRatio;
+    int     RatioDiffAbs;
+    int     RatioDiffRel;
+    int     NewMaxModIntsPerSec;
+    int     ModAdjValue;
+    long    ModBase;
+
+    /*
+    ** Check first if we are allowed to perform any modification
+    */
+    if (IsIntModEnabled(pAC)) { 
+        if (M_DIMINFO.IntModTypeSelect != C_INT_MOD_DYNAMIC) {
+            return; 
+        } else {
+            if (M_DIMINFO.ModJustEnabled) {
+                M_DIMINFO.ModJustEnabled = SK_FALSE;
+                return;
+            }
+        }
+    }
+
+    /*
+    ** If we got until here, we have to evaluate the amount of the
+    ** descriptor ratio change...
+    */
+    TotalMaxNbrDescr = pAC->RxDescrPerRing * GetRxCalls(pAC);
+    UsedDescrRatio   = (M_DIMINFO.NbrProcessedDescr * 100) / TotalMaxNbrDescr;
+
+    if (UsedDescrRatio > M_DIMINFO.PrevUsedDescrRatio) {
+        RatioDiffAbs = (UsedDescrRatio - M_DIMINFO.PrevUsedDescrRatio);
+        RatioDiffRel = (RatioDiffAbs * 100) / UsedDescrRatio;
+        M_DIMINFO.PrevUsedDescrRatio = UsedDescrRatio;
+        IncreaseTimerDuration = SK_FALSE;  /* in other words: DECREASE */
+    } else if (UsedDescrRatio < M_DIMINFO.PrevUsedDescrRatio) {
+        RatioDiffAbs = (M_DIMINFO.PrevUsedDescrRatio - UsedDescrRatio);
+        RatioDiffRel = (RatioDiffAbs * 100) / M_DIMINFO.PrevUsedDescrRatio;
+        M_DIMINFO.PrevUsedDescrRatio = UsedDescrRatio;
+        IncreaseTimerDuration = SK_TRUE;   /* in other words: INCREASE */
+    } else {
+        RatioDiffAbs = (M_DIMINFO.PrevUsedDescrRatio - UsedDescrRatio);
+        RatioDiffRel = (RatioDiffAbs * 100) / M_DIMINFO.PrevUsedDescrRatio;
+        M_DIMINFO.PrevUsedDescrRatio = UsedDescrRatio;
+        IncreaseTimerDuration = SK_TRUE;   /* in other words: INCREASE */
+    }
+
+    /*
+    ** Now we can determine the change in percent
+    */
+    if ((RatioDiffRel >= 0) && (RatioDiffRel <= 5) ) {
+       ModAdjValue = 1;  /*  1% change - maybe some other value in future */
+    } else if ((RatioDiffRel > 5) && (RatioDiffRel <= 10) ) {
+       ModAdjValue = 1;  /*  1% change - maybe some other value in future */
+    } else if ((RatioDiffRel > 10) && (RatioDiffRel <= 15) ) {
+       ModAdjValue = 1;  /*  1% change - maybe some other value in future */
+    } else {
+       ModAdjValue = 1;  /*  1% change - maybe some other value in future */
+    }
+
+    if (IncreaseTimerDuration) {
+       NewMaxModIntsPerSec =  M_DIMINFO.MaxModIntsPerSec +
+                             (M_DIMINFO.MaxModIntsPerSec * ModAdjValue) / 100;
+    } else {
+       NewMaxModIntsPerSec =  M_DIMINFO.MaxModIntsPerSec -
+                             (M_DIMINFO.MaxModIntsPerSec * ModAdjValue) / 100;
+    }
+
+    /* 
+    ** Check if we exceed boundaries...
+    */
+    if ( (NewMaxModIntsPerSec > M_DIMINFO.MaxModIntsPerSecUpperLimit) ||
+         (NewMaxModIntsPerSec < M_DIMINFO.MaxModIntsPerSecLowerLimit)) {
+        if (M_DIMINFO.DisplayStats) {
+            printk("Cannot change ModTim from %i to %i ints/sec\n",
+                   M_DIMINFO.MaxModIntsPerSec, NewMaxModIntsPerSec);
+        }
+        return;
+    } else {
+        if (M_DIMINFO.DisplayStats) {
+            printk("Resized ModTim from %i to %i ints/sec\n",
+                   M_DIMINFO.MaxModIntsPerSec, NewMaxModIntsPerSec);
+        }
+    }
+
+    M_DIMINFO.MaxModIntsPerSec = NewMaxModIntsPerSec;
+
+    if (pAC->GIni.GIChipId == CHIP_ID_GENESIS) {
+        ModBase = C_CLK_FREQ_GENESIS / pAC->DynIrqModInfo.MaxModIntsPerSec;
+    } else {
+        ModBase = C_CLK_FREQ_YUKON / pAC->DynIrqModInfo.MaxModIntsPerSec;
+    }
+
+    /* 
+    ** We do not need to touch any other registers
+    */
+    SK_OUT32(pAC->IoBase, B2_IRQM_INI, ModBase);
+} 
+
+/*******************************************************************************
+** Function     : DisplaySelectedModerationType()
+** Description  : Displays what type of moderation we have
+** Programmer   : Ralph Roesler
+** Last Modified: 23-mar-03
+** Returns      : void!
+** Notes        : -
+*******************************************************************************/
+
+static void
+DisplaySelectedModerationType(SK_AC *pAC) {
+
+    if (pAC->DynIrqModInfo.DisplayStats) {
+        if (pAC->DynIrqModInfo.IntModTypeSelect == C_INT_MOD_STATIC) {
+             printk("Static int moderation runs with %i INTS/sec\n",
+                    pAC->DynIrqModInfo.MaxModIntsPerSec);
+        } else if (pAC->DynIrqModInfo.IntModTypeSelect == C_INT_MOD_DYNAMIC) {
+             if (IsIntModEnabled(pAC)) {
+                printk("Dynamic int moderation runs with %i INTS/sec\n",
+                       pAC->DynIrqModInfo.MaxModIntsPerSec);
+             } else {
+                printk("Dynamic int moderation currently not applied\n");
+             }
+        } else {
+             printk("No interrupt moderation selected!\n");
+        }
+    }
+}
+
+/*******************************************************************************
+** Function     : DisplaySelectedModerationMask()
+** Description  : Displays what interrupts are moderated
+** Programmer   : Ralph Roesler
+** Last Modified: 23-mar-03
+** Returns      : void!
+** Notes        : -
+*******************************************************************************/
+
+static void
+DisplaySelectedModerationMask(SK_AC *pAC) {
+
+    if (pAC->DynIrqModInfo.DisplayStats) {
+        if (pAC->DynIrqModInfo.IntModTypeSelect != C_INT_MOD_NONE) {
+            switch (pAC->DynIrqModInfo.MaskIrqModeration) {
+                case IRQ_MASK_TX_ONLY: 
+                   printk("Only Tx-interrupts are moderated\n");
+                   break;
+                case IRQ_MASK_RX_ONLY: 
+                   printk("Only Rx-interrupts are moderated\n");
+                   break;
+                case IRQ_MASK_SP_ONLY: 
+                   printk("Only special-interrupts are moderated\n");
+                   break;
+                case IRQ_MASK_TX_RX: 
+                   printk("Tx- and Rx-interrupts are moderated\n");
+                   break;
+                case IRQ_MASK_SP_RX: 
+                   printk("Special- and Rx-interrupts are moderated\n");
+                   break;
+                case IRQ_MASK_SP_TX: 
+                   printk("Special- and Tx-interrupts are moderated\n");
+                   break;
+                case IRQ_MASK_RX_TX_SP:
+                   printk("All Rx-, Tx and special-interrupts are moderated\n");
+                   break;
+                default:
+                   printk("Don't know what is moderated\n");
+                   break;
+            }
+        } else {
+            printk("No specific interrupts masked for moderation\n");
+        }
+    } 
+}
+
+/*******************************************************************************
+** Function     : DisplayDescrRatio
+** Description  : Like the name states...
+** Programmer   : Ralph Roesler
+** Last Modified: 23-mar-03
+** Returns      : void!
+** Notes        : -
+*******************************************************************************/
+
+static void
+DisplayDescrRatio(SK_AC *pAC) {
+    int TotalMaxNbrDescr = 0;
+
+    if (pAC->DynIrqModInfo.DisplayStats) {
+        TotalMaxNbrDescr = pAC->RxDescrPerRing * GetRxCalls(pAC);
+        printk("Ratio descriptors: %i/%i\n",
+               M_DIMINFO.NbrProcessedDescr, TotalMaxNbrDescr);
+    }
+}
+
+/*******************************************************************************
+**
+** End of file
+**
+*******************************************************************************/
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/net/sk98lin/skge.c linux-2.4.20-wolk4.4-fullkernel/drivers/net/sk98lin/skge.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/net/sk98lin/skge.c	2003-07-30 13:51:29.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/net/sk98lin/skge.c	2003-07-30 10:31:39.000000000 +0200
@@ -1,16 +1,17 @@
+
 /******************************************************************************
  *
  * Name:    skge.c
  * Project:	GEnesis, PCI Gigabit Ethernet Adapter
- * Version:	$Revision: 1.44 $
- * Date:       	$Date: 2003/01/09 09:25:26 $
+ * Version:	$Revision: 1.58 $
+ * Date:       	$Date: 2003/06/17 07:14:29 $
  * Purpose:	The main driver source module
  *
  ******************************************************************************/
- 
+
 /******************************************************************************
  *
- *	(C)Copyright 1998-2002 SysKonnect GmbH.
+ *	(C)Copyright 1998-2003 SysKonnect GmbH.
  *
  *	Driver for SysKonnect Gigabit Ethernet Server Adapters:
  *
@@ -31,7 +32,7 @@
  *	SK-9843 (single link 1000Base-SX V2)
  *	SK-9821 (single link 1000Base-T V2)
  *
- *	Created 10-Feb-1999, based on Linux' acenic.c, 3c59x.c and 
+ *	Created 10-Feb-1999, based on Linux' acenic.c, 3c59x.c and
  *	SysKonnects GEnesis Solaris driver
  *	Author: Christoph Goos (cgoos@syskonnect.de)
  *	        Mirko Lindner (mlindner@syskonnect.de)
@@ -56,6 +57,55 @@
  * History:
  *
  *	$Log: skge.c,v $
+ *	Revision 1.58  2003/06/17 07:14:29  mlindner
+ *	Add: Disable checksum functionality
+ *	Fix: Unload module (Kernel 2.5)
+ *	
+ *	Revision 1.57  2003/06/05 14:55:27  mlindner
+ *	Fix: ProcFS creation (Kernel 2.2.x)
+ *	Fix: ProcFS OWNER (Kernel 2.2.x)
+ *	
+ *	Revision 1.56  2003/06/03 14:34:29  mlindner
+ *	Add: Additions for SK_SLIM
+ *	Fix: SkGeIoctl SK_IOCTL_GEN
+ *	
+ *	Revision 1.55  2003/05/26 13:00:52  mlindner
+ *	Add: Support for Kernel 2.5/2.6
+ *	Add: Support for new IO-control MIB data structure
+ *	Add: New SkOsGetTime function
+ *	Fix: Race condition with broken LM80 chip
+ *	Fix: Race condition with padded frames
+ *	
+ *	Revision 1.54  2003/04/28 13:07:27  mlindner
+ *	Fix: Delay race condition with some server machines
+ *	
+ *	Revision 1.53  2003/04/28 12:49:49  mlindner
+ *	Fix: Code optimization
+ *	
+ *	Revision 1.52  2003/04/28 12:24:32  mlindner
+ *	Fix: Disabled HW Error IRQ on 32-bit Yukon if sensor IRQ occurs
+ *	
+ *	Revision 1.51  2003/04/16 08:31:14  mlindner
+ *	Fix: Kernel 2.2 compilation
+ *	
+ *	Revision 1.49  2003/04/10 09:08:51  mlindner
+ *	Add: Blink mode verification
+ *	Fix: Checksum calculation
+ *	
+ *	Revision 1.48  2003/03/21 14:48:38  rroesler
+ *	Added code for interrupt moderation
+ *	
+ *	Revision 1.47  2003/03/12 13:56:15  mlindner
+ *	Fix: Mac update during SK_DRV_NET_UP
+ *	
+ *	Revision 1.46  2003/02/25 14:16:36  mlindner
+ *	Fix: Copyright statement
+ *	
+ *	Revision 1.45  2003/02/25 13:25:55  mlindner
+ *	Add: Performance improvements
+ *	Add: Support for various vendors
+ *	Fix: Init function
+ *	
  *	Revision 1.44  2003/01/09 09:25:26  mlindner
  *	Fix: Remove useless init_module/cleanup_module forward declarations
  *	
@@ -256,7 +306,7 @@
  *	Printing "ethX:" before adapter type at adapter init.
  *	
  *
- *	10-Feb-1999 cg	Created, based on Linux' acenic.c, 3c59x.c and 
+ *	10-Feb-1999 cg	Created, based on Linux' acenic.c, 3c59x.c and
  *			SysKonnects GEnesis Solaris driver
  *
  ******************************************************************************/
@@ -265,11 +315,11 @@
  *
  * Possible compiler options (#define xxx / -Dxxx):
  *
- *	debugging can be enable by changing SK_DEBUG_CHKMOD and 
+ *	debugging can be enable by changing SK_DEBUG_CHKMOD and
  *	SK_DEBUG_CHKCAT in makefile (described there).
  *
  ******************************************************************************/
- 
+
 /******************************************************************************
  *
  * Description:
@@ -333,39 +383,48 @@
  ******************************************************************************/
 
 #include	"h/skversion.h"
+
 #include	<linux/module.h>
 #include	<linux/init.h>
 #include 	<linux/proc_fs.h>
+
 #include	"h/skdrv1st.h"
 #include	"h/skdrv2nd.h"
 
+/*******************************************************************************
+ *
+ * Defines
+ *
+ ******************************************************************************/
 
-/* defines ******************************************************************/
 /* for debuging on x86 only */
 /* #define BREAKPOINT() asm(" int $3"); */
 
+/* use the transmit hw checksum driver functionality */
+#define USE_SK_TX_CHECKSUM
+
+/* use the receive hw checksum driver functionality */
+#define USE_SK_RX_CHECKSUM
+
 /* use the scatter-gather functionality with sendfile() */
 #define SK_ZEROCOPY
 
 /* use of a transmit complete interrupt */
 #define USE_TX_COMPLETE
 
-/* use interrupt moderation (for tx complete only) */
-#define USE_INT_MOD
-#define INTS_PER_SEC	1800
-
 /*
  * threshold for copying small receive frames
  * set to 0 to avoid copying, set to 9001 to copy all frames
  */
-#define SK_COPY_THRESHOLD	200
+#define SK_COPY_THRESHOLD	50
 
 /* number of adapters that can be configured via command line params */
 #define SK_MAX_CARD_PARAM	16
 
 
+
 /*
- * use those defines for a compile-in version of the driver instead 
+ * use those defines for a compile-in version of the driver instead
  * of command line parameters
  */
 // #define LINK_SPEED_A	{"Auto", }
@@ -385,17 +444,33 @@
 #define DEV_KFREE_SKB_IRQ(skb) dev_kfree_skb_irq(skb)
 #define DEV_KFREE_SKB_ANY(skb) dev_kfree_skb_any(skb)
 
-/* function prototypes ******************************************************/
+
+/* Set blink mode*/
+#define OEM_CONFIG_VALUE (	SK_ACT_LED_BLINK | \
+				SK_DUP_LED_NORMAL | \
+				SK_LED_LINK100_ON)
+
+
+/* Isr return value */
+#define SkIsrRetVar	void
+#define SkIsrRetNone	NULL
+#define SkIsrRetHandled	NULL
+
+
+/*******************************************************************************
+ *
+ * Local Function Prototypes
+ *
+ ******************************************************************************/
+
 static void	FreeResources(struct SK_NET_DEVICE *dev);
 static int	SkGeBoardInit(struct SK_NET_DEVICE *dev, SK_AC *pAC);
 static SK_BOOL	BoardAllocMem(SK_AC *pAC);
 static void	BoardFreeMem(SK_AC *pAC);
 static void	BoardInitMem(SK_AC *pAC);
-static void	SetupRing(SK_AC*, void*, uintptr_t, RXD**, RXD**, RXD**,
-			int*, SK_BOOL);
-
-static void	SkGeIsr(int irq, void *dev_id, struct pt_regs *ptregs);
-static void	SkGeIsrOnePort(int irq, void *dev_id, struct pt_regs *ptregs);
+static void	SetupRing(SK_AC*, void*, uintptr_t, RXD**, RXD**, RXD**, int*, SK_BOOL);
+static SkIsrRetVar	SkGeIsr(int irq, void *dev_id, struct pt_regs *ptregs);
+static SkIsrRetVar	SkGeIsrOnePort(int irq, void *dev_id, struct pt_regs *ptregs);
 static int	SkGeOpen(struct SK_NET_DEVICE *dev);
 static int	SkGeClose(struct SK_NET_DEVICE *dev);
 static int	SkGeXmit(struct sk_buff *skb, struct SK_NET_DEVICE *dev);
@@ -410,26 +485,46 @@ static void	FreeTxDescriptors(SK_AC*pAC,
 static void	FillRxRing(SK_AC*, RX_PORT*);
 static SK_BOOL	FillRxDescriptor(SK_AC*, RX_PORT*);
 static void	ReceiveIrq(SK_AC*, RX_PORT*, SK_BOOL);
-static void ClearAndStartRx(SK_AC*, int);
+static void	ClearAndStartRx(SK_AC*, int);
 static void	ClearTxIrq(SK_AC*, int, int);
 static void	ClearRxRing(SK_AC*, RX_PORT*);
 static void	ClearTxRing(SK_AC*, TX_PORT*);
-static void	SetQueueSizes(SK_AC	*pAC);
 static int	SkGeChangeMtu(struct SK_NET_DEVICE *dev, int new_mtu);
 static void	PortReInitBmu(SK_AC*, int);
 static int	SkGeIocMib(DEV_NET*, unsigned int, int);
+static void	StartDrvCleanupTimer(SK_AC *pAC);
+static void	StopDrvCleanupTimer(SK_AC *pAC);
 static int	XmitFrameSG(SK_AC*, TX_PORT*, struct sk_buff*);
 
-/*Extern */
 
-/* external Proc function */
-extern int proc_read(
-	char	*buffer,
-	char	**buffer_location,
-	off_t	offset,
-	int		buffer_length,
-	int		*eof,
-	void	*data);
+/*******************************************************************************
+ *
+ * Obsolete Function Prototypes
+ *
+ ******************************************************************************/
+#if 0
+static void	SetQueueSizes(SK_AC	*pAC);
+#endif
+
+/*******************************************************************************
+ *
+ * Extern Function Prototypes
+ *
+ ******************************************************************************/
+
+static const char 	SK_Root_Dir_entry[] = "sk98lin";
+static struct		proc_dir_entry *pSkRootDir;
+extern int 			sk_proc_read(char   *buffer,
+								char	**buffer_location,
+								off_t	offset,
+								int		buffer_length,
+								int		*eof,
+								void	*data);
+
+extern void SkDimEnableModerationIfNeeded(SK_AC *pAC);	
+extern void SkDimDisplayModerationSettings(SK_AC *pAC);
+extern void SkDimStartModerationTimer(SK_AC *pAC);
+extern void SkDimModerate(SK_AC *pAC);
 
 #ifdef DEBUG
 static void	DumpMsg(struct sk_buff*, char*);
@@ -448,13 +543,9 @@ static uintptr_t TxQueueAddr[SK_MAX_MACS
 static uintptr_t RxQueueAddr[SK_MAX_MACS] = {0x400, 0x480};
 
 
-/* local variables **********************************************************/
-const char SK_Root_Dir_entry[8];
-
 static struct proc_dir_entry	*pSkRootDir;
 
 
-
 /*****************************************************************************
  *
  * 	skge_probe - find all SK-98xx adapters
@@ -472,6 +563,7 @@ static int __init skge_probe (void)
 {
 	int			proc_root_initialized = 0;
 	int			boards_found = 0;
+	int			vendor_flag = SK_FALSE;
 	SK_AC			*pAC;
 	DEV_NET			*pNet = NULL;
 	struct proc_dir_entry	*pProcFile;
@@ -494,14 +586,19 @@ static int __init skge_probe (void)
 		dev = NULL;
 		pNet = NULL;
 
-		if ((pdev->vendor != PCI_VENDOR_ID_SYSKONNECT) && 
-			((pdev->device != PCI_DEVICE_ID_SYSKONNECT_GE) || 
+
+		SK_PCI_ISCOMPLIANT(vendor_flag, pdev);
+		if (!vendor_flag)
+			continue;
+
+/*		if ((pdev->vendor != PCI_VENDOR_ID_SYSKONNECT) &&
+			((pdev->device != PCI_DEVICE_ID_SYSKONNECT_GE) ||
 			(pdev->device != PCI_DEVICE_ID_SYSKONNECT_YU))){
 			continue;
 		}
-
+*/
 		/* Configure DMA attributes. */
-		if (pci_set_dma_mask(pdev, (u64) 0xffffffffffffffff) &&
+		if (pci_set_dma_mask(pdev, (u64) 0xffffffffffffffffULL) &&
 			pci_set_dma_mask(pdev, (u64) 0xffffffff))
 			continue;
 
@@ -559,12 +656,15 @@ static int __init skge_probe (void)
 		dev->flags &= 		~IFF_RUNNING;
 
 #ifdef SK_ZEROCOPY
+#ifdef USE_SK_TX_CHECKSUM
+
 		if (pAC->GIni.GIChipId == CHIP_ID_YUKON) {
 			/* Use only if yukon hardware */
 			/* SK and ZEROCOPY - fly baby... */
 			dev->features |= NETIF_F_SG | NETIF_F_IP_CSUM;
 		}
 #endif
+#endif
 
 		/*
 		 * Dummy value.
@@ -621,10 +721,10 @@ static int __init skge_probe (void)
 			if(!proc_root_initialized) {
 				pSkRootDir = create_proc_entry(SK_Root_Dir_entry,
 					S_IFDIR | S_IWUSR | S_IRUGO | S_IXUGO, proc_net);
+				pSkRootDir->owner = THIS_MODULE;
 				proc_root_initialized = 1;
 			}
 
-			pSkRootDir->owner = THIS_MODULE;
 		}
 
 
@@ -635,21 +735,24 @@ static int __init skge_probe (void)
 			pSkRootDir);
 
 		
-		pProcFile->read_proc = proc_read;
+		pProcFile->read_proc = sk_proc_read;
 		pProcFile->write_proc = NULL;
 		pProcFile->nlink = 1;
 		pProcFile->size = sizeof(dev->name + 1);
 		pProcFile->data = (void *)pProcFile;
+		pProcFile->owner = THIS_MODULE;
 
 		pNet->PortNr = 0;
 		pNet->NetNr = 0;
 
 #ifdef SK_ZEROCOPY
+#ifdef USE_SK_TX_CHECKSUM
 			if (pAC->GIni.GIChipId == CHIP_ID_YUKON) {
 				/* SG and ZEROCOPY - fly baby... */
 				dev->features |= NETIF_F_SG | NETIF_F_IP_CSUM;
 			}
 #endif
+#endif
 
 		boards_found++;
 
@@ -680,22 +783,25 @@ static int __init skge_probe (void)
 			dev->flags &= 		~IFF_RUNNING;
 
 #ifdef SK_ZEROCOPY
+#ifdef USE_SK_TX_CHECKSUM
 			if (pAC->GIni.GIChipId == CHIP_ID_YUKON) {
 				/* SG and ZEROCOPY - fly baby... */
 				dev->features |= NETIF_F_SG | NETIF_F_IP_CSUM;
 			}
 #endif
+#endif
 
 			pProcFile = create_proc_entry(dev->name,
 				S_IFREG | S_IXUSR | S_IWGRP | S_IROTH,
 				pSkRootDir);
 
 		
-			pProcFile->read_proc = proc_read;
+			pProcFile->read_proc = sk_proc_read;
 			pProcFile->write_proc = NULL;
 			pProcFile->nlink = 1;
 			pProcFile->size = sizeof(dev->name + 1);
 			pProcFile->data = (void *)pProcFile;
+			pProcFile->owner = THIS_MODULE;
 
 			memcpy((caddr_t) &dev->dev_addr,
 			(caddr_t) &pAC->Addr.Net[1].CurrentMacAddress, 6);
@@ -774,13 +880,19 @@ MODULE_PARM(DupCap_A,   "1-" __MODULE_ST
 MODULE_PARM(DupCap_B,   "1-" __MODULE_STRING(SK_MAX_CARD_PARAM) "s");
 MODULE_PARM(FlowCtrl_A, "1-" __MODULE_STRING(SK_MAX_CARD_PARAM) "s");
 MODULE_PARM(FlowCtrl_B, "1-" __MODULE_STRING(SK_MAX_CARD_PARAM) "s");
-MODULE_PARM(Role_A,	    "1-" __MODULE_STRING(SK_MAX_CARD_PARAM) "s");
-MODULE_PARM(Role_B,	    "1-" __MODULE_STRING(SK_MAX_CARD_PARAM) "s");
+MODULE_PARM(Role_A,	"1-" __MODULE_STRING(SK_MAX_CARD_PARAM) "s");
+MODULE_PARM(Role_B,	"1-" __MODULE_STRING(SK_MAX_CARD_PARAM) "s");
 MODULE_PARM(PrefPort,   "1-" __MODULE_STRING(SK_MAX_CARD_PARAM) "s");
 MODULE_PARM(RlmtMode,   "1-" __MODULE_STRING(SK_MAX_CARD_PARAM) "s");
 /* not used, just there because every driver should have them: */
 MODULE_PARM(options,    "1-" __MODULE_STRING(SK_MAX_CARD_PARAM) "i");
 MODULE_PARM(debug,      "i");
+/* used for interrupt moderation */
+MODULE_PARM(IntsPerSec,     "1-" __MODULE_STRING(SK_MAX_CARD_PARAM) "i");
+MODULE_PARM(Moderation,     "1-" __MODULE_STRING(SK_MAX_CARD_PARAM) "s");
+MODULE_PARM(Stats,          "1-" __MODULE_STRING(SK_MAX_CARD_PARAM) "s");
+MODULE_PARM(ModerationMask, "1-" __MODULE_STRING(SK_MAX_CARD_PARAM) "s");
+MODULE_PARM(AutoSizing,     "1-" __MODULE_STRING(SK_MAX_CARD_PARAM) "s");
 
 
 #ifdef LINK_SPEED_A
@@ -858,6 +970,12 @@ static char *RlmtMode[SK_MAX_CARD_PARAM]
 static int debug = 0; /* not used */
 static int options[SK_MAX_CARD_PARAM] = {0, }; /* not used */
 
+static int   IntsPerSec[SK_MAX_CARD_PARAM];
+static char *Moderation[SK_MAX_CARD_PARAM];
+static char *ModerationMask[SK_MAX_CARD_PARAM];
+static char *AutoSizing[SK_MAX_CARD_PARAM];
+static char *Stats[SK_MAX_CARD_PARAM];
+
 
 /*****************************************************************************
  *
@@ -881,7 +999,7 @@ static int __init skge_init_module(void)
 
 	cards = skge_probe();
 	if (cards == 0) {
-		printk("No adapter found.\n");
+		printk("sk98lin: No adapter found.\n");
 	}
 	return cards ? 0 : -ENODEV;
 } /* skge_init_module */
@@ -913,7 +1031,7 @@ SK_EVPARA EvPara;
 		netif_stop_queue(SkGeRootDev);
 		SkGeYellowLED(pAC, pAC->IoBase, 0);
 
-		if(pAC->BoardLevel == 2) {
+		if(pAC->BoardLevel == SK_INIT_RUN) {
 			/* board is still alive */
 			spin_lock_irqsave(&pAC->SlowPathLock, Flags);
 			EvPara.Para32[0] = 0;
@@ -925,16 +1043,16 @@ SK_EVPARA EvPara;
 			SkEventDispatcher(pAC, pAC->IoBase);
 			/* disable interrupts */
 			SK_OUT32(pAC->IoBase, B0_IMSK, 0);
-			SkGeDeInit(pAC, pAC->IoBase); 
+			SkGeDeInit(pAC, pAC->IoBase);
 			spin_unlock_irqrestore(&pAC->SlowPathLock, Flags);
-			pAC->BoardLevel = 0;
+			pAC->BoardLevel = SK_INIT_DATA;
 			/* We do NOT check here, if IRQ was pending, of course*/
 		}
 
-		if(pAC->BoardLevel == 1) {
+		if(pAC->BoardLevel == SK_INIT_IO) {
 			/* board is still alive */
-			SkGeDeInit(pAC, pAC->IoBase); 
-			pAC->BoardLevel = 0;
+			SkGeDeInit(pAC, pAC->IoBase);
+			pAC->BoardLevel = SK_INIT_DATA;
 		}
 
 		if ((pAC->GIni.GIMacsFound == 2) && pAC->RlmtNets == 2){
@@ -945,7 +1063,7 @@ SK_EVPARA EvPara;
 		FreeResources(SkGeRootDev);
 
 		SkGeRootDev->get_stats = NULL;
-		/* 
+		/*
 		 * otherwise unregister_netdev calls get_stats with
 		 * invalid IO ...  :-(
 		 */
@@ -963,6 +1081,7 @@ SK_EVPARA EvPara;
 module_init(skge_init_module);
 module_exit(skge_cleanup_module);
 
+
 /*****************************************************************************
  *
  * 	SkGeBoardInit - do level 0 and 1 initialization
@@ -1005,20 +1124,20 @@ SK_BOOL	DualNet;
 	
 	spin_lock_irqsave(&pAC->SlowPathLock, Flags);
 	/* Does a RESET on board ...*/
-	if (SkGeInit(pAC, pAC->IoBase, 0) != 0) {
+	if (SkGeInit(pAC, pAC->IoBase, SK_INIT_DATA) != 0) {
 		printk("HWInit (0) failed.\n");
 		spin_unlock_irqrestore(&pAC->SlowPathLock, Flags);
 		return(-EAGAIN);
 	}
-	SkI2cInit(  pAC, pAC->IoBase, 0);
-	SkEventInit(pAC, pAC->IoBase, 0);
-	SkPnmiInit( pAC, pAC->IoBase, 0);
-	SkAddrInit( pAC, pAC->IoBase, 0);
-	SkRlmtInit( pAC, pAC->IoBase, 0);
-	SkTimerInit(pAC, pAC->IoBase, 0);
+	SkI2cInit(  pAC, pAC->IoBase, SK_INIT_DATA);
+	SkEventInit(pAC, pAC->IoBase, SK_INIT_DATA);
+	SkPnmiInit( pAC, pAC->IoBase, SK_INIT_DATA);
+	SkAddrInit( pAC, pAC->IoBase, SK_INIT_DATA);
+	SkRlmtInit( pAC, pAC->IoBase, SK_INIT_DATA);
+	SkTimerInit(pAC, pAC->IoBase, SK_INIT_DATA);
 	
-	pAC->BoardLevel = 0;
-	pAC->RxBufSize = ETH_BUF_SIZE;
+	pAC->BoardLevel = SK_INIT_DATA;
+	pAC->RxBufSize  = ETH_BUF_SIZE;
 
 	SK_PNMI_SET_DRIVER_DESCR(pAC, DescrString);
 	SK_PNMI_SET_DRIVER_VER(pAC, VerStr);
@@ -1027,24 +1146,24 @@ SK_BOOL	DualNet;
 
 	/* level 1 init common modules here (HW init) */
 	spin_lock_irqsave(&pAC->SlowPathLock, Flags);
-	if (SkGeInit(pAC, pAC->IoBase, 1) != 0) {
+	if (SkGeInit(pAC, pAC->IoBase, SK_INIT_IO) != 0) {
 		printk("HWInit (1) failed.\n");
 		spin_unlock_irqrestore(&pAC->SlowPathLock, Flags);
 		return(-EAGAIN);
 	}
-	SkI2cInit(  pAC, pAC->IoBase, 1);
-	SkEventInit(pAC, pAC->IoBase, 1);
-	SkPnmiInit( pAC, pAC->IoBase, 1);
-	SkAddrInit( pAC, pAC->IoBase, 1);
-	SkRlmtInit( pAC, pAC->IoBase, 1);
-	SkTimerInit(pAC, pAC->IoBase, 1);
+	SkI2cInit(  pAC, pAC->IoBase, SK_INIT_IO);
+	SkEventInit(pAC, pAC->IoBase, SK_INIT_IO);
+	SkPnmiInit( pAC, pAC->IoBase, SK_INIT_IO);
+	SkAddrInit( pAC, pAC->IoBase, SK_INIT_IO);
+	SkRlmtInit( pAC, pAC->IoBase, SK_INIT_IO);
+	SkTimerInit(pAC, pAC->IoBase, SK_INIT_IO);
 
 	GetConfiguration(pAC);
 	if (pAC->RlmtNets == 2) {
 		pAC->GIni.GIPortUsage = SK_MUL_LINK;
 	}
 
-	pAC->BoardLevel = 1;
+	pAC->BoardLevel = SK_INIT_IO;
 	spin_unlock_irqrestore(&pAC->SlowPathLock, Flags);
 
 	if (pAC->GIni.GIMacsFound == 2) {
@@ -1104,9 +1223,9 @@ SK_BOOL	DualNet;
 	printk("      PrefPort:%c  RlmtMode:%s\n",
 		'A' + pAC->Rlmt.Net[0].Port[pAC->Rlmt.Net[0].PrefPort]->PortNumber,
 		(pAC->RlmtMode==0)  ? "Check Link State" :
-		((pAC->RlmtMode==1) ? "Check Link State" : 
-		((pAC->RlmtMode==3) ? "Check Local Port" : 
-		((pAC->RlmtMode==7) ? "Check Segmentation" : 
+		((pAC->RlmtMode==1) ? "Check Link State" :
+		((pAC->RlmtMode==3) ? "Check Local Port" :
+		((pAC->RlmtMode==7) ? "Check Segmentation" :
 		((pAC->RlmtMode==17) ? "Dual Check Link State" :"Error")))));
 
 	SkGeYellowLED(pAC, pAC->IoBase, 1);
@@ -1392,7 +1511,7 @@ int	PortIndex)	/* index of the port for 
  * Returns: N/A
  *
  */
-static void SkGeIsr(int irq, void *dev_id, struct pt_regs *ptregs)
+static SkIsrRetVar SkGeIsr(int irq, void *dev_id, struct pt_regs *ptregs)
 {
 struct SK_NET_DEVICE *dev = (struct SK_NET_DEVICE *)dev_id;
 DEV_NET		*pNet;
@@ -1489,6 +1608,7 @@ SK_U32		IntSrc;		/* interrupts source re
 		SK_IN32(pAC->IoBase, B0_ISRC, &IntSrc);
 	} /* while (IntSrc & IRQ_MASK != 0) */
 
+	IntSrc &= pAC->GIni.GIValIrqMask;
 	if ((IntSrc & SPECIAL_IRQS) || pAC->CheckQueue) {
 		SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_INT_SRC,
 			("SPECIAL IRQ DP-Cards => %x\n", IntSrc));
@@ -1501,13 +1621,17 @@ SK_U32		IntSrc;		/* interrupts source re
 		spin_unlock(&pAC->SlowPathLock);
 	}
 	/*
-	 * do it all again is case we cleared an interrupt that 
+	 * do it all again is case we cleared an interrupt that
 	 * came in after handling the ring (OUTs may be delayed
 	 * in hardware buffers, but are through after IN)
-	 */
-
+	 *
+	 * rroesler: has been commented out and shifted to
+	 *           SkGeDrvEvent(), because it is timer
+	 *           guarded now
+	 *
 	ReceiveIrq(pAC, &pAC->RxPort[0], SK_TRUE);
 	ReceiveIrq(pAC, &pAC->RxPort[1], SK_TRUE);
+	 */
 
 	if (pAC->CheckQueue) {
 		pAC->CheckQueue = SK_FALSE;
@@ -1516,11 +1640,10 @@ SK_U32		IntSrc;		/* interrupts source re
 		spin_unlock(&pAC->SlowPathLock);
 	}
 
-
 	/* IRQ is processed - Enable IRQs again*/
-	SK_OUT32(pAC->IoBase, B0_IMSK, IRQ_MASK);
+	SK_OUT32(pAC->IoBase, B0_IMSK, pAC->GIni.GIValIrqMask);
 
-	return;
+		return;
 } /* SkGeIsr */
 
 
@@ -1537,7 +1660,7 @@ SK_U32		IntSrc;		/* interrupts source re
  * Returns: N/A
  *
  */
-static void SkGeIsrOnePort(int irq, void *dev_id, struct pt_regs *ptregs)
+static SkIsrRetVar SkGeIsrOnePort(int irq, void *dev_id, struct pt_regs *ptregs)
 {
 struct SK_NET_DEVICE *dev = (struct SK_NET_DEVICE *)dev_id;
 DEV_NET		*pNet;
@@ -1604,6 +1727,7 @@ SK_U32		IntSrc;		/* interrupts source re
 		SK_IN32(pAC->IoBase, B0_ISRC, &IntSrc);
 	} /* while (IntSrc & IRQ_MASK != 0) */
 	
+	IntSrc &= pAC->GIni.GIValIrqMask;
 	if ((IntSrc & SPECIAL_IRQS) || pAC->CheckQueue) {
 		SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_INT_SRC,
 			("SPECIAL IRQ SP-Cards => %x\n", IntSrc));
@@ -1616,16 +1740,21 @@ SK_U32		IntSrc;		/* interrupts source re
 		spin_unlock(&pAC->SlowPathLock);
 	}
 	/*
-	 * do it all again is case we cleared an interrupt that 
+	 * do it all again is case we cleared an interrupt that
 	 * came in after handling the ring (OUTs may be delayed
 	 * in hardware buffers, but are through after IN)
-	 */
+	 *
+	 * rroesler: has been commented out and shifted to
+	 *           SkGeDrvEvent(), because it is timer
+	 *           guarded now
+	 *
 	ReceiveIrq(pAC, &pAC->RxPort[0], SK_TRUE);
+	 */
 
 	/* IRQ is processed - Enable IRQs again*/
-	SK_OUT32(pAC->IoBase, B0_IMSK, IRQ_MASK);
+	SK_OUT32(pAC->IoBase, B0_IMSK, pAC->GIni.GIValIrqMask);
 
-	return;
+		return;
 } /* SkGeIsrOnePort */
 
 
@@ -1660,34 +1789,39 @@ struct SK_NET_DEVICE	*dev)
 	SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_ENTRY,
 		("SkGeOpen: pAC=0x%lX:\n", (unsigned long)pAC));
 
-	if (pAC->BoardLevel == 0) {
+
+	/* Set blink mode */
+	if (pAC->PciDev->vendor == 0x1186)
+		pAC->GIni.GILedBlinkCtrl = OEM_CONFIG_VALUE;
+
+	if (pAC->BoardLevel == SK_INIT_DATA) {
 		/* level 1 init common modules here */
-		if (SkGeInit(pAC, pAC->IoBase, 1) != 0) {
+		if (SkGeInit(pAC, pAC->IoBase, SK_INIT_IO) != 0) {
 			printk("%s: HWInit (1) failed.\n", pAC->dev[pNet->PortNr]->name);
 			return (-1);
 		}
-		SkI2cInit	(pAC, pAC->IoBase, 1);
-		SkEventInit	(pAC, pAC->IoBase, 1);
-		SkPnmiInit	(pAC, pAC->IoBase, 1);
-		SkAddrInit	(pAC, pAC->IoBase, 1);
-		SkRlmtInit	(pAC, pAC->IoBase, 1);
-		SkTimerInit	(pAC, pAC->IoBase, 1);
-		pAC->BoardLevel = 1;
+		SkI2cInit	(pAC, pAC->IoBase, SK_INIT_IO);
+		SkEventInit	(pAC, pAC->IoBase, SK_INIT_IO);
+		SkPnmiInit	(pAC, pAC->IoBase, SK_INIT_IO);
+		SkAddrInit	(pAC, pAC->IoBase, SK_INIT_IO);
+		SkRlmtInit	(pAC, pAC->IoBase, SK_INIT_IO);
+		SkTimerInit	(pAC, pAC->IoBase, SK_INIT_IO);
+		pAC->BoardLevel = SK_INIT_IO;
 	}
 
-	if (pAC->BoardLevel != 2) {
+	if (pAC->BoardLevel != SK_INIT_RUN) {
 		/* tschilling: Level 2 init modules here, check return value. */
-		if (SkGeInit(pAC, pAC->IoBase, 2) != 0) {
+		if (SkGeInit(pAC, pAC->IoBase, SK_INIT_RUN) != 0) {
 			printk("%s: HWInit (2) failed.\n", pAC->dev[pNet->PortNr]->name);
 			return (-1);
 		}
-		SkI2cInit	(pAC, pAC->IoBase, 2);
-		SkEventInit	(pAC, pAC->IoBase, 2);
-		SkPnmiInit	(pAC, pAC->IoBase, 2);
-		SkAddrInit	(pAC, pAC->IoBase, 2);
-		SkRlmtInit	(pAC, pAC->IoBase, 2);
-		SkTimerInit	(pAC, pAC->IoBase, 2);
-		pAC->BoardLevel = 2;
+		SkI2cInit	(pAC, pAC->IoBase, SK_INIT_RUN);
+		SkEventInit	(pAC, pAC->IoBase, SK_INIT_RUN);
+		SkPnmiInit	(pAC, pAC->IoBase, SK_INIT_RUN);
+		SkAddrInit	(pAC, pAC->IoBase, SK_INIT_RUN);
+		SkRlmtInit	(pAC, pAC->IoBase, SK_INIT_RUN);
+		SkTimerInit	(pAC, pAC->IoBase, SK_INIT_RUN);
+		pAC->BoardLevel = SK_INIT_RUN;
 	}
 
 	for (i=0; i<pAC->GIni.GIMacsFound; i++) {
@@ -1697,20 +1831,14 @@ struct SK_NET_DEVICE	*dev)
 	}
 	SkGeYellowLED(pAC, pAC->IoBase, 1);
 
-#ifdef USE_INT_MOD
-/* moderate only TX complete interrupts (these are not time critical) */
-#define IRQ_MOD_MASK (IRQ_EOF_AS_TX1 | IRQ_EOF_AS_TX2)
-	{
-		unsigned long ModBase;
-		ModBase = 53125000 / INTS_PER_SEC;
-		SK_OUT32(pAC->IoBase, B2_IRQM_INI, ModBase);
-		SK_OUT32(pAC->IoBase, B2_IRQM_MSK, IRQ_MOD_MASK);
-		SK_OUT32(pAC->IoBase, B2_IRQM_CTRL, TIM_START);
-	}
-#endif
+	StartDrvCleanupTimer(pAC);
+	SkDimEnableModerationIfNeeded(pAC);	
+	SkDimDisplayModerationSettings(pAC);
+
+	pAC->GIni.GIValIrqMask &= IRQ_MASK;
 
 	/* enable Interrupts */
-	SK_OUT32(pAC->IoBase, B0_IMSK, IRQ_MASK);
+	SK_OUT32(pAC->IoBase, B0_IMSK, pAC->GIni.GIValIrqMask);
 	SK_OUT32(pAC->IoBase, B0_HWE_IMSK, IRQ_HWE_MASK);
 
 	spin_lock_irqsave(&pAC->SlowPathLock, Flags);
@@ -1778,7 +1906,9 @@ struct SK_NET_DEVICE	*dev)
 	SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_ENTRY,
 		("SkGeClose: pAC=0x%lX ", (unsigned long)pAC));
 
-	/* 
+        StopDrvCleanupTimer(pAC);
+
+	/*
 	 * Clear multicast table, promiscuous mode ....
 	 */
 	SkAddrMcClear(pAC, pAC->IoBase, PortIdx, 0);
@@ -1796,7 +1926,7 @@ struct SK_NET_DEVICE	*dev)
 		SK_OUT32(pAC->IoBase, B0_IMSK, 0);
 		/* stop the hardware */
 		SkGeDeInit(pAC, pAC->IoBase);
-		pAC->BoardLevel = 0;
+		pAC->BoardLevel = SK_INIT_DATA;
 		spin_unlock_irqrestore(&pAC->SlowPathLock, Flags);
 	} else {
 
@@ -1810,7 +1940,7 @@ struct SK_NET_DEVICE	*dev)
 		/* Stop port */
 		spin_lock_irqsave(&pAC->TxPort[pNet->PortNr]
 			[TX_PRIO_LOW].TxDesRingLock, Flags);
-		SkGeStopPort(pAC, pAC->IoBase, pNet->PortNr, 
+		SkGeStopPort(pAC, pAC->IoBase, pNet->PortNr,
 			SK_STOP_ALL, SK_HARD_RST);
 		spin_unlock_irqrestore(&pAC->TxPort[pNet->PortNr]
 			[TX_PRIO_LOW].TxDesRingLock, Flags);
@@ -1835,8 +1965,8 @@ struct SK_NET_DEVICE	*dev)
 
 	pAC->MaxPorts--;
 	pNet->Up = 0;
+
 	MOD_DEC_USE_COUNT;
-	
 	return (0);
 } /* SkGeClose */
 
@@ -1865,7 +1995,7 @@ int			Rc;	/* return code of XmitFrame */
 	pNet = (DEV_NET*) dev->priv;
 	pAC = pNet->pAC;
 
-	if ((!skb_shinfo(skb)->nr_frags) || 
+	if ((!skb_shinfo(skb)->nr_frags) ||
 		(pAC->GIni.GIChipId == CHIP_ID_GENESIS)) {
 		/* Don't activate scatter-gather and hardware checksum */
 
@@ -1936,7 +2066,7 @@ SK_AC 		*pAC,		/* pointer to adapter con
 TX_PORT		*pTxPort,	/* pointer to struct of port to send to */
 struct sk_buff	*pMessage)	/* pointer to send-message */
 {
-TXD		*pTxd;		/* the rxd to fill */
+TXD		*pTxd, *pOldTxd;		/* the rxd to fill */
 unsigned long	Flags;
 SK_U64		PhysAddr;
 int		BytesSend;
@@ -1969,7 +2099,7 @@ int		BytesSend;
 	pTxPort->TxdRingFree--;
 	/* the needed descriptor is reserved now */
 	
-	/* 
+	/*
 	 * everything allocated ok, so add buffer to descriptor
 	 */
 
@@ -1994,15 +2124,14 @@ int		BytesSend;
 #else
 		TX_CTRL_EOF | pMessage->len;
 #endif
-	
-	if ((pTxPort->pTxdRingPrev->TBControl & TX_CTRL_OWN_BMU) == 0) {
+
+	pOldTxd = xchg(&pTxPort->pTxdRingPrev, pTxd);
+	if ((pOldTxd->TBControl & TX_CTRL_OWN_BMU) == 0) {
 		/* previous descriptor already done, so give tx start cmd */
 		/* StartTx(pAC, pTxPort->HwAddr); */
 		SK_OUT8(pTxPort->HwAddr, TX_Q_CTRL, TX_Q_CTRL_START);
-	}
-	pTxPort->pTxdRingPrev = pTxd;
-	
-	
+	}	
+
 	BytesSend = pMessage->len;
 	spin_unlock_irqrestore(&pTxPort->TxDesRingLock, Flags);
 	/* after releasing the lock, the skb may be immidiately freed */
@@ -2099,7 +2228,7 @@ struct sk_buff	*pMessage)	/* pointer to 
 		pTxd->TcpSumWr = 14+hlength;
 	
 	} else {
-		pTxd->TBControl = TX_CTRL_CHECK_DEFAULT | 
+		pTxd->TBControl = TX_CTRL_CHECK_DEFAULT |
 				  TX_CTRL_SOFTWARE |
 				  TX_CTRL_STF |
 				  skb_headlen(pMessage);
@@ -2127,7 +2256,7 @@ struct sk_buff	*pMessage)	/* pointer to 
 		
 		/* HW checksum */
 		if (pMessage->ip_summed == CHECKSUM_HW) {
-			pTxd->TBControl = TX_CTRL_OWN_BMU | 
+			pTxd->TBControl = TX_CTRL_OWN_BMU |
 				  	  TX_CTRL_SOFTWARE |
 					  TX_CTRL_ST_FWD;
 
@@ -2155,7 +2284,7 @@ struct sk_buff	*pMessage)	/* pointer to 
 					   sk_frag->size;
 #endif
 			pTxdFst->TBControl |= TX_CTRL_OWN_BMU |
-					      TX_CTRL_SOFTWARE; 
+					      TX_CTRL_SOFTWARE;
 
 		} else {
 			pTxd->TBControl |= sk_frag->size;
@@ -2188,7 +2317,7 @@ void dump_frag( SK_U8 *data, int length)
 {
         int i;
 
-        printk("Length: %d\n", length);                
+        printk("Length: %d\n", length);
         for( i=0; i < length; i++ ) {
                 printk(" %02x", (SK_U8)*(data + i) );
                 if( !((i+1) % 20) )
@@ -2228,27 +2357,27 @@ SK_U64	PhysAddr;	/* address of DMA mappi
 
 	pNewTail = pTxPort->pTxdRingTail;
 	pTxd = pNewTail;
-	/* 
+	/*
 	 * loop forever; exits if TX_CTRL_SOFTWARE bit not set in start frame
 	 * or TX_CTRL_OWN_BMU bit set in any frame
 	 */
 	while (1) {
 		Control = pTxd->TBControl;
 		if ((Control & TX_CTRL_SOFTWARE) == 0) {
-			/* 
+			/*
 			 * software controllable bit is set in first
 			 * fragment when given to BMU. Not set means that
-			 * this fragment was never sent or is already 
+			 * this fragment was never sent or is already
 			 * freed ( -> ring completely free now).
 			 */
 			pTxPort->pTxdRingTail = pTxd;
-			netif_start_queue(pAC->dev[pTxPort->PortIndex]);
+			netif_wake_queue(pAC->dev[pTxPort->PortIndex]);
 			return;
 		}
 		if (Control & TX_CTRL_OWN_BMU) {
 			pTxPort->pTxdRingTail = pTxd;
 			if (pTxPort->TxdRingFree > 0) {
-				netif_start_queue(pAC->dev[pTxPort->PortIndex]);
+				netif_wake_queue(pAC->dev[pTxPort->PortIndex]);
 			}
 			return;
 		}
@@ -2408,6 +2537,7 @@ SK_U32			Control;		/* control field of d
 struct sk_buff	*pMsg;			/* pointer to message holding frame */
 struct sk_buff	*pNewMsg;		/* pointer to a new message for copying frame */
 int				FrameLength;	/* total length of received frame */
+int				IpFrameLength;
 SK_MBUF			*pRlmtMbuf;		/* ptr to a buffer for giving a frame to rlmt */
 SK_EVPARA		EvPara;			/* an event parameter union */	
 unsigned long	Flags;			/* for spin lock */
@@ -2435,8 +2565,8 @@ rx_start:	
 		  pRxPort->RxdRingFree ++) {
 
 		/*
-		 * For a better understanding of this loop 
-		 * Go through every descriptor beginning at the head 
+		 * For a better understanding of this loop
+		 * Go through every descriptor beginning at the head
 		 * Please note: the ring might be completely received so the OWN bit
 		 * set is not a good crirteria to leave that loop.
 		 * Therefore the RingFree counter is used.
@@ -2454,6 +2584,7 @@ rx_start:	
 			FillRxRing(pAC, pRxPort);
 			return;
 		}
+                pAC->DynIrqModInfo.NbrProcessedDescr++;
 
 		/* get length of frame and check it */
 		FrameLength = Control & RX_CTRL_LEN_MASK;
@@ -2500,7 +2631,7 @@ rx_start:	
 		if (pAC->GIni.GIChipId == CHIP_ID_GENESIS) {
 			IsBc = (FrameStat & XMR_FS_BC) != 0;
 			IsMc = (FrameStat & XMR_FS_MC) != 0;
-			IsBadFrame = (FrameStat & 
+			IsBadFrame = (FrameStat &
 				(XMR_FS_ANY_ERR | XMR_FS_2L_VLAN)) != 0;
 		} else {
 			IsBc = (FrameStat & GMR_FS_BC) != 0;
@@ -2563,6 +2694,7 @@ rx_start:	
 				FrameLength, 0);
 			ReQueueRxBuffer(pAC, pRxPort, pMsg,
 				pRxd->VDataHigh, pRxd->VDataLow);
+
 			pMsg = pNewMsg;
 
 		}
@@ -2585,33 +2717,65 @@ rx_start:	
 			skb_put(pMsg, FrameLength);
 			/* hardware checksum */
 			Type = ntohs(*((short*)&pMsg->data[12]));
+
+#ifdef USE_SK_RX_CHECKSUM
 			if (Type == 0x800) {
 				Csum1=le16_to_cpu(pRxd->TcpSums & 0xffff);
 				Csum2=le16_to_cpu((pRxd->TcpSums >> 16) & 0xffff);
-				if ((((Csum1 & 0xfffe) && (Csum2 & 0xfffe)) &&
-					(pAC->GIni.GIChipId == CHIP_ID_GENESIS)) ||
-					(pAC->GIni.GIChipId == CHIP_ID_YUKON)) {
-					Result = SkCsGetReceiveInfo(pAC,
-						&pMsg->data[14], 
-						Csum1, Csum2, pRxPort->PortIndex);
-					if (Result ==
-						SKCS_STATUS_IP_FRAGMENT ||
-						Result ==
-						SKCS_STATUS_IP_CSUM_OK ||
-						Result ==
-						SKCS_STATUS_TCP_CSUM_OK ||
-						Result ==
-						SKCS_STATUS_UDP_CSUM_OK) {
-							pMsg->ip_summed =
-							CHECKSUM_UNNECESSARY;
-					} else {
-						SK_DBG_MSG(NULL, SK_DBGMOD_DRV,
-						SK_DBGCAT_DRV_RX_PROGRESS,
-						("skge: CRC error. Frame dropped!\n"));
-						goto rx_failed;
-					}
-				}/* checksumControl calculation valid */
+				IpFrameLength = (int) ntohs((unsigned short)
+								((unsigned short *) pMsg->data)[8]);
+
+				/*
+				 * Test: If frame is padded, a check is not possible!
+				 * Frame not padded? Length difference must be 14 (0xe)!
+				 */
+				if ((FrameLength - IpFrameLength) != 0xe) {
+				/* Frame padded => TCP offload not possible! */
+					pMsg->ip_summed = CHECKSUM_NONE;
+				} else {
+				/* Frame not padded => TCP offload! */
+					if ((((Csum1 & 0xfffe) && (Csum2 & 0xfffe)) &&
+						(pAC->GIni.GIChipId == CHIP_ID_GENESIS)) ||
+						(pAC->GIni.GIChipId == CHIP_ID_YUKON)) {
+						Result = SkCsGetReceiveInfo(pAC,
+							&pMsg->data[14],
+							Csum1, Csum2, pRxPort->PortIndex);
+						if (Result ==
+							SKCS_STATUS_IP_FRAGMENT ||
+							Result ==
+							SKCS_STATUS_IP_CSUM_OK ||
+							Result ==
+							SKCS_STATUS_TCP_CSUM_OK ||
+							Result ==
+							SKCS_STATUS_UDP_CSUM_OK) {
+								pMsg->ip_summed =
+								CHECKSUM_UNNECESSARY;
+						}
+						else if (Result ==
+							SKCS_STATUS_TCP_CSUM_ERROR ||
+							Result ==
+							SKCS_STATUS_UDP_CSUM_ERROR ||
+							Result ==
+							SKCS_STATUS_IP_CSUM_ERROR_UDP ||
+							Result ==
+							SKCS_STATUS_IP_CSUM_ERROR_TCP ||
+							Result ==
+							SKCS_STATUS_IP_CSUM_ERROR ) {
+							/* HW Checksum error */
+							SK_DBG_MSG(NULL, SK_DBGMOD_DRV,
+							SK_DBGCAT_DRV_RX_PROGRESS,
+							("skge: CRC error. Frame dropped!\n"));
+							goto rx_failed;
+						} else {
+								pMsg->ip_summed =
+								CHECKSUM_NONE;
+						}
+					}/* checksumControl calculation valid */
+				} /* Frame length check */
 			} /* IP frame */
+#else
+			pMsg->ip_summed = CHECKSUM_NONE;	
+#endif
 		} /* frame > SK_COPY_TRESHOLD */
 		
 		SK_DBG_MSG(NULL, SK_DBGMOD_DRV,	1,("V"));
@@ -2625,7 +2789,7 @@ rx_start:	
 #if 0
 			IsMc = (FrameStat & XMR_FS_MC)==XMR_FS_MC;
 #endif
-			SK_RLMT_LOOKAHEAD(pAC, PortIndex, 
+			SK_RLMT_LOOKAHEAD(pAC, PortIndex,
 				&pMsg->data[Offset],
 				IsBc, IsMc, &ForRlmt);
 		}
@@ -2650,7 +2814,7 @@ rx_start:	
 			}
 			else {
 				/* drop frame */
-				SK_DBG_MSG(NULL, SK_DBGMOD_DRV, 
+				SK_DBG_MSG(NULL, SK_DBGMOD_DRV,
 					SK_DBGCAT_DRV_RX_PROGRESS,
 					("D"));
 				DEV_KFREE_SKB(pMsg);
@@ -2659,7 +2823,7 @@ rx_start:	
 		} /* if not for rlmt */
 		else {
 			/* packet for rlmt */
-			SK_DBG_MSG(NULL, SK_DBGMOD_DRV, 
+			SK_DBG_MSG(NULL, SK_DBGMOD_DRV,
 				SK_DBGCAT_DRV_RX_PROGRESS, ("R"));
 			pRlmtMbuf = SkDrvAllocRlmtMbuf(pAC,
 				pAC->IoBase, FrameLength);
@@ -2687,14 +2851,14 @@ rx_start:	
 					pAC->CheckQueue = SK_TRUE;
 				}
 
-				SK_DBG_MSG(NULL, SK_DBGMOD_DRV, 
+				SK_DBG_MSG(NULL, SK_DBGMOD_DRV,
 					SK_DBGCAT_DRV_RX_PROGRESS,
 					("Q"));
 			}
-			if ((pAC->dev[pRxPort->PortIndex]->flags & 
+			if ((pAC->dev[pRxPort->PortIndex]->flags &
 				(IFF_PROMISC | IFF_ALLMULTI)) != 0 ||
-				(ForRlmt & SK_RLMT_RX_PROTOCOL) == 
-				SK_RLMT_RX_PROTOCOL) { 
+				(ForRlmt & SK_RLMT_RX_PROTOCOL) ==
+				SK_RLMT_RX_PROTOCOL) {
 				pMsg->dev = pAC->dev[pRxPort->PortIndex];
 				pMsg->protocol = eth_type_trans(pMsg,
 					pAC->dev[pRxPort->PortIndex]);
@@ -2711,7 +2875,7 @@ rx_start:	
 	/* RXD ring is empty -> fill and restart */
 	FillRxRing(pAC, pRxPort);
 	/* do not start if called from Close */
-	if (pAC->BoardLevel > 0) {
+	if (pAC->BoardLevel > SK_INIT_DATA) {
 		ClearAndStartRx(pAC, PortIndex);
 	}
 	return;
@@ -2854,6 +3018,7 @@ unsigned long	Flags;
 } /* ClearTxRing */
 
 
+#if 0
 /*****************************************************************************
  *
  * 	SetQueueSizes - configure the sizes of rx and tx queues
@@ -2881,7 +3046,7 @@ int	i;		/* loop counter */
 if (pAC->RlmtNets == 1) {
 	StandbyRam = SK_RLMT_STANDBY_QRXSIZE + SK_RLMT_STANDBY_QXASIZE +
 		SK_RLMT_STANDBY_QXSSIZE;
-	RemainingRam = pAC->GIni.GIRamSize - 
+	RemainingRam = pAC->GIni.GIRamSize -
 		(pAC->GIni.GIMacsFound-1) * StandbyRam;
 	for (i=0; i<pAC->GIni.GIMacsFound; i++) {
 		pAC->GIni.GP[i].PRxQSize = SK_RLMT_STANDBY_QRXSIZE;
@@ -2945,6 +3110,7 @@ if (pAC->RlmtNets == 1) {
 	}
 #endif
 } /* SetQueueSizes */
+#endif
 
 
 /*****************************************************************************
@@ -3097,7 +3263,7 @@ SK_EVPARA 	EvPara;
 		return -EINVAL;
 	}
 
-	if(pAC->BoardLevel != 2) {
+	if(pAC->BoardLevel != SK_INIT_RUN) {
 		return -EINVAL;
 	}
 
@@ -3123,7 +3289,7 @@ SK_EVPARA 	EvPara;
 	spin_lock_irqsave(&pAC->SlowPathLock, Flags);
 
 	/* Found more than one port */
-	if ((pAC->GIni.GIMacsFound == 2 ) && 
+	if ((pAC->GIni.GIMacsFound == 2 ) &&
 		(pAC->RlmtNets == 2)) {
 			/* Stop both ports */
 			EvPara.Para32[0] = 0;
@@ -3143,16 +3309,16 @@ SK_EVPARA 	EvPara;
 
 	}
 
-	/* 
+	/*
 	 * adjust number of rx buffers allocated
 	 */
 	if (NewMtu > 1500) {
 		/* use less rx buffers */
 		for (i=0; i<pAC->GIni.GIMacsFound; i++) {
 			/* Found more than one port */
-			if ((pAC->GIni.GIMacsFound == 2 ) && 
+			if ((pAC->GIni.GIMacsFound == 2 ) &&
 				(pAC->RlmtNets == 2)) {
-					pAC->RxPort[i].RxFillLimit = 
+					pAC->RxPort[i].RxFillLimit =
 						pAC->RxDescrPerRing - 100;
 			} else {
 				if (i == pAC->ActivePort)
@@ -3168,7 +3334,7 @@ SK_EVPARA 	EvPara;
 		/* use normal amount of rx buffers */
 		for (i=0; i<pAC->GIni.GIMacsFound; i++) {
 			/* Found more than one port */
-			if ((pAC->GIni.GIMacsFound == 2 ) && 
+			if ((pAC->GIni.GIMacsFound == 2 ) &&
 				(pAC->RlmtNets == 2)) {
 					pAC->RxPort[i].RxFillLimit = 1;
 			} else {
@@ -3180,10 +3346,10 @@ SK_EVPARA 	EvPara;
 			}
 		}
 	}
-	 
-	SkGeDeInit(pAC, pAC->IoBase); 
+	
+	SkGeDeInit(pAC, pAC->IoBase);
 
-	/* 
+	/*
 	 * enable/disable hardware support for long frames
 	 */
 	if (NewMtu > 1500) {
@@ -3191,7 +3357,7 @@ SK_EVPARA 	EvPara;
 		pAC->GIni.GIPortUsage = SK_JUMBO_LINK;
 	}
 	else {
-		if ((pAC->GIni.GIMacsFound == 2 ) && 
+		if ((pAC->GIni.GIMacsFound == 2 ) &&
 			(pAC->RlmtNets == 2)) {
 			pAC->GIni.GIPortUsage = SK_MUL_LINK;
 		} else {
@@ -3199,13 +3365,13 @@ SK_EVPARA 	EvPara;
 		}
 	}
 
-	SkGeInit(   pAC, pAC->IoBase, 1);
-	SkI2cInit(  pAC, pAC->IoBase, 1);
-	SkEventInit(pAC, pAC->IoBase, 1);
-	SkPnmiInit( pAC, pAC->IoBase, 1);
-	SkAddrInit( pAC, pAC->IoBase, 1);
-	SkRlmtInit( pAC, pAC->IoBase, 1);
-	SkTimerInit(pAC, pAC->IoBase, 1);
+	SkGeInit(   pAC, pAC->IoBase, SK_INIT_IO);
+	SkI2cInit(  pAC, pAC->IoBase, SK_INIT_IO);
+	SkEventInit(pAC, pAC->IoBase, SK_INIT_IO);
+	SkPnmiInit( pAC, pAC->IoBase, SK_INIT_IO);
+	SkAddrInit( pAC, pAC->IoBase, SK_INIT_IO);
+	SkRlmtInit( pAC, pAC->IoBase, SK_INIT_IO);
+	SkTimerInit(pAC, pAC->IoBase, SK_INIT_IO);
 	
 	/*
 	 * tschilling:
@@ -3213,17 +3379,18 @@ SK_EVPARA 	EvPara;
 	 */
 	GetConfiguration(pAC);
 	
-	SkGeInit(   pAC, pAC->IoBase, 2);
-	SkI2cInit(  pAC, pAC->IoBase, 2);
-	SkEventInit(pAC, pAC->IoBase, 2);
-	SkPnmiInit( pAC, pAC->IoBase, 2);
-	SkAddrInit( pAC, pAC->IoBase, 2);
-	SkRlmtInit( pAC, pAC->IoBase, 2);
-	SkTimerInit(pAC, pAC->IoBase, 2);
+	SkGeInit(   pAC, pAC->IoBase, SK_INIT_RUN);
+	SkI2cInit(  pAC, pAC->IoBase, SK_INIT_RUN);
+	SkEventInit(pAC, pAC->IoBase, SK_INIT_RUN);
+	SkPnmiInit( pAC, pAC->IoBase, SK_INIT_RUN);
+	SkAddrInit( pAC, pAC->IoBase, SK_INIT_RUN);
+	SkRlmtInit( pAC, pAC->IoBase, SK_INIT_RUN);
+	SkTimerInit(pAC, pAC->IoBase, SK_INIT_RUN);
 
-	/* 
+	/*
 	 * clear and reinit the rx rings here
 	 */
+
 	for (i=0; i<pAC->GIni.GIMacsFound; i++) {
 		ReceiveIrq(pAC, &pAC->RxPort[i], SK_TRUE);
 		ClearRxRing(pAC, &pAC->RxPort[i]);
@@ -3236,15 +3403,8 @@ SK_EVPARA 	EvPara;
 
 	SkGeYellowLED(pAC, pAC->IoBase, 1);
 
-#ifdef USE_INT_MOD
-	{
-		unsigned long ModBase;
-		ModBase = 53125000 / INTS_PER_SEC;
-		SK_OUT32(pAC->IoBase, B2_IRQM_INI, ModBase);
-		SK_OUT32(pAC->IoBase, B2_IRQM_MSK, IRQ_MOD_MASK);
-		SK_OUT32(pAC->IoBase, B2_IRQM_CTRL, TIM_START);
-	}
-#endif
+	SkDimEnableModerationIfNeeded(pAC);	
+	SkDimDisplayModerationSettings(pAC);
 
 	netif_start_queue(pAC->dev[pNet->PortNr]);
 	for (i=pAC->GIni.GIMacsFound-1; i>=0; i--) {
@@ -3252,14 +3412,14 @@ SK_EVPARA 	EvPara;
 	}
 
 	/* enable Interrupts */
-	SK_OUT32(pAC->IoBase, B0_IMSK, IRQ_MASK);
+	SK_OUT32(pAC->IoBase, B0_IMSK, pAC->GIni.GIValIrqMask);
 	SK_OUT32(pAC->IoBase, B0_HWE_IMSK, IRQ_HWE_MASK);
 
 	SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_START, EvPara);
 	SkEventDispatcher(pAC, pAC->IoBase);
 
 	/* Found more than one port */
-	if ((pAC->GIni.GIMacsFound == 2 ) && 
+	if ((pAC->GIni.GIMacsFound == 2 ) &&
 		(pAC->RlmtNets == 2)) {
 			/* Start both ports */
 			EvPara.Para32[0] = pAC->RlmtNets;
@@ -3274,7 +3434,7 @@ SK_EVPARA 	EvPara;
 			
 			if (pOtherNet->Up) {
 				EvPara.Para32[0] = pOtherNet->PortNr;
-				SkEventQueue(pAC, SKGE_RLMT, 
+				SkEventQueue(pAC, SKGE_RLMT,
 					SK_RLMT_START, EvPara);
 			}
 	} else {
@@ -3378,10 +3538,14 @@ static int SkGeIoctl(struct SK_NET_DEVIC
 {
 DEV_NET		*pNet;
 SK_AC		*pAC;
+void		*pMemBuf;
 
 SK_GE_IOCTL	Ioctl;
 unsigned int	Err = 0;
-int		Size;
+int		Size = 0;
+int             Ret = 0;
+unsigned int	Length = 0;
+int		HeaderLength = sizeof(SK_U32) + sizeof(SK_U32);
 
 	SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_ENTRY,
 		("SkGeIoctl starts now...\n"));
@@ -3398,7 +3562,7 @@ int		Size;
 	case SK_IOCTL_PRESETMIB:
 		if (!capable(CAP_NET_ADMIN)) return -EPERM;
  	case SK_IOCTL_GETMIB:
-		if(copy_from_user(&pAC->PnmiStruct, Ioctl.pData, 
+		if(copy_from_user(&pAC->PnmiStruct, Ioctl.pData,
 			Ioctl.Len<sizeof(pAC->PnmiStruct)?
 			Ioctl.Len : sizeof(pAC->PnmiStruct))) {
 			return -EFAULT;
@@ -3413,10 +3577,36 @@ int		Size;
 			return -EFAULT;
 		}
 		break;
+	case SK_IOCTL_GEN:
+		if (Ioctl.Len < (sizeof(pAC->PnmiStruct) + HeaderLength)) {
+			Length = Ioctl.Len;
+		} else {
+			Length = sizeof(pAC->PnmiStruct) + HeaderLength;
+		}
+		if (NULL == (pMemBuf = kmalloc(Length, GFP_KERNEL))) {
+			return -EFAULT;
+		}
+		if(copy_from_user(pMemBuf, Ioctl.pData, Length)) {
+			return -EFAULT;
+		}
+		if ((Ret = SkPnmiGenIoctl(pAC, pAC->IoBase, pMemBuf, &Length, 0)) < 0) {
+			return -EFAULT;
+		}
+		if(copy_to_user(Ioctl.pData, pMemBuf, Length) ) {
+			return -EFAULT;
+		}
+		Ioctl.Len = Length;
+		if(copy_to_user(rq->ifr_data, &Ioctl, sizeof(SK_GE_IOCTL))) {
+			return -EFAULT;
+		}
+		kfree(pMemBuf); /* cleanup everything */
+		break;
 	default:
 		Err = -EOPNOTSUPP;
 	}
+
 	return(Err);
+
 } /* SkGeIoctl */
 
 
@@ -3506,8 +3696,8 @@ SK_BOOL DupSet;
  *	-----------------------------------------------------------------
  *	Sense		|   AutoSense	|   AutoSense	|   AutoSense	|
  */
-int	Capabilities[3][3] = 
-		{ {		  -1, SK_LMODE_FULL,     SK_LMODE_HALF}, 
+int	Capabilities[3][3] =
+		{ {		  -1, SK_LMODE_FULL,     SK_LMODE_HALF},
 		  {SK_LMODE_AUTOBOTH, SK_LMODE_AUTOFULL, SK_LMODE_AUTOHALF},
 		  {SK_LMODE_AUTOSENSE, SK_LMODE_AUTOSENSE, SK_LMODE_AUTOSENSE} };
 #define DC_BOTH	0
@@ -3545,7 +3735,7 @@ int	Capabilities[3][3] = 
 	/* Only copper type adapter and GE V2 cards */
 	if (((pAC->GIni.GIChipId != CHIP_ID_YUKON) ||
 		(pAC->GIni.GICopperType != SK_TRUE)) &&
-		((LinkSpeed != SK_LSPEED_AUTO) && 
+		((LinkSpeed != SK_LSPEED_AUTO) &&
 		(LinkSpeed != SK_LSPEED_1000MBPS))) {
 		printk("%s: Illegal value for Speed_A. "
 			"Not a copper card or GE V2 card\n    Using "
@@ -3704,7 +3894,7 @@ int	Capabilities[3][3] = 
 	/* Only copper type adapter and GE V2 cards */
 	if (((pAC->GIni.GIChipId != CHIP_ID_YUKON) ||
 		(pAC->GIni.GICopperType != SK_TRUE)) &&
-		((LinkSpeed != SK_LSPEED_AUTO) && 
+		((LinkSpeed != SK_LSPEED_AUTO) &&
 		(LinkSpeed != SK_LSPEED_1000MBPS))) {
 		printk("%s: Illegal value for Speed_B. "
 			"Not a copper card or GE V2 card\n    Using "
@@ -3880,7 +4070,7 @@ int	Capabilities[3][3] = 
 		}
 		else if (strcmp(RlmtMode[pAC->Index], "CheckSeg") == 0) {
 			pAC->RlmtMode = SK_RLMT_CHECK_LINK |
-				SK_RLMT_CHECK_LOC_LINK | 
+				SK_RLMT_CHECK_LOC_LINK |
 				SK_RLMT_CHECK_SEG;
 		}
 		else if ((strcmp(RlmtMode[pAC->Index], "DualNet") == 0) &&
@@ -3897,6 +4087,104 @@ int	Capabilities[3][3] = 
 	else {
 		pAC->RlmtMode = 0;
 	}
+	
+	/*
+	** Check the interrupt moderation parameters
+	*/
+	if (Moderation[pAC->Index] != NULL) {
+	    if (strcmp(Moderation[pAC->Index], "Static") == 0) {
+                pAC->DynIrqModInfo.IntModTypeSelect = C_INT_MOD_STATIC;
+	    } else if (strcmp(Moderation[pAC->Index], "Dynamic") == 0) {
+	        pAC->DynIrqModInfo.IntModTypeSelect = C_INT_MOD_DYNAMIC;
+	    } else {
+	        pAC->DynIrqModInfo.IntModTypeSelect = C_INT_MOD_NONE;
+	    }
+	} else {
+	    pAC->DynIrqModInfo.IntModTypeSelect = C_INT_MOD_NONE;
+	}
+
+	if (Stats[pAC->Index] != NULL) {
+	    if (strcmp(Stats[pAC->Index], "Yes") == 0) {
+	        pAC->DynIrqModInfo.DisplayStats = SK_TRUE;
+	    } else {
+		pAC->DynIrqModInfo.DisplayStats = SK_FALSE;
+	    }
+	} else {
+	    pAC->DynIrqModInfo.DisplayStats = SK_FALSE;
+	}
+
+        if (ModerationMask[pAC->Index] != NULL) {
+           if (strcmp(ModerationMask[pAC->Index], "Rx") == 0) {
+               pAC->DynIrqModInfo.MaskIrqModeration = IRQ_MASK_RX_ONLY;
+           } else if (strcmp(ModerationMask[pAC->Index], "Tx") == 0) {
+               pAC->DynIrqModInfo.MaskIrqModeration = IRQ_MASK_TX_ONLY;
+           } else if (strcmp(ModerationMask[pAC->Index], "Sp") == 0) {
+               pAC->DynIrqModInfo.MaskIrqModeration = IRQ_MASK_SP_ONLY;
+           } else if (strcmp(ModerationMask[pAC->Index], "RxSp") == 0) {
+               pAC->DynIrqModInfo.MaskIrqModeration = IRQ_MASK_SP_RX;
+           } else if (strcmp(ModerationMask[pAC->Index], "SpRx") == 0) {
+               pAC->DynIrqModInfo.MaskIrqModeration = IRQ_MASK_SP_RX;
+           } else if (strcmp(ModerationMask[pAC->Index], "RxTx") == 0) {
+               pAC->DynIrqModInfo.MaskIrqModeration = IRQ_MASK_TX_RX;
+           } else if (strcmp(ModerationMask[pAC->Index], "TxRx") == 0) {
+               pAC->DynIrqModInfo.MaskIrqModeration = IRQ_MASK_TX_RX;
+           } else if (strcmp(ModerationMask[pAC->Index], "TxSp") == 0) {
+               pAC->DynIrqModInfo.MaskIrqModeration = IRQ_MASK_SP_TX;
+           } else if (strcmp(ModerationMask[pAC->Index], "SpTx") == 0) {
+               pAC->DynIrqModInfo.MaskIrqModeration = IRQ_MASK_SP_TX;
+           } else if (strcmp(ModerationMask[pAC->Index], "RxTxSp") == 0) {
+               pAC->DynIrqModInfo.MaskIrqModeration = IRQ_MASK_RX_TX_SP;
+           } else if (strcmp(ModerationMask[pAC->Index], "RxSpTx") == 0) {
+               pAC->DynIrqModInfo.MaskIrqModeration = IRQ_MASK_RX_TX_SP;
+           } else if (strcmp(ModerationMask[pAC->Index], "TxRxSp") == 0) {
+               pAC->DynIrqModInfo.MaskIrqModeration = IRQ_MASK_RX_TX_SP;
+           } else if (strcmp(ModerationMask[pAC->Index], "TxSpRx") == 0) {
+               pAC->DynIrqModInfo.MaskIrqModeration = IRQ_MASK_RX_TX_SP;
+           } else if (strcmp(ModerationMask[pAC->Index], "SpTxRx") == 0) {
+               pAC->DynIrqModInfo.MaskIrqModeration = IRQ_MASK_RX_TX_SP;
+           } else if (strcmp(ModerationMask[pAC->Index], "SpRxTx") == 0) {
+               pAC->DynIrqModInfo.MaskIrqModeration = IRQ_MASK_RX_TX_SP;
+           } else { /* some rubbish */
+               pAC->DynIrqModInfo.MaskIrqModeration = IRQ_MASK_RX_ONLY;
+           }
+        } else {  /* operator has stated nothing */
+           pAC->DynIrqModInfo.MaskIrqModeration = IRQ_MASK_TX_RX;
+        }
+
+        if (AutoSizing[pAC->Index] != NULL) {
+           if (strcmp(AutoSizing[pAC->Index], "On") == 0) {
+               pAC->DynIrqModInfo.AutoSizing = SK_FALSE;
+           } else {
+               pAC->DynIrqModInfo.AutoSizing = SK_FALSE;
+           }
+        } else {  /* operator has stated nothing */
+           pAC->DynIrqModInfo.AutoSizing = SK_FALSE;
+        }
+
+        if (IntsPerSec[pAC->Index] != 0) {
+           if ((IntsPerSec[pAC->Index]< 30)&&(IntsPerSec[pAC->Index]> 40000)) {
+              pAC->DynIrqModInfo.MaxModIntsPerSec = C_INTS_PER_SEC_DEFAULT;
+           } else {
+              pAC->DynIrqModInfo.MaxModIntsPerSec = IntsPerSec[pAC->Index];
+           }
+        } else {
+           pAC->DynIrqModInfo.MaxModIntsPerSec = C_INTS_PER_SEC_DEFAULT;
+        }
+
+        /*
+	** Evaluate upper and lower moderation threshold
+	*/
+        pAC->DynIrqModInfo.MaxModIntsPerSecUpperLimit =
+            pAC->DynIrqModInfo.MaxModIntsPerSec +
+            (pAC->DynIrqModInfo.MaxModIntsPerSec / 2);
+
+        pAC->DynIrqModInfo.MaxModIntsPerSecLowerLimit =
+            pAC->DynIrqModInfo.MaxModIntsPerSec -
+            (pAC->DynIrqModInfo.MaxModIntsPerSec / 2);
+
+        pAC->DynIrqModInfo.PrevTimeVal = jiffies;  /* initial value */
+
+
 } /* GetConfiguration */
 
 
@@ -3931,8 +4219,44 @@ unsigned long Flags;
 	}
 } /* ProductStr */
 
+/*****************************************************************************
+ *
+ *      StartDrvCleanupTimer - Start timer to check for descriptors which
+ *                             might be placed in descriptor ring, but
+ *                             havent been handled up to now
+ *
+ * Description:
+ *      This function requests a HW-timer fo the Yukon card. The actions to
+ *      perform when this timer expires, are located in the SkDrvEvent().
+ *
+ * Returns: N/A
+ */
+static void
+StartDrvCleanupTimer(SK_AC *pAC) {
+    SK_EVPARA    EventParam;   /* Event struct for timer event */
+
+    SK_MEMSET((char *) &EventParam, 0, sizeof(EventParam));
+    EventParam.Para32[0] = SK_DRV_RX_CLEANUP_TIMER;
+    SkTimerStart(pAC, pAC->IoBase, &pAC->DrvCleanupTimer,
+                 SK_DRV_RX_CLEANUP_TIMER_LENGTH,
+                 SKGE_DRV, SK_DRV_TIMER, EventParam);
+}
 
-
+/*****************************************************************************
+ *
+ *      StopDrvCleanupTimer - Stop timer to check for descriptors
+ *
+ * Description:
+ *      This function requests a HW-timer fo the Yukon card. The actions to
+ *      perform when this timer expires, are located in the SkDrvEvent().
+ *
+ * Returns: N/A
+ */
+static void
+StopDrvCleanupTimer(SK_AC *pAC) {
+    SkTimerStop(pAC, pAC->IoBase, &pAC->DrvCleanupTimer);
+    SK_MEMSET((char *) &pAC->DrvCleanupTimer, 0, sizeof(SK_TIMER));
+}
 
 /****************************************************************************/
 /* functions for common modules *********************************************/
@@ -3991,8 +4315,8 @@ struct sk_buff	*pMsgBlock;	/* pointer to
  *	Nothing
  */
 void  SkDrvFreeRlmtMbuf(
-SK_AC		*pAC,		/* pointer to adapter context */  
-SK_IOC		IoC,		/* the IO-context */              
+SK_AC		*pAC,		/* pointer to adapter context */
+SK_IOC		IoC,		/* the IO-context */
 SK_MBUF		*pMbuf)		/* size of the requested buffer */
 {
 SK_MBUF		*pFreeMbuf;
@@ -4021,7 +4345,9 @@ SK_MBUF		*pNextMbuf;
  */
 SK_U64 SkOsGetTime(SK_AC *pAC)
 {
-	return jiffies;
+	SK_U64	PrivateJiffies;
+	SkOsGetTimeCurrent(pAC, &PrivateJiffies);
+	return PrivateJiffies;
 } /* SkOsGetTime */
 
 
@@ -4269,6 +4595,9 @@ SK_BOOL		DualNet;
 			printk("    speed:           unknown\n");
 		}
 
+		/* Mac update */
+		SkAddrMcUpdate(pAC,IoC, FromPort);
+
 		Stat = pAC->GIni.GP[FromPort].PLinkModeStatus;
 		if (Stat == SK_LMODE_STAT_AUTOHALF ||
 			Stat == SK_LMODE_STAT_AUTOFULL) {
@@ -4313,18 +4642,26 @@ SK_BOOL		DualNet;
 				printk("    role:            ???\n");
 			}
 		}
-
+ 
 #ifdef SK_ZEROCOPY
 		if (pAC->GIni.GIChipId == CHIP_ID_YUKON)
+#ifdef USE_SK_TX_CHECKSUM
 			printk("    scatter-gather:  enabled\n");
+#else
+			printk("    tx-checksum:     disabled\n");
+#endif
 		else
 			printk("    scatter-gather:  disabled\n");
-
 #else
 			printk("    scatter-gather:  disabled\n");
 #endif
-		
-		if ((Param.Para32[0] != pAC->ActivePort) && 
+
+#ifndef USE_SK_RX_CHECKSUM
+			printk("    rx-checksum:     disabled\n");
+#endif
+
+	
+		if ((Param.Para32[0] != pAC->ActivePort) &&
 			(pAC->RlmtNets == 1)) {
 			NewPara.Para32[0] = pAC->ActivePort;
 			NewPara.Para32[1] = Param.Para32[0];
@@ -4379,7 +4716,7 @@ SK_BOOL		DualNet;
 		ClearTxRing(pAC, &pAC->TxPort[FromPort][TX_PRIO_LOW]);
 		ClearTxRing(pAC, &pAC->TxPort[ToPort][TX_PRIO_LOW]);
 		spin_lock_irqsave(
-			&pAC->TxPort[FromPort][TX_PRIO_LOW].TxDesRingLock, 
+			&pAC->TxPort[FromPort][TX_PRIO_LOW].TxDesRingLock,
 			Flags);
 		spin_lock_irqsave(
 			&pAC->TxPort[ToPort][TX_PRIO_LOW].TxDesRingLock, Flags);
@@ -4441,6 +4778,31 @@ SK_BOOL		DualNet;
 
 			DEV_KFREE_SKB_ANY(pMsg);
 		break;
+	case SK_DRV_TIMER:
+		if (Param.Para32[0] == SK_DRV_MODERATION_TIMER) {
+			/*
+			** expiration of the moderation timer implies that
+			** dynamic moderation is to be applied
+			*/
+			SkDimStartModerationTimer(pAC);
+			SkDimModerate(pAC);
+                        if (pAC->DynIrqModInfo.DisplayStats) {
+			    SkDimDisplayModerationSettings(pAC);
+                        }
+                } else if (Param.Para32[0] == SK_DRV_RX_CLEANUP_TIMER) {
+			/*
+			** check if we need to check for descriptors which
+			** haven't been handled the last millisecs
+			*/
+			StartDrvCleanupTimer(pAC);
+			if (pAC->GIni.GIMacsFound == 2) {
+				ReceiveIrq(pAC, &pAC->RxPort[1], SK_TRUE);
+			}
+			ReceiveIrq(pAC, &pAC->RxPort[0], SK_TRUE);
+		} else {
+			printk("Expiration of unknown timer\n");
+		}
+		break;
 	default:
 		break;
 	}
@@ -4548,7 +4910,7 @@ static void DumpMsg(struct sk_buff *skb,
  *	DumpData - print a data area
  *
  * Description:
- *	This function prints a area of data to the system logfile/to the 
+ *	This function prints a area of data to the system logfile/to the
  *	console.
  *
  * Returns: N/A
@@ -4596,7 +4958,7 @@ char	HEXCHAR[] = "0123456789ABCDEF";
  *	DumpLong - print a data area as long values
  *
  * Description:
- *	This function prints a area of data to the system logfile/to the 
+ *	This function prints a area of data to the system logfile/to the
  *	console.
  *
  * Returns: N/A
@@ -4650,9 +5012,8 @@ int	l;
 
 #endif
 
-/*
- * Local variables:
- * compile-command: "make"
- * End:
- */
-
+/*******************************************************************************
+ *
+ * End of file
+ *
+ ******************************************************************************/
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/net/sk98lin/skgehwt.c linux-2.4.20-wolk4.4-fullkernel/drivers/net/sk98lin/skgehwt.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/net/sk98lin/skgehwt.c	2003-07-30 13:51:29.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/net/sk98lin/skgehwt.c	2003-07-30 10:31:39.000000000 +0200
@@ -1,17 +1,17 @@
 /******************************************************************************
  *
  * Name:	skgehwt.c
- * Project:	GEnesis, PCI Gigabit Ethernet Adapter
- * Version:	$Revision: 1.13 $
- * Date:	$Date: 1999/11/22 13:31:12 $
+ * Project:	Gigabit Ethernet Adapters, Common Modules
+ * Version:	$Revision: 1.14 $
+ * Date:	$Date: 2003/05/13 18:01:58 $
  * Purpose:	Hardware Timer.
  *
  ******************************************************************************/
 
 /******************************************************************************
  *
- *	(C)Copyright 1998,1999 SysKonnect,
- *	a business unit of Schneider & Koch & Co. Datensysteme GmbH.
+ *	(C)Copyright 1998-2002 SysKonnect GmbH.
+ *	(C)Copyright 2002-2003 Marvell.
  *
  *	This program is free software; you can redistribute it and/or modify
  *	it under the terms of the GNU General Public License as published by
@@ -27,6 +27,9 @@
  * History:
  *
  *	$Log: skgehwt.c,v $
+ *	Revision 1.14  2003/05/13 18:01:58  mkarl
+ *	Editorial changes.
+ *	
  *	Revision 1.13  1999/11/22 13:31:12  cgoos
  *	Changed license header to GPL.
  *	
@@ -76,8 +79,10 @@
 /*
 	Event queue and dispatcher
 */
+#if (defined(DEBUG) || ((!defined(LINT)) && (!defined(SK_SLIM))))
 static const char SysKonnectFileId[] =
-	"$Header: /usr56/projects/ge/schedule/skgehwt.c,v 1.13 1999/11/22 13:31:12 cgoos Exp $" ;
+	"$Header: /usr56/projects/ge/schedule/skgehwt.c,v 1.14 2003/05/13 18:01:58 mkarl Exp $" ;
+#endif
 
 #include "h/skdrv1st.h"		/* Driver Specific Definitions */
 #include "h/skdrv2nd.h"		/* Adapter Control- and Driver specific Def. */
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/net/sk98lin/skgeinit.c linux-2.4.20-wolk4.4-fullkernel/drivers/net/sk98lin/skgeinit.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/net/sk98lin/skgeinit.c	2003-07-30 13:51:29.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/net/sk98lin/skgeinit.c	2003-07-30 10:31:39.000000000 +0200
@@ -1,16 +1,17 @@
 /******************************************************************************
  *
  * Name:	skgeinit.c
- * Project:	GEnesis, PCI Gigabit Ethernet Adapter
- * Version:	$Revision: 1.84 $
- * Date:	$Date: 2003/01/28 09:57:25 $
- * Purpose:	Contains functions to initialize the GE HW
+ * Project:	Gigabit Ethernet Adapters, Common Modules
+ * Version:	$Revision: 1.93 $
+ * Date:	$Date: 2003/05/28 15:44:43 $
+ * Purpose:	Contains functions to initialize the adapter
  *
  ******************************************************************************/
 
 /******************************************************************************
  *
- *	(C)Copyright 1998-2003 SysKonnect GmbH.
+ *	(C)Copyright 1998-2002 SysKonnect.
+ *	(C)Copyright 2002-2003 Marvell.
  *
  *	This program is free software; you can redistribute it and/or modify
  *	it under the terms of the GNU General Public License as published by
@@ -26,6 +27,54 @@
  * History:
  *
  *	$Log: skgeinit.c,v $
+ *	Revision 1.93  2003/05/28 15:44:43  rschmidt
+ *	Added check for chip Id on WOL WA for chip Rev. A.
+ *	Added setting of GILevel in SkGeDeInit().
+ *	Minor changes to avoid LINT warnings.
+ *	Editorial changes.
+ *	
+ *	Revision 1.92  2003/05/13 17:42:26  mkarl
+ *	Added SK_FAR for PXE.
+ *	Separated code pathes not used for SLIM driver to reduce code size.
+ *	Removed calls to I2C for SLIM driver.
+ *	Removed currently unused function SkGeLoadLnkSyncCnt.
+ *	Editorial changes.
+ *	
+ *	Revision 1.91  2003/05/06 12:21:48  rschmidt
+ *	Added use of pAC->GIni.GIYukon for selection of YUKON branches.
+ *	Added defines around GENESIS resp. YUKON branches to reduce
+ *	code size for PXE.
+ *	Editorial changes.
+ *	
+ *	Revision 1.90  2003/04/28 09:12:20  rschmidt
+ *	Added init for GIValIrqMask (common IRQ mask).
+ *	Disabled HW Error IRQ on Yukon if sensor IRQ is set in SkGeInit1()
+ *	by changing the common mask stored in GIValIrqMask.
+ *	Editorial changes.
+ *	
+ *	Revision 1.89  2003/04/10 14:33:10  rschmidt
+ *	Fixed alignement error of patchable configuration parameter
+ *	in struct OemConfig caused by length of recognition string.
+ *	
+ *	Revision 1.88  2003/04/09 12:59:45  rschmidt
+ *	Added define around initialization of patchable OEM specific
+ *	configuration parameter.
+ *	
+ *	Revision 1.87  2003/04/08 16:46:13  rschmidt
+ *	Added configuration variable for OEMs and initialization for
+ *	GILedBlinkCtrl (LED Blink Control).
+ *	Improved detection for YUKON-Lite Rev. A1.
+ *	Editorial changes.
+ *	
+ *	Revision 1.86  2003/03/31 06:53:13  mkarl
+ *	Corrected Copyright.
+ *	Editorial changes.
+ *	
+ *	Revision 1.85  2003/02/05 15:30:33  rschmidt
+ *	Corrected setting of GIHstClkFact (Host Clock Factor) and
+ *	GIPollTimerVal (Descr. Poll Timer Init Value) for YUKON.
+ *	Editorial changes.
+ *	
  *	Revision 1.84  2003/01/28 09:57:25  rschmidt
  *	Added detection of YUKON-Lite Rev. A0 (stored in GIYukonLite).
  *	Disabled Rx GMAC FIFO Flush for YUKON-Lite Rev. A0.
@@ -395,8 +444,10 @@
 
 /* local variables ************************************************************/
 
+#if (defined(DEBUG) || ((!defined(LINT)) && (!defined(SK_SLIM))))
 static const char SysKonnectFileId[] =
-	"@(#)$Id: skgeinit.c,v 1.84 2003/01/28 09:57:25 rschmidt Exp $ (C) SK ";
+	"@(#) $Id: skgeinit.c,v 1.93 2003/05/28 15:44:43 rschmidt Exp $ (C) Marvell.";
+#endif
 
 struct s_QOffTab {
 	int	RxQOff;		/* Receive Queue Address Offset */
@@ -407,14 +458,27 @@ static struct s_QOffTab QOffTab[] = {
 	{Q_R1, Q_XS1, Q_XA1}, {Q_R2, Q_XS2, Q_XA2}
 };
 
+struct s_Config {
+	char	ScanString[8];
+	SK_U32	Value;
+};
+
+static struct s_Config OemConfig = {
+	{'O','E','M','_','C','o','n','f'},
+#ifdef SK_OEM_CONFIG
+	OEM_CONFIG_VALUE,
+#else
+	0,
+#endif
+};
 
 /******************************************************************************
  *
  *	SkGePollRxD() - Enable / Disable Descriptor Polling of RxD Ring
  *
  * Description:
- *	Enable or disable the descriptor polling the receive descriptor
- *	ring (RxD) of port 'Port'.
+ *	Enable or disable the descriptor polling of the receive descriptor
+ *	ring (RxD) for port 'Port'.
  *	The new configuration is *not* saved over any SkGeStopPort() and
  *	SkGeInitPort() calls.
  *
@@ -441,8 +505,8 @@ SK_BOOL PollRxD)	/* SK_TRUE (enable pol.
  *	SkGePollTxD() - Enable / Disable Descriptor Polling of TxD Rings
  *
  * Description:
- *	Enable or disable the descriptor polling the transmit descriptor
- *	ring(s) (TxD) of port 'Port'.
+ *	Enable or disable the descriptor polling of the transmit descriptor
+ *	ring(s) (TxD) for port 'Port'.
  *	The new configuration is *not* saved over any SkGeStopPort() and
  *	SkGeInitPort() calls.
  *
@@ -460,7 +524,7 @@ SK_BOOL PollTxD)	/* SK_TRUE (enable pol.
 
 	pPrt = &pAC->GIni.GP[Port];
 
-	DWord = (PollTxD) ? CSR_ENA_POL : CSR_DIS_POL;
+	DWord = (SK_U32)(PollTxD ? CSR_ENA_POL : CSR_DIS_POL);
 
 	if (pPrt->PXSQSize != 0) {
 		SK_OUT32(IoC, Q_ADDR(pPrt->PXsQOff, Q_CSR), DWord);
@@ -501,6 +565,7 @@ int		State)		/* yellow LED state, 0 = OF
 }	/* SkGeYellowLED */
 
 
+#if (!defined(SK_SLIM) || defined(GENESIS))
 /******************************************************************************
  *
  *	SkGeXmitLED() - Modify the Operational Mode of a transmission LED.
@@ -556,6 +621,7 @@ int		Mode)		/* Mode may be SK_LED_DIS, S
 	 * (In this case it has to be added here. But we will see. XXX)
 	 */
 }	/* SkGeXmitLED */
+#endif	/* !SK_SLIM || GENESIS */
 
 
 /******************************************************************************
@@ -576,12 +642,12 @@ int		Mode)		/* Mode may be SK_LED_DIS, S
  *	1:	configuration error
  */
 static int DoCalcAddr(
-SK_AC		*pAC, 			/* adapter context */
-SK_GEPORT	*pPrt,			/* port index */
-int			QuSize,			/* size of the queue to configure in kB */
-SK_U32		*StartVal,		/* start value for address calculation */
-SK_U32		*QuStartAddr,	/* start addr to calculate */
-SK_U32		*QuEndAddr)		/* end address to calculate */
+SK_AC		*pAC, 				/* adapter context */
+SK_GEPORT	SK_FAR *pPrt,		/* port index */
+int			QuSize,				/* size of the queue to configure in kB */
+SK_U32		SK_FAR *StartVal,	/* start value for address calculation */
+SK_U32		SK_FAR *QuStartAddr,/* start addr to calculate */
+SK_U32		SK_FAR *QuEndAddr)	/* end address to calculate */
 {
 	SK_U32	EndVal;
 	SK_U32	NextStart;
@@ -656,7 +722,6 @@ SK_BOOL	DualNet)		/* adapter context */
 		return(2);
 	}
 
-
 	if (DualNet) {
 		/* every port gets the same amount of memory */
 		ActivePortKilobytes = pAC->GIni.GIRamSize / pAC->GIni.GIMacsFound;
@@ -758,14 +823,19 @@ SK_AC	 *pAC,		/* adapter context */
 int		 Port)		/* port index */
 {
 	SK_GEPORT *pPrt;
-	int	UsedMem;	/* total memory used (max. found ports) */
 	int	i;
 	int	Rtv;
 	int	Rtv2;
 	SK_U32	StartAddr;
+#ifndef SK_SLIM
+	int	UsedMem;	/* total memory used (max. found ports) */
+#endif	
 
-	UsedMem = 0;
 	Rtv = 0;
+	
+#ifndef SK_SLIM
+
+	UsedMem = 0;
 	for (i = 0; i < pAC->GIni.GIMacsFound; i++) {
 		pPrt = &pAC->GIni.GP[i];
 
@@ -801,6 +871,7 @@ int		 Port)		/* port index */
 		SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_HWI_E012, SKERR_HWI_E012MSG);
 		return(1);
 	}
+#endif	/* !SK_SLIM */
 
 	/* Now start address calculation */
 	StartAddr = pAC->GIni.GIRamOffs;
@@ -832,6 +903,7 @@ int		 Port)		/* port index */
 }	/* SkGeCheckQSize */
 
 
+#ifdef GENESIS
 /******************************************************************************
  *
  *	SkGeInitMacArb() - Initialize the MAC Arbiter
@@ -866,7 +938,7 @@ SK_IOC	IoC)		/* IO context */
 	/* Fast Output Enable Mode was intended to use with Rev. B2, but now? */
 
 	/*
-	 * There is not start or enable button to push, therefore
+	 * There is no start or enable button to push, therefore
 	 * the MAC arbiter is configured and enabled now.
 	 */
 }	/* SkGeInitMacArb */
@@ -911,6 +983,7 @@ SK_IOC	IoC)		/* IO context */
 		}
 	}
 }	/* SkGeInitPktArb */
+#endif /* GENESIS */
 
 
 /******************************************************************************
@@ -940,8 +1013,9 @@ int		Port)		/* Port Index (MAC_1 + n) */
 	 *	- enable the FIFO
 	 */
 	
-	Word = GMF_RX_CTRL_DEF;
+	Word = (SK_U16)GMF_RX_CTRL_DEF;
 	
+#ifdef GENESIS
 	if (pAC->GIni.GIGenesis) {
 		/* Configure Rx MAC FIFO */
 		SK_OUT8(IoC, MR_ADDR(Port, RX_MFF_CTRL2), MFF_RST_CLR);
@@ -958,10 +1032,14 @@ int		Port)		/* Port Index (MAC_1 + n) */
 			SK_OUT16(IoC, MR_ADDR(Port, RX_MFF_CTRL1), MFF_ENA_FLUSH);
 		}
 	}
-	else {
+#endif /* GENESIS */
+	
+#ifdef YUKON
+	if (pAC->GIni.GIYukon) {
 		/* set Rx GMAC FIFO Flush Mask */
 		SK_OUT16(IoC, MR_ADDR(Port, RX_GMF_FL_MSK), (SK_U16)RX_FF_FL_DEF_MSK);
 		
+		/* disable Rx GMAC FIFO Flush for YUKON-Lite Rev. A0 only */
 		if (pAC->GIni.GIYukonLite && pAC->GIni.GIChipId == CHIP_ID_YUKON) {
 
 			Word &= ~GMF_RX_F_FL_ON;
@@ -986,9 +1064,11 @@ int		Port)		/* Port Index (MAC_1 + n) */
 		/* set Tx GMAC FIFO Almost Empty Threshold */
 /*		SK_OUT32(IoC, MR_ADDR(Port, TX_GMF_AE_THR), 0); */
 	}
-}	/* SkGeInitMacFifo */
+#endif /* YUKON */
 
+}	/* SkGeInitMacFifo */
 
+#ifdef	SK_LNK_SYNC_CNT
 /******************************************************************************
  *
  *	SkGeLoadLnkSyncCnt() - Load the Link Sync Counter and starts counting
@@ -1061,8 +1141,9 @@ SK_U32	CntVal)		/* Counter value */
 		SK_OUT32(IoC, B0_IMSK, OrgIMsk);
 	}
 }	/* SkGeLoadLnkSyncCnt*/
+#endif	/* SK_LNK_SYNC_CNT */
 
-
+#if defined(SK_DIAG) || defined(SK_CFG_SYNC)
 /******************************************************************************
  *
  *	SkGeCfgSync() - Configure synchronous bandwidth for this port.
@@ -1151,6 +1232,7 @@ int		SyncMode)	/* Sync Mode: TXA_ENA_ALL
 
 	return(0);
 }	/* SkGeCfgSync */
+#endif /* SK_DIAG || SK_CFG_SYNC*/
 
 
 /******************************************************************************
@@ -1216,7 +1298,7 @@ int		QuType)			/* Queue Type (SK_RX_SRAM
 			 * we NEED Store & Forward of the RAM buffer.
 			 */
 			if (pAC->GIni.GIPortUsage == SK_JUMBO_LINK ||
-				!pAC->GIni.GIGenesis) {
+				pAC->GIni.GIYukon) {
 				/* enable Store & Forward Mode for the Tx Side */
 				SK_OUT8(IoC, RB_ADDR(QuIoOffs, RB_CTRL), RB_ENA_STFWD);
 			}
@@ -1421,7 +1503,7 @@ int		QuIoOffs)	/* Queue IO Address Offse
  * Example:
  *	1) A Link Down event was signaled for a port. Therefore the activity
  *	of this port should be stopped and a hardware reset should be issued
- *	to enable the workaround of XMAC errata #2. But the received frames
+ *	to enable the workaround of XMAC Errata #2. But the received frames
  *	should not be discarded.
  *		...
  *		SkGeStopPort(pAC, IoC, Port, SK_STOP_TX, SK_HARD_RST);
@@ -1488,8 +1570,8 @@ int		RstMode)/* Reset Mode (SK_SOFT_RST,
 	SK_U32	DWord;
 	SK_U32	XsCsr;
 	SK_U32	XaCsr;
-	int		i;
 	SK_U64	ToutStart;
+	int		i;
 	int		ToutCnt;
 
 	pPrt = &pAC->GIni.GP[Port];
@@ -1513,8 +1595,8 @@ int		RstMode)/* Reset Mode (SK_SOFT_RST,
 			 * Clear packet arbiter timeout to make sure
 			 * this loop will terminate.
 			 */
-			SK_OUT16(IoC, B3_PA_CTRL, (Port == MAC_1) ? PA_CLR_TO_TX1 :
-				PA_CLR_TO_TX2);
+			SK_OUT16(IoC, B3_PA_CTRL, (SK_U16)((Port == MAC_1) ?
+				PA_CLR_TO_TX1 : PA_CLR_TO_TX2));
 
 			/*
 			 * If the transfer stucks at the MAC the STOP command will not
@@ -1594,6 +1676,7 @@ int		RstMode)/* Reset Mode (SK_SOFT_RST,
 		SK_OUT8(IoC, RB_ADDR(pPrt->PXsQOff, RB_CTRL), RB_RST_SET);
 		
 		/* Reset Tx MAC FIFO */
+#ifdef GENESIS
 		if (pAC->GIni.GIGenesis) {
 			/* Note: MFF_RST_SET does NOT reset the XMAC ! */
 			SK_OUT8(IoC, MR_ADDR(Port, TX_MFF_CTRL2), MFF_RST_SET);
@@ -1602,10 +1685,14 @@ int		RstMode)/* Reset Mode (SK_SOFT_RST,
 			/* Link LED is switched off by the RLMT and the Diag itself */
 			SkGeXmitLED(pAC, IoC, MR_ADDR(Port, TX_LED_INI), SK_LED_DIS);
 		}
-		else {
+#endif /* GENESIS */
+	
+#ifdef YUKON
+		if (pAC->GIni.GIYukon) {
 			/* Reset TX MAC FIFO */
 			SK_OUT8(IoC, MR_ADDR(Port, TX_GMF_CTRL_T), (SK_U8)GMF_RST_SET);
 		}
+#endif /* YUKON */
 	}
 
 	if ((Dir & SK_STOP_RX) != 0) {
@@ -1624,9 +1711,9 @@ int		RstMode)/* Reset Mode (SK_SOFT_RST,
 			 * Clear packet arbiter timeout to make sure
 			 * this loop will terminate
 			 */
-			SK_OUT16(IoC, B3_PA_CTRL, (Port == MAC_1) ? PA_CLR_TO_RX1 :
-				PA_CLR_TO_RX2);
-			
+			SK_OUT16(IoC, B3_PA_CTRL, (SK_U16)((Port == MAC_1) ?
+				PA_CLR_TO_RX1 : PA_CLR_TO_RX2));
+
 			DWord = TestStopBit(pAC, IoC, pPrt->PRxQOff);
 
 			/* timeout if i==0 (bug fix for #10748) */
@@ -1652,6 +1739,7 @@ int		RstMode)/* Reset Mode (SK_SOFT_RST,
 		SK_OUT8(IoC, RB_ADDR(pPrt->PRxQOff, RB_CTRL), RB_RST_SET);
 
 		/* Reset Rx MAC FIFO */
+#ifdef GENESIS
 		if (pAC->GIni.GIGenesis) {
 			
 			SK_OUT8(IoC, MR_ADDR(Port, RX_MFF_CTRL2), MFF_RST_SET);
@@ -1659,10 +1747,14 @@ int		RstMode)/* Reset Mode (SK_SOFT_RST,
 			/* switch Rx LED off, stop the LED counter */
 			SkGeXmitLED(pAC, IoC, MR_ADDR(Port, RX_LED_INI), SK_LED_DIS);
 		}
-		else {
+#endif /* GENESIS */
+	
+#ifdef YUKON
+		if (pAC->GIni.GIYukon) {
 			/* Reset Rx MAC FIFO */
 			SK_OUT8(IoC, MR_ADDR(Port, RX_GMF_CTRL_T), (SK_U8)GMF_RST_SET);
 		}
+#endif /* YUKON */
 	}
 }	/* SkGeStopPort */
 
@@ -1699,27 +1791,29 @@ SK_IOC	IoC)		/* IO context */
 		pPrt->PPrevRx = 0;
 		pPrt->PPrevFcs = 0;
 		pPrt->PRxLim = SK_DEF_RX_WA_LIM;
-		pPrt->PLinkMode = SK_LMODE_AUTOFULL;
-		pPrt->PLinkSpeedCap = SK_LSPEED_CAP_1000MBPS;
-		pPrt->PLinkSpeed = SK_LSPEED_1000MBPS;
-		pPrt->PLinkSpeedUsed = SK_LSPEED_STAT_UNKNOWN;
-		pPrt->PLinkModeConf = SK_LMODE_AUTOSENSE;
-		pPrt->PFlowCtrlMode = SK_FLOW_MODE_SYM_OR_REM;
-		pPrt->PLinkBroken = SK_TRUE; /* See WA code */
-		pPrt->PLinkCap = (SK_LMODE_CAP_HALF | SK_LMODE_CAP_FULL |
-				SK_LMODE_CAP_AUTOHALF | SK_LMODE_CAP_AUTOFULL);
-		pPrt->PLinkModeStatus = SK_LMODE_STAT_UNKNOWN;
-		pPrt->PFlowCtrlCap = SK_FLOW_MODE_SYM_OR_REM;
-		pPrt->PFlowCtrlStatus = SK_FLOW_STAT_NONE;
+		pPrt->PLinkMode = (SK_U8)SK_LMODE_AUTOFULL;
+		pPrt->PLinkSpeedCap = (SK_U8)SK_LSPEED_CAP_1000MBPS;
+		pPrt->PLinkSpeed = (SK_U8)SK_LSPEED_1000MBPS;
+		pPrt->PLinkSpeedUsed = (SK_U8)SK_LSPEED_STAT_UNKNOWN;
+		pPrt->PLinkModeConf = (SK_U8)SK_LMODE_AUTOSENSE;
+		pPrt->PFlowCtrlMode = (SK_U8)SK_FLOW_MODE_SYM_OR_REM;
+		pPrt->PLinkCap = (SK_U8)(SK_LMODE_CAP_HALF | SK_LMODE_CAP_FULL |
+			SK_LMODE_CAP_AUTOHALF | SK_LMODE_CAP_AUTOFULL);
+		pPrt->PLinkModeStatus = (SK_U8)SK_LMODE_STAT_UNKNOWN;
+		pPrt->PFlowCtrlCap = (SK_U8)SK_FLOW_MODE_SYM_OR_REM;
+		pPrt->PFlowCtrlStatus = (SK_U8)SK_FLOW_STAT_NONE;
 		pPrt->PMSCap = 0;
-		pPrt->PMSMode = SK_MS_MODE_AUTO;
-		pPrt->PMSStatus = SK_MS_STAT_UNSET;
+		pPrt->PMSMode = (SK_U8)SK_MS_MODE_AUTO;
+		pPrt->PMSStatus = (SK_U8)SK_MS_STAT_UNSET;
+		pPrt->PLipaAutoNeg = (SK_U8)SK_LIPA_UNKNOWN;
 		pPrt->PAutoNegFail = SK_FALSE;
-		pPrt->PLipaAutoNeg = SK_LIPA_UNKNOWN;
 		pPrt->PHWLinkUp = SK_FALSE;
+		pPrt->PLinkBroken = SK_TRUE; /* See WA code */
 	}
 
 	pAC->GIni.GIPortUsage = SK_RED_LINK;
+	pAC->GIni.GILedBlinkCtrl = (SK_U16)OemConfig.Value;
+	pAC->GIni.GIValIrqMask = IS_ALL_MSK;
 
 }	/* SkGeInit0*/
 
@@ -1786,8 +1880,8 @@ SK_IOC	IoC)		/* IO context */
 	SkPciReadCfgDWord(pAC, PCI_BASE_2ND, &Bp2);
 	SkPciReadCfgByte(pAC, PCI_LAT_TIM, &Lat);
 	
-	if (PciCmd != 0 || Cls != 0 || (Bp1 & 0xfffffff0L) != 0 || Bp2 != 1 ||
-		Lat != 0) {
+	if (PciCmd != 0 || Cls != (SK_U8)0 || Lat != (SK_U8)0 ||
+		(Bp1 & 0xfffffff0L) != 0 || Bp2 != 1) {
 		return(1);
 	}
 
@@ -1829,26 +1923,26 @@ SK_IOC	IoC)		/* IO context */
 	SK_U8	Byte;
 	SK_U16	Word;
 	SK_U16	CtrlStat;
-	SK_U32	FlashAddr;
+	SK_U32	DWord;
 	int	RetVal;
 	int	i;
 
 	RetVal = 0;
 
-	/* Save CLK_RUN bits (YUKON-Lite) */
+	/* save CLK_RUN bits (YUKON-Lite) */
 	SK_IN16(IoC, B0_CTST, &CtrlStat);
 
 #ifdef SK_PCI_RESET
 	(void)SkGePciReset(pAC, IoC);
 #endif /* SK_PCI_RESET */
 
-	/* Do the SW-reset */
+	/* do the SW-reset */
 	SK_OUT8(IoC, B0_CTST, CS_RST_SET);
 
-	/* Release the SW-reset */
+	/* release the SW-reset */
 	SK_OUT8(IoC, B0_CTST, CS_RST_CLR);
 
-	/* Reset all error bits in the PCI STATUS register */
+	/* reset all error bits in the PCI STATUS register */
 	/*
 	 * Note: PCI Cfg cycles cannot be used, because they are not
 	 *		 available on some platforms after 'boot time'.
@@ -1856,42 +1950,47 @@ SK_IOC	IoC)		/* IO context */
 	SK_IN16(IoC, PCI_C(PCI_STATUS), &Word);
 	
 	SK_OUT8(IoC, B2_TST_CTRL1, TST_CFG_WRITE_ON);
-	SK_OUT16(IoC, PCI_C(PCI_STATUS), Word | PCI_ERRBITS);
+	SK_OUT16(IoC, PCI_C(PCI_STATUS), (SK_U16)(Word | PCI_ERRBITS));
 	SK_OUT8(IoC, B2_TST_CTRL1, TST_CFG_WRITE_OFF);
 
-	/* Release Master Reset */
+	/* release Master Reset */
 	SK_OUT8(IoC, B0_CTST, CS_MRST_CLR);
 
 #ifdef CLK_RUN
 	CtrlStat |= CS_CLK_RUN_ENA;
 #endif /* CLK_RUN */
 
-	/* Restore CLK_RUN bits */
-	SK_OUT16(IoC, B0_CTST, CtrlStat &
-		(CS_CLK_RUN_HOT | CS_CLK_RUN_RST | CS_CLK_RUN_ENA));
+	/* restore CLK_RUN bits */
+	SK_OUT16(IoC, B0_CTST, (SK_U16)(CtrlStat &
+		(CS_CLK_RUN_HOT | CS_CLK_RUN_RST | CS_CLK_RUN_ENA)));
 	
-	/* Read Chip Identification Number */
+	/* read Chip Identification Number */
 	SK_IN8(IoC, B2_CHIP_ID, &Byte);
 	pAC->GIni.GIChipId = Byte;
 	
-	/* Read number of MACs */
+	/* read number of MACs */
 	SK_IN8(IoC, B2_MAC_CFG, &Byte);
 	pAC->GIni.GIMacsFound = (Byte & CFG_SNG_MAC) ? 1 : 2;
 	
-	/* Get Chip Revision Number */
+	/* get Chip Revision Number */
 	pAC->GIni.GIChipRev = (SK_U8)((Byte & CFG_CHIP_R_MSK) >> 4);
 
 	/* get diff. PCI parameters */
 	SK_IN16(IoC, B0_CTST, &CtrlStat);
 	
-	/* Read the adapters external SRAM size */
+	/* read the adapters RAM size */
 	SK_IN8(IoC, B2_E_0, &Byte);
 	
+	pAC->GIni.GIGenesis = SK_FALSE;
+	pAC->GIni.GIYukon = SK_FALSE;
+	pAC->GIni.GIYukonLite = SK_FALSE;
+
+#ifdef GENESIS
 	if (pAC->GIni.GIChipId == CHIP_ID_GENESIS) {
 
 		pAC->GIni.GIGenesis = SK_TRUE;
 
-		if (Byte == 3) {						
+		if (Byte == (SK_U8)3) {						
 			/* special case: 4 x 64k x 36, offset = 0x80000 */
 			pAC->GIni.GIRamSize = 1024;
 			pAC->GIni.GIRamOffs = (SK_U32)512 * 1024;
@@ -1900,43 +1999,73 @@ SK_IOC	IoC)		/* IO context */
 			pAC->GIni.GIRamSize = (int)Byte * 512;
 			pAC->GIni.GIRamOffs = 0;
 		}
+		/* all GE adapters work with 53.125 MHz host clock */
+		pAC->GIni.GIHstClkFact = SK_FACT_53;
+		
+		/* set Descr. Poll Timer Init Value to 250 ms */
+		pAC->GIni.GIPollTimerVal =
+			SK_DPOLL_DEF * (SK_U32)pAC->GIni.GIHstClkFact / 100;
 	}
-	else {
+#endif /* GENESIS */
+	
+#ifdef YUKON
+	if (pAC->GIni.GIChipId != CHIP_ID_GENESIS) {
+		
+		pAC->GIni.GIYukon = SK_TRUE;
+		
+		pAC->GIni.GIRamSize = (Byte == (SK_U8)0) ? 128 : (int)Byte * 4;
 		
-		pAC->GIni.GIGenesis = SK_FALSE;
-
-#ifndef VCPU
-		pAC->GIni.GIRamSize = (Byte == 0) ? 128 : (int)Byte * 4;
-#else
-		pAC->GIni.GIRamSize = 128;
-#endif		
 		pAC->GIni.GIRamOffs = 0;
 		
-		pAC->GIni.GIWolOffs = (pAC->GIni.GIChipRev == 0) ? WOL_REG_OFFS : 0;
+		/* WA for chip Rev. A */
+		pAC->GIni.GIWolOffs = (pAC->GIni.GIChipId == CHIP_ID_YUKON &&
+			pAC->GIni.GIChipRev == 0) ? WOL_REG_OFFS : 0;
 		
-		/* check PM Cap of PCI config space */
+		/* get PM Capabilities of PCI config space */
 		SK_IN16(IoC, PCI_C(PCI_PM_CAP_REG), &Word);
 
-			/* check if VAUX is available */
+		/* check if VAUX is available */
 		if (((CtrlStat & CS_VAUX_AVAIL) != 0) &&
 			/* check also if PME from D3cold is set */
 			((Word & PCI_PME_D3C_SUP) != 0)) {
-			/* set VAUX is available */
+			/* set entry in GE init struct */
 			pAC->GIni.GIVauxAvail = SK_TRUE;
 		}
 		
-		/* save Flash-Address Register */
-		SK_IN32(IoC, B2_FAR, &FlashAddr);
+		if (pAC->GIni.GIChipId == CHIP_ID_YUKON_LITE) {
+			/* this is Rev. A1 */
+			pAC->GIni.GIYukonLite = SK_TRUE;
+		}
+		else {
+			/* save Flash-Address Register */
+			SK_IN32(IoC, B2_FAR, &DWord);
+
+			/* test Flash-Address Register */
+			SK_OUT8(IoC, B2_FAR + 3, 0xff);
+			SK_IN8(IoC, B2_FAR + 3, &Byte);
+
+			if (Byte != 0) {
+				/* this is Rev. A0 */
+				pAC->GIni.GIYukonLite = SK_TRUE;
+
+				/* restore Flash-Address Register */
+				SK_OUT32(IoC, B2_FAR, DWord);
+			}
+		}
 
-		/* test Flash-Address Register */
-		SK_OUT8(IoC, B2_FAR + 3, 0xff);
-		SK_IN8(IoC, B2_FAR + 3, &Byte);
+		/* read the Interrupt source */
+		SK_IN32(IoC, B0_ISRC, &DWord);
 		
-		pAC->GIni.GIYukonLite = (SK_BOOL)(Byte != 0);
+		if ((DWord & IS_HW_ERR) != 0) {
+			/* read the HW Error Interrupt source */
+			SK_IN32(IoC, B0_HWE_ISRC, &DWord);
+			
+			if ((DWord & IS_IRQ_SENSOR) != 0) {
+				/* disable HW Error IRQ */
+				pAC->GIni.GIValIrqMask &= ~IS_HW_ERR;
+			}
+		}
 		
-		/* restore Flash-Address Register */
-		SK_OUT32(IoC, B2_FAR, FlashAddr);
-
 		for (i = 0; i < pAC->GIni.GIMacsFound; i++) {
 			/* set GMAC Link Control reset */
 			SK_OUT16(IoC, MR_ADDR(i, GMAC_LINK_CTRL), GMLC_RST_SET);
@@ -1944,33 +2073,34 @@ SK_IOC	IoC)		/* IO context */
 			/* clear GMAC Link Control reset */
 			SK_OUT16(IoC, MR_ADDR(i, GMAC_LINK_CTRL), GMLC_RST_CLR);
 		}
+		/* all YU chips work with 78.125 MHz host clock */
+		pAC->GIni.GIHstClkFact = SK_FACT_78;
+		
+		pAC->GIni.GIPollTimerVal = SK_DPOLL_MAX;	/* 215 ms */
 	}
+#endif /* YUKON */
 
-	/* Check if 64-bit PCI Slot is present */
+	/* check if 64-bit PCI Slot is present */
 	pAC->GIni.GIPciSlot64 = (SK_BOOL)((CtrlStat & CS_BUS_SLOT_SZ) != 0);
 	
-	/* Check if 66 MHz PCI Clock is active */
+	/* check if 66 MHz PCI Clock is active */
 	pAC->GIni.GIPciClock66 = (SK_BOOL)((CtrlStat & CS_BUS_CLOCK) != 0);
 
-	/* Read PCI HW Revision Id. */
+	/* read PCI HW Revision Id. */
 	SK_IN8(IoC, PCI_C(PCI_REV_ID), &Byte);
 	pAC->GIni.GIPciHwRev = Byte;
 
-	/* All known GE Adapters work with 53.125 MHz host clock */
-	pAC->GIni.GIHstClkFact = SK_FACT_53;
-	pAC->GIni.GIPollTimerVal =
-		SK_DPOLL_DEF * (SK_U32)pAC->GIni.GIHstClkFact / 100;
-	
-	/* Read the PMD type */
+	/* read the PMD type */
 	SK_IN8(IoC, B2_PMD_TYP, &Byte);
 	pAC->GIni.GICopperType = (SK_U8)(Byte == 'T');
 
-	/* Read the PHY type */
+	/* read the PHY type */
 	SK_IN8(IoC, B2_E_1, &Byte);
 
 	Byte &= 0x0f;	/* the PHY type is stored in the lower nibble */
 	for (i = 0; i < pAC->GIni.GIMacsFound; i++) {
 		
+#ifdef GENESIS
 		if (pAC->GIni.GIGenesis) {
 			switch (Byte) {
 			case SK_PHY_XMAC:
@@ -1978,8 +2108,8 @@ SK_IOC	IoC)		/* IO context */
 				break;
 			case SK_PHY_BCOM:
 				pAC->GIni.GP[i].PhyAddr = PHY_ADDR_BCOM;
-				pAC->GIni.GP[i].PMSCap =
-					SK_MS_CAP_AUTO | SK_MS_CAP_MASTER | SK_MS_CAP_SLAVE;
+				pAC->GIni.GP[i].PMSCap = (SK_U8)(SK_MS_CAP_AUTO |
+					SK_MS_CAP_MASTER | SK_MS_CAP_SLAVE);
 				break;
 #ifdef OTHER_PHY
 			case SK_PHY_LONE:
@@ -1995,36 +2125,48 @@ SK_IOC	IoC)		/* IO context */
 				break;
 			}
 		}
-		else {
-			if (Byte == 0) {
+#endif /* GENESIS */
+	
+#ifdef YUKON
+		if (pAC->GIni.GIYukon) {
+			
+			if (Byte < (SK_U8)SK_PHY_MARV_COPPER) {
 				/* if this field is not initialized */
-				Byte = SK_PHY_MARV_COPPER;
+				Byte = (SK_U8)SK_PHY_MARV_COPPER;
+				
 				pAC->GIni.GICopperType = SK_TRUE;
 			}
+			
 			pAC->GIni.GP[i].PhyAddr = PHY_ADDR_MARV;
 			
 			if (pAC->GIni.GICopperType) {
-				pAC->GIni.GP[i].PLinkSpeedCap = SK_LSPEED_CAP_AUTO |
+
+				pAC->GIni.GP[i].PLinkSpeedCap = (SK_U8)(SK_LSPEED_CAP_AUTO |
 					SK_LSPEED_CAP_10MBPS | SK_LSPEED_CAP_100MBPS |
-					SK_LSPEED_CAP_1000MBPS;
-				pAC->GIni.GP[i].PLinkSpeed = SK_LSPEED_AUTO;
-				pAC->GIni.GP[i].PMSCap =
-					SK_MS_CAP_AUTO | SK_MS_CAP_MASTER | SK_MS_CAP_SLAVE;
+					SK_LSPEED_CAP_1000MBPS);
+				
+				pAC->GIni.GP[i].PLinkSpeed = (SK_U8)SK_LSPEED_AUTO;
+				
+				pAC->GIni.GP[i].PMSCap = (SK_U8)(SK_MS_CAP_AUTO |
+					SK_MS_CAP_MASTER | SK_MS_CAP_SLAVE);
 			}
 			else {
-				Byte = SK_PHY_MARV_FIBER;
+				Byte = (SK_U8)SK_PHY_MARV_FIBER;
 			}
 		}
+#endif /* YUKON */
 		
-		pAC->GIni.GP[i].PhyType = Byte;
+		pAC->GIni.GP[i].PhyType = (int)Byte;
 		
 		SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_INIT,
 			("PHY type: %d  PHY addr: %04x\n", Byte,
 			pAC->GIni.GP[i].PhyAddr));
 	}
 	
-	/* Get Mac Type & set function pointers dependent on */
+	/* get MAC Type & set function pointers dependent on */
+#ifdef GENESIS
 	if (pAC->GIni.GIGenesis) {
+		
 		pAC->GIni.GIMacType = SK_MAC_XMAC;
 
 		pAC->GIni.GIFunc.pFnMacUpdateStats	= SkXmUpdateStats;
@@ -2032,24 +2174,30 @@ SK_IOC	IoC)		/* IO context */
 		pAC->GIni.GIFunc.pFnMacResetCounter	= SkXmResetCounter;
 		pAC->GIni.GIFunc.pFnMacOverflow		= SkXmOverflowStatus;
 	}
-	else {
+#endif /* GENESIS */
+	
+#ifdef YUKON
+	if (pAC->GIni.GIYukon) {
+		
 		pAC->GIni.GIMacType = SK_MAC_GMAC;
 
 		pAC->GIni.GIFunc.pFnMacUpdateStats	= SkGmUpdateStats;
 		pAC->GIni.GIFunc.pFnMacStatistic	= SkGmMacStatistic;
 		pAC->GIni.GIFunc.pFnMacResetCounter	= SkGmResetCounter;
 		pAC->GIni.GIFunc.pFnMacOverflow		= SkGmOverflowStatus;
-		
+
 #ifdef SPECIAL_HANDLING
 		if (pAC->GIni.GIChipId == CHIP_ID_YUKON) {
 			/* check HW self test result */
 			SK_IN8(IoC, B2_E_3, &Byte);
-			if ((Byte & B2_E3_RES_MASK) != 0) {
+			if (Byte & B2_E3_RES_MASK) {
 				RetVal = 6;
 			}
 		}
 #endif
 	}
+#endif /* YUKON */
+	
 	return(RetVal);
 }	/* SkGeInit1 */
 
@@ -2073,7 +2221,9 @@ static void SkGeInit2(
 SK_AC	*pAC,		/* adapter context */
 SK_IOC	IoC)		/* IO context */
 {
+#ifdef GENESIS
 	SK_U32	DWord;
+#endif /* GENESIS */
 	int		i;
 
 	/* start the Descriptor Poll Timer */
@@ -2087,6 +2237,7 @@ SK_IOC	IoC)		/* IO context */
 		SK_OUT8(IoC, B28_DPT_CTRL, DPT_START);
 	}
 
+#ifdef GENESIS
 	if (pAC->GIni.GIGenesis) {
 		/* start the Blink Source Counter */
 		DWord = SK_BLK_DUR * (SK_U32)pAC->GIni.GIHstClkFact / 100;
@@ -2102,10 +2253,14 @@ SK_IOC	IoC)		/* IO context */
 
 		SkGeInitPktArb(pAC, IoC);
 	}
-	else {
-		/* Start Time Stamp Timer */
+#endif /* GENESIS */
+	
+#ifdef YUKON
+	if (pAC->GIni.GIYukon) {
+		/* start Time Stamp Timer */
 		SK_OUT8(IoC, GMAC_TI_ST_CTRL, (SK_U8)GMT_ST_START);
 	}
+#endif /* YUKON */
 
 	/* enable the Tx Arbiters */
 	for (i = 0; i < pAC->GIni.GIMacsFound; i++) {
@@ -2177,17 +2332,17 @@ int		Level)		/* initialization level */
 			break;
 		}
 
-		/* Check if the adapter seems to be accessible */
-		SK_OUT32(IoC, B2_IRQM_INI, 0x11335577L);
+		/* check if the adapter seems to be accessible */
+		SK_OUT32(IoC, B2_IRQM_INI, SK_TEST_VAL);
 		SK_IN32(IoC, B2_IRQM_INI, &DWord);
 		SK_OUT32(IoC, B2_IRQM_INI, 0L);
 		
-		if (DWord != 0x11335577L) {
+		if (DWord != SK_TEST_VAL) {
 			RetVal = 2;
 			break;
 		}
 
-		/* Check if the number of GIMacsFound matches SK_MAX_MACS */
+		/* check if the number of GIMacsFound matches SK_MAX_MACS */
 		if (pAC->GIni.GIMacsFound > SK_MAX_MACS) {
 			RetVal = 1;
 			break;
@@ -2224,7 +2379,7 @@ int		Level)		/* initialization level */
 
 /******************************************************************************
  *
- *	SkGeDeInit() - Deinitialize the adapter.
+ *	SkGeDeInit() - Deinitialize the adapter
  *
  * Description:
  *	All ports of the adapter will be stopped if not already done.
@@ -2240,12 +2395,12 @@ SK_IOC	IoC)		/* IO context */
 	int	i;
 	SK_U16	Word;
 
-#ifndef VCPU
-	/* Ensure I2C is ready */
+#if (!defined(SK_SLIM) && !defined(VCPU))
+	/* ensure I2C is ready */
 	SkI2cWaitIrq(pAC, IoC);
-#endif
+#endif	
 
-	/* Stop all current transfer activity */
+	/* stop all current transfer activity */
 	for (i = 0; i < pAC->GIni.GIMacsFound; i++) {
 		if (pAC->GIni.GP[i].PState != SK_PRT_STOP &&
 			pAC->GIni.GP[i].PState != SK_PRT_RESET) {
@@ -2262,11 +2417,13 @@ SK_IOC	IoC)		/* IO context */
 	SK_IN16(IoC, PCI_C(PCI_STATUS), &Word);
 	
 	SK_OUT8(IoC, B2_TST_CTRL1, TST_CFG_WRITE_ON);
-	SK_OUT16(IoC, PCI_C(PCI_STATUS), Word | PCI_ERRBITS);
+	SK_OUT16(IoC, PCI_C(PCI_STATUS), (SK_U16)(Word | PCI_ERRBITS));
 	SK_OUT8(IoC, B2_TST_CTRL1, TST_CFG_WRITE_OFF);
 
-	/* Do the reset, all LEDs are switched off now */
+	/* do the reset, all LEDs are switched off now */
 	SK_OUT8(IoC, B0_CTST, CS_RST_SET);
+	
+	pAC->GIni.GILevel = SK_INIT_DATA;
 }	/* SkGeDeInit */
 
 
@@ -2317,10 +2474,11 @@ int		Port)		/* Port to configure */
 		return(2);
 	}
 
-	/* Configuration ok, initialize the Port now */
+	/* configuration ok, initialize the Port now */
 
+#ifdef GENESIS
 	if (pAC->GIni.GIGenesis) {
-		/* Initialize Rx, Tx and Link LED */
+		/* initialize Rx, Tx and Link LED */
 		/*
 		 * If 1000BT Phy needs LED initialization than swap
 		 * LED and XMAC initialization order
@@ -2331,12 +2489,16 @@ int		Port)		/* Port to configure */
 		
 		SkXmInitMac(pAC, IoC, Port);
 	}
-	else {
+#endif /* GENESIS */
+	
+#ifdef YUKON
+	if (pAC->GIni.GIYukon) {
 
 		SkGmInitMac(pAC, IoC, Port);
 	}
+#endif /* YUKON */
 	
-	/* Do NOT initialize the Link Sync Counter */
+	/* do NOT initialize the Link Sync Counter */
 
 	SkGeInitMacFifo(pAC, IoC, Port);
 	
@@ -2349,7 +2511,7 @@ int		Port)		/* Port to configure */
 	
 	SkGeInitBmu(pAC, IoC, Port);
 
-	/* Mark port as initialized */
+	/* mark port as initialized */
 	pPrt->PState = SK_PRT_INIT;
 
 	return(0);
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/net/sk98lin/skgemib.c linux-2.4.20-wolk4.4-fullkernel/drivers/net/sk98lin/skgemib.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/net/sk98lin/skgemib.c	2003-07-30 13:51:29.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/net/sk98lin/skgemib.c	2003-07-30 10:31:39.000000000 +0200
@@ -2,15 +2,16 @@
  *
  * Name:	skgemib.c
  * Project:	GEnesis, PCI Gigabit Ethernet Adapter
- * Version:	$Revision: 1.7 $
- * Date:	$Date: 2002/12/16 09:04:34 $
+ * Version:	$Revision: 1.9 $
+ * Date:	$Date: 2003/05/23 12:55:20 $
  * Purpose:	Private Network Management Interface Management Database
  *
  ****************************************************************************/
 
 /******************************************************************************
  *
- *	(C)Copyright 2002 SysKonnect GmbH.
+ *	(C)Copyright 1998-2002 SysKonnect GmbH.
+ *	(C)Copyright 2002-2003 Marvell.
  *
  *	This program is free software; you can redistribute it and/or modify
  *	it under the terms of the GNU General Public License as published by
@@ -26,6 +27,12 @@
  * History:
  *
  *	$Log: skgemib.c,v $
+ *	Revision 1.9  2003/05/23 12:55:20  tschilli
+ *	OID_SKGE_BOARDLEVEL added.
+ *	
+ *	Revision 1.8  2003/03/27 11:19:15  tschilli
+ *	Copyright messages changed.
+ *	
  *	Revision 1.7  2002/12/16 09:04:34  tschilli
  *	Code for VCT handling added.
  *	
@@ -100,8 +107,13 @@ PNMI_STATIC int Vct(SK_AC *pAC, SK_IOC I
 PNMI_STATIC int PowerManagement(SK_AC *pAC, SK_IOC IoC, int action, SK_U32 Id,
 	char *pBuf, unsigned int *pLen, SK_U32 Instance,
 	unsigned int TableIndex, SK_U32 NetIndex);
-#endif
+#endif /* SK_POWER_MGMT */
 
+#ifdef SK_DIAG_SUPPORT
+PNMI_STATIC int DiagActions(SK_AC *pAC, SK_IOC IoC, int action, SK_U32 Id,
+	char *pBuf, unsigned int *pLen, SK_U32 Instance,
+	unsigned int TableIndex, SK_U32 NetIndex);
+#endif /* SK_DIAG_SUPPORT */
 
 
 /* defines *******************************************************************/
@@ -267,6 +279,13 @@ PNMI_STATIC const SK_PNMI_TAB_ENTRY IdTa
 		0,
 		SK_PNMI_RW, PowerManagement, 0},
 #endif /* SK_POWER_MGMT */
+#ifdef SK_DIAG_SUPPORT
+	{OID_SKGE_DIAG_MODE,
+		0,
+		0,
+		0,
+		SK_PNMI_RW, DiagActions, 0},
+#endif /* SK_DIAG_SUPPORT */
 	{OID_SKGE_MDB_VERSION,
 		1,
 		0,
@@ -1052,5 +1071,10 @@ PNMI_STATIC const SK_PNMI_TAB_ENTRY IdTa
 		0,
 		0,
 		SK_PNMI_RO, Vct, 0},
+	{OID_SKGE_BOARDLEVEL,
+		0,
+		0,
+		0,
+		SK_PNMI_RO, General, 0},
 };
 
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/net/sk98lin/skgepnmi.c linux-2.4.20-wolk4.4-fullkernel/drivers/net/sk98lin/skgepnmi.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/net/sk98lin/skgepnmi.c	2003-07-30 13:51:29.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/net/sk98lin/skgepnmi.c	2003-07-30 10:31:39.000000000 +0200
@@ -2,8 +2,8 @@
  *
  * Name:	skgepnmi.c
  * Project:	GEnesis, PCI Gigabit Ethernet Adapter
- * Version:	$Revision: 1.102 $
- * Date:	$Date: 2002/12/16 14:03:24 $
+ * Version:	$Revision: 1.108 $
+ * Date:	$Date: 2003/05/27 07:10:11 $
  * Purpose:	Private Network Management Interface
  *
  ****************************************************************************/
@@ -11,6 +11,7 @@
 /******************************************************************************
  *
  *	(C)Copyright 1998-2002 SysKonnect GmbH.
+ *	(C)Copyright 2002-2003 Marvell.
  *
  *	This program is free software; you can redistribute it and/or modify
  *	it under the terms of the GNU General Public License as published by
@@ -26,6 +27,30 @@
  * History:
  *
  *	$Log: skgepnmi.c,v $
+ *	Revision 1.108  2003/05/27 07:10:11  tschilli
+ *	Bug in SkPnmiGenIoctl() fixed.
+ *	
+ *	Revision 1.106  2003/04/10 14:47:31  rschmidt
+ *	Fixed handling for OID_GEN_RCV_OK and OID_GEN_XMIT_OK for YUKON's GMAC
+ *	in GetPhysStatVal().
+ *	Replaced macro PHY_READ() with function call SkXmPhyRead().
+ *	Made optimisations for readability and code size.
+ *	Editorial changes.
+ *	
+ *	Revision 1.105  2003/04/09 12:51:32  rschmidt
+ *	Fixed XMAC only handling for some events in SkPnmiEvent().
+ *	Fixed return value for OID_GEN_RCV_OK (SK_PNMI_HRX) in GetPhysStatVal().
+ *	Editorial changes.
+ *	
+ *	Revision 1.104  2003/03/27 11:18:21  tschilli
+ *	BRK statements from DEBUG code removed.
+ *	OID_GEN_XMIT_OK and OID_GEN_RCV_OK work with Yukon now.
+ *	Copyright messages changed.
+ *	
+ *	Revision 1.103  2002/12/20 09:57:13  tschilli
+ *	SK_PNMI_EVT_VCT_RESET event code changed.
+ *	Unused variable from Vct() removed.
+ *	
  *	Revision 1.102  2002/12/16 14:03:24  tschilli
  *	VCT code in Vct() changed.
  *	
@@ -84,7 +109,7 @@
  *	- Extended SIRQ event handler for both mac types.
  *	- Fixed rx short counter bug (#10620)
  *	- Added handler for oids SKGE_SPEED_MODE & SKGE_SPEED_STATUS.
- *	- Extendet GetPhysStatVal() for GMAC.
+ *	- Extended GetPhysStatVal() for GMAC.
  *	- Editorial changes.
  *	
  *	Revision 1.90  2002/05/22 08:56:25  rwahl
@@ -172,7 +197,7 @@
  *	Added state check to PHY_READ call (hanged if called during startup).
  *	
  *	Revision 1.67  1999/09/22 09:53:20  rwahl
- *	- Read Broadcom register for updating fcs error counter (1000Base-T).
+ *	- Read Broadcom register for updating FCS error counter (1000Base-T).
  *
  *	Revision 1.66  1999/08/26 13:47:56  rwahl
  *	Added SK_DRIVER_SENDEVENT when queueing RLMT_CHANGE_THRES trap.
@@ -432,9 +457,10 @@
  ****************************************************************************/
 
 
+#ifndef _lint
 static const char SysKonnectFileId[] =
-	"@(#) $Id: skgepnmi.c,v 1.102 2002/12/16 14:03:24 tschilli Exp $"
-	" (C) SysKonnect.";
+	"@(#) $Id: skgepnmi.c,v 1.108 2003/05/27 07:10:11 tschilli Exp $ (C) Marvell.";
+#endif /* !_lint */
 
 #include "h/skdrv1st.h"
 #include "h/sktypes.h"
@@ -472,11 +498,13 @@ int SkPnmiSetVar(SK_AC *pAC, SK_IOC IoC,
 	unsigned int *pLen, SK_U32 Instance, SK_U32 NetIndex);
 int SkPnmiGetStruct(SK_AC *pAC, SK_IOC IoC, void *pBuf,
 	unsigned int *pLen, SK_U32 NetIndex);
-int SkPnmiPreSetStruct(SK_AC *pAC, SK_IOC IoC, void *pBuf, 
+int SkPnmiPreSetStruct(SK_AC *pAC, SK_IOC IoC, void *pBuf,
 	unsigned int *pLen, SK_U32 NetIndex);
-int SkPnmiSetStruct(SK_AC *pAC, SK_IOC IoC, void *pBuf, 
+int SkPnmiSetStruct(SK_AC *pAC, SK_IOC IoC, void *pBuf,
 	unsigned int *pLen, SK_U32 NetIndex);
 int SkPnmiEvent(SK_AC *pAC, SK_IOC IoC, SK_U32 Event, SK_EVPARA Param);
+int SkPnmiGenIoctl(SK_AC *pAC, SK_IOC IoC, void * pBuf,
+	unsigned int * pLen, SK_U32 NetIndex);
 
 
 /*
@@ -530,7 +558,7 @@ PNMI_STATIC void CheckVctStatus(SK_AC *,
 /*
  * Overflow status register bit table and corresponding counter
  * dependent on MAC type - the number relates to the size of overflow
- * mask returned by the pFnMacOverflow function 
+ * mask returned by the pFnMacOverflow function
  */
 PNMI_STATIC const SK_U16 StatOvrflwBit[][SK_PNMI_MAC_TYPES] = {
 /* Bit0  */	{ SK_PNMI_HTX, 				SK_PNMI_HTX_UNICAST},
@@ -694,7 +722,7 @@ PNMI_STATIC const SK_PNMI_STATADDR StatA
 	/* SK_PNMI_HRX_FRAMING */
 	{{XM_RXF_FRA_ERR, SK_TRUE}, {0, SK_FALSE}},
 	/* SK_PNMI_HRX_UNDERSIZE */
-	{{0, SK_FALSE},{GM_RXF_SHT, SK_TRUE}},
+	{{0, SK_FALSE}, {GM_RXF_SHT, SK_TRUE}},
 	/* SK_PNMI_HRX_OVERFLOW */
 	{{XM_RXE_FIFO_OV, SK_TRUE}, {GM_RXE_FIFO_OV, SK_TRUE}},
 	/* SK_PNMI_HRX_JABBER */
@@ -768,7 +796,6 @@ int Level)		/* Initialization level */
 	SK_U16		Val16;		/* Multiple purpose 16 bit variable */
 	SK_U8		Val8;		/* Mulitple purpose 8 bit variable */
 	SK_EVPARA	EventParam;	/* Event struct for timer event */
-	SK_GEPORT	*pPrt;
 	SK_PNMI_VCT	*pVctBackupData;
 
 
@@ -797,7 +824,6 @@ int Level)		/* Initialization level */
 					   ("CounterOffset struct size (%d) differs from"
 						"SK_PNMI_MAX_IDX (%d)\n",
 						SK_PNMI_CNT_NO, SK_PNMI_MAX_IDX));
-			BRK;
 		}
 
 		if (SK_PNMI_MAX_IDX !=
@@ -808,10 +834,9 @@ int Level)		/* Initialization level */
 			SK_DBG_MSG(pAC, SK_DBGMOD_PNMI, SK_DBGCAT_INIT | SK_DBGCAT_FATAL,
 					   ("StatAddr table size (%d) differs from "
 						"SK_PNMI_MAX_IDX (%d)\n",
-						(sizeof(StatAddr) / 
+						(sizeof(StatAddr) /
 						 (sizeof(SK_PNMI_STATADDR) * SK_PNMI_MAC_TYPES)),
 						 SK_PNMI_MAX_IDX));
-			BRK;
 		}
 #endif /* SK_PNMI_CHECK */
 		break;
@@ -829,8 +854,7 @@ int Level)		/* Initialization level */
 		
 		/* Initialize DSP variables for Vct() to 0xff => Never written! */		
 		for (PortIndex = 0; PortIndex < PortMax; PortIndex ++) {
-			pPrt = &pAC->GIni.GP[PortIndex];
-			pPrt->PCableLen =0xff;
+			pAC->GIni.GP[PortIndex].PCableLen = 0xff;
 			pVctBackupData = &pAC->Pnmi.VctBackup[PortIndex];
 			pVctBackupData->PCableLen = 0xff;
 		}
@@ -958,14 +982,14 @@ int Level)		/* Initialization level */
 		default:
 			pAC->Pnmi.Connector = 1;
 			break;
-		}		
+		}
 		break;
-		
+
 	case SK_INIT_RUN:
 		/*
 		 * Start timer for RLMT change counter
 		 */
-		SK_MEMSET((char *) &EventParam, 0, sizeof(EventParam));
+		SK_MEMSET((char *)&EventParam, 0, sizeof(EventParam));
 		SkTimerStart(pAC, IoC, &pAC->Pnmi.RlmtChangeEstimate.EstTimer,
 			28125000, SKGE_PNMI, SK_PNMI_EVT_CHG_EST_TIMER,
 			EventParam);
@@ -994,17 +1018,17 @@ int Level)		/* Initialization level */
  *	                         the data.
  *	SK_PNMI_ERR_UNKNOWN_OID  The requested OID is unknown
  *	SK_PNMI_ERR_UNKNOWN_INST The requested instance of the OID doesn't
- *                               exist (e.g. port instance 3 on a two port
+ *                           exist (e.g. port instance 3 on a two port
  *	                         adapter.
  */
 int SkPnmiGetVar(
 SK_AC *pAC,		/* Pointer to adapter context */
 SK_IOC IoC,		/* IO context handle */
 SK_U32 Id,		/* Object ID that is to be processed */
-void *pBuf,		/* Buffer to which to mgmt data will be retrieved */
+void *pBuf,		/* Buffer to which the management data will be copied */
 unsigned int *pLen,	/* On call: buffer length. On return: used buffer */
 SK_U32 Instance,	/* Instance (1..n) that is to be queried or -1 */
-SK_U32 NetIndex)	/* NetIndex (0..n), in single net mode allways zero */
+SK_U32 NetIndex)	/* NetIndex (0..n), in single net mode always zero */
 {
 	SK_DBG_MSG(pAC, SK_DBGMOD_PNMI, SK_DBGCAT_CTRL,
 		("PNMI: SkPnmiGetVar: Called, Id=0x%x, BufLen=%d, Instance=%d, NetIndex=%d\n",
@@ -1022,8 +1046,8 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
  *	Calls a general sub-function for all this stuff. The preset does
  *	the same as a set, but returns just before finally setting the
  *	new value. This is usefull to check if a set might be successfull.
- *	If as instance a -1 is passed, an array of values is supposed and
- *	all instance of the OID will be set.
+ *	If the instance -1 is passed, an array of values is supposed and
+ *	all instances of the OID will be set.
  *
  * Returns:
  *	SK_PNMI_ERR_OK           The request was successfully performed.
@@ -1036,17 +1060,17 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
  *	SK_PNMI_ERR_READ_ONLY    The OID is read-only and cannot be set.
  *	SK_PNMI_ERR_UNKNOWN_OID  The requested OID is unknown.
  *	SK_PNMI_ERR_UNKNOWN_INST The requested instance of the OID doesn't
- *                               exist (e.g. port instance 3 on a two port
+ *                           exist (e.g. port instance 3 on a two port
  *	                         adapter.
  */
 int SkPnmiPreSetVar(
 SK_AC *pAC,		/* Pointer to adapter context */
 SK_IOC IoC,		/* IO context handle */
 SK_U32 Id,		/* Object ID that is to be processed */
-void *pBuf,		/* Buffer which stores the mgmt data to be set */
-unsigned int *pLen,	/* Total length of mgmt data */
+void *pBuf,		/* Buffer to which the management data will be copied */
+unsigned int *pLen,	/* Total length of management data */
 SK_U32 Instance,	/* Instance (1..n) that is to be set or -1 */
-SK_U32 NetIndex)	/* NetIndex (0..n), in single net mode allways zero */
+SK_U32 NetIndex)	/* NetIndex (0..n), in single net mode always zero */
 {
 	SK_DBG_MSG(pAC, SK_DBGMOD_PNMI, SK_DBGCAT_CTRL,
 		("PNMI: SkPnmiPreSetVar: Called, Id=0x%x, BufLen=%d, Instance=%d, NetIndex=%d\n",
@@ -1065,8 +1089,8 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
  *	Calls a general sub-function for all this stuff. The preset does
  *	the same as a set, but returns just before finally setting the
  *	new value. This is usefull to check if a set might be successfull.
- *	If as instance a -1 is passed, an array of values is supposed and
- *	all instance of the OID will be set.
+ *	If the instance -1 is passed, an array of values is supposed and
+ *	all instances of the OID will be set.
  *
  * Returns:
  *	SK_PNMI_ERR_OK           The request was successfully performed.
@@ -1079,17 +1103,17 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
  *	SK_PNMI_ERR_READ_ONLY    The OID is read-only and cannot be set.
  *	SK_PNMI_ERR_UNKNOWN_OID  The requested OID is unknown.
  *	SK_PNMI_ERR_UNKNOWN_INST The requested instance of the OID doesn't
- *                               exist (e.g. port instance 3 on a two port
+ *                           exist (e.g. port instance 3 on a two port
  *	                         adapter.
  */
 int SkPnmiSetVar(
 SK_AC *pAC,		/* Pointer to adapter context */
 SK_IOC IoC,		/* IO context handle */
 SK_U32 Id,		/* Object ID that is to be processed */
-void *pBuf,		/* Buffer which stores the mgmt data to be set */
-unsigned int *pLen,	/* Total length of mgmt data */
+void *pBuf,		/* Buffer to which the management data will be copied */
+unsigned int *pLen,	/* Total length of management data */
 SK_U32 Instance,	/* Instance (1..n) that is to be set or -1 */
-SK_U32 NetIndex)	/* NetIndex (0..n), in single net mode allways zero */
+SK_U32 NetIndex)	/* NetIndex (0..n), in single net mode always zero */
 {
 	SK_DBG_MSG(pAC, SK_DBGMOD_PNMI, SK_DBGCAT_CTRL,
 		("PNMI: SkPnmiSetVar: Called, Id=0x%x, BufLen=%d, Instance=%d, NetIndex=%d\n",
@@ -1116,14 +1140,14 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
  *	SK_PNMI_ERR_GENERAL      A general severe internal error occured
  *	SK_PNMI_ERR_TOO_SHORT    The passed buffer is too short to take
  *	                         the data.
- *	SK_PNMI_ERR_UNKNOWN_NET  The requested NetIndex doesn't exist 
+ *	SK_PNMI_ERR_UNKNOWN_NET  The requested NetIndex doesn't exist
  */
 int SkPnmiGetStruct(
 SK_AC *pAC,		/* Pointer to adapter context */
 SK_IOC IoC,		/* IO context handle */
-void *pBuf,		/* Buffer which will store the retrieved data */
+void *pBuf,		/* Buffer to which the management data will be copied. */
 unsigned int *pLen,	/* Length of buffer */
-SK_U32 NetIndex)	/* NetIndex (0..n), in single net mode allways zero */
+SK_U32 NetIndex)	/* NetIndex (0..n), in single net mode always zero */
 {
 	int		Ret;
 	unsigned int	TableIndex;
@@ -1301,13 +1325,13 @@ SK_AC *pAC,		/* Pointer to adapter conte
 SK_IOC IoC,		/* IO context handle */
 void *pBuf,		/* Buffer which contains the data to be set */
 unsigned int *pLen,	/* Length of buffer */
-SK_U32 NetIndex)	/* NetIndex (0..n), in single net mode allways zero */
+SK_U32 NetIndex)	/* NetIndex (0..n), in single net mode always zero */
 {
 	SK_DBG_MSG(pAC, SK_DBGMOD_PNMI, SK_DBGCAT_CTRL,
 		("PNMI: SkPnmiPreSetStruct: Called, BufLen=%d, NetIndex=%d\n",
 			*pLen, NetIndex));
 
-	return (PnmiStruct(pAC, IoC, SK_PNMI_PRESET, (char *)pBuf, 
+	return (PnmiStruct(pAC, IoC, SK_PNMI_PRESET, (char *)pBuf,
     					pLen, NetIndex));
 }
 
@@ -1339,13 +1363,13 @@ SK_AC *pAC,		/* Pointer to adapter conte
 SK_IOC IoC,		/* IO context handle */
 void *pBuf,		/* Buffer which contains the data to be set */
 unsigned int *pLen,	/* Length of buffer */
-SK_U32 NetIndex)	/* NetIndex (0..n), in single net mode allways zero */
+SK_U32 NetIndex)	/* NetIndex (0..n), in single net mode always zero */
 {
 	SK_DBG_MSG(pAC, SK_DBGMOD_PNMI, SK_DBGCAT_CTRL,
 		("PNMI: SkPnmiSetStruct: Called, BufLen=%d, NetIndex=%d\n",
 			*pLen, NetIndex));
 
-	return (PnmiStruct(pAC, IoC, SK_PNMI_SET, (char *)pBuf, 
+	return (PnmiStruct(pAC, IoC, SK_PNMI_SET, (char *)pBuf,
     					pLen, NetIndex));
 }
 
@@ -1392,9 +1416,9 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
  *	                              is now an active port. PNMI will now
  *	                              add the statistic data of this port to
  *	                              the virtual port.
- *	SK_PNMI_EVT_RLMT_SET_NETS     Notifies PNMI about the net mode. The first Parameter
+ *	SK_PNMI_EVT_RLMT_SET_NETS     Notifies PNMI about the net mode. The first parameter
  *	                              contains the number of nets. 1 means single net, 2 means
- *	                              dual net. The second Parameter is -1
+ *	                              dual net. The second parameter is -1
  *
  * Returns:
  *	Always 0
@@ -1406,7 +1430,7 @@ SK_U32 Event,		/* Event-Id */
 SK_EVPARA Param)	/* Event dependent parameter */
 {
 	unsigned int	PhysPortIndex;
-	unsigned int	MaxNetNumber;
+    unsigned int	MaxNetNumber;
 	int			CounterIndex;
 	int			Ret;
 	SK_U16		MacStatus;
@@ -1436,7 +1460,7 @@ SK_EVPARA Param)	/* Event dependent para
 			("PNMI: SkPnmiEvent: Called, Event=0x%x, Param=0x%x\n",
 			(unsigned int)Event, (unsigned int)Param.Para64));
 	}
-#endif
+#endif /* DEBUG */
 	SK_PNMI_CHECKFLAGS("SkPnmiEvent: On call");
 
 	MacType = pAC->GIni.GIMacType;
@@ -1455,18 +1479,18 @@ SK_EVPARA Param)	/* Event dependent para
 				PhysPortIndex));
 			return (0);
 		}
-#endif
+#endif /* DEBUG */
 		OverflowStatus = 0;
 
 		/*
 		 * Check which source caused an overflow interrupt.
 		 */
-		if ((pAC->GIni.GIFunc.pFnMacOverflow(
-			 pAC, IoC, PhysPortIndex, MacStatus, &OverflowStatus) != 0) ||
+		if ((pAC->GIni.GIFunc.pFnMacOverflow(pAC, IoC, PhysPortIndex,
+				MacStatus, &OverflowStatus) != 0) ||
 			(OverflowStatus == 0)) {
 
 			SK_PNMI_CHECKFLAGS("SkPnmiEvent: On return");
-			return (0); 
+			return (0);
 		}
 
 		/*
@@ -1486,20 +1510,20 @@ SK_EVPARA Param)	/* Event dependent para
 
 			case SK_PNMI_HTX_UTILUNDER:
 			case SK_PNMI_HTX_UTILOVER:
-				XM_IN16(IoC, PhysPortIndex, XM_TX_CMD,
-					&Register);
-				Register |= XM_TX_SAM_LINE;
-				XM_OUT16(IoC, PhysPortIndex, XM_TX_CMD,
-					Register);
+				if (MacType == SK_MAC_XMAC) {
+					XM_IN16(IoC, PhysPortIndex, XM_TX_CMD, &Register);
+					Register |= XM_TX_SAM_LINE;
+					XM_OUT16(IoC, PhysPortIndex, XM_TX_CMD, Register);
+				}
 				break;
 
 			case SK_PNMI_HRX_UTILUNDER:
 			case SK_PNMI_HRX_UTILOVER:
-				XM_IN16(IoC, PhysPortIndex, XM_RX_CMD,
-					&Register);
-				Register |= XM_RX_SAM_LINE;
-				XM_OUT16(IoC, PhysPortIndex, XM_RX_CMD,
-					Register);
+				if (MacType == SK_MAC_XMAC) {
+					XM_IN16(IoC, PhysPortIndex, XM_RX_CMD, &Register);
+					Register |= XM_RX_SAM_LINE;
+					XM_OUT16(IoC, PhysPortIndex, XM_RX_CMD, Register);
+				}
 				break;
 
 			case SK_PNMI_HTX_OCTETHIGH:
@@ -1540,7 +1564,8 @@ SK_EVPARA Param)	/* Event dependent para
 				(unsigned int)Param.Para64));
 			return (0);
 		}
-#endif
+#endif /* DEBUG */
+
 		/*
 		 * Store a trap message in the trap buffer and generate
 		 * an event for user space applications with the
@@ -1556,11 +1581,12 @@ SK_EVPARA Param)	/* Event dependent para
 		if ((unsigned int)Param.Para64 >= (unsigned int)pAC->I2c.MaxSens) {
 
 			SK_DBG_MSG(pAC, SK_DBGMOD_PNMI, SK_DBGCAT_CTRL,
-				("PNMI: ERR:SkPnmiEvent: SK_PNMI_EVT_SEN_WAR_UPP parameter wrong, SensorIndex=%d\n",
+				("PNMI: ERR: SkPnmiEvent: SK_PNMI_EVT_SEN_WAR_UPP parameter wrong, SensorIndex=%d\n",
 				(unsigned int)Param.Para64));
 			return (0);
 		}
-#endif
+#endif /* DEBUG */
+
 		/*
 		 * Store a trap message in the trap buffer and generate
 		 * an event for user space applications with the
@@ -1580,7 +1606,8 @@ SK_EVPARA Param)	/* Event dependent para
 				(unsigned int)Param.Para64));
 			return (0);
 		}
-#endif
+#endif /* DEBUG */
+
 		/*
 		 * Store a trap message in the trap buffer and generate
 		 * an event for user space applications with the
@@ -1600,7 +1627,8 @@ SK_EVPARA Param)	/* Event dependent para
 				(unsigned int)Param.Para64));
 			return (0);
 		}
-#endif
+#endif /* DEBUG */
+
 		/*
 		 * Store a trap message in the trap buffer and generate
 		 * an event for user space applications with the
@@ -1620,7 +1648,7 @@ SK_EVPARA Param)	/* Event dependent para
 		 * Be careful in changing these values, on change check
 		 *   - typedef of SK_PNMI_ESTIMATE (Size of EstValue
 		 *     array one less than value number)
-		 *   - Timer initilization SkTimerStart() in SkPnmiInit
+		 *   - Timer initialization SkTimerStart() in SkPnmiInit
 		 *   - Delta value below must be multiplicated with
 		 *     power of 2
 		 *
@@ -1671,7 +1699,7 @@ SK_EVPARA Param)	/* Event dependent para
 			(void)SK_DRIVER_SENDEVENT(pAC, IoC);
 		}
 
-		SK_MEMSET((char *) &EventParam, 0, sizeof(EventParam));
+		SK_MEMSET((char *)&EventParam, 0, sizeof(EventParam));
 		SkTimerStart(pAC, IoC, &pAC->Pnmi.RlmtChangeEstimate.EstTimer,
 			28125000, SKGE_PNMI, SK_PNMI_EVT_CHG_EST_TIMER,
 			EventParam);
@@ -1693,20 +1721,21 @@ SK_EVPARA Param)	/* Event dependent para
 
 			return (0);
 		}
-#endif
+#endif /* DEBUG */
 
 		/*
-		 * Set all counters and timestamps to zero
+		 * Set all counters and timestamps to zero.
+		 * The according NetIndex is required as a
+		 * parameter of the event.
 		 */
-		ResetCounter(pAC, IoC, NetIndex); /* the according NetIndex is required
-												as a Parameter of the Event */ 
+		ResetCounter(pAC, IoC, NetIndex);
 		break;
 
 	case SK_PNMI_EVT_XMAC_RESET:
 		/*
 		 * To grant continuous counter values store the current
 		 * XMAC statistic values to the entries 1..n of the
-		 * CounterOffset array. XMAC Errata #2 
+		 * CounterOffset array. XMAC Errata #2
 		 */
 #ifdef DEBUG
 		if ((unsigned int)Param.Para64 >= SK_MAX_MACS) {
@@ -1742,11 +1771,10 @@ SK_EVPARA Param)	/* Event dependent para
 				continue;
 			}
 
-			pAC->Pnmi.Port[PhysPortIndex].
-				CounterOffset[CounterIndex] = GetPhysStatVal(
-				pAC, IoC, PhysPortIndex, CounterIndex);
-			pAC->Pnmi.Port[PhysPortIndex].
-				CounterHigh[CounterIndex] = 0;
+			pAC->Pnmi.Port[PhysPortIndex].CounterOffset[CounterIndex] =
+				GetPhysStatVal(pAC, IoC, PhysPortIndex, CounterIndex);
+			
+			pAC->Pnmi.Port[PhysPortIndex].CounterHigh[CounterIndex] = 0;
 		}
 
 		pAC->Pnmi.MacUpdatedFlag --;
@@ -1763,7 +1791,8 @@ SK_EVPARA Param)	/* Event dependent para
 
 			return (0);
 		}
-#endif
+#endif /* DEBUG */
+
 		/*
 		 * Store a trap message in the trap buffer and generate an event for
 		 * user space applications with the SK_DRIVER_SENDEVENT macro.
@@ -1772,8 +1801,7 @@ SK_EVPARA Param)	/* Event dependent para
 		(void)SK_DRIVER_SENDEVENT(pAC, IoC);
 
 		/* Bugfix for XMAC errata (#10620)*/
-		if (pAC->GIni.GIMacType == SK_MAC_XMAC){
-
+		if (MacType == SK_MAC_XMAC) {
 			/* Add incremental difference to offset (#10620)*/
 			(void)pAC->GIni.GIFunc.pFnMacStatistic(pAC, IoC, PhysPortIndex,
 				XM_RXE_SHT_ERR, &Val32);
@@ -1800,20 +1828,22 @@ SK_EVPARA Param)	/* Event dependent para
 
 			return (0);
 		}
-#endif
+#endif /* DEBUG */
+
 		/*
 		 * Store a trap message in the trap buffer and generate an event for
 		 * user space applications with the SK_DRIVER_SENDEVENT macro.
 		 */
 		QueueRlmtPortTrap(pAC, OID_SKGE_TRAP_RLMT_PORT_DOWN, PhysPortIndex);
 		(void)SK_DRIVER_SENDEVENT(pAC, IoC);
-        
+
 		/* Bugfix #10620 - get zero level for incremental difference */
-		if ((pAC->GIni.GIMacType == SK_MAC_XMAC)) {
+		if (MacType == SK_MAC_XMAC) {
 
 			(void)pAC->GIni.GIFunc.pFnMacStatistic(pAC, IoC, PhysPortIndex,
 				XM_RXE_SHT_ERR, &Val32);
-			pAC->Pnmi.Port[PhysPortIndex].RxShortZeroMark = 
+			
+			pAC->Pnmi.Port[PhysPortIndex].RxShortZeroMark =
 				(((SK_U64)pAC->Pnmi.Port[PhysPortIndex].
 				 CounterHigh[SK_PNMI_HRX_SHORTS] << 32) | (SK_U64)Val32);
 		}
@@ -1837,7 +1867,8 @@ SK_EVPARA Param)	/* Event dependent para
 				("PNMI: ERR: SkPnmiEvent: SK_PNMI_EVT_RLMT_ACTIVE_DOWN parameter too high, NetIndex=%d\n",
 				NetIndex));
 		}
-#endif
+#endif /* DEBUG */
+
 		/*
 		 * For now, ignore event if NetIndex != 0.
 		 */
@@ -1914,7 +1945,8 @@ SK_EVPARA Param)	/* Event dependent para
 				("PNMI: ERR: SkPnmiEvent: SK_PNMI_EVT_RLMT_ACTIVE_UP parameter too high, NetIndex=%d\n",
 				NetIndex));
 		}
-#endif
+#endif /* DEBUG */
+
 		/*
 		 * For now, ignore event if NetIndex != 0.
 		 */
@@ -1976,9 +2008,7 @@ SK_EVPARA Param)	/* Event dependent para
 			pAC->Pnmi.VirtualCounterOffset[CounterIndex] -= Value;
 		}
 
-		/*
-		 * Set port to active
-		 */
+		/* Set port to active */
 		pAC->Pnmi.Port[PhysPortIndex].ActiveFlag = SK_TRUE;
 
 		pAC->Pnmi.MacUpdatedFlag --;
@@ -2020,47 +2050,56 @@ SK_EVPARA Param)	/* Event dependent para
         break;
 
     case SK_PNMI_EVT_VCT_RESET:
-	PhysPortIndex = Param.Para32[0];
-	pPrt = &pAC->GIni.GP[PhysPortIndex];
-	pVctBackupData = &pAC->Pnmi.VctBackup[PhysPortIndex];
-	
-	if (pAC->Pnmi.VctStatus[PhysPortIndex] & SK_PNMI_VCT_PENDING) {
-		RetCode = SkGmCableDiagStatus(pAC, IoC, PhysPortIndex, SK_FALSE);
-		if (RetCode == 2) {
-			/*
-			 * VCT test is still running.
-			 * Start VCT timer counter again.
-			 */
-			SK_MEMSET((char *) &Param, 0, sizeof(Param));
-			Param.Para32[0] = PhysPortIndex;
-			Param.Para32[1] = -1;
-			SkTimerStart(pAC, IoC, &pAC->Pnmi.VctTimeout[PhysPortIndex].VctTimer,
-				4000000, SKGE_PNMI, SK_PNMI_EVT_VCT_RESET, Param);
-			break;
-		}
-		pAC->Pnmi.VctStatus[PhysPortIndex] &= ~SK_PNMI_VCT_PENDING;
-		pAC->Pnmi.VctStatus[PhysPortIndex] |=
-			(SK_PNMI_VCT_NEW_VCT_DATA | SK_PNMI_VCT_TEST_DONE);
+		PhysPortIndex = Param.Para32[0];
+		pPrt = &pAC->GIni.GP[PhysPortIndex];
+		pVctBackupData = &pAC->Pnmi.VctBackup[PhysPortIndex];
 		
-		/* Copy results for later use to PNMI struct. */
-		for (i = 0; i < 4; i++)  {
-			if (pPrt->PMdiPairLen[i] > 35) {
-				CableLength = 1000 * (((175 * pPrt->PMdiPairLen[i]) / 210) - 28);
+		if (pAC->Pnmi.VctStatus[PhysPortIndex] & SK_PNMI_VCT_PENDING) {
+			RetCode = SkGmCableDiagStatus(pAC, IoC, PhysPortIndex, SK_FALSE);
+			if (RetCode == 2) {
+				/*
+				 * VCT test is still running.
+				 * Start VCT timer counter again.
+				 */
+				SK_MEMSET((char *) &Param, 0, sizeof(Param));
+				Param.Para32[0] = PhysPortIndex;
+				Param.Para32[1] = -1;
+				SkTimerStart(pAC, IoC,
+					&pAC->Pnmi.VctTimeout[PhysPortIndex].VctTimer,
+				4000000, SKGE_PNMI, SK_PNMI_EVT_VCT_RESET, Param);
+				break;
 			}
-			else {
-				CableLength = 0;
+			pAC->Pnmi.VctStatus[PhysPortIndex] &= ~SK_PNMI_VCT_PENDING;
+			pAC->Pnmi.VctStatus[PhysPortIndex] |=
+				(SK_PNMI_VCT_NEW_VCT_DATA | SK_PNMI_VCT_TEST_DONE);
+			
+			/* Copy results for later use to PNMI struct. */
+			for (i = 0; i < 4; i++)  {
+				if (pPrt->PMdiPairSts[i] == SK_PNMI_VCT_NORMAL_CABLE) {
+					if ((pPrt->PMdiPairLen[i] > 35) &&
+						(pPrt->PMdiPairLen[i] < 0xff)) {
+						pPrt->PMdiPairSts[i] = SK_PNMI_VCT_IMPEDANCE_MISMATCH;
+					}
+				}
+				if ((pPrt->PMdiPairLen[i] > 35) &&
+					(pPrt->PMdiPairLen[i] != 0xff)) {
+					CableLength = 1000 *
+						(((175 * pPrt->PMdiPairLen[i]) / 210) - 28);
+				}
+				else {
+					CableLength = 0;
+				}
+				pVctBackupData->PMdiPairLen[i] = CableLength;
+				pVctBackupData->PMdiPairSts[i] = pPrt->PMdiPairSts[i];
 			}
-			pVctBackupData->PMdiPairLen[i] = CableLength;
-			pVctBackupData->PMdiPairSts[i] = pPrt->PMdiPairSts[i];
+			
+			Param.Para32[0] = PhysPortIndex;
+			Param.Para32[1] = -1;
+			SkEventQueue(pAC, SKGE_DRV, SK_DRV_PORT_RESET, Param);
+			SkEventDispatcher(pAC, IoC);
 		}
 		
-		Param.Para32[0] = PhysPortIndex;
-		Param.Para32[1] = -1;
-		SkEventQueue(pAC, SKGE_DRV, SK_DRV_PORT_RESET, Param);
-		SkEventDispatcher(pAC, IoC);
-	}
-	
-	break;
+		break;
 
 	default:
 		break;
@@ -2088,19 +2127,19 @@ SK_EVPARA Param)	/* Event dependent para
  *	SkGePnmiPreSetVar, or SkGePnmiSetVar.
  *
  * Returns:
- *	SK_PNMI_ERR_XXX. For details have a look to the description of the
+ *	SK_PNMI_ERR_XXX. For details have a look at the description of the
  *	calling functions.
- *	SK_PNMI_ERR_UNKNOWN_NET  The requested NetIndex doesn't exist 
+ *	SK_PNMI_ERR_UNKNOWN_NET  The requested NetIndex doesn't exist
  */
 PNMI_STATIC int PnmiVar(
 SK_AC *pAC,		/* Pointer to adapter context */
 SK_IOC IoC,		/* IO context handle */
-int Action,		/* Get/PreSet/Set action */
+int Action,		/* GET/PRESET/SET action */
 SK_U32 Id,		/* Object ID that is to be processed */
-char *pBuf,		/* Buffer which stores the mgmt data to be set */
-unsigned int *pLen,	/* Total length of mgmt data */
+char *pBuf,		/* Buffer used for the management data transfer */
+unsigned int *pLen,	/* Total length of pBuf management data  */
 SK_U32 Instance,	/* Instance (1..n) that is to be set or -1 */
-SK_U32 NetIndex)	/* NetIndex (0..n), in single net mode allways zero */
+SK_U32 NetIndex)	/* NetIndex (0..n), in single net mode always zero */
 {
 	unsigned int	TableIndex;
 	int		Ret;
@@ -2112,9 +2151,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 		return (SK_PNMI_ERR_UNKNOWN_OID);
 	}
 	
-    /* 
-     * Check NetIndex 
-     */
+    /* Check NetIndex */
 	if (NetIndex >= pAC->Rlmt.NumNets) {
 		return (SK_PNMI_ERR_UNKNOWN_NET);
 	}
@@ -2145,15 +2182,15 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
  *
  * Returns:
  *	SK_PNMI_ERR_XXX. The codes are described in the calling functions.
- *	SK_PNMI_ERR_UNKNOWN_NET  The requested NetIndex doesn't exist 
+ *	SK_PNMI_ERR_UNKNOWN_NET  The requested NetIndex doesn't exist
  */
 PNMI_STATIC int PnmiStruct(
 SK_AC *pAC,		/* Pointer to adapter context */
 SK_IOC IoC,		/* IO context handle */
-int  Action,		/* Set action to be performed */
-char *pBuf,		/* Buffer which contains the data to be set */
-unsigned int *pLen,	/* Length of buffer */
-SK_U32 NetIndex)	/* NetIndex (0..n), in single net mode allways zero */
+int  Action,	/* PRESET/SET action to be performed */
+char *pBuf,		/* Buffer used for the management data transfer */
+unsigned int *pLen,	/* Length of pBuf management data buffer */
+SK_U32 NetIndex)	/* NetIndex (0..n), in single net mode always zero */
 {
 	int		Ret;
 	unsigned int	TableIndex;
@@ -2179,9 +2216,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 		return (SK_PNMI_ERR_TOO_SHORT);
 	}
 	
-    /* 
-     * Check NetIndex 
-     */
+    /* Check NetIndex */
 	if (NetIndex >= pAC->Rlmt.NumNets) {
 		return (SK_PNMI_ERR_UNKNOWN_NET);
 	}
@@ -2348,19 +2383,19 @@ SK_U32 Id)		/* Object identifier to be s
  *	                         value range.
  *	SK_PNMI_ERR_READ_ONLY    The OID is read-only and cannot be set.
  *	SK_PNMI_ERR_UNKNOWN_INST The requested instance of the OID doesn't
- *                               exist (e.g. port instance 3 on a two port
+ *                           exist (e.g. port instance 3 on a two port
  *	                         adapter.
  */
 PNMI_STATIC int OidStruct(
 SK_AC *pAC,		/* Pointer to adapter context */
 SK_IOC IoC,		/* IO context handle */
-int Action,		/* Get/PreSet/Set action */
+int Action,		/* GET/PRESET/SET action */
 SK_U32 Id,		/* Object ID that is to be processed */
-char *pBuf,		/* Buffer to which to mgmt data will be retrieved */
-unsigned int *pLen,	/* On call: buffer length. On return: used buffer */
+char *pBuf,		/* Buffer used for the management data transfer */
+unsigned int *pLen,	/* On call: pBuf buffer length. On return: used buffer */
 SK_U32 Instance,	/* Instance (1..n) that is to be queried or -1 */
 unsigned int TableIndex, /* Index to the Id table */
-SK_U32 NetIndex)	/* NetIndex (0..n), in single net mode allways zero */
+SK_U32 NetIndex)	/* NetIndex (0..n), in single net mode always zero */
 {
 	if (Id != OID_SKGE_ALL_DATA) {
 
@@ -2415,19 +2450,19 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
  *	                         value range.
  *	SK_PNMI_ERR_READ_ONLY    The OID is read-only and cannot be set.
  *	SK_PNMI_ERR_UNKNOWN_INST The requested instance of the OID doesn't
- *                               exist (e.g. port instance 3 on a two port
+ *                           exist (e.g. port instance 3 on a two port
  *	                         adapter.
  */
 PNMI_STATIC int Perform(
 SK_AC *pAC,		/* Pointer to adapter context */
 SK_IOC IoC,		/* IO context handle */
-int Action,		/* Get/PreSet/Set action */
+int Action,		/* GET/PRESET/SET action */
 SK_U32 Id,		/* Object ID that is to be processed */
-char *pBuf,		/* Buffer to which to mgmt data will be retrieved */
-unsigned int *pLen,	/* On call: buffer length. On return: used buffer */
+char *pBuf,		/* Buffer used for the management data transfer */
+unsigned int *pLen,	/* On call: pBuf buffer length. On return: used buffer */
 SK_U32 Instance,	/* Instance (1..n) that is to be queried or -1 */
 unsigned int TableIndex, /* Index to the Id table */
-SK_U32 NetIndex)	/* NetIndex (0..n), in single net mode allways zero */
+SK_U32 NetIndex)	/* NetIndex (0..n), in single net mode always zero */
 {
 	int	Ret;
 	SK_U32	ActionOp;
@@ -2546,19 +2581,19 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
  *	                         the correct data (e.g. a 32bit value is
  *	                         needed, but a 16 bit value was passed).
  *	SK_PNMI_ERR_UNKNOWN_INST The requested instance of the OID doesn't
- *                               exist (e.g. port instance 3 on a two port
+ *                           exist (e.g. port instance 3 on a two port
  *	                         adapter.
  */
 PNMI_STATIC int Mac8023Stat(
 SK_AC *pAC,		/* Pointer to adapter context */
 SK_IOC IoC,		/* IO context handle */
-int Action,		/* Get/PreSet/Set action */
+int Action,		/* GET/PRESET/SET action */
 SK_U32 Id,		/* Object ID that is to be processed */
-char *pBuf,		/* Buffer to which to mgmt data will be retrieved */
-unsigned int *pLen,	/* On call: buffer length. On return: used buffer */
+char *pBuf,		/* Buffer used for the management data transfer */
+unsigned int *pLen,	/* On call: pBuf buffer length. On return: used buffer */
 SK_U32 Instance,	/* Instance (1..n) that is to be queried or -1 */
 unsigned int TableIndex,	/* Index to the Id table */
-SK_U32 NetIndex)	/* NetIndex (0..n), in single net mode allways zero */
+SK_U32 NetIndex)	/* NetIndex (0..n), in single net mode always zero */
 {
 	int     Ret;
 	SK_U64  StatVal;
@@ -2583,9 +2618,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 		return (SK_PNMI_ERR_READ_ONLY);
 	}
 
-	/*
-	 * Check length
-	 */
+	/* Check length */
 	switch (Id) {
 
 	case OID_802_3_PERMANENT_ADDRESS:
@@ -2606,9 +2639,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 
 #else /* SK_NDIS_64BIT_CTR */
 
-		/*
-		 * for compatibility, at least 32bit are required for oid
-		 */
+		/* for compatibility, at least 32bit are required for OID */
 		if (*pLen < sizeof(SK_U32)) {
 			/*
 			* but indicate handling for 64bit values,
@@ -2654,9 +2685,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 	default:
 		StatVal = GetStatVal(pAC, IoC, 0, IdTable[TableIndex].Param, NetIndex);
 
-		/*
-		 * by default 32bit values are evaluated
-		 */
+		/* by default 32bit values are evaluated */
 		if (!Is64BitReq) {
 			StatVal32 = (SK_U32)StatVal;
 			SK_PNMI_STORE_U32(pBuf, StatVal32);
@@ -2679,7 +2708,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
  * MacPrivateStat - OID handler function of OID_SKGE_STAT_XXX
  *
  * Description:
- *	Retrieves the XMAC statistic data.
+ *	Retrieves the MAC statistic data.
  *
  * Returns:
  *	SK_PNMI_ERR_OK           The request was successfully performed.
@@ -2688,35 +2717,36 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
  *	                         the correct data (e.g. a 32bit value is
  *	                         needed, but a 16 bit value was passed).
  *	SK_PNMI_ERR_UNKNOWN_INST The requested instance of the OID doesn't
- *                               exist (e.g. port instance 3 on a two port
+ *                           exist (e.g. port instance 3 on a two port
  *	                         adapter.
  */
 PNMI_STATIC int MacPrivateStat(
 SK_AC *pAC,		/* Pointer to adapter context */
 SK_IOC IoC,		/* IO context handle */
-int Action,		/* Get/PreSet/Set action */
+int Action,		/* GET/PRESET/SET action */
 SK_U32 Id,		/* Object ID that is to be processed */
-char *pBuf,		/* Buffer to which to mgmt data will be retrieved */
-unsigned int *pLen,	/* On call: buffer length. On return: used buffer */
+char *pBuf,		/* Buffer used for the management data transfer */
+unsigned int *pLen,	/* On call: pBuf buffer length. On return: used buffer */
 SK_U32 Instance,	/* Instance (1..n) that is to be queried or -1 */
 unsigned int TableIndex, /* Index to the Id table */
-SK_U32 NetIndex)	/* NetIndex (0..n), in single net mode allways zero */
+SK_U32 NetIndex)	/* NetIndex (0..n), in single net mode always zero */
 {
 	unsigned int	LogPortMax;
 	unsigned int	LogPortIndex;
 	unsigned int	PhysPortMax;
 	unsigned int	Limit;
 	unsigned int	Offset;
+	int				MacType;
 	int				Ret;
 	SK_U64			StatVal;
+	
+	
 
-
-	/*
-	 * Calculate instance if wished. MAC index 0 is the virtual
-	 * MAC.
-	 */
+	/* Calculate instance if wished. MAC index 0 is the virtual MAC */
 	PhysPortMax = pAC->GIni.GIMacsFound;
 	LogPortMax = SK_PNMI_PORT_PHYS2LOG(PhysPortMax);
+	
+	MacType = pAC->GIni.GIMacType;
 
 	if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) { /* Dual net mode */
 		LogPortMax--;
@@ -2739,19 +2769,14 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 		Limit = LogPortMax;
 	}
 
-
-	/*
-	 * Check action
-	 */
+	/* Check action */
 	if (Action != SK_PNMI_GET) {
 
 		*pLen = 0;
 		return (SK_PNMI_ERR_READ_ONLY);
 	}
 
-	/*
-	 * Check length
-	 */
+	/* Check length */
 	if (*pLen < (Limit - LogPortIndex) * sizeof(SK_U64)) {
 
 		*pLen = (Limit - LogPortIndex) * sizeof(SK_U64);
@@ -2759,7 +2784,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 	}
 
 	/*
-	 * Update XMAC statistic and increment semaphore to indicate that
+	 * Update MAC statistic and increment semaphore to indicate that
 	 * an update was already done.
 	 */
 	Ret = MacUpdate(pAC, IoC, 0, pAC->GIni.GIMacsFound - 1);
@@ -2770,9 +2795,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 	}
 	pAC->Pnmi.MacUpdatedFlag ++;
 
-	/*
-	 * Get value
-	 */
+	/* Get value */
 	Offset = 0;
 	for (; LogPortIndex < Limit; LogPortIndex ++) {
 
@@ -2787,51 +2810,44 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 			return (SK_PNMI_ERR_GENERAL);
 */
 		case OID_SKGE_STAT_RX:
-		case OID_SKGE_STAT_TX:
-			switch (pAC->GIni.GIMacType) {
-			case SK_MAC_XMAC:
+			if (MacType == SK_MAC_GMAC) {
+				StatVal =
+					GetStatVal(pAC, IoC, LogPortIndex,
+							   SK_PNMI_HRX_BROADCAST, NetIndex) +
+					GetStatVal(pAC, IoC, LogPortIndex,
+							   SK_PNMI_HRX_MULTICAST, NetIndex) +
+					GetStatVal(pAC, IoC, LogPortIndex,
+							   SK_PNMI_HRX_UNICAST, NetIndex) +
+					GetStatVal(pAC, IoC, LogPortIndex,
+							   SK_PNMI_HRX_UNDERSIZE, NetIndex);
+			}
+			else {
 				StatVal = GetStatVal(pAC, IoC, LogPortIndex,
 					IdTable[TableIndex].Param, NetIndex);
-				break;
-
-			case SK_MAC_GMAC:
-				if (Id == OID_SKGE_STAT_TX) {
-
-					StatVal =
-						GetStatVal(pAC, IoC, LogPortIndex,
-								   SK_PNMI_HTX_BROADCAST, NetIndex) +
-						GetStatVal(pAC, IoC, LogPortIndex,
-								   SK_PNMI_HTX_MULTICAST, NetIndex) +
-						GetStatVal(pAC, IoC, LogPortIndex,
-								   SK_PNMI_HTX_UNICAST, NetIndex);
-				}
-				else {
-					StatVal =
-						GetStatVal(pAC, IoC, LogPortIndex,
-								   SK_PNMI_HRX_BROADCAST, NetIndex) +
-						GetStatVal(pAC, IoC, LogPortIndex,
-								   SK_PNMI_HRX_MULTICAST, NetIndex) +
-						GetStatVal(pAC, IoC, LogPortIndex,
-								   SK_PNMI_HRX_UNICAST, NetIndex) +
-						GetStatVal(pAC, IoC, LogPortIndex,
-								   SK_PNMI_HRX_UNDERSIZE, NetIndex);
-				}
-				break;
-
-			default:
-				StatVal = 0;
-				break;
 			}
+			break;
 
-			SK_PNMI_STORE_U64(pBuf + Offset, StatVal);
+		case OID_SKGE_STAT_TX:
+			if (MacType == SK_MAC_GMAC) {
+				StatVal =
+					GetStatVal(pAC, IoC, LogPortIndex,
+							   SK_PNMI_HTX_BROADCAST, NetIndex) +
+					GetStatVal(pAC, IoC, LogPortIndex,
+							   SK_PNMI_HTX_MULTICAST, NetIndex) +
+					GetStatVal(pAC, IoC, LogPortIndex,
+							   SK_PNMI_HTX_UNICAST, NetIndex);
+			}
+			else {
+				StatVal = GetStatVal(pAC, IoC, LogPortIndex,
+					IdTable[TableIndex].Param, NetIndex);
+			}
 			break;
 
 		default:
 			StatVal = GetStatVal(pAC, IoC, LogPortIndex,
 				IdTable[TableIndex].Param, NetIndex);
-			SK_PNMI_STORE_U64(pBuf + Offset, StatVal);
-			break;
 		}
+		SK_PNMI_STORE_U64(pBuf + Offset, StatVal);
 
 		Offset += sizeof(SK_U64);
 	}
@@ -2863,19 +2879,19 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
  *	                         value range.
  *	SK_PNMI_ERR_READ_ONLY    The OID is read-only and cannot be set.
  *	SK_PNMI_ERR_UNKNOWN_INST The requested instance of the OID doesn't
- *                               exist (e.g. port instance 3 on a two port
+ *                           exist (e.g. port instance 3 on a two port
  *	                         adapter.
  */
 PNMI_STATIC int Addr(
 SK_AC *pAC,		/* Pointer to adapter context */
 SK_IOC IoC,		/* IO context handle */
-int Action,		/* Get/PreSet/Set action */
+int Action,		/* GET/PRESET/SET action */
 SK_U32 Id,		/* Object ID that is to be processed */
-char *pBuf,		/* Buffer to which to mgmt data will be retrieved */
-unsigned int *pLen,	/* On call: buffer length. On return: used buffer */
+char *pBuf,		/* Buffer used for the management data transfer */
+unsigned int *pLen,	/* On call: pBuf buffer length. On return: used buffer */
 SK_U32 Instance,	/* Instance (1..n) that is to be queried or -1 */
 unsigned int TableIndex, /* Index to the Id table */
-SK_U32 NetIndex)	/* NetIndex (0..n), in single net mode allways zero */
+SK_U32 NetIndex)	/* NetIndex (0..n), in single net mode always zero */
 {
 	int		Ret;
 	unsigned int	LogPortMax;
@@ -2906,7 +2922,6 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 		LogPortIndex = SK_PNMI_PORT_INST2LOG(Instance);
 		Limit = LogPortIndex + 1;
 	}
-
 	else { /* Instance == (SK_U32)(-1), get all Instances of that OID */
 
 		LogPortIndex = 0;
@@ -2918,9 +2933,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 	 */
 	if (Action == SK_PNMI_GET) {
 
-		/*
-		 * Check length
-		*/
+		/* Check length */
 		if (*pLen < (Limit - LogPortIndex) * 6) {
 
 			*pLen = (Limit - LogPortIndex) * 6;
@@ -2996,9 +3009,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 			return (SK_PNMI_ERR_GENERAL);
 		}
 
-		/*
-		 * Check length
-		*/
+		/* Check length */
 		if (*pLen < (Limit - LogPortIndex) * 6) {
 
 			*pLen = (Limit - LogPortIndex) * 6;
@@ -3069,19 +3080,19 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
  *	                         the correct data (e.g. a 32bit value is
  *	                         needed, but a 16 bit value was passed).
  *	SK_PNMI_ERR_UNKNOWN_INST The requested instance of the OID doesn't
- *                               exist (e.g. port instance 3 on a two port
+ *                           exist (e.g. port instance 3 on a two port
  *	                         adapter.
  */
 PNMI_STATIC int CsumStat(
 SK_AC *pAC,		/* Pointer to adapter context */
 SK_IOC IoC,		/* IO context handle */
-int Action,		/* Get/PreSet/Set action */
+int Action,		/* GET/PRESET/SET action */
 SK_U32 Id,		/* Object ID that is to be processed */
-char *pBuf,		/* Buffer to which to mgmt data will be retrieved */
-unsigned int *pLen,	/* On call: buffer length. On return: used buffer */
+char *pBuf,		/* Buffer used for the management data transfer */
+unsigned int *pLen,	/* On call: pBuf buffer length. On return: used buffer */
 SK_U32 Instance,	/* Instance (1..n) that is to be queried or -1 */
 unsigned int TableIndex, /* Index to the Id table */
-SK_U32 NetIndex)	/* NetIndex (0..n), in single net mode allways zero */
+SK_U32 NetIndex)	/* NetIndex (0..n), in single net mode always zero */
 {
 	unsigned int	Index;
 	unsigned int	Limit;
@@ -3116,9 +3127,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 		return (SK_PNMI_ERR_READ_ONLY);
 	}
 
-	/*
-	 * Check length
-	 */
+	/* Check length */
 	if (*pLen < (Limit - Index) * sizeof(SK_U64)) {
 
 		*pLen = (Limit - Index) * sizeof(SK_U64);
@@ -3187,19 +3196,19 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
  *	                         the correct data (e.g. a 32bit value is
  *	                         needed, but a 16 bit value was passed).
  *	SK_PNMI_ERR_UNKNOWN_INST The requested instance of the OID doesn't
- *                               exist (e.g. port instance 3 on a two port
+ *                           exist (e.g. port instance 3 on a two port
  *	                         adapter.
  */
 PNMI_STATIC int SensorStat(
 SK_AC *pAC,		/* Pointer to adapter context */
 SK_IOC IoC,		/* IO context handle */
-int Action,		/* Get/PreSet/Set action */
+int Action,		/* GET/PRESET/SET action */
 SK_U32 Id,		/* Object ID that is to be processed */
-char *pBuf,		/* Buffer to which to mgmt data will be retrieved */
-unsigned int *pLen,	/* On call: buffer length. On return: used buffer */
+char *pBuf,		/* Buffer used for the management data transfer */
+unsigned int *pLen,	/* On call: pBuf buffer length. On return: used buffer */
 SK_U32 Instance,	/* Instance (1..n) that is to be queried or -1 */
 unsigned int TableIndex, /* Index to the Id table */
-SK_U32 NetIndex)	/* NetIndex (0..n), in single net mode allways zero */
+SK_U32 NetIndex)	/* NetIndex (0..n), in single net mode always zero */
 {
 	unsigned int	i;
 	unsigned int	Index;
@@ -3238,9 +3247,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 		return (SK_PNMI_ERR_READ_ONLY);
 	}
 
-	/*
-	 * Check length
-	 */
+	/* Check length */
 	switch (Id) {
 
 	case OID_SKGE_SENSOR_VALUE:
@@ -3434,19 +3441,19 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
  *	                         value range.
  *	SK_PNMI_ERR_READ_ONLY    The OID is read-only and cannot be set.
  *	SK_PNMI_ERR_UNKNOWN_INST The requested instance of the OID doesn't
- *                               exist (e.g. port instance 3 on a two port
+ *                           exist (e.g. port instance 3 on a two port
  *	                         adapter.
  */
 PNMI_STATIC int Vpd(
 SK_AC *pAC,		/* Pointer to adapter context */
 SK_IOC IoC,		/* IO context handle */
-int Action,		/* Get/PreSet/Set action */
+int Action,		/* GET/PRESET/SET action */
 SK_U32 Id,		/* Object ID that is to be processed */
-char *pBuf,		/* Buffer to which to mgmt data will be retrieved */
-unsigned int *pLen,	/* On call: buffer length. On return: used buffer */
+char *pBuf,		/* Buffer used for the management data transfer */
+unsigned int *pLen,	/* On call: pBuf buffer length. On return: used buffer */
 SK_U32 Instance,	/* Instance (1..n) that is to be queried or -1 */
 unsigned int TableIndex, /* Index to the Id table */
-SK_U32 NetIndex)	/* NetIndex (0..n), in single net mode allways zero */
+SK_U32 NetIndex)	/* NetIndex (0..n), in single net mode always zero */
 {
 	SK_VPD_STATUS	*pVpdStatus;
 	unsigned int	BufLen;
@@ -3465,8 +3472,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 	/*
 	 * Get array of all currently stored VPD keys
 	 */
-	Ret = GetVpdKeyArr(pAC, IoC, &KeyArr[0][0], sizeof(KeyArr),
-		&KeyNo);
+	Ret = GetVpdKeyArr(pAC, IoC, &KeyArr[0][0], sizeof(KeyArr), &KeyNo);
 	if (Ret != SK_PNMI_ERR_OK) {
 		*pLen = 0;
 		return (Ret);
@@ -3712,7 +3718,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 			*pLen = 0;
 			return (SK_PNMI_ERR_GENERAL);
 		}
-	} 
+	}
 	else {
 		/* The only OID which can be set is VPD_ACTION */
 		if (Id != OID_SKGE_VPD_ACTION) {
@@ -3909,19 +3915,19 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
  *	                         the correct data (e.g. a 32bit value is
  *	                         needed, but a 16 bit value was passed).
  *	SK_PNMI_ERR_UNKNOWN_INST The requested instance of the OID doesn't
- *                               exist (e.g. port instance 3 on a two port
+ *                           exist (e.g. port instance 3 on a two port
  *	                         adapter.
  */
 PNMI_STATIC int General(
 SK_AC *pAC,		/* Pointer to adapter context */
 SK_IOC IoC,		/* IO context handle */
-int Action,		/* Get/PreSet/Set action */
+int Action,		/* GET/PRESET/SET action */
 SK_U32 Id,		/* Object ID that is to be processed */
-char *pBuf,		/* Buffer to which to mgmt data will be retrieved */
+char *pBuf,		/* Buffer used for the management data transfer */
 unsigned int *pLen,	/* On call: buffer length. On return: used buffer */
 SK_U32 Instance,	/* Instance (1..n) that is to be queried or -1 */
 unsigned int TableIndex, /* Index to the Id table */
-SK_U32 NetIndex)	/* NetIndex (0..n), in single net mode allways zero */
+SK_U32 NetIndex)	/* NetIndex (0..n), in single net mode always zero */
 {
 	int		Ret;
 	unsigned int	Index;
@@ -3939,7 +3945,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 	int			MacType;
 
 	/*
-	 * Check instance. We only handle single instance variables
+	 * Check instance. We only handle single instance variables.
 	 */
 	if (Instance != (SK_U32)(-1) && Instance != 1) {
 
@@ -3990,6 +3996,14 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 #endif /* SK_NDIS_64BIT_CTR */
 		break;
 
+	case OID_SKGE_BOARDLEVEL:
+		if (*pLen < sizeof(SK_U32)) {
+
+			*pLen = sizeof(SK_U32);
+			return (SK_PNMI_ERR_TOO_SHORT);
+		}
+		break;
+
 	case OID_SKGE_PORT_NUMBER:
 	case OID_SKGE_DEVICE_TYPE:
 	case OID_SKGE_RESULT:
@@ -4085,10 +4099,10 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 			Val64RxHwErrs =
 				GetStatVal(pAC, IoC, 0, SK_PNMI_HRX_MISSED, NetIndex) +
 				GetStatVal(pAC, IoC, 0, SK_PNMI_HRX_FRAMING, NetIndex) +
-				GetStatVal(pAC, IoC, 0, SK_PNMI_HRX_OVERFLOW, NetIndex)+
+				GetStatVal(pAC, IoC, 0, SK_PNMI_HRX_OVERFLOW, NetIndex) +
 				GetStatVal(pAC, IoC, 0, SK_PNMI_HRX_JABBER, NetIndex) +
 				GetStatVal(pAC, IoC, 0, SK_PNMI_HRX_CARRIER, NetIndex) +
-				GetStatVal(pAC, IoC, 0, SK_PNMI_HRX_IRLENGTH, NetIndex)+
+				GetStatVal(pAC, IoC, 0, SK_PNMI_HRX_IRLENGTH, NetIndex) +
 				GetStatVal(pAC, IoC, 0, SK_PNMI_HRX_SYMBOL, NetIndex) +
 				GetStatVal(pAC, IoC, 0, SK_PNMI_HRX_SHORTS, NetIndex) +
 				GetStatVal(pAC, IoC, 0, SK_PNMI_HRX_RUNT, NetIndex) +
@@ -4102,8 +4116,8 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 		case OID_GEN_XMIT_ERROR:
 			Val64TxHwErrs =
 				GetStatVal(pAC, IoC, 0, SK_PNMI_HTX_EXCESS_COL, NetIndex) +
-				GetStatVal(pAC, IoC, 0, SK_PNMI_HTX_LATE_COL, NetIndex)+
-				GetStatVal(pAC, IoC, 0, SK_PNMI_HTX_UNDERRUN, NetIndex)+
+				GetStatVal(pAC, IoC, 0, SK_PNMI_HTX_LATE_COL, NetIndex) +
+				GetStatVal(pAC, IoC, 0, SK_PNMI_HTX_UNDERRUN, NetIndex) +
 				GetStatVal(pAC, IoC, 0, SK_PNMI_HTX_CARRIER, NetIndex);
 			break;
 		}
@@ -4130,6 +4144,12 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 		*pLen = Len;
 		break;
 
+	case OID_SKGE_BOARDLEVEL:
+		Val32 = (SK_U32)pAC->GIni.GILevel;
+		SK_PNMI_STORE_U32(pBuf, Val32);
+		*pLen = sizeof(SK_U32);
+		break;
+
 	case OID_SKGE_PORT_NUMBER:
 		Val32 = (SK_U32)pAC->GIni.GIMacsFound;
 		SK_PNMI_STORE_U32(pBuf, Val32);
@@ -4316,7 +4336,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 		break;
 
 	case OID_SKGE_TX_SW_QUEUE_LEN:
-		/* 2002-09-17 pweber: For XMAC, use the frozen sw counters (BufPort) */
+		/* 2002-09-17 pweber: For XMAC, use the frozen SW counters (BufPort) */
 		if (MacType == SK_MAC_XMAC) {
 			/* Dual net mode */
 			if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
@@ -4345,7 +4365,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 
 
 	case OID_SKGE_TX_SW_QUEUE_MAX:
-		/* 2002-09-17 pweber: For XMAC, use the frozen sw counters (BufPort) */
+		/* 2002-09-17 pweber: For XMAC, use the frozen SW counters (BufPort) */
 		if (MacType == SK_MAC_XMAC) {
 			/* Dual net mode */
 			if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
@@ -4373,7 +4393,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 		break;
 
 	case OID_SKGE_TX_RETRY:
-		/* 2002-09-17 pweber: For XMAC, use the frozen sw counters (BufPort) */
+		/* 2002-09-17 pweber: For XMAC, use the frozen SW counters (BufPort) */
 		if (MacType == SK_MAC_XMAC) {
 			/* Dual net mode */
 			if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
@@ -4401,7 +4421,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 		break;
 
 	case OID_SKGE_RX_INTR_CTS:
-		/* 2002-09-17 pweber: For XMAC, use the frozen sw counters (BufPort) */
+		/* 2002-09-17 pweber: For XMAC, use the frozen SW counters (BufPort) */
 		if (MacType == SK_MAC_XMAC) {
 			/* Dual net mode */
 			if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
@@ -4429,7 +4449,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 		break;
 
 	case OID_SKGE_TX_INTR_CTS:
-		/* 2002-09-17 pweber: For XMAC, use the frozen sw counters (BufPort) */
+		/* 2002-09-17 pweber: For XMAC, use the frozen SW counters (BufPort) */
 		if (MacType == SK_MAC_XMAC) {
 			/* Dual net mode */
 			if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
@@ -4457,7 +4477,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 		break;
 
 	case OID_SKGE_RX_NO_BUF_CTS:
-		/* 2002-09-17 pweber: For XMAC, use the frozen sw counters (BufPort) */
+		/* 2002-09-17 pweber: For XMAC, use the frozen SW counters (BufPort) */
 		if (MacType == SK_MAC_XMAC) {
 			/* Dual net mode */
 			if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
@@ -4485,7 +4505,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 		break;
 
 	case OID_SKGE_TX_NO_BUF_CTS:
-		/* 2002-09-17 pweber: For XMAC, use the frozen sw counters (BufPort) */
+		/* 2002-09-17 pweber: For XMAC, use the frozen SW counters (BufPort) */
 		if (MacType == SK_MAC_XMAC) {
 			/* Dual net mode */
 			if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
@@ -4513,7 +4533,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 		break;
 
 	case OID_SKGE_TX_USED_DESCR_NO:
-		/* 2002-09-17 pweber: For XMAC, use the frozen sw counters (BufPort) */
+		/* 2002-09-17 pweber: For XMAC, use the frozen SW counters (BufPort) */
 		if (MacType == SK_MAC_XMAC) {
 			/* Dual net mode */
 			if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
@@ -4541,7 +4561,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 		break;
 
 	case OID_SKGE_RX_DELIVERED_CTS:
-		/* 2002-09-17 pweber: For XMAC, use the frozen sw counters (BufPort) */
+		/* 2002-09-17 pweber: For XMAC, use the frozen SW counters (BufPort) */
 		if (MacType == SK_MAC_XMAC) {
 			/* Dual net mode */
 			if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
@@ -4569,7 +4589,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 		break;
 
 	case OID_SKGE_RX_OCTETS_DELIV_CTS:
-		/* 2002-09-17 pweber: For XMAC, use the frozen sw counters (BufPort) */
+		/* 2002-09-17 pweber: For XMAC, use the frozen SW counters (BufPort) */
 		if (MacType == SK_MAC_XMAC) {
 			/* Dual net mode */
 			if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
@@ -4607,7 +4627,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 		break;
 
 	case OID_SKGE_IN_ERRORS_CTS:
-		/* 2002-09-17 pweber: For XMAC, use the frozen sw counters (BufPort) */
+		/* 2002-09-17 pweber: For XMAC, use the frozen SW counters (BufPort) */
 		if (MacType == SK_MAC_XMAC) {
 			/* Dual net mode */
 			if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
@@ -4615,7 +4635,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 			}
 			/* Single net mode */
 			else {
-				Val64 = Val64RxHwErrs + 
+				Val64 = Val64RxHwErrs +
 					pAC->Pnmi.BufPort[0].RxNoBufCts +
 					pAC->Pnmi.BufPort[1].RxNoBufCts;
 			}
@@ -4627,7 +4647,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 			}
 			/* Single net mode */
 			else {
-				Val64 = Val64RxHwErrs + 
+				Val64 = Val64RxHwErrs +
 					pAC->Pnmi.Port[0].RxNoBufCts +
 					pAC->Pnmi.Port[1].RxNoBufCts;
 			}
@@ -4637,7 +4657,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 		break;
 
 	case OID_SKGE_OUT_ERROR_CTS:
-		/* 2002-09-17 pweber: For XMAC, use the frozen sw counters (BufPort) */
+		/* 2002-09-17 pweber: For XMAC, use the frozen SW counters (BufPort) */
 		if (MacType == SK_MAC_XMAC) {
 			/* Dual net mode */
 			if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
@@ -4645,7 +4665,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 			}
 			/* Single net mode */
 			else {
-				Val64 = Val64TxHwErrs + 
+				Val64 = Val64TxHwErrs +
 					pAC->Pnmi.BufPort[0].TxNoBufCts +
 					pAC->Pnmi.BufPort[1].TxNoBufCts;
 			}
@@ -4657,7 +4677,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 			}
 			/* Single net mode */
 			else {
-				Val64 = Val64TxHwErrs + 
+				Val64 = Val64TxHwErrs +
 					pAC->Pnmi.Port[0].TxNoBufCts +
 					pAC->Pnmi.Port[1].TxNoBufCts;
 			}
@@ -4667,7 +4687,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 		break;
 
 	case OID_SKGE_ERR_RECOVERY_CTS:
-		/* 2002-09-17 pweber: For XMAC, use the frozen sw counters (BufPort) */
+		/* 2002-09-17 pweber: For XMAC, use the frozen SW counters (BufPort) */
 		if (MacType == SK_MAC_XMAC) {
 			/* Dual net mode */
 			if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {
@@ -4708,7 +4728,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 		break;
 
 	case OID_GEN_RCV_ERROR:
-		/* 2002-09-17 pweber: For XMAC, use the frozen sw counters (BufPort) */
+		/* 2002-09-17 pweber: For XMAC, use the frozen SW counters (BufPort) */
 		if (MacType == SK_MAC_XMAC) {
 			Val64 = Val64RxHwErrs + pAC->Pnmi.BufPort[NetIndex].RxNoBufCts;
 		}
@@ -4731,7 +4751,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 		break;
 
 	case OID_GEN_XMIT_ERROR:
-		/* 2002-09-17 pweber: For XMAC, use the frozen sw counters (BufPort) */
+		/* 2002-09-17 pweber: For XMAC, use the frozen SW counters (BufPort) */
 		if (MacType == SK_MAC_XMAC) {
 			Val64 = Val64TxHwErrs + pAC->Pnmi.BufPort[NetIndex].TxNoBufCts;
 		}
@@ -4754,7 +4774,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 		break;
 
 	case OID_GEN_RCV_NO_BUFFER:
-		/* 2002-09-17 pweber: For XMAC, use the frozen sw counters (BufPort) */
+		/* 2002-09-17 pweber: For XMAC, use the frozen SW counters (BufPort) */
 		if (MacType == SK_MAC_XMAC) {
 			Val64 = pAC->Pnmi.BufPort[NetIndex].RxNoBufCts;
 		}
@@ -4820,19 +4840,19 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
  *	                         value range.
  *	SK_PNMI_ERR_READ_ONLY    The OID is read-only and cannot be set.
  *	SK_PNMI_ERR_UNKNOWN_INST The requested instance of the OID doesn't
- *                               exist (e.g. port instance 3 on a two port
+ *                           exist (e.g. port instance 3 on a two port
  *	                         adapter.
  */
 PNMI_STATIC int Rlmt(
 SK_AC *pAC,		/* Pointer to adapter context */
 SK_IOC IoC,		/* IO context handle */
-int Action,		/* Get/PreSet/Set action */
+int Action,		/* GET/PRESET/SET action */
 SK_U32 Id,		/* Object ID that is to be processed */
-char *pBuf,		/* Buffer to which to mgmt data will be retrieved */
-unsigned int *pLen,	/* On call: buffer length. On return: used buffer */
+char *pBuf,		/* Buffer used for the management data transfer */
+unsigned int *pLen,	/* On call: pBuf buffer length. On return: used buffer */
 SK_U32 Instance,	/* Instance (1..n) that is to be queried or -1 */
 unsigned int TableIndex, /* Index to the Id table */
-SK_U32 NetIndex)	/* NetIndex (0..n), in single net mode allways zero */
+SK_U32 NetIndex)	/* NetIndex (0..n), in single net mode always zero */
 {
 	int		Ret;
 	unsigned int	PhysPortIndex;
@@ -4852,7 +4872,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 	}
 
 	/*
-	 * Perform the requested action
+	 * Perform the requested action.
 	 */
 	if (Action == SK_PNMI_GET) {
 
@@ -5125,19 +5145,19 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
  *	                         the correct data (e.g. a 32bit value is
  *	                         needed, but a 16 bit value was passed).
  *	SK_PNMI_ERR_UNKNOWN_INST The requested instance of the OID doesn't
- *                               exist (e.g. port instance 3 on a two port
+ *                           exist (e.g. port instance 3 on a two port
  *	                         adapter.
  */
 PNMI_STATIC int RlmtStat(
 SK_AC *pAC,		/* Pointer to adapter context */
 SK_IOC IoC,		/* IO context handle */
-int Action,		/* Get/PreSet/Set action */
+int Action,		/* GET/PRESET/SET action */
 SK_U32 Id,		/* Object ID that is to be processed */
-char *pBuf,		/* Buffer to which to mgmt data will be retrieved */
-unsigned int *pLen,	/* On call: buffer length. On return: used buffer */
+char *pBuf,		/* Buffer used for the management data transfer */
+unsigned int *pLen,	/* On call: pBuf buffer length. On return: used buffer */
 SK_U32 Instance,	/* Instance (1..n) that is to be queried or -1 */
 unsigned int TableIndex, /* Index to the Id table */
-SK_U32 NetIndex)	/* NetIndex (0..n), in single net mode allways zero */
+SK_U32 NetIndex)	/* NetIndex (0..n), in single net mode always zero */
 {
 	unsigned int	PhysPortMax;
 	unsigned int	PhysPortIndex;
@@ -5148,7 +5168,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 	SK_U64		Val64;
 
 	/*
-	 * Calculate the port indexes from the instance
+	 * Calculate the port indexes from the instance.
 	 */
 	PhysPortMax = pAC->GIni.GIMacsFound;
 
@@ -5327,19 +5347,19 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
  *	                         value range.
  *	SK_PNMI_ERR_READ_ONLY    The OID is read-only and cannot be set.
  *	SK_PNMI_ERR_UNKNOWN_INST The requested instance of the OID doesn't
- *                               exist (e.g. port instance 3 on a two port
+ *                           exist (e.g. port instance 3 on a two port
  *	                         adapter.
  */
 PNMI_STATIC int MacPrivateConf(
 SK_AC *pAC,		/* Pointer to adapter context */
 SK_IOC IoC,		/* IO context handle */
-int Action,		/* Get/PreSet/Set action */
+int Action,		/* GET/PRESET/SET action */
 SK_U32 Id,		/* Object ID that is to be processed */
-char *pBuf,		/* Buffer to which to mgmt data will be retrieved */
-unsigned int *pLen,	/* On call: buffer length. On return: used buffer */
+char *pBuf,		/* Buffer used for the management data transfer */
+unsigned int *pLen,	/* On call: pBuf buffer length. On return: used buffer */
 SK_U32 Instance,	/* Instance (1..n) that is to be queried or -1 */
 unsigned int TableIndex, /* Index to the Id table */
-SK_U32 NetIndex)	/* NetIndex (0..n), in single net mode allways zero */
+SK_U32 NetIndex)	/* NetIndex (0..n), in single net mode always zero */
 {
 	unsigned int	PhysPortMax;
 	unsigned int	PhysPortIndex;
@@ -5348,14 +5368,13 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 	unsigned int	Limit;
 	unsigned int	Offset;
 	char		Val8;
-	int		Ret;
+	char 		*pBufPtr;
+	int			Ret;
 	SK_EVPARA	EventParam;
 	SK_U32		Val32;
 
-
 	/*
-	 * Calculate instance if wished. MAC index 0 is the virtual
-	 * MAC.
+	 * Calculate instance if wished. MAC index 0 is the virtual MAC.
 	 */
 	PhysPortMax = pAC->GIni.GIMacsFound;
 	LogPortMax = SK_PNMI_PORT_PHYS2LOG(PhysPortMax);
@@ -5386,9 +5405,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 	 */
 	if (Action == SK_PNMI_GET) {
 
-		/*
-		 * Check length
-		 */
+		/* Check length */
 		switch (Id) {
 
 		case OID_SKGE_PMD:
@@ -5408,16 +5425,15 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 		case OID_SKGE_SPEED_STATUS:
 			if (*pLen < (Limit - LogPortIndex) * sizeof(SK_U8)) {
 
-				*pLen = (Limit - LogPortIndex) *
-					sizeof(SK_U8);
+				*pLen = (Limit - LogPortIndex) * sizeof(SK_U8);
 				return (SK_PNMI_ERR_TOO_SHORT);
 			}
 			break;
 
         case OID_SKGE_MTU:
-			if (*pLen < sizeof(SK_U32)) {
+			if (*pLen < (Limit - LogPortIndex) * sizeof(SK_U32)) {
 
-				*pLen = sizeof(SK_U32);
+				*pLen = (Limit - LogPortIndex) * sizeof(SK_U32);
 				return (SK_PNMI_ERR_TOO_SHORT);
 			}
 			break;
@@ -5446,343 +5462,297 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 		Offset = 0;
 		for (; LogPortIndex < Limit; LogPortIndex ++) {
 
+			pBufPtr = pBuf + Offset;
+			
 			switch (Id) {
 
 			case OID_SKGE_PMD:
-				*(pBuf + Offset) = pAC->Pnmi.PMD;
+				*pBufPtr = pAC->Pnmi.PMD;
 				Offset += sizeof(char);
 				break;
 
 			case OID_SKGE_CONNECTOR:
-				*(pBuf + Offset) = pAC->Pnmi.Connector;
+				*pBufPtr = pAC->Pnmi.Connector;
 				Offset += sizeof(char);
 				break;
 
 			case OID_SKGE_LINK_CAP:
 				if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNetMode */
 					if (LogPortIndex == 0) {
-	
 						/* Get value for virtual port */
-						VirtualConf(pAC, IoC, Id, pBuf +
-							Offset);
+						VirtualConf(pAC, IoC, Id, pBufPtr);
 					}
 					else {
 						/* Get value for physical ports */
 						PhysPortIndex = SK_PNMI_PORT_LOG2PHYS(
 							pAC, LogPortIndex);
 
-						*(pBuf + Offset) = pAC->GIni.GP[
-							PhysPortIndex].PLinkCap;
+						*pBufPtr = pAC->GIni.GP[PhysPortIndex].PLinkCap;
 					}
-					Offset += sizeof(char);
 				}
 				else { /* DualNetMode */
 					
-					*(pBuf + Offset) = pAC->GIni.GP[NetIndex].PLinkCap;
-					Offset += sizeof(char);
+					*pBufPtr = pAC->GIni.GP[NetIndex].PLinkCap;
 				}
+				Offset += sizeof(char);
 				break;
 
 			case OID_SKGE_LINK_MODE:
 				if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNetMode */
 					if (LogPortIndex == 0) {
-	
 						/* Get value for virtual port */
-						VirtualConf(pAC, IoC, Id, pBuf +
-						Offset);
+						VirtualConf(pAC, IoC, Id, pBufPtr);
 					}
 					else {
 						/* Get value for physical ports */
 						PhysPortIndex = SK_PNMI_PORT_LOG2PHYS(
 							pAC, LogPortIndex);
 
-						*(pBuf + Offset) = pAC->GIni.GP[
-							PhysPortIndex].PLinkModeConf;
+						*pBufPtr = pAC->GIni.GP[PhysPortIndex].PLinkModeConf;
 					}
-					Offset += sizeof(char);
 				}
-				else { /* DualNetMode */ 
+				else { /* DualNetMode */
 				
-					*(pBuf + Offset) = pAC->GIni.GP[NetIndex].PLinkModeConf;
-					Offset += sizeof(char);
+					*pBufPtr = pAC->GIni.GP[NetIndex].PLinkModeConf;
 				}
+				Offset += sizeof(char);
 				break;
 
 			case OID_SKGE_LINK_MODE_STATUS:
 				if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNetMode */
 					if (LogPortIndex == 0) {
-	
 						/* Get value for virtual port */
-						VirtualConf(pAC, IoC, Id, pBuf +
-							Offset);
+						VirtualConf(pAC, IoC, Id, pBufPtr);
 					}
 					else {
 						/* Get value for physical port */
 						PhysPortIndex = SK_PNMI_PORT_LOG2PHYS(
 							pAC, LogPortIndex);
 
-						*(pBuf + Offset) =
-							CalculateLinkModeStatus(pAC,
-								IoC, PhysPortIndex);
+						*pBufPtr =
+							CalculateLinkModeStatus(pAC, IoC, PhysPortIndex);
 					}
-					Offset += sizeof(char);
 				}
 				else { /* DualNetMode */
-					*(pBuf + Offset) = CalculateLinkModeStatus(pAC, IoC, NetIndex);
-					Offset += sizeof(char);
+					
+					*pBufPtr = CalculateLinkModeStatus(pAC, IoC, NetIndex);
 				}
+				Offset += sizeof(char);
 				break;
 
 			case OID_SKGE_LINK_STATUS:
 				if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNetMode */
 					if (LogPortIndex == 0) {
-	
 						/* Get value for virtual port */
-						VirtualConf(pAC, IoC, Id, pBuf +
-							Offset);
+						VirtualConf(pAC, IoC, Id, pBufPtr);
 					}
 					else {
 						/* Get value for physical ports */
 						PhysPortIndex = SK_PNMI_PORT_LOG2PHYS(
 							pAC, LogPortIndex);
 	
-						*(pBuf + Offset) =
-							CalculateLinkStatus(pAC,
-								IoC, PhysPortIndex);
+						*pBufPtr = CalculateLinkStatus(pAC, IoC, PhysPortIndex);
 					}
-					Offset += sizeof(char);
 				}
 				else { /* DualNetMode */
 
-					*(pBuf + Offset) = CalculateLinkStatus(pAC, IoC, NetIndex);
-					Offset += sizeof(char);
+					*pBufPtr = CalculateLinkStatus(pAC, IoC, NetIndex);
 				}
+				Offset += sizeof(char);
 				break;
 
 			case OID_SKGE_FLOWCTRL_CAP:
 				if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNetMode */
 					if (LogPortIndex == 0) {
-	
 						/* Get value for virtual port */
-						VirtualConf(pAC, IoC, Id, pBuf +
-							Offset);
+						VirtualConf(pAC, IoC, Id, pBufPtr);
 					}
 					else {
 						/* Get value for physical ports */
 						PhysPortIndex = SK_PNMI_PORT_LOG2PHYS(
 							pAC, LogPortIndex);
 	
-						*(pBuf + Offset) = pAC->GIni.GP[
-							PhysPortIndex].PFlowCtrlCap;
+						*pBufPtr = pAC->GIni.GP[PhysPortIndex].PFlowCtrlCap;
 					}
-					Offset += sizeof(char);
 				}
 				else { /* DualNetMode */
 				
-					*(pBuf + Offset) = pAC->GIni.GP[NetIndex].PFlowCtrlCap;
-					Offset += sizeof(char);
+					*pBufPtr = pAC->GIni.GP[NetIndex].PFlowCtrlCap;
 				}
+				Offset += sizeof(char);
 				break;
 
 			case OID_SKGE_FLOWCTRL_MODE:
 				if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNetMode */
 					if (LogPortIndex == 0) {
-	
 						/* Get value for virtual port */
-						VirtualConf(pAC, IoC, Id, pBuf +
-							Offset);
+						VirtualConf(pAC, IoC, Id, pBufPtr);
 					}
 					else {
 						/* Get value for physical port */
 						PhysPortIndex = SK_PNMI_PORT_LOG2PHYS(
 							pAC, LogPortIndex);
 	
-						*(pBuf + Offset) = pAC->GIni.GP[
-							PhysPortIndex].PFlowCtrlMode;
+						*pBufPtr = pAC->GIni.GP[PhysPortIndex].PFlowCtrlMode;
 					}
-					Offset += sizeof(char);
 				}
 				else { /* DualNetMode */
 
-					*(pBuf + Offset) = pAC->GIni.GP[NetIndex].PFlowCtrlMode;
-					Offset += sizeof(char);
+					*pBufPtr = pAC->GIni.GP[NetIndex].PFlowCtrlMode;
 				}
+				Offset += sizeof(char);
 				break;
 
 			case OID_SKGE_FLOWCTRL_STATUS:
 				if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNetMode */
 					if (LogPortIndex == 0) {
-	
 						/* Get value for virtual port */
-						VirtualConf(pAC, IoC, Id, pBuf +
-							Offset);
+						VirtualConf(pAC, IoC, Id, pBufPtr);
 					}
 					else {
 						/* Get value for physical port */
 						PhysPortIndex = SK_PNMI_PORT_LOG2PHYS(
 							pAC, LogPortIndex);
 	
-						*(pBuf + Offset) = pAC->GIni.GP[
-							PhysPortIndex].PFlowCtrlStatus;
+						*pBufPtr = pAC->GIni.GP[PhysPortIndex].PFlowCtrlStatus;
 					}
-					Offset += sizeof(char);
 				}
 				else { /* DualNetMode */
 
-					*(pBuf + Offset) = pAC->GIni.GP[NetIndex].PFlowCtrlStatus;
-					Offset += sizeof(char);
+					*pBufPtr = pAC->GIni.GP[NetIndex].PFlowCtrlStatus;
 				}
+				Offset += sizeof(char);
 				break;
 
 			case OID_SKGE_PHY_OPERATION_CAP:
 				if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNetMode */
 					if (LogPortIndex == 0) {
-	
 						/* Get value for virtual port */
-						VirtualConf(pAC, IoC, Id, pBuf +
-							Offset);
+						VirtualConf(pAC, IoC, Id, pBufPtr);
 					}
 					else {
 						/* Get value for physical ports */
 						PhysPortIndex = SK_PNMI_PORT_LOG2PHYS(
 							pAC, LogPortIndex);
 	
-						*(pBuf + Offset) = pAC->GIni.GP[
-							PhysPortIndex].PMSCap;
+						*pBufPtr = pAC->GIni.GP[PhysPortIndex].PMSCap;
 					}
-					Offset += sizeof(char);
 				}
 				else { /* DualNetMode */
 				
-					*(pBuf + Offset) = pAC->GIni.GP[NetIndex].PMSCap;
-					Offset += sizeof(char);
+					*pBufPtr = pAC->GIni.GP[NetIndex].PMSCap;
 				}
+				Offset += sizeof(char);
 				break;
 
 			case OID_SKGE_PHY_OPERATION_MODE:
 				if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNetMode */
 					if (LogPortIndex == 0) {
-
 						/* Get value for virtual port */
-						VirtualConf(pAC, IoC, Id, pBuf + Offset);
+						VirtualConf(pAC, IoC, Id, pBufPtr);
 					}
 					else {
 						/* Get value for physical port */
 						PhysPortIndex = SK_PNMI_PORT_LOG2PHYS(
 							pAC, LogPortIndex);
 
-						*(pBuf + Offset) = pAC->GIni.GP[
-							PhysPortIndex].PMSMode;
+						*pBufPtr = pAC->GIni.GP[PhysPortIndex].PMSMode;
 					}
-					Offset += sizeof(char);
 				}
 				else { /* DualNetMode */
 				
-					*(pBuf + Offset) = pAC->GIni.GP[NetIndex].PMSMode;
-					Offset += sizeof(char);
+					*pBufPtr = pAC->GIni.GP[NetIndex].PMSMode;
 				}
+				Offset += sizeof(char);
 				break;
 
 			case OID_SKGE_PHY_OPERATION_STATUS:
 				if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNetMode */
 					if (LogPortIndex == 0) {
-
 						/* Get value for virtual port */
-						VirtualConf(pAC, IoC, Id, pBuf + Offset);
+						VirtualConf(pAC, IoC, Id, pBufPtr);
 					}
 					else {
 						/* Get value for physical port */
 						PhysPortIndex = SK_PNMI_PORT_LOG2PHYS(
 							pAC, LogPortIndex);
 	
-						*(pBuf + Offset) = pAC->GIni.GP[
-							PhysPortIndex].PMSStatus;
+						*pBufPtr = pAC->GIni.GP[PhysPortIndex].PMSStatus;
 					}
-					Offset += sizeof(char);
 				}
 				else {
 				
-					*(pBuf + Offset) = pAC->GIni.GP[NetIndex].PMSStatus;
-					Offset += sizeof(char);
+					*pBufPtr = pAC->GIni.GP[NetIndex].PMSStatus;
 				}
+				Offset += sizeof(char);
 				break;
 
 			case OID_SKGE_SPEED_CAP:
 				if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNetMode */
 					if (LogPortIndex == 0) {
-	
 						/* Get value for virtual port */
-						VirtualConf(pAC, IoC, Id, pBuf +
-							Offset);
+						VirtualConf(pAC, IoC, Id, pBufPtr);
 					}
 					else {
 						/* Get value for physical ports */
 						PhysPortIndex = SK_PNMI_PORT_LOG2PHYS(
 							pAC, LogPortIndex);
 	
-						*(pBuf + Offset) = pAC->GIni.GP[
-							PhysPortIndex].PLinkSpeedCap;
+						*pBufPtr = pAC->GIni.GP[PhysPortIndex].PLinkSpeedCap;
 					}
-					Offset += sizeof(char);
 				}
 				else { /* DualNetMode */
 				
-					*(pBuf + Offset) = pAC->GIni.GP[NetIndex].PLinkSpeedCap;
-					Offset += sizeof(char);
+					*pBufPtr = pAC->GIni.GP[NetIndex].PLinkSpeedCap;
 				}
+				Offset += sizeof(char);
 				break;
 
 			case OID_SKGE_SPEED_MODE:
 				if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNetMode */
 					if (LogPortIndex == 0) {
-	
 						/* Get value for virtual port */
-						VirtualConf(pAC, IoC, Id, pBuf + Offset);
+						VirtualConf(pAC, IoC, Id, pBufPtr);
 					}
 					else {
 						/* Get value for physical port */
 						PhysPortIndex = SK_PNMI_PORT_LOG2PHYS(
 							pAC, LogPortIndex);
 	
-						*(pBuf + Offset) = pAC->GIni.GP[
-							PhysPortIndex].PLinkSpeed;
+						*pBufPtr = pAC->GIni.GP[PhysPortIndex].PLinkSpeed;
 					}
-					Offset += sizeof(char);
 				}
 				else { /* DualNetMode */
 
-					*(pBuf + Offset) = pAC->GIni.GP[NetIndex].PLinkSpeed;
-					Offset += sizeof(char);
+					*pBufPtr = pAC->GIni.GP[NetIndex].PLinkSpeed;
 				}
+				Offset += sizeof(char);
 				break;
 
 			case OID_SKGE_SPEED_STATUS:
 				if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNetMode */
 					if (LogPortIndex == 0) {
-	
 						/* Get value for virtual port */
-						VirtualConf(pAC, IoC, Id, pBuf + Offset);
+						VirtualConf(pAC, IoC, Id, pBufPtr);
 					}
 					else {
 						/* Get value for physical port */
 						PhysPortIndex = SK_PNMI_PORT_LOG2PHYS(
 							pAC, LogPortIndex);
 	
-						*(pBuf + Offset) = pAC->GIni.GP[
-							PhysPortIndex].PLinkSpeedUsed;
+						*pBufPtr = pAC->GIni.GP[PhysPortIndex].PLinkSpeedUsed;
 					}
-					Offset += sizeof(char);
 				}
 				else { /* DualNetMode */
 
-					*(pBuf + Offset) = pAC->GIni.GP[NetIndex].PLinkSpeedUsed;
-					Offset += sizeof(char);
+					*pBufPtr = pAC->GIni.GP[NetIndex].PLinkSpeedUsed;
 				}
+				Offset += sizeof(char);
 				break;
 			
 			case OID_SKGE_MTU:
 				Val32 = SK_DRIVER_GET_MTU(pAC, IoC, NetIndex);
-				SK_PNMI_STORE_U32(pBuf + Offset, Val32);
+				SK_PNMI_STORE_U32(pBufPtr, Val32);
 				Offset += sizeof(SK_U32);
 				break;
 
@@ -6209,19 +6179,19 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
  *	                         value range.
  *	SK_PNMI_ERR_READ_ONLY    The OID is read-only and cannot be set.
  *	SK_PNMI_ERR_UNKNOWN_INST The requested instance of the OID doesn't
- *                               exist (e.g. port instance 3 on a two port
+ *                           exist (e.g. port instance 3 on a two port
  *	                         adapter.
  */
 PNMI_STATIC int Monitor(
 SK_AC *pAC,		/* Pointer to adapter context */
 SK_IOC IoC,		/* IO context handle */
-int Action,		/* Get/PreSet/Set action */
+int Action,		/* GET/PRESET/SET action */
 SK_U32 Id,		/* Object ID that is to be processed */
-char *pBuf,		/* Buffer to which to mgmt data will be retrieved */
-unsigned int *pLen,	/* On call: buffer length. On return: used buffer */
+char *pBuf,		/* Buffer used for the management data transfer */
+unsigned int *pLen,	/* On call: pBuf buffer length. On return: used buffer */
 SK_U32 Instance,	/* Instance (1..n) that is to be queried or -1 */
 unsigned int TableIndex, /* Index to the Id table */
-SK_U32 NetIndex)	/* NetIndex (0..n), in single net mode allways zero */
+SK_U32 NetIndex)	/* NetIndex (0..n), in single net mode always zero */
 {
 	unsigned int	Index;
 	unsigned int	Limit;
@@ -6232,7 +6202,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 	/*
 	 * Calculate instance if wished.
 	 */
-/* XXX Not yet implemented. Return always an empty table. */
+	/* XXX Not yet implemented. Return always an empty table. */
 	Entries = 0;
 
 	if ((Instance != (SK_U32)(-1))) {
@@ -6331,21 +6301,23 @@ PNMI_STATIC void VirtualConf(
 SK_AC *pAC,		/* Pointer to adapter context */
 SK_IOC IoC,		/* IO context handle */
 SK_U32 Id,		/* Object ID that is to be processed */
-char *pBuf)		/* Buffer to which to mgmt data will be retrieved */
+char *pBuf)		/* Buffer used for the management data transfer */
 {
 	unsigned int	PhysPortMax;
 	unsigned int	PhysPortIndex;
 	SK_U8		Val8;
 	SK_BOOL		PortActiveFlag;
-
+	SK_GEPORT	*pPrt;
 
 	*pBuf = 0;
 	PortActiveFlag = SK_FALSE;
 	PhysPortMax = pAC->GIni.GIMacsFound;
-
+	
 	for (PhysPortIndex = 0; PhysPortIndex < PhysPortMax;
 		PhysPortIndex ++) {
 
+		pPrt = &pAC->GIni.GP[PhysPortIndex];
+
 		/* Check if the physical port is active */
 		if (!pAC->Pnmi.Port[PhysPortIndex].ActiveFlag) {
 
@@ -6364,14 +6336,14 @@ char *pBuf)		/* Buffer to which to mgmt 
 			 * From a curious point of view the virtual port
 			 * is capable of all found capabilities.
 			 */
-			*pBuf |= pAC->GIni.GP[PhysPortIndex].PLinkCap;
+			*pBuf |= pPrt->PLinkCap;
 			break;
 
 		case OID_SKGE_LINK_MODE:
 			/* Check if it is the first active port */
 			if (*pBuf == 0) {
 
-				*pBuf = pAC->GIni.GP[PhysPortIndex].PLinkModeConf;
+				*pBuf = pPrt->PLinkModeConf;
 				continue;
 			}
 
@@ -6380,8 +6352,7 @@ char *pBuf)		/* Buffer to which to mgmt 
 			 * mode than the first one we return a value that
 			 * indicates that the link mode is indeterminated.
 			 */
-			if (*pBuf != pAC->GIni.GP[PhysPortIndex].PLinkModeConf
-				) {
+			if (*pBuf != pPrt->PLinkModeConf) {
 
 				*pBuf = SK_LMODE_INDETERMINATED;
 			}
@@ -6437,7 +6408,7 @@ char *pBuf)		/* Buffer to which to mgmt 
 			/* Check if it is the first active port */
 			if (*pBuf == 0) {
 
-				*pBuf = pAC->GIni.GP[PhysPortIndex].PFlowCtrlCap;
+				*pBuf = pPrt->PFlowCtrlCap;
 				continue;
 			}
 
@@ -6445,14 +6416,14 @@ char *pBuf)		/* Buffer to which to mgmt 
 			 * From a curious point of view the virtual port
 			 * is capable of all found capabilities.
 			 */
-			*pBuf |= pAC->GIni.GP[PhysPortIndex].PFlowCtrlCap;
+			*pBuf |= pPrt->PFlowCtrlCap;
 			break;
 
 		case OID_SKGE_FLOWCTRL_MODE:
 			/* Check if it is the first active port */
 			if (*pBuf == 0) {
 
-				*pBuf = pAC->GIni.GP[PhysPortIndex].PFlowCtrlMode;
+				*pBuf = pPrt->PFlowCtrlMode;
 				continue;
 			}
 
@@ -6461,7 +6432,7 @@ char *pBuf)		/* Buffer to which to mgmt 
 			 * control mode than the first one, we return a value
 			 * that indicates that the mode is indeterminated.
 			 */
-			if (*pBuf != pAC->GIni.GP[PhysPortIndex].PFlowCtrlMode) {
+			if (*pBuf != pPrt->PFlowCtrlMode) {
 
 				*pBuf = SK_FLOW_MODE_INDETERMINATED;
 			}
@@ -6471,7 +6442,7 @@ char *pBuf)		/* Buffer to which to mgmt 
 			/* Check if it is the first active port */
 			if (*pBuf == 0) {
 
-				*pBuf = pAC->GIni.GP[PhysPortIndex].PFlowCtrlStatus;
+				*pBuf = pPrt->PFlowCtrlStatus;
 				continue;
 			}
 
@@ -6481,7 +6452,7 @@ char *pBuf)		/* Buffer to which to mgmt 
 			 * value that indicates that the status is
 			 * indeterminated.
 			 */
-			if (*pBuf != pAC->GIni.GP[PhysPortIndex].PFlowCtrlStatus) {
+			if (*pBuf != pPrt->PFlowCtrlStatus) {
 
 				*pBuf = SK_FLOW_STAT_INDETERMINATED;
 			}
@@ -6491,7 +6462,7 @@ char *pBuf)		/* Buffer to which to mgmt 
 			/* Check if it is the first active port */
 			if (*pBuf == 0) {
 
-				*pBuf = pAC->GIni.GP[PhysPortIndex].PMSCap;
+				*pBuf = pPrt->PMSCap;
 				continue;
 			}
 
@@ -6499,14 +6470,14 @@ char *pBuf)		/* Buffer to which to mgmt 
 			 * From a curious point of view the virtual port
 			 * is capable of all found capabilities.
 			 */
-			*pBuf |= pAC->GIni.GP[PhysPortIndex].PMSCap;
+			*pBuf |= pPrt->PMSCap;
 			break;
 
 		case OID_SKGE_PHY_OPERATION_MODE:
 			/* Check if it is the first active port */
 			if (*pBuf == 0) {
 
-				*pBuf = pAC->GIni.GP[PhysPortIndex].PMSMode;
+				*pBuf = pPrt->PMSMode;
 				continue;
 			}
 
@@ -6515,7 +6486,7 @@ char *pBuf)		/* Buffer to which to mgmt 
 			 * slave mode than the first one, we return a value
 			 * that indicates that the mode is indeterminated.
 			 */
-			if (*pBuf != pAC->GIni.GP[PhysPortIndex].PMSMode) {
+			if (*pBuf != pPrt->PMSMode) {
 
 				*pBuf = SK_MS_MODE_INDETERMINATED;
 			}
@@ -6525,7 +6496,7 @@ char *pBuf)		/* Buffer to which to mgmt 
 			/* Check if it is the first active port */
 			if (*pBuf == 0) {
 
-				*pBuf = pAC->GIni.GP[PhysPortIndex].PMSStatus;
+				*pBuf = pPrt->PMSStatus;
 				continue;
 			}
 
@@ -6535,7 +6506,7 @@ char *pBuf)		/* Buffer to which to mgmt 
 			 * value that indicates that the status is
 			 * indeterminated.
 			 */
-			if (*pBuf != pAC->GIni.GP[PhysPortIndex].PMSStatus) {
+			if (*pBuf != pPrt->PMSStatus) {
 
 				*pBuf = SK_MS_STAT_INDETERMINATED;
 			}
@@ -6545,7 +6516,7 @@ char *pBuf)		/* Buffer to which to mgmt 
 			/* Check if it is the first active port */
 			if (*pBuf == 0) {
 
-				*pBuf = pAC->GIni.GP[PhysPortIndex].PLinkSpeed;
+				*pBuf = pPrt->PLinkSpeed;
 				continue;
 			}
 
@@ -6554,7 +6525,7 @@ char *pBuf)		/* Buffer to which to mgmt 
 			 * control mode than the first one, we return a value
 			 * that indicates that the mode is indeterminated.
 			 */
-			if (*pBuf != pAC->GIni.GP[PhysPortIndex].PLinkSpeed) {
+			if (*pBuf != pPrt->PLinkSpeed) {
 
 				*pBuf = SK_LSPEED_INDETERMINATED;
 			}
@@ -6564,7 +6535,7 @@ char *pBuf)		/* Buffer to which to mgmt 
 			/* Check if it is the first active port */
 			if (*pBuf == 0) {
 
-				*pBuf = pAC->GIni.GP[PhysPortIndex].PLinkSpeedUsed;
+				*pBuf = pPrt->PLinkSpeedUsed;
 				continue;
 			}
 
@@ -6574,7 +6545,7 @@ char *pBuf)		/* Buffer to which to mgmt 
 			 * value that indicates that the status is
 			 * indeterminated.
 			 */
-			if (*pBuf != pAC->GIni.GP[PhysPortIndex].PLinkSpeedUsed) {
+			if (*pBuf != pPrt->PLinkSpeedUsed) {
 
 				*pBuf = SK_LSPEED_STAT_INDETERMINATED;
 			}
@@ -6662,7 +6633,6 @@ unsigned int PhysPortIndex)	/* Physical 
 {
 	SK_U8	Result;
 
-
 	if (!pAC->GIni.GP[PhysPortIndex].PHWLinkUp) {
 
 		Result = SK_PNMI_RLMT_LSTAT_PHY_DOWN;
@@ -6702,7 +6672,6 @@ unsigned int PhysPortIndex)	/* Physical 
 {
 	SK_U8	Result;
 
-
 	/* Get the current mode, which can be full or half duplex */
 	Result = pAC->GIni.GP[PhysPortIndex].PLinkModeStatus;
 
@@ -6710,7 +6679,7 @@ unsigned int PhysPortIndex)	/* Physical 
 	if (Result < SK_LMODE_STAT_HALF) {
 
 		Result = SK_LMODE_STAT_UNKNOWN;
-	} 
+	}
 	else if (pAC->GIni.GP[PhysPortIndex].PLinkMode >= SK_LMODE_AUTOHALF) {
 
 		/*
@@ -6913,8 +6882,8 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
  *
  * Description:
  *	The XMAC holds its statistic internally. To obtain the current
- *	values we send a command so that the statistic data will
- *	be written to apredefined memory area on the adapter. 
+ *	values we must send a command so that the statistic data will
+ *	be written to a predefined memory area on the adapter.
  *
  * Returns:
  *	SK_PNMI_ERR_OK	     Task successfully performed.
@@ -6941,16 +6910,16 @@ unsigned int LastMac)	/* Index of the la
 	for (MacIndex = FirstMac; MacIndex <= LastMac; MacIndex ++) {
 
 		/*
-		 * 2002-09-13 pweber:	Freeze the current sw counters. 
-		 *                      (That should be done as close as 
-		 *                      possible to the update of the 
-		 *                      hw counters)
+		 * 2002-09-13 pweber:	Freeze the current SW counters.
+		 *                      (That should be done as close as
+		 *                      possible to the update of the
+		 *                      HW counters)
 		 */
 		if (pAC->GIni.GIMacType == SK_MAC_XMAC) {
 			pAC->Pnmi.BufPort[MacIndex] = pAC->Pnmi.Port[MacIndex];
 		}
 			
-		/* 2002-09-13 pweber:  Update the hw counter  */
+		/* 2002-09-13 pweber:  Update the HW counter  */
 		if (pAC->GIni.GIFunc.pFnMacUpdateStats(pAC, IoC, MacIndex) != 0) {
 
 			return (SK_PNMI_ERR_GENERAL);
@@ -6991,6 +6960,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 	if (pAC->Pnmi.DualNetActiveFlag == SK_TRUE) {	/* Dual net mode */
 
 		PhysPortIndex = NetIndex;
+		
 		Val = GetPhysStatVal(pAC, IoC, PhysPortIndex, StatIndex);
 	}
 	else {	/* Single Net mode */
@@ -7005,8 +6975,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 
 				if (pAC->Pnmi.Port[PhysPortIndex].ActiveFlag) {
 
-					Val += GetPhysStatVal(pAC, IoC, PhysPortIndex,
-						StatIndex);
+					Val += GetPhysStatVal(pAC, IoC, PhysPortIndex, StatIndex);
 				}
 			}
 
@@ -7016,6 +6985,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 		else {
 			/* Get counter value of physical port */
 			PhysPortIndex = SK_PNMI_PORT_LOG2PHYS(pAC, LogPortIndex);
+			
 			Val = GetPhysStatVal(pAC, IoC, PhysPortIndex, StatIndex);
 		}
 	}
@@ -7049,14 +7019,18 @@ unsigned int StatIndex)		/* Index to sta
 	SK_U32	HighVal = 0;
 	SK_U16	Word;
 	int		MacType;
+	unsigned int HelpIndex;
+	SK_GEPORT	*pPrt;
 	
 	SK_PNMI_PORT	*pPnmiPrt;
 	SK_GEMACFUNC	*pFnMac;
 	
+	pPrt = &pAC->GIni.GP[PhysPortIndex];
+	
 	MacType = pAC->GIni.GIMacType;
 	
-	/* 2002-09-17 pweber: For XMAC, use the frozen sw counters (BufPort) */
-	if (pAC->GIni.GIMacType == SK_MAC_XMAC) {
+	/* 2002-09-17 pweber: For XMAC, use the frozen SW counters (BufPort) */
+	if (MacType == SK_MAC_XMAC) {
 		pPnmiPrt = &pAC->Pnmi.BufPort[PhysPortIndex];
 	}
 	else {
@@ -7067,15 +7041,46 @@ unsigned int StatIndex)		/* Index to sta
 
 	switch (StatIndex) {
 	case SK_PNMI_HTX:
+		if (MacType == SK_MAC_GMAC) {
+			(void)pFnMac->pFnMacStatistic(pAC, IoC, PhysPortIndex,
+							StatAddr[SK_PNMI_HTX_BROADCAST][MacType].Reg,
+							&LowVal);
+			(void)pFnMac->pFnMacStatistic(pAC, IoC, PhysPortIndex,
+							StatAddr[SK_PNMI_HTX_MULTICAST][MacType].Reg,
+							&HighVal);
+			LowVal += HighVal;
+			(void)pFnMac->pFnMacStatistic(pAC, IoC, PhysPortIndex,
+							StatAddr[SK_PNMI_HTX_UNICAST][MacType].Reg,
+							&HighVal);
+			LowVal += HighVal;
+		}
+		else {
+			(void)pFnMac->pFnMacStatistic(pAC, IoC, PhysPortIndex,
+										  StatAddr[StatIndex][MacType].Reg,
+										  &LowVal);
+		}
+		HighVal = pPnmiPrt->CounterHigh[StatIndex];
+		break;
+	
 	case SK_PNMI_HRX:
-		/* Not supported by GMAC */
 		if (MacType == SK_MAC_GMAC) {
-			return (Val); 
+			(void)pFnMac->pFnMacStatistic(pAC, IoC, PhysPortIndex,
+							StatAddr[SK_PNMI_HRX_BROADCAST][MacType].Reg,
+							&LowVal);
+			(void)pFnMac->pFnMacStatistic(pAC, IoC, PhysPortIndex,
+							StatAddr[SK_PNMI_HRX_MULTICAST][MacType].Reg,
+							&HighVal);
+			LowVal += HighVal;
+			(void)pFnMac->pFnMacStatistic(pAC, IoC, PhysPortIndex,
+							StatAddr[SK_PNMI_HRX_UNICAST][MacType].Reg,
+							&HighVal);
+			LowVal += HighVal;
+		}
+		else {
+			(void)pFnMac->pFnMacStatistic(pAC, IoC, PhysPortIndex,
+										  StatAddr[StatIndex][MacType].Reg,
+										  &LowVal);
 		}
-			
-		(void)pFnMac->pFnMacStatistic(pAC, IoC, PhysPortIndex,
-									  StatAddr[StatIndex][MacType].Reg,
-									  &LowVal);
 		HighVal = pPnmiPrt->CounterHigh[StatIndex];
 		break;
 
@@ -7106,14 +7111,16 @@ unsigned int StatIndex)		/* Index to sta
 	case SK_PNMI_HTX_MACC:
 		/* GMAC only supports PAUSE MAC control frames */
 		if (MacType == SK_MAC_GMAC) {
-			Val = GetPhysStatVal(pAC, IoC, PhysPortIndex, SK_PNMI_HTX_PMACC);
-
-			return (Val); 
+			HelpIndex = SK_PNMI_HTX_PMACC;
 		}
-
+		else {
+			HelpIndex = StatIndex;
+		}
+		
 		(void)pFnMac->pFnMacStatistic(pAC, IoC, PhysPortIndex,
-									  StatAddr[StatIndex][MacType].Reg,
-									  &LowVal);
+								StatAddr[HelpIndex][MacType].Reg,
+								&LowVal);
+
 		HighVal = pPnmiPrt->CounterHigh[StatIndex];
 		break;
 
@@ -7130,12 +7137,10 @@ unsigned int StatIndex)		/* Index to sta
 		HighVal = pPnmiPrt->CounterHigh[StatIndex];
 		break;
 
-
-
 	case SK_PNMI_HTX_DEFFERAL:
 		/* Not supported by GMAC */
 		if (MacType == SK_MAC_GMAC) {
-			return (Val); 
+			return (Val);
 		}
 		
 		/*
@@ -7144,16 +7149,16 @@ unsigned int StatIndex)		/* Index to sta
 		 *
 		 * In full-duplex mode the counter remains constant!
 		 */
-		if ((pAC->GIni.GP[PhysPortIndex].PLinkModeStatus == SK_LMODE_STAT_AUTOFULL) ||
-			(pAC->GIni.GP[PhysPortIndex].PLinkModeStatus == SK_LMODE_STAT_FULL)) {
+		if ((pPrt->PLinkModeStatus == SK_LMODE_STAT_AUTOFULL) ||
+			(pPrt->PLinkModeStatus == SK_LMODE_STAT_FULL)) {
 
 			LowVal = 0;
 			HighVal = 0;
 		}
 		else {
-			/* Otherwise get contents of hardware register. */
+			/* Otherwise get contents of hardware register */
 			(void)pFnMac->pFnMacStatistic(pAC, IoC, PhysPortIndex,
-										  StatAddr[SK_PNMI_HTX_DEFFERAL][MacType].Reg,
+										  StatAddr[StatIndex][MacType].Reg,
 										  &LowVal);
 			HighVal = pPnmiPrt->CounterHigh[StatIndex];
 		}
@@ -7181,7 +7186,7 @@ unsigned int StatIndex)		/* Index to sta
 	case SK_PNMI_HRX_LONGFRAMES:
 		/* For XMAC the SW counter is managed by PNMI */
 		if (MacType == SK_MAC_XMAC) {
-			return (pPnmiPrt->StatRxLongFrameCts); 
+			return (pPnmiPrt->StatRxLongFrameCts);
 		}
 		
 		(void)pFnMac->pFnMacStatistic(pAC, IoC, PhysPortIndex,
@@ -7192,19 +7197,17 @@ unsigned int StatIndex)		/* Index to sta
 		
 	case SK_PNMI_HRX_TOO_LONG:
 		(void)pFnMac->pFnMacStatistic(pAC, IoC, PhysPortIndex,
-						StatAddr[StatIndex][MacType].Reg,
+								StatAddr[StatIndex][MacType].Reg,
 								&LowVal);
 		HighVal = pPnmiPrt->CounterHigh[StatIndex];
 		
 		Val = (((SK_U64)HighVal << 32) | (SK_U64)LowVal);
 
-		switch (MacType) {
-		case SK_MAC_GMAC:
+		if (MacType == SK_MAC_GMAC) {
 			/* For GMAC the SW counter is additionally managed by PNMI */
 			Val += pPnmiPrt->StatRxFrameTooLongCts;
-			break;
-
-		case SK_MAC_XMAC:
+		}
+		else {
 			/*
 			 * Frames longer than IEEE 802.3 frame max size are counted
 			 * by XMAC in frame_too_long counter even reception of long
@@ -7212,10 +7215,6 @@ unsigned int StatIndex)		/* Index to sta
 			 * So correct the value by subtracting RxLongFrame counter.
 			 */
 			Val -= pPnmiPrt->StatRxLongFrameCts;
-			break;
-
-		default:
-			break;
 		}
 
 		LowVal = (SK_U32)Val;
@@ -7226,7 +7225,7 @@ unsigned int StatIndex)		/* Index to sta
 		/* Not supported by GMAC */
 		if (MacType == SK_MAC_GMAC) {
 			/* GM_RXE_FRAG?? */
-			return (Val); 
+			return (Val);
 		}
 		
 		/*
@@ -7234,7 +7233,7 @@ unsigned int StatIndex)		/* Index to sta
 		 *
 		 * If link-down the counter remains constant
 		 */
-		if (pAC->GIni.GP[PhysPortIndex].PLinkModeStatus != SK_LMODE_STAT_UNKNOWN) {
+		if (pPrt->PLinkModeStatus != SK_LMODE_STAT_UNKNOWN) {
 
 			/* Otherwise get incremental difference */
 			(void)pFnMac->pFnMacStatistic(pAC, IoC, PhysPortIndex,
@@ -7261,8 +7260,7 @@ unsigned int StatIndex)		/* Index to sta
 	case SK_PNMI_HRX_CEXT:
 		/* Not supported by GMAC */
 		if (MacType == SK_MAC_GMAC) {
-			/* GM_RXE_FRAG?? */
-			return (Val); 
+			return (Val);
 		}
 
 		(void)pFnMac->pFnMacStatistic(pAC, IoC, PhysPortIndex,
@@ -7274,7 +7272,7 @@ unsigned int StatIndex)		/* Index to sta
 	case SK_PNMI_HRX_PMACC_ERR:
 		/* For GMAC the SW counter is managed by PNMI */
 		if (MacType == SK_MAC_GMAC) {
-			return (pPnmiPrt->StatRxPMaccErr); 
+			return (pPnmiPrt->StatRxPMaccErr);
 		}
 		
 		(void)pFnMac->pFnMacStatistic(pAC, IoC, PhysPortIndex,
@@ -7296,16 +7294,14 @@ unsigned int StatIndex)		/* Index to sta
 		break;
 
 	case SK_PNMI_HRX_FCS:
-		/* 
-		 * Broadcom filters fcs errors and counts it in 
+		/*
+		 * Broadcom filters FCS errors and counts it in
 		 * Receive Error Counter register
 		 */
-		if (pAC->GIni.GP[PhysPortIndex].PhyType == SK_PHY_BCOM) {
+		if (pPrt->PhyType == SK_PHY_BCOM) {
 			/* do not read while not initialized (PHY_READ hangs!)*/
-			if (pAC->GIni.GP[PhysPortIndex].PState) {
-				PHY_READ(IoC, &pAC->GIni.GP[PhysPortIndex],
-						 PhysPortIndex, PHY_BCOM_RE_CTR,
-						 &Word);
+			if (pPrt->PState != SK_PRT_RESET) {
+				SkXmPhyRead(pAC, IoC, PhysPortIndex, PHY_BCOM_RE_CTR, &Word);
 				
 				LowVal = Word;
 			}
@@ -7375,8 +7371,8 @@ SK_U32 NetIndex)
 	EventParam.Para32[1] = (SK_U32)-1;
 	SkEventQueue(pAC, SKGE_CSUM, SK_CSUM_EVENT_CLEAR_PROTO_STATS,
 		EventParam);
-#endif
-
+#endif /* SK_USE_CSUM */
+	
 	/* Clear XMAC statistic */
 	for (PhysPortIndex = 0; PhysPortIndex <
 		(unsigned int)pAC->GIni.GIMacsFound; PhysPortIndex ++) {
@@ -7492,18 +7488,18 @@ unsigned int Size)	/* Space needed for t
 		End -= EntrySize;
 #ifdef DEBUG
 		SK_MEMSET(pBuf + End, (char)(-1), EntrySize);
-#endif
+#endif /* DEBUG */
 		if (End == BufPad) {
 #ifdef DEBUG
 			SK_MEMSET(pBuf, (char)(-1), End);
-#endif
+#endif /* DEBUG */
 			BufFree += End;
 			End = 0;
 			BufPad = 0;
 		}
 	}
 
-	/* 
+	/*
 	 * Insert new entry as first entry. Newest entries are
 	 * stored at the beginning of the queue.
 	 */
@@ -7772,7 +7768,6 @@ SK_MAC_ADDR *pMac)	/* Pointer of Source 
 	}
 }
 
-
 #ifdef SK_POWER_MGMT
 /*****************************************************************************
  *
@@ -7814,45 +7809,50 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 		*pLen = 0;
 		return (SK_PNMI_ERR_UNKNOWN_INST);
 	}
+	
+    
+    /* Check length */
+    switch (Id) {
 
-	/*
-	 * Perform action
-	 */
-	if (Action == SK_PNMI_GET) {
+    case OID_PNP_CAPABILITIES:
+        if (*pLen < sizeof(SK_PNP_CAPABILITIES)) {
 
-		/*
-		 * Check length
-		 */
-		switch (Id) {
+            *pLen = sizeof(SK_PNP_CAPABILITIES);
+            return (SK_PNMI_ERR_TOO_SHORT);
+        }
+        break;
 
-		case OID_PNP_CAPABILITIES:
-			if (*pLen < sizeof(SK_PNP_CAPABILITIES)) {
+	case OID_PNP_SET_POWER:
+    case OID_PNP_QUERY_POWER:
+    	if (*pLen < sizeof(SK_DEVICE_POWER_STATE))
+    	{
+    		*pLen = sizeof(SK_DEVICE_POWER_STATE);
+    		return (SK_PNMI_ERR_TOO_SHORT);
+    	}
+        break;
 
-				*pLen = sizeof(SK_PNP_CAPABILITIES);
-				return (SK_PNMI_ERR_TOO_SHORT);
-			}
-			break;
+    case OID_PNP_ADD_WAKE_UP_PATTERN:
+    case OID_PNP_REMOVE_WAKE_UP_PATTERN:
+		if (*pLen < sizeof(SK_PM_PACKET_PATTERN)) {
 
-		case OID_PNP_QUERY_POWER:
-		case OID_PNP_ENABLE_WAKE_UP:
-			if (*pLen < sizeof(SK_U32)) {
+			*pLen = sizeof(SK_PM_PACKET_PATTERN);
+			return (SK_PNMI_ERR_TOO_SHORT);
+		}
+		break;
 
-				*pLen = sizeof(SK_U32);
-				return (SK_PNMI_ERR_TOO_SHORT);
-			}
-			break;
+    case OID_PNP_ENABLE_WAKE_UP:
+        if (*pLen < sizeof(SK_U32)) {
 
-		case OID_PNP_SET_POWER:
-		case OID_PNP_ADD_WAKE_UP_PATTERN:
-		case OID_PNP_REMOVE_WAKE_UP_PATTERN:
-			break;
-		
-		default:
-			SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR040,
-				SK_PNMI_ERR040MSG);
-			*pLen = 0;
-			return (SK_PNMI_ERR_GENERAL);
-		}
+            *pLen = sizeof(SK_U32);
+            return (SK_PNMI_ERR_TOO_SHORT);
+        }
+        break;
+    }
+	
+    /*
+	 * Perform action
+	 */
+	if (Action == SK_PNMI_GET) {
 
 		/*
 		 * Get value
@@ -7865,11 +7865,12 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 
 		case OID_PNP_QUERY_POWER:
 			/* The Windows DDK describes: An OID_PNP_QUERY_POWER requests
-			 the miniport to indicate whether it can transition its NIC 
-			 to the low-power state. 
+			 the miniport to indicate whether it can transition its NIC
+			 to the low-power state.
 			 A miniport driver must always return NDIS_STATUS_SUCCESS
 			 to a query of OID_PNP_QUERY_POWER. */
-			RetCode = SK_PNMI_ERR_OK;
+			*pLen = sizeof(SK_DEVICE_POWER_STATE);;
+            RetCode = SK_PNMI_ERR_OK;
 			break;
 
 			/* NDIS handles these OIDs as write-only.
@@ -7880,7 +7881,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 		case OID_PNP_ADD_WAKE_UP_PATTERN:
 		case OID_PNP_REMOVE_WAKE_UP_PATTERN:
 			*pLen = 0;	
-			RetCode = SK_PNMI_ERR_OK;
+            RetCode = SK_PNMI_ERR_NOT_SUPPORTED;
 			break;
 
 		case OID_PNP_ENABLE_WAKE_UP:
@@ -7892,41 +7893,9 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 			break;
 		}
 
-		return (RetCode); 
+		return (RetCode);
 	}
 	
-	/*
-	 * From here SET or PRESET action. Check if the passed
-	 * buffer length is plausible.
-	 */
-	switch (Id) {
-	case OID_PNP_SET_POWER:
-	case OID_PNP_ENABLE_WAKE_UP:
-		if (*pLen < sizeof(SK_U32)) {
-
-			*pLen = sizeof(SK_U32);
-			return (SK_PNMI_ERR_TOO_SHORT);
-		}
-		if (*pLen != sizeof(SK_U32)) {
-
-			*pLen = 0;
-			return (SK_PNMI_ERR_BAD_VALUE);
-		}
-		break;
-
-	case OID_PNP_ADD_WAKE_UP_PATTERN:
-	case OID_PNP_REMOVE_WAKE_UP_PATTERN:
-		if (*pLen < sizeof(SK_PM_PACKET_PATTERN)) {
-
-			*pLen = 0;
-			return (SK_PNMI_ERR_BAD_VALUE); 
-		}
-		break;
-
-    default:
-		*pLen = 0;
-		return (SK_PNMI_ERR_READ_ONLY);
-	}
 
 	/*
 	 * Perform preset or set
@@ -7934,7 +7903,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 	
 	/* POWER module does not support PRESET action */
 	if (Action == SK_PNMI_PRESET) {
-		return (SK_PNMI_ERR_OK); 
+		return (SK_PNMI_ERR_OK);
 	}
 
 	switch (Id) {
@@ -7955,13 +7924,148 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 		break;
 		
 	default:
-		RetCode = SK_PNMI_ERR_GENERAL;
+		RetCode = SK_PNMI_ERR_READ_ONLY;
 	}
 	
 	return (RetCode);
 }
 #endif /* SK_POWER_MGMT */
 
+#ifdef SK_DIAG_SUPPORT
+/*****************************************************************************
+ *
+ * DiagActions - OID handler function of Diagnostic driver 
+ *
+ * Description:
+ *	The code is simple. No description necessary.
+ *
+ * Returns:
+ *	SK_PNMI_ERR_OK           The request was successfully performed.
+ *	SK_PNMI_ERR_GENERAL      A general severe internal error occured.
+ *	SK_PNMI_ERR_TOO_SHORT    The passed buffer is too short to contain
+ *	                         the correct data (e.g. a 32bit value is
+ *	                         needed, but a 16 bit value was passed).
+ *	SK_PNMI_ERR_UNKNOWN_INST The requested instance of the OID doesn't
+ *                           exist (e.g. port instance 3 on a two port
+ *	                         adapter.
+ */
+
+PNMI_STATIC int DiagActions(
+SK_AC *pAC,		/* Pointer to adapter context */
+SK_IOC IoC,		/* IO context handle */
+int Action,		/* GET/PRESET/SET action */
+SK_U32 Id,		/* Object ID that is to be processed */
+char *pBuf,		/* Buffer used for the management data transfer */
+unsigned int *pLen,	/* On call: pBuf buffer length. On return: used buffer */
+SK_U32 Instance,	/* Instance (1..n) that is to be queried or -1 */
+unsigned int TableIndex, /* Index to the Id table */
+SK_U32 NetIndex)	/* NetIndex (0..n), in single net mode always zero */
+{
+
+	SK_U32	RetCode = SK_PNMI_ERR_GENERAL;
+
+	/*
+	 * Check instance. We only handle single instance variables.
+	 */
+	if (Instance != (SK_U32)(-1) && Instance != 1) {
+
+		*pLen = 0;
+		return (SK_PNMI_ERR_UNKNOWN_INST);
+	}
+
+	/*
+	 * Check length.
+	 */
+	switch (Id) {
+
+	case OID_SKGE_DIAG_MODE:
+		if (*pLen < sizeof(SK_U32)) {
+
+			*pLen = sizeof(SK_U32);
+			return (SK_PNMI_ERR_TOO_SHORT);
+		}
+		break;
+
+	default:
+		SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR040, SK_PNMI_ERR040MSG);
+		*pLen = 0;
+		return (SK_PNMI_ERR_GENERAL);
+	}
+
+	/* Perform action. */
+
+	/* GET value. */
+	if (Action == SK_PNMI_GET) {
+
+		switch (Id) {
+
+		case OID_SKGE_DIAG_MODE:
+			SK_PNMI_STORE_U32(pBuf, pAC->DiagModeActive);
+			*pLen = sizeof(SK_U32);	
+			RetCode = SK_PNMI_ERR_OK;
+			break;
+
+		default:
+			*pLen = 0;	
+			RetCode = SK_PNMI_ERR_GENERAL;
+			break;
+		}
+
+		return (RetCode); 
+	}
+
+	/* From here SET or PRESET value. */
+	
+	/* PRESET value is not supported. */
+	if (Action == SK_PNMI_PRESET) {
+		return (SK_PNMI_ERR_OK); 
+	}
+
+	/* SET value. */
+	switch (Id) {
+		case OID_SKGE_DIAG_MODE:
+
+			/* Handle the SET. */
+			switch (*pBuf) {
+		
+				/* Enter the DIAG mode in the driver. */
+				case 1:
+					/* If DiagMode is not active, we can enter it. */
+					if (!pAC->DiagModeActive) {
+
+						RetCode = SkDrvEnterDiagMode(pAC);	
+					}
+					else {
+
+						RetCode = SK_PNMI_ERR_GENERAL;
+					}
+					break;
+
+				/* Leave the DIAG mode in the driver. */
+				case 0:
+					RetCode = SkDrvLeaveDiagMode(pAC);	
+					break;
+
+				default:
+					RetCode = SK_PNMI_ERR_BAD_VALUE;
+					break;
+			}
+			break;
+
+		default:
+			RetCode = SK_PNMI_ERR_GENERAL;
+	}
+
+	if (RetCode == SK_PNMI_ERR_OK) {
+		*pLen = sizeof(SK_U32);
+	}
+	else {
+
+		*pLen = 0;
+	}
+	return (RetCode);
+}
+#endif /* SK_DIAG_SUPPORT */
 
 /*****************************************************************************
  *
@@ -7977,7 +8081,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
  *	                         the correct data (e.g. a 32bit value is
  *	                         needed, but a 16 bit value was passed).
  *	SK_PNMI_ERR_UNKNOWN_INST The requested instance of the OID doesn't
- *                               exist (e.g. port instance 3 on a two port
+ *                           exist (e.g. port instance 3 on a two port
  *	                         adapter).
  *	SK_PNMI_ERR_READ_ONLY	 Only the Get action is allowed.
  *
@@ -7986,10 +8090,10 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 PNMI_STATIC int Vct(
 SK_AC *pAC,		/* Pointer to adapter context */
 SK_IOC IoC,		/* IO context handle */
-int Action,		/* Get/PreSet/Set action */
+int Action,		/* GET/PRESET/SET action */
 SK_U32 Id,		/* Object ID that is to be processed */
-char *pBuf,		/* Buffer to which the mgmt data will be copied */
-unsigned int *pLen,	/* On call: buffer length. On return: used buffer */
+char *pBuf,		/* Buffer used for the management data transfer */
+unsigned int *pLen,	/* On call: pBuf buffer length. On return: used buffer */
 SK_U32 Instance,	/* Instance (-1,2..n) that is to be queried */
 unsigned int TableIndex, /* Index to the Id table */
 SK_U32 NetIndex)	/* NetIndex (0..n), in single net mode always zero */
@@ -8001,7 +8105,6 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 	SK_U32		PhysPortIndex;
 	SK_U32		Limit;
 	SK_U32		Offset;
-	SK_U32		Len;
 	SK_BOOL		Link;
 	SK_U32		RetCode = SK_PNMI_ERR_GENERAL;
 	int		i;
@@ -8034,7 +8137,8 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 		}
 		Limit = PhysPortIndex + 1;
 	}
-	else {	/*
+	else {
+		/*
 		 * Instance == (SK_U32) (-1), get all Instances of that OID.
 		 *
 		 * Not implemented yet. May be used in future releases.
@@ -8051,9 +8155,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 		Link = SK_FALSE;
 	}
 	
-	/*
-	 * Check MAC type.
-	 */
+	/* Check MAC type */
 	if (pPrt->PhyType != SK_PHY_MARV_COPPER) {
 		*pLen = 0;
 		return (SK_PNMI_ERR_GENERAL);
@@ -8062,13 +8164,9 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 	/* Initialize backup data pointer. */
 	pVctBackupData = &pAC->Pnmi.VctBackup[PhysPortIndex];
 	
-	/*
-	 * Check action type.
-	 */
+	/* Check action type */
 	if (Action == SK_PNMI_GET) {
-		/*
-		 * Check length.
-		 */
+		/* Check length */
 		switch (Id) {
 		
 		case OID_SKGE_VCT_GET:
@@ -8090,14 +8188,12 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 			return (SK_PNMI_ERR_GENERAL);
 		}	
 		
-		/*
-		 * Get value.
-		 */
+		/* Get value */
 		Offset = 0;
 		for (; PhysPortIndex < Limit; PhysPortIndex++) {
 			switch (Id) {
 			
-			case OID_SKGE_VCT_GET:		
+			case OID_SKGE_VCT_GET:
 				if ((Link == SK_FALSE) &&
 					(pAC->Pnmi.VctStatus[PhysPortIndex] & SK_PNMI_VCT_PENDING)) {
 					RetCode = SkGmCableDiagStatus(pAC, IoC, PhysPortIndex, SK_FALSE);
@@ -8171,9 +8267,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
 	 * buffer length is plausible.
 	 */
 	
-	/*
-	 * Check length.
-	 */
+	/* Check length */
 	switch (Id) {
 	case OID_SKGE_VCT_SET:
 		if (*pLen < (Limit - PhysPortIndex) * sizeof(SK_U32)) {
@@ -8254,7 +8348,6 @@ SK_U32		PhysPortIndex)
 	SK_GEPORT 	*pPrt;
 	SK_PNMI_VCT	*pVctData;
 	SK_U32		RetCode;
-	SK_U8		LinkSpeedUsed;
 	
 	pPrt = &pAC->GIni.GP[PhysPortIndex];
 	
@@ -8297,10 +8390,84 @@ SK_U32		PhysPortIndex)
 		}
 		
 		/* DSP only valid in 100/1000 modes. */
-		LinkSpeedUsed = pAC->GIni.GP[PhysPortIndex].PLinkSpeedUsed;
-		if (LinkSpeedUsed != SK_LSPEED_STAT_10MBPS) {	
+		if (pAC->GIni.GP[PhysPortIndex].PLinkSpeedUsed !=
+			SK_LSPEED_STAT_10MBPS) {	
 			pVctData->VctStatus |= SK_PNMI_VCT_NEW_DSP_DATA;
 		}
 	}
-
 } /* CheckVctStatus */
+
+
+/*****************************************************************************
+ *
+ *      SkPnmiGenIoctl - Handles new generic PNMI IOCTL, calls the needed
+ *                       PNMI function depending on the subcommand and
+ *                       returns all data belonging to the complete database
+ *                       or OID request.
+ *
+ * Description:
+ *	Looks up the requested subcommand, calls the corresponding handler
+ *	function and passes all required parameters to it.
+ *	The function is called by the driver. It is needed to handle the new
+ *  generic PNMI IOCTL. This IOCTL is given to the driver and contains both
+ *  the OID and a subcommand to decide what kind of request has to be done.
+ *
+ * Returns:
+ *	SK_PNMI_ERR_OK           The request was successfully performed
+ *	SK_PNMI_ERR_GENERAL      A general severe internal error occured
+ *	SK_PNMI_ERR_TOO_SHORT    The passed buffer is too short to take
+ *	                         the data.
+ *	SK_PNMI_ERR_UNKNOWN_OID  The requested OID is unknown
+ *	SK_PNMI_ERR_UNKNOWN_INST The requested instance of the OID doesn't
+ *                           exist (e.g. port instance 3 on a two port
+ *	                         adapter.
+ */
+int SkPnmiGenIoctl(
+SK_AC		*pAC,		/* Pointer to adapter context struct */
+SK_IOC		IoC,		/* I/O context */
+void		*pBuf,		/* Buffer used for the management data transfer */
+unsigned int *pLen,		/* Length of buffer */
+SK_U32		NetIndex)	/* NetIndex (0..n), in single net mode always zero */
+{
+SK_I32	Mode;			/* Store value of subcommand. */
+SK_U32	Oid;			/* Store value of OID. */
+int		ReturnCode;		/* Store return value to show status of PNMI action. */
+int 	HeaderLength;	/* Length of desired action plus OID. */
+
+	ReturnCode = SK_PNMI_ERR_GENERAL;
+	
+	Mode = *((SK_I32 *) pBuf);
+	Oid  = *((SK_U32 *) ((char *) pBuf + sizeof(SK_I32)));
+	HeaderLength = sizeof(SK_I32) + sizeof(SK_U32);
+	*pLen = *pLen - HeaderLength;
+	SK_MEMCPY((char *) pBuf, (char *) pBuf + HeaderLength, *pLen);
+	
+	switch(Mode) {
+	case SK_GET_SINGLE_VAR:
+		ReturnCode = SkPnmiGetVar(pAC, IoC, Oid, pBuf, pLen,
+			((SK_U32) (-1)), NetIndex);
+		break; 
+	case SK_SET_SINGLE_VAR:
+		ReturnCode = SkPnmiSetVar(pAC, IoC, Oid, pBuf, pLen, 
+			((SK_U32) (-1)), NetIndex);
+		break;
+	case SK_PRESET_SINGLE_VAR:
+		ReturnCode = SkPnmiPreSetVar(pAC, IoC, Oid, pBuf, pLen,
+			((SK_U32) (-1)), NetIndex);
+		break;
+	case SK_GET_FULL_MIB:
+		ReturnCode = SkPnmiGetStruct(pAC, IoC, pBuf, pLen, NetIndex);
+		break;
+	case SK_SET_FULL_MIB:
+		ReturnCode = SkPnmiPreSetStruct(pAC, IoC, pBuf, pLen, NetIndex);
+		break;
+	case SK_PRESET_FULL_MIB:
+		ReturnCode = SkPnmiSetStruct(pAC, IoC, pBuf, pLen, NetIndex);
+		break;
+	default:
+		break;
+	}
+	
+	return (ReturnCode);
+
+} /* SkGeIocGen */
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/net/sk98lin/skgesirq.c linux-2.4.20-wolk4.4-fullkernel/drivers/net/sk98lin/skgesirq.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/net/sk98lin/skgesirq.c	2003-07-30 13:51:29.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/net/sk98lin/skgesirq.c	2003-07-30 10:31:39.000000000 +0200
@@ -1,16 +1,17 @@
 /******************************************************************************
  *
  * Name:	skgesirq.c
- * Project:	GEnesis, PCI Gigabit Ethernet Adapter
- * Version:	$Revision: 1.82 $
- * Date:	$Date: 2003/01/29 13:34:33 $
+ * Project:	Gigabit Ethernet Adapters, Common Modules
+ * Version:	$Revision: 1.90 $
+ * Date:	$Date: 2003/05/28 15:35:45 $
  * Purpose:	Special IRQ module
  *
  ******************************************************************************/
 
 /******************************************************************************
  *
- *	(C)Copyright 1998-2003 SysKonnect GmbH.
+ *	(C)Copyright 1998-2002 SysKonnect.
+ *	(C)Copyright 2002-2003 Marvell.
  *
  *	This program is free software; you can redistribute it and/or modify
  *	it under the terms of the GNU General Public License as published by
@@ -26,6 +27,51 @@
  * History:
  *
  *	$Log: skgesirq.c,v $
+ *	Revision 1.90  2003/05/28 15:35:45  rschmidt
+ *	Added parameter AutoNeg in all SkGePortCheckUp...() to save code.
+ *	Added setting for AutoNeg only once in SkGePortCheckUp().
+ *	Moved defines for return codes of SkGePortCheckUp() to header file.
+ *	Editorial changes.
+ *	
+ *	Revision 1.89  2003/05/13 17:32:20  mkarl
+ *	Removed links to RLMT and PNMI for SLIM driver (SK_SLIM).
+ *	Separated GENESIS and YUKON only code to reduce code size.
+ *	
+ *	Revision 1.88  2003/05/06 13:20:34  rschmidt
+ *	Changed workaround for Tx hang in half duplex only for Genesis.
+ *	Replaced SkPnmiGetVar() calls for Tx Octets Counter
+ *	with SkXmMacStatistic() in SkGeSirqIsr().
+ *	Added defines around GENESIS resp. YUKON branches to reduce
+ *	code size for PXE.
+ *	Editorial changes.
+ *	
+ *	Revision 1.87  2003/04/28 09:18:31  rschmidt
+ *	Added increment for GITimeStampCnt (high dword for
+ *	Time Stamp Timer counter), when overflow IRQ occurs.
+ *	Disabled HW Error IRQ on 32-bit Yukon if sensor IRQ occurs
+ *	by changing the common mask stored in GIValIrqMask.
+ *	Changed handling for HW Error IRQ in SkGeSirqIsr().
+ *	Added clearing of the software forced IRQ in SkGeSirqIsr().
+ *	Editorial changes.
+ *	
+ *	Revision 1.86  2003/04/09 13:03:24  rschmidt
+ *	Added workaround for configuration of GPHY's Auto-negotiation
+ *	advertisement register after link down event in SkPhyIsrGmac().
+ *	
+ *	Revision 1.85  2003/04/08 16:39:02  rschmidt
+ *	Changed handling for different PhyTypes for source code
+ *	portability to PXE, UNDI.
+ *	Editorial changes.
+ *	
+ *	Revision 1.84  2003/03/31 07:01:43  mkarl
+ *	Corrected Copyright.
+ *	Editorial changes.
+ *	
+ *	Revision 1.83  2003/02/05 15:10:59  rschmidt
+ *	Fixed setting of PLinkSpeedUsed in SkHWLinkUp() when
+ *	auto-negotiation is disabled.
+ *	Editorial changes.
+ *	
  *	Revision 1.82  2003/01/29 13:34:33  rschmidt
  *	Added some typecasts to avoid compiler warnings.
  *	
@@ -135,7 +181,7 @@
  *	Added workaround for half duplex hangup.
  *	
  *	Revision 1.58  2000/09/28 13:06:04  gklug
- *	fix: BCOM may NOT be touched if XMAC is in RESET state
+ *	fix: BCom may NOT be touched if XMAC is in RESET state
  *	
  *	Revision 1.57  2000/09/08 12:38:39  cgoos
  *	Added forgotten variable declaration.
@@ -356,26 +402,35 @@
  *
  */
 
+#if (defined(DEBUG) || ((!defined(LINT)) && (!defined(SK_SLIM))))
 static const char SysKonnectFileId[] =
-	"$Id: skgesirq.c,v 1.82 2003/01/29 13:34:33 rschmidt Exp $" ;
+	"@(#) $Id: skgesirq.c,v 1.90 2003/05/28 15:35:45 rschmidt Exp $ (C) Marvell.";
+#endif
 
 #include "h/skdrv1st.h"		/* Driver Specific Definitions */
+#ifndef SK_SLIM
 #include "h/skgepnmi.h"		/* PNMI Definitions */
 #include "h/skrlmt.h"		/* RLMT Definitions */
+#endif
 #include "h/skdrv2nd.h"		/* Adapter Control and Driver specific Def. */
 
 /* local function prototypes */
-static int	SkGePortCheckUpXmac(SK_AC*, SK_IOC, int);
-static int	SkGePortCheckUpBcom(SK_AC*, SK_IOC, int);
-static int	SkGePortCheckUpGmac(SK_AC*, SK_IOC, int);
+#ifdef GENESIS
+static int	SkGePortCheckUpXmac(SK_AC*, SK_IOC, int, SK_BOOL);
+static int	SkGePortCheckUpBcom(SK_AC*, SK_IOC, int, SK_BOOL);
 static void	SkPhyIsrBcom(SK_AC*, SK_IOC, int, SK_U16);
+#endif /* GENESIS */
+#ifdef YUKON
+static int	SkGePortCheckUpGmac(SK_AC*, SK_IOC, int, SK_BOOL);
 static void	SkPhyIsrGmac(SK_AC*, SK_IOC, int, SK_U16);
+#endif /* YUKON */
 #ifdef OTHER_PHY
-static int	SkGePortCheckUpLone(SK_AC*, SK_IOC, int);
-static int	SkGePortCheckUpNat(SK_AC*, SK_IOC, int);
+static int	SkGePortCheckUpLone(SK_AC*, SK_IOC, int, SK_BOOL);
+static int	SkGePortCheckUpNat(SK_AC*, SK_IOC, int, SK_BOOL);
 static void	SkPhyIsrLone(SK_AC*, SK_IOC, int, SK_U16);
 #endif /* OTHER_PHY */
 
+#ifdef GENESIS
 /*
  * array of Rx counter from XMAC which are checked
  * in AutoSense mode to check whether a link is not able to auto-negotiate.
@@ -388,6 +443,7 @@ static const SK_U16 SkGeRxRegs[]= {
 	XM_RXF_1023B,
 	XM_RXF_MAX_SZ
 } ;
+#endif /* GENESIS */
 
 #ifdef __C2MAN__
 /*
@@ -400,20 +456,13 @@ intro()
 {}
 #endif
 
-/* Define return codes of SkGePortCheckUp and CheckShort */
-#define	SK_HW_PS_NONE		0	/* No action needed */
-#define	SK_HW_PS_RESTART	1	/* Restart needed */
-#define	SK_HW_PS_LINK		2	/* Link Up actions needed */
-
 /******************************************************************************
  *
  *	SkHWInitDefSense() - Default Autosensing mode initialization
  *
- * Description:
- *	This function sets the PLinkMode for HWInit
- *
- * Note:
+ * Description: sets the PLinkMode for HWInit
  *
+ * Returns: N/A
  */
 static void SkHWInitDefSense(
 SK_AC	*pAC,	/* adapter context */
@@ -441,17 +490,17 @@ int		Port)	/* Port Index (MAC_1 + n) */
 }	/* SkHWInitDefSense */
 
 
+#ifdef GENESIS
 /******************************************************************************
  *
- *	SkHWSenseGetNext() - GetNextAutosensing Mode
+ *	SkHWSenseGetNext() - Get Next Autosensing Mode
  *
- * Description:
- *	This function handles the AutoSensing
+ * Description: gets the appropriate next mode
  *
  * Note:
  *
  */
-SK_U8 SkHWSenseGetNext(
+static SK_U8 SkHWSenseGetNext(
 SK_AC	*pAC,	/* adapter context */
 SK_IOC	IoC,	/* IO context */
 int		Port)	/* Port Index (MAC_1 + n) */
@@ -462,18 +511,18 @@ int		Port)	/* Port Index (MAC_1 + n) */
 
 	pPrt->PAutoNegTimeOut = 0;
 
-	if (pPrt->PLinkModeConf != SK_LMODE_AUTOSENSE) {
+    if (pPrt->PLinkModeConf != (SK_U8)SK_LMODE_AUTOSENSE) {
 		/* Leave all as configured */
 		return(pPrt->PLinkModeConf);
 	}
 
-	if (pPrt->PLinkMode == SK_LMODE_AUTOFULL) {
+    if (pPrt->PLinkMode == (SK_U8)SK_LMODE_AUTOFULL) {
 		/* Return next mode AUTOBOTH */
-		return(SK_LMODE_AUTOBOTH);
+        return ((SK_U8)SK_LMODE_AUTOBOTH);
 	}
 
 	/* Return default autofull */
-	return(SK_LMODE_AUTOFULL);
+    return ((SK_U8)SK_LMODE_AUTOFULL);
 }	/* SkHWSenseGetNext */
 
 
@@ -481,13 +530,11 @@ int		Port)	/* Port Index (MAC_1 + n) */
  *
  *	SkHWSenseSetNext() - Autosensing Set next mode
  *
- * Description:
- *	This function sets the appropriate next mode.
- *
- * Note:
+ * Description:	sets the appropriate next mode
  *
+ * Returns: N/A
  */
-void SkHWSenseSetNext(
+static void SkHWSenseSetNext(
 SK_AC	*pAC,		/* adapter context */
 SK_IOC	IoC,		/* IO context */
 int		Port,		/* Port Index (MAC_1 + n) */
@@ -499,7 +546,7 @@ SK_U8	NewMode)	/* New Mode to be written
 
 	pPrt->PAutoNegTimeOut = 0;
 
-	if (pPrt->PLinkModeConf != SK_LMODE_AUTOSENSE) {
+    if (pPrt->PLinkModeConf != (SK_U8)SK_LMODE_AUTOSENSE) {
 		return;
 	}
 
@@ -511,17 +558,16 @@ SK_U8	NewMode)	/* New Mode to be written
 
 	return;
 }	/* SkHWSenseSetNext */
+#endif /* GENESIS */
 
 
 /******************************************************************************
  *
  *	SkHWLinkDown() - Link Down handling
  *
- * Description:
- *	This function handles the Hardware link down signal
- *
- * Note:
+ * Description: handles the hardware link down signal
  *
+ * Returns: N/A
  */
 void SkHWLinkDown(
 SK_AC	*pAC,		/* adapter context */
@@ -541,7 +587,7 @@ int		Port)		/* Port Index (MAC_1 + n) */
 	/* Init default sense mode */
 	SkHWInitDefSense(pAC, IoC, Port);
 
-	if (!pPrt->PHWLinkUp) {
+	if (pPrt->PHWLinkUp == SK_FALSE) {
 		return;
 	}
 
@@ -552,8 +598,8 @@ int		Port)		/* Port Index (MAC_1 + n) */
 	pPrt->PHWLinkUp = SK_FALSE;
 
 	/* Reset Port stati */
-	pPrt->PLinkModeStatus = SK_LMODE_STAT_UNKNOWN;
-	pPrt->PFlowCtrlStatus = SK_FLOW_STAT_NONE;
+    pPrt->PLinkModeStatus = (SK_U8)SK_LMODE_STAT_UNKNOWN;
+    pPrt->PFlowCtrlStatus = (SK_U8)SK_FLOW_STAT_NONE;
 	pPrt->PLinkSpeedUsed = SK_LSPEED_STAT_INDETERMINATED;
 
 	/* Re-init Phy especially when the AutoSense default is set now */
@@ -571,11 +617,9 @@ int		Port)		/* Port Index (MAC_1 + n) */
  *
  *	SkHWLinkUp() - Link Up handling
  *
- * Description:
- *	This function handles the Hardware link up signal
- *
- * Note:
+ * Description: handles the hardware link up signal
  *
+ * Returns: N/A
  */
 void SkHWLinkUp(
 SK_AC	*pAC,	/* adapter context */
@@ -593,39 +637,52 @@ int		Port)	/* Port Index (MAC_1 + n) */
 
 	pPrt->PHWLinkUp = SK_TRUE;
 	pPrt->PAutoNegFail = SK_FALSE;
-	pPrt->PLinkModeStatus = SK_LMODE_STAT_UNKNOWN;
+    pPrt->PLinkModeStatus = (SK_U8)SK_LMODE_STAT_UNKNOWN;
 
-	if (pPrt->PLinkMode != SK_LMODE_AUTOHALF &&
-	    pPrt->PLinkMode != SK_LMODE_AUTOFULL &&
-	    pPrt->PLinkMode != SK_LMODE_AUTOBOTH) {
+    if (pPrt->PLinkMode != (SK_U8)SK_LMODE_AUTOHALF &&
+        pPrt->PLinkMode != (SK_U8)SK_LMODE_AUTOFULL &&
+        pPrt->PLinkMode != (SK_U8)SK_LMODE_AUTOBOTH) {
 		/* Link is up and no Auto-negotiation should be done */
 
-		/* Configure Port */
-		
-		/* link speed should be the configured one */
-		pPrt->PLinkSpeedUsed = pPrt->PLinkSpeed;
+		/* Link speed should be the configured one */
+		switch (pPrt->PLinkSpeed) {
+		case SK_LSPEED_AUTO:
+			/* default is 1000 Mbps */
+		case SK_LSPEED_1000MBPS:
+			pPrt->PLinkSpeedUsed = SK_LSPEED_STAT_1000MBPS;
+			break;
+		case SK_LSPEED_100MBPS:
+			pPrt->PLinkSpeedUsed = SK_LSPEED_STAT_100MBPS;
+			break;
+		case SK_LSPEED_10MBPS:
+			pPrt->PLinkSpeedUsed = SK_LSPEED_STAT_10MBPS;
+			break;
+		}
 
 		/* Set Link Mode Status */
 		if (pPrt->PLinkMode == SK_LMODE_FULL) {
 			pPrt->PLinkModeStatus = SK_LMODE_STAT_FULL;
 		}
 		else {
-			pPrt->PLinkModeStatus = SK_LMODE_STAT_HALF;
+            pPrt->PLinkModeStatus = (SK_U8)SK_LMODE_STAT_HALF;
 		}
 
 		/* No flow control without auto-negotiation */
-		pPrt->PFlowCtrlStatus = SK_FLOW_STAT_NONE;
+        pPrt->PFlowCtrlStatus = (SK_U8)SK_FLOW_STAT_NONE;
 
 		/* enable Rx/Tx */
-		SkMacRxTxEnable(pAC, IoC, Port);
+        (void)SkMacRxTxEnable(pAC, IoC, Port);
 	}
 }	/* SkHWLinkUp */
 
 
 /******************************************************************************
  *
- * SkMacParity	- does everything to handle MAC parity errors correctly
+ *	SkMacParity() - MAC parity workaround
  *
+ * Description: handles MAC parity errors correctly
+ *
+ * Returns: N/A
  */
 static void SkMacParity(
 SK_AC	*pAC,	/* adapter context */
@@ -634,21 +691,28 @@ int		Port)	/* Port Index of the port fai
 {
 	SK_EVPARA	Para;
 	SK_GEPORT	*pPrt;		/* GIni Port struct pointer */
-	SK_U32		TxMax;		/* TxMax Counter */
+	SK_U32		TxMax;		/* Tx Max Size Counter */
 
 	pPrt = &pAC->GIni.GP[Port];
 
 	/* Clear IRQ Tx Parity Error */
+#ifdef GENESIS
 	if (pAC->GIni.GIGenesis) {
+
 		SK_OUT16(IoC, MR_ADDR(Port, TX_MFF_CTRL1), MFF_CLR_PERR);
 	}
-	else {
+#endif /* GENESIS */
+	
+#ifdef YUKON
+	if (pAC->GIni.GIYukon) {
 		/* HW-Bug #8: cleared by GMF_CLI_TX_FC instead of GMF_CLI_TX_PE */
 		SK_OUT8(IoC, MR_ADDR(Port, TX_GMF_CTRL_T),
 			(SK_U8)((pAC->GIni.GIChipRev == 0) ? GMF_CLI_TX_FC : GMF_CLI_TX_PE));
 	}
-
+#endif /* YUKON */
+	
 	if (pPrt->PCheckPar) {
+
 		if (Port == MAC_1) {
 			SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_SIRQ_E016, SKERR_SIRQ_E016MSG);
 		}
@@ -657,6 +721,7 @@ int		Port)	/* Port Index of the port fai
 		}
 		Para.Para64 = Port;
 		SkEventQueue(pAC, SKGE_DRV, SK_DRV_PORT_FAIL, Para);
+		
 		Para.Para32[0] = Port;
 		SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_LINK_DOWN, Para);
 
@@ -664,15 +729,21 @@ int		Port)	/* Port Index of the port fai
 	}
 
 	/* Check whether frames with a size of 1k were sent */
+#ifdef GENESIS
 	if (pAC->GIni.GIGenesis) {
 		/* Snap statistic counters */
 		(void)SkXmUpdateStats(pAC, IoC, Port);
 		
 		(void)SkXmMacStatistic(pAC, IoC, Port, XM_TXF_MAX_SZ, &TxMax);
 	}
-	else {
+#endif /* GENESIS */
+	
+#ifdef YUKON
+	if (pAC->GIni.GIYukon) {
+
 		(void)SkGmMacStatistic(pAC, IoC, Port, GM_TXF_1518B, &TxMax);
 	}
+#endif /* YUKON */
 	
 	if (TxMax > 0) {
 		/* From now on check the parity */
@@ -683,11 +754,11 @@ int		Port)	/* Port Index of the port fai
 
 /******************************************************************************
  *
- *	Hardware Error service routine
+ *	SkGeHwErr() - Hardware Error service routine
  *
- * Description:
+ * Description: handles all HW Error interrupts
  *
- * Notes:
+ * Returns: N/A
  */
 static void SkGeHwErr(
 SK_AC	*pAC,		/* adapter context */
@@ -710,50 +781,62 @@ SK_U32	HwStatus)	/* Interrupt status wor
 		SK_IN16(IoC, PCI_C(PCI_STATUS), &Word);
 		
 		SK_OUT8(IoC, B2_TST_CTRL1, TST_CFG_WRITE_ON);
-		SK_OUT16(IoC, PCI_C(PCI_STATUS), Word | PCI_ERRBITS);
+        SK_OUT16(IoC, PCI_C(PCI_STATUS), (SK_U16)(Word | PCI_ERRBITS));
 		SK_OUT8(IoC, B2_TST_CTRL1, TST_CFG_WRITE_OFF);
 
 		Para.Para64 = 0;
 		SkEventQueue(pAC, SKGE_DRV, SK_DRV_ADAP_FAIL, Para);
 	}
 
+#ifdef GENESIS
 	if (pAC->GIni.GIGenesis) {
+
 		if ((HwStatus & IS_NO_STAT_M1) != 0) {
 			/* Ignore it */
 			/* This situation is also indicated in the descriptor */
 			SK_OUT16(IoC, MR_ADDR(MAC_1, RX_MFF_CTRL1), MFF_CLR_INSTAT);
 		}
-	
+
 		if ((HwStatus & IS_NO_STAT_M2) != 0) {
 			/* Ignore it */
 			/* This situation is also indicated in the descriptor */
 			SK_OUT16(IoC, MR_ADDR(MAC_2, RX_MFF_CTRL1), MFF_CLR_INSTAT);
 		}
-	
+
 		if ((HwStatus & IS_NO_TIST_M1) != 0) {
 			/* Ignore it */
 			/* This situation is also indicated in the descriptor */
 			SK_OUT16(IoC, MR_ADDR(MAC_1, RX_MFF_CTRL1), MFF_CLR_INTIST);
 		}
-	
+
 		if ((HwStatus & IS_NO_TIST_M2) != 0) {
 			/* Ignore it */
 			/* This situation is also indicated in the descriptor */
 			SK_OUT16(IoC, MR_ADDR(MAC_2, RX_MFF_CTRL1), MFF_CLR_INTIST);
 		}
 	}
-	else {	/* YUKON */
+#endif /* GENESIS */
+	
+#ifdef YUKON
+	if (pAC->GIni.GIYukon) {
 		/* This is necessary only for Rx timing measurements */
 		if ((HwStatus & IS_IRQ_TIST_OV) != 0) {
+			/* increment Time Stamp Timer counter (high) */
+			pAC->GIni.GITimeStampCnt++;
+
 			/* Clear Time Stamp Timer IRQ */
 			SK_OUT8(IoC, GMAC_TI_ST_CTRL, (SK_U8)GMT_ST_CLR_IRQ);
 		}
 
 		if ((HwStatus & IS_IRQ_SENSOR) != 0) {
-			/* Clear I2C IRQ */
-			SK_OUT32(IoC, B2_I2C_IRQ, I2C_CLR_IRQ);
+			/* no sensors on 32-bit Yukon */
+			if (pAC->GIni.GIYukon32Bit) {
+				/* disable HW Error IRQ */
+				pAC->GIni.GIValIrqMask &= ~IS_HW_ERR;
+			}
 		}
 	}
+#endif /* YUKON */
 
 	if ((HwStatus & IS_RAM_RD_PAR) != 0) {
 		SK_OUT16(IoC, B3_RI_CTRL, RI_CLR_RD_PERR);
@@ -784,6 +867,7 @@ SK_U32	HwStatus)	/* Interrupt status wor
 		SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_SIRQ_E018, SKERR_SIRQ_E018MSG);
 		Para.Para64 = MAC_1;
 		SkEventQueue(pAC, SKGE_DRV, SK_DRV_PORT_FAIL, Para);
+		
 		Para.Para32[0] = MAC_1;
 		SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_LINK_DOWN, Para);
 	}
@@ -795,6 +879,7 @@ SK_U32	HwStatus)	/* Interrupt status wor
 		SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_SIRQ_E019, SKERR_SIRQ_E019MSG);
 		Para.Para64 = MAC_2;
 		SkEventQueue(pAC, SKGE_DRV, SK_DRV_PORT_FAIL, Para);
+		
 		Para.Para32[0] = MAC_2;
 		SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_LINK_DOWN, Para);
 	}
@@ -803,11 +888,11 @@ SK_U32	HwStatus)	/* Interrupt status wor
 
 /******************************************************************************
  *
- *	Interrupt service routine
+ *	SkGeSirqIsr() - Special Interrupt Service Routine
  *
- * Description:
+ * Description: handles all non data transfer specific interrupts (slow path)
  *
- * Notes:
+ * Returns: N/A
  */
 void SkGeSirqIsr(
 SK_AC	*pAC,		/* adapter context */
@@ -817,13 +902,10 @@ SK_U32	Istatus)	/* Interrupt status word
 	SK_EVPARA	Para;
 	SK_U32		RegVal32;	/* Read register value */
 	SK_GEPORT	*pPrt;		/* GIni Port struct pointer */
-	unsigned 	Len;
-	SK_U64		Octets;
 	SK_U16 		PhyInt;
-	SK_U16 		PhyIMsk;
 	int			i;
 
-	if ((Istatus & IS_HW_ERR) != 0) {
+	if (((Istatus & IS_HW_ERR) & pAC->GIni.GIValIrqMask) != 0) {
 		/* read the HW Error Interrupt source */
 		SK_IN32(IoC, B0_HWE_ISRC, &RegVal32);
 		
@@ -869,32 +951,47 @@ SK_U32	Istatus)	/* Interrupt status word
 		/* May be a normal situation in a server with a slow network */
 		SK_OUT16(IoC, B3_PA_CTRL, PA_CLR_TO_TX1);
 
-		/*
-		 * workaround: if in half duplex mode, check for Tx hangup.
-		 * Read number of TX'ed bytes, wait for 10 ms, then compare
-		 * the number with current value. If nothing changed, we assume
-		 * that Tx is hanging and do a FIFO flush (see event routine).
-		 */
-		if ((pPrt->PLinkModeStatus == SK_LMODE_STAT_HALF ||
-		    pPrt->PLinkModeStatus == SK_LMODE_STAT_AUTOHALF) &&
-		    !pPrt->HalfDupTimerActive) {
+#ifdef GENESIS
+		if (pAC->GIni.GIGenesis) {
 			/*
-			 * many more pack. arb. timeouts may come in between,
-			 * we ignore those
+			 * workaround: if in half duplex mode, check for Tx hangup.
+			 * Read number of TX'ed bytes, wait for 10 ms, then compare
+			 * the number with current value. If nothing changed, we assume
+			 * that Tx is hanging and do a FIFO flush (see event routine).
 			 */
-			pPrt->HalfDupTimerActive = SK_TRUE;
+			if ((pPrt->PLinkModeStatus == SK_LMODE_STAT_HALF ||
+				pPrt->PLinkModeStatus == SK_LMODE_STAT_AUTOHALF) &&
+				!pPrt->HalfDupTimerActive) {
+				/*
+				 * many more pack. arb. timeouts may come in between,
+				 * we ignore those
+				 */
+				pPrt->HalfDupTimerActive = SK_TRUE;
+#ifdef XXX
+				Len = sizeof(SK_U64);
+				SkPnmiGetVar(pAC, IoC, OID_SKGE_STAT_TX_OCTETS, (char *)&Octets,
+					&Len, (SK_U32)SK_PNMI_PORT_PHYS2INST(pAC, 0),
+					pAC->Rlmt.Port[0].Net->NetNumber);
+				
+				pPrt->LastOctets = Octets;
+#endif /* XXX */
+				/* Snap statistic counters */
+				(void)SkXmUpdateStats(pAC, IoC, 0);
 
-			Len = sizeof(SK_U64);
-			SkPnmiGetVar(pAC, IoC, OID_SKGE_STAT_TX_OCTETS, (char *)&Octets,
-				&Len, (SK_U32) SK_PNMI_PORT_PHYS2INST(pAC, 0),
-				pAC->Rlmt.Port[0].Net->NetNumber);
-			
-			pPrt->LastOctets = Octets;
-			
-			Para.Para32[0] = 0;
-			SkTimerStart(pAC, IoC, &pPrt->HalfDupChkTimer, SK_HALFDUP_CHK_TIME,
-				SKGE_HWAC, SK_HWEV_HALFDUP_CHK, Para);
+				(void)SkXmMacStatistic(pAC, IoC, 0, XM_TXO_OK_HI, &RegVal32);
+
+				pPrt->LastOctets = (SK_U64)RegVal32 << 32;
+				
+				(void)SkXmMacStatistic(pAC, IoC, 0, XM_TXO_OK_LO, &RegVal32);
+
+				pPrt->LastOctets += RegVal32;
+				
+				Para.Para32[0] = 0;
+				SkTimerStart(pAC, IoC, &pPrt->HalfDupChkTimer, SK_HALFDUP_CHK_TIME,
+					SKGE_HWAC, SK_HWEV_HALFDUP_CHK, Para);
+			}
 		}
+#endif /* GENESIS */
 	}
 
 	if ((Istatus & IS_PA_TO_TX2) != 0) {
@@ -904,23 +1001,38 @@ SK_U32	Istatus)	/* Interrupt status word
 		/* May be a normal situation in a server with a slow network */
 		SK_OUT16(IoC, B3_PA_CTRL, PA_CLR_TO_TX2);
 
-		/* workaround: see above */
-		if ((pPrt->PLinkModeStatus == SK_LMODE_STAT_HALF ||
-		     pPrt->PLinkModeStatus == SK_LMODE_STAT_AUTOHALF) &&
-		    !pPrt->HalfDupTimerActive) {
-			pPrt->HalfDupTimerActive = SK_TRUE;
-
-			Len = sizeof(SK_U64);
-			SkPnmiGetVar(pAC, IoC, OID_SKGE_STAT_TX_OCTETS, (char *)&Octets,
-				&Len, (SK_U32) SK_PNMI_PORT_PHYS2INST(pAC, 1),
-				pAC->Rlmt.Port[1].Net->NetNumber);
-			
-			pPrt->LastOctets = Octets;
-			
-			Para.Para32[0] = 1;
-			SkTimerStart(pAC, IoC, &pPrt->HalfDupChkTimer, SK_HALFDUP_CHK_TIME,
-				SKGE_HWAC, SK_HWEV_HALFDUP_CHK, Para);
+#ifdef GENESIS
+		if (pAC->GIni.GIGenesis) {
+			/* workaround: see above */
+			if ((pPrt->PLinkModeStatus == SK_LMODE_STAT_HALF ||
+				 pPrt->PLinkModeStatus == SK_LMODE_STAT_AUTOHALF) &&
+				!pPrt->HalfDupTimerActive) {
+				pPrt->HalfDupTimerActive = SK_TRUE;
+#ifdef XXX
+				Len = sizeof(SK_U64);
+				SkPnmiGetVar(pAC, IoC, OID_SKGE_STAT_TX_OCTETS, (char *)&Octets,
+					&Len, (SK_U32)SK_PNMI_PORT_PHYS2INST(pAC, 1),
+					pAC->Rlmt.Port[1].Net->NetNumber);
+				
+				pPrt->LastOctets = Octets;
+#endif /* XXX */
+				/* Snap statistic counters */
+				(void)SkXmUpdateStats(pAC, IoC, 1);
+
+				(void)SkXmMacStatistic(pAC, IoC, 1, XM_TXO_OK_HI, &RegVal32);
+
+				pPrt->LastOctets = (SK_U64)RegVal32 << 32;
+				
+				(void)SkXmMacStatistic(pAC, IoC, 1, XM_TXO_OK_LO, &RegVal32);
+
+				pPrt->LastOctets += RegVal32;
+				
+				Para.Para32[0] = 1;
+				SkTimerStart(pAC, IoC, &pPrt->HalfDupChkTimer, SK_HALFDUP_CHK_TIME,
+					SKGE_HWAC, SK_HWEV_HALFDUP_CHK, Para);
+			}
 		}
+#endif /* GENESIS */
 	}
 
 	/* Check interrupts of the particular queues */
@@ -1001,59 +1113,69 @@ SK_U32	Istatus)	/* Interrupt status word
 				continue;
 			}
 			
-			switch (pPrt->PhyType) {
-			
-			case SK_PHY_XMAC:
-				break;
-			
-			case SK_PHY_BCOM:
-				SkXmPhyRead(pAC, IoC, i, PHY_BCOM_INT_STAT, &PhyInt);
-				SkXmPhyRead(pAC, IoC, i, PHY_BCOM_INT_MASK, &PhyIMsk);
-
-				if ((PhyInt & ~PhyIMsk) != 0) {
-					SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_IRQ,
-						("Port %d Bcom Int: 0x%04X Mask: 0x%04X\n",
-						i, PhyInt, PhyIMsk));
-					SkPhyIsrBcom(pAC, IoC, i, PhyInt);
+#ifdef GENESIS
+			if (pAC->GIni.GIGenesis) {
+				
+				switch (pPrt->PhyType) {
+				
+				case SK_PHY_XMAC:
+					break;
+				
+				case SK_PHY_BCOM:
+					SkXmPhyRead(pAC, IoC, i, PHY_BCOM_INT_STAT, &PhyInt);
+	
+					if ((PhyInt & ~PHY_B_DEF_MSK) != 0) {
+						SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_IRQ,
+							("Port %d Bcom Int: 0x%04X\n",
+							i, PhyInt));
+						SkPhyIsrBcom(pAC, IoC, i, PhyInt);
+					}
+					break;
+#ifdef OTHER_PHY
+				case SK_PHY_LONE:
+					SkXmPhyRead(pAC, IoC, i, PHY_LONE_INT_STAT, &PhyInt);
+					
+					if ((PhyInt & PHY_L_DEF_MSK) != 0) {
+						SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_IRQ,
+							("Port %d Lone Int: %x\n",
+							i, PhyInt));
+						SkPhyIsrLone(pAC, IoC, i, PhyInt);
+					}
+					break;
+#endif /* OTHER_PHY */
 				}
-				break;
-			
-			case SK_PHY_MARV_COPPER:
-			case SK_PHY_MARV_FIBER:
+			}
+#endif /* GENESIS */
+	
+#ifdef YUKON
+			if (pAC->GIni.GIYukon) {
+				/* Read PHY Interrupt Status */
 				SkGmPhyRead(pAC, IoC, i, PHY_MARV_INT_STAT, &PhyInt);
-				SkGmPhyRead(pAC, IoC, i, PHY_MARV_INT_MASK, &PhyIMsk);
 
-				if ((PhyInt & PhyIMsk) != 0) {
+				if ((PhyInt & PHY_M_DEF_MSK) != 0) {
 					SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_IRQ,
-						("Port %d Marv Int: 0x%04X Mask: 0x%04X\n",
-						i, PhyInt, PhyIMsk));
+						("Port %d Marv Int: 0x%04X\n",
+						i, PhyInt));
 					SkPhyIsrGmac(pAC, IoC, i, PhyInt);
 				}
-				break;
-
-#ifdef OTHER_PHY
-			case SK_PHY_LONE:
-				SkXmPhyRead(pAC, IoC, i, PHY_LONE_INT_STAT, &PhyInt);
-				SkXmPhyRead(pAC, IoC, i, PHY_LONE_INT_ENAB, &PhyIMsk);
-				
-				if ((PhyInt & PhyIMsk) != 0) {
-					SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_IRQ,
-						("Port %d Lone Int: %x Mask: %x\n",
-						i, PhyInt, PhyIMsk));
-					SkPhyIsrLone(pAC, IoC, i, PhyInt);
-				}
-				break;
-			case SK_PHY_NAT:
-				/* todo: National */
-				break;
-#endif /* OTHER_PHY */
 			}
+#endif /* YUKON */
 		}
 	}
 
 	/* I2C Ready interrupt */
 	if ((Istatus & IS_I2C_READY) != 0) {
+#ifdef SK_SLIM
+        SK_OUT32(IoC, B2_I2C_IRQ, I2C_CLR_IRQ);
+#else		
 		SkI2cIsr(pAC, IoC);
+#endif		
+	}
+
+	/* SW forced interrupt */
+	if ((Istatus & IS_IRQ_SW) != 0) {
+		/* clear the software IRQ */
+		SK_OUT8(IoC, B0_CTST, CS_CL_SW_IRQ);
 	}
 
 	if ((Istatus & IS_LNK_SYNC_M1) != 0) {
@@ -1088,20 +1210,30 @@ SK_U32	Istatus)	/* Interrupt status word
 
 	/* Timer interrupt (served last) */
 	if ((Istatus & IS_TIMINT) != 0) {
+		/* check for HW Errors */
+		if (((Istatus & IS_HW_ERR) & ~pAC->GIni.GIValIrqMask) != 0) {
+			/* read the HW Error Interrupt source */
+			SK_IN32(IoC, B0_HWE_ISRC, &RegVal32);
+
+			SkGeHwErr(pAC, IoC, RegVal32);
+		}
+
 		SkHwtIsr(pAC, IoC);
 	}
+
 }	/* SkGeSirqIsr */
 
 
+#ifdef GENESIS
 /******************************************************************************
  *
- * SkGePortCheckShorts - Implementing XMAC Workaround Errata # 2
+ * SkGePortCheckShorts() - Implementing XMAC Workaround Errata # 2
  *
  * return:
  *	0	o.k. nothing needed
  *	1	Restart needed on this port
  */
-static int	SkGePortCheckShorts(
+static int SkGePortCheckShorts(
 SK_AC	*pAC,		/* Adapter Context */
 SK_IOC	IoC,		/* IO Context */
 int		Port)		/* Which port should be checked */
@@ -1126,13 +1258,15 @@ int		Port)		/* Which port should be chec
 	(void)SkXmMacStatistic(pAC, IoC, Port, XM_RXE_SHT_ERR, &Shorts);
 
 	/*
-	 * Read Rx counter (packets seen on the network and not necessarily
+	 * Read Rx counters (packets seen on the network and not necessarily
 	 * really received.
 	 */
 	RxCts = 0;
 
 	for (i = 0; i < sizeof(SkGeRxRegs)/sizeof(SkGeRxRegs[0]); i++) {
+		
 		(void)SkXmMacStatistic(pAC, IoC, Port, SkGeRxRegs[i], &RxTmp);
+		
 		RxCts += (SK_U64)RxTmp;
 	}
 
@@ -1202,44 +1336,76 @@ int		Port)		/* Which port should be chec
 
 	return(Rtv);
 }	/* SkGePortCheckShorts */
+#endif /* GENESIS */
 
 
 /******************************************************************************
  *
- * SkGePortCheckUp - Implementation of the Workaround for Errata #2
+ * SkGePortCheckUp() - Check if the link is up
  *
  * return:
  *	0	o.k. nothing needed
  *	1	Restart needed on this port
  *	2	Link came up
  */
-static int	SkGePortCheckUp(
+static int SkGePortCheckUp(
 SK_AC	*pAC,		/* Adapter Context */
 SK_IOC	IoC,		/* IO Context */
 int		Port)		/* Which port should be checked */
 {
-	switch (pAC->GIni.GP[Port].PhyType) {
-	case SK_PHY_XMAC:
-		return(SkGePortCheckUpXmac(pAC, IoC, Port));
-	case SK_PHY_BCOM:
-		return(SkGePortCheckUpBcom(pAC, IoC, Port));
-	case SK_PHY_MARV_COPPER:
-	case SK_PHY_MARV_FIBER:
-		return(SkGePortCheckUpGmac(pAC, IoC, Port));
+	SK_GEPORT	*pPrt;		/* GIni Port struct pointer */
+	SK_BOOL		AutoNeg;	/* Is Auto-negotiation used ? */
+	int			Rtv;		/* Return value */
+
+	pPrt = &pAC->GIni.GP[Port];
+
+	if (pPrt->PLinkMode == SK_LMODE_HALF || pPrt->PLinkMode == SK_LMODE_FULL) {
+		AutoNeg = SK_FALSE;
+	}
+	else {
+		AutoNeg = SK_TRUE;
+	}
+
+#ifdef GENESIS
+	if (pAC->GIni.GIGenesis) {
+
+		switch (pPrt->PhyType) {
+		
+		case SK_PHY_XMAC:
+			Rtv = SkGePortCheckUpXmac(pAC, IoC, Port, AutoNeg);
+			break;
+		case SK_PHY_BCOM:
+			Rtv = SkGePortCheckUpBcom(pAC, IoC, Port, AutoNeg);
+			break;
 #ifdef OTHER_PHY
-	case SK_PHY_LONE:
-		return(SkGePortCheckUpLone(pAC, IoC, Port));
-	case SK_PHY_NAT:
-		return(SkGePortCheckUpNat(pAC, IoC, Port));
+		case SK_PHY_LONE:
+			Rtv = SkGePortCheckUpLone(pAC, IoC, Port, AutoNeg);
+			break;
+		case SK_PHY_NAT:
+			Rtv = SkGePortCheckUpNat(pAC, IoC, Port, AutoNeg);
+			break;
 #endif /* OTHER_PHY */
+		default:
+			Rtv = SK_HW_PS_NONE;
+		}
 	}
-	return(SK_HW_PS_NONE);
+#endif /* GENESIS */
+	
+#ifdef YUKON
+	if (pAC->GIni.GIYukon) {
+		
+		Rtv = SkGePortCheckUpGmac(pAC, IoC, Port, AutoNeg);
+	}
+#endif /* YUKON */
+
+	return(Rtv);	
 }	/* SkGePortCheckUp */
 
 
+#ifdef GENESIS
 /******************************************************************************
  *
- * SkGePortCheckUpXmac - Implementing of the Workaround Errata # 2
+ * SkGePortCheckUpXmac() - Implementing of the Workaround Errata # 2
  *
  * return:
  *	0	o.k. nothing needed
@@ -1249,7 +1415,8 @@ int		Port)		/* Which port should be chec
 static int SkGePortCheckUpXmac(
 SK_AC	*pAC,		/* Adapter Context */
 SK_IOC	IoC,		/* IO Context */
-int		Port)		/* Which port should be checked */
+int		Port,		/* Which port should be checked */
+SK_BOOL	AutoNeg)	/* Is Auto-negotiation used ? */
 {
 	SK_U32		Shorts;		/* Short Event Counter */
 	SK_GEPORT	*pPrt;		/* GIni Port struct pointer */
@@ -1260,7 +1427,6 @@ int		Port)		/* Which port should be chec
 	SK_U16		LpAb;		/* Link Partner Ability */
 	SK_U16		ResAb;		/* Resolved Ability */
 	SK_U16		ExtStat;	/* Extended Status Register */
-	SK_BOOL		AutoNeg;	/* Is Auto-negotiation used ? */
 	SK_U8		NextMode;	/* Next AutoSensing Mode */
 
 	pPrt = &pAC->GIni.GP[Port];
@@ -1278,13 +1444,6 @@ int		Port)		/* Which port should be chec
 	pPrt->PIsave = 0;
 
 	/* Now wait for each port's link */
-	if (pPrt->PLinkMode == SK_LMODE_HALF || pPrt->PLinkMode == SK_LMODE_FULL) {
-		AutoNeg = SK_FALSE;
-	}
-	else {
-		AutoNeg = SK_TRUE;
-	}
-
 	if (pPrt->PLinkBroken) {
 		/* Link was broken */
 		XM_IN32(IoC, Port, XM_GP_PORT, &GpReg);
@@ -1501,7 +1660,7 @@ int		Port)		/* Which port should be chec
 
 /******************************************************************************
  *
- * SkGePortCheckUpBcom - Check, if the link is up
+ * SkGePortCheckUpBcom() - Check if the link is up on Bcom PHY
  *
  * return:
  *	0	o.k. nothing needed
@@ -1509,9 +1668,10 @@ int		Port)		/* Which port should be chec
  *	2	Link came up
  */
 static int SkGePortCheckUpBcom(
-SK_AC	*pAC,	/* Adapter Context */
-SK_IOC	IoC,	/* IO Context */
-int		Port)	/* Which port should be checked */
+SK_AC	*pAC,		/* Adapter Context */
+SK_IOC	IoC,		/* IO Context */
+int		Port,		/* Which port should be checked */
+SK_BOOL	AutoNeg)	/* Is Auto-negotiation used ? */
 {
 	SK_GEPORT	*pPrt;		/* GIni Port struct pointer */
 	int			Done;
@@ -1523,7 +1683,6 @@ int		Port)	/* Which port should be check
 	SK_U16		LpAb;
 	SK_U16		ExtStat;
 #endif /* DEBUG */
-	SK_BOOL		AutoNeg;	/* Is Auto-negotiation used ? */
 
 	pPrt = &pAC->GIni.GP[Port];
 
@@ -1600,7 +1759,7 @@ int		Port)	/* Which port should be check
 
 	if ((Isrc & (PHY_B_IS_NO_HDCL /* | PHY_B_IS_NO_HDC */)) != 0) {
 		/*
-		 * Workaround BCOM Errata:
+		 * Workaround BCom Errata:
 		 *	enable and disable loopback mode if "NO HCD" occurs.
 		 */
 		SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_CTRL, &Ctrl);
@@ -1693,14 +1852,6 @@ int		Port)	/* Which port should be check
 	}
 #endif /* DEBUG */
 
-	/* Now wait for each port's link */
-	if (pPrt->PLinkMode == SK_LMODE_HALF || pPrt->PLinkMode == SK_LMODE_FULL) {
-		AutoNeg = SK_FALSE;
-	}
-	else {
-		AutoNeg = SK_TRUE;
-	}
-
 	/*
 	 * Here we usually can check whether the link is in sync and
 	 * auto-negotiation is done.
@@ -1711,7 +1862,7 @@ int		Port)	/* Which port should be check
 	SkMacAutoNegLipaPhy(pAC, IoC, Port, PhyStat);
 	
 	SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-		("AutoNeg: %d, PhyStat: 0x%04x\n", AutoNeg, PhyStat));
+		("AutoNeg: %d, PhyStat: 0x%04X\n", AutoNeg, PhyStat));
 
 	SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_1000T_STAT, &ResAb);
 
@@ -1733,7 +1884,7 @@ int		Port)	/* Which port should be check
 		SK_MS_STAT_MASTER : SK_MS_STAT_SLAVE;
 	
 	SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-		("AutoNeg: %d, PhyStat: 0x%04x\n", AutoNeg, PhyStat));
+		("AutoNeg: %d, PhyStat: 0x%04X\n", AutoNeg, PhyStat));
 
 	if (AutoNeg) {
 		if ((PhyStat & PHY_ST_AN_OVER) != 0) {
@@ -1797,16 +1948,19 @@ int		Port)	/* Which port should be check
 		SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_IRQ,
 			("Link sync(GP), Port %d\n", Port));
 		SkHWLinkUp(pAC, IoC, Port);
+		
 		return(SK_HW_PS_LINK);
 	}
 
 	return(SK_HW_PS_NONE);
 }	/* SkGePortCheckUpBcom */
+#endif /* GENESIS */
 
 
+#ifdef YUKON
 /******************************************************************************
  *
- * SkGePortCheckUpGmac - Check, if the link is up
+ * SkGePortCheckUpGmac() - Check if the link is up on Marvell PHY
  *
  * return:
  *	0	o.k. nothing needed
@@ -1814,9 +1968,10 @@ int		Port)	/* Which port should be check
  *	2	Link came up
  */
 static int SkGePortCheckUpGmac(
-SK_AC	*pAC,	/* Adapter Context */
-SK_IOC	IoC,	/* IO Context */
-int		Port)	/* Which port should be checked */
+SK_AC	*pAC,		/* Adapter Context */
+SK_IOC	IoC,		/* IO Context */
+int		Port,		/* Which port should be checked */
+SK_BOOL	AutoNeg)	/* Is Auto-negotiation used ? */
 {
 	SK_GEPORT	*pPrt;		/* GIni Port struct pointer */
 	int			Done;
@@ -1824,7 +1979,6 @@ int		Port)	/* Which port should be check
 	SK_U16		PhyStat;	/* Phy Status */
 	SK_U16		PhySpecStat;/* Phy Specific Status */
 	SK_U16		ResAb;		/* Master/Slave resolution */
-	SK_BOOL		AutoNeg;	/* Is Auto-negotiation used ? */
 
 	pPrt = &pAC->GIni.GP[Port];
 
@@ -1836,26 +1990,19 @@ int		Port)	/* Which port should be check
 	}
 
 	if ((Isrc & PHY_M_IS_DOWNSH_DET) != 0) {
-		/* TBD */
+		SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+			("Downshift detected port %d\n", Port));
 	}
 
 	if (pPrt->PHWLinkUp) {
 		return(SK_HW_PS_NONE);
 	}
 
-	/* Now wait for each port's link */
-	if (pPrt->PLinkMode == SK_LMODE_HALF || pPrt->PLinkMode == SK_LMODE_FULL) {
-		AutoNeg = SK_FALSE;
-	}
-	else {
-		AutoNeg = SK_TRUE;
-	}
-
 	/* Read PHY Status */
 	SkGmPhyRead(pAC, IoC, Port, PHY_MARV_STAT, &PhyStat);
 
 	SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-		("AutoNeg: %d, PhyStat: 0x%04x\n", AutoNeg, PhyStat));
+		("AutoNeg: %d, PhyStat: 0x%04X\n", AutoNeg, PhyStat));
 
 	SkMacAutoNegLipaPhy(pAC, IoC, Port, PhyStat);
 	
@@ -1875,7 +2022,7 @@ int		Port)	/* Which port should be check
 	SkGmPhyRead(pAC, IoC, Port, PHY_MARV_PHY_STAT, &PhySpecStat);
 	
 	SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-		("AutoNeg: %d, PhySpecStat: 0x%04x\n", AutoNeg, PhySpecStat));
+		("AutoNeg: %d, PhySpecStat: 0x%04X\n", AutoNeg, PhySpecStat));
 
 	if ((PhySpecStat & PHY_M_PS_LINK_UP) == 0) {
 		return(SK_HW_PS_NONE);
@@ -1921,12 +2068,13 @@ int		Port)	/* Which port should be check
 
 	return(SK_HW_PS_NONE);
 }	/* SkGePortCheckUpGmac */
+#endif /* YUKON */
 
 
 #ifdef OTHER_PHY
 /******************************************************************************
  *
- * SkGePortCheckUpLone - Check if the link is up
+ * SkGePortCheckUpLone() - Check if the link is up on Level One PHY
  *
  * return:
  *	0	o.k. nothing needed
@@ -1936,7 +2084,8 @@ int		Port)	/* Which port should be check
 static int SkGePortCheckUpLone(
 SK_AC	*pAC,		/* Adapter Context */
 SK_IOC	IoC,		/* IO Context */
-int		Port)		/* Which port should be checked */
+int		Port,		/* Which port should be checked */
+SK_BOOL	AutoNeg)	/* Is Auto-negotiation used ? */
 {
 	SK_GEPORT	*pPrt;		/* GIni Port struct pointer */
 	int			Done;
@@ -1945,7 +2094,6 @@ int		Port)		/* Which port should be chec
 	SK_U16		ExtStat;	/* Extended Status Register */
 	SK_U16		PhyStat;	/* Phy Status Register */
 	SK_U16		StatSum;
-	SK_BOOL		AutoNeg;	/* Is Auto-negotiation used ? */
 	SK_U8		NextMode;	/* Next AutoSensing Mode */
 
 	pPrt = &pAC->GIni.GP[Port];
@@ -1957,14 +2105,6 @@ int		Port)		/* Which port should be chec
 	StatSum = pPrt->PIsave;
 	pPrt->PIsave = 0;
 
-	/* Now wait for each ports link */
-	if (pPrt->PLinkMode == SK_LMODE_HALF || pPrt->PLinkMode == SK_LMODE_FULL) {
-		AutoNeg = SK_FALSE;
-	}
-	else {
-		AutoNeg = SK_TRUE;
-	}
-
 	/*
 	 * here we usually can check whether the link is in sync and
 	 * auto-negotiation is done.
@@ -2057,6 +2197,7 @@ int		Port)		/* Which port should be chec
 		SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_IRQ,
 			("Link sync(GP), Port %d\n", Port));
 		SkHWLinkUp(pAC, IoC, Port);
+		
 		return(SK_HW_PS_LINK);
 	}
 
@@ -2066,7 +2207,7 @@ int		Port)		/* Which port should be chec
 
 /******************************************************************************
  *
- * SkGePortCheckUpNat - Check if the link is up
+ * SkGePortCheckUpNat() - Check if the link is up on National PHY
  *
  * return:
  *	0	o.k. nothing needed
@@ -2076,7 +2217,8 @@ int		Port)		/* Which port should be chec
 static int SkGePortCheckUpNat(
 SK_AC	*pAC,		/* Adapter Context */
 SK_IOC	IoC,		/* IO Context */
-int		Port)		/* Which port should be checked */
+int		Port,		/* Which port should be checked */
+SK_BOOL	AutoNeg)	/* Is Auto-negotiation used ? */
 {
 	/* todo: National */
 	return(SK_HW_PS_NONE);
@@ -2086,7 +2228,7 @@ int		Port)		/* Which port should be chec
 
 /******************************************************************************
  *
- *	Event service routine
+ *	SkGeSirqEvent() - Event Service Routine
  *
  * Description:
  *
@@ -2098,13 +2240,14 @@ SK_IOC		IoC,		/* Io Context */
 SK_U32		Event,		/* Module specific Event */
 SK_EVPARA	Para)		/* Event specific Parameter */
 {
-	SK_U64		Octets;
 	SK_GEPORT	*pPrt;		/* GIni Port struct pointer */
 	SK_U32		Port;
-	SK_U32		Time;
-	unsigned	Len;
+	SK_U32		Val32;
 	int			PortStat;
 	SK_U8		Val8;
+#ifdef GENESIS
+	SK_U64		Octets;
+#endif /* GENESIS */
 
 	Port = Para.Para32[0];
 	pPrt = &pAC->GIni.GP[Port];
@@ -2112,15 +2255,13 @@ SK_EVPARA	Para)		/* Event specific Param
 	switch (Event) {
 	case SK_HWEV_WATIM:
 		/* Check whether port came up */
-		PortStat = SkGePortCheckUp(pAC, IoC, Port);
+		PortStat = SkGePortCheckUp(pAC, IoC, (int)Port);
 
 		switch (PortStat) {
 		case SK_HW_PS_RESTART:
 			if (pPrt->PHWLinkUp) {
-				/*
-				 * Set Link to down.
-				 */
-				SkHWLinkDown(pAC, IoC, Port);
+				/* Set Link to down */
+				SkHWLinkDown(pAC, IoC, (int)Port);
 
 				/*
 				 * Signal directly to RLMT to ensure correct
@@ -2137,20 +2278,19 @@ SK_EVPARA	Para)		/* Event specific Param
 			/* Signal to RLMT */
 			SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_LINK_UP, Para);
 			break;
-
 		}
 		
 		/* Start again the check Timer */
 		if (pPrt->PHWLinkUp) {
-			Time = SK_WA_ACT_TIME;
+			Val32 = SK_WA_ACT_TIME;
 		}
 		else {
-			Time = SK_WA_INA_TIME;
+			Val32 = SK_WA_INA_TIME;
 		}
 
 		/* Todo: still needed for non-XMAC PHYs??? */
 		/* Start workaround Errata #2 timer */
-		SkTimerStart(pAC, IoC, &pPrt->PWaTimer, Time,
+		SkTimerStart(pAC, IoC, &pPrt->PWaTimer, Val32,
 			SKGE_HWAC, SK_HWEV_WATIM, Para);
 		break;
 
@@ -2163,7 +2303,7 @@ SK_EVPARA	Para)		/* Event specific Param
 			SkRlmtEvent(pAC, IoC, SK_RLMT_LINK_DOWN, Para);
 		}
 
-		SkHWLinkDown(pAC, IoC, Port);
+		SkHWLinkDown(pAC, IoC, (int)Port);
 
 		/* Schedule Port RESET */
 		SkEventQueue(pAC, SKGE_DRV, SK_DRV_PORT_RESET, Para);
@@ -2185,7 +2325,7 @@ SK_EVPARA	Para)		/* Event specific Param
 		/* Stop Workaround Timer */
 		SkTimerStop(pAC, IoC, &pPrt->PWaTimer);
 
-		SkHWLinkDown(pAC, IoC, Port);
+		SkHWLinkDown(pAC, IoC, (int)Port);
 		break;
 
 	case SK_HWEV_UPDATE_STAT:
@@ -2256,26 +2396,41 @@ SK_EVPARA	Para)		/* Event specific Param
 		}
 		break;
 
+#ifdef GENESIS
 	case SK_HWEV_HALFDUP_CHK:
-		/*
-		 * half duplex hangup workaround.
-		 * See packet arbiter timeout interrupt for description
-		 */
-		pPrt->HalfDupTimerActive = SK_FALSE;
-		if (pPrt->PLinkModeStatus == SK_LMODE_STAT_HALF ||
-		    pPrt->PLinkModeStatus == SK_LMODE_STAT_AUTOHALF) {
-			
-			Len = sizeof(SK_U64);
-			SkPnmiGetVar(pAC, IoC, OID_SKGE_STAT_TX_OCTETS, (char *)&Octets,
-				&Len, (SK_U32)SK_PNMI_PORT_PHYS2INST(pAC, Port),
-				pAC->Rlmt.Port[Port].Net->NetNumber);
-			
-			if (pPrt->LastOctets == Octets) {
-				/* Tx hanging, a FIFO flush restarts it */
-				SkMacFlushTxFifo(pAC, IoC, Port);
+		if (pAC->GIni.GIGenesis) {
+			/*
+			 * half duplex hangup workaround.
+			 * See packet arbiter timeout interrupt for description
+			 */
+			pPrt->HalfDupTimerActive = SK_FALSE;
+			if (pPrt->PLinkModeStatus == SK_LMODE_STAT_HALF ||
+				pPrt->PLinkModeStatus == SK_LMODE_STAT_AUTOHALF) {
+#ifdef XXX
+				Len = sizeof(SK_U64);
+				SkPnmiGetVar(pAC, IoC, OID_SKGE_STAT_TX_OCTETS, (char *)&Octets,
+					&Len, (SK_U32)SK_PNMI_PORT_PHYS2INST(pAC, Port),
+					pAC->Rlmt.Port[Port].Net->NetNumber);
+#endif /* XXX */
+				/* Snap statistic counters */
+				(void)SkXmUpdateStats(pAC, IoC, Port);
+
+				(void)SkXmMacStatistic(pAC, IoC, Port, XM_TXO_OK_HI, &Val32);
+
+				Octets = (SK_U64)Val32 << 32;
+				
+				(void)SkXmMacStatistic(pAC, IoC, Port, XM_TXO_OK_LO, &Val32);
+
+				Octets += Val32;
+				
+				if (pPrt->LastOctets == Octets) {
+					/* Tx hanging, a FIFO flush restarts it */
+					SkMacFlushTxFifo(pAC, IoC, Port);
+				}
 			}
 		}
 		break;
+#endif /* GENESIS */
 	
 	default:
 		SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_SIRQ_E001, SKERR_SIRQ_E001MSG);
@@ -2286,11 +2441,12 @@ SK_EVPARA	Para)		/* Event specific Param
 }	/* SkGeSirqEvent */
 
 
+#ifdef GENESIS
 /******************************************************************************
  *
- *	SkPhyIsrBcom - PHY interrupt service routine
+ *	SkPhyIsrBcom() - PHY interrupt service routine
  *
- * Description: handle all interrupts from BCOM PHY
+ * Description: handles all interrupts from BCom PHY
  *
  * Returns: N/A
  */
@@ -2312,10 +2468,10 @@ SK_U16		IStatus)	/* Interrupt Status */
 	}
 	
 	if ((IStatus & (PHY_B_IS_AN_PR | PHY_B_IS_LST_CHANGE)) != 0) {
-		Para.Para32[0] = (SK_U32)Port;
 
 		SkHWLinkDown(pAC, IoC, Port);
 
+		Para.Para32[0] = (SK_U32)Port;
 		/* Signal to RLMT */
 		SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_LINK_DOWN, Para);
 
@@ -2325,13 +2481,15 @@ SK_U16		IStatus)	/* Interrupt Status */
 	}
 
 }	/* SkPhyIsrBcom */
+#endif /* GENESIS */
 
 
+#ifdef YUKON
 /******************************************************************************
  *
- *	SkPhyIsrGmac - PHY interrupt service routine
+ *	SkPhyIsrGmac() - PHY interrupt service routine
  *
- * Description: handle all interrupts from Marvell PHY
+ * Description: handles all interrupts from Marvell PHY
  *
  * Returns: N/A
  */
@@ -2343,14 +2501,27 @@ SK_U16		IStatus)	/* Interrupt Status */
 {
 	SK_GEPORT	*pPrt;		/* GIni Port struct pointer */
 	SK_EVPARA	Para;
+	SK_U16		Word;
 
 	pPrt = &pAC->GIni.GP[Port];
 
 	if ((IStatus & (PHY_M_IS_AN_PR | PHY_M_IS_LST_CHANGE)) != 0) {
-		Para.Para32[0] = (SK_U32)Port;
 
 		SkHWLinkDown(pAC, IoC, Port);
 
+		SkGmPhyRead(pAC, IoC, Port, PHY_MARV_AUNE_ADV, &Word);
+
+		SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+			("AutoNeg.Adv: 0x%04X\n", Word));
+		
+		/* Set Auto-negotiation advertisement */
+		if (pPrt->PFlowCtrlMode == SK_FLOW_MODE_SYM_OR_REM) {
+			/* restore Asymmetric Pause bit */
+			SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_AUNE_ADV,
+				(SK_U16)(Word | PHY_M_AN_ASP));
+		}
+		
+		Para.Para32[0] = (SK_U32)Port;
 		/* Signal to RLMT */
 		SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_LINK_DOWN, Para);
 	}
@@ -2369,14 +2540,15 @@ SK_U16		IStatus)	/* Interrupt Status */
 		SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_SIRQ_E024, SKERR_SIRQ_E024MSG);
 	}
 }	/* SkPhyIsrGmac */
+#endif /* YUKON */
 
 
 #ifdef OTHER_PHY
 /******************************************************************************
  *
- *	SkPhyIsrLone - PHY interrupt service routine
+ *	SkPhyIsrLone() - PHY interrupt service routine
  *
- * Description: handle all interrupts from LONE PHY
+ * Description: handles all interrupts from LONE PHY
  *
  * Returns: N/A
  */
@@ -2389,10 +2561,11 @@ SK_U16	IStatus)	/* Interrupt Status */
 	SK_EVPARA	Para;
 
 	if (IStatus & (PHY_L_IS_DUP | PHY_L_IS_ISOL)) {
+		
 		SkHWLinkDown(pAC, IoC, Port);
 
-		/* Signal to RLMT */
 		Para.Para32[0] = (SK_U32)Port;
+		/* Signal to RLMT */
 		SkEventQueue(pAC, SKGE_RLMT, SK_RLMT_LINK_DOWN, Para);
 	}
 
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/net/sk98lin/skproc.c linux-2.4.20-wolk4.4-fullkernel/drivers/net/sk98lin/skproc.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/net/sk98lin/skproc.c	2003-07-30 13:51:29.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/net/sk98lin/skproc.c	2003-07-30 10:31:39.000000000 +0200
@@ -2,15 +2,15 @@
  *
  * Name:    skproc.c
  * Project:	GEnesis, PCI Gigabit Ethernet Adapter
- * Version:	$Revision: 1.3 $
- * Date:    $Date: 2002/10/02 12:59:51 $
+ * Version:	$Revision: 1.6 $
+ * Date:    $Date: 2003/05/26 12:58:53 $
  * Purpose:	Funktions to display statictic data
  *
  ******************************************************************************/
  
 /******************************************************************************
  *
- *	(C)Copyright 1998-2002 SysKonnect GmbH.
+ *	(C)Copyright 1998-2003 SysKonnect GmbH.
  *
  *	This program is free software; you can redistribute it and/or modify
  *	it under the terms of the GNU General Public License as published by
@@ -28,6 +28,15 @@
  * History:
  *
  *	$Log: skproc.c,v $
+ *	Revision 1.6  2003/05/26 12:58:53  mlindner
+ *	Add: Support for Kernel 2.5/2.6
+ *	
+ *	Revision 1.5  2003/03/19 14:40:47  mlindner
+ *	Fix: Editorial changes
+ *	
+ *	Revision 1.4  2003/02/25 14:16:37  mlindner
+ *	Fix: Copyright statement
+ *	
  *	Revision 1.3  2002/10/02 12:59:51  mlindner
  *	Add: Support for Yukon
  *	Add: Speed check and setup
@@ -79,21 +88,27 @@
 #define SPECIALX	32		/* 0x */
 #define LARGE		64
 
-extern SK_AC				*pACList;
-extern struct net_device 	*SkGeRootDev;
-
+extern struct net_device	*SkGeRootDev;
 extern char * SkNumber(
-	char * str,
-	long long num,
-	int base,
-	int size,
-	int precision,
-	int type);
+				char * str,
+				long long num,
+				int base,
+				int size,
+				int precision,
+				int type);
+
+int sk_proc_read(char *buffer,
+				char **buffer_location,
+				off_t offset,
+				int buffer_length,
+				int *eof,
+				void *data);
+
 
 
 /*****************************************************************************
  *
- * 	proc_read - print "summaries" entry 
+ * 	sk_proc_read - print "summaries" entry 
  *
  * Description:
  *  This function fills the proc entry with statistic data about 
@@ -103,7 +118,7 @@ extern char * SkNumber(
  * Returns: buffer with statistic data
  *	
  */
-int proc_read(char *buffer,
+int sk_proc_read(char *buffer,
 char **buffer_location,
 off_t offset,
 int buffer_length,
@@ -117,7 +132,7 @@ void *data)
 	SK_AC					*pAC;
 	char 					test_buf[100];
 	char					sens_msg[50];
-	unsigned long			Flags;		
+	unsigned long			Flags;	
 	unsigned int			Size;
 	struct SK_NET_DEVICE 		*next;
 	struct SK_NET_DEVICE 		*SkgeProcDev = SkGeRootDev;
@@ -249,7 +264,7 @@ void *data)
 					SkNumber(test_buf, pPnmiStruct->InErrorsCts,
 					10,0,-1,0));
 				len += sprintf(buffer + len,
-					"Receive drops                  %s\n",
+					"Receive droped                 %s\n",
 					SkNumber(test_buf, pPnmiStruct->RxNoBufCts,
 					10,0,-1,0));
 				len += sprintf(buffer + len,
@@ -337,7 +352,7 @@ void *data)
 					SkNumber(test_buf, pPnmiStat->StatTxSingleCollisionCts,
 					10,0,-1,0));
 				len += sprintf(buffer + len,
-					"Transmit errors types\n");
+					"Transmit error types\n");
 				len += sprintf(buffer + len,
 					"   excessive collision         %ld\n",
 					pAC->stats.tx_aborted_errors);
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/net/sk98lin/skqueue.c linux-2.4.20-wolk4.4-fullkernel/drivers/net/sk98lin/skqueue.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/net/sk98lin/skqueue.c	2003-07-30 13:51:29.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/net/sk98lin/skqueue.c	2003-07-30 10:31:39.000000000 +0200
@@ -1,17 +1,17 @@
 /******************************************************************************
  *
  * Name:	skqueue.c
- * Project:	GEnesis, PCI Gigabit Ethernet Adapter
- * Version:	$Revision: 1.18 $
- * Date:	$Date: 2002/05/07 14:11:11 $
+ * Project:	Gigabit Ethernet Adapters, Schedule-Modul
+ * Version:	$Revision: 1.19 $
+ * Date:	$Date: 2003/05/13 18:00:07 $
  * Purpose:	Management of an event queue.
  *
  ******************************************************************************/
 
 /******************************************************************************
  *
- *	(C)Copyright 1998,1999 SysKonnect,
- *	a business unit of Schneider & Koch & Co. Datensysteme GmbH.
+ *	(C)Copyright 1998-2002 SysKonnect GmbH.
+ *	(C)Copyright 2002-2003 Marvell.
  *
  *	This program is free software; you can redistribute it and/or modify
  *	it under the terms of the GNU General Public License as published by
@@ -27,6 +27,10 @@
  * History:
  *
  *	$Log: skqueue.c,v $
+ *	Revision 1.19  2003/05/13 18:00:07  mkarl
+ *	Removed calls to RLMT, TWSI, and PNMI for SLIM driver (SK_SLIM).
+ *	Editorial changes.
+ *	
  *	Revision 1.18  2002/05/07 14:11:11  rwahl
  *	Fixed Watcom Precompiler error.
  *	
@@ -90,8 +94,10 @@
 /*
 	Event queue and dispatcher
 */
+#if (defined(DEBUG) || ((!defined(LINT)) && (!defined(SK_SLIM))))
 static const char SysKonnectFileId[] =
-	"$Header: /usr56/projects/ge/schedule/skqueue.c,v 1.18 2002/05/07 14:11:11 rwahl Exp $" ;
+	"$Header: /usr56/projects/ge/schedule/skqueue.c,v 1.19 2003/05/13 18:00:07 mkarl Exp $" ;
+#endif
 
 #include "h/skdrv1st.h"		/* Driver Specific Definitions */
 #include "h/skqueue.h"		/* Queue Definitions */
@@ -171,7 +177,8 @@ SK_IOC	Ioc)	/* Io context */
 	while (pEv != pAC->Event.EvPut) {
 		PRINTF("dispatch Class %d Event %d\n",pEv->Class,pEv->Event) ;
 		switch(Class = pEv->Class) {
-#ifndef SK_USE_LAC_EV        
+#ifndef SK_USE_LAC_EV
+#ifndef SK_SLIM
 		case SKGE_RLMT :	/* RLMT Event */
 			Rtv = SkRlmtEvent(pAC,Ioc,pEv->Event,pEv->Para);
 			break ;
@@ -181,7 +188,8 @@ SK_IOC	Ioc)	/* Io context */
 		case SKGE_PNMI :
 			Rtv = SkPnmiEvent(pAC,Ioc,pEv->Event,pEv->Para);
 			break ;
-#endif /* SK_USE_LAC_EV */
+#endif	/* not SK_SLIM */
+#endif	/* not SK_USE_LAC_EV */
 		case SKGE_DRV :		/* Driver Event */
 			Rtv = SkDrvEvent(pAC,Ioc,pEv->Event,pEv->Para);
 			break ;
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/net/sk98lin/skrlmt.c linux-2.4.20-wolk4.4-fullkernel/drivers/net/sk98lin/skrlmt.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/net/sk98lin/skrlmt.c	2003-07-30 13:51:29.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/net/sk98lin/skrlmt.c	2003-07-30 10:31:39.000000000 +0200
@@ -2,15 +2,16 @@
  *
  * Name:	skrlmt.c
  * Project:	GEnesis, PCI Gigabit Ethernet Adapter
- * Version:	$Revision: 1.68 $
- * Date:	$Date: 2003/01/31 15:26:56 $
+ * Version:	$Revision: 1.69 $
+ * Date:	$Date: 2003/04/15 09:39:22 $
  * Purpose:	Manage links on SK-NET Adapters, esp. redundant ones.
  *
  ******************************************************************************/
 
 /******************************************************************************
  *
- *	(C)Copyright 1998-2001 SysKonnect GmbH.
+ *	(C)Copyright 1998-2002 SysKonnect GmbH.
+ *	(C)Copyright 2002-2003 Marvell.
  *
  *	This program is free software; you can redistribute it and/or modify
  *	it under the terms of the GNU General Public License as published by
@@ -26,6 +27,10 @@
  * History:
  *
  *	$Log: skrlmt.c,v $
+ *	Revision 1.69  2003/04/15 09:39:22  tschilli
+ *	Copyright messages changed.
+ *	"#error C++ is not yet supported." removed.
+ *	
  *	Revision 1.68  2003/01/31 15:26:56  rschmidt
  *	Added init for local variables in RlmtInit().
  *	
@@ -282,13 +287,12 @@
 
 #ifndef	lint
 static const char SysKonnectFileId[] =
-	"@(#) $Id: skrlmt.c,v 1.68 2003/01/31 15:26:56 rschmidt Exp $ (C) SysKonnect.";
+	"@(#) $Id: skrlmt.c,v 1.69 2003/04/15 09:39:22 tschilli Exp $ (C) Marvell.";
 #endif	/* !defined(lint) */
 
 #define __SKRLMT_C
 
 #ifdef __cplusplus
-#error C++ is not yet supported.
 extern "C" {
 #endif	/* cplusplus */
 
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/net/sk98lin/sktimer.c linux-2.4.20-wolk4.4-fullkernel/drivers/net/sk98lin/sktimer.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/net/sk98lin/sktimer.c	2003-07-30 13:51:29.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/net/sk98lin/sktimer.c	2003-07-30 10:31:39.000000000 +0200
@@ -1,17 +1,17 @@
 /******************************************************************************
  *
  * Name:	sktimer.c
- * Project:	GEnesis, PCI Gigabit Ethernet Adapter
- * Version:	$Revision: 1.12 $
- * Date:	$Date: 1999/11/22 13:38:51 $
+ * Project:	Gigabit Ethernet Adapters, Schedule-Modul
+ * Version:	$Revision: 1.13 $
+ * Date:	$Date: 2003/05/13 18:01:01 $
  * Purpose:	High level timer functions.
  *
  ******************************************************************************/
 
 /******************************************************************************
  *
- *	(C)Copyright 1998,1999 SysKonnect,
- *	a business unit of Schneider & Koch & Co. Datensysteme GmbH.
+ *	(C)Copyright 1998-2002 SysKonnect GmbH.
+ *	(C)Copyright 2002-2003 Marvell.
  *
  *	This program is free software; you can redistribute it and/or modify
  *	it under the terms of the GNU General Public License as published by
@@ -27,6 +27,9 @@
  * History:
  *
  *	$Log: sktimer.c,v $
+ *	Revision 1.13  2003/05/13 18:01:01  mkarl
+ *	Editorial changes.
+ *	
  *	Revision 1.12  1999/11/22 13:38:51  cgoos
  *	Changed license header to GPL.
  *	
@@ -75,8 +78,10 @@
 /*
 	Event queue and dispatcher
 */
+#if (defined(DEBUG) || ((!defined(LINT)) && (!defined(SK_SLIM))))
 static const char SysKonnectFileId[] =
-	"$Header: /usr56/projects/ge/schedule/sktimer.c,v 1.12 1999/11/22 13:38:51 cgoos Exp $" ;
+	"$Header: /usr56/projects/ge/schedule/sktimer.c,v 1.13 2003/05/13 18:01:01 mkarl Exp $" ;
+#endif
 
 #include "h/skdrv1st.h"		/* Driver Specific Definitions */
 #include "h/skdrv2nd.h"		/* Adapter Control- and Driver specific Def. */
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/net/sk98lin/skxmac2.c linux-2.4.20-wolk4.4-fullkernel/drivers/net/sk98lin/skxmac2.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/net/sk98lin/skxmac2.c	2003-07-30 13:51:29.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/net/sk98lin/skxmac2.c	2003-07-30 10:31:39.000000000 +0200
@@ -1,16 +1,17 @@
 /******************************************************************************
  *
  * Name:	skxmac2.c
- * Project:	GEnesis, PCI Gigabit Ethernet Adapter
- * Version:	$Revision: 1.90 $
- * Date:	$Date: 2003/01/29 13:35:19 $
+ * Project:	Gigabit Ethernet Adapters, Common Modules
+ * Version:	$Revision: 1.97 $
+ * Date:	$Date: 2003/05/28 15:53:47 $
  * Purpose:	Contains functions to initialize the MACs and PHYs
  *
  ******************************************************************************/
 
 /******************************************************************************
  *
- *	(C)Copyright 1998-2003 SysKonnect GmbH.
+ *	(C)Copyright 1998-2002 SysKonnect.
+ *	(C)Copyright 2002-2003 Marvell.
  *
  *	This program is free software; you can redistribute it and/or modify
  *	it under the terms of the GNU General Public License as published by
@@ -26,6 +27,50 @@
  * History:
  *
  *	$Log: skxmac2.c,v $
+ *	Revision 1.97  2003/05/28 15:53:47  rschmidt
+ *	Removed setting of Yukon PHY's 'force link good' in loopback mode.
+ *	Replaced call pFnMacOverflow() with SkXmOverflowStatus() resp.
+ *	SkGmOverflowStatus().
+ *	Editorial changes.
+ *	
+ *	Revision 1.96  2003/05/13 17:37:11  mkarl
+ *	Removed calls to PNMI for SLIM driver.
+ *	Added SK_FAR for PXE.
+ *	Separated code pathes not used for SLIM driver.
+ *	Some further separations for YUKON and GENESIS.
+ *	Editorial changes.
+ *	
+ *	Revision 1.95  2003/05/06 13:09:53  rschmidt
+ *	Changed init sequence for auto-negotiation disabled in SkGmInitMac().
+ *	Added defines around GENESIS resp. YUKON branches to reduce
+ *	code size for PXE.
+ *	Editorial changes.
+ *	
+ *	Revision 1.94  2003/04/10 14:36:40  rschmidt
+ *	Fixed define for debug code in SkGmInitPhyMarv().
+ *	
+ *	Revision 1.93  2003/04/08 16:58:16  rschmidt
+ *	Changed initialisation of GMAC and GPHY for disabling
+ *	Flow-Control with parameter 'none' (Bug Id #10769).
+ *	Changed init for blinking active LED and normal duplex LED
+ *	depending on value from GILedBlinkCtrl (LED Blink Control).
+ *	Added control for Link100 LED.
+ *	Changed handling for different PhyTypes for source code
+ *	portability to PXE, UNDI.
+ *	Editorial changes.
+ *	
+ *	Revision 1.92  2003/03/31 07:12:33  mkarl
+ *	Restore PHY_MARV_AUNE_ADV after writing to GM_GP_CTRL in order to make
+ *	auto-negotiation of limited flow-control possible.
+ *	Corrected Copyright.
+ *	Editorial changes.
+ *	
+ *	Revision 1.91  2003/02/05 15:09:34  rschmidt
+ *	Removed setting of 'Collision Test'-bit in SkGmInitPhyMarv().
+ *	Disabled auto-update for speed, duplex and flow-control when
+ *	auto-negotiation is not enabled (Bug Id #10766).
+ *	Editorial changes.
+ *	
  *	Revision 1.90  2003/01/29 13:35:19  rschmidt
  *	Increment Rx FIFO Overflow counter only in DEBUG-mode.
  *	Corrected define for blinking active LED.
@@ -48,7 +93,7 @@
  *	Added setup of Ext. PHY Specific Ctrl Reg (downshift feature).
  *	
  *	Revision 1.85  2002/12/05 14:09:16  rschmidt
- *	Improved avoiding endless loop in SkGmPhyWrite(), SkGmPhyWrite().
+ *	Improved avoiding endless loop in SkGmPhyRead(), SkGmPhyWrite().
  *	Added additional advertising for 10Base-T when 100Base-T is selected.
  *	Added case SK_PHY_MARV_FIBER for YUKON Fiber adapter.
  *	Editorial changes.
@@ -416,9 +461,13 @@ typedef struct s_PhyHack {
 } BCOM_HACK;
 
 /* local variables ************************************************************/
+
+#if (defined(DEBUG) || ((!defined(LINT)) && (!defined(SK_SLIM))))
 static const char SysKonnectFileId[] =
-	"@(#)$Id: skxmac2.c,v 1.90 2003/01/29 13:35:19 rschmidt Exp $ (C) SK ";
+	"@(#) $Id: skxmac2.c,v 1.97 2003/05/28 15:53:47 rschmidt Exp $ (C) Marvell.";
+#endif
 
+#ifdef GENESIS
 BCOM_HACK BcomRegA1Hack[] = {
  { 0x18, 0x0c20 }, { 0x17, 0x0012 }, { 0x15, 0x1104 }, { 0x17, 0x0013 },
  { 0x15, 0x0404 }, { 0x17, 0x8006 }, { 0x15, 0x0132 }, { 0x17, 0x8006 },
@@ -430,14 +479,19 @@ BCOM_HACK BcomRegC0Hack[] = {
  { 0x15, 0x0A04 }, { 0x18, 0x0420 },
  { 0, 0 }
 };
+#endif
 
 /* function prototypes ********************************************************/
+#ifdef GENESIS
 static void	SkXmInitPhyXmac(SK_AC*, SK_IOC, int, SK_BOOL);
 static void	SkXmInitPhyBcom(SK_AC*, SK_IOC, int, SK_BOOL);
-static void	SkGmInitPhyMarv(SK_AC*, SK_IOC, int, SK_BOOL);
 static int	SkXmAutoNegDoneXmac(SK_AC*, SK_IOC, int);
 static int	SkXmAutoNegDoneBcom(SK_AC*, SK_IOC, int);
+#endif /* GENESIS */
+#ifdef YUKON
+static void	SkGmInitPhyMarv(SK_AC*, SK_IOC, int, SK_BOOL);
 static int	SkGmAutoNegDoneMarv(SK_AC*, SK_IOC, int);
+#endif /* YUKON */
 #ifdef OTHER_PHY
 static void	SkXmInitPhyLone(SK_AC*, SK_IOC, int, SK_BOOL);
 static void	SkXmInitPhyNat (SK_AC*, SK_IOC, int, SK_BOOL);
@@ -446,7 +500,7 @@ static int	SkXmAutoNegDoneNat (SK_AC*, S
 #endif /* OTHER_PHY */
 
 
-
+#ifdef GENESIS
 /******************************************************************************
  *
  *	SkXmPhyRead() - Read from XMAC PHY register
@@ -457,11 +511,11 @@ static int	SkXmAutoNegDoneNat (SK_AC*, S
  *	nothing
  */
 void SkXmPhyRead(
-SK_AC	*pAC,		/* Adapter Context */
-SK_IOC	IoC,		/* I/O Context */
-int		Port,		/* Port Index (MAC_1 + n) */
-int		PhyReg,		/* Register Address (Offset) */
-SK_U16	*pVal)		/* Pointer to Value */
+SK_AC	*pAC,			/* Adapter Context */
+SK_IOC	IoC,			/* I/O Context */
+int		Port,			/* Port Index (MAC_1 + n) */
+int		PhyReg,			/* Register Address (Offset) */
+SK_U16  SK_FAR *pVal)	/* Pointer to Value */
 {
 	SK_U16		Mmu;
 	SK_GEPORT	*pPrt;
@@ -527,8 +581,10 @@ SK_U16	Val)		/* Value */
 		} while ((Mmu & XM_MMU_PHY_BUSY) != 0);
 	}
 }	/* SkXmPhyWrite */
+#endif /* GENESIS */
 
 
+#ifdef YUKON
 /******************************************************************************
  *
  *	SkGmPhyRead() - Read from GPHY register
@@ -539,11 +595,11 @@ SK_U16	Val)		/* Value */
  *	nothing
  */
 void SkGmPhyRead(
-SK_AC	*pAC,		/* Adapter Context */
-SK_IOC	IoC,		/* I/O Context */
-int		Port,		/* Port Index (MAC_1 + n) */
-int		PhyReg,		/* Register Address (Offset) */
-SK_U16	*pVal)		/* Pointer to Value */
+SK_AC	*pAC,			/* Adapter Context */
+SK_IOC	IoC,			/* I/O Context */
+int		Port,			/* Port Index (MAC_1 + n) */
+int		PhyReg,			/* Register Address (Offset) */
+SK_U16	SK_FAR *pVal)	/* Pointer to Value */
 {
 	SK_U16	Ctrl;
 	SK_GEPORT	*pPrt;
@@ -592,6 +648,7 @@ SK_U16	*pVal)		/* Pointer to Value */
 	VCPUprintf(0, "VCPUgetTime(), SimCyle=%u, SimLowTime=%u\n",
 		SimCyle, SimLowTime);
 #endif /* VCPU */
+
 }	/* SkGmPhyRead */
 
 
@@ -660,9 +717,12 @@ SK_U16	Val)		/* Value */
 	VCPUprintf(0, "VCPUgetTime(), SimCyle=%u, SimLowTime=%u\n",
 		SimCyle, SimLowTime);
 #endif /* VCPU */
+
 }	/* SkGmPhyWrite */
+#endif /* YUKON */
 
 
+#ifdef SK_DIAG
 /******************************************************************************
  *
  *	SkGePhyRead() - Read from PHY register
@@ -719,6 +779,7 @@ SK_U16	Val)		/* Value */
 	
 	w_func(pAC, IoC, Port, PhyReg, Val);
 }	/* SkGePhyWrite */
+#endif /* SK_DIAG */
 
 
 /******************************************************************************
@@ -738,9 +799,14 @@ SK_IOC	IoC,	/* IO context */
 int		Port,	/* Port Index (MAC_1 + n) */
 SK_BOOL	Enable)	/* Enable / Disable */
 {
+#ifdef YUKON
 	SK_U16	RcReg;
+#endif
+#ifdef GENESIS
 	SK_U32	MdReg;
+#endif	
 
+#ifdef GENESIS
 	if (pAC->GIni.GIGenesis) {
 		
 		XM_IN32(IoC, Port, XM_MODE, &MdReg);
@@ -754,7 +820,10 @@ SK_BOOL	Enable)	/* Enable / Disable */
 		/* setup Mode Register */
 		XM_OUT32(IoC, Port, XM_MODE, MdReg);
 	}
-	else {
+#endif /* GENESIS */
+	
+#ifdef YUKON
+	if (pAC->GIni.GIYukon) {
 		
 		GM_IN16(IoC, Port, GM_RX_CTRL, &RcReg);
 		
@@ -768,6 +837,8 @@ SK_BOOL	Enable)	/* Enable / Disable */
 		/* setup Receive Control Register */
 		GM_OUT16(IoC, Port, GM_RX_CTRL, RcReg);
 	}
+#endif /* YUKON */
+
 }	/* SkMacPromiscMode*/
 
 
@@ -788,9 +859,14 @@ SK_IOC	IoC,	/* IO context */
 int		Port,	/* Port Index (MAC_1 + n) */
 SK_BOOL	Enable)	/* Enable / Disable */
 {
+#ifdef YUKON
 	SK_U16	RcReg;
+#endif	
+#ifdef GENESIS
 	SK_U32	MdReg;
+#endif
 
+#ifdef GENESIS
 	if (pAC->GIni.GIGenesis) {
 		
 		XM_IN32(IoC, Port, XM_MODE, &MdReg);
@@ -804,7 +880,10 @@ SK_BOOL	Enable)	/* Enable / Disable */
 		/* setup Mode Register */
 		XM_OUT32(IoC, Port, XM_MODE, MdReg);
 	}
-	else {
+#endif /* GENESIS */
+	
+#ifdef YUKON
+	if (pAC->GIni.GIYukon) {
 		
 		GM_IN16(IoC, Port, GM_RX_CTRL, &RcReg);
 		
@@ -818,6 +897,8 @@ SK_BOOL	Enable)	/* Enable / Disable */
 		/* setup Receive Control Register */
 		GM_OUT16(IoC, Port, GM_RX_CTRL, RcReg);
 	}
+#endif /* YUKON */
+
 }	/* SkMacHashing*/
 
 
@@ -917,7 +998,7 @@ int		Mode)		/* Mode is SK_STRIP_FCS_ON/O
  * Description:
  *	The features
  *	 - FCS (CRC) stripping,				SK_STRIP_FCS_ON/OFF
- *	 - don't set XMR_FS_ERR in status	SK_BIG_PK_OK_ON/OFF
+ *	 - don't set GMR_FS_LONG_ERR		SK_BIG_PK_OK_ON/OFF
  *	   for frames > 1514 bytes
  *   - enable Rx of own packets         SK_SELF_RX_ON/OFF
  *
@@ -1000,6 +1081,7 @@ int		Mode)		/* Rx Mode */
 		
 		SkGmSetRxCmd(pAC, IoC, Port, Mode);
 	}
+
 }	/* SkMacSetRxCmd */
 
 
@@ -1031,7 +1113,7 @@ SK_BOOL	Enable)	/* Enable / Disable */
 			Word |= XM_TX_NO_CRC;
 		}
 		/* setup Tx Command Register */
-		XM_OUT16(pAC, Port, XM_TX_CMD, Word);
+		XM_OUT16(IoC, Port, XM_TX_CMD, Word);
 	}
 	else {
 		
@@ -1046,11 +1128,13 @@ SK_BOOL	Enable)	/* Enable / Disable */
 		/* setup Tx Control Register */
 		GM_OUT16(IoC, Port, GM_TX_CTRL, Word);
 	}
+
 }	/* SkMacCrcGener*/
 
 #endif /* SK_DIAG */
 
 
+#ifdef GENESIS
 /******************************************************************************
  *
  *	SkXmClrExactAddr() - Clear Exact Match Address Registers
@@ -1084,6 +1168,7 @@ int		StopNum)	/* Stop after finished wit
 		XM_OUTADDR(IoC, Port, XM_EXM(i), &ZeroAddr[0]);
 	}
 }	/* SkXmClrExactAddr */
+#endif /* GENESIS */
 
 
 /******************************************************************************
@@ -1101,6 +1186,7 @@ SK_AC	*pAC,	/* adapter context */
 SK_IOC	IoC,	/* IO context */
 int		Port)	/* Port Index (MAC_1 + n) */
 {
+#ifdef GENESIS
 	SK_U32	MdReg;
 
 	if (pAC->GIni.GIGenesis) {
@@ -1109,10 +1195,15 @@ int		Port)	/* Port Index (MAC_1 + n) */
 
 		XM_OUT32(IoC, Port, XM_MODE, MdReg | XM_MD_FTF);
 	}
-	else {
+#endif /* GENESIS */
+	
+#ifdef YUKON
+	if (pAC->GIni.GIYukon) {
 		/* no way to flush the FIFO we have to issue a reset */
 		/* TBD */
 	}
+#endif /* YUKON */
+
 }	/* SkMacFlushTxFifo */
 
 
@@ -1131,6 +1222,7 @@ SK_AC	*pAC,	/* adapter context */
 SK_IOC	IoC,	/* IO context */
 int		Port)	/* Port Index (MAC_1 + n) */
 {
+#ifdef GENESIS
 	SK_U32	MdReg;
 
 	if (pAC->GIni.GIGenesis) {
@@ -1139,13 +1231,19 @@ int		Port)	/* Port Index (MAC_1 + n) */
 
 		XM_OUT32(IoC, Port, XM_MODE, MdReg | XM_MD_FRF);
 	}
-	else {
+#endif /* GENESIS */
+	
+#ifdef YUKON
+	if (pAC->GIni.GIYukon) {
 		/* no way to flush the FIFO we have to issue a reset */
 		/* TBD */
 	}
+#endif /* YUKON */
+
 }	/* SkMacFlushRxFifo */
 
 
+#ifdef GENESIS
 /******************************************************************************
  *
  *	SkXmSoftRst() - Do a XMAC software reset
@@ -1294,8 +1392,10 @@ int		Port)	/* Port Index (MAC_1 + n) */
 	}
 
 }	/* SkXmHardRst */
+#endif /* GENESIS */
 
 
+#ifdef YUKON
 /******************************************************************************
  *
  *	SkGmSoftRst() - Do a GMAC software reset
@@ -1330,7 +1430,7 @@ int		Port)	/* Port Index (MAC_1 + n) */
 	GM_IN16(IoC, Port, GM_RX_CTRL, &RxCtrl);
 	
 	GM_OUT16(IoC, Port, GM_RX_CTRL,
-		RxCtrl | GM_RXCR_UCF_ENA | GM_RXCR_MCF_ENA);
+		(SK_U16)(RxCtrl | GM_RXCR_UCF_ENA | GM_RXCR_MCF_ENA));
 
 }	/* SkGmSoftRst */
 
@@ -1360,6 +1460,7 @@ int		Port)	/* Port Index (MAC_1 + n) */
 	SK_OUT32(IoC, MR_ADDR(Port, GMAC_CTRL), GMC_RST_SET);
 
 }	/* SkGmHardRst */
+#endif /* YUKON */
 
 
 /******************************************************************************
@@ -1383,14 +1484,19 @@ int		Port)	/* Port Index (MAC_1 + n) */
 	/* disable receiver and transmitter */
 	SkMacRxTxDisable(pAC, IoC, Port);
 
+#ifdef GENESIS
 	if (pAC->GIni.GIGenesis) {
 		
 		SkXmSoftRst(pAC, IoC, Port);
 	}
-	else {
+#endif /* GENESIS */
+	
+#ifdef YUKON
+	if (pAC->GIni.GIYukon) {
 		
 		SkGmSoftRst(pAC, IoC, Port);
 	}
+#endif /* YUKON */
 
 	/* flush the MAC's Rx and Tx FIFOs */
 	SkMacFlushTxFifo(pAC, IoC, Port);
@@ -1417,21 +1523,26 @@ SK_IOC	IoC,	/* IO context */
 int		Port)	/* Port Index (MAC_1 + n) */
 {
 	
+#ifdef GENESIS
 	if (pAC->GIni.GIGenesis) {
 		
 		SkXmHardRst(pAC, IoC, Port);
 	}
-	else {
+#endif /* GENESIS */
+	
+#ifdef YUKON
+	if (pAC->GIni.GIYukon) {
 		
 		SkGmHardRst(pAC, IoC, Port);
 	}
+#endif /* YUKON */
 
 	pAC->GIni.GP[Port].PState = SK_PRT_RESET;
 
 }	/* SkMacHardRst */
 
 
-
+#ifdef GENESIS
 /******************************************************************************
  *
  *	SkXmInitMac() - Initialize the XMAC II
@@ -1556,10 +1667,10 @@ int		Port)		/* Port Index (MAC_1 + n) */
 		 */
 		SkMacInitPhy(pAC, IoC, Port, SK_FALSE);
 
-#if 0
+#ifdef TEST_ONLY
 		/* temp. code: enable signal detect */
 		/* WARNING: do not override GMII setting above */
-		XM_OUT16(pAC, Port, XM_HW_CFG, XM_HW_COM4SIG);
+		XM_OUT16(IoC, Port, XM_HW_CFG, XM_HW_COM4SIG);
 #endif
 	}
 
@@ -1619,7 +1730,7 @@ int		Port)		/* Port Index (MAC_1 + n) */
 		SWord |= XM_RX_BIG_PK_OK;
 	}
 
-	if (pPrt->PLinkModeConf == SK_LMODE_HALF) {
+	if (pPrt->PLinkMode == SK_LMODE_HALF) {
 		/*
 		 * If in manual half duplex mode the other side might be in
 		 * full duplex mode, so ignore if a carrier extension is not seen
@@ -1665,7 +1776,10 @@ int		Port)		/* Port Index (MAC_1 + n) */
 	 * has been completed successfully.
 	 */
 }	/* SkXmInitMac */
+#endif /* GENESIS */
+
 
+#ifdef YUKON
 /******************************************************************************
  *
  *	SkGmInitMac() - Initialize the GMAC
@@ -1712,11 +1826,13 @@ int		Port)		/* Port Index (MAC_1 + n) */
 		/* set GMAC Control reset */
 		SK_OUT32(IoC, MR_ADDR(Port, GMAC_CTRL), GMC_RST_SET);
 
+#ifdef XXX
 		/* clear GMAC Control reset */
 		SK_OUT32(IoC, MR_ADDR(Port, GMAC_CTRL), GMC_RST_CLR);
 
 		/* set GMAC Control reset */
 		SK_OUT32(IoC, MR_ADDR(Port, GMAC_CTRL), GMC_RST_SET);
+#endif /* XXX */
 
 		/* set HWCFG_MODE */
 		DWord = GPC_INT_POL_HI | GPC_DIS_FC | GPC_DIS_SLEEP |
@@ -1730,10 +1846,76 @@ int		Port)		/* Port Index (MAC_1 + n) */
 		/* release GPHY Control reset */
 		SK_OUT32(IoC, MR_ADDR(Port, GPHY_CTRL), DWord | GPC_RST_CLR);
 
+#ifdef VCPU
+		VCpuWait(9000);
+#endif /* VCPU */
+
 		/* clear GMAC Control reset */
 		SK_OUT32(IoC, MR_ADDR(Port, GMAC_CTRL), GMC_PAUSE_ON | GMC_RST_CLR);
 
-		/* Dummy read the Interrupt source register */
+#ifdef VCPU
+		VCpuWait(2000);
+#endif /* VCPU */
+
+		/* Auto-negotiation ? */
+		if (pPrt->PLinkMode == SK_LMODE_HALF || pPrt->PLinkMode == SK_LMODE_FULL) {
+			/* Auto-negotiation disabled */
+
+			/* get General Purpose Control */
+			GM_IN16(IoC, Port, GM_GP_CTRL, &SWord);
+
+			/* disable auto-update for speed, duplex and flow-control */
+			SWord |= GM_GPCR_AU_ALL_DIS;
+			
+			/* setup General Purpose Control Register */
+			GM_OUT16(IoC, Port, GM_GP_CTRL, SWord);
+			
+			SWord = GM_GPCR_AU_ALL_DIS;
+		}
+		else {
+			SWord = 0;
+		}
+
+		/* speed settings */
+		switch (pPrt->PLinkSpeed) {
+		case SK_LSPEED_AUTO:
+		case SK_LSPEED_1000MBPS:
+			SWord |= GM_GPCR_SPEED_1000 | GM_GPCR_SPEED_100;
+			break;
+		case SK_LSPEED_100MBPS:
+			SWord |= GM_GPCR_SPEED_100;
+			break;
+		case SK_LSPEED_10MBPS:
+			break;
+		}
+
+		/* duplex settings */
+		if (pPrt->PLinkMode != SK_LMODE_HALF) {
+			/* set full duplex */
+			SWord |= GM_GPCR_DUP_FULL;
+		}
+
+		switch (pPrt->PFlowCtrlMode) {
+		case SK_FLOW_MODE_NONE:
+			/* set Pause Off */
+			SK_OUT32(IoC, MR_ADDR(Port, GMAC_CTRL), GMC_PAUSE_OFF);
+			/* disable Tx & Rx flow-control */
+			SWord |= GM_GPCR_FC_TX_DIS | GM_GPCR_FC_RX_DIS | GM_GPCR_AU_FCT_DIS;
+			break;
+		case SK_FLOW_MODE_LOC_SEND:
+			/* disable Rx flow-control */
+			SWord |= GM_GPCR_FC_RX_DIS | GM_GPCR_AU_FCT_DIS;
+			break;
+		case SK_FLOW_MODE_SYMMETRIC:
+		case SK_FLOW_MODE_SYM_OR_REM:
+			/* enable Tx & Rx flow-control */
+			break;
+		}
+
+		/* setup General Purpose Control Register */
+		GM_OUT16(IoC, Port, GM_GP_CTRL, SWord);
+
+		/* dummy read the Interrupt Source Register */
 		SK_IN16(IoC, GMAC_IRQ_SRC, &SWord);
 		
 #ifndef VCPU
@@ -1746,50 +1928,6 @@ int		Port)		/* Port Index (MAC_1 + n) */
 
 	(void)SkGmResetCounter(pAC, IoC, Port);
 
-	SWord =  0;
-
-	/* speed settings */
-	switch (pPrt->PLinkSpeed) {
-	case SK_LSPEED_AUTO:
-		/* auto update for speed is already set */
-		break;
-	case SK_LSPEED_1000MBPS:
-		SWord |= GM_GPCR_SPEED_1000 | GM_GPCR_SPEED_100;
-		break;
-	case SK_LSPEED_100MBPS:
-		SWord |= GM_GPCR_SPEED_100;
-		break;
-	case SK_LSPEED_10MBPS:
-		break;
-	}
-	
-	/* duplex settings */
-	if (pPrt->PLinkModeConf == SK_LMODE_FULL ||
-		pPrt->PLinkModeConf == SK_LMODE_AUTOSENSE) {
-		
-		SWord |= GM_GPCR_DUP_FULL;
-	}
-
-	/* flow control settings */
-	switch (pPrt->PFlowCtrlMode) {
-	case SK_FLOW_MODE_NONE:
-		/* disable auto-neg of flow control */
-		SWord |= GM_GPCR_FC_TX_DIS | GM_GPCR_FC_RX_DIS;
-		break;
-	case SK_FLOW_MODE_LOC_SEND:
-		SWord |= GM_GPCR_FC_RX_DIS;
-		break;
-	case SK_FLOW_MODE_SYMMETRIC:
-		/* TBD */
-	case SK_FLOW_MODE_SYM_OR_REM:
-		/* do nothing means to enable autoneg for flowcontrol and */
-		/* enable rx and tx of pause frames */
-		break;
-	}
-
-	/* setup General Purpose Control Register */
-	GM_OUT16(IoC, Port, GM_GP_CTRL, SWord);
-
 	/* setup Transmit Control Register */
 	GM_OUT16(IoC, Port, GM_TX_CTRL, GM_TXCR_COL_THR);
 
@@ -1805,7 +1943,7 @@ int		Port)		/* Port Index (MAC_1 + n) */
 	GM_IN16(IoC, Port, GM_TX_PARAM, &SWord);
 #endif /* VCPU */
 
-	SWord = JAM_LEN_VAL(3) | JAM_IPG_VAL(11) | IPG_JAM_DATA(26);
+    SWord = (SK_U16)(JAM_LEN_VAL(3) | JAM_IPG_VAL(11) | IPG_JAM_DATA(26));
 	
 	GM_OUT16(IoC, Port, GM_TX_PARAM, SWord);
 
@@ -1883,8 +2021,10 @@ int		Port)		/* Port Index (MAC_1 + n) */
 #endif /* SK_DIAG */
 
 }	/* SkGmInitMac */
+#endif /* YUKON */
 
 
+#ifdef GENESIS
 /******************************************************************************
  *
  *	SkXmInitDupMd() - Initialize the XMACs Duplex Mode
@@ -2254,8 +2394,10 @@ SK_BOOL	DoLoop)		/* Should a Phy LoopBac
 	SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
 		("PHY Control Reg=0x%04X\n", Ctrl1));
 }	/* SkXmInitPhyBcom */
+#endif /* GENESIS */
 
 
+#ifdef YUKON
 /******************************************************************************
  *
  *	SkGmInitPhyMarv() - Initialize the Marvell Phy registers
@@ -2278,17 +2420,14 @@ SK_BOOL	DoLoop)		/* Should a Phy LoopBac
 	SK_U16		C1000BaseT;
 	SK_U16		AutoNegAdv;
 	SK_U16		ExtPhyCtrl;
-	SK_U16		PhyStat;
-	SK_U16		PhyStat1;
-	SK_U16		PhySpec;
 	SK_U16		LedCtrl;
 	SK_BOOL		AutoNeg;
+#if defined(SK_DIAG) || defined(DEBUG)
+	SK_U16		PhyStat;
+	SK_U16		PhyStat1;
+	SK_U16		PhySpecStat;
+#endif /* SK_DIAG || DEBUG */
 
-#ifdef VCPU
-	VCPUprintf(0, "SkGmInitPhyMarv(), Port=%u, DoLoop=%u\n",
-		Port, DoLoop);
-#else /* VCPU */
-	
 	pPrt = &pAC->GIni.GP[Port];
 
 	/* Auto-negotiation ? */
@@ -2299,7 +2438,17 @@ SK_BOOL	DoLoop)		/* Should a Phy LoopBac
 		AutoNeg = SK_TRUE;
 	}
 	
-	if (!DoLoop) {
+#ifdef VCPU
+	VCPUprintf(0, "SkGmInitPhyMarv(), Port=%u, DoLoop=%u\n",
+		Port, DoLoop);
+#else /* VCPU */
+	
+	if (DoLoop) {
+		/* Set 'MAC Power up'-bit, set Manual MDI configuration */
+		SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_PHY_CTRL,
+			PHY_M_PC_MAC_POW_UP);
+	}
+	else {
 		/* Read Ext. PHY Specific Control */
 		SkGmPhyRead(pAC, IoC, Port, PHY_MARV_EXT_CTRL, &ExtPhyCtrl);
 		
@@ -2311,18 +2460,19 @@ SK_BOOL	DoLoop)		/* Should a Phy LoopBac
 	
 		SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_EXT_CTRL, ExtPhyCtrl);
 		SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-			("Ext.PHYCtrl=0x%04X\n", ExtPhyCtrl));
-		
-		/* Read PHY Control */
-		SkGmPhyRead(pAC, IoC, Port, PHY_MARV_CTRL, &PhyCtrl);
-		
-		/* Assert software reset */
-		SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_CTRL,
-			(SK_U16)(PhyCtrl | PHY_CT_RESET));
+			("Ext. PHY Ctrl=0x%04X\n", ExtPhyCtrl));
 	}
+
+	/* Read PHY Control */
+	SkGmPhyRead(pAC, IoC, Port, PHY_MARV_CTRL, &PhyCtrl);
+
+	PhyCtrl |= PHY_CT_RESET;
+	/* Assert software reset */
+	SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_CTRL, PhyCtrl);
+
 #endif /* VCPU */
 
-	PhyCtrl = PHY_CT_COL_TST;
+	PhyCtrl = 0 /* PHY_CT_COL_TST */;
 	C1000BaseT = 0;
 	AutoNegAdv = PHY_SEL_TYPE;
 
@@ -2492,11 +2642,6 @@ SK_BOOL	DoLoop)		/* Should a Phy LoopBac
 	/* Program PHY register 30 as 16'h0708 for simulation speed up */
 	SkGmPhyWrite(pAC, IoC, Port, 30, 0x0708);
 	
-#if 0
-	/* Program PHY register 20 as 16'h2070 */
-	SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_EXT_CTRL, 0x2070);
-#endif /* 0 */
-	
 	VCpuWait(2000);
 
 #else /* VCPU */
@@ -2516,22 +2661,26 @@ SK_BOOL	DoLoop)		/* Should a Phy LoopBac
 		/* Set the PHY Loopback bit */
 		PhyCtrl |= PHY_CT_LOOP;
 
+#ifdef XXX
 		/* Program PHY register 16 as 16'h0400 to force link good */
 		SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_PHY_CTRL, PHY_M_PC_FL_GOOD);
+#endif /* XXX */
 
-#if 0
+#ifndef VCPU
 		if (pPrt->PLinkSpeed != SK_LSPEED_AUTO) {
 			/* Write Ext. PHY Specific Control */
 			SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_EXT_CTRL,
 				(SK_U16)((pPrt->PLinkSpeed + 2) << 4));
 		}
+#endif /* VCPU */
 	}
+#ifdef TEST_ONLY
 	else if (pPrt->PLinkSpeed == SK_LSPEED_10MBPS) {
 			/* Write PHY Specific Control */
-			SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_PHY_CTRL, PHY_M_PC_EN_DET_MSK);
-		}
-#endif /* 0 */
+			SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_PHY_CTRL,
+				PHY_M_PC_EN_DET_MSK);
 	}
+#endif
 
 	/* Write to the PHY Control register */
 	SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_CTRL, PhyCtrl);
@@ -2539,38 +2688,36 @@ SK_BOOL	DoLoop)		/* Should a Phy LoopBac
 #ifdef VCPU
 	VCpuWait(2000);
 #else
-#if 0
-	/* Read PHY Specific Control */
-	SkGmPhyRead(pAC, IoC, Port, PHY_MARV_PHY_CTRL, &PhySpec);
-	/* Assert CRS on Transmit */
-	PhySpec |= PHY_M_PC_ASS_CRS_TX;
-
-	SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_PHY_CTRL, PhySpec);
-#endif
 
 	LedCtrl = PHY_M_LED_PULS_DUR(PULS_170MS) | PHY_M_LED_BLINK_RT(BLINK_84MS);
 
-#ifdef ACT_LED_BLINK
-	LedCtrl |= PHY_M_LEDC_RX_CTRL | PHY_M_LEDC_TX_CTRL;
-#endif /* ACT_LED_BLINK */
-
-#ifdef DUP_LED_NORMAL
-	LedCtrl |= PHY_M_LEDC_DP_CTRL;
-#endif /* DUP_LED_NORMAL */
+	if ((pAC->GIni.GILedBlinkCtrl & SK_ACT_LED_BLINK) != 0) {
+		LedCtrl |= PHY_M_LEDC_RX_CTRL | PHY_M_LEDC_TX_CTRL;
+	}
 
+	if ((pAC->GIni.GILedBlinkCtrl & SK_DUP_LED_NORMAL) != 0) {
+		LedCtrl |= PHY_M_LEDC_DP_CTRL;
+	}
+	
 	SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_LED_CTRL, LedCtrl);
 
-#endif /* VCPU */
+	if ((pAC->GIni.GILedBlinkCtrl & SK_LED_LINK100_ON) != 0) {
+		/* only in forced 100Mbps mode */
+		if (!AutoNeg && pPrt->PLinkSpeed == SK_LSPEED_100MBPS) {
+
+			SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_LED_OVER,
+				PHY_M_LED_MO_100(MO_LED_ON));
+		}
+	}
 
 #ifdef SK_DIAG
 	c_print("Set PHY Ctrl=0x%04X\n", PhyCtrl);
 	c_print("Set 1000 B-T=0x%04X\n", C1000BaseT);
 	c_print("Set Auto-Neg=0x%04X\n", AutoNegAdv);
 	c_print("Set Ext Ctrl=0x%04X\n", ExtPhyCtrl);
-	c_print("Set SpecCtrl=0x%04X\n", PhySpec);
 #endif /* SK_DIAG */
 
-#ifndef xDEBUG
+#if defined(SK_DIAG) || defined(DEBUG)
 	/* Read PHY Control */
 	SkGmPhyRead(pAC, IoC, Port, PHY_MARV_CTRL, &PhyCtrl);
 	SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
@@ -2589,7 +2736,7 @@ SK_BOOL	DoLoop)		/* Should a Phy LoopBac
 	/* Read Ext. PHY Specific Control */
 	SkGmPhyRead(pAC, IoC, Port, PHY_MARV_EXT_CTRL, &ExtPhyCtrl);
 	SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-		("Ext PHY Ctrl=0x%04X\n", ExtPhyCtrl));
+		("Ext. PHY Ctrl=0x%04X\n", ExtPhyCtrl));
 	
 	/* Read PHY Status */
 	SkGmPhyRead(pAC, IoC, Port, PHY_MARV_STAT, &PhyStat);
@@ -2600,10 +2747,10 @@ SK_BOOL	DoLoop)		/* Should a Phy LoopBac
 		("PHY Stat Reg.=0x%04X\n", PhyStat1));
 	
 	/* Read PHY Specific Status */
-	SkGmPhyRead(pAC, IoC, Port, PHY_MARV_PHY_STAT, &PhySpec);
+	SkGmPhyRead(pAC, IoC, Port, PHY_MARV_PHY_STAT, &PhySpecStat);
 	SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-		("PHY Spec Stat=0x%04X\n", PhySpec));
-#endif /* DEBUG */
+		("PHY Spec Stat=0x%04X\n", PhySpecStat));
+#endif /* SK_DIAG || DEBUG */
 
 #ifdef SK_DIAG
 	c_print("PHY Ctrl Reg=0x%04X\n", PhyCtrl);
@@ -2612,10 +2759,13 @@ SK_BOOL	DoLoop)		/* Should a Phy LoopBac
 	c_print("Ext Ctrl Reg=0x%04X\n", ExtPhyCtrl);
 	c_print("PHY Stat Reg=0x%04X\n", PhyStat);
 	c_print("PHY Stat Reg=0x%04X\n", PhyStat1);
-	c_print("PHY Spec Reg=0x%04X\n", PhySpec);
+	c_print("PHY Spec Reg=0x%04X\n", PhySpecStat);
 #endif /* SK_DIAG */
 
+#endif /* VCPU */
+
 }	/* SkGmInitPhyMarv */
+#endif /* YUKON */
 
 
 #ifdef OTHER_PHY
@@ -2720,10 +2870,6 @@ SK_BOOL	DoLoop)		/* Should a Phy LoopBac
 
 	}
 	
-	/* Initialize LED register here ? */
-	/* No. Please do it in SkDgXmitLed() (if required) and swap
-	   init order of LEDs and XMAC. (MAl) */
-	
 	/* Write 1000Base-T Control Register */
 	SkXmPhyWrite(pAC, IoC, Port, PHY_LONE_1000T_CTRL, Ctrl2);
 	SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
@@ -2790,89 +2936,39 @@ SK_BOOL	DoLoop)		/* Should a Phy LoopBac
 
 	pPrt = &pAC->GIni.GP[Port];
 
-	switch (pPrt->PhyType) {
-	case SK_PHY_XMAC:
-		SkXmInitPhyXmac(pAC, IoC, Port, DoLoop);
-		break;
-	case SK_PHY_BCOM:
-		SkXmInitPhyBcom(pAC, IoC, Port, DoLoop);
-		break;
-	case SK_PHY_MARV_COPPER:
-	case SK_PHY_MARV_FIBER:
-		SkGmInitPhyMarv(pAC, IoC, Port, DoLoop);
-		break;
+#ifdef GENESIS
+	if (pAC->GIni.GIGenesis) {
+		
+		switch (pPrt->PhyType) {
+		case SK_PHY_XMAC:
+			SkXmInitPhyXmac(pAC, IoC, Port, DoLoop);
+			break;
+		case SK_PHY_BCOM:
+			SkXmInitPhyBcom(pAC, IoC, Port, DoLoop);
+			break;
 #ifdef OTHER_PHY
-	case SK_PHY_LONE:
-		SkXmInitPhyLone(pAC, IoC, Port, DoLoop);
-		break;
-	case SK_PHY_NAT:
-		SkXmInitPhyNat(pAC, IoC, Port, DoLoop);
-		break;
+		case SK_PHY_LONE:
+			SkXmInitPhyLone(pAC, IoC, Port, DoLoop);
+			break;
+		case SK_PHY_NAT:
+			SkXmInitPhyNat(pAC, IoC, Port, DoLoop);
+			break;
 #endif /* OTHER_PHY */
+		}
 	}
-}	/* SkMacInitPhy */
-
-
-#ifndef SK_DIAG
-/******************************************************************************
- *
- *	SkXmAutoNegLipaXmac() - Decides whether Link Partner could do auto-neg
- *
- *	This function analyses the Interrupt status word. If any of the
- *	Auto-negotiating interrupt bits are set, the PLipaAutoNeg variable
- *	is set true.
- */
-void SkXmAutoNegLipaXmac(
-SK_AC	*pAC,		/* adapter context */
-SK_IOC	IoC,		/* IO context */
-int		Port,		/* Port Index (MAC_1 + n) */
-SK_U16	IStatus)	/* Interrupt Status word to analyse */
-{
-	SK_GEPORT	*pPrt;
-
-	pPrt = &pAC->GIni.GP[Port];
-
-	if (pPrt->PLipaAutoNeg != SK_LIPA_AUTO &&
-		(IStatus & (XM_IS_LIPA_RC | XM_IS_RX_PAGE | XM_IS_AND)) != 0) {
-
-		SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-			("AutoNegLipa: AutoNeg detected on Port %d, IStatus=0x%04x\n",
-			Port, IStatus));
-		pPrt->PLipaAutoNeg = SK_LIPA_AUTO;
+#endif /* GENESIS */
+	
+#ifdef YUKON
+	if (pAC->GIni.GIYukon) {
+		
+		SkGmInitPhyMarv(pAC, IoC, Port, DoLoop);
 	}
-}	/* SkXmAutoNegLipaXmac */
-
-
-/******************************************************************************
- *
- *	SkMacAutoNegLipaPhy() - Decides whether Link Partner could do auto-neg
- *
- *	This function analyses the PHY status word.
- *  If any of the Auto-negotiating bits are set, the PLipaAutoNeg variable
- *	is set true.
- */
-void SkMacAutoNegLipaPhy(
-SK_AC	*pAC,		/* adapter context */
-SK_IOC	IoC,		/* IO context */
-int		Port,		/* Port Index (MAC_1 + n) */
-SK_U16	PhyStat)	/* PHY Status word to analyse */
-{
-	SK_GEPORT	*pPrt;
-
-	pPrt = &pAC->GIni.GP[Port];
-
-	if (pPrt->PLipaAutoNeg != SK_LIPA_AUTO &&
-		(PhyStat & PHY_ST_AN_OVER) != 0) {
+#endif /* YUKON */
 
-		SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-			("AutoNegLipa: AutoNeg detected on Port %d, PhyStat=0x%04x\n",
-			Port, PhyStat));
-		pPrt->PLipaAutoNeg = SK_LIPA_AUTO;
-	}
-}	/* SkMacAutoNegLipaPhy */
-#endif /* SK_DIAG */
+}	/* SkMacInitPhy */
 
 
+#ifdef GENESIS
 /******************************************************************************
  *
  *	SkXmAutoNegDoneXmac() - Auto-negotiation handling
@@ -2977,7 +3073,7 @@ int		Port)		/* Port Index (MAC_1 + n) */
 	SK_U16		LPAb;		/* Link Partner Ability */
 	SK_U16		AuxStat;	/* Auxiliary Status */
 
-#if 0
+#ifdef TEST_ONLY
 01-Sep-2000 RA;:;:
 	SK_U16		ResAb;		/* Resolved Ability */
 #endif	/* 0 */
@@ -2988,7 +3084,7 @@ int		Port)		/* Port Index (MAC_1 + n) */
 
 	/* Get PHY parameters */
 	SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_AUNE_LP, &LPAb);
-#if 0
+#ifdef TEST_ONLY
 01-Sep-2000 RA;:;:
 	SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_1000T_STAT, &ResAb);
 #endif	/* 0 */
@@ -3018,7 +3114,7 @@ int		Port)		/* Port Index (MAC_1 + n) */
 		return(SK_AND_DUP_CAP);
 	}
 	
-#if 0
+#ifdef TEST_ONLY
 01-Sep-2000 RA;:;:
 	/* Check Master/Slave resolution */
 	if ((ResAb & PHY_B_1000S_MSF) != 0) {
@@ -3033,7 +3129,7 @@ int		Port)		/* Port Index (MAC_1 + n) */
 		SK_MS_STAT_MASTER : SK_MS_STAT_SLAVE;
 #endif	/* 0 */
 
-	/* Check PAUSE mismatch */
+	/* Check PAUSE mismatch ??? */
 	/* We are using IEEE 802.3z/D5.0 Table 37-4 */
 	if ((AuxStat & PHY_B_AS_PAUSE_MSK) == PHY_B_AS_PAUSE_MSK) {
 		/* Symmetric PAUSE */
@@ -3055,8 +3151,10 @@ int		Port)		/* Port Index (MAC_1 + n) */
 
 	return(SK_AND_OK);
 }	/* SkXmAutoNegDoneBcom */
+#endif /* GENESIS */
 
 
+#ifdef YUKON
 /******************************************************************************
  *
  *	SkGmAutoNegDoneMarv() - Auto-negotiation handling
@@ -3126,7 +3224,7 @@ int		Port)		/* Port Index (MAC_1 + n) */
 		pPrt->PLinkModeStatus = SK_LMODE_STAT_AUTOHALF;
 	}
 	
-	/* Check PAUSE mismatch */
+	/* Check PAUSE mismatch ??? */
 	/* We are using IEEE 802.3z/D5.0 Table 37-4 */
 	if ((AuxStat & PHY_M_PS_PAUSE_MSK) == PHY_M_PS_PAUSE_MSK) {
 		/* Symmetric PAUSE */
@@ -3159,6 +3257,7 @@ int		Port)		/* Port Index (MAC_1 + n) */
 
 	return(SK_AND_OK);
 }	/* SkGmAutoNegDoneMarv */
+#endif /* YUKON */
 
 
 #ifdef OTHER_PHY
@@ -3311,28 +3410,37 @@ int		Port)		/* Port Index (MAC_1 + n) */
 
 	pPrt = &pAC->GIni.GP[Port];
 
-	switch (pPrt->PhyType) {
-	case SK_PHY_XMAC:
-		Rtv = SkXmAutoNegDoneXmac(pAC, IoC, Port);
-		break;
-	case SK_PHY_BCOM:
-		Rtv = SkXmAutoNegDoneBcom(pAC, IoC, Port);
-		break;
-	case SK_PHY_MARV_COPPER:
-	case SK_PHY_MARV_FIBER:
-		Rtv = SkGmAutoNegDoneMarv(pAC, IoC, Port);
-		break;
+#ifdef GENESIS
+	if (pAC->GIni.GIGenesis) {
+		
+		switch (pPrt->PhyType) {
+		
+		case SK_PHY_XMAC:
+			Rtv = SkXmAutoNegDoneXmac(pAC, IoC, Port);
+			break;
+		case SK_PHY_BCOM:
+			Rtv = SkXmAutoNegDoneBcom(pAC, IoC, Port);
+			break;
 #ifdef OTHER_PHY
-	case SK_PHY_LONE:
-		Rtv = SkXmAutoNegDoneLone(pAC, IoC, Port);
-		break;
-	case SK_PHY_NAT:
-		Rtv = SkXmAutoNegDoneNat(pAC, IoC, Port);
-		break;
-#endif /* OTHER_PHY */
-	default:
-		return(SK_AND_OTHER);
+		case SK_PHY_LONE:
+			Rtv = SkXmAutoNegDoneLone(pAC, IoC, Port);
+			break;
+		case SK_PHY_NAT:
+			Rtv = SkXmAutoNegDoneNat(pAC, IoC, Port);
+			break;
+#endif /* OTHER_PHY */
+		default:
+			return(SK_AND_OTHER);
+		}
 	}
+#endif /* GENESIS */
+	
+#ifdef YUKON
+	if (pAC->GIni.GIYukon) {
+		
+		Rtv = SkGmAutoNegDoneMarv(pAC, IoC, Port);
+	}
+#endif /* YUKON */
 	
 	if (Rtv != SK_AND_OK) {
 		return(Rtv);
@@ -3347,6 +3455,7 @@ int		Port)		/* Port Index (MAC_1 + n) */
 }	/* SkMacAutoNegDone */
 
 
+#ifdef GENESIS
 /******************************************************************************
  *
  *	SkXmSetRxTxEn() - Special Set Rx/Tx Enable and some features in XMAC
@@ -3400,8 +3509,10 @@ int		Para)		/* Parameter to set: MAC or 
 	XM_IN16(IoC, Port, XM_MMU_CMD, &Word);
 
 }	/* SkXmSetRxTxEn */
+#endif /* GENESIS */
 
 
+#ifdef YUKON
 /******************************************************************************
  *
  *	SkGmSetRxTxEn() - Special Set Rx/Tx Enable and some features in GMAC
@@ -3440,14 +3551,17 @@ int		Para)		/* Parameter to set: MAC Loo
 		break;
 	}
 	
-	GM_OUT16(IoC, Port, GM_GP_CTRL, Ctrl | GM_GPCR_RX_ENA | GM_GPCR_TX_ENA);
+    GM_OUT16(IoC, Port, GM_GP_CTRL, (SK_U16)(Ctrl | GM_GPCR_RX_ENA |
+		GM_GPCR_TX_ENA));
 
 	/* dummy read to ensure writing */
 	GM_IN16(IoC, Port, GM_GP_CTRL, &Ctrl);
 
 }	/* SkGmSetRxTxEn */
+#endif /* YUKON */
 
 
+#ifndef SK_SLIM
 /******************************************************************************
  *
  *	SkMacSetRxTxEn() - Special Set Rx/Tx Enable and parameters
@@ -3462,16 +3576,22 @@ SK_IOC	IoC,		/* IO context */
 int		Port,		/* Port Index (MAC_1 + n) */
 int		Para)
 {
+#ifdef GENESIS
 	if (pAC->GIni.GIGenesis) {
 		
 		SkXmSetRxTxEn(pAC, IoC, Port, Para);
 	}
-	else {
+#endif /* GENESIS */
+	
+#ifdef YUKON
+	if (pAC->GIni.GIYukon) {
 		
 		SkGmSetRxTxEn(pAC, IoC, Port, Para);
 	}
+#endif /* YUKON */
 
 }	/* SkMacSetRxTxEn */
+#endif /* !SK_SLIM */
 
 
 /******************************************************************************
@@ -3492,7 +3612,9 @@ int		Port)		/* Port Index (MAC_1 + n) */
 	SK_GEPORT	*pPrt;
 	SK_U16		Reg;		/* 16-bit register value */
 	SK_U16		IntMask;	/* MAC interrupt mask */
+#ifdef GENESIS
 	SK_U16		SWord;
+#endif
 
 	pPrt = &pAC->GIni.GP[Port];
 
@@ -3509,6 +3631,7 @@ int		Port)		/* Port Index (MAC_1 + n) */
 		return(0);
 	}
 
+#ifdef GENESIS
 	if (pAC->GIni.GIGenesis) {
 		/* set Duplex Mode and Pause Mode */
 		SkXmInitDupMd(pAC, IoC, Port);
@@ -3556,7 +3679,8 @@ int		Port)		/* Port Index (MAC_1 + n) */
 			SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_AUX_CTRL, &SWord);
 			SkXmPhyWrite(pAC, IoC, Port, PHY_BCOM_AUX_CTRL,
 				(SK_U16)(SWord & ~PHY_B_AC_DIS_PM));
-			SkXmPhyWrite(pAC, IoC, Port, PHY_BCOM_INT_MASK, PHY_B_DEF_MSK);
+            SkXmPhyWrite(pAC, IoC, Port, PHY_BCOM_INT_MASK,
+				(SK_U16)PHY_B_DEF_MSK);
 			break;
 #ifdef OTHER_PHY
 		case SK_PHY_LONE:
@@ -3573,7 +3697,10 @@ int		Port)		/* Port Index (MAC_1 + n) */
 		/* enable Rx/Tx */
 		XM_OUT16(IoC, Port, XM_MMU_CMD, Reg | XM_MMU_ENA_RX | XM_MMU_ENA_TX);
 	}
-	else {
+#endif /* GENESIS */
+	
+#ifdef YUKON
+	if (pAC->GIni.GIYukon) {
 		/*
 		 * Initialize the Interrupt Mask Register. Default IRQs are...
 		 *	- Rx Counter Event Overflow
@@ -3599,13 +3726,16 @@ int		Port)		/* Port Index (MAC_1 + n) */
 		}
 		
 		/* enable Rx/Tx */
-		GM_OUT16(IoC, Port, GM_GP_CTRL, Reg | GM_GPCR_RX_ENA | GM_GPCR_TX_ENA);
+        GM_OUT16(IoC, Port, GM_GP_CTRL, (SK_U16)(Reg | GM_GPCR_RX_ENA |
+			GM_GPCR_TX_ENA));
 
 #ifndef VCPU
 		/* Enable all PHY interrupts */
-		SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_INT_MASK, PHY_M_DEF_MSK);
+        SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_INT_MASK,
+			(SK_U16)PHY_M_DEF_MSK);
 #endif /* VCPU */
 	}
+#endif /* YUKON */
 					
 	return(0);
 
@@ -3627,6 +3757,7 @@ int		Port)		/* Port Index (MAC_1 + n) */
 {
 	SK_U16	Word;
 
+#ifdef GENESIS
 	if (pAC->GIni.GIGenesis) {
 		
 		XM_IN16(IoC, Port, XM_MMU_CMD, &Word);
@@ -3636,15 +3767,21 @@ int		Port)		/* Port Index (MAC_1 + n) */
 		/* dummy read to ensure writing */
 		XM_IN16(IoC, Port, XM_MMU_CMD, &Word);
 	}
-	else {
+#endif /* GENESIS */
+	
+#ifdef YUKON
+	if (pAC->GIni.GIYukon) {
 		
 		GM_IN16(IoC, Port, GM_GP_CTRL, &Word);
 
-		GM_OUT16(IoC, Port, GM_GP_CTRL, Word & ~(GM_GPCR_RX_ENA | GM_GPCR_TX_ENA));
+        GM_OUT16(IoC, Port, GM_GP_CTRL, (SK_U16)(Word & ~(GM_GPCR_RX_ENA |
+			GM_GPCR_TX_ENA)));
 
 		/* dummy read to ensure writing */
 		GM_IN16(IoC, Port, GM_GP_CTRL, &Word);
 	}
+#endif /* YUKON */
+
 }	/* SkMacRxTxDisable */
 
 
@@ -3662,10 +3799,13 @@ SK_IOC	IoC,		/* IO context */
 int		Port)		/* Port Index (MAC_1 + n) */
 {
 	SK_GEPORT	*pPrt;
+#ifdef GENESIS
 	SK_U16		Word;
+#endif
 
 	pPrt = &pAC->GIni.GP[Port];
 
+#ifdef GENESIS
 	if (pAC->GIni.GIGenesis) {
 		
 		/* disable all XMAC IRQs */
@@ -3696,7 +3836,10 @@ int		Port)		/* Port Index (MAC_1 + n) */
 #endif /* OTHER_PHY */
 		}
 	}
-	else {
+#endif /* GENESIS */
+	
+#ifdef YUKON
+	if (pAC->GIni.GIYukon) {
 		/* disable all GMAC IRQs */
 		SK_OUT8(IoC, GMAC_IRQ_MSK, 0);
 		
@@ -3705,6 +3848,8 @@ int		Port)		/* Port Index (MAC_1 + n) */
 		SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_INT_MASK, 0);
 #endif /* VCPU */
 	}
+#endif /* YUKON */
+
 }	/* SkMacIrqDisable */
 
 
@@ -3737,7 +3882,8 @@ SK_BOOL	Enable)	/* Enable / Disable */
 	/* setup Mode Register */
 	XM_OUT32(IoC, Port, XM_MODE, MdReg);
 
-}	/* SkXmSendCont*/
+}	/* SkXmSendCont */
+
 
 /******************************************************************************
  *
@@ -3778,12 +3924,74 @@ SK_BOOL	Enable)	/* Enable / Disable */
 			TimeCtrl = GMT_ST_STOP | GMT_ST_CLR_IRQ;
 		}
 		/* Start/Stop Time Stamp Timer */
-		SK_OUT8(pAC, GMAC_TI_ST_CTRL, TimeCtrl);
+		SK_OUT8(IoC, GMAC_TI_ST_CTRL, TimeCtrl);
 	}
+
 }	/* SkMacTimeStamp*/
 
-#else /* SK_DIAG */
+#else /* !SK_DIAG */
+
+#ifdef GENESIS
+/******************************************************************************
+ *
+ *	SkXmAutoNegLipaXmac() - Decides whether Link Partner could do auto-neg
+ *
+ *	This function analyses the Interrupt status word. If any of the
+ *	Auto-negotiating interrupt bits are set, the PLipaAutoNeg variable
+ *	is set true.
+ */
+void SkXmAutoNegLipaXmac(
+SK_AC	*pAC,		/* adapter context */
+SK_IOC	IoC,		/* IO context */
+int		Port,		/* Port Index (MAC_1 + n) */
+SK_U16	IStatus)	/* Interrupt Status word to analyse */
+{
+	SK_GEPORT	*pPrt;
+
+	pPrt = &pAC->GIni.GP[Port];
+
+	if (pPrt->PLipaAutoNeg != SK_LIPA_AUTO &&
+		(IStatus & (XM_IS_LIPA_RC | XM_IS_RX_PAGE | XM_IS_AND)) != 0) {
+
+		SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+			("AutoNegLipa: AutoNeg detected on Port %d, IStatus=0x%04X\n",
+			Port, IStatus));
+		pPrt->PLipaAutoNeg = SK_LIPA_AUTO;
+	}
+}	/* SkXmAutoNegLipaXmac */
+#endif /* GENESIS */
+
+
+/******************************************************************************
+ *
+ *	SkMacAutoNegLipaPhy() - Decides whether Link Partner could do auto-neg
+ *
+ *	This function analyses the PHY status word.
+ *  If any of the Auto-negotiating bits are set, the PLipaAutoNeg variable
+ *	is set true.
+ */
+void SkMacAutoNegLipaPhy(
+SK_AC	*pAC,		/* adapter context */
+SK_IOC	IoC,		/* IO context */
+int		Port,		/* Port Index (MAC_1 + n) */
+SK_U16	PhyStat)	/* PHY Status word to analyse */
+{
+	SK_GEPORT	*pPrt;
+
+	pPrt = &pAC->GIni.GP[Port];
 
+	if (pPrt->PLipaAutoNeg != SK_LIPA_AUTO &&
+		(PhyStat & PHY_ST_AN_OVER) != 0) {
+
+		SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+			("AutoNegLipa: AutoNeg detected on Port %d, PhyStat=0x%04X\n",
+			Port, PhyStat));
+		pPrt->PLipaAutoNeg = SK_LIPA_AUTO;
+	}
+}	/* SkMacAutoNegLipaPhy */
+
+
+#ifdef GENESIS
 /******************************************************************************
  *
  *	SkXmIrq() - Interrupt Service Routine
@@ -3812,6 +4020,9 @@ int		Port)		/* Port Index (MAC_1 + n) */
 	SK_EVPARA	Para;
 	SK_U16		IStatus;	/* Interrupt status read from the XMAC */
 	SK_U16		IStatus2;
+#ifdef SK_SLIM
+    SK_U64      OverflowStatus;
+#endif	
 
 	pPrt = &pAC->GIni.GP[Port];
 	
@@ -3829,7 +4040,7 @@ int		Port)		/* Port Index (MAC_1 + n) */
 	}
 	
 	SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_IRQ,
-		("XmacIrq Port %d Isr 0x%04x\n", Port, IStatus));
+		("XmacIrq Port %d Isr 0x%04X\n", Port, IStatus));
 
 	if (!pPrt->PHWLinkUp) {
 		/* Spurious XMAC interrupt */
@@ -3843,7 +4054,7 @@ int		Port)		/* Port Index (MAC_1 + n) */
 		XM_IN16(IoC, Port, XM_ISRC, &IStatus2);
 
 		SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_IRQ,
-			("SkXmIrq: Link async. Double check Port %d 0x%04x 0x%04x\n",
+			("SkXmIrq: Link async. Double check Port %d 0x%04X 0x%04X\n",
 			 Port, IStatus, IStatus2));
 		IStatus &= ~XM_IS_INP_ASS;
 		IStatus |= IStatus2;
@@ -3892,9 +4103,13 @@ int		Port)		/* Port Index (MAC_1 + n) */
 
 	/* Combined Tx & Rx Counter Overflow SIRQ Event */
 	if ((IStatus & (XM_IS_RXC_OV | XM_IS_TXC_OV)) != 0) {
+#ifdef SK_SLIM
+		SkXmOverflowStatus(pAC, IoC, Port, IStatus, &OverflowStatus);
+#else
 		Para.Para32[0] = (SK_U32)Port;
 		Para.Para32[1] = (SK_U32)IStatus;
 		SkPnmiEvent(pAC, IoC, SK_PNMI_EVT_SIRQ_OVERFLOW, Para);
+#endif /* SK_SLIM */
 	}
 
 	if ((IStatus & XM_IS_RXF_OV) != 0) {
@@ -3917,8 +4132,10 @@ int		Port)		/* Port Index (MAC_1 + n) */
 		/* not served here */
 	}
 }	/* SkXmIrq */
+#endif /* GENESIS */
 
 
+#ifdef YUKON
 /******************************************************************************
  *
  *	SkGmIrq() - Interrupt Service Routine
@@ -3936,25 +4153,35 @@ SK_IOC	IoC,		/* IO context */
 int		Port)		/* Port Index (MAC_1 + n) */
 {
 	SK_GEPORT	*pPrt;
-	SK_EVPARA	Para;
 	SK_U8		IStatus;	/* Interrupt status */
+#ifdef SK_SLIM
+    SK_U64      OverflowStatus;
+#else
+	SK_EVPARA	Para;
+#endif	
 
 	pPrt = &pAC->GIni.GP[Port];
 	
 	SK_IN8(IoC, GMAC_IRQ_SRC, &IStatus);
 	
+#ifdef XXX
 	/* LinkPartner Auto-negable? */
 	SkMacAutoNegLipaPhy(pAC, IoC, Port, IStatus);
+#endif /* XXX */
 	
 	SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_IRQ,
-		("GmacIrq Port %d Isr 0x%04x\n", Port, IStatus));
+		("GmacIrq Port %d Isr 0x%04X\n", Port, IStatus));
 
 	/* Combined Tx & Rx Counter Overflow SIRQ Event */
 	if (IStatus & (GM_IS_RX_CO_OV | GM_IS_TX_CO_OV)) {
 		/* these IRQs will be cleared by reading GMACs register */
+#ifdef SK_SLIM
+        SkGmOverflowStatus(pAC, IoC, Port, IStatus, &OverflowStatus);
+#else
 		Para.Para32[0] = (SK_U32)Port;
 		Para.Para32[1] = (SK_U32)IStatus;
 		SkPnmiEvent(pAC, IoC, SK_PNMI_EVT_SIRQ_OVERFLOW, Para);
+#endif		
 	}
 
 	if (IStatus & GM_IS_RX_FF_OR) {
@@ -3980,6 +4207,8 @@ int		Port)		/* Port Index (MAC_1 + n) */
 		/* not served here */
 	}
 }	/* SkGmIrq */
+#endif /* YUKON */
+
 
 /******************************************************************************
  *
@@ -3995,19 +4224,25 @@ SK_AC	*pAC,		/* adapter context */
 SK_IOC	IoC,		/* IO context */
 int		Port)		/* Port Index (MAC_1 + n) */
 {
-
+#ifdef GENESIS
 	if (pAC->GIni.GIGenesis) {
 		/* IRQ from XMAC */
 		SkXmIrq(pAC, IoC, Port);
 	}
-	else {
+#endif /* GENESIS */
+	
+#ifdef YUKON
+	if (pAC->GIni.GIYukon) {
 		/* IRQ from GMAC */
 		SkGmIrq(pAC, IoC, Port);
 	}
+#endif /* YUKON */
+
 }	/* SkMacIrq */
 
 #endif /* !SK_DIAG */
 
+#ifdef GENESIS
 /******************************************************************************
  *
  *	SkXmUpdateStats() - Force the XMAC to output the current statistic
@@ -4057,24 +4292,6 @@ unsigned int Port)	/* Port Index (MAC_1 
 	return(0);
 }	/* SkXmUpdateStats */
 
-/******************************************************************************
- *
- *	SkGmUpdateStats() - Force the GMAC to output the current statistic
- *
- * Description:
- *	Empty function for GMAC. Statistic data is accessible in direct way.
- *
- * Returns:
- *	0:  success
- *	1:  something went wrong
- */
-int SkGmUpdateStats(
-SK_AC	*pAC,		/* adapter context */
-SK_IOC	IoC,		/* IO context */
-unsigned int Port)	/* Port Index (MAC_1 + n) */
-{
-	return(0);
-}
 
 /******************************************************************************
  *
@@ -4090,11 +4307,11 @@ unsigned int Port)	/* Port Index (MAC_1 
  *	1:  something went wrong
  */
 int SkXmMacStatistic(
-SK_AC	*pAC,		/* adapter context */
-SK_IOC	IoC,		/* IO context */
-unsigned int Port,	/* Port Index (MAC_1 + n) */
-SK_U16	StatAddr,	/* MIB counter base address */
-SK_U32	*pVal)		/* ptr to return statistic value */
+SK_AC	*pAC,			/* adapter context */
+SK_IOC	IoC,			/* IO context */
+unsigned int Port,		/* Port Index (MAC_1 + n) */
+SK_U16	StatAddr,		/* MIB counter base address */
+SK_U32  SK_FAR *pVal)	/* ptr to return statistic value */
 {
 	if ((StatAddr < XM_TXF_OK) || (StatAddr > XM_RXF_MAX_SZ)) {
 		
@@ -4108,63 +4325,137 @@ SK_U32	*pVal)		/* ptr to return statisti
 	return(0);
 }	/* SkXmMacStatistic */
 
+
 /******************************************************************************
  *
- *	SkGmMacStatistic() - Get GMAC counter value
+ *	SkXmResetCounter() - Clear MAC statistic counter
  *
  * Description:
- *	Gets the 32bit counter value. Except for the octet counters
- *	the lower 32bit are counted in hardware and the upper 32bit
- *	must be counted in software by monitoring counter overflow interrupts.
+ *	Force the XMAC to clear its statistic counter.
  *
  * Returns:
  *	0:  success
  *	1:  something went wrong
  */
-int SkGmMacStatistic(
+int SkXmResetCounter(
 SK_AC	*pAC,		/* adapter context */
 SK_IOC	IoC,		/* IO context */
-unsigned int Port,	/* Port Index (MAC_1 + n) */
-SK_U16	StatAddr,	/* MIB counter base address */
-SK_U32	*pVal)		/* ptr to return statistic value */
+unsigned int Port)	/* Port Index (MAC_1 + n) */
 {
+	XM_OUT16(IoC, Port, XM_STAT_CMD, XM_SC_CLR_RXC | XM_SC_CLR_TXC);
+	/* Clear two times according to Errata #3 */
+	XM_OUT16(IoC, Port, XM_STAT_CMD, XM_SC_CLR_RXC | XM_SC_CLR_TXC);
 
-	if ((StatAddr < GM_RXF_UC_OK) || (StatAddr > GM_TXE_FIFO_UR)) {
-		
-		SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_HWI_E022, SKERR_HWI_E022MSG);
-		
-		SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
-			("SkGmMacStat: wrong MIB counter 0x%04X\n", StatAddr));
-		return(1);
+	return(0);
+}	/* SkXmResetCounter */
+
+
+/******************************************************************************
+ *
+ *	SkXmOverflowStatus() - Gets the status of counter overflow interrupt
+ *
+ * Description:
+ *	Checks the source causing an counter overflow interrupt. On success the
+ *	resulting counter overflow status is written to <pStatus>, whereas the
+ *	upper dword stores the XMAC ReceiveCounterEvent register and the lower
+ *	dword the XMAC TransmitCounterEvent register.
+ *
+ * Note:
+ *	For XMAC the interrupt source is a self-clearing register, so the source
+ *	must be checked only once. SIRQ module does another check to be sure
+ *	that no interrupt get lost during process time.
+ *
+ * Returns:
+ *	0:  success
+ *	1:  something went wrong
+ */
+int SkXmOverflowStatus(
+SK_AC	*pAC,				/* adapter context */
+SK_IOC	IoC,				/* IO context */
+unsigned int Port,			/* Port Index (MAC_1 + n) */
+SK_U16  IStatus,			/* Interupt Status from MAC */
+SK_U64	SK_FAR *pStatus)	/* ptr for return overflow status value */
+{
+	SK_U64	Status;	/* Overflow status */
+	SK_U32	RegVal;
+
+	Status = 0;
+
+	if ((IStatus & XM_IS_RXC_OV) != 0) {
+
+		XM_IN32(IoC, Port, XM_RX_CNT_EV, &RegVal);
+		Status |= (SK_U64)RegVal << 32;
+	}
+	
+	if ((IStatus & XM_IS_TXC_OV) != 0) {
+
+		XM_IN32(IoC, Port, XM_TX_CNT_EV, &RegVal);
+		Status |= (SK_U64)RegVal;
 	}
-		
-	GM_IN32(IoC, Port, StatAddr, pVal);
+
+	*pStatus = Status;
 
 	return(0);
-}	/* SkGmMacStatistic */
+}	/* SkXmOverflowStatus */
+#endif /* GENESIS */
 
+
+#ifdef YUKON
 /******************************************************************************
  *
- *	SkXmResetCounter() - Clear MAC statistic counter
+ *	SkGmUpdateStats() - Force the GMAC to output the current statistic
  *
  * Description:
- *	Force the XMAC to clear its statistic counter.
+ *	Empty function for GMAC. Statistic data is accessible in direct way.
  *
  * Returns:
  *	0:  success
  *	1:  something went wrong
  */
-int SkXmResetCounter(
+int SkGmUpdateStats(
 SK_AC	*pAC,		/* adapter context */
 SK_IOC	IoC,		/* IO context */
 unsigned int Port)	/* Port Index (MAC_1 + n) */
 {
-	XM_OUT16(IoC, Port, XM_STAT_CMD, XM_SC_CLR_RXC | XM_SC_CLR_TXC);
-	/* Clear two times according to Errata #3 */
-	XM_OUT16(IoC, Port, XM_STAT_CMD, XM_SC_CLR_RXC | XM_SC_CLR_TXC);
+	return(0);
+}
+
+
+/******************************************************************************
+ *
+ *	SkGmMacStatistic() - Get GMAC counter value
+ *
+ * Description:
+ *	Gets the 32bit counter value. Except for the octet counters
+ *	the lower 32bit are counted in hardware and the upper 32bit
+ *	must be counted in software by monitoring counter overflow interrupts.
+ *
+ * Returns:
+ *	0:  success
+ *	1:  something went wrong
+ */
+int SkGmMacStatistic(
+SK_AC	*pAC,			/* adapter context */
+SK_IOC	IoC,			/* IO context */
+unsigned int Port,		/* Port Index (MAC_1 + n) */
+SK_U16	StatAddr,		/* MIB counter base address */
+SK_U32	SK_FAR *pVal)	/* ptr to return statistic value */
+{
+
+	if ((StatAddr < GM_RXF_UC_OK) || (StatAddr > GM_TXE_FIFO_UR)) {
+		
+		SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_HWI_E022, SKERR_HWI_E022MSG);
+		
+		SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+			("SkGmMacStat: wrong MIB counter 0x%04X\n", StatAddr));
+		return(1);
+	}
+		
+	GM_IN32(IoC, Port, StatAddr, pVal);
 
 	return(0);
-}	/* SkXmResetCounter */
+}	/* SkGmMacStatistic */
+
 
 /******************************************************************************
  *
@@ -4188,7 +4479,6 @@ unsigned int Port)	/* Port Index (MAC_1 
 
 	GM_IN16(IoC, Port, GM_PHY_ADDR, &Reg);
 
-#ifndef VCPU
 	/* set MIB Clear Counter Mode */
 	GM_OUT16(IoC, Port, GM_PHY_ADDR, Reg | GM_PAR_MIB_CLR);
 	
@@ -4200,59 +4490,10 @@ unsigned int Port)	/* Port Index (MAC_1 
 	
 	/* clear MIB Clear Counter Mode */
 	GM_OUT16(IoC, Port, GM_PHY_ADDR, Reg);
-#endif /* !VCPU */
 	
 	return(0);
 }	/* SkGmResetCounter */
 
-/******************************************************************************
- *
- *	SkXmOverflowStatus() - Gets the status of counter overflow interrupt
- *
- * Description:
- *	Checks the source causing an counter overflow interrupt. On success the
- *	resulting counter overflow status is written to <pStatus>, whereas the
- *	upper dword stores the XMAC ReceiveCounterEvent register and the lower
- *	dword the XMAC TransmitCounterEvent register.
- *
- * Note:
- *	For XMAC the interrupt source is a self-clearing register, so the source
- *	must be checked only once. SIRQ module does another check to be sure
- *	that no interrupt get lost during process time.
- *
- * Returns:
- *	0:  success
- *	1:  something went wrong
- */
-int SkXmOverflowStatus(
-SK_AC	*pAC,		/* adapter context */
-SK_IOC	IoC,		/* IO context */
-unsigned int Port,	/* Port Index (MAC_1 + n) */
-SK_U16  IStatus,	/* Interupt Status from MAC */
-SK_U64	*pStatus)	/* ptr for return overflow status value */
-{
-	SK_U64	Status;	/* Overflow status */
-	SK_U32	RegVal;
-
-	Status = 0;
-
-	if ((IStatus & XM_IS_RXC_OV) != 0) {
-
-		XM_IN32(IoC, Port, XM_RX_CNT_EV, &RegVal);
-		Status |= (SK_U64)RegVal << 32;
-	}
-	
-	if ((IStatus & XM_IS_TXC_OV) != 0) {
-
-		XM_IN32(IoC, Port, XM_TX_CNT_EV, &RegVal);
-		Status |= (SK_U64)RegVal;
-	}
-
-	*pStatus = Status;
-
-	return(0);
-}	/* SkXmOverflowStatus */
-
 
 /******************************************************************************
  *
@@ -4274,11 +4515,11 @@ SK_U64	*pStatus)	/* ptr for return overf
  *	1:  something went wrong
  */
 int SkGmOverflowStatus(
-SK_AC	*pAC,		/* adapter context */
-SK_IOC	IoC,		/* IO context */
-unsigned int Port,	/* Port Index (MAC_1 + n) */
-SK_U16  IStatus,	/* Interupt Status from MAC */
-SK_U64	*pStatus)	/* ptr for return overflow status value */
+SK_AC	*pAC,				/* adapter context */
+SK_IOC	IoC,				/* IO context */
+unsigned int Port,			/* Port Index (MAC_1 + n) */
+SK_U16  IStatus,			/* Interupt Status from MAC */
+SK_U64	SK_FAR *pStatus)	/* ptr for return overflow status value */
 {
 	SK_U64	Status;		/* Overflow status */
 	SK_U16	RegVal;
@@ -4309,6 +4550,8 @@ SK_U64	*pStatus)	/* ptr for return overf
 	return(0);
 }	/* SkGmOverflowStatus */
 
+
+#ifndef SK_SLIM
 /******************************************************************************
  *
  *	SkGmCableDiagStatus() - Starts / Gets status of cable diagnostic test
@@ -4393,5 +4636,7 @@ SK_BOOL	StartTest)	/* flag for start / g
 
 	return(0);
 }	/* SkGmCableDiagStatus */
+#endif /* !SK_SLIM */
+#endif /* YUKON */
 
 /* End of file */
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/net/tg3.c linux-2.4.20-wolk4.4-fullkernel/drivers/net/tg3.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/net/tg3.c	2003-07-30 13:51:30.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/net/tg3.c	2003-07-30 11:18:18.000000000 +0200
@@ -29,10 +29,6 @@
 #include <asm/byteorder.h>
 #include <asm/uaccess.h>
 
-#ifndef PCI_DMA_BUS_IS_PHYS
-#define PCI_DMA_BUS_IS_PHYS 1
-#endif
-
 #if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
 #define TG3_VLAN_TAG_USED 1
 #else
@@ -50,8 +46,8 @@
 
 #define DRV_MODULE_NAME		"tg3"
 #define PFX DRV_MODULE_NAME	": "
-#define DRV_MODULE_VERSION	"1.5"
-#define DRV_MODULE_RELDATE	"March 21, 2003"
+#define DRV_MODULE_VERSION	"1.6"
+#define DRV_MODULE_RELDATE	"June 11, 2003"
 
 #define TG3_DEF_MAC_MODE	0
 #define TG3_DEF_RX_MODE		0
@@ -2227,73 +2223,17 @@ static void tg3_tx_timeout(struct net_de
 	schedule_task(&tp->reset_task);
 }
 
-#if !PCI_DMA_BUS_IS_PHYS
-static void tg3_set_txd_addr(struct tg3 *tp, int entry, dma_addr_t mapping)
-{
-	if (tp->tg3_flags & TG3_FLAG_HOST_TXDS) {
-		struct tg3_tx_buffer_desc *txd = &tp->tx_ring[entry];
-
-		txd->addr_hi = ((u64) mapping >> 32);
-		txd->addr_lo = ((u64) mapping & 0xffffffff);
-	} else {
-		unsigned long txd;
-
-		txd = (tp->regs +
-		       NIC_SRAM_WIN_BASE +
-		       NIC_SRAM_TX_BUFFER_DESC);
-		txd += (entry * TXD_SIZE);
-
-		if (sizeof(dma_addr_t) != sizeof(u32))
-			writel(((u64) mapping >> 32),
-			       txd + TXD_ADDR + TG3_64BIT_REG_HIGH);
-
-		writel(((u64) mapping & 0xffffffff),
-		       txd + TXD_ADDR + TG3_64BIT_REG_LOW);
-	}
-}
-#endif
-
 static void tg3_set_txd(struct tg3 *, int, dma_addr_t, int, u32, u32);
 
 static int tigon3_4gb_hwbug_workaround(struct tg3 *tp, struct sk_buff *skb,
 				       u32 guilty_entry, int guilty_len,
 				       u32 last_plus_one, u32 *start, u32 mss)
 {
+	struct sk_buff *new_skb = skb_copy(skb, GFP_ATOMIC);
 	dma_addr_t new_addr;
 	u32 entry = *start;
 	int i;
 
-#if !PCI_DMA_BUS_IS_PHYS
-	/* IOMMU, just map the guilty area again which is guarenteed to
-	 * use different addresses.
-	 */
-
-	i = 0;
-	while (entry != guilty_entry) {
-		entry = NEXT_TX(entry);
-		i++;
-	}
-	if (i == 0) {
-		new_addr = pci_map_single(tp->pdev, skb->data, guilty_len,
-					  PCI_DMA_TODEVICE);
-	} else {
-		skb_frag_t *frag = &skb_shinfo(skb)->frags[i - 1];
-
-		new_addr = pci_map_page(tp->pdev,
-					frag->page, frag->page_offset,
-					guilty_len, PCI_DMA_TODEVICE);
-	}
-	pci_unmap_single(tp->pdev, pci_unmap_addr(&tp->tx_buffers[guilty_entry],
-						  mapping),
-			 guilty_len, PCI_DMA_TODEVICE);
-	tg3_set_txd_addr(tp, guilty_entry, new_addr);
-	pci_unmap_addr_set(&tp->tx_buffers[guilty_entry], mapping,
-			   new_addr);
-	*start = last_plus_one;
-#else
-	/* Oh well, no IOMMU, have to allocate a whole new SKB. */
-	struct sk_buff *new_skb = skb_copy(skb, GFP_ATOMIC);
-
 	if (!new_skb) {
 		dev_kfree_skb(skb);
 		return -1;
@@ -2330,7 +2270,6 @@ static int tigon3_4gb_hwbug_workaround(s
 	}
 
 	dev_kfree_skb(skb);
-#endif
 
 	return 0;
 }
@@ -6706,7 +6645,7 @@ static int __devinit tg3_init_one(struct
 	}
 
 	/* Configure DMA attributes. */
-	if (!pci_set_dma_mask(pdev, (u64) 0xffffffffffffffff)) {
+	if (!pci_set_dma_mask(pdev, (u64) 0xffffffffffffffffULL)) {
 		pci_using_dac = 1;
 	} else {
 		err = pci_set_dma_mask(pdev, (u64) 0xffffffff);
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/pci/pci.ids linux-2.4.20-wolk4.4-fullkernel/drivers/pci/pci.ids
--- linux-2.4.20-wolk4.3-fullkernel/drivers/pci/pci.ids	2003-07-30 13:51:31.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/pci/pci.ids	2003-07-30 10:31:39.000000000 +0200
@@ -2096,6 +2096,9 @@
 	1006  MINI PCI type 3B Data Fax Modem
 	1007  Mini PCI 56k Winmodem
 		10b7 615c  Mini PCI 56K Modem
+	1700  Gigabit Ethernet Adapter
+		10b7 0010  3Com 3C940 Gigabit LOM Ethernet Adapter
+		10b7 0020  3Com 3C941 Gigabit LOM Ethernet Adapter
 	3390  3c339 TokenLink Velocity
 	3590  3c359 TokenLink Velocity XL
 		10b7 3590  TokenLink Velocity XL Adapter (3C359/359B)
@@ -2679,7 +2682,7 @@
 	0505  VT82C505
 	0561  VT82C561
 	0571  VT82C586B PIPC Bus Master IDE
-		1458 5002 GA-7VAX Mainboard
+		1458 5002  GA-7VAX Mainboard
 	0576  VT82C576 3V [Apollo Master]
 	0585  VT82C585VP [Apollo VP1/VPX]
 	0586  VT82C586/A/B PCI-to-ISA [Apollo VP]
@@ -2751,9 +2754,9 @@
 	3148  P4M266 Host Bridge
 	3156  P/KN266 Host Bridge
 	3177  VT8233A ISA Bridge
-		1458 5001 GA-7VAX Mainboard
+		1458 5001  GA-7VAX Mainboard
 	3189  VT8377 [KT400 AGP] Host Bridge
-		1458 5000 GA-7VAX Mainboard
+		1458 5000  GA-7VAX Mainboard
 	5030  VT82C596 ACPI [Apollo PRO]
 	6100  VT85C100A [Rhine II]
 	8231  VT8231 [PCI-to-ISA Bridge]
@@ -3035,6 +3038,12 @@
 1144  Cincinnati Milacron
 	0001  Noservo controller
 1145  Workbit Corporation
+	f007  NinjaSCSI-32 KME
+	8007  NinjaSCSI-32 Workbit
+	f010  NinjaSCSI-32 Workbit
+	f012  NinjaSCSI-32 Logitec
+	f013  NinjaSCSI-32 Logitec
+	f015  NinjaSCSI-32 Melco
 1146  Force Computers
 1147  Interface Corp
 1148  SysKonnect
@@ -3056,24 +3065,43 @@
 		1148 5844  FDDI SK-5844 (SK-NET FDDI-LP64 DAS)
 	4200  Token Ring adapter
 	4300  SK-98xx Gigabit Ethernet Server Adapter
-		1148 9821  SK-9821 Gigabit Ethernet 1000Base-T Server Adapter
-		1148 9822  SK-9822 Gigabit Ethernet 1000Base-T Dual Port Server Adapter
-		1148 9841  SK-9841 Gigabit Ethernet 1000Base-LX Server Adapter
-		1148 9842  SK-9842 Gigabit Ethernet 1000Base-LX Dual Port Server Adapter
-		1148 9843  SK-9843 Gigabit Ethernet 1000Base-SX Server Adapter
-		1148 9844  SK-9844 Gigabit Ethernet 1000Base-SX Dual Port Server Adapter
-		1148 9861  SK-9861 Gigabit Ethernet 1000Base-SX Server Adapter
-		1148 9862  SK-9862 Gigabit Ethernet 1000Base-SX Dual Port Server Adapter
-		1148 9871  SK-9871 Gigabit Ethernet 1000Base-ZX Server Adapter
-		1148 9872  SK-9872 Gigabit Ethernet 1000Base-ZX Dual Port Server Adapter
-	4320  SK-98xx Gigabit Ethernet Server Adapter
-		1148 9521  SK-9521 10/100/1000Base-T Adapter
+		1148 9821  SK-9821 Gigabit Ethernet Server Adapter (SK-NET GE-T)
+		1148 9822  SK-9822 Gigabit Ethernet Server Adapter (SK-NET GE-T dual link)
+		1148 9841  SK-9841 Gigabit Ethernet Server Adapter (SK-NET GE-LX)
+		1148 9842  SK-9842 Gigabit Ethernet Server Adapter (SK-NET GE-LX dual link)
+		1148 9843  SK-9843 Gigabit Ethernet Server Adapter (SK-NET GE-SX)
+		1148 9844  SK-9844 Gigabit Ethernet Server Adapter (SK-NET GE-SX dual link)
+		1148 9861  SK-9861 Gigabit Ethernet Server Adapter (SK-NET GE-SX Volition)
+		1148 9862  SK-9862 Gigabit Ethernet Server Adapter (SK-NET GE-SX Volition dual link)
+		1148 9871  SK-9871 Gigabit Ethernet Server Adapter (SK-NET GE-ZX)
+		1148 9872  SK-9872 Gigabit Ethernet Server Adapter (SK-NET GE-ZX dual link)
+		1259 2970  Allied Telesyn AT-2970SX Gigabit Ethernet Adapter
+		1259 2971  Allied Telesyn AT-2970LX Gigabit Ethernet Adapter
+		1259 2972  Allied Telesyn AT-2970TX Gigabit Ethernet Adapter
+		1259 2973  Allied Telesyn AT-2971SX Gigabit Ethernet Adapter
+		1259 2974  Allied Telesyn AT-2971T Gigabit Ethernet Adapter
+		1259 2975  Allied Telesyn AT-2970SX/2SC Gigabit Ethernet Adapter
+		1259 2976  Allied Telesyn AT-2970LX/2SC Gigabit Ethernet Adapter
+		1259 2977  Allied Telesyn AT-2970TX/2TX Gigabit Ethernet Adapter
+	4320  SK-98xx V2.0 Gigabit Ethernet Adapter
+		1148 0121  Marvell RDK-8001 Adapter
+		1148 0221  Marvell RDK-8002 Adapter
+		1148 0321  Marvell RDK-8003 Adapter
+		1148 0421  Marvell RDK-8004 Adapter
+		1148 0621  Marvell RDK-8006 Adapter
+		1148 0721  Marvell RDK-8007 Adapter
+		1148 0821  Marvell RDK-8008 Adapter
+		1148 0921  Marvell RDK-8009 Adapter
+		1148 1121  Marvell RDK-8011 Adapter
+		1148 1221  Marvell RDK-8012 Adapter
+		1148 3221  SK-9521 V2.0 10/100/1000Base-T Adapter
 		1148 5021  SK-9821 V2.0 Gigabit Ethernet 10/100/1000Base-T Adapter
 		1148 5041  SK-9841 V2.0 Gigabit Ethernet 1000Base-LX Adapter
 		1148 5043  SK-9843 V2.0 Gigabit Ethernet 1000Base-SX Adapter
 		1148 5051  SK-9851 V2.0 Gigabit Ethernet 1000Base-SX Adapter
 		1148 5061  SK-9861 V2.0 Gigabit Ethernet 1000Base-SX Adapter
 		1148 5071  SK-9871 V2.0 Gigabit Ethernet 1000Base-ZX Adapter
+		1148 9521  SK-9521 10/100/1000Base-T Adapter
 	4400  Gigabit Ethernet
 1149  Win System Corporation
 114a  VMIC
@@ -3283,6 +3311,8 @@
 	1340  DFE-690TXD CardBus PC Card
 	1561  DRP-32TXD Cardbus PC Card
 	4000  DL2K Ethernet
+	4c00  Gigabit Ethernet Adapter
+		1186 4c00  DGE-530T Gigabit Ethernet Adapter
 1187  Advanced Technology Laboratories, Inc.
 1188  Shima Seiki Manufacturing Ltd.
 1189  Matsushita Electronics Co Ltd
@@ -3360,6 +3390,8 @@
 11aa  Actel
 11ab  Galileo Technology Ltd.
 	0146  GT-64010
+	4320  Gigabit Ethernet Adapter
+		11ab 9521  Marvell Yukon Gigabit Ethernet 10/100/1000Base-T Adapter
 	4801  GT-48001
 	f003  GT-64010 Primary Image Piranha Image Generator
 11ac  Canon Information Systems Research Aust.
@@ -4547,6 +4579,8 @@
 136f  Applied Magic Inc
 1370  ATL Products
 1371  CNet Technology Inc
+	434e  GigaCard Network Adapter
+		1371 434e  N-Way PCI-Bus Giga-Card 1000/100/10Mbps(L)
 1373  Silicon Vision Inc
 1374  Silicom Ltd
 1375  Argosystems Inc
@@ -5579,6 +5613,11 @@
 16f6  VideoTele.com, Inc.
 170b  NetOctave Inc
 170c  YottaYotta Inc.
+1737  Linksys
+	1032  Gigabit Network Adapter
+		1737 0015  EG1032 v2 Instant Gigabit Network Adapter
+	1064  Gigabit Network Adapter
+		1737 0016  EG1064 v2 Instant Gigabit Network Adapter
 173b  Altima (nee Broadcom)
 	03e8  AC1000 Gigabit Ethernet
 	03ea  AC9100 Gigabit Ethernet
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/Makefile linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/Makefile
--- linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/Makefile	2003-07-30 13:52:43.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/Makefile	2003-07-30 11:18:44.000000000 +0200
@@ -244,9 +244,6 @@ sim710.o : sim710_d.h
 
 53c700.o: 53c700_d.h
 
-qla2xxx/qla2100.o:
-	cd qla2xxx; make qla2100.o
-
 qla2xxx/qla2200.o:
 	cd qla2xxx; make qla2200.o
 
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/aic7xxx/Makefile linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/aic7xxx/Makefile
--- linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/aic7xxx/Makefile	2003-07-30 13:52:43.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/aic7xxx/Makefile	2003-07-30 11:51:35.000000000 +0200
@@ -13,7 +13,8 @@ ifeq ($(CONFIG_PCI),y)
 obj-$(CONFIG_SCSI_AIC79XX)	+= aic79xx.o
 endif
 
-EXTRA_CFLAGS += -I$(TOPDIR)/drivers/scsi -Werror
+EXTRA_CFLAGS += -I$(TOPDIR)/drivers/scsi
+#EXTRA_CFLAGS += -I$(TOPDIR)/drivers/scsi -Werror
 #EXTRA_CFLAGS += -g
 
 # Platform Specific Files
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/aic7xxx/aic79xx_osm.c linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/aic7xxx/aic79xx_osm.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/aic7xxx/aic79xx_osm.c	2003-07-30 13:52:43.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/aic7xxx/aic79xx_osm.c	2003-07-30 10:30:50.000000000 +0200
@@ -1698,6 +1698,7 @@ Scsi_Host_Template aic79xx_driver_templa
 	.highmem_io		= 1,
 #endif
 #endif
+	.vary_io = 1,
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
 	.slave_alloc		= ahd_linux_slave_alloc,
 	.slave_configure	= ahd_linux_slave_configure,
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/aic7xxx/aic7xxx_host.h linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/aic7xxx/aic7xxx_host.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/aic7xxx/aic7xxx_host.h	2003-07-30 13:51:34.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/aic7xxx/aic7xxx_host.h	2002-12-18 01:03:57.000000000 +0100
@@ -91,7 +91,6 @@ int		 ahc_linux_abort(Scsi_Cmnd *);
 	use_clustering: ENABLE_CLUSTERING,			\
 	use_new_eh_code: 1,					\
 	highmem_io: 1,						\
-	vary_io: 1,						\
 }
 
 #endif /* _AIC7XXX_HOST_H_ */
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/aic7xxx/aic7xxx_osm.c linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/aic7xxx/aic7xxx_osm.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/aic7xxx/aic7xxx_osm.c	2003-07-30 13:52:43.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/aic7xxx/aic7xxx_osm.c	2003-07-30 10:30:50.000000000 +0200
@@ -1327,6 +1327,7 @@ Scsi_Host_Template aic7xxx_driver_templa
 	.highmem_io		= 1,
 #endif
 #endif
+	.vary_io = 1,
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
 	.slave_alloc		= ahc_linux_slave_alloc,
 	.slave_configure	= ahc_linux_slave_configure,
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/hosts.h linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/hosts.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/hosts.h	2003-07-30 13:52:43.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/hosts.h	2003-07-30 10:30:59.000000000 +0200
@@ -291,9 +291,6 @@ typedef struct	SHT
      */
     unsigned emulated:1;
 
-    /*
-     * True for drivers that can do I/O from highmem
-     */
     unsigned highmem_io:1;
 
     /*
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/megaraid.c linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/megaraid.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/megaraid.c	2003-07-30 13:51:36.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/megaraid.c	2003-07-30 10:30:53.000000000 +0200
@@ -9,7 +9,7 @@
  *              as published by the Free Software Foundation; either version
  *              2 of the License, or (at your option) any later version.
  *
- * Version : v1.18h (Feb 06, 2003)
+ * Version : v1.18i (June 20, 2003)
  *
  * Description: Linux device driver for LSI Logic MegaRAID controller
  *
@@ -530,6 +530,18 @@
  * e.g., check consistency and rebuild put a heavy constraint on fW resources
  * resulting in aborted commands.
  *
+ * Version 1.18i
+ * Fri Jun 20 07:39:05 EDT 2003 - Atul Mukker <atulm@lsil.com>
+ *
+ * Request and reserve memory/IO regions. Otherwise a panic occurs if 2.00.x
+ * driver is loaded on top of 1.18x driver
+ *
+ * Prevent memory leak in cases when data transfer from/to application fails
+ * and ioctl is failing.
+ *
+ * Add support for ioctls on AMD-64 bit platforms
+ *			- Sreenivas Bagalkote <sreenib@lsil.com>
+ *
  * BUGS:
  *     Some older 2.1 kernels (eg. 2.1.90) have a bug in pci.c that
  *     fails to detect the controller as a pci device on the system.
@@ -593,12 +605,27 @@
 #include <linux/reboot.h>
 #include <linux/init.h>
 
+#ifdef __x86_64__
+#include <asm/ioctl32.h>
+#endif
+
 #include "sd.h"
 #include "scsi.h"
 #include "hosts.h"
 
 #include "megaraid.h"
 
+#ifdef __x86_64__
+/*
+ * The IOCTL cmd received from 32 bit compiled applications
+ */
+
+extern int register_ioctl32_conversion( unsigned int cmd,
+				int(*handler)(unsigned int, unsigned int, unsigned long,
+						struct file* ));
+extern int unregister_ioctl32_conversion( unsigned int cmd );
+#endif
+
 /*
  *================================================================
  *  #Defines
@@ -656,8 +683,8 @@ MODULE_LICENSE ("GPL");
 #define DRIVER_LOCK(p)
 #define DRIVER_UNLOCK(p)
 #define IO_LOCK_T unsigned long io_flags = 0
-#define IO_LOCK spin_lock_irqsave(&megaCfg->lock,io_flags);
-#define IO_UNLOCK spin_unlock_irqrestore(&megaCfg->lock,io_flags);
+#define IO_LOCK spin_lock_irqsave(&io_request_lock,io_flags);
+#define IO_UNLOCK spin_unlock_irqrestore(&io_request_lock,io_flags);
 
 #define queue_task_irq(a,b)     queue_task(a,b)
 #define queue_task_irq_off(a,b) queue_task(a,b)
@@ -2920,15 +2947,15 @@ static int mega_findCard (Scsi_Host_Temp
 
 	int		i, j;
 
-#if BITS_PER_LONG==64
-	u64 megaBase;
-#else
-	u32 megaBase;
-#endif
+	unsigned long megaBase;
+	unsigned long tbase;
 
 	u16 pciIdx = 0;
 	u16 numFound = 0;
 	u16 subsysid, subsysvid;
+	u8 did_mem_map_f = 0;
+	u8 did_io_map_f = 0;
+	u8 did_scsi_register_f = 0;
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,1,0)	/* 0x20100 */
 	while (!pcibios_find_device
@@ -2947,6 +2974,10 @@ static int mega_findCard (Scsi_Host_Temp
 		pciBus = pdev->bus->number;
 		pciDevFun = pdev->devfn;
 #endif
+		did_mem_map_f = 0;
+		did_io_map_f = 0;
+		did_scsi_register_f = 0;
+
 		if ((flag & BOARD_QUARTZ) && (skip_id == -1)) {
 				if( (pciVendor == PCI_VENDOR_ID_PERC4_DI_YSTONE &&
 					pciDev == PCI_DEVICE_ID_PERC4_DI_YSTONE) ||
@@ -3021,22 +3052,55 @@ static int mega_findCard (Scsi_Host_Temp
 		megaIrq = pdev->irq;
 #endif
 
+		tbase = megaBase;
+
 		pciIdx++;
 
 		if (flag & BOARD_QUARTZ) {
+
 			megaBase &= PCI_BASE_ADDRESS_MEM_MASK;
+
+			if( ! request_mem_region(megaBase, 128,
+									"MegaRAID: LSI Logic Corporation" ) ) {
+
+					printk(KERN_WARNING "megaraid: mem region busy!\n");
+
+					continue;
+			}
+
 			megaBase = (long) ioremap (megaBase, 128);
-			if (!megaBase)
+
+			if (!megaBase) {
+
+				printk(KERN_WARNING "megaraid: could not map hba memory!\n");
+
+				release_mem_region(tbase, 128);
+
 				continue;
+			}
+			did_mem_map_f = 1;
+
 		} else {
 			megaBase &= PCI_BASE_ADDRESS_IO_MASK;
 			megaBase += 0x10;
+
+			if( ! request_region(megaBase, 16,
+									"MegaRAID: LSI Logic Corporation") ) {
+
+					printk(KERN_WARNING "megaraid: region busy.\n");
+
+					continue;
+			}
+			did_io_map_f = 1;
+
 		}
 
 		/* Initialize SCSI Host structure */
 		host = scsi_register (pHostTmpl, sizeof (mega_host_config));
 		if (!host)
-			goto err_unmap;
+			goto fail_attach;
+
+		did_scsi_register_f = 1;
 
 		/*
 		 * Comment the following initialization if you know 'max_sectors' is
@@ -3074,8 +3138,6 @@ static int mega_findCard (Scsi_Host_Temp
 		megaCfg->int_qh = NULL;
 		megaCfg->int_qt = NULL;
 		megaCfg->int_qlen = 0;
-		spin_lock_init(&megaCfg->lock);
-		host->lock = &megaCfg->lock;
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
 		megaCfg->dev = pdev;
@@ -3088,11 +3150,8 @@ static int mega_findCard (Scsi_Host_Temp
 		megaCfg->host->unique_id = (pciBus << 8) | pciDevFun;
 		megaCtlrs[numCtlrs] = megaCfg;
 
-		if (!(flag & BOARD_QUARTZ)) {
-
-			/* Request our IO Range */
-			if( !request_region(megaBase, 16, "megaraid") )
-				goto err_unregister;
+		if (flag & BOARD_QUARTZ) {
+				megaCfg->host->base = tbase;
 		}
 
 		/* Request our IRQ */
@@ -3101,7 +3160,7 @@ static int mega_findCard (Scsi_Host_Temp
 			printk (KERN_WARNING
 				"megaraid: Couldn't register IRQ %d!\n",
 				megaIrq);
-			goto err_release;
+			goto fail_attach;
 		}
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
@@ -3223,8 +3282,7 @@ static int mega_findCard (Scsi_Host_Temp
 					     sizeof (mega_mailbox64),
 					     (void *) megaCfg->mailbox64ptr,
 					     megaCfg->dma_handle64);
-			scsi_unregister (host);
-			continue;
+			goto fail_attach;
 		}
 
 		/*
@@ -3259,14 +3317,17 @@ static int mega_findCard (Scsi_Host_Temp
 #endif
 #endif
 		continue;
-	      err_release:
-		if (flag & BOARD_QUARTZ)
-			release_region (megaBase, 16);
-	      err_unregister:
-		scsi_unregister (host);
-	      err_unmap:
-		if (flag & BOARD_QUARTZ)
-			iounmap ((void *) megaBase);
+fail_attach:
+		if( did_mem_map_f ) {
+				iounmap((void *)megaBase);
+				release_mem_region(tbase, 128);
+		}
+		if( did_io_map_f ) {
+				release_region(megaBase, 16);
+		}
+		if( did_scsi_register_f ) {
+				scsi_unregister (host);
+		}
 	}
 	return numFound;
 }
@@ -3366,6 +3427,12 @@ int megaraid_detect (Scsi_Host_Template 
 		}
 
 		init_MUTEX (&mimd_entry_mtx);
+#ifdef __x86_64__
+		/*
+		 * Register the 32-bit ioctl conversion
+		 */
+		register_ioctl32_conversion( MEGAIOCCMD, sys_ioctl );
+#endif
 	}
 
 	return count;
@@ -3397,6 +3464,7 @@ int megaraid_release (struct Scsi_Host *
 	/* Free our resources */
 	if (megaCfg->flag & BOARD_QUARTZ) {
 		iounmap ((void *) megaCfg->base);
+		release_mem_region(megaCfg->host->base, 128);
 	} else {
 		release_region (megaCfg->host->io_port, 16);
 	}
@@ -3443,6 +3511,9 @@ int megaraid_release (struct Scsi_Host *
 
 	unregister_chrdev (major, "megadev");
 	unregister_reboot_notifier (&mega_notifier);
+#ifdef __x86_64__
+	unregister_ioctl32_conversion( MEGAIOCCMD );
+#endif
 
 	return 0;
 }
@@ -3929,7 +4000,7 @@ int megaraid_queue (Scsi_Cmnd * SCpnt, v
 
 		if (pScb->SCpnt->cmnd[0] == M_RD_IOCTL_CMD_NEW) {
 			init_MUTEX_LOCKED (&pScb->ioctl_sem);
-			spin_unlock_irq (&megaCfg->lock);
+			spin_unlock_irq (&io_request_lock);
 			down (&pScb->ioctl_sem);
     		user_area = (char *)*((u32*)&pScb->SCpnt->cmnd[4]);
 			if (copy_to_user
@@ -3938,7 +4009,7 @@ int megaraid_queue (Scsi_Cmnd * SCpnt, v
 				    ("megaraid: Error copying ioctl return value to user buffer.\n");
 				pScb->SCpnt->result = (DID_ERROR << 16);
 			}
-			spin_lock_irq (&megaCfg->lock);
+			spin_lock_irq (&io_request_lock);
 			DRIVER_LOCK (megaCfg);
 			kfree (pScb->buff_ptr);
 			pScb->buff_ptr = NULL;
@@ -4685,7 +4756,7 @@ static int megadev_ioctl (struct inode *
 	struct uioctl_t *uioc;
 	dma_addr_t	dma_addr;
 	u32		length;
-	mega_host_config *megaCfg = NULL;
+	mega_host_config *megacfg = NULL;
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)	/* 0x020400 */
 	struct pci_dev pdev;
 	struct pci_dev *pdevp = &pdev;
@@ -4824,7 +4895,7 @@ static int megadev_ioctl (struct inode *
 		 */
 		for( shpnt = scsi_hostlist; shpnt; shpnt = shpnt->next ) {
 			if( shpnt->hostdata == (unsigned long *)megaCtlrs[adapno] ) {
-				megaCfg = (mega_host_config *)shpnt->hostdata;
+				megacfg = (mega_host_config *)shpnt->hostdata;
 				break;
 			}
 		}
@@ -4844,7 +4915,7 @@ static int megadev_ioctl (struct inode *
 		if( outlen || inlen ) {
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
 			pdevp = &pdev;
-			memcpy(pdevp, megaCfg->dev, sizeof(struct pci_dev));
+			memcpy(pdevp, megacfg->dev, sizeof(struct pci_dev));
 			pdevp->dma_mask = 0xffffffff;
 #else
 			pdevp = NULL;
@@ -4854,16 +4925,16 @@ static int megadev_ioctl (struct inode *
 			if( kvaddr == NULL ) {
 				printk(KERN_WARNING "megaraid:allocation failed\n");
 				ret = -ENOMEM;
-				goto out;
+				goto out_ioctl_cmd_new;
 			}
 
 			ioc.ui.fcs.buffer = kvaddr;
 
 			if (inlen) {
 				/* copyin the user data */
-				if (copy_from_user(kvaddr, (char *)uaddr, length )) {
-					ret = -EFAULT;
-					goto out;
+				if( copy_from_user(kvaddr, (char *)uaddr, length ) ) {
+						ret = -EFAULT;
+						goto out_ioctl_cmd_new;
 				}
 			}
 		}
@@ -4881,9 +4952,10 @@ static int megadev_ioctl (struct inode *
 		down(&mimd_ioctl_sem);
 
 		if( !scsicmd->result && outlen ) {
-			if (copy_to_user(uaddr, kvaddr, length))
-				ret = -EFAULT;
-				goto out;
+			if (copy_to_user(uaddr, kvaddr, length)) {
+				return -EFAULT;
+				goto out_ioctl_cmd_new;
+			}
 		}
 
 		/*
@@ -4902,7 +4974,8 @@ static int megadev_ioctl (struct inode *
 			put_user (scsicmd->result, &uioc->mbox[17]);
 		}
 
-out:
+out_ioctl_cmd_new:
+
 		if (kvaddr) {
 			dma_free_consistent(pdevp, length, kvaddr, dma_addr);
 		}
@@ -4949,7 +5022,7 @@ out:
 		 */
 		for( shpnt = scsi_hostlist; shpnt; shpnt = shpnt->next ) {
 			if( shpnt->hostdata == (unsigned long *)megaCtlrs[adapno] ) {
-				megaCfg = (mega_host_config *)shpnt->hostdata;
+				megacfg = (mega_host_config *)shpnt->hostdata;
 				break;
 			}
 		}
@@ -4961,14 +5034,14 @@ out:
 		 */
 		if( ioc.mbox[0] == FC_DEL_LOGDRV && ioc.mbox[2] == OP_DEL_LOGDRV ) {
 
-			if( !megaCfg->support_random_del ) {
+			if( !megacfg->support_random_del ) {
 				printk("megaraid: logdrv delete on non supporting f/w.\n");
 				return -EINVAL;
 			}
 
 			uioc = (struct uioctl_t *)arg;
 
-			ret = mega_del_logdrv(megaCfg, ioc.mbox[3]);
+			ret = mega_del_logdrv(megacfg, ioc.mbox[3]);
 
 			put_user(1, &uioc->mbox[16]);	/* numstatus */
 			put_user(ret, &uioc->mbox[17]);	/* status */
@@ -4991,7 +5064,7 @@ out:
 		if (outlen || inlen) {
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
 			pdevp = &pdev;
-			memcpy(pdevp, megaCfg->dev, sizeof(struct pci_dev));
+			memcpy(pdevp, megacfg->dev, sizeof(struct pci_dev));
 			pdevp->dma_mask = 0xffffffff;
 #else
 			pdevp = NULL;
@@ -5003,12 +5076,8 @@ out:
 
 			if( kvaddr == NULL ) {
 				printk (KERN_WARNING "megaraid:allocation failed\n");
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)	/*0x20400 */
-				kfree(scsicmd);
-#else
-				scsi_init_free((char *)scsicmd, sizeof(Scsi_Cmnd));
-#endif
-				return -ENOMEM;
+				ret = -ENOMEM;
+				goto out_ioctl_cmd;
 			}
 
 			ioc.data = kvaddr;
@@ -5016,9 +5085,15 @@ out:
 			if (inlen) {
 				if (ioc.mbox[0] == MEGA_MBOXCMD_PASSTHRU) {
 					/* copyin the user data */
-					copy_from_user (kvaddr, uaddr, ioc.pthru.dataxferlen);
+					if( copy_from_user (kvaddr, uaddr, ioc.pthru.dataxferlen)){
+							ret = -EFAULT;
+							goto out_ioctl_cmd;
+					}
 				} else {
-					copy_from_user (kvaddr, uaddr, inlen);
+					if( copy_from_user (kvaddr, uaddr, inlen) ) {
+							ret = -EFAULT;
+							goto out_ioctl_cmd;
+					}
 				}
 			}
 		}
@@ -5036,11 +5111,15 @@ out:
 
 		if (!scsicmd->result && outlen) {
 			if (ioc.mbox[0] == MEGA_MBOXCMD_PASSTHRU) {
-				if (copy_to_user (uaddr, kvaddr, ioc.pthru.dataxferlen))	
+				if (copy_to_user (uaddr, kvaddr, ioc.pthru.dataxferlen)) {
 					ret = -EFAULT;
+					goto out_ioctl_cmd;
+				}
 			} else {
-				if (copy_to_user (uaddr, kvaddr, outlen)) 
+				if (copy_to_user (uaddr, kvaddr, outlen)) {
 					ret = -EFAULT;
+					goto out_ioctl_cmd;
+				}
 			}
 		}
 
@@ -5065,6 +5144,8 @@ out:
 			put_user (scsicmd->result, &uioc->mbox[17]); /* status */
 		}
 
+out_ioctl_cmd:
+
 		if (kvaddr) {
 			dma_free_consistent(pdevp, PAGE_SIZE, kvaddr, dma_addr );
 		}
@@ -5253,7 +5334,6 @@ mega_del_logdrv(mega_host_config *this_h
 	IO_LOCK_T;
 	DECLARE_WAIT_QUEUE_HEAD(wq);
 	mega_scb	*scbp;
-	mega_host_config *megaCfg = this_hba;
 
 	/*
 	 * Stop sending commands to the controller, queue them internally.
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/megaraid.h linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/megaraid.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/megaraid.h	2003-07-30 13:51:36.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/megaraid.h	2003-07-30 10:30:53.000000000 +0200
@@ -4,7 +4,6 @@
 #ifndef LINUX_VERSION_CODE
 #include <linux/version.h>
 #endif
-#include <linux/spinlock.h>
 
 /*
  * For state flag. Do not use LSB(8 bits) which are
@@ -31,7 +30,8 @@
 #define M_RD_IOCTL_CMD_NEW		0x81
 #define M_RD_DRIVER_IOCTL_INTERFACE	0x82
 
-#define MEGARAID_VERSION "v1.18h (Release Date: Thu Feb  6 17:25:43 EST 2003)\n"
+#define MEGARAID_VERSION "v1.18i (Release Date: Fri Jun 20 07:39:05 EDT 2003)\n"
+
 
 #define MEGARAID_IOCTL_VERSION 	114
 
@@ -805,7 +805,6 @@ typedef struct _mega_host_config {
 	mega_scb	*int_qh;	/* commands are queued in the internal queue */
 	mega_scb	*int_qt;	/* while the hba is quiescent */
 	int			int_qlen;
-	spinlock_t	lock;
 	char		logdrv_chan[MAX_CHANNEL+NVIRT_CHAN]; /* logical drive are on
 														 what channels. */
 	int			mega_ch_class;
@@ -901,7 +900,9 @@ struct mbox_passthru {
  * Defines for Driver IOCTL interface, Op-code:M_RD_DRIVER_IOCTL_INTERFACE
  */
 #define MEGAIOC_MAGIC  	'm'
-#define MEGAIOCCMD     	_IOWR(MEGAIOC_MAGIC, 0)	/* Mega IOCTL command */
+
+/* Mega IOCTL command */
+#define MEGAIOCCMD     	_IOWR(MEGAIOC_MAGIC, 0, struct uioctl_t)
 
 #define MEGAIOC_QNADAP		'm'	/* Query # of adapters */
 #define MEGAIOC_QDRVRVER	'e'	/* Query driver version */
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/qla2xxx/Makefile linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/qla2xxx/Makefile
--- linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/qla2xxx/Makefile	2003-07-30 13:51:36.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/qla2xxx/Makefile	2003-07-30 10:28:03.000000000 +0200
@@ -26,7 +26,6 @@ qla2300.o: $(SRC_FILES) 
 	$(CC) $(CFLAGS) $(QLA_FLAGS) -DISP2300 -c qla2300.c -o $@
 
 modules_install:
-	echo HERE!!!!
 	mkdir $(MODLIB)/kernel/drivers/scsi/qla2xxx/
 	cp qla2100.o qla2200.o qla2300.o $(MODLIB)/kernel/drivers/scsi/qla2xxx/
 
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/qla2xxx/README.qla2x00 linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/qla2xxx/README.qla2x00
--- linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/qla2xxx/README.qla2x00	2003-07-30 13:51:36.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/qla2xxx/README.qla2x00	2003-07-30 10:28:03.000000000 +0200
@@ -1,5 +1,5 @@
                  QLogic Fibre Channel Driver
-     for Red Hat Linux 7.2, 7.3, and Advanced Server 2.1
+     for Red Hat Linux 7.2, 7.3, 8.0 and Advanced Server 2.1
              and Suse Linux 7.3, and Enterprise 7
 
 Products supported: QLA22XX, QLA23XX
@@ -96,14 +96,15 @@ Please refer to Release Notes (release.t
 4. Saving the Driver Source to Diskette
 ---------------------------------------
 
-1. Download the failover or non-failover qla2x00src-vx.yy-*.tgz file 
-   from QLogic's website.
+1. Download the failover or non-failover qla2x00-vx.yy.zz-dist.tgz
+   distribution file from QLogic's website.
 
    * Failover compressed file has suffix "fo" while non failover 
      does not.		
 
 2. If prompted "What would you like to do with this file?" choose 
    "Save this file to disk."
+
 3. Insert a blank diskette and download to the diskette directly.
 
 
@@ -135,7 +136,7 @@ using a RAMDISK image during system boot
        # rpm -iv kernel-source*.rpm
 
 2. Using the diskette you created in Section 4, copy the
-   qla2x00src-vx.yy-*.tgz file to /qla2x00. Follow these steps from
+   qla2x00-vx.yy.zz-dist.tgz file to /qla2x00. Follow these steps from
    the "/" (root) directory:
 
        # mkdir qla2x00
@@ -144,7 +145,7 @@ using a RAMDISK image during system boot
        # cp /mnt/floppy/*.tgz . (the period at the end is required)
        # tar -xvzf *.tgz
        # cd qlogic
-       # ./drvsetup (this will extract the source files in to the 
+       # ./drvrsetup (this will extract the driver source files to the 
                      current directory)
 
 3. Build the Driver qla2200.o and qla2300.o from the source code by
@@ -171,7 +172,7 @@ using a RAMDISK image during system boot
        # rpm -iv kernel-source*.rpm
 
 2. Using the diskette you created in Section 4, copy the
-   qla2x00src-vx.yy-*.tgz file to /qla2x00. Follow these steps from
+   qla2x00-vx.yy.zz-dist.tgz file to /qla2x00. Follow these steps from
    the "/" (root) directory:
 
        # mkdir qla2x00
@@ -180,7 +181,7 @@ using a RAMDISK image during system boot
        # cp /mnt/floppy/*.tgz . (the period at the end is required)
        # tar -xvzf *.tgz
        # cd qlogic
-       # ./drvsetup (this will extract the source files in to the
+       # ./drvrsetup (this will extract the driver source files to the
                      current directory)
 
 3. Build the Driver qla2200.o and qla2300.o from the source code by
@@ -528,7 +529,7 @@ macro MPIO_SUPPORT in qla_settings.h fil
 
 #define MPIO_SUPPORT                    1
 
-Note: The failover distribution package, qla2x00src-vx.yy.zz-fo.tgz, 
+Note: The failover distribution package, qla2x00-vx.yy.zz-fo-dist.tgz, 
 has the above macro enabled by default.
 
 
@@ -681,8 +682,8 @@ This mask specification is heavily type 
 9. Diskette Content 
 --------------------
 
-The qla2x00src-vx.yy.zz-*.tgz files can be extracted into the 
-following files:
+The qla2x00src-vx.yy.zz-*.tgz files within the downloaded
+distribution package can be extracted into the following files:
 
        listops.h
        Makefile.kernel
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/qla2xxx/exioct.h linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/qla2xxx/exioct.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/qla2xxx/exioct.h	2003-07-30 13:51:36.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/qla2xxx/exioct.h	2003-07-30 10:28:03.000000000 +0200
@@ -2,7 +2,7 @@
  *                  QLOGIC LINUX SOFTWARE
  *
  * QLogic ISP2x00 device driver for Linux 2.4.x
- * Copyright (C) 2002 Qlogic Corporation
+ * Copyright (C) 2003 Qlogic Corporation
  * (www.qlogic.com)
  *
  * This program is free software; you can redistribute it and/or modify it
@@ -182,6 +182,13 @@
  *
  * Rev. 5.27	Mar 01, 2002
  * RL	- Added new SC value for SCSI3 command passthru.
+ *
+ * Rev. 5.28	Dec 09, 2002
+ * Sync up with NT version of exioct.h:
+ * TLE	- Modify EXT_RNID_REQ data structure for IBM SendRNID workaround
+ * YPL	- Add firmware state (online diagnostics)
+ * YPL	- Add ELS PS
+ * YPL	- Add els event, # of els buffers & size
  */
 
 #ifndef	_EXIOCT_H
@@ -245,25 +252,23 @@
  * Common header struct definitions for San/Device Mgmt
  * ***********************************************************************
  */
-typedef struct
-{
-        UINT64    Signature;			/* 8 chars string */
-        UINT16    AddrMode;			/* 2 */
-        UINT16    Version;			/* 2 */
-        UINT16    SubCode;			/* 2 */
-        UINT16    Instance;			/* 2 */
-        UINT32    Status;			/* 4 */
-        UINT32    DetailStatus;			/* 4 */
-        UINT32    Reserved1;			/* 4 */
-        UINT32    RequestLen;			/* 4 */
-        UINT32    ResponseLen;			/* 4 */
-        UINT64    RequestAdr;			/* 8 */
-        UINT64    ResponseAdr;			/* 8 */
-        UINT16    HbaSelect;			/* 2 */
-        UINT16    VendorSpecificStatus[11];	/* 22 */
-        UINT64    VendorSpecificData;		/* 8 chars string */
-}
-EXT_IOCTL, *PEXT_IOCTL;			/* 84 / 0x54 */
+typedef struct {
+	UINT64    Signature;			/* 8 chars string */
+	UINT16    AddrMode;			/* 2 */
+	UINT16    Version;			/* 2 */
+	UINT16    SubCode;			/* 2 */
+	UINT16    Instance;			/* 2 */
+	UINT32    Status;			/* 4 */
+	UINT32    DetailStatus;			/* 4 */
+	UINT32    Reserved1;			/* 4 */
+	UINT32    RequestLen;			/* 4 */
+	UINT32    ResponseLen;			/* 4 */
+	UINT64    RequestAdr;			/* 8 */
+	UINT64    ResponseAdr;			/* 8 */
+	UINT16    HbaSelect;			/* 2 */
+	UINT16    VendorSpecificStatus[11];	/* 22 */
+	UINT64    VendorSpecificData;		/* 8 chars string */
+} EXT_IOCTL, *PEXT_IOCTL;			/* 84 / 0x54 */
 
 /*
  * Addressing mode used by the user application
@@ -342,6 +347,7 @@ EXT_IOCTL, *PEXT_IOCTL;			/* 84 / 0x54 *
 #define	EXT_CC_GET_AEN			EXT_CC_GET_AEN_OS
 #define	EXT_CC_SEND_ELS_RNID		EXT_CC_SEND_ELS_RNID_OS
 #define	EXT_CC_SEND_SCSI_PASSTHRU	EXT_CC_SCSI_PASSTHRU_OS
+#define	EXT_CC_SEND_ELS_PASSTHRU	EXT_CC_SEND_ELS_PASSTHRU_OS
 
 /*
  * HBA port operations
@@ -351,14 +357,14 @@ EXT_IOCTL, *PEXT_IOCTL;			/* 84 / 0x54 *
 
 
 /* Reserved command codes. */
-#define	EXT_CC_RESERVED0A		EXT_CC_RESERVED0A_OS
-#define	EXT_CC_RESERVED0B		EXT_CC_RESERVED0B_OS
-#define	EXT_CC_RESERVED0C		EXT_CC_RESERVED0C_OS
-#define	EXT_CC_RESERVED0D		EXT_CC_RESERVED0D_OS
-#define	EXT_CC_RESERVED0E		EXT_CC_RESERVED0E_OS
-#define	EXT_CC_RESERVED0F		EXT_CC_RESERVED0F_OS
-#define	EXT_CC_RESERVED0G		EXT_CC_RESERVED0G_OS
-#define	EXT_CC_RESERVED0H		EXT_CC_RESERVED0H_OS
+#define	EXT_CC_RESERVED0A		EXT_CC_RESERVED0A_OS    
+#define	EXT_CC_RESERVED0B		EXT_CC_RESERVED0B_OS    
+#define	EXT_CC_RESERVED0C		EXT_CC_RESERVED0C_OS    
+#define	EXT_CC_RESERVED0D		EXT_CC_RESERVED0D_OS    
+#define	EXT_CC_RESERVED0E		EXT_CC_RESERVED0E_OS    
+#define	EXT_CC_RESERVED0F		EXT_CC_RESERVED0F_OS    
+#define	EXT_CC_RESERVED0G		EXT_CC_RESERVED0G_OS    
+#define	EXT_CC_RESERVED0H		EXT_CC_RESERVED0H_OS    
 #define	EXT_CC_RESERVED0I		EXT_CC_RESERVED0I_OS
 #define	EXT_CC_RESERVED0J		EXT_CC_RESERVED0J_OS
 #define	EXT_CC_RESERVED0Z		EXT_CC_RESERVED0Z_OS
@@ -407,7 +413,7 @@ EXT_IOCTL, *PEXT_IOCTL;			/* 84 / 0x54 *
 #define	EXT_SC_GET_PORT_SUMMARY		106
 #define	EXT_SC_GET_POSITION_MAP		107
 #define	EXT_SC_GET_RETRY_CNT		108	/* Currently Not Supported */
-#define	EXT_SC_GET_RNID			109
+#define	EXT_SC_GET_RNID			109	
 #define	EXT_SC_GET_RTIN			110	/* Currently Not Supported */
 #define	EXT_SC_GET_FC_LUN_BITMASK	111
 #define	EXT_SC_GET_FC_STATISTICS	112	/* for backward compatible */
@@ -416,7 +422,7 @@ EXT_IOCTL, *PEXT_IOCTL;			/* 84 / 0x54 *
 #define	EXT_SC_GET_SEL_TIMEOUT		201	/* Currently Not Supported */
 
 
-/*
+/* 
  * Sub codes for Set Data.
  * Use in combination with EXT_SET_DATA as the ioctl code
  */
@@ -426,7 +432,7 @@ EXT_IOCTL, *PEXT_IOCTL;			/* 84 / 0x54 *
 
 /* 100 - 199 FC_INTF_TYPE */
 #define	EXT_SC_SET_LUN_BITMASK		103
-#define	EXT_SC_SET_RNID			109
+#define	EXT_SC_SET_RNID			109	
 #define	EXT_SC_SET_FC_LUN_BITMASK	111
 #define	EXT_SC_RESERVED_BC112	112
 #define	EXT_SC_RESERVED_BC113	113
@@ -450,59 +456,55 @@ EXT_IOCTL, *PEXT_IOCTL;			/* 84 / 0x54 *
 /*
  * Response struct
  */
-typedef struct _EXT_HBA_NODE
-{
-        UINT8     WWNN         [EXT_DEF_WWN_NAME_SIZE];	/* 8 */
-        UINT8     Manufacturer [EXT_DEF_MAX_STR_SIZE];	/* 128; "QLOGIC" */
-        UINT8     Model        [EXT_DEF_MAX_STR_SIZE];	/* 128; "QLA2200" */
-        UINT8     SerialNum    [EXT_DEF_SERIAL_NUM_SIZE];/* 4;  123  */
-        UINT8     DriverVersion[EXT_DEF_MAX_STR_SIZE];	/* 128; "7.4.3" */
-        UINT8     FWVersion    [EXT_DEF_MAX_STR_SIZE];	/* 128; "2.1.6" */
-
-        /* The following field is currently not supported */
-        UINT8     OptRomVersion[EXT_DEF_MAX_STR_SIZE];	/* 128; "1.44" */
-
-        UINT16    PortCount;				/* 2; 1 */
-        UINT16    InterfaceType;			/* 2; FC/SCSI */
-
-        /* The following two fields are not yet supported */
-        UINT32    DriverAttr;				/* 4 */
-        UINT32    FWAttr;				/* 4 */
-
-        UINT32    Reserved[8];				/* 32 */
-}
-EXT_HBA_NODE, *PEXT_HBA_NODE;				/* 696 */
+typedef struct _EXT_HBA_NODE {
+	UINT8     WWNN         [EXT_DEF_WWN_NAME_SIZE];	/* 8 */
+	UINT8     Manufacturer [EXT_DEF_MAX_STR_SIZE];	/* 128; "QLOGIC" */
+	UINT8     Model        [EXT_DEF_MAX_STR_SIZE];	/* 128; "QLA2200" */
+	UINT8     SerialNum    [EXT_DEF_SERIAL_NUM_SIZE];/* 4;  123  */
+	UINT8     DriverVersion[EXT_DEF_MAX_STR_SIZE];	/* 128; "7.4.3" */
+	UINT8     FWVersion    [EXT_DEF_MAX_STR_SIZE];	/* 128; "2.1.6" */
+
+	/* The following field is currently not supported */
+	UINT8     OptRomVersion[EXT_DEF_MAX_STR_SIZE];	/* 128; "1.44" */
+
+	UINT16    PortCount;				/* 2; 1 */
+	UINT16    InterfaceType;			/* 2; FC/SCSI */
+
+	/* The following two fields are not yet supported */
+	UINT32    DriverAttr;				/* 4 */
+	UINT32    FWAttr;				/* 4 */
+
+	UINT32    Reserved[8];				/* 32 */
+} EXT_HBA_NODE, *PEXT_HBA_NODE;				/* 696 */
 
 /* HBA node query interface type */
 #define	EXT_DEF_FC_INTF_TYPE			1
 #define	EXT_DEF_SCSI_INTF_TYPE			2
 
-typedef struct _EXT_HBA_PORT
-{
-        UINT8     WWPN[EXT_DEF_WWN_NAME_SIZE];	/* 8 */
-        UINT8     Id  [EXT_DEF_PORTID_SIZE];	/* 4; 3 bytes valid Port Id. */
-        UINT16    Type;				/* 2; Port Type */
-        UINT16    State;			/* 2; Port State */
-        UINT16    Mode;				/* 2 */
-        UINT16    DiscPortCount;		/* 2 */
-        UINT16    DiscPortNameType;		/* 2; USE_NODE_NAME or */
-        /* USE_PORT_NAME */
-        UINT16    DiscTargetCount;		/* 2 */
-        UINT16    Bus;				/* 2 */
-        UINT16    Target;			/* 2 */
-        UINT16    Lun;				/* 2 */
-        /* 2 */
-        UINT8     PortSupportedFC4Types;
-        UINT8     PortActiveFC4Types;
-        UINT8     FabricName[EXT_DEF_WWN_NAME_SIZE];	/* 8 */
-
-        /* 2*/
-        UINT8     PortSupportedSpeed;
-        UINT8     PortSpeed;
-        UINT16    Unused;			/* 2 */
-        UINT32    Reserved[3];			/* 12 */
-}
-EXT_HBA_PORT, *PEXT_HBA_PORT;			/* 56 */
+typedef struct _EXT_HBA_PORT {
+	UINT8     WWPN[EXT_DEF_WWN_NAME_SIZE];	/* 8 */
+	UINT8     Id  [EXT_DEF_PORTID_SIZE];	/* 4; 3 bytes valid Port Id. */
+	UINT16    Type;				/* 2; Port Type */
+	UINT16    State;			/* 2; Port State */
+	UINT16    Mode;				/* 2 */
+	UINT16    DiscPortCount;		/* 2 */
+	UINT16    DiscPortNameType;		/* 2; USE_NODE_NAME or */
+						/* USE_PORT_NAME */
+	UINT16    DiscTargetCount;		/* 2 */
+	UINT16    Bus;				/* 2 */
+	UINT16    Target;			/* 2 */
+	UINT16    Lun;				/* 2 */
+						/* 2 */
+	UINT8     PortSupportedFC4Types;
+	UINT8     PortActiveFC4Types;
+	UINT8     FabricName[EXT_DEF_WWN_NAME_SIZE];	/* 8 */
+
+						/* 2*/
+	UINT8     PortSupportedSpeed;
+	UINT8     PortSpeed;
+	UINT16    Unused;			/* 2 */
+	UINT32    Reserved[3];			/* 12 */
+} EXT_HBA_PORT, *PEXT_HBA_PORT;			/* 56 */
 
 /* port type */
 #define	EXT_DEF_INITIATOR_DEV		1
@@ -538,88 +540,78 @@ EXT_HBA_PORT, *PEXT_HBA_PORT;			/* 56 */
 #define EXT_DEF_PORTSPEED_2GBIT		2
 #define EXT_DEF_PORTSPEED_10GBIT	4
 
-typedef struct _EXT_DISC_PORT
-{
-        UINT8     WWNN[EXT_DEF_WWN_NAME_SIZE];	/* 8 */
-        UINT8     WWPN[EXT_DEF_WWN_NAME_SIZE];	/* 8 */
-        UINT8     Id  [EXT_DEF_PORTID_SIZE];
-        /* 4; last 3 bytes used. big endian */
-
-        /* The following fields currently are not supported */
-        UINT16    Type;				/* 2; Port Type */
-        UINT16    Status;			/* 2; Port Status */
-        UINT16    Bus;				/* 2; n/a for Solaris */
-
-        UINT16    TargetId;			/* 2 */
-        UINT8     Local;			/* 1; Local or Remote */
-        UINT8     ReservedByte[1];		/* 1 */
-
-        UINT16    LoopID;			/* 2; Loop ID */
-
-        UINT32    Reserved[7];			/* 28 */
-}
-EXT_DISC_PORT, *PEXT_DISC_PORT;		/* 60 */
-
-typedef struct _EXT_DISC_TARGET
-{
-        UINT8     WWNN[EXT_DEF_WWN_NAME_SIZE];	/* 8 */
-        UINT8     WWPN[EXT_DEF_WWN_NAME_SIZE];	/* 8 */
-        UINT8     Id  [EXT_DEF_PORTID_SIZE];
-        /* 4; last 3 bytes used. big endian */
-
-        /* The following fields currently are not supported */
-        UINT16    Type;				/* 2; Target Type */
-        UINT16    Status;			/* 2; Target Status*/
-        UINT16    Bus;				/* 2; n/a for Solaris */
-
-        UINT16    TargetId;			/* 2 */
-
-        /* The following field is currently not supported */
-        UINT16    LunCount;			/* 2; n/a for nt */
-
-        UINT8     Local;			/* 1; Local or Remote */
-        UINT8     ReservedByte[1];		/* 1 */
-
-        UINT16    LoopID;			/* 2; Loop ID */
-
-        UINT16    Reserved[13];			/* 26 */
-}
-EXT_DISC_TARGET, *PEXT_DISC_TARGET;		/* 60 */
+typedef struct _EXT_DISC_PORT {
+	UINT8     WWNN[EXT_DEF_WWN_NAME_SIZE];	/* 8 */
+	UINT8     WWPN[EXT_DEF_WWN_NAME_SIZE];	/* 8 */
+	UINT8     Id  [EXT_DEF_PORTID_SIZE];
+					/* 4; last 3 bytes used. big endian */
+
+	/* The following fields currently are not supported */
+	UINT16    Type;				/* 2; Port Type */
+	UINT16    Status;			/* 2; Port Status */
+	UINT16    Bus;				/* 2; n/a for Solaris */
+
+	UINT16    TargetId;			/* 2 */
+	UINT8     Local;			/* 1; Local or Remote */
+	UINT8     ReservedByte[1];		/* 1 */
+	
+	UINT16    LoopID;			/* 2; Loop ID */
+	
+	UINT32    Reserved[7];			/* 28 */
+} EXT_DISC_PORT, *PEXT_DISC_PORT;		/* 60 */
+
+typedef struct _EXT_DISC_TARGET {
+	UINT8     WWNN[EXT_DEF_WWN_NAME_SIZE];	/* 8 */
+	UINT8     WWPN[EXT_DEF_WWN_NAME_SIZE];	/* 8 */
+	UINT8     Id  [EXT_DEF_PORTID_SIZE];
+					/* 4; last 3 bytes used. big endian */
+
+	/* The following fields currently are not supported */
+	UINT16    Type;				/* 2; Target Type */
+	UINT16    Status;			/* 2; Target Status*/
+	UINT16    Bus;				/* 2; n/a for Solaris */
+
+	UINT16    TargetId;			/* 2 */
+
+	/* The following field is currently not supported */
+	UINT16    LunCount;			/* 2; n/a for nt */
+
+	UINT8     Local;			/* 1; Local or Remote */
+	UINT8     ReservedByte[1];		/* 1 */
+	
+	UINT16    LoopID;			/* 2; Loop ID */
+	
+	UINT16    Reserved[13];			/* 26 */
+} EXT_DISC_TARGET, *PEXT_DISC_TARGET;		/* 60 */
 
 /* The following command is not supported */
-typedef struct _EXT_DISC_LUN
-{			/* n/a for nt */
-        UINT16    Id;				/* 2 */
-        UINT16    State;			/* 2 */
-        UINT16    IoCount;			/* 2 */
-        UINT16    Reserved[15];			/* 30 */
-}
-EXT_DISC_LUN, *PEXT_DISC_LUN;			/* 36 */
+typedef struct _EXT_DISC_LUN {			/* n/a for nt */
+	UINT16    Id;				/* 2 */
+	UINT16    State;			/* 2 */
+	UINT16    IoCount;			/* 2 */
+	UINT16    Reserved[15];			/* 30 */
+} EXT_DISC_LUN, *PEXT_DISC_LUN;			/* 36 */
 
 
 /* SCSI address */
-typedef struct _EXT_SCSI_ADDR
-{
-        UINT16    Bus;				/* 2 */
-        UINT16    Target;			/* 2 */
-        UINT16    Lun;				/* 2 */
-        UINT16    Padding[5];			/* 10 */
-}
-EXT_SCSI_ADDR, *PEXT_SCSI_ADDR;		/* 16 */
+typedef struct _EXT_SCSI_ADDR {
+	UINT16    Bus;				/* 2 */
+	UINT16    Target;			/* 2 */
+	UINT16    Lun;				/* 2 */
+	UINT16    Padding[5];			/* 10 */
+} EXT_SCSI_ADDR, *PEXT_SCSI_ADDR;		/* 16 */
 
 
 /* Fibre Channel address */
-typedef struct _EXT_FC_ADDR
-{
-        union {
-                UINT8    WWNN[EXT_DEF_WWN_NAME_SIZE];	/* 8 */
-                UINT8    WWPN[EXT_DEF_WWN_NAME_SIZE];	/* 8 */
-                UINT8    Id[EXT_DEF_PORTID_SIZE];	/* 4 */
-        } FcAddr;
-        UINT16    Type;					/* 2 */
-        UINT16    Padding[2];				/* 2 */
-}
-EXT_FC_ADDR, *PEXT_FC_ADDR;				/* 24 */
+typedef struct _EXT_FC_ADDR {
+	union {
+		UINT8    WWNN[EXT_DEF_WWN_NAME_SIZE];	/* 8 */
+		UINT8    WWPN[EXT_DEF_WWN_NAME_SIZE];	/* 8 */
+		UINT8    Id[EXT_DEF_PORTID_SIZE];	/* 4 */
+	} FcAddr;
+	UINT16    Type;					/* 2 */
+	UINT16    Padding[2];				/* 2 */
+} EXT_FC_ADDR, *PEXT_FC_ADDR;				/* 24 */
 
 #define	EXT_DEF_TYPE_WWNN                   1
 #define	EXT_DEF_TYPE_WWPN                   2
@@ -628,23 +620,20 @@ EXT_FC_ADDR, *PEXT_FC_ADDR;				/* 24 */
 
 
 /* Destination address */
-typedef struct _EXT_DEST_ADDR
-{
-        union {
-                UINT8    WWNN[EXT_DEF_WWN_NAME_SIZE];	/* 8 */
-                UINT8    WWPN[EXT_DEF_WWN_NAME_SIZE];	/* 8 */
-                UINT8    Id[EXT_DEF_PORTID_SIZE];	/* 4 */
-                struct {
-                        UINT16    Bus;			/* 2 */
-                        UINT16    Target;		/* 2 */
-                }
-                ScsiAddr;
-        } DestAddr;
-        UINT16    DestType;				/* 2 */
-        UINT16    Lun;					/* 2 */
-        UINT16    Padding[2];				/* 4 */
-}
-EXT_DEST_ADDR, *PEXT_DEST_ADDR;			/* 16 */
+typedef struct _EXT_DEST_ADDR {
+	union {
+		UINT8    WWNN[EXT_DEF_WWN_NAME_SIZE];	/* 8 */
+		UINT8    WWPN[EXT_DEF_WWN_NAME_SIZE];	/* 8 */
+		UINT8    Id[EXT_DEF_PORTID_SIZE];	/* 4 */
+		struct {
+			UINT16    Bus;			/* 2 */
+			UINT16    Target;		/* 2 */
+		} ScsiAddr;
+	} DestAddr;
+	UINT16    DestType;				/* 2 */
+	UINT16    Lun;					/* 2 */
+	UINT16    Padding[2];				/* 4 */
+} EXT_DEST_ADDR, *PEXT_DEST_ADDR;			/* 16 */
 
 
 #define	EXT_DEF_DESTTYPE_WWNN			1
@@ -654,142 +643,129 @@ EXT_DEST_ADDR, *PEXT_DEST_ADDR;			/* 16 
 #define	EXT_DEF_DESTTYPE_SCSI			5
 
 /* Statistic */
-typedef struct _EXT_HBA_PORT_STAT
-{
-        UINT32    ControllerErrorCount;		/* 4 */
-        UINT32    DeviceErrorCount;		/* 4 */
-        UINT32    TotalIoCount;			/* 4 */
-        UINT32    TotalMBytes;			/* 4; MB of data processed */
-        UINT32    TotalLipResets;		/* 4; Total no. of LIP Reset */
-        UINT32    Reserved2;			/* 4 */
-        UINT32    TotalLinkFailures;		/* 4 */
-        UINT32    TotalLossOfSync;		/* 4 */
-        UINT32    TotalLossOfSignals;		/* 4 */
-        UINT32    PrimitiveSeqProtocolErrorCount;/* 4 */
-        UINT32    InvalidTransmissionWordCount;	/* 4 */
-        UINT32    InvalidCRCCount;		/* 4 */
-        UINT32    Reserved[16];			/* 64 */
-}
-EXT_HBA_PORT_STAT, *PEXT_HBA_PORT_STAT;	/* 112 */
+typedef struct _EXT_HBA_PORT_STAT {
+	UINT32    ControllerErrorCount;		/* 4 */
+	UINT32    DeviceErrorCount;		/* 4 */
+	UINT32    TotalIoCount;			/* 4 */
+	UINT32    TotalMBytes;			/* 4; MB of data processed */
+	UINT32    TotalLipResets;		/* 4; Total no. of LIP Reset */
+	UINT32    Reserved2;			/* 4 */
+	UINT32    TotalLinkFailures;		/* 4 */
+	UINT32    TotalLossOfSync;		/* 4 */
+	UINT32    TotalLossOfSignals;		/* 4 */
+	UINT32    PrimitiveSeqProtocolErrorCount;/* 4 */
+	UINT32    InvalidTransmissionWordCount;	/* 4 */
+	UINT32    InvalidCRCCount;		/* 4 */
+	UINT32    Reserved[16];			/* 64 */
+} EXT_HBA_PORT_STAT, *PEXT_HBA_PORT_STAT;	/* 112 */
 
 
 /* Driver property */
-typedef struct _EXT_DRIVER
-{
-        UINT8     Version[EXT_DEF_MAX_STR_SIZE];/* 128 */
-        UINT16    NumOfBus;			/* 2; Port Type */
-        UINT16    TargetsPerBus;		/* 2; Port Status */
-        UINT16    LunsPerTarget;		/* 2 */
-        UINT32    MaxTransferLen;		/* 4 */
-        UINT32    MaxDataSegments;		/* 4 */
-        UINT16    DmaBitAddresses;		/* 2 */
-        UINT16    IoMapType;			/* 2 */
-        UINT32    Attrib;			/* 4 */
-        UINT32    InternalFlags[4];		/* 16 */
-        UINT32    Reserved[8];			/* 32 */
-}
-EXT_DRIVER, *PEXT_DRIVER;			/* 198 */
+typedef struct _EXT_DRIVER {
+	UINT8     Version[EXT_DEF_MAX_STR_SIZE];/* 128 */
+	UINT16    NumOfBus;			/* 2; Port Type */
+	UINT16    TargetsPerBus;		/* 2; Port Status */
+	UINT16    LunsPerTarget;		/* 2 */
+	UINT32    MaxTransferLen;		/* 4 */
+	UINT32    MaxDataSegments;		/* 4 */
+	UINT16    DmaBitAddresses;		/* 2 */
+	UINT16    IoMapType;			/* 2 */
+	UINT32    Attrib;			/* 4 */
+	UINT32    InternalFlags[4];		/* 16 */
+	UINT32    Reserved[8];			/* 32 */
+} EXT_DRIVER, *PEXT_DRIVER;			/* 198 */
 
 
 /* Firmware property */
-typedef struct _EXT_FW
-{
-        UINT8     Version[EXT_DEF_MAX_STR_SIZE];/* 128 */
-        UINT32    Attrib;			/* 4 */
-        UINT16    Reserved[33];			/* 66 */
-}
-EXT_FW, *PEXT_FW;				/* 198 */
+typedef struct _EXT_FW {
+	UINT8     Version[EXT_DEF_MAX_STR_SIZE];/* 128 */
+	UINT32    Attrib;			/* 4 */
+	UINT16    Reserved[33];			/* 66 */
+} EXT_FW, *PEXT_FW;				/* 198 */
 
 
 /* ISP/Chip property */
-typedef struct _EXT_CHIP
-{
-        UINT16    VendorId;			/* 2 */
-        UINT16    DeviceId;			/* 2 */
-        UINT16    SubVendorId;			/* 2 */
-        UINT16    SubSystemId;			/* 2 */
-        UINT16    PciBusNumber;			/* 2 */
-        UINT16    PciSlotNumber;		/* 2 */
-        UINT32    IoAddr;			/* 4 */
-        UINT32    IoAddrLen;			/* 4 */
-        UINT32    MemAddr;			/* 4 */
-        UINT32    MemAddrLen;			/* 4 */
-        UINT16    ChipType;			/* 2 */
-        UINT16    InterruptLevel;		/* 2 */
-        UINT16    OutMbx[8];			/* 16 */
-        UINT16    PciDevFunc;	                /* 2 */
-        UINT16    Reserved[15];			/* 30 */
-}
-EXT_CHIP, *PEXT_CHIP;				/* 80 */
+typedef struct _EXT_CHIP {
+	UINT16    VendorId;			/* 2 */
+	UINT16    DeviceId;			/* 2 */
+	UINT16    SubVendorId;			/* 2 */
+	UINT16    SubSystemId;			/* 2 */
+	UINT16    PciBusNumber;			/* 2 */
+	UINT16    PciSlotNumber;		/* 2 */
+	UINT32    IoAddr;			/* 4 */
+	UINT32    IoAddrLen;			/* 4 */
+	UINT32    MemAddr;			/* 4 */
+	UINT32    MemAddrLen;			/* 4 */
+	UINT16    ChipType;			/* 2 */
+	UINT16    InterruptLevel;		/* 2 */
+	UINT16    OutMbx[8];			/* 16 */
+	UINT16    PciDevFunc;	                /* 2 */
+	UINT16    Reserved[15];			/* 30 */
+} EXT_CHIP, *PEXT_CHIP;				/* 80 */
 
 
 /* Request Buffer for RNID */
-typedef struct _EXT_RNID_REQ
-{
-        EXT_FC_ADDR Addr;
-        UINT8       DataFormat;
-        UINT32      Reserved[16];
-}
-EXT_RNID_REQ, *PEXT_RNID_REQ;
+typedef struct _EXT_RNID_REQ {
+	EXT_FC_ADDR Addr;			/* 14 */
+	UINT8     DataFormat;			/* 1 */
+	UINT8     Pad;				/* 1 */
+	UINT8     OptWWN[EXT_DEF_WWN_NAME_SIZE];	/* 8 */
+	UINT8     OptPortId[EXT_DEF_PORTID_SIZE];	/* 4 */
+	UINT32    Reserved[12];			/* 48 */
+	UINT8     Pad1[3];			/* 3 */
+} EXT_RNID_REQ, *PEXT_RNID_REQ;			/* 79 */
 
 #define EXT_DEF_RNID_DFORMAT_NONE		0
 #define EXT_DEF_RNID_DFORMAT_TOPO_DISC		0xDF
 
 /* Request Buffer for Set RNID */
-typedef struct _EXT_SET_RNID_REQ
-{
-        UINT8     IPVersion[2];
-        UINT8     UDPPortNumber[2];
-        UINT8     IPAddress[16];
-        UINT32    Reserved[16];
-}
-EXT_SET_RNID_REQ, *PEXT_SET_RNID_REQ;
+typedef struct _EXT_SET_RNID_REQ {
+	UINT8     IPVersion[2];
+	UINT8     UDPPortNumber[2];
+	UINT8     IPAddress[16];
+	UINT32    Reserved[16];
+} EXT_SET_RNID_REQ, *PEXT_SET_RNID_REQ;
 
 /* RNID definition and data struct */
 #define	SEND_RNID_RSP_SIZE  72
 
 typedef struct _RNID_DATA
 {
-        UINT8     WWN[16];			/* 16 */
-        UINT32    UnitType;			/* 4 */
-        UINT8     PortId[4];			/* 4 */
-        UINT32    NumOfAttachedNodes;		/* 4 */
-        UINT8     IPVersion[2];			/* 2 */
-        UINT8     UDPPortNumber[2];		/* 2 */
-        UINT8     IPAddress[16];		/* 16 */
-        UINT16    Reserved;			/* 2 */
-        UINT16    TopoDiscFlags;		/* 2 */
-}
-EXT_RNID_DATA, *PEXT_RNID_DATA;		/* 52 */
+	UINT8     WWN[16];			/* 16 */
+	UINT32    UnitType;			/* 4 */
+	UINT8     PortId[4];			/* 4 */
+	UINT32    NumOfAttachedNodes;		/* 4 */
+	UINT8     IPVersion[2];			/* 2 */
+	UINT8     UDPPortNumber[2];		/* 2 */
+	UINT8     IPAddress[16];		/* 16 */
+	UINT16    Reserved;			/* 2 */
+	UINT16    TopoDiscFlags;		/* 2 */
+} EXT_RNID_DATA, *PEXT_RNID_DATA;		/* 52 */
 
 
 /* SCSI pass-through */
-typedef struct _EXT_SCSI_PASSTHRU
-{
-        EXT_SCSI_ADDR   TargetAddr;
-        UINT8           Direction;
-        UINT8           CdbLength;
-        UINT8           Cdb[EXT_DEF_SCSI_PASSTHRU_CDB_LENGTH];
+typedef struct _EXT_SCSI_PASSTHRU {
+	EXT_SCSI_ADDR   TargetAddr;
+	UINT8           Direction;
+	UINT8           CdbLength;
+	UINT8           Cdb[EXT_DEF_SCSI_PASSTHRU_CDB_LENGTH];
         UINT32          Reserved[14];
         UINT16          Reserved2;
         UINT16          SenseLength;
-        UINT8           SenseData[256];
-}
-EXT_SCSI_PASSTHRU, *PEXT_SCSI_PASSTHRU;
+	UINT8           SenseData[256];
+} EXT_SCSI_PASSTHRU, *PEXT_SCSI_PASSTHRU;
 
 /* FC SCSI pass-through */
-typedef struct _EXT_FC_SCSI_PASSTHRU
-{
-        EXT_DEST_ADDR   FCScsiAddr;
-        UINT8           Direction;
-        UINT8           CdbLength;
-        UINT8           Cdb[EXT_DEF_SCSI_PASSTHRU_CDB_LENGTH];
+typedef struct _EXT_FC_SCSI_PASSTHRU {
+	EXT_DEST_ADDR   FCScsiAddr;
+	UINT8           Direction;
+	UINT8           CdbLength;
+	UINT8           Cdb[EXT_DEF_SCSI_PASSTHRU_CDB_LENGTH];
         UINT32          Reserved[14];
         UINT16          Reserved2;
         UINT16          SenseLength;
-        UINT8           SenseData[256];
-}
-EXT_FC_SCSI_PASSTHRU, *PEXT_FC_SCSI_PASSTHRU;
+	UINT8           SenseData[256];
+} EXT_FC_SCSI_PASSTHRU, *PEXT_FC_SCSI_PASSTHRU;
 
 /* SCSI pass-through direction */
 #define	EXT_DEF_SCSI_PASSTHRU_DATA_IN		1
@@ -797,29 +773,24 @@ EXT_FC_SCSI_PASSTHRU, *PEXT_FC_SCSI_PASS
 
 
 /* EXT_REG_AEN Request struct */
-typedef struct _EXT_REG_AEN
-{
-        UINT32    Enable;	/* 4; non-0 to enable, 0 to disable. */
-        UINT32    Reserved;	/* 4 */
-}
-EXT_REG_AEN, *PEXT_REG_AEN;	/* 8 */
+typedef struct _EXT_REG_AEN {
+	UINT32    Enable;	/* 4; non-0 to enable, 0 to disable. */
+	UINT32    Reserved;	/* 4 */
+} EXT_REG_AEN, *PEXT_REG_AEN;	/* 8 */
 
 /* EXT_GET_AEN Response struct */
-typedef struct _EXT_ASYNC_EVENT
-{
-        UINT32	AsyncEventCode;		/* 4 */
-        union {
-                struct {
-                        UINT8   RSCNInfo[EXT_DEF_PORTID_SIZE_ACTUAL];/* 3, BE */
-                        UINT8   AddrFormat;			/* 1 */
-                        UINT32  Rsvd_1[2];			/* 8 */
-                }
-                RSCN;
-
-                UINT32  Reserved[3];	/* 12 */
-        } Payload;
-}
-EXT_ASYNC_EVENT, *PEXT_ASYNC_EVENT;	/* 16 */
+typedef struct _EXT_ASYNC_EVENT {
+	UINT32	AsyncEventCode;		/* 4 */
+	union {
+		struct {
+			UINT8   RSCNInfo[EXT_DEF_PORTID_SIZE_ACTUAL];/* 3, BE */
+			UINT8   AddrFormat;			/* 1 */
+			UINT32  Rsvd_1[2];			/* 8 */
+		} RSCN;
+
+		UINT32  Reserved[3];	/* 12 */
+	} Payload;
+} EXT_ASYNC_EVENT, *PEXT_ASYNC_EVENT;	/* 16 */
 
 
 /* Asynchronous Event Codes */
@@ -829,9 +800,12 @@ EXT_ASYNC_EVENT, *PEXT_ASYNC_EVENT;	/* 1
 #define	EXT_DEF_LIP_RESET		0x8013
 #define	EXT_DEF_RSCN			0x8015
 #define	EXT_DEF_DEVICE_UPDATE		0x8014
+#define	EXT_DEF_ELS          		0x8200
 
 /* Required # of entries in the queue buffer allocated. */
 #define	EXT_DEF_MAX_AEN_QUEUE		EXT_DEF_MAX_AEN_QUEUE_OS
+#define	EXT_DEF_MAX_ELS_BUFS		EXT_DEF_MAX_ELS_BUFS_OS
+#define	EXT_DEF_SIZE_ELS_BUF		EXT_DEF_SIZE_ELS_BUF_OS
 
 /* Device type to get for EXT_SC_GET_PORT_SUMMARY */
 #define	EXT_DEF_GET_KNOWN_DEVICE	0x1
@@ -843,53 +817,47 @@ EXT_ASYNC_EVENT, *PEXT_ASYNC_EVENT;	/* 1
 /* Each entry in device database */
 typedef struct _EXT_DEVICEDATAENTRY
 {
-        UINT8		NodeWWN[8];	/* Node World Wide Name for device */
-        UINT8		PortWWN[8];	/* Port World Wide Name for device */
-        UINT8		PortID[3];	/* Current PortId for device */
-        UINT8		ControlFlags;	/* Control flag */
-        EXT_SCSI_ADDR	TargetAddress;	/* scsi address */
-        UINT32		DeviceFlags;	/* Flags for device */
-        UINT16		LoopID;		/* Loop ID */
-        UINT16		BaseLunNumber;
-        UINT32		Reserved[32];
-}
-EXT_DEVICEDATAENTRY, *PEXT_DEVICEDATAENTRY;
+	UINT8		NodeWWN[8];	/* Node World Wide Name for device */
+	UINT8		PortWWN[8];	/* Port World Wide Name for device */
+	UINT8		PortID[3];	/* Current PortId for device */
+	UINT8		ControlFlags;	/* Control flag */
+	EXT_SCSI_ADDR	TargetAddress;	/* scsi address */
+	UINT32		DeviceFlags;	/* Flags for device */
+	UINT16		LoopID;		/* Loop ID */
+	UINT16		BaseLunNumber;  
+	UINT32		Reserved[32];
+} EXT_DEVICEDATAENTRY, *PEXT_DEVICEDATAENTRY;
 
 /* Device database information */
 typedef struct _EXT_DEVICEDATA
 {
-        UINT32	TotalDevices;          /* Set to total number of device. */
-        UINT32	ReturnListEntryCount;  /* Set to number of device entries */
-        /* returned in list. */
-
-        EXT_DEVICEDATAENTRY  EntryList[1]; /* Variable length */
-}
-EXT_DEVICEDATA, *PEXT_DEVICEDATA;
+	UINT32	TotalDevices;          /* Set to total number of device. */
+	UINT32	ReturnListEntryCount;  /* Set to number of device entries */
+		                       /* returned in list. */
+
+	EXT_DEVICEDATAENTRY  EntryList[1]; /* Variable length */
+} EXT_DEVICEDATA, *PEXT_DEVICEDATA;
 
 
 /* Swap Target Device Data structure */
 typedef struct _EXT_SWAPTARGETDEVICE
 {
-        EXT_DEVICEDATAENTRY CurrentExistDevice;
-        EXT_DEVICEDATAENTRY NewDevice;
-}
-EXT_SWAPTARGETDEVICE, *PEXT_SWAPTARGETDEVICE;
+	EXT_DEVICEDATAENTRY CurrentExistDevice;
+	EXT_DEVICEDATAENTRY NewDevice;
+} EXT_SWAPTARGETDEVICE, *PEXT_SWAPTARGETDEVICE;
 
 /* LUN BitMask structure definition, array of 8bit bytes,
  * 1 bit per lun.  When bit == 1, the lun is masked.
  * Most significant bit of mask[0] is lun 0.
  * Least significant bit of mask[0] is lun 7.
  */
-typedef struct _EXT_LUN_BIT_MASK
-{
+typedef struct _EXT_LUN_BIT_MASK {
 #if ((EXT_DEF_MAX_LUN & 0x7) == 0)
-        UINT8	mask[EXT_DEF_MAX_LUN >> 3];
+	UINT8	mask[EXT_DEF_MAX_LUN >> 3];
 #else
-
-        UINT8	mask[(EXT_DEF_MAX_LUN + 8) >> 3 ];
+	UINT8	mask[(EXT_DEF_MAX_LUN + 8) >> 3 ];
 #endif
-}
-EXT_LUN_BIT_MASK, *PEXT_LUN_BIT_MASK;
+} EXT_LUN_BIT_MASK, *PEXT_LUN_BIT_MASK;
 
 /*
  * LUN mask bit manipulation macros
@@ -921,35 +889,33 @@ EXT_LUN_BIT_MASK, *PEXT_LUN_BIT_MASK;
 
 typedef struct _EXT_LUN_BITMASK_ENTRY
 {
-        UINT8	NodeName[EXT_DEF_WWN_NAME_SIZE];
-        UINT8	PortName[EXT_DEF_WWN_NAME_SIZE];
+	UINT8	NodeName[EXT_DEF_WWN_NAME_SIZE];
+	UINT8	PortName[EXT_DEF_WWN_NAME_SIZE];
 
-        UINT32	Reserved2;
-        UINT32	Reserved3;
-        UINT32	Reserved4;
-        UINT32	Reserved5;     /* Pad to 32-byte header.*/
-
-        UINT8	Bitmask[EXT_DEF_LUN_BITMASK_BYTES];
-}
-EXT_LUN_BITMASK_ENTRY, *PEXT_LUN_BITMASK_ENTRY;
+	UINT32	Reserved2;
+	UINT32	Reserved3;
+	UINT32	Reserved4;
+	UINT32	Reserved5;     /* Pad to 32-byte header.*/
+
+	UINT8	Bitmask[EXT_DEF_LUN_BITMASK_BYTES];
+} EXT_LUN_BITMASK_ENTRY, *PEXT_LUN_BITMASK_ENTRY;
 
 /* Structure as it is stored in the config file.*/
 typedef struct _LUN_BITMASK_LIST
 {
-        UINT16	Version;       /* Should be LUN_BITMASK_REGISTRY_VERSION */
-        UINT16	EntryCount;    /* Count of variable entries following.*/
-        UINT32	Reserved1;
-        UINT32	Reserved2;
-        UINT32	Reserved3;
-        UINT32	Reserved4;
-        UINT32	Reserved5;
-        UINT32	Reserved6;
-        UINT32	Reserved7;     /* Pad to 32-byte header.*/
+	UINT16	Version;       /* Should be LUN_BITMASK_REGISTRY_VERSION */
+	UINT16	EntryCount;    /* Count of variable entries following.*/
+	UINT32	Reserved1;
+	UINT32	Reserved2;
+	UINT32	Reserved3;
+	UINT32	Reserved4;
+	UINT32	Reserved5;
+	UINT32	Reserved6;
+	UINT32	Reserved7;     /* Pad to 32-byte header.*/
 
-        EXT_LUN_BITMASK_ENTRY BitmaskEntry[1]; /* Variable-length data.*/
+	EXT_LUN_BITMASK_ENTRY BitmaskEntry[1]; /* Variable-length data.*/
 
-}
-EXT_LUN_BITMASK_LIST, *PEXT_LUN_BITMASK_LIST;
+} EXT_LUN_BITMASK_LIST, *PEXT_LUN_BITMASK_LIST;
 
 
 #define	EXT_DEF_LUN_BITMASK_LIST_MIN_SIZE   \
@@ -959,6 +925,21 @@ EXT_LUN_BITMASK_LIST, *PEXT_LUN_BITMASK_
     (EXT_DEF_LUN_BITMASK_LIST_HEADER_SIZE + \
     (sizeof(EXT_DEF_LUN_BITMASK_ENTRY) * EXT_DEF_LUN_BITMASK_LIST_MAX_ENTRIES))
 
+/* Request Buffer for ELS PT*/
+#define EXT_DEF_WWPN_VALID  1
+#define EXT_DEF_WWNN_VALID  2
+#define EXT_DEF_PID_VALID   4
+typedef struct _EXT_ELS_PT_REQ {
+	UINT8     WWNN[EXT_DEF_WWN_NAME_SIZE];	/* 8 */
+	UINT8     WWPN[EXT_DEF_WWN_NAME_SIZE];	/* 8 */
+	UINT8     Id[EXT_DEF_PORTID_SIZE];  	/* 4 */
+	UINT16    ValidMask;			/* 2 */
+	UINT16    Lid;				/* 2 */
+	UINT16    Rxid;				/* 2 */
+	UINT16    AccRjt;			/* 2 */
+	UINT32    Reserved;			/* 4 */
+} EXT_ELS_PT_REQ, *PEXT_ELS_PT_REQ;		/* 32 */
+
 #ifdef _MSC_VER
 #pragma pack()
 #endif
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/qla2xxx/exioctln.h linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/qla2xxx/exioctln.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/qla2xxx/exioctln.h	2003-07-30 13:51:36.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/qla2xxx/exioctln.h	2003-07-30 10:28:03.000000000 +0200
@@ -2,7 +2,7 @@
 *                  QLOGIC LINUX SOFTWARE
 *
 * QLogic ISP2x00 device driver for Linux 2.4.x
-* Copyright (C) 2002 Qlogic Corporation
+* Copyright (C) 2003 QLogic Corporation
 * (www.qlogic.com)
 *
 * This program is free software; you can redistribute it and/or modify it
@@ -17,6 +17,25 @@
 ****************************************************************************/
 
 /*
+ * File Name: exioctln.h
+
+   Rev 14    February 25, 2003	RL
+             - Added EXT_CC_DRIVER_SPECIFIC ioctl command to return
+	       some driver specific data that can be used by API library
+	       to determine how to maintain backward compatibility
+	       of certain features.
+
+   Rev 13    January 31, 2003	RL
+             - Changed the value of EXT_DEF_USE_HBASELECT to avoid
+               conflicting with older implementation of FO API lib.
+
+   Rev 12    January 20, 2003	RL
+             - Added EXT_DEF_USE_HBASELECT definition for use by
+               the SETINSTANCE command.
+ 
+   Rev 11    December 10, 2002	RL
+             - Added EXT_CC_SEND_ELS_PASSTHRU_OS definition.
+ 
    Rev 10    October 26, 2001	RL
              - Corrected MAX_HBA, MAX_TARGET and MAX_LUN values to 255.
  
@@ -70,13 +89,9 @@
 #define	UINT64	void *
 #define BOOLEAN uint8_t
 
-typedef struct  track_instance
-{
-
-        int   handle;
-
-}
-track_instance_t;
+typedef struct  track_instance {
+	int   handle;
+} track_instance_t;
 
 
 #if BITS_PER_LONG <= 32
@@ -99,16 +114,27 @@ track_instance_t;
 
 #define EXT_DEF_MAX_AEN_QUEUE_OS        64
 
+#define EXT_DEF_FC_HEADER_LEN		24
+#define EXT_DEF_ELS_RJT_LENGTH		0x08	/* 8  */
+#define EXT_DEF_ELS_RPS_ACC_LENGTH	0x40	/* 64 */
+#define EXT_DEF_ELS_RLS_ACC_LENGTH	0x1C	/* 28 */
+
+#define EXT_DEF_USE_HBASELECT		0x02	/* bit 1: HbaSelect field now
+						 * used to specify destination
+						 * HBA of each command.
+						 * SetInstance cmd is now
+						 * issued only once during
+						 * API initialization.
+						 */
 
 
 /*****************/
 /* Command codes */
 /*****************/
 
-/****************************************************/
-/* These are regular command codes, starting from 0 */
-/****************************************************/
-
+/*************************************************************/
+/* These are regular/external command codes, starting from 0 */
+/*************************************************************/
 #define EXT_CC_QUERY_OS					/* QUERY */	\
     _IOWR(QLMULTIPATH_MAGIC, 0x00, sizeof(EXT_IOCTL))
 #define EXT_CC_SEND_FCCT_PASSTHRU_OS			/* FCCT_PASSTHRU */ \
@@ -127,7 +153,9 @@ track_instance_t;
 #define EXT_CC_SET_DATA_OS				/* SET_DATA */	\
     _IOWR(QLMULTIPATH_MAGIC, 0x07, sizeof(EXT_IOCTL))
 
+/*****************************************/
 /* following are internal command codes. */
+/*****************************************/
 #define EXT_CC_RESERVED0A_OS						\
     _IOWR(QLMULTIPATH_MAGIC, 0x08, sizeof(EXT_IOCTL))
 #define EXT_CC_RESERVED0B_OS						\
@@ -156,16 +184,22 @@ track_instance_t;
 #define EXT_CC_RESERVED0Z_OS						\
     _IOWR(QLMULTIPATH_MAGIC, 0x21, sizeof(EXT_IOCTL))
 
+/********************************************************/
+/* These are additional regular/external command codes. */
+/********************************************************/
+#define EXT_CC_SEND_ELS_PASSTHRU_OS					\
+    _IOWR(QLMULTIPATH_MAGIC, 0x30, sizeof(EXT_IOCTL))
+
 
 /********************************************************/
 /* Failover ioctl command codes range from 0xc0 to 0xdf */
 /********************************************************/
 
 
-/*
- * These are Linux driver implementation specific commands. Values
- * start from highest possible value and in decreasing order.
- */
+/*******************************************************************/
+/* These are Linux driver implementation specific commands. Values */
+/* start from highest possible value and in decreasing order.      */
+/*******************************************************************/
 
 #define EXT_CC_STARTIOCTL				/* STARTIOCTL */ \
     _IOWR(QLMULTIPATH_MAGIC, 0xff, sizeof(EXT_IOCTL))
@@ -173,8 +207,26 @@ track_instance_t;
     _IOWR(QLMULTIPATH_MAGIC, 0xfe, sizeof(EXT_IOCTL))
 #define	EXT_CC_WWPN_TO_SCSIADDR				/* WWPN_TO_SCSIADDR */ \
     _IOWR(QLMULTIPATH_MAGIC, 0xfd, sizeof(EXT_IOCTL))
+#define	EXT_CC_DRIVER_SPECIFIC				/* DRIVER_SPECIFIC */ \
+    _IOWR(QLMULTIPATH_MAGIC, 0xfc, sizeof(EXT_IOCTL))
 
 
+/*
+ * Response struct definition
+ */
+typedef struct _EXT_LN_DRV_VERSION {
+	UINT8	Major;
+	UINT8	Minor;
+	UINT8	Patch;
+	UINT8	Beta;
+	UINT8	Reserved[4];
+} EXT_LN_DRV_VERSION;				/* 8 */
+
+typedef struct _EXT_LN_DRIVER_DATA {
+	EXT_LN_DRV_VERSION  	DrvVer;		/* 8 */
+	UINT32    Reserved[14];			/* 56 */
+} EXT_LN_DRIVER_DATA, *PEXT_LN_DRIVER_DATA;	/* 64 */
+
 
 
 
@@ -192,7 +244,7 @@ track_instance_t;
  * c-brace-offset: -2
  * c-argdecl-indent: 2
  * c-label-offset: -2
- * c-continued-statement-offset: 2
+ * c-continued-statement-offset: 4
  * c-continued-brace-offset: 0
  * indent-tabs-mode: nil
  * tab-width: 8
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/qla2xxx/inioct.h linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/qla2xxx/inioct.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/qla2xxx/inioct.h	2003-07-30 13:51:36.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/qla2xxx/inioct.h	2003-07-30 10:28:03.000000000 +0200
@@ -2,7 +2,7 @@
  *                  QLOGIC LINUX SOFTWARE
  *
  * QLogic ISP2x00 device driver for Linux 2.4.x
- * Copyright (C) 2002 Qlogic Corporation
+ * Copyright (C) 2003 Qlogic Corporation
  * (www.qlogic.com)
  *
  * This program is free software; you can redistribute it and/or modify it
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/qla2xxx/listops.h linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/qla2xxx/listops.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/qla2xxx/listops.h	2003-07-30 13:51:36.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/qla2xxx/listops.h	2003-07-30 10:28:03.000000000 +0200
@@ -2,7 +2,7 @@
  *                  QLOGIC LINUX SOFTWARE
  *
  * QLogic ISP2x00 device driver for Linux 2.4.x
- * Copyright (C) 2002 Qlogic Corporation
+ * Copyright (C) 2003 Qlogic Corporation
  * (www.qlogic.com)
  *
  * This program is free software; you can redistribute it and/or modify it
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/qla2xxx/ql2100_fw.h linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/qla2xxx/ql2100_fw.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/qla2xxx/ql2100_fw.h	2003-07-30 13:51:36.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/qla2xxx/ql2100_fw.h	2003-07-30 10:28:03.000000000 +0200
@@ -2,7 +2,7 @@
  *                  QLOGIC LINUX SOFTWARE
  *
  * QLogic ISP2x00 device driver for Linux 2.4.x
- * Copyright (C) 2002 Qlogic Corporation
+ * Copyright (C) 2003 Qlogic Corporation
  * (www.qlogic.com)
  *
  * This program is free software; you can redistribute it and/or modify it
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/qla2xxx/ql2200_fw.h linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/qla2xxx/ql2200_fw.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/qla2xxx/ql2200_fw.h	2003-07-30 13:51:36.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/qla2xxx/ql2200_fw.h	2003-07-30 10:28:03.000000000 +0200
@@ -2,7 +2,7 @@
  *                  QLOGIC LINUX SOFTWARE
  *
  * QLogic ISP2x00 device driver for Linux 2.4.x
- * Copyright (C) 2002 Qlogic Corporation
+ * Copyright (C) 2003 Qlogic Corporation
  * (www.qlogic.com)
  *
  * This program is free software; you can redistribute it and/or modify it
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/qla2xxx/ql2200ip_fw.h linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/qla2xxx/ql2200ip_fw.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/qla2xxx/ql2200ip_fw.h	2003-07-30 13:51:36.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/qla2xxx/ql2200ip_fw.h	2003-07-30 10:28:03.000000000 +0200
@@ -2,7 +2,7 @@
  *                  QLOGIC LINUX SOFTWARE
  *
  * QLogic ISP2x00 device driver for Linux 2.4.x
- * Copyright (C) 2002 Qlogic Corporation
+ * Copyright (C) 2003 Qlogic Corporation
  * (www.qlogic.com)
  *
  * This program is free software; you can redistribute it and/or modify it
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/qla2xxx/ql2300_fw.h linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/qla2xxx/ql2300_fw.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/qla2xxx/ql2300_fw.h	2003-07-30 13:51:36.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/qla2xxx/ql2300_fw.h	2003-07-30 10:28:03.000000000 +0200
@@ -2,7 +2,7 @@
  *                  QLOGIC LINUX SOFTWARE
  *
  * QLogic ISP2x00 device driver for Linux 2.4.x
- * Copyright (C) 2002 Qlogic Corporation
+ * Copyright (C) 2003 Qlogic Corporation
  * (www.qlogic.com)
  *
  * This program is free software; you can redistribute it and/or modify it
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/qla2xxx/ql2300ip_fw.h linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/qla2xxx/ql2300ip_fw.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/qla2xxx/ql2300ip_fw.h	2003-07-30 13:51:37.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/qla2xxx/ql2300ip_fw.h	2003-07-30 10:28:03.000000000 +0200
@@ -2,7 +2,7 @@
  *                  QLOGIC LINUX SOFTWARE
  *
  * QLogic ISP2x00 device driver for Linux 2.4.x
- * Copyright (C) 2002 Qlogic Corporation
+ * Copyright (C) 2003 Qlogic Corporation
  * (www.qlogic.com)
  *
  * This program is free software; you can redistribute it and/or modify it
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/qla2xxx/qla2100.c linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/qla2xxx/qla2100.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/qla2xxx/qla2100.c	2003-07-30 13:51:37.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/qla2xxx/qla2100.c	2003-07-30 10:28:03.000000000 +0200
@@ -2,7 +2,7 @@
  *                  QLOGIC LINUX SOFTWARE
  *
  * QLogic ISP2x00 device driver for Linux 2.4.x
- * Copyright (C) 2002 Qlogic Corporation
+ * Copyright (C) 2003 Qlogic Corporation
  * (www.qlogic.com)
  *
  * This program is free software; you can redistribute it and/or modify it
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/qla2xxx/qla2200.c linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/qla2xxx/qla2200.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/qla2xxx/qla2200.c	2003-07-30 13:51:37.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/qla2xxx/qla2200.c	2003-07-30 10:28:03.000000000 +0200
@@ -2,7 +2,7 @@
  *                  QLOGIC LINUX SOFTWARE
  *
  * QLogic ISP2x00 device driver for Linux 2.4.x
- * Copyright (C) 2002 Qlogic Corporation
+ * Copyright (C) 2003 Qlogic Corporation
  * (www.qlogic.com)
  *
  * This program is free software; you can redistribute it and/or modify it
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/qla2xxx/qla2300.c linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/qla2xxx/qla2300.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/qla2xxx/qla2300.c	2003-07-30 13:51:37.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/qla2xxx/qla2300.c	2003-07-30 10:28:03.000000000 +0200
@@ -2,7 +2,7 @@
  *                  QLOGIC LINUX SOFTWARE
  *
  * QLogic ISP2x00 device driver for Linux 2.4.x
- * Copyright (C) 2002 Qlogic Corporation
+ * Copyright (C) 2003 Qlogic Corporation
  * (www.qlogic.com)
  *
  * This program is free software; you can redistribute it and/or modify it
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/qla2xxx/qla2x00.c linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/qla2xxx/qla2x00.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/qla2xxx/qla2x00.c	2003-07-30 13:51:37.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/qla2xxx/qla2x00.c	2003-07-30 10:28:04.000000000 +0200
@@ -33,9 +33,7 @@
 * Include files
 */
 #include <linux/config.h>
-#if defined(MODULE)
 #include <linux/module.h>
-#endif
 
 #if !defined(LINUX_VERSION_CODE)
 #include <linux/version.h>
@@ -105,9 +103,9 @@ static unsigned long mem_id[1000];
 * options would be SIGPWR, I suppose.
 */
 #define SHUTDOWN_SIGS	(sigmask(SIGHUP))
-#include "sd.h"
-#include "scsi.h"
-#include "hosts.h"
+#include "../sd.h"
+#include "../scsi.h"
+#include "../hosts.h"
 #ifdef __VMWARE__
 #include "vmklinux_dist.h"
 #endif
@@ -227,15 +225,33 @@ del_timer_sync(&(h)->timer); \
 
 typedef unsigned long paddr32_t;
 
+/* proc info string processing */
+struct info_str {
+	char	*buffer;
+	int	length;
+	off_t	offset;
+	int	pos;
+};
+
+
 /*
 *  Qlogic Driver support Function Prototypes.
 */
+STATIC void copy_mem_info(struct info_str *, char *, int);
+STATIC int copy_info(struct info_str *, char *, ...);
+
 STATIC uint8_t qla2x00_register_with_Linux(scsi_qla_host_t *ha,
 			uint8_t maxchannels);
 STATIC int qla2x00_done(scsi_qla_host_t *);
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
 STATIC void qla2x00_select_queue_depth(struct Scsi_Host *, Scsi_Device *);
 #endif
+
+#if defined (CONFIG_SCSIFCHOTSWAP) || defined(CONFIG_GAMAP)
+int qla2x00_get_scsi_info_from_wwn (int mode, unsigned long long wwn, int *host, int *channel, int *lun, int *id);
+int qla2x00_get_wwn_from_scsi_info (int host, int id, unsigned long long *wwn);
+#endif /* CONFIG_SCSIFCHOTSWAP || CONFIG_GAMAP */
+
 STATIC void qla2x00_timer(scsi_qla_host_t *);
 
 STATIC uint8_t qla2x00_mem_alloc(scsi_qla_host_t *);
@@ -244,6 +260,7 @@ static void qla2x00_dump_regs(struct Scs
 #if STOP_ON_ERROR
 static void qla2x00_panic(char *, struct Scsi_Host *host);
 #endif
+static 
 void qla2x00_print_scsi_cmd(Scsi_Cmnd *cmd);
 
 #if 0
@@ -251,7 +268,7 @@ STATIC void qla2x00_abort_pending_queue(
 #endif
 
 STATIC void qla2x00_mem_free(scsi_qla_host_t *ha);
-void qla2x00_do_dpc(void *p);
+STATIC void qla2x00_do_dpc(void *p);
 
 static inline void qla2x00_callback(scsi_qla_host_t *ha, Scsi_Cmnd *cmd);
 
@@ -319,14 +336,14 @@ STATIC uint8_t qla2x00_configure_hba(scs
 STATIC void qla2x00_reset_chip(scsi_qla_host_t *ha);
 
 STATIC void qla2x00_display_fc_names(scsi_qla_host_t *ha);
-void qla2x00_dump_requests(scsi_qla_host_t *ha);
+static void qla2x00_dump_requests(scsi_qla_host_t *ha);
 static void qla2x00_get_properties(scsi_qla_host_t *ha, char *string);
 STATIC uint8_t qla2x00_find_propname(scsi_qla_host_t *ha,
 		char *propname, char *propstr, char *db, int siz);
 static int qla2x00_get_prop_16chars(scsi_qla_host_t *ha,
 		char *propname, char *propval, char *cmdline);
 static char *qla2x00_get_line(char *str, char *line);
-void qla2x00_check_fabric_devices(scsi_qla_host_t *ha);
+static void qla2x00_check_fabric_devices(scsi_qla_host_t *ha);
 
 #if defined(FC_IP_SUPPORT)
 /* General support routines */
@@ -390,6 +407,7 @@ static uint8_t qla2x00_register_fc4(scsi
 static uint8_t qla2x00_gan(scsi_qla_host_t *, sns_cmd_rsp_t *, dma_addr_t,
 		fcdev_t *);
 static uint8_t qla2x00_fabric_login(scsi_qla_host_t *, fcdev_t *);
+static uint8_t qla2x00_local_device_login(scsi_qla_host_t *, uint16_t);
 
 STATIC uint8_t qla2x00_configure_loop(scsi_qla_host_t *);
 static uint8_t qla2x00_configure_local_loop(scsi_qla_host_t *, uint8_t );
@@ -399,16 +417,16 @@ STATIC uint8_t qla2x00_32bit_start_scsi(
 STATIC uint8_t qla2x00_64bit_start_scsi(srb_t *sp);
 
 /* Routines for Failover */
-os_tgt_t *qla2x00_tgt_alloc(scsi_qla_host_t *ha, uint16_t t);
+static os_tgt_t *qla2x00_tgt_alloc(scsi_qla_host_t *ha, uint16_t t);
 #if APIDEV
 static int apidev_init(struct Scsi_Host*);
 static int apidev_cleanup(void);
 #endif
-void qla2x00_tgt_free(scsi_qla_host_t *ha, uint16_t t);
-os_lun_t *qla2x00_lun_alloc(scsi_qla_host_t *ha, uint16_t t, uint16_t l);
+static void qla2x00_tgt_free(scsi_qla_host_t *ha, uint16_t t);
+static os_lun_t *qla2x00_lun_alloc(scsi_qla_host_t *ha, uint16_t t, uint16_t l);
 
 static void qla2x00_lun_free(scsi_qla_host_t *ha, uint16_t t, uint16_t l);
-void qla2x00_next(scsi_qla_host_t *vis_ha);
+static void qla2x00_next(scsi_qla_host_t *vis_ha);
 static int qla2x00_build_fcport_list(scsi_qla_host_t *ha);
 static void qla2x00_config_os(scsi_qla_host_t *ha);
 static uint16_t qla2x00_fcport_bind(scsi_qla_host_t *ha, fc_port_t *fcport);
@@ -422,19 +440,19 @@ STATIC void qla2x00_process_failover(scs
 STATIC int qla2x00_device_reset(scsi_qla_host_t *, uint16_t, uint16_t);
 
 static inline int qla2x00_is_wwn_zero(uint8_t *wwn);
-void qla2x00_get_lun_mask_from_config(scsi_qla_host_t *ha, fc_port_t *port,
+static void qla2x00_get_lun_mask_from_config(scsi_qla_host_t *ha, fc_port_t *port,
                                       uint16_t tgt, uint16_t dev_no);
-void 
+static void 
 qla2x00_print_q_info(os_lun_t *q);
 
 #if QLA2X_PERFORMANCE
-void qla2x00_done_tasklet(long p);
+static void qla2x00_done_tasklet(long p);
 #endif
 
 STATIC void qla2x00_failover_cleanup(srb_t *);
 void qla2x00_flush_failover_q(scsi_qla_host_t *, os_lun_t *);
 
-void qla2x00_chg_endian(uint8_t buf[], size_t size);
+static void qla2x00_chg_endian(uint8_t buf[], size_t size);
 STATIC uint8_t qla2x00_check_sense(Scsi_Cmnd *cp, os_lun_t *);
 
 STATIC uint8_t 
@@ -475,8 +493,8 @@ qla2x00_dump_word(uint8_t *, uint32_t, u
 STATIC void qla2x00_sleep_done (struct semaphore * sem);
 #endif
 
-uint8_t qla2x00_allocate_sp_pool( scsi_qla_host_t *ha);
-void qla2x00_free_sp_pool(scsi_qla_host_t *ha );
+STATIC uint8_t qla2x00_allocate_sp_pool( scsi_qla_host_t *ha);
+STATIC void qla2x00_free_sp_pool(scsi_qla_host_t *ha );
 STATIC srb_t * qla2x00_get_new_sp (scsi_qla_host_t *ha);
 STATIC uint8_t qla2x00_check_tgt_status(scsi_qla_host_t *ha, Scsi_Cmnd *cmd);
 STATIC uint8_t qla2x00_check_port_status(scsi_qla_host_t *ha,
@@ -617,7 +635,7 @@ qla2x00_add_initiator_device(scsi_qla_ho
 
 
 /* Debug print buffer */
-char          debug_buff[LINESIZE*3];
+static char          debug_buff[LINESIZE*3];
 
 /*
 * insmod needs to find the variable and make it point to something
@@ -780,8 +798,6 @@ static int qla2x00_lip = 0;
 
 #include "qla_debug.h"
 
-uint8_t copyright[48] = "Copyright 1999-2003, QLogic Corporation";
-
 /****************************************************************************/
 /*  LINUX -  Loadable Module Functions.                                     */
 /****************************************************************************/
@@ -941,10 +957,7 @@ int	mem_trace_ptr = 0;
  */
 static scsi_qla_host_t *qla2x00_hostlist = NULL;
 
-#if defined(QLA2100_PROFILE)
-static int qla2x00_buffer_size = 0;
-static char *qla2x00_buffer = NULL;
-#endif
+
 STATIC int qla2x00_retryq_dmp = 0;              /* dump retry queue */
 
 #include <linux/ioctl.h>
@@ -980,7 +993,7 @@ static uint8_t alpa_table[MAX_LOCAL_LOOP
 *
 * Returns:
 *************************************************************************/
-int
+static int
 qla2x00_set_info(char *buffer, int length, struct Scsi_Host *HBAptr)
 {
 	return (-ENOSYS);  /* Currently this is a no-op */
@@ -993,33 +1006,80 @@ qla2x00_set_info(char *buffer, int lengt
 #endif
 
 
+/*
+ * The following support functions are adopted to handle
+ * the re-entrant qla2x00_proc_info correctly.
+ */
+STATIC void
+copy_mem_info(struct info_str *info, char *data, int len)
+{
+	if (info->pos + len > info->offset + info->length)
+		len = info->offset + info->length - info->pos;
+
+	if (info->pos + len < info->offset) {
+		info->pos += len;
+		return;
+	}
+ 
+	if (info->pos < info->offset) {
+		off_t partial;
+ 
+		partial = info->offset - info->pos;
+		data += partial;
+		info->pos += partial;
+		len  -= partial;
+	}
+ 
+	if (len > 0) {
+		memcpy(info->buffer, data, len);
+		info->pos += len;
+		info->buffer += len;
+	}
+}
+
+STATIC int
+copy_info(struct info_str *info, char *fmt, ...)
+{
+	va_list args;
+	char buf[256];
+	int len;
+ 
+	va_start(args, fmt);
+	len = vsprintf(buf, fmt, args);
+	va_end(args);
+ 
+	copy_mem_info(info, buf, len);
+
+	return (len);
+}
+
 /*************************************************************************
 * qla2x00_proc_info
 *
 * Description:
 *   Return information to handle /proc support for the driver.
 *
-* inout : decides on the direction of the dataflow and the meaning of the
+* inout : decides the direction of the dataflow and the meaning of the
 *         variables
 * buffer: If inout==FALSE data is being written to it else read from it
-*         (ptrs to a page buffer)
+*         (ptr to a page buffer)
 * *start: If inout==FALSE start of the valid data in the buffer
-* offset: If inout==FALSE offset from the beginning of the imaginary file
-*         from which we start writing into the buffer
+* offset: If inout==FALSE starting offset from the beginning of all
+*         possible data to return.
 * length: If inout==FALSE max number of bytes to be written into the buffer
-*         else number of bytes in the buffer
+*         else number of bytes in "buffer"
 * Returns:
+*         < 0:  error. errno value.
+*         >= 0: sizeof data returned.
 *************************************************************************/
-#define	PROC_BUF	(&qla2x00_buffer[len])
-int
+static int
 qla2x00_proc_info(char *buffer, char **start, off_t offset,
 	          int length, int hostno, int inout)
 {
-#if QLA2100_PROFILE
 	struct Scsi_Host *host;
+	struct info_str	info;
 	int             i;
-	int             len = 0;
-	int             size = 0;
+	int             retval = -EINVAL;
 	os_lun_t	*up;
 	qla_boards_t    *bdp;
 	scsi_qla_host_t *ha;
@@ -1027,8 +1087,8 @@ qla2x00_proc_info(char *buffer, char **s
 	uint32_t        tmp_sn;
 	unsigned long   *flags;
 	struct list_head *list, *temp;
-	unsigned long    cpu_flags;
-	uint8_t	*loop_state;
+	unsigned long	cpu_flags;
+	uint8_t		*loop_state;
 
 #if REQ_TRACE
 
@@ -1037,375 +1097,334 @@ qla2x00_proc_info(char *buffer, char **s
 #endif
 
 	DEBUG3(printk(KERN_INFO
-			"Entering proc_info buff_in=%p, offset=0x%lx, "
-			"length=0x%x\n", buffer, offset, length);)
+	    "Entering proc_info buff_in=%p, offset=0x%lx, length=0x%x, "
+	    "hostno=%d\n", buffer, offset, length, hostno);)
 
 	host = NULL;
 
 	/* Find the host that was specified */
 	for (ha=qla2x00_hostlist; (ha != NULL) && ha->host->host_no != hostno;
-			ha=ha->next) {
+	    ha=ha->next) {
 		continue;
 	}
 
 	/* if host wasn't found then exit */
 	if (!ha) {
-		size = sprintf(buffer,
-				"Can't find adapter for host number %d\n", 
-				hostno);
+		DEBUG2_3(printk(KERN_WARNING
+		    "%s: Can't find adapter for host number %d\n", 
+		    __func__, hostno);)
 
-		if (size > length) {
-			return (size);
-		} else {
-			return (0);
-		}
+		return (retval);
 	}
 
 	host = ha->host;
 
-	if (inout == TRUE) /* Has data been written to the file? */
-	{
-		printk("qla2x00_proc: has data been written to the file. \n");
+	if (inout == TRUE) {
+		/* Has data been written to the file? */
+		DEBUG3(printk(
+		    "%s: has data been written to the file. \n",
+		    __func__);)
 		return (qla2x00_set_info(buffer, length, host));
 	}
 
-	/*
-	 * if our old buffer is the right size use it otherwise
-	 * allocate a new one.
-	 */
-	size = 4096 * 5;  /* get a page */
-	if (qla2x00_buffer_size != size) {
-		/* deallocate this buffer and get a new one */
-		if (qla2x00_buffer != NULL) {
-			kfree(qla2x00_buffer);
-			qla2x00_buffer_size = 0;
-		}
-		qla2x00_buffer = kmalloc(size, GFP_KERNEL);
+	if (start) {
+		*start = buffer;
 	}
 
-	if (qla2x00_buffer == NULL) {
-		size = sprintf(buffer,
-				"qla2100 - kmalloc error at line %d\n",
-				__LINE__);
-		return size;
-	}
+	info.buffer = buffer;
+	info.length = length;
+	info.offset = offset;
+	info.pos    = 0;
 
-	/* save the size of our buffer */
-	qla2x00_buffer_size = size;
 
 	/* start building the print buffer */
 	bdp = &QLBoardTbl_fc[ha->devnum];
-	size =  sprintf(PROC_BUF,
-			"QLogic PCI to Fibre Channel Host Adapter for "
+	copy_info(&info,
+	    "QLogic PCI to Fibre Channel Host Adapter for "
 #if defined(ISP2100)
-			"ISP2100:\n"
+	    "ISP2100:\n"
 #endif
 #if defined(ISP2200)
-			"ISP22xx:\n"
+	    "ISP22xx:\n"
 #endif
 #if defined(ISP2300)
-			"ISP23xx:\n"
+	    "ISP23xx:\n"
 #endif
-			"        Firmware version: %2d.%02d.%02d, "
-			"Driver version %s",
-			bdp->fwver[0], bdp->fwver[1], bdp->fwver[2], 
-			QLA2100_VERSION);
-
-	len += size;
+	    "        Firmware version: %2d.%02d.%02d, "
+	    "Driver version %s",
+	    bdp->fwver[0], bdp->fwver[1], bdp->fwver[2], 
+	    QLA2100_VERSION);
 
 	if (ha->flags.failover_enabled) {
-		size = sprintf(PROC_BUF, "-fo\n");
-		len += size;
-	}
-	else {
-		size = sprintf(PROC_BUF, "\n");
-		len += size;
+		copy_info(&info, "-fo\n");
+	} else {
+		copy_info(&info, "\n");
 	}
 
-	size = sprintf(PROC_BUF, "Entry address = %p\n",qla2x00_set_info);
-	len += size;
+	copy_info(&info, "Entry address = %p\n",qla2x00_set_info);
+
+	tmp_sn = ((ha->serial0 & 0x1f) << 16) | (ha->serial2 << 8) | 
+	    ha->serial1;
+	copy_info(&info, "HBA: %s, Serial# %c%05d\n",
+	    bdp->bdName, ('A' + tmp_sn/100000), (tmp_sn%100000));
+
+	copy_info(&info,
+	    "Request Queue = 0x%lx, Response Queue = 0x%lx\n",
+	    (long unsigned int)ha->request_dma,
+	    (long unsigned int)ha->response_dma);
+
+	copy_info(&info,
+	    "Request Queue count= %ld, Response Queue count= %ld\n",
+	    (long)REQUEST_ENTRY_CNT, (long)RESPONSE_ENTRY_CNT);
+
+	copy_info(&info,
+	    "Total number of active commands = %ld\n",
+	    ha->actthreads);
 
-	tmp_sn = ((ha->serial0 & 0x1f) << 16) | 
-		(ha->serial2 << 8) | 
-		ha->serial1;
-	size = sprintf(PROC_BUF, "HBA: %s, Serial# %c%05d\n",
-			bdp->bdName, ('A' + tmp_sn/100000), (tmp_sn%100000));
-	len += size;
-
-	size = sprintf(PROC_BUF,
-			"Request Queue = 0x%lx, Response Queue = 0x%lx\n",
-			(long unsigned int)ha->request_dma,
-			(long unsigned int)ha->response_dma);
-	len += size;
-
-	size = sprintf(PROC_BUF,
-			"Request Queue count= %ld, Response Queue count= %ld\n",
-			(long)REQUEST_ENTRY_CNT, (long)RESPONSE_ENTRY_CNT);
-	len += size;
-
-	size = sprintf(PROC_BUF,
-			"Total number of active commands = %ld\n",
-			ha->actthreads);
-	len += size;
-
-	size = sprintf(PROC_BUF,
-			"Total number of interrupts = %ld\n",
-		 	 (long)ha->total_isr_cnt);
-	len += size;
+	copy_info(&info,
+	    "Total number of interrupts = %ld\n",
+	    (long)ha->total_isr_cnt);
 
 #if defined(FC_IP_SUPPORT)
-	size = sprintf(PROC_BUF,
-			"Total number of active IP commands = %ld\n",
-			ha->ipreq_cnt);
-	len += size;
+	copy_info(&info,
+	    "Total number of active IP commands = %ld\n",
+	    ha->ipreq_cnt);
 #endif
 
 #if defined(IOCB_HIT_RATE)
-	size = sprintf(PROC_BUF,
-			"Total number of IOCBs (used/max/#hit) "
-			"= (%d/%d/%d)\n",
-			(int)ha->iocb_cnt,
-			(int)ha->iocb_hiwat,
-			(int)ha->iocb_overflow_cnt);
-#else
-	size = sprintf(PROC_BUF,
-			"Total number of IOCBs (used/max) "
-			"= (%d/%d)\n",
-			(int)ha->iocb_cnt, (int)ha->iocb_hiwat);
-#endif
-	len += size;
-
-
-	size = sprintf(PROC_BUF,
-			"Total number of queued commands = %d\n",
-			(max_srbs - ha->srb_cnt));
-	len += size;
-
-	size = sprintf(PROC_BUF,
-			"    Device queue depth = 0x%x\n",
-			(ql2xmaxqdepth == 0) ? 16 : ql2xmaxqdepth);
-	len += size;
-
-	size = sprintf(PROC_BUF,
-			"Number of free request entries = %d\n", ha->req_q_cnt);
-	len += size;
-
-	size = sprintf(PROC_BUF,
-			"Number of mailbox timeouts = %ld\n",
-			qla2x00_stats.mboxtout);
-	len += size;
-
-	size = sprintf(PROC_BUF,
-			"Number of ISP aborts = %ld\n",qla2x00_stats.ispAbort);
-	len += size;
-
-	size = sprintf(PROC_BUF,
-			"Number of loop resyncs = %ld\n",
-			qla2x00_stats.loop_resync);
-	len += size;
-
-	size = sprintf(PROC_BUF,
-			"Number of retries for empty slots = %ld\n",
-			qla2x00_stats.outarray_full);
-	len += size;
-
-	size = sprintf(PROC_BUF,
-			"Number of reqs in pending_q= %ld, retry_q= %d, "
-			"done_q= %ld, scsi_retry_q= %d\n",
-			ha->qthreads, ha->retry_q_cnt,
-			ha->done_q_cnt, ha->scsi_retry_q_cnt);
-	len += size;
+	copy_info(&info,
+	    "Total number of IOCBs (used/max/#hit) "
+	    "= (%d/%d/%d)\n",
+	    (int)ha->iocb_cnt,
+	    (int)ha->iocb_hiwat,
+	    (int)ha->iocb_overflow_cnt);
+#else
+	copy_info(&info,
+	    "Total number of IOCBs (used/max) "
+	    "= (%d/%d)\n",
+	    (int)ha->iocb_cnt, (int)ha->iocb_hiwat);
+#endif
+
+
+	copy_info(&info,
+	    "Total number of queued commands = %d\n",
+	    (max_srbs - ha->srb_cnt));
+
+	copy_info(&info,
+	    "    Device queue depth = 0x%x\n",
+	    (ql2xmaxqdepth == 0) ? 16 : ql2xmaxqdepth);
+
+	copy_info(&info,
+	    "Number of free request entries = %d\n", ha->req_q_cnt);
+
+	copy_info(&info,
+	    "Number of mailbox timeouts = %ld\n",
+	    qla2x00_stats.mboxtout);
+
+	copy_info(&info,
+	    "Number of ISP aborts = %ld\n",qla2x00_stats.ispAbort);
+
+	copy_info(&info,
+	    "Number of loop resyncs = %ld\n",
+	    qla2x00_stats.loop_resync);
+
+	copy_info(&info,
+	    "Number of retries for empty slots = %ld\n",
+	    qla2x00_stats.outarray_full);
+
+	copy_info(&info,
+	    "Number of reqs in pending_q= %ld, retry_q= %d, "
+	    "done_q= %ld, scsi_retry_q= %d\n",
+	    ha->qthreads, ha->retry_q_cnt,
+	    ha->done_q_cnt, ha->scsi_retry_q_cnt);
 
 	if (ha->flags.failover_enabled) {
-		size = sprintf(PROC_BUF,
-				"Number of reqs in failover_q= %d\n",
-				ha->failover_cnt);
-		len += size;
+		copy_info(&info,
+		    "Number of reqs in failover_q= %d\n",
+		    ha->failover_cnt);
 	}
 
 	flags = (unsigned long *) &ha->flags;
 
-	if (ha->loop_state == LOOP_DOWN)
+	if (ha->loop_state == LOOP_DOWN) {
 		loop_state = "DOWN";
-	else if (ha->loop_state ==LOOP_UP)
+	} else if (ha->loop_state ==LOOP_UP) {
 		loop_state = "UP";
-	else if (ha->loop_state ==LOOP_READY)
+	} else if (ha->loop_state ==LOOP_READY) {
 		loop_state = "READY";
-	else if (ha->loop_state ==LOOP_TIMEOUT)
+	} else if (ha->loop_state ==LOOP_TIMEOUT) {
 		loop_state = "TIMEOUT";
-	else if (ha->loop_state ==LOOP_UPDATE)
+	} else if (ha->loop_state ==LOOP_UPDATE) {
 		loop_state = "UPDATE";
-	else
+	} else {
 		loop_state = "UNKNOWN";
+	}
+
+	copy_info(&info, 
+	    "Host adapter:loop state= <%s>, flags= 0x%lx\n",
+	    loop_state , *flags);
+
+	copy_info(&info, "Dpc flags = 0x%lx\n", ha->dpc_flags);
+
+	copy_info(&info, "MBX flags = 0x%x\n", ha->mbx_flags);
+
+	copy_info(&info, "SRB Free Count = %d\n", ha->srb_cnt);
+
+	copy_info(&info, "Port down retry = %3.3d\n",
+	    ha->port_down_retry_count);
 
-	size = sprintf(PROC_BUF, 
-			"Host adapter:loop state= <%s>, flags= 0x%lx\n",
-			loop_state , *flags);
-	len += size;
-
-	size = sprintf(PROC_BUF, "Dpc flags = 0x%lx\n",ha->dpc_flags);
-	len += size;
-
-	size = sprintf(PROC_BUF, "MBX flags = 0x%x\n",ha->mbx_flags);
-	len += size;
-
-	size = sprintf(PROC_BUF, "SRB Free Count = %d\n",ha->srb_cnt);
-	len += size;
-
-	size = sprintf(PROC_BUF, "Port down retry = %3.3d\n",
-			ha->port_down_retry_count);
-	len += size;
-
-	size = sprintf(PROC_BUF, "Login retry count = %3.3d\n",
-			ha->login_retry_count);
-	len += size;
-
-	size = sprintf(PROC_BUF, "Commands retried with dropped frame(s) =%d\n",
-			ha->dropped_frame_error_cnt);
-	len += size;
+	copy_info(&info, "Login retry count = %3.3d\n",
+	    ha->login_retry_count);
 
-	size = sprintf(PROC_BUF, "\n");
-	len += size;
+	copy_info(&info,
+	    "Commands retried with dropped frame(s) = %d\n",
+	    ha->dropped_frame_error_cnt);
+
+	copy_info(&info, "\n");
 
 #if REQ_TRACE
 	if (qla2x00_req_dmp) {
-		size  = sprintf(PROC_BUF,
-				"Outstanding Commands on controller:\n");
-		len += size;
+		copy_info(&info,
+		    "Outstanding Commands on controller:\n");
 
 		for (i = 1; i < MAX_OUTSTANDING_COMMANDS; i++) {
-			if ((sp = ha->outstanding_cmds[i]) == NULL)
+			if ((sp = ha->outstanding_cmds[i]) == NULL) {
 				continue;
+			}
 
-			if ((cp = sp->cmd) == NULL)
+			if ((cp = sp->cmd) == NULL) {
 				continue;
+			}
 
-			size = sprintf(PROC_BUF, "(%d): Pid=%d, sp flags=0x%lx"
-					", cmd=0x%p, state=%d\n", 
-					i, 
-					(int)sp->cmd->serial_number, 
-					(long)sp->flags,
-					CMD_SP(sp->cmd),
-					(int)sp->state);
-			len += size;
+			copy_info(&info, "(%d): Pid=%d, sp flags=0x%lx"
+			    ", cmd=0x%p, state=%d\n", 
+			    i, 
+			    (int)sp->cmd->serial_number, 
+			    (long)sp->flags,
+			    CMD_SP(sp->cmd),
+			    (int)sp->state);
 
-			if (len >= qla2x00_buffer_size - 256)
+			if (info.pos >= info.offset + info.length) {
+				/* No need to continue */
 				goto profile_stop;
+			}
 		}
 	}
 #endif /* REQ_TRACE */
 
 	if (qla2x00_retryq_dmp) {
 		if (!list_empty(&ha->retry_queue)) {
-			size  = sprintf(PROC_BUF,
-					"qla%ld: Retry queue requests:\n",
-					ha->host_no);
-			len += size;
+			copy_info(&info,
+			    "qla%ld: Retry queue requests:\n",
+			    ha->host_no);
+
 			spin_lock_irqsave(&ha->list_lock, cpu_flags);
+
 			i = 0;
 			list_for_each_safe(list, temp, &ha->retry_queue) {
 				sp = list_entry(list, srb_t, list);
 				t = SCSI_TCN_32(sp->cmd);
 				l = SCSI_LUN_32(sp->cmd);
-				size = sprintf(PROC_BUF,
-						"%d: target=%d, lun=%d, "
-						"pid=%ld sp=%p, sp->flags=0x%x,"
-						"sp->state= %d\n", 
-						i, t, l, 
-						sp->cmd->serial_number, sp, 
-						sp->flags, sp->state );
-				len += size;
+
+				copy_info(&info,
+				    "%d: target=%d, lun=%d, "
+				    "pid=%ld sp=%p, sp->flags=0x%x,"
+				    "sp->state= %d\n", 
+				    i, t, l, 
+				    sp->cmd->serial_number, sp, 
+				    sp->flags, sp->state );
+
 				i++;
-				if (len >= qla2x00_buffer_size - 256)
+
+				if (info.pos >= info.offset + info.length) {
+					/* No need to continue */
 					goto profile_stop;
+				}
 			}
+
 			spin_unlock_irqrestore(&ha->list_lock, cpu_flags);
+
 		} /* if (!list_empty(&ha->retry_queue))*/
 	} /* if ( qla2x00_retryq_dmp )  */
 
 	/* 2.25 node/port display to proc */
 	/* Display the node name for adapter */
-	size = sprintf(PROC_BUF, "\nSCSI Device Information:\n");
-	len += size;
-	size = sprintf(PROC_BUF,
-			"scsi-qla%d-adapter-node="
-			"%02x%02x%02x%02x%02x%02x%02x%02x;\n",
-			(int)ha->instance,
-			ha->init_cb->node_name[0],
-			ha->init_cb->node_name[1],
-			ha->init_cb->node_name[2],
-			ha->init_cb->node_name[3],
-			ha->init_cb->node_name[4],
-			ha->init_cb->node_name[5],
-			ha->init_cb->node_name[6],
-			ha->init_cb->node_name[7]);
-	len += size;
+	copy_info(&info, "\nSCSI Device Information:\n");
+	copy_info(&info,
+	    "scsi-qla%d-adapter-node="
+	    "%02x%02x%02x%02x%02x%02x%02x%02x;\n",
+	    (int)ha->instance,
+	    ha->init_cb->node_name[0],
+	    ha->init_cb->node_name[1],
+	    ha->init_cb->node_name[2],
+	    ha->init_cb->node_name[3],
+	    ha->init_cb->node_name[4],
+	    ha->init_cb->node_name[5],
+	    ha->init_cb->node_name[6],
+	    ha->init_cb->node_name[7]);
 
 	/* display the port name for adapter */
-	size = sprintf(PROC_BUF,
-			"scsi-qla%d-adapter-port="
-			"%02x%02x%02x%02x%02x%02x%02x%02x;\n",
-			(int)ha->instance,
-			ha->init_cb->port_name[0],
-			ha->init_cb->port_name[1],
-			ha->init_cb->port_name[2],
-			ha->init_cb->port_name[3],
-			ha->init_cb->port_name[4],
-			ha->init_cb->port_name[5],
-			ha->init_cb->port_name[6],
-			ha->init_cb->port_name[7]);
-	len += size;
+	copy_info(&info,
+	    "scsi-qla%d-adapter-port="
+	    "%02x%02x%02x%02x%02x%02x%02x%02x;\n",
+	    (int)ha->instance,
+	    ha->init_cb->port_name[0],
+	    ha->init_cb->port_name[1],
+	    ha->init_cb->port_name[2],
+	    ha->init_cb->port_name[3],
+	    ha->init_cb->port_name[4],
+	    ha->init_cb->port_name[5],
+	    ha->init_cb->port_name[6],
+	    ha->init_cb->port_name[7]);
 
 	/* Print out device port names */
 	for (i = 0; i < MAX_FIBRE_DEVICES; i++) {
-		if (ha->fc_db[i].loop_id == PORT_UNUSED)
+		if (ha->fc_db[i].loop_id == PORT_UNUSED) {
 			continue;
+		}
 
 		if (ha->flags.failover_enabled) {
-			size = sprintf(PROC_BUF,
-					"scsi-qla%d-port-%d="
-					"%02x%02x%02x%02x%02x%02x%02x%02x:"
-					"%02x%02x%02x%02x%02x%02x%02x%02x;\n",
-					(int)ha->instance, i,
-					ha->fc_db[i].name[0],
-					ha->fc_db[i].name[1],
-					ha->fc_db[i].name[2],
-					ha->fc_db[i].name[3],
-					ha->fc_db[i].name[4],
-					ha->fc_db[i].name[5],
-					ha->fc_db[i].name[6],
-					ha->fc_db[i].name[7],
-					ha->fc_db[i].wwn[0],
-					ha->fc_db[i].wwn[1],
-					ha->fc_db[i].wwn[2],
-					ha->fc_db[i].wwn[3],
-					ha->fc_db[i].wwn[4],
-					ha->fc_db[i].wwn[5],
-					ha->fc_db[i].wwn[6],
-					ha->fc_db[i].wwn[7]);
+			copy_info(&info,
+			    "scsi-qla%d-port-%d="
+			    "%02x%02x%02x%02x%02x%02x%02x%02x:"
+			    "%02x%02x%02x%02x%02x%02x%02x%02x;\n",
+			    (int)ha->instance, i,
+			    ha->fc_db[i].name[0],
+			    ha->fc_db[i].name[1],
+			    ha->fc_db[i].name[2],
+			    ha->fc_db[i].name[3],
+			    ha->fc_db[i].name[4],
+			    ha->fc_db[i].name[5],
+			    ha->fc_db[i].name[6],
+			    ha->fc_db[i].name[7],
+			    ha->fc_db[i].wwn[0],
+			    ha->fc_db[i].wwn[1],
+			    ha->fc_db[i].wwn[2],
+			    ha->fc_db[i].wwn[3],
+			    ha->fc_db[i].wwn[4],
+			    ha->fc_db[i].wwn[5],
+			    ha->fc_db[i].wwn[6],
+			    ha->fc_db[i].wwn[7]);
 		} else {
-			size = sprintf(PROC_BUF,
-					"scsi-qla%d-target-%d="
-					"%02x%02x%02x%02x%02x%02x%02x%02x;\n",
-					(int)ha->instance, i,
-					ha->fc_db[i].wwn[0],
-					ha->fc_db[i].wwn[1],
-					ha->fc_db[i].wwn[2],
-					ha->fc_db[i].wwn[3],
-					ha->fc_db[i].wwn[4],
-					ha->fc_db[i].wwn[5],
-					ha->fc_db[i].wwn[6],
-					ha->fc_db[i].wwn[7]);
+			copy_info(&info,
+			    "scsi-qla%d-target-%d="
+			    "%02x%02x%02x%02x%02x%02x%02x%02x;\n",
+			    (int)ha->instance, i,
+			    ha->fc_db[i].wwn[0],
+			    ha->fc_db[i].wwn[1],
+			    ha->fc_db[i].wwn[2],
+			    ha->fc_db[i].wwn[3],
+			    ha->fc_db[i].wwn[4],
+			    ha->fc_db[i].wwn[5],
+			    ha->fc_db[i].wwn[6],
+			    ha->fc_db[i].wwn[7]);
 		}
 
-		len += size;
 	} /* 2.25 node/port display to proc */
 
-	size = sprintf(PROC_BUF, "\nSCSI LUN Information:\n");
-	len += size;
+	copy_info(&info, "\nSCSI LUN Information:\n");
 
-	size = sprintf(PROC_BUF, "(Id:Lun)\n");
-	len += size;
+	copy_info(&info, "(Id:Lun)\n");
 
 	/* scan for all equipment stats */
 	for (t = 0; t < MAX_FIBRE_DEVICES; t++) {
@@ -1413,97 +1432,74 @@ qla2x00_proc_info(char *buffer, char **s
 		for (l = 0; l < ha->max_luns; l++) {
 			up = (os_lun_t *) GET_LU_Q(ha, t, l);
 
-			if (up == NULL)
+			if (up == NULL) {
 				continue;
+			}
 
 			if (up->io_cnt == 0 || 
 #if SHOW_ONLY_SCSI_SCANNED_LUNS
 				up->io_cnt < 3 ||
 #endif
-				up->fclun == NULL)
+				up->fclun == NULL) {
 				continue;
+			}
 
-			if (up->fclun->flags & FC_DISCON_LUN)
+			if (up->fclun->flags & FC_DISCON_LUN) {
 				continue;
+			}
 
-			size = sprintf(PROC_BUF,
-					"(%2d:%2d): Total reqs %ld,",
-					t,l,up->io_cnt);
-			len += size;
-
-			size = sprintf(PROC_BUF,
-					" Pending reqs %ld,",
-					up->out_cnt);
-			len += size;
+			copy_info(&info,
+			    "(%2d:%2d): Total reqs %ld,",
+			    t,l,up->io_cnt);
+
+			copy_info(&info,
+			    " Pending reqs %ld,",
+			    up->out_cnt);
 
 			if (up->io_cnt < 3) {
-				size = sprintf(PROC_BUF,
-						" flags 0x%x*,",
-						(int)up->q_flag);
+				copy_info(&info,
+				    " flags 0x%x*,",
+				    (int)up->q_flag);
 			} else {
-				size = sprintf(PROC_BUF,
-						" flags 0x%x,",
-						(int)up->q_flag);
-			}
-			len += size;
-
-			size = sprintf(PROC_BUF, 
-					" %ld:%d:%02x,",
-					up->fclun->fcport->ha->instance,
-					up->fclun->fcport->cur_path,
-					up->fclun->fcport->loop_id);
-			len += size;
+				copy_info(&info,
+				    " flags 0x%x,",
+				    (int)up->q_flag);
+			}
+
+			copy_info(&info, 
+			    " %ld:%d:%02x,",
+			    up->fclun->fcport->ha->instance,
+			    up->fclun->fcport->cur_path,
+			    up->fclun->fcport->loop_id);
 
-			size = sprintf(PROC_BUF, "\n");
-			len += size;
+			copy_info(&info, "\n");
 
-			if (len >= qla2x00_buffer_size - 256)
+			if (info.pos >= info.offset + info.length) {
+				/* No need to continue */
 				goto profile_stop;
+			}
 		}
 
-		if (len >= qla2x00_buffer_size - 256)
+		if (info.pos >= info.offset + info.length) {
+			/* No need to continue */
 			break;
+		}
 	}
 
 profile_stop:
-	if (len >= qla2x00_buffer_size) {
-		printk(KERN_WARNING 
-			"qla2x00: Overflow buffer at line %d\n", __LINE__);
-	}
 
-	if (offset > len - 1 ) {
-		/*
-		 * dg 11/1 - Don't get rid of buffer other appications may be
-		 * using it.
-		 *
-		 * kfree(qla2x00_buffer);
-		 * qla2x00_buffer = NULL;
-		 * qla2x00_buffer_size = length = 0;
-		 */
-		*start = NULL;
-		length = 0;
-	} else {
-		*start = buffer;
-		if (len - offset < length) {
-			length = len - offset;
-		}
-		memcpy(buffer, &qla2x00_buffer[offset], length);
-	}
+	retval = info.pos > info.offset ? info.pos - info.offset : 0;
 
 	DEBUG3(printk(KERN_INFO 
-			"Exiting proc_info: qlabuff=%p, offset=0x%lx, "
-			"length=0x%x\n", qla2x00_buffer, offset, length);)
+	    "Exiting proc_info: info.pos=%d, offset=0x%lx, "
+	    "length=0x%x\n", info.pos, offset, length);)
 
 #if QLA2100_LIPTEST
 	qla2x00_lip = 1;
 #endif
 
-#else
+	return (retval);
 
-	return (0);
-#endif /* QLA2100_PROFILE */
-
-	return (length);
 }
  
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,3)
@@ -1646,7 +1642,7 @@ __sp_put(struct scsi_qla_host * ha, srb_
 * None.
 * Note:Need to add the support for if( sp->state == SRB_FAILOVER_STATE).
 **************************************************************************/
-void
+static void
 qla2x00_cmd_timeout(srb_t *sp)
 {
 	int t, l;
@@ -1884,7 +1880,7 @@ qla2x00_delete_timer_from_cmd(srb_t *sp 
 * Returns:
 *  num - number of host adapters found.
 **************************************************************************/
-int
+static int
 qla2x00_detect(Scsi_Host_Template *template)
 {
 	device_reg_t	*reg;
@@ -1958,8 +1954,7 @@ qla2x00_detect(Scsi_Host_Template *templ
 	template->proc_name = DRIVER_NAME;
 
 	/* Try and find each different type of adapter we support */
-	for (i = 0;
-		bdp->device_id != 0 && i < NUM_OF_ISP_DEVICES;
+	for (i = 0; bdp->device_id != 0 && i < NUM_OF_ISP_DEVICES;
 		i++, bdp++) {
 
 		/* PCI_SUBSYSTEM_IDS supported */
@@ -2244,9 +2239,9 @@ qla2x00_detect(Scsi_Host_Template *templ
 				qla2x00_mem_free(ha);
 
 #ifdef __VMWARE__
-                 /* No need to grab the lock just to call
-                  * scsi_unregister in the vmkernel.
-                  */
+				 /* No need to grab the lock just to call
+				  * scsi_unregister in the vmkernel.
+				  */
 #else
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
 				spin_lock_irq(&io_request_lock);
@@ -2277,10 +2272,19 @@ qla2x00_detect(Scsi_Host_Template *templ
 			WRT_REG_WORD(&reg->semaphore, 0);
 			WRT_REG_WORD(&reg->host_cmd, HC_CLR_RISC_INT);
 			WRT_REG_WORD(&reg->host_cmd, HC_CLR_HOST_INT);
+
+			/* Enable proper parity */
 #if defined(ISP2300)
-			/* Enable SRAM, Instruction RAM and GP RAM parity. */
-			WRT_REG_WORD(&reg->host_cmd, (HC_ENABLE_PARITY + 0x7));
+			if (ha->device_id == QLA2312_DEVICE_ID)
+				/* SRAM, Instruction RAM and GP RAM parity */
+				WRT_REG_WORD(&reg->host_cmd,
+				    (HC_ENABLE_PARITY + 0x7));
+			else
+				/* SRAM parity */
+				WRT_REG_WORD(&reg->host_cmd,
+				    (HC_ENABLE_PARITY + 0x1));
 #endif
+
 			spin_unlock_irqrestore(&ha->hardware_lock, flags);
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
@@ -2340,23 +2344,6 @@ qla2x00_detect(Scsi_Host_Template *templ
 				schedule_timeout(5);
 			}
 
-/* FlexServ Patch */
-#if defined(CONFIG_MD_MULTIHOST)
-			{
-				unsigned long	i;
-
-				union {
-					__u64	identifier;
-					char	wwn[WWN_SIZE];
-				} foo;
-
-				for (i = 0; i < WWN_SIZE; i++) {
-					foo.wwn[i] = ha->init_cb->port_name[i];
-				}
-				host->host_identifier = foo.identifier;
-			}
-#endif /* CONFIG_MD_MULTIHOST */
-
 			/* List the target we have found */
 			if (displayConfig && (!ha->flags.failover_enabled))
 				qla2x00_display_fc_names(ha);
@@ -2408,6 +2395,11 @@ qla2x00_register_with_Linux(scsi_qla_hos
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
 	host->select_queue_depths = qla2x00_select_queue_depth;
 #endif
+#if defined (CONFIG_SCSIFCHOTSWAP) || defined(CONFIG_GAMAP)
+	host->hostt->get_scsi_info_from_wwn = qla2x00_get_scsi_info_from_wwn;
+	host->hostt->get_wwn_from_scsi_info = qla2x00_get_wwn_from_scsi_info;
+#endif /* CONFIG_SCSIFCHOTSWAP || CONFIG_GAMAP */
+
 	host->n_io_port = 0xFF;
 
 #if MEMORY_MAPPED_IO
@@ -2425,6 +2417,24 @@ qla2x00_register_with_Linux(scsi_qla_hos
 	/* set our host ID  (need to do something about our two IDs) */
 	host->this_id = 255;
 
+#if defined(CONFIG_MD_MULTIHOST_FC)
+	{
+		unsigned long   i;
+		unsigned long   j;
+
+		union {
+			__u64   identifier;
+			char    wwn[WWN_SIZE];
+		} foo;
+
+		for (i = 0, j = WWN_SIZE-1; i < WWN_SIZE; i++, j--) {
+			foo.wwn[i] = ha->init_cb->port_name[j];
+		}
+
+		host->fc_wwn = foo.identifier;
+	}
+#endif /* CONFIG_MD_MULTIHOST_FC */
+
 	/* Register the I/O space with Linux */
 	if (check_region(host->io_port, 0xff)) {
 		printk(KERN_WARNING
@@ -2467,7 +2477,7 @@ qla2x00_register_with_Linux(scsi_qla_hos
 * Returns:
 *  0 - Always returns good status
 **************************************************************************/
-int
+static int
 qla2x00_release(struct Scsi_Host *host)
 {
 	scsi_qla_host_t *ha = (scsi_qla_host_t *) host->hostdata;
@@ -2568,11 +2578,6 @@ qla2x00_release(struct Scsi_Host *host)
 	if (ha->flags.failover_enabled)
 		qla2x00_cfg_mem_free(ha);
 
-	if (qla2x00_buffer != NULL) {
-		kfree(qla2x00_buffer);
-		qla2x00_buffer_size = 0;
-	}
-
 #if QL_TRACE_MEMORY
 	for (t = 0; t < 1000; t++) {
 		if (mem_trace[t] == 0L)
@@ -2600,7 +2605,7 @@ qla2x00_release(struct Scsi_Host *host)
 * Returns:
 *     Return a text string describing the driver.
 **************************************************************************/
-const char *
+static const char *
 qla2x00_info(struct Scsi_Host *host)
 {
 	static char qla2x00_buffer[255];
@@ -2801,7 +2806,7 @@ qla2x00_check_port_status(scsi_qla_host_
 * interrupt handler may call this routine as part of request-completion
 * handling).
 **************************************************************************/
-int
+static int
 qla2x00_queuecommand(Scsi_Cmnd *cmd, void (*fn)(Scsi_Cmnd *))
 {
 	fc_port_t	*fcport;
@@ -3108,7 +3113,7 @@ qla2x00_eh_wait_on_command(scsi_qla_host
 *
 * Note:
 **************************************************************************/
-int
+static int
 qla2xxx_eh_abort(Scsi_Cmnd *cmd)
 {
 	int		i;
@@ -3469,7 +3474,7 @@ qla2x00_eh_wait_for_pending_target_comma
 *    SUCCESS/FAILURE (defined as macro in scsi.h).
 *
 **************************************************************************/
-int
+static int
 qla2xxx_eh_device_reset(Scsi_Cmnd *cmd)
 {
 	int		return_status = SUCCESS;
@@ -3678,7 +3683,7 @@ qla2x00_eh_wait_for_pending_commands(scs
 *    SUCCESS/FAILURE (defined as macro in scsi.h).
 *
 **************************************************************************/
-int
+static int
 qla2xxx_eh_bus_reset(Scsi_Cmnd *cmd)
 {
 	int        return_status = SUCCESS;
@@ -3823,7 +3828,7 @@ qla2xxx_eh_bus_reset(Scsi_Cmnd *cmd)
 *
 * Note:
 **************************************************************************/
-int
+static int
 qla2xxx_eh_host_reset(Scsi_Cmnd *cmd)
 {
 	int		return_status = SUCCESS;
@@ -3994,7 +3999,7 @@ qla2xxx_eh_host_reset(Scsi_Cmnd *cmd)
 * Description:
 *   Return the disk geometry for the given SCSI device.
 **************************************************************************/
-int
+static int
 qla2x00_biosparam(Disk *disk, kdev_t dev, int geom[])
 {
 	int heads, sectors, cylinders;
@@ -4023,7 +4028,7 @@ qla2x00_biosparam(Disk *disk, kdev_t dev
 *
 * Context: Interrupt
 **************************************************************************/
-void
+static void
 qla2x00_intr_handler(int irq, void *dev_id, struct pt_regs *regs)
 {
 	unsigned long flags = 0;
@@ -4129,7 +4134,7 @@ qla2x00_intr_handler(int irq, void *dev_
  *      p -- pointer to hba struct
  *
  */
-void
+static void
 qla2x00_done_tasklet(long p)
 {
 	scsi_qla_host_t *ha = (scsi_qla_host_t *) p;
@@ -4161,7 +4166,7 @@ qla2x00_done_tasklet(long p)
 * the timer routine detects a event it will one of the task
 * bits then wake us up.
 **************************************************************************/
-void
+static void
 qla2x00_do_dpc(void *p)
 {
 #ifndef __VMWARE__
@@ -4485,13 +4490,13 @@ qla2x00_do_dpc(void *p)
 						fcport->login_retry) {
 
 						fcport->login_retry--;
-						memset(&dev, 0, sizeof(dev));
+						memset(&dev, 0, sizeof(fcdev_t));
 						dev.loop_id = fcport->old_loop_id;
 						dev.d_id.b24 = fcport->d_id.b24;
 						if(ha->fc_db[fcport->dev_id].flag & DEV_PUBLIC)	
 							status = qla2x00_fabric_login(ha, &dev);
 						else 	
-							status = qla2x00_login_local_device(ha, (dev.loop_id & 0xff), BIT_0 );
+							status = qla2x00_local_device_login(ha, (dev.loop_id & 0xff));
 
 						if (status == QL_STATUS_SUCCESS) {
 							ha->fc_db[fcport->dev_id].loop_id = dev.loop_id;
@@ -4672,7 +4677,7 @@ qla2x00_do_dpc(void *p)
 *   as the default queue depth.  Otherwise, we use either 4 or 8 as the
 *   default queue depth (dependent on the number of hardware SCBs).
 **************************************************************************/
-void
+static void
 qla2x00_device_queue_depth(scsi_qla_host_t *p, Scsi_Device *device)
 {
 	int default_depth = 16;
@@ -4723,6 +4728,108 @@ qla2x00_select_queue_depth(struct Scsi_H
 }
 #endif
 
+#if defined (CONFIG_SCSIFCHOTSWAP) || defined(CONFIG_GAMAP)
+union wwnmap {
+	unsigned long long wwn;
+	unsigned char wwn_u8[8];
+};
+
+int qla2x00_get_scsi_info_from_wwn (int mode,
+	unsigned long long wwn,
+	int *host,
+	int *channel,
+	int *lun,
+	int *id) {
+
+scsi_qla_host_t *list;
+Scsi_Device *scsi_device;
+union wwnmap wwncompare;
+union wwnmap wwncompare2;
+int i, j, k;
+
+	/*
+	 * Retrieve big endian version of world wide name
+	 */
+	wwncompare2.wwn = wwn;
+	for (j = 0, k=7; j < 8; j++, k--) {
+		wwncompare.wwn_u8[j] = wwncompare2.wwn_u8[k];
+	}
+
+	/*
+	 * query all hosts searching for WWN
+	 */
+	for (list = qla2x00_hostlist; list; list = list->next) {
+		for (i = 0; i < MAX_FIBRE_DEVICES; i++) {
+			/*
+			 * Scan all devices in FibreChannel database
+			 * if WWN match found, return SCSI device information
+			 */
+			if (memcmp (wwncompare.wwn_u8, list->fc_db[i].name, 8) == 0) {
+				/*
+				 * If inserting, avoid scan for channel and lun information
+				 */
+				if (mode == 0) {
+					*channel = 0;
+					*lun = 0;
+					*host = list->host->host_no;
+					*id = i;
+					return (0);
+				}
+			
+
+				/*
+				 * WWN matches, find channel and lun information from scsi
+				 * device
+				 */
+				for (scsi_device = list->host->host_queue; scsi_device; scsi_device = scsi_device->next) {
+					if (scsi_device->id == i) {
+						*channel = scsi_device->channel;
+						*lun = scsi_device->lun;
+						break;
+					}
+				}
+				if (scsi_device == 0) {
+					return (-ENOENT);
+				}
+				/*
+				 * Device found, return all data
+				 */
+				*host = list->host->host_no;
+				*id = i;
+				return (0);
+			} /* memcmp */
+		} /* i < MAXFIBREDEVICES */
+	}
+	return (-ENOENT);
+}
+
+int qla2x00_get_wwn_from_scsi_info (int host, int id, unsigned long long *wwn) {
+scsi_qla_host_t *list;
+union wwnmap wwnendian;
+union wwnmap wwnendian2;
+int j, k;
+
+	/*
+	 * Examine all QLogic hosts
+	 */
+	for (list = qla2x00_hostlist; list; list = list->next) {
+		if (host == list->host->host_no) {
+			/*
+			 * Get endian corrected 64 bit WWN
+			 */
+
+			memcpy (&wwnendian2.wwn, list->fc_db[id].name, 8);
+			for (j = 0, k=7; j < 8; j++, k--) {
+				wwnendian.wwn_u8[j] = wwnendian2.wwn_u8[k];
+			}
+			*wwn = wwnendian.wwn;
+			return (0);
+		}
+	}
+	return (-ENOENT);
+}
+#endif /* CONFIG_SCSIFCHOTSWAP || CONFIG_GAMAP */
+
 /**************************************************************************
 * ** Driver Support Routines **
 *
@@ -4780,11 +4887,19 @@ qla2x00_delete_from_done_queue(scsi_qla_
 					scsi_to_pci_dma_dir(
 						sp->cmd->sc_data_direction));
 		} else if (sp->cmd->request_bufflen) {
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,13)
+			pci_unmap_page(dest_ha->pdev,
+					sp->saved_dma_handle,
+					sp->cmd->request_bufflen,
+					scsi_to_pci_dma_dir(
+						sp->cmd->sc_data_direction));
+#else
 			pci_unmap_single(dest_ha->pdev,
 					sp->saved_dma_handle,
 					sp->cmd->request_bufflen,
 					scsi_to_pci_dma_dir(
 						sp->cmd->sc_data_direction));
+#endif
 		}
 #endif
 	}
@@ -4859,7 +4974,7 @@ qla2x00_done(scsi_qla_host_t *old_ha)
 
 		cmd = sp->cmd;
 		if (cmd == NULL) {
-#if  DEBUG_QLA2100
+#if  0
 			panic("qla2x00_done: SP %p already freed - %s %d.\n",
 			    sp, __FILE__,__LINE__);
 #else
@@ -4884,11 +4999,19 @@ qla2x00_done(scsi_qla_host_t *old_ha)
 				    scsi_to_pci_dma_dir(
 					    cmd->sc_data_direction));
 			} else if (cmd->request_bufflen) {
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,13)
+				pci_unmap_page(ha->pdev,
+					sp->saved_dma_handle,
+					cmd->request_bufflen,
+					scsi_to_pci_dma_dir(
+						cmd->sc_data_direction));
+#else
 				pci_unmap_single(ha->pdev,
 				    sp->saved_dma_handle,
 				    cmd->request_bufflen,
 				    scsi_to_pci_dma_dir(
 					    cmd->sc_data_direction));
+#endif
 			}
 #endif
 		}
@@ -6087,8 +6210,16 @@ qla2x00_initialize_adapter(scsi_qla_host
 				}
 
 				if (ha->flags.update_config_needed) {
-					ha->init_cb->additional_firmware_options.
-						connection_options = ha->operating_mode;
+					struct qla2x00_additional_firmware_options additional_firmware_options;
+
+					*((uint16_t *) &additional_firmware_options) =
+					    le16_to_cpu(*((uint16_t *) &ha->init_cb->additional_firmware_options));
+
+					additional_firmware_options.connection_options = ha->operating_mode;
+
+					*((uint16_t *) &ha->init_cb->additional_firmware_options) =
+					    cpu_to_le16( *((uint16_t *) &additional_firmware_options));
+
 					restart_risc = 1;
 				}
 
@@ -6504,7 +6635,7 @@ qla2x00_setup_chip(scsi_qla_host_t *ha)
 			__func__,
 			risc_code_size,
 			ha->request_ring,
-			ha->request_dma);)
+			(u64)ha->request_dma);)
 
 	/*
 	 * Save active FC4 type depending on firmware support. This info is
@@ -7258,6 +7389,10 @@ qla2x00_nvram_config(scsi_qla_host_t *ha
 	device_reg_t *reg = ha->iobase;
 	uint16_t  data;
 #endif
+	struct qla2xxx_host_p host_p;
+	struct qla2x00_firmware_options firmware_options;
+	struct qla2x00_additional_firmware_options additional_firmware_options;
+
 	uint8_t   status = 0;
 	uint8_t   chksum = 0;
 	uint16_t  cnt, base;
@@ -7300,8 +7435,8 @@ qla2x00_nvram_config(scsi_qla_host_t *ha
 #endif
 		/* Verify valid NVRAM checksum. */
 		for (cnt = 0; cnt < sizeof(nvram22_t)/2; cnt++) {
-	 	 	 *wptr = cpu_to_le16(
-				    qla2x00_get_nvram_word(ha, (cnt+base)));
+	 	 	*wptr = cpu_to_le16(
+			    qla2x00_get_nvram_word(ha, (cnt+base)));
 			chksum += (uint8_t)*wptr;
 			chksum += (uint8_t)(*wptr >> 8);
 			wptr++;
@@ -7339,34 +7474,59 @@ qla2x00_nvram_config(scsi_qla_host_t *ha
 			 * Set default initialization control block.
 			 */
 			nv->parameter_block_version = ICB_VERSION;
-			nv->firmware_options.enable_fairness = 1;
-			nv->firmware_options.enable_fast_posting = 1;
-			nv->firmware_options.enable_full_login_on_lip = 1;
-			nv->firmware_options.expanded_ifwcb = 1;
-
-			nv->frame_payload_size  = 1024;
-			nv->max_iocb_allocation = 256;
-			nv->execution_throttle  = 16;
+
+			*((uint16_t *) &firmware_options) =
+			    le16_to_cpu(*((uint16_t *) &nv->firmware_options));
+
+			firmware_options.enable_fairness = 1;
+			firmware_options.enable_fast_posting = 1;
+			firmware_options.enable_full_login_on_lip = 1;
+			firmware_options.expanded_ifwcb = 1;
+
+			*((uint16_t *) &nv->firmware_options) =
+			    cpu_to_le16(*((uint16_t *) &firmware_options));
+
+			nv->frame_payload_size  = __constant_cpu_to_le16(1024);
+			nv->max_iocb_allocation = __constant_cpu_to_le16(256);
+			nv->execution_throttle  = __constant_cpu_to_le16(16);
+
 			nv->retry_count         = 8;
 			nv->retry_delay         = 1;
 			nv->port_name[0]        = 32;
 			nv->port_name[3]        = 224;
 			nv->port_name[4]        = 139;
 			nv->login_timeout       = 4;
+
+			*((uint16_t *) &additional_firmware_options) =
+			    le16_to_cpu(*((uint16_t *)
+				&nv->additional_firmware_options));
+
+			additional_firmware_options.connection_options =
 #if defined(ISP2200)
-			nv->additional_firmware_options.connection_options =
 					P2P_LOOP;
 #else
-			nv->additional_firmware_options.connection_options =
 					LOOP_P2P;
 #endif
+
+			*((uint16_t *) &nv->additional_firmware_options) =
+			    cpu_to_le16(*((uint16_t *)
+				&additional_firmware_options));
+
 			/*
 			 * Set default host adapter parameters
 			 */
-			nv->host_p.enable_lip_full_login = 1;
+
+			*((uint16_t *) &host_p) =
+			    le16_to_cpu(*((uint16_t *) &nv->host_p));
+
+			host_p.enable_lip_full_login = 1;
+
+			*((uint16_t *) &nv->host_p) =
+			    cpu_to_le16(*((uint16_t *) &host_p));
+
 			nv->reset_delay = 5;
 			nv->port_down_retry_count = 8;
-			nv->maximum_luns_per_target = 8;
+			nv->maximum_luns_per_target = __constant_cpu_to_le16(8);
 			status = 1;
 		}
 
@@ -7391,52 +7551,71 @@ qla2x00_nvram_config(scsi_qla_host_t *ha
 		while (cnt--)
 			*dptr1++ = *dptr2++;
 
-		/* HBA node name 0 correction */
-		for (cnt=0 ; cnt<8 ; cnt++) {
-			if (icb->node_name[cnt] != 0)
-				break;
-		}
-		if (cnt == 8) {
-			for (cnt= 0 ; cnt < 8 ; cnt++)
-				icb->node_name[cnt] = icb->port_name[cnt];
-			icb->node_name[0] = icb->node_name[0] & ~BIT_0;
-			icb->port_name[0] = icb->port_name[0] |  BIT_0;
+		/*
+		 * Get the three bit fields.
+		 */
+		*((uint16_t *) &firmware_options) =
+		    le16_to_cpu(*((uint16_t *) &icb->firmware_options));
+
+		*((uint16_t *) &additional_firmware_options) =
+		    le16_to_cpu(*((uint16_t *)
+			&icb->additional_firmware_options));
+
+		*((uint16_t *) &host_p) =
+		    le16_to_cpu(*((uint16_t *) &nv->host_p));
+
+		if (!firmware_options.node_name_option) {
+			/*
+			 * Firmware will apply the following mask if the
+			 * nodename was not provided.
+			 */
+			memcpy(icb->node_name, icb->port_name, WWN_SIZE);
+			icb->node_name[0] &= 0xF0;
 		}
 
 		/*
 		 * Setup driver firmware options.
 		 */
-		icb->firmware_options.enable_full_duplex       = 0;
-		icb->firmware_options.enable_target_mode       = 0;
-		icb->firmware_options.disable_initiator_mode   = 0;
-		icb->firmware_options.enable_port_update_event = 1;
-		icb->firmware_options.enable_full_login_on_lip = 1;
+
+		firmware_options.enable_full_duplex       = 0;
+		firmware_options.enable_target_mode       = 0;
+		firmware_options.disable_initiator_mode   = 0;
+		firmware_options.enable_port_update_event = 1;
+		firmware_options.enable_full_login_on_lip = 1;
 #if defined(ISP2300)
-		icb->firmware_options.enable_fast_posting = 0;
+		firmware_options.enable_fast_posting = 0;
 #endif
 #if !defined(FC_IP_SUPPORT)
 		/* Enable FC-Tape support */
-		icb->firmware_options.node_name_option = 1;
-		icb->firmware_options.expanded_ifwcb = 1;
-		icb->additional_firmware_options.enable_fc_tape = 1;
-		icb->additional_firmware_options.enable_fc_confirm = 1;
+		firmware_options.expanded_ifwcb = 1;
+		additional_firmware_options.enable_fc_tape = 1;
+		additional_firmware_options.enable_fc_confirm = 1;
 #endif
 		/*
 		 * Set host adapter parameters
 		 */
-		ha->flags.enable_target_mode = icb->firmware_options.enable_target_mode;
-		ha->flags.disable_luns = nv->host_p.disable_luns;
-		ha->flags.disable_risc_code_load = nv->host_p.disable_risc_code_load;
-		ha->flags.set_cache_line_size_1 = nv->host_p.set_cache_line_size_1;
-		ha->flags.enable_64bit_addressing = nv->host_p.enable_64bit_addressing;
+		ha->flags.enable_target_mode = firmware_options.enable_target_mode;
+		ha->flags.disable_luns = host_p.disable_luns;
+		ha->flags.disable_risc_code_load = host_p.disable_risc_code_load;
+		ha->flags.set_cache_line_size_1 = host_p.set_cache_line_size_1;
+		ha->flags.enable_64bit_addressing = host_p.enable_64bit_addressing;
 
 		qla2x00_config_dma_addressing(ha);
 
-		ha->flags.enable_lip_reset = nv->host_p.enable_lip_reset;
-		ha->flags.enable_lip_full_login = nv->host_p.enable_lip_full_login;
-		ha->flags.enable_target_reset = nv->host_p.enable_target_reset;
-		ha->flags.enable_flash_db_update = nv->host_p.enable_database_storage;
-		ha->operating_mode = icb->additional_firmware_options.connection_options;
+		ha->flags.enable_lip_reset = host_p.enable_lip_reset;
+		ha->flags.enable_lip_full_login = host_p.enable_lip_full_login;
+		ha->flags.enable_target_reset = host_p.enable_target_reset;
+		ha->flags.enable_flash_db_update = host_p.enable_database_storage;
+		ha->operating_mode = additional_firmware_options.connection_options;
+
+		/*
+		 * Put back any changes made to the bit fields.
+		 */
+		*((uint16_t *) &icb->firmware_options) =
+		    cpu_to_le16(*((uint16_t *) &firmware_options));
+
+		*((uint16_t *) &icb->additional_firmware_options) =
+		    cpu_to_le16(*((uint16_t *) &additional_firmware_options));
 
 		/* new for IOCTL support of APIs */
 		ha->node_name[0] = icb->node_name[0];
@@ -7449,13 +7628,12 @@ qla2x00_nvram_config(scsi_qla_host_t *ha
 		ha->node_name[7] = icb->node_name[7];
 		ha->nvram_version = nv->nvram_version;
 
-
-		ha->hiwat = icb->iocb_allocation;
-		ha->execution_throttle = nv->execution_throttle;
+		ha->hiwat = le16_to_cpu(icb->iocb_allocation);
+		ha->execution_throttle = le16_to_cpu(nv->execution_throttle);
 		if (nv->login_timeout < ql2xlogintimeout)
 			nv->login_timeout = ql2xlogintimeout;
 
-		icb->execution_throttle = cpu_to_le16(0xffff); /* set to max */
+		icb->execution_throttle = __constant_cpu_to_le16(0xFFFF);
 		ha->retry_count = nv->retry_count;
 		/* Set minimum login_timeout to 4 seconds. */
 		if (nv->login_timeout < 4)
@@ -7479,10 +7657,10 @@ qla2x00_nvram_config(scsi_qla_host_t *ha
 		/* save OEM related items for QLA2200s and QLA2300s */
 		ha->oem_id = nv->oem_id;
 		ha->oem_spare0 = nv->oem_spare0;
-		for (cnt= 2 ; cnt < 8 ; cnt++)
+		for (cnt = 2; cnt < 8; cnt++)
 			ha->oem_string[cnt] = nv->oem_string[cnt];
 
-		for (cnt= 0 ; cnt < 8 ; cnt++) {
+		for (cnt = 0; cnt < 8; cnt++) {
 			ha->oem_part[cnt] = nv->oem_part[cnt];
 			ha->oem_fru[cnt] = nv->oem_fru[cnt];
 			ha->oem_ec[cnt] = nv->oem_ec[cnt];
@@ -7492,7 +7670,7 @@ qla2x00_nvram_config(scsi_qla_host_t *ha
 		memcpy(ha->ip_port_name, nv->port_name, WWN_SIZE);
 #endif
 
-		ha->max_probe_luns = nv->maximum_luns_per_target;
+		ha->max_probe_luns = le16_to_cpu(nv->maximum_luns_per_target);
 
 		/* High-water mark of IOCBs */
 		ha->iocb_hiwat = MAX_IOCBS_AVAILBALE;
@@ -7501,7 +7679,7 @@ qla2x00_nvram_config(scsi_qla_host_t *ha
 		if (!nv->maximum_luns_per_target)
 			ha->max_luns = MAX_LUNS;
 		else if (nv->maximum_luns_per_target < MAX_LUNS)
-			ha->max_luns = nv->maximum_luns_per_target;
+			ha->max_luns = le16_to_cpu(nv->maximum_luns_per_target);
 		else
 			ha->max_luns = MAX_LUNS;
 #else
@@ -7532,8 +7710,8 @@ qla2x00_nvram_config(scsi_qla_host_t *ha
 #endif
 		/* Set login_retry_count */
 		ha->login_retry_count  = nv->retry_count;
-		if ( ha->port_down_retry_count == nv->port_down_retry_count &&
-			ha->port_down_retry_count > 3 )
+		if (ha->port_down_retry_count == nv->port_down_retry_count &&
+			ha->port_down_retry_count > 3)
 			ha->login_retry_count = ha->port_down_retry_count;
 		else if ( ha->port_down_retry_count > ha->login_retry_count )
 			ha->login_retry_count = ha->port_down_retry_count;
@@ -7776,7 +7954,7 @@ qla2x00_poll(scsi_qla_host_t *ha)
 * Returns:
 *      0 = success
 */
-int
+static int
 qla2x00_restart_isp(scsi_qla_host_t *ha)
 {
 	uint8_t		status = 0;
@@ -7796,11 +7974,22 @@ qla2x00_restart_isp(scsi_qla_host_t *ha)
 			WRT_REG_WORD(&reg->host_cmd, (HC_ENABLE_PARITY + 0x0));
 			spin_unlock_irqrestore(&ha->hardware_lock, flags);
 #endif
+
 			status = qla2x00_setup_chip(ha);
+
 #if defined(ISP2300)
 			spin_lock_irqsave(&ha->hardware_lock, flags);
-			/* Enable SRAM, Instruction RAM and GP RAM parity. */
-			WRT_REG_WORD(&reg->host_cmd, (HC_ENABLE_PARITY + 0x7));
+
+			/* Enable proper parity */
+			if (ha->device_id == QLA2312_DEVICE_ID)
+				/* SRAM, Instruction RAM and GP RAM parity */
+				WRT_REG_WORD(&reg->host_cmd,
+				    (HC_ENABLE_PARITY + 0x7));
+			else
+				/* SRAM parity */
+				WRT_REG_WORD(&reg->host_cmd,
+				    (HC_ENABLE_PARITY + 0x1));
+
 			spin_unlock_irqrestore(&ha->hardware_lock, flags);
 #endif
 		}
@@ -8140,14 +8329,15 @@ qla2x00_loop_reset(scsi_qla_host_t *ha)
 		}
 	}
 
-#ifndef __VMWARE__NO_BUG_FIX
+	if (
+
+#ifdef __VMWARE__NO_BUG_FIX
+		status == QL_STATUS_SUCCESS &&
+#else
    /* Do not look at status, since it may very well be the result of
     * the last target reset and will not tell whether the lip_reset
     * was completed successfully!!!
     */
-    if (
-#else
-	if (status == QL_STATUS_SUCCESS &&
 #endif
 		((!ha->flags.enable_target_reset && 
 		  !ha->flags.enable_lip_reset) ||
@@ -8481,7 +8671,7 @@ qla2x00_64bit_start_scsi(srb_t *sp)
 	failed = qla2x00_check_request_ring(ha,
 			tot_iocbs, req_ring_index, &req_q_cnt);
 	if (failed)
-		goto queuing_error;
+		goto queuing_error_64;
 
 	/* Check for room in outstanding command list. */
 	found = 0;
@@ -8501,7 +8691,7 @@ qla2x00_64bit_start_scsi(srb_t *sp)
 				"req_q_cnt=%lx.\n",
 				__func__,
 				(u_long)ha->req_q_cnt);)
-		goto queuing_error;
+		goto queuing_error_64;
 	}
 
 	/*
@@ -8604,20 +8794,21 @@ qla2x00_64bit_start_scsi(srb_t *sp)
 #if defined(SANE_USAGE_OF_CMD_DIRECTION)
 		/* Set transfer direction */
 #ifndef __VMWARE__
-		if (cmd->sc_data_direction == SCSI_DATA_WRITE)
+		if (cmd->sc_data_direction == SCSI_DATA_WRITE) {
 			cmd_pkt->control_flags |=
-				__constant_cpu_to_le16(CF_WRITE);
-		else if (cmd->sc_data_direction == SCSI_DATA_READ)
+			    __constant_cpu_to_le16(CF_WRITE);
+		} else if (cmd->sc_data_direction == SCSI_DATA_READ) {
 			cmd_pkt->control_flags |=
-				__constant_cpu_to_le16(CF_READ);
-		else {
+			    __constant_cpu_to_le16(CF_READ);
+		} else
 #else
 		/* Always set the data direction here, since the vmkernel
 		 * does not do it for us (otherwise it will hold a default
 		 * value of zero, which means SCSI_DATA_WRITE)
 		 */
-		if (1) {
+		if (1)
 #endif //__VMWARE__
+		{
 			switch (cmd->data_cmnd[0]) {
 				case FORMAT_UNIT:
 				case WRITE_6:
@@ -8710,7 +8901,7 @@ qla2x00_64bit_start_scsi(srb_t *sp)
 							req_ring_index,
 							&req_q_cnt);
 					if (failed) {
-						goto mapped_queuing_error;
+						goto mapped_queuing_error_64;
 					}
 
 					cont_pkt = qla2x00_prep_a64_cont_packet(
@@ -8753,7 +8944,7 @@ qla2x00_64bit_start_scsi(srb_t *sp)
 								&req_q_cnt);
 						if (failed)
 							goto
-							   mapped_queuing_error;
+							   mapped_queuing_error_64;
 
 						cont_pkt =
 						  qla2x00_prep_a64_cont_packet(
@@ -8797,12 +8988,26 @@ qla2x00_64bit_start_scsi(srb_t *sp)
 			*/
 			req_dma = (unsigned long)cmd->request_buffer;
 #else
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,13)
+			struct page *page = virt_to_page(cmd->request_buffer);
+			unsigned long offset = ((unsigned long)
+						 cmd->request_buffer 
+						 & ~PAGE_MASK);
+
+			req_dma = pci_map_page(ha->pdev,
+					page,
+					offset,
+					cmd->request_bufflen,
+					scsi_to_pci_dma_dir(
+					cmd->sc_data_direction));
+#else
 			req_dma = pci_map_single(ha->pdev,
 					cmd->request_buffer,
 					cmd->request_bufflen,
 					scsi_to_pci_dma_dir(
 						cmd->sc_data_direction));
 #endif
+#endif
 			req_len = cmd->request_bufflen;
 
 			sp->saved_dma_handle = req_dma;
@@ -8882,13 +9087,13 @@ qla2x00_64bit_start_scsi(srb_t *sp)
 	spin_unlock_irqrestore(&ha->hardware_lock, flags);
 	return (0);
 
-mapped_queuing_error:
+mapped_queuing_error_64:
 #ifndef __VMWARE__
 	pci_unmap_sg(ha->pdev, (struct scatterlist *)cmd->request_buffer,
 		cmd->use_sg, scsi_to_pci_dma_dir(cmd->sc_data_direction));
 #endif
 
-queuing_error:
+queuing_error_64:
 	spin_unlock_irqrestore(&ha->hardware_lock, flags);
 	return (1);
 }
@@ -8977,7 +9182,7 @@ qla2x00_32bit_start_scsi(srb_t *sp)
 	failed = qla2x00_check_request_ring(ha,
 			tot_iocbs, req_ring_index, &req_q_cnt);
 	if (failed)
-		goto queuing_error;
+		goto queuing_error_32;
 
 	/* Check for room in outstanding command list. */
 	found = 0;
@@ -8997,7 +9202,7 @@ qla2x00_32bit_start_scsi(srb_t *sp)
 				"req_q_cnt=%lx.\n",
 				__func__,
 				(u_long)ha->req_q_cnt);)
-		goto queuing_error;
+		goto queuing_error_32;
 	}
 
 	/*
@@ -9100,20 +9305,21 @@ qla2x00_32bit_start_scsi(srb_t *sp)
 #if defined(SANE_USAGE_OF_CMD_DIRECTION)
 #ifndef __VMWARE__
 		/* Set transfer direction */
-		if (cmd->sc_data_direction == SCSI_DATA_WRITE)
+		if (cmd->sc_data_direction == SCSI_DATA_WRITE) {
 			cmd_pkt->control_flags |=
 				__constant_cpu_to_le16(CF_WRITE);
-		else if (cmd->sc_data_direction == SCSI_DATA_READ)
+		} else if (cmd->sc_data_direction == SCSI_DATA_READ) {
 			cmd_pkt->control_flags |=
 				__constant_cpu_to_le16(CF_READ);
-		else {
+		} else
 #else
 		/* Always set the data direction here, since the vmkernel
 		 * does not do it for us (otherwise it will hold a default
 		 * value of zero, which means SCSI_DATA_WRITE)
 		 */
-		if (1) {
+		if (1)
 #endif //__VMWARE__
+		{
 			switch (cmd->data_cmnd[0]) {
 				case FORMAT_UNIT:
 				case WRITE_6:
@@ -9203,7 +9409,7 @@ qla2x00_32bit_start_scsi(srb_t *sp)
 							req_ring_index,
 							&req_q_cnt);
 					if (failed) {
-						goto mapped_queuing_error;
+						goto mapped_queuing_error_32;
 					}
 
 					cont_pkt = qla2x00_prep_cont_packet(
@@ -9243,12 +9449,26 @@ qla2x00_32bit_start_scsi(srb_t *sp)
 			 */
 			req_dma = (unsigned long)cmd->request_buffer;
 #else
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,13)
+			struct page *page = virt_to_page(cmd->request_buffer);
+			unsigned long offset = ((unsigned long)
+						 cmd->request_buffer 
+						 & ~PAGE_MASK);
+
+			req_dma = pci_map_page(ha->pdev,
+					page,
+					offset,
+					cmd->request_bufflen,
+					scsi_to_pci_dma_dir(
+					cmd->sc_data_direction));
+#else
 			req_dma = pci_map_single(ha->pdev,
 					cmd->request_buffer,
 					cmd->request_bufflen,
 					scsi_to_pci_dma_dir(
 						cmd->sc_data_direction));
 #endif
+#endif
 			req_len = cmd->request_bufflen;
 
 			sp->saved_dma_handle = req_dma;
@@ -9312,13 +9532,13 @@ qla2x00_32bit_start_scsi(srb_t *sp)
 	spin_unlock_irqrestore(&ha->hardware_lock, flags);
 	return (0);
 
-mapped_queuing_error:
+mapped_queuing_error_32:
 #ifndef __VMWARE__
 	pci_unmap_sg(ha->pdev, (struct scatterlist *)cmd->request_buffer,
 		cmd->use_sg, scsi_to_pci_dma_dir(cmd->sc_data_direction));
 #endif
 
-queuing_error:
+queuing_error_32:
 	spin_unlock_irqrestore(&ha->hardware_lock, flags);
 	return (1);
 }
@@ -9596,7 +9816,7 @@ qla2x00_enable_lun(scsi_qla_host_t *ha)
 		pkt->entry_type = ENABLE_LUN_TYPE;
 		pkt->command_count = 32;
 		pkt->immed_notify_count = 1;
-		pkt->timeout = __constant_cpu_to_le16(0xffff);
+		pkt->timeout = __constant_cpu_to_le16(0xFFFF);
 
 		/* Issue command to ISP */
 		qla2x00_isp_cmd(ha);
@@ -9768,11 +9988,39 @@ qla2x00_isr(scsi_qla_host_t *ha, uint16_
 #if defined(ISP2300)
 	uint16_t     temp2;
 	uint8_t      mailbox_int;
+	uint16_t     hccr;
 #endif
 	uint8_t      rscn_queue_index;
 
 	ENTER(__func__);
 
+#if defined(ISP2300)
+	/*
+	 * Check for a paused RISC -- schedule an isp abort 
+	 */
+	if (data & BIT_8) {
+		hccr = RD_REG_WORD(&reg->host_cmd);
+		printk(KERN_INFO
+		    "%s(%ld): RISC paused, dumping HCCR (%x) and schedule "
+		    "an ISP abort (big-hammer)\n",
+		    __func__,
+		    ha->host_no,
+		    hccr);
+		printk("%s(%ld): RISC paused, dumping HCCR (%x) and schedule "
+		    "an ISP abort (big-hammer)\n",
+		    __func__,
+		    ha->host_no,
+		    hccr);
+
+		/*
+		 * TODO: Need to add more error recovery.  Simply scheduling
+		 * an ISP abort will not work here.  The RISC will need to
+		 * be reset in order for the RISC interrupt bit to be cleared.
+		 */
+		set_bit(ISP_ABORT_NEEDED, &ha->dpc_flags);
+	}
+#endif
+
 	/* Check for mailbox interrupt. */
 	MBOX_TRACE(ha,BIT_2);
 #if defined(ISP2100) || defined(ISP2200)
@@ -10074,6 +10322,7 @@ qla2x00_isr(scsi_qla_host_t *ha, uint16_
 				}
 
 				ha->flags.management_server_logged_in = 0;
+				ha->current_speed = 0; /* reset value */
 
 				/* no wait 10/19/2000 */
 				if (ha->ioctl->flags &
@@ -11131,12 +11380,11 @@ qla2x00_ms_entry(scsi_qla_host_t *ha, ms
 	ENTER(__func__);
 
 	DEBUG3(printk("%s(): pkt=%p pkthandle=%d.\n",
-			__func__,
-			pkt, pkt->handle);)
-
+	    __func__, pkt, pkt->handle1);)
+	
 	/* Validate handle. */
-	if (pkt->handle < MAX_OUTSTANDING_COMMANDS)
-		sp = ha->outstanding_cmds[pkt->handle];
+	if (pkt->handle1 < MAX_OUTSTANDING_COMMANDS)
+		sp = ha->outstanding_cmds[pkt->handle1];
 	else
 		sp = NULL;
 
@@ -11152,7 +11400,7 @@ qla2x00_ms_entry(scsi_qla_host_t *ha, ms
 	CMD_ENTRY_STATUS(sp->cmd) = pkt->entry_status;
 
 	/* Free outstanding command slot. */
-	ha->outstanding_cmds[pkt->handle] = 0;
+	ha->outstanding_cmds[pkt->handle1] = 0;
 	sp->flags |= SRB_ISP_COMPLETED;
 
 	add_to_done_queue(ha, sp);
@@ -11771,7 +12019,7 @@ qla2x00_reset_chip(scsi_qla_host_t *ha) 
  * This routine will wait for fabric devices for
  * the reset delay.
  */
-void qla2x00_check_fabric_devices(scsi_qla_host_t *ha) 
+static void qla2x00_check_fabric_devices(scsi_qla_host_t *ha) 
 {
 	uint16_t	fw_state;
 
@@ -12148,18 +12396,18 @@ qla2x00_update_fc_database(scsi_qla_host
 	uint16_t	cnt, i;
 
 	DEBUG(printk("qla2x00: Found device - "
-			"nodename=%02x%02x%02x%02x%02x%02x%02x%02x, "
-			"portname=%02x%02x%02x%02x%02x%02x%02x%02x, "
-			"port Id=%06x, loop id=%04x\n",
-			device->name[0], device->name[1],
-			device->name[2], device->name[3],
-			device->name[4], device->name[5],
-			device->name[6], device->name[7],
-			device->wwn[0], device->wwn[1],
-			device->wwn[2], device->wwn[3],
-			device->wwn[4], device->wwn[5],
-			device->wwn[6], device->wwn[7],
-			device->d_id.b24, device->loop_id);)
+	    "nodename=%02x%02x%02x%02x%02x%02x%02x%02x, "
+	    "portname=%02x%02x%02x%02x%02x%02x%02x%02x, "
+	    "port Id=%06x, loop id=%04x\n",
+	    device->name[0], device->name[1],
+	    device->name[2], device->name[3],
+	    device->name[4], device->name[5],
+	    device->name[6], device->name[7],
+	    device->wwn[0], device->wwn[1],
+	    device->wwn[2], device->wwn[3],
+	    device->wwn[4], device->wwn[5],
+	    device->wwn[6], device->wwn[7],
+	    device->d_id.b24, device->loop_id);)
 
 	/* Look for device in database. */
 	for (cnt = 0; cnt < MAX_FIBRE_DEVICES; cnt++) {
@@ -12170,43 +12418,45 @@ qla2x00_update_fc_database(scsi_qla_host
 		switch (ha->binding_type) {
 			case BIND_BY_PORT_NAME:
 				rval = memcmp(device->wwn,
-						ha->fc_db[cnt].wwn, WWN_SIZE);
+				    ha->fc_db[cnt].wwn, WWN_SIZE);
 				break;
 
 			case BIND_BY_PORT_ID:
 				rval = (device->d_id.b24 !=
-						ha->fc_db[cnt].d_id.b24);
+				    ha->fc_db[cnt].d_id.b24);
 				break;
 
 			case BIND_BY_NODE_NAME:
 				rval = memcmp(device->name,
-						ha->fc_db[cnt].name, WWN_SIZE);
+				    ha->fc_db[cnt].name, WWN_SIZE);
 				break;
 		}
 		if (rval)
 			continue;
 
 		DEBUG(printk("qla2x00: Reusing slot %d "
-				"for device "
-				"%02x%02x%02x%02x%02x%02x%02x%02x\n",
-				cnt,
-				device->wwn[0],
-				device->wwn[1],
-				device->wwn[2],
-				device->wwn[3],
-				device->wwn[4],
-				device->wwn[5],
-				device->wwn[6],
-				device->wwn[7]);)
-		if (device->flag == DEV_PUBLIC) {
+		    "for device "
+		    "%02x%02x%02x%02x%02x%02x%02x%02x\n",
+		    cnt,
+		    device->wwn[0],
+		    device->wwn[1],
+		    device->wwn[2],
+		    device->wwn[3],
+		    device->wwn[4],
+		    device->wwn[5],
+		    device->wwn[6],
+		    device->wwn[7]);)
+
+		if (device->flag & DEV_PUBLIC) {
 			ha->fc_db[cnt].flag |= DEV_PUBLIC;
 		} else {
 			if (ha->fc_db[cnt].flag & DEV_PUBLIC) {
 				ha->fc_db[cnt].flag &= ~DEV_PUBLIC;
 				ha->fabricid[ha->fc_db[cnt].loop_id].in_use 
-					= FALSE;
+				    = FALSE;
 			}
 		}
+
 		ha->fc_db[cnt].loop_id = device->loop_id;
 		ha->fc_db[cnt].d_id.b24 = device->d_id.b24;
 
@@ -12236,53 +12486,62 @@ qla2x00_update_fc_database(scsi_qla_host
 			(ha->fc_db[i].loop_id == PORT_NEED_MAP)) {
 
 			DEBUG(printk("qla2x00: New slot %d for device "
-					"%02x%02x%02x%02x%02x%02x%02x%02x\n",
-					i,
-					device->wwn[0],
-					device->wwn[1],
-					device->wwn[2],
-					device->wwn[3],
-					device->wwn[4],
-					device->wwn[5],
-					device->wwn[6],
-					device->wwn[7]);)
+			    "%02x%02x%02x%02x%02x%02x%02x%02x\n",
+			    i,
+			    device->wwn[0],
+			    device->wwn[1],
+			    device->wwn[2],
+			    device->wwn[3],
+			    device->wwn[4],
+			    device->wwn[5],
+			    device->wwn[6],
+			    device->wwn[7]);)
+
 			memcpy(ha->fc_db[i].name, device->name, WWN_SIZE);
  			memcpy(ha->fc_db[i].wwn, device->wwn, WWN_SIZE);
 			ha->fc_db[i].loop_id = device->loop_id;
 			ha->fc_db[i].d_id.b24 = device->d_id.b24;
-			if (device->flag == DEV_PUBLIC)
+
+			if (device->flag & DEV_PUBLIC)
 				ha->fc_db[i].flag |= DEV_PUBLIC;
+
 			ha->flags.updated_fc_db = TRUE;
+
 			return (0);
 		}
 	}
 
 	if (enable_slot_reuse) {
-		for (i = 0; i < MAX_FIBRE_DEVICES; i++)
+		for (i = 0; i < MAX_FIBRE_DEVICES; i++) {
 			if (ha->fc_db[i].loop_id == PORT_AVAILABLE) {
 				DEBUG(printk("qla2x00: Assigned slot %d "
-						"reuse for device "
-						"%02x%02x%02x%02x%02x%02x%02x%02x\n",
-						i, 
-						device->wwn[0],
-						device->wwn[1],
-						device->wwn[2],
-						device->wwn[3],
-						device->wwn[4],
-						device->wwn[5],
-						device->wwn[6],
-						device->wwn[7]);)
+				    "reuse for device "
+				    "%02x%02x%02x%02x%02x%02x%02x%02x\n",
+				    i, 
+				    device->wwn[0],
+				    device->wwn[1],
+				    device->wwn[2],
+				    device->wwn[3],
+				    device->wwn[4],
+				    device->wwn[5],
+				    device->wwn[6],
+				    device->wwn[7]);)
+
 				memcpy(ha->fc_db[i].name,
-						device->name, WWN_SIZE);
+				    device->name, WWN_SIZE);
 				memcpy(ha->fc_db[i].wwn,
-						device->wwn, WWN_SIZE);
+				    device->wwn, WWN_SIZE);
 				ha->fc_db[i].loop_id = device->loop_id;
 				ha->fc_db[i].d_id.b24 = device->d_id.b24;
-				if (device->flag == DEV_PUBLIC)
+
+				if (device->flag & DEV_PUBLIC)
 					ha->fc_db[i].flag |= DEV_PUBLIC;
+
 				ha->flags.updated_fc_db = TRUE;
+
 				return (0);
 			}
+		}
 	}
 
 	return(BIT_1);
@@ -12371,13 +12630,13 @@ qla2x00_device_resync(scsi_qla_host_t *h
 			}
 		}
 
+		if (dev.format == 3)
+			continue;
+
 		/*
 		 * Invalidate initiator devices indicated by RSCN so we know
 		 * they are no longer logged in.
 		 */
-		if (dev.format == 3)
-			continue;
-
 		list_for_each(fcil, &ha->fcinitiators) {
 			fcinitiator = list_entry(fcil, fc_initiator_t, list);
 
@@ -12388,6 +12647,7 @@ qla2x00_device_resync(scsi_qla_host_t *h
 				continue;
 
 			fcinitiator->loop_id |= PORT_LOST_ID;
+			fcinitiator->d_id.b24 = 0;
 		}
 	}
 
@@ -12482,8 +12742,8 @@ qla2x00_configure_fabric(scsi_qla_host_t
 			break;
 
 		/*
-		 * Logout all previous devices not currently in database and
-		 * mark them available.
+		 * Logout all previous fabric devices marked lost, except
+		 * tape devices.
 		 */
 		for (index = 0; index < MAX_FIBRE_DEVICES &&
 			!atomic_read(&ha->loop_down_timer) &&
@@ -12491,7 +12751,8 @@ qla2x00_configure_fabric(scsi_qla_host_t
 			index++) {
 
 			if (ha->fc_db[index].loop_id & PORT_LOST_ID &&
-				(ha->fc_db[index].flag & DEV_PUBLIC)) {
+			    (ha->fc_db[index].flag & DEV_PUBLIC) &&
+			    !(ha->fc_db[index].flag & DEV_TAPE_DEVICE)) {
 
 				qla2x00_fabric_logout(ha, 
 						ha->fc_db[index].loop_id & 
@@ -13088,24 +13349,22 @@ qla2x00_fabric_login(scsi_qla_host_t *ha
 
 	for (;;) {
 		DEBUG(printk("scsi(%ld): Trying Fabric Login w/loop id 0x%04x "
-				"for port %06x\n",
-				ha->host_no, 
-				device->loop_id, 
-				device->d_id.b24);)
+		    "for port %06x\n",
+		    ha->host_no, device->loop_id, device->d_id.b24);)
 
 		/* Login device on switch. */
 		qla2x00_login_fabric(ha,
-				device->loop_id, device->d_id.b.domain,
-				device->d_id.b.area, device->d_id.b.al_pa, 
-				&status[0], BIT_0);
+		    device->loop_id, device->d_id.b.domain,
+		    device->d_id.b.area, device->d_id.b.al_pa, 
+		    &status[0], BIT_0);
 
 		if (status[0] == 0x4007) {
 			ha->fabricid[device->loop_id].in_use = FALSE;
 			device->loop_id = status[1];
 
 			DEBUG(printk("Fabric Login: port in use - next "
-					"loop id=0x%04x, port Id=%06x\n",
-					device->loop_id, device->d_id.b24);)
+			    "loop id=0x%04x, port Id=%06x\n",
+			    device->loop_id, device->d_id.b24);)
 
 			if (device->loop_id <= LAST_SNS_LOOP_ID)
 				ha->fabricid[device->loop_id].in_use = TRUE;
@@ -13124,9 +13383,8 @@ qla2x00_fabric_login(scsi_qla_host_t *ha
 			qla2x00_get_port_database(ha, device, 0);
 
 			DEBUG(printk("scsi(%ld): Fabric Login OK. loop "
-					"id=0x%04x, port Id=%06x\n",
-					ha->host_no, 
-					device->loop_id, device->d_id.b24);)
+			    "id=0x%04x, port Id=%06x\n",
+			    ha->host_no, device->loop_id, device->d_id.b24);)
 			return 0;
 
 		} else if (status[0] == 0x4008) {
@@ -13141,19 +13399,47 @@ qla2x00_fabric_login(scsi_qla_host_t *ha
 			return 3;
 		} else {
 			DEBUG2(printk("%s(%ld): failed=%x port_id=%06x "
-					"loop_id=%x jiffies=%lx.\n", 
-					__func__,
-					ha->host_no,
-					status[0], 
-					device->d_id.b24,
-					device->loop_id,
-					jiffies);)
+			    "loop_id=%x jiffies=%lx.\n", 
+			    __func__, ha->host_no, status[0], 
+			    device->d_id.b24, device->loop_id, jiffies);)
 			return 1;
 		}
 	}
 }
 
 /*
+ * qla2x00_local_device_login
+ *	Issue local device login command.
+ *
+ * Input:
+ *	ha = adapter block pointer.
+ *	loop_id = loop id of device to login to.
+ *
+ * Returns (Where's the #define!!!!):
+ *      0 - Login successfully
+ *      1 - Login failed
+ *      3 - Fatal error
+ */
+static uint8_t
+qla2x00_local_device_login(scsi_qla_host_t *ha, uint16_t loop_id)
+{
+	int		rval;
+	uint16_t	mb[MAILBOX_REGISTER_COUNT];
+
+	memset(mb, 0, sizeof(mb));
+	rval = qla2x00_login_local_device(ha, loop_id, mb, BIT_0);
+	if (rval == QL_STATUS_SUCCESS) {
+		/* Interrogate mailbox registers for any errors */
+		if (mb[0] == 0x4005)
+			rval = 1;
+		else if (mb[0] == 0x4006)
+			/* device not in PCB table */
+			rval = 3;
+	}
+	return rval;
+}
+
+/*
  * qla2x00_configure_loop
  *      Updates Fibre Channel Device Database with what is actually on loop.
  *
@@ -13515,7 +13801,9 @@ qla2x00_fcport_bind(scsi_qla_host_t *ha,
 	}
 
 	if (t != MAX_TARGETS) {
-		DEBUG(tq = TGT_Q(ha, t);)
+		tq = TGT_Q(ha, t);
+		tq->vis_port = fcport;
+
 		DEBUG(printk("scsi%ld: Assigning target ID %02x @ %p to "
 				"loop id: %04x, port state=0x%x, "
 				"port down retry=%d\n",
@@ -13834,7 +14122,7 @@ qla2x00_build_fcport_list(scsi_qla_host_
 
 			if (!ha->flags.failover_enabled)
 				qla2x00_get_lun_mask_from_config(ha, 
-						fcport, cnt, 0);
+				    fcport, cnt, 0);
 
 			if (prev_fcport == NULL) {
 				/* nothing in fcport list yet */
@@ -13849,8 +14137,8 @@ qla2x00_build_fcport_list(scsi_qla_host_
 
 		} else {
 			DEBUG3(printk("%s(%ld): updating device to list.\n", 
-					__func__,
-					ha->host_no);)
+			    __func__, ha->host_no);)
+			fcport->loop_id = dev->loop_id;
 			fcport->loop_id = dev->loop_id;
 			fcport->old_loop_id = dev->loop_id;
 		}
@@ -13858,9 +14146,8 @@ qla2x00_build_fcport_list(scsi_qla_host_
 		if (atomic_read(&fcport->state) != FC_ONLINE) {
 			if (qla2x00_update_fcport(ha, fcport, cnt)) {
 				DEBUG2(printk("%s(%ld): update_fcport "
-						"failed.\n",
-						__func__,
-						ha->host_no);)
+				    "failed.\n",
+				    __func__, ha->host_no);)
 
 				return BIT_0;
 			}
@@ -14196,8 +14483,11 @@ qla2x00_lun_discovery(scsi_qla_host_t *h
 		if (rlc_succeeded == 1) {
 			if (pkt->inq[0] == 0 || pkt->inq[0] == 0xc) {
 				fcport->flags &= ~(FC_TAPE_DEVICE);
-			} else if (pkt->inq[0] == 1 || pkt->inq[0] == 8)
+				ha->fc_db[index].flag &= ~DEV_TAPE_DEVICE;
+			} else if (pkt->inq[0] == 1 || pkt->inq[0] == 8) {
 				fcport->flags |= FC_TAPE_DEVICE;
+				ha->fc_db[index].flag |= DEV_TAPE_DEVICE;
+			}
 
 			/* Stop the scan */
 			break;
@@ -14212,12 +14502,15 @@ qla2x00_lun_discovery(scsi_qla_host_t *h
 		 */
 		if (pkt->inq[0] == 0 || pkt->inq[0] == 0xc) {
 			fcport->flags &= ~(FC_TAPE_DEVICE);
-		} else if (pkt->inq[0] == 1 || pkt->inq[0] == 8)
+			ha->fc_db[index].flag &= ~DEV_TAPE_DEVICE;
+		} else if (pkt->inq[0] == 1 || pkt->inq[0] == 8) {
 			fcport->flags |= FC_TAPE_DEVICE;
-		else if (pkt->inq[0] == 0x20 || pkt->inq[0] == 0x7f)
+			ha->fc_db[index].flag |= DEV_TAPE_DEVICE;
+		} else if (pkt->inq[0] == 0x20 || pkt->inq[0] == 0x7f) {
 			disconnected++;
-		else
+		} else {
 			continue;
+		}
 		
 		/* Allocate LUN if not already allocated. */
 		for (fclun = fcport->fclun; 
@@ -14513,10 +14806,14 @@ qla2x00_configure_local_loop(scsi_qla_ho
 
 	ENTER(__func__);
 
-	/* No point in continuing if the loop is in a volatile state */
-	if (atomic_read(&ha->loop_down_timer) ||
-		test_bit(LOOP_RESYNC_NEEDED, &ha->dpc_flags))
+	/*
+	 * No point in continuing if the loop is in a volatile state -- 
+	 * reschedule LOCAL_LOOP_UPDATE for later processing
+	 */
+	if (test_bit(LOOP_RESYNC_NEEDED, &ha->dpc_flags)) {
+		set_bit(LOCAL_LOOP_UPDATE, &ha->dpc_flags);
 		return (0);
+	}
 
 	gn_list = pci_alloc_consistent(ha->pdev,
 			sizeof(GN_LIST_LENGTH), &phys_address);
@@ -14550,6 +14847,10 @@ qla2x00_configure_local_loop(scsi_qla_ho
 		}
 	}
 
+	DEBUG3(printk("%s(%ld): Getting FCAL position map\n",
+		__func__, ha->host_no));
+	DEBUG3(qla2x00_get_fcal_position_map(ha, NULL));
+
 	/* Get port name list.*/
 #if defined(FC_IP_SUPPORT)
 	if (ha->flags.enable_ip == FALSE)
@@ -14570,6 +14871,10 @@ qla2x00_configure_local_loop(scsi_qla_ho
 		goto cleanup_allocation;
 	}
 
+	DEBUG3(printk("%s(%ld): port list size (%d)\n",
+		__func__, ha->host_no, size));
+	DEBUG3(qla2x00_dump_buffer((uint8_t *)gn_list, size));
+
 	/* Any valid entries returned? */
 	/* dg: 10/29/99 for an empty list */
 	if (size / sizeof(port_list_entry_t) == 0)
@@ -14579,27 +14884,23 @@ qla2x00_configure_local_loop(scsi_qla_ho
 	for ( ; size >= sizeof(port_list_entry_t);
 			size -= sizeof(port_list_entry_t),
 			port_entry++) {
+		device.loop_id = le16_to_cpu(port_entry->loop_id);
 
 #if defined(FC_IP_SUPPORT)
-		uint16_t list_entry_loop_id;
-
-		list_entry_loop_id = port_entry->loop_id;
-		port_entry->loop_id &= LOOP_ID_MASK; 
+		device.loop_id &= LOOP_ID_MASK; 
 #endif
 
 		/* Skip any non-local loop-ids - this includes 'known ports' */
-		if (port_entry->loop_id > LAST_LOCAL_LOOP_ID) 
+		if (device.loop_id > LAST_LOCAL_LOOP_ID) 
 			continue;
 #if NOT_NEEDED
 		/* Skip the known ports. */
-		if ((port_entry->loop_id == SNS_FL_PORT) ||
-			(port_entry->loop_id == FABRIC_CONTROLLER) ||
-			(port_entry->loop_id == SIMPLE_NAME_SERVER))
+		if ((device.loop_id == SNS_FL_PORT) ||
+			(device.loop_id == FABRIC_CONTROLLER) ||
+			(device.loop_id == SIMPLE_NAME_SERVER))
 			continue;
 #endif
 
-		device.loop_id = port_entry->loop_id;
-
 		/* Get port name */
 		rval = qla2x00_get_port_name(ha, device.loop_id, port_name, 0);
 		if (rval || qla2x00_is_wwn_zero(port_name)) {
@@ -14712,7 +15013,7 @@ cleanup_allocation:
  * Context:
  *	Kernel context.
  */
-os_tgt_t *
+static os_tgt_t *
 qla2x00_tgt_alloc(scsi_qla_host_t *ha, uint16_t t) 
 {
 	os_tgt_t	*tq;
@@ -14768,7 +15069,7 @@ qla2x00_tgt_alloc(scsi_qla_host_t *ha, u
  * Context:
  *	Kernel context.
  */
-void
+static void
 qla2x00_tgt_free(scsi_qla_host_t *ha, uint16_t t) 
 {
 	os_tgt_t	*tq;
@@ -14817,7 +15118,7 @@ qla2x00_tgt_free(scsi_qla_host_t *ha, ui
  * Context:
  *	Kernel context.
  */
-os_lun_t *
+static os_lun_t *
 qla2x00_lun_alloc(scsi_qla_host_t *ha, uint16_t t, uint16_t l) 
 {
 	os_lun_t	*lq;
@@ -14941,7 +15242,7 @@ qla2x00_lun_free(scsi_qla_host_t *ha, ui
  * 
  * Note: This routine will always try to start I/O from visible HBA.
  */
-void
+static void
 qla2x00_next(scsi_qla_host_t *vis_ha) 
 {
 	scsi_qla_host_t *dest_ha;
@@ -15127,9 +15428,9 @@ qla2x00_get_lun_mask_from_config(scsi_ql
 			ha->instance, tgt, dev_no);
 
 	rval = qla2x00_get_prop_xstr(ha, propbuf, (uint8_t *)&lun_mask,
-			sizeof(lun_mask));
+			sizeof(lun_bit_mask_t));
 	if (rval != -1 && 
-		(rval == sizeof(lun_mask))) {
+		(rval == sizeof(lun_bit_mask_t))) {
 
 		DEBUG3(printk("%s(%ld): lun mask for port %p from file:\n",
 				__func__,
@@ -15138,7 +15439,7 @@ qla2x00_get_lun_mask_from_config(scsi_ql
 		DEBUG3(qla2x00_dump_buffer((uint8_t *)&port->lun_mask,
 					sizeof(lun_bit_mask_t));)
 
-		for (lun = 8 * sizeof(lun_mask) - 1, l = 0; 
+		for (lun = 8 * sizeof(lun_bit_mask_t) - 1, l = 0; 
 			lun >= 0; 
 			lun--, l++) {
 
@@ -15228,7 +15529,7 @@ qla2x00_bstr_to_hex(char *s, uint8_t *bp
  * Context:
  *      Kernel context.
  */
-int
+static int
 qla2x00_get_prop_xstr(scsi_qla_host_t *ha, 
 		char *propname, uint8_t *propval, int size) 
 {
@@ -15281,7 +15582,7 @@ qla2x00_get_prop_xstr(scsi_qla_host_t *h
  * Context:
  *	Kernel context.
  */
-void
+static void
 qla2x00_chg_endian(uint8_t buf[], size_t size) 
 {
 	uint8_t byte;
@@ -15310,7 +15611,7 @@ qla2x00_chg_endian(uint8_t buf[], size_t
  * 
  * Note: Sets the ref_count for non Null sp to one.
  */
-uint8_t
+static uint8_t
 qla2x00_allocate_sp_pool(scsi_qla_host_t *ha) 
 {
 	srb_t   *sp;
@@ -15369,7 +15670,7 @@ qla2x00_allocate_sp_pool(scsi_qla_host_t
  *  This routine frees all adapter allocated memory.
  *  
  */
-void
+static void
 qla2x00_free_sp_pool( scsi_qla_host_t *ha) 
 {
 	struct list_head *list, *temp;
@@ -16098,7 +16399,7 @@ qla2x00_add_initiator_device(scsi_qla_ho
 * Declarations for load module
 */
 static  Scsi_Host_Template driver_template = QLA2100_LINUX_TEMPLATE;
-#include "scsi_module.c"
+#include "../scsi_module.c"
 
 /****************************************************************************/
 /*                         Driver Debug Functions.                          */
@@ -16118,14 +16419,12 @@ qla2x00_dump_buffer(uint8_t * b, uint32_
 
 	for (cnt = 0; cnt < size;) {
 		c = *b++;
-		printk("%2x",(uint32_t) c);
+		printk("%02x",(uint32_t) c);
 		cnt++;
 		if (!(cnt % 16))
 			printk("\n");
-		else if (c < 10)
-			printk("  ");
 		else
-			printk(" ");
+			printk("  ");
 	}
 	if (cnt % 16)
 		printk("\n");
@@ -16138,7 +16437,7 @@ qla2x00_dump_buffer(uint8_t * b, uint32_
  *   Input	 
  *	 cmd : Scsi_Cmnd
  **************************************************************************/
-void
+static void
 qla2x00_print_scsi_cmd(Scsi_Cmnd * cmd) 
 {
 	struct scsi_qla_host *ha;
@@ -16193,7 +16492,7 @@ qla2x00_print_scsi_cmd(Scsi_Cmnd * cmd) 
  * Input
  *      q: lun queue	 
  */ 
-void 
+static void 
 qla2x00_print_q_info(struct os_lun *q) 
 {
 	printk("Queue info: flags=0x%lx\n", q->q_flag);
@@ -16341,7 +16640,7 @@ qla2x00_panic(char *cp, struct Scsi_Host
 *   qla2x00_dump_requests
 *
 **************************************************************************/
-void
+static void
 qla2x00_dump_requests(scsi_qla_host_t *ha) 
 {
 
@@ -16678,7 +16977,7 @@ qla2x00_cfg_persistent_binding(scsi_qla_
  * kmem_zalloc
  * Allocate and zero out the block of memory
  */
-inline void *
+static inline void *
 kmem_zalloc( int siz, int code, int id) 
 {
 	uint8_t *bp;
@@ -16772,10 +17071,14 @@ static int 
 apidev_ioctl(struct inode *inode, struct file *fp, 
 		unsigned int cmd, unsigned long arg) 
 {
-	Scsi_Device fake_scsi_device;
-	fake_scsi_device.host = apidev_host;
+	/* Since this var is not really used, use static type to
+	 * conserve stack space.
+	 */
+	static Scsi_Device dummy_scsi_device;
+
+	dummy_scsi_device.host = apidev_host;
 
-	return (qla2x00_ioctl(&fake_scsi_device, (int)cmd, (void*)arg));
+	return (qla2x00_ioctl(&dummy_scsi_device, (int)cmd, (void*)arg));
 }
 
 static struct file_operations apidev_fops = {
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/qla2xxx/qla2x00.h linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/qla2xxx/qla2x00.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/qla2xxx/qla2x00.h	2003-07-30 13:51:37.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/qla2xxx/qla2x00.h	2003-07-30 10:28:04.000000000 +0200
@@ -2,7 +2,7 @@
 *                  QLOGIC LINUX SOFTWARE
 *
 * QLogic ISP2x00 device driver for Linux 2.4.x
-* Copyright (C) 2002 Qlogic Corporation
+* Copyright (C) 2003 Qlogic Corporation
 * (www.qlogic.com)
 *
 * This program is free software; you can redistribute it and/or modify it
@@ -649,6 +649,7 @@ typedef struct {
 #define MBC_INITIALIZE_FIRMWARE   0x60  /* Initialize firmware */
 #define MBC_INITIATE_LIP          0x62  /* Initiate Loop Initialization */
                                         /* Procedure */
+#define MBC_GET_FCAL_MAP	0x63  /* Get FC/AL position map */
 #define MBC_GET_PORT_DATABASE     0x64  /* Get port database. */
 #define MBC_TARGET_RESET	  0x66  /* Target reset. */
 #define MBC_GET_FIRMWARE_STATE    0x69  /* Get firmware state. */
@@ -668,6 +669,8 @@ typedef struct {
 #define	MBC_SEND_LFA_COMMAND		0x7D	/* Send Loop Fabric Address */
 #define	MBC_LUN_RESET			0x7E	/* Send LUN reset */
 
+/* Firmware return data sizes */
+#define FCAL_MAP_SIZE	128
 
 /* Mailbox bit definitions for out_mb and in_mb */
 #define	MBX_31		BIT_31
@@ -785,34 +788,193 @@ typedef struct {
 	uint16_t extended_lun_stop_list_pointer;
 } port_database_t;
 
-
 /*
  * ISP Initialization Control Block.
  */
-typedef struct
+
+struct qla2100_firmware_options
 {
-    uint8_t  version;
-        #define ICB_VERSION 1
-    uint8_t  reserved_1;
-    struct
-    {
+#if defined(__BIG_ENDIAN)
+        uint8_t unused_15                    :1;
+        uint8_t enable_name_change           :1;
+        uint8_t enable_full_login_on_lip     :1;
+        uint8_t enable_stop_q_on_full        :1;
+
+        uint8_t previous_assigned_addressing :1;
+        uint8_t enable_decending_soft_assign :1;
+        uint8_t disable_initial_lip          :1;
+        uint8_t enable_port_update_event     :1;
+
+        uint8_t enable_lun_response          :1;
+        uint8_t enable_adisc                 :1;
+        uint8_t disable_initiator_mode       :1;
+        uint8_t enable_target_mode           :1;
+
+        uint8_t enable_fast_posting          :1;
+        uint8_t enable_full_duplex           :1;
+        uint8_t enable_fairness              :1;
+        uint8_t enable_hard_loop_id          :1;
+#else
+        uint8_t enable_hard_loop_id          :1;
+        uint8_t enable_fairness              :1;
+        uint8_t enable_full_duplex           :1;
+        uint8_t enable_fast_posting          :1;
+
+        uint8_t enable_target_mode           :1;
+        uint8_t disable_initiator_mode       :1;
+        uint8_t enable_adisc                 :1;
+        uint8_t enable_lun_response          :1;
+
+        uint8_t enable_port_update_event     :1;
+        uint8_t disable_initial_lip          :1;
+        uint8_t enable_decending_soft_assign :1;
+        uint8_t previous_assigned_addressing :1;
+
+        uint8_t enable_stop_q_on_full        :1;
+        uint8_t enable_full_login_on_lip     :1;
+        uint8_t enable_name_change           :1;
+        uint8_t unused_15                    :1;
+#endif
+};
+
+struct qla2x00_firmware_options
+{
+#if defined(__BIG_ENDIAN)
+        uint8_t expanded_ifwcb               :1;
+        uint8_t node_name_option             :1;
+        uint8_t enable_full_login_on_lip     :1;
+        uint8_t enable_stop_q_on_full        :1;
+
+        uint8_t previous_assigned_addressing :1;
+        uint8_t enable_decending_soft_assign :1;
+        uint8_t disable_initial_lip          :1;
+        uint8_t enable_port_update_event     :1;
+
+        uint8_t enable_lun_response          :1;
+        uint8_t enable_adisc                 :1;
+        uint8_t disable_initiator_mode       :1;
+        uint8_t enable_target_mode           :1;
+
+        uint8_t enable_fast_posting          :1;
+        uint8_t enable_full_duplex           :1;
+        uint8_t enable_fairness              :1;
+        uint8_t enable_hard_loop_id          :1;
+#else
         uint8_t enable_hard_loop_id          :1;
         uint8_t enable_fairness              :1;
         uint8_t enable_full_duplex           :1;
         uint8_t enable_fast_posting          :1;
+
         uint8_t enable_target_mode           :1;
         uint8_t disable_initiator_mode       :1;
         uint8_t enable_adisc                 :1;
         uint8_t enable_lun_response          :1;
+
         uint8_t enable_port_update_event     :1;
         uint8_t disable_initial_lip          :1;
         uint8_t enable_decending_soft_assign :1;
         uint8_t previous_assigned_addressing :1;
+
         uint8_t enable_stop_q_on_full        :1;
         uint8_t enable_full_login_on_lip     :1;
         uint8_t node_name_option             :1;
         uint8_t expanded_ifwcb               :1;
-    }firmware_options;
+#endif
+};
+
+struct qla2x00_additional_firmware_options
+{
+#if defined(__BIG_ENDIAN)
+        uint8_t unused_15                    :1; /* bit 0 */
+        uint8_t enable_cmd_q_target_mode     :1; /* bit 1 */
+        uint8_t enable_fc_confirm            :1; /* bit 2 */
+        uint8_t enable_fc_tape               :1; /* bit 3 */
+
+        uint8_t unused_11                    :1; /* bit 4 */
+        uint8_t unused_10                    :1; /* bit 5 */
+        uint8_t enable_ack0                  :1; /* bit 6 */
+        uint8_t enable_class2                :1; /* bit 7 */
+
+        uint8_t nonpart_if_hard_addr_failed  :1; /* bit 8 */
+        uint8_t connection_options           :3; /* bits 9-11 */
+                #define LOOP      0
+                #define P2P       1
+                #define LOOP_P2P  2
+                #define P2P_LOOP  3
+
+        uint8_t operation_mode               :4; /* bits 12-15 */
+#else
+        uint8_t operation_mode               :4; /* bits 0-3 */
+
+        uint8_t connection_options           :3; /* bits 4-6 */
+                #define LOOP      0
+                #define P2P       1
+                #define LOOP_P2P  2
+                #define P2P_LOOP  3
+        uint8_t nonpart_if_hard_addr_failed  :1; /* bit 7 */
+
+        uint8_t enable_class2                :1; /* bit 8 */
+        uint8_t enable_ack0                  :1; /* bit 9 */
+        uint8_t unused_10                    :1; /* bit 10 */
+        uint8_t unused_11                    :1; /* bit 11 */
+
+        uint8_t enable_fc_tape               :1; /* bit 12 */
+        uint8_t enable_fc_confirm            :1; /* bit 13 */
+        uint8_t enable_cmd_q_target_mode     :1; /* bit 14 */
+        uint8_t unused_15                    :1; /* bit 15 */
+#endif
+};
+
+struct qla2x00_special_options
+{
+#if defined(__BIG_ENDIAN)
+	uint8_t	data_rate			:2;
+	uint8_t	enable_50_ohm_termination	:1;
+	uint8_t	unused_12			:1;
+
+	uint8_t	unused_11			:1;
+	uint8_t	unused_10			:1;
+	uint8_t	unused_9			:1;
+	uint8_t	unused_8			:1;
+
+	uint8_t	disable_auto_plogi_local_loop	:1;
+	uint8_t	enable_ooo_frame_handling	:1;
+	uint8_t	fcp_rsp_payload			:2;
+
+	uint8_t	unused_3			:1;
+	uint8_t	unused_2			:1;
+	uint8_t	soft_id_only			:1;
+	uint8_t	enable_read_xfr_rdy		:1;
+#else
+	uint8_t	enable_read_xfr_rdy		:1;
+	uint8_t	soft_id_only			:1;
+	uint8_t	unused_2			:1;
+	uint8_t	unused_3			:1;
+
+	uint8_t	fcp_rsp_payload			:2;
+	uint8_t	enable_ooo_frame_handling	:1;
+	uint8_t	disable_auto_plogi_local_loop	:1;
+
+	uint8_t	unused_8			:1;
+	uint8_t	unused_9			:1;
+	uint8_t	unused_10			:1;
+	uint8_t	unused_11			:1;
+
+	uint8_t	unused_12			:1;
+	uint8_t	enable_50_ohm_termination	:1;
+	uint8_t	data_rate			:2;
+#endif
+};
+#define SO_DATA_RATE_1GB	0
+#define SO_DATA_RATE_2GB	1
+#define SO_DATA_RATE_AUTO	2
+
+typedef struct
+{
+    uint8_t  version;
+        #define ICB_VERSION 1
+    uint8_t  reserved_1;
+    struct qla2x00_firmware_options firmware_options;
     uint16_t frame_length;
     uint16_t iocb_allocation;
     uint16_t execution_throttle;
@@ -844,27 +1006,11 @@ typedef struct
     uint8_t  immediate_notify_resource_count;
     uint16_t timeout;
     uint16_t reserved_3;
-    struct
-    {
-        uint8_t operation_mode               :4;
-        uint8_t connection_options           :3;
-                #define LOOP      0
-                #define P2P       1
-                #define LOOP_P2P  2
-                #define P2P_LOOP  3
-        uint8_t nonpart_if_hard_addr_failed  :1; /* Bit 7 */
-        uint8_t enable_class2                :1; /* Bit 8 */
-        uint8_t enable_ack0                  :1; /* Bit 9 */
-        uint8_t unused_10                    :1; /* bit 10 */
-        uint8_t unused_11                    :1; /* bit 11 */
-        uint8_t enable_fc_tape               :1; /* bit 12 */
-        uint8_t enable_fc_confirm            :1; /* bit 13 */
-        uint8_t enable_cmd_q_target_mode     :1; /* bit 14 */
-        uint8_t unused_15                    :1; /* bit 15 */
-    }additional_firmware_options;
+    struct qla2x00_additional_firmware_options additional_firmware_options;
     uint8_t     response_accum_timer;
     uint8_t     interrupt_delay_timer;
-    uint16_t    reserved_4[14];
+    struct qla2x00_special_options special_options;
+    uint16_t    reserved_4[13];
 }init_cb_t;
 
 /*
@@ -895,14 +1041,105 @@ typedef struct
 #define NV_DELAY_COUNT          10
 
 /*
- *  ISP2100 NVRAM structure definitions.
+ * NVRAM host parameter.
  */
-typedef struct
+
+struct qla2xxx_host_p
 {
-    /*
-     * NVRAM header
-     */
+#if defined(__BIG_ENDIAN)
+        uint8_t unused_15               :1;
+        uint8_t unused_14               :1;
+        uint8_t unused_13               :1;
+        uint8_t enable_database_storage :1;
+
+        uint8_t enable_target_reset     :1;
+        uint8_t enable_lip_full_login   :1;
+        uint8_t enable_lip_reset        :1;
+        uint8_t enable_64bit_addressing :1;
 
+        uint8_t enable_extended_logging :1;
+        uint8_t pci_parity_disable      :1;
+        uint8_t set_cache_line_size_1   :1;
+        uint8_t disable_risc_code_load  :1;
+
+        uint8_t enable_selectable_boot  :1;
+        uint8_t disable_luns            :1;
+        uint8_t disable_bios            :1;
+        uint8_t unused_0                :1;
+#else
+        uint8_t unused_0                :1;
+        uint8_t disable_bios            :1;
+        uint8_t disable_luns            :1;
+        uint8_t enable_selectable_boot  :1;
+
+        uint8_t disable_risc_code_load  :1;
+        uint8_t set_cache_line_size_1   :1;
+        uint8_t pci_parity_disable      :1;
+        uint8_t enable_extended_logging :1;
+
+        uint8_t enable_64bit_addressing :1;
+        uint8_t enable_lip_reset        :1;
+        uint8_t enable_lip_full_login   :1;
+        uint8_t enable_target_reset     :1;
+
+        uint8_t enable_database_storage :1;
+        uint8_t unused_13               :1;
+        uint8_t unused_14               :1;
+        uint8_t unused_15               :1;
+#endif
+};
+
+struct qla2x00_hba_features
+{
+#if defined(__BIG_ENDIAN)
+        uint8_t unused_12               :1;
+        uint8_t unused_11               :1;
+        uint8_t unused_10               :1;
+        uint8_t unused_9                :1;
+
+        uint8_t unused_8                :1;
+        uint8_t unused_7                :1;
+        uint8_t unused_6                :1;
+        uint8_t unused_5                :1;
+
+        uint8_t unused_4                :1;
+        uint8_t unused_3                :1;
+        uint8_t unused_2                :1;
+        uint8_t unused_1                :1;
+
+        uint8_t multi_chip_hba          :1;
+        uint8_t buffer_plus_module      :1;
+        uint8_t risc_ram_parity         :1;
+        uint8_t external_gbic           :1;
+#else
+        uint8_t external_gbic           :1;
+        uint8_t risc_ram_parity         :1;
+        uint8_t buffer_plus_module      :1;
+        uint8_t multi_chip_hba          :1;
+
+        uint8_t unused_1                :1;
+        uint8_t unused_2                :1;
+        uint8_t unused_3                :1;
+        uint8_t unused_4                :1;
+
+        uint8_t unused_5                :1;
+        uint8_t unused_6                :1;
+        uint8_t unused_7                :1;
+        uint8_t unused_8                :1;
+
+        uint8_t unused_9                :1;
+        uint8_t unused_10               :1;
+        uint8_t unused_11               :1;
+        uint8_t unused_12               :1;
+#endif
+};
+
+/*
+ *  ISP2[23]XX NVRAM structure definitions.
+ */
+
+typedef struct
+{
     uint8_t     id[4];
     uint8_t     nvram_version;
     uint8_t     reserved_0;
@@ -914,25 +1151,7 @@ typedef struct
     uint8_t     parameter_block_version;
     uint8_t     reserved_1;
 
-    struct
-    {
-        uint8_t enable_hard_loop_id          :1;
-        uint8_t enable_fairness              :1;
-        uint8_t enable_full_duplex           :1;
-        uint8_t enable_fast_posting          :1;
-        uint8_t enable_target_mode           :1;
-        uint8_t disable_initiator_mode       :1;
-        uint8_t enable_adisc                 :1;
-        uint8_t enable_lun_response          :1;
-        uint8_t enable_port_update_event     :1;
-        uint8_t disable_initial_lip          :1;
-        uint8_t enable_decending_soft_assign :1;
-        uint8_t previous_assigned_addressing :1;
-        uint8_t enable_stop_q_on_full        :1;
-        uint8_t enable_full_login_on_lip     :1;
-        uint8_t node_name_option             :1;
-        uint8_t expanded_ifwcb               :1;
-    }firmware_options;
+    struct qla2x00_firmware_options firmware_options;
 
     uint16_t    frame_payload_size;
     uint16_t    max_iocb_allocation;
@@ -948,60 +1167,18 @@ typedef struct
 
     /* Expanded RISC parameter block */
 
-    struct
-    {
-#if OLD
-        uint8_t operation_mode               :4;
-        uint8_t connection_options           :3;
-        uint8_t enable_fc_tape               :1;
-        uint8_t enable_class2                :1;
-        uint8_t enable_fc_confirm            :1;
-        uint8_t enable_ack0                  :1;
-        uint8_t enable_command_reference_num :1;
-        uint8_t nonpart_if_hard_addr_failed  :1;
-        uint8_t enable_read_xfr_rdy          :1;
-        uint8_t unused_14                    :1;
-        uint8_t unused_15                    :1;
-#endif
-        uint8_t operation_mode               :4;
-        uint8_t connection_options           :3;
-        uint8_t nonpart_if_hard_addr_failed  :1;
-        uint8_t enable_class2                :1;
-        uint8_t enable_ack0                  :1;
-        uint8_t unused_10                    :1;
-        uint8_t unused_11                    :1;
-        uint8_t enable_fc_tape               :1;
-        uint8_t enable_fc_confirm            :1;
-        uint8_t enable_command_reference_num :1;
-    }additional_firmware_options;
+    struct qla2x00_additional_firmware_options additional_firmware_options;
 
     uint8_t     response_accum_timer;
     uint8_t     interrupt_delay_timer;
-    uint16_t    reserved_2[14];
+    struct qla2x00_special_options special_options;
+    uint16_t    reserved_2[13];
 
     /*
      * NVRAM host parameter block
      */
 
-    struct
-    {
-        uint8_t unused_0                :1;
-        uint8_t disable_bios            :1;
-        uint8_t disable_luns            :1;
-        uint8_t enable_selectable_boot  :1;
-        uint8_t disable_risc_code_load  :1;
-        uint8_t set_cache_line_size_1   :1;
-        uint8_t pci_parity_disable      :1;
-        uint8_t enable_extended_logging :1;
-        uint8_t enable_64bit_addressing :1;
-        uint8_t enable_lip_reset        :1;
-        uint8_t enable_lip_full_login   :1;
-        uint8_t enable_target_reset     :1;
-        uint8_t enable_database_storage :1;
-        uint8_t unused_13               :1;
-        uint8_t unused_14               :1;
-        uint8_t unused_15               :1;
-    }host_p;
+    struct qla2xxx_host_p host_p;
 
     uint8_t     boot_node_name[WWN_SIZE];
     uint8_t     boot_lun_number;
@@ -1033,25 +1210,7 @@ typedef struct
     uint8_t oem_ec[8];
 
     /* Offset 232 */
-    struct
-    {
-        uint8_t external_gbic           :1;
-        uint8_t risc_ram_parity         :1;
-        uint8_t buffer_plus_module      :1;
-        uint8_t multi_chip_hba          :1;
-        uint8_t unused_1                :1;
-        uint8_t unused_2                :1;
-        uint8_t unused_3                :1;
-        uint8_t unused_4                :1;
-        uint8_t unused_5                :1;
-        uint8_t unused_6                :1;
-        uint8_t unused_7                :1;
-        uint8_t unused_8                :1;
-        uint8_t unused_9                :1;
-        uint8_t unused_10               :1;
-        uint8_t unused_11               :1;
-        uint8_t unused_12               :1;
-    }hba_features;
+    struct qla2x00_hba_features hba_features;
 
     uint16_t   reserved_9;
     uint16_t   reserved_10;
@@ -1073,12 +1232,12 @@ typedef struct
     uint8_t     checksum;
 }nvram22_t;
 
+/*
+ *  ISP2100 NVRAM structure definitions.
+ */
+
 typedef struct
 {
-    /*
-     * NVRAM header for 2100 board.
-     */
-
     uint8_t     id[4];
     uint8_t     nvram_version;
     uint8_t     reserved_0;
@@ -1090,25 +1249,7 @@ typedef struct
     uint8_t     parameter_block_version;
     uint8_t     reserved_1;
 
-    struct
-    {
-        uint8_t enable_hard_loop_id          :1;
-        uint8_t enable_fairness              :1;
-        uint8_t enable_full_duplex           :1;
-        uint8_t enable_fast_posting          :1;
-        uint8_t enable_target_mode           :1;
-        uint8_t disable_initiator_mode       :1;
-        uint8_t enable_adisc                 :1;
-        uint8_t enable_lun_response          :1;
-        uint8_t enable_port_update_event     :1;
-        uint8_t disable_initial_lip          :1;
-        uint8_t enable_decending_soft_assign :1;
-        uint8_t previous_assigned_addressing :1;
-        uint8_t enable_stop_q_on_full        :1;
-        uint8_t enable_full_login_on_lip     :1;
-        uint8_t enable_name_change           :1;
-        uint8_t unused_15                    :1;
-    }firmware_options;
+    struct qla2100_firmware_options firmware_options;
 
     uint16_t    frame_payload_size;
     uint16_t    max_iocb_allocation;
@@ -1128,25 +1269,7 @@ typedef struct
      * NVRAM host parameter block
      */
 
-    struct
-    {
-        uint8_t unused_0                :1;
-        uint8_t disable_bios            :1;
-        uint8_t disable_luns            :1;
-        uint8_t enable_selectable_boot  :1;
-        uint8_t disable_risc_code_load  :1;
-        uint8_t set_cache_line_size_1   :1;
-        uint8_t pci_parity_disable      :1;
-        uint8_t enable_extended_logging :1;
-        uint8_t enable_64bit_addressing :1;
-        uint8_t enable_lip_reset        :1;
-        uint8_t enable_lip_full_login   :1;
-        uint8_t enable_target_reset     :1;
-        uint8_t enable_database_storage :1;
-        uint8_t unused_13               :1;
-        uint8_t unused_14               :1;
-        uint8_t unused_15               :1;
-    }host_p;
+    struct qla2xxx_host_p host_p;
 
     uint8_t     boot_node_name[WWN_SIZE];
     uint8_t     boot_lun_number;
@@ -1658,18 +1781,22 @@ typedef struct
     uint8_t  entry_count;               /* Entry count. */
     uint8_t  sys_define;                /* System defined. */
     uint8_t  entry_status;              /* Entry Status. */
-    uint32_t handle;                    /* System handle. */
+    uint32_t handle1;                   /* System handle. */
     uint8_t  reserved;
     uint8_t  loop_id;
     uint16_t status;
     uint16_t control_flags;             /* Control flags. */
     uint16_t reserved2;
     uint16_t timeout;
-    uint16_t DSDcount;
-    uint16_t RespDSDcount;
-    uint8_t  reserved3[10];
-    uint32_t Response_bytecount;
-    uint32_t Request_bytecount;
+    uint16_t cmd_dsd_count;
+    uint16_t total_dsd_count;
+    uint8_t  type;
+    uint8_t  r_ctl;
+    uint16_t rx_id;
+    uint16_t reserved3;
+    uint32_t handle2;
+    uint32_t rsp_bytecount;
+    uint32_t req_bytecount;
     uint32_t dseg_req_address[2];         /* Data segment 0 address. */
     uint32_t dseg_req_length;             /* Data segment 0 length. */
     uint32_t dseg_rsp_address[2];         /* Data segment 1 address. */
@@ -2134,7 +2261,7 @@ typedef struct
 #define MBS_NAME_SERVER_NOT_LOGGED_IN   0x400A
 
 
-#define MAX_IOCTL_WAIT_THREADS	16
+#define MAX_IOCTL_WAIT_THREADS	MAX_SRBS
 typedef struct _wait_q_t {
 	uint8_t			flags;
 #define WQ_IN_USE	0x1
@@ -2160,7 +2287,7 @@ typedef struct hba_ioctl{
 	struct timer_list	cmpl_timer;
 	uint8_t		ioctl_tov;
 	uint8_t		SCSIPT_InProgress;
-	uint8_t		FCCT_InProgress;
+	uint8_t		MSIOCB_InProgress;
 
 	os_tgt_t	*ioctl_tq;
 	os_lun_t	*ioctl_lq;
@@ -2174,6 +2301,9 @@ typedef struct hba_ioctl{
 	uint32_t	flags;
 #define	IOCTL_OPEN			BIT_0
 #define	IOCTL_AEN_TRACKING_ENABLE	BIT_1
+	uint8_t		*scrap_mem;	/* per ha scrap buf for ioctl usage */
+	uint32_t	scrap_mem_size; /* total size */
+	uint32_t	scrap_mem_used; /* portion used */
 
 } hba_ioctl_context;
 
@@ -2652,7 +2782,7 @@ typedef struct scsi_qla_host
 }
 #endif
 
-void qla2x00_device_queue_depth(scsi_qla_host_t *, Scsi_Device *);
+static void qla2x00_device_queue_depth(scsi_qla_host_t *, Scsi_Device *);
 #endif
 
 #if defined(__386__)
@@ -2664,19 +2794,19 @@ void qla2x00_device_queue_depth(scsi_qla
 /*
  *  Linux - SCSI Driver Interface Function Prototypes.
  */
-int qla2x00_ioctl(Scsi_Device *, int , void *);
-int qla2x00_proc_info ( char *, char **, off_t, int, int, int);
-const char * qla2x00_info(struct Scsi_Host *host);
-int qla2x00_detect(Scsi_Host_Template *);
-int qla2x00_release(struct Scsi_Host *);
-const char * qla2x00_info(struct Scsi_Host *);
-int qla2x00_queuecommand(Scsi_Cmnd *, void (* done)(Scsi_Cmnd *));
+static int qla2x00_ioctl(Scsi_Device *, int , void *);
+static int qla2x00_proc_info ( char *, char **, off_t, int, int, int);
+static const char * qla2x00_info(struct Scsi_Host *host);
+static int qla2x00_detect(Scsi_Host_Template *);
+static int qla2x00_release(struct Scsi_Host *);
+static const char * qla2x00_info(struct Scsi_Host *);
+static int qla2x00_queuecommand(Scsi_Cmnd *, void (* done)(Scsi_Cmnd *));
 int qla2x00_abort(Scsi_Cmnd *);
 int qla2x00_reset(Scsi_Cmnd *, unsigned int);
-int qla2x00_biosparam(Disk *, kdev_t, int[]);
-void qla2x00_intr_handler(int, void *, struct pt_regs *);
+static int qla2x00_biosparam(Disk *, kdev_t, int[]);
+static void qla2x00_intr_handler(int, void *, struct pt_regs *);
 #if !defined(MODULE)
-static int __init qla2100_setup (char *s);
+static int __init qla2x00_setup (char *s);
 #else
 void qla2x00_setup(char *s);
 #endif
@@ -2757,7 +2887,7 @@ TEMPLATE_PROC_DIR 	  	 	 	 	 	\
 	detect:		qla2x00_detect,				\
 	release:	qla2x00_release,			\
 	info:		qla2x00_info,				\
-	ioctl: qla2x00_ioctl,                                    \
+	ioctl: qla2x00_ioctl,					\
 	command: NULL,						\
 	queuecommand: qla2x00_queuecommand,			\
 	eh_strategy_handler: NULL,				\
@@ -2777,9 +2907,9 @@ TEMPLATE_PROC_DIR 	  	 	 	 	 	\
 	unchecked_isa_dma: 0,	/* no memory DMA restrictions */\
 TEMPLATE_USE_NEW_EH_CODE 	 	 	 	 	\
 TEMPLATE_MAX_SECTORS						\
+TEMPLATE_EMULATED						\
 	highmem_io: 1,						\
 	vary_io: 1,						\
-TEMPLATE_EMULATED						\
 	use_clustering: ENABLE_CLUSTERING			\
 }
 
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/qla2xxx/qla2x00_ioctl.c linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/qla2xxx/qla2x00_ioctl.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/qla2xxx/qla2x00_ioctl.c	2003-07-30 13:51:37.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/qla2xxx/qla2x00_ioctl.c	2003-07-30 10:28:04.000000000 +0200
@@ -2,7 +2,7 @@
  *                  QLOGIC LINUX SOFTWARE
  *
  * QLogic ISP2x00 device driver for Linux 2.4.x
- * Copyright (C) 2002 Qlogic Corporation
+ * Copyright (C) 2003 Qlogic Corporation
  * (www.qlogic.com)
  *
  * This program is free software; you can redistribute it and/or modify it
@@ -18,32 +18,54 @@
  ******************************************************************************/
 
 
-#define	QLA_PT_CMD_TOV			(30 * 2)
-#define QLA_IOCTL_ACCESS_WAIT_TIME	30 /* seconds */
+#define	QLA_PT_CMD_TOV			(60) /* firmware timeout */
+#define QLA_PT_CMD_DRV_TOV		(QLA_PT_CMD_TOV + 1) /* drvr timeout */
+#define QLA_IOCTL_ACCESS_WAIT_TIME	(QLA_PT_CMD_DRV_TOV + 2) /* wait_q tov */
 #define QLA_INITIAL_IOCTLMEM_SIZE	(2 * PAGE_SIZE)
+#define QLA_IOCTL_SCRAP_SIZE		2048 /* scrap memory for local use. */
+
+/* ELS related defines */
+#define FC_HEADER_LEN		24
+#define ELS_RJT_LENGTH		0x08	/* 8  */
+#define ELS_RPS_ACC_LENGTH	0x40	/* 64 */
+#define ELS_RLS_ACC_LENGTH	0x1C	/* 28 */
+
+/* ELS cmd Reply Codes */
+#define ELS_STAT_LS_RJT		0x01
+#define ELS_STAT_LS_ACC		0x02
 
 #define IOCTL_INVALID_STATUS    0xffff
 
 #if defined(INTAPI)
 #include "inioct.h"
 /* from qla_inioct.c */
-extern int qla2x00_read_nvram(scsi_qla_host_t *, EXT_IOCTL *, int);
-extern int qla2x00_update_nvram(scsi_qla_host_t *, EXT_IOCTL *, int);
-extern int qla2x00_write_nvram_word(scsi_qla_host_t *, uint8_t, uint16_t);
-extern int qla2x00_send_loopback(scsi_qla_host_t *, EXT_IOCTL *, int);
-extern int qla2x00_read_option_rom(scsi_qla_host_t *, EXT_IOCTL *, int);
-extern int qla2x00_update_option_rom(scsi_qla_host_t *, EXT_IOCTL *, int);
+static int qla2x00_read_nvram(scsi_qla_host_t *, EXT_IOCTL *, int);
+static int qla2x00_update_nvram(scsi_qla_host_t *, EXT_IOCTL *, int);
+static int qla2x00_write_nvram_word(scsi_qla_host_t *, uint8_t, uint16_t);
+static int qla2x00_send_loopback(scsi_qla_host_t *, EXT_IOCTL *, int);
+static int qla2x00_read_option_rom(scsi_qla_host_t *, EXT_IOCTL *, int);
+static int qla2x00_update_option_rom(scsi_qla_host_t *, EXT_IOCTL *, int);
 #endif
 
 
+/*
+ * Local prototypes
+ */
 STATIC int qla2x00_alloc_ioctl_mem(scsi_qla_host_t *);
 STATIC int qla2x00_get_new_ioctl_dma_mem(scsi_qla_host_t *, uint32_t);
 STATIC void qla2x00_free_ioctl_mem(scsi_qla_host_t *);
 
-/*
- * Local prototypes
- */
-STATIC int qla2x00_find_curr_ha(int, scsi_qla_host_t **);
+STATIC int qla2x00_get_ioctl_scrap_mem(scsi_qla_host_t *, void **, uint32_t);
+STATIC void qla2x00_free_ioctl_scrap_mem(scsi_qla_host_t *);
+
+#if defined(ISP2300)
+STATIC uint8_t qla2x00_get_next_free_pub_id(scsi_qla_host_t *, uint16_t *);
+STATIC uint8_t qla2x00_host_relogin(scsi_qla_host_t *, fcdev_t *);
+#endif
+
+STATIC int qla2x00_find_curr_ha(uint16_t, scsi_qla_host_t **);
+
+STATIC int qla2x00_get_driver_specifics(EXT_IOCTL *);
 
 STATIC int qla2x00_aen_reg(scsi_qla_host_t *, EXT_IOCTL *, int);
 STATIC int qla2x00_aen_get(scsi_qla_host_t *, EXT_IOCTL *, int);
@@ -63,8 +85,12 @@ STATIC int qla2x00_get_port_summary(scsi
 STATIC int qla2x00_query_driver(scsi_qla_host_t *, EXT_IOCTL *, int);
 STATIC int qla2x00_query_fw(scsi_qla_host_t *, EXT_IOCTL *, int);
 
+#if defined(ISP2300)
+STATIC int qla2x00_send_els_passthru(scsi_qla_host_t *, EXT_IOCTL *, int);
+#endif
 STATIC int qla2x00_send_fcct(scsi_qla_host_t *, EXT_IOCTL *, int);
-STATIC int qla2x00_start_ms_cmd(scsi_qla_host_t *, EXT_IOCTL *, srb_t *);
+STATIC int qla2x00_start_ms_cmd(scsi_qla_host_t *, EXT_IOCTL *, srb_t *,
+    EXT_ELS_PT_REQ *);
 
 STATIC int qla2x00_wwpn_to_scsiaddr(scsi_qla_host_t *, EXT_IOCTL *, int);
 STATIC int qla2x00_scsi_passthru(scsi_qla_host_t *, EXT_IOCTL *, int);
@@ -84,7 +110,8 @@ STATIC uint8_t qla2x00_release_ioctl_acc
 STATIC void qla2x00_wait_q_memb_alloc(scsi_qla_host_t *, wait_q_t **);
 STATIC void qla2x00_wait_q_memb_free(scsi_qla_host_t *, wait_q_t *);
 STATIC uint8_t qla2x00_wait_q_add(scsi_qla_host_t *, wait_q_t **);
-STATIC void qla2x00_wait_q_remove(scsi_qla_host_t *, wait_q_t **);
+STATIC void qla2x00_wait_q_get_next(scsi_qla_host_t *, wait_q_t **);
+STATIC void qla2x00_wait_q_remove(scsi_qla_host_t *, wait_q_t *);
 
 
 /*
@@ -102,14 +129,14 @@ STATIC void qla2x00_wait_q_remove(scsi_q
 STATIC void
 qla2x00_ioctl_sleep_done(struct semaphore * sem)
 {
-	DEBUG9(printk("ioctl_sleep: entered.\n");)
+	DEBUG9(printk("%s: entered.\n", __func__);)
 
 	if (sem != NULL){
 		DEBUG9(printk("ioctl_sleep: wake up sem.\n");)
 		up(sem);
 	}
 
-	DEBUG9(printk("ioctl_sleep: exiting.\n");)
+	DEBUG9(printk("%s: exiting.\n", __func__);)
 }
 
 /*
@@ -133,7 +160,6 @@ qla2x00_ioctl_sem_init(scsi_qla_host_t *
 	ha->ioctl->cmpl_timer.data = (unsigned long)&ha->ioctl->cmpl_sem;
 	ha->ioctl->cmpl_timer.function =
 	    (void (*)(unsigned long))qla2x00_ioctl_sleep_done;
-
 }
 
 /*
@@ -156,7 +182,7 @@ qla2x00_scsi_pt_done(Scsi_Cmnd *pscsi_cm
 	host = pscsi_cmd->host;
 	ha = (scsi_qla_host_t *) host->hostdata;
 
-	DEBUG9(printk("qla2x00_scsi_pt_done post function called OK\n");)
+	DEBUG9(printk("%s post function called OK\n", __func__);)
 
 	/* save detail status for IOCTL reporting */
 	ha->ioctl->SCSIPT_InProgress = 0;
@@ -164,16 +190,16 @@ qla2x00_scsi_pt_done(Scsi_Cmnd *pscsi_cm
 
 	up(&ha->ioctl->cmpl_sem);
 
-	DEBUG9(printk("qla2x00_scsi_pt_done: exiting.\n");)
+	DEBUG9(printk("%s: exiting.\n", __func__);)
 
 	return;
 }
 
 /*
- * qla2x00_fcct_done
+ * qla2x00_msiocb_done
  *
  * Description:
- *   Resets FCCT ioctl progress flag and wakes up the ioctl completion
+ *   Resets MSIOCB ioctl progress flag and wakes up the ioctl completion
  *   semaphore.
  *
  * Input:
@@ -182,7 +208,7 @@ qla2x00_scsi_pt_done(Scsi_Cmnd *pscsi_cm
  * Returns:
  */
 STATIC void
-qla2x00_fcct_done(Scsi_Cmnd *pscsi_cmd)
+qla2x00_msiocb_done(Scsi_Cmnd *pscsi_cmd)
 {
 	struct Scsi_Host *host;
 	scsi_qla_host_t  *ha;
@@ -190,14 +216,14 @@ qla2x00_fcct_done(Scsi_Cmnd *pscsi_cmd)
 	host = pscsi_cmd->host;
 	ha = (scsi_qla_host_t *) host->hostdata;
 
-	DEBUG9(printk("qla2x00_fcct_done post function called OK\n");)
+	DEBUG9(printk("%s post function called OK\n", __func__);)
 
-	ha->ioctl->FCCT_InProgress = 0;
+	ha->ioctl->MSIOCB_InProgress = 0;
 	ha->ioctl->ioctl_tov = 0;
 
 	up(&ha->ioctl->cmpl_sem);
 
-	DEBUG9(printk("qla2x00_fcct_done: exiting.\n");)
+	DEBUG9(printk("%s: exiting.\n", __func__);)
 		
 	return;
 }
@@ -211,52 +237,70 @@ qla2x00_fcct_done(Scsi_Cmnd *pscsi_cmd)
  * Returns:
  *   ret  = 0    Success
  *   ret != 0    Failed; detailed status copied to EXT_IOCTL structure
- *               if applicable
+ *               if possible
  *************************************************************************/
-int
+STATIC int
 qla2x00_ioctl(Scsi_Device *dev, int cmd, void *arg)
 {
 	int		mode = 0;
-	int		rval = 0;
-	int		ret = EINVAL;
+	int		tmp_rval = 0;
+	int		ret = -EINVAL;
 
 	uint8_t		*temp;
 	uint8_t		tempbuf[8];
 	uint32_t	i;
 	uint32_t	status;
 
-	static EXT_IOCTL	ext;
-	PEXT_IOCTL		pext = &ext;
+	EXT_IOCTL	*pext;
 
-	scsi_qla_host_t		*ha;
-	struct Scsi_Host	*host;
+	scsi_qla_host_t	*ha;
 
 
-	DEBUG9(printk("qla2x00_ioctl: entry to command (%x), arg (%p)\n",
-		cmd, arg);)
+	DEBUG9(printk("%s: entry to command (%x), arg (%p)\n",
+	    __func__, cmd, arg);)
 
 	/* Catch any non-exioct ioctls */
 	if (_IOC_TYPE(cmd) != QLMULTIPATH_MAGIC) {
-		return (-EINVAL);
+		return (ret);
 	}
 
-	host = dev->host;
-	ha = (scsi_qla_host_t *) host->hostdata; /* midlayer chosen instance */
-
 	ret = verify_area(VERIFY_READ, (void *)arg, sizeof(EXT_IOCTL));
 	if (ret) {
-		DEBUG9_10(printk("qla2x00_ioctl: ERROR VERIFY_READ EXT_IOCTL "
-		    "sturct. ha=%p.\n", ha);)
-		return ret;
+		DEBUG9_10(printk("%s: ERROR VERIFY_READ EXT_IOCTL "
+		    "sturct. cmd=%d arg=%p.\n", __func__, cmd, arg);)
+		return (ret);
+	}
+
+	/* Allocate ioctl structure buffer to support multiple concurrent
+	 * entries.
+	 */
+	pext = KMEM_ZALLOC(sizeof(EXT_IOCTL), 16);
+	if (pext == NULL) {
+		/* error */
+		printk(KERN_WARNING
+		    "qla2x00: ERROR in main ioctl buffer allocation.\n");
+		return (-ENOMEM);
 	}
 
 	/* copy in application layer EXT_IOCTL */
 	ret = copy_from_user(pext, arg, sizeof(EXT_IOCTL));
 	if (ret) {
-		DEBUG9_10(printk("qla2x00_ioctl: ERROR COPY_FROM_USER "
-				       "EXT_IOCTL sturct. ha=%p.\n",
-				       ha);)
-		return ret;
+		DEBUG9_10(printk("%s: ERROR COPY_FROM_USER "
+		    "EXT_IOCTL sturct. cmd=%d arg=%p.\n",
+		    __func__, cmd, arg);)
+
+		KMEM_FREE(pext, sizeof(EXT_IOCTL));
+		return (ret);
+	}
+
+	/* Verify before update status fields in EXT_IOCTL struct. */
+	ret = verify_area(VERIFY_WRITE, (void *)arg, sizeof(EXT_IOCTL));
+	if (ret) {
+		DEBUG9_10(printk("%s: ERROR VERIFY_WRITE EXT_IOCTL "
+		    "sturct. cmd=%d arg=%p.\n", __func__, cmd, arg);)
+
+		KMEM_FREE(pext, sizeof(EXT_IOCTL));
+		return (ret);
 	}
 
 	/* check signature of this ioctl */
@@ -272,88 +316,147 @@ qla2x00_ioctl(Scsi_Device *dev, int cmd,
 		status = 1;
 
 	if (status != 0) {
-		DEBUG9_10(printk("qla2x00_ioctl: signature did not match. "
-		    "ha=%p\n", ha);)
+		DEBUG9_10(printk("%s: signature did not match. "
+		    "cmd=%d arg=%p.\n", __func__, cmd, arg);)
 		pext->Status = EXT_STATUS_INVALID_PARAM;
 		copy_to_user((void *)arg, (void *)pext, sizeof(EXT_IOCTL));
-		return EXT_STATUS_ERR;
+
+		KMEM_FREE(pext, sizeof(EXT_IOCTL));
+		return (-EINVAL);
 	}
 
 	/* check version of this ioctl */
 	if (pext->Version > EXT_VERSION) {
 		printk(KERN_WARNING
-		    "qla2x00: interface version not supported = %d.\n",
-				pext->Version);
+		    "qla2x00: ioctl interface version not supported = %d.\n",
+		    pext->Version);
 		pext->Status = EXT_STATUS_UNSUPPORTED_VERSION;
 		copy_to_user((void *)arg, (void *)pext, sizeof(EXT_IOCTL));
-		return EXT_STATUS_ERR;
+
+		KMEM_FREE(pext, sizeof(EXT_IOCTL));
+		return (-EINVAL);
 	}
 
-	/* check for API setting HBA Instance for subsequent operations */
-	if (cmd == (int)EXT_CC_STARTIOCTL) {
-		DEBUG9(printk("qla2x00_ioctl: got startioctl command.\n");)
+	/* check for special cmds used during application's setup time. */
+	switch (cmd) {
+	case EXT_CC_STARTIOCTL:
+		DEBUG9(printk("%s: got startioctl command.\n", __func__);)
 
 		pext->Instance = num_hosts;
 		pext->Status = EXT_STATUS_OK;
-		copy_to_user((void *)arg, (void *)pext, sizeof(EXT_IOCTL));
-		return EXT_STATUS_OK;
+		ret = copy_to_user((void *)arg, (void *)pext,
+		    sizeof(EXT_IOCTL));
 
-	} else if (cmd == (int)EXT_CC_SETINSTANCE) {
-		/*
-		 * Since API opens devices once and uses handle for
-		 * subsequent calls, we keep a parameter to designate
-		 * the "active HBA" for ioctls.
+		KMEM_FREE(pext, sizeof(EXT_IOCTL));
+		return (ret);
+
+	case EXT_CC_SETINSTANCE:
+		/* This call is used to return the HBA's host number to
+		 * ioctl caller.  All subsequent ioctl commands will put
+		 * the host number in HbaSelect field to tell us which
+		 * HBA is the destination.
 		 */
 		if (pext->Instance < num_hosts) {
-			apiHBAInstance = pext->Instance;
+			if (!((uint32_t)pext->VendorSpecificData &
+			    EXT_DEF_USE_HBASELECT)) {
+				/* Backward compatible code. */
+				apiHBAInstance = pext->Instance;
+			}
+
 			/*
-			 * Return host number in pext->HbaSelect for
-			 * reference by IOCTL caller.
+			 * Return host number via pext->HbaSelect for
+			 * specified API instance number.
 			 */
-			if (qla2x00_find_curr_ha(apiHBAInstance, &ha) != 0) {
-				DEBUG9_10(printk("qla2x00_ioctl: ERROR finding "
-				    "ha in EXT_SETINSTANCE. Instance=%d "
-				    "num_hosts=%d ha=%p.\n",
-				    pext->Instance, num_hosts, ha);)
+			if (qla2x00_find_curr_ha(pext->Instance, &ha) != 0) {
 				pext->Status = EXT_STATUS_DEV_NOT_FOUND;
-				copy_to_user(arg, pext, sizeof(EXT_IOCTL));
+				ret = copy_to_user(arg, pext, sizeof(EXT_IOCTL));
+				DEBUG9_10(printk("%s: SETINSTANCE invalid inst "
+				    "%d. num_hosts=%d ha=%p ret=%d.\n",
+				    __func__, pext->Instance, num_hosts, ha,
+				    ret);)
 
-				return EXT_STATUS_ERR;
+				KMEM_FREE(pext, sizeof(EXT_IOCTL));
+				return (ret); /* ioctl completed ok */
 			}
 
 			pext->HbaSelect = ha->host_no;
 			pext->Status = EXT_STATUS_OK;
-			copy_to_user(arg, pext, sizeof(EXT_IOCTL));
 
-			DEBUG9(printk("qla2x00_ioctl: Setting instance to "
-			    "%d.\n", apiHBAInstance);)
-
-			ret = EXT_STATUS_OK;
+			DEBUG9(printk("%s: Matching instance %d to hba "
+			    "%ld.\n", __func__, pext->Instance, ha->host_no);)
 		} else {
-			DEBUG9_10(printk("qla2x00_ioctl: ERROR EXT_SETINSTANCE."
+			DEBUG9_10(printk("%s: ERROR EXT_SETINSTANCE."
 			    " Instance=%d num_hosts=%d ha=%p.\n",
-			    pext->Instance, num_hosts, ha);)
+			    __func__, pext->Instance, num_hosts, ha);)
 
 			pext->Status = EXT_STATUS_DEV_NOT_FOUND;
-			copy_to_user(arg, pext, sizeof(EXT_IOCTL));
-			ret = EXT_STATUS_ERR;
 		}
+		ret = copy_to_user(arg, pext, sizeof(EXT_IOCTL));
+		KMEM_FREE(pext, sizeof(EXT_IOCTL));
 
-		return ret;
+		DEBUG9(printk("%s: SETINSTANCE exiting. ret=%d.\n",
+		    __func__, ret);)
+
+		return (ret);
+
+	case EXT_CC_DRIVER_SPECIFIC:
+		ret = qla2x00_get_driver_specifics(pext);
+		tmp_rval = copy_to_user(arg, (void *)pext, sizeof(EXT_IOCTL));
+
+		if (ret == 0)
+			ret = tmp_rval;
+
+		KMEM_FREE(pext, sizeof(EXT_IOCTL));
+		return (ret);
+
+	default:
+		break;
 	}
 
-	/*
-	 * Check for valid apiHBAInstance (set previously by EXT_SETINSTANCE
-	 * or default 0)  and set ha context for this IOCTL.
-	 */
-	if (qla2x00_find_curr_ha(apiHBAInstance, &ha) != 0) {
+	if (!((uint32_t)pext->VendorSpecificData & EXT_DEF_USE_HBASELECT)) {
+		/* Backward compatible code. */
+		/* Will phase out soon. */
+
+		/* Check for valid apiHBAInstance (set previously by
+		 * EXT_SETINSTANCE or default 0)  and set ha context
+		 * for this IOCTL.
+		 */
+		if (qla2x00_find_curr_ha(apiHBAInstance, &ha) != 0) {
 
-		DEBUG9_10(printk("qla2x00_ioctl: ERROR matching apiHBAInstance "
-		    "%d to an HBA Instance.\n", apiHBAInstance);)
+			DEBUG9_10(printk("%s: ERROR matching apiHBAInstance "
+			    "%d to an HBA Instance.\n",
+			    __func__, pext->HbaSelect);)
 
-		pext->Status = EXT_STATUS_DEV_NOT_FOUND;
-		copy_to_user(arg, pext, sizeof(EXT_IOCTL));
-		return EXT_STATUS_ERR;
+			pext->Status = EXT_STATUS_DEV_NOT_FOUND;
+			copy_to_user(arg, pext, sizeof(EXT_IOCTL));
+
+			KMEM_FREE(pext, sizeof(EXT_IOCTL));
+			return (-EINVAL);
+		}
+
+		DEBUG9(printk("%s: active apiHBAInstance=%d host_no=%ld "
+		    "CC=%x SC=%x.\n",
+		    __func__, apiHBAInstance, ha->host_no, cmd, pext->SubCode);)
+
+	} else {
+		/* Use HbaSelect value to get a matching ha instance
+		 * for this ioctl command.
+		 */
+		if (qla2x00_find_curr_ha(pext->HbaSelect, &ha) != 0) {
+
+			DEBUG9_10(printk("%s: ERROR matching pext->HbaSelect "
+			    "%d to an HBA Instance.\n",
+			    __func__, pext->HbaSelect);)
+
+			pext->Status = EXT_STATUS_DEV_NOT_FOUND;
+			copy_to_user(arg, pext, sizeof(EXT_IOCTL));
+
+			KMEM_FREE(pext, sizeof(EXT_IOCTL));
+			return (-EINVAL);
+		}
+
+		DEBUG9(printk("%s: active host_inst=%ld CC=%x SC=%x.\n",
+		    __func__, ha->instance, cmd, pext->SubCode);)
 	}
 
 	/*
@@ -362,166 +465,115 @@ qla2x00_ioctl(Scsi_Device *dev, int cmd,
 	 */
 	if (qla2x00_get_ioctl_access(ha, QLA_IOCTL_ACCESS_WAIT_TIME) != 0) {
 		/* error timed out */
-		DEBUG9_10(printk("qla2x00_ioctl: ERROR timeout getting "
-		    "ioctl access. Inst=%d.\n", apiHBAInstance);)
+		DEBUG9_10(printk("%s: ERROR timeout getting ioctl "
+		    "access. host no=%d.\n", __func__, pext->HbaSelect);)
 
 		pext->Status = EXT_STATUS_BUSY;
 		copy_to_user(arg, pext, sizeof(EXT_IOCTL));
-		return EXT_STATUS_ERR;
-	}
 
-	/*
-	 * Set EXT_IOCTL.HbaSelect to host number for reference by IOCTL
-	 * caller.
-	 */
-	pext->HbaSelect = ha->host_no;
-
-	DEBUG9(printk("qla2x00_ioctl: active apiHBAInstance=%d CC=%x SC=%x.\n",
-	    apiHBAInstance, cmd, pext->SubCode);)
+		KMEM_FREE(pext, sizeof(EXT_IOCTL));
+		return (-EBUSY);
+	}
 
 
-	while( test_bit(CFG_ACTIVE, &ha->cfg_flags) || ha->dpc_active ) {
+	while (test_bit(CFG_ACTIVE, &ha->cfg_flags) || ha->dpc_active) {
 		if( signal_pending(current) )
 			break;   /* get out */
 
 		set_current_state(TASK_INTERRUPTIBLE);
 		schedule_timeout(HZ);
-	};
+	}
 
 	switch (cmd) { /* switch on EXT IOCTL COMMAND CODE */
 
 	case EXT_CC_QUERY:
-		DEBUG9(printk("qla2x00_ioctl: got query command.\n");)
+		DEBUG9(printk("%s: got query command.\n", __func__);)
 
-		rval = qla2x00_query(ha, pext, 0);
-		ret = (rval == QL_STATUS_SUCCESS) ?
-		    EXT_STATUS_OK : EXT_STATUS_ERR;
-		copy_to_user((void *)arg, (void *)pext, sizeof(EXT_IOCTL));
+		ret = qla2x00_query(ha, pext, 0);
 
 		break;
 
 	case EXT_CC_GET_DATA:
-		DEBUG9(printk("qla2x00_ioctl: got get_data command.\n");)
+		DEBUG9(printk("%s: got get_data command.\n", __func__);)
 
-		rval = qla2x00_get_data(ha, pext, 0);
-		ret = (rval == QL_STATUS_SUCCESS) ?
-		    EXT_STATUS_OK : EXT_STATUS_ERR;
-		copy_to_user((void *)arg, (void *)pext, sizeof(EXT_IOCTL));
+		ret = qla2x00_get_data(ha, pext, 0);
 
 		break;
 
 	case EXT_CC_SEND_FCCT_PASSTHRU:
-		DEBUG9(printk("qla2x00_ioctl: got CT passthru cmd.\n"));
+		DEBUG9(printk("%s: got CT passthru cmd.\n", __func__));
 
-		rval = qla2x00_send_fcct(ha, pext, 0);
-		ret = (rval == QL_STATUS_SUCCESS) ?
-		    EXT_STATUS_OK : EXT_STATUS_ERR;
-		copy_to_user((void *)arg, (void *)pext, sizeof(EXT_IOCTL));
+		ret = qla2x00_send_fcct(ha, pext, 0);
 
 		break;
 
 	case EXT_CC_SEND_SCSI_PASSTHRU:
-		DEBUG9(printk("qla2x00_ioctl: got SCSI passthru cmd.\n"));
+		DEBUG9(printk("%s: got SCSI passthru cmd.\n", __func__));
 
-		rval = qla2x00_scsi_passthru(ha, pext, mode);
-		ret = (rval == QL_STATUS_SUCCESS) ?
-		    EXT_STATUS_OK : EXT_STATUS_ERR;
-		copy_to_user((void *)arg, (void *)pext, sizeof(EXT_IOCTL));
+		ret = qla2x00_scsi_passthru(ha, pext, mode);
 
 		break;
 
 	case EXT_CC_REG_AEN:
-		rval = qla2x00_aen_reg(ha, pext, mode);
-
-		ret = (rval == QL_STATUS_SUCCESS) ?
-		    EXT_STATUS_OK : EXT_STATUS_ERR;
-		copy_to_user((void *)arg, (void *)pext, sizeof(EXT_IOCTL));
+		ret = qla2x00_aen_reg(ha, pext, mode);
 
 		break;
 
 	case EXT_CC_GET_AEN:
-		rval = qla2x00_aen_get(ha, pext, mode);
-
-		ret = (rval == QL_STATUS_SUCCESS) ?
-		    EXT_STATUS_OK : EXT_STATUS_ERR;
-		copy_to_user((void *)arg, (void *)pext, sizeof(EXT_IOCTL));
+		ret = qla2x00_aen_get(ha, pext, mode);
 
 		break;
 
 	case EXT_CC_WWPN_TO_SCSIADDR:
-		rval = qla2x00_wwpn_to_scsiaddr(ha, pext, 0);
-		ret = (rval == QL_STATUS_SUCCESS) ?
-		    EXT_STATUS_OK : EXT_STATUS_ERR;
-		copy_to_user(arg, pext, sizeof(EXT_IOCTL));
+		ret = qla2x00_wwpn_to_scsiaddr(ha, pext, 0);
 		break;
 
 	case EXT_CC_SEND_ELS_RNID:
-		rval = qla2x00_send_els_rnid(ha, pext, mode);
-		ret = (rval == QL_STATUS_SUCCESS) ?
-		    EXT_STATUS_OK : EXT_STATUS_ERR;
-		copy_to_user(arg, pext, sizeof(EXT_IOCTL));
+		ret = qla2x00_send_els_rnid(ha, pext, mode);
 		break;
 
 	case EXT_CC_SET_DATA:
-		rval = qla2x00_set_host_data(ha, pext, mode);
-		ret = (rval == QL_STATUS_SUCCESS) ?
-		    EXT_STATUS_OK : EXT_STATUS_ERR;
-		copy_to_user(arg, pext, sizeof(EXT_IOCTL));
+		ret = qla2x00_set_host_data(ha, pext, mode);
 		break;                                                          
 
 #if defined(INTAPI)
 	case INT_CC_READ_NVRAM:
-		rval = qla2x00_read_nvram(ha, pext, mode);
-
-		ret = (rval == QL_STATUS_SUCCESS) ?
-		    EXT_STATUS_OK : EXT_STATUS_ERR;
-		copy_to_user((void *)arg, (void *)pext, sizeof(EXT_IOCTL));
+		ret = qla2x00_read_nvram(ha, pext, mode);
 
 		break;
 
 	case INT_CC_UPDATE_NVRAM:
-		rval = qla2x00_update_nvram(ha, pext, mode);
-
-		ret = (rval == QL_STATUS_SUCCESS) ?
-		    EXT_STATUS_OK : EXT_STATUS_ERR;
-		copy_to_user((void *)arg, (void *)pext, sizeof(EXT_IOCTL));
+		ret = qla2x00_update_nvram(ha, pext, mode);
 
 		break;
 
 	case INT_CC_LOOPBACK:
-		rval = qla2x00_send_loopback(ha, pext, mode);
-
-		ret = (rval == QL_STATUS_SUCCESS) ?
-		    EXT_STATUS_OK : EXT_STATUS_ERR;
-		copy_to_user((void *)arg, (void *)pext, sizeof(EXT_IOCTL));
+		ret = qla2x00_send_loopback(ha, pext, mode);
 
 		break;
 
 	case INT_CC_READ_OPTION_ROM:
-		rval = qla2x00_read_option_rom(ha, pext, mode);
-
-		ret = (rval == QL_STATUS_SUCCESS) ?
-		    EXT_STATUS_OK : EXT_STATUS_ERR;
-		copy_to_user((void *)arg, (void *)pext, sizeof(EXT_IOCTL));
+		ret = qla2x00_read_option_rom(ha, pext, mode);
 
 		break;
 
 	case INT_CC_UPDATE_OPTION_ROM:
-		rval = qla2x00_update_option_rom(ha, pext, mode);
-
-		ret = (rval == QL_STATUS_SUCCESS) ?
-		    EXT_STATUS_OK : EXT_STATUS_ERR;
-		copy_to_user((void *)arg, (void *)pext, sizeof(EXT_IOCTL));
+		ret = qla2x00_update_option_rom(ha, pext, mode);
 
 		break;
 #endif /* INTAPI */
 
+#if defined(ISP2300)
+	case EXT_CC_SEND_ELS_PASSTHRU:
+		DEBUG9(printk("%s: got ELS passthru cmd.\n", __func__));
+
+		ret = qla2x00_send_els_passthru(ha, pext, 0);
+
+		break;
+#endif
+
 	/* all others go here */
 	/*
-	   case EXT_CC_ELS_RNID_SEND:
-	   break;
-	   case EXT_CC_ELS_RTIN_SEND:
-	   break;
 	   case EXT_CC_PLATFORM_REG:
 	   break;
 	 */
@@ -537,21 +589,31 @@ qla2x00_ioctl(Scsi_Device *dev, int cmd,
 	case FO_CC_SET_LUN_DATA:
 	case FO_CC_GET_TARGET_DATA:
 	case FO_CC_SET_TARGET_DATA:
-		DEBUG9(printk("qla2x00_ioctl: failover arg (%p):\n", arg);)
-		    qla2x00_fo_ioctl(ha,cmd, arg, mode);
-		copy_to_user((void *)arg, (void *)pext, sizeof(EXT_IOCTL));
+		DEBUG9(printk("%s: failover arg (%p):\n", __func__, arg);)
+
+		qla2x00_fo_ioctl(ha, cmd, pext, mode);
+
 		break;
 
 	default:
-		ret = EXT_STATUS_ERR;
+		pext->Status = EXT_STATUS_INVALID_REQUEST;
 		break;
+
 	} /* end of CC decode switch */
 
-	DEBUG9(printk("qla2x00_ioctl: exiting. rval(%d) ret(%d)\n", rval, ret);)
+	/* Always try to copy values back regardless what happened before. */
+	tmp_rval = copy_to_user(arg, (void *)pext, sizeof(EXT_IOCTL));
+
+	if (ret == 0)
+		ret = tmp_rval;
+
+	DEBUG9(printk("%s: exiting. tmp_rval(%d) ret(%d)\n",
+	    __func__, tmp_rval, ret);)
 
 	qla2x00_release_ioctl_access(ha);
 
-	return ret;
+	KMEM_FREE(pext, sizeof(EXT_IOCTL));
+	return (ret);
 }
 
 /*
@@ -570,7 +632,8 @@ qla2x00_ioctl(Scsi_Device *dev, int cmd,
 STATIC int
 qla2x00_alloc_ioctl_mem(scsi_qla_host_t *ha)
 {
-	DEBUG9(printk("qla2x00_alloc_ioctl_mem entered.\n");)
+	DEBUG9(printk("%s(%ld): inst=%ld entered.\n",
+	    __func__, ha->host_no, ha->instance);)
 
 	if (qla2x00_get_new_ioctl_dma_mem(ha, QLA_INITIAL_IOCTLMEM_SIZE) !=
 	    QL_STATUS_SUCCESS) {
@@ -612,23 +675,39 @@ qla2x00_alloc_ioctl_mem(scsi_qla_host_t 
 		return QL_STATUS_RESOURCE_ERROR;
 	}
 	/*INIT_LIST_HEAD(&(ha->ioctl->ioctl_lq->cmd));*/
+
+	/* Pick the largest size we'll need per ha of all ioctl cmds.
+	 * Use this size when freeing.
+	 */
+	ha->ioctl->scrap_mem = KMEM_ZALLOC(QLA_IOCTL_SCRAP_SIZE, 15);
+	if (ha->ioctl->scrap_mem == NULL) {
+		printk(KERN_WARNING
+		    "qla2x00: ERROR in ioctl scrap_mem allocation.\n");
+		return QL_STATUS_RESOURCE_ERROR;
+	}
+	ha->ioctl->scrap_mem_size = QLA_IOCTL_SCRAP_SIZE;
+	ha->ioctl->scrap_mem_used = 0;
+	DEBUG9(printk("%s(%ld): scrap_mem_size=%d.\n",
+	    __func__, ha->host_no, ha->ioctl->scrap_mem_size);)
+
 	ha->ioctl->ioctl_lq->q_state = LUN_STATE_READY;
 #ifdef __VMWARE__
-    spin_lock_init(&ha->ioctl->ioctl_lq->q_lock);
+	spin_lock_init(&ha->ioctl->ioctl_lq->q_lock);
 #else
 	ha->ioctl->ioctl_lq->q_lock = SPIN_LOCK_UNLOCKED;
 #endif
 
 	/* Init wait_q fields */
 #ifdef __VMWARE__
-    spin_lock_init(&ha->ioctl->wait_q_lock);
+	spin_lock_init(&ha->ioctl->wait_q_lock);
 #else
 	ha->ioctl->wait_q_lock = SPIN_LOCK_UNLOCKED;
 #endif
 
-	DEBUG9(printk("qla2x00_alloc_ioctl_mem exiting.\n");)
+	DEBUG9(printk("%s(%ld): inst=%ld exiting.\n",
+	    __func__, ha->host_no, ha->instance);)
 
-	return QLA2X00_SUCCESS;
+	return QL_STATUS_SUCCESS;
 }
 
 /*
@@ -648,9 +727,11 @@ qla2x00_alloc_ioctl_mem(scsi_qla_host_t 
 STATIC int
 qla2x00_get_new_ioctl_dma_mem(scsi_qla_host_t *ha, uint32_t size)
 {
+	DEBUG9(printk("%s entered.\n", __func__);)
+
 	if (ha->ioctl_mem) {
-		DEBUG9(printk("qla2x00_get_new_ioctl_dma_mem: ioctl_mem "
-		    "was previously allocated. Dealloc old buffer.\n");)
+		DEBUG9(printk("%s: ioctl_mem was previously allocated. "
+		    "Dealloc old buffer.\n", __func__);)
 
 	 	/* free the memory first */
 	 	pci_free_consistent(ha->pdev, ha->ioctl_mem_size, ha->ioctl_mem,
@@ -663,14 +744,16 @@ qla2x00_get_new_ioctl_dma_mem(scsi_qla_h
 
 	if (ha->ioctl_mem == NULL) {
 		printk(KERN_WARNING
-		    "qla2x00_get_new_ioctl_dma_mem: ERROR in ioctl physical "
-		    "memory allocation. Requested length=%x.\n", size);
+		    "%s: ERROR in ioctl physical memory allocation. "
+		    "Requested length=%x.\n", __func__, size);
 
 		ha->ioctl_mem_size = 0;
 		return QL_STATUS_RESOURCE_ERROR;
 	}
 	ha->ioctl_mem_size = size;
 
+	DEBUG9(printk("%s exiting.\n", __func__);)
+
 	return QL_STATUS_SUCCESS;
 }
 
@@ -687,10 +770,21 @@ qla2x00_get_new_ioctl_dma_mem(scsi_qla_h
 STATIC void
 qla2x00_free_ioctl_mem(scsi_qla_host_t *ha)
 {
-	DEBUG9(printk("qla2x00_free_ioctl_mem entered.\n");)
+	DEBUG9(printk("%s(%ld): inst=%ld entered.\n",
+	    __func__, ha->host_no, ha->instance);)
 
 	if (ha->ioctl != NULL) {
 
+		if (ha->ioctl->scrap_mem != NULL) {
+			/* The size here must match up to what we
+			 * allocated before.
+			 */
+			KMEM_FREE(ha->ioctl->scrap_mem,
+			    ha->ioctl->scrap_mem_size);
+			ha->ioctl->scrap_mem = NULL;
+			ha->ioctl->scrap_mem_size = 0;
+		}
+
 		if (ha->ioctl->ioctl_tq != NULL) {
 			KMEM_FREE(ha->ioctl->ioctl_tq, sizeof(os_tgt_t));
 			ha->ioctl->ioctl_tq = NULL;
@@ -720,15 +814,272 @@ qla2x00_free_ioctl_mem(scsi_qla_host_t *
 	    ha->ioctl_mem_phys);
 	ha->ioctl_mem = NULL;
 
-	DEBUG9(printk("qla2x00_free_ioctl_mem exiting.\n");)
+	DEBUG9(printk("%s(%ld): inst=%ld exiting.\n",
+	    __func__, ha->host_no, ha->instance);)
+
+}
+
+/*
+ * qla2x00_get_ioctl_scrap_mem
+ *	Returns pointer to memory of the specified size from the scrap buffer.
+ *	This can be called multiple times before the free call as long
+ *	as the memory is to be used by the same ioctl command and
+ *	there's still memory left in the scrap buffer.
+ *
+ * Input:
+ *	ha = adapter state pointer.
+ *	ppmem = pointer to return a buffer pointer.
+ *	size = size of buffer to return.
+ *
+ * Returns:
+ *	qla2x00 local function return status code.
+ *
+ * Context:
+ *	Kernel context.
+ */
+STATIC int
+qla2x00_get_ioctl_scrap_mem(scsi_qla_host_t *ha, void **ppmem, uint32_t size)
+{
+	int		ret = QL_STATUS_SUCCESS;
+	uint32_t	free_mem;
+
+	DEBUG9(printk("%s(%ld): inst=%ld entered. size=%d.\n",
+	    __func__, ha->host_no, ha->instance, size);)
+
+	free_mem = ha->ioctl->scrap_mem_size - ha->ioctl->scrap_mem_used;
+	if (free_mem >= size) {
+		*ppmem = ha->ioctl->scrap_mem + ha->ioctl->scrap_mem_used;
+		ha->ioctl->scrap_mem_used += size;
+	} else {
+		DEBUG10(printk("%s(%ld): no more scrap memory.\n",
+		    __func__, ha->host_no);)
+
+		ret = QL_STATUS_ERROR;
+	}
+
+	DEBUG9(printk("%s(%ld): exiting. ret=%d.\n",
+	    __func__, ha->host_no, ret);)
+
+	return (ret);
+}
+
+/*
+ * qla2x00_free_ioctl_scrap_mem
+ *	Makes the entire scrap buffer free for use.
+ *
+ * Input:
+ *	ha = adapter state pointer.
+ *
+ * Returns:
+ *	qla2x00 local function return status code.
+ *
+ */
+STATIC void
+qla2x00_free_ioctl_scrap_mem(scsi_qla_host_t *ha)
+{
+	DEBUG9(printk("%s(%ld): inst=%ld entered.\n",
+	    __func__, ha->host_no, ha->instance);)
+
+	memset(ha->ioctl->scrap_mem, 0, ha->ioctl->scrap_mem_size);
+	ha->ioctl->scrap_mem_used = 0;
+
+	DEBUG9(printk("%s(%ld): exiting.\n",
+	    __func__, ha->host_no);)
+}
+
+#if defined(ISP2300)
+/*
+ * qla2x00_get_next_free_pub_id
+ *	Find the next free public loop ID to use, starting from the old
+ *	loop ID passed in.  If the old loop ID is invalid, this function
+ *	will start the search from beginning.
+ *
+ * Input:
+ *	ha		= adapter block pointer.
+ *	ploop_id	= pointer to a 16bit var containing the old loop
+ *			ID which is also to be used to get the new loop ID.
+ *
+ * Returns:
+ *      QL_STATUS_SUCCESS - Found an usable loop ID
+ *      QL_STATUS_RESOURCE_ERROR - No more free loop ID
+ */
+STATIC uint8_t
+qla2x00_get_next_free_pub_id(scsi_qla_host_t *ha, uint16_t *ploop_id)
+{
+	uint8_t		retval = QL_STATUS_SUCCESS;
+	uint16_t	index;
+	uint16_t	old_id;
+
+	DEBUG9(printk("%s(%ld): inst=%ld entered.\n",
+	    __func__, ha->host_no, ha->instance);)
+
+	old_id = *ploop_id;
+	if (old_id >= LAST_SNS_LOOP_ID) {
+		/* set a starting point */
+		old_id = ha->min_external_loopid;
+	}
+
+	for (index = old_id; index < LAST_SNS_LOOP_ID; index++) {
+		if (!ha->fabricid[index].in_use) {
+			ha->fabricid[index].in_use = TRUE;
+			*ploop_id = index;
+			DEBUG9(printk("%s(%ld): found Lid %02x.\n",
+			    __func__, ha->host_no, index);)
+			break;
+		}
+	}
+	if (index >= LAST_SNS_LOOP_ID) {
+		/* no more free ID */
+		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR no more free LID "
+		    "available.\n", __func__, ha->host_no, ha->instance);)
+
+		retval = QL_STATUS_RESOURCE_ERROR;
+	}
+
+	DEBUG9(printk("%s(%ld): inst=%ld exiting. retval=%d.\n",
+	     __func__, ha->host_no, ha->instance, retval);)
+
+	return retval;
+}
+
+/*
+ * qla2x00_host_relogin
+ *	Issue fabric login command to a host in the host_db which
+ *	had somehow been lost before. All updates are passed back
+ *	via pdevice. No update will be done to any of ha's database.
+ *
+ * Input:
+ *	ha = adapter block pointer.
+ *	pdevice = pointer to FC device type structure.
+ *
+ * Returns:
+ *      QL_STATUS_SUCCESS - Login successfully
+ *      QL_STATUS_ERROR - Login failed
+ *      QL_STATUS_FATAL_ERROR - Fatal error
+ */
+STATIC uint8_t
+qla2x00_host_relogin(scsi_qla_host_t *ha, fcdev_t *pdevice) 
+{
+	uint8_t		retval = QL_STATUS_SUCCESS;
+	uint16_t	status[3];
+	uint16_t	tmp_loop_id;
+
+	DEBUG9(printk("%s(%ld): inst=%ld entered.\n",
+	    __func__, ha->host_no, ha->instance);)
+
+	/* pdevice->loop_id is assumed to be straight from the current
+	 * database content.
+	 */
+	tmp_loop_id = pdevice->loop_id & 0xff;
+	if (tmp_loop_id >= LAST_SNS_LOOP_ID) {
+		/* Invalid value.  We need to find a valid ID to use. */
+		if (qla2x00_get_next_free_pub_id(ha, &tmp_loop_id) != 0) {
+			/* no more free IDs to use */
+			DEBUG9_10(printk("%s(%ld): inst=%ld no free loop_id "
+			    " available for login.\n",
+			    __func__, ha->host_no, ha->instance);)
+
+			return QL_STATUS_ERROR;
+		}
+	}
+
+	for (;;) {
+		DEBUG9(printk("%s(%ld): Login w/loop id 0x%02x for port %06x\n",
+		    __func__, ha->host_no, pdevice->loop_id,
+		    pdevice->d_id.b24);)
+
+		/* Login device on switch. */
+		qla2x00_login_fabric(ha,
+		    tmp_loop_id, pdevice->d_id.b.domain,
+		    pdevice->d_id.b.area, pdevice->d_id.b.al_pa, 
+		    &status[0], 0);
+
+		if (status[0] != MBS_CMD_CMP &&
+		    status[0] != MBS_PORT_ID_IN_USE &&
+		    status[0] != MBS_LOOP_ID_IN_USE) {
+
+	 		DEBUG9_10(printk("%s(%ld): inst=%ld "
+			    "ERROR login status[0]=%x status[1]=%x.\n",
+			    __func__, ha->host_no, ha->instance, status[0],
+			    status[1]);)
+
+			retval = QL_STATUS_FATAL_ERROR;
+			break;
+		}
+
+		if (status[0] == MBS_CMD_CMP) {
+			DEBUG9(printk("%s(%ld): inst=%ld "
+			    " host login success; loop_id=%x.\n",
+			    __func__, ha->host_no, ha->instance, tmp_loop_id);)
+
+			pdevice->loop_id = tmp_loop_id;
+			retval = QL_STATUS_SUCCESS;
+			break;
+
+		} else if (status[0] == MBS_PORT_ID_IN_USE) {
+			ha->fabricid[tmp_loop_id].in_use = FALSE;
+			tmp_loop_id = status[1];
+
+			DEBUG9(printk("%s(%ld): inst=%ld "
+			    "port %06x already using loop id=0x%02x in "
+			    "f/w database. Retrying.\n",
+			    __func__, ha->host_no, ha->instance,
+			    pdevice->d_id.b24, tmp_loop_id);)
+
+			if (tmp_loop_id <= LAST_SNS_LOOP_ID) {
+				ha->fabricid[tmp_loop_id].in_use = TRUE;
+			} else {
+				/* Error */
+				DEBUG9_10(printk("%s(%ld): inst=%ld "
+				    "PORT_ID_IN_USE - invalid loop id %02x "
+				    "returned.\n",
+				    __func__, ha->host_no, ha->instance,
+				    pdevice->loop_id);)
+				retval = QL_STATUS_ERROR;
+				break;
+			}
+
+		} else if (status[0] == MBS_LOOP_ID_IN_USE) {
+			/* loop id already used by others; try another one */
+			DEBUG9_10(printk("%s(%ld): inst=%ld "
+			    "loop id %02x already used.\n",
+			    __func__, ha->host_no, ha->instance,
+			    pdevice->loop_id);)
+
+			/* Search for another usable loop_id */
+			if (qla2x00_get_next_free_pub_id(ha,
+			    &tmp_loop_id) == 0) {
+
+				DEBUG9(printk("%s(%ld): previous loop "
+				    "id in use. Retry with 0x%02x.\n",
+				    __func__, ha->host_no, tmp_loop_id);)
+
+				ha->fabricid[tmp_loop_id].in_use = TRUE;
+			} else {
+				/* Error */
+				DEBUG9_10(printk("%s(%ld): inst=%ld loop id "
+				    "in use; no more free loop id.\n",
+				    __func__, ha->host_no, ha->instance);)
+
+				retval = QL_STATUS_ERROR;
+				break;
+			}
+		}
+	}
+
+	DEBUG9(printk("%s(%ld): inst=%ld exiting. retval=%d.\n",
+	     __func__, ha->host_no, ha->instance, retval);)
+
+	return (retval);
 }
+#endif
 
 /*
  * qla2x00_find_curr_ha
- *	Searches and returns the pointer to the adapter instance specified.
+ *	Searches and returns the pointer to the adapter host_no specified.
  *
  * Input:
- *	inst = adapter instance number to search.
+ *	host_inst = driver internal adapter instance number to search.
  *	ha = adapter state pointer of the instance requested.
  *
  * Returns:
@@ -738,25 +1089,26 @@ qla2x00_free_ioctl_mem(scsi_qla_host_t *
  *	Kernel context.
  */
 STATIC int
-qla2x00_find_curr_ha(int inst, scsi_qla_host_t **ret_ha)
+qla2x00_find_curr_ha(uint16_t host_inst, scsi_qla_host_t **ret_ha)
 {
 	int	rval = QL_STATUS_SUCCESS;
 	scsi_qla_host_t *search_ha = NULL;
 
 	/*
-	 * Check for valid apiHBAInstance (set previously by EXT_SETINSTANCE 
-	 * or default 0)  and set ha context for this IOCTL
+	 * Set ha context for this IOCTL by matching host_no.
 	 */
 	for (search_ha = qla2x00_hostlist;
-	    (search_ha != NULL) && search_ha->instance != inst;
+	    (search_ha != NULL) && (search_ha->instance != host_inst);
 	    search_ha = search_ha->next)
 		continue;
 
 	if (search_ha == NULL) {
-		DEBUG10(printk("qla2x00_ioctl: ERROR matching apiHBAInstance "
-		    "%d to an HBA Instance.\n", apiHBAInstance);)
+		DEBUG10(printk("%s: ERROR matching host_inst "
+		    "%d to an HBA Instance.\n", __func__, host_inst);)
 		rval = QL_STATUS_ERROR;
 	} else {
+		DEBUG9(printk("%s: found matching host_inst "
+		    "%d to an HBA Instance.\n", __func__, host_inst);)
 		*ret_ha = search_ha;
 	}
 
@@ -764,6 +1116,65 @@ qla2x00_find_curr_ha(int inst, scsi_qla_
 }
 
 /*
+ * qla2x00_get_driver_specifics
+ *	Returns driver specific data in the response buffer.
+ *
+ * Input:
+ *	pext = pointer to EXT_IOCTL structure containing values from user.
+ *
+ * Returns:
+ *	0 = success
+ *	others = errno value
+ *
+ * Context:
+ *	Kernel context.
+ */
+STATIC int
+qla2x00_get_driver_specifics(EXT_IOCTL *pext)
+{
+	int			ret = 0;
+	EXT_LN_DRIVER_DATA	data;
+
+	DEBUG9(printk("%s: entered.\n",
+	    __func__);)
+
+	if (pext->ResponseLen < sizeof(EXT_LN_DRIVER_DATA)) {
+		pext->Status = EXT_STATUS_BUFFER_TOO_SMALL;
+		DEBUG9_10(printk("%s: ERROR ResponseLen too small.\n",
+		    __func__);)
+
+		return (ret);
+	}
+
+	data.DrvVer.Major = QLA_DRIVER_MAJOR_VER;
+	data.DrvVer.Minor = QLA_DRIVER_MINOR_VER;
+	data.DrvVer.Patch = QLA_DRIVER_PATCH_VER;
+	data.DrvVer.Beta = QLA_DRIVER_BETA_VER;
+
+	ret = verify_area(VERIFY_WRITE, (void *)pext->ResponseAdr,
+	    sizeof(EXT_LN_DRIVER_DATA));
+	if (ret) {
+		pext->Status = EXT_STATUS_COPY_ERR;
+		DEBUG9_10(printk("%s: ERROR verify write resp buf\n",
+		    __func__);)
+
+		return (ret);
+	}
+
+	ret = copy_to_user(pext->ResponseAdr, &data, sizeof(EXT_LN_DRIVER_DATA));
+	if (ret) {
+		pext->Status = EXT_STATUS_COPY_ERR;
+		DEBUG9_10(printk("%s: ERROR copy resp buf\n",
+		    __func__);)
+	}
+
+	DEBUG9(printk("%s: exiting. ret=%d.\n",
+	    __func__, ret);)
+
+	return (ret);
+}
+
+/*
  * qla2x00_aen_reg
  *	IOCTL management server Asynchronous Event Tracking Enable/Disable.
  *
@@ -774,6 +1185,7 @@ qla2x00_find_curr_ha(int inst, scsi_qla_
  *
  * Returns:
  *	0 = success
+ *	others = errno value
  *
  * Context:
  *	Kernel context.
@@ -784,9 +1196,20 @@ qla2x00_aen_reg(scsi_qla_host_t *ha, EXT
 	int		rval = 0;
 	EXT_REG_AEN	reg_struct;
 
-	DEBUG9(printk("qla2x00_aen_reg: entered.\n");)
+	DEBUG9(printk("%s(%ld): inst %ld entered.\n",
+	    __func__, ha->host_no, ha->instance);)
+
+	rval = verify_area(VERIFY_READ, (void *)cmd->RequestAdr,
+	    sizeof(EXT_REG_AEN));
+	if (rval) {
+		cmd->Status = EXT_STATUS_COPY_ERR;
+		DEBUG9_10(printk("%s(%ld): inst %ld ERROR verify read req buf\n",
+		    __func__, ha->host_no, ha->instance);)
+
+		return (rval);
+	}
 
-	rval = copy_from_user(&reg_struct, cmd->RequestAdr, cmd->RequestLen);
+	rval = copy_from_user(&reg_struct, cmd->RequestAdr, sizeof(EXT_REG_AEN));
 	if (rval == 0) {
 		cmd->Status = EXT_STATUS_OK;
 		if (reg_struct.Enable) {
@@ -796,16 +1219,17 @@ qla2x00_aen_reg(scsi_qla_host_t *ha, EXT
 		}
 	} else {
 		cmd->Status = EXT_STATUS_COPY_ERR;
-		rval = EFAULT;
 	}
-	DEBUG9(printk("qla2x00_aen_reg: reg_struct. Enable(%d) "
-	    "ha->ioctl_flag(%x) cmd->Status(%d) cmd->DetailStatus (%d).",
-	    reg_struct.Enable, ha->ioctl->flags, cmd->Status,
-	    cmd->DetailStatus);)
 
-	DEBUG9(printk("qla2x00_aen_reg: exiting.\n");)
+	DEBUG9(printk("%s(%ld): inst %ld reg_struct.Enable(%d) "
+	    "ha->ioctl_flag(%x) cmd->Status(%d).",
+	    __func__, ha->host_no, ha->instance, reg_struct.Enable,
+	    ha->ioctl->flags, cmd->Status);)
 
-	return rval;
+	DEBUG9(printk("%s(%ld): inst=%ld exiting.\n",
+	    __func__, ha->host_no, ha->instance);)
+
+	return (rval);
 }
 
 /*
@@ -820,6 +1244,7 @@ qla2x00_aen_reg(scsi_qla_host_t *ha, EXT
  *
  * Returns:
  *	0 = success
+ *	others = errno value
  *
  * Context:
  *	Kernel context.
@@ -832,26 +1257,38 @@ qla2x00_aen_get(scsi_qla_host_t *ha, EXT
 {
 	int		rval = 0;
 	EXT_ASYNC_EVENT	*tmp_q;
-	static  EXT_ASYNC_EVENT	aen[EXT_DEF_MAX_AEN_QUEUE];
+	EXT_ASYNC_EVENT	*paen;
 	uint8_t		i;
 	uint8_t		queue_cnt;
 	uint8_t		request_cnt;
 	uint32_t	stat = EXT_STATUS_OK;
-	uint32_t	dstat = EXT_STATUS_OK;
 	uint32_t	ret_len = 0;
 	unsigned long   cpu_flags = 0;
 
-	DEBUG9(printk("qla2x00_aen_get: entered.\n");)
+	DEBUG9(printk("%s(%ld): inst=%ld entered.\n",
+	    __func__, ha->host_no, ha->instance);)
 
 	request_cnt = (uint8_t)(cmd->ResponseLen / sizeof(EXT_ASYNC_EVENT));
 
 	if (request_cnt < EXT_DEF_MAX_AEN_QUEUE) {
 		/* We require caller to alloc for the maximum request count */
 		cmd->Status       = EXT_STATUS_BUFFER_TOO_SMALL;
-		rval = 0;
-		DEBUG9_10(printk(
-		    "qla2x00_aen_get: Buffer too small. Exiting normally.");)
-		return rval;
+		DEBUG9_10(printk("%s(%ld): inst=%ld Buffer too small. "
+		    "Exiting normally.",
+		    __func__, ha->host_no, ha->instance);)
+
+		return (rval);
+	}
+
+	if (qla2x00_get_ioctl_scrap_mem(ha, (void **)&paen,
+	    sizeof(EXT_ASYNC_EVENT) * EXT_DEF_MAX_AEN_QUEUE)) {
+		/* not enough memory */
+		cmd->Status = EXT_STATUS_NO_MEMORY;
+		DEBUG9_10(printk("%s(%ld): inst=%ld scrap not big enough. "
+		    "size requested=%d.\n",
+		    __func__, ha->host_no, ha->instance,
+		    sizeof(EXT_ASYNC_EVENT)*EXT_DEF_MAX_AEN_QUEUE);)
+		return (rval);
 	}
 
 	/* 1st: Make a local copy of the entire queue content. */
@@ -863,8 +1300,8 @@ qla2x00_aen_get(scsi_qla_host_t *ha, EXT
 
 	for (; queue_cnt < EXT_DEF_MAX_AEN_QUEUE;) {
 		if (tmp_q[i].AsyncEventCode != 0) {
-			memcpy(&aen[queue_cnt], &tmp_q[i],
-					sizeof(EXT_ASYNC_EVENT));
+			memcpy(&paen[queue_cnt], &tmp_q[i],
+			    sizeof(EXT_ASYNC_EVENT));
 			queue_cnt++;
 			tmp_q[i].AsyncEventCode = 0; /* empty out the slot */
 		}
@@ -891,26 +1328,37 @@ qla2x00_aen_get(scsi_qla_host_t *ha, EXT
 	/* Copy the entire queue to user's buffer. */
 	ret_len = (uint32_t)(queue_cnt * sizeof(EXT_ASYNC_EVENT));
 	if (queue_cnt != 0) {
-		copy_to_user(cmd->ResponseAdr, aen, ret_len);
+		rval = verify_area(VERIFY_WRITE, (void *)cmd->ResponseAdr,
+		    ret_len);
+		if (rval != 0) {
+			cmd->Status = EXT_STATUS_COPY_ERR;
+			DEBUG9_10(printk(
+			    "%s(%ld): inst=%ld ERROR verify write resp buf.\n",
+			    __func__, ha->host_no, ha->instance);)
+
+			qla2x00_free_ioctl_scrap_mem(ha);
+			return (rval);
+		}
+
+		rval = copy_to_user(cmd->ResponseAdr, paen, ret_len);
 	}
 	cmd->ResponseLen = ret_len;
 
 	if (rval != 0) {
 		stat = EXT_STATUS_COPY_ERR;
-		rval = EFAULT;
-		DEBUG10(printk("qla2x00_aen_get: FAILED. error = %d\n", stat);)
+		DEBUG9_10(printk("%s(%ld): inst=%ld FAILED. error = %d\n",
+		    __func__, ha->host_no, ha->instance, stat);)
 	} else {
 		stat = EXT_STATUS_OK;
-		rval = 0;
-		DEBUG9(printk("qla2x00_aen_get: exiting normally.\n");)
 	}
 
-	cmd->Status       = stat;
-	cmd->DetailStatus = dstat;
+	cmd->Status = stat;
+	qla2x00_free_ioctl_scrap_mem(ha);
 
-	DEBUG9(printk("qla2x00_aen_get: exiting. rval= %d\n", rval);)
+	DEBUG9(printk("%s(%ld): inst=%ld exiting. rval=%d.\n",
+	     __func__, ha->host_no, ha->instance, rval);)
 
-	return rval;
+	return (rval);
 }
 
 /*
@@ -933,7 +1381,8 @@ qla2x00_enqueue_aen(scsi_qla_host_t *ha,
 	uint16_t		*mbx;
 	EXT_ASYNC_EVENT		*aen_queue;
 
-	DEBUG9(printk("qla2x00_enqueue_aen: entered.\n");)
+	DEBUG9(printk("%s(%ld): inst=%ld entered.\n",
+	    __func__, ha->host_no, ha->instance);)
 
 	aen_queue = (EXT_ASYNC_EVENT *)ha->ioctl->aen_tracking_queue;
 	if (aen_queue[ha->ioctl->aen_q_tail].AsyncEventCode != 0) {
@@ -957,14 +1406,13 @@ qla2x00_enqueue_aen(scsi_qla_host_t *ha,
 		}
 	}
 
-	DEBUG(printk("qla2x00_enqueue_aen: Adding code 0x%x to aen_q %p @ %d\n",
-	    event_code, aen_queue, ha->ioctl->aen_q_tail);)
+	DEBUG(printk("%s(%ld): inst=%ld Adding code 0x%x to aen_q %p @ %d\n",
+	    __func__, ha->host_no, ha->instance, event_code, aen_queue,
+	    ha->ioctl->aen_q_tail);)
+
 	new_entry = ha->ioctl->aen_q_tail;
 	aen_queue[new_entry].AsyncEventCode = event_code;
 
-	DEBUG(printk("qla2x00_enqueue_aen: Adding code 0x%8x\n",
-	    aen_queue[new_entry].AsyncEventCode);)
-
 		/* Update payload */
 	switch (event_code) {
 	case MBA_LIP_OCCURRED:
@@ -996,15 +1444,33 @@ qla2x00_enqueue_aen(scsi_qla_host_t *ha,
 		break;
 	}
 
-	DEBUG9(printk("qla2x00_enqueue_aen: exiting.\n");)
+	DEBUG9(printk("%s(%ld): inst=%ld exiting.\n",
+	    __func__, ha->host_no, ha->instance);)
 }
 
+/*
+ * qla2x00_query
+ *	Handles all subcommands of the EXT_CC_QUERY command.
+ *
+ * Input:
+ *	ha = adapter state pointer.
+ *	pext = EXT_IOCTL structure pointer.
+ *	mode = not used.
+ *
+ * Returns:
+ *	0 = success
+ *	others = errno value
+ *
+ * Context:
+ *	Kernel context.
+ */
 STATIC int
 qla2x00_query(scsi_qla_host_t *ha, EXT_IOCTL *pext, int mode)
 {
-	int rval;
+	int rval = 0;
 
-	DEBUG9(printk("qla2x00_query: entered.\n");)
+	DEBUG9(printk("%s(%ld): inst=%ld entered.\n",
+	    __func__, ha->host_no, ha->instance);)
 
 	/* All Query type ioctls are done here */
 	switch(pext->SubCode) {
@@ -1025,7 +1491,7 @@ qla2x00_query(scsi_qla_host_t *ha, EXT_I
 		break;
 
 	case EXT_SC_QUERY_DISC_TGT:
-		/* printk("[Start SC_QUERY_DISC_TGT active ha=%x]\n",ha); */
+		/* return discovered target information */
 		rval = qla2x00_query_disc_tgt(ha, pext, mode);
 		break;
 
@@ -1035,65 +1501,93 @@ qla2x00_query(scsi_qla_host_t *ha, EXT_I
 
 	case EXT_SC_QUERY_DISC_LUN:
 		pext->Status = EXT_STATUS_UNSUPPORTED_SUBCODE;
-		rval = pext->Status;
 		break;
 
 	default:
-		DEBUG10(printk("qla2x00_query: unknown SubCode %d.\n",
-		    pext->SubCode);)
+		DEBUG9_10(printk("%s(%ld): inst=%ld unknown SubCode %d.\n",
+		    __func__, ha->host_no, ha->instance, pext->SubCode);)
 		pext->Status = EXT_STATUS_UNSUPPORTED_SUBCODE;
-		rval = pext->Status;
 		break;
 	}
 
-	DEBUG9(printk("qla2x00_query: exiting.\n");)
+	DEBUG9(printk("%s(%ld): inst=%ld exiting.\n",
+	    __func__, ha->host_no, ha->instance);)
+
 	return rval;
 }
 
+/*
+ * qla2x00_query_hba_node
+ *	Handles EXT_SC_QUERY_HBA_NODE subcommand.
+ *
+ * Input:
+ *	ha = adapter state pointer.
+ *	pext = EXT_IOCTL structure pointer.
+ *	mode = not used.
+ *
+ * Returns:
+ *	0 = success
+ *	others = errno value
+ *
+ * Context:
+ *	Kernel context.
+ */
 STATIC int
 qla2x00_query_hba_node(scsi_qla_host_t *ha, EXT_IOCTL *pext, int mode)
 {
-	int		ret = EXT_STATUS_OK;
+	int		ret = 0;
 	uint32_t	i, transfer_size;
-	static  EXT_HBA_NODE	tmp_hba_node;
+	EXT_HBA_NODE	*ptmp_hba_node;
 	qla_boards_t	*bdp;
 
-	DEBUG9(printk("qla2x00_query_hba_node: entered.\n");)
 
-	memset(&tmp_hba_node, 0, sizeof(EXT_HBA_NODE));
+	DEBUG9(printk("%s(%ld): inst=%ld entered.\n",
+	    __func__, ha->host_no, ha->instance);)
+
+	if (qla2x00_get_ioctl_scrap_mem(ha, (void **)&ptmp_hba_node,
+	    sizeof(EXT_HBA_NODE))) {
+		/* not enough memory */
+		pext->Status = EXT_STATUS_NO_MEMORY;
+		DEBUG9_10(printk("%s(%ld): inst=%ld scrap not big enough. "
+		    "size requested=%d.\n",
+		    __func__, ha->host_no, ha->instance,
+		    sizeof(EXT_HBA_NODE));)
+		return (ret);
+	}
 
 	/* fill all available HBA NODE Information */
 	bdp = &QLBoardTbl_fc[ha->devnum];
 	for (i = 0; i < 8 ; i++)
-		tmp_hba_node.WWNN[i] = ha->node_name[i];
+		ptmp_hba_node->WWNN[i] = ha->node_name[i];
 
-	sprintf((char *)(tmp_hba_node.Manufacturer),"Qlogic Corp.");
-	sprintf((char *)(tmp_hba_node.Model),(char *)&bdp->bdName[0]);
+	sprintf((char *)(ptmp_hba_node->Manufacturer),"Qlogic Corp.");
+	sprintf((char *)(ptmp_hba_node->Model),(char *)&bdp->bdName[0]);
 
-	tmp_hba_node.SerialNum[0] = ha->serial0;
-	tmp_hba_node.SerialNum[1] = ha->serial1;
-	tmp_hba_node.SerialNum[2] = ha->serial2;
-	sprintf((char *)(tmp_hba_node.DriverVersion),QLA2100_VERSION);
-	sprintf((char *)(tmp_hba_node.FWVersion),"%2d.%02d.%02d",
+	ptmp_hba_node->SerialNum[0] = ha->serial0;
+	ptmp_hba_node->SerialNum[1] = ha->serial1;
+	ptmp_hba_node->SerialNum[2] = ha->serial2;
+	sprintf((char *)(ptmp_hba_node->DriverVersion),QLA2100_VERSION);
+	sprintf((char *)(ptmp_hba_node->FWVersion),"%2d.%02d.%02d",
 	    bdp->fwver[0], bdp->fwver[1], bdp->fwver[2]);
 
-	sprintf((char *)(tmp_hba_node.OptRomVersion),"%d.%d",
+	sprintf((char *)(ptmp_hba_node->OptRomVersion),"%d.%d",
 	    ha->optrom_major, ha->optrom_minor);
 
-	tmp_hba_node.InterfaceType = EXT_DEF_FC_INTF_TYPE;
-	tmp_hba_node.PortCount = 1;
+	ptmp_hba_node->InterfaceType = EXT_DEF_FC_INTF_TYPE;
+	ptmp_hba_node->PortCount = 1;
 
 
-	tmp_hba_node.DriverAttr = (ha->flags.failover_enabled) ?
+	ptmp_hba_node->DriverAttr = (ha->flags.failover_enabled) ?
 	    DRVR_FO_ENABLED : 0;
 
 	ret = verify_area(VERIFY_WRITE, (void  *)pext->ResponseAdr,
 	    sizeof(EXT_HBA_NODE));
 	if (ret) {
 		pext->Status = EXT_STATUS_COPY_ERR;
-		DEBUG9_10(printk("qla2x00_query_hba_node: ERROR verify write "
-		    "rsp buffer.\n");)
-		return pext->Status;
+		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR verify wrt rsp buf\n",
+		    __func__, ha->host_no, ha->instance);)
+		qla2x00_free_ioctl_scrap_mem(ha);
+		return (ret);
 	}
 
 	/* now copy up the HBA_NODE to user */
@@ -1102,57 +1596,93 @@ qla2x00_query_hba_node(scsi_qla_host_t *
 	else
 		transfer_size = sizeof(EXT_HBA_NODE);
 
-	copy_to_user((uint8_t *)pext->ResponseAdr, (uint8_t *)&tmp_hba_node,
-	    transfer_size);
+	ret = copy_to_user((uint8_t *)pext->ResponseAdr,
+	    (uint8_t *)ptmp_hba_node, transfer_size);
+	if (ret) {
+		pext->Status = EXT_STATUS_COPY_ERR;
+		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR copy rsp buffer.\n",
+		    __func__, ha->host_no, ha->instance);)
+		qla2x00_free_ioctl_scrap_mem(ha);
+		return (ret);
+	}
 
 	pext->Status       = EXT_STATUS_OK;
 	pext->DetailStatus = EXT_STATUS_OK;
 
-	DEBUG9(printk("qla2x00_query_hba_node: exiting.\n");)
-	return ret;
+	DEBUG9(printk("%s(%ld): inst=%ld exiting.\n",
+	    __func__, ha->host_no, ha->instance);)
+
+	qla2x00_free_ioctl_scrap_mem(ha);
+	return (ret);
 }
 
+/*
+ * qla2x00_query_hba_port
+ *	Handles EXT_SC_QUERY_HBA_PORT subcommand.
+ *
+ * Input:
+ *	ha = adapter state pointer.
+ *	pext = EXT_IOCTL structure pointer.
+ *	mode = not used.
+ *
+ * Returns:
+ *	0 = success
+ *	others = errno value
+ *
+ * Context:
+ *	Kernel context.
+ */
 STATIC int
 qla2x00_query_hba_port(scsi_qla_host_t *ha, EXT_IOCTL *pext, int mode)
 {
-	int	ret = EXT_STATUS_OK;
+	int		ret = 0;
 	uint32_t	tgt_cnt, tgt, transfer_size;
 	uint32_t	port_cnt;
 	fc_port_t	*fcport;
-	EXT_HBA_PORT	tmp_hba_port;
+	EXT_HBA_PORT	*ptmp_hba_port;
 
-	DEBUG9(printk("qla2x00_query_hba_port: entered.\n");)
+	DEBUG9(printk("%s(%ld): inst=%ld entered.\n",
+	    __func__, ha->host_no, ha->instance);)
 
-	memset(&tmp_hba_port, 0, sizeof(EXT_HBA_PORT));
+	if (qla2x00_get_ioctl_scrap_mem(ha, (void **)&ptmp_hba_port,
+	    sizeof(EXT_HBA_PORT))) {
+		/* not enough memory */
+		pext->Status = EXT_STATUS_NO_MEMORY;
+		DEBUG9_10(printk("%s(%ld): inst=%ld scrap not big enough. "
+		    "size requested=%d.\n",
+		    __func__, ha->host_no, ha->instance,
+		    sizeof(EXT_HBA_PORT));)
+		return (ret);
+	}
 
 	/* reflect all HBA PORT related info */
-	tmp_hba_port.WWPN[7] = ha->init_cb->port_name[7];
-	tmp_hba_port.WWPN[6] = ha->init_cb->port_name[6];
-	tmp_hba_port.WWPN[5] = ha->init_cb->port_name[5];
-	tmp_hba_port.WWPN[4] = ha->init_cb->port_name[4];
-	tmp_hba_port.WWPN[3] = ha->init_cb->port_name[3];
-	tmp_hba_port.WWPN[2] = ha->init_cb->port_name[2];
-	tmp_hba_port.WWPN[1] = ha->init_cb->port_name[1];
-	tmp_hba_port.WWPN[0] = ha->init_cb->port_name[0];
-	tmp_hba_port.Id[0] = 0;
-	tmp_hba_port.Id[1] = ha->d_id.r.d_id[2];
-	tmp_hba_port.Id[2] = ha->d_id.r.d_id[1];
-	tmp_hba_port.Id[3] = ha->d_id.r.d_id[0];
-	tmp_hba_port.Type =  EXT_DEF_INITIATOR_DEV;
+	ptmp_hba_port->WWPN[7] = ha->init_cb->port_name[7];
+	ptmp_hba_port->WWPN[6] = ha->init_cb->port_name[6];
+	ptmp_hba_port->WWPN[5] = ha->init_cb->port_name[5];
+	ptmp_hba_port->WWPN[4] = ha->init_cb->port_name[4];
+	ptmp_hba_port->WWPN[3] = ha->init_cb->port_name[3];
+	ptmp_hba_port->WWPN[2] = ha->init_cb->port_name[2];
+	ptmp_hba_port->WWPN[1] = ha->init_cb->port_name[1];
+	ptmp_hba_port->WWPN[0] = ha->init_cb->port_name[0];
+	ptmp_hba_port->Id[0] = 0;
+	ptmp_hba_port->Id[1] = ha->d_id.r.d_id[2];
+	ptmp_hba_port->Id[2] = ha->d_id.r.d_id[1];
+	ptmp_hba_port->Id[3] = ha->d_id.r.d_id[0];
+	ptmp_hba_port->Type =  EXT_DEF_INITIATOR_DEV;
 
 	switch (ha->current_topology) {
 	case ISP_CFG_NL:
 	case ISP_CFG_FL:
-		tmp_hba_port.Mode = EXT_DEF_LOOP_MODE;
+		ptmp_hba_port->Mode = EXT_DEF_LOOP_MODE;
 		break;
 
 	case ISP_CFG_N:
 	case ISP_CFG_F:
-		tmp_hba_port.Mode = EXT_DEF_P2P_MODE;
+		ptmp_hba_port->Mode = EXT_DEF_P2P_MODE;
 		break;
 
 	default:
-		tmp_hba_port.Mode = EXT_DEF_UNKNOWN_MODE;
+		ptmp_hba_port->Mode = EXT_DEF_UNKNOWN_MODE;
 		break;
 	}
 
@@ -1160,7 +1690,9 @@ qla2x00_query_hba_port(scsi_qla_host_t *
 	for (fcport = ha->fcport; (fcport); fcport = fcport->next) {
 		/* if removed or missing */
 		if (atomic_read(&fcport->state) != FC_ONLINE) {
-			DEBUG9(printk("query_hba_port: port %06x not online.\n",
+			DEBUG9_10(printk(
+			    "%s(%ld): inst=%ld port %06x not online\n",
+			    __func__, ha->host_no, ha->instance,
 			    fcport->d_id.b24);)
 			continue;
 		}
@@ -1175,64 +1707,68 @@ qla2x00_query_hba_port(scsi_qla_host_t *
 		tgt_cnt++;
 	}
 
-	tmp_hba_port.DiscPortCount   = port_cnt;
-	tmp_hba_port.DiscTargetCount = tgt_cnt;
+	DEBUG9_10(printk("%s(%ld): inst=%ld disc_port cnt=%d, tgt cnt=%d.\n",
+	    __func__, ha->host_no, ha->instance,
+	    port_cnt, tgt_cnt);)
+	ptmp_hba_port->DiscPortCount   = port_cnt;
+	ptmp_hba_port->DiscTargetCount = tgt_cnt;
 
 	if (ha->loop_state == LOOP_DOWN) {
 
-		tmp_hba_port.State = EXT_DEF_HBA_LOOP_DOWN;
+		ptmp_hba_port->State = EXT_DEF_HBA_LOOP_DOWN;
 
 	} else if (ha->loop_state != LOOP_READY ||
 	    test_bit(ABORT_ISP_ACTIVE, &ha->dpc_flags) ||
 	    test_bit(CFG_ACTIVE, &ha->cfg_flags) || ABORTS_ACTIVE) {
 
-		tmp_hba_port.State = EXT_DEF_HBA_SUSPENDED;
+		ptmp_hba_port->State = EXT_DEF_HBA_SUSPENDED;
 
 	} else {
 
-		tmp_hba_port.State = EXT_DEF_HBA_OK;
+		ptmp_hba_port->State = EXT_DEF_HBA_OK;
 
 	}
 
-	tmp_hba_port.DiscPortNameType = EXT_DEF_USE_PORT_NAME;
+	ptmp_hba_port->DiscPortNameType = EXT_DEF_USE_PORT_NAME;
 
 	/* Return supported FC4 type depending on driver support. */
-	tmp_hba_port.PortSupportedFC4Types = EXT_DEF_FC4_TYPE_SCSI;
+	ptmp_hba_port->PortSupportedFC4Types = EXT_DEF_FC4_TYPE_SCSI;
 #if defined(FC_IP_SUPPORT)
 
-	tmp_hba_port.PortSupportedFC4Types |= EXT_DEF_FC4_TYPE_IP;
+	ptmp_hba_port->PortSupportedFC4Types |= EXT_DEF_FC4_TYPE_IP;
 #endif
 #if defined(FC_SCTP_SUPPORT)
 
-	tmp_hba_port.PortSupportedFC4Types |= EXT_DEF_FC4_TYPE_SCTP;
+	ptmp_hba_port->PortSupportedFC4Types |= EXT_DEF_FC4_TYPE_SCTP;
 #endif
 
-	tmp_hba_port.PortActiveFC4Types = ha->active_fc4_types;
+	ptmp_hba_port->PortActiveFC4Types = ha->active_fc4_types;
 
 	/* Return supported speed depending on adapter type */
 #if defined(ISP2100)
 
-	tmp_hba_port.PortSupportedSpeed = EXT_DEF_PORTSPEED_1GBIT;
+	ptmp_hba_port->PortSupportedSpeed = EXT_DEF_PORTSPEED_1GBIT;
 #elif defined(ISP2200)
 
-	tmp_hba_port.PortSupportedSpeed = EXT_DEF_PORTSPEED_1GBIT;
+	ptmp_hba_port->PortSupportedSpeed = EXT_DEF_PORTSPEED_1GBIT;
 #elif defined(ISP2300)
 
-	tmp_hba_port.PortSupportedSpeed = EXT_DEF_PORTSPEED_2GBIT;
+	ptmp_hba_port->PortSupportedSpeed = EXT_DEF_PORTSPEED_2GBIT;
 #else
 	/* invalid */
-	tmp_hba_port.PortSupportedSpeed = 0;
+	ptmp_hba_port->PortSupportedSpeed = 0;
 #endif
 
-	tmp_hba_port.PortSpeed = ha->current_speed;
+	ptmp_hba_port->PortSpeed = ha->current_speed;
 
 	ret = verify_area(VERIFY_WRITE, (void *)pext->ResponseAdr ,
 	    sizeof(EXT_HBA_PORT));
 	if (ret) {
 		pext->Status = EXT_STATUS_COPY_ERR;
-		DEBUG9_10(printk("qla2x00_query_hba_port: ERROR verify write "
-		    "rsp buffer.\n");)
-		return ret;
+		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR verify wrt rsp buf\n",
+		    __func__, ha->host_no, ha->instance);)
+		qla2x00_free_ioctl_scrap_mem(ha);
+		return (ret);
 	}
 
 	/* now copy up the HBA_PORT to user */
@@ -1241,94 +1777,130 @@ qla2x00_query_hba_port(scsi_qla_host_t *
 	else
 		transfer_size = sizeof(EXT_HBA_PORT);
 
-	copy_to_user((uint8_t *)pext->ResponseAdr, (uint8_t *)&tmp_hba_port,
-	    transfer_size);
+	ret = copy_to_user((uint8_t *)pext->ResponseAdr,
+	    (uint8_t *)ptmp_hba_port, transfer_size);
+	if (ret) {
+		pext->Status = EXT_STATUS_COPY_ERR;
+		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR copy rsp buffer.\n",
+		    __func__, ha->host_no, ha->instance);)
+		qla2x00_free_ioctl_scrap_mem(ha);
+		return (ret);
+	}
 
 	pext->Status       = EXT_STATUS_OK;
 	pext->DetailStatus = EXT_STATUS_OK;
+	qla2x00_free_ioctl_scrap_mem(ha);
+
+	DEBUG9(printk("%s(%ld): inst=%ld exiting.\n",
+	    __func__, ha->host_no, ha->instance);)
 
-	DEBUG9(printk("qla2x00_query_hba_port: exiting.\n");)
 	return ret;
 }
 
+/*
+ * qla2x00_query_disc_port
+ *	Handles EXT_SC_QUERY_DISC_PORT subcommand.
+ *
+ * Input:
+ *	ha = adapter state pointer.
+ *	pext = EXT_IOCTL structure pointer.
+ *	mode = not used.
+ *
+ * Returns:
+ *	0 = success
+ *	others = errno value
+ *
+ * Context:
+ *	Kernel context.
+ */
 STATIC int
 qla2x00_query_disc_port(scsi_qla_host_t *ha, EXT_IOCTL *pext, int mode)
 {
-	int		ret = EXT_STATUS_OK;
+	int		ret = 0;
 	uint32_t	tgt, transfer_size, inst;
 	fc_port_t	*fcport;
 	os_tgt_t	*tq;
-	EXT_DISC_PORT	tmp_disc_port;
+	EXT_DISC_PORT	*ptmp_disc_port;
 
-	DEBUG9(printk("qla2x00_query_disc_port: entered. Port inst=%02d.\n",
-	    pext->Instance);)
+	DEBUG9(printk("%s(%ld): inst=%ld entered. Port inst=%02d.\n",
+	    __func__, ha->host_no, ha->instance, pext->Instance);)
 
 	inst = 0;
 	for (fcport = ha->fcport; fcport != NULL; fcport = fcport->next) {
 		if (atomic_read(&fcport->state) != FC_ONLINE) {
 			/* port does not exist anymore */
-			DEBUG9(printk("qla2x00_query_disc_port: fcport "
-			    "marked lost. d_id=%06x loop_id=%02x not online.\n",
-			    fcport->d_id.b24, fcport->loop_id);)
+			DEBUG9(printk("%s(%ld): fcport marked lost. "
+			    "d_id=%06x loop_id=%02x not online.\n",
+			    __func__, ha->host_no, fcport->d_id.b24,
+			    fcport->loop_id);)
 
 			continue;
 		}
 
 		if (inst != pext->Instance) {
-			DEBUG9(printk("qla2x00_query_disc_port: found "
-			    "fcport %02d. Skipping.\n", inst);)
+			DEBUG9(printk("%s(%ld): found fcport %02d d_id=%06x. "
+			    "Skipping.\n",
+			    __func__, ha->host_no, inst, fcport->d_id.b24);)
 
 			inst++;
 			continue;
 		}
 
-		DEBUG9(printk("qla2x00_query_disc_port: fcport %02d "
+		DEBUG9(printk("%s(%ld): inst=%ld found matching fcport %02d "
 		    "online. d_id=%06x loop_id=%02x online.\n",
-		    inst, fcport->d_id.b24, fcport->loop_id);)
+		    __func__, ha->host_no, ha->instance, inst, fcport->d_id.b24,
+		    fcport->loop_id);)
 
 		/* Found the matching port still connected. */
 		break;
 	}
 
 	if (fcport == NULL) {
-		DEBUG9_10(printk("qla2x00_query_disc_port: dev not found.\n");)
-		    pext->Status = EXT_STATUS_DEV_NOT_FOUND;
-		return ret;
-	}
-	if (pext->Status != EXT_STATUS_OK) {
-		DEBUG9_10(printk("qla2x00_query_disc_port: device down.\n");)
-		return QL_STATUS_SUCCESS;
-	}
+		DEBUG9_10(printk("%s(%ld): inst=%ld dev not found.\n",
+		    __func__, ha->host_no, ha->instance);)
 
-	memset(&tmp_disc_port, 0, sizeof(EXT_DISC_PORT));
+		pext->Status = EXT_STATUS_DEV_NOT_FOUND;
+		return (ret);
+	}
 
-	memcpy(tmp_disc_port.WWNN, fcport->node_name, WWN_SIZE);
-	memcpy(tmp_disc_port.WWPN, fcport->port_name, WWN_SIZE);
+	if (qla2x00_get_ioctl_scrap_mem(ha, (void **)&ptmp_disc_port,
+	    sizeof(EXT_DISC_PORT))) {
+		/* not enough memory */
+		pext->Status = EXT_STATUS_NO_MEMORY;
+		DEBUG9_10(printk("%s(%ld): inst=%ld scrap not big enough. "
+		    "size requested=%d.\n",
+		    __func__, ha->host_no, ha->instance,
+		    sizeof(EXT_DISC_PORT));)
+		return (ret);
+	}
 
-	tmp_disc_port.Id[0] = 0;
-	tmp_disc_port.Id[1] = fcport->d_id.r.d_id[2];
-	tmp_disc_port.Id[2] = fcport->d_id.r.d_id[1];
-	tmp_disc_port.Id[3] = fcport->d_id.r.d_id[0];
+	memcpy(ptmp_disc_port->WWNN, fcport->node_name, WWN_SIZE);
+	memcpy(ptmp_disc_port->WWPN, fcport->port_name, WWN_SIZE);
+
+	ptmp_disc_port->Id[0] = 0;
+	ptmp_disc_port->Id[1] = fcport->d_id.r.d_id[2];
+	ptmp_disc_port->Id[2] = fcport->d_id.r.d_id[1];
+	ptmp_disc_port->Id[3] = fcport->d_id.r.d_id[0];
 
 	/* Currently all devices on fcport list are target capable devices */
 	/* This default value may need to be changed after we add non target
 	 * devices also to this list.
 	 */
-	tmp_disc_port.Type = EXT_DEF_TARGET_DEV;
+	ptmp_disc_port->Type = EXT_DEF_TARGET_DEV;
 
 	if (fcport->flags & FC_FABRIC_DEVICE) {
-		tmp_disc_port.Type |= EXT_DEF_FABRIC_DEV;
+		ptmp_disc_port->Type |= EXT_DEF_FABRIC_DEV;
 	}
 	if (fcport->flags & FC_TAPE_DEVICE) {
-		tmp_disc_port.Type |= EXT_DEF_TAPE_DEV;
+		ptmp_disc_port->Type |= EXT_DEF_TAPE_DEV;
 	}
 	if (fcport->flags & FC_INITIATOR_DEVICE) {
-		tmp_disc_port.Type |= EXT_DEF_INITIATOR_DEV;
+		ptmp_disc_port->Type |= EXT_DEF_INITIATOR_DEV;
 	}
 
-	tmp_disc_port.LoopID = fcport->loop_id;
-	tmp_disc_port.Status = 0;
-	tmp_disc_port.Bus    = 0;
+	ptmp_disc_port->LoopID = fcport->loop_id;
+	ptmp_disc_port->Status = 0;
+	ptmp_disc_port->Bus    = 0;
 
 	for (tgt = 0; tgt < MAX_TARGETS; tgt++) {
 		if ((tq = ha->otgt[tgt]) == NULL) {
@@ -1338,10 +1910,9 @@ qla2x00_query_disc_port(scsi_qla_host_t 
 		if (tq->vis_port == NULL)  /* dg 08/14/01 */
 			continue;
 
-		if (memcmp(fcport->port_name,
-					tq->vis_port->port_name,
-					EXT_DEF_WWN_NAME_SIZE) == 0) {
-			tmp_disc_port.TargetId = tgt;
+		if (memcmp(fcport->port_name, tq->vis_port->port_name,
+		    EXT_DEF_WWN_NAME_SIZE) == 0) {
+			ptmp_disc_port->TargetId = tgt;
 			break;
 		}
 	}
@@ -1350,9 +1921,10 @@ qla2x00_query_disc_port(scsi_qla_host_t 
 	    sizeof(EXT_DISC_PORT));
 	if (ret) {
 		pext->Status = EXT_STATUS_COPY_ERR;
-		DEBUG9_10(printk("qla2x00_query_disc_port: ERROR verify write "
-		    "rsp buffer.\n");)
-		return ret;
+		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR verify wrt rsp buf\n",
+		    __func__, ha->host_no, ha->instance);)
+		qla2x00_free_ioctl_scrap_mem(ha);
+		return (ret);
 	}
 
 	/* now copy up the DISC_PORT to user */
@@ -1361,28 +1933,54 @@ qla2x00_query_disc_port(scsi_qla_host_t 
 	else
 		transfer_size = sizeof(EXT_DISC_PORT);
 
-	copy_to_user((uint8_t *)pext->ResponseAdr, (uint8_t *)&tmp_disc_port,
-	    transfer_size);
+	ret = copy_to_user((uint8_t *)pext->ResponseAdr,
+	    (uint8_t *)ptmp_disc_port, transfer_size);
+	if (ret) {
+		pext->Status = EXT_STATUS_COPY_ERR;
+		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR copy rsp buffer.\n",
+		    __func__, ha->host_no, ha->instance);)
+		qla2x00_free_ioctl_scrap_mem(ha);
+		return (ret);
+	}
 
 	pext->Status       = EXT_STATUS_OK;
 	pext->DetailStatus = EXT_STATUS_OK;
+	qla2x00_free_ioctl_scrap_mem(ha);
 
+	DEBUG9(printk("%s(%ld): inst=%ld exiting.\n",
+	    __func__, ha->host_no, ha->instance);)
 
-	DEBUG9(printk("qla2x00_query_disc_port: exiting.\n");)
-	return ret;
+	return (ret);
 }
 
+/*
+ * qla2x00_query_disc_tgt
+ *	Handles EXT_SC_QUERY_DISC_TGT subcommand.
+ *
+ * Input:
+ *	ha = adapter state pointer.
+ *	pext = EXT_IOCTL structure pointer.
+ *	mode = not used.
+ *
+ * Returns:
+ *	0 = success
+ *	others = errno value
+ *
+ * Context:
+ *	Kernel context.
+ */
 STATIC int
 qla2x00_query_disc_tgt(scsi_qla_host_t *ha, EXT_IOCTL *pext, int mode)
 {
-	int		ret = EXT_STATUS_OK;
+	int		ret = 0;
 	uint32_t	tgt, transfer_size, inst;
 	uint32_t	cnt, i;
 	fc_port_t	*tgt_fcport;
 	os_tgt_t	*tq;
-	EXT_DISC_TARGET	tmp_disc_target;
+	EXT_DISC_TARGET	*ptmp_disc_target;
 
-	DEBUG9(printk("qla2x00_query_disc_tgt: entered.\n");)
+	DEBUG9(printk("%s(%ld): inst=%ld entered.\n",
+	    __func__, ha->host_no, ha->instance);)
 
 	tq = NULL;
 	for (tgt = 0, inst = 0; tgt < MAX_TARGETS; tgt++) {
@@ -1399,47 +1997,58 @@ qla2x00_query_disc_tgt(scsi_qla_host_t *
 	}
 
 	if (tq == NULL || tgt == MAX_TARGETS) {
-		DEBUG9_10(printk("qla2x00_query_disc_tgt: target dev not "
-		    "found. tq=%p, tgt=%x.\n", tq, tgt);)
 		pext->Status = EXT_STATUS_DEV_NOT_FOUND;
-		return pext->Status;
+		DEBUG9_10(printk("%s(%ld): inst=%ld target dev not found. "
+		    "tq=%p, tgt=%d.\n",
+		    __func__, ha->host_no, ha->instance, tq, tgt);)
+		return (ret);
 	}
 
 	if (tq->vis_port == NULL) { 	/* dg 08/14/01 */
-		DEBUG9_10(printk("qla2x00_query_disc_tgt: target dev not "
-		    "found. tq=%p, tgt=%x.\n", tq, tgt);)
 		pext->Status = EXT_STATUS_BUSY;
-		return pext->Status;
+		DEBUG9_10(printk("%s(%ld): inst=%ld target dev not found. "
+		    "tq=%p.\n",
+		    __func__, ha->host_no, ha->instance, tq);)
+		return (ret);
 	}
 
-	memset(&tmp_disc_target, 0, sizeof(EXT_DISC_TARGET));
+	if (qla2x00_get_ioctl_scrap_mem(ha, (void **)&ptmp_disc_target,
+	    sizeof(EXT_DISC_TARGET))) {
+		/* not enough memory */
+		pext->Status = EXT_STATUS_NO_MEMORY;
+		DEBUG9_10(printk("%s(%ld): inst=%ld scrap not big enough. "
+		    "size requested=%d.\n",
+		    __func__, ha->host_no, ha->instance,
+		    sizeof(EXT_DISC_TARGET));)
+		return (ret);
+	}
 
 	tgt_fcport = tq->vis_port;
-	memcpy(tmp_disc_target.WWNN, tgt_fcport->node_name, WWN_SIZE);
-	memcpy(tmp_disc_target.WWPN, tgt_fcport->port_name, WWN_SIZE);
+	memcpy(ptmp_disc_target->WWNN, tgt_fcport->node_name, WWN_SIZE);
+	memcpy(ptmp_disc_target->WWPN, tgt_fcport->port_name, WWN_SIZE);
 
-	tmp_disc_target.Id[0] = 0;
-	tmp_disc_target.Id[1] = tgt_fcport->d_id.r.d_id[2];
-	tmp_disc_target.Id[2] = tgt_fcport->d_id.r.d_id[1];
-	tmp_disc_target.Id[3] = tgt_fcport->d_id.r.d_id[0];
+	ptmp_disc_target->Id[0] = 0;
+	ptmp_disc_target->Id[1] = tgt_fcport->d_id.r.d_id[2];
+	ptmp_disc_target->Id[2] = tgt_fcport->d_id.r.d_id[1];
+	ptmp_disc_target->Id[3] = tgt_fcport->d_id.r.d_id[0];
 
 	/* All devices on ha->otgt list are target capable devices. */
-	tmp_disc_target.Type = EXT_DEF_TARGET_DEV;
+	ptmp_disc_target->Type = EXT_DEF_TARGET_DEV;
 
 	if (tgt_fcport->flags & FC_FABRIC_DEVICE) {
-		tmp_disc_target.Type |= EXT_DEF_FABRIC_DEV;
+		ptmp_disc_target->Type |= EXT_DEF_FABRIC_DEV;
 	}
 	if (tgt_fcport->flags & FC_TAPE_DEVICE) {
-		tmp_disc_target.Type |= EXT_DEF_TAPE_DEV;
+		ptmp_disc_target->Type |= EXT_DEF_TAPE_DEV;
 	}
 	if (tgt_fcport->flags & FC_INITIATOR_DEVICE) {
-		tmp_disc_target.Type |= EXT_DEF_INITIATOR_DEV;
+		ptmp_disc_target->Type |= EXT_DEF_INITIATOR_DEV;
 	}
 
-	tmp_disc_target.LoopID   = tgt_fcport->loop_id;
-	tmp_disc_target.Status   = 0;
-	tmp_disc_target.Bus      = 0;
-	tmp_disc_target.TargetId = tgt;
+	ptmp_disc_target->LoopID   = tgt_fcport->loop_id;
+	ptmp_disc_target->Status   = 0;
+	ptmp_disc_target->Bus      = 0;
+	ptmp_disc_target->TargetId = tgt;
 
 	cnt = 0;
 	/* enumerate available LUNs under this TGT (if any) */
@@ -1450,15 +2059,16 @@ qla2x00_query_disc_tgt(scsi_qla_host_t *
 		}
 	}
 
-	tmp_disc_target.LunCount = cnt;
+	ptmp_disc_target->LunCount = cnt;
 
 	ret = verify_area(VERIFY_WRITE, (void *)pext->ResponseAdr,
 	    sizeof(EXT_DISC_TARGET));
 	if (ret) {
 		pext->Status = EXT_STATUS_COPY_ERR;
-		DEBUG9_10(printk("qla2x00_query_disc_tgt: ERROR verify write "
-		    "rsp buffer.\n");)
-		return pext->Status;
+		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR verify wrt rsp buf\n",
+		    __func__, ha->host_no, ha->instance);)
+		qla2x00_free_ioctl_scrap_mem(ha);
+		return (ret);
 	}
 
 	/* now copy up the DISC_PORT to user */
@@ -1467,53 +2077,90 @@ qla2x00_query_disc_tgt(scsi_qla_host_t *
 	else
 		transfer_size = sizeof(EXT_DISC_TARGET);
 
-	copy_to_user((uint8_t *)pext->ResponseAdr, (uint8_t *)&tmp_disc_target,
-	    transfer_size);
+	ret = copy_to_user((uint8_t *)pext->ResponseAdr,
+	    (uint8_t *)ptmp_disc_target, transfer_size);
+	if (ret) {
+		pext->Status = EXT_STATUS_COPY_ERR;
+		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR copy rsp buffer.\n",
+		    __func__, ha->host_no, ha->instance);)
+		qla2x00_free_ioctl_scrap_mem(ha);
+		return (ret);
+	}
 
 	pext->Status       = EXT_STATUS_OK;
 	pext->DetailStatus = EXT_STATUS_OK;
+	qla2x00_free_ioctl_scrap_mem(ha);
 
-	DEBUG9(printk("qla2x00_query_disc_tgt: exiting.\n");)
-	return ret;
+	DEBUG9(printk("%s(%ld): inst=%ld exiting.\n",
+	    __func__, ha->host_no, ha->instance);)
+
+	return (ret);
 }
 
+/*
+ * qla2x00_query_chip
+ *	Handles EXT_SC_QUERY_CHIP subcommand.
+ *
+ * Input:
+ *	ha = adapter state pointer.
+ *	pext = EXT_IOCTL structure pointer.
+ *	mode = not used.
+ *
+ * Returns:
+ *	0 = success
+ *	others = errno value
+ *
+ * Context:
+ *	Kernel context.
+ */
 STATIC int
 qla2x00_query_chip(scsi_qla_host_t *ha, EXT_IOCTL *pext, int mode)
 {
-	int		ret = EXT_STATUS_OK;
+	int		ret = 0;
 	uint32_t	transfer_size, i;
-	EXT_CHIP		tmp_isp;
+	EXT_CHIP		*ptmp_isp;
 	struct Scsi_Host	*host;
 
-	DEBUG9(printk("qla2x00_query_chip: entered.\n");)
+	DEBUG9(printk("%s(%ld): inst=%ld entered.\n",
+	    __func__, ha->host_no, ha->instance);)
 
-	memset(&tmp_isp, 0, sizeof(EXT_CHIP));
+	if (qla2x00_get_ioctl_scrap_mem(ha, (void **)&ptmp_isp,
+	    sizeof(EXT_CHIP))) {
+		/* not enough memory */
+		pext->Status = EXT_STATUS_NO_MEMORY;
+		DEBUG9_10(printk("%s(%ld): inst=%ld scrap not big enough. "
+		    "size requested=%d.\n",
+		    __func__, ha->host_no, ha->instance,
+		    sizeof(EXT_CHIP));)
+		return (ret);
+	}
 
 	host = ha->host;
-	tmp_isp.VendorId       = QLA2X00_VENDOR_ID;
-	tmp_isp.DeviceId       = ha->device_id;
-	tmp_isp.SubVendorId    = ha->subsystem_vendor;
-	tmp_isp.SubSystemId    = ha->subsystem_device;
-	tmp_isp.PciBusNumber   = ha->pdev->bus->number;
-	tmp_isp.PciDevFunc     = ha->pdev->devfn;
-	tmp_isp.PciSlotNumber  = PCI_SLOT(ha->pdev->devfn);
-	tmp_isp.IoAddr         = host->io_port;
-	tmp_isp.IoAddrLen      = 512;
-	tmp_isp.MemAddr        = 0; /* ? */
-	tmp_isp.MemAddrLen     = 0; /* ? */
-	tmp_isp.ChipType       = 0; /* ? */
-	tmp_isp.InterruptLevel = host->irq;
+	ptmp_isp->VendorId       = QLA2X00_VENDOR_ID;
+	ptmp_isp->DeviceId       = ha->device_id;
+	ptmp_isp->SubVendorId    = ha->subsystem_vendor;
+	ptmp_isp->SubSystemId    = ha->subsystem_device;
+	ptmp_isp->PciBusNumber   = ha->pdev->bus->number;
+	ptmp_isp->PciDevFunc     = ha->pdev->devfn;
+	ptmp_isp->PciSlotNumber  = PCI_SLOT(ha->pdev->devfn);
+	ptmp_isp->IoAddr         = host->io_port;
+	ptmp_isp->IoAddrLen      = 512;
+	ptmp_isp->MemAddr        = 0; /* ? */
+	ptmp_isp->MemAddrLen     = 0; /* ? */
+	ptmp_isp->ChipType       = 0; /* ? */
+	ptmp_isp->InterruptLevel = host->irq;
 
 	for (i = 0; i < 8; i++)
-		tmp_isp.OutMbx[i] = 0;
+		ptmp_isp->OutMbx[i] = 0;
 
-	ret = verify_area(VERIFY_WRITE, (void *)pext->ResponseAdr ,
+	ret = verify_area(VERIFY_WRITE, (void *)pext->ResponseAdr,
 	    sizeof(EXT_CHIP));
 	if (ret) {
 		pext->Status = EXT_STATUS_COPY_ERR;
-		DEBUG9_10(printk("qla2x00_query_chip: ERROR verify write rsp "
-		    "buffer.\n");)
-		return pext->Status;
+		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR verify wrt rsp buf\n",
+		    __func__, ha->host_no, ha->instance);)
+		qla2x00_free_ioctl_scrap_mem(ha);
+		return (ret);
 	}
 
 	/* now copy up the ISP to user */
@@ -1522,16 +2169,42 @@ qla2x00_query_chip(scsi_qla_host_t *ha, 
 	else
 		transfer_size = sizeof(EXT_CHIP);
 
-	copy_to_user((uint8_t *)pext->ResponseAdr, (uint8_t *)&tmp_isp,
+	ret = copy_to_user((uint8_t *)pext->ResponseAdr, (uint8_t *)ptmp_isp,
 	    transfer_size);
+	if (ret) {
+		pext->Status = EXT_STATUS_COPY_ERR;
+		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR copy rsp buffer.\n",
+		    __func__, ha->host_no, ha->instance);)
+		qla2x00_free_ioctl_scrap_mem(ha);
+		return (ret);
+	}
 
 	pext->Status       = EXT_STATUS_OK;
 	pext->DetailStatus = EXT_STATUS_OK;
+	qla2x00_free_ioctl_scrap_mem(ha);
 
-	DEBUG9(printk("qla2x00_query_chip: exiting.\n");)
-	return ret;
+	DEBUG9(printk("%s(%ld): inst=%ld exiting.\n",
+	    __func__, ha->host_no, ha->instance);)
+
+	return (ret);
 }
 
+/*
+ * qla2x00_get_data
+ *	Handles all subcommands of the EXT_CC_GET_DATA command.
+ *
+ * Input:
+ *	ha = adapter state pointer.
+ *	pext = EXT_IOCTL structure pointer.
+ *	mode = not used.
+ *
+ * Returns:
+ *	0 = success
+ *	others = errno value
+ *
+ * Context:
+ *	Kernel context.
+ */
 STATIC int
 qla2x00_get_data(scsi_qla_host_t *ha, EXT_IOCTL *pext, int mode)
 {
@@ -1563,14 +2236,13 @@ qla2x00_get_data(scsi_qla_host_t *ha, EX
 		break;
 
 	default:
-		DEBUG10(printk("qla2x00_get_data: unknown SubCode %d.\n",
-		    pext->SubCode);)
+		DEBUG10(printk("%s(%ld): inst=%ld unknown SubCode %d.\n",
+		    __func__, ha->host_no, ha->instance, pext->SubCode);)
 		pext->Status = EXT_STATUS_UNSUPPORTED_SUBCODE;
-		tmp_rval = pext->Status;
 		break;
 	 }
 
-	return tmp_rval;
+	return (tmp_rval);
 }
 
 /*
@@ -1585,6 +2257,7 @@ qla2x00_get_data(scsi_qla_host_t *ha, EX
  *
  * Returns:
  *	0 = success
+ *	others = errno value
  *
  * Context:
  *	Kernel context.
@@ -1592,37 +2265,39 @@ qla2x00_get_data(scsi_qla_host_t *ha, EX
 STATIC int
 qla2x00_get_statistics(scsi_qla_host_t *ha, EXT_IOCTL *pext, int mode)
 {
-	EXT_HBA_PORT_STAT tmp_stat;
-	int ret;
-	link_stat_t stat_buf;
-	uint8_t  rval;
-	uint8_t  *usr_temp, *kernel_tmp;
-	uint16_t mb_stat[1];
-	uint32_t transfer_size;
+	EXT_HBA_PORT_STAT	*ptmp_stat;
+	int		ret = 0;
+	link_stat_t	stat_buf;
+	uint8_t		rval;
+	uint8_t		*usr_temp, *kernel_tmp;
+	uint16_t	mb_stat[1];
+	uint32_t	transfer_size;
+
 
-	DEBUG9(printk("entered qla2x00_get_statistics function.\n");)
+	DEBUG9(printk("%s(%ld): inst=%ld entered.\n",
+	    __func__, ha->host_no, ha->instance);)
 
 	ret = verify_area(VERIFY_WRITE, (void *)pext->ResponseAdr,
 	    sizeof(EXT_HBA_PORT_STAT));
 	if (ret) {
 		pext->Status = EXT_STATUS_COPY_ERR;
-		DEBUG9_10(printk("qla2x00_get_statistics(%ld): ERROR "
-		    "VERIFY_WRITE EXT_HBA_PORT_STAT.\n", ha->instance);)
-		return pext->Status;
+		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR VERIFY_WRITE "
+		    "EXT_HBA_PORT_STAT.\n",
+		    __func__, ha->host_no, ha->instance);)
+		return (ret);
 	}
 
 	/* check on loop down */
 	if (ha->loop_state != LOOP_READY || 
-		test_bit(CFG_ACTIVE, &ha->cfg_flags) ||
-			(test_bit(ABORT_ISP_ACTIVE, &ha->dpc_flags)) ||
+	    test_bit(CFG_ACTIVE, &ha->cfg_flags) ||
+	    (test_bit(ABORT_ISP_ACTIVE, &ha->dpc_flags)) ||
 	    ABORTS_ACTIVE || ha->dpc_active) {
 
 		pext->Status = EXT_STATUS_BUSY;
-		DEBUG9_10(printk(
-		    "qla2x00_get_statistics(%ld): loop not ready.\n",
-		    ha->host_no);)
+		DEBUG9_10(printk("%s(%ld): inst=%ld loop not ready.\n",
+		    __func__, ha->host_no, ha->instance);)
 
-		return pext->Status;
+		return (ret);
 	}
 
 	/* Send mailbox cmd to get more. */
@@ -1638,30 +2313,42 @@ qla2x00_get_statistics(scsi_qla_host_t *
 			pext->Status = EXT_STATUS_ERR;
 		}
 
-		DEBUG9_10(printk("qla2x00_get_statistics(%ld): ERROR "
-		    "mailbox failed. mb[0]=%x.\n", ha->instance, mb_stat[0]);)
+		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR mailbox failed. "
+		    "mb[0]=%x.\n",
+		    __func__, ha->host_no, ha->instance, mb_stat[0]);)
 		printk(KERN_WARNING
-		     "qla2x00_get_statistics(%ld): ERROR "
-		     "mailbox failed. mb[0]=%x.\n", ha->instance, mb_stat[0]);
+		     "%s(%ld): inst=%ld ERROR mailbox failed. mb[0]=%x.\n",
+		    __func__, ha->host_no, ha->instance, mb_stat[0]);
 
-		return pext->Status;
+		return (ret);
 	}
 
-	tmp_stat.ControllerErrorCount   =  ha->total_isp_aborts;
-	tmp_stat.DeviceErrorCount       =  ha->total_dev_errs;
-	tmp_stat.TotalIoCount           =  ha->total_ios;
-	tmp_stat.TotalMBytes            =  ha->total_bytes;
-	tmp_stat.TotalLipResets         =  ha->total_lip_cnt;
+	if (qla2x00_get_ioctl_scrap_mem(ha, (void **)&ptmp_stat,
+	    sizeof(EXT_HBA_PORT_STAT))) {
+		/* not enough memory */
+		pext->Status = EXT_STATUS_NO_MEMORY;
+		DEBUG9_10(printk("%s(%ld): inst=%ld scrap not big enough. "
+		    "size requested=%d.\n",
+		    __func__, ha->host_no, ha->instance,
+		    sizeof(EXT_HBA_PORT_STAT));)
+		return (ret);
+	}
+
+	ptmp_stat->ControllerErrorCount   =  ha->total_isp_aborts;
+	ptmp_stat->DeviceErrorCount       =  ha->total_dev_errs;
+	ptmp_stat->TotalIoCount           =  ha->total_ios;
+	ptmp_stat->TotalMBytes            =  ha->total_bytes >> 20;
+	ptmp_stat->TotalLipResets         =  ha->total_lip_cnt;
 	/*
-	   tmp_stat.TotalInterrupts        =  ha->total_isr_cnt;
+	   ptmp_stat->TotalInterrupts        =  ha->total_isr_cnt;
 	 */
 
-	tmp_stat.TotalLinkFailures               = stat_buf.link_fail_cnt;
-	tmp_stat.TotalLossOfSync                 = stat_buf.loss_sync_cnt;
-	tmp_stat.TotalLossOfSignals              = stat_buf.loss_sig_cnt;
-	tmp_stat.PrimitiveSeqProtocolErrorCount  = stat_buf.prim_seq_err_cnt;
-	tmp_stat.InvalidTransmissionWordCount    = stat_buf.inval_xmit_word_cnt;
-	tmp_stat.InvalidCRCCount                 = stat_buf.inval_crc_cnt;
+	ptmp_stat->TotalLinkFailures               = stat_buf.link_fail_cnt;
+	ptmp_stat->TotalLossOfSync                 = stat_buf.loss_sync_cnt;
+	ptmp_stat->TotalLossOfSignals              = stat_buf.loss_sig_cnt;
+	ptmp_stat->PrimitiveSeqProtocolErrorCount  = stat_buf.prim_seq_err_cnt;
+	ptmp_stat->InvalidTransmissionWordCount    = stat_buf.inval_xmit_word_cnt;
+	ptmp_stat->InvalidCRCCount                 = stat_buf.inval_crc_cnt;
 
 	/* now copy up the STATISTICS to user */
 	if (pext->ResponseLen < sizeof(EXT_HBA_PORT_STAT))
@@ -1669,17 +2356,25 @@ qla2x00_get_statistics(scsi_qla_host_t *
 	else
 		transfer_size = sizeof(EXT_HBA_PORT_STAT);
 
-
 	usr_temp   = (uint8_t *)pext->ResponseAdr;
-	kernel_tmp = (uint8_t *)&tmp_stat;
-	copy_to_user(usr_temp, kernel_tmp, transfer_size);
+	kernel_tmp = (uint8_t *)ptmp_stat;
+	ret = copy_to_user(usr_temp, kernel_tmp, transfer_size);
+	if (ret) {
+		pext->Status = EXT_STATUS_COPY_ERR;
+		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR copy rsp buffer.\n",
+		    __func__, ha->host_no, ha->instance);)
+		qla2x00_free_ioctl_scrap_mem(ha);
+		return (ret);
+	}
 
 	pext->Status       = EXT_STATUS_OK;
 	pext->DetailStatus = EXT_STATUS_OK;
+	qla2x00_free_ioctl_scrap_mem(ha);
 
-	DEBUG9(printk("finished qla2x00_get_statistics function.\n");)
+	DEBUG9(printk("%s(%ld): inst=%ld exiting.\n",
+	    __func__, ha->host_no, ha->instance);)
 
-	return pext->Status;
+	return (ret);
 }
 
 /*
@@ -1695,6 +2390,7 @@ qla2x00_get_statistics(scsi_qla_host_t *
  *
  * Returns:
  *	0 = success
+ *	others = errno value
  *
  * Context:
  *	Kernel context.
@@ -1702,31 +2398,35 @@ qla2x00_get_statistics(scsi_qla_host_t *
 STATIC int
 qla2x00_get_fc_statistics(scsi_qla_host_t *ha, EXT_IOCTL *pext, int mode)
 {
-	EXT_HBA_PORT_STAT tmp_stat;
-	EXT_DEST_ADDR addr_struct;
-	int ret;
-	link_stat_t stat_buf;
-	uint8_t  rval, tgt;
-	uint8_t  *usr_temp, *kernel_tmp;
-	uint8_t  *req_name;
-	uint16_t mb_stat[1];
-	uint32_t transfer_size;
+	EXT_HBA_PORT_STAT	*ptmp_stat;
+	EXT_DEST_ADDR		addr_struct;
+	int		ret = 0;
+	link_stat_t	stat_buf;
+	uint8_t		rval, tgt;
+	uint8_t		*usr_temp, *kernel_tmp;
+	uint8_t		*req_name;
+	uint16_t	mb_stat[1];
+	uint32_t	transfer_size;
+
 
-	DEBUG9(printk("entered qla2x00_get_fc_statistics function.\n");)
+	DEBUG9(printk("%s(%ld): inst=%ld entered.\n",
+	    __func__, ha->host_no, ha->instance);)
 
 	ret = verify_area(VERIFY_WRITE, (void *)pext->ResponseAdr,
 	    sizeof(EXT_HBA_PORT_STAT));
 	if (ret) {
 		pext->Status = EXT_STATUS_COPY_ERR;
-		DEBUG9_10(printk("qla2x00_get_fc_statistics(%ld): ERROR "
-		    "VERIFY_WRITE.\n", ha->instance);)
-		return pext->Status;
+		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR VERIFY_WRITE.\n",
+		    __func__, ha->host_no, ha->instance);)
+		return (ret);
 	}
 
 	ret = copy_from_user(&addr_struct, pext->RequestAdr, pext->RequestLen);
 	if (ret) {
 		pext->Status = EXT_STATUS_COPY_ERR;
-		return pext->Status;
+		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR copy req buf.\n",
+		    __func__, ha->host_no, ha->instance);)
+		return (ret);
 	}
 
 	/* find the device's loop_id */
@@ -1734,10 +2434,10 @@ qla2x00_get_fc_statistics(scsi_qla_host_
 	case EXT_DEF_DESTTYPE_WWPN:
 		req_name = addr_struct.DestAddr.WWPN;
 		for (tgt = 0; tgt < MAX_FIBRE_DEVICES; tgt++) {
-			if (memcmp(ha->fc_db[tgt].wwn,
-					req_name,
-					EXT_DEF_WWN_NAME_SIZE) == 0)
+			if (memcmp(ha->fc_db[tgt].wwn, req_name,
+			    EXT_DEF_WWN_NAME_SIZE) == 0) {
 				break;
+			}
 		}
 		break;
 
@@ -1748,9 +2448,9 @@ qla2x00_get_fc_statistics(scsi_qla_host_
 	default:
 		pext->Status = EXT_STATUS_INVALID_PARAM;
 		pext->DetailStatus = EXT_DSTATUS_NOADNL_INFO;
-		DEBUG9_10(printk("qla2x00_get_statistics(%ld): ERROR "
-		    "Unsupported subcode address type.\n", ha->instance);)
-		return pext->Status;
+		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR Unsupported subcode "
+		    "address type.\n", __func__, ha->host_no, ha->instance);)
+		return (ret);
 
 		break;
 	}
@@ -1759,7 +2459,7 @@ qla2x00_get_fc_statistics(scsi_qla_host_
 		/* not found */
 		pext->Status = EXT_STATUS_DEV_NOT_FOUND;
 		pext->DetailStatus = EXT_DSTATUS_TARGET;
-		return pext->Status;
+		return (ret);
 	}
 
 	/* check for suspended/lost device */
@@ -1773,13 +2473,14 @@ qla2x00_get_fc_statistics(scsi_qla_host_
 
 	/* check on loop down */
 	if (ha->loop_state != LOOP_READY ||
-		test_bit(CFG_ACTIVE, &ha->cfg_flags) ||
+	    test_bit(CFG_ACTIVE, &ha->cfg_flags) ||
 	    (test_bit(ABORT_ISP_ACTIVE, &ha->dpc_flags)) ||
 	    ABORTS_ACTIVE || ha->dpc_active) {
+
 		pext->Status = EXT_STATUS_BUSY;
-		DEBUG9_10(printk("qla2x00_get_fc_statistics(%ld): loop not "
-		    "ready.\n", ha->host_no);)
-		return pext->Status;
+		DEBUG9_10(printk("%s(%ld): inst=%ld loop not ready.\n",
+		     __func__, ha->host_no, ha->instance);)
+		return (ret);
 	}
 
 	/* Send mailbox cmd to get more. */
@@ -1794,26 +2495,38 @@ qla2x00_get_fc_statistics(scsi_qla_host_
 			pext->Status = EXT_STATUS_ERR;
 		}
 
-		DEBUG9_10(printk("qla2x00_get_fc_statistics(%ld): ERROR "
-		    "mailbox failed. mb[0]=%x.\n", ha->instance, mb_stat[0]);)
-		return pext->Status;
+		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR mailbox failed. "
+		    "mb[0]=%x.\n",
+		    __func__, ha->host_no, ha->instance, mb_stat[0]);)
+		return (ret);
 	}
 
-	tmp_stat.ControllerErrorCount   =  ha->total_isp_aborts;
-	tmp_stat.DeviceErrorCount       =  ha->total_dev_errs;
-	tmp_stat.TotalIoCount           =  ha->total_ios;
-	tmp_stat.TotalMBytes            =  ha->total_bytes;
-	tmp_stat.TotalLipResets         =  ha->total_lip_cnt;
+	if (qla2x00_get_ioctl_scrap_mem(ha, (void **)&ptmp_stat,
+	    sizeof(EXT_HBA_PORT_STAT))) {
+		/* not enough memory */
+		pext->Status = EXT_STATUS_NO_MEMORY;
+		DEBUG9_10(printk("%s(%ld): inst=%ld scrap not big enough. "
+		    "size requested=%d.\n",
+		    __func__, ha->host_no, ha->instance,
+		    sizeof(EXT_HBA_PORT_STAT));)
+		return (ret);
+	}
+
+	ptmp_stat->ControllerErrorCount   =  ha->total_isp_aborts;
+	ptmp_stat->DeviceErrorCount       =  ha->total_dev_errs;
+	ptmp_stat->TotalIoCount           =  ha->total_ios;
+	ptmp_stat->TotalMBytes            =  ha->total_bytes >> 20;
+	ptmp_stat->TotalLipResets         =  ha->total_lip_cnt;
 	/*
-	   tmp_stat.TotalInterrupts        =  ha->total_isr_cnt;
+	   ptmp_stat->TotalInterrupts        =  ha->total_isr_cnt;
 	 */
 
-	tmp_stat.TotalLinkFailures               = stat_buf.link_fail_cnt;
-	tmp_stat.TotalLossOfSync                 = stat_buf.loss_sync_cnt;
-	tmp_stat.TotalLossOfSignals              = stat_buf.loss_sig_cnt;
-	tmp_stat.PrimitiveSeqProtocolErrorCount  = stat_buf.prim_seq_err_cnt;
-	tmp_stat.InvalidTransmissionWordCount    = stat_buf.inval_xmit_word_cnt;
-	tmp_stat.InvalidCRCCount                 = stat_buf.inval_crc_cnt;
+	ptmp_stat->TotalLinkFailures               = stat_buf.link_fail_cnt;
+	ptmp_stat->TotalLossOfSync                 = stat_buf.loss_sync_cnt;
+	ptmp_stat->TotalLossOfSignals              = stat_buf.loss_sig_cnt;
+	ptmp_stat->PrimitiveSeqProtocolErrorCount  = stat_buf.prim_seq_err_cnt;
+	ptmp_stat->InvalidTransmissionWordCount    = stat_buf.inval_xmit_word_cnt;
+	ptmp_stat->InvalidCRCCount                 = stat_buf.inval_crc_cnt;
 
 	/* now copy up the STATISTICS to user */
 	if (pext->ResponseLen < sizeof(EXT_HBA_PORT_STAT))
@@ -1821,72 +2534,131 @@ qla2x00_get_fc_statistics(scsi_qla_host_
 	else
 		transfer_size = sizeof(EXT_HBA_PORT_STAT);
 
-
 	usr_temp   = (uint8_t *)pext->ResponseAdr;
-	kernel_tmp = (uint8_t *)&tmp_stat;
-	copy_to_user(usr_temp, kernel_tmp, transfer_size);
+	kernel_tmp = (uint8_t *)ptmp_stat;
+	ret = copy_to_user(usr_temp, kernel_tmp, transfer_size);
+	if (ret) {
+		pext->Status = EXT_STATUS_COPY_ERR;
+		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR copy rsp buffer.\n",
+		    __func__, ha->host_no, ha->instance);)
+		qla2x00_free_ioctl_scrap_mem(ha);
+		return (ret);
+	}
 
 	pext->Status       = EXT_STATUS_OK;
 	pext->DetailStatus = EXT_STATUS_OK;
+	qla2x00_free_ioctl_scrap_mem(ha);
 
-	DEBUG9(printk("finished qla2x00_get_fc_statistics function.\n");)
+	DEBUG9(printk("%s(%ld): inst=%ld exiting.\n",
+	    __func__, ha->host_no, ha->instance);)
 
-	return pext->Status;
+	return (ret);
 }
 
+/*
+ * qla2x00_get_port_summary
+ *	Handles EXT_SC_GET_PORT_SUMMARY subcommand.
+ *	Returns values of devicedata and dd_entry list.
+ *
+ * Input:
+ *	ha = adapter state pointer.
+ *	pext = EXT_IOCTL structure pointer.
+ *	mode = not used.
+ *
+ * Returns:
+ *	0 = success
+ *	others = errno value
+ *
+ * Context:
+ *	Kernel context.
+ */
 STATIC int
 qla2x00_get_port_summary(scsi_qla_host_t *ha, EXT_IOCTL *pext, int mode)
 {
-	int		ret = EXT_STATUS_OK;
+	int		ret = 0;
 	uint8_t		*usr_temp, *kernel_tmp;
 	uint32_t	b;
 	uint32_t	i, port_cnt, entry;
 	uint32_t	number_of_entries = 0;
 	uint32_t	tgt_cnt, transfer_size;
 	fc_port_t	*fcport;
-	void		*start_of_entry_list, *current_offset;
+	uint32_t	current_offset;
+	void		*start_of_entry_list;
 
-	static EXT_DEVICEDATA		devicedata;
-	static EXT_DEVICEDATAENTRY	dd_entry;
+	EXT_DEVICEDATA		*pdevicedata;
+	EXT_DEVICEDATAENTRY	*pdd_entry;
 
-	DEBUG9(printk("qla2x00_get_port_summary: entered.\n");)
+	DEBUG9(printk("%s(%ld): inst=%ld entered.\n",
+	    __func__, ha->host_no, ha->instance);)
 
 	port_cnt = 0;
 	tgt_cnt  = 0;
-	memset(&devicedata, 0, sizeof(EXT_DEVICEDATA));
-	memset(&dd_entry, 0, sizeof(EXT_DEVICEDATAENTRY));
+
+	if (qla2x00_get_ioctl_scrap_mem(ha, (void **)&pdevicedata,
+	    sizeof(EXT_DEVICEDATA))) {
+		/* not enough memory */
+		pext->Status = EXT_STATUS_NO_MEMORY;
+		DEBUG9_10(printk("%s(%ld): inst=%ld scrap not big enough. "
+		    "pdevicedata requested=%d.\n",
+		    __func__, ha->host_no, ha->instance,
+		    sizeof(EXT_DEVICEDATA));)
+		return (ret);
+	}
+
+	if (qla2x00_get_ioctl_scrap_mem(ha, (void **)&pdd_entry,
+	    sizeof(EXT_DEVICEDATAENTRY))) {
+		/* not enough memory */
+		pext->Status = EXT_STATUS_NO_MEMORY;
+		DEBUG9_10(printk("%s(%ld): inst=%ld scrap not big enough. "
+		    "pdd_entry requested=%d.\n",
+		    __func__, ha->host_no, ha->instance,
+		    sizeof(EXT_DEVICEDATAENTRY));)
+		qla2x00_free_ioctl_scrap_mem(ha);
+		return (ret);
+	}
 
 	for (fcport = ha->fcport; fcport != NULL; fcport = fcport->next) {
 		port_cnt++;
 	}
-	devicedata.TotalDevices = port_cnt;
+	pdevicedata->TotalDevices = port_cnt;
 
 	number_of_entries = pext->ResponseLen / sizeof(EXT_DEVICEDATAENTRY);
 
 	/* we want the lesser of port_cnt and number_of_entries */
 	if (number_of_entries > port_cnt)
 		number_of_entries = port_cnt;
-	devicedata.ReturnListEntryCount  = number_of_entries;
+	pdevicedata->ReturnListEntryCount  = number_of_entries;
 
-	DEBUG9(printk("qla2x00_ioctl: EXT_SC_GET_PORT_SUMMARY port_cnt=%x, "
-	    "return entry cnt=%x.\n", port_cnt, number_of_entries);)
+	DEBUG9(printk("%s(%ld): inst=%ld EXT_SC_GET_PORT_SUMMARY port_cnt=%x, "
+	    "return entry cnt=%x.\n",
+	    __func__, ha->host_no, ha->instance, port_cnt,
+	    number_of_entries);)
 
-	transfer_size = sizeof(devicedata.ReturnListEntryCount) +
-	    sizeof(devicedata.TotalDevices);
+	transfer_size = sizeof(pdevicedata->ReturnListEntryCount) +
+	    sizeof(pdevicedata->TotalDevices);
 
 	/* copy top of devicedata here */
 	ret = verify_area(VERIFY_WRITE, (void *)(pext->ResponseAdr),
 	    transfer_size);
 	if (ret) {
 		pext->Status = EXT_STATUS_COPY_ERR;
-		DEBUG9_10(printk(
-		    "qla2x00_ioctl: ERROR verify WRITE rsp buf.\n");)
-		return pext->Status;
+		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR verify wrt rsp buf\n",
+		    __func__, ha->host_no, ha->instance);)
+		qla2x00_free_ioctl_scrap_mem(ha);
+		return (ret);
 	}
 
 	usr_temp   = (uint8_t *)pext->ResponseAdr;
-	kernel_tmp = (uint8_t *)&devicedata;
-	copy_to_user(usr_temp, kernel_tmp, transfer_size);
+	kernel_tmp = (uint8_t *)pdevicedata;
+	ret = copy_to_user(usr_temp, kernel_tmp, transfer_size);
+	if (ret) {
+		pext->Status = EXT_STATUS_COPY_ERR;
+		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR copy rsp "
+		    "devicedata buffer.\n",
+		    __func__, ha->host_no, ha->instance);)
+		qla2x00_free_ioctl_scrap_mem(ha);
+		return (ret);
+	}
 
 	start_of_entry_list = (void *)(pext->ResponseAdr) + transfer_size;
 
@@ -1895,266 +2667,930 @@ qla2x00_get_port_summary(scsi_qla_host_t
 
 		/* copy from fc_db of this target (port) to dd_entry */
 
-		memcpy(dd_entry.NodeWWN, fcport->node_name, WWN_SIZE);
-		memcpy(dd_entry.PortWWN, fcport->port_name, WWN_SIZE);
+		memcpy(pdd_entry->NodeWWN, fcport->node_name, WWN_SIZE);
+		memcpy(pdd_entry->PortWWN, fcport->port_name, WWN_SIZE);
 
 		for (b = 0; b < 3 ; b++)
-			dd_entry.PortID[b] = fcport->d_id.r.d_id[2-b];
+			pdd_entry->PortID[b] = fcport->d_id.r.d_id[2-b];
 
 		if (fcport->flags & FC_FABRIC_DEVICE) {
-			dd_entry.ControlFlags = EXT_DEF_GET_FABRIC_DEVICE;
+			pdd_entry->ControlFlags = EXT_DEF_GET_FABRIC_DEVICE;
 		} else {
-			dd_entry.ControlFlags = 0;
+			pdd_entry->ControlFlags = 0;
 		}
 
-		dd_entry.TargetAddress.Bus    = 0;
+		pdd_entry->TargetAddress.Bus    = 0;
 		/* Retrieve 'Target' number for port via fc_db */
 		for (i = 0; i < MAX_TARGETS; i++) {
 			if (ha->fc_db[i].loop_id == PORT_UNUSED)
 				continue;
 
-			if (memcmp(fcport->port_name,
-					ha->fc_db[i].wwn,
-					EXT_DEF_WWN_NAME_SIZE) == 0) {
-				dd_entry.TargetAddress.Target = i;
+			if (memcmp(fcport->port_name, ha->fc_db[i].wwn,
+			    EXT_DEF_WWN_NAME_SIZE) == 0) {
+				pdd_entry->TargetAddress.Target = i;
 				break;
 			}
 		}
-		dd_entry.TargetAddress.Lun    = 0;
-		dd_entry.DeviceFlags          = 0;
-		dd_entry.LoopID               = fcport->loop_id;
-		dd_entry.BaseLunNumber        = 0;
+		pdd_entry->TargetAddress.Lun    = 0;
+		pdd_entry->DeviceFlags          = 0;
+		pdd_entry->LoopID               = fcport->loop_id;
+		pdd_entry->BaseLunNumber        = 0;
 
-		current_offset = (void *)(entry * sizeof(EXT_DEVICEDATAENTRY));
+		current_offset = entry * sizeof(EXT_DEVICEDATAENTRY);
 
 		transfer_size = sizeof(EXT_DEVICEDATAENTRY);
 		ret = verify_area(VERIFY_WRITE,
-		    (void *)((start_of_entry_list + (u_long)current_offset)),
+		    (void *)(start_of_entry_list + current_offset),
 		    transfer_size);
 
 		if (ret) {
 			pext->Status = EXT_STATUS_COPY_ERR;
-			DEBUG10(printk("qla2x00_ioctl: ERROR verify_area WRITE "
-			    "ha=%p\n", ha);)
+			DEBUG10(printk("%s(%ld): inst=%ld ERROR verify WRITE "
+			    "rsp bufaddr=%p\n",
+			    __func__, ha->host_no, ha->instance,
+			    (void *)(start_of_entry_list + current_offset));)
+			qla2x00_free_ioctl_scrap_mem(ha);
 			return pext->Status;
 		}
 
 		/* now copy up this dd_entry to user */
 		usr_temp = (uint8_t *)((u_long) start_of_entry_list +
-		    (u_long)current_offset);
-		kernel_tmp = (uint8_t *)&dd_entry;
-	 	copy_to_user(usr_temp, kernel_tmp, transfer_size);
+		    current_offset);
+		kernel_tmp = (uint8_t *)pdd_entry;
+	 	ret = copy_to_user(usr_temp, kernel_tmp, transfer_size);
+		if (ret) {
+			pext->Status = EXT_STATUS_COPY_ERR;
+			DEBUG9_10(printk("%s(%ld): inst=%ld ERROR copy rsp "
+			    "entry list buffer.\n",
+			    __func__, ha->host_no, ha->instance);)
+			qla2x00_free_ioctl_scrap_mem(ha);
+			return (ret);
+		}
 
 	} /* for number_of_entries */
 
 	pext->Status       = EXT_STATUS_OK;
 	pext->DetailStatus = EXT_STATUS_OK;
+	qla2x00_free_ioctl_scrap_mem(ha);
+
+	DEBUG9(printk("%s(%ld): inst=%ld exiting.\n",
+	    __func__, ha->host_no, ha->instance);)
 
-	DEBUG9(printk("qla2x00_get_port_summary: exiting.\n");)
-	return pext->Status;
+	return (ret);
 }
 
+/*
+ * qla2x00_query_driver
+ *	Handles EXT_SC_QUERY_DRIVER subcommand.
+ *
+ * Input:
+ *	ha = adapter state pointer.
+ *	pext = EXT_IOCTL structure pointer.
+ *	mode = not used.
+ *
+ * Returns:
+ *	0 = success
+ *	others = errno value
+ *
+ * Context:
+ *	Kernel context.
+ */
 STATIC int
 qla2x00_query_driver(scsi_qla_host_t *ha, EXT_IOCTL *pext, int mode)
 {
-	int		ret = EINVAL;
+	int		ret = 0;
 	uint8_t		*usr_temp, *kernel_tmp;
 	uint32_t	transfer_size;
-	EXT_DRIVER	driver_prop;
+	EXT_DRIVER	*pdriver_prop;
+
+	DEBUG9(printk("%s(%ld): inst=%ld entered.\n",
+	    __func__, ha->host_no, ha->instance);)
+
+	if (qla2x00_get_ioctl_scrap_mem(ha, (void **)&pdriver_prop,
+	    sizeof(EXT_DRIVER))) {
+		/* not enough memory */
+		pext->Status = EXT_STATUS_NO_MEMORY;
+		DEBUG9_10(printk("%s(%ld): inst=%ld scrap not big enough. "
+		    "size requested=%d.\n",
+		    __func__, ha->host_no, ha->instance,
+		    sizeof(EXT_DRIVER));)
+		return (ret);
+	}
+
+	sprintf(pdriver_prop->Version, QLA2100_VERSION);
+	pdriver_prop->NumOfBus = MAX_BUSES;
+	pdriver_prop->TargetsPerBus = MAX_FIBRE_DEVICES;
+	pdriver_prop->LunsPerTarget = MAX_LUNS;
+	pdriver_prop->MaxTransferLen  = 0xffffffff;
+	pdriver_prop->MaxDataSegments = 0xffffffff;
+
+	if (ha->flags.enable_64bit_addressing == 1)
+		pdriver_prop->DmaBitAddresses = 64;
+	else
+		pdriver_prop->DmaBitAddresses = 32;
+
+	if (pext->ResponseLen < sizeof(EXT_DRIVER))
+		transfer_size = pext->ResponseLen;
+	else
+		transfer_size = sizeof(EXT_DRIVER);
+
+	ret = verify_area(VERIFY_WRITE, (void *)pext->ResponseAdr ,
+	    transfer_size);
+	if (ret) {
+		pext->Status = EXT_STATUS_COPY_ERR;
+		DEBUG10(printk("%s(%ld): inst=%ld ERROR verify wrt rsp buf.\n",
+		    __func__, ha->host_no, ha->instance);)
+		qla2x00_free_ioctl_scrap_mem(ha);
+		return (ret);
+	}
+
+	/* now copy up the ISP to user */
+	usr_temp   = (uint8_t *)pext->ResponseAdr;
+	kernel_tmp = (uint8_t *)pdriver_prop;
+	ret = copy_to_user(usr_temp, kernel_tmp, transfer_size);
+	if (ret) {
+		pext->Status = EXT_STATUS_COPY_ERR;
+		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR copy rsp buffer.\n",
+		    __func__, ha->host_no, ha->instance);)
+		qla2x00_free_ioctl_scrap_mem(ha);
+		return (ret);
+	}
+
+	pext->Status       = EXT_STATUS_OK;
+	pext->DetailStatus = EXT_STATUS_OK;
+	qla2x00_free_ioctl_scrap_mem(ha);
+
+	DEBUG9(printk("%s(%ld): inst=%ld exiting.\n",
+	    __func__, ha->host_no, ha->instance);)
+
+	return (ret);
+}
+
+/*
+ * qla2x00_query_fw
+ *	Handles EXT_SC_QUERY_FW subcommand.
+ *
+ * Input:
+ *	ha = adapter state pointer.
+ *	pext = EXT_IOCTL structure pointer.
+ *	mode = not used.
+ *
+ * Returns:
+ *	0 = success
+ *	others = errno value
+ *
+ * Context:
+ *	Kernel context.
+ */
+STATIC int
+qla2x00_query_fw(scsi_qla_host_t *ha, EXT_IOCTL *pext, int mode)
+{
+	int		ret = 0;
+	qla_boards_t	*bdp;
+	uint8_t		*usr_temp, *kernel_tmp;
+	uint32_t	transfer_size;
+	EXT_FW		*pfw_prop;
+
+
+	DEBUG9(printk("%s(%ld): inst=%ld entered.\n",
+	    __func__, ha->host_no, ha->instance);)
+
+	if (qla2x00_get_ioctl_scrap_mem(ha, (void **)&pfw_prop,
+	    sizeof(EXT_FW))) {
+		/* not enough memory */
+		pext->Status = EXT_STATUS_NO_MEMORY;
+		DEBUG9_10(printk("%s(%ld): inst=%ld scrap not big enough. "
+		    "size requested=%d.\n",
+		    __func__, ha->host_no, ha->instance,
+		    sizeof(EXT_FW));)
+		return (ret);
+	}
+
+	bdp = &QLBoardTbl_fc[ha->devnum];
+	pfw_prop->Version[0] = bdp->fwver[0];
+	pfw_prop->Version[1] = bdp->fwver[1];
+	pfw_prop->Version[2] = bdp->fwver[2];
+
+	transfer_size = sizeof(EXT_FW);
+
+	ret = verify_area(VERIFY_WRITE, (void *)pext->ResponseAdr ,
+	    transfer_size);
+	if (ret) {
+		pext->Status = EXT_STATUS_COPY_ERR;
+		DEBUG10(printk("%s(%ld): inst=%ld ERROR verify wrt rsp buf.\n",
+		    __func__, ha->host_no, ha->instance);)
+		qla2x00_free_ioctl_scrap_mem(ha);
+		return (ret);
+	}
+
+	usr_temp   = (uint8_t *)pext->ResponseAdr;
+	kernel_tmp = (uint8_t *)pfw_prop;
+	ret = copy_to_user(usr_temp, kernel_tmp, transfer_size);
+	if (ret) {
+		pext->Status = EXT_STATUS_COPY_ERR;
+		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR copy rsp buffer.\n",
+		    __func__, ha->host_no, ha->instance);)
+		qla2x00_free_ioctl_scrap_mem(ha);
+		return (ret);
+	}
+
+	pext->Status       = EXT_STATUS_OK;
+	pext->DetailStatus = EXT_STATUS_OK;
+	qla2x00_free_ioctl_scrap_mem(ha);
+
+	DEBUG9(printk("%s(%ld): inst=%ld exiting.\n",
+	    __func__, ha->host_no, ha->instance);)
+
+	return (ret);
+}
+
+#if defined(ISP2300)
+/*
+ * qla2x00_send_els_passthru
+ *	Passes the ELS command down to firmware as MSIOCB and
+ *	copies the response back when it completes.
+ *
+ * Input:
+ *	ha = adapter state pointer.
+ *	pext = EXT_IOCTL structure pointer.
+ *	mode = not used.
+ *
+ * Returns:
+ *	0 = success
+ *	others = errno value
+ *
+ * Context:
+ *	Kernel context.
+ */
+STATIC int
+qla2x00_send_els_passthru(scsi_qla_host_t *ha, EXT_IOCTL *pext, int mode)
+{
+	int		ret = 0;
+	int		tmp_rval = 0;
+
+	uint8_t		index;
+	uint8_t		invalid_wwn = FALSE;
+	uint8_t		port_found;
+	uint8_t		*ptmp_stat;
+	uint8_t		*pusr_req_buf;
+	uint8_t		*presp_payload;
+	uint32_t	payload_len;
+	uint32_t	usr_req_len;
+
+	fcdev_t		tmpdev;
+
+	fc_lun_t	*ptemp_fclun;	/* buf from scrap mem */
+	fc_port_t	*ptemp_fcport;	/* buf from scrap mem */
+
+	fc_port_t	*pfcport;
+
+	os_lun_t	*plq;
+	os_tgt_t	*ptq;
+
+	Scsi_Cmnd	*pscsi_cmd;
+
+	srb_t		*sp = NULL;
+	EXT_ELS_PT_REQ	*pels_pt_req;
+
+	struct list_head *fcil;
+	fc_initiator_t	*fcinitiator;
+
+
+	DEBUG9(printk("%s(%ld): inst=%ld entered.\n",
+	    __func__, ha->host_no, ha->instance);)
+
+	/* check on current topology */
+	if ((ha->current_topology != ISP_CFG_F) &&
+	    (ha->current_topology != ISP_CFG_FL)) {
+		pext->Status = EXT_STATUS_DEV_NOT_FOUND;
+		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR not in F or FL mode\n",
+		    __func__, ha->host_no, ha->instance);)
+		return (ret);
+	}
+
+	if (ha->ioctl_mem_size <= 0) {
+		if (qla2x00_get_new_ioctl_dma_mem(ha,
+		    QLA_INITIAL_IOCTLMEM_SIZE) != QL_STATUS_SUCCESS) {
+
+			DEBUG9_10(printk("%s: ERROR cannot alloc DMA "
+			    "buffer size=%lx.\n",
+			    __func__, QLA_INITIAL_IOCTLMEM_SIZE);)
+
+			pext->Status = EXT_STATUS_NO_MEMORY;
+			return (ret);
+		}
+	}
+
+	if (pext->ResponseLen > ha->ioctl_mem_size) {
+		if (qla2x00_get_new_ioctl_dma_mem(ha, pext->ResponseLen) !=
+		    QL_STATUS_SUCCESS) {
+
+			DEBUG9_10(printk("%s: ERROR cannot alloc requested"
+			    "DMA buffer size %x.\n",
+			    __func__, pext->ResponseLen);)
+
+			pext->Status = EXT_STATUS_NO_MEMORY;
+			return (ret);
+		}
+
+		DEBUG9(printk("%s(%ld): inst=%ld rsp buf length larger than "
+		    "existing size. Additional mem alloc successful.\n",
+		    __func__, ha->host_no, ha->instance);)
+	}
+
+	usr_req_len = pext->RequestLen - sizeof(EXT_ELS_PT_REQ);
+	if (usr_req_len > ha->ioctl_mem_size) {
+		pext->Status = EXT_STATUS_INVALID_PARAM;
+
+		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR ReqLen too big=%x.\n",
+		    __func__, ha->host_no, ha->instance, pext->RequestLen);)
+
+		return (ret);
+	}
+
+	/* Verify entire EXT IOCTL request buffer */
+	
+	ret = verify_area(VERIFY_READ, (void *)pext->RequestAdr,
+	    pext->RequestLen);
+	if (ret) {
+		pext->Status = EXT_STATUS_COPY_ERR;
+		DEBUG9_10(printk(
+		    "%s(%ld): inst=%ld ERROR verify read req buf\n",
+		    __func__, ha->host_no, ha->instance);)
+
+		return (ret);
+	}
+
+	DEBUG9(printk("%s(%ld): inst=%ld req buf verified.\n",
+	    __func__, ha->host_no, ha->instance);)
+
+	if (qla2x00_get_ioctl_scrap_mem(ha, (void **)&pscsi_cmd,
+	    sizeof(Scsi_Cmnd))) {
+		/* not enough memory */
+		pext->Status = EXT_STATUS_NO_MEMORY;
+		DEBUG9_10(printk("%s(%ld): inst=%ld scrap not big enough. "
+		    "size requested=%d.\n",
+		    __func__, ha->host_no, ha->instance,
+		    sizeof(Scsi_Cmnd));)
+		return (ret);
+	}
+	if (qla2x00_get_ioctl_scrap_mem(ha, (void **)&pels_pt_req,
+	    sizeof(EXT_ELS_PT_REQ))) {
+		/* not enough memory */
+		pext->Status = EXT_STATUS_NO_MEMORY;
+		DEBUG9_10(printk("%s(%ld): inst=%ld scrap not big enough. "
+		    "els_pt_req size requested=%d.\n",
+		    __func__, ha->host_no, ha->instance,
+		    sizeof(EXT_ELS_PT_REQ));)
+		goto els_passthru_done;
+	}
+	if (qla2x00_get_ioctl_scrap_mem(ha, (void **)&ptemp_fclun,
+	    sizeof(fc_lun_t))) {
+		/* not enough memory */
+		pext->Status = EXT_STATUS_NO_MEMORY;
+		DEBUG9_10(printk("%s(%ld): inst=%ld scrap not big enough. "
+		    "fclun size requested=%d.\n",
+		    __func__, ha->host_no, ha->instance,
+		    sizeof(fc_lun_t));)
+		goto els_passthru_done;
+	}
+	if (qla2x00_get_ioctl_scrap_mem(ha, (void **)&ptemp_fcport,
+	    sizeof(fc_port_t))) {
+		/* not enough memory */
+		pext->Status = EXT_STATUS_NO_MEMORY;
+		DEBUG9_10(printk("%s(%ld): inst=%ld scrap not big enough. "
+		    "fcport size requested=%d.\n",
+		    __func__, ha->host_no, ha->instance,
+		    sizeof(fc_port_t));)
+		goto els_passthru_done;
+	}
+
+	/* initialize */
+
+	memset(ha->ioctl_mem, 0, ha->ioctl_mem_size);
+
+	/* copy request buffer */
+	
+	ret = copy_from_user(pels_pt_req, pext->RequestAdr,
+	    sizeof(EXT_ELS_PT_REQ));
+	if (ret) {
+		pext->Status = EXT_STATUS_COPY_ERR;
+
+		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR"
+		    "copy_from_user() of struct failed (%d).\n",
+		    __func__, ha->host_no, ha->instance, ret);)
+
+		goto els_passthru_done;
+	}
+
+	pusr_req_buf = (uint8_t *)pext->RequestAdr + sizeof(EXT_ELS_PT_REQ);
+	
+	ret = copy_from_user(ha->ioctl_mem, pusr_req_buf, usr_req_len);
+	if (ret) {
+		pext->Status = EXT_STATUS_COPY_ERR;
+
+		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR"
+		    "copy_from_user() of request buf failed (%d).\n",
+		    __func__, ha->host_no, ha->instance, ret);)
+
+		goto els_passthru_done;
+	}
+
+	DEBUG9(printk("%s(%ld): inst=%ld after copy request.\n",
+	    __func__, ha->host_no, ha->instance);)
+	
+	/* check on loop down (1) */
+	if (ha->loop_state != LOOP_READY || 
+	    test_bit(CFG_ACTIVE, &ha->cfg_flags) ||
+	    (test_bit(ABORT_ISP_ACTIVE, &ha->dpc_flags)) || ABORTS_ACTIVE) {
+
+		DEBUG9_10(printk(
+		    "%s(%ld): inst=%ld before dest port validation- loop not "
+		    "ready; cannot proceed.\n",
+		    __func__, ha->host_no, ha->instance);)
+
+		pext->Status = EXT_STATUS_BUSY;
+
+		goto els_passthru_done;
+	}
+
+	/*********************************/
+	/* Validate the destination port */
+	/*********************************/
+
+	/* first: WWN cannot be zero if no PID is specified */
+	invalid_wwn = qla2x00_is_wwn_zero(pels_pt_req->WWPN);
+	if (invalid_wwn && !(pels_pt_req->ValidMask & EXT_DEF_PID_VALID)) {
+		/* error: both are not set. */
+		pext->Status = EXT_STATUS_INVALID_PARAM;
+
+		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR no valid WWPN/PID\n",
+		    __func__, ha->host_no, ha->instance);)
+
+		goto els_passthru_done;
+	}
+
+	/* second: it cannot be the local/current HBA itself */
+	if (!invalid_wwn) {
+		if (memcmp(ha->init_cb->port_name, pels_pt_req->WWPN,
+		    EXT_DEF_WWN_NAME_SIZE) == 0) {
+
+			/* local HBA specified. */
+
+			pext->Status = EXT_STATUS_INVALID_PARAM;
+			DEBUG9_10(printk("%s(%ld): inst=%ld ERROR local HBA's "
+			    "WWPN found.\n",
+			    __func__, ha->host_no, ha->instance);)
+
+			goto els_passthru_done;
+		}
+	} else { /* using PID */
+		if (pels_pt_req->Id[1] == ha->d_id.r.d_id[2]
+		    && pels_pt_req->Id[2] == ha->d_id.r.d_id[1]
+		    && pels_pt_req->Id[3] == ha->d_id.r.d_id[0]) {
+
+			/* local HBA specified. */
+
+			pext->Status = EXT_STATUS_INVALID_PARAM;
+			DEBUG9_10(printk("%s(%ld): inst=%ld ERROR local HBA's "
+			    "PID found.\n",
+			    __func__, ha->host_no, ha->instance);)
+
+			goto els_passthru_done;
+		}
+	}
+
+	/************************/
+	/* Now find the loop ID */
+	/************************/
+
+	/* 1st: scan thru our HBA database */
+	index = 0;
+	port_found = FALSE;
+	fcinitiator = NULL;
+	if (!invalid_wwn) {
+		/* search with WWPN */
+		list_for_each(fcil, &ha->fcinitiators) {
+			fcinitiator = list_entry(fcil, fc_initiator_t, list);
+
+			if (memcmp(pels_pt_req->WWPN, fcinitiator->port_name,
+				 EXT_DEF_WWN_NAME_SIZE) == 0) {
+
+				port_found = TRUE;
+				pels_pt_req->Lid = fcinitiator->loop_id;
+
+				DEBUG9(printk("%s(%ld): inst=%ld found host "
+				    "w/ WWN. loop_id = %02x.\n",
+				    __func__, ha->host_no, ha->instance,
+				    pels_pt_req->Lid);)
+
+				break;
+			}
+		}
+	} else {
+		/* search with PID */
+		list_for_each(fcil, &ha->fcinitiators) {
+			fcinitiator = list_entry(fcil, fc_initiator_t, list);
+
+			if (pels_pt_req->Id[1] == fcinitiator->d_id.r.d_id[2]
+			    && pels_pt_req->Id[2] == fcinitiator->d_id.r.d_id[1]
+			    && pels_pt_req->Id[3] ==
+				    fcinitiator->d_id.r.d_id[0]) {
+
+				port_found = TRUE;
+				pels_pt_req->Lid = fcinitiator->loop_id;
+
+				DEBUG9(printk("%s(%ld): inst=%ld found host "
+				    "w/ WWN. loop_id = %02x.\n",
+				    __func__, ha->host_no, ha->instance,
+				    pels_pt_req->Lid);)
+
+				break;
+			}
+		}
+	}
+
+	/* If this is for a host device, check if we need to perform login */
+	if (port_found && (fcinitiator->loop_id >= LAST_SNS_LOOP_ID)) {
+
+		DEBUG9_10(printk("%s(%ld): inst=%ld need to relogin to "
+		    "dest host.\n",
+		    __func__, ha->host_no, ha->instance);)
+
+		if (fcinitiator->d_id.b24 == 0) {
+			/* Either RSCN hasn't been processed yet or
+			 * this host is no longer connected to us.
+			 */
+			pext->Status = EXT_STATUS_DEV_NOT_FOUND;
+			DEBUG9_10(printk("%s(%ld): inst=%ld ERROR dest host "
+			    "port lost.\n",
+			    __func__, ha->host_no, ha->instance);)
+
+			goto els_passthru_done;
+		}
+
+		/* login and update database */
+		tmpdev.d_id.b24 = fcinitiator->d_id.b24;
+		tmpdev.loop_id = fcinitiator->loop_id;
+
+		if (qla2x00_host_relogin(ha, &tmpdev) != 0) {
+			/* login failed. */
+			pext->Status = EXT_STATUS_DEV_NOT_FOUND;
+
+			DEBUG9_10(printk("%s(%ld): inst=%ld ERROR login to "
+			    "host port failed. loop_id=%02x pid=%06x ret=%d.\n",
+			    __func__, ha->host_no, ha->instance, tmpdev.loop_id,
+			    tmpdev.d_id.b24, ret);)
+
+			goto els_passthru_done;
+		} else {
+			fcinitiator->loop_id = tmpdev.loop_id;
+			pels_pt_req->Lid = tmpdev.loop_id;
+
+			DEBUG9(printk("%s(%ld): inst=%ld success login to "
+			    "remote host; Lid=%02x.\n",
+			    __func__, ha->host_no, ha->instance,
+			    fcinitiator->loop_id);)
+		}
+	}
+	
+	/* 2nd: scan thru our fcport database */
+	if (!invalid_wwn) {
+		/* search with WWPN */
+		for (pfcport = ha->fcport;
+		    (!port_found) && pfcport != NULL; pfcport = pfcport->next) {
+
+			if (memcmp(pfcport->port_name, pels_pt_req->WWPN,
+			    EXT_DEF_WWN_NAME_SIZE) == 0) {
+
+				port_found = TRUE;
+				pels_pt_req->Lid = pfcport->loop_id;
+
+				DEBUG9(printk("%s(%ld): inst=%ld found fcport "
+				    "w/ WWN. loop_id = %02x.\n",
+				    __func__, ha->host_no, ha->instance,
+				    pels_pt_req->Lid);)
+				break;
+			}
+		}
+	} else {
+		/* search with PID */
+		for (pfcport = ha->fcport;
+		    (!port_found) && pfcport != NULL; pfcport = pfcport->next) {
+
+			if (pels_pt_req->Id[1] == pfcport->d_id.r.d_id[2]
+			    && pels_pt_req->Id[2] == pfcport->d_id.r.d_id[1]
+			    && pels_pt_req->Id[3] == pfcport->d_id.r.d_id[0]) {
+
+				port_found = TRUE;
+				pels_pt_req->Lid = pfcport->loop_id;
+
+				DEBUG9(printk("%s(%ld): inst=%ld found fcport "
+				    "w/ PID. loop_id = %02x.\n",
+				    __func__, ha->host_no, ha->instance,
+				    pels_pt_req->Lid);)
+
+				break;
+			}
+		}
+	}
+	
+	if (!port_found) {
+		/* invalid WWN or PID specified */
+		pext->Status = EXT_STATUS_INVALID_PARAM;
+		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR WWPN/PID invalid.\n",
+		    __func__, ha->host_no, ha->instance);)
+
+		goto els_passthru_done;
+	}
+
+	/* alloc sp */
+	if ((sp = qla2x00_get_new_sp(ha)) == NULL) {
+
+		pext->Status = EXT_STATUS_NO_MEMORY;
+		DEBUG9_10(printk("%s: ERROR cannot alloc sp %p.\n",
+		    __func__, sp);)
+
+		goto els_passthru_done;
+	}
+
+	DEBUG9(printk("%s(%ld): inst=%ld after alloc sp.\n",
+	    __func__, ha->host_no, ha->instance);)
+
+	/* setup sp for this command */
+	ptq = ha->ioctl->ioctl_tq;
+	plq = ha->ioctl->ioctl_lq;
+	sp->cmd = pscsi_cmd;
+	sp->flags = SRB_IOCTL;
+	sp->lun_queue = plq;
+	sp->tgt_queue = ptq;
+	ptemp_fclun->fcport = ptemp_fcport;
+	ptemp_fclun->lun = 0;
+	ptemp_fclun->flags = 0;
+	ptemp_fclun->next = NULL;
+	plq->fclun = ptemp_fclun;
+	plq->fclun->fcport->ha = ha;
 
-	DEBUG9(printk("qla2x00_query_driver: entered.\n");)
+	/* init scsi_cmd */
+	pscsi_cmd->host = ha->host;
+	pscsi_cmd->scsi_done = qla2x00_msiocb_done;
 
-	memset(&driver_prop, 0, sizeof(EXT_DRIVER));
+	/* check on loop down (2)- check again just before sending cmd out. */
+	if (ha->loop_state != LOOP_READY || 
+	    test_bit(CFG_ACTIVE, &ha->cfg_flags) ||
+	    (test_bit(ABORT_ISP_ACTIVE, &ha->dpc_flags)) ||
+	    ABORTS_ACTIVE) {
 
-	sprintf(driver_prop.Version, QLA2100_VERSION);
-	driver_prop.NumOfBus = MAX_BUSES;
-	driver_prop.TargetsPerBus = MAX_FIBRE_DEVICES;
-	driver_prop.LunsPerTarget = MAX_LUNS;
-	driver_prop.MaxTransferLen  = 0xffffffff;
-	driver_prop.MaxDataSegments = 0xffffffff;
+		DEBUG9_10(printk("%s(%ld): inst=%ld before issue cmd- loop "
+		    "not ready.\n",
+		    __func__, ha->host_no, ha->instance);)
 
-	if (ha->flags.enable_64bit_addressing == 1)
-		driver_prop.DmaBitAddresses = 64;
-	else
-		driver_prop.DmaBitAddresses = 32;
+		pext->Status = EXT_STATUS_BUSY;
 
-	if (pext->ResponseLen < sizeof(EXT_DRIVER))
-		transfer_size = pext->ResponseLen;
-	else
-		transfer_size = sizeof(EXT_DRIVER);
+		atomic_set(&sp->ref_count, 0);
+		add_to_free_queue (ha, sp);
 
-	ret = verify_area(VERIFY_WRITE, (void *)pext->ResponseAdr ,
-	    transfer_size);
-	if (ret) {
-		pext->Status = EXT_STATUS_COPY_ERR;
-		DEBUG10(printk(
-		    "qla2x00_query_driver: ERROR verify WRITE rsp buf.\n");)
-		return pext->Status;
+		goto els_passthru_done;
 	}
 
-	/* now copy up the ISP to user */
-	usr_temp   = (uint8_t *)pext->ResponseAdr;
-	kernel_tmp = (uint8_t *)&driver_prop;
-	copy_to_user(usr_temp, kernel_tmp, transfer_size);
+	DEBUG9(printk("%s(%ld): inst=%ld going to issue command.\n",
+	    __func__, ha->host_no, ha->instance);)
 
-	pext->Status       = EXT_STATUS_OK;
-	pext->DetailStatus = EXT_STATUS_OK;
+	tmp_rval = qla2x00_start_ms_cmd(ha, pext, sp, pels_pt_req);
 
-	DEBUG9(printk("qla2x00_query_driver: exiting.\n");)
+	DEBUG9(printk("%s(%ld): inst=%ld after issue command.\n",
+	    __func__, ha->host_no, ha->instance);)
 
-	return pext->Status;
-}
+	if (tmp_rval != 0) {
+		/* We waited and post function did not get called */
+		DEBUG9_10(printk("%s(%ld): inst=%ld command timed out.\n",
+		    __func__, ha->host_no, ha->instance);)
 
-STATIC int
-qla2x00_query_fw(scsi_qla_host_t *ha, EXT_IOCTL *pext, int mode)
-{
-	int		ret = EINVAL;
-	qla_boards_t	*bdp;
-	uint8_t		*usr_temp, *kernel_tmp;
-	uint32_t	transfer_size;
-	EXT_FW		fw_prop;
+		pext->Status = EXT_STATUS_MS_NO_RESPONSE;
+
+		atomic_set(&sp->ref_count, 0);
+		add_to_free_queue (ha, sp);
 
-	DEBUG9(printk("qla2x00_query_fw: entered.\n");)
+		goto els_passthru_done;
+	}
 
-	memset(&fw_prop, 0, sizeof(EXT_FW));
+	/* check on data returned */
+	ptmp_stat = (uint8_t *)ha->ioctl_mem + FC_HEADER_LEN;
 
-	bdp = &QLBoardTbl_fc[ha->devnum];
-	fw_prop.Version[0] = bdp->fwver[0];
-	fw_prop.Version[1] = bdp->fwver[1];
-	fw_prop.Version[2] = bdp->fwver[2];
+	if (*ptmp_stat == ELS_STAT_LS_RJT) {
+		payload_len = FC_HEADER_LEN + ELS_RJT_LENGTH;
 
-	transfer_size = sizeof(EXT_FW);
+	} else if (*ptmp_stat == ELS_STAT_LS_ACC) {
+		payload_len = pext->ResponseLen - sizeof(EXT_ELS_PT_REQ);
 
-	ret = verify_area(VERIFY_WRITE, (void *)pext->ResponseAdr ,
-	    transfer_size);
+	} else {
+		/* invalid. just copy the status word. */
+		DEBUG9_10(printk("%s(%ld): inst=%ld invalid stat "
+		    "returned =0x%x.\n",
+		    __func__, ha->host_no, ha->instance, *ptmp_stat);)
+
+		payload_len = FC_HEADER_LEN + 4;
+	}
+
+	DEBUG9(printk("%s(%ld): inst=%ld data dump-\n",
+	    __func__, ha->host_no, ha->instance);)
+	DEBUG9(qla2x00_dump_buffer((uint8_t *)ptmp_stat,
+	    pext->ResponseLen - sizeof(EXT_ELS_PT_REQ) - FC_HEADER_LEN);)
+	
+	/* Verify response buffer to be written */
+	/* The data returned include FC frame header */
+	presp_payload = (uint8_t *)pext->ResponseAdr + sizeof(EXT_ELS_PT_REQ);
+
+	ret = verify_area(VERIFY_WRITE, (void *)presp_payload, payload_len);
 	if (ret) {
 		pext->Status = EXT_STATUS_COPY_ERR;
-		DEBUG10(printk(
-		    "qla2x00_query_fw: ERROR verify WRITE rsp buf.\n");)
-		return pext->Status;
+
+		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR verify wrt rsp "
+		    "buffer. ha=%p.\n",
+		    __func__, ha->host_no, ha->instance, ha);)
+
+		goto els_passthru_done;
 	}
 
-	usr_temp   = (uint8_t *)pext->ResponseAdr;
-	kernel_tmp = (uint8_t *)&fw_prop;
-	copy_to_user(usr_temp, kernel_tmp, transfer_size);
+	/* copy back data returned to response buffer */
+	ret = copy_to_user(presp_payload, (uint8_t *)ha->ioctl_mem,
+	    payload_len);
+	if (ret) {
+		pext->Status = EXT_STATUS_COPY_ERR;
+		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR copy rsp buffer.\n",
+		    __func__, ha->host_no, ha->instance);)
+		goto els_passthru_done;
+	}
 
-	pext->Status       = EXT_STATUS_OK;
-	pext->DetailStatus = EXT_STATUS_OK;
+	DEBUG9(printk("%s(%ld): inst=%ld exiting normally.\n",
+	    __func__, ha->host_no, ha->instance);)
 
-	DEBUG9(printk("qla2x00_query_fw: exiting.\n");)
+els_passthru_done:
 
-	return pext->Status;
+	qla2x00_free_ioctl_scrap_mem(ha);
+	return (ret);
 }
+#endif
 
+/*
+ * qla2x00_send_fcct
+ *	Passes the FC CT command down to firmware as MSIOCB and
+ *	copies the response back when it completes.
+ *
+ * Input:
+ *	ha = adapter state pointer.
+ *	pext = EXT_IOCTL structure pointer.
+ *	mode = not used.
+ *
+ * Returns:
+ *	0 = success
+ *	others = errno value
+ *
+ * Context:
+ *	Kernel context.
+ */
 STATIC int
 qla2x00_send_fcct(scsi_qla_host_t *ha, EXT_IOCTL *pext, int mode)
 {
 	int		ret = 0;
+	int		tmp_rval = 0;
 	uint16_t	mb[MAILBOX_REGISTER_COUNT];
 
-	static fc_lun_t		temp_fclun;
-	fc_lun_t		*fclun;
-	static fc_port_t	tmp_fcport;
-	os_lun_t		*lq;
-	os_tgt_t		*tq;
+	fc_lun_t	*ptemp_fclun;
+	fc_port_t	*ptemp_fcport;
 
-	static Scsi_Cmnd scsi_cmd;
-	Scsi_Cmnd	*pscsi_cmd = &scsi_cmd;
+	os_lun_t	*lq;
+	os_tgt_t	*tq;
+
+	Scsi_Cmnd	*pscsi_cmd;
 	srb_t		*sp = NULL;
 
-	DEBUG9(printk("qla2x00_send_fcct(%ld): entered.\n", ha->host_no);)
+	DEBUG9(printk("%s(%ld): inst=%ld entered.\n",
+	    __func__, ha->host_no, ha->instance);)
 
 	/* check on current topology */
 	if ((ha->current_topology != ISP_CFG_F) &&
 	    (ha->current_topology != ISP_CFG_FL)) {
 		pext->Status = EXT_STATUS_DEV_NOT_FOUND;
-		DEBUG9_10(printk("qla2x00_send_fcct(%ld): ERROR not in F or FL"
-		    "mode.\n",ha->host_no);)
-		return ret;
+		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR not in F or FL mode\n",
+		    __func__, ha->host_no, ha->instance);)
+		return (ret);
 	}
 
 	if (ha->ioctl_mem_size <= 0) {
 		if (qla2x00_get_new_ioctl_dma_mem(ha,
 		    QLA_INITIAL_IOCTLMEM_SIZE) != QL_STATUS_SUCCESS) {
 
-			DEBUG9_10(printk("qla2x00_send_fcct: ERROR cannot "
-			    "alloc DMA buffer size=%lx.\n",
+			DEBUG9_10(printk("%s(%ld): inst=%ld ERROR cannot alloc "
+			    "DMA buffer size=%lx.\n",
+			    __func__, ha->host_no, ha->instance,
 			    QLA_INITIAL_IOCTLMEM_SIZE);)
 
 			pext->Status = EXT_STATUS_NO_MEMORY;
-			return pext->Status;
+			return (ret);
 		}
 	}
 
 	if (pext->ResponseLen > ha->ioctl_mem_size) {
 		if (qla2x00_get_new_ioctl_dma_mem(ha, pext->ResponseLen) !=
 		    QL_STATUS_SUCCESS) {
-			DEBUG9_10(printk("qla2x00_send_fcct: ERROR "
-			    "cannot alloc requested"
-			    "DMA buffer size %x.\n",
+			DEBUG9_10(printk("%s(%ld): inst=%ld ERROR cannot alloc "
+			    "requested DMA buffer size %x.\n",
+			    __func__, ha->host_no, ha->instance,
 			    pext->ResponseLen);)
 			pext->Status = EXT_STATUS_NO_MEMORY;
-			return pext->Status;
+			return (ret);
 		}
 
-		DEBUG9(printk("qla2x00_send_fcct(%ld): rsp buf length larger "
-		    "than existing size. Additional"
-		    "mem alloc successful.\n",
-		    ha->host_no);)
+		DEBUG9(printk("%s(%ld): inst=%ld rsp buf len larger than "
+		    "existing size. Additional mem alloc successful.\n",
+		    __func__, ha->host_no, ha->instance);)
 	}
 
 	if (pext->RequestLen > ha->ioctl_mem_size) {
 		pext->Status = EXT_STATUS_INVALID_PARAM;
-		DEBUG9_10(printk("qla2x00_send_fcct(%ld): ERROR RequestLen"
-		    "too big=%x.\n",
-		    ha->host_no, pext->RequestLen);)
+		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR ReqLen too big=%x.\n",
+		    __func__, ha->host_no, ha->instance, pext->RequestLen);)
 
-		return pext->Status;
+		return (ret);
 	}
 
 	ret = verify_area(VERIFY_READ, (void *)pext->RequestAdr,
 	    pext->RequestLen);
 	if (ret) {
 		pext->Status = EXT_STATUS_COPY_ERR;
-		DEBUG9_10(printk("qla2x00_send_fcct(%ld): ERROR"
-		    "verify read request buf.\n",
-		    ha->host_no);)
+		DEBUG9_10(printk(
+		    "%s(%ld): inst=%ld ERROR verify read req buf\n",
+		    __func__, ha->host_no, ha->instance);)
 
-		return ret;
+		return (ret);
 	}
 
-	DEBUG9(printk("qla2x00_send_fcct(%ld): req buf verified.\n",
-	    ha->host_no);)
-
-	if ((sp = qla2x00_get_new_sp(ha)) == NULL) {
-
-		DEBUG9_10(printk("qla2x00_send_fcct: ERROR "
-		    "cannot alloc sp %p.\n", sp);)
+	DEBUG9(printk("%s(%ld): inst=%ld req buf verified.\n",
+	    __func__, ha->host_no, ha->instance);)
 
+	if (qla2x00_get_ioctl_scrap_mem(ha, (void **)&pscsi_cmd,
+	    sizeof(Scsi_Cmnd))) {
+		/* not enough memory */
+		pext->Status = EXT_STATUS_NO_MEMORY;
+		DEBUG9_10(printk("%s(%ld): inst=%ld scrap not big enough. "
+		    "size requested=%d.\n",
+		    __func__, ha->host_no, ha->instance,
+		    sizeof(Scsi_Cmnd));)
+		return (ret);
+	}
+	if (qla2x00_get_ioctl_scrap_mem(ha, (void **)&ptemp_fclun,
+	    sizeof(fc_lun_t))) {
+		/* not enough memory */
 		pext->Status = EXT_STATUS_NO_MEMORY;
-		return pext->Status;
+		DEBUG9_10(printk("%s(%ld): inst=%ld scrap not big enough. "
+		    "fclun size requested=%d.\n",
+		    __func__, ha->host_no, ha->instance,
+		    sizeof(fc_lun_t));)
+		goto fcct_passthru_done;
+	}
+	if (qla2x00_get_ioctl_scrap_mem(ha, (void **)&ptemp_fcport,
+	    sizeof(fc_port_t))) {
+		/* not enough memory */
+		pext->Status = EXT_STATUS_NO_MEMORY;
+		DEBUG9_10(printk("%s(%ld): inst=%ld scrap not big enough. "
+		    "fcport size requested=%d.\n",
+		    __func__, ha->host_no, ha->instance,
+		    sizeof(fc_port_t));)
+		goto fcct_passthru_done;
 	}
 
-	DEBUG9(printk("qla2x00_send_fcct(%ld): after alloc sp.\n",
-	    ha->host_no);)
-
-	/* clear scsi_cmd to be used */
-	memset(&scsi_cmd, 0, sizeof(Scsi_Cmnd));
+	/* initialize */
 	memset(ha->ioctl_mem, 0, ha->ioctl_mem_size);
 
 	/* copy request buffer */
 	ret = copy_from_user(ha->ioctl_mem, pext->RequestAdr, pext->RequestLen);
 	if (ret) {
 		pext->Status = EXT_STATUS_COPY_ERR;
-		DEBUG9_10(printk("qla2x00_send_fcct(%ld): ERROR"
-		    "copy_from_user() failed (%d).\n",
-		    ha->host_no, ret);)
+		DEBUG9_10(printk(
+		    "%s(%ld): inst=%ld ERROR copy req buf. ret=%d\n",
+		    __func__, ha->host_no, ha->instance, ret);)
+
+
+		goto fcct_passthru_done;
+	}
 
-		return ret;
+	DEBUG9(printk("%s(%ld): inst=%ld after copy request.\n",
+	    __func__, ha->host_no, ha->instance);)
+
+	/* alloc sp */
+	if ((sp = qla2x00_get_new_sp(ha)) == NULL) {
+
+		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR cannot alloc "
+		    "sp %p.\n",
+		    __func__, ha->host_no, ha->instance, sp);)
+
+		pext->Status = EXT_STATUS_NO_MEMORY;
+		goto fcct_passthru_done;
 	}
 
-	DEBUG9(printk("qla2x00_send_fcct(%ld): after copy request.\n",
-	    ha->host_no);)
+	DEBUG9(printk("%s(%ld): inst=%ld after alloc sp.\n",
+	    __func__, ha->host_no, ha->instance);)
 
 	/* setup sp for this command */
 	tq = ha->ioctl->ioctl_tq;
@@ -2163,84 +3599,85 @@ qla2x00_send_fcct(scsi_qla_host_t *ha, E
 	sp->flags = SRB_IOCTL;
 	sp->lun_queue = lq;
 	sp->tgt_queue = tq;
-	fclun = &temp_fclun;
-	fclun->fcport = &tmp_fcport;
-	fclun->lun = 0;
-	fclun->flags = 0;
-	fclun->next = NULL;
-	lq->fclun = fclun;
+	ptemp_fclun->fcport = ptemp_fcport;
+	ptemp_fclun->lun = 0;
+	ptemp_fclun->flags = 0;
+	ptemp_fclun->next = NULL;
+	lq->fclun = ptemp_fclun;
 	lq->fclun->fcport->ha = ha;
 
 	/* init scsi_cmd */
-	scsi_cmd.host = ha->host;
-	scsi_cmd.scsi_done = qla2x00_fcct_done;
+	pscsi_cmd->host = ha->host;
+	pscsi_cmd->scsi_done = qla2x00_msiocb_done;
 
 	/* check on management server login status */
 	if (ha->flags.management_server_logged_in == 0) {
 		/* login to management server device */
 
-		ret = qla2x00_login_fabric(ha, MANAGEMENT_SERVER, 0xff, 0xff,
-		    0xfa, &mb[0], BIT_1);
+		tmp_rval = qla2x00_login_fabric(ha, MANAGEMENT_SERVER,
+		    0xff, 0xff, 0xfa, &mb[0], BIT_1);
 
-		if (ret != 0 || mb[0] != 0x4000) {
+		if (tmp_rval != 0 || mb[0] != 0x4000) {
 			pext->Status = EXT_STATUS_DEV_NOT_FOUND;
 
-	 		DEBUG10(printk("qla2x00_send_fcct(%ld): ERROR"
-			    "login to MS.\n",
-			    ha->host_no);)
+	 		DEBUG10(printk("%s(%ld): inst=%ld ERROR login to MS.\n",
+			    __func__, ha->host_no, ha->instance);)
+
 			atomic_set(&sp->ref_count, 0);
 			add_to_free_queue (ha, sp);
 
-			return pext->Status;
+			goto fcct_passthru_done;
 		}
 
 		ha->flags.management_server_logged_in = 1;
 	}
 
-	DEBUG9(printk("qla2x00_send_fcct(%ld): success login to MS.\n",
-	    ha->host_no);)
+	DEBUG9(printk("%s(%ld): success login to MS.\n",
+	    __func__, ha->host_no);)
 
 	/* check on loop down */
 	if (ha->loop_state != LOOP_READY || 
-		test_bit(CFG_ACTIVE, &ha->cfg_flags) ||
+	    test_bit(CFG_ACTIVE, &ha->cfg_flags) ||
 	    (test_bit(ABORT_ISP_ACTIVE, &ha->dpc_flags)) ||
 	    ABORTS_ACTIVE) {
 
+		DEBUG10(printk("%s(%ld): inst=%ld loop not ready.\n",
+		    __func__, ha->host_no, ha->instance);)
+
 		pext->Status = EXT_STATUS_BUSY;
-		DEBUG10(printk("qla2x00_send_fcct(%ld): loop not ready.\n",
-		    ha->host_no);)
+
 		atomic_set(&sp->ref_count, 0);
 		add_to_free_queue (ha, sp);
 
-		return pext->Status;
+		goto fcct_passthru_done;
 	}
 
-	DEBUG9(printk("qla2x00_send_fcct(%ld): going to issue command.\n",
-	    ha->host_no);)
+	DEBUG9(printk("%s(%ld): inst=%ld going to issue command.\n",
+	    __func__, ha->host_no, ha->instance);)
 
-	ret = qla2x00_start_ms_cmd(ha, pext, sp);
+	tmp_rval = qla2x00_start_ms_cmd(ha, pext, sp, NULL);
 
-	DEBUG9(printk("qla2x00_send_fcct(%ld): after issue command.\n",
-	    ha->host_no);)
+	DEBUG9(printk("%s(%ld): inst=%ld after issue command.\n",
+	    __func__, ha->host_no, ha->instance);)
 
-	if (ret != 0) {
+	if (tmp_rval != 0) {
 		/* We waited and post function did not get called */
-		DEBUG9_10(printk("qla2x00_send_fcct(%ld): command timed out.\n",
-		    ha->host_no);)
+		DEBUG9_10(printk("%s(%ld): inst=%ld command timed out.\n",
+		    __func__, ha->host_no, ha->instance);)
 		pext->Status = EXT_STATUS_MS_NO_RESPONSE;
 		atomic_set(&sp->ref_count, 0);
 		add_to_free_queue (ha, sp);
 
-		return pext->Status;
+		goto fcct_passthru_done;
 	}
 
 	if (CMD_COMPL_STATUS(pscsi_cmd) != 0 ||
 	    CMD_ENTRY_STATUS(pscsi_cmd) != 0) {
-		DEBUG9_10(printk(
-		    "qla2x00_send_fcct(%ld): command returned error=%x.\n",
-		    ha->host_no, CMD_COMPL_STATUS(pscsi_cmd));)
+		DEBUG9_10(printk("%s(%ld): inst=%ld cmd returned error=%x.\n",
+		    __func__, ha->host_no, ha->instance,
+		    CMD_COMPL_STATUS(pscsi_cmd));)
 		pext->Status = EXT_STATUS_ERR;
-		return pext->Status;
+		goto fcct_passthru_done;
 	}
 
 	/* getting device data and putting in pext->ResponseAdr */
@@ -2248,27 +3685,58 @@ qla2x00_send_fcct(scsi_qla_host_t *ha, E
 	    pext->ResponseLen);
 	if (ret) {
 		pext->Status = EXT_STATUS_COPY_ERR;
-		DEBUG9_10(printk("qla2x00_send_fcct(%ld): ERROR verify write "
-		    "response buffer. ha=%p.\n",
-		    ha->host_no, ha);)
-		return ret;
+		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR verify wrt rsp "
+		    "buffer. ha=%p.\n",
+		    __func__, ha->host_no, ha->instance, ha);)
+		goto fcct_passthru_done;
 	}
 
 	/* sending back data returned from Management Server */
-	copy_to_user((uint8_t *)pext->ResponseAdr,
+	ret = copy_to_user((uint8_t *)pext->ResponseAdr,
 	    (uint8_t *)ha->ioctl_mem, pext->ResponseLen);
+	if (ret) {
+		pext->Status = EXT_STATUS_COPY_ERR;
+		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR copy rsp buffer.\n",
+		    __func__, ha->host_no, ha->instance);)
+		goto fcct_passthru_done;
+	}
 
-	DEBUG9(printk("qla2x00_send_fcct(%ld): exiting normally.\n",
-	    ha->host_no);)
+	DEBUG9(printk("%s(%ld): inst=%ld exiting.\n",
+	    __func__, ha->host_no, ha->instance);)
 
-	return 0;
+fcct_passthru_done:
+
+	qla2x00_free_ioctl_scrap_mem(ha);
+	return (ret);
 }
 
+/*
+ * qla2x00_start_ms_cmd
+ *	Allocates an MSIOCB request pkt and sends out the passthru cmd.
+ *
+ * Input:
+ *	ha = adapter state pointer.
+ *
+ * Returns:
+ *	qla2x00 local function return status code.
+ *
+ * Context:
+ *	Kernel context.
+ */
 STATIC int
-qla2x00_start_ms_cmd(scsi_qla_host_t *ha, EXT_IOCTL *pext, srb_t *sp)
+qla2x00_start_ms_cmd(scsi_qla_host_t *ha, EXT_IOCTL *pext, srb_t *sp,
+    EXT_ELS_PT_REQ *pels_pt_req)
 {
-	ms_iocb_entry_t	*pkt;
-	unsigned long cpu_flags = 0;
+#define	ELS_REQUEST_RCTL	0x22
+#define ELS_REPLY_RCTL		0x23
+
+	uint32_t	usr_req_len;
+	uint32_t	usr_resp_len;
+	uint64_t	usr_reqbuf_addr;
+
+	ms_iocb_entry_t		*pkt;
+	unsigned long		cpu_flags = 0;
+
 
 	/* get spin lock for this operation */
 	spin_lock_irqsave(&ha->hardware_lock, cpu_flags);
@@ -2280,32 +3748,61 @@ qla2x00_start_ms_cmd(scsi_qla_host_t *ha
 		spin_unlock_irqrestore(&ha->hardware_lock, cpu_flags);
 
 		pext->Status = EXT_STATUS_NO_MEMORY;
-		DEBUG10(printk("qla2x00_ioctl: FCCT_PASSTHRU - could not get "
-		    "Request Packet.\n");)
-		return pext->Status;
+		DEBUG10(printk("%s(%ld): inst=%ld MSIOCB PT - could not get "
+		    "Request Packet.\n", __func__, ha->host_no, ha->instance);)
+		return (QL_STATUS_RESOURCE_ERROR);
 	}
 
 	pkt->entry_type  = MS_IOCB_TYPE;
 	pkt->entry_count = 1;
-	pkt->loop_id     = MANAGEMENT_SERVER;
-	pkt->timeout     = QLA_PT_CMD_TOV;
-	pkt->DSDcount    = 1;
-	pkt->RespDSDcount = 2;
-	pkt->Response_bytecount = pext->ResponseLen;
-	pkt->Request_bytecount  = pext->RequestLen;
+	
+	if (pels_pt_req != NULL) {
+		/* process ELS passthru command */
+		usr_reqbuf_addr = (uint64_t)ha->ioctl_mem_phys +
+		    sizeof(EXT_ELS_PT_REQ);
+		usr_req_len = pext->RequestLen - sizeof(EXT_ELS_PT_REQ);
+		usr_resp_len = pext->ResponseLen - sizeof(EXT_ELS_PT_REQ);
+	
+		pkt->control_flags = BIT_15; /* ELS passthru enabled */
+		pkt->loop_id = pels_pt_req->Lid;
+		pkt->type    = 1; /* ELS frame */
+		
+		if (pext->ResponseLen != 0) {
+			pkt->r_ctl    = ELS_REQUEST_RCTL;
+			pkt->rx_id    = 0;
+		} else {
+			pkt->r_ctl    = ELS_REPLY_RCTL;
+			pkt->rx_id    = pels_pt_req->Rxid;
+		}
+	} else {
+		usr_reqbuf_addr = (uint64_t)ha->ioctl_mem_phys;
+		usr_req_len = pext->RequestLen;
+		usr_resp_len = pext->ResponseLen;
+		pkt->loop_id     = MANAGEMENT_SERVER;
+	}
+
+	DEBUG9_10(printk("%s(%ld): inst=%ld using loop_id=%02x req_len=%d, "
+	    "resp_len=%d.\n", __func__, ha->host_no, ha->instance,
+	    pkt->loop_id, usr_req_len, usr_resp_len);)
+
+	pkt->timeout = QLA_PT_CMD_TOV;
+	pkt->cmd_dsd_count = 1;
+	pkt->total_dsd_count = 2; /* no continuation */
+	pkt->rsp_bytecount = usr_resp_len;
+	pkt->req_bytecount = usr_req_len;
 
 	/* loading command payload address */
-	pkt->dseg_req_address[0] = LS_64BITS(ha->ioctl_mem_phys);
-	pkt->dseg_req_address[1] = MS_64BITS(ha->ioctl_mem_phys);
-	pkt->dseg_req_length = pext->RequestLen;
+	pkt->dseg_req_address[0] = LS_64BITS(usr_reqbuf_addr);
+	pkt->dseg_req_address[1] = MS_64BITS(usr_reqbuf_addr);
+	pkt->dseg_req_length = usr_req_len;
 
-	/* loading command response address */
+	/* loading response payload address */
 	pkt->dseg_rsp_address[0] = LS_64BITS(ha->ioctl_mem_phys);
 	pkt->dseg_rsp_address[1] = MS_64BITS(ha->ioctl_mem_phys);
-	pkt->dseg_rsp_length = pext->ResponseLen;
+	pkt->dseg_rsp_length = usr_resp_len;
 
-	/* set flag to indicate IOCTL FCCT PassThru in progress */
-	ha->ioctl->FCCT_InProgress = 1;
+	/* set flag to indicate IOCTL MSIOCB cmd in progress */
+	ha->ioctl->MSIOCB_InProgress = 1;
 	ha->ioctl->ioctl_tov = pkt->timeout + 1; /* 1 second more */
 
 	/* prepare for receiving completion. */
@@ -2317,27 +3814,49 @@ qla2x00_start_ms_cmd(scsi_qla_host_t *ha
 	ha->ioctl->cmpl_timer.expires = jiffies + ha->ioctl->ioctl_tov * HZ;
 	add_timer(&ha->ioctl->cmpl_timer);
 
-	DEBUG9(printk("qla2x00_start_ms_cmd: releasing hardware_lock.\n");)
+	DEBUG9(printk("%s(%ld): inst=%ld releasing hardware_lock.\n",
+	    __func__, ha->host_no, ha->instance);)
 	spin_unlock_irqrestore(&ha->hardware_lock, cpu_flags);
 
-	DEBUG9(printk("qla2x00_start_ms_cmd: sleep for completion.\n");)
+	DEBUG9(printk("%s(%ld): inst=%ld sleep for completion.\n",
+	    __func__, ha->host_no, ha->instance);)
+
 	down(&ha->ioctl->cmpl_sem);
 
 	del_timer(&ha->ioctl->cmpl_timer);
 
-	if (ha->ioctl->FCCT_InProgress == 1) {
-	 	DEBUG9_10(printk("qla2x00_start_ms_cmd: timed out. exiting.\n");)
-		return 1;
+	if (ha->ioctl->MSIOCB_InProgress == 1) {
+	 	DEBUG9_10(printk("%s(%ld): inst=%ld timed out. exiting.\n",
+		    __func__, ha->host_no, ha->instance);)
+		return QL_STATUS_ERROR;
 	}
 
-	DEBUG9(printk("qla2x00_start_ms_cmd: done. exiting.\n");)
-	return 0;
+	DEBUG9(printk("%s(%ld): inst=%ld exiting.\n",
+	    __func__, ha->host_no, ha->instance);)
+
+	return QL_STATUS_SUCCESS;
 }
 
+/*
+ * qla2x00_wwpn_to_scsiaddr
+ *	Handles the EXT_CC_WWPN_TO_SCSIADDR command.
+ *
+ * Input:
+ *	ha = adapter state pointer.
+ *	pext = EXT_IOCTL structure pointer.
+ *	mode = not used.
+ *
+ * Returns:
+ *	0 = success
+ *	others = errno value
+ *
+ * Context:
+ *	Kernel context.
+ */
 STATIC int
 qla2x00_wwpn_to_scsiaddr(scsi_qla_host_t *ha, EXT_IOCTL *pext, int mode)
 {
-	int		rval;
+	int		ret = 0;
 	fc_port_t	*tgt_fcport;
 	os_tgt_t	*tq;
 	uint8_t		tmp_wwpn[EXT_DEF_WWN_NAME_SIZE];
@@ -2345,36 +3864,37 @@ qla2x00_wwpn_to_scsiaddr(scsi_qla_host_t
 	EXT_SCSI_ADDR	tmp_addr;
 
 
-	DEBUG9(printk("qla2x00_wwpn_to_scsiaddr(%ld): entered.\n",
-	    ha->host_no);)
+	DEBUG9(printk("%s(%ld): inst=%ld entered.\n",
+	    __func__, ha->host_no, ha->instance);)
 
 	if (pext->RequestLen != EXT_DEF_WWN_NAME_SIZE ||
 	    pext->ResponseLen < sizeof(EXT_SCSI_ADDR)) {
 		/* error */
-		DEBUG9_10(printk("qla2x00_wwpn_to_scsiaddr(%ld): invalid WWN "
-		    "buffer size %d received.\n",
-		    ha->host_no, pext->ResponseLen);)
+		DEBUG9_10(printk("%s(%ld): inst=%ld invalid WWN buffer size %d "
+		    "received.\n",
+		    __func__, ha->host_no, ha->instance, pext->ResponseLen);)
 		pext->Status = EXT_STATUS_INVALID_PARAM;
 
-		return pext->Status;
+		return (ret);
 	}
 
-	rval = verify_area(VERIFY_READ, (void *)pext->RequestAdr,
-			pext->RequestLen);
-	if (rval) {
-		DEBUG9_10(printk("qla2x00_wwpn_to_scsiaddr(%ld): ERROR "
-		    "VERIFY_READ request buf.\n", ha->host_no);)
+	ret = verify_area(VERIFY_READ, (void *)pext->RequestAdr,
+	    pext->RequestLen);
+	if (ret) {
+		DEBUG9_10(printk(
+		    "%s(%ld): inst=%ld ERROR VERIFY_READ req buf\n",
+		    __func__, ha->host_no, ha->instance);)
 		pext->Status = EXT_STATUS_COPY_ERR;
-		return pext->Status;
+		return (ret);
 	}
 
-	rval = copy_from_user(tmp_wwpn, pext->RequestAdr, pext->RequestLen);
-	if (rval) {
-		DEBUG9_10(printk("qla2x00_wwpn_to_scsiaddr(%ld): ERROR "
-		    "copy_from_user failed (%d) request buf.\n",
-		    ha->host_no, rval);)
+	ret = copy_from_user(tmp_wwpn, pext->RequestAdr, pext->RequestLen);
+	if (ret) {
+		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR copy_from_user "
+		    "failed(%d) on request buf.\n",
+		    __func__, ha->host_no, ha->instance, ret);)
 		pext->Status = EXT_STATUS_COPY_ERR;
-		return pext->Status;
+		return (ret);
 	}
 
 	tq = NULL;
@@ -2389,25 +3909,26 @@ qla2x00_wwpn_to_scsiaddr(scsi_qla_host_t
 		}
 
 		tgt_fcport = tq->vis_port;
-		if (memcmp(tmp_wwpn,
-				tgt_fcport->port_name,
-				EXT_DEF_WWN_NAME_SIZE) == 0) {
+		if (memcmp(tmp_wwpn, tgt_fcport->port_name,
+		    EXT_DEF_WWN_NAME_SIZE) == 0) {
 			break;
 		}
 	}
 
 	if (tq == NULL || tgt >= MAX_TARGETS) {
-		DEBUG9_10(printk("qla2x00_query_disc_tgt: target dev not "
-		    "found. tq=%p, tgt=%x.\n", tq, tgt);)
 		pext->Status = EXT_STATUS_DEV_NOT_FOUND;
-		return pext->Status;
+		DEBUG9_10(printk("%s(%ld): inst=%ld target dev not found. "
+		    "tq=%p, tgt=%x.\n", __func__, ha->host_no, ha->instance,
+		    tq, tgt);)
+		return (ret);
 	}
 
 	if (tq->vis_port == NULL) { 	/* dg 08/14/01 */
-		DEBUG9_10(printk("qla2x00_query_disc_tgt: target port not "
-		    "found. tq=%p, tgt=%x.\n", tq, tgt);)
 		pext->Status = EXT_STATUS_BUSY;
-		return pext->Status;
+		DEBUG9_10(printk("%s(%ld): inst=%ld target port not found. "
+		    "tq=%p, tgt=%x.\n",
+		    __func__, ha->host_no, ha->instance, tq, tgt);)
+		return (ret);
 	}	
 
 	/* Currently we only have bus 0 and no translation on LUN */
@@ -2424,33 +3945,55 @@ qla2x00_wwpn_to_scsiaddr(scsi_qla_host_t
 	if (pext->ResponseLen > sizeof(EXT_SCSI_ADDR))
 		pext->ResponseLen = sizeof(EXT_SCSI_ADDR);
 
-	rval = verify_area(VERIFY_WRITE, (void *)pext->ResponseAdr,
+	ret = verify_area(VERIFY_WRITE, (void *)pext->ResponseAdr,
 	    pext->ResponseLen);
-	if (rval) {
+	if (ret) {
 		pext->Status = EXT_STATUS_COPY_ERR;
-		DEBUG9_10(printk("qla2x00_wwpn_to_scsiaddr(%ld): ERROR "
-		    "VERIFY_WRITE response buf.\n", ha->host_no);)
-		return pext->Status;
+		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR VERIFY wrt rsp buf\n",
+		    __func__, ha->host_no, ha->instance);)
+		return (ret);
 	}
 
-	copy_to_user((uint8_t *)pext->ResponseAdr, &tmp_addr,
+	ret = copy_to_user((uint8_t *)pext->ResponseAdr, &tmp_addr,
 	    pext->ResponseLen);
+	if (ret) {
+		pext->Status = EXT_STATUS_COPY_ERR;
+		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR copy rsp buffer.\n",
+		    __func__, ha->host_no, ha->instance);)
+		return (ret);
+	}
 
 	DEBUG9(printk(KERN_INFO
-	    "qla2x00_wwpn_to_scsiaddr: Found t%d l%d for %02x%02x%02x%02x"
-	    "%02x%02x%02x%02x.\n",
+	    "%s(%ld): Found t%d l%d for %02x%02x%02x%02x%02x%02x%02x%02x.\n",
+	    __func__, ha->host_no,
 	    tmp_addr.Target, tmp_addr.Lun,
 	    tmp_wwpn[0], tmp_wwpn[1], tmp_wwpn[2], tmp_wwpn[3],
 	    tmp_wwpn[4], tmp_wwpn[5], tmp_wwpn[6], tmp_wwpn[7]);)
 
 	pext->Status = EXT_STATUS_OK;
 
-	DEBUG9(printk("qla2x00_wwpn_to_scsiaddr(%ld): exiting.\n",
-	    ha->host_no);)
+	DEBUG9(printk("%s(%ld): inst=%ld exiting.\n",
+	    __func__, ha->host_no, ha->instance);)
 
-	return pext->Status;
+	return (ret);
 }
 
+/*
+ * qla2x00_scsi_passthru
+ *	Handles all subcommands of the EXT_CC_SEND_SCSI_PASSTHRU command.
+ *
+ * Input:
+ *	ha = adapter state pointer.
+ *	pext = EXT_IOCTL structure pointer.
+ *	mode = not used.
+ *
+ * Returns:
+ *	0 = success
+ *	others = errno value
+ *
+ * Context:
+ *	Kernel context.
+ */
 STATIC int
 qla2x00_scsi_passthru(scsi_qla_host_t *ha, EXT_IOCTL *pext, int mode)
 {
@@ -2473,6 +4016,22 @@ qla2x00_scsi_passthru(scsi_qla_host_t *h
 	return tmp_rval;
 }
 
+/*
+ * qla2x00_sc_scsi_passthru
+ *	Handles EXT_SC_SEND_SCSI_PASSTHRU subcommand.
+ *
+ * Input:
+ *	ha = adapter state pointer.
+ *	pext = EXT_IOCTL structure pointer.
+ *	mode = not used.
+ *
+ * Returns:
+ *	0 = success
+ *	others = errno value
+ *
+ * Context:
+ *	Kernel context.
+ */
 STATIC int
 qla2x00_sc_scsi_passthru(scsi_qla_host_t *ha, EXT_IOCTL *pext, int mode)
 {
@@ -2486,101 +4045,135 @@ qla2x00_sc_scsi_passthru(scsi_qla_host_t
 #endif
 	uint32_t	transfer_len;
 
-	static EXT_SCSI_PASSTHRU	scsi_pass;
-	EXT_SCSI_PASSTHRU	*pscsi_pass = &scsi_pass;
+	EXT_SCSI_PASSTHRU	*pscsi_pass;
 
-	static Scsi_Cmnd	scsi_cmd;
-	Scsi_Cmnd		*pscsi_cmd = &scsi_cmd;
-	static Scsi_Device	scsi_device;
-
-	DEBUG9(printk("qla2x00_sc_scsi_passthru: entered.\n");)
-
-	/* clear scsi_cmd and scsi_device to be used */
-	memset(pscsi_cmd, 0, sizeof(Scsi_Cmnd));
-	memset(&scsi_device, 0, sizeof(Scsi_Device));
-	memset(ha->ioctl_mem, 0, ha->ioctl_mem_size);
+	Scsi_Cmnd		*pscsi_cmd;
+	Scsi_Device		*pscsi_device;
+
+	DEBUG9(printk("%s(%ld): inst=%ld entered.\n",
+	    __func__, ha->host_no, ha->instance);)
 
 	ret = verify_area(VERIFY_READ, (void *)pext->RequestAdr,
 	    sizeof(EXT_SCSI_PASSTHRU));
 	if (ret) {
 		pext->Status = EXT_STATUS_COPY_ERR;
-		DEBUG9_10(printk("qla2x00_sc_scsi_passthru: ERROR verify READ "
-		    "SCSI_PASSTHRU.\n");)
-		return ret;
+		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR verify READ "
+		    "req buf.\n",
+		    __func__, ha->host_no, ha->instance);)
+		return (ret);
 	}
 
 	if (pext->ResponseLen > ha->ioctl_mem_size) {
 		if (qla2x00_get_new_ioctl_dma_mem(ha, pext->ResponseLen) !=
 		    QL_STATUS_SUCCESS) {
-			DEBUG9_10(printk("qla2x00_sc_scsi_passthru: ERROR "
-			    "cannot alloc requested"
-			    "DMA buffer size %x.\n",
+			DEBUG9_10(printk("%s(%ld): inst=%ld ERROR cannot alloc "
+			    "requested DMA buffer size %x.\n",
+			    __func__, ha->host_no, ha->instance,
 			    pext->ResponseLen);)
 			pext->Status = EXT_STATUS_NO_MEMORY;
-			return pext->Status;
+			return (ret);
 		}
 	}
 
+	if (qla2x00_get_ioctl_scrap_mem(ha, (void **)&pscsi_pass,
+	    sizeof(EXT_SCSI_PASSTHRU))) {
+		/* not enough memory */
+		pext->Status = EXT_STATUS_NO_MEMORY;
+		DEBUG9_10(printk("%s(%ld): inst=%ld scrap not big enough. "
+		    "size requested=%d.\n",
+		    __func__, ha->host_no, ha->instance,
+		    sizeof(EXT_SCSI_PASSTHRU));)
+		return (ret);
+	}
+
+	if (qla2x00_get_ioctl_scrap_mem(ha, (void **)&pscsi_cmd,
+	    sizeof(Scsi_Cmnd))) {
+		/* not enough memory */
+		pext->Status = EXT_STATUS_NO_MEMORY;
+		DEBUG9_10(printk("%s(%ld): inst=%ld scrap not big enough. "
+		    "pscsi_cmd requested=%d.\n",
+		    __func__, ha->host_no, ha->instance,
+		    sizeof(Scsi_Cmnd));)
+		goto scsi_passthru_done;
+	}
+
+	if (qla2x00_get_ioctl_scrap_mem(ha, (void **)&pscsi_device,
+	    sizeof(Scsi_Device))) {
+		/* not enough memory */
+		pext->Status = EXT_STATUS_NO_MEMORY;
+		DEBUG9_10(printk("%s(%ld): inst=%ld scrap not big enough. "
+		    "pscsi_device requested=%d.\n",
+		    __func__, ha->host_no, ha->instance,
+		    sizeof(Scsi_Device));)
+		goto scsi_passthru_done;
+	}
+
+	/* clear ioctl_mem to be used */
+	memset(ha->ioctl_mem, 0, ha->ioctl_mem_size);
+
 	/* Copy request buffer */
 	usr_temp = (uint8_t *)pext->RequestAdr;
 	kernel_tmp = (uint8_t *)pscsi_pass;
 	ret = copy_from_user(kernel_tmp, usr_temp, sizeof(EXT_SCSI_PASSTHRU));
 	if (ret) {
 		pext->Status = EXT_STATUS_COPY_ERR;
-		DEBUG9_10(printk("qla2x00_sc_scsi_passthru: ERROR "
-				"copy_from_user() failed (%d).\n",
-				ret);)
-		return ret;
+		DEBUG9_10(printk(
+		    "%s(%ld): inst=%ld ERROR copy req buf ret=%d\n",
+		    __func__, ha->host_no, ha->instance, ret);)
+		goto scsi_passthru_done;
 	}
 
 	/* set target coordinates */
-	scsi_cmd.target = pscsi_pass->TargetAddr.Target;
-	scsi_cmd.lun    = pscsi_pass->TargetAddr.Lun;
+	pscsi_cmd->target = pscsi_pass->TargetAddr.Target;
+	pscsi_cmd->lun    = pscsi_pass->TargetAddr.Lun;
 
 	/* Verify target exists */
-	if (TGT_Q(ha, scsi_cmd.target) == NULL) {
+	if (TGT_Q(ha, pscsi_cmd->target) == NULL) {
 		pext->Status = EXT_STATUS_DEV_NOT_FOUND;
-		return pext->Status;
+		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR tgt %d not found.\n",
+		    __func__, ha->host_no, ha->instance, pscsi_cmd->target);)
+		goto scsi_passthru_done;
 	}
 
 	/* Copy over cdb */
 
 	if (pscsi_pass->CdbLength == 6) {
-		scsi_cmd.cmd_len = 6;
+		pscsi_cmd->cmd_len = 6;
 
 	} else if (pscsi_pass->CdbLength == 10) {
-		scsi_cmd.cmd_len = 0x0A;
+		pscsi_cmd->cmd_len = 0x0A;
 
 	} else if (pscsi_pass->CdbLength == 12) {
-		scsi_cmd.cmd_len = 0x0C;
+		pscsi_cmd->cmd_len = 0x0C;
 
 	} else {
 		printk(KERN_WARNING
-		    "qla2x00_sc_scsi_passthru: Unsupported Cdb Length=%x.\n",
-		pscsi_pass->CdbLength);
+		    "%s: Unsupported Cdb Length=%x.\n",
+		    __func__, pscsi_pass->CdbLength);
+
 		pext->Status = EXT_STATUS_INVALID_PARAM;
-		return pext->Status;
+		goto scsi_passthru_done;
 	}
 
-	memcpy(scsi_cmd.data_cmnd, pscsi_pass->Cdb, scsi_cmd.cmd_len);
-	memcpy(scsi_cmd.cmnd, pscsi_pass->Cdb, scsi_cmd.cmd_len);
+	memcpy(pscsi_cmd->data_cmnd, pscsi_pass->Cdb, pscsi_cmd->cmd_len);
+	memcpy(pscsi_cmd->cmnd, pscsi_pass->Cdb, pscsi_cmd->cmd_len);
 
-	DEBUG9(printk("Dump of cdb buffer:\n");)
-	DEBUG9(qla2x00_dump_buffer((uint8_t *)&scsi_cmd.data_cmnd[0],
-	    scsi_cmd.cmd_len);)
+	DEBUG9(printk("%s Dump of cdb buffer:\n", __func__);)
+	DEBUG9(qla2x00_dump_buffer((uint8_t *)&pscsi_cmd->data_cmnd[0],
+	    pscsi_cmd->cmd_len);)
 
 	pscsi_cmd->host    = ha->host;
 
 	/* mark this as a special delivery and collection command */
-	scsi_cmd.flags     = 0;
-	scsi_cmd.scsi_done = qla2x00_scsi_pt_done;
+	pscsi_cmd->flags     = 0;
+	pscsi_cmd->scsi_done = qla2x00_scsi_pt_done;
 
-	scsi_cmd.device               = &scsi_device;
-	scsi_cmd.device->tagged_queue = 0;
-	scsi_cmd.use_sg               = 0; /* no ScatterGather */
-	scsi_cmd.request_bufflen      = pext->ResponseLen;
-	scsi_cmd.request_buffer       = ha->ioctl_mem;
-	scsi_cmd.timeout_per_command  = QLA_PT_CMD_TOV * HZ;
+	pscsi_cmd->device               = pscsi_device;
+	pscsi_cmd->device->tagged_queue = 0;
+	pscsi_cmd->use_sg               = 0; /* no ScatterGather */
+	pscsi_cmd->request_bufflen      = pext->ResponseLen;
+	pscsi_cmd->request_buffer       = ha->ioctl_mem;
+	pscsi_cmd->timeout_per_command  = QLA_PT_CMD_TOV * HZ;
 	CMD_RESID_LEN(pscsi_cmd) = SRB_IOCTL; /* Used to set sp->flags later */
 
 	if (pscsi_pass->Direction == EXT_DEF_SCSI_PASSTHRU_DATA_OUT) {
@@ -2589,24 +4182,24 @@ qla2x00_sc_scsi_passthru(scsi_qla_host_t
 		    pext->ResponseLen);
 		if (ret) {
 			pext->Status = EXT_STATUS_COPY_ERR;
-			DEBUG9_10(printk("qla2x00_sc_scsi_passthru: ERROR "
-			    "verify READ SCSI_PASSTHRU.\n");)
-			return pext->Status;
+			DEBUG9_10(printk("%s(%ld): inst=%ld ERROR verify READ "
+			    "rsp buf.\n", __func__, ha->host_no, ha->instance);)
+			goto scsi_passthru_done;
 		}
 
-		scsi_cmd.sc_data_direction = SCSI_DATA_WRITE;
+		pscsi_cmd->sc_data_direction = SCSI_DATA_WRITE;
 		usr_temp   = (uint8_t *)pext->ResponseAdr;
 		kernel_tmp = (uint8_t *)ha->ioctl_mem;
 		ret = copy_from_user(kernel_tmp, usr_temp, pext->ResponseLen);
 		if (ret) {
 			pext->Status = EXT_STATUS_COPY_ERR;
-			DEBUG9_10(printk("qla2x00_sc_scsi_passthru: ERROR "
-			    "copy_from_user() failed (%d).\n",
-			    ret);)
-			return pext->Status;
+			DEBUG9_10(printk("%s(%ld): inst=%ld ERROR copy rsp buf "
+			    "failed(%d).\n",
+			    __func__, ha->host_no, ha->instance, ret);)
+			goto scsi_passthru_done;
 		}
 	} else {
-		scsi_cmd.sc_data_direction = SCSI_DATA_READ;
+		pscsi_cmd->sc_data_direction = SCSI_DATA_READ;
 	}
 
 	DEBUG9({
@@ -2614,30 +4207,32 @@ qla2x00_sc_scsi_passthru(scsi_qla_host_t
 		t = SCSI_TCN_32(pscsi_cmd);
 		l = SCSI_LUN_32(pscsi_cmd);
 	})
-	DEBUG9(printk("qla2x00_sc_scsi_passthru: CDB=%02x %02x %02x %02x; "
-	    "b=%x t=%x l=%x.\n",
-	    scsi_cmd.cmnd[0], scsi_cmd.cmnd[1], scsi_cmd.cmnd[2],
-	    scsi_cmd.cmnd[3], b, t, l);)
+	DEBUG9(printk("%s(%ld): CDB=%02x %02x %02x %02x; b=%x t=%x l=%x.\n",
+	    __func__, ha->host_no, pscsi_cmd->cmnd[0], pscsi_cmd->cmnd[1],
+	    pscsi_cmd->cmnd[2], pscsi_cmd->cmnd[3], b, t, l);)
 
 	/*
 	 * Check the status of the port
 	 */
 	if (qla2x00_check_tgt_status(ha, pscsi_cmd) != QL_STATUS_SUCCESS) {
 		pext->Status = EXT_STATUS_DEV_NOT_FOUND;
-		return pext->Status;
+		DEBUG9_10(printk("%s(%ld): inst=%ld check_tgt_status "
+		    "failed.\n",
+		    __func__, ha->host_no, ha->instance);)
+		goto scsi_passthru_done;
 	}
 
 	/* set flag to indicate IOCTL SCSI PassThru in progress */
 	ha->ioctl->SCSIPT_InProgress = 1;
-	ha->ioctl->ioctl_tov = (int)QLA_PT_CMD_TOV + 1;
+	ha->ioctl->ioctl_tov = (int)QLA_PT_CMD_DRV_TOV;
 
 	/* prepare for receiving completion. */
 	qla2x00_ioctl_sem_init(ha);
 	CMD_COMPL_STATUS(pscsi_cmd) = (int) IOCTL_INVALID_STATUS;
 
 	/* send command to adapter */
-	DEBUG9(printk("qla2x00_sc_scsi_passthru(%ld): sending command.\n",
-	    ha->host_no);)
+	DEBUG9(printk("%s(%ld): inst=%ld sending command.\n",
+	    __func__, ha->host_no, ha->instance);)
 
 	/* get spin lock for this operation */
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
@@ -2657,10 +4252,16 @@ qla2x00_sc_scsi_passthru(scsi_qla_host_t
 	spin_unlock_irqrestore(ha->host->host_lock, ha->cpu_flags);
 #endif
 
+	DEBUG9(printk("%s(%ld): inst=%ld waiting for completion.\n",
+	    __func__, ha->host_no, ha->instance);)
+
 	down(&ha->ioctl->cmpl_sem);
 
 	del_timer(&ha->ioctl->cmpl_timer);
 
+	DEBUG9(printk("%s(%ld): inst=%ld completed.\n",
+	    __func__, ha->host_no, ha->instance);)
+
 	if (ha->ioctl->SCSIPT_InProgress == 1) {
 
 		printk(KERN_WARNING
@@ -2668,17 +4269,16 @@ qla2x00_sc_scsi_passthru(scsi_qla_host_t
 		    ha->host_no);
 
 		pext->Status = EXT_STATUS_DEV_NOT_FOUND;
-		return EXT_STATUS_ERR;
+		goto scsi_passthru_done;
 	}
 
 	if (CMD_COMPL_STATUS(pscsi_cmd) == (int)IOCTL_INVALID_STATUS) {
 
-		DEBUG9(printk("qla2x00_sc_scsi_passthru(%ld): ERROR - "
-		    "command not completed.\n",
-		    ha->host_no);)
+		DEBUG9(printk("%s(%ld): inst=%ld ERROR - cmd not completed.\n",
+		    __func__, ha->host_no, ha->instance);)
 
 		pext->Status = EXT_STATUS_ERR;
-		return EXT_STATUS_ERR;
+		goto scsi_passthru_done;
 	}
 
 	switch (CMD_COMPL_STATUS(pscsi_cmd)) {
@@ -2688,12 +4288,12 @@ qla2x00_sc_scsi_passthru(scsi_qla_host_t
 	case CS_PORT_LOGGED_OUT:
 	case CS_PORT_CONFIG_CHG:
 	case CS_PORT_BUSY:
-		DEBUG10(printk("qla2x00_sc_scsi_passthru: cs err = %x.\n",
+		DEBUG9_10(printk("%s(%ld): inst=%ld cs err = %x.\n",
+		    __func__, ha->host_no, ha->instance,
 		    CMD_COMPL_STATUS(pscsi_cmd));)
-		ret = EXT_STATUS_ERR;
 		pext->Status = EXT_STATUS_BUSY;
 
-		return ret;
+		goto scsi_passthru_done;
 	}
 
 	if ((CMD_COMPL_STATUS(pscsi_cmd) == CS_DATA_UNDERRUN) ||
@@ -2701,16 +4301,18 @@ qla2x00_sc_scsi_passthru(scsi_qla_host_t
 
 		/* have done the post function */
 		pext->Status       = EXT_STATUS_SCSI_STATUS;
-		pext->DetailStatus = CMD_SCSI_STATUS(pscsi_cmd);
-		DEBUG9_10(printk("qla2x00_sc_scsi_passthru: data underrun or "
-		    "scsi err. host status =0x%x, scsi status = 0x%x.\n",
-		CMD_COMPL_STATUS(pscsi_cmd), CMD_SCSI_STATUS(pscsi_cmd));)
+		pext->DetailStatus = CMD_SCSI_STATUS(pscsi_cmd) & 0xff;
+		DEBUG9_10(printk("%s(%ld): inst=%ld data underrun or scsi err. "
+		    "host status =0x%x, scsi status = 0x%x.\n",
+		    __func__, ha->host_no, ha->instance,
+		    CMD_COMPL_STATUS(pscsi_cmd), CMD_SCSI_STATUS(pscsi_cmd));)
 
 	} else if (CMD_COMPL_STATUS(pscsi_cmd) != 0) {
-		DEBUG9_10(printk("qla2x00_sc_scsi_passthru: cs err = %x. "
-		    "copying ext stat %x\n",
-		    CMD_COMPL_STATUS(pscsi_cmd), pext->Status);)
-		return pext->Status;
+		DEBUG9_10(printk("%s(%ld): inst=%ld cs err=%x.\n",
+		    __func__, ha->host_no, ha->instance,
+		    CMD_COMPL_STATUS(pscsi_cmd));)
+		pext->Status = EXT_STATUS_ERR;
+		goto scsi_passthru_done;
 	}
 
 	/* copy up structure to make sense data available to user */
@@ -2719,33 +4321,48 @@ qla2x00_sc_scsi_passthru(scsi_qla_host_t
 		for (i = 0; i < CMD_ACTUAL_SNSLEN(pscsi_cmd); i++)
 			pscsi_pass->SenseData[i] = pscsi_cmd->sense_buffer[i];
 
+		DEBUG10(printk("%s Dump of sense buffer:\n", __func__);)
+		DEBUG10(qla2x00_dump_buffer(
+		    (uint8_t *)&pscsi_pass->SenseData[0],
+		    CMD_ACTUAL_SNSLEN(pscsi_cmd));)
+
 		ret = verify_area(VERIFY_WRITE, (void *)pext->RequestAdr,
 		    sizeof(EXT_SCSI_PASSTHRU));
 		if (ret) {
 			pext->Status = EXT_STATUS_COPY_ERR;
-			DEBUG9_10(printk("qla2x00_sc_scsi_passthru: ERROR "
-			    "verify WRITE FC_SCSI_PASSTHRU]\n");)
-			return ret;
+			DEBUG9_10(printk("%s(%ld): inst=%ld ERROR verify WRITE "
+			    "req buf.\n", __func__, ha->host_no, ha->instance);)
+			goto scsi_passthru_done;
 		}
 
-		usr_temp   = (uint8_t *)pext->RequestAdr + i;
-		kernel_tmp = (uint8_t *)pscsi_pass + i;
-		copy_to_user(usr_temp, kernel_tmp, sizeof(EXT_SCSI_PASSTHRU));
+		usr_temp   = (uint8_t *)pext->RequestAdr;
+		kernel_tmp = (uint8_t *)pscsi_pass;
+		ret = copy_to_user(usr_temp, kernel_tmp,
+		    sizeof(EXT_SCSI_PASSTHRU));
+		if (ret) {
+			pext->Status = EXT_STATUS_COPY_ERR;
+			DEBUG9_10(printk("%s(%ld): inst=%ld ERROR copy sense "
+			    "buffer.\n",
+			    __func__, ha->host_no, ha->instance);)
+			goto scsi_passthru_done;
+		}
 	}
 
 	scsi_direction = pscsi_pass->Direction;
 
 	if (scsi_direction == EXT_DEF_SCSI_PASSTHRU_DATA_IN) {
-		DEBUG9(printk("qla2x00_sc_scsi_passthru: copying data.\n");)
+		DEBUG9(printk("%s(%ld): inst=%ld copying data.\n",
+		    __func__, ha->host_no, ha->instance);)
 
 		/* getting device data and putting in pext->ResponseAdr */
 		ret = verify_area(VERIFY_WRITE, (void *)pext->ResponseAdr ,
 		    pext->ResponseLen);
 		if (ret) {
 			pext->Status = EXT_STATUS_COPY_ERR;
-			DEBUG9_10(printk("qla2x00_sc_scsi_passthru: ERROR "
-			    "verify write ResponseAdr.\n");)
-			return ret;
+			DEBUG9_10(printk("%s(%ld): inst=%ld ERROR verify write "
+			    "ResponseAdr.\n",
+			    __func__, ha->host_no, ha->instance);)
+			goto scsi_passthru_done;
 		}
 
 		/* now copy up the READ data to user */
@@ -2762,13 +4379,41 @@ qla2x00_sc_scsi_passthru(scsi_qla_host_t
 
 		usr_temp   = (uint8_t *)pext->ResponseAdr;
 		kernel_tmp = (uint8_t *)ha->ioctl_mem;
-		copy_to_user(usr_temp, kernel_tmp, transfer_len);
+		ret = copy_to_user(usr_temp, kernel_tmp, transfer_len);
+		if (ret) {
+			pext->Status = EXT_STATUS_COPY_ERR;
+			DEBUG9_10(printk(
+			    "%s(%ld): inst=%ld ERROR copy rsp buf\n",
+			    __func__, ha->host_no, ha->instance);)
+			goto scsi_passthru_done;
+		}
 	}
 
-	DEBUG9(printk("qla2x00_sc_scsi_passthru: exiting.\n");)
-	return ret;
+	DEBUG9(printk("%s(%ld): inst=%ld exiting.\n",
+	    __func__, ha->host_no, ha->instance);)
+
+scsi_passthru_done:
+
+	qla2x00_free_ioctl_scrap_mem(ha);
+	return (ret);
 }
 
+/*
+ * qla2x00_sc_fc_scsi_passthru
+ *	Handles EXT_SC_SEND_FC_SCSI_PASSTHRU subcommand.
+ *
+ * Input:
+ *	ha = adapter state pointer.
+ *	pext = EXT_IOCTL structure pointer.
+ *	mode = not used.
+ *
+ * Returns:
+ *	0 = success
+ *	others = errno value
+ *
+ * Context:
+ *	Kernel context.
+ */
 STATIC int
 qla2x00_sc_fc_scsi_passthru(scsi_qla_host_t *ha, EXT_IOCTL *pext, int mode)
 {
@@ -2788,53 +4433,85 @@ qla2x00_sc_fc_scsi_passthru(scsi_qla_hos
 	uint32_t		transfer_len;
 	uint8_t			scsi_direction;
 
-	static EXT_FC_SCSI_PASSTHRU	fc_scsi_pass;
-	EXT_FC_SCSI_PASSTHRU	*pfc_scsi_pass = &fc_scsi_pass;
+	EXT_FC_SCSI_PASSTHRU	*pfc_scsi_pass;
 
-	static Scsi_Cmnd	fc_scsi_cmd;
-	Scsi_Cmnd		*pfc_scsi_cmd = &fc_scsi_cmd;
-	static Scsi_Device	fc_scsi_device;
+	Scsi_Cmnd		*pfc_scsi_cmd;
+	Scsi_Device		*pfc_scsi_device;
 
-	DEBUG9(printk("qla2x00_fc_scsi_passthru: entered.\n");)
+	DEBUG9(printk("%s(%ld): inst=%ld entered.\n",
+	    __func__, ha->host_no, ha->instance);)
 
 	if ((sp = qla2x00_get_new_sp(ha)) == NULL) {
 
-		DEBUG9_10(printk("qla2x00_fc_scsi_passthru: ERROR "
-		    "cannot alloc sp %p.\n", sp);)
+		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR cannot alloc sp.\n",
+		    __func__, ha->host_no, ha->instance);)
+
+		pext->Status = EXT_STATUS_NO_MEMORY;
+		return (ret);
+	}
+
+	if (qla2x00_get_ioctl_scrap_mem(ha, (void **)&pfc_scsi_pass,
+	    sizeof(EXT_FC_SCSI_PASSTHRU))) {
+		/* not enough memory */
+		pext->Status = EXT_STATUS_NO_MEMORY;
+		DEBUG9_10(printk("%s(%ld): inst=%ld scrap not big enough. "
+		    "size requested=%d.\n",
+		    __func__, ha->host_no, ha->instance,
+		    sizeof(EXT_FC_SCSI_PASSTHRU));)
+		return (ret);
+	}
+
+	if (qla2x00_get_ioctl_scrap_mem(ha, (void **)&pfc_scsi_cmd,
+	    sizeof(Scsi_Cmnd))) {
+		/* not enough memory */
+		pext->Status = EXT_STATUS_NO_MEMORY;
+		DEBUG9_10(printk("%s(%ld): inst=%ld scrap not big enough. "
+		    "size requested=%d.\n",
+		    __func__, ha->host_no, ha->instance,
+		    sizeof(Scsi_Cmnd));)
+		goto fc_scsi_passthru_done;
+	}
 
+	if (qla2x00_get_ioctl_scrap_mem(ha, (void **)&pfc_scsi_device,
+	    sizeof(Scsi_Device))) {
+		/* not enough memory */
 		pext->Status = EXT_STATUS_NO_MEMORY;
-		return pext->Status;
+		DEBUG9_10(printk("%s(%ld): inst=%ld scrap not big enough. "
+		    "size requested=%d.\n",
+		    __func__, ha->host_no, ha->instance,
+		    sizeof(Scsi_Device));)
+		goto fc_scsi_passthru_done;
 	}
 
-	/* clear ioctl_sp and fc_scsi_cmd and fc_scsi_device to be used */
-	memset(pfc_scsi_cmd, 0, sizeof(Scsi_Cmnd));
-	memset(&fc_scsi_device, 0, sizeof(Scsi_Device));
+	/* clear ioctl_mem to be used */
 	memset(ha->ioctl_mem, 0, ha->ioctl_mem_size);
 
 	ret = verify_area(VERIFY_READ, (void *)pext->RequestAdr,
 	    sizeof(EXT_FC_SCSI_PASSTHRU));
 	if (ret) {
 		pext->Status = EXT_STATUS_COPY_ERR;
-		DEBUG9_10(printk("qla2x00_fc_scsi_passthru: ERROR verify READ "
-		    "SCSI_FC_PASSTHRU.\n");)
+		DEBUG9_10(printk(
+		    "%s(%ld): inst=%ld ERROR verify READ req buf.\n",
+		    __func__, ha->host_no, ha->instance);)
 		atomic_set(&sp->ref_count, 0);
 		add_to_free_queue (ha, sp);
 
-		return ret;
+		goto fc_scsi_passthru_done;
 	}
 
 	if (pext->ResponseLen > ha->ioctl_mem_size) {
 		if (qla2x00_get_new_ioctl_dma_mem(ha, pext->ResponseLen) !=
 		    QL_STATUS_SUCCESS) {
 
-			DEBUG9_10(printk("qla2x00_fc_scsi_passthru: ERROR "
-			    "cannot alloc requested DMA buffer size %x.\n",
+			DEBUG9_10(printk("%s(%ld): inst=%ld ERROR cannot alloc "
+			    "requested DMA buffer size %x.\n",
+			    __func__, ha->host_no, ha->instance,
 			    pext->ResponseLen);)
 
 			pext->Status = EXT_STATUS_NO_MEMORY;
 			atomic_set(&sp->ref_count, 0);
 			add_to_free_queue (ha, sp);
-			return pext->Status;
+			goto fc_scsi_passthru_done;
 		}
 	}
 
@@ -2842,26 +4519,26 @@ qla2x00_sc_fc_scsi_passthru(scsi_qla_hos
 	usr_temp   = (uint8_t *)pext->RequestAdr;
 	kernel_tmp = (uint8_t *)pfc_scsi_pass;
 	ret = copy_from_user(kernel_tmp, usr_temp,
-			sizeof(EXT_FC_SCSI_PASSTHRU));
+	    sizeof(EXT_FC_SCSI_PASSTHRU));
 	if (ret) {
 		pext->Status = EXT_STATUS_COPY_ERR;
-		DEBUG9_10(printk("qla2x00_fc_scsi_passthru: ERROR "
-		    "copy_from_user() failed (%d).\n",
-		    ret);)
+		DEBUG9_10(printk(
+		    "%s(%ld): inst=%ld ERROR copy req buf ret=%d\n",
+		    __func__, ha->host_no, ha->instance, ret);)
 		atomic_set(&sp->ref_count, 0);
 		add_to_free_queue (ha, sp);
 
-		return ret;
+		goto fc_scsi_passthru_done;
 	}
 
-	if (fc_scsi_pass.FCScsiAddr.DestType != EXT_DEF_DESTTYPE_WWPN) {
+	if (pfc_scsi_pass->FCScsiAddr.DestType != EXT_DEF_DESTTYPE_WWPN) {
 		pext->Status = EXT_STATUS_DEV_NOT_FOUND;
-		DEBUG9_10(printk("qla2x00_fc_scsi_passthru: ERROR - "
-					"wrong Dest type. \n");)
+		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR -wrong Dest type. \n",
+		    __func__, ha->host_no, ha->instance);)
 		ret = EXT_STATUS_ERR;
 		atomic_set(&sp->ref_count, 0);
 		add_to_free_queue (ha, sp);
-		return ret;
+		goto fc_scsi_passthru_done;
 	}
 
 	fclun = NULL;
@@ -2873,7 +4550,7 @@ qla2x00_sc_fc_scsi_passthru(scsi_qla_hos
 		}
 
 		for (fclun = fcport->fclun; fclun; fclun = fclun->next) {
-			if (fclun->lun == fc_scsi_pass.FCScsiAddr.Lun) {
+			if (fclun->lun == pfc_scsi_pass->FCScsiAddr.Lun) {
 				/* Found the right LUN */
 				break;
 			}
@@ -2883,29 +4560,31 @@ qla2x00_sc_fc_scsi_passthru(scsi_qla_hos
 
 	if (fcport == NULL) {
 		pext->Status = EXT_STATUS_DEV_NOT_FOUND;
-		DEBUG9_10(printk("qla2x00_fc_scsi_passthru: FC AddrFormat - "
-		    "DID NOT FIND Port for WWPN.\n");)
+		DEBUG9_10(printk("%s(%ld): inst=%ld FC AddrFormat - DID NOT "
+		    "FIND Port matching WWPN.\n",
+		    __func__, ha->host_no, ha->instance);)
 		atomic_set(&sp->ref_count, 0);
 		add_to_free_queue (ha, sp);
-		return pext->Status;
+		goto fc_scsi_passthru_done;
 	}
 
 	/* v5.21b9 - use a temporary fclun */
 	if (fclun == NULL) {
 		fclun = &temp_fclun;
 		fclun->fcport = fcport;
-		fclun->lun = fc_scsi_pass.FCScsiAddr.Lun;
+		fclun->lun = pfc_scsi_pass->FCScsiAddr.Lun;
 		fclun->flags = 0;
 		fclun->next = NULL;
 	}
 
 	/* set target coordinates */
-	fc_scsi_cmd.target = 0xff; /* not used. just put something there. */
-	fc_scsi_cmd.lun    = fc_scsi_pass.FCScsiAddr.Lun;
+	pfc_scsi_cmd->target = 0xff; /* not used. just put something there. */
+	pfc_scsi_cmd->lun    = pfc_scsi_pass->FCScsiAddr.Lun;
 
-	DEBUG9(printk("qla2x00_fc_scsi_passthru: cmd for loopid=%04x L=%04x "
+	DEBUG9(printk("%s(%ld): inst=%ld cmd for loopid=%04x L=%04x "
 	    "WWPN=%02x%02x%02x%02x%02x%02x%02x%02x.\n",
-	    fclun->fcport->loop_id, fc_scsi_cmd.lun,
+	    __func__, ha->host_no, ha->instance, fclun->fcport->loop_id,
+	    pfc_scsi_cmd->lun,
 	    pfc_scsi_pass->FCScsiAddr.DestAddr.WWPN[0],
 	    pfc_scsi_pass->FCScsiAddr.DestAddr.WWPN[1],
 	    pfc_scsi_pass->FCScsiAddr.DestAddr.WWPN[2],
@@ -2917,24 +4596,24 @@ qla2x00_sc_fc_scsi_passthru(scsi_qla_hos
 
 	if (pfc_scsi_pass->CdbLength == 6) {
 		sp->cmd_length = 6;
-		fc_scsi_cmd.cmd_len = 6;
+		pfc_scsi_cmd->cmd_len = 6;
 
 	} else if (pfc_scsi_pass->CdbLength == 0x0A) {
 		sp->cmd_length = 0x0A;
-		fc_scsi_cmd.cmd_len = 0x0A;
+		pfc_scsi_cmd->cmd_len = 0x0A;
 
 	} else if (pfc_scsi_pass->CdbLength == 0x0C) {
 		sp->cmd_length = 0x0C;
-		fc_scsi_cmd.cmd_len = 0x0C;
+		pfc_scsi_cmd->cmd_len = 0x0C;
 
 	} else if (pfc_scsi_pass->CdbLength == 0x10) {
 		sp->cmd_length = 0x10;
-		fc_scsi_cmd.cmd_len = 0x10;
+		pfc_scsi_cmd->cmd_len = 0x10;
 
 		/* Does the kernel support 16byte CDBs? */
 		if (sp->cmd_length > MAX_COMMAND_SIZE) {
 			/* No, use workaround method */
-			fc_scsi_cmd.cmd_len = 0x0C;
+			pfc_scsi_cmd->cmd_len = 0x0C;
 
 			sp->more_cdb[0] = pfc_scsi_pass->Cdb[12];
 			sp->more_cdb[1] = pfc_scsi_pass->Cdb[13];
@@ -2949,14 +4628,16 @@ qla2x00_sc_fc_scsi_passthru(scsi_qla_hos
 		atomic_set(&sp->ref_count, 0);
 		add_to_free_queue (ha, sp);
 
-		return pext->Status;
+		goto fc_scsi_passthru_done;
 	}
 
-	memcpy(fc_scsi_cmd.data_cmnd, pfc_scsi_pass->Cdb, fc_scsi_cmd.cmd_len);
-	memcpy(fc_scsi_cmd.cmnd, pfc_scsi_pass->Cdb, fc_scsi_cmd.cmd_len);
+	memcpy(pfc_scsi_cmd->data_cmnd, pfc_scsi_pass->Cdb,
+	    pfc_scsi_cmd->cmd_len);
+	memcpy(pfc_scsi_cmd->cmnd, pfc_scsi_pass->Cdb,
+	    pfc_scsi_cmd->cmd_len);
 
-	DEBUG9(printk("Dump of cdb buffer:\n");)
-	DEBUG9(qla2x00_dump_buffer((uint8_t *)&fc_scsi_cmd.data_cmnd[0], 16);)
+	DEBUG9(printk("%s Dump of cdb buffer:\n", __func__);)
+	DEBUG9(qla2x00_dump_buffer((uint8_t *)&pfc_scsi_cmd->data_cmnd[0], 16);)
 
 	pfc_scsi_cmd->host    = ha->host;
 	sp->ha                = ha;
@@ -2967,46 +4648,47 @@ qla2x00_sc_fc_scsi_passthru(scsi_qla_hos
 	CMD_SP(pfc_scsi_cmd)  = (void *) sp;
 
 	/* mark this as a special delivery and collection command */
-	fc_scsi_cmd.flags     = 0;
-	fc_scsi_cmd.scsi_done = qla2x00_scsi_pt_done;
+	pfc_scsi_cmd->flags     = 0;
+	pfc_scsi_cmd->scsi_done = qla2x00_scsi_pt_done;
 
-	fc_scsi_cmd.device               = &fc_scsi_device;
-	fc_scsi_cmd.device->tagged_queue = 0;
-	fc_scsi_cmd.use_sg               = 0; /* no ScatterGather */
-	fc_scsi_cmd.request_bufflen      = pext->ResponseLen;
-	fc_scsi_cmd.request_buffer       = ha->ioctl_mem;
-	fc_scsi_cmd.timeout_per_command  = QLA_PT_CMD_TOV * HZ;
+	pfc_scsi_cmd->device               = pfc_scsi_device;
+	pfc_scsi_cmd->device->tagged_queue = 0;
+	pfc_scsi_cmd->use_sg               = 0; /* no ScatterGather */
+	pfc_scsi_cmd->request_bufflen      = pext->ResponseLen;
+	pfc_scsi_cmd->request_buffer       = ha->ioctl_mem;
+	pfc_scsi_cmd->timeout_per_command  = QLA_PT_CMD_TOV * HZ;
 
 	if (pfc_scsi_pass->Direction == EXT_DEF_SCSI_PASSTHRU_DATA_OUT) {
 		/* sending user data from pext->ResponseAdr to device */
 		ret = verify_area(VERIFY_READ, (void *)pext->ResponseAdr,
-				pext->ResponseLen);
+		    pext->ResponseLen);
 		if (ret) {
 			pext->Status = EXT_STATUS_COPY_ERR;
-			DEBUG9_10(printk("qla2x00_fc_scsi_passthru: ERROR "
-			    "verify read ResponseAdr.\n");)
+			DEBUG9_10(printk("%s(%ld): inst=%ld ERROR verify read "
+			    "ResponseAdr.\n",
+			    __func__, ha->host_no, ha->instance);)
 			atomic_set(&sp->ref_count, 0);
 			add_to_free_queue (ha, sp);
 
-			return pext->Status;
+			goto fc_scsi_passthru_done;
 		}
 
-		fc_scsi_cmd.sc_data_direction = SCSI_DATA_WRITE;
+		pfc_scsi_cmd->sc_data_direction = SCSI_DATA_WRITE;
 		usr_temp   = (uint8_t *)pext->ResponseAdr;
 		kernel_tmp = (uint8_t *)ha->ioctl_mem;
 		ret = copy_from_user(kernel_tmp, usr_temp, pext->ResponseLen);
 		if (ret) {
 			pext->Status = EXT_STATUS_COPY_ERR;
-			DEBUG9_10(printk("qla2x00_fc_scsi_passthru: ERROR "
-			    "copy_from_user() failed (%d).\n",
-			    ret);)
+			DEBUG9_10(printk("%s(%ld): inst=%ld ERROR copy "
+			    "failed(%d) on rsp buf.\n",
+			    __func__, ha->host_no, ha->instance, ret);)
 			atomic_set(&sp->ref_count, 0);
 			add_to_free_queue (ha, sp);
 
-			return pext->Status;
+			goto fc_scsi_passthru_done;
 		}
 	} else {
-		fc_scsi_cmd.sc_data_direction = SCSI_DATA_READ;
+		pfc_scsi_cmd->sc_data_direction = SCSI_DATA_READ;
 	}
 
 	tq = ha->ioctl->ioctl_tq;
@@ -3029,13 +4711,12 @@ qla2x00_sc_fc_scsi_passthru(scsi_qla_hos
 		t = SCSI_TCN_32(pfc_scsi_cmd);
 		l = SCSI_LUN_32(pfc_scsi_cmd);
 	})
-	DEBUG9(printk("qla2x00_sc_scsi_passthru: ha instance=%ld tq=%p lq=%p "
+	DEBUG9(printk("%s(%ld): ha instance=%ld tq=%p lq=%p "
 	    "fclun=%p.\n",
-	    ha->instance, tq, lq, fclun);)
-	DEBUG9(printk("qla2x00_sc_scsi_passthru: CDB=%02x %02x %02x %02x; "
-	    "b=%x t=%x l=%x.\n",
-	    fc_scsi_cmd.cmnd[0], fc_scsi_cmd.cmnd[1], fc_scsi_cmd.cmnd[2],
-	    fc_scsi_cmd.cmnd[3], b, t, l);)
+	    __func__, ha->host_no, ha->instance, tq, lq, fclun);)
+	DEBUG9(printk("\tCDB=%02x %02x %02x %02x; b=%x t=%x l=%x.\n",
+	    pfc_scsi_cmd->cmnd[0], pfc_scsi_cmd->cmnd[1], pfc_scsi_cmd->cmnd[2],
+	    pfc_scsi_cmd->cmnd[3], b, t, l);)
 
 	/*
 	 * Check the status of the port
@@ -3044,20 +4725,20 @@ qla2x00_sc_fc_scsi_passthru(scsi_qla_hos
 		pext->Status = EXT_STATUS_DEV_NOT_FOUND;
 		atomic_set(&sp->ref_count, 0);
 		add_to_free_queue (ha, sp);
-		return pext->Status;
+		goto fc_scsi_passthru_done;
 	}
 
 	/* set flag to indicate IOCTL SCSI PassThru in progress */
 	ha->ioctl->SCSIPT_InProgress = 1;
-	ha->ioctl->ioctl_tov = (int)QLA_PT_CMD_TOV + 1;
+	ha->ioctl->ioctl_tov = (int)QLA_PT_CMD_DRV_TOV;
 
 	/* prepare for receiving completion. */
 	qla2x00_ioctl_sem_init(ha);
 	CMD_COMPL_STATUS(pfc_scsi_cmd) = (int) IOCTL_INVALID_STATUS;
 
 	/* send command to adapter */
-	DEBUG9(printk("qla2x00_fc_scsi_passthru(%ld): sending command.\n",
-	    ha->host_no);)
+	DEBUG9(printk("%s(%ld): inst=%ld sending command.\n",
+	    __func__, ha->host_no, ha->instance);)
 
 	add_to_pending_queue(ha, sp);
 
@@ -3079,18 +4760,18 @@ qla2x00_sc_fc_scsi_passthru(scsi_qla_hos
 		pext->Status = EXT_STATUS_DEV_NOT_FOUND;
 		atomic_set(&sp->ref_count, 0);
 		add_to_free_queue (ha, sp);
-		return EXT_STATUS_ERR;
+		goto fc_scsi_passthru_done;
 	}
 
 	if (CMD_COMPL_STATUS(pfc_scsi_cmd) == (int)IOCTL_INVALID_STATUS) {
 
-		DEBUG9(printk("qla2x00_fc_scsi_passthru(%ld): ERROR. "
-		    "command not completed.\n", ha->host_no);)
+		DEBUG9(printk("%s(%ld): inst=%ld ERROR. cmd not completed.\n",
+		    __func__, ha->host_no, ha->instance);)
 
 		pext->Status = EXT_STATUS_ERR;
 		atomic_set(&sp->ref_count, 0);
 		add_to_free_queue (ha, sp);
-		return EXT_STATUS_ERR;
+		goto fc_scsi_passthru_done;
 	}
 
 	switch (CMD_COMPL_STATUS(pfc_scsi_cmd)) {
@@ -3100,9 +4781,9 @@ qla2x00_sc_fc_scsi_passthru(scsi_qla_hos
 	case CS_PORT_LOGGED_OUT:
 	case CS_PORT_CONFIG_CHG:
 	case CS_PORT_BUSY:
-		DEBUG10(printk("qla2x00_fc_scsi_passthru: cs err = %x.\n",
+		DEBUG10(printk("%s(%ld): inst=%ld cs err = %x.\n",
+		    __func__, ha->host_no, ha->instance,
 		    CMD_COMPL_STATUS(pfc_scsi_cmd));)
-			ret = EXT_STATUS_ERR;
 		pext->Status = EXT_STATUS_BUSY;
 		break;
 	}
@@ -3115,29 +4796,32 @@ qla2x00_sc_fc_scsi_passthru(scsi_qla_hos
 		/* The SDMAPI is only concerned with the low-order byte */
 		pext->DetailStatus = CMD_SCSI_STATUS(pfc_scsi_cmd) & 0xff;
 
-		DEBUG9_10(printk("qla2x00_fc_scsi_passthru: data underrun or "
-		    "scsi err. host status =0x%x, scsi status = 0x%x.\n",
+		DEBUG9_10(printk("%s(%ld): inst=%ld data underrun or scsi err. "
+		    "host status =0x%x, scsi status = 0x%x.\n",
+		    __func__, ha->host_no, ha->instance,
 		    CMD_COMPL_STATUS(pfc_scsi_cmd),
 		    CMD_SCSI_STATUS(pfc_scsi_cmd));)
 
 	} else if (CMD_COMPL_STATUS(pfc_scsi_cmd) != 0) {
-		DEBUG9_10(printk("qla2x00_fc_scsi_passthru: cs err = %x. "
-		    "copying ext stat %x\n",
-		    CMD_COMPL_STATUS(pfc_scsi_cmd), pext->Status);)
+		DEBUG9_10(printk("%s(%ld): inst=%ld cs err=%x.\n",
+		    __func__, ha->host_no, ha->instance,
+		    CMD_COMPL_STATUS(pfc_scsi_cmd));)
+		pext->Status = EXT_STATUS_ERR;
 
-		return pext->Status;
+		goto fc_scsi_passthru_done;
 	}
 
 	/* Process completed command */
-	DEBUG9(printk("qla2x00_fc_scsi_passthru: complete. host status =0x%x, "
-	    "scsi status = 0x%x.\n",
-	    CMD_COMPL_STATUS(pfc_scsi_cmd), CMD_SCSI_STATUS(pfc_scsi_cmd));)
+	DEBUG9(printk("%s(%ld): inst=%ld done. host status=0x%x, "
+	    "scsi status=0x%x.\n",
+	    __func__, ha->host_no, ha->instance, CMD_COMPL_STATUS(pfc_scsi_cmd),
+	    CMD_SCSI_STATUS(pfc_scsi_cmd));)
 
 	/* copy up structure to make sense data available to user */
 	pfc_scsi_pass->SenseLength = CMD_ACTUAL_SNSLEN(pfc_scsi_cmd);
 	if (CMD_ACTUAL_SNSLEN(pfc_scsi_cmd)) {
-		DEBUG9_10(printk("qla2x00_fc_scsi_passthru: sense[0]=%x "
-		    "sense[2]=%x.\n",
+		DEBUG9_10(printk("%s(%ld): inst=%ld sense[0]=%x sense[2]=%x.\n",
+		    __func__, ha->host_no, ha->instance,
 		    pfc_scsi_cmd->sense_buffer[0],
 		    pfc_scsi_cmd->sense_buffer[2]);)
 
@@ -3150,21 +4834,31 @@ qla2x00_sc_fc_scsi_passthru(scsi_qla_hos
 		    sizeof(EXT_FC_SCSI_PASSTHRU));
 		if (ret) {
 			pext->Status = EXT_STATUS_COPY_ERR;
-			DEBUG9_10(printk("qla2x00_fc_scsi_passthru: ERROR "
-			    "verify WRITE RequestAdr.\n");)
-			return ret;
+			DEBUG9_10(printk("%s(%ld): inst=%ld ERROR verify WRITE "
+			    "RequestAdr.\n",
+			    __func__, ha->host_no, ha->instance);)
+			goto fc_scsi_passthru_done;
 		}
 
 		usr_temp = (uint8_t *)pext->RequestAdr;
 		kernel_tmp = (uint8_t *)pfc_scsi_pass;
-		copy_to_user(usr_temp, kernel_tmp, sizeof(EXT_FC_SCSI_PASSTHRU));
+		ret = copy_to_user(usr_temp, kernel_tmp,
+		    sizeof(EXT_FC_SCSI_PASSTHRU));
+		if (ret) {
+			pext->Status = EXT_STATUS_COPY_ERR;
+			DEBUG9_10(printk("%s(%ld): inst=%ld ERROR copy sense "
+			    "buffer.\n",
+			    __func__, ha->host_no, ha->instance);)
+			goto fc_scsi_passthru_done;
+		}
 	}
 
 	scsi_direction = pfc_scsi_pass->Direction;
 
 	if (scsi_direction == EXT_DEF_SCSI_PASSTHRU_DATA_IN) {
 
-		DEBUG9(printk("qla2x00_fc_scsi_passthru: copying data.\n");)
+		DEBUG9(printk("%s(%ld): inst=%ld copying data.\n",
+		    __func__, ha->host_no, ha->instance);)
 
 		/* getting device data and putting in pext->ResponseAdr */
 		ret = verify_area(VERIFY_WRITE, (void *)pext->ResponseAdr,
@@ -3172,10 +4866,11 @@ qla2x00_sc_fc_scsi_passthru(scsi_qla_hos
 		if (ret) {
 			pext->Status = EXT_STATUS_COPY_ERR;
 
-			DEBUG9_10(printk("qla2x00_fc_scsi_passthru: ERROR "
-			    "verify write ResponseAdr.\n");)
+			DEBUG9_10(printk("%s(%ld): inst=%ld ERROR verify write "
+			    "ResponseAdr.\n",
+			    __func__, ha->host_no, ha->instance);)
 
-			return ret;
+			goto fc_scsi_passthru_done;
 		}
 
 		/* now copy up the READ data to user */
@@ -3192,12 +4887,41 @@ qla2x00_sc_fc_scsi_passthru(scsi_qla_hos
 
 		usr_temp = (uint8_t *)pext->ResponseAdr;
 		kernel_tmp = (uint8_t *)ha->ioctl_mem;
-		copy_to_user(usr_temp, kernel_tmp, transfer_len);
+		ret = copy_to_user(usr_temp, kernel_tmp, transfer_len);
+		if (ret) {
+			pext->Status = EXT_STATUS_COPY_ERR;
+			DEBUG9_10(printk(
+			    "%s(%ld): inst=%ld ERROR copy rsp buf\n",
+			    __func__, ha->host_no, ha->instance);)
+			goto fc_scsi_passthru_done;
+		}
 	}
 
-	return ret;
+	DEBUG9(printk("%s(%ld): inst=%ld exiting.\n",
+	    __func__, ha->host_no, ha->instance);)
+
+fc_scsi_passthru_done:
+
+	qla2x00_free_ioctl_scrap_mem(ha);
+	return (ret);
 }
 
+/*
+ * qla2x00_sc_scsi3_passthru
+ *	Handles EXT_SC_SCSI3_PASSTHRU subcommand.
+ *
+ * Input:
+ *	ha = adapter state pointer.
+ *	pext = EXT_IOCTL structure pointer.
+ *	mode = not used.
+ *
+ * Returns:
+ *	0 = success
+ *	others = errno value
+ *
+ * Context:
+ *	Kernel context.
+ */
 STATIC int
 qla2x00_sc_scsi3_passthru(scsi_qla_host_t *ha, EXT_IOCTL *pext, int mode)
 {
@@ -3215,165 +4939,198 @@ qla2x00_sc_scsi3_passthru(scsi_qla_host_
 	uint32_t		i, b, t;
 	uint32_t		scsi_direction;
 
-	static EXT_FC_SCSI_PASSTHRU	fc_scsi_pass;
-	EXT_FC_SCSI_PASSTHRU	*pfc_scsi_pass = &fc_scsi_pass;
+	EXT_FC_SCSI_PASSTHRU	*pfc_scsi3_pass;
 
-	static Scsi_Cmnd	scsi3_cmd;
-	Scsi_Cmnd		*pscsi3_cmd = &scsi3_cmd;
-	static Scsi_Device	scsi3_device;
+	Scsi_Cmnd		*pscsi3_cmd;
+	Scsi_Device		*pscsi3_device;
 
 
-	DEBUG9(printk("qla2x00_scsi3_passthru: entered.\n");)
+	DEBUG9(printk("%s(%ld): inst=%ld entered.\n",
+	    __func__, ha->host_no, ha->instance);)
 
 	if ((sp = qla2x00_get_new_sp(ha)) == NULL) {
 
-		DEBUG9_10(printk("qla2x00_scsi3_passthru: ERROR "
-		    "cannot alloc sp %p.\n", sp);)
+		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR cannot alloc sp.\n",
+		    __func__, ha->host_no, ha->instance);)
+
+		pext->Status = EXT_STATUS_NO_MEMORY;
+		return (ret);
+	}
+
+	if (qla2x00_get_ioctl_scrap_mem(ha, (void **)&pfc_scsi3_pass,
+	    sizeof(EXT_FC_SCSI_PASSTHRU))) {
+		/* not enough memory */
+		pext->Status = EXT_STATUS_NO_MEMORY;
+		DEBUG9_10(printk("%s(%ld): inst=%ld scrap not big enough. "
+		    "size requested=%d.\n",
+		    __func__, ha->host_no, ha->instance,
+		    sizeof(EXT_FC_SCSI_PASSTHRU));)
+		return (ret);
+	}
+
+	if (qla2x00_get_ioctl_scrap_mem(ha, (void **)&pscsi3_cmd,
+	    sizeof(Scsi_Cmnd))) {
+		/* not enough memory */
+		pext->Status = EXT_STATUS_NO_MEMORY;
+		DEBUG9_10(printk("%s(%ld): inst=%ld scrap not big enough. "
+		    "size requested=%d.\n",
+		    __func__, ha->host_no, ha->instance,
+		    sizeof(Scsi_Cmnd));)
+		goto scsi3_passthru_done;
+	}
 
+	if (qla2x00_get_ioctl_scrap_mem(ha, (void **)&pscsi3_device,
+	    sizeof(Scsi_Device))) {
+		/* not enough memory */
 		pext->Status = EXT_STATUS_NO_MEMORY;
-		return pext->Status;
+		DEBUG9_10(printk("%s(%ld): inst=%ld scrap not big enough. "
+		    "size requested=%d.\n",
+		    __func__, ha->host_no, ha->instance,
+		    sizeof(Scsi_Device));)
+		goto scsi3_passthru_done;
 	}
 
-	/* clear ioctl_sp and scsi3_cmd and scsi3_device to be used */
-	memset(pscsi3_cmd, 0, sizeof(Scsi_Cmnd));
-	memset(&scsi3_device, 0, sizeof(Scsi_Device));
+	/* clear ioctl_mem to be used */
 	memset(ha->ioctl_mem, 0, ha->ioctl_mem_size);
 
 	ret = verify_area(VERIFY_READ, (void *)pext->RequestAdr,
 	    sizeof(EXT_FC_SCSI_PASSTHRU));
 	if (ret) {
 		pext->Status = EXT_STATUS_COPY_ERR;
-		DEBUG9_10(printk("qla2x00_scsi3_passthru: ERROR verify READ "
-		    "SCSI_FC_PASSTHRU.\n");)
+		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR verify READ "
+		    "req buf.\n", __func__, ha->host_no, ha->instance);)
 		atomic_set(&sp->ref_count, 0);
 		add_to_free_queue (ha, sp);
-		return ret;
+		goto scsi3_passthru_done;
 	}
 
 	if (pext->ResponseLen > ha->ioctl_mem_size) {
 		if (qla2x00_get_new_ioctl_dma_mem(ha, pext->ResponseLen) !=
 		    QL_STATUS_SUCCESS) {
 
-			DEBUG9_10(printk("qla2x00_scsi3_passthru: ERROR cannot "
+			DEBUG9_10(printk("%s(%ld): inst=%ld ERROR cannot "
 			    "alloc requested DMA buffer size=%x.\n",
+			    __func__, ha->host_no, ha->instance,
 			    pext->ResponseLen);)
 
 			pext->Status = EXT_STATUS_NO_MEMORY;
 			atomic_set(&sp->ref_count, 0);
 			add_to_free_queue (ha, sp);
-			return pext->Status;
+			goto scsi3_passthru_done;
 		}
 	}
 
 	/* Copy request buffer */
 	usr_temp   = (uint8_t *)pext->RequestAdr;
-	kernel_tmp = (uint8_t *)pfc_scsi_pass;
+	kernel_tmp = (uint8_t *)pfc_scsi3_pass;
 	ret = copy_from_user(kernel_tmp, usr_temp,
-			sizeof(EXT_FC_SCSI_PASSTHRU));
+	    sizeof(EXT_FC_SCSI_PASSTHRU));
 	if (ret) {
 		pext->Status = EXT_STATUS_COPY_ERR;
-		DEBUG9_10(printk("qla2x00_scsi3_passthru: ERROR "
-		    "copy_from_user() failed (%d).\n",
-		    ret);)
+		DEBUG9_10(printk(
+		    "%s(%ld): inst=%ld ERROR copy req buf ret=%d\n",
+		    __func__, ha->host_no, ha->instance, ret);)
 		atomic_set(&sp->ref_count, 0);
 		add_to_free_queue (ha, sp);
-		return ret;
+		goto scsi3_passthru_done;
 	}
 
-	if (pfc_scsi_pass->FCScsiAddr.DestType != EXT_DEF_DESTTYPE_WWPN) {
+	if (pfc_scsi3_pass->FCScsiAddr.DestType != EXT_DEF_DESTTYPE_WWPN) {
 		pext->Status = EXT_STATUS_DEV_NOT_FOUND;
-		DEBUG9_10(printk("qla2x00_scsi3_passthru: ERROR - "
-		    "wrong Dest type. \n");)
+		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR - wrong Dest type.\n",
+		    __func__, ha->host_no, ha->instance);)
 		ret = EXT_STATUS_ERR;
 		atomic_set(&sp->ref_count, 0);
 		add_to_free_queue (ha, sp);
 
-		return ret;
+		goto scsi3_passthru_done;
 	}
 
 	/*
 	 * For this ioctl command we always assume all 16 bytes are
 	 * initialized.
 	 */
-	if (pfc_scsi_pass->CdbLength != MAX_SCSI3_CDB_LEN) {
+	if (pfc_scsi3_pass->CdbLength != MAX_SCSI3_CDB_LEN) {
 		pext->Status = EXT_STATUS_INVALID_PARAM;
-		DEBUG9_10(printk("qla2x00_scsi3_passthru: ERROR - "
-		    "wrong Cdb Length %d.\n", pfc_scsi_pass->CdbLength);)
-		ret = EXT_STATUS_ERR;
+		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR -wrong Cdb Len %d.\n",
+		    __func__, ha->host_no, ha->instance,
+		    pfc_scsi3_pass->CdbLength);)
 		atomic_set(&sp->ref_count, 0);
 		add_to_free_queue (ha, sp);
-		return ret;
+		goto scsi3_passthru_done;
 	}
 
 	for (fcport = ha->fcport; (fcport); fcport = fcport->next) {
 		if (memcmp(fcport->port_name,
-		    pfc_scsi_pass->FCScsiAddr.DestAddr.WWPN, 8) == 0) {
+		    pfc_scsi3_pass->FCScsiAddr.DestAddr.WWPN, 8) == 0) {
 			break;
 		}
 	}
 	if (fcport == NULL) {
 		pext->Status = EXT_STATUS_DEV_NOT_FOUND;
 
-		DEBUG9_10(printk("qla2x00_scsi3_passthru: "
-		    "DID NOT FIND Port for WWPN %02x%02x%02x%02x"
-		    "%02x%02x%02x%02x.\n",
-		    pfc_scsi_pass->FCScsiAddr.DestAddr.WWPN[0],
-		    pfc_scsi_pass->FCScsiAddr.DestAddr.WWPN[1],
-		    pfc_scsi_pass->FCScsiAddr.DestAddr.WWPN[2],
-		    pfc_scsi_pass->FCScsiAddr.DestAddr.WWPN[3],
-		    pfc_scsi_pass->FCScsiAddr.DestAddr.WWPN[4],
-		    pfc_scsi_pass->FCScsiAddr.DestAddr.WWPN[5],
-		    pfc_scsi_pass->FCScsiAddr.DestAddr.WWPN[6],
-		    pfc_scsi_pass->FCScsiAddr.DestAddr.WWPN[7]);)
+		DEBUG9_10(printk("%s(%ld): inst=%ld DID NOT FIND Port for WWPN "
+		    "%02x%02x%02x%02x%02x%02x%02x%02x.\n",
+		    __func__, ha->host_no, ha->instance,
+		    pfc_scsi3_pass->FCScsiAddr.DestAddr.WWPN[0],
+		    pfc_scsi3_pass->FCScsiAddr.DestAddr.WWPN[1],
+		    pfc_scsi3_pass->FCScsiAddr.DestAddr.WWPN[2],
+		    pfc_scsi3_pass->FCScsiAddr.DestAddr.WWPN[3],
+		    pfc_scsi3_pass->FCScsiAddr.DestAddr.WWPN[4],
+		    pfc_scsi3_pass->FCScsiAddr.DestAddr.WWPN[5],
+		    pfc_scsi3_pass->FCScsiAddr.DestAddr.WWPN[6],
+		    pfc_scsi3_pass->FCScsiAddr.DestAddr.WWPN[7]);)
 
 		atomic_set(&sp->ref_count, 0);
 		add_to_free_queue (ha, sp);
 
-		return pext->Status;
+		goto scsi3_passthru_done;
 	}
 
 	/* Use a temporary fclun to send out the command. */
 	fclun = &temp_fclun;
 	fclun->fcport = fcport;
-	fclun->lun = pfc_scsi_pass->FCScsiAddr.Lun;
+	fclun->lun = pfc_scsi3_pass->FCScsiAddr.Lun;
 	fclun->flags = 0;
 	fclun->next = NULL;
 
 	/* set target coordinates */
-	scsi3_cmd.target = 0xff;  /* not used. just put something there. */
-	scsi3_cmd.lun = pfc_scsi_pass->FCScsiAddr.Lun;
+	pscsi3_cmd->target = 0xff;  /* not used. just put something there. */
+	pscsi3_cmd->lun = pfc_scsi3_pass->FCScsiAddr.Lun;
 
-	DEBUG9(printk("qla2x00_scsi3_passthru: cmd for loopid=%04x L=%04x "
+	DEBUG9(printk("%s(%ld): inst=%ld cmd for loopid=%04x L=%04x "
 	    "WWPN=%02x%02x%02x%02x%02x%02x%02x%02x.\n",
-	    fclun->fcport->loop_id, scsi3_cmd.lun,
-	    pfc_scsi_pass->FCScsiAddr.DestAddr.WWPN[0],
-	    pfc_scsi_pass->FCScsiAddr.DestAddr.WWPN[1],
-	    pfc_scsi_pass->FCScsiAddr.DestAddr.WWPN[2],
-	    pfc_scsi_pass->FCScsiAddr.DestAddr.WWPN[3],
-	    pfc_scsi_pass->FCScsiAddr.DestAddr.WWPN[4],
-	    pfc_scsi_pass->FCScsiAddr.DestAddr.WWPN[5],
-	    pfc_scsi_pass->FCScsiAddr.DestAddr.WWPN[6],
-	    pfc_scsi_pass->FCScsiAddr.DestAddr.WWPN[7]);)
+	    __func__, ha->host_no, ha->instance,
+	    fclun->fcport->loop_id, pscsi3_cmd->lun,
+	    pfc_scsi3_pass->FCScsiAddr.DestAddr.WWPN[0],
+	    pfc_scsi3_pass->FCScsiAddr.DestAddr.WWPN[1],
+	    pfc_scsi3_pass->FCScsiAddr.DestAddr.WWPN[2],
+	    pfc_scsi3_pass->FCScsiAddr.DestAddr.WWPN[3],
+	    pfc_scsi3_pass->FCScsiAddr.DestAddr.WWPN[4],
+	    pfc_scsi3_pass->FCScsiAddr.DestAddr.WWPN[5],
+	    pfc_scsi3_pass->FCScsiAddr.DestAddr.WWPN[6],
+	    pfc_scsi3_pass->FCScsiAddr.DestAddr.WWPN[7]);)
 
 	sp->cmd_length = MAX_SCSI3_CDB_LEN;
-	scsi3_cmd.cmd_len = MAX_SCSI3_CDB_LEN;
+	pscsi3_cmd->cmd_len = MAX_SCSI3_CDB_LEN;
 
 	/* Does the kernel support 16byte CDBs? */
 	if (sp->cmd_length > MAX_COMMAND_SIZE) {
 		/* No, use workaround method */
-		scsi3_cmd.cmd_len = 0x0C;
+		pscsi3_cmd->cmd_len = 0x0C;
 
-		sp->more_cdb[0] = pfc_scsi_pass->Cdb[12];
-		sp->more_cdb[1] = pfc_scsi_pass->Cdb[13];
-		sp->more_cdb[2] = pfc_scsi_pass->Cdb[14];
-		sp->more_cdb[3] = pfc_scsi_pass->Cdb[15];
+		sp->more_cdb[0] = pfc_scsi3_pass->Cdb[12];
+		sp->more_cdb[1] = pfc_scsi3_pass->Cdb[13];
+		sp->more_cdb[2] = pfc_scsi3_pass->Cdb[14];
+		sp->more_cdb[3] = pfc_scsi3_pass->Cdb[15];
 	}
 
-	memcpy(scsi3_cmd.data_cmnd, pfc_scsi_pass->Cdb, scsi3_cmd.cmd_len);
-	memcpy(scsi3_cmd.cmnd, pfc_scsi_pass->Cdb, scsi3_cmd.cmd_len);
+	memcpy(pscsi3_cmd->data_cmnd, pfc_scsi3_pass->Cdb, pscsi3_cmd->cmd_len);
+	memcpy(pscsi3_cmd->cmnd, pfc_scsi3_pass->Cdb, pscsi3_cmd->cmd_len);
 
-	DEBUG9(printk("qla2x00_scsi3_passthru: cdb buffer dump:\n");)
-	DEBUG9(qla2x00_dump_buffer((uint8_t *)&scsi3_cmd.data_cmnd[0], 16);)
+	DEBUG9(printk("%s(%ld): inst=%ld cdb buffer dump:\n",
+	    __func__, ha->host_no, ha->instance);)
+	DEBUG9(qla2x00_dump_buffer((uint8_t *)&pscsi3_cmd->data_cmnd[0], 16);)
 
 	pscsi3_cmd->host      = ha->host;
 	sp->ha                = ha;
@@ -3384,45 +5141,46 @@ qla2x00_sc_scsi3_passthru(scsi_qla_host_
 	CMD_SP(pscsi3_cmd)    = (void *) sp;
 
 	/* mark this as a special delivery and collection command */
-	scsi3_cmd.flags     = 0;
-	scsi3_cmd.scsi_done = qla2x00_scsi_pt_done;
+	pscsi3_cmd->flags     = 0;
+	pscsi3_cmd->scsi_done = qla2x00_scsi_pt_done;
 
-	scsi3_cmd.device               = &scsi3_device;
-	scsi3_cmd.device->tagged_queue = 0;
-	scsi3_cmd.use_sg               = 0; /* no ScatterGather */
-	scsi3_cmd.request_bufflen      = pext->ResponseLen;
-	scsi3_cmd.request_buffer       = ha->ioctl_mem;
-	scsi3_cmd.timeout_per_command  = QLA_PT_CMD_TOV * HZ;
+	pscsi3_cmd->device               = pscsi3_device;
+	pscsi3_cmd->device->tagged_queue = 0;
+	pscsi3_cmd->use_sg               = 0; /* no ScatterGather */
+	pscsi3_cmd->request_bufflen      = pext->ResponseLen;
+	pscsi3_cmd->request_buffer       = ha->ioctl_mem;
+	pscsi3_cmd->timeout_per_command  = QLA_PT_CMD_TOV * HZ;
 
-	if (pfc_scsi_pass->Direction == EXT_DEF_SCSI_PASSTHRU_DATA_OUT) {
+	if (pfc_scsi3_pass->Direction == EXT_DEF_SCSI_PASSTHRU_DATA_OUT) {
 		/* sending user data from pext->ResponseAdr to device */
 		ret = verify_area(VERIFY_READ, (void *)pext->ResponseAdr,
 		    pext->ResponseLen);
 		if (ret) {
 			pext->Status = EXT_STATUS_COPY_ERR;
-			DEBUG9_10(printk("qla2x00_scsi3_passthru: ERROR "
-			    "verify read ResponseAdr.\n");)
+			DEBUG9_10(printk("%s(%ld): inst=%ld ERROR verify read "
+			    "ResponseAdr.\n",
+			    __func__, ha->host_no, ha->instance);)
 			atomic_set(&sp->ref_count, 0);
 			add_to_free_queue (ha, sp);
-			return pext->Status;
+			goto scsi3_passthru_done;
 		}
 
-		scsi3_cmd.sc_data_direction = SCSI_DATA_WRITE;
+		pscsi3_cmd->sc_data_direction = SCSI_DATA_WRITE;
 		usr_temp   = (uint8_t *)pext->ResponseAdr;
 		kernel_tmp = (uint8_t *)ha->ioctl_mem;
 		ret = copy_from_user(kernel_tmp, usr_temp, pext->ResponseLen);
 		if (ret) {
 			pext->Status = EXT_STATUS_COPY_ERR;
-			DEBUG9_10(printk("qla2x00_scsi3_passthru: ERROR "
-			    "copy_from_user() failed (%d).\n",
-			    ret);)
+			DEBUG9_10(printk("%s(%ld): inst=%ld ERROR copy rsp buf "
+			    "ret=%d.\n",
+			    __func__, ha->host_no, ha->instance, ret);)
 			atomic_set(&sp->ref_count, 0);
 			add_to_free_queue (ha, sp);
-			return pext->Status;
+			goto scsi3_passthru_done;
 		}
 
 	} else {
-		scsi3_cmd.sc_data_direction = SCSI_DATA_READ;
+		pscsi3_cmd->sc_data_direction = SCSI_DATA_READ;
 	}
 
 	/* Use temporary LU and TGT queue */
@@ -3432,13 +5190,12 @@ qla2x00_sc_scsi3_passthru(scsi_qla_host_
 	b = SCSI_BUS_32(pscsi3_cmd);
 	t = SCSI_TCN_32(pscsi3_cmd);
 
-	DEBUG9(printk("qla2x00_scsi3_passthru: ha instance=%ld tq=%p lq=%p "
-	    "fclun=%p.\n",
-	    ha->instance,tq,lq,fclun); )
-	DEBUG9(printk("qla2x00_scsi3_passthru: CDB=%02x %02x %02x %02x; "
-	    	"b=%x t=%x fclun=%x\n",
-	    	scsi3_cmd.cmnd[0],scsi3_cmd.cmnd[1],scsi3_cmd.cmnd[2],
-	    	scsi3_cmd.cmnd[3],b,t,SCSI_LUN_32(pscsi3_cmd));)
+	DEBUG9(printk("%s(%ld): ha instance=%ld tq=%p lq=%p fclun=%p.\n",
+	    __func__, ha->host_no, ha->instance,tq,lq,fclun); )
+	DEBUG9(printk("%s(%ld): CDB=%02x %02x %02x %02x; b=%x t=%x fclun=%x\n",
+	    __func__, ha->host_no, pscsi3_cmd->cmnd[0], pscsi3_cmd->cmnd[1],
+	    pscsi3_cmd->cmnd[2], pscsi3_cmd->cmnd[3], b, t,
+	    SCSI_LUN_32(pscsi3_cmd));)
 
 	if (tq && lq) {
 		/*
@@ -3467,20 +5224,21 @@ qla2x00_sc_scsi3_passthru(scsi_qla_host_
 	 */
 	if (qla2x00_check_port_status(ha, fcport) != QL_STATUS_SUCCESS) {
 
-		DEBUG9_10(printk("qla2x00_scsi3_passthru: port missing "
-		    "or loop down. fcport=%p timer=%d state=%d dpc=%lx.\n",
-		    fcport, atomic_read(&ha->loop_down_timer), ha->loop_state,
+		DEBUG9_10(printk("%s(%ld): inst=%ld port missing or loop down. "
+		    "fcport=%p timer=%d state=%d dpc=%lx.\n",
+		    __func__, ha->host_no, ha->instance, fcport,
+		    atomic_read(&ha->loop_down_timer), ha->loop_state,
 		    ha->dpc_flags);)
 
 		pext->Status = EXT_STATUS_DEV_NOT_FOUND;
 		atomic_set(&sp->ref_count, 0);
 		add_to_free_queue (ha, sp);
-		return pext->Status;
+		goto scsi3_passthru_done;
 	}
 
 	/* set flag to indicate IOCTL SCSI PassThru in progress */
 	ha->ioctl->SCSIPT_InProgress = 1;
-	ha->ioctl->ioctl_tov = (int)QLA_PT_CMD_TOV + 1;
+	ha->ioctl->ioctl_tov = (int)QLA_PT_CMD_DRV_TOV;
 
 	/* prepare for receiving completion. */
 	qla2x00_ioctl_sem_init(ha);
@@ -3504,24 +5262,24 @@ qla2x00_sc_scsi3_passthru(scsi_qla_host_
 	if (ha->ioctl->SCSIPT_InProgress == 1) {
 
 		printk(KERN_WARNING
-		    "qla2x00: scsi%ld ERROR passthru command timeout.\n",
-		    ha->host_no);
+		    "qla2x00: inst=%ld scsi%ld ERROR PT command timeout.\n",
+		    ha->host_no, ha->instance);
 
 		pext->Status = EXT_STATUS_DEV_NOT_FOUND;
 		atomic_set(&sp->ref_count, 0);
 		add_to_free_queue (ha, sp);
-		return EXT_STATUS_ERR;
+		goto scsi3_passthru_done;
 
 	}
 	if (CMD_COMPL_STATUS(pscsi3_cmd) == (int)IOCTL_INVALID_STATUS) {
 
-		DEBUG9(printk("qla2x00_scsi3_passthru(%ld): ERROR - "
-		    "command not completed.\n", ha->host_no);)
+		DEBUG9(printk("%s(%ld): inst=%ld ERROR - cmd not completed.\n",
+		    __func__, ha->host_no, ha->instance);)
 
 		pext->Status = EXT_STATUS_ERR;
 		atomic_set(&sp->ref_count, 0);
 		add_to_free_queue (ha, sp);
-		return EXT_STATUS_ERR;
+		goto scsi3_passthru_done;
 	}
 
 	switch (CMD_COMPL_STATUS(pscsi3_cmd)) {
@@ -3531,9 +5289,9 @@ qla2x00_sc_scsi3_passthru(scsi_qla_host_
 	case CS_PORT_LOGGED_OUT:
 	case CS_PORT_CONFIG_CHG:
 	case CS_PORT_BUSY:
-		DEBUG10(printk("qla2x00_scsi3_passthru: cs err = %x.\n",
+		DEBUG10(printk("%s(%ld): inst=%ld cs err = %x.\n",
+		    __func__, ha->host_no, ha->instance,
 		    CMD_COMPL_STATUS(pscsi3_cmd));)
-		ret = EXT_STATUS_ERR;
 		pext->Status = EXT_STATUS_BUSY;
 		break;
 	}
@@ -3543,34 +5301,37 @@ qla2x00_sc_scsi3_passthru(scsi_qla_host_
 
 		/* have done the post function */
 		pext->Status       = EXT_STATUS_SCSI_STATUS;
-		pext->DetailStatus = CMD_SCSI_STATUS(pscsi3_cmd);
+		pext->DetailStatus = CMD_SCSI_STATUS(pscsi3_cmd) & 0xff;
 
-		DEBUG9_10(printk("qla2x00_scsi3_passthru: data underrun or "
-		    "scsi err. host status =0x%x, scsi status = 0x%x.\n",
+		DEBUG9_10(printk("%s(%ld): inst=%ld data underrun or scsi err. "
+		    "host status =0x%x, scsi status = 0x%x.\n",
+		    __func__, ha->host_no, ha->instance,
 		    CMD_COMPL_STATUS(pscsi3_cmd), CMD_SCSI_STATUS(pscsi3_cmd));)
 
 	} else if (CMD_COMPL_STATUS(pscsi3_cmd) != 0) {
-		DEBUG9_10(printk("qla2x00_scsi3_passthru: cs err = %x. "
-		    "ext stat %x\n",
-		    CMD_COMPL_STATUS(pscsi3_cmd), pext->Status);)
-		return pext->Status;
+		DEBUG9_10(printk("%s(%ld): inst=%ld cs err = %x.\n",
+		    __func__, ha->host_no, ha->instance,
+		    CMD_COMPL_STATUS(pscsi3_cmd));)
+		pext->Status = EXT_STATUS_ERR;
+		goto scsi3_passthru_done;
 	}
 
 	/* Process completed command */
-	DEBUG9(printk("qla2x00_scsi3_passthru: complete. host status =0x%x, "
-	    "scsi status = 0x%x.\n",
-	    CMD_COMPL_STATUS(pscsi3_cmd), CMD_SCSI_STATUS(pscsi3_cmd));)
+	DEBUG9(printk("%s(%ld): inst=%ld done. host status=0x%x, "
+	    "scsi status=0x%x.\n",
+	    __func__, ha->host_no, ha->instance, CMD_COMPL_STATUS(pscsi3_cmd),
+	    CMD_SCSI_STATUS(pscsi3_cmd));)
 
 	/* copy up structure to make sense data available to user */
-	pfc_scsi_pass->SenseLength = CMD_ACTUAL_SNSLEN(pscsi3_cmd);
+	pfc_scsi3_pass->SenseLength = CMD_ACTUAL_SNSLEN(pscsi3_cmd);
 	if (CMD_ACTUAL_SNSLEN(pscsi3_cmd)) {
-		DEBUG9_10(printk("qla2x00_scsi3_passthru: sense[0]=%x "
-		    "sense[2]=%x.\n",
+		DEBUG9_10(printk("%s(%ld): inst=%ld sense[0]=%x sense[2]=%x.\n",
+		    __func__, ha->host_no, ha->instance,
 		    pscsi3_cmd->sense_buffer[0],
 		    pscsi3_cmd->sense_buffer[2]);)
 
 		for (i = 0; i < CMD_ACTUAL_SNSLEN(pscsi3_cmd); i++) {
-			pfc_scsi_pass->SenseData[i] =
+			pfc_scsi3_pass->SenseData[i] =
 			    pscsi3_cmd->sense_buffer[i];
 		}
 
@@ -3578,21 +5339,31 @@ qla2x00_sc_scsi3_passthru(scsi_qla_host_
 		    sizeof(EXT_FC_SCSI_PASSTHRU));
 		if (ret) {
 			pext->Status = EXT_STATUS_COPY_ERR;
-			DEBUG9_10(printk("qla2x00_scsi3_passthru: ERROR verify "
-			    "WRITE RequestAdr.\n");)
-			return ret;
+			DEBUG9_10(printk("%s(%ld): inst=%ld ERROR verify WRITE "
+			    "RequestAdr.\n",
+			    __func__, ha->host_no, ha->instance);)
+			goto scsi3_passthru_done;
 		}
 
 		usr_temp = (uint8_t *)pext->RequestAdr;
-		kernel_tmp = (uint8_t *)pfc_scsi_pass;
-		copy_to_user(usr_temp, kernel_tmp, sizeof(EXT_FC_SCSI_PASSTHRU));
+		kernel_tmp = (uint8_t *)pfc_scsi3_pass;
+		ret = copy_to_user(usr_temp, kernel_tmp,
+		    sizeof(EXT_FC_SCSI_PASSTHRU));
+		if (ret) {
+			pext->Status = EXT_STATUS_COPY_ERR;
+			DEBUG9_10(printk("%s(%ld): inst=%ld ERROR copy sense "
+			    "buffer.\n",
+			    __func__, ha->host_no, ha->instance);)
+			goto scsi3_passthru_done;
+		}
 	}
 
-	scsi_direction = pfc_scsi_pass->Direction;
+	scsi_direction = pfc_scsi3_pass->Direction;
 
 	if (scsi_direction == EXT_DEF_SCSI_PASSTHRU_DATA_IN) {
 
-		DEBUG9(printk("qla2x00_scsi3_passthru: copying data.\n");)
+		DEBUG9(printk("%s(%ld): inst=%ld copying data.\n",
+		    __func__, ha->host_no, ha->instance);)
 
 		/* getting device data and putting in pext->ResponseAdr */
 		ret = verify_area(VERIFY_WRITE, (void *)pext->ResponseAdr,
@@ -3600,10 +5371,11 @@ qla2x00_sc_scsi3_passthru(scsi_qla_host_
 		if (ret) {
 			pext->Status = EXT_STATUS_COPY_ERR;
 
-			DEBUG9_10(printk("qla2x00_scsi3_passthru: ERROR verify "
-			    "write ResponseAdr.\n");)
+			DEBUG9_10(printk("%s(%ld): inst=%ld ERROR verify write "
+			    "ResponseAdr.\n",
+			    __func__, ha->host_no, ha->instance);)
 
-			return ret;
+			goto scsi3_passthru_done;
 		}
 
 		/* now copy up the READ data to user */
@@ -3620,10 +5392,23 @@ qla2x00_sc_scsi3_passthru(scsi_qla_host_
 
 		usr_temp = (uint8_t *)pext->ResponseAdr;
 		kernel_tmp = (uint8_t *)ha->ioctl_mem;
-		copy_to_user(usr_temp, kernel_tmp, transfer_len);
+		ret = copy_to_user(usr_temp, kernel_tmp, transfer_len);
+		if (ret) {
+			pext->Status = EXT_STATUS_COPY_ERR;
+			DEBUG9_10(printk(
+			    "%s(%ld): inst=%ld ERROR copy rsp buf\n",
+			    __func__, ha->host_no, ha->instance);)
+			goto scsi3_passthru_done;
+		}
 	}
 
-	return ret;
+	DEBUG9(printk("%s(%ld): inst=%ld exiting.\n",
+	    __func__, ha->host_no, ha->instance);)
+
+scsi3_passthru_done:
+
+	qla2x00_free_ioctl_scrap_mem(ha);
+	return (ret);
 }
 
 /*
@@ -3637,6 +5422,7 @@ qla2x00_sc_scsi3_passthru(scsi_qla_host_
  *
  * Returns:
  *	0 = success
+ *	others = errno value
  *
  * Context:
  *	Kernel context.
@@ -3647,8 +5433,8 @@ qla2x00_send_els_rnid(scsi_qla_host_t *h
 #define TGT_DEV 	 1
 #define HOST_DEV 	 2
 
-	EXT_RNID_REQ	tmp_rnid;
-	int		rval = 0;
+	EXT_RNID_REQ	*tmp_rnid;
+	int		ret = 0;
 	uint8_t 	dev_found = 0;
 	uint16_t	dev_loop_id = 0;
 	uint16_t	mb[MAILBOX_REGISTER_COUNT];
@@ -3658,79 +5444,88 @@ qla2x00_send_els_rnid(scsi_qla_host_t *h
 	struct list_head *fcil;
 	fc_initiator_t	*fcinitiator;
 
-	DEBUG9(printk("qla2x00_send_els_rnid(%ld): entered.\n",
-	    ha->host_no);)
+	DEBUG9(printk("%s(%ld): inst=%ld entered.\n",
+	    __func__, ha->host_no, ha->instance);)
 
 	if (ha->ioctl_mem_size < SEND_RNID_RSP_SIZE) {
 		if (qla2x00_get_new_ioctl_dma_mem(ha,
 		    SEND_RNID_RSP_SIZE) != QL_STATUS_SUCCESS) {
 
-			DEBUG9_10(printk("qla2x00_send_els_rnid(%ld): ERROR "
-			    "cannot alloc DMA buffer. size=%x.\n",
-			    ha->host_no, SEND_RNID_RSP_SIZE);)
+			DEBUG9_10(printk("%s(%ld): inst=%ld ERROR cannot alloc "
+			    "DMA buffer. size=%x.\n",
+			    __func__, ha->host_no, ha->instance,
+			    SEND_RNID_RSP_SIZE);)
 
 			pext->Status = EXT_STATUS_NO_MEMORY;
-			return QL_STATUS_ERROR;
+			return (ret);
 		}
 	}
 
 	if (pext->RequestLen != sizeof(EXT_RNID_REQ)) {
 		/* parameter error */
-		DEBUG9_10(printk("qla2x00_send_els_rnid(%ld): invalid "
-		    "request length %d.\n",
-		    ha->host_no, pext->RequestLen);)
+		DEBUG9_10(printk("%s(%ld): inst=%ld invalid req length %d.\n",
+		    __func__, ha->host_no, ha->instance, pext->RequestLen);)
 		pext->Status = EXT_STATUS_INVALID_PARAM;
-		return QL_STATUS_ERROR;
+		return (ret);
 	}
 
-	rval = verify_area(VERIFY_READ, (void *)pext->RequestAdr,
+	ret = verify_area(VERIFY_READ, (void *)pext->RequestAdr,
 	    pext->RequestLen);
 
-	if (rval != 0) {
+	if (ret != 0) {
 		pext->Status = EXT_STATUS_COPY_ERR;
 		DEBUG9_10(printk(
-		    "qla2x00_send_els_rnid(%ld): request buf verify READ "
-		    "FAILED.\n",
-		    ha->host_no);)
-		return QL_STATUS_ERROR;
+		    "%s(%ld): inst=%ld req buf verify READ FAILED\n",
+		    __func__, ha->host_no, ha->instance);)
+		return (ret);
 	}
 
-	DEBUG9(printk("qla2x00_send_els_rnid(%ld): request buf verified. "
-	    " Copying request data.\n",
-	    ha->host_no);)
+	DEBUG9(printk("%s(%ld): inst=%ld req buf verified. Copying req data.\n",
+	    __func__, ha->host_no, ha->instance);)
 
-	rval = copy_from_user(&tmp_rnid, pext->RequestAdr, pext->RequestLen);
-	if (rval) {
+	if (qla2x00_get_ioctl_scrap_mem(ha, (void **)&tmp_rnid,
+	    sizeof(EXT_RNID_REQ))) {
+		/* not enough memory */
+		pext->Status = EXT_STATUS_NO_MEMORY;
+		DEBUG9_10(printk("%s(%ld): inst=%ld scrap not big enough. "
+		    "size requested=%d.\n",
+		    __func__, ha->host_no, ha->instance,
+		    sizeof(EXT_RNID_REQ));)
+		return (ret);
+	}
+
+	ret = copy_from_user(tmp_rnid, pext->RequestAdr, pext->RequestLen);
+	if (ret) {
 		pext->Status = EXT_STATUS_COPY_ERR;
 		DEBUG9_10(printk(
-		    "qla2x00_send_els_rnid(%ld): ERROR copy_from_user()"
-		    "failed (%d).\n",
-		    ha->host_no,
-		    rval);)
-		return QL_STATUS_ERROR;
+		    "%s(%ld): inst=%ld ERROR copy req buf ret=%d\n",
+		    __func__, ha->host_no, ha->instance, ret);)
+		qla2x00_free_ioctl_scrap_mem(ha);
+		return (ret);
 	}
 
 	/* Find loop ID of the device */
 	fcinitiator = NULL;
-	switch (tmp_rnid.Addr.Type) {
+	switch (tmp_rnid->Addr.Type) {
 	case EXT_DEF_TYPE_WWNN:
 
-		DEBUG9(printk("qla2x00_send_els_rnid(%ld): got node name.\n",
-		    ha->host_no);)
+		DEBUG9(printk("%s(%ld): inst=%ld got node name.\n",
+		    __func__, ha->host_no, ha->instance);)
 
 		for (fcport = ha->fcport; (fcport); fcport = fcport->next) {
 			/* if removed or missing */
 			if (atomic_read(&fcport->state) == FC_ONLINE &&
-			    memcmp((void *)tmp_rnid.Addr.FcAddr.WWNN,
+			    memcmp((void *)tmp_rnid->Addr.FcAddr.WWNN,
 			    (void *)fcport->node_name,
 			    EXT_DEF_WWN_NAME_SIZE) == 0) {
 				break;
 			}
 		}
 		if (fcport != NULL) {
-			DEBUG9(printk("qla2x00_send_els_rnid(%ld): found "
-			    " target device; loop_id=%x.\n",
-			    ha->host_no, fcport->loop_id);)
+			DEBUG9(printk("%s(%ld): inst=%ld found tgt dev; "
+			    "loop_id=%x.\n",
+			    __func__, ha->host_no, ha->instance,
+			    fcport->loop_id);)
 
 			dev_found = TGT_DEV;
 			dev_loop_id = fcport->loop_id;
@@ -3742,7 +5537,7 @@ qla2x00_send_els_rnid(scsi_qla_host_t *h
 		list_for_each(fcil, &ha->fcinitiators) {
 			fcinitiator = list_entry(fcil, fc_initiator_t, list);
 
-			if (memcmp(tmp_rnid.Addr.FcAddr.WWNN,
+			if (memcmp(tmp_rnid->Addr.FcAddr.WWNN,
 				 fcinitiator->node_name,
 				 EXT_DEF_WWN_NAME_SIZE) == 0 &&
 				fcinitiator->d_id.b24 != 0) {
@@ -3752,9 +5547,10 @@ qla2x00_send_els_rnid(scsi_qla_host_t *h
 			}
 		}
 		if (found) {
-			DEBUG9(printk("qla2x00_send_els_rnid(%ld): found "
-			    " host device; loop_id=%x.\n",
-			    ha->host_no, fcinitiator->loop_id);)
+			DEBUG9(printk("%s(%ld): inst=%ld found host device; "
+			    "loop_id=%x.\n",
+			    __func__, ha->host_no, ha->instance,
+			    fcinitiator->loop_id);)
 
 			dev_found = HOST_DEV;
 			dev_loop_id = fcinitiator->loop_id;
@@ -3764,22 +5560,23 @@ qla2x00_send_els_rnid(scsi_qla_host_t *h
 		break;
 
 	case EXT_DEF_TYPE_WWPN:
-		DEBUG9(printk("qla2x00_send_els_rnid(%ld): got port name.\n",
-		    ha->host_no);)
+		DEBUG9(printk("%s(%ld): inst=%ld got port name.\n",
+		    __func__, ha->host_no, ha->instance);)
 
 		for (fcport = ha->fcport; (fcport); fcport = fcport->next) {
 			/* if removed or missing */
 			if (atomic_read(&fcport->state) == FC_ONLINE &&
-			    memcmp((void *)tmp_rnid.Addr.FcAddr.WWPN,
+			    memcmp((void *)tmp_rnid->Addr.FcAddr.WWPN,
 			    (void *)fcport->port_name,
 			    EXT_DEF_WWN_NAME_SIZE) == 0) {
 				break;
 			}
 		}
 		if (fcport != NULL) {
-			DEBUG9(printk("qla2x00_send_els_rnid(%ld): found "
-			    " target device; loop_id=%x.\n",
-			    ha->host_no, fcport->loop_id);)
+			DEBUG9(printk("%s(%ld): inst=%ld found tgt dev; "
+			    "loop_id=%x.\n",
+			    __func__, ha->host_no, ha->instance,
+			    fcport->loop_id);)
 
 			dev_found = TGT_DEV; /* target device */
 			dev_loop_id = fcport->loop_id;
@@ -3791,7 +5588,7 @@ qla2x00_send_els_rnid(scsi_qla_host_t *h
 		list_for_each(fcil, &ha->fcinitiators) {
 			fcinitiator = list_entry(fcil, fc_initiator_t, list);
 
-			if (memcmp(tmp_rnid.Addr.FcAddr.WWPN,
+			if (memcmp(tmp_rnid->Addr.FcAddr.WWPN,
 				 fcinitiator->port_name,
 				 EXT_DEF_WWN_NAME_SIZE) == 0 &&
 				fcinitiator->d_id.b24 != 0) {
@@ -3801,9 +5598,10 @@ qla2x00_send_els_rnid(scsi_qla_host_t *h
 			}
 		}
 		if (found) {
-			DEBUG9(printk("qla2x00_send_els_rnid(%ld): found "
-			    " host device; loop_id=%x.\n",
-			    ha->host_no, fcinitiator->loop_id);)
+			DEBUG9(printk("%s(%ld): inst=%ld found host device; "
+			    "loop_id=%x.\n",
+			    __func__, ha->host_no, ha->instance,
+			    fcinitiator->loop_id);)
 
 			dev_found = HOST_DEV;
 			dev_loop_id = fcinitiator->loop_id;
@@ -3813,23 +5611,24 @@ qla2x00_send_els_rnid(scsi_qla_host_t *h
 		break;
 
 	case EXT_DEF_TYPE_PORTID:
-		DEBUG9(printk("qla2x00_send_els_rnid(%ld): got port ID.\n",
-		    ha->host_no);)
+		DEBUG9(printk("%s(%ld): inst=%ld got port ID.\n",
+		    __func__, ha->host_no, ha->instance);)
 
 		/* PORTID bytes entered must already be big endian */
 		for (fcport = ha->fcport; (fcport); fcport = fcport->next) {
 			/* if removed or missing */
 			if (atomic_read(&fcport->state) == FC_ONLINE &&
-			    memcmp((void *)&tmp_rnid.Addr.FcAddr.Id[1],
+			    memcmp((void *)&tmp_rnid->Addr.FcAddr.Id[1],
 			    (void *)(fcport->d_id.r.d_id),
 			    EXT_DEF_PORTID_SIZE_ACTUAL) == 0) {
 				break;
 			}
 		}
 		if (fcport != NULL) {
-			DEBUG9(printk("qla2x00_send_els_rnid(%ld): found "
-			    " target device; loop_id=%x.\n",
-			    ha->host_no, fcport->loop_id);)
+			DEBUG9(printk("%s(%ld): inst=%ld found tgt dev; "
+			    "loop_id=%x.\n",
+			    __func__, ha->host_no, ha->instance,
+			    fcport->loop_id);)
 
 			dev_found = TGT_DEV; /* target device */
 			dev_loop_id = fcport->loop_id;
@@ -3841,7 +5640,7 @@ qla2x00_send_els_rnid(scsi_qla_host_t *h
 		list_for_each(fcil, &ha->fcinitiators) {
 			fcinitiator = list_entry(fcil, fc_initiator_t, list);
 
-			if (memcmp(&tmp_rnid.Addr.FcAddr.Id[1],
+			if (memcmp(&tmp_rnid->Addr.FcAddr.Id[1],
 				&fcinitiator->d_id,
 				EXT_DEF_PORTID_SIZE_ACTUAL) == 0) {
 
@@ -3850,9 +5649,10 @@ qla2x00_send_els_rnid(scsi_qla_host_t *h
 			}
 		}
 		if (found) {
-			DEBUG9(printk("qla2x00_send_els_rnid(%ld): found "
-			    " host device; loop_id=%x.\n",
-			    ha->host_no, fcinitiator->loop_id);)
+			DEBUG9(printk("%s(%ld): inst=%ld found host device; "
+			    "loop_id=%x.\n",
+			    __func__, ha->host_no, ha->instance,
+			    fcinitiator->loop_id);)
 
 			dev_found = HOST_DEV;
 			dev_loop_id = fcinitiator->loop_id;
@@ -3863,10 +5663,10 @@ qla2x00_send_els_rnid(scsi_qla_host_t *h
 	default:
 		/* parameter error */
 		pext->Status = EXT_STATUS_INVALID_PARAM;
-		DEBUG9_10(printk("qla2x00_send_els_rnid(%ld): invalid "
-		    "addressing type.\n",
-		    ha->host_no);)
-		return pext->Status;
+		DEBUG9_10(printk("%s(%ld): inst=%ld invalid addressing type.\n",
+		    __func__, ha->host_no, ha->instance);)
+		qla2x00_free_ioctl_scrap_mem(ha);
+		return (ret);
 	}
 
 	if (!dev_found ||
@@ -3875,26 +5675,27 @@ qla2x00_send_els_rnid(scsi_qla_host_t *h
 		 * configured; just return error.
 		 */
 		pext->Status = EXT_STATUS_DEV_NOT_FOUND;
-		rval = pext->Status;
 		DEBUG9_10(printk(
-		    "qla2x00_send_els_rnid(%ld): device not found. "
-		    "dev_found=%d dev_loop_id=%x.\n",
-		    ha->host_no, dev_found, dev_loop_id);)
-		return (rval);
+		    "%s(%ld): inst=%ld device not found. dev_found=%d "
+		    "dev_loop_id=%x.\n",
+		    __func__, ha->host_no, ha->instance, dev_found,
+		    dev_loop_id);)
+		qla2x00_free_ioctl_scrap_mem(ha);
+		return (ret);
 	}
 
 	/* check on loop down */
 	if (ha->loop_state != LOOP_READY || 
-		test_bit(CFG_ACTIVE, &ha->cfg_flags) ||
+	    test_bit(CFG_ACTIVE, &ha->cfg_flags) ||
 	    (test_bit(ABORT_ISP_ACTIVE, &ha->dpc_flags)) ||
 	    ABORTS_ACTIVE || ha->dpc_active) {
 
 		pext->Status = EXT_STATUS_BUSY;
-		DEBUG9_10(printk(
-		    "qla2x00_send_els_rnid(%ld): loop not ready.\n",
-		    ha->host_no);)
+		DEBUG9_10(printk("%s(%ld): inst=%ld loop not ready.\n",
+		    __func__, ha->host_no, ha->instance);)
 
-		return pext->Status;
+		qla2x00_free_ioctl_scrap_mem(ha);
+		return (ret);
 	}
 
 	/* Check whether we need to login first. */
@@ -3915,16 +5716,16 @@ qla2x00_send_els_rnid(scsi_qla_host_t *h
 			}
 		}
 
-		DEBUG9(printk("qla2x00_send_els_rnid(%ld): try relogin to "
-		    " host device; dev_loop_id=%x.\n",
-		    ha->host_no, dev_loop_id);)
+		DEBUG9(printk("%s(%ld): inst=%ld try relogin to host dev; "
+		    "dev_loop_id=%x.\n",
+		    __func__, ha->host_no, ha->instance, dev_loop_id);)
 
 		for (;;) {
 			if (dev_loop_id > LAST_SNS_LOOP_ID) {
 				/* error */
-				DEBUG10(printk("qla2x00_send_els_rnid(%ld): "
-				    " no valid loop_id for login.\n",
-				    ha->host_no);)
+				DEBUG10(printk("%s(%ld): inst=%ld "
+				    "no valid loop_id for login.\n",
+				    __func__, ha->host_no, ha->instance);)
 
 				break;
 			}
@@ -3940,16 +5741,18 @@ qla2x00_send_els_rnid(scsi_qla_host_t *h
 			    mb[0] != MBS_PORT_ID_IN_USE &&
 			    mb[0] != MBS_LOOP_ID_IN_USE) {
 
-	 			DEBUG10(printk("qla2x00_send_els_rnid(%ld): "
+	 			DEBUG10(printk("%s(%ld): inst=%ld "
 				    "ERROR login mb[0]=%x mb[1]=%x.\n",
-				    ha->host_no, mb[0], mb[1]);)
+				    __func__, ha->host_no, ha->instance,
+				    mb[0], mb[1]);)
 				break;
 			}
 
 			if (mb[0] == MBS_CMD_CMP) {
-				DEBUG9(printk("qla2x00_send_els_rnid(%ld): "
-				    " host login success; loop_id=%x.\n",
-				    ha->host_no, dev_loop_id);)
+				DEBUG9(printk("%s(%ld): inst=%ld host login "
+				    "success; loop_id=%x.\n",
+				    __func__, ha->host_no, ha->instance,
+				    dev_loop_id);)
 
 				fcinitiator->loop_id = dev_loop_id;
 				break;
@@ -3957,9 +5760,10 @@ qla2x00_send_els_rnid(scsi_qla_host_t *h
 				ha->fabricid[dev_loop_id].in_use = FALSE;
 				dev_loop_id = mb[1];
 
-				DEBUG9(printk("qla2x00_send_els_rnid(%ld): "
-				    "port %06x using loop id=0x%04x.\n",
-				    ha->host_no, ha->phost_db[host].d_id.b24,
+				DEBUG9(printk("%s(%ld): inst=%ld port %06x "
+				    "using loop id=0x%04x.\n",
+				    __func__, ha->host_no, ha->instance,
+				    fcinitiator->d_id.b24,
 				    dev_loop_id);)
 
 				if (dev_loop_id <= LAST_SNS_LOOP_ID)
@@ -3980,10 +5784,10 @@ qla2x00_send_els_rnid(scsi_qla_host_t *h
 
 				if (dev_loop_id <= LAST_SNS_LOOP_ID) {
 					DEBUG9(printk(
-					    "qla2x00_send_els_rnid(%ld): "
-					    "previous loop id in use. Retry "
-					    "with 0x%04x.\n",
-					    ha->host_no, dev_loop_id);)
+					    "%s(%ld): inst=%ld previous loop "
+					    "id in use. Retry with 0x%04x.\n",
+					    __func__, ha->host_no, ha->instance,
+					    dev_loop_id);)
 
 					ha->fabricid[dev_loop_id].in_use = TRUE;
 				} else {
@@ -3995,150 +5799,168 @@ qla2x00_send_els_rnid(scsi_qla_host_t *h
 
 		if (mb[0] != MBS_CMD_CMP) {
 			pext->Status = EXT_STATUS_ERR;
-			DEBUG9_10(printk(
-			    "qla2x00_send_els_rnid(%ld): login failed.\n",
-			    ha->host_no);)
+			DEBUG9_10(printk( "%s(%ld): inst=%ld login failed.\n",
+			    __func__, ha->host_no, ha->instance);)
 
-			return pext->Status;
+			qla2x00_free_ioctl_scrap_mem(ha);
+			return (ret);
 		}
 	}
 
 	/* Send command */
-	DEBUG9(printk("qla2x00_send_els_rnid(%ld): sending rnid cmd.\n",
-	    ha->host_no);)
+	DEBUG9(printk("%s(%ld): inst=%ld sending rnid cmd.\n",
+	    __func__, ha->host_no, ha->instance);)
 
-	rval = qla2x00_send_rnid_mbx(ha, dev_loop_id,
-	    (uint8_t)tmp_rnid.DataFormat, ha->ioctl_mem_phys,
+	ret = qla2x00_send_rnid_mbx(ha, dev_loop_id,
+	    (uint8_t)tmp_rnid->DataFormat, ha->ioctl_mem_phys,
 	    SEND_RNID_RSP_SIZE, &mb[0]);
 
-	if (rval != QLA2X00_SUCCESS) {
+	if (ret != QLA2X00_SUCCESS) {
 		/* error */
 		pext->Status = EXT_STATUS_ERR;
 
-                DEBUG9_10(printk(
-                    "qla2x00_send_els_rnid(%ld): FAILED. rval = %x.\n",
-                    ha->host_no, mb[0]);)
-		return (0);
+                DEBUG9_10(printk("%s(%ld): inst=%ld FAILED. rval = %x.\n",
+                    __func__, ha->host_no, ha->instance, mb[0]);)
+		qla2x00_free_ioctl_scrap_mem(ha);
+		return (ret);
 	}
 
-	DEBUG9(printk("qla2x00_send_els_rnid(%ld): rnid cmd sent ok.\n",
-	    ha->host_no);)
+	DEBUG9(printk("%s(%ld): inst=%ld rnid cmd sent ok.\n",
+	    __func__, ha->host_no, ha->instance);)
 
 	/* Copy the response */
 	copy_len = (pext->ResponseLen > SEND_RNID_RSP_SIZE) ?
 	    SEND_RNID_RSP_SIZE : pext->ResponseLen;
 
-	rval = verify_area(VERIFY_WRITE, (void  *)pext->ResponseAdr,
+	ret = verify_area(VERIFY_WRITE, (void  *)pext->ResponseAdr,
 	    copy_len);
 
-	if (rval != 0) {
+	if (ret != 0) {
 		pext->Status = EXT_STATUS_COPY_ERR;
 		DEBUG9_10(printk(
-		    "qla2x00_send_els_rnid(%ld): response buf verify WRITE "
-		    "failed.\n",
-		    ha->host_no);)
-		rval = EFAULT;
+		    "%s(%ld): inst=%ld rsp buf verify WRITE error\n",
+		    __func__, ha->host_no, ha->instance);)
 	} else {
-		copy_to_user((uint8_t *)pext->ResponseAdr,
+		ret = copy_to_user((uint8_t *)pext->ResponseAdr,
 		    (uint8_t *)ha->ioctl_mem, copy_len);
+		if (ret) {
+			pext->Status = EXT_STATUS_COPY_ERR;
+			DEBUG9_10(printk(
+			    "%s(%ld): inst=%ld ERROR copy rsp buf\n",
+			    __func__, ha->host_no, ha->instance);)
+			qla2x00_free_ioctl_scrap_mem(ha);
+			return (ret);
+		}
 
 		if (SEND_RNID_RSP_SIZE > pext->ResponseLen) {
 			pext->Status = EXT_STATUS_DATA_OVERRUN;
-			DEBUG9(printk(
-	 		    "qla2x00_send_els_rnid(%ld): data overrun. "
+			DEBUG9(printk("%s(%ld): inst=%ld data overrun. "
 			    "exiting normally.\n",
-			    ha->host_no);)
+			    __func__, ha->host_no, ha->instance);)
 		} else {
 			pext->Status = EXT_STATUS_OK;
-			DEBUG9(printk(
-			    "qla2x00_send_els_rnid(%ld): exiting normally.\n",
-			    ha->host_no);)
+			DEBUG9(printk("%s(%ld): inst=%ld exiting normally.\n",
+			    __func__, ha->host_no, ha->instance);)
 		}
 		pext->ResponseLen = copy_len;
-		rval = 0;
 	}
 
-	return (rval);
+	qla2x00_free_ioctl_scrap_mem(ha);
+	return (ret);
 }
 
+/*
+ * qla2x00_get_rnid_params
+ *	IOCTL to get RNID parameters of the adapter.
+ *
+ * Input:
+ *	ha = adapter state pointer.
+ *	pext = User space CT arguments pointer.
+ *	mode = flags.
+ *
+ * Returns:
+ *	0 = success
+ *	others = errno value
+ *
+ * Context:
+ *	Kernel context.
+ */
 static int
 qla2x00_get_rnid_params(scsi_qla_host_t *ha, EXT_IOCTL *pext, int mode)
 {
-	int		rval = 0;
+	int		ret = 0;
+	int		tmp_rval = 0;
 	uint32_t	copy_len;
 	uint16_t	mb[MAILBOX_REGISTER_COUNT];
 
-	DEBUG9(printk("qla2x00_get_rnid_params(%ld): entered.\n",
-	    ha->host_no);)
+	DEBUG9(printk("%s(%ld): inst=%ld entered.\n",
+	    __func__, ha->host_no, ha->instance);)
 
 	/* check on loop down */
 	if (ha->loop_state != LOOP_READY || 
-		test_bit(CFG_ACTIVE, &ha->cfg_flags) ||
+	    test_bit(CFG_ACTIVE, &ha->cfg_flags) ||
 	    (test_bit(ABORT_ISP_ACTIVE, &ha->dpc_flags)) ||
 	    ABORTS_ACTIVE || ha->dpc_active) {
 
 		pext->Status = EXT_STATUS_BUSY;
-		DEBUG9_10(printk(
-		    "qla2x00_get_rnid_params(%ld): loop not ready.\n",
-		    ha->host_no);)
+		DEBUG9_10(printk("%s(%ld): inst=%ld loop not ready.\n",
+		    __func__, ha->host_no, ha->instance);)
 
-		return pext->Status;
+		return (ret);
 	}
 
 	/* Send command */
-	rval = qla2x00_get_rnid_params_mbx(ha, ha->ioctl_mem_phys,
+	tmp_rval = qla2x00_get_rnid_params_mbx(ha, ha->ioctl_mem_phys,
 	    sizeof(EXT_RNID_DATA), &mb[0]);
 
-	if (rval != QLA2X00_SUCCESS) {
+	if (tmp_rval != QLA2X00_SUCCESS) {
 		/* error */
 		pext->Status = EXT_STATUS_ERR;
 
-		DEBUG9_10(printk(
-		    "qla2x00_get_rnid_params(%ld): cmd FAILED=%x.\n",
-		    ha->host_no, mb[0]);)
-		return (0);
+		DEBUG9_10(printk("%s(%ld): inst=%ld cmd FAILED=%x.\n",
+		    __func__, ha->host_no, ha->instance, mb[0]);)
+		return (ret);
 	}
 
 	/* Copy the response */
 	copy_len = (pext->ResponseLen > sizeof(EXT_RNID_DATA)) ?
 	    (uint32_t)sizeof(EXT_RNID_DATA) : pext->ResponseLen;
-	rval = verify_area(VERIFY_WRITE, (void  *)pext->ResponseAdr,
+	ret = verify_area(VERIFY_WRITE, (void  *)pext->ResponseAdr,
 	    copy_len);
 
-	if (rval != 0) {
+	if (ret != 0) {
 		pext->Status = EXT_STATUS_COPY_ERR;
-		DEBUG9_10(printk(
-		    "qla2x00_get_rnid_params(%ld): verify WRITE response buf "
-		    "failed.\n",
-		    ha->host_no);)
-		rval = EFAULT;
+		DEBUG9_10(printk("%s(%ld): inst=%ld verify WRITE rsp buf error\n",
+		    __func__, ha->host_no, ha->instance);)
 	} else {
-		copy_to_user((void *)pext->ResponseAdr, (void *)ha->ioctl_mem,
-		    copy_len);
+		ret = copy_to_user((void *)pext->ResponseAdr,
+		    (void *)ha->ioctl_mem, copy_len);
+		if (ret) {
+			pext->Status = EXT_STATUS_COPY_ERR;
+			DEBUG9_10(printk("%s(%ld): inst=%ld ERROR copy rsp buf\n",
+			    __func__, ha->host_no, ha->instance);)
+			return (ret);
+		}
 
 		pext->ResponseLen = copy_len;
 		if (copy_len < sizeof(EXT_RNID_DATA)) {
 			pext->Status = EXT_STATUS_DATA_OVERRUN;
-			DEBUG9_10(printk(
-			    "qla2x00_get_rnid_params(%ld): data overrun. "
+			DEBUG9_10(printk("%s(%ld): inst=%ld data overrun. "
 			    "exiting normally.\n",
-			    ha->host_no);)
+			    __func__, ha->host_no, ha->instance);)
  		} else if (pext->ResponseLen > sizeof(EXT_RNID_DATA)) {
  			pext->Status = EXT_STATUS_DATA_UNDERRUN;
- 			DEBUG9_10(printk(
-			    "qla2x00_get_rnid_params(%ld): data underrun. "
+ 			DEBUG9_10(printk("%s(%ld): inst=%ld data underrun. "
  			    "exiting normally.\n",
- 			    ha->host_no);)
+ 			    __func__, ha->host_no, ha->instance);)
 		} else {
 			pext->Status = EXT_STATUS_OK;
-			DEBUG9(printk(
-			    "qla2x00_get_rnid_params(%ld): exiting normally.\n",
-			    ha->host_no);)
+			DEBUG9(printk("%s(%ld): inst=%ld exiting normally.\n",
+			    __func__, ha->host_no, ha->instance);)
 		}
-		rval = 0;
 	}
 
-	return (rval);
+	return (ret);
 }
 
 /*
@@ -4152,6 +5974,7 @@ qla2x00_get_rnid_params(scsi_qla_host_t 
  *
  * Returns:
  *	0 = success
+ *	others = errno value
  *
  * Context:
  *	Kernel context.
@@ -4159,158 +5982,210 @@ qla2x00_get_rnid_params(scsi_qla_host_t 
 STATIC int
 qla2x00_set_host_data(scsi_qla_host_t *ha, EXT_IOCTL *pext, int mode)
 {
-	int	rval = 0;
+	int	ret = 0;
 
-	DEBUG9(printk("qla2x00_set_host_data(%ld): entered.\n",
-	    ha->host_no);)
+	DEBUG9(printk("%s(%ld): inst=%ld entered.\n",
+	    __func__, ha->host_no, ha->instance);)
 
 	/* check on loop down */
 	if (ha->loop_state != LOOP_READY || 
-		test_bit(CFG_ACTIVE, &ha->cfg_flags) ||
+	    test_bit(CFG_ACTIVE, &ha->cfg_flags) ||
 	    (test_bit(ABORT_ISP_ACTIVE, &ha->dpc_flags)) ||
 	    ABORTS_ACTIVE || ha->dpc_active) {
 
 		pext->Status = EXT_STATUS_BUSY;
-		DEBUG9_10(printk(
-		    "qla2x00_set_host_data(%ld): loop not ready.\n",
-		    ha->host_no);)
+		DEBUG9_10(printk("%s(%ld): inst=%ld loop not ready.\n",
+		    __func__, ha->host_no, ha->instance);)
 
-		return pext->Status;
+		return (ret);
 	}
 
 	/* switch on command subcode */
 	switch (pext->SubCode) {
 	case EXT_SC_SET_RNID:
-		rval = qla2x00_set_rnid_params(ha, pext, mode);
+		ret = qla2x00_set_rnid_params(ha, pext, mode);
 		break;
 	default:
 		/* function not supported. */
 		pext->Status = EXT_STATUS_UNSUPPORTED_SUBCODE;
-		rval = ENODEV;
 		break;
 	}
 
-	DEBUG9(printk("qla2x00_set_host_data(%ld): exiting.\n",
-	    ha->host_no);)
+	DEBUG9(printk("%s(%ld): inst=%ld exiting.\n",
+	    __func__, ha->host_no, ha->instance);)
 
-	return (rval);
+	return (ret);
 }
 
+/*
+ * qla2x00_set_rnid_params
+ *	IOCTL to set RNID parameters of the adapter.
+ *
+ * Input:
+ *	ha = adapter state pointer.
+ *	pext = User space CT arguments pointer.
+ *	mode = flags.
+ *
+ * Returns:
+ *	0 = success
+ *	others = errno value
+ *
+ * Context:
+ *	Kernel context.
+ */
 STATIC int
 qla2x00_set_rnid_params(scsi_qla_host_t *ha, EXT_IOCTL *pext, int mode)
 {
-	EXT_SET_RNID_REQ	tmp_set;
+	EXT_SET_RNID_REQ	*tmp_set;
 	EXT_RNID_DATA	*tmp_buf;
-	int		rval = 0;
+	int		ret = 0;
+	int		tmp_rval = 0;
 	uint16_t	mb[MAILBOX_REGISTER_COUNT];
 
-	DEBUG9(printk("qla2x00_set_rnid_params(%ld): entered.\n",
-	    ha->host_no);)
+	DEBUG9(printk("%s(%ld): inst=%ld entered.\n",
+	    __func__, ha->host_no, ha->instance);)
 
 	if (pext->RequestLen != sizeof(EXT_SET_RNID_REQ)) {
 		/* parameter error */
 		pext->Status = EXT_STATUS_INVALID_PARAM;
-		DEBUG9_10(printk("qla2x00_set_rnid_params(%ld): invalid "
-		    "request length.\n",
-		    ha->host_no);)
-		return(0);
+		DEBUG9_10(printk("%s(%ld): inst=%ld invalid request length.\n",
+		    __func__, ha->host_no, ha->instance);)
+		return(ret);
 	}
 
-	rval = verify_area(VERIFY_READ, (void *)pext->RequestAdr,
+	ret = verify_area(VERIFY_READ, (void *)pext->RequestAdr,
 	    pext->RequestLen);
 
-	if (rval != 0) {
+	if (ret != 0) {
 		pext->Status = EXT_STATUS_COPY_ERR;
-		DEBUG9_10(printk(
-		    "qla2x00_set_rnid_params(%ld): verify READ request buf.\n",
-		    ha->host_no);)
-		return(EFAULT);
+		DEBUG9_10(printk("%s(%ld): inst=%ld verify READ request buf.\n",
+		    __func__, ha->host_no, ha->instance);)
+		return(ret);
 	}
 
-	rval = copy_from_user(&tmp_set, pext->RequestAdr, pext->RequestLen);
-	if (rval) {
+	if (qla2x00_get_ioctl_scrap_mem(ha, (void **)&tmp_set,
+	    sizeof(EXT_SET_RNID_REQ))) {
+		/* not enough memory */
+		pext->Status = EXT_STATUS_NO_MEMORY;
+		DEBUG9_10(printk("%s(%ld): inst=%ld scrap not big enough. "
+		    "size requested=%d.\n",
+		    __func__, ha->host_no, ha->instance,
+		    sizeof(EXT_SET_RNID_REQ));)
+		return (ret);
+	}
+
+	ret = copy_from_user(tmp_set, pext->RequestAdr, pext->RequestLen);
+	if (ret) {
 		pext->Status = EXT_STATUS_COPY_ERR;
 		DEBUG9_10(printk(
-		    "qla2x00_set_rnid_params(%ld): ERROR copy_from_user() "
-		    "failed (%d)\n", 
-		    ha->host_no,
-		    rval);)
-		return(EFAULT);
+		    "%s(%ld): inst=%ld ERROR copy req buf ret=%d\n", 
+		    __func__, ha->host_no, ha->instance, ret);)
+		qla2x00_free_ioctl_scrap_mem(ha);
+		return(ret);
 	}
 
-	rval = qla2x00_get_rnid_params_mbx(ha, ha->ioctl_mem_phys,
+	tmp_rval = qla2x00_get_rnid_params_mbx(ha, ha->ioctl_mem_phys,
 	    sizeof(EXT_RNID_DATA), &mb[0]);
-	if (rval != QLA2X00_SUCCESS) {
+	if (tmp_rval != QLA2X00_SUCCESS) {
 		/* error */
 		pext->Status = EXT_STATUS_ERR;
 
-                DEBUG9_10(printk(
-                    "qla2x00_set_rnid_params(%ld): read cmd FAILED=%x.\n",
-                    ha->host_no, mb[0]);)
-		return (0);
+                DEBUG9_10(printk("%s(%ld): inst=%ld read cmd FAILED=%x.\n",
+                    __func__, ha->host_no, ha->instance, mb[0]);)
+		qla2x00_free_ioctl_scrap_mem(ha);
+		return (ret);
 	}
 
 	tmp_buf = (EXT_RNID_DATA *)ha->ioctl_mem;
 	/* Now set the params. */
-	memcpy(tmp_buf->IPVersion, tmp_set.IPVersion, 2);
-	memcpy(tmp_buf->UDPPortNumber, tmp_set.UDPPortNumber, 2);
-	memcpy(tmp_buf->IPAddress, tmp_set.IPAddress, 16);
-	rval = qla2x00_set_rnid_params_mbx(ha, ha->ioctl_mem_phys,
+	memcpy(tmp_buf->IPVersion, tmp_set->IPVersion, 2);
+	memcpy(tmp_buf->UDPPortNumber, tmp_set->UDPPortNumber, 2);
+	memcpy(tmp_buf->IPAddress, tmp_set->IPAddress, 16);
+	tmp_rval = qla2x00_set_rnid_params_mbx(ha, ha->ioctl_mem_phys,
 	    sizeof(EXT_RNID_DATA), &mb[0]);
 
-	if (rval != QLA2X00_SUCCESS) {
+	if (tmp_rval != QLA2X00_SUCCESS) {
 		/* error */
 		pext->Status = EXT_STATUS_ERR;
 
-		DEBUG9_10(printk(
-		    "qla2x00_set_rnid_params(%ld): set cmd FAILED=%x.\n",
-		    ha->host_no, mb[0]);)
-		rval = 0;
+		DEBUG9_10(printk("%s(%ld): inst=%ld set cmd FAILED=%x.\n",
+		    __func__, ha->host_no, ha->instance, mb[0]);)
 	} else {
 		pext->Status = EXT_STATUS_OK;
-		DEBUG9(printk(
-		    "qla2x00_set_rnid_params(%ld): exiting normally.\n",
-		    ha->host_no);)
+		DEBUG9(printk("%s(%ld): inst=%ld exiting normally.\n",
+		    __func__, ha->host_no, ha->instance);)
 	}
 
-	return (rval);
+	qla2x00_free_ioctl_scrap_mem(ha);
+	return (ret);
 }
 
+/*
+ * qla2x00_waitq_sem_timeout
+ *	Timeout function to be called when a thread on the wait_q
+ *	queue timed out.
+ *
+ * Input:
+ *	data = data pointer for timeout function.
+ *
+ * Returns:
+ *	qla2x00 local function return status code.
+ *
+ * Context:
+ *	Kernel context.
+ */
 STATIC void
 qla2x00_waitq_sem_timeout(unsigned long data)
 {
 	wait_q_t *tmp_ptr = (wait_q_t *)data;
 
-	DEBUG9(printk("qla2x00_sem_timeout: entered.\n");)
+	DEBUG9(printk("%s: entered.\n", __func__);)
 
-	if (tmp_ptr != NULL)
+	if (tmp_ptr != NULL) {
+		DEBUG9(printk("%s: wait_q thread=%p.\n", __func__, tmp_ptr);)
 		up(&tmp_ptr->wait_q_sem);
+	}
+
+	DEBUG9(printk("%s: exiting.\n", __func__);)
 
-	DEBUG9(printk("qla2x00_sem_timeout: exiting.\n");)
 }
 
 /*
- *  tov = timeout value in seconds
+ * qla2x00_get_ioctl_access
+ *	Serialization routine for the ioctl commands.
+ *	When succeeded the exiting thread gains "access" and
+ *	proceeds, otherwise it gives up and returns error.
+ *	Each thread would wait tov seconds before giving up.
+ *
+ * Input:
+ *	ha = adapter state pointer.
+ *	tov = timeout value in seconds
+ *
+ * Returns:
+ *	qla2x00 local function return status code.
+ *
+ * Context:
+ *	Kernel context.
  */
 STATIC uint8_t
 qla2x00_get_ioctl_access(scsi_qla_host_t *ha, uint32_t tov)
 {
 	int		prev_val = 1;
-	uint8_t		ret;
+	uint8_t		rval = QL_STATUS_SUCCESS;
 	unsigned long	cpu_flags;
 	struct timer_list	tmp_access_timer;
 	wait_q_t	*ptmp_wq = NULL;
 
 
-	DEBUG9(printk("qla2x00_get_ioctl_access(%ld): entered.\n",
-	    ha->host_no);)
+	DEBUG9(printk("%s(%ld): inst=%ld entered.\n",
+	    __func__, ha->host_no, ha->instance);)
 
 	while (1) {
 		if (test_bit(IOCTL_WANT, (void *)&(ha->ioctl->access_bits)) ==
 		    0) {
 
-			DEBUG9(printk("qla2x00_get_ioctl_access(%ld): going "
-			    " to test access_bits.\n", ha->host_no);)
+			DEBUG9(printk("%s(%ld): going to test access_bits.\n",
+			    __func__, ha->host_no);)
 
 			/* No one else is waiting. Go ahead and try to
 			 * get access.
@@ -4322,9 +6197,10 @@ qla2x00_get_ioctl_access(scsi_qla_host_t
 		}
 
 		/* wait for previous command to finish */
-		DEBUG9(printk("qla2x00_get_ioctl_access(%ld): access_bits=%x. "
-		    "busy. Waiting for access. curr time=0x%lx.\n",
-		    ha->host_no, ha->ioctl->access_bits, jiffies);)
+		DEBUG9(printk("%s(%ld): inst=%ld access_bits=%x. busy. "
+		    "Waiting for access. curr time=0x%lx.\n",
+		    __func__, ha->host_no, ha->instance,
+		    ha->ioctl->access_bits, jiffies);)
 
 		/*
 		 * Init timer and get semaphore from wait_q. if we got valid
@@ -4335,8 +6211,8 @@ qla2x00_get_ioctl_access(scsi_qla_host_t
 
 		if (ptmp_wq == NULL) {
 			/* queue full? problem? can't proceed. */
-			DEBUG9_10(printk("qla2x00_get_ioctl_access(%ld): ERROR "
-			    "no more wait_q allowed. exiting.\n", ha->host_no);)
+			DEBUG9_10(printk("%s(%ld): ERROR no more wait_q "
+			    "allowed. exiting.\n", __func__, ha->host_no);)
 
 			break;
 		}
@@ -4348,20 +6224,22 @@ qla2x00_get_ioctl_access(scsi_qla_host_t
 		    (void (*)(unsigned long))qla2x00_waitq_sem_timeout;
 		tmp_access_timer.expires = jiffies + tov * HZ;
 
-		DEBUG9(printk("get_ioctl_access(%ld): adding timer. "
+		DEBUG9(printk("%s(%ld): adding timer. "
 		    "curr time=0x%lx timeoutval=0x%lx.\n",
-		    ha->host_no, jiffies, tmp_access_timer.expires);)
+		    __func__, ha->host_no, jiffies, tmp_access_timer.expires);)
 
 		/* wait. */
 		add_timer(&tmp_access_timer);
 
-		DEBUG9(printk("get_ioctl_access(%ld): going to sleep. current "
-		    "time=0x%lx.\n", ha->host_no, jiffies);)
+		DEBUG9(printk("%s(%ld): inst=%ld wait_q %p going to sleep. "
+		    "current time=0x%lx.\n",
+		    __func__, ha->host_no, ha->instance, ptmp_wq, jiffies);)
 
 		down_interruptible(&ptmp_wq->wait_q_sem);
 
-		DEBUG9(printk("get_ioctl_access(%ld): woke up. current "
-		    "time=0x%lx.\n", ha->host_no, jiffies);)
+		DEBUG9(printk("%s(%ld): inst=%ld wait_q %p woke up. current "
+		    "time=0x%lx.\n",
+		    __func__, ha->host_no, ha->instance, ptmp_wq, jiffies);)
 
 		del_timer(&tmp_access_timer);
 
@@ -4378,8 +6256,14 @@ qla2x00_get_ioctl_access(scsi_qla_host_t
 		 * new thread might grab it before we did.
 		 */
 		spin_lock_irqsave(&ha->ioctl->wait_q_lock, cpu_flags);
+		if (prev_val != 0) {
+			/* We'll return with error.
+			 * Make sure we remove ourselves from wait_q.
+			 */
+			qla2x00_wait_q_remove(ha, ptmp_wq);
+		}
 		if (ha->ioctl->wait_q_head == NULL) {
-			/* We're the last thread in queue. */
+			/* We're the last thread in wait_q queue. */
 			clear_bit(IOCTL_WANT, (void *)&ha->ioctl->access_bits);
 		}
 		qla2x00_wait_q_memb_free(ha, ptmp_wq);
@@ -4391,47 +6275,74 @@ qla2x00_get_ioctl_access(scsi_qla_host_t
 	if (prev_val == 0) {
 		/* We got the lock */
 
-		DEBUG9(printk("qla2x00_get_ioctl_access(%ld): got access.\n",
-					ha->host_no);)
+		DEBUG9(printk("%s(%ld): inst=%ld got access.\n",
+		    __func__, ha->host_no, ha->instance);)
 
-		ret = QL_STATUS_SUCCESS;
 	} else {
 		/* Timeout or resource error. */
-		DEBUG9_10(printk("qla2x00_get_ioctl_access(%ld): timed out "
-		    "or wait_q error.\n", ha->host_no);)
+		DEBUG9_10(printk("%s(%ld): inst=%ld timed out "
+		    "or wait_q error.\n", __func__, ha->host_no, ha->instance);)
 
-		ret = QL_STATUS_TIMEOUT;
+		rval = QL_STATUS_TIMEOUT;
 	}
 
-	return ret;
+	return (rval);
 }
 
+/*
+ * qla2x00_release_ioctl_access
+ *	Serialization routine for the ioctl commands.
+ *	This releases "access" and checks on wai_q queue. If there's
+ *	another thread waiting then wakes it up.
+ *
+ * Input:
+ *	ha = adapter state pointer.
+ *	tov = timeout value in seconds
+ *
+ * Returns:
+ *	qla2x00 local function return status code.
+ *
+ * Context:
+ *	Kernel context.
+ */
 STATIC uint8_t
 qla2x00_release_ioctl_access(scsi_qla_host_t *ha)
 {
 	wait_q_t	*next_thread = NULL;
 
-	DEBUG9(printk("qla2x00_release_ioctl_access:(%ld): entered.\n",
-	    ha->host_no);)
+	DEBUG9(printk("%s(%ld): inst=%ld entered.\n",
+	    __func__, ha->host_no, ha->instance);)
 
 	clear_bit(IOCTL_ACTIVE, (void *)&(ha->ioctl->access_bits));
 
 	/* Wake up one pending ioctl thread in wait_q */
-	qla2x00_wait_q_remove(ha, &next_thread);
+	qla2x00_wait_q_get_next(ha, &next_thread);
 	if (next_thread) {
-		DEBUG9(printk("qla2x00_release_ioctl_access: found wait_q. "
-		    "Waking up waitq %p.\n", &next_thread);)
+		DEBUG9(printk(
+		    "%s(%ld): inst=%ld found wait_q. Wake up waitq %p\n",
+		    __func__, ha->host_no, ha->instance, &next_thread);)
 		up(&next_thread->wait_q_sem);
 	}
 
-	DEBUG9(printk("qla2x00_release_ioctl_access:(%ld): exiting.\n",
-	    ha->host_no);)
+	DEBUG9(printk("%s(%ld): inst=%ld exiting.\n",
+	    __func__, ha->host_no, ha->instance);)
 
 	return QL_STATUS_SUCCESS;
 }
 
-/* Find a free wait_q member from the array. Must already got the
- * wait_q_lock spinlock.
+/*
+ * qla2x00_wait_q_memb_alloc
+ *	Finds a free wait_q member from the array. Must already got the
+ *	wait_q_lock spinlock.
+ *
+ * Input:
+ *	ha = adapter state pointer.
+ *
+ * Returns:
+ *	qla2x00 local function return status code.
+ *
+ * Context:
+ *	Kernel context.
  */
 STATIC void
 qla2x00_wait_q_memb_alloc(scsi_qla_host_t *ha, wait_q_t **ret_wait_q_memb)
@@ -4439,8 +6350,8 @@ qla2x00_wait_q_memb_alloc(scsi_qla_host_
 	uint8_t		i;
 	wait_q_t	*ptmp = NULL;
 
-	DEBUG9(printk("qla2x00_wait_q_memb_alloc: entered. "
-	    "Inst=%d.\n", apiHBAInstance);)
+	DEBUG9(printk("%s(%ld): inst=%ld entered.\n",
+	    __func__, ha->host_no, ha->instance);)
 
 	for (i = 0; i < MAX_IOCTL_WAIT_THREADS; i++) {
 		if (!(ha->ioctl->wait_q_arr[i].flags & WQ_IN_USE)) {
@@ -4452,46 +6363,73 @@ qla2x00_wait_q_memb_alloc(scsi_qla_host_
 
 	*ret_wait_q_memb = ptmp;
 
-	DEBUG9(printk("qla2x00_wait_q_memb_alloc: return waitq_memb=%p. "
-	    "Inst=%d.\n", *ret_wait_q_memb, apiHBAInstance);)
+	DEBUG9(printk("%s(%ld): inst=%ld return waitq_memb=%p.\n",
+	    __func__, ha->host_no, ha->instance, *ret_wait_q_memb);)
 }
 
-/* Free the specified wait_q member. Must already got the wait_q_lock
- * spinlock.
+/*
+ * qla2x00_wait_q_memb_free
+ *	Frees the specified wait_q member. Must already got the wait_q_lock
+ *	spinlock.
+ *
+ * Input:
+ *	ha = adapter state pointer.
+ *
+ * Returns:
+ *	qla2x00 local function return status code.
+ *
+ * Context:
+ *	Kernel context.
  */
 STATIC void
 qla2x00_wait_q_memb_free(scsi_qla_host_t *ha, wait_q_t *pfree_wait_q_memb)
 {
-	DEBUG9(printk("qla2x00_wait_q_memb_free: entered. "
-	    "Inst=%d.\n", apiHBAInstance);)
+	DEBUG9(printk("%s(%ld): inst=%ld entered.\n",
+	    __func__, ha->host_no, ha->instance);)
 
-	if (pfree_wait_q_memb != NULL)
+	if (pfree_wait_q_memb != NULL) {
+		DEBUG9(printk("%s(%ld): freeing %p.\n",
+		    __func__, ha->host_no, pfree_wait_q_memb);)
 		pfree_wait_q_memb->flags &= ~WQ_IN_USE;
+	}
 
-	DEBUG9(printk("qla2x00_wait_q_memb_free: exiting. "
-	    "Inst=%d.\n", apiHBAInstance);)
+	DEBUG9(printk("%s(%ld): inst=%ld exiting.\n",
+	    __func__, ha->host_no, ha->instance);)
 }
 
-/* Allocates a wait_q_t struct and add to the wait_q list. */
+/*
+ * qla2x00_wait_q_add
+ *	Allocates a wait_q_t struct and add to the wait_q list.
+ *
+ * Input:
+ *	ha = adapter state pointer.
+ *
+ * Returns:
+ *	qla2x00 local function return status code.
+ *
+ * Context:
+ *	Kernel context.
+ */
 STATIC uint8_t
 qla2x00_wait_q_add(scsi_qla_host_t *ha, wait_q_t **ret_wq)
 {
-	uint8_t		ret;
+	uint8_t		rval = QL_STATUS_SUCCESS;
 	unsigned long	cpu_flags;
 	wait_q_t	*ptmp = NULL;
 
 	spin_lock_irqsave(&ha->ioctl->wait_q_lock, cpu_flags);
 
-	DEBUG9(printk("qla2x00_wait_q_add: got wait_q spinlock. "
-	    "Inst=%d.\n", apiHBAInstance);)
+	DEBUG9(printk("%s(%ld): inst=%ld got wait_q spinlock.\n",
+	    __func__, ha->host_no, ha->instance);)
 
 	qla2x00_wait_q_memb_alloc(ha, &ptmp);
 	if (ptmp == NULL) {
 		/* can't add any more threads */
-		DEBUG9_10(printk("qla2x00_wait_q_add: ERROR no more "
-		    "ioctl threads allowed. Inst=%d.\n", apiHBAInstance);)
+		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR no more ioctl "
+		    "threads allowed.\n",
+		    __func__, ha->host_no, ha->instance);)
 
-		ret = QL_STATUS_RESOURCE_ERROR;
+		rval = QL_STATUS_RESOURCE_ERROR;
 	} else {
 		if (ha->ioctl->wait_q_tail == NULL) {
 			/* First thread to queue. */
@@ -4509,43 +6447,121 @@ qla2x00_wait_q_add(scsi_qla_host_t *ha, 
 
 		init_MUTEX_LOCKED(&ptmp->wait_q_sem);
 
-		ret = QL_STATUS_SUCCESS;
+		rval = QL_STATUS_SUCCESS;
 	}
 
-	DEBUG9(printk("qla2x00_wait_q_add: going to release spinlock. "
-	    "ret_wq=%p, ret=%d. Inst=%d.\n", *ret_wq, ret, apiHBAInstance);)
+	DEBUG9(printk("%s(%ld): inst=%ld going to release spinlock. "
+	    "ret_wq=%p, rval=%d.\n",
+	    __func__, ha->host_no, ha->instance, *ret_wq, rval);)
 
 	spin_unlock_irqrestore(&ha->ioctl->wait_q_lock, cpu_flags);
 
-	return ret;
+	return rval;
 }
 
-/* Just remove one member from wait_q.  Don't free anything. */
+/*
+ * qla2x00_wait_q_get_next
+ *	This just removes one member from head of wait_q.
+ *
+ * Input:
+ *	ha = adapter state pointer.
+ *
+ * Returns:
+ *	qla2x00 local function return status code.
+ *
+ * Context:
+ *	Kernel context.
+ */
 STATIC void
-qla2x00_wait_q_remove(scsi_qla_host_t *ha, wait_q_t **ret_wq)
+qla2x00_wait_q_get_next(scsi_qla_host_t *ha, wait_q_t **ret_wq)
 {
 	unsigned long	cpu_flags;
 
+	if (test_bit(IOCTL_ACTIVE, (void *)&(ha->ioctl->access_bits)) != 0) {
+		/* Another thread just became active. Exit. */
+		*ret_wq = NULL;
+		return;
+	}
+
+	/* Find the next thread to wake up */
 	spin_lock_irqsave(&ha->ioctl->wait_q_lock, cpu_flags);
 
-	DEBUG9(printk("qla2x00_wait_q_remove: got wait_q spinlock. "
-	    "Inst=%d.\n", apiHBAInstance);)
+	DEBUG9(printk("%s(%ld): inst=%ld got wait_q spinlock.\n",
+	    __func__, ha->host_no, ha->instance);)
 
 	/* Remove from head */
 	*ret_wq = ha->ioctl->wait_q_head;
 	if (ha->ioctl->wait_q_head != NULL) {
+
 		ha->ioctl->wait_q_head = ha->ioctl->wait_q_head->pnext;
+
 		if (ha->ioctl->wait_q_head == NULL) {
 			/* That's the last one in queue. */
 			ha->ioctl->wait_q_tail = NULL;
 		}
+
 		(*ret_wq)->pnext = NULL;
 	}
 
-	DEBUG9(printk("qla2x00_wait_q_remove: return ret_wq=%p. Going to "
-	    "release spinlock. Inst=%d.\n", *ret_wq, apiHBAInstance);)
-
+	DEBUG9(printk("%s(%ld): inst=%ld return ret_wq=%p. Going to release "
+	    "spinlock.\n",
+	    __func__, ha->host_no, ha->instance, *ret_wq);)
 	spin_unlock_irqrestore(&ha->ioctl->wait_q_lock, cpu_flags);
 }
 
+/*
+ * qla2x00_wait_q_remove
+ *	Removes the specified member from wait_q.
+ *	Must already got the wait_q_lock spin lock.
+ *
+ * Input:
+ *	ha = adapter state pointer.
+ *
+ * Returns:
+ *	qla2x00 local function return status code.
+ *
+ * Context:
+ *	Kernel context.
+ */
+STATIC void
+qla2x00_wait_q_remove(scsi_qla_host_t *ha, wait_q_t *rem_wq)
+{
+	wait_q_t	*ptmp_wq;
+	wait_q_t	*ptmp_prev;
+
+	DEBUG9(printk("%s(%ld): inst=%ld rem_wq=%p.\n",
+	    __func__, ha->host_no, ha->instance, rem_wq);)
+
+	/* Search then remove */
+	ptmp_prev = NULL;
+	for (ptmp_wq = ha->ioctl->wait_q_head; ptmp_wq != NULL;
+	    ptmp_wq = ptmp_wq->pnext) {
+
+		if (ptmp_wq == rem_wq) {
+			/* Found it in wait_q. Remove. */
+
+			DEBUG9(printk("%s(%ld): inst=%ld removing.\n",
+			    __func__, ha->host_no, ha->instance);)
+
+			if (ha->ioctl->wait_q_head == ptmp_wq) {
+				ha->ioctl->wait_q_head = ptmp_wq->pnext;
+			} else {
+				ptmp_prev->pnext = ptmp_wq->pnext;
+			}
+
+			if (ha->ioctl->wait_q_tail == ptmp_wq) {
+				ha->ioctl->wait_q_tail = ptmp_prev;
+			}
+
+			ptmp_wq->pnext = NULL;
+
+			break;
+		}
+		ptmp_prev = ptmp_wq;
+	}
+
+	DEBUG9(printk("%s(%ld): inst=%ld exiting.\n",
+	    __func__, ha->host_no, ha->instance);)
+}
+
 
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/qla2xxx/qla_cfg.c linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/qla2xxx/qla_cfg.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/qla2xxx/qla_cfg.c	2003-07-30 13:51:37.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/qla2xxx/qla_cfg.c	2003-07-30 10:28:03.000000000 +0200
@@ -2,7 +2,7 @@
  *                  QLOGIC LINUX SOFTWARE
  *
  * QLogic ISP2x00 device driver for Linux 2.4.x
- * Copyright (C) 2002 Qlogic Corporation
+ * Copyright (C) 2003 Qlogic Corporation
  * (www.qlogic.com)
  *
  * This program is free software; you can redistribute it and/or modify it
@@ -35,40 +35,48 @@
 /*
  *  Local Function Prototypes.
  */
-static mp_path_t * qla2x00_select_next_path(mp_host_t *host, mp_device_t *dp, uint8_t);
 
 static uint32_t qla2x00_add_portname_to_mp_dev(mp_device_t *, uint8_t *);
+
 static mp_device_t * qla2x00_allocate_mp_dev(uint8_t *, uint8_t *);
-static mp_path_t * qla2x00_allocate_path(mp_host_t *host, uint16_t path_id,
-                fc_port_t *port, uint16_t dev_id);
+static mp_path_t * qla2x00_allocate_path(mp_host_t *, uint16_t, fc_port_t *,
+    uint16_t);
+static mp_path_list_t * qla2x00_allocate_path_list(void);
+
+mp_host_t * qla2x00_cfg_find_host(scsi_qla_host_t *);
 static mp_host_t * qla2x00_find_host_by_name(uint8_t *);
+
 static mp_device_t * qla2x00_find_or_allocate_mp_dev (mp_host_t *, uint16_t,
-                fc_port_t *);
-static mp_path_t  * qla2x00_find_or_allocate_path(mp_host_t *, mp_device_t *,
-                uint16_t, fc_port_t	*);
-static uint32_t qla2x00_send_failover_notify(mp_device_t *, uint8_t lun,
-                mp_path_t *new_path, mp_path_t *old_path);
-static BOOL qla2x00_update_mp_host( mp_host_t  *);
+    fc_port_t *);
+static mp_path_t * qla2x00_find_or_allocate_path(mp_host_t *, mp_device_t *,
+    uint16_t, fc_port_t *);
+
+static uint32_t qla2x00_cfg_register_failover_lun(mp_device_t *,srb_t *,
+    fc_lun_t *);
+static uint32_t qla2x00_send_failover_notify(mp_device_t *, uint8_t,
+    mp_path_t *, mp_path_t *);
+static mp_path_t * qla2x00_select_next_path(mp_host_t *, mp_device_t *,
+    uint8_t);
+
+static BOOL qla2x00_update_mp_host(mp_host_t  *);
 static uint32_t qla2x00_update_mp_tree (void);
+
 static fc_lun_t *qla2x00_find_matching_lun(uint8_t , mp_path_t *);
-static mp_path_t *qla2x00_find_path_by_id(mp_device_t *, uint8_t );
-static mp_device_t  *qla2x00_find_mp_dev_by_id(mp_host_t *, uint8_t );
-static mp_device_t  *qla2x00_find_mp_dev_by_name(mp_host_t *, uint8_t *);
+static mp_path_t *qla2x00_find_path_by_id(mp_device_t *, uint8_t);
+static mp_device_t *qla2x00_find_mp_dev_by_id(mp_host_t *, uint8_t);
+static mp_device_t *qla2x00_find_mp_dev_by_name(mp_host_t *, uint8_t *);
+
+static mp_path_t *qla2x00_get_visible_path(mp_device_t *dp);
+static void qla2x00_map_os_targets(mp_host_t *);
+static void qla2x00_map_os_luns(mp_host_t *, mp_device_t *, uint16_t);
+static BOOL qla2x00_map_a_oslun(mp_host_t *, mp_device_t *, uint16_t, uint16_t);
+
 static BOOL qla2x00_is_ww_name_zero(uint8_t *);
 static void qla2x00_add_path(mp_path_list_t *, mp_path_t *);
 static BOOL qla2x00_is_portname_in_device(mp_device_t *, uint8_t *);
-static void qla2x00_failback_luns( mp_host_t  *);
-static void qla2x00_failback_single_lun( mp_device_t *dp, uint8_t lun, uint8_t new);
-static void qla2x00_setup_new_path( mp_device_t *, mp_path_t *);
-static void qla2x00_map_os_targets(mp_host_t *);
-static void qla2x00_map_os_luns(mp_host_t *, mp_device_t *, uint16_t );
-mp_host_t * qla2x00_cfg_find_host(scsi_qla_host_t *ha);
-static mp_path_list_t * qla2x00_allocate_path_list( void );
-static uint32_t
-qla2x00_cfg_register_failover_lun(mp_device_t *,srb_t *, fc_lun_t *);
-static BOOL
-qla2x00_map_a_oslun(mp_host_t *, mp_device_t *, uint16_t , uint16_t );
-static mp_path_t *qla2x00_get_visible_path(mp_device_t 	*dp);
+static void qla2x00_failback_single_lun(mp_device_t *, uint8_t, uint8_t);
+static void qla2x00_failback_luns(mp_host_t *);
+static void qla2x00_setup_new_path(mp_device_t *, mp_path_t *);
 
 /*
  * Global data items
@@ -280,9 +288,9 @@ qla2x00_cfg_event_notify(scsi_qla_host_t
  * Returns:
  *      pointer to new fc_lun_t, or NULL if failover fails.
  */
-fc_lun_t	*
+fc_lun_t *
 qla2x00_cfg_failover(scsi_qla_host_t *ha, fc_lun_t *fp,
-                     os_tgt_t *tgt, srb_t *sp)
+    os_tgt_t *tgt, srb_t *sp)
 {
 	mp_host_t	*host;			/* host adapter pointer */
 	mp_device_t	*dp;			/* virtual device pointer */
@@ -340,56 +348,207 @@ qla2x00_cfg_failover(scsi_qla_host_t *ha
  *
  * Return;
  *      0 on success or errno.
+ *	driver ioctl errors are returned via cmd->Status.
  *
  * Context:
  *      Kernel context.
  */
-uint32_t
+int
 qla2x00_cfg_get_paths(EXT_IOCTL *cmd, FO_GET_PATHS *bp, int mode)
 {
 	FO_PATHS_INFO	*paths,	*u_paths;
 	FO_PATH_ENTRY	*entry;
 	EXT_DEST_ADDR   *sap = &bp->HbaAddr;
-	mp_host_t	*host;		/* host adapter pointer */
+	mp_host_t	*host = NULL;	/* host adapter pointer */
 	mp_device_t	*dp;		/* virtual device pointer */
 	mp_path_t	*path;		/* path pointer */
 	mp_path_list_t	*path_list;	/* path list pointer */
 	int	cnt;
-	uint32_t	rval = 0;
+	int	rval = 0;
 	scsi_qla_host_t *ha;
 
+	DEBUG9(printk("%s: entered.\n", __func__);)
+
 	u_paths = (FO_PATHS_INFO *) cmd->ResponseAdr;
 	ha = qla2x00_get_hba((int)bp->HbaInstance);
 
-	if ((host = qla2x00_cfg_find_host(ha)) == NULL) {
+	if (!ha) {
+		DEBUG2_9_10(printk("%s: no ha matching inst %d.\n",
+		    __func__, bp->HbaInstance);)
+
 		cmd->Status = EXT_STATUS_DEV_NOT_FOUND;
-		cmd->DetailStatus = EXT_DSTATUS_HBA_INST;
-		DEBUG4(printk("qla2x00_get_paths: cannot find target (%ld)\n",
-				ha->instance);)
-		return ENODEV;
+		return (rval);
 	}
 
+	if (ha->flags.failover_enabled)
+		if ((host = qla2x00_cfg_find_host(ha)) == NULL) {
+			cmd->Status = EXT_STATUS_DEV_NOT_FOUND;
+			cmd->DetailStatus = EXT_DSTATUS_HBA_INST;
+			DEBUG4(printk("%s: cannot find target (%ld)\n",
+			    __func__, ha->instance);)
+			DEBUG9_10(printk("%s: cannot find host inst(%ld).\n",
+			    __func__, ha->instance);)
+
+			return rval;
+		}
+
 	if ((paths = (FO_PATHS_INFO *)kmem_zalloc(sizeof(FO_PATHS_INFO),
-					GFP_ATOMIC,20)) == NULL) {
+	    GFP_ATOMIC,20)) == NULL) {
+
+		DEBUG4(printk("%s: failed to allocate memory of size (%d)\n",
+		    __func__, (int)sizeof(FO_PATHS_INFO));)
+		DEBUG9_10(printk("%s: failed allocate memory size(%d).\n",
+		    __func__, (int)sizeof(FO_PATHS_INFO));)
 
-		DEBUG4(printk("qla_cfg_get_paths: failed to allocate memory "
-				"of size (%d)\n",
-				(int)sizeof(FO_PATHS_INFO));)
-		return 1;
+		cmd->Status = EXT_STATUS_NO_MEMORY;
+
+		return -ENOMEM;
 	}
 
-	/* Scan for mp_dev by nodename *ONLY* */
-	if (sap->DestType != EXT_DEF_DESTTYPE_WWNN) {
+	if (!ha->flags.failover_enabled) {
+		/* non-fo case. There's only one path. */
+
+		mp_path_list_t	*ptmp_plist;
+#define STD_MAX_PATH_CNT	1
+#define STD_VISIBLE_INDEX	0
+		fc_port_t		*pfcport = NULL;
+
+		DEBUG9(printk("%s: non-fo case.\n", __func__);)
+
+		if (qla2x00_get_ioctl_scrap_mem(ha, (void **)&ptmp_plist,
+		    sizeof(mp_path_list_t))) {
+			/* not enough memory */
+			DEBUG9_10(printk("%s(%ld): inst=%ld scrap not big enough. "
+			    "lun_mask requested=%d.\n",
+			    __func__, ha->host_no, ha->instance,
+			    sizeof(mp_path_list_t));)
+			cmd->Status = EXT_STATUS_NO_MEMORY;
+
+			return -ENOMEM;
+		}
+
+		for (pfcport = ha->fcport; pfcport != NULL;
+		    pfcport = pfcport->next) {
+
+			if (memcmp(pfcport->node_name, sap->DestAddr.WWNN,
+			    EXT_DEF_WWN_NAME_SIZE) == 0) {
+				break;
+			}
+		}
+
+		if (pfcport) {
+			DEBUG9(printk("%s: found fcport:"
+			    "(%02x-%02x-%02x-%02x-%02x-%02x-%02x-%02x)\n.",
+			    __func__,
+			    sap->DestAddr.WWNN[0],
+			    sap->DestAddr.WWNN[1],
+			    sap->DestAddr.WWNN[2],
+			    sap->DestAddr.WWNN[3],
+			    sap->DestAddr.WWNN[4],
+			    sap->DestAddr.WWNN[5],
+			    sap->DestAddr.WWNN[6],
+			    sap->DestAddr.WWNN[7]);)
+
+			paths->HbaInstance         = bp->HbaInstance;
+			paths->PathCount           = STD_MAX_PATH_CNT;
+			paths->VisiblePathIndex    = STD_VISIBLE_INDEX;
+
+			/* Copy current path, which is the first one (0). */
+			memcpy(paths->CurrentPathIndex, ptmp_plist->current_path,
+			    sizeof(paths->CurrentPathIndex));
+
+			entry = &(paths->PathEntry[STD_VISIBLE_INDEX]);
+
+			entry->Visible     = TRUE;
+			entry->HbaInstance = bp->HbaInstance;
+
+			memcpy(entry->PortName, pfcport->port_name,
+			    EXT_DEF_WWP_NAME_SIZE);
+
+			rval = verify_area(VERIFY_WRITE, (void *)u_paths,
+			    cmd->ResponseLen);
+			if (rval) {
+				/* error */
+				DEBUG9_10(printk("%s: u_paths %p verify write"
+				    " error. paths->PathCount=%d.\n",
+				    __func__, u_paths, paths->PathCount);)
+			}
+
+			/* Copy data to user */
+			if (rval == 0)
+			 	rval = copy_to_user(&u_paths->PathCount,
+			 	    &paths->PathCount, 4);
+			if (rval == 0)
+				rval = copy_to_user(&u_paths->CurrentPathIndex,
+				    &paths->CurrentPathIndex,
+				    sizeof(paths->CurrentPathIndex));
+			if (rval == 0)
+				rval = copy_to_user(&u_paths->PathEntry,
+				    &paths->PathEntry,
+				    sizeof(paths->PathEntry));
+
+			if (rval) { /* if any of the above failed */
+				DEBUG9_10(printk("%s: data copy failed.\n",
+				    __func__);)
+
+				cmd->Status = EXT_STATUS_COPY_ERR;
+			}
+		} else {
+			cmd->Status = EXT_STATUS_DEV_NOT_FOUND;
+			cmd->DetailStatus = EXT_DSTATUS_TARGET;
+
+			DEBUG10(printk("%s: cannot find fcport "
+			    "(%02x-%02x-%02x-%02x-%02x-%02x-%02x-%02x)\n.",
+			    __func__,
+			    sap->DestAddr.WWNN[0],
+			    sap->DestAddr.WWNN[1],
+			    sap->DestAddr.WWNN[2],
+			    sap->DestAddr.WWNN[3],
+			    sap->DestAddr.WWNN[4],
+			    sap->DestAddr.WWNN[5],
+			    sap->DestAddr.WWNN[6],
+			    sap->DestAddr.WWNN[7]);)
+			DEBUG4(printk("%s: cannot find fcport "
+			    "(%02x-%02x-%02x-%02x-%02x-%02x-%02x-%02x)\n.",
+			    __func__,
+			    sap->DestAddr.WWNN[0],
+			    sap->DestAddr.WWNN[1],
+			    sap->DestAddr.WWNN[2],
+			    sap->DestAddr.WWNN[3],
+			    sap->DestAddr.WWNN[4],
+			    sap->DestAddr.WWNN[5],
+			    sap->DestAddr.WWNN[6],
+			    sap->DestAddr.WWNN[7]);)
+		}
+
+		qla2x00_free_ioctl_scrap_mem(ha);
+		/* end of non-fo case. */
+
+	} else if (sap->DestType != EXT_DEF_DESTTYPE_WWNN) {
+		/* Scan for mp_dev by nodename *ONLY* */
 
 		cmd->Status = EXT_STATUS_INVALID_PARAM;
 		cmd->DetailStatus = EXT_DSTATUS_TARGET;
-		rval = ENODEV;
 
-		DEBUG4(printk("qla2x00_cfg_get_paths: target ca be accessed "
-					"by NodeName only.");)
+		DEBUG4(printk("%s: target can be accessed by NodeName only.",
+		    __func__);)
+		DEBUG10(printk("%s: target can be accessed by NodeName only. "
+		    "got type %d.\n",
+		    __func__, sap->DestType);)
 
 	} else if ((dp = qla2x00_find_mp_dev_by_name(host,
-					sap->DestAddr.WWNN)) != NULL) {
+	    sap->DestAddr.WWNN)) != NULL) {
+		DEBUG9(printk("%s: Found mp_dev:"
+		    "(%02x-%02x-%02x-%02x-%02x-%02x-%02x-%02x)\n.",
+		    __func__,
+		    sap->DestAddr.WWNN[0],
+		    sap->DestAddr.WWNN[1],
+		    sap->DestAddr.WWNN[2],
+		    sap->DestAddr.WWNN[3],
+		    sap->DestAddr.WWNN[4],
+		    sap->DestAddr.WWNN[5],
+		    sap->DestAddr.WWNN[6],
+		    sap->DestAddr.WWNN[7]);)
 
 		path_list = dp->path_list;
 
@@ -399,8 +558,8 @@ qla2x00_cfg_get_paths(EXT_IOCTL *cmd, FO
 
 		/* copy current paths */
 		memcpy(paths->CurrentPathIndex,
-				path_list->current_path,
-				sizeof(paths->CurrentPathIndex));
+		    path_list->current_path,
+		    sizeof(paths->CurrentPathIndex));
 
 		path = path_list->last;
 		for (cnt = 0; cnt < path_list->path_cnt; cnt++) {
@@ -408,43 +567,68 @@ qla2x00_cfg_get_paths(EXT_IOCTL *cmd, FO
 
 			entry->Visible    = (path->id == path_list->visible);
 			entry->HbaInstance = path->host->instance;
+
 			memcpy(entry->PortName,
-					path->portname,
-					EXT_DEF_WWP_NAME_SIZE);
+			    path->portname,
+			    EXT_DEF_WWP_NAME_SIZE);
+
 			path = path->next;
 		}
 
+		rval = verify_area(VERIFY_WRITE, (void *)u_paths,
+		    cmd->ResponseLen);
+		if (rval) {
+			/* error */
+			DEBUG9_10(printk("%s: u_paths %p verify write"
+			    " error. paths->PathCount=%d.\n",
+			    __func__, u_paths, paths->PathCount);)
+		}
+
 		/* copy data to user */
-		copy_to_user(&u_paths->PathCount, &paths->PathCount, 4);
-		copy_to_user(&u_paths->CurrentPathIndex,
-				&paths->CurrentPathIndex,
-				sizeof(paths->CurrentPathIndex));
-		copy_to_user(&u_paths->PathEntry,
-				&paths->PathEntry,
-				sizeof(paths->PathEntry));
+		if (rval == 0)
+			rval = copy_to_user(&u_paths->PathCount,
+			    &paths->PathCount, 4);
+		if (rval == 0)
+			rval = copy_to_user(&u_paths->CurrentPathIndex,
+			    &paths->CurrentPathIndex,
+			    sizeof(paths->CurrentPathIndex));
+		if (rval == 0)
+			rval = copy_to_user(&u_paths->PathEntry,
+			    &paths->PathEntry,
+			    sizeof(paths->PathEntry));
+
+		if (rval != 0) {  /* if any of the above failed */
+			DEBUG9_10(printk("%s: u_paths %p copy"
+			    " error. paths->PathCount=%d.\n",
+			    __func__, u_paths, paths->PathCount);)
+			cmd->Status = EXT_STATUS_COPY_ERR;
+		}
+
 	} else {
 
 		cmd->Status = EXT_STATUS_DEV_NOT_FOUND;
 		cmd->DetailStatus = EXT_DSTATUS_TARGET;
 
-		DEBUG4(printk("qla2x00_cfg_get_paths: cannot find device "
-				"(%02x-%02x-%02x-%02x-%02x-%02x-%02x-%02x)\n.",
-				sap->DestAddr.WWNN[0],
-				sap->DestAddr.WWNN[1],
-				sap->DestAddr.WWNN[2],
-				sap->DestAddr.WWNN[3],
-				sap->DestAddr.WWNN[4],
-				sap->DestAddr.WWNN[5],
-				sap->DestAddr.WWNN[6],
-				sap->DestAddr.WWNN[7]);)
-		rval = ENODEV;
+		DEBUG4(printk("%s: cannot find device "
+		    "(%02x-%02x-%02x-%02x-%02x-%02x-%02x-%02x)\n.",
+		    __func__,
+		    sap->DestAddr.WWNN[0],
+		    sap->DestAddr.WWNN[1],
+		    sap->DestAddr.WWNN[2],
+		    sap->DestAddr.WWNN[3],
+		    sap->DestAddr.WWNN[4],
+		    sap->DestAddr.WWNN[5],
+		    sap->DestAddr.WWNN[6],
+		    sap->DestAddr.WWNN[7]);)
 	}
 
-	KMEM_FREE(paths, sizeof(paths));
+	KMEM_FREE(paths, sizeof(FO_PATHS_INFO));
+
+	DEBUG9(printk("%s: exiting. rval=%d.\n", __func__, rval);)
 
 	return rval;
 
-}
+} /* qla2x00_cfg_get_paths */
 
 /*
  * qla2x00_cfg_set_current_path
@@ -473,92 +657,104 @@ qla2x00_cfg_set_current_path(EXT_IOCTL *
 	scsi_qla_host_t *ha;
 	mp_path_t       *new_path, *old_path;
 
+	DEBUG9(printk("%s: entered.\n", __func__);)
+
 	/* First find the adapter with the instance number. */
 	ha = qla2x00_get_hba((int)bp->HbaInstance);
-	if ((host = qla2x00_cfg_find_host(ha)) != NULL) {
-		set_bit(CFG_ACTIVE, &ha->cfg_flags);
-		sap = &bp->HbaAddr;
-		/* Scan for mp_dev by nodename *ONLY* */
-		if (sap->DestType != EXT_DEF_DESTTYPE_WWNN) {
-			cmd->Status = EXT_STATUS_DEV_NOT_FOUND;
-			cmd->DetailStatus = EXT_DSTATUS_TARGET;
-			rval = ENODEV;
-			DEBUG4(printk("qla2x00_cfg_set_current_path: "
-					"target ca be accessed by "
-					"NodeName only.");)
-		} else if ((dp = qla2x00_find_mp_dev_by_name(
-					host, sap->DestAddr.WWNN)) != NULL) {
-
-			path_list = dp->path_list;
-
-			if (bp->NewCurrentPathIndex < MAX_PATHS_PER_DEVICE &&
-				sap->Lun < MAX_LUNS &&
-				bp->NewCurrentPathIndex < path_list->path_cnt) {
-
-				orig_id = path_list->current_path[sap->Lun];
-
-				DEBUG(printk("qla2x00_set_current_path: "
-					"dev no  %d, lun %d, "
-					"newindex %d, oldindex %d "
-					"nn=%02x%02x%02x%02x%02x%02x%02x%02x\n",
-					dp->dev_id, sap->Lun,
-					bp->NewCurrentPathIndex, orig_id,
-					host->nodename[0], host->nodename[1],
-					host->nodename[2], host->nodename[3],
-					host->nodename[4], host->nodename[5],
-					host->nodename[6], host->nodename[7]);)
-
-				if (bp->NewCurrentPathIndex != orig_id) {
-					/* Acquire the update spinlock. */
-
-					/* Set the new current path. */
-					new_id = path_list->
-						current_path[sap->Lun] =
-							bp->NewCurrentPathIndex;
-
-					/* Release the update spinlock. */
-					old_path = qla2x00_find_path_by_id(
-							dp, orig_id);
-					new_path = qla2x00_find_path_by_id(dp,
-							new_id);
-					new_host = new_path->host;
-					/* remap the lun */
-					qla2x00_map_a_oslun(new_host, dp,
-							dp->dev_id, sap->Lun);
-
-					qla2x00_send_failover_notify(dp,
-							sap->Lun,
-							old_path,
-							new_path);
-				} else {
-					/* EMPTY */
-					DEBUG4(printk(
-						"qla2x00_set_current_path: "
-						"path index not changed.\n");)
-				}
+	if (!ha) {
+		DEBUG2_9_10(printk("%s: no ha matching inst %d.\n",
+		    __func__, bp->HbaInstance);)
+
+		cmd->Status = EXT_STATUS_DEV_NOT_FOUND;
+		return (rval);
+	}
+
+	if (!ha->flags.failover_enabled)
+		/* non-failover mode. nothing to be done. */
+		return 0;
+
+	if ((host = qla2x00_cfg_find_host(ha)) == NULL) {
+		cmd->Status = EXT_STATUS_DEV_NOT_FOUND;
+		cmd->DetailStatus = EXT_DSTATUS_HBA_INST;
+		DEBUG4(printk("%s: cannot find adapter.\n",
+		    __func__);)
+		return (rval);
+	}
+
+	set_bit(CFG_ACTIVE, &ha->cfg_flags);
+	sap = &bp->HbaAddr;
+	/* Scan for mp_dev by nodename *ONLY* */
+	if (sap->DestType != EXT_DEF_DESTTYPE_WWNN) {
+		cmd->Status = EXT_STATUS_DEV_NOT_FOUND;
+		cmd->DetailStatus = EXT_DSTATUS_TARGET;
+		DEBUG4(printk("%s: target can be accessed by NodeName only.",
+		    __func__);)
+		DEBUG9_10(printk("%s: target can be accessed by NodeName only.",
+		    __func__);)
+	} else if ((dp = qla2x00_find_mp_dev_by_name(
+	    host, sap->DestAddr.WWNN)) != NULL) {
+
+		path_list = dp->path_list;
+
+		if (bp->NewCurrentPathIndex < MAX_PATHS_PER_DEVICE &&
+		    sap->Lun < MAX_LUNS &&
+		    bp->NewCurrentPathIndex < path_list->path_cnt) {
+
+			orig_id = path_list->current_path[sap->Lun];
+
+			DEBUG(printk("%s: dev no  %d, lun %d, "
+			    "newindex %d, oldindex %d "
+			    "nn=%02x%02x%02x%02x%02x%02x%02x%02x\n",
+			    __func__, dp->dev_id, sap->Lun,
+			    bp->NewCurrentPathIndex, orig_id,
+			    host->nodename[0], host->nodename[1],
+			    host->nodename[2], host->nodename[3],
+			    host->nodename[4], host->nodename[5],
+			    host->nodename[6], host->nodename[7]);)
+
+			if (bp->NewCurrentPathIndex != orig_id) {
+				/* Acquire the update spinlock. */
+
+				/* Set the new current path. */
+				new_id = path_list-> current_path[sap->Lun] =
+				    bp->NewCurrentPathIndex;
+
+				/* Release the update spinlock. */
+				old_path = qla2x00_find_path_by_id(
+				    dp, orig_id);
+				new_path = qla2x00_find_path_by_id(dp, new_id);
+				new_host = new_path->host;
+
+				/* remap the lun */
+				qla2x00_map_a_oslun(new_host, dp,
+				    dp->dev_id, sap->Lun);
+
+				qla2x00_send_failover_notify(dp,
+				    sap->Lun, old_path, new_path);
 			} else {
-				cmd->Status = EXT_STATUS_INVALID_PARAM;
-				cmd->DetailStatus = EXT_DSTATUS_PATH_INDEX;
-				rval = EINVAL;
-				DEBUG4(printk("qla2x00_set_current_path: "
-					       "invalid index for device.\n");)
+				/* EMPTY */
+				DEBUG4(printk("%s: path index not changed.\n",
+				    __func__);)
 			}
 		} else {
-			cmd->Status = EXT_STATUS_DEV_NOT_FOUND;
-			cmd->DetailStatus = EXT_DSTATUS_TARGET;
-			rval = ENODEV;
-			DEBUG4(printk("qla2x00_set_current_path: "
-				       "cannot find device.\n");)
+			cmd->Status = EXT_STATUS_INVALID_PARAM;
+			cmd->DetailStatus = EXT_DSTATUS_PATH_INDEX;
+			DEBUG4(printk("%s: invalid index for device.\n",
+			    __func__);)
+			DEBUG9_10(printk("%s: invalid index for device.\n",
+			    __func__);)
 		}
-		clear_bit(CFG_ACTIVE, &ha->cfg_flags);
-
 	} else {
 		cmd->Status = EXT_STATUS_DEV_NOT_FOUND;
-		cmd->DetailStatus = EXT_DSTATUS_HBA_INST;
-		rval = ENODEV;
-		DEBUG4(printk("qla2x00_set_current_path: "
-				"cannot find adapter.\n");)
+		cmd->DetailStatus = EXT_DSTATUS_TARGET;
+		DEBUG4(printk("%s: cannot find device.\n",
+		    __func__);)
+		DEBUG9_10(printk("%s: cannot find device.\n",
+		    __func__);)
 	}
+	clear_bit(CFG_ACTIVE, &ha->cfg_flags);
+
+	DEBUG9(printk("%s: exiting. rval = %d.\n", __func__, rval);)
 
 	return rval;
 }
@@ -640,12 +836,12 @@ qla2x00_alloc_host(scsi_qla_host_t *ha)
 
 		if (qla2x00_fo_enabled(host->ha, host->instance)) {
 			host->flags |= MP_HOST_FLAG_FO_ENABLED;
-			DEBUG4(printk("qla2x00_alloc_host: "
-					"Failover enabled.\n");)
+			DEBUG4(printk("%s: Failover enabled.\n",
+			    __func__);)
 		} else {
 			/* EMPTY */
-			DEBUG4(printk("qla2x00_alloc_host: "
-					"Failover disabled.\n");)
+			DEBUG4(printk("%s: Failover disabled.\n",
+			    __func__);)
 		}
 		/* add to list */
 		if (mp_hosts_base == NULL) {
@@ -658,10 +854,10 @@ qla2x00_alloc_host(scsi_qla_host_t *ha)
 		}
 		mp_num_hosts++;
 
-		DEBUG4(printk("Alloc host @ %p\n", host);)
+		DEBUG4(printk("%s: Alloc host @ %p\n", __func__, host);)
 	} else {
 		/* EMPTY */
-		DEBUG4(printk("qla2x00_alloc_host: Failed\n");)
+		DEBUG4(printk("%s: Failed\n", __func__);)
 	}
 
 	return host;
@@ -693,21 +889,19 @@ qla2x00_add_portname_to_mp_dev(mp_device
 	/* Look for an empty slot and add the specified portname.   */
 	for (index = 0; index < MAX_NUMBER_PATHS; index++) {
 		if (qla2x00_is_ww_name_zero(&dp->portnames[index][0])) {
-			DEBUG4(printk("adding portname to dp = "
-					"%p at index = %d\n",
-					dp, index);)
+			DEBUG4(printk("%s: adding portname to dp = "
+			    "%p at index = %d\n",
+			    __func__, dp, index);)
 			memcpy(&dp->portnames[index][0], portname, WWN_SIZE);
 			break;
 		}
 	}
 	if (index == MAX_NUMBER_PATHS) {
 		rval = QLA2X00_FUNCTION_FAILED;
-		DEBUG4(printk("qla2x00_add_portname_to_mp_dev: "
-				"Fail no room\n");)
+		DEBUG4(printk("%s: Fail no room\n", __func__);)
 	} else {
 		/* EMPTY */
-		DEBUG4(printk("qla2x00_add_portname_to_mp_dev: "
-				"Exit OK\n");)
+		DEBUG4(printk("%s: Exit OK\n", __func__);)
 	}
 
 	LEAVE("qla2x00_add_portname_to_mp_dev");
@@ -741,9 +935,8 @@ qla2x00_allocate_mp_dev(uint8_t  *nodena
 	dp = (mp_device_t *)KMEM_ZALLOC(sizeof(mp_device_t), 3);
 
 	if (dp != NULL) {
-		DEBUG3(printk("qla2x00_allocate_mp_dev: "
-				"mp_device_t allocated at %p\n",
-				dp);)
+		DEBUG3(printk("%s: mp_device_t allocated at %p\n",
+		    __func__, dp);)
 
 		/*
 		 * Copy node name into the mp_device_t.
@@ -760,20 +953,19 @@ qla2x00_allocate_mp_dev(uint8_t  *nodena
 
 		/* Allocate an PATH_LIST for the fc_mp_dev. */
 		if ((dp->path_list = qla2x00_allocate_path_list()) == NULL) {
-			DEBUG4(printk("qla2x00_allocate_mp_dev: "
-					"allocate path_list Failed.\n");)
+			DEBUG4(printk("%s: allocate path_list Failed.\n",
+			    __func__);)
 			KMEM_FREE(dp, sizeof(mp_device_t));
 			dp = NULL;
 		} else {
-			DEBUG4(printk("qla2x00_allocate_mp_dev: "
-					"mp_path_list_t allocated at %p\n",
-					dp->path_list);)
+			DEBUG4(printk("%s: mp_path_list_t allocated at %p\n",
+			    __func__, dp->path_list);)
 			/* EMPTY */
 			DEBUG4(printk("qla2x00_allocate_mp_dev: Exit Okay\n");)
 		}
 	} else {
 		/* EMPTY */
-		DEBUG4(printk("qla2x00_allocate_mp_dev: Allocate failed.\n");)
+		DEBUG4(printk("%s: Allocate failed.\n", __func__);)
 	}
 
 	LEAVE("qla2x00_allocate_mp_dev");
@@ -799,18 +991,17 @@ qla2x00_allocate_mp_dev(uint8_t  *nodena
  */
 static mp_path_t *
 qla2x00_allocate_path(mp_host_t *host, uint16_t path_id,
-                      fc_port_t *port, uint16_t dev_id)
+    fc_port_t *port, uint16_t dev_id)
 {
-	mp_path_t            *path;
+	mp_path_t	*path;
 	uint16_t	lun;
 
 	ENTER("qla2x00_allocate_path");
 
 	path = (mp_path_t *) KMEM_ZALLOC(sizeof(mp_path_t), 4);
 	if (path != NULL) {
-		DEBUG3(printk("qla2x00_allocate_path: "
-				"mp_path_t allocated at %p\n",
-				path); )
+		DEBUG3(printk("%s: mp_path_t allocated at %p\n",
+		    __func__, path); )
 
 		/* Copy the supplied information into the MP_PATH.  */
 		path->host = host;
@@ -829,7 +1020,7 @@ qla2x00_allocate_path(mp_host_t *host, u
 		}
 	} else {
 		/* EMPTY */
-		DEBUG4(printk("qla2x00_allocate_path: Failed\n");)
+		DEBUG4(printk("%s: Failed\n", __func__);)
 	}
 
 	return path;
@@ -859,9 +1050,8 @@ qla2x00_allocate_path_list( void )
 	path_list = (mp_path_list_t *) KMEM_ZALLOC(sizeof(mp_path_list_t), 5);
 
 	if (path_list != NULL) {
-		DEBUG4(printk("qla2x00_allocate_pathlist: "
-				"allocated at %p\n",
-				path_list);)
+		DEBUG4(printk("%s: allocated at %p\n",
+		    __func__, path_list);)
 
 		path_list->visible = PATH_INDEX_INVALID;
 		/* Initialized current path */
@@ -873,7 +1063,8 @@ qla2x00_allocate_path_list( void )
 
 	} else {
 		/* EMPTY */
-		DEBUG4(printk("Alloc pool failed for MP_PATH_LIST.\n");)
+		DEBUG4(printk("%s: Alloc pool failed for MP_PATH_LIST.\n",
+		    __func__);)
 	}
 
 	return path_list;
@@ -904,8 +1095,8 @@ qla2x00_cfg_find_host(scsi_qla_host_t *h
 	for (tmp_host = mp_hosts_base; (tmp_host); tmp_host = tmp_host->next) {
 		if (tmp_host->ha == ha) {
 			host = tmp_host;
-			DEBUG3(printk("Found host =%p, instance %d\n",
-					host, host->instance);)
+			DEBUG3(printk("%s: Found host =%p, instance %d\n",
+			    __func__, host, host->instance);)
 			break;
 		}
 	}
@@ -964,7 +1155,8 @@ qla2x00_find_host_by_name(uint8_t   *nam
  *      Kernel context.
  */
 static mp_device_t *
-qla2x00_find_or_allocate_mp_dev(mp_host_t *host, uint16_t dev_id, fc_port_t *port)
+qla2x00_find_or_allocate_mp_dev(mp_host_t *host, uint16_t dev_id,
+    fc_port_t *port)
 {
 	mp_device_t	*dp = NULL;  /* pointer to multi-path device   */
 	BOOL		node_found;  /* Found matching node name. */
@@ -977,13 +1169,12 @@ qla2x00_find_or_allocate_mp_dev(mp_host_
 
 	ENTER("qla2x00_find_or_allocate_mp_dev");
 
-	DEBUG3(printk("(find_or_allocate_mp_dev): host =%p, "
-			"port =%p, id = %d\n",
-			host, port, dev_id);)
+	DEBUG3(printk("%s: host =%p, port =%p, id = %d\n",
+	    __func__, host, port, dev_id);)
 
 	temp_dp = qla2x00_find_mp_dev_by_id(host,dev_id);
 
-	DEBUG3(printk("temp dp =%p\n", temp_dp);)
+	DEBUG3(printk("%s: temp dp =%p\n", __func__, temp_dp);)
 	/* if Device already known at this port. */
 	if (temp_dp != NULL) {
 		node_found = qla2x00_is_nodename_equal(temp_dp->nodename,
@@ -992,9 +1183,8 @@ qla2x00_find_or_allocate_mp_dev(mp_host_
 					port->port_name);
 
 		if (node_found && port_found) {
-			DEBUG3(printk("find_or_alloacte_dev: port "
-					"exists in device %p\n",
-					temp_dp);)
+			DEBUG3(printk("%s: port exists in device %p\n",
+			    __func__, temp_dp);)
 			dp = temp_dp;
 
 			/*
@@ -1014,11 +1204,11 @@ qla2x00_find_or_allocate_mp_dev(mp_host_
 	 * device on each known adapter looking for the node name.
 	 */
 	if (dp == NULL && names_valid) {
-		DEBUG3(printk("Searching each adapter for the device...\n");)
+		DEBUG3(printk("%s: Searching each adapter for the device...\n",
+		    __func__);)
 
-		for (temp_host = mp_hosts_base;
-				(temp_host);
-				temp_host = temp_host->next) {
+		for (temp_host = mp_hosts_base; (temp_host);
+		    temp_host = temp_host->next) {
 
 			/* Loop through each potential device on adapter. */
 			for (j = 0; j < MAX_MP_DEVICES; j++) {
@@ -1035,9 +1225,9 @@ qla2x00_find_or_allocate_mp_dev(mp_host_
 						port->port_name);
 
 				if (node_found || port_found) {
-					DEBUG3(printk("Matching device found "
-							"at %p @ %d\n",
-							temp_dp, j);)
+					DEBUG3(printk("%s: Matching device "
+					    "found at %p @ %d\n",
+					    __func__, temp_dp, j);)
 					/*
 					 * If the node name matches but
 					 * the port name was not found,
@@ -1117,7 +1307,7 @@ qla2x00_find_or_allocate_mp_dev(mp_host_
 /* ARGSUSED */
 static mp_path_t *
 qla2x00_find_or_allocate_path(mp_host_t *host, mp_device_t *dp,
-		uint16_t dev_id, fc_port_t *port)
+    uint16_t dev_id, fc_port_t *port)
 {
 	mp_path_list_t	*path_list = dp->path_list;
 	mp_path_t		*path;
@@ -1126,9 +1316,8 @@ qla2x00_find_or_allocate_path(mp_host_t 
 
 	ENTER("qla2x00_find_or_allocate_path");
 
-	DEBUG4(printk("(find_or_allocate_path): host =%p, "
-			"port =%p, dp=%p, dev id = %d\n",
-			host, port, dp, dev_id);)
+	DEBUG4(printk("%s: host =%p, port =%p, dp=%p, dev id = %d\n",
+	    __func__, host, port, dp, dev_id);)
 	/*
 	 * Loop through each known path in the path list.  Look for
 	 * a PATH that matches both the adapter and the port name.
@@ -1137,31 +1326,30 @@ qla2x00_find_or_allocate_path(mp_host_t 
 
 
 	if (path != NULL ) {
-		DEBUG3(printk("(find_or_allocate_path): Found an existing "
-				"path -  host =%p, port =%p, path id = %d\n",
-				host, path->port, path->id);)
-		DEBUG3(printk("qla2x00_find_or_allocate_path: Luns "
-				"for path_id %d, instance %d\n",
-				path->id, host->instance);)
+		DEBUG3(printk("%s: Found an existing "
+		    "path -  host =%p, port =%p, path id = %d\n",
+		    __func__, host, path->port, path->id);)
+		DEBUG3(printk("%s: Luns for path_id %d, instance %d\n",
+		    __func__, path->id, host->instance);)
 		DEBUG3(qla2x00_dump_buffer(
-					(char *)&path->lun_data.data[0], 64);)
+		    (char *)&path->lun_data.data[0], 64);)
+
 		/* If we found an existing path, look for any changes to it. */
 		if (path->port == NULL) {
-			DEBUG3(printk("update path %p, path id= %d, "
-					"mp_byte=0x%x port=%p\n",
-					path, path->id,
-					path->mp_byte, path->port);)
+			DEBUG3(printk("%s: update path %p, path id= %d, "
+			    "mp_byte=0x%x port=%p\n",
+			    __func__, path, path->id,
+			    path->mp_byte, path->port);)
 			path->port = port;
 			port->mp_byte = path->mp_byte;
 		} else {
 			if ((path->mp_byte & MP_MASK_HIDDEN) &&
 				!(port->mp_byte & MP_MASK_HIDDEN)) {
 
-				DEBUG3(printk("qla2x00_find_or_allocate_path: "
-						"Adapter(%p) "
-						"Device (%p) Path (%d) "
-						"has become visible.\n",
-						host, dp, path->id);)
+				DEBUG3(printk("%s: Adapter(%p) "
+				    "Device (%p) Path (%d) "
+				    "has become visible.\n",
+				    __func__, host, dp, path->id);)
 
 				path->mp_byte &= ~MP_MASK_HIDDEN;
 			}
@@ -1169,11 +1357,10 @@ qla2x00_find_or_allocate_path(mp_host_t 
 			if (!(path->mp_byte & MP_MASK_HIDDEN) &&
 					(port->mp_byte & MP_MASK_HIDDEN)) {
 
-				DEBUG3(printk("qla2x00_find_or_allocate_path: "
-						"Adapter(%p) "
-						"Device (%p) Path (%d) "
-						"has become hidden.\n",
-						host, dp, path->id);)
+				DEBUG3(printk("%s: Adapter(%p) "
+				    "Device (%p) Path (%d) "
+				    "has become hidden.\n",
+				    __func__, host, dp, path->id);)
 
 				path->mp_byte |= MP_MASK_HIDDEN;
 			}
@@ -1191,18 +1378,18 @@ qla2x00_find_or_allocate_path(mp_host_t 
 
 			/* Update port with bitmask info */
 			path = qla2x00_allocate_path(host, id, port, dev_id);
-			DEBUG3(printk("new path %p, path id= %d, "
-					"mp_byte=0x%x port=%p\n",
-					path, id,
-					path->mp_byte, path->port);)
+			DEBUG3(printk("%s: new path %p, path id= %d, "
+			    "mp_byte=0x%x port=%p\n",
+			    __func__, path, id,
+			    path->mp_byte, path->port);)
 			qla2x00_add_path(path_list, path);
 
 			/* Reconcile the new path against the existing ones. */
 			qla2x00_setup_new_path(dp, path);
 		} else {
 			/* EMPTY */
-			DEBUG4(printk("qla2x00_find_or_allocate_path: "
-					"Err exit, no space to add path.\n");)
+			DEBUG4(printk("%s: Err exit, no space to add path.\n",
+			    __func__);)
 		}
 
 	}
@@ -1220,32 +1407,28 @@ qla2x00_cfg_register_failover_lun(mp_dev
 	os_lun_t	*lq;
 	fc_lun_t 	*old_lp;
 
-	DEBUG2(printk("qla2x00_send_failover_notify: "
-			"NEW fclun = %p, sp = %p\n",
-			new_lp, sp);)
+	DEBUG2(printk("%s: NEW fclun = %p, sp = %p\n",
+	    __func__, new_lp, sp);)
 
 	/*
 	 * Fix lun descriptors to point to new fclun which is a new fcport.
 	 */
 	if (new_lp == NULL) {
-		DEBUG2(printk("qla2x00_send_failover_notify: "
-				"Failed new lun %p\n",
-				new_lp);)
+		DEBUG2(printk("%s: Failed new lun %p\n",
+		    __func__, new_lp);)
 		return QLA2X00_FUNCTION_FAILED;
 	}
 
 	tq = sp->tgt_queue;
 	lq = sp->lun_queue;
 	if (tq == NULL) {
-		DEBUG2(printk("qla2x00_send_failover_notify: "
-				"Failed to get old tq %p\n",
-				tq);)
+		DEBUG2(printk("%s: Failed to get old tq %p\n",
+		    __func__, tq);)
 		return QLA2X00_FUNCTION_FAILED;
 	}
 	if (lq == NULL) {
-		DEBUG2(printk("qla2x00_send_failover_notify: "
-				"Failed to get old lq %p\n",
-				lq);)
+		DEBUG2(printk("%s: Failed to get old lq %p\n",
+		    __func__, lq);)
 		return QLA2X00_FUNCTION_FAILED;
 	}
 	old_lp = lq->fclun;
@@ -1272,12 +1455,13 @@ qla2x00_cfg_register_failover_lun(mp_dev
 		(int)old_lp->fcport->ha->instance,
 		(int)new_lp->fcport->ha->instance);
 
-	DEBUG3(printk("qla2x00_send_failover_notify: "
-			"NEW fclun = %p , port =%p, "
-			"loop_id =0x%x, instance %ld\n",
-			new_lp, new_lp->fcport,
-			new_lp->fcport->loop_id,
-			new_lp->fcport->ha->instance);)
+	DEBUG3(printk("%s: NEW fclun = %p , port =%p, "
+	    "loop_id =0x%x, instance %ld\n",
+	    __func__,
+	    new_lp, new_lp->fcport,
+	    new_lp->fcport->loop_id,
+	    new_lp->fcport->ha->instance);)
+
 	return status;
 }
 
@@ -1303,7 +1487,7 @@ qla2x00_cfg_register_failover_lun(mp_dev
 /* ARGSUSED */
 static uint32_t
 qla2x00_send_failover_notify(mp_device_t *dp,
-		uint8_t lun, mp_path_t *newpath, mp_path_t *oldpath)
+    uint8_t lun, mp_path_t *newpath, mp_path_t *oldpath)
 {
 	fc_lun_t	*old_lp, *new_lp;
 	uint32_t	status = QLA2X00_SUCCESS;
@@ -1327,12 +1511,12 @@ qla2x00_send_failover_notify(mp_device_t
 		status =  qla2x00_send_fo_notification(old_lp, new_lp);
 		if (status == QLA2X00_SUCCESS) {
 			/* EMPTY */
-			DEBUG4(printk("qla2x00_send_failover_notify: "
-					"Logout succeded\n");)
+			DEBUG4(printk("%s: Logout succeded\n",
+			    __func__);)
 		} else {
 			/* EMPTY */
-			DEBUG4(printk("qla2x00_send_failover_notify: "
-					"Logout Failed\n");)
+			DEBUG4(printk("%s: Logout Failed\n",
+			    __func__);)
 		}
 	} else if ((qla_fo_params.FailoverNotifyType &
 			 FO_NOTIFY_TYPE_LUN_RESET) ||
@@ -1347,12 +1531,12 @@ qla2x00_send_failover_notify(mp_device_t
 			status = qla2x00_send_fo_notification(old_lp, new_lp);
 			if (status == QLA2X00_SUCCESS) {
 				/* EMPTY */
-				DEBUG4(printk("QLCallFailoverNotify: "
-						"LUN reset succeeded.\n");)
+				DEBUG4(printk("%s: LUN reset succeeded.\n",
+				    __func__);)
 			} else {
 				/* EMPTY */
-				DEBUG4(printk("QLCallFailoverNotify: "
-						"Failed reset LUN.\n");)
+				DEBUG4(printk("%s: Failed reset LUN.\n",
+				    __func__);)
 			}
 		}
 
@@ -1364,19 +1548,18 @@ qla2x00_send_failover_notify(mp_device_t
 			status = qla2x00_send_fo_notification(old_lp, new_lp);
 			if (status == QLA2X00_SUCCESS) {
 				/* EMPTY */
-				DEBUG4(printk("QLCallFailoverNotify: "
-						"Send CDB succeeded.\n");)
+				DEBUG4(printk("%s: Send CDB succeeded.\n",
+				    __func__);)
 			} else {
 				/* EMPTY */
-				DEBUG4(printk("QLCallFailoverNotify: "
-						"Send CDB Error "
-						"lun=(%d).\n", lun);)
+				DEBUG4(printk("%s: Send CDB Error "
+				    "lun=(%d).\n", __func__, lun);)
 			}
 		}
 	} else {
 		/* EMPTY */
-		DEBUG4(printk("QLCallFailoverNotify: failover "
-				"disabled or no notify routine defined.\n");)
+		DEBUG4(printk("%s: failover disabled or no notify routine "
+		    "defined.\n", __func__);)
 	}
 
 	return status;
@@ -1426,55 +1609,51 @@ qla2x00_select_next_path(mp_host_t *host
 		new_host = path->host;
 
 		/* FIXME may need to check for HBA being reset */
-		DEBUG3(printk("qla2x00_select_next_path: "
-				"orig path = %p new path = %p " 
-				"curr idx = %d, new idx = %d\n",
-				orig_path,
-				path,
-				orig_path->id,
-				path->id);)
+		DEBUG3(printk("%s: orig path = %p new path = %p " 
+		    "curr idx = %d, new idx = %d\n",
+		    __func__, orig_path, path, orig_path->id, path->id);)
 		DEBUG3(printk("  FAILOVER: device nodename: "
-				"%02x%02x%02x%02x%02x%02x%02x%02x\n",
-				dp->nodename[0], dp->nodename[1],
-				dp->nodename[2], dp->nodename[3],
-				dp->nodename[4], dp->nodename[5],
-				dp->nodename[6], dp->nodename[7]);)
+		    "%02x%02x%02x%02x%02x%02x%02x%02x\n",
+		    dp->nodename[0], dp->nodename[1],
+		    dp->nodename[2], dp->nodename[3],
+		    dp->nodename[4], dp->nodename[5],
+		    dp->nodename[6], dp->nodename[7]);)
 		DEBUG3(printk(" Original  - host nodename: "
-				"%02x%02x%02x%02x%02x%02x%02x%02x\n",
-				orig_path->host->nodename[0],
-				orig_path->host->nodename[1],
-				orig_path->host->nodename[2],
-				orig_path->host->nodename[3],
-				orig_path->host->nodename[4],
-				orig_path->host->nodename[5],
-				orig_path->host->nodename[6],
-				orig_path->host->nodename[7]);)
+		    "%02x%02x%02x%02x%02x%02x%02x%02x\n",
+		    orig_path->host->nodename[0],
+		    orig_path->host->nodename[1],
+		    orig_path->host->nodename[2],
+		    orig_path->host->nodename[3],
+		    orig_path->host->nodename[4],
+		    orig_path->host->nodename[5],
+		    orig_path->host->nodename[6],
+		    orig_path->host->nodename[7]);)
 		DEBUG3(printk("   portname: "
-				"%02x%02x%02x%02x%02x%02x%02x%02x\n",
-				orig_path->port->port_name[0],
-				orig_path->port->port_name[1],
-				orig_path->port->port_name[2],
-				orig_path->port->port_name[3],
-				orig_path->port->port_name[4],
-				orig_path->port->port_name[5],
-				orig_path->port->port_name[6],
-				orig_path->port->port_name[7]);)
+		    "%02x%02x%02x%02x%02x%02x%02x%02x\n",
+		    orig_path->port->port_name[0],
+		    orig_path->port->port_name[1],
+		    orig_path->port->port_name[2],
+		    orig_path->port->port_name[3],
+		    orig_path->port->port_name[4],
+		    orig_path->port->port_name[5],
+		    orig_path->port->port_name[6],
+		    orig_path->port->port_name[7]);)
 		DEBUG3(printk(" New  - host nodename: "
-				"%02x%02x%02x%02x%02x%02x%02x%02x\n",
-				new_host->nodename[0], new_host->nodename[1],
-				new_host->nodename[2], new_host->nodename[3],
-				new_host->nodename[4], new_host->nodename[5],
-				new_host->nodename[6], new_host->nodename[7]);)
+		    "%02x%02x%02x%02x%02x%02x%02x%02x\n",
+		    new_host->nodename[0], new_host->nodename[1],
+		    new_host->nodename[2], new_host->nodename[3],
+		    new_host->nodename[4], new_host->nodename[5],
+		    new_host->nodename[6], new_host->nodename[7]);)
 		DEBUG3(printk("   portname: "
-				"%02x%02x%02x%02x%02x%02x%02x%02x\n",
-				path->port->port_name[0],
-				path->port->port_name[1],
-				path->port->port_name[2],
-				path->port->port_name[3],
-				path->port->port_name[4],
-				path->port->port_name[5],
-				path->port->port_name[5],
-				path->port->port_name[7]);)
+		    "%02x%02x%02x%02x%02x%02x%02x%02x\n",
+		    path->port->port_name[0],
+		    path->port->port_name[1],
+		    path->port->port_name[2],
+		    path->port->port_name[3],
+		    path->port->port_name[4],
+		    path->port->port_name[5],
+		    path->port->port_name[6],
+		    path->port->port_name[7]);)
 
 		path_list->current_path[lun] = path->id;
 
@@ -1511,7 +1690,7 @@ qla2x00_select_next_path(mp_host_t *host
  *
  */
 static BOOL
-qla2x00_update_mp_host( mp_host_t  *host )
+qla2x00_update_mp_host(mp_host_t  *host)
 {
 	BOOL		success = TRUE;
 	uint16_t	dev_id;
@@ -1530,11 +1709,11 @@ qla2x00_update_mp_host( mp_host_t  *host
 		success |= qla2x00_update_mp_device(host, port, dev_id);
 	}
 	if (success) {
-		DEBUG2(printk("qla2x00_update_mp_host: Exit OK\n");)
+		DEBUG2(printk("%s: Exit OK\n", __func__);)
 		qla2x00_map_os_targets(host);
 	} else {
 		/* EMPTY */
-		DEBUG2(printk("qla2x00_update_mp_host: Exit FAILED\n");)
+		DEBUG2(printk("%s: Exit FAILED\n", __func__);)
 	}
 
 	LEAVE("qla2x00_update_mp_host");
@@ -1569,8 +1748,8 @@ qla2x00_update_mp_device(mp_host_t *host
 
 	ENTER("qla2x00_update_mp_device");
 
-	DEBUG3(printk("update_mp_device: host =%p, port =%p, id = %d\n",
-			host, port, dev_id);)
+	DEBUG3(printk("%s: host =%p, port =%p, id = %d\n",
+	    __func__, host, port, dev_id);)
 
 	if (!qla2x00_is_ww_name_zero(port->port_name)) {
 
@@ -1586,7 +1765,8 @@ qla2x00_update_mp_device(mp_host_t *host
 		 * and add it to the list.
 		 */
 		if (dp == NULL) {
-			DEBUG4(printk("Device NOT found or created at.\n");)
+			DEBUG4(printk("%s: Device NOT found or created at.\n",
+			    __func__);)
 			return FALSE;
 		}
 
@@ -1601,7 +1781,8 @@ qla2x00_update_mp_device(mp_host_t *host
 
 		path = qla2x00_find_or_allocate_path(host, dp, dev_id, port);
 		if (path == NULL) {
-			DEBUG4(printk("Path NOT found or created.\n");)
+			DEBUG4(printk("%s:Path NOT found or created.\n",
+			    __func__);)
 			return FALSE;
 		}
 
@@ -1622,8 +1803,8 @@ qla2x00_update_mp_device(mp_host_t *host
 
 	} else {
 		/* EMPTY */
-		DEBUG4(printk("qla2x00_update_mp_host: "
-				"Failed portname empty.\n");)
+		DEBUG4(printk("%s: Failed portname empty.\n",
+		    __func__);)
 	}
 
 	LEAVE("qla2x00_update_mp_device");
@@ -1655,14 +1836,14 @@ qla2x00_update_mp_tree(void)
 	/* Loop through each adapter and see what needs updating. */
 	for (host = mp_hosts_base; (host) ; host = host->next) {
 
-		DEBUG4(printk("qla2x00_update_mp_tree: hba(%d) flags (%x)\n",
-				host->instance, host->flags);)
+		DEBUG4(printk("%s: hba(%d) flags (%x)\n",
+		    __func__, host->instance, host->flags);)
 		/* Clear the countdown; it may be reset in the update. */
 		host->relogin_countdown = 0;
 
 		/* Override the NEEDS_UPDATE flag if disabled. */
 		if (host->flags & MP_HOST_FLAG_DISABLE ||
-				host->fcport == NULL)
+		    host->fcport == NULL)
 			host->flags &= ~MP_HOST_FLAG_NEEDS_UPDATE;
 
 		if (host->flags & MP_HOST_FLAG_NEEDS_UPDATE) {
@@ -1688,11 +1869,11 @@ qla2x00_update_mp_tree(void)
 
 	if (rval != QLA2X00_SUCCESS) {
 		/* EMPTY */
-		DEBUG4(printk("qla2x00_update_mp_tree: Exit FAILED.\n");)
+		DEBUG4(printk("%s: Exit FAILED.\n", __func__);)
 
 	} else {
 		/* EMPTY */
-		DEBUG4(printk("qla2x00_update_mp_tree: Exit OK.\n");)
+		DEBUG4(printk("%s: Exit OK.\n", __func__);)
 	}
 	return rval;
 }
@@ -1749,8 +1930,8 @@ qla2x00_find_matching_lun(uint8_t lun, m
  *      Kernel context.
  */
 mp_path_t *
-qla2x00_find_path_by_name(mp_host_t *host,
-		mp_path_list_t *plp, uint8_t *portname)
+qla2x00_find_path_by_name(mp_host_t *host, mp_path_list_t *plp,
+    uint8_t *portname)
 {
 	mp_path_t  *path = NULL;		/* match if not NULL */
 	mp_path_t  *tmp_path;
@@ -1772,43 +1953,6 @@ qla2x00_find_path_by_name(mp_host_t *hos
 }
 
 /*
- * qla2x00_find_mp_dev_by_name
- *      Find the mp_dev for the specified target name.
- *
- * Input:
- *      host = host adapter pointer.
- *      name  = Target name
- *
- * Returns:
- *
- * Context:
- *      Kernel context.
- */
-static mp_device_t  *
-qla2x00_find_mp_dev_by_name(mp_host_t *host, uint8_t *name )
-{
-	int id;
-	mp_device_t *dp;
-
-	ENTER("qla2x00_find_mp_dev_by_name");
-
-	for (id= 0; id < MAX_MP_DEVICES; id++) {
-		if ((dp = host->mp_devs[id] ) == NULL)
-			continue;
-
-		if (qla2x00_is_nodename_equal(dp->nodename, name)) {
-			DEBUG3(printk("Found matching device @ index %d:\n",
-					id);)
-			return dp;
-		}
-	}
-
-	LEAVE("qla2x00_find_mp_dev_by_name");
-
-	return NULL;
-}
-
-/*
  * qla2x00_find_path_by_id
  *      Find the path for the specified path id.
  *
@@ -1865,6 +2009,43 @@ qla2x00_find_mp_dev_by_id(mp_host_t *hos
 }
 
 /*
+ * qla2x00_find_mp_dev_by_name
+ *      Find the mp_dev for the specified target name.
+ *
+ * Input:
+ *      host = host adapter pointer.
+ *      name  = Target name
+ *
+ * Returns:
+ *
+ * Context:
+ *      Kernel context.
+ */
+static mp_device_t  *
+qla2x00_find_mp_dev_by_name(mp_host_t *host, uint8_t *name )
+{
+	int id;
+	mp_device_t *dp;
+
+	ENTER("qla2x00_find_mp_dev_by_name");
+
+	for (id= 0; id < MAX_MP_DEVICES; id++) {
+		if ((dp = host->mp_devs[id] ) == NULL)
+			continue;
+
+		if (qla2x00_is_nodename_equal(dp->nodename, name)) {
+			DEBUG3(printk("%s: Found matching device @ index %d:\n",
+			    __func__, id);)
+			return dp;
+		}
+	}
+
+	LEAVE("qla2x00_find_mp_dev_by_name");
+
+	return NULL;
+}
+
+/*
  * qla2x00_get_visible_path
  * Find the the visible path for the specified device.
  *
@@ -1923,15 +2104,15 @@ qla2x00_map_os_targets(mp_host_t *host)
 	for (t = 0; t < MAX_TARGETS; t++ ) {
 		dp = host->mp_devs[t];
 		if (dp != NULL) {
-			DEBUG3(printk("map_os_targets: (%d) found "
-					"a dp = %p, host=%p, ha=%p\n",
-					t, dp, host,ha);)
+			DEBUG3(printk("%s: (%d) found a dp=%p, "
+			    "host=%p, ha=%p\n",
+			    __func__, t, dp, host,ha);)
 
 			if ((path = qla2x00_get_visible_path(dp)) == NULL) {
 				printk(KERN_INFO
-					"qla_cfg(%d): No visible path "
-					"for target %d, dp = %p\n",
-					host->instance, t, dp);
+				    "qla_cfg(%d): No visible path "
+				    "for target %d, dp = %p\n",
+				    host->instance, t, dp);
 				continue;
 			}
 
@@ -1944,22 +2125,19 @@ qla2x00_map_os_targets(mp_host_t *host)
 							WWN_SIZE);
 					tgt->vis_port = path->port;
 				}
-				DEBUG3(printk("qla_cfg%ld: host=%d, "
-						"device= %p has VISIBLE "
-						"path=%p, path id=%d\n",
-						ha->host_no,
-						host->instance,
-						dp,
-						path, path->id);)
+				DEBUG3(printk("%s(%ld): host=%d, "
+				    "device= %p has VISIBLE "
+				    "path=%p, path id=%d\n",
+				    __func__, ha->host_no,
+				    host->instance,
+				    dp, path, path->id);)
 			} else {
 			/* EMPTY */
-				DEBUG3(printk("qla_cfg%ld: host=%d, "
-						"device= %p has HIDDEN "
-						"path=%p, path id=%d\n",
-						ha->host_no,
-						host->instance,
-						dp,
-						path,path->id);)
+				DEBUG3(printk("%s(%ld): host=%d, "
+				    "device= %p has HIDDEN "
+				    "path=%p, path id=%d\n",
+				    __func__, ha->host_no,
+				    host->instance, dp, path,path->id);)
 			}
 			qla2x00_map_os_luns(host, dp, t);
 		} else {
@@ -2050,15 +2228,15 @@ qla2x00_map_a_oslun(mp_host_t *host, mp_
 					 * Mapped lun on the visible path
 					 */
 					if ((vis_path =
-						qla2x00_get_visible_path(dp)) ==
-								NULL ) {
+					    qla2x00_get_visible_path(dp)) ==
+					    NULL ) {
 
 						printk(KERN_INFO
-						  "qla2x00(%d): No visible "
-						  "path for target %d, "
-						  "dp = %p\n",
-						  host->instance,
-						  t, dp);
+						    "qla2x00(%d): No visible "
+						    "path for target %d, "
+						    "dp = %p\n",
+						    host->instance,
+						    t, dp);
 
 						return FALSE;
 					}
@@ -2143,8 +2321,8 @@ qla2x00_add_path( mp_path_list_t *pathli
 
 	ENTER("qla2x00_add_path");
 
-	DEBUG3(printk("add_path: pathlist =%p, path =%p, cnt = %d\n",
-			pathlist, path, pathlist->path_cnt);)
+	DEBUG3(printk("%s: pathlist =%p, path =%p, cnt = %d\n",
+	    __func__, pathlist, path, pathlist->path_cnt);)
 	if (last == NULL) {
 		last = path;
 	} else {
@@ -2199,7 +2377,7 @@ qla2x00_is_portname_in_device(mp_device_
  */
 void
 qla2x00_set_lun_data_from_bitmask(mp_lun_data_t *lun_data,
-			lun_bit_mask_t *lun_mask)
+    lun_bit_mask_t *lun_mask)
 {
 	int16_t	lun;
 
@@ -2212,10 +2390,8 @@ qla2x00_set_lun_data_from_bitmask(mp_lun
 		else
 			lun_data->data[lun] &= ~LUN_DATA_ENABLED;
 
-		DEBUG5(printk("set_lun_data_from_bitmask: "
-				"lun data[%d] = 0x%x\n",
-				lun,
-				lun_data->data[lun]);)
+		DEBUG5(printk("%s: lun data[%d] = 0x%x\n",
+		    __func__, lun, lun_data->data[lun]);)
 	}
 
 	LEAVE("qla2x00_set_lun_data_from_bitmask");
@@ -2351,19 +2527,16 @@ qla2x00_failback_luns( mp_host_t  *host)
 			 * Failback all the paths for this host,
 			 * the luns could be preferred across all paths 
 			 */
-			DEBUG2(printk("qla2x00_failback_luns(%d): "
-					"Lun Data for device %p, "
-					"id=%d, path id=%d\n",
-					host->instance,
-					dp, dp->dev_id,
-					path->id);)
+			DEBUG2(printk("%s(%d): Lun Data for device %p, "
+			    "id=%d, path id=%d\n",
+			    __func__, host->instance, dp, dp->dev_id,
+			    path->id);)
 			DEBUG4(qla2x00_dump_buffer(
-					(char *)&path->lun_data.data[0], 64);)
-			DEBUG4(printk("qla2x00_failback_luns(%d): "
-					"Perferrred Path data:\n",
-					host->instance);)
+			    (char *)&path->lun_data.data[0], 64);)
+			DEBUG4(printk("%s(%d): Perferrred Path data:\n",
+			    __func__, host->instance);)
 			DEBUG4(qla2x00_dump_buffer(
-				(char *)&path_list->current_path[0], 64);)
+			    (char *)&path_list->current_path[0], 64);)
 
 			for (lun = 0; lun < MAX_LUNS_PER_DEVICE; lun++) {
 				l = (uint8_t)(lun & 0xFF);
@@ -2372,13 +2545,11 @@ qla2x00_failback_luns( mp_host_t  *host)
 				 * if this is the preferred lun and not
 				 * the current path then failback lun.
 				 */
-				DEBUG4(printk("failback_luns: "
-						"target= %d, cur path id =%d, "
-						"lun data[%d] = %d)\n",
-						dp->dev_id,
-						path->id,
-						lun,
-						path->lun_data.data[lun]);)
+				DEBUG4(printk("%s: target=%d, cur path id =%d, "
+				    "lun data[%d] = %d)\n",
+				    __func__, dp->dev_id, path->id,
+				    lun, path->lun_data.data[lun]);)
+
 				if ((path->lun_data.data[l] &
 						LUN_DATA_PREFERRED_PATH) &&
 					/* !path->relogin && */
@@ -2443,18 +2614,16 @@ qla2x00_setup_new_path( mp_device_t *dp,
 
 		/* No known visible path */
 		if (path_list->visible == PATH_INDEX_INVALID) {
-			DEBUG3(printk("setup_new_path: No know "
-					"visible path - make this path "
-					"visible\n");)
+			DEBUG3(printk("%s: No know visible path - make this "
+			    "path visible\n",
+			    __func__);)
 				
 			path_list->visible = path->id;
 			path->mp_byte &= ~MP_MASK_HIDDEN;
 		} else {
-			DEBUG3(printk("setup_new_path: Second "
-					"visible path - make this "
-					"one hidden\n");)
-			DEBUG3(printk("qla2x00_setup_new_path: "
-					"Second visible path found.\n");)
+			DEBUG3(printk("%s: Second visible path found- make "
+			    "this one hidden\n",
+			    __func__);)
 
 			path->mp_byte |= MP_MASK_HIDDEN;
 		}
@@ -2480,10 +2649,9 @@ qla2x00_setup_new_path( mp_device_t *dp,
 				if (!(tmp_host->flags &
 						MP_HOST_FLAG_DISABLE)) {
 
-					DEBUG4(printk(
-						"qla2x00_setup_new_path: "
-						"2nd visible path (%p)\n",
-						tmp_host);)
+					DEBUG4(printk("%s: 2nd visible "
+					    "path (%p)\n",
+					    __func__, tmp_host);)
 
 					tmp_host->flags |= MP_HOST_FLAG_DISABLE;
 				}
@@ -2503,10 +2671,9 @@ qla2x00_setup_new_path( mp_device_t *dp,
 		 * available path, so make it the current path.
 		 */
 
-		DEBUG4(printk("qla2x00_setup_new_path: "
-				"lun_data 0x%x, LUN %d\n",
-				path->lun_data.data[l],
-				lun);)
+		DEBUG4(printk("%s: lun_data 0x%x, LUN %d\n",
+		    __func__, path->lun_data.data[l], lun);)
+
 		if (first_path == path) {
 			path_list->current_path[l] = 0;
 			path->lun_data.data[l] |=  LUN_DATA_PREFERRED_PATH;
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/qla2xxx/qla_cfg.h linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/qla2xxx/qla_cfg.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/qla2xxx/qla_cfg.h	2003-07-30 13:51:37.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/qla2xxx/qla_cfg.h	2003-07-30 10:28:03.000000000 +0200
@@ -2,7 +2,7 @@
  *                  QLOGIC LINUX SOFTWARE
  *
  * QLogic ISP2x00 device driver for Linux 2.4.x
- * Copyright (C) 2002 Qlogic Corporation
+ * Copyright (C) 2003 Qlogic Corporation
  * (www.qlogic.com)
  *
  * This program is free software; you can redistribute it and/or modify it
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/qla2xxx/qla_cfgln.c linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/qla2xxx/qla_cfgln.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/qla2xxx/qla_cfgln.c	2003-07-30 13:51:37.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/qla2xxx/qla_cfgln.c	2003-07-30 10:28:03.000000000 +0200
@@ -2,7 +2,7 @@
  *                  QLOGIC LINUX SOFTWARE
  *
  * QLogic ISP2x00 device driver for Linux 2.4.x
- * Copyright (C) 2002 Qlogic Corporation
+ * Copyright (C) 2003 Qlogic Corporation
  * (www.qlogic.com)
  *
  * This program is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
 #include "qla_cfg.h"
 #include "qla_gbl.h"
 
+#define MAX_SEARCH_STR_SIZE	512
 
 /*
  * qla2x00_set_lun_data_from_config
@@ -40,15 +41,15 @@
  */
 void
 qla2x00_set_lun_data_from_config(mp_host_t *host, fc_port_t *port,
-                                 uint16_t tgt, uint16_t dev_no)
+    uint16_t tgt, uint16_t dev_no)
 {
-	static char	propbuf[512];  /* As big as largest search string */
+	char		*propbuf;  /* As big as largest search string */
 	int		rval;
 	int16_t		lun, l;
 	scsi_qla_host_t *ha = host->ha;
 	mp_device_t	*dp;
-	static lun_bit_mask_t lun_mask;
-	lun_bit_mask_t  *mask_ptr = &lun_mask;
+	lun_bit_mask_t	*plun_mask;
+	lun_bit_mask_t  *mask_ptr;
 	mp_path_list_t	*pathlist;
 #if 0
 	uint8_t		control_byte;
@@ -56,24 +57,47 @@ qla2x00_set_lun_data_from_config(mp_host
 
 	mp_path_t *path;
 
-	memset(&lun_mask, 0, sizeof(lun_bit_mask_t));
+	if (qla2x00_get_ioctl_scrap_mem(ha, (void **)&propbuf,
+	    MAX_SEARCH_STR_SIZE)) {
+		/* not enough memory */
+		DEBUG9_10(printk("%s(%ld): inst=%ld scrap not big enough. "
+		    "propbuf requested=%d.\n",
+		    __func__, ha->host_no, ha->instance,
+		    MAX_SEARCH_STR_SIZE);)
+		return;
+	}
+
+	if (qla2x00_get_ioctl_scrap_mem(ha, (void **)&plun_mask,
+	    sizeof(lun_bit_mask_t))) {
+		/* not enough memory */
+		DEBUG9_10(printk("%s(%ld): inst=%ld scrap not big enough. "
+		    "lun_mask requested=%d.\n",
+		    __func__, ha->host_no, ha->instance,
+		    sizeof(lun_bit_mask_t));)
+		qla2x00_free_ioctl_scrap_mem(ha);
+		return;
+	}
+	mask_ptr = plun_mask;
 
 	dp = host->mp_devs[tgt];
 	if (dp == NULL) {
 		printk("qla2x00_set_lun_data_from_config: Target %d "
-				"not found for hba %d\n",tgt, host->instance);
+		    "not found for hba %d\n",tgt, host->instance);
+		qla2x00_free_ioctl_scrap_mem(ha);
 		return;
 	}
 	if ( (pathlist = dp->path_list) == NULL ) {
 		printk("qla2x00_set_lun_data_from_config: path list "
-				"not found for target %d\n", tgt);
+		    "not found for target %d\n", tgt);
+		qla2x00_free_ioctl_scrap_mem(ha);
 		return;
 	}
 
 	if ((path = qla2x00_find_path_by_name(host, pathlist,
-					port->port_name)) == NULL ) {
+	    port->port_name)) == NULL ) {
 		printk("qla2x00_set_lun_data_from_config: No path found "
-				"for target %d\n", tgt);
+		    "for target %d\n", tgt);
+		qla2x00_free_ioctl_scrap_mem(ha);
 		return;
 	}
 
@@ -113,36 +137,36 @@ qla2x00_set_lun_data_from_config(mp_host
 
 	/* Get "target-N-device-N-preferred" as a 256 bit lun_mask*/
 	sprintf(propbuf, "scsi-qla%ld-tgt-%d-di-%d-preferred",
-			ha->instance, tgt, dev_no);
+	    ha->instance, tgt, dev_no);
 	DEBUG2(printk("build_tree: %s\n",propbuf);)
 
 	rval = qla2x00_get_prop_xstr(ha, propbuf,
-			(uint8_t *)(&lun_mask), sizeof(lun_mask));
+	    (uint8_t *)(plun_mask), sizeof(lun_bit_mask_t));
 
 	if (rval == -1) {
 		/* EMPTY */
 		DEBUG2(printk("qla2x00_set_lun_data_from_config: "
-				"NO Preferred mask  - ret %d\n", rval);)
+		    "NO Preferred mask  - ret %d\n", rval);)
 	} else {
-		if (rval != sizeof(lun_mask)) {
+		if (rval != sizeof(lun_bit_mask_t)) {
 			/* EMPTY */
 			printk("qla2x00_set_lun_data_from_config: "
-				"Preferred mask len %d is incorrect.\n", rval);
+			    "Preferred mask len %d is incorrect.\n", rval);
 		}
 
 		DEBUG3(printk("qla2x00_set_lun_data_from_config: "
-				"Preferred mask read:\n");)
-		DEBUG3(qla2x00_dump_buffer((char *)&lun_mask,
-					sizeof(lun_mask));)
+		    "Preferred mask read:\n");)
+		DEBUG3(qla2x00_dump_buffer((char *)plun_mask,
+		    sizeof(lun_bit_mask_t));)
 
 		for (lun = MAX_LUNS-1, l =0; lun >= 0; lun--, l++ ) {
 			if (EXT_IS_LUN_BIT_SET(mask_ptr, lun)) {
 				path->lun_data.data[l] |=
-					LUN_DATA_PREFERRED_PATH;
+				    LUN_DATA_PREFERRED_PATH;
 				pathlist->current_path[l] = path->id;
 			} else {
 				path->lun_data.data[l] &=
-					~LUN_DATA_PREFERRED_PATH;
+				    ~LUN_DATA_PREFERRED_PATH;
 			}
 		}
 
@@ -150,39 +174,40 @@ qla2x00_set_lun_data_from_config(mp_host
 
 	/* Get "target-N-device-N-lun-disable" as a 256 bit lun_mask*/
 	sprintf(propbuf, "scsi-qla%ld-tgt-%d-di-%d-lun-disabled",
-			ha->instance, tgt, dev_no);
+	    ha->instance, tgt, dev_no);
 	DEBUG3(printk("build_tree: %s\n",propbuf);)
 
 	rval = qla2x00_get_prop_xstr(ha, propbuf,
-			(uint8_t *)&lun_mask, sizeof(lun_mask));
+	    (uint8_t *)plun_mask, sizeof(lun_bit_mask_t));
 	if (rval == -1) {
 		/* default: all luns enabled */
 		for (lun = 0; lun < MAX_LUNS; lun++) {
 			path->lun_data.data[lun] |= LUN_DATA_ENABLED;
 		}
 	} else {
-		if (rval != sizeof(lun_mask)) {
+		if (rval != sizeof(lun_bit_mask_t)) {
 			printk("qla2x00_set_lun_data_from_config: Enable "
-				"mask has wrong size %d != %d\n",
-				rval, (int)sizeof(lun_mask));
+			    "mask has wrong size %d != %d\n",
+			    rval, (int)sizeof(lun_bit_mask_t));
 		} else {
 			for (lun = MAX_LUNS-1, l =0; lun >= 0; lun--, l++) {
 				/* our bit mask is inverted */
 				if (!EXT_IS_LUN_BIT_SET(mask_ptr,lun))
 					path->lun_data.data[l] |=
-						LUN_DATA_ENABLED;
+					    LUN_DATA_ENABLED;
 				else
 					path->lun_data.data[l] &=
-						~LUN_DATA_ENABLED;
+					    ~LUN_DATA_ENABLED;
 			}
 		}
 	}
 
 	DEBUG3(printk("qla2x00_set_lun_data_from_config: Luns data for "
-			"device %p, instance %d, path id=%d\n",
-			dp,host->instance,path->id);)
+	    "device %p, instance %d, path id=%d\n",
+	    dp,host->instance,path->id);)
 	DEBUG3(qla2x00_dump_buffer((char *)&path->lun_data.data[0], 64);)
 
+	qla2x00_free_ioctl_scrap_mem(ha);
 	LEAVE("qla2x00_set_lun_data_from_config");
 }
 
@@ -201,9 +226,9 @@ qla2x00_set_lun_data_from_config(mp_host
  *	Kernel context.
  */
 void
-qla2x00_cfg_build_path_tree( scsi_qla_host_t *ha)
+qla2x00_cfg_build_path_tree(scsi_qla_host_t *ha)
 {
-	static char	propbuf[512];
+	char		*propbuf;
 	uint8_t		node_name[WWN_SIZE];
 	uint8_t		port_name[WWN_SIZE];
 	fc_port_t	*port;
@@ -218,9 +243,19 @@ qla2x00_cfg_build_path_tree( scsi_qla_ho
 	ENTER("qla2x00_cfg_build_path_tree");
 
 	printk(KERN_INFO
-		"qla02%d: ConfigRequired is set. \n", (int)ha->instance);
+	    "qla02%d: ConfigRequired is set. \n", (int)ha->instance);
 	DEBUG(printk("qla2x00_cfg_build_path_tree: hba =%d",
-				(int)ha->instance);)
+	    (int)ha->instance);)
+
+	if (qla2x00_get_ioctl_scrap_mem(ha, (void **)&propbuf,
+	    MAX_SEARCH_STR_SIZE)) {
+		/* not enough memory */
+		DEBUG9_10(printk("%s(%ld): inst=%ld scrap not big enough. "
+		    "propbuf requested=%d.\n",
+		    __func__, ha->host_no, ha->instance,
+		    MAX_SEARCH_STR_SIZE);)
+		return;
+	}
 
 	/* Look for adapter nodename in properties */
 	sprintf(propbuf, "scsi-qla%ld-adapter-port", ha->instance);
@@ -228,6 +263,7 @@ qla2x00_cfg_build_path_tree( scsi_qla_ho
 
 	rval = qla2x00_get_prop_xstr(ha, propbuf, port_name, WWN_SIZE);
 	if (rval != WWN_SIZE) {
+		qla2x00_free_ioctl_scrap_mem(ha);
 		return;
 	}
 
@@ -235,29 +271,31 @@ qla2x00_cfg_build_path_tree( scsi_qla_ho
 	name = 	&ha->init_cb->port_name[0];
 	if (!qla2x00_is_nodename_equal(name, port_name)) {
 		printk(KERN_INFO
-			"scsi(%d): Adapter nodenames don't match - ha = %p.\n",
-			(int)ha->instance,ha);
+		    "scsi(%d): Adapter nodenames don't match - ha = %p.\n",
+		    (int)ha->instance,ha);
 		DEBUG(printk("qla(%d): Adapter nodenames don't match - "
-				"ha = %p.\n",
-				(int)host->instance,ha);)
+		    "ha = %p.\n",
+		    (int)ha->instance,ha);)
+		qla2x00_free_ioctl_scrap_mem(ha);
 		return;
 	}
 
 	instance = ha->instance;
 	if ((host = qla2x00_alloc_host(ha)) == NULL) {
 		printk(KERN_INFO
-			"scsi(%d): Couldn't allocate host - ha = %p.\n",
-			(int)instance,ha);
+		    "scsi(%d): Couldn't allocate host - ha = %p.\n",
+		    (int)instance,ha);
 	} else {
 		/* create a dummy port */
 		port = (fc_port_t *)KMEM_ZALLOC(sizeof (fc_port_t),9);
 		if (port == NULL) {
 			printk(KERN_INFO
-				"scsi(%d): Couldn't allocate port.\n",
-				(int)instance);
+			    "scsi(%d): Couldn't allocate port.\n",
+			    (int)instance);
 			DEBUG(printk("qla(%d): Couldn't allocate port.\n",
-					(int)host->instance);)
+			    (int)host->instance);)
 			/* remove host */
+			qla2x00_free_ioctl_scrap_mem(ha);
 			return;
 		}
 
@@ -265,11 +303,11 @@ qla2x00_cfg_build_path_tree( scsi_qla_ho
 
 		/* For each target on the host bus adapter */
 		for (tgt_no = 0; tgt_no < MAX_MP_DEVICES &&
-				!done; tgt_no++) {
+		    !done; tgt_no++) {
 
 			/* get all paths for this target */
 			for (dev_no = 0; dev_no < MAX_PATHS_PER_DEVICE &&
-					!done ; dev_no++) {
+			    !done ; dev_no++) {
 
 				/*
 				 * O(N*M) scan, should ideally check if there
@@ -290,11 +328,11 @@ qla2x00_cfg_build_path_tree( scsi_qla_ho
 				 * number
 				 */
 				sprintf(propbuf, "scsi-qla%d-tgt-%d-di-%d-node",
-						instance, tgt_no, dev_no);
+				    instance, tgt_no, dev_no);
 				DEBUG(printk("build_tree: %s\n",propbuf);)
 
 				rval = qla2x00_get_prop_xstr(ha, propbuf,
-							node_name, WWN_SIZE);
+				    node_name, WWN_SIZE);
 				if (rval != WWN_SIZE)
 					continue;
 
@@ -305,11 +343,11 @@ qla2x00_cfg_build_path_tree( scsi_qla_ho
 				 * number
 				 */
 				sprintf(propbuf, "scsi-qla%d-tgt-%d-di-%d-port",
-						instance,  tgt_no, dev_no);
+				    instance,  tgt_no, dev_no);
 				DEBUG(printk("build_tree: %s\n",propbuf);)
 
 				rval = qla2x00_get_prop_xstr(ha, propbuf,
-							port_name, WWN_SIZE);
+				    port_name, WWN_SIZE);
 				if (rval != WWN_SIZE)
 					continue;
 
@@ -322,33 +360,36 @@ qla2x00_cfg_build_path_tree( scsi_qla_ho
 				 * is present then all luns are visible.
 				 */
 				sprintf(propbuf,
-					"scsi-qla%d-tgt-%d-di-%d-control",
-					instance, tgt_no, dev_no);
+				    "scsi-qla%d-tgt-%d-di-%d-control",
+				    instance, tgt_no, dev_no);
 				DEBUG3(printk("build_tree: %s\n",propbuf);)
 
 				rval = qla2x00_get_prop_xstr(ha, propbuf,
-						(uint8_t *)(&control_byte),
-						sizeof(control_byte));
+				    (uint8_t *)(&control_byte),
+				    sizeof(control_byte));
 				if (rval == -1) {
 					/* error getting string. go to next. */
 					continue;
 				}
 
 				DEBUG(printk("build_tree: control byte 0x%x\n",
-							control_byte);)
+				    control_byte);)
 
 				port->mp_byte = control_byte;
 				DEBUG(printk("build_tree: update_mp_device "
-						"host=%p, port=%p, tgt_no=%d\n",
-						host, port, tgt_no);)
+				    "host=%p, port=%p, tgt_no=%d\n",
+				    host, port, tgt_no);)
 
 				qla2x00_update_mp_device(host, port, tgt_no);
 				qla2x00_set_lun_data_from_config(host,
-						port, tgt_no, dev_no);
+				    port, tgt_no, dev_no);
 			}
 		}
 		KMEM_FREE(port, sizeof (fc_port_t));
 	}
+
+	qla2x00_free_ioctl_scrap_mem(ha);
+
 	LEAVE("qla2x00_cfg_build_path_tree");
 	DEBUG(printk("Leaving: qla2x00_cfg_build_path_tree\n");)
 }
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/qla2xxx/qla_debug.h linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/qla2xxx/qla_debug.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/qla2xxx/qla_debug.h	2003-07-30 13:51:37.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/qla2xxx/qla_debug.h	2003-07-30 10:28:03.000000000 +0200
@@ -2,7 +2,7 @@
  *                  QLOGIC LINUX SOFTWARE
  *
  * QLogic ISP2x00 device driver for Linux 2.4.x
- * Copyright (C) 2002 Qlogic Corporation
+ * Copyright (C) 2003 Qlogic Corporation
  * (www.qlogic.com)
  *
  * This program is free software; you can redistribute it and/or modify it
@@ -32,14 +32,6 @@
 #define ENTER_INTR(x) 	do {} while (0)
 #define LEAVE_INTR(x)   do {} while (0)
 #endif
-#if defined(QL_DEBUG_LEVEL_3)
-#define DEBUG3(x)	do {x;} while (0);
-#define DEBUG2_3(x)	do {x;} while (0);
-#define DEBUG2_3_11(x)	do {x;} while (0);
-#define DEBUG3_11(x)	do {x;} while (0);
-#else
-#define DEBUG3(x)	do {} while (0);
-#endif
 
 #if  QLA2100_COMTRACE
 #define COMTRACE(x)     do {printk(x);} while (0);
@@ -63,10 +55,20 @@
 #define DEBUG2(x)       do {x;} while (0);
 #define DEBUG2_3(x)     do {x;} while (0);
 #define DEBUG2_3_11(x)  do {x;} while (0);
+#define DEBUG2_9_10(x)    do {x;} while (0);
 #define DEBUG2_11(x)    do {x;} while (0);
 #else
 #define DEBUG2(x)	do {} while (0);
-  #if !defined(QL_DEBUG_LEVEL_3)
+#endif
+
+#if defined(QL_DEBUG_LEVEL_3)
+#define DEBUG3(x)	do {x;} while (0);
+#define DEBUG2_3(x)	do {x;} while (0);
+#define DEBUG2_3_11(x)	do {x;} while (0);
+#define DEBUG3_11(x)	do {x;} while (0);
+#else
+#define DEBUG3(x)	do {} while (0);
+  #if !defined(QL_DEBUG_LEVEL_2)
   #define DEBUG2_3(x)	do {} while (0);
   #endif
 #endif
@@ -92,16 +94,21 @@
 #if defined(QL_DEBUG_LEVEL_9)
 #define DEBUG9(x)       do {x;} while (0);
 #define DEBUG9_10(x)    do {x;} while (0);
+#define DEBUG2_9_10(x)	do {x;} while (0);
 #else
 #define DEBUG9(x)	do {} while (0);
 #endif
 
 #if defined(QL_DEBUG_LEVEL_10)
 #define DEBUG10(x)      do {x;} while (0);
+#define DEBUG2_9_10(x)	do {x;} while (0);
 #define DEBUG9_10(x)	do {x;} while (0);
 #else
 #define DEBUG10(x)	do {} while (0);
-  #if !defined(QL_DEBUG_LEVEL_9)
+  #if !defined(DEBUG2_9_10)
+  #define DEBUG2_9_10(x)	do {} while (0);
+  #endif
+  #if !defined(DEBUG9_10)
   #define DEBUG9_10(x)	do {} while (0);
   #endif
 #endif
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/qla2xxx/qla_fo.c linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/qla2xxx/qla_fo.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/qla2xxx/qla_fo.c	2003-07-30 13:51:37.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/qla2xxx/qla_fo.c	2003-07-30 10:28:03.000000000 +0200
@@ -2,7 +2,7 @@
 *                  QLOGIC LINUX SOFTWARE
 *
 * QLogic ISP2x00 device driver for Linux 2.4.x
-* Copyright (C) 2002 Qlogic Corporation
+* Copyright (C) 2003 Qlogic Corporation
 * (www.qlogic.com)
 *
 * This program is free software; you can redistribute it and/or modify it
@@ -104,6 +104,8 @@ qla2x00_fo_stats(FO_HBA_STAT *stat_p, BO
 	uint32_t rval = 0;
 	scsi_qla_host_t *hbap;
 
+	DEBUG9(printk("%s: entered.\n", __func__);)
+
 	inst = stat_p->input.HbaInstance;
 	stat_p->info.HbaCount = 0;
 
@@ -118,11 +120,15 @@ qla2x00_fo_stats(FO_HBA_STAT *stat_p, BO
 			idx = inst;
 		}
 		if (reset == TRUE) {
+			DEBUG9(printk("%s: reset stats.\n", __func__);)
 			hbap->IosRequested = 0;
 			hbap->BytesRequested = 0;
 			hbap->IosExecuted = 0;
 			hbap->BytesExecuted = 0;
 		} else {
+			DEBUG9(printk("%s: get stats for inst %d.\n",
+			    __func__, inst);)
+
 #if 0
 			stat_p->info.StatEntry[idx].IosRequested =
 				hbap->IosRequested;
@@ -139,6 +145,9 @@ qla2x00_fo_stats(FO_HBA_STAT *stat_p, BO
 		else
 			hbap = (scsi_qla_host_t *)hbap->next;
 	}
+
+	DEBUG9(printk("%s: exiting.\n", __func__);)
+
 	return rval;
 }
 
@@ -176,25 +185,37 @@ qla2x00_fo_get_lun_data(EXT_IOCTL *pext,
 	FO_LUN_DATA_LIST *u_list, *list;
 
 
+	DEBUG9(printk("%s: entered.\n", __func__);)
+
 	ha = qla2x00_get_hba((int)bp->HbaInstance);
 
-	DEBUG3(printk("qla_fo_get_lun_data: hba %p, buff %p.\n", ha, bp);)
-	DEBUG4(printk("qla_fo_get_lun_data: hba %p, buff %p "
-			"bp->HbaInstance(%x).\n",
-			ha, bp, (int)bp->HbaInstance));
+	if (!ha) {
+		DEBUG2_9_10(printk("%s: no ha matching inst %d.\n",
+		    __func__, bp->HbaInstance);)
+
+		pext->Status = EXT_STATUS_DEV_NOT_FOUND;
+		return (ret);
+	}
+
+	DEBUG9(printk("%s: ha inst %ld, buff %p.\n",
+	    __func__, ha->instance, bp);)
+	DEBUG4(printk("%s: hba %p, buff %p bp->HbaInstance(%x).\n",
+	    __func__, ha, bp, (int)bp->HbaInstance));
 
 	if (ha->flags.failover_enabled)
 		if ((host = qla2x00_cfg_find_host(ha)) == NULL) {
-			DEBUG2(printk("qla2x00_get_lun_data: no HOST for "
-					"ha %p.\n", ha);)
-			return 1;
+			DEBUG2_9_10(printk("%s: no HOST for ha inst %ld.\n",
+			    __func__, ha->instance);)
+			pext->Status = EXT_STATUS_DEV_NOT_FOUND;
+			return (ret);
 		}
 
 	if ((list = (FO_LUN_DATA_LIST *)kmem_zalloc(sizeof(FO_LUN_DATA_LIST),
-					GFP_ATOMIC, 12)) == NULL) {
-		printk("qla_fo_get_lun_data: failed to allocate "
-			"memory of size (%d)\n", (int)sizeof(FO_LUN_DATA_LIST));
-		return 1;
+	    GFP_ATOMIC, 12)) == NULL) {
+		DEBUG2_9_10(printk("%s: failed to alloc memory of size (%d)\n",
+		    __func__, (int)sizeof(FO_LUN_DATA_LIST));)
+		pext->Status = EXT_STATUS_NO_MEMORY;
+		return (-ENOMEM);
 	}
 
 	entry = &list->DataEntry[0];
@@ -212,9 +233,9 @@ qla2x00_fo_get_lun_data(EXT_IOCTL *pext,
 	for ( ; (fcport); fcport = fcport->next) {
 
 		memcpy(entry->NodeName,
-				fcport->node_name, EXT_DEF_WWN_NAME_SIZE);
+		    fcport->node_name, EXT_DEF_WWN_NAME_SIZE);
 		memcpy(entry->PortName,
-				fcport->port_name, EXT_DEF_WWN_NAME_SIZE);
+		    fcport->port_name, EXT_DEF_WWN_NAME_SIZE);
 
 		if (!ha->flags.failover_enabled) {
 			/*
@@ -234,7 +255,7 @@ qla2x00_fo_get_lun_data(EXT_IOCTL *pext,
 			}
 			if (cnt == MAX_FIBRE_DEVICES) {
 				/* Not found?  For now just go to next port. */
-#if defined(QL_DEBUG_LEVEL_2)
+#if defined(QL_DEBUG_LEVEL_2) || defined(QL_DEBUG_LEVEL_10)
 				uint8_t          *tmp_name;
 #if USE_PORTNAME
 				tmp_name = fcport->port_name;
@@ -242,39 +263,60 @@ qla2x00_fo_get_lun_data(EXT_IOCTL *pext,
 				tmp_name = fcport->node_name;
 #endif
 
-				printk("fo_get_lun_data(%ld): ERROR "
-					"port %02x%02x%02x%02x%02x%02x%02x%02x "
-					"not configured.\n", ha->host_no,
-					tmp_name[0], tmp_name[1], tmp_name[2],
-					tmp_name[3], tmp_name[4], tmp_name[5],
-					tmp_name[6], tmp_name[7]);
+				printk("%s(%ld): ERROR - port "
+				    "%02x%02x%02x%02x%02x%02x%02x%02x "
+				    "not configured.\n",
+				    __func__, ha->host_no,
+				    tmp_name[0], tmp_name[1], tmp_name[2],
+				    tmp_name[3], tmp_name[4], tmp_name[5],
+				    tmp_name[6], tmp_name[7]);
 #endif /* DEBUG */
 
 				continue;
 			}
 
+			/* Got a valid port */
+			list->EntryCount++;
+
 			for (lun = 0; lun < MAX_LUNS; lun++) {
 				/* set MSB if masked */
-				if (EXT_IS_LUN_BIT_SET(&(fcport->lun_mask),
-							lun)) {
-					entry->Data[lun] = 0;
-				} else {
-					entry->Data[lun] = LUN_DATA_ENABLED;
+				entry->Data[lun] = LUN_DATA_PREFERRED_PATH;
+				if (!EXT_IS_LUN_BIT_SET(&(fcport->lun_mask),
+				    lun)) {
+					entry->Data[lun] |= LUN_DATA_ENABLED;
 				}
 			}
 
-			DEBUG3(printk("qla2x00_fo_get_lun_data: got lun_mask "
-						"for tgt %d\n", cnt);)
-			DEBUG3(qla2x00_dump_buffer((char *)&(fcport->lun_mask),
-						sizeof(fcport->lun_mask));)
+			DEBUG9(printk("%s: got lun_mask for tgt %d\n",
+			    __func__, cnt);)
+			DEBUG9(qla2x00_dump_buffer((char *)&(fcport->lun_mask),
+			    sizeof(lun_bit_mask_t));)
+
+			ret = verify_area(VERIFY_WRITE, (void *)u_entry,
+			    sizeof(FO_EXTERNAL_LUN_DATA_ENTRY));
+			if (ret) {
+				/* error */
+				DEBUG9_10(printk("%s: u_entry %p verify write"
+				    " error. list->EntryCount=%d.\n",
+				    __func__, u_entry, list->EntryCount);)
+				pext->Status = EXT_STATUS_COPY_ERR;
+				break;
+			}
 
-			list->EntryCount++;
+			ret = copy_to_user(u_entry, entry,
+			    sizeof(FO_EXTERNAL_LUN_DATA_ENTRY));
 
-			copy_to_user(u_entry, entry,
-					sizeof(FO_EXTERNAL_LUN_DATA_ENTRY));
-			u_entry++;
+			if (ret) {
+				/* error */
+				DEBUG9_10(printk("%s: u_entry %p copy "
+				    "error. list->EntryCount=%d.\n",
+				    __func__, u_entry, list->EntryCount);)
+				pext->Status = EXT_STATUS_COPY_ERR;
+				break;
+			}
 
 			/* Go to next port */
+			u_entry++;
 			continue;
 		}
 
@@ -297,33 +339,54 @@ qla2x00_fo_get_lun_data(EXT_IOCTL *pext,
 
 			path = pathlist->last;
 			for (path_id = 0; path_id < pathlist->path_cnt;
-					path_id++, path = path->next) {
+			    path_id++, path = path->next) {
 
 				if (path->host != host)
 					continue;
 
 				if (!qla2x00_is_portname_equal(path->portname,
-							entry->PortName))
+				    entry->PortName))
 					continue;
 
+				/* Got an entry */
+				entry->TargetId = dp->dev_id;
+				entry->Dev_No = path->id;
+				list->EntryCount++;
+
 				for (lun = 0; lun < MAX_LUNS; lun++) {
 					entry->Data[lun] =
-						path->lun_data.data[lun];
+					    path->lun_data.data[lun];
+				}
+
+				ret = verify_area(VERIFY_WRITE, (void *)u_entry,
+				    sizeof(FO_EXTERNAL_LUN_DATA_ENTRY));
+				if (ret) {
+					/* error */
+					DEBUG2_9_10(printk("%s: u_entry %p "
+					    "verify wrt err. EntryCount=%d.\n",
+					    __func__, u_entry, list->EntryCount);)
+					pext->Status = EXT_STATUS_COPY_ERR;
+					break;
+				}
+
+				ret = copy_to_user(u_entry, entry,
+				    sizeof(FO_EXTERNAL_LUN_DATA_ENTRY));
+				if (ret) {
+					/* error */
+					DEBUG2_9_10(printk("%s: u_entry %p "
+					    "copy out err. EntryCount=%d.\n",
+					    __func__, u_entry, list->EntryCount);)
+					pext->Status = EXT_STATUS_COPY_ERR;
+					break;
 				}
 
-				entry->TargetId = dp->dev_id;
-				entry->Dev_No = path->id;
-				list->EntryCount++;
-				copy_to_user(u_entry, entry,
-					sizeof(FO_EXTERNAL_LUN_DATA_ENTRY));
 				u_entry++;
 
-				DEBUG2(printk("qla_fo: (output) get_lun_data - "
-						"u_entry(%p) - lun entry[%d] "
-						":\n",
-						u_entry,list->EntryCount - 1);)
+				DEBUG9(printk("%s: (output) get_lun_data - "
+				    "u_entry(%p) - lun entry[%d] :\n",
+				    __func__, u_entry,list->EntryCount - 1);)
 
-				DEBUG2(qla2x00_dump_buffer((void *)entry, 64);)
+				DEBUG9(qla2x00_dump_buffer((void *)entry, 64);)
 
 				/*
 				 * We found the right path for this port.
@@ -337,16 +400,32 @@ qla2x00_fo_get_lun_data(EXT_IOCTL *pext,
 		}
 	}
 
-	DEBUG4(printk("qla_fo: get_lun_data - entry count = [%d]\n",
-				list->EntryCount);)
-
-	/* copy number of entries */
-	copy_to_user(&u_list->EntryCount, &list->EntryCount,
-			sizeof(list->EntryCount));
-	pext->ResponseLen = FO_LUN_DATA_LIST_MAX_SIZE;
+	DEBUG9(printk("%s: get_lun_data - entry count = [%d]\n",
+	    __func__, list->EntryCount);)
+	DEBUG4(printk("%s: get_lun_data - entry count = [%d]\n",
+	    __func__, list->EntryCount);)
+
+	if (ret == 0) {
+		ret = verify_area(VERIFY_WRITE, (void *)&u_list->EntryCount,
+		    sizeof(list->EntryCount));
+		if (ret) {
+			/* error */
+			DEBUG2_9_10(printk("%s: u_list->EntryCount %p verify "
+			    " write error. list->EntryCount=%d.\n",
+			    __func__, u_entry, list->EntryCount);)
+			pext->Status = EXT_STATUS_COPY_ERR;
+		} else {
+			/* copy number of entries */
+			ret = copy_to_user(&u_list->EntryCount, &list->EntryCount,
+			    sizeof(list->EntryCount));
+			pext->ResponseLen = FO_LUN_DATA_LIST_MAX_SIZE;
+		}
+	}
 
 	KMEM_FREE(list, sizeof(FO_LUN_DATA_LIST));
 
+	DEBUG9(printk("%s: exiting. ret=%d.\n", __func__, ret);)
+
 	return ret;
 }
 
@@ -391,24 +470,36 @@ qla2x00_fo_set_lun_data(EXT_IOCTL *pext,
 	com_struc *com_iter;
 
 
+	DEBUG9(printk("%s: entered.\n", __func__);)
+
 	ha = qla2x00_get_hba((int)bp->HbaInstance);
 
-	DEBUG9(printk("qla_fo_set_lun_data: hba %p, buff %p.\n", ha, bp);)
+	if (!ha) {
+		DEBUG2_9_10(printk("%s: no ha matching inst %d.\n",
+		    __func__, bp->HbaInstance);)
+
+		pext->Status = EXT_STATUS_DEV_NOT_FOUND;
+		return (ret);
+	}
+
+	DEBUG9(printk("%s: ha inst %ld, buff %p.\n",
+	    __func__, ha->instance, bp);)
 
 	if (ha->flags.failover_enabled)
 		if ((host = qla2x00_cfg_find_host(ha)) == NULL) {
-			DEBUG2(printk("qla2x00_fo_set_lun_data: no HOST for "
-					"ha %p.\n", ha);)
-			return 1;
+			DEBUG2_9_10(printk("%s: no HOST for ha inst %ld.\n",
+			    __func__, ha->instance);)
+			pext->Status = EXT_STATUS_DEV_NOT_FOUND;
+			return (ret);
 		}
 
 	if ((list = (FO_LUN_DATA_LIST *)kmem_zalloc(sizeof(FO_LUN_DATA_LIST),
-					GFP_ATOMIC, 13)) == NULL) {
+	    GFP_ATOMIC, 13)) == NULL) {
 
-		DEBUG2_3(printk("qla_fo_set_lun_data: failed to allocate "
-				"memory of size (%d)\n",
-				(int)sizeof(FO_LUN_DATA_LIST));)
-		return 1;
+		DEBUG2_9_10(printk("%s: failed to alloc memory of size (%d)\n",
+		    __func__, (int)sizeof(FO_LUN_DATA_LIST));)
+		pext->Status = EXT_STATUS_NO_MEMORY;
+		return (-ENOMEM);
 	}
 
 	entry = &list->DataEntry[0];
@@ -418,7 +509,26 @@ qla2x00_fo_set_lun_data(EXT_IOCTL *pext,
 	u_list = &(com_iter->foLunDataList);
 	u_entry = &u_list->DataEntry[0];
 
-	copy_from_user(list, u_list, sizeof(FO_LUN_DATA_LIST));
+	ret = verify_area(VERIFY_READ, (void *)u_list,
+	    sizeof(FO_LUN_DATA_LIST));
+	if (ret) {
+		/* error */
+		DEBUG2_9_10(printk("%s: u_list %p verify read error.\n",
+		    __func__, u_list);)
+		pext->Status = EXT_STATUS_COPY_ERR;
+		KMEM_FREE(list, FO_LUN_DATA_LIST);
+		return (ret);
+	}
+
+	ret = copy_from_user(list, u_list, sizeof(FO_LUN_DATA_LIST));
+	if (ret) {
+		/* error */
+		DEBUG2_9_10(printk("%s: u_list %p copy error.\n",
+		    __func__, u_list);)
+		pext->Status = EXT_STATUS_COPY_ERR;
+		KMEM_FREE(list, FO_LUN_DATA_LIST);
+		return (ret);
+	}
 
 	DEBUG2(printk("qla_fo_set_lun_data: pext->RequestAdr(%p) u_list (%p) "
 			"sizeof(FO_LUN_DATA_INPUT) =(%d) and 64 bytes...\n",
@@ -428,8 +538,25 @@ qla2x00_fo_set_lun_data(EXT_IOCTL *pext,
 
 	for (i = 0; i < list->EntryCount; i++, u_entry++) {
 
-		copy_from_user(entry, u_entry,
-				sizeof(FO_EXTERNAL_LUN_DATA_ENTRY));
+		ret = verify_area(VERIFY_READ, (void *)u_entry,
+		    sizeof(FO_EXTERNAL_LUN_DATA_ENTRY));
+		if (ret) {
+			/* error */
+			DEBUG2_9_10(printk("%s: u_entry %p verify "
+			    " read error.\n",
+			    __func__, u_entry);)
+			pext->Status = EXT_STATUS_COPY_ERR;
+			break;
+		}
+		ret = copy_from_user(entry, u_entry,
+		    sizeof(FO_EXTERNAL_LUN_DATA_ENTRY));
+		if (ret) {
+			/* error */
+			DEBUG2_9_10(printk("%s: u_entry %p copy error.\n",
+			    __func__, u_entry);)
+			pext->Status = EXT_STATUS_COPY_ERR;
+			break;
+		}
 
 		if (!ha->flags.failover_enabled) {
 			/*
@@ -483,21 +610,21 @@ qla2x00_fo_set_lun_data(EXT_IOCTL *pext,
 
 			path = pathlist->last;
 			for (path_id = 0; path_id < pathlist->path_cnt;
-					path_id++, path = path->next) {
+			    path_id++, path = path->next) {
 
 				if (path->host != host)
 					continue;
 
 				if (!qla2x00_is_portname_equal(path->portname,
-							entry->PortName))
+				    entry->PortName))
 					continue;
 
 				for (lun = 0; lun < MAX_LUNS; lun++) {
 					path->lun_data.data[lun] =
-						entry->Data[lun];
+					    entry->Data[lun];
 					DEBUG4(printk("cfg_set_lun_data: lun "
-						"data[%d] = 0x%x \n", lun,
-						path->lun_data.data[lun]);)
+					    "data[%d] = 0x%x \n", lun,
+					    path->lun_data.data[lun]);)
 				}
 
 				break;
@@ -508,6 +635,8 @@ qla2x00_fo_set_lun_data(EXT_IOCTL *pext,
 
 	KMEM_FREE(list, FO_LUN_DATA_LIST);
 
+	DEBUG9(printk("%s: exiting. ret = %d.\n", __func__, ret);)
+
 	return ret;
 }
 
@@ -542,23 +671,35 @@ qla2x00_fo_get_target_data(EXT_IOCTL *pe
 	uint32_t	b;
 
 
+	DEBUG9(printk("%s: entered.\n", __func__);)
+
 	ha = qla2x00_get_hba((int)bp->HbaInstance);
 
-	DEBUG3(printk("qla_fo_get_target_data: hba %p, buff %p.\n", ha, bp);)
+	if (!ha) {
+		DEBUG2_9_10(printk("%s: no ha matching inst %d.\n",
+		    __func__, bp->HbaInstance);)
+
+		pext->Status = EXT_STATUS_DEV_NOT_FOUND;
+		return (ret);
+	}
+
+	DEBUG9(printk("%s: ha inst %ld, buff %p.\n",
+	    __func__, ha->instance, bp);)
 
 	if (ha->flags.failover_enabled)
 		if ((host = qla2x00_cfg_find_host(ha)) == NULL) {
-			DEBUG2(printk("qla2x00_get_target_data: no HOST for "
-					"ha %p.\n", ha);)
-			return 1;
+			DEBUG2_9_10(printk("%s: no HOST for ha inst %ld.\n",
+			    __func__, ha->instance);)
+			pext->Status = EXT_STATUS_DEV_NOT_FOUND;
+			return (ret);
 		}
 
 	if ((entry = (FO_DEVICE_DATA *)kmem_zalloc(sizeof(FO_DEVICE_DATA),
-					GFP_ATOMIC,14)) == NULL) {
-		DEBUG2_3(printk("qla_fo_get_target_data: failed to allocate "
-				"memory of size (%d)\n",
-				(int)sizeof(FO_DEVICE_DATA));)
-		return 1;
+	    GFP_ATOMIC,14)) == NULL) {
+		DEBUG2_9_10(printk("%s: failed to alloc memory of size (%d)\n",
+		    __func__, (int)sizeof(FO_DEVICE_DATA));)
+		pext->Status = EXT_STATUS_NO_MEMORY;
+		return (-ENOMEM);
 	}
 
 	u_entry = (FO_DEVICE_DATA *) pext->ResponseAdr;
@@ -573,9 +714,9 @@ qla2x00_fo_get_target_data(EXT_IOCTL *pe
 	for (i = 0; fcport && i < MAX_TARGETS; i++, fcport = fcport->next) {
 
 		memcpy(entry->WorldWideName,
-				fcport->node_name, EXT_DEF_WWN_NAME_SIZE);
+		    fcport->node_name, EXT_DEF_WWN_NAME_SIZE);
 		memcpy(entry->PortName,
-				fcport->port_name, EXT_DEF_WWN_NAME_SIZE);
+		    fcport->port_name, EXT_DEF_WWN_NAME_SIZE);
 
 		for (b = 0; b < 3 ; b++)
 			entry->PortId[b] = fcport->d_id.r.d_id[2-b];
@@ -597,7 +738,7 @@ qla2x00_fo_get_target_data(EXT_IOCTL *pe
 			}
 			if (cnt == MAX_FIBRE_DEVICES) {
 				/* Not found?  For now just go to next port. */
-#if defined(QL_DEBUG_LEVEL_2)
+#if defined(QL_DEBUG_LEVEL_2) || defined(QL_DEBUG_LEVEL_10)
 				uint8_t          *tmp_name;
 #if USE_PORTNAME
 				tmp_name = fcport->port_name;
@@ -606,18 +747,40 @@ qla2x00_fo_get_target_data(EXT_IOCTL *pe
 #endif
 
 				printk("fo_get_target_data(%ld): ERROR "
-					"port %02x%02x%02x%02x%02x%02x%02x%02x "
-					"not configured.\n", ha->host_no,
-					tmp_name[0], tmp_name[1], tmp_name[2],
-					tmp_name[3], tmp_name[4], tmp_name[5],
-					tmp_name[6], tmp_name[7]);
+				    "port %02x%02x%02x%02x%02x%02x%02x%02x "
+				    "not configured.\n", ha->host_no,
+				    tmp_name[0], tmp_name[1], tmp_name[2],
+				    tmp_name[3], tmp_name[4], tmp_name[5],
+				    tmp_name[6], tmp_name[7]);
 #endif /* DEBUG */
 
 				continue;
 			}
 
 			entry->MultipathControl = 0; /* always configured */
-			copy_to_user(u_entry, entry, sizeof(FO_DEVICE_DATA));
+
+			ret = verify_area(VERIFY_WRITE, (void *)u_entry,
+			    sizeof(FO_DEVICE_DATA));
+			if (ret) {
+				/* error */
+				DEBUG2_9_10(printk("%s: u_entry %p verify "
+				    " wrt err. tgt id=%d.\n",
+				    __func__, u_entry, cnt);)
+				pext->Status = EXT_STATUS_COPY_ERR;
+				break;
+			}
+
+			ret = copy_to_user(u_entry, entry,
+			    sizeof(FO_DEVICE_DATA));
+			if (ret) {
+				/* error */
+				DEBUG2_9_10(printk("%s: u_entry %p copy "
+				    "out err. tgt id=%d.\n",
+				    __func__, u_entry, cnt);)
+				pext->Status = EXT_STATUS_COPY_ERR;
+				break;
+			}
+
 			u_entry++;
 
 			continue;
@@ -642,25 +805,45 @@ qla2x00_fo_get_target_data(EXT_IOCTL *pe
 
 			path = pathlist->last;
 			for (path_id = 0; path_id < pathlist->path_cnt;
-					path_id++, path= path->next) {
+			    path_id++, path= path->next) {
 
 				if (path->host != host)
 					continue;
 
 				if (!qla2x00_is_portname_equal(path->portname,
-							entry->PortName))
+				    entry->PortName))
 					continue;
 
 				entry->TargetId = dp->dev_id;
 				entry->Dev_No = path->id;
 				entry->MultipathControl = path->mp_byte;
 
-				DEBUG3(printk("cfg_get_target_data: path->id "
-						"= %d, target data = 0x%x \n",
-						path->id,
-						path->mp_byte);)
-				copy_to_user(u_entry,
-						entry, sizeof(FO_DEVICE_DATA));
+				DEBUG9(printk("cfg_get_target_data: path->id "
+				    "= %d, target data = 0x%x \n",
+				    path->id, path->mp_byte);)
+
+				ret = verify_area(VERIFY_WRITE, (void *)u_entry,
+				    sizeof(FO_DEVICE_DATA));
+				if (ret) {
+					/* error */
+					DEBUG2_9_10(printk("%s: u_entry %p "
+					    "verify wrt err. tgt id=%d.\n",
+					    __func__, u_entry, dp->dev_id);)
+					pext->Status = EXT_STATUS_COPY_ERR;
+					break;
+				}
+
+				ret = copy_to_user(u_entry, entry,
+				    sizeof(FO_DEVICE_DATA));
+				if (ret) {
+					/* error */
+					DEBUG2_9_10(printk("%s: u_entry %p "
+					    "copy out err. tgt id=%d.\n",
+					    __func__, u_entry, dp->dev_id);)
+					pext->Status = EXT_STATUS_COPY_ERR;
+					break;
+				}
+
 				u_entry++;
 
 				/* Path found. Continue with next fcport */
@@ -669,10 +852,16 @@ qla2x00_fo_get_target_data(EXT_IOCTL *pe
 			break;
 		}
 	}
-	pext->ResponseLen = sizeof(FO_DEVICE_DATABASE);
+
+	if (ret == 0) {
+		pext->ResponseLen = sizeof(FO_DEVICE_DATABASE);
+	}
 
 	KMEM_FREE(entry, sizeof(FO_DEVICE_DATA));
-	return ret;
+
+	DEBUG9(printk("%s: exiting. ret = %d.\n", __func__, ret);)
+
+	return (ret);
 }
 
 /*
@@ -702,34 +891,64 @@ qla2x00_fo_set_target_data(EXT_IOCTL *pe
 	uint8_t	         path_id;
 	FO_DEVICE_DATA *entry, *u_entry;
 
+	DEBUG9(printk("%s: entered.\n", __func__);)
+
 	ha = qla2x00_get_hba((int)bp->HbaInstance);
 
-	DEBUG3(printk("qla_fo_set_target_data: hba %p, buff %p.\n",
-				ha, bp);)
+	if (!ha) {
+		DEBUG2_9_10(printk("%s: no ha matching inst %d.\n",
+		    __func__, bp->HbaInstance);)
+
+		pext->Status = EXT_STATUS_DEV_NOT_FOUND;
+		return (ret);
+	}
+
+	DEBUG9(printk("%s: ha inst %ld, buff %p.\n",
+	    __func__, ha->instance, bp);)
 
 	if (!ha->flags.failover_enabled)
 		/* non-failover mode. nothing to be done. */
 		return 0;
 
 	if ((host = qla2x00_cfg_find_host(ha)) == NULL) {
-		DEBUG2(printk("qla2x00_fo_set_target_data: no HOST for "
-				"ha %p.\n", ha);)
-		return 1;
+		DEBUG2_9_10(printk("%s: no HOST for ha inst %ld.\n",
+		    __func__, ha->instance);)
+		pext->Status = EXT_STATUS_DEV_NOT_FOUND;
+		return (ret);
 	}
 
 	if ((entry = (FO_DEVICE_DATA *)kmem_zalloc(sizeof(FO_DEVICE_DATA),
-					GFP_ATOMIC,15)) == NULL) {
-		DEBUG2_3(printk("qla_fo_set_target_data: failed to allocate "
-				"memory of size (%d)\n",
-				(int)sizeof(FO_LUN_DATA_LIST));)
-		return 1;
+	    GFP_ATOMIC,15)) == NULL) {
+		DEBUG2_9_10(printk("%s: failed to alloc memory of size (%d)\n",
+		    __func__, (int)sizeof(FO_DEVICE_DATA));)
+		pext->Status = EXT_STATUS_NO_MEMORY;
+		return (-ENOMEM);
 	}
 
 	u_entry = (FO_DEVICE_DATA *)(pext->RequestAdr +
-			sizeof(FO_TARGET_DATA_INPUT));
+	    sizeof(FO_TARGET_DATA_INPUT));
 
 	for (i = 0; i < MAX_TARGETS; i++, u_entry++) {
-		copy_from_user(entry, u_entry, sizeof(FO_DEVICE_DATA));
+		ret = verify_area(VERIFY_READ, (void *)u_entry,
+		    sizeof(FO_DEVICE_DATA));
+		if (ret) {
+			/* error */
+			DEBUG2_9_10(printk("%s: u_entry %p verify read err.\n",
+			    __func__, u_entry);)
+			pext->Status = EXT_STATUS_COPY_ERR;
+			break;
+		}
+
+		ret = copy_from_user(entry, u_entry, sizeof(FO_DEVICE_DATA));
+
+		if (ret) {
+			/* error */
+			DEBUG2_9_10(printk("%s: u_entry %p copy error.\n",
+			    __func__, u_entry);)
+			pext->Status = EXT_STATUS_COPY_ERR;
+			break;
+		}
+
 		for (dev_no = 0; dev_no < MAX_MP_DEVICES; dev_no++) {
 			dp = host->mp_devs[dev_no];
 
@@ -745,20 +964,20 @@ qla2x00_fo_set_target_data(EXT_IOCTL *pe
 
 			path = pathlist->last;
 			for (path_id = 0; path_id < pathlist->path_cnt;
-					path_id++, path= path->next) {
+			    path_id++, path= path->next) {
 
 				if (path->host != host)
 					continue;
 
 				if (!qla2x00_is_portname_equal(path->portname,
-							entry->PortName))
+				    entry->PortName))
 					continue;
 
 				path->mp_byte = entry->MultipathControl;
 
-				DEBUG3(printk("cfg_set_target_data: %d target "
-						"data = 0x%x \n",
-						path->id,path->mp_byte);)
+				DEBUG9(printk("cfg_set_target_data: %d target "
+				    "data = 0x%x \n",
+				    path->id,path->mp_byte);)
 
 				/*
 				 * If this is the visible path, then make it
@@ -768,6 +987,7 @@ qla2x00_fo_set_target_data(EXT_IOCTL *pe
 				    (path->mp_byte & MP_MASK_UNCONFIGURED))) {
 					pathlist->visible = path->id;
 				}
+
 				/* Found path. Go to next entry. */
 				break;
 			}
@@ -776,7 +996,10 @@ qla2x00_fo_set_target_data(EXT_IOCTL *pe
 	}
 
 	KMEM_FREE(entry, sizeof(FO_DEVICE_DATA));
-	return ret;
+
+	DEBUG9(printk("%s: exiting. ret = %d.\n", __func__, ret);)
+
+	return (ret);
 
 }
 
@@ -799,11 +1022,10 @@ qla2x00_fo_set_target_data(EXT_IOCTL *pe
  */
 /* ARGSUSED */
 int
-qla2x00_fo_ioctl(scsi_qla_host_t *ha, int ioctl_code, void *arg, int mode)
+qla2x00_fo_ioctl(scsi_qla_host_t *ha, int ioctl_code, void *ret_arg, int mode)
 {
 	static EXT_IOCTL cmd_struct;
-	int stat, rval = 0;
-	/* EXT_IOCTL status values */
+	int    rval = 0;
 	size_t	in_size, out_size;
 	static	union {
 		FO_PARAMS params;
@@ -817,9 +1039,9 @@ qla2x00_fo_ioctl(scsi_qla_host_t *ha, in
 
 
 	ENTER("qla2x00_fo_ioctl");
+	DEBUG9(printk("%s: entered. arg (%p):\n", __func__, ret_arg);)
 
-	memcpy(&cmd_struct, arg, sizeof(cmd_struct));
-	DEBUG3(printk("qla2x00_fo_ioctl: arg (%p):\n", arg);)
+	memcpy(&cmd_struct, ret_arg, sizeof(cmd_struct));
 
 	/*
 	 * default case for this switch not needed,
@@ -861,27 +1083,47 @@ qla2x00_fo_ioctl(scsi_qla_host_t *ha, in
 		if ((int)cmd_struct.RequestLen < in_size) {
 			cmd_struct.Status = EXT_STATUS_INVALID_PARAM;
 			cmd_struct.DetailStatus = EXT_DSTATUS_REQUEST_LEN;
-			rval = EINVAL;
+			DEBUG10(printk("%s: got invalie req len (%d).\n",
+			    __func__, cmd_struct.RequestLen);)
+
 		} else {
 
-			stat = copy_from_user(&buff,
-					cmd_struct.RequestAdr, in_size);
-			DEBUG4(printk("qla2x00_fo_ioctl: printing "
-					"request buffer:\n"));
-			if (stat) {
+			rval = verify_area(VERIFY_READ,
+			    (void *)cmd_struct.RequestAdr, in_size);
+			if (rval) {
+				/* error */
+				DEBUG2_9_10(printk("%s: req buf verify read "
+				    "error. size=%d.\n",
+				    __func__, in_size);)
 				cmd_struct.Status = EXT_STATUS_COPY_ERR;
-				rval = EFAULT;
+			}
+			rval = copy_from_user(&buff,
+			    (void *)cmd_struct.RequestAdr, in_size);
+
+			if (rval) {
+				DEBUG2_9_10(printk("%s: req buf copy error. "
+				    "size=%d.\n",
+				    __func__, in_size);)
+
+				cmd_struct.Status = EXT_STATUS_COPY_ERR;
+			} else {
+				DEBUG9(printk("qla2x00_fo_ioctl: req buf "
+				    "copied ok.\n"));
 			}
 		}
 	} else if (out_size != 0 && (int)cmd_struct.ResponseLen < out_size) {
 		cmd_struct.Status = EXT_STATUS_BUFFER_TOO_SMALL;
 		cmd_struct.DetailStatus = out_size;
-		rval = EINVAL;
+		DEBUG10(printk("%s: got invalie resp len (%d).\n",
+		    __func__, cmd_struct.ResponseLen);)
 	}
-	if (rval == 0)
 
-		cmd_struct.Status = EXT_STATUS_OK;
+	if (rval != 0 || cmd_struct.Status != 0)
+		goto done_fo_ioctl;
+
+	cmd_struct.Status = EXT_STATUS_OK;
 	cmd_struct.DetailStatus = EXT_STATUS_OK;
+
 	switch (ioctl_code) {
 		case FO_CC_GET_PARAMS:
 			rval = qla2x00_fo_get_params(&buff.params);
@@ -908,56 +1150,80 @@ qla2x00_fo_ioctl(scsi_qla_host_t *ha, in
 		case FO_CC_GET_LUN_DATA:
 
 			DEBUG4(printk("calling qla2x00_fo_get_lun_data\n");)
-			DEBUG4(printk("((EXT_IOCTL*)arg)->RequestAdr (%p):\n",
-					(((EXT_IOCTL*)arg)->RequestAdr));)
+			DEBUG4(printk("cmd_struct.RequestAdr (%p):\n",
+					cmd_struct.RequestAdr);)
+
 			rval = qla2x00_fo_get_lun_data(&cmd_struct,
-						&buff.lun_data, mode);
+			    &buff.lun_data, mode);
+
 			if (rval != 0)
 				out_size = 0;
 			break;
 		case FO_CC_SET_LUN_DATA:
 
 			DEBUG4(printk("calling qla2x00_fo_set_lun_data\n");)
-			DEBUG4(printk("	((EXT_IOCTL*)arg)->RequestAdr (%p):\n",
-					(((EXT_IOCTL*)arg)->RequestAdr));)
+			DEBUG4(printk("	cmd_struct.RequestAdr (%p):\n",
+			    cmd_struct.RequestAdr);)
+
 			rval = qla2x00_fo_set_lun_data(&cmd_struct,
-						&buff.lun_data, mode);
+			    &buff.lun_data, mode);
 			break;
 		case FO_CC_GET_TARGET_DATA:
 			DEBUG4(printk("calling qla2x00_fo_get_target_data\n");)
-			DEBUG4(printk("	((EXT_IOCTL*)arg)->RequestAdr (%p):\n",
-					(((EXT_IOCTL*)arg)->RequestAdr));)
+			DEBUG4(printk("cmd_struct.RequestAdr (%p):\n",
+			    cmd_struct.RequestAdr);)
+
 			rval = qla2x00_fo_get_target_data(&cmd_struct,
-						&buff.target_data, mode);
+			    &buff.target_data, mode);
+
 			if (rval != 0) {
 				out_size = 0;
 			}
 			break;
 		case FO_CC_SET_TARGET_DATA:
 			DEBUG4(printk("calling qla2x00_fo_set_target_data\n");)
-			DEBUG4(printk("	((EXT_IOCTL*)arg)->RequestAdr (%p):\n",
-					(((EXT_IOCTL*)arg)->RequestAdr));)
+			DEBUG4(printk("	cmd_struct.RequestAdr (%p):\n",
+			    cmd_struct.RequestAdr);)
 			rval = qla2x00_fo_set_target_data(&cmd_struct,
-						&buff.target_data, mode);
+			    &buff.target_data, mode);
 			break;
 
 	}
-	if ((cmd_struct.ResponseLen = out_size) != 0) {
-		copy_to_user(&(((EXT_IOCTL*)arg)->ResponseAdr),
-				&buff, out_size);
+
+	if (rval == 0 && (cmd_struct.ResponseLen = out_size) != 0) {
+		rval = verify_area(VERIFY_WRITE, (void *)cmd_struct.ResponseAdr,
+		    out_size);
+		if (rval != 0) {
+			DEBUG10(printk("%s: resp buf very write error.\n",
+			    __func__);)
+			cmd_struct.Status = EXT_STATUS_COPY_ERR;
+		}
 	}
 
+	if (rval == 0) {
+		rval = copy_to_user((void *)cmd_struct.ResponseAdr,
+		    &buff, out_size);
+
+		if (rval != 0) {
+			DEBUG10(printk("%s: resp buf copy error. size=%d.\n",
+			    __func__, out_size);)
+			cmd_struct.Status = EXT_STATUS_COPY_ERR;
+		}
+	}
+
+done_fo_ioctl:
+
 	/* Set Status and DetailStatus fields in application EXT_IOCTL */
-	(((EXT_IOCTL*)arg)->Status) 		= cmd_struct.Status;
-	(((EXT_IOCTL*)arg)->DetailStatus)	= cmd_struct.DetailStatus;
-	(((EXT_IOCTL*)arg)->ResponseLen)	= cmd_struct.ResponseLen;
+	(((EXT_IOCTL*)ret_arg)->Status) 	= cmd_struct.Status;
+	(((EXT_IOCTL*)ret_arg)->DetailStatus)	= cmd_struct.DetailStatus;
+	(((EXT_IOCTL*)ret_arg)->ResponseLen)	= cmd_struct.ResponseLen;
 
 	if (rval != 0) {
 		/*EMPTY*/
-		DEBUG4(printk("qla2x00_fo_ioctl: **** FAILED ****\n");)
+		DEBUG10(printk("%s: **** FAILED ****\n", __func__);)
 	} else {
 		/*EMPTY*/
-		DEBUG4(printk("qla2x00_fo_ioctl: exiting normally\n");)
+		DEBUG9(printk("%s: exiting normally\n", __func__);)
 	}
 
 	return rval;
@@ -986,13 +1252,15 @@ qla2x00_fo_count_retries(scsi_qla_host_t
 	os_lun_t	*lq;
 	os_tgt_t	*tq;
 
+	DEBUG9(printk("%s: entered.\n", __func__);)
+
 	if (++sp->fo_retry_cnt >  qla_fo_params.MaxRetriesPerIo) {
 		/* no more failovers for this request */
 		retry = FALSE;
 		sp->fo_retry_cnt = 0;
 		printk(KERN_INFO
-			"qla2x00: no more failovers for request - "
-			"pid= %ld\n", sp->cmd->serial_number);
+		    "qla2x00: no more failovers for request - "
+		    "pid= %ld\n", sp->cmd->serial_number);
 	} else {
 		/*
 		 * We haven't exceeded the max retries for this request, check
@@ -1000,11 +1268,11 @@ qla2x00_fo_count_retries(scsi_qla_host_t
 		 */
 		if ((sp->fo_retry_cnt % qla_fo_params.MaxRetriesPerPath) == 0) {
 			DEBUG(printk(" qla2x00_fo_count_retries: FAILOVER - "
-					"queuing ha=%ld, sp=%p, pid =%ld, "
-					"fo retry= %d \n",
-					ha->host_no,
-					sp, sp->cmd->serial_number,
-					sp->fo_retry_cnt);)
+			    "queuing ha=%ld, sp=%p, pid =%ld, "
+			    "fo retry= %d \n",
+			    ha->host_no,
+			    sp, sp->cmd->serial_number,
+			    sp->fo_retry_cnt);)
 
 			/*
 			 * Note: we don't want it to timeout, so it is
@@ -1025,6 +1293,9 @@ qla2x00_fo_count_retries(scsi_qla_host_t
 			add_to_failover_queue(ha,sp);
 		}
 	}
+
+	DEBUG9(printk("%s: exiting. retry = %d.\n", __func__, retry);)
+
 	return retry ;
 }
 
@@ -1071,6 +1342,8 @@ qla2x00_fo_check(scsi_qla_host_t *ha, sr
 	};
 #endif
 
+	DEBUG9(printk("%s: entered.\n", __func__);)
+
 	/* we failover on selction timeouts only */
 	host_status = CMD_RESULT(sp->cmd) >>16;
 	if( host_status == DID_NO_CONNECT) {
@@ -1089,6 +1362,9 @@ qla2x00_fo_check(scsi_qla_host_t *ha, sr
 				sp, sp->fo_retry_cnt,
 				retry, reason[host_status]);)
 	}
+
+	DEBUG9(printk("%s: exiting. retry = %d.\n", __func__, retry);)
+
 	return retry;
 }
 
@@ -1132,6 +1408,8 @@ qla2x00_fo_path_change(uint32_t type, fc
 static uint32_t
 qla2x00_fo_get_params(PFO_PARAMS pp)
 {
+	DEBUG9(printk("%s: entered.\n", __func__);)
+
 	pp->MaxPathsPerDevice = qla_fo_params.MaxPathsPerDevice;
 	pp->MaxRetriesPerPath = qla_fo_params.MaxRetriesPerPath;
 	pp->MaxRetriesPerIo = qla_fo_params.MaxRetriesPerIo;
@@ -1140,8 +1418,10 @@ qla2x00_fo_get_params(PFO_PARAMS pp)
 	pp->FailoverNotifyCdbLength = qla_fo_params.FailoverNotifyCdbLength;
 	memset(pp->FailoverNotifyCdb, 0, sizeof(pp->FailoverNotifyCdb));
 	memcpy(pp->FailoverNotifyCdb,
-			&qla_fo_params.FailoverNotifyCdb[0],
-			sizeof(pp->FailoverNotifyCdb));
+	    &qla_fo_params.FailoverNotifyCdb[0], sizeof(pp->FailoverNotifyCdb));
+
+	DEBUG9(printk("%s: exiting.\n", __func__);)
+
 	return EXT_STATUS_OK;
 }
 
@@ -1161,13 +1441,17 @@ qla2x00_fo_get_params(PFO_PARAMS pp)
 static uint32_t
 qla2x00_fo_set_params(PFO_PARAMS pp)
 {
+	DEBUG9(printk("%s: entered.\n", __func__);)
+
 	/* Check values for defined MIN and MAX */
 	if ((pp->MaxPathsPerDevice > SDM_DEF_MAX_PATHS_PER_DEVICE) ||
-			(pp->MaxRetriesPerPath < FO_MAX_RETRIES_PER_PATH_MIN) ||
-			(pp->MaxRetriesPerPath > FO_MAX_RETRIES_PER_PATH_MAX) ||
-			(pp->MaxRetriesPerIo < FO_MAX_RETRIES_PER_IO_MIN) ||
-			(pp->MaxRetriesPerPath > FO_MAX_RETRIES_PER_IO_MAX))
+	    (pp->MaxRetriesPerPath < FO_MAX_RETRIES_PER_PATH_MIN) ||
+	    (pp->MaxRetriesPerPath > FO_MAX_RETRIES_PER_PATH_MAX) ||
+	    (pp->MaxRetriesPerIo < FO_MAX_RETRIES_PER_IO_MIN) ||
+	    (pp->MaxRetriesPerPath > FO_MAX_RETRIES_PER_IO_MAX)) {
+		DEBUG2_9_10(printk("%s: got invalid params.\n", __func__);)
 		return EXT_STATUS_INVALID_PARAM;
+	}
 
 	/* Update the global structure. */
 	qla_fo_params.MaxPathsPerDevice = pp->MaxPathsPerDevice;
@@ -1178,13 +1462,19 @@ qla2x00_fo_set_params(PFO_PARAMS pp)
 	qla_fo_params.FailoverNotifyCdbLength = pp->FailoverNotifyCdbLength;
 	if (pp->FailoverNotifyType & FO_NOTIFY_TYPE_CDB) {
 		if (pp->FailoverNotifyCdbLength >
-				sizeof(qla_fo_params.FailoverNotifyCdb))
+		    sizeof(qla_fo_params.FailoverNotifyCdb)) {
+			DEBUG2_9_10(printk("%s: got invalid cdb length.\n",
+			    __func__);)
 			return EXT_STATUS_INVALID_PARAM;
+		}
 
 		memcpy(qla_fo_params.FailoverNotifyCdb,
-				pp->FailoverNotifyCdb,
-				sizeof(qla_fo_params.FailoverNotifyCdb));
+		    pp->FailoverNotifyCdb,
+		    sizeof(qla_fo_params.FailoverNotifyCdb));
 	}
+
+	DEBUG9(printk("%s: exiting.\n", __func__);)
+
 	return EXT_STATUS_OK;
 }
 
@@ -1203,6 +1493,8 @@ qla2x00_fo_set_params(PFO_PARAMS pp)
 void
 qla2x00_fo_init_params(scsi_qla_host_t *ha)
 {
+	DEBUG3(printk("%s: entered.\n", __func__);)
+
 	/* For parameters that are not completely implemented yet, */
 
 	memset(&qla_fo_params, 0, sizeof(qla_fo_params));
@@ -1223,6 +1515,8 @@ qla2x00_fo_init_params(scsi_qla_host_t *
 	qla_fo_params.Flags =  0;
 	qla_fo_params.FailoverNotifyType = FO_NOTIFY_TYPE_NONE;
 
+	DEBUG3(printk("%s: exiting.\n", __func__);)
+
 }
 
 /*
@@ -1251,6 +1545,7 @@ qla2x00_send_fo_notification(fc_lun_t *o
 
 
 	ENTER("qla2x00_send_fo_notification");
+	DEBUG3(printk("%s: entered.\n", __func__);)
 
 	loop_id = old_lp->fcport->loop_id;
 	lun = old_lp->lun;
@@ -1259,35 +1554,35 @@ qla2x00_send_fo_notification(fc_lun_t *o
 		rval = qla2x00_lun_reset(old_ha, loop_id, lun);
 		if (rval == QLA2X00_SUCCESS) {
 			DEBUG4(printk("qla2x00_send_fo_notification: LUN "
-					"reset succeded\n");)
+			    "reset succeded\n");)
 		} else {
 			DEBUG4(printk("qla2x00_send_fo_notification: LUN "
-					"reset failed\n");)
+			    "reset failed\n");)
 		}
 
 	}
 	if ( (qla_fo_params.FailoverNotifyType ==
-			 FO_NOTIFY_TYPE_LOGOUT_OR_LUN_RESET) ||
-			(qla_fo_params.FailoverNotifyType ==
-			 FO_NOTIFY_TYPE_LOGOUT_OR_CDB) )  {
+	     FO_NOTIFY_TYPE_LOGOUT_OR_LUN_RESET) ||
+	    (qla_fo_params.FailoverNotifyType ==
+	     FO_NOTIFY_TYPE_LOGOUT_OR_CDB) )  {
 
 		rval = qla2x00_fabric_logout(old_ha, loop_id);
 		if (rval == QLA2X00_SUCCESS) {
 			DEBUG4(printk("qla2x00_send_fo_failover_notify: "
-					"logout succeded\n");)
+			    "logout succeded\n");)
 		} else {
 			DEBUG4(printk("qla2x00_send_fo_failover_notify: "
-					"logout failed\n");)
+			    "logout failed\n");)
 		}
 
 	}
 
 	if (qla_fo_params.FailoverNotifyType == FO_NOTIFY_TYPE_CDB) {
 		pkt = pci_alloc_consistent(old_ha->pdev,
-				sizeof(inq_cmd_rsp_t), &phys_address);
+		    sizeof(inq_cmd_rsp_t), &phys_address);
 		if (pkt == NULL) {
 			DEBUG4(printk("qla2x00_send_fo_failover_notify: "
-					"memory allocation failed\n");)
+			    "memory allocation failed\n");)
 
 			return(QLA2X00_FUNCTION_FAILED);
 		}
@@ -1300,8 +1595,8 @@ qla2x00_send_fo_notification(fc_lun_t *o
 		pkt->p.cmd.target = (uint8_t)loop_id;
 		pkt->p.cmd.control_flags = CF_SIMPLE_TAG;
 		memcpy(pkt->p.cmd.scsi_cdb,
-				qla_fo_params.FailoverNotifyCdb,
-				qla_fo_params.FailoverNotifyCdbLength);
+		    qla_fo_params.FailoverNotifyCdb,
+		    qla_fo_params.FailoverNotifyCdbLength);
 		/* FIXME This setup needs to be verified with Dennis. */
 		pkt->p.cmd.dseg_count = __constant_cpu_to_le16(1);
 		pkt->p.cmd.byte_count = __constant_cpu_to_le32(0);
@@ -1310,24 +1605,26 @@ qla2x00_send_fo_notification(fc_lun_t *o
 		pkt->p.cmd.dseg_0_length = __constant_cpu_to_le32(0);
 
 		rval = qla2x00_issue_iocb(old_ha, pkt, phys_address,
-				sizeof (inq_cmd_rsp_t));
+		    sizeof (inq_cmd_rsp_t));
 		if (rval != QLA2X00_SUCCESS ||
-				pkt->p.rsp.comp_status != CS_COMPLETE ||
-				pkt->p.rsp.scsi_status & SS_CHECK_CONDITION ||
-				pkt->inq[0] == 0x7f) {
+		    pkt->p.rsp.comp_status != CS_COMPLETE ||
+		    pkt->p.rsp.scsi_status & SS_CHECK_CONDITION ||
+		    pkt->inq[0] == 0x7f) {
 
 			DEBUG4(printk("qla2x00_fo_notification: send CDB "
-					"failed: comp_status = %x"
-					"scsi_status = %x inq[0] = %x\n",
-					pkt->p.rsp.comp_status,
-					pkt->p.rsp.scsi_status,
-					pkt->inq[0]);)
+			    "failed: comp_status = %x"
+			    "scsi_status = %x inq[0] = %x\n",
+			    pkt->p.rsp.comp_status,
+			    pkt->p.rsp.scsi_status,
+			    pkt->inq[0]);)
 		}
 
 		pci_free_consistent(old_ha->pdev,
-				sizeof(inq_cmd_rsp_t), pkt, phys_address);
+		    sizeof(inq_cmd_rsp_t), pkt, phys_address);
 	}
 
+	DEBUG3(printk("%s: exiting. rval = %d.\n", __func__, rval);)
+
 	return rval;
 }
 
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/qla2xxx/qla_fo.cfg linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/qla2xxx/qla_fo.cfg
--- linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/qla2xxx/qla_fo.cfg	2003-07-30 13:51:37.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/qla2xxx/qla_fo.cfg	2003-07-30 10:28:04.000000000 +0200
@@ -2,7 +2,7 @@
  *                  QLOGIC LINUX SOFTWARE
  *
  * QLogic ISP2x00 device driver for Linux 2.4.x
- * Copyright (C) 2002 Qlogic Corporation
+ * Copyright (C) 2003 Qlogic Corporation
  * (www.qlogic.com)
  *
  * This program is free software; you can redistribute it and/or modify it
@@ -20,9 +20,9 @@
 /*
  * QLogic ISP2x00 Multi-path LUN Support Driver
  */
-int	MaxPathsPerDevice = 0;
-int	MaxRetriesPerPath =0 ;
-int	MaxRetriesPerIo =0;
+static int	MaxPathsPerDevice = 0;
+static int	MaxRetriesPerPath =0 ;
+static int	MaxRetriesPerIo =0;
 #if defined(MODULE)
 /* insmod qla2100 <options> ql2xopts=<string> */
 MODULE_PARM(MaxPathsPerDevice, "i");
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/qla2xxx/qla_fo.h linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/qla2xxx/qla_fo.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/qla2xxx/qla_fo.h	2003-07-30 13:51:37.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/qla2xxx/qla_fo.h	2003-07-30 10:28:03.000000000 +0200
@@ -2,7 +2,7 @@
  *                  QLOGIC LINUX SOFTWARE
  *
  * QLogic ISP2x00 device driver for Linux 2.4.x
- * Copyright (C) 2002 Qlogic Corporation
+ * Copyright (C) 2003 Qlogic Corporation
  * (www.qlogic.com)
  *
  * This program is free software; you can redistribute it and/or modify it
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/qla2xxx/qla_gbl.h linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/qla2xxx/qla_gbl.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/qla2xxx/qla_gbl.h	2003-07-30 13:51:37.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/qla2xxx/qla_gbl.h	2003-07-30 10:28:04.000000000 +0200
@@ -2,7 +2,7 @@
 *                  QLOGIC LINUX SOFTWARE
 *
 * QLogic ISP2x00 device driver for Linux 2.4.x
-* Copyright (C) 2002 Qlogic Corporation
+* Copyright (C) 2003 Qlogic Corporation
 * (www.qlogic.com)
 *
 * This program is free software; you can redistribute it and/or modify it
@@ -38,7 +38,7 @@ extern SysFoParams_t qla_fo_params;
 /*
  * Global Function Prototypes in qla2x00.c source file.
  */
-extern int qla2x00_get_prop_xstr(scsi_qla_host_t *, char *, uint8_t *, int);
+static int qla2x00_get_prop_xstr(scsi_qla_host_t *, char *, uint8_t *, int);
 
 extern void qla2x00_formatted_print(char *, uint64_t , uint8_t, uint8_t);
 extern void qla2x00_formatted_dump_buffer(char *, uint8_t *, uint8_t ,
@@ -67,7 +67,7 @@ extern int qla2x00_cfg_path_discovery(sc
 extern int qla2x00_cfg_event_notify(scsi_qla_host_t *ha, uint32_t i_type);
 extern fc_lun_t *qla2x00_cfg_failover(scsi_qla_host_t *ha, fc_lun_t *fp,
 					      os_tgt_t *tgt, srb_t *sp);
-extern uint32_t qla2x00_cfg_get_paths( EXT_IOCTL *, FO_GET_PATHS *, int);
+extern int qla2x00_cfg_get_paths( EXT_IOCTL *, FO_GET_PATHS *, int);
 extern int qla2x00_cfg_set_current_path( EXT_IOCTL *,
 			FO_SET_CURRENT_PATH *, int);
 extern void qla2x00_fo_properties(scsi_qla_host_t *ha);
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/qla2xxx/qla_inioct.c linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/qla2xxx/qla_inioct.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/qla2xxx/qla_inioct.c	2003-07-30 13:51:37.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/qla2xxx/qla_inioct.c	2003-07-30 10:28:04.000000000 +0200
@@ -2,7 +2,7 @@
  *                  QLOGIC LINUX SOFTWARE
  *
  * QLogic ISP2x00 device driver for Linux 2.4.x
- * Copyright (C) 2002 Qlogic Corporation
+ * Copyright (C) 2003 Qlogic Corporation
  * (www.qlogic.com)
  *
  * This program is free software; you can redistribute it and/or modify it
@@ -19,17 +19,17 @@
 
 #include "inioct.h"
 
-extern int qla2x00_loopback_test(scsi_qla_host_t *ha, INT_LOOPBACK_REQ *req,
+static int qla2x00_loopback_test(scsi_qla_host_t *ha, INT_LOOPBACK_REQ *req,
     uint16_t *ret_mb);
 
-int qla2x00_read_nvram(scsi_qla_host_t *, EXT_IOCTL *, int);
-int qla2x00_update_nvram(scsi_qla_host_t *, EXT_IOCTL *, int);
-int qla2x00_write_nvram_word(scsi_qla_host_t *, uint8_t, uint16_t);
-int qla2x00_send_loopback(scsi_qla_host_t *, EXT_IOCTL *, int);
-int qla2x00_read_option_rom(scsi_qla_host_t *, EXT_IOCTL *, int);
-int qla2x00_update_option_rom(scsi_qla_host_t *, EXT_IOCTL *, int);
+static int qla2x00_read_nvram(scsi_qla_host_t *, EXT_IOCTL *, int);
+static int qla2x00_update_nvram(scsi_qla_host_t *, EXT_IOCTL *, int);
+static int qla2x00_write_nvram_word(scsi_qla_host_t *, uint8_t, uint16_t);
+static int qla2x00_send_loopback(scsi_qla_host_t *, EXT_IOCTL *, int);
+static int qla2x00_read_option_rom(scsi_qla_host_t *, EXT_IOCTL *, int);
+static int qla2x00_update_option_rom(scsi_qla_host_t *, EXT_IOCTL *, int);
 
-int
+static int
 qla2x00_read_nvram(scsi_qla_host_t *ha, EXT_IOCTL *pext, int mode)
 {
 	uint8_t  *usr_temp, *kernel_tmp;
@@ -83,12 +83,12 @@ qla2x00_read_nvram(scsi_qla_host_t *ha, 
  * Context:
  *	Kernel context.
  */
-int
+static int
 qla2x00_update_nvram(scsi_qla_host_t *ha, EXT_IOCTL *pext, int mode)
 {
 	uint8_t i, cnt;
 	uint8_t *usr_tmp, *kernel_tmp;
-	static nvram21_t new_nv;
+	nvram21_t *pnew_nv;
 	uint16_t *wptr;
 	uint16_t data;
 	uint32_t transfer_size;
@@ -103,8 +103,19 @@ qla2x00_update_nvram(scsi_qla_host_t *ha
 	else
 		transfer_size = sizeof(nvram21_t);
 
+	if (qla2x00_get_ioctl_scrap_mem(ha, (void **)&pnew_nv,
+	    sizeof(nvram21_t))) {
+		/* not enough memory */
+		pext->Status = EXT_STATUS_NO_MEMORY;
+		DEBUG9_10(printk("%s(%ld): inst=%ld scrap not big enough. "
+		    "size requested=%d.\n",
+		    __func__, ha->host_no, ha->instance,
+		    sizeof(nvram21_t));)
+		return (ret);
+	}
+
 	/* Read from user buffer */
-	kernel_tmp = (uint8_t *)&new_nv;
+	kernel_tmp = (uint8_t *)pnew_nv;
 	usr_tmp = (uint8_t *)pext->RequestAdr;
 
 	ret = verify_area(VERIFY_READ, (void *)usr_tmp, transfer_size);
@@ -112,12 +123,13 @@ qla2x00_update_nvram(scsi_qla_host_t *ha
 		DEBUG9_10(printk(
 		    "qla2x00_update_nvram: ERROR in buffer verify READ. "
 		    "RequestAdr=%p\n", pext->RequestAdr);)
+		qla2x00_free_ioctl_scrap_mem(ha);
 		return ret;
 	}
 
 	copy_from_user(kernel_tmp, usr_tmp, transfer_size);
 
-	kernel_tmp = (uint8_t *)&new_nv;
+	kernel_tmp = (uint8_t *)pnew_nv;
 
 	/* we need to checksum the nvram */
 	for (i = 0; i < sizeof(nvram21_t) - 1; i++) {
@@ -130,7 +142,7 @@ qla2x00_update_nvram(scsi_qla_host_t *ha
 	*kernel_tmp = chksum;
 
 	/* Write to NVRAM */
-	wptr = (uint16_t *)&new_nv;
+	wptr = (uint16_t *)pnew_nv;
 	for (cnt = 0; cnt < transfer_size / 2; cnt++) {
 		data = *wptr++;
 		qla2x00_write_nvram_word(ha, cnt, data);
@@ -141,10 +153,11 @@ qla2x00_update_nvram(scsi_qla_host_t *ha
 
 	DEBUG9(printk("qla2x00_update_nvram: exiting.\n");)
 
+	qla2x00_free_ioctl_scrap_mem(ha);
 	return 0;
 }
 
-int
+static int
 qla2x00_write_nvram_word(scsi_qla_host_t *ha, uint8_t addr, uint16_t data)
 {
 	int count;
@@ -220,7 +233,7 @@ qla2x00_write_nvram_word(scsi_qla_host_t
 	return 0;
 }
 
-int
+static int
 qla2x00_send_loopback(scsi_qla_host_t *ha, EXT_IOCTL *pext, int mode)
 {
 	int		status;
@@ -451,7 +464,7 @@ int qla2x00_update_option_rom(scsi_qla_h
 		return (ret);
 	}
 
-	kern_tmp = (uint8_t *)KMEM_ZALLOC(FLASH_IMAGE_SIZE, 40);
+	kern_tmp = (uint8_t *)KMEM_ZALLOC(FLASH_IMAGE_SIZE, 30);
 	if (kern_tmp == NULL) {
 		pext->Status = EXT_STATUS_COPY_ERR;
 		printk(KERN_WARNING
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/qla2xxx/qla_ip.c linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/qla2xxx/qla_ip.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/qla2xxx/qla_ip.c	2003-07-30 13:51:37.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/qla2xxx/qla_ip.c	2003-07-30 10:28:03.000000000 +0200
@@ -2,7 +2,7 @@
  *                  QLOGIC LINUX SOFTWARE
  *
  * QLogic ISP2x00 device driver for Linux 2.4.x
- * Copyright (C) 2002 Qlogic Corporation
+ * Copyright (C) 2003 Qlogic Corporation
  * (www.qlogic.com)
  *
  * This program is free software; you can redistribute it and/or modify it
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/qla2xxx/qla_ip.h linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/qla2xxx/qla_ip.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/qla2xxx/qla_ip.h	2003-07-30 13:51:37.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/qla2xxx/qla_ip.h	2003-07-30 10:28:03.000000000 +0200
@@ -2,7 +2,7 @@
  *                  QLOGIC LINUX SOFTWARE
  *
  * QLogic ISP2x00 IP network driver for Linux 2.4.x
- * Copyright (C) 2002 Qlogic Corporation
+ * Copyright (C) 2003 Qlogic Corporation
  * (www.qlogic.com)
  *
  * This program is free software; you can redistribute it and/or modify it
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/qla2xxx/qla_mbx.c linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/qla2xxx/qla_mbx.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/qla2xxx/qla_mbx.c	2003-07-30 13:51:37.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/qla2xxx/qla_mbx.c	2003-07-30 10:28:04.000000000 +0200
@@ -2,7 +2,7 @@
  *                  QLOGIC LINUX SOFTWARE
  *
  * QLogic ISP2x00 device driver for Linux 2.4.x
- * Copyright (C) 2002 Qlogic Corporation
+ * Copyright (C) 2003 Qlogic Corporation
  * (www.qlogic.com)
  *
  * This program is free software; you can redistribute it and/or modify it
@@ -93,7 +93,7 @@ STATIC int
 qla2x00_get_retry_cnt(scsi_qla_host_t *, uint8_t *, uint8_t *);
 
 #if defined(INTAPI)
-int
+static int
 qla2x00_loopback_test(scsi_qla_host_t *, INT_LOOPBACK_REQ *, uint16_t *);
 #endif
 
@@ -123,7 +123,7 @@ qla2x00_login_fabric(scsi_qla_host_t *, 
     uint16_t *, uint8_t);
 
 STATIC int
-qla2x00_login_local_device(scsi_qla_host_t *ha, uint16_t loop_id, uint8_t opt);
+qla2x00_login_local_device(scsi_qla_host_t *, uint16_t, uint16_t *, uint8_t);
 
 STATIC int
 qla2x00_fabric_logout(scsi_qla_host_t *ha, uint16_t loop_id);
@@ -153,6 +153,10 @@ qla2x00_set_rnid_params_mbx(scsi_qla_hos
 STATIC int
 qla2x00_get_rnid_params_mbx(scsi_qla_host_t *, dma_addr_t, size_t, uint16_t *);
 
+#if defined(QL_DEBUG_LEVEL_3)
+STATIC int
+qla2x00_get_fcal_position_map(scsi_qla_host_t *ha, char *pos_map);
+#endif
 
 /***************************/
 /* Function implementation */
@@ -2172,39 +2176,56 @@ qla2x00_login_fabric(scsi_qla_host_t *ha
  *             
  */
 STATIC int
-qla2x00_login_local_device(scsi_qla_host_t *ha, uint16_t loop_id, uint8_t opt)
+qla2x00_login_local_device(scsi_qla_host_t *ha,
+		uint16_t loop_id, uint16_t *mb_ret, uint8_t opt)
 {
 	int rval;
 	mbx_cmd_t mc;
 	mbx_cmd_t *mcp = &mc;
 
-	DEBUG3(printk("qla2x00_login_local_device(%ld): entered.\n",
-				ha->host_no);)
+	DEBUG3(printk("%s(%ld): entered.\n", __func__, ha->host_no);)
 
 	mcp->mb[0] = MBC_LOGIN_LOOP_PORT;
 	mcp->mb[1] = (loop_id << 8) ;
 	mcp->mb[2] = opt;
 	mcp->out_mb = MBX_2|MBX_1|MBX_0;
-	mcp->in_mb = MBX_0;
+ 	mcp->in_mb = MBX_7|MBX_6|MBX_1|MBX_0;
 	mcp->tov =  ha->login_timeout * 2;
 	mcp->flags = 0;
 	rval = (int)qla2x00_mailbox_command(ha, mcp);
 
-	if (rval != QL_STATUS_SUCCESS) {
-		/*EMPTY*/
-		DEBUG(printk("qla2x00_login_local_device(%ld): failed=%x mb[0]=%x " 
-					"mb[1]=%x.\n",
-					ha->host_no, rval, mcp->mb[0], mcp->mb[1]);)
-			DEBUG2_3(printk("qla2x00_login_local_device(%ld): failed=%x mb[0]=%x "
-					       	"mb[1]=%x.\n",
-						ha->host_no, rval, mcp->mb[0], mcp->mb[1]);)
+ 	/* Return mailbox statuses. */
+ 	if (mb_ret != NULL) {
+ 		mb_ret[0] = mcp->mb[0];
+ 		mb_ret[1] = mcp->mb[1];
+ 		mb_ret[6] = mcp->mb[6];
+ 		mb_ret[7] = mcp->mb[7];
+ 	}
+
+	if (rval != QL_STATUS_SUCCESS) {
+ 		/* AV tmp code: need to change main mailbox_command function to
+ 		 * return ok even when the mailbox completion value is not
+ 		 * SUCCESS. The caller needs to be responsible to interpret
+ 		 * the return values of this mailbox command if we're not
+ 		 * to change too much of the existing code.
+ 		 */
+ 		if (mcp->mb[0] == 0x4005 || mcp->mb[0] == 0x4006)
+ 			rval = QL_STATUS_SUCCESS;
+
+		DEBUG(printk("%s(%ld): failed=%x mb[0]=%x mb[1]=%x "
+		    "mb[6]=%x mb[7]=%x.\n",
+		    __func__, ha->host_no, rval, mcp->mb[0], mcp->mb[1],
+		    mcp->mb[6], mcp->mb[7]);)
+		DEBUG2_3(printk("%s(%ld): failed=%x mb[0]=%x mb[1]=%x "
+		    "mb[6]=%x mb[7]=%x.\n",
+		    __func__, ha->host_no, rval, mcp->mb[0], mcp->mb[1],
+		    mcp->mb[6], mcp->mb[7]);)
 	} else {
 		/*EMPTY*/
-		DEBUG3(printk("qla2x00_login_local_device(%ld): done.\n",
-					ha->host_no);)
+		DEBUG3(printk("%s(%ld): done.\n", __func__, ha->host_no);)
 	}
-	return (rval);
 
+	return (rval);
 }
 
 /*
@@ -2598,3 +2619,71 @@ qla2x00_get_rnid_params_mbx(scsi_qla_hos
 	return (rval);
 }
 
+#if defined(QL_DEBUG_LEVEL_3)
+/*
+ * qla2x00_get_fcal_position_map
+ *	Get FCAL (LILP) position map using mailbox command
+ *
+ * Input:
+ *	ha = adapter state pointer.
+ *	pos_map = buffer pointer (can be NULL).
+ *
+ * Returns:
+ *	qla2x00 local function return status code.
+ *
+ * Context:
+ *	Kernel context.
+ */
+STATIC int
+qla2x00_get_fcal_position_map(scsi_qla_host_t *ha, char *pos_map)
+{
+	int rval;
+	mbx_cmd_t mc;
+	mbx_cmd_t *mcp = &mc;
+	char *pmap;
+	dma_addr_t pmap_dma;
+
+	pmap = pci_alloc_consistent(ha->pdev, FCAL_MAP_SIZE, &pmap_dma);
+	if (pmap  == NULL) {
+		DEBUG2_3_11(printk("%s(%ld): **** Mem Alloc Failed ****",
+		    __func__, ha->host_no));
+		return QL_STATUS_RESOURCE_ERROR;
+	}
+
+	memset(pmap, 0, FCAL_MAP_SIZE);
+
+	mcp->mb[0] = MBC_GET_FCAL_MAP;
+	mcp->mb[2] = MSW(pmap_dma);
+	mcp->mb[3] = LSW(pmap_dma);
+	mcp->mb[6] = QL21_64BITS_4THWD(pmap_dma);
+	mcp->mb[7] = QL21_64BITS_3RDWD(pmap_dma);
+	mcp->out_mb = MBX_7|MBX_6|MBX_3|MBX_2|MBX_0;
+	mcp->in_mb = MBX_1|MBX_0;
+	mcp->buf_size = FCAL_MAP_SIZE;
+	mcp->flags = MBX_DMA_IN;
+	mcp->tov =  ha->login_timeout * 2;
+	rval = (int)qla2x00_mailbox_command(ha, mcp);
+
+	if (rval == QL_STATUS_SUCCESS) {
+		DEBUG11(printk("%s(%ld): (mb0=%x/mb1=%x) FC/AL Position Map "
+		    "size (%x)\n",
+		    __func__, ha->host_no,
+		    mcp->mb[0], mcp->mb[1], (unsigned)pmap[0]));
+		DEBUG11(qla2x00_dump_buffer(pmap, pmap[0] + 1));
+
+		if (pos_map)
+			memcpy(pos_map, pmap, FCAL_MAP_SIZE);
+	}
+	pci_free_consistent(ha->pdev, FCAL_MAP_SIZE, pmap, pmap_dma);
+
+	if (rval != QL_STATUS_SUCCESS) {
+		DEBUG2_3_11(printk("%s(%ld): failed=%x.\n",
+		    __func__, ha->host_no, rval));
+	} else {
+		DEBUG11(printk("%s(%ld): done.\n",
+		    __func__, ha->host_no));
+	}
+
+	return rval;
+}
+#endif
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/qla2xxx/qla_mbx.h linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/qla2xxx/qla_mbx.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/qla2xxx/qla_mbx.h	2003-07-30 13:51:37.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/qla2xxx/qla_mbx.h	2003-07-30 10:28:03.000000000 +0200
@@ -2,7 +2,7 @@
  *                  QLOGIC LINUX SOFTWARE
  *
  * QLogic ISP2x00 device driver for Linux 2.4.x
- * Copyright (C) 2002 Qlogic Corporation
+ * Copyright (C) 2003 Qlogic Corporation
  * (www.qlogic.com)
  *
  * This program is free software; you can redistribute it and/or modify it
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/qla2xxx/qla_settings.h linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/qla2xxx/qla_settings.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/qla2xxx/qla_settings.h	2003-07-30 13:51:37.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/qla2xxx/qla_settings.h	2003-07-30 10:28:03.000000000 +0200
@@ -2,7 +2,7 @@
  *                  QLOGIC LINUX SOFTWARE
  *
  * QLogic ISP2x00 device driver for Linux 2.4.x
- * Copyright (C) 2002 Qlogic Corporation
+ * Copyright (C) 2003 Qlogic Corporation
  * (www.qlogic.com)
  *
  * This program is free software; you can redistribute it and/or modify it
@@ -36,7 +36,6 @@
 #define  USE_PORTNAME                  1    /* option to use port names for targets */
 #define  LUN_MASKING                   0
 #define  USE_FLASH_DATABASE            0 /* Save persistent data to flash */
-#define  QLA2100_PROFILE               1
 #define  QLA_SCSI_VENDOR_DIR           0 /* Decode vendor specific opcodes for direction */
 #define QLA2100_LIPTEST    	       0
 #define REQ_TRACE    		       1
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/qla2xxx/qla_vendor.c linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/qla2xxx/qla_vendor.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/qla2xxx/qla_vendor.c	2003-07-30 13:51:37.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/qla2xxx/qla_vendor.c	2003-07-30 10:28:03.000000000 +0200
@@ -2,7 +2,7 @@
  *                  QLOGIC LINUX SOFTWARE
  *
  * QLogic ISP2x00 device driver for Linux 2.4.x
- * Copyright (C) 2002 Qlogic Corporation
+ * Copyright (C) 2003 Qlogic Corporation
  * (www.qlogic.com)
  *
  * This program is free software; you can redistribute it and/or modify it
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/qla2xxx/qla_version.h linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/qla2xxx/qla_version.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/qla2xxx/qla_version.h	2003-07-30 13:51:37.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/qla2xxx/qla_version.h	2003-07-30 10:28:03.000000000 +0200
@@ -3,7 +3,7 @@
  *                  QLOGIC LINUX SOFTWARE
  *
  * QLogic ISP2x00 device driver for Linux 2.4.x
- * Copyright (C) 2002 Qlogic Corporation
+ * Copyright (C) 2003 Qlogic Corporation
  * (www.qlogic.com)
  *
  * This program is free software; you can redistribute it and/or modify it
@@ -21,7 +21,12 @@
  * Driver version 
  */
 #if DEBUG_QLA2100
-#define QLA2100_VERSION      "6.04.00-debug"
+#define QLA2100_VERSION      "6.05.60-debug"
 #else
-#define QLA2100_VERSION      "6.04.00"
+#define QLA2100_VERSION      "6.05.60"
 #endif
+
+#define QLA_DRIVER_MAJOR_VER	6
+#define QLA_DRIVER_MINOR_VER	5
+#define QLA_DRIVER_PATCH_VER	60
+#define QLA_DRIVER_BETA_VER	0
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/qla2xxx/qlfo.h linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/qla2xxx/qlfo.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/qla2xxx/qlfo.h	2003-07-30 13:51:37.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/qla2xxx/qlfo.h	2003-07-30 10:28:03.000000000 +0200
@@ -2,7 +2,7 @@
  *                  QLOGIC LINUX SOFTWARE
  *
  * QLogic ISP2x00 device driver for Linux 2.4.x
- * Copyright (C) 2002 Qlogic Corporation
+ * Copyright (C) 2003 Qlogic Corporation
  * (www.qlogic.com)
  *
  * This program is free software; you can redistribute it and/or modify it
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/qla2xxx/qlfolimits.h linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/qla2xxx/qlfolimits.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/qla2xxx/qlfolimits.h	2003-07-30 13:51:37.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/qla2xxx/qlfolimits.h	2003-07-30 10:28:03.000000000 +0200
@@ -2,7 +2,7 @@
  *                  QLOGIC LINUX SOFTWARE
  *
  * QLogic ISP2x00 device driver for Linux 2.4.x
- * Copyright (C) 2002 Qlogic Corporation
+ * Copyright (C) 2003 Qlogic Corporation
  * (www.qlogic.com)
  *
  * This program is free software; you can redistribute it and/or modify it
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/qla2xxx/qlfoln.h linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/qla2xxx/qlfoln.h
--- linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/qla2xxx/qlfoln.h	2003-07-30 13:51:37.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/qla2xxx/qlfoln.h	2003-07-30 10:28:03.000000000 +0200
@@ -2,7 +2,7 @@
  *                  QLOGIC LINUX SOFTWARE
  *
  * QLogic ISP2x00 device driver for Linux 2.4.x
- * Copyright (C) 2002 Qlogic Corporation
+ * Copyright (C) 2003 Qlogic Corporation
  * (www.qlogic.com)
  *
  * This program is free software; you can redistribute it and/or modify it
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/qla2xxx/release.txt linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/qla2xxx/release.txt
--- linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/qla2xxx/release.txt	2003-07-30 13:51:38.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/qla2xxx/release.txt	2003-07-30 10:28:03.000000000 +0200
@@ -4,7 +4,7 @@
                            Release Notes
 			   =============
 
-Version  6.04.00	January 20, 2003
+Version  6.05.00b5	February 28, 2003
 
 +**********************************************+
 * Features supported by this version of driver *
@@ -26,3 +26,6 @@ o Please view revision.notes file
 +**************+
 * Known Issues *
 +**************+
+o This driver must be used with API library v2.00Beta3 + in order
+  to handle re-entrant API/ioctl commands correctly.
+
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/qla2xxx/revision.notes linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/qla2xxx/revision.notes
--- linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/qla2xxx/revision.notes	2003-07-30 13:51:38.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/qla2xxx/revision.notes	2003-07-30 10:28:03.000000000 +0200
@@ -5,8 +5,73 @@
  *
  * Revision History
  *
- *  Rev  6.04.00	January 20, 2003	RA
- *	-Formal release to Compaq
+ *  Rev  6.05.00b5	February 28, 2003	RL/AV
+ *	- Added check for a paused RISC in ISR -- dump HCCR for reason
+ *	- Fix improper nodename/portname construction in 
+ *	  qla2x00_nvram_config() by honoring the node_name_option
+ *	  bit in NVRAM.
+ *	- Correct parity check enables for 23xx ISPs.
+ *	- Add helper function qla2x00_local_device_login() to mimic
+ *	  fabric login logic.
+ *	- Reschedule a local-loop update if a loop-resync needed
+ *	  in qla2x00_local_loop_update() -- this will fix a small
+ *	  windows where a target-device state would become out-of-
+ *	  sync.
+ *	- Add debug function qla2x00_get_fcal_position_map() to
+ *	  return from the firmware the current negotiated LILP map.
+ *	- Fix endianess issues in direct connect environment
+ *	  (Mark Bellon mbellon@mvista.com):
+ *	- Add endian-safe bitmap structures for nvram
+ *	  and init_cb_t usage.
+ *	- Fix endianess problem in qla2x00_configure_local_loop().
+ *	- Add special_options structure for data rate and 
+ *	  termination settings.
+ *	- Fixed data corruption problem when issuing ioctl commands
+ *	  concurrently to multiple HBAs by using a per ha scrap buf.
+ *	- Added new ioctl command for returning driver specific data.
+ *	  This is used to allow API implementation to be backward
+ *	  compatible with driver.
+ *	- Reset adapter current_speed when loop is down.
+ *
+ *  Rev  6.05.00b4	February 06, 2003	RL/AV
+ *	- Fixed the checking of DEV_PUBLIC flag before setting
+ *	  the FC_FABRIC_DEVICE flag. The flag is now checked
+ *	  using bitwise AND everywhere.  This fixes problem
+ *	  with devices that are both initiator and target.
+ *	- Added checking of tape device so we don't logout from
+ *	  tape devices.
+ *	- Fixed the driver hang in get_target_data of non-fo driver
+ *	  by correctly store fcport value to target queue in
+ *	  fcport_bind.
+ *	- Fixed invalid configuration problem when displaying
+ *	  target LUNs via non-fo driver by correctly assign
+ *	  the only path as preferred path.
+ *	- Added ioctl support for non-fo driver to return path and
+ *	  system parameters information.
+ *	- Corrected the return values of fo ioctl functions
+ *	  and added checking of return value of copy_to/from_user
+ *	  calls.
+ *	- Fixed debug prints, some of which access invalid pointer.
+ *
+ *  Rev  6.05.00b3	January 27, 2003	RA/DG
+ *	- Added support for can_dma_32 and highmem_io.
+ *
+ *  Rev  6.05.00b2	January 24, 2003	RL/RA/AV/DG
+ *	- Added the use of HbaSelect to determine the ha context
+ *	  of each ioctl command.
+ *	- Corrected ioctl wait_q handling when timeout happened.
+ *	- Dynamically allocate EXT_IOCTL structure in order to
+ *	  make the main ioctl function reentrant.
+ *	- Corrected the return values of all non-fo ioctl functions
+ *	  and added checking of return value of copy_to/from_user
+ *	  calls in places that matter.
+ *	- Made proc_info reentrant by directly writing to the
+ *	  buffer supplied by the caller.
+ *
+ *  Rev  6.05.00b1	December 20, 2002	RL
+ *	- Added send_els_passthru function and modified start_ms_cmd
+ *	  to be used by both send_fcct and send_els_passthru.
+ *	- Modified ms_iocb definition to comply with latest 2300 spec. 
  *
  *  Rev  6.04.00b8	January 16, 2003	RA/DG/AV
  *	- Use proper compiler flags when built with later GCC
@@ -453,7 +518,7 @@
  *	- Fix potential panic when configuration data exists for a device
  *	  that is off-line.
  *
- *  Rev  6.0b23	       May   06, 2002       RA/RLU
+ *  Rev  6.0b23	       May   06, 2002       RA/RL
  *	- Added the new setup() routine for lk>=2.4 and above to handle the 
  *	  kernel command line parameter.
  *	- Set BIT_1 when issuing login_fabric() from the ioctl to take
@@ -534,7 +599,7 @@
  *	- Added barrier() between subsequent reads in
  *  	   qla2x00_debounce_register();  
  *	  
- *  Rev  6.0b17        April 09, 2002       AV/RLU/RA
+ *  Rev  6.0b17        April 09, 2002       AV/RL/RA
  *	- Deleted all direct references to qla2x00_callback outside
  *	  of sp_put and __sp_put functions, so the sp->ref_count
  *	  is decremented correctly before going back to free pool.
@@ -558,7 +623,7 @@
  *	  1 tick.  1 tick is unrealistic.
  *	- Added more ioctl function description headers.
  *
- *  Rev  6.0b16        April 08, 2002       RA/AV/RLU
+ *  Rev  6.0b16        April 08, 2002       RA/AV/RL
  *	 - Added the support to recognise medium changer type
  *	   as Tape devive(inq[0] == 8).
  *	 - For Not Ready case suspend the lun only for Hard Disk Device 
@@ -612,7 +677,7 @@
  *	 - Return a different status for 4006 error from login fabric
  *	   mbx cmd so we don't retry anymore.
  *
- *  Rev  6.0b14        April 04, 2002       DG/RA/RLU/AV
+ *  Rev  6.0b14        April 04, 2002       DG/RA/RL/AV
  *	 - Fixed query_disc_port ioctl not returning correct port
  *	   state.
  *	 - Changed port_down_retry_count to 32.
@@ -625,7 +690,7 @@
  *	 - Added PCI module device table.
  *	 - Updated README file with Suse ramdisk info.
  *
- *  Rev  6.0b13        April 03, 2002       DG/RA/RLU/AV
+ *  Rev  6.0b13        April 03, 2002       DG/RA/RL/AV
  *	- Fixed the makefile issue: corrected documentation,
  *	  and makefile syntax problem (making both drivers when
  *	  only one is asked for).
@@ -667,7 +732,7 @@
  *	  scsi3 passthru ioctl functions.
  *	- Updated README file.
  *
- *  Rev  6.0b9         March 28, 2002       RA/DG/RLU/JJ QLogic
+ *  Rev  6.0b9         March 28, 2002       RA/DG/RL/JJ QLogic
  *	- Added use of additional fields in Scsi_Cmnd to save IO
  *	  status related values for ioctl SCSI/FCCT passthru cmd
  *	  processing.
@@ -676,7 +741,7 @@
  *	- Added device and bus reset new error handling functions.
  *	- Added option and code to handle register_fc4.
  *
- *  Rev  6.0b8         March 27,2002        RA/DG/RLU QLogic
+ *  Rev  6.0b8         March 27,2002        RA/DG/RL QLogic
  *      - Set the host_byte status correctly in process_completed_request().
  *	- Fixed the stack overflow in configure_fabric() qla2x00_ioctl()
  *	  and qla2x00_fo_ioctl() routine.
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/scsi.c linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/scsi.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/scsi.c	2003-07-30 13:52:43.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/scsi.c	2003-07-30 11:18:43.000000000 +0200
@@ -199,6 +199,7 @@ void  scsi_initialize_queue(Scsi_Device 
 	blk_queue_headactive(q, 0);
 	spin_lock_init(&SDpnt->device_lock);
 	q->queue_lock = &SDpnt->device_lock;
+	blk_queue_throttle_sectors(q, 1);
 	q->queuedata = (void *) SDpnt;
 }
 
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/scsi_lib.c linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/scsi_lib.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/scsi_lib.c	2003-07-30 13:51:38.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/scsi_lib.c	2003-07-30 11:12:47.000000000 +0200
@@ -385,6 +385,7 @@ static Scsi_Cmnd *__scsi_end_request(Scs
 		if ((bh = req->bh) != NULL) {
 			nsect = bh->b_size >> 9;
 			blk_finished_io(nsect);
+			blk_finished_sectors(req, nsect);
 			req->bh = bh->b_reqnext;
 			bh->b_reqnext = NULL;
 			sectors -= nsect;
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/sg.c linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/sg.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/scsi/sg.c	2003-07-30 13:52:43.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/scsi/sg.c	2003-07-30 11:18:47.000000000 +0200
@@ -3029,7 +3029,7 @@ static int sg_proc_host_info(char * buff
     	for ( ; k < shp->host_no; ++k)
 	    PRINT_PROC("-1\t-1\t-1\t-1\t-1\t-1\n");
 	PRINT_PROC("%u\t%hu\t%hd\t%hu\t%d\t%d\n",
-		   shp->unique_id, shp->host_busy, shp->cmd_per_lun,
+		   shp->unique_id, atomic_read(&shp->host_busy), shp->cmd_per_lun,
 		   shp->sg_tablesize, (int)shp->unchecked_isa_dma,
 		   (int)shp->hostt->emulated);
     }
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/drivers/usb/usb.c linux-2.4.20-wolk4.4-fullkernel/drivers/usb/usb.c
--- linux-2.4.20-wolk4.3-fullkernel/drivers/usb/usb.c	2003-07-30 13:51:41.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/drivers/usb/usb.c	2002-12-18 01:03:58.000000000 +0100
@@ -2136,7 +2136,7 @@ err:
 int usb_string(struct usb_device *dev, int index, char *buf, size_t size)
 {
 	unsigned char *tbuf;
-	int err, len;
+	int err;
 	unsigned int u, idx;
 
 	if (size <= 0 || !buf || !index)
@@ -2166,15 +2166,10 @@ int usb_string(struct usb_device *dev, i
 	}
 
 	/*
-	 * ask for the length of the string 
+	 * Just ask for a maximum length string and then take the length
+	 * that was returned.
 	 */
-
-	err = usb_get_string(dev, dev->string_langid, index, tbuf, 2);
-	if(err<2)
-		goto errout;
-	len=tbuf[0];	
-	
-	err = usb_get_string(dev, dev->string_langid, index, tbuf, len);
+	err = usb_get_string(dev, dev->string_langid, index, tbuf, 255);
 	if (err < 0)
 		goto errout;
 
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/binfmt_elf.c linux-2.4.20-wolk4.4-fullkernel/fs/binfmt_elf.c
--- linux-2.4.20-wolk4.3-fullkernel/fs/binfmt_elf.c	2003-07-30 13:51:44.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/binfmt_elf.c	2003-07-30 11:23:32.000000000 +0200
@@ -386,7 +386,6 @@ static unsigned long load_aout_interp(st
 	unsigned long text_data, elf_entry = ~0UL;
 	char * addr;
 	loff_t offset;
-	int retval;
 
 	current->mm->end_code = interp_ex->a_text;
 	text_data = interp_ex->a_text + interp_ex->a_data;
@@ -408,11 +407,9 @@ static unsigned long load_aout_interp(st
 	}
 
 	do_brk(0, text_data);
-	retval = -ENOEXEC;
 	if (!interpreter->f_op || !interpreter->f_op->read)
 		goto out;
-	retval = interpreter->f_op->read(interpreter, addr, text_data, &offset);
-	if (retval < 0)
+	if (interpreter->f_op->read(interpreter, addr, text_data, &offset) < 0)
 		goto out;
 	flush_icache_range((unsigned long)addr,
 	                   (unsigned long)addr + text_data);
@@ -455,6 +452,7 @@ static int load_elf_binary(struct linux_
 	struct elfhdr interp_elf_ex;
   	struct exec interp_ex;
 	char passed_fileno[6];
+	struct files_struct *files, *ftmp;
 
 #ifdef CONFIG_GRKERNSEC_PAX_RANDEXEC
 	unsigned long load_addr_random = 0UL;
@@ -491,10 +489,17 @@ static int load_elf_binary(struct linux_
 	retval = kernel_read(bprm->file, elf_ex.e_phoff, (char *) elf_phdata, size);
 	if (retval < 0)
 		goto out_free_ph;
+		
+	files = current->files;		/* Refcounted so ok */
+	if(unshare_files() < 0)
+		goto out_free_ph;
 
+	/* exec will make our files private anyway, but for the a.out
+	   loader stuff we need to do it earlier */
+	   
 	retval = get_unused_fd();
 	if (retval < 0)
-		goto out_free_ph;
+		goto out_free_fh;
 	get_file(bprm->file);
 	fd_install(elf_exec_fileno = retval, bprm->file);
 
@@ -609,6 +614,9 @@ static int load_elf_binary(struct linux_
 	if (retval)
 		goto out_free_dentry;
 
+	/* Discard our unneeded old files struct */
+	put_files_struct(files);
+
 	/* OK, This is the point of no return */
 	current->mm->start_data = 0;
 	current->mm->end_data = 0;
@@ -954,6 +962,7 @@ static int load_elf_binary(struct linux_
 	if (current->ptrace & PT_PTRACED)
 		send_sig(SIGTRAP, current, 0);
 	/* here retval is zero */
+	steal_locks(files, current->files);
 out:
 	return retval;
 
@@ -967,6 +976,10 @@ out_free_interp:
 		kfree(elf_interpreter);
 out_free_file:
 	sys_close(elf_exec_fileno);
+out_free_fh:
+	ftmp = current->files;
+	current->files = files;
+	put_files_struct(ftmp);
 out_free_ph:
 	kfree(elf_phdata);
 	goto out;
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/block_dev.c linux-2.4.20-wolk4.4-fullkernel/fs/block_dev.c
--- linux-2.4.20-wolk4.3-fullkernel/fs/block_dev.c	2003-07-30 13:52:44.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/block_dev.c	2003-07-30 11:18:47.000000000 +0200
@@ -693,6 +693,8 @@ struct address_space_operations def_blk_
 	direct_IO: blkdev_direct_IO,
 };
 
+static int	blkdev_kvec_read(struct file *filp, kvec_cb_t cb, size_t size, loff_t pos);
+static int	blkdev_kvec_write(struct file *filp, kvec_cb_t cb, size_t size, loff_t pos);
 struct file_operations def_blk_fops = {
 	open:		blkdev_open,
 	release:	blkdev_close,
@@ -702,6 +704,10 @@ struct file_operations def_blk_fops = {
 	mmap:		generic_file_mmap,
 	fsync:		block_fsync,
 	ioctl:		blkdev_ioctl,
+	aio_read:	generic_file_aio_read,
+	aio_write:	generic_file_aio_write,
+	kvec_read:	blkdev_kvec_read,
+	kvec_write:	blkdev_kvec_write,
 };
 
 const char * bdevname(kdev_t dev)
@@ -715,3 +721,121 @@ const char * bdevname(kdev_t dev)
 	sprintf(buffer, "%s(%d,%d)", name, MAJOR(dev), MINOR(dev));
 	return buffer;
 }
+static int blkdev_kvec_rw(struct file *filp, int rw, kvec_cb_t cb, size_t size, loff_t pos);
+static int blkdev_kvec_read(struct file *file, kvec_cb_t cb, size_t size, loff_t pos)
+{
+	if (file->f_flags & O_DIRECT)
+		return blkdev_kvec_rw(file, READ, cb, size, pos);
+	else
+		return generic_file_kvec_read(file, cb, size, pos);
+}
+
+static int blkdev_kvec_write(struct file *file, kvec_cb_t cb, size_t size, loff_t pos)
+{
+	if (file->f_flags & O_DIRECT)
+		return blkdev_kvec_rw(file, WRITE, cb, size, pos);
+	else
+		return generic_file_kvec_write(file, cb, size, pos);
+}
+
+static int	blkdev_kvec_rw(struct file *filp, int rw, kvec_cb_t cb, size_t size, loff_t pos)
+{
+	int		err;
+	unsigned	minor;
+	kdev_t		dev;
+	unsigned long	limit, blocknr, blocks;
+
+	unsigned	sector_size, sector_bits, sector_mask;
+	unsigned	max_sectors;
+	unsigned	i;
+
+	pr_debug("blkdev_kvec_rw: %p %d %d %p %d %d %Lu\n", filp, rw, nr, kiovec, flags, size, pos);
+	/*
+	 * First, a few checks on device size limits 
+	 */
+
+	dev = filp->f_dentry->d_inode->i_rdev;
+	sector_size = 512;
+	if (is_mounted(dev)) {
+		if (blksize_size[MAJOR(dev)])
+			sector_size = blksize_size[MAJOR(dev)][MINOR(dev)];
+	} else {
+		if (hardsect_size[MAJOR(dev)])
+			sector_size = hardsect_size[MAJOR(dev)][MINOR(dev)];
+	}
+
+	if (sector_size == 512)  /* Fastpath */
+		sector_bits = 9;
+	else {
+		for (sector_bits = 0; sector_size > (1 << sector_bits); sector_bits++);
+		if ((1 << sector_bits) != sector_size) {
+			BUG();
+			return -EINVAL;
+		}
+	}
+
+	sector_mask = sector_size - 1;
+	max_sectors = 25000; /* KIO_MAX_SECTORS >> (sector_bits - 9); */
+	
+	if (blk_size[MAJOR(dev)])
+		limit = (((loff_t) blk_size[MAJOR(dev)][MINOR(dev)]) << BLOCK_SIZE_BITS) >> sector_bits;
+	else
+		limit = INT_MAX;
+	pr_debug("blkdev_kvec_rw: dev %d:%d (+%lu)\n",
+		 MAJOR(dev), MINOR(dev), limit);
+
+	/* EOF at the end */
+	err = 0;
+	if (!size || (pos >> sector_bits) == limit) {
+		pr_debug("blkdev_kvec_rw: %Lu > %lu, %d\n", pos >> sector_bits, limit, sector_bits);
+		cb.fn(cb.data, cb.vec, err);
+		return 0;
+	}
+
+	/* ENXIO for io beyond the end */
+	err = -ENXIO;
+	if ((pos >> sector_bits) >= limit) {
+		pr_debug("blkdev_kvec_rw: %Lu > %lu, %d\n", pos >> sector_bits, limit, sector_bits);
+		goto out;
+	}
+
+	err = -EINVAL;
+	if ((pos < 0) || (pos & sector_mask) || (size & sector_mask)) {
+		pr_debug("pos(%Ld)/size(%lu) wrong(%d)\n", pos, size, sector_mask);
+		goto out;
+	}
+
+	/* Verify that the scatter-gather list is sector aligned. */
+	for (i=0; i<cb.vec->nr; i++)
+		if ((cb.vec->veclet[i].offset & sector_mask) ||
+		    (cb.vec->veclet[i].length & sector_mask)) {
+			pr_debug("veclet offset/length wrong");
+			goto out;
+		}
+
+	/*
+	 * Split the IO into KIO_MAX_SECTORS chunks, mapping and
+	 * unmapping the single kiobuf as we go to perform each chunk of
+	 * IO.  
+	 */
+
+	blocknr = pos >> sector_bits;
+	blocks = size >> sector_bits;
+	if (blocks > max_sectors)
+		blocks = max_sectors;
+	if (blocks > limit - blocknr)
+		blocks = limit - blocknr;
+	err = -ENXIO;
+	if (!blocks) {
+		pr_debug("blkdev: !blocks %d %ld %ld\n", max_sectors, limit, blocknr);
+		goto out;
+	}
+
+	err = brw_kvec_async(rw, cb, dev, blocks, blocknr, sector_bits);
+out:
+	if (err)
+		printk(KERN_DEBUG "blkdev_kvec_rw: ret is %d\n", err);
+	return err;
+}
+
+
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/buffer.c linux-2.4.20-wolk4.4-fullkernel/fs/buffer.c
--- linux-2.4.20-wolk4.3-fullkernel/fs/buffer.c	2003-07-30 13:52:53.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/buffer.c	2003-07-30 11:21:09.000000000 +0200
@@ -1240,6 +1240,7 @@ struct buffer_head * bread(kdev_t dev, i
 		cond_resched();
 		return bh;
 	}
+	set_bit(BH_Sync, &bh->b_state);
 	ll_rw_block(READ, 1, &bh);
 	wait_on_buffer(bh);
 	if (buffer_uptodate(bh))
@@ -1647,7 +1648,6 @@ static int __block_write_full_page(struc
 
 	if (!page->buffers)
 		create_empty_buffers(page, inode->i_dev, 1 << inode->i_blkbits);
-	BUG_ON(page_count(page) < 3);
 	head = page->buffers;
 
 	block = page->index << (PAGE_CACHE_SHIFT - inode->i_blkbits);
@@ -1902,7 +1902,6 @@ int block_read_full_page(struct page *pa
 	blocksize = 1 << inode->i_blkbits;
 	if (!page->buffers)
 		create_empty_buffers(page, inode->i_dev, blocksize);
-	BUG_ON(page_count(page) < 3);
 	head = page->buffers;
 
 	blocks = PAGE_CACHE_SIZE >> inode->i_blkbits;
@@ -2517,7 +2516,7 @@ int brw_kiovec(int rw, int nr, struct ki
 					if (iosize > length)
 						iosize = length;
 					for (block_iter = 1; block_iter < iosize / size; block_iter++) {
-						if (blocknr + block_iter * (size >> 9) != b[bufind + block_iter]) {
+						if (blocknr + block_iter != b[bufind + block_iter]) {
 							iosize = size;
 							break;
 						}
@@ -2614,7 +2613,6 @@ int brw_page(int rw, struct page *page, 
 
 	if (!page->buffers)
 		create_empty_buffers(page, dev, size);
-	BUG_ON(page_count(page) < 3);
 	head = bh = page->buffers;
 
 	/* Stage 1: lock all the buffers */
@@ -2851,13 +2849,6 @@ static void sync_page_buffers(struct buf
 int try_to_free_buffers(struct page * page, unsigned int gfp_mask)
 {
 	struct buffer_head * tmp, * bh = page->buffers;
-	int was_uptodate = 1;
-
-	if (!PageLocked(page))
-		BUG();
-
-	if (!bh)
-		return 1;
 
 	spin_lock(&lru_list_lock);
 	write_lock(&hash_table_lock);
@@ -2879,8 +2870,7 @@ int try_to_free_buffers(struct page * pa
 		tmp = tmp->b_this_page;
 
 		if (p->b_dev == B_FREE) BUG();
-		if (!buffer_uptodate(p))
-			was_uptodate = 0;
+
 		remove_inode_queue(p);
 		__remove_from_queues(p);
 		__put_unused_buffer_head(p);
@@ -2888,15 +2878,7 @@ int try_to_free_buffers(struct page * pa
 	spin_unlock(&unused_list_lock);
 
 	/* Wake up anyone waiting for buffer heads */
-	smp_mb();
-	if (waitqueue_active(&buffer_wait))
-		wake_up(&buffer_wait);
-
-	/*
-	 * Make sure we don't read buffers again when they are reattached
-	 */
-	if (was_uptodate)
-		SetPageUptodate(page);
+	wake_up(&buffer_wait);
 
 	/* And free the page */
 	page->buffers = NULL;
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/dquot.c linux-2.4.20-wolk4.4-fullkernel/fs/dquot.c
--- linux-2.4.20-wolk4.3-fullkernel/fs/dquot.c	2003-07-30 13:51:45.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/dquot.c	2003-07-30 11:18:53.000000000 +0200
@@ -397,7 +397,7 @@ restart:
 		if (dquot->dq_flags & DQ_LOCKED)
 			wait_on_dquot(dquot);
 		if (dquot_dirty(dquot))
-			commit_dqblk(dquot);
+			sb->dq_op->sync_dquot(dquot);
 		dqput(dquot);
 		goto restart;
 	}
@@ -1203,10 +1203,10 @@ warn_put_all:
 	flush_warnings(transfer_to, warntype);
 	for (cnt = 0; cnt < MAXQUOTAS; cnt++) {
 		/* First we must put duplicate - otherwise we might deadlock */
-		if (transfer_to[cnt] != NODQUOT)
-			dqputduplicate(transfer_to[cnt]);
 		if (transfer_from[cnt] != NODQUOT)
-			dqput(transfer_from[cnt]);
+			dqputduplicate(transfer_from[cnt]);
+		if (transfer_to[cnt] != NODQUOT)
+			dqput(transfer_to[cnt]);
 	}
 	return ret;
 }
@@ -1221,9 +1221,16 @@ struct dquot_operations dquot_operations
 	alloc_inode:	dquot_alloc_inode,
 	free_space:	dquot_free_space,
 	free_inode:	dquot_free_inode,
-	transfer:	dquot_transfer
+	transfer:	dquot_transfer,
+	sync_dquot:	commit_dqblk
 };
 
+/* Function used by filesystems for initializing the dquot_operations structure */
+void init_dquot_operations(struct dquot_operations *fsdqops)
+{
+	memcpy(fsdqops, &dquot_operations, sizeof(dquot_operations));
+}
+
 static inline void set_enable_flags(struct quota_info *dqopt, int type)
 {
 	switch (type) {
@@ -1519,3 +1526,4 @@ __initcall(dquot_init);
 EXPORT_SYMBOL(register_quota_format);
 EXPORT_SYMBOL(unregister_quota_format);
 EXPORT_SYMBOL(dqstats);
+EXPORT_SYMBOL(init_dquot_operations);
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/exec.c linux-2.4.20-wolk4.4-fullkernel/fs/exec.c
--- linux-2.4.20-wolk4.3-fullkernel/fs/exec.c	2003-07-30 13:52:44.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/exec.c	2003-07-30 11:23:32.000000000 +0200
@@ -663,6 +663,7 @@ int flush_old_exec(struct linux_binprm *
 	char * name;
 	int i, ch, retval;
 	struct signal_struct * oldsig;
+	struct files_struct * files;
 
 	/*
 	 * Make sure we have a private signal table
@@ -671,6 +672,19 @@ int flush_old_exec(struct linux_binprm *
 	retval = make_private_signals();
 	if (retval) goto flush_failed;
 
+	/*
+	 * Make sure we have private file handles. Ask the
+	 * fork helper to do the work for us and the exit
+	 * helper to do the cleanup of the old one.
+	 */
+	 
+	files = current->files;		/* refcounted so safe to hold */
+	retval = unshare_files();
+	if(retval)
+		goto flush_failed;
+	steal_locks(files, current->files);
+	put_files_struct(files);
+	
 	/* 
 	 * Release all of the old mmap stuff
 	 */
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/ext3/super.c linux-2.4.20-wolk4.4-fullkernel/fs/ext3/super.c
--- linux-2.4.20-wolk4.3-fullkernel/fs/ext3/super.c	2003-07-30 13:51:46.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/ext3/super.c	2003-07-30 11:18:53.000000000 +0200
@@ -424,6 +424,9 @@ void ext3_put_super (struct super_block 
 	return;
 }
 
+static struct dquot_operations ext3_qops;
+static int (*old_sync_dquot)(struct dquot *dquot);
+
 static struct super_operations ext3_sops = {
 	read_inode:	ext3_read_inode,	/* BKL held */
 	write_inode:	ext3_write_inode,	/* BKL not held.  Don't need */
@@ -1171,6 +1174,7 @@ struct super_block * ext3_read_super (st
 	 * set up enough so that it can read an inode
 	 */
 	sb->s_op = &ext3_sops;
+	sb->dq_op = &ext3_qops;
 	INIT_LIST_HEAD(&sbi->s_orphan); /* unlinked but open files */
 	INIT_LIST_HEAD(&sbi->s_dirty); /* inodes to be flushed next commit */
 
@@ -1812,10 +1816,65 @@ int ext3_statfs (struct super_block * sb
 	return 0;
 }
 
+/* Helper function for writing quotas on sync - we need to start transaction before quota file
+ * is locked for write. Otherwise the are possible deadlocks:
+ * Process 1                         Process 2
+ * ext3_create()                     quota_sync()
+ *   journal_start()                   write_dquot()
+ *   DQUOT_INIT()                        down(dqio_sem)
+ *     down(dqio_sem)                    journal_start()
+ *
+ */
+
+#ifdef CONFIG_QUOTA
+
+/* Blocks: (2 data blocks) * (3 indirect + 1 descriptor + 1 bitmap) + superblock */
+#define EXT3_OLD_QFMT_BLOCKS 11
+/* Blocks: quota info + (4 pointer blocks + 1 entry block) * (3 indirect + 1 descriptor + 1 bitmap) + superblock */
+#define EXT3_V0_QFMT_BLOCKS 27
+
+static int ext3_sync_dquot(struct dquot *dquot)
+{
+	int nblocks, ret;
+	handle_t *handle;
+	struct quota_info *dqops = sb_dqopt(dquot->dq_sb);
+	struct inode *qinode;
+
+	switch (dqops->info[dquot->dq_type].dqi_format->qf_fmt_id) {
+		case QFMT_VFS_OLD:
+			nblocks = EXT3_OLD_QFMT_BLOCKS;
+			break;
+		case QFMT_VFS_V0:
+			nblocks = EXT3_V0_QFMT_BLOCKS;
+			break;
+		default:
+			nblocks = EXT3_MAX_TRANS_DATA;
+	}
+	lock_kernel();
+	qinode = dqops->files[dquot->dq_type]->f_dentry->d_inode;
+	handle = ext3_journal_start(qinode, nblocks);
+	if (IS_ERR(handle)) {
+		unlock_kernel();
+		return PTR_ERR(handle);
+	}
+	unlock_kernel();
+	ret = old_sync_dquot(dquot);
+	lock_kernel();
+	ret = ext3_journal_stop(handle, qinode);
+	unlock_kernel();
+	return ret;
+}
+#endif
+
 static DECLARE_FSTYPE_DEV(ext3_fs_type, "ext3", ext3_read_super);
 
 static int __init init_ext3_fs(void)
 {
+#ifdef CONFIG_QUOTA
+	init_dquot_operations(&ext3_qops);
+	old_sync_dquot = ext3_qops.sync_dquot;
+	ext3_qops.sync_dquot = ext3_sync_dquot;
+#endif
         return register_filesystem_lifo(&ext3_fs_type);
 }
 
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/jbd/commit.c linux-2.4.20-wolk4.4-fullkernel/fs/jbd/commit.c
--- linux-2.4.20-wolk4.3-fullkernel/fs/jbd/commit.c	2003-07-30 13:52:44.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/jbd/commit.c	2003-07-30 11:18:52.000000000 +0200
@@ -457,6 +457,11 @@ sync_datalist_empty:
 			continue;
 		}
 
+		/* start_this_handle() accounts t_outstanding_credits
+		 * to know free space in log, but this counter is changed
+		 * by journal_next_log_block() also. */
+		commit_transaction->t_outstanding_credits--;
+
 		/* Bump b_count to prevent truncate from stumbling over
                    the shadowed buffer!  @@@ This can go if we ever get
                    rid of the BJ_IO/BJ_Shadow pairing of buffers. */
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/jbd/journal.c linux-2.4.20-wolk4.4-fullkernel/fs/jbd/journal.c
--- linux-2.4.20-wolk4.3-fullkernel/fs/jbd/journal.c	2003-07-30 13:52:44.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/jbd/journal.c	2003-07-30 11:18:47.000000000 +0200
@@ -913,7 +913,7 @@ int journal_create(journal_t *journal)
 		__brelse(bh);
 	}
 
-	sync_dev(journal->j_dev);
+	fsync_no_super(journal->j_dev);
 	jbd_debug(1, "JBD: journal cleared.\n");
 
 	/* OK, fill in the initial static fields in the new superblock */
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/locks.c linux-2.4.20-wolk4.4-fullkernel/fs/locks.c
--- linux-2.4.20-wolk4.3-fullkernel/fs/locks.c	2003-07-30 13:51:49.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/locks.c	2003-07-30 11:23:32.000000000 +0200
@@ -1933,6 +1933,23 @@ done:
 	return length;
 }
 
+void steal_locks(fl_owner_t from, fl_owner_t to)
+{
+	struct list_head *tmp;
+
+	if (from == to)
+		return;
+
+	lock_kernel();
+	list_for_each(tmp, &file_lock_list) {
+		struct file_lock *fl = list_entry(tmp, struct file_lock,
+						  fl_link);
+		if (fl->fl_owner == from)
+			fl->fl_owner = to;
+	}
+	unlock_kernel();
+}
+
 #ifdef MSNFS
 /**
  *	lock_may_read - checks that the region is free of locks
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/lufs/file.c linux-2.4.20-wolk4.4-fullkernel/fs/lufs/file.c
--- linux-2.4.20-wolk4.3-fullkernel/fs/lufs/file.c	2003-07-30 13:51:49.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/lufs/file.c	2003-07-30 11:12:46.000000000 +0200
@@ -131,7 +131,8 @@ static int lu_file_readpage(struct file 
 {
     int res;
     struct iovec siov[3], riov;
-    unsigned long offset, count;
+    long long offset;
+    unsigned long count;
     struct server_slot *slot;
 
     TRACE("in\n");
@@ -191,6 +192,10 @@ static int lu_file_writepage(struct page
 
 static int lu_file_preparewrite(struct file *f, struct page *p, unsigned offset, unsigned to)
 {
+    TRACE("in\n");
+
+    TRACE("out\n");
+
     return 0;
 }
 
@@ -200,7 +205,8 @@ static int lu_file_commitwrite(struct fi
     struct server_slot *slot;
     struct iovec iov[4];
     char *buf;
-    unsigned long off, cnt;
+    long long off;
+    unsigned long cnt;
 
     TRACE("in\n");
 
@@ -216,7 +222,7 @@ static int lu_file_commitwrite(struct fi
 
     buf = kmap(p) + offset;
     cnt = to - offset;
-    off = offset + (p->index << PAGE_CACHE_SHIFT);
+    off = offset + (((long long)p->index) << PAGE_CACHE_SHIFT);
 
     iov[0].iov_base = &off;
     iov[0].iov_len = sizeof(off);
@@ -227,7 +233,7 @@ static int lu_file_commitwrite(struct fi
     iov[3].iov_base = buf;
     iov[3].iov_len = cnt;
 
-    TRACE("write %s, offset %d, count %d\n", slot->s_buf, (int)off, (int)cnt);
+    TRACE("write %s, offset %Ld, count %d\n", slot->s_buf, off, (int)cnt);
 
     if((res = lu_execute(GET_INFO(f->f_dentry->d_sb), slot, PTYPE_WRITE, iov, 4, NULL, 0)) < 0)
 	goto out1;
@@ -284,6 +290,28 @@ static ssize_t lu_file_write(struct file
     return res;
 }
 
+/*
+ *  Without this function, fsync() returns EINVAL indicating that the
+ *  file is special (eg pipe or socket) and does not support
+ *  synchronization.
+ *
+ *  This causes, for example, Emacs to report "Writing file: Invalid
+ *  argument, <filename>" when saving a file to a lufs file system.
+ *
+ *  The opengroup spec states "It is explicitly intended that a null
+ *  implementation is permitted." This is therefore a quick but valid
+ *  hack to avoid this problem.
+ *
+ *  See http://www.moses.uklinux.net/patches/lki-3.html#ss3.4
+ *      http://www.opengroup.org/onlinepubs/007904975/functions/fsync.html
+ * 
+ *  James Marsh <marshj@cs.man.ac.uk> 22-Apr-2003 
+ */
+static int lu_file_fsync(struct file *filp, struct dentry *dentryp, int datasync)
+{    
+    return 0;
+}
+
 struct file_operations lu_file_operations = {
     llseek:	generic_file_llseek,
     read:	lu_file_read,
@@ -291,6 +319,7 @@ struct file_operations lu_file_operation
     mmap:	lu_file_mmap,
     open:	lu_file_open,
     release:	lu_file_release,
+    fsync:      lu_file_fsync
 };
 
 struct inode_operations lu_file_inode_operations = {
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/lufs/inode.c linux-2.4.20-wolk4.4-fullkernel/fs/lufs/inode.c
--- linux-2.4.20-wolk4.3-fullkernel/fs/lufs/inode.c	2003-07-30 13:51:49.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/lufs/inode.c	2003-07-30 11:12:46.000000000 +0200
@@ -471,6 +471,9 @@ static struct super_block* lu_read_super
     sb->s_magic = LU_MAGIC;
     sb->s_op = &lu_sops;
     sb->s_flags = 0;
+    sb->s_maxbytes = ((((unsigned long long)1) << 32) << LU_BLOCKSIZEBITS) - 1;
+
+    TRACE("sb->s_maxbytes=%Ld\n",sb->s_maxbytes);
 
     lu_lookup_root(info, &root_attr);
     root_inode = lu_iget(sb, &root_attr);
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/lufs/proc.c linux-2.4.20-wolk4.4-fullkernel/fs/lufs/proc.c
--- linux-2.4.20-wolk4.3-fullkernel/fs/lufs/proc.c	2003-07-30 13:51:49.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/lufs/proc.c	2003-07-30 11:12:46.000000000 +0200
@@ -140,8 +140,11 @@ static int slot_reconnect(struct lufs_sb
 	slot->s_sock = NULL;
     }
 
-    while(tries++ < LU_MAXTRIES && (res = sock_connect(info->server_socket, &slot->s_sock)) < 0)
+    while(tries++ < LU_MAXTRIES && (res = sock_connect(info->server_socket, &slot->s_sock)) < 0){
 	TRACE("retrying...\n");
+	sock_release(slot->s_sock);
+	slot->s_sock = NULL;
+    }
 
     if(res >= 0){
 	TRACE("successfully reconnected.\n");
@@ -185,6 +188,7 @@ static int do_execute(struct socket *soc
 	WARN("sock_send failed!\n");
 	return res;
     }
+    
     if((res = sock_send(sock, siov, slen)) < 0){
 	WARN("sock_send failed!\n");
 	return res;
@@ -208,7 +212,7 @@ static int do_execute(struct socket *soc
 	WARN("Unexpected data!!! Getting out of sync...\n");
 	return -1;
     }
-	
+    
     if((res = sock_recv(sock, riov, rlen, msg.msg_datalen, 0)) < 0){
 	WARN("sock_recv failed!\n");
 	return res;
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/lufs/proto.h linux-2.4.20-wolk4.4-fullkernel/fs/lufs/proto.h
--- linux-2.4.20-wolk4.3-fullkernel/fs/lufs/proto.h	2003-07-30 13:51:49.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/lufs/proto.h	2003-07-30 11:12:46.000000000 +0200
@@ -68,7 +68,7 @@ struct lufs_fattr{
     unsigned long	f_nlink;
     unsigned long	f_uid;
     unsigned long	f_gid;
-    unsigned long	f_size;
+    long long		f_size;
     unsigned long	f_atime;
     unsigned long	f_mtime;
     unsigned long	f_ctime;
@@ -88,7 +88,7 @@ struct lufs_req_mkdir{
 };
 
 struct lufs_req_rw{
-    unsigned long	offset;
+    long long		offset;
     unsigned long	count;
     char		name[0];
 };
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/namespace.c linux-2.4.20-wolk4.4-fullkernel/fs/namespace.c
--- linux-2.4.20-wolk4.3-fullkernel/fs/namespace.c	2003-07-30 13:51:49.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/namespace.c	2003-07-30 11:18:35.000000000 +0200
@@ -1021,7 +1021,7 @@ int copy_namespace(int flags, struct tas
 		return -EPERM;
 	}
 
-	new_ns = kmalloc(sizeof(struct namespace *), GFP_KERNEL);
+	new_ns = kmalloc(sizeof(struct namespace), GFP_KERNEL);
 	if (!new_ns)
 		goto out;
 
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Common/inc/ocfs.h linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Common/inc/ocfs.h
--- linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Common/inc/ocfs.h	2003-07-30 13:51:50.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Common/inc/ocfs.h	2003-07-30 10:28:53.000000000 +0200
@@ -29,8 +29,14 @@
 
 /* XXX Hack to avoid warning */
 struct mem_dqinfo;
-extern inline void prefetch(const void *x);
 extern inline void mark_info_dirty(struct mem_dqinfo *info);
+#ifdef __i386__
+extern inline void prefetch(const void *x);
+#endif
+#ifdef __ia64__
+extern inline void prefetch(const void *x);
+extern inline void prefetchw(const void *x);
+#endif
 
 /*
 ** System header files
@@ -51,6 +57,7 @@ extern inline void mark_info_dirty(struc
 #include  <linux/list.h>
 #include  <linux/fs.h>
 #include  <linux/pagemap.h>
+#include  <linux/random.h>
 #include  <linux/string.h>
 #include  <linux/locks.h>
 #include  <linux/hdreg.h>
@@ -67,16 +74,14 @@ extern inline void mark_info_dirty(struc
 #include  <linux/inet.h>
 #include  <linux/version.h>
 
-#include  <stdbool.h>
-
 /*
 ** Private header files
 */
+#include  <ocfsbool.h>
 #include  <ocfsconst.h>
 #include  <ocfscom.h>
 
 #include  <ocfshash.h>
-#include  <ocfserr.h>
 #include  <ocfstrace.h>
 #include  <ocfsvol.h>
 #include  <ocfsdisk.h>
@@ -86,11 +91,13 @@ extern inline void mark_info_dirty(struc
 
 #include  <ocfsver.h>
 
+#include  <ocfsiosup.h>
+#include  <ocfsport.h>
+#include  <ocfsgenmisc.h>
 #include  <ocfsgenalloc.h>
 #include  <ocfsgencreate.h>
 #include  <ocfsgendirnode.h>
 #include  <ocfsgendlm.h>
-#include  <ocfsgenmisc.h>
 #include  <ocfsheartbeat.h>
 #include  <ocfsgennm.h>
 #include  <ocfsgensysfile.h>
@@ -103,11 +110,9 @@ extern inline void mark_info_dirty(struc
 #include  <ocfsdlmp.h>
 #include  <ocfsfile.h>
 #include  <ocfsioctl.h>
-#include  <ocfsiosup.h>
 #include  <ocfsipc.h>
 #include  <ocfsmain.h>
 #include  <ocfsmount.h>
-#include  <ocfsport.h>
 #include  <ocfsproc.h>
 
 #endif				/* _OCFS_H_ */
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Common/inc/ocfsbool.h linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Common/inc/ocfsbool.h
--- linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Common/inc/ocfsbool.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Common/inc/ocfsbool.h	2003-07-30 10:28:53.000000000 +0200
@@ -0,0 +1,37 @@
+/*
+ * ocfsbool.h
+ *
+ * Defines a boolean type. Yes, we use our own boolean type. Eventually
+ * someone will have to do a global search and replace to just use __s32
+ *
+ * Copyright (C) 2003 Oracle Corporation.  All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ * 
+ * This program 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 recieved a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 021110-1307, USA.
+ *
+ * Authors: Neeraj Goyal, Suchit Kaura, Kurt Hackel, Sunil Mushran,
+ *          Manish Singh, Wim Coekaerts, Mark Fasheh
+ */
+
+
+#ifndef  _OCFSBOOL_H_
+#define  _OCFSBOOL_H_
+
+typedef enum { false = 0, true = 1 } ocfs_bool;
+
+/* This should be removed and all old code fixed to just use ocfs_bool */
+typedef ocfs_bool bool;
+
+#endif	/* _OCFSBOOL_H_ */
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Common/inc/ocfscom.h linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Common/inc/ocfscom.h
--- linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Common/inc/ocfscom.h	2003-07-30 13:51:50.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Common/inc/ocfscom.h	2003-07-30 10:28:53.000000000 +0200
@@ -29,25 +29,23 @@
 
 #define OCFS_POINTER_SIZE   (sizeof(void *))
 
-typedef char eb1;
-typedef short eb2;
-typedef long eb4;
-typedef long long eb8;
-typedef signed char sb1;
-typedef signed short sb2;
-typedef signed long sb4;
-typedef signed long long sb8;
-typedef unsigned char ub1;
-typedef unsigned short ub2;
-typedef unsigned long ub4;
-typedef unsigned long long ub8;
+#ifdef __LP64__
+#define OCFS_GCC_ATTR_PACKED	__attribute__ ((packed))
+#define OCFS_GCC_ATTR_ALIGNED	__attribute__ ((aligned(4)))
+#define OCFS_GCC_ATTR_PACKALGN	__attribute__ ((aligned(4), packed))
+#endif
+#ifdef __i386__
+#define OCFS_GCC_ATTR_PACKED
+#define OCFS_GCC_ATTR_ALIGNED
+#define OCFS_GCC_ATTR_PACKALGN
+#endif
 
 typedef struct _ocfs_alloc_bm
 {
 	void *buf;
-	ub4 size;
-	ub4 failed;
-	ub4 ok_retries;
+	__u32 size;
+	__u32 failed;
+	__u32 ok_retries;
 }
 ocfs_alloc_bm;
 
@@ -61,13 +59,19 @@ typedef struct _ocfs_sem
 ocfs_sem;
 
 /* convenience macro */
-#define ocfs_safefree(x)     \
-        do                   \
-        {                    \
-          if ((x) != NULL)   \
-            ocfs_free(x);    \
-          (x) = NULL;        \
-        } while (0)
+#define ocfs_safefree(x)	\
+do {				\
+	if (x)			\
+		ocfs_free(x);	\
+	(x) = NULL;		\
+} while (0)
+
+#define ocfs_safevfree(x)	\
+do {				\
+	if (x)			\
+		vfree(x);	\
+	(x) = NULL;		\
+} while (0)
 
 #define OCFS_ASSERT(x)             do { if (!(x)) BUG(); } while (0)
 #define OCFS_BREAKPOINT()          printk("DEBUG BREAKPOINT! %s, %d\n", \
@@ -76,8 +80,8 @@ ocfs_sem;
 /* time is in 0.1 microsecs */
 #define OcfsQuerySystemTime(t)                                                \
                           do {                                                \
-                            (*t)  = (ub8)((ub8)CURRENT_TIME * (ub8)10000000); \
-                            (*t) += (ub8)((ub8)xtime.tv_usec * (ub8)10);      \
+                            (*t)  = (__u64)((__u64)CURRENT_TIME * (__u64)10000000); \
+                            (*t) += (__u64)((__u64)xtime.tv_usec * (__u64)10);      \
                           } while (0)
 
 #ifdef __KERNEL__
@@ -89,17 +93,17 @@ ocfs_sem;
 
 typedef struct _ocfs_extent
 {
-	sb8 virtual;
-	sb8 physical;
-	sb8 sectors;
+	__s64 virtual;
+	__s64 physical;
+	__s64 sectors;
 }
 ocfs_extent;
 
 typedef struct _ocfs_extent_map
 {
 	spinlock_t lock;
-	ub4 capacity;
-	ub4 count;
+	__u32 capacity;
+	__u32 count;
 	bool initialized;
 	void *buf;
 }
@@ -129,8 +133,8 @@ alloc_item;
                                       i->i_ino        = LO(o); \
                                   } while (0)
 
-#define GET_INODE_OFFSET(i)       (ub8)((((ub8)((ub4)i->u.generic_ip))<<32) + \
-                                        ((ub8)i->i_ino))
+#define GET_INODE_OFFSET(i)       (__u64)((((__u64)((unsigned long)i->u.generic_ip))<<32) + \
+                                        ((__u64)i->i_ino))
 
 #define SET_INODE_OIN(i,o)        do { \
                                       i->i_flags     |= S_OCFS_OIN_VALID; \
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Common/inc/ocfsconst.h linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Common/inc/ocfsconst.h
--- linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Common/inc/ocfsconst.h	2003-07-30 13:51:50.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Common/inc/ocfsconst.h	2003-07-30 10:28:53.000000000 +0200
@@ -35,7 +35,7 @@
 #define  ONE_MILLI_SEC           (10 * 1000)         /* 100 nanosec unit */
 #define  ONE_MEGA_BYTE           (1 * 1024 * 1024)   /* in bytes */
 
-#define  MISS_COUNT_VALUE        5
+#define  MISS_COUNT_VALUE        20
 
 #define  OCFS_DEFAULT_DIR_NODE_SIZE  (1024 * 128)
 #define  OCFS_DEFAULT_FILE_NODE_SIZE (512)
@@ -109,7 +109,7 @@ enum {
 #define  OCFS_EXTENT_DATA             1
 #define  OCFS_EXTENT_HEADER           2
 
-#define  OCFS_MAX_FILE_ENTRY_EXTENTS  3	//SM or is it 4?
+#define  OCFS_MAX_FILE_ENTRY_EXTENTS  3
 #define  OCFS_MAX_DATA_EXTENTS        18
 #define  NUM_SECTORS_IN_LEAF_NODE     1
 
@@ -128,7 +128,7 @@ enum {
 #define  OCFS_DLM_EXCLUSIVE_LOCK       (0x2)
 #define  OCFS_DLM_ENABLE_CACHE_LOCK    (0x8)
 
-#define  OCFS_INVALID_NODE_NUM         ULONG_MAX
+#define  OCFS_INVALID_NODE_NUM         UINT_MAX
 
 typedef enum _ocfs_rw_mode
 {
@@ -165,10 +165,6 @@ ocfs_rw_mode;
 
 #define  DIR_NODE_FLAG_ROOT           0x1
 
-/* Enable debug printks..... */
-#define  OCFS_DBG          1
-#define  OCFS_MEM_DBG
-
 /*
 ** Information on Publish sector of each node
 */
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Common/inc/ocfsdef.h linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Common/inc/ocfsdef.h
--- linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Common/inc/ocfsdef.h	2003-07-30 13:51:50.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Common/inc/ocfsdef.h	2003-07-30 10:28:53.000000000 +0200
@@ -27,24 +27,17 @@
 #ifndef  _OCFSDEF_H_
 #define  _OCFSDEF_H_
 
-extern bool bDebug;
-extern ub8 debugOffset;
-
-# define  UPDATE_OIN(a)      do {                                     \
-                               (a)->needs_verification = true;        \
-                               ocfs_verify_update_oin((a)->osb, (a)); \
-                             } while (0)
-
-#define  OIN_NEEDS_VERIFICATION(a) \
-                             ((a)->needs_verification)
-#define  OIN_UPDATED(a)      ((a)->needs_verification = false)
+#define  OIN_NEEDS_VERIFICATION(a)	((a)->needs_verification)
+#define  OIN_UPDATED(a)			((a)->needs_verification = false)
 
 #define  IS_VALID_DIR_NODE(ptr)                                       \
                  (!strncmp((ptr)->signature, OCFS_DIR_NODE_SIGNATURE, \
                            strlen(OCFS_DIR_NODE_SIGNATURE)))
 
+/* sm - ocfs 1.0 fails to set fe->sig for dirs */
 #define  IS_VALID_FILE_ENTRY(ptr)     \
-                (!strcmp((ptr)->signature, OCFS_FILE_ENTRY_SIGNATURE))
+		(((ptr)->attribs & OCFS_ATTRIB_DIRECTORY) ||	\
+		 (!strcmp((ptr)->signature, OCFS_FILE_ENTRY_SIGNATURE)))
 
 #define  IS_VALID_EXTENT_HEADER(ptr)  \
                 (!strcmp((ptr)->signature, OCFS_EXTENT_HEADER_SIGNATURE))
@@ -58,7 +51,7 @@ extern ub8 debugOffset;
 #define  OCFS_GET_EXTENT(vbo, extent, k)                            \
               do {                                                  \
                 for ((k) = 0; (k) < OCFS_MAX_DATA_EXTENTS; (k)++) { \
-                  if((sb8)((extent)->extents[(k)].file_off +        \
+                  if((__s64)((extent)->extents[(k)].file_off +        \
                      (extent)->extents[(k)].num_bytes) > (vbo))     \
                     break;                                          \
                 }                                                   \
@@ -67,7 +60,7 @@ extern ub8 debugOffset;
 #define  OCFS_GET_FILE_ENTRY_EXTENT(vbo, fileentry, k)                    \
               do {                                                        \
                 for ((k) = 0; (k) < OCFS_MAX_FILE_ENTRY_EXTENTS; (k)++) { \
-                  if((sb8)((fileentry)->extents[(k)].file_off +           \
+                  if((__s64)((fileentry)->extents[(k)].file_off +           \
                      (fileentry)->extents[(k)].length) > (vbo))           \
                     break;                                                \
                 }                                                         \
@@ -96,7 +89,32 @@ extern ub8 debugOffset;
                                                      (type * OCFS_MAXIMUM_NODES) + node : -1 )
 #endif
 
-
+#define down_with_flag(_sem, _flg)	\
+	do {				\
+		if (!_flg) {		\
+			down (_sem);	\
+			_flg = true;	\
+		}			\
+	} while (0)
+
+#define up_with_flag(_sem, _flg)	\
+	do {				\
+		if (_flg) {		\
+			up (_sem);	\
+			_flg = false;	\
+		}			\
+	} while (0)
+
+#define ocfs_task_interruptible(_o)	((_o)->dlm_task != current && signal_pending(current))
+
+#define ocfs_trans_in_progress(_o)			\
+do {							\
+	int _i = 0;					\
+	while (((_o)->trans_in_progress) && (_i < 10)) {\
+		ocfs_sleep (100);			\
+		_i++;					\
+	}						\
+} while (0)
 
 struct _ocfs_file;
 struct _ocfs_inode;
@@ -109,13 +127,13 @@ struct _ocfs_super;
 #define  OCFS_CLEAR_FLAG(flag, value)  ((flag) &= ~(value))
 
 #define  OCFS_SECTOR_ALIGN(buf)                     \
-               ((ub8)buf +                          \
-                (((ub8)buf % OCFS_SECTOR_SIZE) ?    \
-                 (OCFS_SECTOR_SIZE - ((ub8)buf % OCFS_SECTOR_SIZE)):0))
+               ((__u64)buf +                          \
+                (((__u64)buf % OCFS_SECTOR_SIZE) ?    \
+                 (OCFS_SECTOR_SIZE - ((__u64)buf % OCFS_SECTOR_SIZE)):0))
 
 #define  OCFS_ALIGN(val, align)        \
-               ((ub8)val  +            \
-                (((ub8)val % align) ? (align - ((ub8)val % align)): 0))
+               ((__u64)val  +            \
+                (((__u64)val % align) ? (align - ((__u64)val % align)): 0))
 
 /*
 ** Structures...
@@ -135,7 +153,7 @@ struct _ocfs_super;
 */
 #define  UPDATE_PUBLISH_MAP(pubmap, num, flag, numnodes)          \
                 do {                                              \
-                  ub8 var = 0x1;                                  \
+                  __u64 var = 0x1;                                  \
                   if((flag) == OCFS_PUBLISH_CLEAR)                \
                     (pubmap) &= (~(var << ((num) % (numnodes)))); \
                   else                                            \
@@ -144,11 +162,19 @@ struct _ocfs_super;
 
 typedef struct _ocfs_obj_id
 {
-	ub4 type;		/* 4 byte signature to uniquely identify the struct */
-	ub4 size;		/* sizeof the struct */
+	__u32 type;		/* 4 byte signature to uniquely identify the struct */
+	__u32 size;		/* sizeof the struct */
 }
 ocfs_obj_id;
 
+typedef struct _ocfs_filldir
+{
+       __u8 fname[OCFS_MAX_FILENAME_LENGTH];
+       loff_t pos;
+       __u32 ino;
+} ocfs_filldir;
+
+
 /**************************************************************************
 **  Each file open instance is represented by a context control block.
 **  For each successful create/open request; a file object and a ocfs_file will
@@ -163,11 +189,10 @@ typedef struct _ocfs_file
 	struct _ocfs_inode *oin;	/* ptr to the assoc. ocfs_inode */
 	struct list_head next_ofile;	/* all OFILEs for a ocfs_inode are linked */
 	struct file *k_file;
-	ub8 curr_byte_off;
-	sb8 curr_dir_off;
+	__u64 curr_byte_off;
+	__s64 curr_dir_off;
 	void *curr_dir_buf;
-	long f_iobuf_lock;
-	struct kiobuf *f_iobuf;
+	ocfs_filldir filldir;
 }
 ocfs_file;
 
@@ -178,50 +203,53 @@ typedef struct _ocfs_io_runs ocfs_io_run
 
 typedef struct _ocfs_lock_res
 {
-	ub4 signature;
-	ub1 lock_type;		/* Support only Exclusive & Shared */
-	ub4 ref_cnt;		/* Used in case of Shared resources */
-	ub4 master_node_num;	/* Master Node */
-	ub8 last_upd_seq_num;
-	ub8 last_lock_upd;
-	ub8 sector_num;
-	ub8 oin_openmap;
-	ub1 in_use;
+	__u32 signature;
+	__u8 lock_type;		/* Support only Exclusive & Shared */
+	atomic_t lr_share_cnt;	/* Used in case of Shared resources */
+	atomic_t lr_ref_cnt;	/* When 0, freed */
+	__u32 master_node_num;	/* Master Node */
+	__u64 last_upd_seq_num;
+	__u64 last_lock_upd;
+	__u64 sector_num;
+	__u64 oin_openmap;
+	__u64 tmp_openmap;	/* oin_openmap collected over the comm */
+	__u8 in_use;
 	int thread_id;
 	struct list_head cache_list;
 	bool in_cache_list;
-	ub4 lock_state;
+	__u32 lock_state;
+	__u32 vote_state;		/* Is the lockres being voted on over ipcdlm */
 	ocfs_inode *oin;
 	spinlock_t lock_mutex;
 	wait_queue_head_t voted_event;
 	atomic_t voted_event_woken;
-	ub8 req_vote_map;
-	ub8 got_vote_map;
-	ub4 vote_status;
-	ub8 last_write_time;
-	ub8 last_read_time;
-	ub4 writer_node_num;
-	ub4 reader_node_num;
+	__u64 req_vote_map;
+	__u64 got_vote_map;
+	__u32 vote_status;
+	__u64 last_write_time;
+	__u64 last_read_time;
+	__u32 writer_node_num;
+	__u32 reader_node_num;
 }
 ocfs_lock_res;
 
 struct _ocfs_inode
 {
 	ocfs_obj_id obj_id;
-	sb8 alloc_size;
+	__s64 alloc_size;
 	struct inode *inode;
 	ocfs_sem main_res;
 	ocfs_sem paging_io_res;
 	ocfs_lock_res *lock_res;
-	ub8 file_disk_off;	/* file location on the volume */
-	ub8 dir_disk_off;	/* for dirs, offset to dirnode structure */
-	ub8 chng_seq_num;
-	ub8 parent_dirnode_off;	/* from the start of vol */
+	__u64 file_disk_off;	/* file location on the volume */
+	__u64 dir_disk_off;	/* for dirs, offset to dirnode structure */
+	__u64 chng_seq_num;
+	__u64 parent_dirnode_off;	/* from the start of vol */
 	ocfs_extent_map map;
 	struct _ocfs_super *osb;	/* ocfs_inode belongs to this volume */
-	ub4 oin_flags;
+	__u32 oin_flags;
 	struct list_head next_ofile;	/* list of all ofile(s) */
-	ub4 open_hndl_cnt;
+	__u32 open_hndl_cnt;
 	bool needs_verification;
 	bool cache_enabled;
 };
@@ -257,12 +285,12 @@ struct _ocfs_super
 	ocfs_obj_id obj_id;
 	ocfs_sem osb_res;	/* resource to protect the ocfs_super */
 	struct list_head osb_next;	/* list of ocfs_super(s) */
-	ub4 osb_id;		/* id used by the proc interface */
+	__u32 osb_id;		/* id used by the proc interface */
 	struct completion complete;
 	struct task_struct *dlm_task;
-	ub4 osb_flags;
-	sb8 file_open_cnt;	/* num of open files/dirs. vol cannot be dismounted if > 0 */
-	ub8 publ_map;		/* each bit represents state of node */
+	__u32 osb_flags;
+	__s64 file_open_cnt;	/* num of open files/dirs. vol cannot be dismounted if > 0 */
+	__u64 publ_map;		/* each bit represents state of node */
 	HASHTABLE root_sect_node;	/* lockres->sector_num hash */
 	struct list_head cache_lock_list;
 	struct super_block *sb;
@@ -270,46 +298,52 @@ struct _ocfs_super
 	ocfs_vol_layout vol_layout;
 	ocfs_vol_node_map vol_node_map;
 	ocfs_node_config_info *node_cfg_info[OCFS_MAXIMUM_NODES];
-	ub8 cfg_seq_num;
+	__u64 cfg_seq_num;
 	bool cfg_initialized;
-	ub4 num_cfg_nodes;
-	ub4 node_num;
+	__u32 num_cfg_nodes;
+	__u32 node_num;
 	bool reclaim_id;                /* reclaim the original node number*/
-	ub1 hbm;
-	ub4 hbt;
-	ub8 log_disk_off;
-	ub8 log_meta_disk_off;
-	ub8 log_file_size;
-	ub4 sect_size;
+	__u8 hbm;
+	__u32 hbt;
+	__u64 log_disk_off;
+	__u64 log_meta_disk_off;
+	__u64 log_file_size;
+	__u32 sect_size;
 	bool needs_flush;
 	bool commit_cache_exec;
 	ocfs_sem map_lock;
 	ocfs_extent_map metadata_map;
 	ocfs_extent_map trans_map;
 	ocfs_alloc_bm cluster_bitmap;
-	ub4 max_dir_node_ent;
+	__u32 max_dir_node_ent;
 	ocfs_vol_state vol_state;
-	sb8 curr_trans_id;
+	__s64 curr_trans_id;
 	bool trans_in_progress;
 	ocfs_sem log_lock;
 	ocfs_sem recovery_lock;
-	ub4 node_recovering;
+	__u32 node_recovering;
 #ifdef PARANOID_LOCKS
 	ocfs_sem dir_alloc_lock;
 	ocfs_sem file_alloc_lock;
-#endif				/* PARANOID_LOCKS */
+#endif
 	ocfs_sem vol_alloc_lock;
 	struct timer_list lock_timer;
 	atomic_t lock_stop;
 	wait_queue_head_t lock_event;
 	atomic_t lock_event_woken;
+	struct semaphore comm_lock;	/* protects ocfs_comm_process_vote_reply */
+	atomic_t nm_init;
+	wait_queue_head_t nm_init_event;
 	bool cache_fs;
-	ub4 prealloc_lock;
+	__u32 prealloc_lock;
 	ocfs_io_runs *data_prealloc;
 	ocfs_io_runs *md_prealloc;
-	ub1 *cfg_prealloc;
-	ub4 cfg_len;
-	ub1 *log_prealloc;
+	__u8 *cfg_prealloc;
+	__u32 cfg_len;
+	__u8 *log_prealloc;
+	struct semaphore publish_lock;  /* protects r/w to publish sector */
+	atomic_t node_req_vote;		/* set when node's vote req pending */
+	struct semaphore trans_lock;	/* serializes transactions */
 };
 
 enum {
@@ -326,9 +360,9 @@ enum {
 
 typedef struct _ocfs_comm_info
 {
-	ub4 type;
+	__u32 type;
 	char *ip_addr;
-	ub4 ip_port;
+	__u32 ip_port;
 	char *ip_mask;
 }
 ocfs_comm_info;
@@ -342,40 +376,51 @@ typedef struct _ocfs_global_ctxt
 	kmem_cache_t *ofile_cache;
 	kmem_cache_t *fe_cache;
 	kmem_cache_t *lockres_cache;
-	ub4 flags;
-	ub4 pref_node_num;		/* preferred... osb has the real one */
+	__u32 flags;
+	__u32 pref_node_num;		/* preferred... osb has the real one */
 	ocfs_guid guid;			/* uniquely identifies a node */
 	char *node_name;		/* human readable node identification */
 	char *cluster_name;		/* unused */
 	ocfs_comm_info comm_info;	/* ip address, etc for listener */
 	bool comm_info_read;		/* ipc info loaded from config file */
 	wait_queue_head_t flush_event;	/* unused */
-	ub1 hbm;
+	__u8 hbm;
+	spinlock_t comm_seq_lock;	/* protects comm_seq_num */
+	__u64 comm_seq_num;		/* local node seq num used in ipcdlm */
 #ifdef OCFS_LINUX_MEM_DEBUG
         struct list_head item_list;
 #endif
+	atomic_t cnt_lockres;		/* count of allocated lockres */
 }
 ocfs_global_ctxt;
 
 struct _ocfs_io_runs
 {
-	ub8 disk_off;
-	ub4 offset;
-	ub4 byte_cnt;
+	__u64 disk_off;
+	__u32 offset;
+	__u32 byte_cnt;
 };
 
 #if defined(OCFS_LINUX_MEM_DEBUG)
-# define ocfs_malloc(Size)     ({ \
-                                 void *m = ocfs_linux_dbg_alloc(Size, __FILE__, __LINE__); \
-                                 printk("ocfs_malloc called from %s:%d, returned %p\n", __FILE__, __LINE__, m); \
-                                 m; \
-                               })
-# define ocfs_free(x)          do { \
-                                 printk("ocfs_free called from %s:%d, freeing %p\n", __FILE__, __LINE__, x); \
-                                 ocfs_linux_dbg_free(x); \
-                               } while (0)
+# define ocfs_malloc(_s)					\
+({								\
+	void *m = ocfs_linux_dbg_alloc(_s, __FILE__, __LINE__);	\
+	if (debug_level & OCFS_DEBUG_LEVEL_MALLOC)		\
+		printk("malloc(%s,%d) = %p\n", __FILE__,	\
+		       __LINE__, m);				\
+	m;							\
+})
+
+# define ocfs_free(x)\
+do {								\
+	if (debug_level & OCFS_DEBUG_LEVEL_MALLOC)		\
+		printk("free(%s,%d) = %p\n", __FILE__,	\
+		       __LINE__, x);				\
+	ocfs_linux_dbg_free(x);					\
+} while (0)
+
 #elif !defined(OCFS_LINUX_MEM_DEBUG)
-# define ocfs_malloc(Size)     kmalloc((size_t)(Size), GFP_NOFS)
+# define ocfs_malloc(Size)     kmalloc((size_t)(Size), GFP_KERNEL)
 # define ocfs_free             kfree
 #endif				/* ! defined(OCFS_MEM_DBG) */
 
@@ -383,8 +428,8 @@ struct _ocfs_io_runs
 typedef struct _ocfs_ipc_ctxt
 {
 	ocfs_sem ipc_ctxt_res;
-	ub4 dlm_msg_size;
-	ub2 version;
+	__u32 dlm_msg_size;
+	__u16 version;
 	bool init;
 	bool re_init;
 	struct socket *send_sock;
@@ -405,9 +450,9 @@ extern ocfs_ipc_ctxt OcfsIpcCtxt;
 
 typedef struct _ocfs_ipc_dlm_config
 {
-	ub2 version;
-	ub4 msg_size;
-	ub4 num_recv_threads;
+	__u16 version;
+	__u32 msg_size;
+	__u32 num_recv_threads;
 }
 ocfs_ipc_dlm_config;
 
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Common/inc/ocfsdisk.h linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Common/inc/ocfsdisk.h
--- linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Common/inc/ocfsdisk.h	2003-07-30 13:51:50.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Common/inc/ocfsdisk.h	2003-07-30 10:28:53.000000000 +0200
@@ -29,188 +29,195 @@
 
 typedef struct _ocfs_alloc_ext
 {
-	ub8 file_off;		/* Starting offset within the file */
-	ub8 num_bytes;	        /* Number of bytes used by this alloc */
-	ub8 disk_off;		/* Physical Disk Offset */
+	/* Starting offset within the file */
+	__u64 file_off;		        // NUMBER RANGE(0,ULONG_LONG_MAX)
+	/* Number of bytes used by this alloc */
+	__u64 num_bytes;	                // NUMBER RANGE(0,ULONG_LONG_MAX)
+	/* Physical Disk Offset */
+	__u64 disk_off;		        // NUMBER RANGE(0,ULONG_LONG_MAX)
 }
 ocfs_alloc_ext;
 
 typedef struct _ocfs_publish
 {
-	ub8 time;
-	sb4 vote;
-	bool dirty;
-	ub4 vote_type;
-	ub8 vote_map;
-	ub8 publ_seq_num;
-	ub8 dir_ent;
-	ub1 hbm[OCFS_MAXIMUM_NODES];
-	/* Might be useful to keep track of total number of files and a */
-	/* bitmap reflecting used directory entries to optimise the query */
-	/* directory etc here!!!  */
+	__u64 time;                       // DATE
+	__s32 vote;                       // BOOL
+	bool dirty;                     // BOOL
+	__u32 vote_type;                  // FILEFLAG
+	__u64 vote_map;                   // NODEBITMAP
+	__u64 publ_seq_num;               // NUMBER RANGE(0,ULONG_LONG_MAX)
+	__u64 dir_ent;                    // NUMBER RANGE(0,ULONG_LONG_MAX)
+	__u8 hbm[OCFS_MAXIMUM_NODES];    // UNUSED
+	/* last seq num used in comm voting */
+	__u64 comm_seq_num;		// NUMBER RANGE(0,ULONG_LONG_MAX)
 }
+OCFS_GCC_ATTR_PACKALGN
 ocfs_publish;
 
 typedef struct _ocfs_vote
 {
-	ub1 vote[OCFS_MAXIMUM_NODES];
-	ub8 vote_seq_num;
-	ub8 dir_ent;
-	ub1 open_handle;
-	ub1 pad[7];
+	__u8 vote[OCFS_MAXIMUM_NODES];   // VOTEFLAG[32]
+	__u64 vote_seq_num;               // NUMBER RANGE(0,ULONG_LONG_MAX)
+	__u64 dir_ent;                    // NUMBER RANGE(0,ULONG_LONG_MAX)
+	__u8 open_handle;                // BOOL
 }
+OCFS_GCC_ATTR_PACKALGN
 ocfs_vote;
 
 typedef struct _ocfs_file_entry
 {
-	ocfs_disk_lock disk_lock;
-	ub1 signature[8];
-	bool local_ext;		/* Is FileEntry extents used or B+tree used */
-	ub1 next_free_ext;
-	sb1 next_del;
-	sb4 granularity;	/* Number of leaf levels */
-	ub1 filename[OCFS_MAX_FILENAME_LENGTH];
-	ub2 filename_len;
-	ub8 file_size;
-	ub8 alloc_size;		/* Could be >= FileSize */
-	ub8 create_time;
-	ub8 modify_time;	/* Creation time or Last Modified time */
-	ocfs_alloc_ext extents[OCFS_MAX_FILE_ENTRY_EXTENTS];
-	ub8 dir_node_ptr;
-	ub8 this_sector;
-	ub8 last_ext_ptr;
-	ub4 sync_flags;		/* Valid (bit 1), Change (bit 2), Dirty (bit 3) */
-	ub4 link_cnt;
-	ub4 attribs;
-	ub4 prot_bits;
-	ub4 uid;
-	ub4 gid;
-	ub2 dev_major;
-	ub2 dev_minor;
+	ocfs_disk_lock disk_lock;       // DISKLOCK
+	__u8 signature[8];               // NUMBER[8] RANGE(0,255)
+	bool local_ext;		        // BOOL
+	__u8 next_free_ext;              // UNUSED 
+	__s8 next_del;                   // NUMBER RANGE(-1,254)
+	__s32 granularity;	        // NUMBER RANGE(-1,3)
+	__u8 filename[OCFS_MAX_FILENAME_LENGTH];  // CHAR[OCFS_MAX_FILENAME_LENGTH]
+	__u16 filename_len;               // NUMBER RANGE(0,OCFS_MAX_FILENAME_LENGTH)
+	__u64 file_size;                  // NUMBER RANGE(0,ULONG_LONG_MAX)
+	__u64 alloc_size;		        // NUMBER RANGE(0,ULONG_LONG_MAX)
+	__u64 create_time;                // DATE
+	__u64 modify_time;	        // DATE
+	ocfs_alloc_ext extents[OCFS_MAX_FILE_ENTRY_EXTENTS];  // EXTENT[OCFS_MAX_FILE_ENTRY_EXTENTS]
+	__u64 dir_node_ptr;               // NUMBER RANGE(0,ULONG_LONG_MAX)
+	__u64 this_sector;                // NUMBER RANGE(0,ULONG_LONG_MAX)
+	__u64 last_ext_ptr;               // NUMBER RANGE(0,ULONG_LONG_MAX)
+	__u32 sync_flags;		        // SYNCFLAG
+	__u32 link_cnt;                   // NUMBER RANGE(0,UINT_MAX)
+	__u32 attribs;                    // ATTRIBS
+	__u32 prot_bits;                  // PERMS
+	__u32 uid;                        // UID
+	__u32 gid;                        // GID
+	__u16 dev_major;                  // NUMBER RANGE(0,65535)   
+	__u16 dev_minor;                  // NUMBER RANGE(0,65535)
+	/* 32-bit: sizeof(fe) = 484 bytes */
+	/* 64-bit: sizeof(fe) = 488 bytes */
+	/* Need to account for that fact when the struct is extended. */
 }
 ocfs_file_entry;
 
 /* not sizeof-safe across platforms */
 typedef struct _ocfs_index_node
 {
-	ub8 down_ptr;
-	ub8 file_ent_ptr;
-	ub1 name_len;
-	ub1 name[1];
+	__u64 down_ptr;
+	__u64 file_ent_ptr;
+	__u8 name_len;
+	__u8 name[1];
 }
+OCFS_GCC_ATTR_PACKALGN
 ocfs_index_node;
 
 typedef struct _ocfs_index_hdr
 {
 	ocfs_disk_lock disk_lock;
-	ub8 signature;
-	sb8 up_tree_ptr;	/* Pointer to parent of this dnode */
-	ub8 node_disk_off;
-	ub1 state;		/* In recovery, needs recovery etc */
-	ub1 pad[7];
-	ub8 down_ptr;
-	ub1 num_ents;;		/* Number of extents in this Node */
-	ub1 depth;		/* Depth of this Node from root of the btree */
-	ub1 num_ent_used;	/* Num of entries in the dir blk used up. */
-	ub1 dir_node_flags;	/* Flags */
-	ub1 sync_flags;		/* Flags */
-	ub1 index[256];
-	ub1 reserved[161];
-	ub1 file_ent[1];	/* 63 entries here with 32K DIR_NODE size */
+	__u64 signature;
+	__s64 up_tree_ptr;	/* Pointer to parent of this dnode */
+	__u64 node_disk_off;
+	__u8 state;		/* In recovery, needs recovery etc */
+	__u64 down_ptr	OCFS_GCC_ATTR_ALIGNED;
+	__u8 num_ents;;		/* Number of extents in this Node */
+	__u8 depth;		/* Depth of this Node from root of the btree */
+	__u8 num_ent_used;	/* Num of entries in the dir blk used up. */
+	__u8 dir_node_flags;	/* Flags */
+	__u8 sync_flags;		/* Flags */
+	__u8 index[256];
+	__u8 reserved[161];
+	__u8 file_ent[1];	/* 63 entries here with 32K DIR_NODE size */
 }
+OCFS_GCC_ATTR_PACKED
 ocfs_index_hdr;
 
 /* not sizeof-safe across platforms */
 typedef struct _ocfs_dir_node
 {
-	ocfs_disk_lock disk_lock;
-	ub1 signature[8];
-	ub8 alloc_file_off;
-	ub4 alloc_node;
-	ub1 pad[4];
-	ub8 free_node_ptr;
-	ub8 node_disk_off;
-	sb8 next_node_ptr;
-	sb8 indx_node_ptr;
-	sb8 next_del_ent_node;
-	sb8 head_del_ent_node;
-	ub1 first_del;
-	ub1 num_del;
-	ub1 num_ents;		/* Number of extents in this Node */
-	ub1 depth;		/* Depth of Node from the root of te btree */
-	ub1 num_ent_used;	/* Number of entries in the dir blk used up. */
-	ub1 dir_node_flags;	/* Flags */
-	ub1 sync_flags;		/* Flags */
-	ub1 index[256];
-	ub1 index_dirty;
-	ub1 bad_off;
-	ub1 reserved[127];
-	ub1 file_ent[1];;	/* 63 entries here with 32K DIR_NODE size */
+	ocfs_disk_lock disk_lock;       // DISKLOCK
+	__u8 signature[8];               // NUMBER[8] RANGE(0,255)
+	__u64 alloc_file_off;             // NUMBER RANGE(0,ULONG_LONG_MAX) 
+	__u32 alloc_node;                 // NUMBER RANGE(0,31)
+	__u64 free_node_ptr;              // DISKPTR
+	__u64 node_disk_off;              // DISKPTR
+	__s64 next_node_ptr;              // DISKPTR 
+	__s64 indx_node_ptr;              // DISKPTR
+	__s64 next_del_ent_node;          // DISKPTR
+	__s64 head_del_ent_node;          // DISKPTR
+	__u8 first_del;                  // NUMBER RANGE(-1,254)
+	__u8 num_del;                    // NUMBER RANGE(0,254)
+	__u8 num_ents;	                // NUMBER RANGE(0,254)
+	__u8 depth;		        // UNUSED
+	__u8 num_ent_used;	        // NUMBER RANGE(0,254)
+	__u8 dir_node_flags;	        // DIRFLAG
+	__u8 sync_flags;		        // SYNCFLAG
+	__u8 index[256];                 // DIRINDEX
+	__u8 index_dirty;                // BOOL
+	__u8 bad_off;                    // NUMBER RANGE(0,254)
+	__u8 reserved[127];              // UNUSED
+	__u8 file_ent[1];                // UNUSED
 }
+OCFS_GCC_ATTR_PACKALGN
 ocfs_dir_node;
 
 typedef struct _ocfs_vol_node_map
 {
-	ub8 time[OCFS_MAXIMUM_NODES];
-	ub8 scan_time[OCFS_MAXIMUM_NODES];
-	ub1 scan_rate[OCFS_MAXIMUM_NODES];
+	__u64 time[OCFS_MAXIMUM_NODES];
+	__u64 scan_time[OCFS_MAXIMUM_NODES];
+	__u8 scan_rate[OCFS_MAXIMUM_NODES];
 #ifdef UNUSED
-	ub1 exp_scan_rate[OCFS_MAXIMUM_NODES];
-	ub8 exp_rate_chng_time[OCFS_MAXIMUM_NODES];
+	__u8 exp_scan_rate[OCFS_MAXIMUM_NODES];
+	__u64 exp_rate_chng_time[OCFS_MAXIMUM_NODES];
 #endif
-	ub4 miss_cnt[OCFS_MAXIMUM_NODES];
-	ub8 largest_seq_num;
+	__u32 miss_cnt[OCFS_MAXIMUM_NODES];
+	atomic_t dismount[OCFS_MAXIMUM_NODES];
+	__u64 largest_seq_num;
 }
 ocfs_vol_node_map;
 
 typedef struct _ocfs_vol_layout
 {
-	ub8 start_off;
-	ub4 num_nodes;
-	ub4 cluster_size;
-	ub1 mount_point[MAX_MOUNT_POINT_LEN];
-	ub1 vol_id[MAX_VOL_ID_LENGTH];
-	ub1 label[MAX_VOL_LABEL_LEN];
-	ub4 label_len;
-	ub1 pad[4];
-	ub8 size;
-	ub8 root_start_off;
-	ub8 serial_num;
-	ub8 root_size;
-	ub8 publ_sect_off;
-	ub8 vote_sect_off;
-	ub8 root_bitmap_off;
-	ub8 root_bitmap_size;
-	ub8 data_start_off;
-	ub8 num_clusters;
-	ub8 root_int_off;
-	ub8 dir_node_size;
-	ub8 file_node_size;
-	ub8 bitmap_off;
-	ub8 node_cfg_off;
-	ub8 node_cfg_size;
-	ub8 new_cfg_off;
-	ub4 prot_bits;
-	ub4 uid;
-	ub4 gid;
+	__u64 start_off;
+	__u32 num_nodes;
+	__u32 cluster_size;
+	__u8 mount_point[MAX_MOUNT_POINT_LEN];
+	__u8 vol_id[MAX_VOL_ID_LENGTH];
+	__u8 label[MAX_VOL_LABEL_LEN];
+	__u32 label_len;
+	__u64 size;
+	__u64 root_start_off;
+	__u64 serial_num;
+	__u64 root_size;
+	__u64 publ_sect_off;
+	__u64 vote_sect_off;
+	__u64 root_bitmap_off;
+	__u64 root_bitmap_size;
+	__u64 data_start_off;
+	__u64 num_clusters;
+	__u64 root_int_off;
+	__u64 dir_node_size;
+	__u64 file_node_size;
+	__u64 bitmap_off;
+	__u64 node_cfg_off;
+	__u64 node_cfg_size;
+	__u64 new_cfg_off;
+	__u32 prot_bits;
+	__u32 uid;
+	__u32 gid;
 }
 ocfs_vol_layout;
 
 typedef struct _ocfs_extent_group
 {
-	ub1 signature[8];
-	sb4 next_free_ext;	/* 0 when init, -1 when full */
-	ub4 curr_sect;		/* Currently available sector for use */
-	ub4 max_sects;		/* Maximum Number of Sectors */
-	ub4 type;		/* Type of this sector... either */
-	/*  Actual Data or a Ptr to another location */
-	sb4 granularity;	/* Number of leaf levels */
-	ub4 alloc_node;
-	ub8 this_ext;
-	ub8 next_data_ext;
-	ub8 alloc_file_off;
-	ub8 last_ext_ptr;
-	ub8 up_hdr_node_ptr;
+	__u8 signature[8];
+	__s32 next_free_ext;	/* 0 when init, -1 when full */
+	__u32 curr_sect;	/* Currently available sector for use */
+	__u32 max_sects;	/* Maximum Number of Sectors */
+	__u32 type;		/* Type of this sector... either */
+				/*  Actual Data or a Ptr to another location */
+	__s32 granularity;	/* Number of leaf levels */
+	__u32 alloc_node;
+	__u64 this_ext;
+	__u64 next_data_ext;
+	__u64 alloc_file_off;
+	__u64 last_ext_ptr;
+	__u64 up_hdr_node_ptr;
 	ocfs_alloc_ext extents[OCFS_MAX_DATA_EXTENTS];
 }
 ocfs_extent_group;
@@ -218,7 +225,8 @@ ocfs_extent_group;
 typedef struct _ocfs_bitmap_lock
 {
     ocfs_disk_lock disk_lock;
-    ub4 used_bits;
+    __u32 used_bits;
 }
+OCFS_GCC_ATTR_PACKALGN
 ocfs_bitmap_lock;
 #endif /*_OCFSDISK_H_ */
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Common/inc/ocfsdlm.h linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Common/inc/ocfsdlm.h
--- linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Common/inc/ocfsdlm.h	2003-07-30 13:51:50.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Common/inc/ocfsdlm.h	2003-07-30 10:28:53.000000000 +0200
@@ -30,54 +30,52 @@
 #define  OCFS_MAX_DLM_PKT_SIZE			256
 #define  OCFS_DLM_MAX_MSG_SIZE			256
 
-#define  OCFS_DLM_VOTE_OK			0
-#define  OCFS_DLM_VOTE_OIN_ALREADY_INUSE	1
-#define  OCFS_DLM_VOTE_UPDATE_RETRY		2
-#define  OCFS_DLM_VOTE_FILE_DEL			3
-
 #define  OCFS_DLM_MSG_MAGIC			0x79677083
 
 typedef struct _ocfs_dlm_msg_hdr
 {
-        ub8 lock_id;
-        ub4 flags;
-        ub8 lock_seq_num;
-} ocfs_dlm_msg_hdr;
+	__u64 lock_id;
+	__u32 flags;
+	__u64 lock_seq_num;
+	__u8 open_handle;
+}
+OCFS_GCC_ATTR_PACKALGN
+ocfs_dlm_msg_hdr;
 
 typedef ocfs_dlm_msg_hdr ocfs_dlm_req_master;
 typedef ocfs_dlm_msg_hdr ocfs_dlm_disk_vote_req;
 
 typedef struct _ocfs_dlm_reply_master
 {
-        ocfs_dlm_msg_hdr h;
-	ub4 status;
+	ocfs_dlm_msg_hdr h;
+	__u32 status;
 }
 ocfs_dlm_reply_master;
 
 typedef struct _ocfs_dlm_disk_vote_reply
 {
-        ocfs_dlm_msg_hdr h;
-	ub4 status;
+	ocfs_dlm_msg_hdr h;
+	__u32 status;
 }
 ocfs_dlm_disk_vote_reply;
 
 typedef struct _ocfs_dlm_msg
 {
-	ub4 magic;
-	ub4 msg_len;
-	ub1 vol_id[MAX_VOL_ID_LENGTH];
-	ub4 src_node;
-	ub4 dst_node;
-	ub4 msg_type;
-	ub4 check_sum;
-	ub1 msg_buf[1];
+	__u32 magic;
+	__u32 msg_len;
+	__u8 vol_id[MAX_VOL_ID_LENGTH];
+	__u32 src_node;
+	__u32 dst_node;
+	__u32 msg_type;
+	__u32 check_sum;
+	__u8 msg_buf[1];
 }
 ocfs_dlm_msg;
 
 typedef struct _ocfs_recv_ctxt
 {
-	sb4 msg_len;
-	ub1 msg[OCFS_MAX_DLM_PKT_SIZE];
+	__s32 msg_len;
+	__u8 msg[OCFS_MAX_DLM_PKT_SIZE];
 	int status;
 	struct tq_struct ipc_tq;
 }
@@ -85,10 +83,9 @@ ocfs_recv_ctxt;
 
 enum
 {
-	OCFS_REQUEST_MAKE_MASTER = 1,
-	OCFS_REPLY_MAKE_MASTER,
-	OCFS_DISK_VOTE_REQUEST,
-	OCFS_DISK_VOTE_REPLY
+	OCFS_VOTE_REQUEST = 1,
+	OCFS_VOTE_REPLY,
+	OCFS_INFO_DISMOUNT
 };
 
 #endif				/* _OCFSDLM_H_ */
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Common/inc/ocfserr.h linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Common/inc/ocfserr.h
--- linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Common/inc/ocfserr.h	2003-07-30 13:51:50.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Common/inc/ocfserr.h	2003-07-30 10:28:53.000000000 +0200
@@ -1,84 +1,4 @@
-/****************************************************************************
- ** Oracle Cluster File System
- **
- ** File: ocfserr.h
- **
- ** Module: Oracle Cluster File System Driver
- **
- ** Description:
- **
- ** Author: Neeraj Goyal, Suchit Kaura
- **
- ** MODIFIED    MM/DD/YY
- ** ========    ========
- ** smushran    08-21-01 - Portable
- ** skaura      04-04-00 - Created
- *****************************************************************************
- ** Copyright (c) 2000, 2001, 2002 by Oracle Corporation.  All Rights Reserved.
- ** This document contains proprietary information about Oracle Corporation.
- ** It is provided under an agreement containing restrictions on use and
- ** disclosure and is also protected by law.
- ****************************************************************************/
-
 #ifndef _OCFSERR_H_
 #define _OCFSERR_H_
 
-/*
-**  Values are 32 bit values layed out as follows:
-**
-**   3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1
-**   1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
-**  +---+-+-+-----------------------+-------------------------------+
-**  |Sev|C|R|     Facility          |               Code            |
-**  +---+-+-+-----------------------+-------------------------------+
-**
-**  where
-**
-**      Sev - is the severity code
-**
-**          00 - Success
-**          01 - Informational
-**          10 - Warning
-**          11 - Error
-**
-**      C - is the Customer code flag
-**
-**      R - is a reserved bit
-**
-**      Facility - is the facility code
-**
-**      Code - is the facility's status code
-**
-**
-** Define the facility codes
-*/
-
-/*
-** Define the severity codes
-*/
-#define STATUS_SEVERITY_WARNING          0x2
-#define STATUS_SEVERITY_SUCCESS          0x0
-#define STATUS_SEVERITY_INFORMATIONAL    0x1
-#define STATUS_SEVERITY_ERROR            0x3
-
-/*
-** MessageId: OCFS_ERROR_INTERNAL_ERROR
-**
-** MessageText:
-**
-** The Sample FSD encountered an internal error.
-** Please check log data information.
-*/
-#define OCFS_ERROR_INTERNAL_ERROR        ((ub4)0xE004A001L)
-
-typedef struct _ocfs_errent
-{
-      int errno;
-      char *str;
-} ocfs_errent;
- 
- 
-extern ocfs_errent ocfs_error_strings[];
-extern int ocfs_num_err;
-
 #endif				/* _OCFSERR_H_ */
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Common/inc/ocfsgenalloc.h linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Common/inc/ocfsgenalloc.h
--- linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Common/inc/ocfsgenalloc.h	2003-07-30 13:51:50.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Common/inc/ocfsgenalloc.h	2003-07-30 10:28:53.000000000 +0200
@@ -27,84 +27,165 @@
 #ifndef _OCFSGENALLOC_H_
 #define _OCFSGENALLOC_H_
 
-#define ocfs_get_file_entry(x,y,z)  ocfs_force_get_file_entry(x,y,z,false)
-#define ocfs_put_file_entry(x,y)    ocfs_force_put_file_entry(x,y,false)
+enum {
+	EXTENT_HEADER,
+	EXTENT_DATA
+};
+
+#define OCFS_EXTENT_MERGEABLE(ext, off)	\
+			(((ext)->disk_off + (ext)->num_bytes) == (off))
+
+#define ocfs_read_extent(osb, ext, off, typ)				\
+({									\
+	int __status;							\
+	ocfs_extent_group *__ext;					\
+	__status = ocfs_read_disk(osb, (ext), (osb)->sect_size, off);	\
+	if (__status >= 0) {						\
+		__ext = (ocfs_extent_group *) (ext);			\
+		if ((typ) == EXTENT_HEADER) {				\
+			if (!IS_VALID_EXTENT_HEADER(__ext))		\
+				__status = -EFAIL;			\
+		}							\
+		if ((typ) == EXTENT_DATA) {				\
+			if (!IS_VALID_EXTENT_DATA(__ext))		\
+				__status = -EFAIL;			\
+		}							\
+	}								\
+	__status;							\
+})
+
+int _write_free_extent_log(ocfs_super *osb, ocfs_cleanup_record *CleanupLogRec,
+		   __u32 len, __u32 fileoff, __u32 nodenum, __u32 thistype);
+
+int ocfs_kill_this_tree(ocfs_super *osb, ocfs_extent_group *extent_grp,
+			ocfs_cleanup_record *CleanupLogRec);
+
+int ocfs_lookup_file_allocation (ocfs_super * osb,
+			  ocfs_inode * oin,
+			  __s64 Vbo,
+			  __s64 * Lbo,
+			  __u32 ByteCount, __u32 * NumIndex, void **Buffer);
 
-int ocfs_force_get_file_entry (ocfs_super * osb, ocfs_file_entry ** FileEntry,
-			   ub8 DiskOffset, bool force);
-int ocfs_force_put_file_entry (ocfs_super * osb, ocfs_file_entry * FileEntry,
-			   bool force);
+#ifndef USERSPACE_TOOL
 
 int ocfs_read_file_entry (ocfs_super * osb,
-		   ocfs_file_entry * FileEntry, ub8 DiskOffset);
+		   ocfs_file_entry * FileEntry, __u64 DiskOffset);
 
-int ocfs_write_file_entry (ocfs_super * osb, ocfs_file_entry * FileEntry, ub8 Offset);
+int ocfs_write_file_entry (ocfs_super * osb, ocfs_file_entry * FileEntry, __u64 Offset);
 
 void ocfs_remove_extent_map_entry (ocfs_super * osb,
-			  ocfs_extent_map * Map, sb8 Vbo, ub4 ByteCount);
+			  ocfs_extent_map * Map, __s64 Vbo, __u32 ByteCount);
 
 int ocfs_allocate_new_data_node (ocfs_super * osb,
 		     ocfs_file_entry * FileEntry,
-		     ub8 actualDiskOffset,
-		     ub8 actualLength,
-		     ocfs_extent_group * ExtentHeader, ub8 * NewExtentOffset);
+		     __u64 actualDiskOffset,
+		     __u64 actualLength,
+		     ocfs_extent_group * ExtentHeader, __u64 * NewExtentOffset);
 
 int ocfs_add_to_last_data_node (ocfs_super * osb,
 		   ocfs_inode * oin,
 		   ocfs_file_entry * FileEntry,
-		   ub8 actualDiskOffset,
-		   ub8 actualLength, ub4 * ExtentIndex, bool * IncreaseDepth);
+		   __u64 actualDiskOffset,
+		   __u64 actualLength, __u32 * ExtentIndex, bool * IncreaseDepth);
 
 int ocfs_update_last_data_extent (ocfs_super * osb,
-		      ocfs_file_entry * FileEntry, ub8 NextDataOffset);
+		      ocfs_file_entry * FileEntry, __u64 NextDataOffset);
+
+int ocfs_update_uphdrptr(ocfs_super *osb, ocfs_file_entry *fe,
+			 __u64 new_up_hdr_ptr);
 
 int ocfs_grow_extent_tree (ocfs_super * osb,
 		ocfs_file_entry * FileEntry,
-		ub8 actualDiskOffset, ub8 actualLength);
+		__u64 actualDiskOffset, __u64 actualLength);
 
 int ocfs_allocate_extent (ocfs_super * osb,
 		    ocfs_inode * oin,
 		    ocfs_file_entry * FileEntry,
-		    ub8 actualDiskOffset, ub8 actualLength);
-
-bool ocfs_check_for_extent_merge (ocfs_alloc_ext * LastExtent, ub8 ActualDiskOffset);
+		    __u64 actualDiskOffset, __u64 actualLength);
 
 bool ocfs_get_next_extent_map_entry (ocfs_super * osb,
 			   ocfs_extent_map * Map,
-			   ub4 RunIndex,
-			   sb8 * Vbo, sb8 * Lbo, ub4 * SectorCount);
+			   __u32 RunIndex,
+			   __s64 * Vbo, __s64 * Lbo, __u32 * SectorCount);
 
 int ocfs_update_all_headers (ocfs_super * osb,
-		  ocfs_extent_group * AllocExtent, ub8 FileSize);
+		  ocfs_extent_group * AllocExtent, __u64 FileSize, ocfs_file_entry *fe);
 
 int ocfs_free_extents_for_truncate (ocfs_super * osb, ocfs_file_entry * FileEntry);
 
 int ocfs_get_leaf_extent (ocfs_super * osb,
 	       ocfs_file_entry * FileEntry,
-	       sb8 Vbo, ocfs_extent_group * OcfsDataExtent);
-
-int ocfs_lookup_file_allocation (ocfs_super * osb,
-			  ocfs_inode * oin,
-			  sb8 Vbo,
-			  sb8 * Lbo,
-			  ub4 ByteCount, ub4 * NumIndex, void **Buffer);
+	       __s64 Vbo, ocfs_extent_group * OcfsDataExtent);
 
-int ocfs_adjust_allocation (ocfs_io_runs ** IoRuns, ub4 * ioRunSize);
+int ocfs_adjust_allocation (ocfs_io_runs ** IoRuns, __u32 * ioRunSize);
 
 bool ocfs_lookup_extent_map_entry (ocfs_super * osb,
 			  ocfs_extent_map * Map,
-			  sb8 Vbo, sb8 * Lbo, ub8 * SectorCount, ub4 * Index);
+			  __s64 Vbo, __s64 * Lbo, __u64 * SectorCount, __u32 * Index);
 
 bool ocfs_add_extent_map_entry (ocfs_super * osb,
-		       ocfs_extent_map * Map, sb8 Vbo, sb8 Lbo, ub8 ByteCount);
+		       ocfs_extent_map * Map, __s64 Vbo, __s64 Lbo, __u64 ByteCount);
 
 int ocfs_update_extent_map (ocfs_super * osb,
 		     ocfs_extent_map * Map,
 		     void *Buffer,
-		     sb8 * localVbo, ub8 * remainingLength, ub4 Flag);
+		     __s64 * localVbo, __u64 * remainingLength, __u32 Flag);
 
 int ocfs_extent_map_load (ocfs_super * osb,
 		     ocfs_extent_map * Map,
-		     void **Buffer, sb8 Vbo, ub8 ByteCount, ub4 * RetRuns);
+		     void **Buffer, __s64 Vbo, __u64 ByteCount, __u32 * RetRuns);
+
+                                                                                
+int ocfs_fix_extent_group(ocfs_super *osb, ocfs_extent_group *group);
+
+int ocfs_update_last_ext_ptr(ocfs_super *osb, ocfs_file_entry *fe);
+
+int ocfs_split_this_tree(ocfs_super * osb, ocfs_extent_group *extent_grp,
+                        ocfs_cleanup_record *CleanupLogRec, ocfs_file_entry *fe);
+
+int _squish_extent_entries(ocfs_super *osb, ocfs_alloc_ext *extarr, __u32 *freeExtent, ocfs_cleanup_record *CleanupLogRec, __u64 FileSize, bool flag);
+
+/*
+ * ocfs_force_get_file_entry()
+ *
+ */
+static inline int ocfs_force_get_file_entry (ocfs_super * osb, ocfs_file_entry ** FileEntry,
+		       __u64 DiskOffset, bool force)
+{
+	if (!FileEntry)
+		return -EFAIL;
+	*FileEntry = ocfs_allocate_file_entry ();
+	if (!*FileEntry)
+		return -ENOMEM;
+	if (force)
+		return ocfs_read_force_disk (osb, *FileEntry, osb->sect_size,
+					  DiskOffset);
+	else
+		return ocfs_read_file_entry (osb, *FileEntry, DiskOffset);
+}  /* ocfs_force_get_file_entry */
+
+
+/*
+ * ocfs_force_put_file_entry()
+ *
+ */
+static inline int ocfs_force_put_file_entry (ocfs_super * osb, ocfs_file_entry * FileEntry,
+		       bool force)
+{
+	if (!FileEntry)
+		return -EFAIL;
+	if (force)
+		return ocfs_write_force_disk (osb, FileEntry, osb->sect_size,
+					   FileEntry->this_sector);
+	else
+		return ocfs_write_file_entry (osb, FileEntry,
+					   FileEntry->this_sector);
+}  /* ocfs_force_put_file_entry */
+
+
+#define ocfs_get_file_entry(x,y,z)  ocfs_force_get_file_entry(x,y,z,false)
+#define ocfs_put_file_entry(x,y)    ocfs_force_put_file_entry(x,y,false)
+
+#endif				/* !USERSPACE_TOOL */
 
 #endif				/* _OCFSGENALLOC_H_ */
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Common/inc/ocfsgenclose.h linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Common/inc/ocfsgenclose.h
--- linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Common/inc/ocfsgenclose.h	2003-07-30 13:51:50.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Common/inc/ocfsgenclose.h	1970-01-01 01:00:00.000000000 +0100
@@ -1,31 +0,0 @@
-/*
- * ocfsgenclose.h
- *
- * Function prototypes for related 'C' file.
- *
- * Copyright (C) 2002 Oracle Corporation.  All rights reserved.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- * 
- * This program 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 recieved a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 021110-1307, USA.
- *
- * Authors: Neeraj Goyal, Suchit Kaura, Kurt Hackel, Sunil Mushran,
- *          Manish Singh, Wim Coekaerts
- */
-#ifndef _OCFSGENCLOSE_H_
-#define _OCFSGENCLOSE_H_
-
-int ocfs_gen_close (ocfs_super * osb, ocfs_file * ofile);
-
-#endif				/* _OCFSGENCLOSE_H_ */
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Common/inc/ocfsgencreate.h linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Common/inc/ocfsgencreate.h
--- linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Common/inc/ocfsgencreate.h	2003-07-30 13:51:50.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Common/inc/ocfsgencreate.h	2003-07-30 10:28:53.000000000 +0200
@@ -30,53 +30,53 @@
 int ocfs_verify_update_oin (ocfs_super * osb, ocfs_inode * oin);
 
 int ocfs_find_contiguous_space_from_bitmap (ocfs_super * osb,
-			       ub8 file_size,
-			       ub8 * cluster_off, ub8 * cluster_count, bool sysfile);
+			       __u64 file_size,
+			       __u64 * cluster_off, __u64 * cluster_count, bool sysfile);
 
 int ocfs_create_oin_from_entry (ocfs_super * osb,
 		    ocfs_file_entry * fe,
 		    ocfs_inode ** new_oin,
-		    ub8 parent_dir_off, ocfs_inode * parent_oin);
+		    __u64 parent_dir_off, ocfs_inode * parent_oin);
 
 int ocfs_find_files_on_disk (ocfs_super * osb,
-		 ub8 parent_off,
+		 __u64 parent_off,
 		 struct qstr * file_name,
 		 ocfs_file_entry * fe, ocfs_file * ofile);
 
 void ocfs_initialize_dir_node (ocfs_super * osb,
 		   ocfs_dir_node * dir_node,
-		   ub8 bitmap_off, ub8 file_off, ub4 node);
+		   __u64 bitmap_off, __u64 file_off, __u32 node);
 
 int ocfs_delete_file_entry (ocfs_super * osb,
-		 ocfs_file_entry * fe, ub8 parent_off, sb4 log_node_num);
+		 ocfs_file_entry * fe, __u64 parent_off, __s32 log_node_num);
 
 int ocfs_rename_file (ocfs_super * osb,
-		ub8 parent_off, struct qstr * file_name, ub8 file_off);
+		__u64 parent_off, struct qstr * file_name, __u64 file_off);
 
-int ocfs_del_file (ocfs_super * osb, ub8 parent_off, ub4 flags, ub8 file_off);
+int ocfs_del_file (ocfs_super * osb, __u64 parent_off, __u32 flags, __u64 file_off);
 
-int ocfs_extend_file (ocfs_super * osb, ub8 parent_off,
-		ocfs_inode * oin, ub8 file_size, ub8 * file_off);
+int ocfs_extend_file (ocfs_super * osb, __u64 parent_off,
+		ocfs_inode * oin, __u64 file_size, __u64 * file_off);
 
 int ocfs_change_file_size (ocfs_super * osb,
-		    ub8 parent_off,
+		    __u64 parent_off,
 		    ocfs_inode * oin,
-		    ub8 file_size, ub8 * file_off, struct iattr *attr);
+		    __u64 file_size, __u64 * file_off, struct iattr *attr);
 
-int ocfs_create_directory (ocfs_super * osb, ub8 parent_off, ocfs_file_entry * fe);
+int ocfs_create_directory (ocfs_super * osb, __u64 parent_off, ocfs_file_entry * fe);
 
-int ocfs_create_file (ocfs_super * osb, ub8 parent_off, ocfs_file_entry * fe);
+int ocfs_create_file (ocfs_super * osb, __u64 parent_off, ocfs_file_entry * fe);
 
 int ocfs_create_modify_file (ocfs_super * osb,
-		  ub8 parent_off,
+		  __u64 parent_off,
 		  ocfs_inode * oin,
 		  struct qstr * file_name,
-		  ub8 file_size,
-		  ub8 * file_off, ub4 flags, ocfs_file_entry * fe, struct iattr *attr);
+		  __u64 file_size,
+		  __u64 * file_off, __u32 flags, ocfs_file_entry * fe, struct iattr *attr);
 
 int ocfs_initialize_oin (ocfs_inode * oin,
 		   ocfs_super * osb,
-		   ub4 flags, struct file *file_obj, ub8 file_off, ub8 lock_id);
+		   __u32 flags, struct file *file_obj, __u64 file_off, __u64 lock_id);
 
 int ocfs_create_delete_cdsl (struct inode *inode,
 		  struct file *filp, ocfs_super * osb, ocfs_cdsl * cdsl);
@@ -89,12 +89,12 @@ int ocfs_update_file_entry_slot (ocfs_su
 void ocfs_check_lock_state (ocfs_super * osb, ocfs_inode * oin);
 #endif
 
-int ocfs_delete_cdsl (ocfs_super * osb, ub8 parent_off, ocfs_file_entry * fe);
+int ocfs_delete_cdsl (ocfs_super * osb, __u64 parent_off, ocfs_file_entry * fe);
 
-int ocfs_create_cdsl (ocfs_super * osb, ub8 parent_off, ocfs_file_entry * fe);
+int ocfs_create_cdsl (ocfs_super * osb, __u64 parent_off, ocfs_file_entry * fe);
 
-int ocfs_change_to_cdsl (ocfs_super * osb, ub8 parent_off, ocfs_file_entry * fe);
+int ocfs_change_to_cdsl (ocfs_super * osb, __u64 parent_off, ocfs_file_entry * fe);
 
-int ocfs_truncate_file (ocfs_super * osb, ub8 file_off, ub8 file_size);
+int ocfs_truncate_file (ocfs_super * osb, __u64 file_off, __u64 file_size, ocfs_inode *oin);
 
 #endif				/* _OCFSGENCREATE_H_ */
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Common/inc/ocfsgendirnode.h linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Common/inc/ocfsgendirnode.h
--- linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Common/inc/ocfsgendirnode.h	2003-07-30 13:51:50.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Common/inc/ocfsgendirnode.h	2003-07-30 10:28:53.000000000 +0200
@@ -32,27 +32,27 @@ void ocfs_print_file_entry (ocfs_file_en
 void ocfs_print_dir_node (ocfs_super * osb, ocfs_dir_node * DirNode);
 
 int ocfs_alloc_node_block (ocfs_super * osb,
-		ub8 FileSize,
-		ub8 * DiskOffset,
-		ub8 * file_off, ub8 * NumClusterAlloc, ub4 NodeNum, ub4 Type);
+		__u64 FileSize,
+		__u64 * DiskOffset,
+		__u64 * file_off, __u64 * NumClusterAlloc, __u32 NodeNum, __u32 Type);
 
-int ocfs_free_vol_block (ocfs_super * osb, ocfs_free_log * FreeLog, ub4 NodeNum, ub4 Type);
+int ocfs_free_vol_block (ocfs_super * osb, ocfs_free_log * FreeLog, __u32 NodeNum, __u32 Type);
 
 int ocfs_free_node_block (ocfs_super * osb,
-	       ub8 file_off, ub8 Length, ub4 NodeNum, ub4 Type);
+	       __u64 file_off, __u64 Length, __u32 NodeNum, __u32 Type);
 
-int ocfs_free_directory_block (ocfs_super * osb, ocfs_file_entry * fe, sb4 LogNodeNum);
+int ocfs_free_directory_block (ocfs_super * osb, ocfs_file_entry * fe, __s32 LogNodeNum);
 
 int ocfs_recover_dir_node (ocfs_super * osb,
-		ub8 OrigDirNodeOffset, ub8 SavedDirNodeOffset);
+		__u64 OrigDirNodeOffset, __u64 SavedDirNodeOffset);
 
-int ocfs_read_dir_node (ocfs_super * osb, ocfs_dir_node * DirNode, ub8 NodeDiskOffset);
+int ocfs_read_dir_node (ocfs_super * osb, ocfs_dir_node * DirNode, __u64 NodeDiskOffset);
 
 int ocfs_write_force_dir_node (ocfs_super * osb,
-		       ocfs_dir_node * DirNode, sb4 IndexFileEntry);
+		       ocfs_dir_node * DirNode, __s32 IndexFileEntry);
 
 int ocfs_write_dir_node (ocfs_super * osb,
-		  ocfs_dir_node * DirNode, sb4 IndexFileEntry);
+		  ocfs_dir_node * DirNode, __s32 IndexFileEntry);
 
 bool ocfs_walk_dir_node (ocfs_super * osb,
 	       ocfs_dir_node * DirNode,
@@ -66,12 +66,12 @@ bool ocfs_search_dir_node (ocfs_super * 
 bool ocfs_find_index (ocfs_super * osb,
 	   ocfs_dir_node * DirNode, struct qstr * FileName, int *Index);
 
-int ocfs_reindex_dir_node (ocfs_super * osb, ub8 DirNodeOffset, ocfs_dir_node * DirNode);
+int ocfs_reindex_dir_node (ocfs_super * osb, __u64 DirNodeOffset, ocfs_dir_node * DirNode);
 
 int ocfs_insert_dir_node (ocfs_super * osb,
 	       ocfs_dir_node * DirNode,
 	       ocfs_file_entry * InsertEntry,
-	       ocfs_dir_node * LockNode, sb4 * IndexOffset);
+	       ocfs_dir_node * LockNode, __s32 * IndexOffset);
 
 int ocfs_del_file_entry (ocfs_super * osb,
 	      ocfs_file_entry * EntryToDel, ocfs_dir_node * LockNode);
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Common/inc/ocfsgendlm.h linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Common/inc/ocfsgendlm.h
--- linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Common/inc/ocfsgendlm.h	2003-07-30 13:51:50.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Common/inc/ocfsgendlm.h	2003-07-30 10:28:53.000000000 +0200
@@ -29,104 +29,107 @@
 
 typedef struct _ocfs_offset_map
 {
-	ub4 length;
-	ub8 log_disk_off;
-	ub8 actual_disk_off;
+	__u32 length;
+	__u64 log_disk_off;
+	__u64 actual_disk_off;
 }
+OCFS_GCC_ATTR_PACKALGN
 ocfs_offset_map;
 
+#ifndef USERSPACE_TOOL
 int ocfs_insert_cache_link (ocfs_super * osb, ocfs_lock_res * lockres);
 
 int ocfs_update_lock_state (ocfs_super * osb, ocfs_lock_res * lockres,
-			    ub4 flags);
+			    __u32 flags, bool *disk_vote);
 
-int ocfs_disk_request_vote (ocfs_super * osb, ub8 lock_id, ub4 lock_type,
-			    ub4 flags, ub8 vote_map, ub8 * lock_seq_num);
+int ocfs_disk_request_vote (ocfs_super * osb, __u64 lock_id, __u32 lock_type,
+			    __u32 flags, __u64 vote_map, __u64 * lock_seq_num);
 
-int ocfs_wait_for_disk_lock_release (ocfs_super * osb, ub8 offset,
-				     ub4 time_to_wait, ub4 lock_type);
+int ocfs_wait_for_disk_lock_release (ocfs_super * osb, __u64 offset,
+				     __u32 time_to_wait, __u32 lock_type);
 
-int ocfs_wait_for_lock_release (ocfs_super * osb, ub8 offset, ub4 time_to_wait,
-				ocfs_lock_res * lockres, ub4 lock_type);
+int ocfs_wait_for_lock_release (ocfs_super * osb, __u64 offset, __u32 time_to_wait,
+				ocfs_lock_res * lockres, __u32 lock_type);
 
-int ocfs_get_vote_on_disk (ocfs_super * osb, ub8 lock_id, ub4 lock_type,
-			   ub4 flags, ub8 * got_vote_map, ub8 vote_map,
-			   ub8 lock_seq_num, ub8 * oin_open_map);
+int ocfs_get_vote_on_disk (ocfs_super * osb, __u64 lock_id, __u32 lock_type,
+			   __u32 flags, __u64 * got_vote_map, __u64 vote_map,
+			   __u64 lock_seq_num, __u64 * oin_open_map);
 
-int ocfs_disk_reset_voting (ocfs_super * osb, ub8 lock_id, ub4 lock_type);
+int ocfs_disk_reset_voting (ocfs_super * osb, __u64 lock_id, __u32 lock_type);
 
-int ocfs_wait_for_vote (ocfs_super * osb, ub8 lock_id, ub4 lock_type, ub4 flags,
-			ub8 vote_map, ub4 time_to_wait, ub8 lock_seq_num,
+int ocfs_wait_for_vote (ocfs_super * osb, __u64 lock_id, __u32 lock_type, __u32 flags,
+			__u64 vote_map, __u32 time_to_wait, __u64 lock_seq_num,
 			ocfs_lock_res * lockres);
 
-int ocfs_prime_voting (ocfs_super * osb, ub8 lock_id, ub4 lock_type, ub8 vote_map);  /* empty */
+int ocfs_reset_voting (ocfs_super * osb, __u64 lock_id, __u32 lock_type, __u64 vote_map);
 
-int ocfs_reset_voting (ocfs_super * osb, ub8 lock_id, ub4 lock_type, ub8 vote_map);
+int ocfs_request_vote (ocfs_super * osb, __u64 lock_id, __u32 lock_type, __u32 flags,
+		       __u64 vote_map, __u64 * lock_seq_num);
 
-int ocfs_request_vote (ocfs_super * osb, ub8 lock_id, ub4 lock_type, ub4 flags,
-		       ub8 vote_map, ub8 * lock_seq_num);
+int ocfs_comm_request_vote (ocfs_super * osb, __u64 lock_id, __u32 lock_type,
+			    __u32 flags, ocfs_file_entry * fe, __u32 attempts);
 
-int ocfs_comm_request_vote (ocfs_super * osb, ub8 lock_id, ub4 lock_type,
-			    ub4 flags, ocfs_file_entry * fe);
+void ocfs_init_dlm_msg (ocfs_super * osb, ocfs_dlm_msg * dlm_msg, __u32 msg_len);
 
-void ocfs_init_dlm_msg (ocfs_super * osb, ocfs_dlm_msg * dlm_msg, ub4 msg_len);
+int ocfs_send_dlm_request_msg (ocfs_super * osb, __u64 lock_id, __u32 lock_type,
+			       __u32 flags, ocfs_lock_res * lockres,
+			       __u64 vote_map);
 
-int ocfs_send_dlm_request_msg (ocfs_super * osb, ub8 lock_id, ub4 lock_type,
-			       ub4 flags, ocfs_lock_res * lockres,
-			       ub8 vote_map, ub4 msg_type);
+int ocfs_comm_make_lock_master (ocfs_super * osb, __u64 lock_id, __u32 lock_type,
+				__u32 flags, ocfs_lock_res * lockres,
+				ocfs_file_entry * fe, __u64 vote_map,
+				__u32 attempts);
 
-int ocfs_comm_make_lock_master (ocfs_super * osb, ub8 lock_id, ub4 lock_type,
-				ub4 flags, ocfs_lock_res * lockres,
-				ocfs_file_entry * fe, ub8 vote_map);
+int ocfs_make_lock_master (ocfs_super * osb, __u64 lock_id, __u32 lock_type,
+			   __u32 flags, ocfs_lock_res * lockres,
+			   ocfs_file_entry * fe, bool *disk_vote);
 
-int ocfs_make_lock_master (ocfs_super * osb, ub8 lock_id, ub4 lock_type,
-			   ub4 flags, ocfs_lock_res * lockres,
-			   ocfs_file_entry * fe);
-
-void ocfs_acquire_lockres (ocfs_lock_res * lockres);
+int ocfs_acquire_lockres_ex (ocfs_lock_res * lockres, __u32 timeout);
+#define ocfs_acquire_lockres(a)		ocfs_acquire_lockres_ex(a, 0)
 
 void ocfs_release_lockres (ocfs_lock_res * lockres);
 
 int ocfs_update_disk_lock (ocfs_super * osb, ocfs_lock_res * lockres,
-			   ub4 flags, ocfs_file_entry * fe);
+			   __u32 flags, ocfs_file_entry * fe);
 
 int ocfs_update_master_on_open (ocfs_super * osb, ocfs_lock_res * lockres);
 
 void ocfs_init_lockres (ocfs_super * osb, ocfs_lock_res * lockres,
-			ub8 lock_id);
+			__u64 lock_id);
 
-int ocfs_create_update_lock (ocfs_super * osb, ocfs_inode * oin, ub8 lock_id,
-			     ub4 flags);
+int ocfs_create_update_lock (ocfs_super * osb, ocfs_inode * oin, __u64 lock_id,
+			     __u32 flags);
 
-int ocfs_get_x_for_del (ocfs_super * osb, ub8 lock_id, ub4 lock_type, ub4 flags,
+int ocfs_get_x_for_del (ocfs_super * osb, __u64 lock_id, __u32 lock_type, __u32 flags,
 			ocfs_lock_res * lockres, ocfs_file_entry * fe);
 
-int ocfs_try_exclusive_lock (ocfs_super *osb, ocfs_lock_res *lockres, ub4 flags,
-			     ub4 updated, ocfs_file_entry *fe, ub8 lock_id,
-			     ub4 lock_type);
+int ocfs_try_exclusive_lock (ocfs_super *osb, ocfs_lock_res *lockres, __u32 flags,
+			     __u32 updated, ocfs_file_entry *fe, __u64 lock_id,
+			     __u32 lock_type);
 
-int ocfs_acquire_lock (ocfs_super * osb, ub8 lock_id, ub4 lock_type, ub4 flags,
+int ocfs_acquire_lock (ocfs_super * osb, __u64 lock_id, __u32 lock_type, __u32 flags,
 		       ocfs_lock_res ** lockres, ocfs_file_entry * lock_fe);
 
-int ocfs_disk_release_lock (ocfs_super * osb, ub8 lock_id, ub4 lock_type,
-			    ub4 flags, ocfs_lock_res * lockres, ocfs_file_entry *fe);
+int ocfs_disk_release_lock (ocfs_super * osb, __u64 lock_id, __u32 lock_type,
+			    __u32 flags, ocfs_lock_res * lockres, ocfs_file_entry *fe);
 
-int ocfs_release_lock (ocfs_super * osb, ub8 lock_id, ub4 lock_type, ub4 flags,
+int ocfs_release_lock (ocfs_super * osb, __u64 lock_id, __u32 lock_type, __u32 flags,
 		       ocfs_lock_res * lockres, ocfs_file_entry *fe);
 
 int ocfs_init_dlm (void);
 
-int ocfs_add_lock_to_recovery (void);    /* unused */
+int ocfs_add_lock_to_recovery (void);
 
-int ocfs_create_log_extent_map (ocfs_super * osb, ocfs_io_runs ** TransRuns,
-				ub4 * PNumTransRuns, ub8 diskOffset,
-				ub8 ByteCount);	/* unused */
+int ocfs_create_log_extent_map (ocfs_super * osb, ocfs_io_runs ** PTransRuns,
+		__u32 * PNumTransRuns, __u64 diskOffset, __u64 ByteCount);
 
-int ocfs_lookup_cache_link (ocfs_super * osb, ub1 * buf, ub8 actual_diski_off,
-			    ub8 length);
+int ocfs_lookup_cache_link (ocfs_super * osb, __u8 * buf, __u64 actual_disk_off,
+			    __u64 length);
 
 int ocfs_process_log_file (ocfs_super * osb, bool flag);
 
-int ocfs_break_cache_lock (ocfs_super * osb, ocfs_lock_res * lockres);
+int ocfs_break_cache_lock (ocfs_super * osb, ocfs_lock_res * lockres,
+			   ocfs_file_entry *fe);
 
+#endif				/* USERSPACE_TOOL */
 #endif				/* _OCFSGENDLM_H_ */
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Common/inc/ocfsgeninit.h linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Common/inc/ocfsgeninit.h
--- linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Common/inc/ocfsgeninit.h	2003-07-30 13:51:50.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Common/inc/ocfsgeninit.h	1970-01-01 01:00:00.000000000 +0100
@@ -1,32 +0,0 @@
-/*
- * ocfsgeninit.h
- *
- * Function prototypes for related 'C' file.
- *
- * Copyright (C) 2002 Oracle Corporation.  All rights reserved.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- * 
- * This program 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 recieved a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 021110-1307, USA.
- *
- * Authors: Neeraj Goyal, Suchit Kaura, Kurt Hackel, Sunil Mushran,
- *          Manish Singh, Wim Coekaerts
- */
-
-#ifndef _OCFSGENINIT_H_
-#define _OCFSGENINIT_H_
-
-int ocfs_driver_init (void);
-
-#endif				/* _OCFSGENINIT_H_ */
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Common/inc/ocfsgenmisc.h linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Common/inc/ocfsgenmisc.h
--- linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Common/inc/ocfsgenmisc.h	2003-07-30 13:51:50.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Common/inc/ocfsgenmisc.h	2003-07-30 10:28:53.000000000 +0200
@@ -30,8 +30,8 @@
 int ocfs_create_meta_log_files (ocfs_super * osb);
 
 int ocfs_create_new_oin (ocfs_inode ** Returnedoin,
-		  ub8 * AllocationSize,
-		  ub8 * EndOfFile, struct file *FileObject, ocfs_super * osb);
+		  __u64 * AllocationSize,
+		  __u64 * EndOfFile, struct file *FileObject, ocfs_super * osb);
 
 int ocfs_create_root_dir_node (ocfs_super * osb);
 
@@ -43,7 +43,7 @@ void ocfs_release_oin (ocfs_inode * oin,
 
 int ocfs_initialize_osb (ocfs_super * osb,
 		   ocfs_vol_disk_hdr * VolDiskHdr,
-		   ocfs_vol_label * VolLabel, ub4 SectorSize);
+		   ocfs_vol_label * VolLabel, __u32 SectorSize);
 
 int ocfs_verify_volume (ocfs_vol_disk_hdr * VolDiskHdr);
 
@@ -56,21 +56,95 @@ void ocfs_delete_osb (ocfs_super * osb);
 int ocfs_commit_cache (ocfs_super * osb, bool Flag);
 
 
-
 /* sorry about all the macros, but file and line are important */
 
+#ifndef USERSPACE_TOOL
 /* lockres macros */
 #ifdef OCFS_MEM_DBG
-#define ocfs_allocate_lockres()  (ocfs_lock_res *)ocfs_dbg_slab_alloc( \
-                                                    OcfsGlobalCtxt.lockres_cache, \
-                                                    __FILE__, __LINE__)
-#define ocfs_free_lockres(res)   ocfs_dbg_slab_free( \
-                                                    OcfsGlobalCtxt.lockres_cache, res)
+#define ocfs_allocate_lockres()						\
+({									\
+	ocfs_lock_res *_l = NULL;					\
+	 _l = (ocfs_lock_res *)ocfs_dbg_slab_alloc 			\
+	 	(OcfsGlobalCtxt.lockres_cache, __FILE__, __LINE__);	\
+	if (_l)	atomic_inc (&(OcfsGlobalCtxt.cnt_lockres));		\
+	_l;								\
+})
+
+#define ocfs_free_lockres(_r)						\
+do {									\
+	ocfs_dbg_slab_free (OcfsGlobalCtxt.lockres_cache, _r);		\
+	atomic_dec (&(OcfsGlobalCtxt.cnt_lockres));			\
+} while (0)
+
 #else  /* !OCFS_MEM_DBG */
-#define ocfs_allocate_lockres()  (ocfs_lock_res *)kmem_cache_alloc ( \
-                                                    OcfsGlobalCtxt.lockres_cache, GFP_NOFS)
-#define ocfs_free_lockres(res)   kmem_cache_free(OcfsGlobalCtxt.lockres_cache, res)
+#define ocfs_allocate_lockres()						\
+({									\
+ 	ocfs_lock_res *_l = NULL;					\
+	_l = (ocfs_lock_res *)kmem_cache_alloc				\
+			(OcfsGlobalCtxt.lockres_cache, GFP_NOFS);	\
+	if (_l)	atomic_inc (&(OcfsGlobalCtxt.cnt_lockres));		\
+	_l;								\
+})
+
+#define ocfs_free_lockres(_r)						\
+do {									\
+	kmem_cache_free (OcfsGlobalCtxt.lockres_cache, _r);		\
+	atomic_dec (&(OcfsGlobalCtxt.cnt_lockres));			\
+} while (0)
+
+#endif
+
+#define _ocfs_get_lockres(_r)					\
+do {								\
+	if (_r) 						\
+		atomic_inc(&((_r)->lr_ref_cnt));		\
+} while (0)
+
+#define _ocfs_put_lockres(_r)					\
+do {								\
+	if (_r) {						\
+		if (atomic_dec_and_test(&((_r)->lr_ref_cnt))) 	\
+			ocfs_free_lockres(_r);			\
+	}							\
+} while (0)
+
+#ifdef OCFS_DBG_LOCKRES
+#define ocfs_get_lockres(_r)						\
+do {									\
+	if (_r) {							\
+		if (debug_level & OCFS_DEBUG_LEVEL_LOCKRES)		\
+			printk("(%d) get: 0x%08x, %d, %s, %d\n",	\
+			       ocfs_getpid(), (_r),			\
+			       atomic_read(&((_r)->lr_ref_cnt)) + 1,	\
+			       __FUNCTION__, __LINE__);			\
+		_ocfs_get_lockres(_r);					\
+	} else {							\
+		if (debug_level & OCFS_DEBUG_LEVEL_LOCKRES)		\
+			printk("(%d) get: null, -1, %s, %d\n",		\
+			       ocfs_getpid(), __FUNCTION__, __LINE__);	\
+	}								\
+} while (0)
+
+#define ocfs_put_lockres(_r)						\
+do {									\
+	if (_r) {							\
+		if (debug_level & OCFS_DEBUG_LEVEL_LOCKRES)		\
+			printk("(%d) put: 0x%08x, %d, %s, %d\n",	\
+			       ocfs_getpid(), (_r),			\
+			       atomic_read(&((_r)->lr_ref_cnt)) - 1,	\
+			       __FUNCTION__, __LINE__);			\
+		_ocfs_put_lockres(_r);					\
+	} else {							\
+		if (debug_level & OCFS_DEBUG_LEVEL_LOCKRES)		\
+			printk("(%d) put: null, -1, %s, %d\n",		\
+			       ocfs_getpid(), __FUNCTION__, __LINE__);	\
+	}								\
+} while (0)
+#else	/* !OCFS_DBG_LOCKRES */
+#define ocfs_get_lockres(_r)		_ocfs_get_lockres(_r)
+#define	ocfs_put_lockres(_r)		_ocfs_put_lockres(_r)
 #endif
+#endif  /* !USERSPACE_TOOL */
 
 /* ofile macros */
 #ifdef OCFS_MEM_DBG
@@ -115,9 +189,13 @@ int ocfs_commit_cache (ocfs_super * osb,
 	  memset (FileEntry, 0, OCFS_SECTOR_SIZE); \
 	FileEntry; }))
 
-#define ocfs_release_file_entry(fe)  ({ \
-	OCFS_ASSERT (fe); \
-	ocfs_dbg_slab_free (OcfsGlobalCtxt.fe_cache, fe); })
+#define ocfs_release_file_entry(fe)					  \
+	do {								  \
+		if (fe) {						  \
+			ocfs_dbg_slab_free (OcfsGlobalCtxt.fe_cache, fe); \
+			fe = NULL;					  \
+		}							  \
+	} while (0)
 #else  /* !OCFS_MEM_DBG */
 #define ocfs_allocate_file_entry()  ((ocfs_file_entry *)({ \
 	ocfs_file_entry *FileEntry = NULL; \
@@ -126,9 +204,13 @@ int ocfs_commit_cache (ocfs_super * osb,
  	  memset (FileEntry, 0, OCFS_SECTOR_SIZE); \
 	FileEntry; }))
 
-#define ocfs_release_file_entry(fe)  ({ \
-	OCFS_ASSERT (fe); \
-	kmem_cache_free (OcfsGlobalCtxt.fe_cache, fe); })
+#define ocfs_release_file_entry(fe)					\
+	do {								\
+		if (fe) {						\
+			kmem_cache_free (OcfsGlobalCtxt.fe_cache, fe);	\
+			fe = NULL;					\
+		}							\
+	} while (0)
 #endif
 
 /* oin macros - currently the release is handled separately */
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Common/inc/ocfsgennm.h linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Common/inc/ocfsgennm.h
--- linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Common/inc/ocfsgennm.h	2003-07-30 13:51:50.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Common/inc/ocfsgennm.h	2003-07-30 10:28:53.000000000 +0200
@@ -30,24 +30,21 @@
 int ocfs_flush_data (ocfs_inode * oin);
 
 int ocfs_disk_update_resource (ocfs_super * osb, ocfs_lock_res * lockres,
-			       ocfs_file_entry * file_ent);
+			       ocfs_file_entry * file_ent, __u32 timeout);
 
-int ocfs_find_update_res (ocfs_super * osb, ub8 lock_id,
+int ocfs_find_update_res (ocfs_super * osb, __u64 lock_id,
 			  ocfs_lock_res ** lockres, ocfs_file_entry * fe,
-			  ub4 * updated);
+			  __u32 * updated, __u32 timeout);
 
 int ocfs_vote_for_del_ren (ocfs_super * osb, ocfs_publish * publish,
-			   ub4 node_num, ocfs_vote * vote,
+			   __u32 node_num, ocfs_vote * vote,
 			   ocfs_lock_res ** lockres);
 
-struct inode * ocfs_get_inode_from_offset(ocfs_super * osb, ub8 fileoff);
+struct inode * ocfs_get_inode_from_offset(ocfs_super * osb, __u64 fileoff);
 
-int ocfs_process_update_inode_request (ocfs_super * osb, ocfs_vote * vote,
-				       ocfs_publish * publish,
-				       ocfs_lock_res * lockres, ub4 node_num);
+int ocfs_process_update_inode_request (ocfs_super * osb, __u64 lock_id,
+				       ocfs_lock_res * lockres, __u32 node_num);
 
-int ocfs_process_vote (ocfs_super * osb, ocfs_publish * publish, ub4 node_num);
-
-int ocfs_nm_thread (ocfs_super * mount_osb);
+int ocfs_process_vote (ocfs_super * osb, ocfs_publish * publish, __u32 node_num);
 
 #endif				/* _OCFSGENNM_H_ */
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Common/inc/ocfsgenshutdn.h linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Common/inc/ocfsgenshutdn.h
--- linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Common/inc/ocfsgenshutdn.h	2003-07-30 13:51:50.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Common/inc/ocfsgenshutdn.h	1970-01-01 01:00:00.000000000 +0100
@@ -1,34 +0,0 @@
-/*
- * ocfsgenshutdn.h
- *
- * Function prototypes for related 'C' file.
- *
- * Copyright (C) 2002 Oracle Corporation.  All rights reserved.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- * 
- * This program 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 recieved a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 021110-1307, USA.
- *
- * Authors: Neeraj Goyal, Suchit Kaura, Kurt Hackel, Sunil Mushran,
- *          Manish Singh, Wim Coekaerts
- */
-
-#ifndef _OCFSGENSHUTDN_H_
-#define _OCFSGENSHUTDN_H_
-
-void ocfs_commit_at_shutdown (void);
-
-int ocfs_common_shutdown (void);
-
-#endif				/* _OCFSGENSHUTDN_H_ */
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Common/inc/ocfsgensysfile.h linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Common/inc/ocfsgensysfile.h
--- linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Common/inc/ocfsgensysfile.h	2003-07-30 13:51:50.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Common/inc/ocfsgensysfile.h	2003-07-30 10:28:53.000000000 +0200
@@ -27,28 +27,29 @@
 #ifndef _OCFSGENSYSFILE_H_
 #define _OCFSGENSYSFILE_H_
 
-int ocfs_init_system_file (ocfs_super * osb, ub4 FileId);
+int ocfs_init_system_file (ocfs_super * osb, __u32 FileId, char *filename,
+			   ocfs_file_entry *fe);
 
 int ocfs_read_system_file (ocfs_super * osb,
-		ub4 FileId, void *Buffer, ub8 Length, ub8 Offset);
+		__u32 FileId, void *Buffer, __u64 Length, __u64 Offset);
 
 int ocfs_write_system_file (ocfs_super * osb,
-		 ub4 FileId, void *Buffer, ub8 Length, ub8 Offset);
+		 __u32 FileId, void *Buffer, __u64 Length, __u64 Offset);
 
-ub8 ocfs_file_to_disk_off (ocfs_super * osb, ub4 FileId, ub8 Offset);
+__u64 ocfs_file_to_disk_off (ocfs_super * osb, __u32 FileId, __u64 Offset);
 
-int ocfs_get_system_file_size (ocfs_super * osb, ub4 FileId, ub8 * Length, ub8 * AllocSize);
+int ocfs_get_system_file_size (ocfs_super * osb, __u32 FileId, __u64 * Length, __u64 * AllocSize);
 
-int ocfs_extend_system_file (ocfs_super * osb, ub4 FileId, ub8 FileSize, ocfs_file_entry *fe);
+int ocfs_extend_system_file (ocfs_super * osb, __u32 FileId, __u64 FileSize, ocfs_file_entry *fe);
 
 int ocfs_find_extents_of_system_file (ocfs_super * osb,
-			 ub8 file_off,
-			 ub8 Length,
-			 ocfs_file_entry * fe, void **Buffer, ub4 * NumEntries);
+			 __u64 file_off,
+			 __u64 Length,
+			 ocfs_file_entry * fe, void **Buffer, __u32 * NumEntries);
 
-int ocfs_free_file_extents (ocfs_super * osb, ocfs_file_entry * fe, sb4 LogNodeNum);
+int ocfs_free_file_extents (ocfs_super * osb, ocfs_file_entry * fe, __s32 LogNodeNum);
 
-#if !defined(DEBUGOCFS)
+#if !defined(USERSPACE_TOOL)
 int ocfs_write_map_file (ocfs_super * osb);
 #endif
 
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Common/inc/ocfsgentrans.h linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Common/inc/ocfsgentrans.h
--- linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Common/inc/ocfsgentrans.h	2003-07-30 13:51:50.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Common/inc/ocfsgentrans.h	2003-07-30 10:28:53.000000000 +0200
@@ -31,21 +31,21 @@ int ocfs_free_disk_bitmap (ocfs_super * 
 
 int ocfs_process_record (ocfs_super * osb, void *buffer);
 
-int ocfs_process_log (ocfs_super * osb, ub8 trans_id, ub4 node_num, ub4 * type);
+int ocfs_process_log (ocfs_super * osb, __u64 trans_id, __u32 node_num, __u32 * type);
 
 int ocfs_start_trans (ocfs_super * osb);
 
-int ocfs_commit_trans (ocfs_super * osb, ub8 trans_id);
+int ocfs_commit_trans (ocfs_super * osb, __u64 trans_id);
 
-int ocfs_abort_trans (ocfs_super * osb, ub8 trans_id);
+int ocfs_abort_trans (ocfs_super * osb, __u64 trans_id);
 
-int ocfs_reset_publish (ocfs_super * osb, ub8 node_num);
+int ocfs_reset_publish (ocfs_super * osb, __u64 node_num);
 
-int ocfs_recover_vol (ocfs_super * osb, ub8 node_num);
+int ocfs_recover_vol (ocfs_super * osb, __u64 node_num);
 
-int ocfs_write_log (ocfs_super * osb, ocfs_log_record * log_rec, ub4 type);
+int ocfs_write_log (ocfs_super * osb, ocfs_log_record * log_rec, __u32 type);
 
 int ocfs_write_node_log (ocfs_super * osb,
-		  ocfs_log_record * log_rec, ub4 node_num, ub4 type);
+		  ocfs_log_record * log_rec, __u32 node_num, __u32 type);
 
 #endif				/* _OCFSGENTRANS_H_ */
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Common/inc/ocfsgenutil.h linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Common/inc/ocfsgenutil.h
--- linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Common/inc/ocfsgenutil.h	2003-07-30 13:51:50.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Common/inc/ocfsgenutil.h	2003-07-30 10:28:53.000000000 +0200
@@ -28,6 +28,5 @@
 #define _OCFSGENUTIL_H_
 
 int ocfs_compare_qstr (struct qstr * s1, struct qstr * s2);
-char *ocfs_strerror(int errno);
 
 #endif				/* _OCFSGENUTIL_H_ */
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Common/inc/ocfsgenvolcfg.h linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Common/inc/ocfsgenvolcfg.h
--- linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Common/inc/ocfsgenvolcfg.h	2003-07-30 13:51:50.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Common/inc/ocfsgenvolcfg.h	2003-07-30 10:28:53.000000000 +0200
@@ -31,8 +31,8 @@ typedef struct _ocfs_cfg_task
 {
 	struct tq_struct cfg_tq;
 	ocfs_super *osb;
-	ub8 lock_off;
-	ub1 *buffer;
+	__u64 lock_off;
+	__u8 *buffer;
 }
 ocfs_cfg_task;
 
@@ -45,9 +45,9 @@ ocfs_volcfg_op;
 
 void ocfs_worker (void *Arg);
 
-void ocfs_assert_lock_owned (ub4 Arg);
+void ocfs_assert_lock_owned (unsigned long Arg);
 
-int ocfs_add_to_disk_config (ocfs_super * osb, ub4 pref_node_num,
+int ocfs_add_to_disk_config (ocfs_super * osb, __u32 pref_node_num,
 			     ocfs_disk_node_config_info * NodeCfgInfo);
 
 int ocfs_write_volcfg_header (ocfs_super * osb, ocfs_volcfg_op op);
@@ -56,17 +56,17 @@ void ocfs_volcfg_gblctxt_to_disknode(ocf
 
 void ocfs_volcfg_gblctxt_to_node(ocfs_node_config_info *node);
 
-int ocfs_config_with_disk_lock (ocfs_super * osb, ub8 LockOffset, ub1 * Buffer,
-				ub4 node_num, ocfs_volcfg_op op);
+int ocfs_config_with_disk_lock (ocfs_super * osb, __u64 LockOffset, __u8 * Buffer,
+				__u32 node_num, ocfs_volcfg_op op);
 
-int ocfs_release_disk_lock (ocfs_super * osb, ub8 LockOffset);
+int ocfs_release_disk_lock (ocfs_super * osb, __u64 LockOffset);
 
 void ocfs_cfg_worker (ocfs_super * osb);
 
 int ocfs_disknode_to_node (ocfs_node_config_info ** CfgInfo,
 		 ocfs_disk_node_config_info * NodeCfgInfo);
 
-int ocfs_update_disk_config (ocfs_super * osb, ub4 node_num,
+int ocfs_update_disk_config (ocfs_super * osb, __u32 node_num,
 			     ocfs_disk_node_config_info * disk);
 
 int ocfs_chk_update_config (ocfs_super * osb);
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Common/inc/ocfsgenvote.h linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Common/inc/ocfsgenvote.h
--- linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Common/inc/ocfsgenvote.h	2003-07-30 13:51:50.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Common/inc/ocfsgenvote.h	2003-07-30 10:28:53.000000000 +0200
@@ -28,18 +28,16 @@
 #define _OCFSGENVOTE_H_
 
 int ocfs_send_vote_reply (ocfs_super * osb, ocfs_dlm_msg * dlm_msg,
-			  ub4 vote_status, bool inode_open);
+			  __u32 vote_status, bool inode_open);
 
 int ocfs_comm_vote_for_del_ren (ocfs_super * osb, ocfs_lock_res ** lockres,
 				ocfs_dlm_msg * dlm_msg);
 
-int ocfs_find_lockres (ocfs_super * osb, ub8 lock_id, ocfs_lock_res ** lockres);
+bool ocfs_check_ipc_msg (__u8 * msg, __u32 msg_len);
 
-bool ocfs_check_ipc_msg (ub1 * msg, ub4 msg_len);
+void ocfs_find_osb (__s8 * volume_id, ocfs_super ** osb);
 
-void ocfs_find_osb (sb1 * volume_id, ocfs_super ** osb);
-
-int ocfs_find_create_lockres (ocfs_super * osb, ub8 lock_id,
+int ocfs_find_create_lockres (ocfs_super * osb, __u64 lock_id,
 			      ocfs_lock_res ** lockres);
 
 int ocfs_comm_process_vote (ocfs_super * osb, ocfs_dlm_msg * dlm_msg);
@@ -48,6 +46,10 @@ int ocfs_comm_process_vote_reply (ocfs_s
 
 void ocfs_dlm_recv_msg (void *val);
 
-int ocfs_comm_process_msg (ub1 * msg);
+int ocfs_comm_process_msg (__u8 * msg);
+
+int ocfs_send_dismount_msg (ocfs_super * osb, __u64 vote_map);
+
+void ocfs_comm_process_dismount (ocfs_super * osb, ocfs_dlm_msg * dlm_msg);
 
 #endif				/* _OCFSGENVOTE_H_ */
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Common/inc/ocfsheartbeat.h linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Common/inc/ocfsheartbeat.h
--- linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Common/inc/ocfsheartbeat.h	2003-07-30 13:51:50.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Common/inc/ocfsheartbeat.h	2003-07-30 10:28:53.000000000 +0200
@@ -29,6 +29,8 @@
 
 void ocfs_update_publish_map (ocfs_super * osb, void *buffer, bool first_time);
 
-int ocfs_nm_heart_beat (ocfs_super * osb, ub4 flag, bool read_publish);
+int ocfs_nm_thread (ocfs_super * mount_osb);
+
+int ocfs_nm_heart_beat (ocfs_super * osb, __u32 flag, bool read_publish);
 
 #endif				/* _OCFSHEARTBEAT_H_ */
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Common/inc/ocfstrace.h linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Common/inc/ocfstrace.h
--- linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Common/inc/ocfstrace.h	2003-07-30 13:51:50.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Common/inc/ocfstrace.h	2003-07-30 10:28:53.000000000 +0200
@@ -27,11 +27,14 @@
 #ifndef  _OCFSTRACE_H_
 #define  _OCFSTRACE_H_
 
-extern ub4 debug_context;
-extern ub4 debug_level;
+extern __u32 debug_context;
+extern __u32 debug_level;
+extern __u32 debug_exclude;
 
-#define HI(val)            ((ub4)((val) >> 32))
-#define LO(val)            ((ub4)((val) & 0x00000000FFFFFFFFUL))
+#define HI(val)            ((unsigned long)(((val) >> 16) >> 16))
+#define LO(val)            ((unsigned long)((val) & 0x00000000FFFFFFFFUL))
+
+#define HILO(val)	   HI(val), LO(val)
 
 /* Tracing Levels */
 #define OCFS_DEBUG_LEVEL_ERROR         0x00000001
@@ -43,6 +46,9 @@ extern ub4 debug_level;
 #define OCFS_DEBUG_LEVEL_TIMING        0x00000100
 #define OCFS_DEBUG_LEVEL_STACK         0x00000200
 
+#define OCFS_DEBUG_LEVEL_LOCKRES       0x00001000	/* get/put lockres */
+#define OCFS_DEBUG_LEVEL_MALLOC        0x00002000	/* malloc/free lockres */
+
 /* Tracing Contexts */
 #define OCFS_DEBUG_CONTEXT_INIT        0x00000001	/* ocfsgeninit.c,ocfsmain.c */
 #define OCFS_DEBUG_CONTEXT_MEM         0x00000002	/* ocfs_memcheck() in ocfsmain.c */
@@ -77,29 +83,38 @@ extern ub4 debug_level;
 #define OCFS_DEBUG_CONTEXT_IOSUP       0x40000000	/* ocfsiosup.c */
 
 
-#define GET_STACK(s)							\
+#ifdef __ia64__
+# define GET_STACK(s)
+#else
+# define GET_STACK(s)							\
 	IF_LEVEL(OCFS_DEBUG_LEVEL_STACK) {				\
-		sb4 esp;						\
+		__s32 esp;						\
 		__asm__ __volatile__("andl %%esp,%0" : "=r" (esp) : 	\
 				     "0" (8191));			\
 		esp -= sizeof(struct task_struct);			\
 		sprintf((s), "[%ld] ", esp);				\
 	}
+#endif
 
 /* privately used macros */
-# define IF_LEVEL(level)	\
-	if ((debug_context & OCFS_DEBUG_CONTEXT) && (debug_level & level))
+#define IF_LEVEL(level)	\
+	if ((debug_context & OCFS_DEBUG_CONTEXT) && (debug_level & level) && \
+	    ocfs_getpid()!=debug_exclude)
 				
 
+#ifdef __ia64__
+# define GET_TIMING(s, hi, lo)					\
+	do { _HI = _LO = 0; } while (0)
+#else
 # define GET_TIMING(s, hi, lo)					\
 	do {							\
 		IF_LEVEL(OCFS_DEBUG_LEVEL_TIMING) {		\
-			ub4 _lo, _hi;				\
+			__u32 _lo, _hi;				\
 			rdtsc (_lo, _hi);			\
 			if ((s) == NULL) {			\
 				(hi) = _hi; (lo) = _lo;		\
 			} else {				\
-				ub8 _b, _e;			\
+				__u64 _b, _e;			\
 				_b = hi; _b <<= 32; _b |= lo;	\
 				_e = _hi; _e <<= 32; _e |= _lo;	\
 				_e -= _b; 			\
@@ -108,6 +123,7 @@ extern ub4 debug_level;
 			}					\
 		}						\
 	} while (0)
+#endif
 
 /* IF macro */
 #define IF_TRACE(func)						\
@@ -119,194 +135,108 @@ extern ub4 debug_level;
 
 /* TRACE disabled. ERROR macros are never disabled. */
 #if !defined(TRACE)
-# define  LOG_ENTRY()
-# define  LOG_EXIT()
-# define  LOG_EXIT_STATUS(val)
-# define  LOG_EXIT_LONG(val)
-# define  LOG_EXIT_ULONG(val)
-# define  LOG_EXIT_PTR(val)
-# define  LOG_TRACE_STR(str)
-# define  LOG_ENTRY_ARGS(fmt, arg...)
-# define  LOG_EXIT_ARGS(fmt, arg...)
-# define  LOG_TRACE_ARGS(fmt, arg...)
+# define  LOG_ENTRY()				do {} while(0)
+# define  LOG_EXIT() 				do {} while(0)
+# define  LOG_EXIT_STATUS(val)			do {} while(0)
+# define  LOG_EXIT_LONG(val)			do {} while(0)
+# define  LOG_EXIT_ULONG(val)			do {} while(0)
+# define  LOG_EXIT_PTR(val)			do {} while(0)
+# define  LOG_TRACE_STR(str)			do {} while(0)
+# define  LOG_TRACE_STATUS(val)			do {} while(0)
+# define  LOG_ENTRY_ARGS(fmt, arg...)		do {} while(0)
+# define  LOG_EXIT_ARGS(fmt, arg...)		do {} while(0)
+# define  LOG_TRACE_ARGS(fmt, arg...)		do {} while(0)
 #endif				/* !defined(TRACE) */
 
 /* TRACE enabled */
 #if defined(TRACE)
 
 /* ENTRY macros */
-
-/* LOG_ENTRY()
- *
- */
-# define  LOG_ENTRY() 							\
-	ub4 _HI = 0, _LO = 0;						\
-	do {								\
-		ub1 _t[16];						\
-		*_t = '\0';						\
-		GET_STACK(_t);						\
-		GET_TIMING(NULL, _HI, _LO);				\
-		IF_LEVEL(OCFS_DEBUG_LEVEL_ENTRY) {			\
-			printk("(%d) %sENTRY: %s() \n",			\
-			       ocfs_getpid (), _t, __FUNCTION__);	\
-		}							\
-	} while (0)
-
 /* LOG_ENTRY_ARGS()
  *
  * Note: The macro expects the args to be terminated by a newline.
  */
-# define LOG_ENTRY_ARGS(fmt, arg...)					\
-	ub4 _HI = 0, _LO = 0;						\
+#define LOG_ENTRY_ARGS(fmt, arg...)					\
+	__u32 _HI = 0, _LO = 0;						\
 	do {								\
-		ub1 _t[16];						\
+		__u8 _t[16];						\
 		*_t = '\0';						\
 		GET_STACK(_t);						\
 		GET_TIMING(NULL, _HI, _LO);				\
 		IF_LEVEL(OCFS_DEBUG_LEVEL_ENTRY) {			\
 			printk("(%d) %sENTRY: %s",			\
 			       ocfs_getpid (), _t, __FUNCTION__);	\
-			printk(fmt, ##arg);				\
+			if (fmt==NULL)					\
+				printk("() \n");			\
+			else						\
+				printk(fmt, ##arg);			\
 		}							\
 	} while (0)
 
-/* EXIT macros */
-
-/* LOG_EXIT()
- *
- */
-# define LOG_EXIT()							\
-	do {								\
-		IF_LEVEL(OCFS_DEBUG_LEVEL_EXIT) {			\
-			ub1 _t[32];					\
-			*_t = '\0';					\
-			GET_TIMING(_t, _HI, _LO);			\
-			printk("(%d) EXIT : %s() %s\n", ocfs_getpid (),	\
-			       __FUNCTION__, _t);			\
-		}							\
-	} while (0)
-
-/* LOG_EXIT_STATUS()
- *
- */
-# define LOG_EXIT_STATUS(val)						\
-	do {								\
-		IF_LEVEL(OCFS_DEBUG_LEVEL_EXIT) {			\
-			ub1 _t[32];					\
-			*_t = '\0';					\
-			GET_TIMING(_t, _HI, _LO);			\
-			printk("(%d) EXIT : %s() = %d %s\n",		\
-			       ocfs_getpid (), __FUNCTION__, val, _t);	\
-		}							\
-	} while (0)
-
-/* LOG_EXIT_LONG()
- *
- */
-# define LOG_EXIT_LONG(val)		LOG_EXIT_STATUS(val)
+#define LOG_ENTRY()            LOG_ENTRY_ARGS(NULL)
 
-/* LOG_EXIT_ULONG()
- *
- */
-# define LOG_EXIT_ULONG(val)						\
-	do {								\
-		IF_LEVEL(OCFS_DEBUG_LEVEL_EXIT) {			\
-			ub1 _t[50];					\
-			*_t = '\0';					\
-			GET_TIMING(_t, _HI, _LO);			\
-			printk("(%d) EXIT : %s() = %u %s\n",		\
-			       ocfs_getpid (), __FUNCTION__, val, _t);	\
-		}							\
-	} while (0)
 
-/* LOG_EXIT_PTR()
- *
- */
-# define LOG_EXIT_PTR(val)						\
-	do {								\
-		IF_LEVEL(OCFS_DEBUG_LEVEL_EXIT) {			\
-			ub1 _t[50];					\
-			*_t = '\0';					\
-			GET_TIMING(_t, _HI, _LO);			\
-			printk("(%d) EXIT : %s() = 0x%08x %s\n",	\
-			       ocfs_getpid (), __FUNCTION__, val, _t);	\
-		}							\
-	} while (0)
 
+/* EXIT macros */
 /* LOG_EXIT_ARGS()
  *
- * Note: The macro expects the args to be terminated by a newline.
  */
-# define LOG_EXIT_ARGS(fmt, arg...)					\
+#define LOG_EXIT_ARGS(fmt, arg...)					\
 	do {								\
 		IF_LEVEL(OCFS_DEBUG_LEVEL_EXIT) {			\
-			ub1 _t[50];					\
+			__u8 _t[50];					\
 			*_t = '\0';					\
 			GET_TIMING(_t, _HI, _LO);			\
-			printk("(%d) EXIT : %s() = ",			\
-			       ocfs_getpid (), __FUNCTION__);		\
-			printk(fmt, ## arg);				\
+			printk("(%d) EXIT : %s() %s",			\
+			       ocfs_getpid (), __FUNCTION__, 		\
+			       (fmt==NULL ? "" : "= "));		\
+			if (fmt!=NULL)					\
+				printk(fmt, ## arg);			\
 			printk("%s\n", _t);				\
 		}							\
 	}  while (0)
 
-/* TRACE macros */
-
-/* LOG_TRACE_STR()
- *
- */
-# define LOG_TRACE_STR(str)						\
-	do {								\
-		IF_LEVEL(OCFS_DEBUG_LEVEL_TRACE)			\
-			printk("(%d) TRACE: %s() %s\n", ocfs_getpid (),	\
-			       __FUNCTION__, str);			\
-	} while (0)
+#define LOG_EXIT()             LOG_EXIT_ARGS(NULL)
+#define LOG_EXIT_STATUS(val)   LOG_EXIT_ARGS("%d ", val)
+#define LOG_EXIT_LONG(val)     LOG_EXIT_ARGS("%d ", val)
+#define LOG_EXIT_ULONG(val)    LOG_EXIT_ARGS("%u ", val)
+#define LOG_EXIT_PTR(val)      LOG_EXIT_ARGS("0x%p ", val)
 
 
+/* TRACE macros */
 /* LOG_TRACE_ARGS()
  *
  * Note: The macro expects the args to be terminated by a newline.
  */
-# define LOG_TRACE_ARGS(fmt, arg...)					\
+#define LOG_TRACE_ARGS(fmt, arg...)					\
 	do {								\
 		IF_LEVEL(OCFS_DEBUG_LEVEL_TRACE) {			\
-			printk("(%d) TRACE: %s() ", ocfs_getpid (),	\
-			       __FUNCTION__);				\
+			printk("(%d) TRACE: %s(%d) ", ocfs_getpid (),	\
+			       __FUNCTION__, __LINE__);			\
 			printk(fmt, ## arg);				\
 		}							\
 	} while (0)
+
+#define LOG_TRACE_STR(str)     LOG_TRACE_ARGS("%s\n", str)
+#define LOG_TRACE_STATUS(val)  LOG_TRACE_ARGS("%d\n", val);
+
 #endif				/* TRACE */
 
-/* ERROR macros are not compiled out */
 
-/* LOG_ERROR_STR()
- *
- */
-#define LOG_ERROR_STR(str)						    \
-	do {								    \
-		printk(KERN_ERR "(%d) ERROR: %s, %s, %d\n", ocfs_getpid (), \
-		       str, __FILE__, __LINE__);			    \
-	} while (0)
 
+/* ERROR macros are not compiled out */
 /* LOG_ERROR_ARGS()
  *
  * Note: The macro expects the args to be terminated by a newline.
  */
 #define LOG_ERROR_ARGS(fmt, arg...)					\
 	do {								\
-		printk(KERN_ERR "(%d) ERROR: %s, %d, ", ocfs_getpid (),	\
-		       __FILE__, __LINE__);				\
+		printk(KERN_ERR "(%d) ERROR: ", ocfs_getpid ());        \
 		printk(fmt, ## arg);					\
+		printk(", %s, %d\n", __FILE__, __LINE__);		\
 	} while (0)
 
-/* LOG_ERROR_STATUS()
- *
- */
-#define LOG_ERROR_STATUS(status)					\
-	do {								\
-		printk(KERN_ERR "(%d) ERROR: status = %d (%s), %s, %d\n",	\
-		       ocfs_getpid (), status, ocfs_strerror(status),	\
-		       __FILE__, __LINE__);                                    \
-	} while (0)
+#define LOG_ERROR_STR(str)     LOG_ERROR_ARGS("%s", str)
+#define LOG_ERROR_STATUS(st)   LOG_ERROR_ARGS("status = %d", st)
 
 #endif				/* _OCFSTRACE_H_ */
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Common/inc/ocfstrans.h linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Common/inc/ocfstrans.h
--- linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Common/inc/ocfstrans.h	2003-07-30 13:51:50.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Common/inc/ocfstrans.h	2003-07-30 10:28:53.000000000 +0200
@@ -42,18 +42,18 @@
 
 typedef struct _ocfs_free_bitmap
 {
-	ub8 length;
-	ub8 file_off;
-	ub4 type;
-	ub4 node_num;
+	__u64 length;
+	__u64 file_off;
+	__u32 type;
+	__u32 node_num;
 }
 ocfs_free_bitmap;
 
 typedef struct _ocfs_free_extent_log
 {
-	ub4 index;
-	ub1 pad[4];
-	ub8 disk_off;
+	__u32 index;
+	__u8 pad[4];
+	__u64 disk_off;
 }
 ocfs_free_extent_log;
 
@@ -61,25 +61,25 @@ ocfs_free_extent_log;
 
 typedef struct _ocfs_free_log
 {
-	ub4 num_free_upds;
-	ub1 pad[4];
+	__u32 num_free_upds;
+	__u8 pad[4];
 	ocfs_free_bitmap free_bitmap[FREE_LOG_SIZE];
 }
 ocfs_free_log;
 
 typedef struct _ocfs_delete_log
 {
-	ub8 node_num;
-	ub8 ent_del;
-	ub8 parent_dirnode_off;
-	ub4 flags;
-	ub1 pad[4];
+	__u64 node_num;
+	__u64 ent_del;
+	__u64 parent_dirnode_off;
+	__u32 flags;
+	__u8 pad[4];
 }
 ocfs_delete_log;
 
 typedef struct _ocfs_recovery_log
 {
-	ub8 node_num;
+	__u64 node_num;
 }
 ocfs_recovery_log;
 
@@ -89,25 +89,25 @@ ocfs_recovery_log;
 
 typedef struct _ocfs_alloc_log
 {
-	ub8 length;
-	ub8 file_off;
-	ub4 type;
-	ub4 node_num;
+	__u64 length;
+	__u64 file_off;
+	__u32 type;
+	__u32 node_num;
 }
 ocfs_alloc_log;
 
 typedef struct _ocfs_dir_log
 {
-	ub8 orig_off;
-	ub8 saved_off;
-	ub8 length;
+	__u64 orig_off;
+	__u64 saved_off;
+	__u64 length;
 }
 ocfs_dir_log;
 
 typedef struct _ocfs_lock_update
 {
-	ub8 orig_off;
-	ub8 new_off;
+	__u64 orig_off;
+	__u64 new_off;
 }
 ocfs_lock_update;
 
@@ -115,23 +115,23 @@ ocfs_lock_update;
 
 typedef struct _ocfs_lock_log
 {
-	ub4 num_lock_upds;
-	ub1 pad[4];
+	__u32 num_lock_upds;
+	__u8 pad[4];
 	ocfs_lock_update lock_upd[LOCK_UPDATE_LOG_SIZE];
 }
 ocfs_lock_log;
 
 typedef struct _ocfs_bcast_rel_log
 {
-	ub8 lock_id;
+	__u64 lock_id;
 }
 ocfs_bcast_rel_log;
 
 typedef struct _ocfs_cleanup_record
 {
-	ub8 log_id;
-	ub4 log_type;
-	ub1 pad[4];
+	__u64 log_id;
+	__u32 log_type;
+	__u8 pad[4];
 	union
 	{
 		ocfs_lock_log lock;
@@ -146,9 +146,9 @@ ocfs_cleanup_record;
 
 typedef struct _ocfs_log_record
 {
-	ub8 log_id;
-	ub4 log_type;
-	ub1 pad[4];
+	__u64 log_id;
+	__u32 log_type;
+	__u8 pad[4];
 	union
 	{
 		ocfs_dir_log dir;
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Common/inc/ocfsvol.h linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Common/inc/ocfsvol.h
--- linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Common/inc/ocfsvol.h	2003-07-30 13:51:50.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Common/inc/ocfsvol.h	2003-07-30 10:28:53.000000000 +0200
@@ -38,34 +38,47 @@
 
 typedef struct _ocfs_vol_disk_hdr
 {
-	ub4 minor_version;
-	ub4 major_version;
-	ub1 signature[MAX_VOL_SIGNATURE_LEN];	/* OracleCFS */
-	ub1 mount_point[MAX_MOUNT_POINT_LEN];	/* for e.g., /mnt/vol1 */
-	ub8 serial_num;
-	ub8 device_size;	/* Size of the device in bytes */
-	ub8 start_off;		/* Start of the volume... typically 0 */
-	ub8 bitmap_off;		/* Offset to Volume Bitmap... */
-	ub8 publ_off;		/* Offset to the Publish Sector */
-	ub8 vote_off;		/* Offset to the Vote Sector */
-	ub8 root_bitmap_off;
-	ub8 data_start_off;
-	ub8 root_bitmap_size;
-	ub8 root_off;
-	ub8 root_size;
-	ub8 cluster_size;	/* Cluster size as specified during format */
-	ub8 num_nodes;		/* Max number of nodes.... OCFS_MAXIMUM_NODES */
-	ub8 num_clusters;	/* Number of free clusters at format */
-	ub8 dir_node_size;	/* OCFS_DEFAULT_DIR_NODE_SIZE */
-	ub8 file_node_size;	/* OCFS_DEFAULT_FILE_NODE_SIZE */
-	ub8 internal_off;
-	ub8 node_cfg_off;	/* Offset to Node Config */
-	ub8 node_cfg_size;	/* Size of Node Config */
-	ub8 new_cfg_off;	/* Offset to Node Config Lock */
-	ub4 prot_bits;
-	ub4 uid;
-	ub4 gid;
-	sb4 excl_mount;
+	__u32 minor_version;                       // NUMBER RANGE(0,UINT_MAX)
+	__u32 major_version;                       // NUMBER RANGE(0,UINT_MAX)
+	__u8 signature[MAX_VOL_SIGNATURE_LEN];	 // CHAR[MAX_VOL_SIGNATURE_LEN]
+	__u8 mount_point[MAX_MOUNT_POINT_LEN];	 // CHAR[MAX_MOUNT_POINT_LEN]
+	__u64 serial_num;                          // NUMBER RANGE(0,ULONG_LONG_MAX)
+	/* Size of the device in bytes */           
+	__u64 device_size;	                 // NUMBER RANGE(0,ULONG_LONG_MAX)
+	/* Start of the volume... typically 0 */    
+	__u64 start_off;		                 // NUMBER RANGE(0,ULONG_LONG_MAX)
+	/* Offset to Volume Bitmap... */            
+	__u64 bitmap_off;		                 // NUMBER RANGE(0,ULONG_LONG_MAX)
+	/* Offset to the Publish Sector */          
+	__u64 publ_off;		                 // NUMBER RANGE(0,ULONG_LONG_MAX)
+	/* Offset to the Vote Sector */             
+	__u64 vote_off;		                 // NUMBER RANGE(0,ULONG_LONG_MAX)
+	__u64 root_bitmap_off;                     // NUMBER RANGE(0,ULONG_LONG_MAX)
+	__u64 data_start_off;                      // NUMBER RANGE(0,ULONG_LONG_MAX)
+	__u64 root_bitmap_size;                    // NUMBER RANGE(0,ULONG_LONG_MAX)
+	__u64 root_off;                            // NUMBER RANGE(0,ULONG_LONG_MAX)
+	__u64 root_size;                           // NUMBER RANGE(0,ULONG_LONG_MAX)
+	/* Cluster size as specified during format */        
+	__u64 cluster_size;	                 // NUMBER SELECT(4096,8192,16384,32768,65536,131072,262144,524288,1048576)
+	/* Max number of nodes.... OCFS_MAXIMUM_NODES */
+	__u64 num_nodes;		                 // NUMBER RANGE(0,32)
+	/* Number of free clusters at format */
+	__u64 num_clusters;	                 // NUMBER RANGE(0,ULONG_LONG_MAX)
+	/* OCFS_DEFAULT_DIR_NODE_SIZE */
+	__u64 dir_node_size;	                 // NUMBER RANGE(0,ULONG_LONG_MAX)
+	/* OCFS_DEFAULT_FILE_NODE_SIZE */
+	__u64 file_node_size;	                 // NUMBER RANGE(0,ULONG_LONG_MAX)
+	__u64 internal_off;                        // NUMBER RANGE(0,ULONG_LONG_MAX)
+	/* Offset to Node Config */
+	__u64 node_cfg_off;	                 // NUMBER RANGE(0,ULONG_LONG_MAX)
+	/* Size of Node Config */
+	__u64 node_cfg_size;	                 // NUMBER RANGE(0,ULONG_LONG_MAX)
+	/* Offset to Node Config Lock */
+	__u64 new_cfg_off;	                 // NUMBER RANGE(0,ULONG_LONG_MAX)
+	__u32 prot_bits;                           // PERMS
+	__u32 uid;                                 // UID
+	__u32 gid;                                 // GID
+	__s32 excl_mount;                          // NODENUM
 }
 ocfs_vol_disk_hdr;
 
@@ -80,14 +93,14 @@ ocfs_vol_disk_hdr;
 
 typedef struct _ocfs_disk_lock
 {
-	ub4 curr_master;
-	ub1 file_lock;
-	ub8 last_write_time;
-	ub8 last_read_time;
-	ub4 writer_node_num;
-	ub4 reader_node_num;
-	ub8 oin_node_map;
-	ub8 dlock_seq_num;
+	__u32 curr_master;                         // NODENUM
+	__u8 file_lock;                           // LOCKTYPE
+	__u64 last_write_time;                     // DATE
+	__u64 last_read_time;                      // DATE
+	__u32 writer_node_num;                     // NODENUM
+	__u32 reader_node_num;                     // NODENUM
+	__u64 oin_node_map;                        // NODEBITMAP
+	__u64 dlock_seq_num;                       // NUMBER RANGE(0,ULONG_LONG_MAX)
 }
 ocfs_disk_lock;
 
@@ -106,38 +119,29 @@ ocfs_disk_lock;
 
 typedef struct _ocfs_vol_label
 {
-	ocfs_disk_lock disk_lock;
-	ub1 label[MAX_VOL_LABEL_LEN];
-	ub2 label_len;
-	ub1 vol_id[MAX_VOL_ID_LENGTH];
-	ub2 vol_id_len;
-	ub1 cluster_name[MAX_CLUSTER_NAME_LEN];
-	ub2 cluster_name_len;
+	ocfs_disk_lock disk_lock;                // DISKLOCK
+	__u8 label[MAX_VOL_LABEL_LEN];            // CHAR[MAX_VOL_LABEL_LEN]
+	__u16 label_len;                           // NUMBER RANGE(0,MAX_VOL_LABEL_LEN)
+	__u8 vol_id[MAX_VOL_ID_LENGTH];           // CHAR[MAX_VOL_ID_LENGTH]
+	__u16 vol_id_len;                          // NUMBER RANGE(0,MAX_VOL_ID_LENGTH)
+	__u8 cluster_name[MAX_CLUSTER_NAME_LEN];  // CHAR[MAX_CLUSTER_NAME_LEN]
+	__u16 cluster_name_len;                    // NUMBER RANGE(0,MAX_CLUSTER_NAME_LEN)
 }
 ocfs_vol_label;
 
-#define OCFS_IPC_NOT_CONFIG     (0x0)
-#define OCFS_IPC_STATE_CONFIG   (0x1)
-#define OCFS_IPC_STATE_ACTIVE   (0x2)
-#define OCFS_IPC_STATE_INACTIVE (0x4)
-#define OCFS_IPC_STATE_PRIMARY  (0x8)
-
 #define OCFS_IPC_DEFAULT_PORT   7000
 
 typedef struct _ocfs_ipc_config_info
 {
-	ub1 type;
+	__u8 type;
 	char ip_addr[MAX_IP_ADDR_LEN + 1];
-	ub4 ip_port;
+	__u32 ip_port;
 	char ip_mask[MAX_IP_ADDR_LEN + 1];
 }
 ocfs_ipc_config_info;
 
 #define OCFS_IPC_DLM_VERSION    0x0201
 
-#define OCFS_NODE_NOT_CONFIG    0
-#define OCFS_NODE_STATE_CONFIG  1
-
 #define GUID_LEN		32
 #define HOSTID_LEN		20
 #define MACID_LEN		12
@@ -173,11 +177,12 @@ typedef struct _ocfs_node_config_hdr
 {
 	ocfs_disk_lock disk_lock;
 	char signature[NODE_CONFIG_SIGN_LEN];
-	ub4 version;
-	ub4 num_nodes;
-	ub4 last_node;
-	ub8 cfg_seq_num;
+	__u32 version;
+	__u32 num_nodes;
+	__u32 last_node;
+	__u64 cfg_seq_num;
 }
+OCFS_GCC_ATTR_PACKALGN
 ocfs_node_config_hdr;
 
 /*
@@ -192,9 +197,9 @@ ocfs_node_config_hdr;
 
 typedef struct _ocfs_cdsl
 {
-	ub1 name[1024];
-	ub4 flags;
-	ub4 operation;
+	__u8 name[1024];
+	__u32 flags;
+	__u32 operation;
 }
 ocfs_cdsl;
 
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Common/ocfsgenalloc.c linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Common/ocfsgenalloc.c
--- linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Common/ocfsgenalloc.c	2003-07-30 13:51:50.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Common/ocfsgenalloc.c	2003-07-30 10:28:53.000000000 +0200
@@ -30,52 +30,13 @@
 #include <debugocfs.h>
 #endif
 
-#ifndef DEBUGOCFS
-bool Debug = false;
-ub8 debugOffset = 0;
+#ifndef USERSPACE_TOOL
 
 
 /* Tracing */
 #define OCFS_DEBUG_CONTEXT    OCFS_DEBUG_CONTEXT_EXTENT
 
 
-/*
- * ocfs_force_get_file_entry()
- *
- */
-int ocfs_force_get_file_entry (ocfs_super * osb, ocfs_file_entry ** FileEntry,
-		       ub8 DiskOffset, bool force)
-{
-	if (!FileEntry)
-		return -EFAIL;
-	*FileEntry = ocfs_allocate_file_entry ();
-	if (!*FileEntry)
-		return -ENOMEM;
-	if (force)
-		return ocfs_read_force_disk (osb, *FileEntry, osb->sect_size,
-					  DiskOffset);
-	else
-		return ocfs_read_file_entry (osb, *FileEntry, DiskOffset);
-}  /* ocfs_force_get_file_entry */
-
-
-/*
- * ocfs_force_put_file_entry()
- *
- */
-int ocfs_force_put_file_entry (ocfs_super * osb, ocfs_file_entry * FileEntry,
-		       bool force)
-{
-	if (!FileEntry)
-		return -EFAIL;
-	if (force)
-		return ocfs_write_force_disk (osb, FileEntry, osb->sect_size,
-					   FileEntry->this_sector);
-	else
-		return ocfs_write_file_entry (osb, FileEntry,
-					   FileEntry->this_sector);
-}  /* ocfs_force_put_file_entry */
-
 
 /*
  * ocfs_read_file_entry()
@@ -85,7 +46,7 @@ int ocfs_force_put_file_entry (ocfs_supe
  * Returns 0 on success, < 0 on error
  */
 int ocfs_read_file_entry (ocfs_super * osb, ocfs_file_entry * FileEntry,
-		   ub8 DiskOffset)
+		   __u64 DiskOffset)
 {
 	int status = 0;
 
@@ -97,7 +58,7 @@ int ocfs_read_file_entry (ocfs_super * o
 
 	/* Size of File Entry is one sector */
 	status =
-	    ocfs_read_metadata (osb, FileEntry, (ub4) osb->sect_size, DiskOffset);
+	    ocfs_read_metadata (osb, FileEntry, (__u32) osb->sect_size, DiskOffset);
 	if (status < 0) {
 		LOG_ERROR_STATUS (status);
 	}
@@ -114,7 +75,7 @@ int ocfs_read_file_entry (ocfs_super * o
  *
  * Returns 0 on success, < 0 on error
  */
-int ocfs_write_file_entry (ocfs_super * osb, ocfs_file_entry * FileEntry, ub8 Offset)
+int ocfs_write_file_entry (ocfs_super * osb, ocfs_file_entry * FileEntry, __u64 Offset)
 {
 	int status = 0;
 
@@ -131,11 +92,11 @@ int ocfs_write_file_entry (ocfs_super * 
 	    (DISK_LOCK_CURRENT_MASTER (FileEntry) == osb->node_num) &&
 	    (Offset >= osb->vol_layout.bitmap_off)) {
 		status =
-		    ocfs_write_metadata (osb, FileEntry, (ub4) osb->sect_size,
+		    ocfs_write_metadata (osb, FileEntry, (__u32) osb->sect_size,
 				       Offset);
 	} else {
 		status =
-		    ocfs_write_disk (osb, FileEntry, (ub4) osb->sect_size,
+		    ocfs_write_disk (osb, FileEntry, (__u32) osb->sect_size,
 				   Offset);
 	}
 
@@ -154,7 +115,7 @@ int ocfs_write_file_entry (ocfs_super * 
  * Remove an entry from the extent map
  */
 void ocfs_remove_extent_map_entry (ocfs_super * osb,
-			  ocfs_extent_map * Map, sb8 Vbo, ub4 ByteCount)
+			  ocfs_extent_map * Map, __s64 Vbo, __u32 ByteCount)
 {
 	LOG_ENTRY ();
 
@@ -166,8 +127,8 @@ void ocfs_remove_extent_map_entry (ocfs_
 
 	Vbo >>= OCFS_LOG_SECTOR_SIZE;
 
-	ocfs_extent_map_remove ((ocfs_extent_map *) Map, (sb8) Vbo,
-			     (sb8) ByteCount);
+	ocfs_extent_map_remove ((ocfs_extent_map *) Map, (__s64) Vbo,
+			     (__s64) ByteCount);
 
 	LOG_EXIT ();
 	return;
@@ -178,34 +139,34 @@ void ocfs_remove_extent_map_entry (ocfs_
  */
 int ocfs_allocate_new_data_node (ocfs_super * osb,
 		     ocfs_file_entry * FileEntry,
-		     ub8 actualDiskOffset,
-		     ub8 actualLength,
-		     ocfs_extent_group * ExtentHeader, ub8 * NewExtentOffset)
+		     __u64 actualDiskOffset,
+		     __u64 actualLength,
+		     ocfs_extent_group * ExtentHeader, __u64 * NewExtentOffset)
 {
 	int status = 0;
-	ub1 *tempBuf = NULL;
-	ub4 length;
-	ub4 k, i;
-	ub4 depth;
+	__u8 *tempBuf = NULL;
+	__u32 length;
+	__u32 k, i;
+	__u32 depth;
 	ocfs_extent_group *IterExtentHeader = NULL, *IterExtent;
 
-	ub4 allocSize;
-	ub8 upHeaderPtr;
-	ub8 physicalOffset;
-	ub8 fileOffset = 0;
-	ub8 numSectorsAlloc = 0;
-	ub8 lastExtPointer;
+	__u32 allocSize;
+	__u64 upHeaderPtr;
+	__u64 physicalOffset;
+	__u64 fileOffset = 0;
+	__u64 numSectorsAlloc = 0;
+	__u64 lastExtPointer;
 
 	LOG_ENTRY ();
 
 	if (ExtentHeader != NULL) {
-		allocSize = (ub4) ((NUM_SECTORS_IN_LEAF_NODE +
+		allocSize = (__u32) ((NUM_SECTORS_IN_LEAF_NODE +
 				    ExtentHeader->granularity) *
 				   OCFS_SECTOR_SIZE);
 
 		/* allocate contiguous blocks on disk */
 		status = ocfs_alloc_node_block (osb, allocSize, &physicalOffset,
-					 &fileOffset, (ub8 *) & numSectorsAlloc,
+					 &fileOffset, (__u64 *) & numSectorsAlloc,
 					 osb->node_num, DISK_ALLOC_EXTENT_NODE);
 		if (status < 0) {
 			LOG_ERROR_STATUS (status);
@@ -213,8 +174,7 @@ int ocfs_allocate_new_data_node (ocfs_su
 		}
 
 		if (fileOffset == 0) {
-			LOG_ERROR_ARGS ("File offset was 0 for file: %s\n",
-					FileEntry->filename);
+			LOG_ERROR_ARGS ("offset=0, file=%s", FileEntry->filename);
 		}
 
 		k = ExtentHeader->next_free_ext;
@@ -231,7 +191,7 @@ int ocfs_allocate_new_data_node (ocfs_su
 
 		/* Allocate contiguous blocks on disk */
 		status = ocfs_alloc_node_block (osb, allocSize, &physicalOffset,
-					 &fileOffset, (ub8 *) & numSectorsAlloc,
+					 &fileOffset, (__u64 *) & numSectorsAlloc,
 					 osb->node_num, DISK_ALLOC_EXTENT_NODE);
 		if (status < 0) {
 			LOG_ERROR_STATUS (status);
@@ -239,8 +199,7 @@ int ocfs_allocate_new_data_node (ocfs_su
 		}
 
 		if (fileOffset == 0) {
-			LOG_ERROR_ARGS ("File offset was 0 for file: %s\n",
-					FileEntry->filename);
+			LOG_ERROR_ARGS ("offset=0, file=%s", FileEntry->filename);
 		}
 
 		k = FileEntry->next_free_ext;
@@ -254,12 +213,10 @@ int ocfs_allocate_new_data_node (ocfs_su
 
 	/* Common code between grow and this func. */
 
-	length = (ub4) OCFS_ALIGN (allocSize, PAGE_SIZE);
-
+	length = (__u32) OCFS_ALIGN (allocSize, osb->sect_size);
 	tempBuf = ocfs_malloc (length);
 	if (tempBuf == NULL) {
-		status = -ENOMEM;
-		LOG_ERROR_STATUS (status);
+		LOG_ERROR_STATUS (status = -ENOMEM);
 		goto finally;
 	}
 
@@ -281,7 +238,7 @@ int ocfs_allocate_new_data_node (ocfs_su
 		IterExtentHeader->type = OCFS_EXTENT_HEADER;
 		IterExtentHeader->granularity = (depth - 1 - i);
 		IterExtentHeader->extents[0].disk_off =
-		    (ub8) (physicalOffset + (OCFS_SECTOR_SIZE * (i + 1)));
+		    (__u64) (physicalOffset + (OCFS_SECTOR_SIZE * (i + 1)));
 		IterExtentHeader->extents[0].file_off = FileEntry->alloc_size;
 		IterExtentHeader->extents[0].num_bytes = actualLength;
 		IterExtentHeader->next_free_ext = 1;
@@ -289,7 +246,7 @@ int ocfs_allocate_new_data_node (ocfs_su
 		    fileOffset + (OCFS_SECTOR_SIZE * i);
 		IterExtentHeader->alloc_node = osb->node_num;
 		IterExtentHeader->this_ext =
-		    (ub8) (physicalOffset + (OCFS_SECTOR_SIZE * i));
+		    (__u64) (physicalOffset + (OCFS_SECTOR_SIZE * i));
 
 		upHeaderPtr = IterExtentHeader->this_ext;
 		lastExtPointer = IterExtentHeader->this_ext;
@@ -298,7 +255,7 @@ int ocfs_allocate_new_data_node (ocfs_su
 	/* Fill in the leaf branch of the extent tree */
 	IterExtent = (ocfs_extent_group *)
 		     (tempBuf + (OCFS_SECTOR_SIZE * depth));
-	IterExtent->this_ext = (ub8) (physicalOffset +
+	IterExtent->this_ext = (__u64) (physicalOffset +
 				      (OCFS_SECTOR_SIZE * depth));
 	IterExtent->last_ext_ptr = lastExtPointer;
 	IterExtent->up_hdr_node_ptr = upHeaderPtr;
@@ -306,7 +263,11 @@ int ocfs_allocate_new_data_node (ocfs_su
 
 	if ((depth) &&
 	    (IterExtent->this_ext != IterExtentHeader->extents[0].disk_off)) {
-		OCFS_BREAKPOINT ();
+		LOG_ERROR_ARGS ("depth=%d, this_ext=%u.%u, disk_off=%u.%u",
+				depth, HI(IterExtent->this_ext),
+				LO(IterExtent->this_ext),
+				HI(IterExtentHeader->extents[0].disk_off),
+				LO(IterExtentHeader->extents[0].disk_off));
 	}
 
 	strcpy (IterExtent->signature, OCFS_EXTENT_DATA_SIGNATURE);
@@ -342,16 +303,17 @@ int ocfs_allocate_new_data_node (ocfs_su
 		for (i = ExtentHeader->granularity + 1;
 		     i < FileEntry->granularity; i++) {
 			status =
-			    ocfs_read_sector (osb, ExtentHeader,
-					    ExtentHeader->up_hdr_node_ptr);
+			    ocfs_read_extent (osb, ExtentHeader,
+					    ExtentHeader->up_hdr_node_ptr,
+					    EXTENT_HEADER);
 			if (status < 0) {
 				LOG_ERROR_STATUS (status);
-				status = -EINVAL;
 				goto finally;
 			}
 
 			if (ExtentHeader->next_free_ext == 0) {
-				OCFS_BREAKPOINT ();
+				LOG_ERROR_STATUS (status = -EFAIL);
+				goto finally;
 			}
 
 			k = ExtentHeader->next_free_ext - 1;
@@ -361,6 +323,7 @@ int ocfs_allocate_new_data_node (ocfs_su
 			status = ocfs_write_sector (osb, ExtentHeader,
 						  ExtentHeader->this_ext);
 			if (status < 0) {
+				LOG_ERROR_STATUS (status);
 				goto finally;
 			}
 		}
@@ -380,43 +343,37 @@ int ocfs_allocate_new_data_node (ocfs_su
 int ocfs_add_to_last_data_node (ocfs_super * osb,
 		   ocfs_inode * oin,
 		   ocfs_file_entry * FileEntry,
-		   ub8 actualDiskOffset,
-		   ub8 actualLength, ub4 * ExtentIndex, bool * IncreaseDepth)
+		   __u64 actualDiskOffset,
+		   __u64 actualLength, __u32 * ExtentIndex, bool * IncreaseDepth)
 {
 	int status = 0;
-	ub4 k = 0, i;
-	ub4 length;
-	ub1 *buffer = NULL;
+	__u32 k = 0, i;
+	__u32 length;
+	__u8 *buffer = NULL;
 	ocfs_extent_group *OcfsExtent = NULL, *OcfsExtentHeader = NULL;
 	ocfs_extent_group *AllocExtentBuf = NULL;
 	bool UpdateParent = true;
-	ub8 newExtentOff;
+	__u64 newExtentOff;
 
 	LOG_ENTRY ();
 
 	*IncreaseDepth = false;
-	length = (ub4) OCFS_ALIGN (sizeof (ocfs_extent_group), PAGE_SIZE);
-
+	length = (__u32) OCFS_ALIGN (sizeof (ocfs_extent_group), osb->sect_size);
 	buffer = ocfs_malloc (length);
 	if (buffer == NULL) {
 		LOG_ERROR_STATUS (status = -ENOMEM);
 		goto bail;
 	}
 
-	status = ocfs_read_sector (osb, buffer, FileEntry->last_ext_ptr);
+	status = ocfs_read_extent (osb, buffer, FileEntry->last_ext_ptr,
+				   EXTENT_DATA);
 	if (status < 0) {
 		LOG_ERROR_STATUS (status = -EINVAL);
 		goto bail;
 	}
 
-	/* Verify that this is a leaf Node */
 	OcfsExtent = (ocfs_extent_group *) buffer;
 
-	if (!IS_VALID_EXTENT_DATA (OcfsExtent)) {
-		LOG_ERROR_STATUS(status = -EINVAL);
-		goto bail;
-	}
-
 	/* Read the last enxtent and keep traversing upward till we find a */
 	/* free extent or we are at the top and need to create another level. */
 	if (OcfsExtent->next_free_ext > OCFS_MAX_DATA_EXTENTS) {
@@ -431,8 +388,7 @@ int ocfs_add_to_last_data_node (ocfs_sup
 	/* Check here a case where the new allocation can be joined with */
 	/* the last Extent */
 	if (OcfsExtent->next_free_ext >= 1) {
-
-		if (ocfs_check_for_extent_merge
+		if (OCFS_EXTENT_MERGEABLE
 		    (&(OcfsExtent->extents[k]), actualDiskOffset)) {
 			/* We can join the extents, just increase the len of extent */
 			OcfsExtent->extents[k].num_bytes += actualLength;
@@ -440,14 +396,14 @@ int ocfs_add_to_last_data_node (ocfs_sup
 			goto bail;
 		}
 	} else {
-		OCFS_BREAKPOINT ();
+		LOG_ERROR_ARGS ("next_free_ext=%d", OcfsExtent->next_free_ext);
 	}
 
 	/* We cannot merge give him the next extent */
 	k = OcfsExtent->next_free_ext;
 
 	if (k == OCFS_MAX_DATA_EXTENTS) {
-		ub8 up_hdr_node_ptr = 0;
+		__u64 up_hdr_node_ptr = 0;
 
 		if (FileEntry->granularity == 0) {
 			if (FileEntry->next_free_ext ==
@@ -455,10 +411,14 @@ int ocfs_add_to_last_data_node (ocfs_sup
 				(*IncreaseDepth) = true;
 				goto bail;
 			} else {
-				ocfs_allocate_new_data_node (osb, FileEntry,
+				status = ocfs_allocate_new_data_node (osb, FileEntry,
 						     actualDiskOffset,
 						     actualLength, NULL,
 						     &newExtentOff);
+				if (status < 0) {
+					LOG_ERROR_STATUS (status);
+					goto bail;
+				}
 				OcfsExtent->next_data_ext = newExtentOff;
 				UpdateParent = false;
 				FileEntry->last_ext_ptr = newExtentOff;
@@ -466,6 +426,7 @@ int ocfs_add_to_last_data_node (ocfs_sup
 				    ocfs_write_sector (osb, OcfsExtent,
 						     OcfsExtent->this_ext);
 				if (status < 0) {
+					LOG_ERROR_STATUS (status);
 					goto bail;
 				}
 			}
@@ -473,13 +434,12 @@ int ocfs_add_to_last_data_node (ocfs_sup
 			i = 0;
 
 			length =
-			    (ub4) OCFS_ALIGN (sizeof (ocfs_extent_group),
-					      PAGE_SIZE);
+			    (__u32) OCFS_ALIGN (sizeof (ocfs_extent_group),
+						osb->sect_size);
 			AllocExtentBuf = OcfsExtentHeader =
 			    ocfs_malloc (length);
 			if (OcfsExtentHeader == NULL) {
-				status = -ENOMEM;
-				LOG_ERROR_STATUS (status);
+				LOG_ERROR_STATUS (status = -ENOMEM);
 				goto bail;
 			}
 
@@ -490,18 +450,13 @@ int ocfs_add_to_last_data_node (ocfs_sup
 					sizeof (ocfs_extent_group));
 
 				status =
-				    ocfs_read_sector (osb, OcfsExtentHeader,
-						    up_hdr_node_ptr);
+				    ocfs_read_extent (osb, OcfsExtentHeader,
+						    up_hdr_node_ptr, EXTENT_HEADER);
 				if (status < 0) {
 					LOG_ERROR_STATUS (status);
 					goto bail;
 				}
 
-				if (!IS_VALID_EXTENT_HEADER (OcfsExtentHeader)) {
-					LOG_ERROR_STATUS(status = -EINVAL);
-					goto bail;
-				}
-
 				if (OcfsExtentHeader->granularity != i) {
 					LOG_ERROR_STATUS(status = -EINVAL);
 					goto bail;
@@ -529,10 +484,14 @@ int ocfs_add_to_last_data_node (ocfs_sup
 					(*IncreaseDepth) = true;
 					goto bail;
 				} else {
-					ocfs_allocate_new_data_node (osb, FileEntry,
+					status = ocfs_allocate_new_data_node (osb, FileEntry,
 							     actualDiskOffset,
 							     actualLength, NULL,
 							     &newExtentOff);
+					if (status < 0) {
+						LOG_ERROR_STATUS (status);
+						goto bail;
+					}
 					OcfsExtent->next_data_ext =
 					    newExtentOff;
 					UpdateParent = false;
@@ -542,25 +501,29 @@ int ocfs_add_to_last_data_node (ocfs_sup
 							     OcfsExtent->
 							     this_ext);
 					if (status < 0) {
+						LOG_ERROR_STATUS (status);
 						goto bail;
 					}
 				}
-				(*IncreaseDepth) = true;
 				goto bail;
 			} else {
-				ocfs_allocate_new_data_node (osb, FileEntry,
+				status = ocfs_allocate_new_data_node (osb, FileEntry,
 						     actualDiskOffset,
 						     actualLength,
 						     OcfsExtentHeader,
 						     &newExtentOff);
+				if (status < 0) {
+					LOG_ERROR_STATUS (status);
+					goto bail;
+				}
 				OcfsExtent->next_data_ext = newExtentOff;
 				UpdateParent = false;
 				FileEntry->last_ext_ptr = newExtentOff;
 				status =
 				    ocfs_write_sector (osb, OcfsExtent,
 						     OcfsExtent->this_ext);
-//          if(status < 0)
-				{
+				if(status < 0) {
+					LOG_ERROR_STATUS (status);
 					goto bail;
 				}
 			}
@@ -579,24 +542,25 @@ int ocfs_add_to_last_data_node (ocfs_sup
 		status =
 		    ocfs_write_sector (osb, OcfsExtent, OcfsExtent->this_ext);
 		if (status < 0) {
+			LOG_ERROR_STATUS (status);
 			goto finally;
 		}
 
 		for (i = 0; i < FileEntry->granularity; i++) {
 			OcfsExtentHeader = (ocfs_extent_group *) buffer;
-			status = ocfs_read_sector (osb, buffer,
-						 OcfsExtentHeader->
-						 up_hdr_node_ptr);
+			status = ocfs_read_extent (osb, buffer,
+						 OcfsExtentHeader->up_hdr_node_ptr,
+						 EXTENT_HEADER);
 			if (status < 0) {
 				LOG_ERROR_STATUS (status);
-				status = -EINVAL;
 				goto finally;
 			}
 
 			OcfsExtentHeader = (ocfs_extent_group *) buffer;
 
 			if (OcfsExtentHeader->next_free_ext == 0) {
-				OCFS_BREAKPOINT ();
+				LOG_ERROR_STATUS (status = -EFAIL);
+				goto finally;
 			}
 
 			k = OcfsExtentHeader->next_free_ext - 1;
@@ -628,25 +592,24 @@ int ocfs_add_to_last_data_node (ocfs_sup
  *
  */
 int ocfs_update_last_data_extent (ocfs_super * osb,
-		      ocfs_file_entry * FileEntry, ub8 NextDataOffset)
+		      ocfs_file_entry * FileEntry, __u64 NextDataOffset)
 {
 	int status = 0;
-	ub4 length = 0;
-	ub1 *buffer = NULL;
+	__u32 length = 0;
+	__u8 *buffer = NULL;
 	ocfs_extent_group *OcfsExtent;
 
 	LOG_ENTRY ();
 
-	length = (ub4) OCFS_ALIGN (sizeof (ocfs_extent_group), PAGE_SIZE);
-
+	length = (__u32) OCFS_ALIGN (sizeof (ocfs_extent_group), osb->sect_size);
 	buffer = ocfs_malloc (length);
 	if (buffer == NULL) {
-		status = -ENOMEM;
-		LOG_ERROR_STATUS (status);
+		LOG_ERROR_STATUS (status = -ENOMEM);
 		goto finally;
 	}
 
-	status = ocfs_read_sector (osb, buffer, FileEntry->last_ext_ptr);
+	status = ocfs_read_extent (osb, buffer, FileEntry->last_ext_ptr,
+				   EXTENT_DATA);
 	if (status < 0) {
 		LOG_ERROR_STATUS (status);
 		goto finally;
@@ -655,7 +618,11 @@ int ocfs_update_last_data_extent (ocfs_s
 	OcfsExtent = (ocfs_extent_group *) buffer;
 
 	if (OcfsExtent->next_data_ext != 0) {
-		OCFS_BREAKPOINT ();
+		LOG_ERROR_ARGS ("fe->last_ext_ptr=%u.%u, next_data_ext=%u.%u",
+				HI(FileEntry->last_ext_ptr),
+				LO(FileEntry->last_ext_ptr),
+				HI(OcfsExtent->next_data_ext),
+				LO(OcfsExtent->next_data_ext));
 	}
 
 	OcfsExtent->next_data_ext = NextDataOffset;
@@ -673,24 +640,84 @@ int ocfs_update_last_data_extent (ocfs_s
 	return (status);
 }				/* ocfs_update_last_data_extent */
 
+
+/*
+ * ocfs_update_uphdrptr()
+ *
+ */
+int ocfs_update_uphdrptr(ocfs_super *osb, ocfs_file_entry *fe,
+			 __u64 new_up_hdr_ptr)
+{
+	int status = 0;
+	int len;
+	int i;
+	__u8 *buffer = NULL;
+	ocfs_extent_group *extent;
+	__u64 offset;
+
+	LOG_ENTRY ();
+
+	len = OCFS_ALIGN (sizeof (ocfs_extent_group), osb->sect_size);
+	buffer = ocfs_malloc (len);
+	if (buffer == NULL) {
+		LOG_ERROR_STATUS (status = -ENOMEM);
+		goto bail;
+	}
+
+	for (i = 0; i < OCFS_MAX_FILE_ENTRY_EXTENTS; ++i) {
+		offset = fe->extents[i].disk_off;
+
+		status = ocfs_read_sector (osb, buffer, offset);
+		if (status < 0) {
+			LOG_ERROR_STATUS (status);
+			goto bail;
+		}
+
+		extent = (ocfs_extent_group *) buffer;
+
+		if (extent->up_hdr_node_ptr != fe->this_sector)
+			LOG_ERROR_ARGS ("fe->this_sector=%u.%u, uphdrptr=%u.%u",
+					HI(fe->this_sector),
+					LO(fe->this_sector),
+					HI(extent->up_hdr_node_ptr),
+					LO(extent->up_hdr_node_ptr));
+
+		extent->up_hdr_node_ptr = new_up_hdr_ptr;
+
+		status = ocfs_write_sector (osb, buffer, offset);
+		if (status < 0) {
+			LOG_ERROR_STATUS (status);
+			goto bail;
+		}
+	}
+
+      bail:
+	ocfs_safefree (buffer);
+
+	LOG_EXIT_STATUS (status);
+	return status;
+}				/* ocfs_update_uphdrptr */
+
+
 /* ocfs_grow_extent_tree()
  *
  */
 int ocfs_grow_extent_tree (ocfs_super * osb,
 		ocfs_file_entry * FileEntry,
-		ub8 actualDiskOffset, ub8 actualLength)
+		__u64 actualDiskOffset, __u64 actualLength)
 {
 	int status = 0;
-	sb4 k, i;
-	ub4 length = 0;
-	ub4 numSectorsAlloc = 0;
-	ub1 *buffer = NULL;
+	__s32 k, i;
+	__u32 length = 0;
+	__u32 numSectorsAlloc = 0;
+	__u8 *buffer = NULL;
 	ocfs_extent_group *OcfsExtent = NULL;
 	ocfs_extent_group *ExtentHeader = NULL;
-	ub8 physicalOffset;
-	ub8 fileOffset = 0;
-	ub8 upHeaderPtr, lastExtentPtr;
-	ub4 AllocSize;
+	__u64 physicalOffset;
+	__u64 fileOffset = 0;
+	__u64 upHeaderPtr, lastExtentPtr;
+	__u32 AllocSize;
+	__u64 new_up_hdr_ptr = 0;
 
 	LOG_ENTRY ();
 
@@ -699,7 +726,7 @@ int ocfs_grow_extent_tree (ocfs_super * 
 	/* Allocate the space from the Extent file. This function should */
 	/* return contigous disk blocks requested. */
 	status = ocfs_alloc_node_block (osb, AllocSize, &physicalOffset,
-				 &fileOffset, (ub8 *) & numSectorsAlloc,
+				 &fileOffset, (__u64 *) & numSectorsAlloc,
 				 osb->node_num, DISK_ALLOC_EXTENT_NODE);
 	if (status < 0) {
 		LOG_ERROR_STATUS (status);
@@ -707,8 +734,7 @@ int ocfs_grow_extent_tree (ocfs_super * 
 	}
 
 	if (fileOffset == 0) {
-		LOG_TRACE_ARGS ("File offset was 0 for file: %s\n",
-				FileEntry->filename);
+		LOG_TRACE_ARGS ("offset=0, file=%s\n", FileEntry->filename);
 	}
 
 	if (physicalOffset == 0) {
@@ -716,8 +742,7 @@ int ocfs_grow_extent_tree (ocfs_super * 
 		goto finally;
 	}
 
-	length = (ub4) OCFS_ALIGN (AllocSize, PAGE_SIZE);
-
+	length = (__u32) OCFS_ALIGN (AllocSize, osb->sect_size);
 	buffer = ocfs_malloc (length);
 	if (buffer == NULL) {
 		LOG_ERROR_STATUS (status = -ENOMEM);
@@ -742,7 +767,7 @@ int ocfs_grow_extent_tree (ocfs_super * 
 
 	lastExtentPtr = FileEntry->last_ext_ptr;
 
-	OcfsExtent->this_ext = physicalOffset;
+	OcfsExtent->this_ext = new_up_hdr_ptr = physicalOffset;
 	OcfsExtent->alloc_file_off = fileOffset;
 	OcfsExtent->alloc_node = osb->node_num;
 	OcfsExtent->next_data_ext = 0;
@@ -782,8 +807,6 @@ int ocfs_grow_extent_tree (ocfs_super * 
 
 			upHeaderPtr = ExtentHeader->this_ext;
 			lastExtentPtr = ExtentHeader->this_ext;
-
-			/* Also modify the PreviousPtr for all the nodes now */
 		} else {
 			ExtentHeader->extents[0].disk_off =
 			    physicalOffset + (OCFS_SECTOR_SIZE * (i + 1));
@@ -792,7 +815,7 @@ int ocfs_grow_extent_tree (ocfs_super * 
 			ExtentHeader->extents[0].num_bytes = actualLength;
 			ExtentHeader->next_free_ext = 1;
 			ExtentHeader->alloc_file_off =
-			    fileOffset + (OCFS_SECTOR_SIZE * (i + 1));
+			    fileOffset + (OCFS_SECTOR_SIZE * i);
 			ExtentHeader->alloc_node = osb->node_num;
 			ExtentHeader->this_ext =
 			    physicalOffset + (OCFS_SECTOR_SIZE * i);
@@ -854,8 +877,16 @@ int ocfs_grow_extent_tree (ocfs_super * 
 		}
 	}
 
-	/* Clear all the extent information from File Entry */
+	/* Update the uphdrptr of the three extents pointed to by fe */
+	if (FileEntry->granularity > 0) {
+		status = ocfs_update_uphdrptr(osb, FileEntry, new_up_hdr_ptr);
+		if (status < 0) {
+			LOG_ERROR_STATUS (status);
+			goto finally;
+		}
+	}
 
+	/* Clear all the extent information from File Entry */
 	for (i = 0; i < OCFS_MAX_FILE_ENTRY_EXTENTS; i++) {
 		FileEntry->extents[i].file_off = 0;
 		FileEntry->extents[i].num_bytes = 0;
@@ -863,7 +894,6 @@ int ocfs_grow_extent_tree (ocfs_super * 
 	}
 
 	/* Update the File Entry Extent */
-
 	FileEntry->local_ext = false;
 
 	FileEntry->extents[0].file_off = 0;
@@ -887,11 +917,11 @@ int ocfs_grow_extent_tree (ocfs_super * 
 int ocfs_allocate_extent (ocfs_super * osb,
 		    ocfs_inode * oin,
 		    ocfs_file_entry * FileEntry,
-		    ub8 actualDiskOffset, ub8 actualLength)
+		    __u64 actualDiskOffset, __u64 actualLength)
 {
 	int status = 0;
 	bool IncreaseTreeDepth = false;
-	ub4 k = 0;
+	__u32 k = 0;
 
 	LOG_ENTRY ();
 
@@ -918,7 +948,7 @@ int ocfs_allocate_extent (ocfs_super * o
 
 			/* Check here a case where the new allocation can be */
 			/* joined with the last extent. */
-			if (ocfs_check_for_extent_merge
+			if (OCFS_EXTENT_MERGEABLE
 			    (&FileEntry->extents[k], actualDiskOffset)) {
 				/* We can join the extents, just increase the len of extent */
 				FileEntry->extents[k].num_bytes += actualLength;
@@ -943,11 +973,8 @@ int ocfs_allocate_extent (ocfs_super * o
 			goto finally;
 		}
 	} else {
-		LOG_TRACE_STR ("Using DiskExtents");
-
-		if (FileEntry->granularity > 3) {
-			OCFS_BREAKPOINT ();
-		}
+		if (FileEntry->granularity > 3)
+			LOG_ERROR_ARGS ("granularity=%d", FileEntry->granularity);
 
 		/* This File is no longer using Local Extents */
 		status = ocfs_add_to_last_data_node (osb, oin, FileEntry,
@@ -970,8 +997,8 @@ int ocfs_allocate_extent (ocfs_super * o
 
       finally:
 	if ((status == 0) && (oin != NULL)) {
-		sb8 Vbo = 0;
-		sb8 Lbo = 0;
+		__s64 Vbo = 0;
+		__s64 Lbo = 0;
 
 		/* Add this Entry in to extent map. If a new mapping run to be added */
 		/* overlaps an existing mapping run, ocfs_add_extent_map_entry merges */
@@ -981,11 +1008,8 @@ int ocfs_allocate_extent (ocfs_super * o
 
 		/* Add the Entry to the extent map list */
 		if (!ocfs_add_extent_map_entry (osb, &oin->map, Vbo, Lbo,
-						actualLength)) {
-			LOG_ERROR_ARGS ("op failed for off %u.%u, size %u.%u\n",
-					HI (Vbo), LO (Vbo),
-					HI (actualLength), LO (actualLength));
-		}
+						actualLength))
+			LOG_ERROR_STATUS (status = -EFAIL);
 	}
 
 	/* ?? We should update the Filesize and allocation size here */
@@ -994,6 +1018,7 @@ int ocfs_allocate_extent (ocfs_super * o
 	return (status);
 }				/* ocfs_allocate_extent */
 
+#if 0
 /*
  * ocfs_check_for_extent_merge()
  *
@@ -1004,7 +1029,7 @@ int ocfs_allocate_extent (ocfs_super * o
  *
  * Returns true if possible, false, if not.
  */
-bool ocfs_check_for_extent_merge (ocfs_alloc_ext * LastExtent, ub8 ActualDiskOffset)
+bool ocfs_check_for_extent_merge (ocfs_alloc_ext * LastExtent, __u64 ActualDiskOffset)
 {
 	bool ret = false;
 
@@ -1021,6 +1046,7 @@ bool ocfs_check_for_extent_merge (ocfs_a
 	LOG_EXIT_ULONG (ret);
 	return ret;
 }				/* ocfs_check_for_extent_merge */
+#endif
 
 /*
  * ocfs_get_next_extent_map_entry()
@@ -1033,13 +1059,13 @@ bool ocfs_check_for_extent_merge (ocfs_a
  */
 bool ocfs_get_next_extent_map_entry (ocfs_super * osb,
 			   ocfs_extent_map * Map,
-			   ub4 RunIndex, sb8 * Vbo, sb8 * Lbo,
-			   ub4 * SectorCount)
+			   __u32 RunIndex, __s64 * Vbo, __s64 * Lbo,
+			   __u32 * SectorCount)
 {
 	bool Results;
-	sb8 LiVbo;
-	sb8 LiLbo;
-	sb8 LiSectorCount;
+	__s64 LiVbo;
+	__s64 LiLbo;
+	__s64 LiSectorCount;
 
 	LOG_ENTRY ();
 
@@ -1048,19 +1074,19 @@ bool ocfs_get_next_extent_map_entry (ocf
 	Results = ocfs_extent_map_next_entry (Map, RunIndex, &LiVbo, &LiLbo,
 					  &LiSectorCount);
 
-	*Vbo = ((sb8) LiVbo) << OCFS_LOG_SECTOR_SIZE;
+	*Vbo = ((__s64) LiVbo) << OCFS_LOG_SECTOR_SIZE;
 
-	if (((ub4) LiLbo) != -1) {
-		*Lbo = ((sb8) LiLbo) << OCFS_LOG_SECTOR_SIZE;
+	if (((__u32) LiLbo) != -1) {
+		*Lbo = ((__s64) LiLbo) << OCFS_LOG_SECTOR_SIZE;
 	} else {
 		Results = false;
 		*Lbo = 0;
 	}
 
-	*SectorCount = ((ub4) LiSectorCount) << OCFS_LOG_SECTOR_SIZE;
+	*SectorCount = ((__u32) LiSectorCount) << OCFS_LOG_SECTOR_SIZE;
 
 	if ((*SectorCount == 0) && (LiSectorCount != 0)) {
-		*SectorCount = (ub4) - 1;	/* it overflowed */
+		*SectorCount = (__u32) - 1;	/* it overflowed */
 		Results = false;
 	}
 
@@ -1074,11 +1100,11 @@ bool ocfs_get_next_extent_map_entry (ocf
  *
  */
 int ocfs_update_all_headers (ocfs_super * osb, ocfs_extent_group * AllocExtent,
-			     ub8 FileSize)
+			     __u64 FileSize, ocfs_file_entry *fe)
 {
 	int status = 0;
-	ub8 upHeaderPtr;
-	ub4 i = 0;
+	__u64 upHeaderPtr;
+	__u32 i = 0;
 	ocfs_extent_group *ExtentHeader = NULL;
 	ocfs_file_entry *FileEntry = NULL;
 
@@ -1129,9 +1155,10 @@ int ocfs_update_all_headers (ocfs_super 
 					}
 				}
 			}
+			status = ocfs_write_sector (osb, AllocExtent, AllocExtent->this_ext);
 			continue;
 		} else {
-			FileEntry = (ocfs_file_entry *) ExtentHeader;
+			FileEntry = fe;
 
 			if (!IS_VALID_FILE_ENTRY (FileEntry)) {
 				LOG_ERROR_STATUS(status = -EFAIL);
@@ -1171,20 +1198,31 @@ finally:
 	return status;
 }  /* ocfs_update_all_headers */
 
+#endif				/* !USERSPACE_TOOL */
+
+/*
+ * _write_free_extent_log()
+ *  removed most logging from this function as it overwhelms printk on redhat.
+ */
 
-static int _write_free_extent_log(ocfs_super *osb, ocfs_cleanup_record *CleanupLogRec, 
-                                  ub4 len, ub4 fileoff, ub4 nodenum)
+int _write_free_extent_log(ocfs_super *osb, ocfs_cleanup_record *CleanupLogRec, 
+                                  __u32 len, __u32 fileoff, __u32 nodenum, __u32 thistype)
 {
-        ub4 numUpdt;
+        __u32 numUpdt;
         int status=0;
         ocfs_free_bitmap *fb;
 
+//	LOG_ENTRY ();
+//	LOG_TRACE_ARGS("len = %u, fileoff = %u, nodenum = %u\n", len, fileoff, nodenum);
+
+	if (thistype == DISK_ALLOC_EXTENT_NODE)
+	        LOG_TRACE_ARGS("Removing metadata at alloc_fileoff=%u, nodenum=%u\n", fileoff, nodenum);
         numUpdt = CleanupLogRec->rec.free.num_free_upds; 
         if (numUpdt >= FREE_LOG_SIZE) { 
                 status = ocfs_write_node_log (osb, (ocfs_log_record *) CleanupLogRec, 
                                               osb->node_num, LOG_CLEANUP); 
                 if (status < 0) { 
-                        LOG_ERROR_ARGS ("ocfs_write_node_log failed with %d\n", status);
+                        LOG_ERROR_STATUS (status);
                         return status;
                 } 
                 numUpdt = CleanupLogRec->rec.free.num_free_upds = 0; 
@@ -1192,26 +1230,33 @@ static int _write_free_extent_log(ocfs_s
         fb = &(CleanupLogRec->rec.free.free_bitmap[numUpdt]); 
         fb->length = len; 
         fb->file_off = fileoff; 
-        fb->type = DISK_ALLOC_VOLUME; 
+	//fb->type = DISK_ALLOC_VOLUME;
+        fb->type = thistype; 
         fb->node_num = nodenum; 
         (CleanupLogRec->rec.free.num_free_upds)++; 
+
+	// LOG_EXIT_STATUS (status);
         return status;
-}
+} 			/* _write_free_extent_log */
+
+#ifndef USERSPACE_TOOL
  
-static int _squish_extent_entries(ocfs_super *osb, ocfs_alloc_ext *extarr, ub4 *freeExtent, 
-                                  ocfs_cleanup_record *CleanupLogRec, ub8 FileSize, bool flag) 
+int _squish_extent_entries(ocfs_super *osb, ocfs_alloc_ext *extarr, __u32 *freeExtent, 
+                                  ocfs_cleanup_record *CleanupLogRec, __u64 FileSize, bool flag) 
 {
         int status = 0;
 	bool FirstTime = true;
         ocfs_alloc_ext *ext; 
-        ub4 i, csize = osb->vol_layout.cluster_size, 
+        __u32 i, csize = osb->vol_layout.cluster_size, 
             numBitsAllocated = 0, bitmapOffset = 0, 
             firstfree = *freeExtent;
-        ub8 bytes, foff, doff, 
+        __u64 bytes, foff, doff, 
             dstart = osb->vol_layout.data_start_off, 
             diskOffsetTobeFreed, lengthTobeFreed = 0, 
             actualSize = 0, origLength = 0;
 
+	LOG_ENTRY ();
+
         firstfree = *freeExtent;
         for (i = 0; i < firstfree; i++) { 
                 ext = &(extarr[i]); 
@@ -1225,8 +1270,8 @@ static int _squish_extent_entries(ocfs_s
                                         *freeExtent = i; 
                                         FirstTime = false; 
                                 } 
-                                numBitsAllocated = (ub4) (bytes/csize); 
-                                bitmapOffset = (ub4) ((doff - dstart) / csize); 
+                                numBitsAllocated = (__u32) (bytes/csize); 
+                                bitmapOffset = (__u32) ((doff - dstart) / csize); 
                                 ext->num_bytes = ext->disk_off = ext->file_off = 0; 
                         } else { 
                                 if (FirstTime) { 
@@ -1239,20 +1284,602 @@ static int _squish_extent_entries(ocfs_s
                                 if (lengthTobeFreed == 0) { 
                                         continue; 
                                 } 
-                                numBitsAllocated = (ub4) (lengthTobeFreed / csize); 
+                                numBitsAllocated = (__u32) (lengthTobeFreed / csize); 
                                 diskOffsetTobeFreed = doff + bytes; 
-                                bitmapOffset = (ub4) ((diskOffsetTobeFreed - dstart) / csize); 
+                                bitmapOffset = (__u32) ((diskOffsetTobeFreed - dstart) / csize); 
                         } 
                         status = _write_free_extent_log(osb, CleanupLogRec, numBitsAllocated, 
-                                                        bitmapOffset, -1); 
-                        if (status < 0) 
+                                                        bitmapOffset, -1, DISK_ALLOC_VOLUME); 
+                        if (status < 0) {
+				LOG_ERROR_STATUS (status);
                                 break;
+			}
                 }
         } 
+
+	LOG_EXIT_STATUS (status);
         return status; 
 }
-  
+#endif				/* !USERSPACE_TOOL */
+
+/* used by ocfs_kill_this_tree and ocfs_split_this_tree */
+/* This value needs to be removed in a future version and set to
+ * granularity + 1, dynamically */
+#define OCFS_TREE_STACK_SIZE 8
+
+/*
+ * ocfs_kill_this_tree
+ *
+ * Given an extent_group (can be a DAT or header), delete everything,
+ * including itself, it's children, and any data blocks they point to.
+ * Works fine with any granularity (up to 4, in which case we'd need
+ * more stack space)
+ */
+
+/* We can't recurse, so we keep a simple stack of ocfs_extent_groups. */
+int ocfs_kill_this_tree(ocfs_super *osb, ocfs_extent_group *extent_grp, ocfs_cleanup_record *CleanupLogRec) {
+       int status = -EFAIL;
+       int i;
+       __u32 victim;
+       __u32 size = OCFS_ALIGN (sizeof (ocfs_extent_group), osb->sect_size);
+       __u32 csize = osb->vol_layout.cluster_size;
+       __u64 dstart = osb->vol_layout.data_start_off;
+       __u32 num_sectors = 0, bitmap_offset = 0;
+       ocfs_alloc_ext *ext;
+       ocfs_extent_group * grp_stack[OCFS_TREE_STACK_SIZE];
+       ocfs_extent_group * AllocExtent; /* convenience, points to TOS */
+       int tos = 0;
+
+       LOG_ENTRY();
+
+       for (i =0; i < OCFS_TREE_STACK_SIZE; i++)
+               grp_stack[i] = NULL;
+
+       grp_stack[tos] = extent_grp;
+
+       do {
+               AllocExtent = grp_stack[tos];
+
+               if (!IS_VALID_EXTENT_DATA(AllocExtent) &&
+                   !IS_VALID_EXTENT_HEADER(AllocExtent)) {
+                       LOG_ERROR_STR("Invalid extent group!");
+                       goto bail;
+               }
+
+               if (IS_VALID_EXTENT_DATA(AllocExtent)) {
+                       LOG_TRACE_ARGS("found some data to free (%u.%u)\n", HI(AllocExtent->this_ext), LO(AllocExtent->this_ext));
+                       for(i = 0; i < AllocExtent->next_free_ext; i++) {
+                               /* Free the data associated with each header */
+                               ext = &AllocExtent->extents[i];
+                               num_sectors = (__u32) (ext->num_bytes / csize);
+                               bitmap_offset = (__u32) ((ext->disk_off - dstart) / csize);
+                               status = _write_free_extent_log(osb, CleanupLogRec, num_sectors, bitmap_offset, -1, DISK_ALLOC_VOLUME);
+                               if (status < 0) {
+                                       LOG_ERROR_STATUS (status);
+                                       goto bail;
+                               }
+                       }
+                       /* Pop one off the stack */
+                       tos--;
+               } else {
+                       /* Ok, we're a header. */
+
+                       /* Did we already kill all his children, or
+                        * are they already dead? */
+                       if (AllocExtent->next_free_ext == 0) {
+                               tos--;
+                               LOG_TRACE_ARGS("Popping this header (%u.%u)\n",
+HI(AllocExtent->this_ext), LO(AllocExtent->this_ext), AllocExtent->next_free_ext);
+                               goto free_meta;
+                       }
+
+                       /* We're gonna read in our last used extent
+                        * and put him at the top of the stack. We
+                        * also update our next_free_ext so that next
+                        * time we read in the next to last one and so
+                        * on until we've finished all of them
+                        */
+
+                       /* grow the stack, only allocating mem if we
+                        * haven't already */
+                       tos++;
+                       if (grp_stack[tos] == NULL)
+                               grp_stack[tos] = ocfs_malloc(size);
+                       else
+                               memset(grp_stack[tos], 0, size);
+                       victim = AllocExtent->next_free_ext - 1;
+                       ext = &AllocExtent->extents[victim];
+
+                       status = ocfs_read_sector(osb, grp_stack[tos], ext->disk_off);
+                       if (status < 0) {
+                               LOG_ERROR_STATUS (status);
+                               goto bail;
+                       }
+                       AllocExtent->next_free_ext--;
+                       LOG_TRACE_ARGS("Pushing this header (%u.%u)\n", HI(grp_stack[tos]->this_ext), LO(grp_stack[tos]->this_ext));
+
+                       /* We only want to free on our way up the tree */
+                       continue;
+               }
+
+       free_meta:
+               /* Free the metadata associated with this extent group */
+               status = _write_free_extent_log(osb, CleanupLogRec, 1, AllocExtent->alloc_file_off, AllocExtent->alloc_node, DISK_ALLOC_EXTENT_NODE);
+               if (status < 0) {
+                       LOG_ERROR_STATUS (status);
+                       goto bail;
+               }
+       } while (tos >= 0);
+
+       status = 0;
+bail:
+       /* Free the stack. We never free the bottom of the stack
+        * because we were passed that guy from the caller */
+       for(i = 1; i < OCFS_TREE_STACK_SIZE; i++)
+               ocfs_safefree(grp_stack[i]);
+
+       LOG_EXIT_STATUS (status);
+       return(status);
+}
+
+#ifndef USERSPACE_TOOL
 
+int ocfs_fix_extent_group(ocfs_super *osb, ocfs_extent_group *group) {
+       ocfs_alloc_ext *ext;
+       int status=-EFAIL;
+       int i;
+
+       LOG_ENTRY ();
+
+       if (!group) {
+               LOG_ERROR_STR("Invalid extent group (NULL)!");
+               goto bail;
+       }
+
+       if (!IS_VALID_EXTENT_DATA(group) &&
+           !IS_VALID_EXTENT_HEADER(group)) {
+               LOG_ERROR_STR("Invalid extent group!");
+               goto bail;
+       }
+
+       ext = group->extents;
+
+       for(i=group->next_free_ext; i < OCFS_MAX_DATA_EXTENTS; i++) {
+               ext[i].num_bytes = 0;
+               ext[i].disk_off = 0;
+               ext[i].file_off = 0;
+       }
+
+       /* Alright, write this guy back out now */
+       if (osb != NULL) {
+               status = ocfs_write_sector (osb, group, group->this_ext);
+
+               if (status < 0) {
+                       LOG_ERROR_STATUS (status);
+                       goto bail;
+               }
+       }
+       status=0;
+bail:
+       LOG_EXIT_STATUS (status);
+
+       return(status);
+}
+
+/*
+ * ocfs_split_this_tree
+ *
+ * Given an extent_group (DAT or HDR) takes the new alloc_size from fe
+ * and splits this tree into two parts, one of which is deleted.
+ *
+ */
+int ocfs_split_this_tree(ocfs_super * osb, ocfs_extent_group *extent_grp,
+                   ocfs_cleanup_record *CleanupLogRec, ocfs_file_entry *fe) {
+       int status = -EFAIL;
+       __u64 newsize = fe->alloc_size;
+       ocfs_alloc_ext *ext;
+       ocfs_extent_group * grp_stack[OCFS_TREE_STACK_SIZE];
+       ocfs_extent_group * AllocExtent; /* convenience, points to TOS */
+       ocfs_extent_group *tmp = NULL, *tmp2 = NULL;
+       int tos = 0;
+       int i, victim;
+       __u64 bytes, foff, doff, orig_bytes, dstart = osb->vol_layout.data_start_off, total_bytes, csize = osb->vol_layout.cluster_size;
+       __u32 num_sectors, bitmap_offset, size;
+       bool done = false;
+       int gran = fe->granularity;
+
+       LOG_ENTRY();
+
+       size = sizeof (ocfs_cleanup_record);
+       size = (__u32) OCFS_ALIGN (size, PAGE_SIZE);
+
+       /* This is a similar hack to the one below, untested for gran = 3 files
+          because I can't recreate one. */
+       if (gran == 3) {
+               LOG_ERROR_STR("Truncating file with granularity 3, this is not tested and may be unsafe!");
+               LOG_TRACE_STR("Found a granularity 3 tree, trimming it.\n");
+               tmp2 = ocfs_malloc(size);
+
+               if (tmp2 == NULL) {
+                       LOG_ERROR_STATUS(status);
+                       goto bail;
+               }
+
+               for(i = (extent_grp->next_free_ext - 1); i>=0; i--) {
+                       ext = &extent_grp->extents[i];
+
+                       status = ocfs_read_sector(osb, tmp2, ext->disk_off);
+                       if (status < 0) {
+                               LOG_ERROR_STATUS (status);
+                               goto bail;
+                       }
+
+                       if (ext->file_off >= newsize) {
+                               /* Trim this whole subtree */
+                               status = ocfs_kill_this_tree(osb, tmp2, CleanupLogRec);
+                               if (status < 0) {
+                                       LOG_ERROR_STATUS (status);
+                                       goto bail;
+                               }
+                               ext->file_off = 0;
+                               ext->disk_off = 0;
+                               ext->num_bytes = 0;
+                               extent_grp->next_free_ext = i;
+                       } else  { /* This is the one we want to split. */
+                               ext->num_bytes = newsize - ext->file_off;
+                               break;
+                       }
+               }
+               /* Write out our new top of the tree duder */
+               status = ocfs_write_sector(osb, extent_grp, extent_grp->this_ext);
+
+               /* Make our new TOS the header we want to split. */
+               extent_grp = tmp2;
+               LOG_TRACE_STR("Ok, continuing as if granularity = 2");
+
+               /* We want to do the next bit of stuff too */
+               gran = 2;
+       }
+
+       /* get rid of everything from the top level HDR that we can, then
+          proceeed as if we're granularity 1 (which we know works) */
+       if (gran == 2) {
+               LOG_TRACE_STR("Found a granularity 2 tree, trimming it.\n");
+               tmp = ocfs_malloc(size);
+
+               if (tmp == NULL) {
+                       LOG_ERROR_STATUS(status);
+                       goto bail;
+               }
+
+               for(i = (extent_grp->next_free_ext - 1); i>=0; i--) {
+                       ext = &extent_grp->extents[i];
+
+                       status = ocfs_read_sector(osb, tmp, ext->disk_off);
+                       if (status < 0) {
+                               LOG_ERROR_STATUS (status);
+                               goto bail;
+                       }
+
+                       if (ext->file_off >= newsize) {
+                               /* Trim this whole subtree */
+                               status = ocfs_kill_this_tree(osb, tmp, CleanupLogRec);
+                               if (status < 0) {
+                                       LOG_ERROR_STATUS (status);
+                                       goto bail;
+                               }
+                               ext->file_off = 0;
+                               ext->disk_off = 0;
+                               ext->num_bytes = 0;
+                               extent_grp->next_free_ext = i;
+                       } else  { /* This is the one we want to split. */
+                               ext->num_bytes = newsize - ext->file_off;
+                               break;
+                       }
+               }
+               /* Write out our new top of the tree duder */
+               status = ocfs_write_sector(osb, extent_grp, extent_grp->this_ext);
+
+               /* Make our new TOS the header we want to split. */
+               extent_grp = tmp;
+               LOG_TRACE_STR("Ok, continuing as if granularity = 1");
+
+               /* Right now, we don't use 'gran' below here, but just
+                * in case */
+               gran = 1;
+       }
+
+       for (i =0; i < OCFS_TREE_STACK_SIZE; i++)
+               grp_stack[i] = NULL;
+
+       grp_stack[tos] = extent_grp;
+
+       /* Ok, find the splitting point (can be a DAT or HDR) */
+       do {
+               AllocExtent = grp_stack[tos];
+
+               if (!IS_VALID_EXTENT_DATA(AllocExtent) &&
+                   !IS_VALID_EXTENT_HEADER(AllocExtent)) {
+                       LOG_ERROR_STR("Invalid extent group!");
+                       goto bail;
+               }
+
+               if (IS_VALID_EXTENT_DATA(AllocExtent)) {
+                       /* shall we just do away with him? */
+                       LOG_TRACE_STR("Found a whole data extent!");
+                       /* changed this from > to >= */
+                       if (AllocExtent->extents[0].file_off >= newsize) {
+                               LOG_TRACE_ARGS("Killing this data extent (%u, %u)\n", HI(AllocExtent->this_ext), LO(AllocExtent->this_ext));
+                               /* Boundary case - what if this guy is
+                                * the last DAT we should delete
+                                * (i.e., split no more ;) */
+                               status = ocfs_kill_this_tree(osb, AllocExtent, CleanupLogRec);
+                               if (status < 0) {
+                                       LOG_ERROR_STATUS (status);
+                                       goto bail;
+                               }
+
+                       } else {
+                               /* Alright, we know for sure that
+                                * we're splitting in this guy. */
+                               LOG_TRACE_ARGS("Splitting this data extent (%u, %u)\n", HI(AllocExtent->this_ext), LO(AllocExtent->this_ext));
+                               fe->last_ext_ptr= AllocExtent->this_ext;
+                               AllocExtent->next_data_ext = 0;
+                               /* total_bytes is used below to know
+                                * how much total we've whacked off
+                                * this extent*/
+                               total_bytes = 0;
+
+                               /* there is a chance the split is at a
+                                * header boundary. this will catch
+                                * it: */
+                               ext = &AllocExtent->extents[AllocExtent->next_free_ext - 1];
+                               if ((ext->file_off + ext->num_bytes)==newsize){
+                                       LOG_TRACE_STR("Ok, hit that boundary in the DAT");
+                                       goto fix_headers;
+                               }
+                               /* Either kill the data or resize it */
+                               for(i = (AllocExtent->next_free_ext - 1); i>=0;
+i--) {
+                                       ext = &AllocExtent->extents[i];
+
+                                       /* changed this from > to >= */
+                                       /* Do we delete it completely? */
+                                       if (ext->file_off >= newsize) {
+                                               total_bytes+=ext->num_bytes;
+
+                                               num_sectors = (__u32) (ext->num_bytes / csize);
+                                               bitmap_offset = (__u32) ((ext->disk_off - dstart) / csize);
+                                               ext->file_off = 0;
+                                               ext->num_bytes = 0;
+                                               ext->disk_off = 0;
+                                       } else {
+                                               /* Do we shrink it? */
+                                               orig_bytes = ext->num_bytes;
+                                               doff = ext->disk_off;
+                                               foff = ext->file_off;
+                                               bytes = ext->num_bytes = newsize - foff;
+                                               num_sectors = (__u32) ((orig_bytes - bytes) / csize);
+                                               bitmap_offset = (__u32) (((doff
++ bytes) - dstart) / csize);
+                                               //we want to exit the for loop now
+                                               total_bytes+= (orig_bytes - bytes);
+                                               done = true;
+                                       }
+                                       status = _write_free_extent_log(osb, CleanupLogRec, num_sectors, bitmap_offset, -1, DISK_ALLOC_VOLUME);
+                                       if (status < 0) {
+                                               LOG_ERROR_STATUS (status);
+                                               goto bail;
+                                       }
+
+                                       if (done) {
+                                               AllocExtent->next_free_ext=i+1;
+                                               break;
+                                       }
+                               } /* For loop */
+
+                               LOG_TRACE_ARGS("Writing that data extent back out to disk now (%u,%u)\n", HI(AllocExtent->this_ext), LO(AllocExtent->this_ext));
+                               /* Either way, we need to write this back out*/
+                               status = ocfs_write_sector (osb, AllocExtent, AllocExtent->this_ext);
+                               if (status < 0) {
+                                       LOG_ERROR_STATUS(status);
+                                       goto bail;
+                               }
+
+                               LOG_TRACE_ARGS("Fixing the headers above us! (tos=%d)\n", tos);
+                       fix_headers:
+                               /*And here we should fix the headers above us*/
+                               tos--;
+                               while (tos >= 0) {
+                                       LOG_TRACE_ARGS("at top of loop, tos=%d\n", tos);
+                                       AllocExtent = grp_stack[tos];
+                                       victim = AllocExtent->next_free_ext;
+                                       AllocExtent->next_free_ext++;
+                                       /* need to also update
+                                        * numbytes on these guys */
+                                       ext = &AllocExtent->extents[victim];
+                                       ext->num_bytes-= total_bytes;
+                                       status = ocfs_fix_extent_group(osb, AllocExtent);
+                                       if (status < 0) {
+                                               LOG_ERROR_STATUS(status);
+                                               goto bail;
+                                       }
+                                       tos--;
+                               }
+                               LOG_TRACE_STR("breaking to end the function now!");
+                               break;
+                       }
+               } else {
+                       /* It's a header extent */
+
+                       /* Did we already kill all his children, or
+                         * are they already dead? */
+                        if (AllocExtent->next_free_ext == 0) {
+                               /*Ok, we're done with this guy, pop the stack*/
+                               tos--;
+                                LOG_TRACE_ARGS("Popping this header (%u.%u)\n", HI(AllocExtent->this_ext), LO(AllocExtent->this_ext), AllocExtent->next_free_ext);
+
+                               status = _write_free_extent_log(osb, CleanupLogRec, 1, AllocExtent->alloc_file_off, AllocExtent->alloc_node, DISK_ALLOC_EXTENT_NODE);
+                               if (status < 0) {
+                                       LOG_ERROR_STATUS (status);
+                                       goto bail;
+                               }
+                               continue;
+                       }
+                       /* changed this from > to >= */
+                       /* Do we just delete this whole part of the tree? */
+                       if (AllocExtent->extents[0].file_off >= newsize) {
+                               LOG_TRACE_ARGS("whacking this tree: (%u.%u)\n",
+HI(AllocExtent->this_ext), LO(AllocExtent->this_ext));
+
+                               if (AllocExtent->extents[0].file_off ==newsize)
+                                       done = true;
+
+                               ocfs_kill_this_tree(osb, AllocExtent,CleanupLogRec);
+                               tos--;
+                               if (tos < 0) {
+                                       LOG_ERROR_STR("End of stack reached.");
+                                       goto bail;
+                               }
+                               /* I just have to fix my parent,
+                                * right? Yes, but only because our
+                                * max granularity is 2. if it were
+                                * more, we'd have to fix his
+                                * parents parent. */
+
+                               victim = grp_stack[tos]->next_free_ext;
+                               grp_stack[tos]->extents[victim].file_off = 0;
+                               grp_stack[tos]->extents[victim].num_bytes = 0;
+                               grp_stack[tos]->extents[victim].disk_off = 0;
+                               grp_stack[tos]->next_free_ext--;
+
+                               /* Here's an interesting boundary
+                                * case. What if we're truncating on a
+                                * boundary between two headers and
+                                * this is the one we just deleted. In
+                                * that case we're done, but need to
+                                * write the parent out before we leave
+                                * again, this bit of code depends on
+                                * granularity of 2. */
+                               if (done) {
+                                       LOG_TRACE_STR("Found a boundary header, almost done (gonna quit)");
+                                       status = ocfs_fix_extent_group(osb, grp_stack[tos]);
+                                       if (status < 0) {
+                                               LOG_ERROR_STATUS(status);
+                                               goto bail;
+                                       }
+                                       /* decrement tos so we dont
+                                        * trigger an error
+                                        * condition */
+                                       tos--;
+                                       break;
+                               }
+                               /* Ok, we're not a boundary case, continue */
+                               continue;
+                       }
+
+                        /* grow the stack, only allocating mem if we
+                         * haven't already */
+                       tos++;
+                       if (grp_stack[tos] == NULL)
+                               grp_stack[tos] = ocfs_malloc(size);
+                       else
+                               memset(grp_stack[tos], 0, size);
+
+                       /* Go one extent to the left */
+                       AllocExtent->next_free_ext--;
+                       victim = AllocExtent->next_free_ext;
+                       ext = &AllocExtent->extents[victim];
+
+                       status = ocfs_read_sector(osb, grp_stack[tos], ext->disk_off);
+                       if (status < 0) {
+                               LOG_ERROR_STATUS (status);
+                               goto bail;
+                       }
+
+                       LOG_TRACE_ARGS("Pushing this group (%u.%u)\n", HI(grp_stack[tos]->this_ext), LO(grp_stack[tos]->this_ext));
+
+                       /* We only want to free on our way up the tree */
+                       continue;
+               }
+
+               tos--;
+       } while (tos >= 0);
+
+       if (tos >= 0)
+               LOG_ERROR_ARGS("Quitting main loop while top of stack >= 0 (tos=%d)\n", tos);
+
+       status=0;
+bail:
+       ocfs_safefree(tmp);
+       ocfs_safefree(tmp2);
+        /* Free the stack. We never free the bottom of the stack
+         * because we were passed that guy from the caller */
+        for(i = 1; i < OCFS_TREE_STACK_SIZE; i++)
+                ocfs_safefree(grp_stack[i]);
+
+       LOG_EXIT_STATUS (status);
+       return(status);
+}
+
+/*
+ * ocfs_update_last_ext_ptr
+ *
+ *  Travel all the way to the rightmost DAT and set fe->last_ext_ptr to it.
+ */
+int ocfs_update_last_ext_ptr(ocfs_super *osb, ocfs_file_entry *fe) {
+       int status = -EFAIL;
+       ocfs_extent_group *AllocExtent = NULL;
+       __u32 size;
+       __u64 next_ext;
+       int victim;
+
+       LOG_ENTRY ();
+
+       if (fe->next_free_ext == 0) {
+               LOG_TRACE_STR("setting to zero as there isn't any used extents");
+               fe->last_ext_ptr = 0;
+       }
+
+       size = OCFS_ALIGN (sizeof (ocfs_extent_group), osb->sect_size);
+       AllocExtent = ocfs_malloc (size);
+
+       victim = fe->next_free_ext - 1;
+       status = ocfs_read_sector(osb, AllocExtent, fe->extents[victim].disk_off);
+       if (status < 0) {
+               LOG_ERROR_STATUS(status);
+               goto bail;
+       }
+
+       if (!IS_VALID_EXTENT_DATA(AllocExtent) &&
+           !IS_VALID_EXTENT_HEADER(AllocExtent)) {
+               LOG_ERROR_STR("Invalid extent group!");
+               goto bail;
+       }
+
+       while (!IS_VALID_EXTENT_DATA(AllocExtent)) {
+               if (!IS_VALID_EXTENT_HEADER(AllocExtent)) {
+                       LOG_ERROR_STR("Invalid extent group!");
+                       goto bail;
+               }
+
+               next_ext = AllocExtent->extents[AllocExtent->next_free_ext - 1].disk_off;
+               status = ocfs_read_sector(osb, AllocExtent, next_ext);
+               if (status < 0) {
+                       LOG_ERROR_STATUS(status);
+                       goto bail;
+               }
+       }
+
+       fe->last_ext_ptr = AllocExtent->this_ext;
+       status = 0;
+bail:
+       ocfs_safefree(AllocExtent);
+
+       LOG_EXIT_STATUS(status);
+       return(status);
+}
+ 
 /*
  * ocfs_free_extents_for_truncate()
  *
@@ -1260,21 +1887,23 @@ static int _squish_extent_entries(ocfs_s
 int ocfs_free_extents_for_truncate (ocfs_super * osb, ocfs_file_entry * FileEntry)
 {
 	int status = 0;
-	ub4 size;
+	__u32 size;
 	ocfs_cleanup_record *CleanupLogRec = NULL;
 	ocfs_extent_group *AllocExtent = NULL;
-        bool done = false;
-        ub8 alloc_size;
+        __u64 alloc_size;
+        int i, j;
+        bool updated_lep; /* used to mark whether fe->last_ext_ptr has
+                           * been updated */
 
 	LOG_ENTRY ();
 
         alloc_size = FileEntry->alloc_size;
 	size = sizeof (ocfs_cleanup_record);
-	size = (ub4) OCFS_ALIGN (size, PAGE_SIZE);
+	size = (__u32) OCFS_ALIGN (size, PAGE_SIZE);
 
 	CleanupLogRec = ocfs_malloc (size);
 	if (CleanupLogRec == NULL) {
-		status = -ENOMEM;
+		LOG_ERROR_STATUS (status = -ENOMEM);
 		goto finally;
 	}
 
@@ -1284,105 +1913,102 @@ int ocfs_free_extents_for_truncate (ocfs
 
         /* local extents */
 	if (FileEntry->local_ext) {
-                status = _squish_extent_entries(osb, FileEntry->extents, (ub4 *)&FileEntry->next_free_ext, 
-                                                CleanupLogRec, alloc_size, false);
+               LOG_TRACE_STR("local extents, calling _squish_extent_entries");
+                status = _squish_extent_entries(osb, FileEntry->extents, (__u32 *)&FileEntry->next_free_ext, CleanupLogRec, alloc_size, false);
+               LOG_TRACE_ARGS("return from _squish_extent_entries, status=%d",
+status);
+
                 if (status < 0) {
-                        LOG_ERROR_ARGS ("_squish_extent_entries failed with %d\n", status);
+                        LOG_ERROR_STATUS (status);
                         goto finally;
                 }
                 goto write_log;
         }
 
+        LOG_TRACE_ARGS("non-local extents. taking that code path, truncating to alloc_size of (%u.%u)\n", HI(alloc_size), LO(alloc_size));
         /* non-local extents */
-	size = OCFS_ALIGN (sizeof (ocfs_extent_group), PAGE_SIZE);
-
+        updated_lep = false;
+	size = OCFS_ALIGN (sizeof (ocfs_extent_group), osb->sect_size);
 	AllocExtent = ocfs_malloc (size);
 	if (AllocExtent == NULL) {
-		LOG_ERROR_STR ("ocfs_malloc failed for AllocExtent");
-		status = -ENOMEM;
+		LOG_ERROR_STATUS (status = -ENOMEM);
 		goto finally;
 	}
 
 	memset (AllocExtent, 0, size);
 
-	while (FileEntry->last_ext_ptr != 0) {
-		status = ocfs_read_metadata (osb, AllocExtent, osb->sect_size, FileEntry->last_ext_ptr);
+        /* Loop backwards through only the used free extent headers here */
+        for (i = (FileEntry->next_free_ext - 1); i >= 0; i--) {
+                LOG_TRACE_ARGS("at top of loop, i = %d\n", i);
+                /* Go ahead and read that bit of the tree - we'll need it. */
+                status = ocfs_read_metadata (osb, AllocExtent, osb->sect_size,
+                                             FileEntry->extents[i].disk_off);
 		if (status < 0) {
-			LOG_ERROR_ARGS ("ocfs_read_metadata failed with %d\n", status);
+			LOG_ERROR_STATUS(status);
 			goto finally;
 		}
 
-                switch (AllocExtent->type)
-                {
-                    case OCFS_EXTENT_DATA:
-                        if (!IS_VALID_EXTENT_DATA (AllocExtent)) {
-				LOG_ERROR_STR ("Invalid Extent Data");
-				status = -EFAIL;
+               /* Figure out, do we want to kill this whole tree? */
+               if (FileEntry->extents[i].file_off >= alloc_size) {
+                       LOG_TRACE_ARGS("Found an entire tree to delete!\n");
+
+                       status = ocfs_kill_this_tree(osb, AllocExtent, CleanupLogRec);
+                       if (status < 0) {
+                               LOG_ERROR_STATUS(status);
 				goto finally;
 			}
-
-                        if (AllocExtent->extents[0].file_off >= alloc_size) {
-                                status = _squish_extent_entries(osb, AllocExtent->extents, &AllocExtent->next_free_ext, 
-                                                                CleanupLogRec, alloc_size, true);
-                                if (status < 0) {
-                                        LOG_ERROR_ARGS ("_squish_extent_entries failed with %d\n", status);
-                                        goto finally;
-                                }
-                                status = _write_free_extent_log(osb, CleanupLogRec, 1, AllocExtent->alloc_file_off, 
-                                                                AllocExtent->alloc_node);
-                                if (status < 0) {
-                                        LOG_ERROR_ARGS ("_write_free_extent_log failed with %d\n", status);
-                                        goto finally;
-                                }
-			} else {
-                                status = _squish_extent_entries(osb, AllocExtent->extents, &AllocExtent->next_free_ext, 
-                                                                CleanupLogRec, alloc_size, false);
-                                if (status < 0) {
-                                        LOG_ERROR_ARGS ("_squish_extent_entries failed with %d\n", status);
-                                        goto finally;
-                                }
-                                status = _write_free_extent_log(osb, CleanupLogRec, 1, AllocExtent->alloc_file_off, 
-                                                                AllocExtent->alloc_node);
-                                if (status < 0) {
-                                        LOG_ERROR_ARGS ("_write_free_extent_log failed with %d\n", status);
-                                        goto finally;
-                                }
-			        ocfs_update_all_headers (osb, AllocExtent, alloc_size);
-		                done = true;
-			} 
-                        break;
-                    case OCFS_EXTENT_HEADER:
-			if (!IS_VALID_EXTENT_HEADER (AllocExtent)) {
-				LOG_ERROR_STR ("Invalid Extent Header");
-				status = -EFAIL;
+                        /* Ok, update the FileEntry */
+                        FileEntry->extents[i].file_off = 0;
+                        FileEntry->extents[i].disk_off = 0;
+                        FileEntry->extents[i].num_bytes = 0;
+                        FileEntry->next_free_ext = i;
+                } else { /* Ok, we only want part of it. */
+                        /* Actually, the truth is we might NOT want to
+                         * split this tree, but we call this function
+                         * anyways in order to update last_ext_ptr. */
+
+                       LOG_TRACE_ARGS("Splitting this tree!\n");
+                       status = ocfs_split_this_tree(osb, AllocExtent, CleanupLogRec, FileEntry);
+                       if (status < 0) {
+                               LOG_ERROR_STATUS(status);
 				goto finally;
 			}
-
-        		if (AllocExtent->extents[0].file_off >= alloc_size) {
-                                status = _write_free_extent_log(osb, CleanupLogRec, 1, AllocExtent->alloc_file_off, 
-                                                                AllocExtent->alloc_node);
-                                if (status < 0) {
-                                        LOG_ERROR_ARGS ("_write_free_extent_log failed with %d\n", status);
-                                        goto finally;
-                                }
-			} else {
-				OCFS_BREAKPOINT();
-			        ocfs_update_all_headers (osb, AllocExtent, alloc_size);
- 			        done = true;
-                        }
-                        break;
-                    default:
-			LOG_ERROR_STR ("Extent is not an OCFS_EXTENT_DATA or OCFS_EXTENT_HEADER");
-			status = -EFAIL;
+                       /* Ok, update the FileEntry */
+                       LOG_TRACE_ARGS("Alright. num_bytes = (%u,%u), alloc_size = (%u,%u) file_off = (%u,%u)\n", HI(FileEntry->extents[i].num_bytes), LO(FileEntry->extents[i].num_bytes), HI(alloc_size), LO(alloc_size), HI(FileEntry->extents[i].file_off), LO(FileEntry->extents[i].file_off));
+                       FileEntry->extents[i].num_bytes = alloc_size;
+                       for (j=0; j < i; j++)
+                               FileEntry->extents[i].num_bytes += FileEntry->extents[j].num_bytes;
+
+                       FileEntry->next_free_ext = i + 1;
+                       /* We're done - we can't split more than one
+                        * parts of the tree. */
+                       updated_lep = true;
+                       break;
+               }
+       }
+
+       /* Ok, trunc to zero is a special case */
+       if (alloc_size == 0) {
+               FileEntry->last_ext_ptr = 0;
+               FileEntry->granularity = -1;
+               FileEntry->local_ext = true;
+               updated_lep = true;
+       }
+
+       if (!updated_lep) {
+               LOG_TRACE_STR("Updating FileEntry->last_ext_ptr");
+               status = ocfs_update_last_ext_ptr(osb, FileEntry);
+               if (status < 0) {
+                       LOG_ERROR_STATUS(status);
 			goto finally;
-                        break;
-                }
-                if (done)
-                    break;
-	} /* while (FileEntry->last_ext_ptr != 0) */
-
+		}
+	}
+	LOG_TRACE_ARGS("non-local extents, out of loop now, i = %d\n", i);
 
 write_log:
+       /* There may be some log records that haven't been written out
+        * by _write_free_extent_log() yet, so finish up here.*/
+
 	if (CleanupLogRec->rec.free.num_free_upds > 0) {
 		status = ocfs_write_node_log (osb, (ocfs_log_record *) CleanupLogRec,
 					      osb->node_num, LOG_CLEANUP);
@@ -1399,7 +2025,7 @@ write_log:
 	LOG_EXIT_ULONG (status);
 	return status;
 }  /* ocfs_free_extents_for_truncate */
-#endif				/* !DEBUGOCFS */
+#endif				/* !USERSPACE_TOOL */
 
 /*
  * ocfs_lookup_file_allocation()
@@ -1410,17 +2036,17 @@ write_log:
  * decoded and updated in the extent map.
  *
  */
-int ocfs_lookup_file_allocation (ocfs_super * osb, ocfs_inode * oin, sb8 Vbo,
-				 sb8 * Lbo, ub4 ByteCount, ub4 * NumIndex,
+int ocfs_lookup_file_allocation (ocfs_super * osb, ocfs_inode * oin, __s64 Vbo,
+				 __s64 * Lbo, __u32 ByteCount, __u32 * NumIndex,
 				 void **Buffer)
 {
 	int status = 0;
 	ocfs_file_entry *FileEntry = NULL;
-	ub4 allocSize = 0;
-	ub8 length = 0, remainingLength = 0;
-	ub1 *buffer = NULL;
-	ub4 Runs;
-	sb8 localVbo;
+	__u32 allocSize = 0;
+	__u64 length = 0, remainingLength = 0;
+	__u8 *buffer = NULL;
+	__u32 Runs;
+	__s64 localVbo;
 	ocfs_extent_group *OcfsExtent = NULL;
 	ocfs_io_runs *IoRuns = NULL;
 
@@ -1466,21 +2092,29 @@ int ocfs_lookup_file_allocation (ocfs_su
 		goto finally;
 	}
 
-	if (Vbo >= (sb8) FileEntry->alloc_size) {
-		LOG_ERROR_STATUS (status = -EFAIL);
+	if (Vbo >= (__s64) FileEntry->alloc_size) {
+		LOG_ERROR_ARGS ("vbo=%u.%u, fe->alloc_sz=%u.%u oin->alloc_size=%u.%u", 
+				HI(Vbo), LO(Vbo), HI(FileEntry->alloc_size),
+				LO(FileEntry->alloc_size), HI(oin->alloc_size),
+				LO(oin->alloc_size));
+		status = -EFAIL;
 		goto finally;
 	}
 
 	if (FileEntry->local_ext) {
 		status = ocfs_update_extent_map (osb, &oin->map, FileEntry,
 						 NULL, NULL, 1);
+		if (status < 0) {
+			LOG_ERROR_STATUS (status);
+			goto finally;
+		}
 	} else {
 		/* Extents are branched and we are no longer using Local Extents */
 		/* for this File Entry. */
 		allocSize = (NUM_SECTORS_IN_LEAF_NODE +
 			     FileEntry->granularity) * OCFS_SECTOR_SIZE;
-		length = OCFS_ALIGN (allocSize, PAGE_SIZE);
-		buffer = ocfs_malloc ((ub4) length);
+		length = OCFS_ALIGN (allocSize, osb->sect_size);
+		buffer = ocfs_malloc ((__u32) length);
 		if (buffer == NULL) {
 			LOG_ERROR_STATUS (status = -ENOMEM);
 			goto finally;
@@ -1490,15 +2124,11 @@ int ocfs_lookup_file_allocation (ocfs_su
 
 		status = ocfs_get_leaf_extent (osb, FileEntry, localVbo, OcfsExtent);
 		if (status < 0) {
+			LOG_ERROR_STATUS (status);
 			goto finally;
 		}
 
 		while (1) {
-			if (!IS_VALID_EXTENT_DATA (OcfsExtent)) {
-				LOG_ERROR_STATUS(status = -EFAIL);
-				goto finally;
-			}
-
 			status =
 			    ocfs_update_extent_map (osb, &oin->map, OcfsExtent,
 						 &localVbo, &remainingLength,
@@ -1509,11 +2139,18 @@ int ocfs_lookup_file_allocation (ocfs_su
 			}
 
 			if (remainingLength > 0) {
-				OCFS_ASSERT (OcfsExtent->next_data_ext);
+				if (!OcfsExtent->next_data_ext) {
+					LOG_ERROR_ARGS ("vbo=%u.%u, "
+						"oin->alloc_size=%u.%u, thisext=%u.%u",
+						HILO(localVbo), HILO(oin->alloc_size),
+						HILO(OcfsExtent->this_ext));
+					status = -EFAIL;
+					goto finally;
+				}
 
-				status = ocfs_read_sector (osb, OcfsExtent,
-							 OcfsExtent->
-							 next_data_ext);
+				status = ocfs_read_extent (osb, OcfsExtent,
+							 OcfsExtent->next_data_ext,
+							 EXTENT_DATA);
 				if (status < 0) {
 					LOG_ERROR_STATUS(status);
 					goto finally;
@@ -1527,6 +2164,7 @@ int ocfs_lookup_file_allocation (ocfs_su
 	status =
 	    ocfs_extent_map_load (osb, &oin->map, Buffer, Vbo, ByteCount, &Runs);
 	if (status < 0) {
+		LOG_ERROR_STATUS (status);
 		goto finally;
 	}
 
@@ -1542,9 +2180,7 @@ int ocfs_lookup_file_allocation (ocfs_su
 
 	ocfs_safefree (buffer);
 
-	if (FileEntry) {
-		ocfs_release_file_entry (FileEntry);
-	}
+	ocfs_release_file_entry (FileEntry);
 
 	LOG_EXIT_STATUS (status);
 	return (status);
@@ -1555,16 +2191,16 @@ int ocfs_lookup_file_allocation (ocfs_su
  */
 int ocfs_extent_map_load (ocfs_super * osb,
 		     ocfs_extent_map * Map,
-		     void **Buffer, sb8 Vbo, ub8 ByteCount, ub4 * RetRuns)
+		     void **Buffer, __s64 Vbo, __u64 ByteCount, __u32 * RetRuns)
 {
 	int status = -EFAIL;
 	ocfs_io_runs *IoRuns = NULL;
-	ub4 BufferOffset;
-	ub4 ioExtents = OCFS_MAX_DATA_EXTENTS;
-	ub8 length = 0, remainingLength = 0;
-	ub4 Runs, Index, ioRunSize;
-	sb8 localLbo;
-	sb8 localVbo;
+	__u32 BufferOffset;
+	__u32 ioExtents = OCFS_MAX_DATA_EXTENTS;
+	__u64 length = 0, remainingLength = 0;
+	__u32 Runs, Index, ioRunSize;
+	__s64 localLbo;
+	__s64 localVbo;
 
 	LOG_ENTRY ();
 
@@ -1628,12 +2264,12 @@ int ocfs_extent_map_load (ocfs_super * o
  */
 bool ocfs_lookup_extent_map_entry (ocfs_super * osb,
 			  ocfs_extent_map * Map,
-			  sb8 Vbo, sb8 * Lbo, ub8 * SectorCount, ub4 * Index)
+			  __s64 Vbo, __s64 * Lbo, __u64 * SectorCount, __u32 * Index)
 {
 	bool ret;
-	sb8 LiLbo = 0;
-	sb8 LiSectorCount = 0;
-	ub8 remainder = 0;
+	__s64 LiLbo = 0;
+	__s64 LiSectorCount = 0;
+	__u64 remainder = 0;
 
 	LOG_ENTRY ();
 
@@ -1642,8 +2278,8 @@ bool ocfs_lookup_extent_map_entry (ocfs_
 
 	ret = ocfs_extent_map_lookup (Map, (Vbo >> OCFS_LOG_SECTOR_SIZE), &LiLbo,
 				   &LiSectorCount, Index);
-	if ((ub4) LiLbo != -1) {
-		*Lbo = (((sb8) LiLbo) << (sb8) OCFS_LOG_SECTOR_SIZE);
+	if ((__u32) LiLbo != -1) {
+		*Lbo = (((__s64) LiLbo) << (__s64) OCFS_LOG_SECTOR_SIZE);
 		if (ret) {
 			*Lbo += remainder;
 		}
@@ -1654,9 +2290,9 @@ bool ocfs_lookup_extent_map_entry (ocfs_
 
 	*SectorCount = LiSectorCount;
 	if (*SectorCount) {
-		*SectorCount <<= (sb8) OCFS_LOG_SECTOR_SIZE;
+		*SectorCount <<= (__s64) OCFS_LOG_SECTOR_SIZE;
 		if (*SectorCount == 0) {
-			*SectorCount = (ub4) - 1;
+			*SectorCount = (__u32) - 1;
 		}
 
 		if (ret) {
@@ -1677,10 +2313,10 @@ bool ocfs_lookup_extent_map_entry (ocfs_
  * prevously allocated memory.
  *
  */
-int ocfs_adjust_allocation (ocfs_io_runs ** IoRuns, ub4 * ioRunSize)
+int ocfs_adjust_allocation (ocfs_io_runs ** IoRuns, __u32 * ioRunSize)
 {
 	int status = 0;
-	ub4 runSize = 0;
+	__u32 runSize = 0;
 	ocfs_io_runs *localIoRuns = NULL;
 
 	LOG_ENTRY ();
@@ -1709,15 +2345,15 @@ bail:
  *
  */
 int ocfs_update_extent_map (ocfs_super * osb, ocfs_extent_map * Map,
-			    void *Buffer, sb8 * localVbo,
-			    ub8 * remainingLength, ub4 Flag)
+			    void *Buffer, __s64 * localVbo,
+			    __u64 * remainingLength, __u32 Flag)
 {
-	int status = 0;
+	int status = -EFAIL;
 	ocfs_file_entry *FileEntry;
 	ocfs_extent_group *OcfsExtent;
-	sb8 tempVbo;
-	sb8 tempLbo;
-	ub8 tempSize;
+	__s64 tempVbo;
+	__s64 tempLbo;
+	__u64 tempSize;
 	bool Ret;
 	int j;
 
@@ -1742,13 +2378,14 @@ int ocfs_update_extent_map (ocfs_super *
 				goto bail;
 			}
 		}
+		status = 0;
 	} else {
-		ub8 localLength = 0;
+		__u64 localLength = 0;
 
 		OcfsExtent = (ocfs_extent_group *) Buffer;
 
 		for (j = 0; j < OcfsExtent->next_free_ext; j++) {
-			if ((sb8) (OcfsExtent->extents[j].file_off +
+			if ((__s64) (OcfsExtent->extents[j].file_off +
 				   OcfsExtent->extents[j].num_bytes) >
 			    (*localVbo)) {
 				tempVbo = OcfsExtent->extents[j].file_off;
@@ -1758,10 +2395,9 @@ int ocfs_update_extent_map (ocfs_super *
 				/* Add the Extent to extent map list */
 				Ret =
 				    ocfs_add_extent_map_entry (osb, Map, tempVbo,
-							   tempLbo,
-							   (ub4) tempSize);
+							   tempLbo, tempSize);
 				if (!Ret) {
-					LOG_ERROR_STATUS (status -ENOMEM);
+					LOG_ERROR_STATUS (status = -ENOMEM);
 					goto bail;
 				}
 
@@ -1783,9 +2419,11 @@ int ocfs_update_extent_map (ocfs_super *
 
 		if ((OcfsExtent->next_free_ext != OCFS_MAX_DATA_EXTENTS) &&
 		    (*remainingLength)) {
-			OCFS_BREAKPOINT ();
-		}
-
+			LOG_ERROR_ARGS ("next_free_extent=%d, rem_len=%u.%u",
+				OcfsExtent->next_free_ext, HI(*remainingLength),
+				LO(*remainingLength));
+		} else
+			status = 0;
 	}
 
       bail:
@@ -1801,7 +2439,7 @@ int ocfs_update_extent_map (ocfs_super *
  * Returns true on success, false otherwise.
  */
 bool ocfs_add_extent_map_entry (ocfs_super * osb,
-		       ocfs_extent_map * Map, sb8 Vbo, sb8 Lbo, ub8 ByteCount)
+		       ocfs_extent_map * Map, __s64 Vbo, __s64 Lbo, __u64 ByteCount)
 {
 	bool ret;
 
@@ -1822,7 +2460,11 @@ bool ocfs_add_extent_map_entry (ocfs_sup
 	Vbo >>= OCFS_LOG_SECTOR_SIZE;
 	Lbo >>= OCFS_LOG_SECTOR_SIZE;
 
-	ret = ocfs_extent_map_add (Map, ((sb8) Vbo), ((sb8) Lbo), ((sb8) ByteCount));
+	ret = ocfs_extent_map_add (Map, ((__s64) Vbo), ((__s64) Lbo), ((__s64) ByteCount));
+	if (!ret)
+		LOG_ERROR_ARGS ("fileoff=%u.%u, diskoff=%u.%u, len=%u.%u",
+				HI(Vbo), LO(Vbo), HI(Lbo), LO(Lbo),
+				HI(ByteCount), LO(ByteCount));
 
 	LOG_EXIT_ULONG (ret);
 	return ret;
@@ -1833,17 +2475,17 @@ bool ocfs_add_extent_map_entry (ocfs_sup
  */
 int ocfs_get_leaf_extent (ocfs_super * osb,
 	       ocfs_file_entry * FileEntry,
-	       sb8 Vbo, ocfs_extent_group * OcfsDataExtent)
+	       __s64 Vbo, ocfs_extent_group * OcfsDataExtent)
 {
-	int status = -EFAIL, tempstat;
-	ub4 i, j, length;
+	int status = 0, tempstat;
+	__u32 i, j, length;
 	ocfs_extent_group *ExtentHeader = NULL;
-	ub8 childDiskOffset = 0;
+	__u64 childDiskOffset = 0;
 
 	LOG_ENTRY ();
 
 	for (i = 0; i < FileEntry->next_free_ext; i++) {
-		if ((sb8) (FileEntry->extents[i].file_off +
+		if ((__s64) (FileEntry->extents[i].file_off +
 			   FileEntry->extents[i].num_bytes) > Vbo) {
 			childDiskOffset = FileEntry->extents[i].disk_off;
 			break;
@@ -1851,57 +2493,42 @@ int ocfs_get_leaf_extent (ocfs_super * o
 	}
 
 	if (childDiskOffset == 0) {
-		status = -EINVAL;
+		LOG_ERROR_STATUS (status = -EINVAL);
 		goto finally;
 	}
 
 	if (FileEntry->granularity >= 1) {
-		length = PAGE_SIZE;
-		ExtentHeader = ocfs_malloc ((ub4) length);
+		length = osb->sect_size;
+		ExtentHeader = ocfs_malloc ((__u32) length);
 		if (ExtentHeader == NULL) {
-			status = -ENOMEM;
-			LOG_ERROR_STATUS (status);
+			LOG_ERROR_STATUS (status = -ENOMEM);
 			goto finally;
 		}
 	}
 
 	for (i = 0; i < FileEntry->granularity; i++) {
-		tempstat = ocfs_read_sector (osb, ExtentHeader, childDiskOffset);
+		tempstat = ocfs_read_extent (osb, ExtentHeader, childDiskOffset,
+					     EXTENT_HEADER);
 		if (tempstat < 0) {
-			status = tempstat;
-			goto finally;
-		}
-
-		if (!IS_VALID_EXTENT_HEADER (ExtentHeader)) {
-			LOG_ERROR_STATUS(status = -EFAIL);
+			LOG_ERROR_STATUS (status = tempstat);
 			goto finally;
 		}
 
 		for (j = 0; j < ExtentHeader->next_free_ext; j++) {
-			if ((sb8) (ExtentHeader->extents[j].file_off +
+			if ((__s64) (ExtentHeader->extents[j].file_off +
 				   ExtentHeader->extents[j].num_bytes) > Vbo)
 			{
 				childDiskOffset =
-				    ExtentHeader->extents[j].disk_off;
+			 	    ExtentHeader->extents[j].disk_off;
 				break;
 			}
 		}
-
-		if (i != (FileEntry->granularity - 1)) {
-			continue;
-		} else {
-			break;
-		}
 	}
 
-	tempstat = ocfs_read_sector (osb, OcfsDataExtent, childDiskOffset);
+	tempstat = ocfs_read_extent (osb, OcfsDataExtent, childDiskOffset,
+				     EXTENT_DATA);
 	if (tempstat < 0) {
-		status = tempstat;
-		goto finally;
-	}
-
-	if (!IS_VALID_EXTENT_DATA (OcfsDataExtent)) {
-		LOG_ERROR_STATUS(status = -EFAIL);
+		LOG_ERROR_STATUS (status = tempstat);
 		goto finally;
 	}
 
@@ -1909,5 +2536,5 @@ int ocfs_get_leaf_extent (ocfs_super * o
 	ocfs_safefree (ExtentHeader);
 
 	LOG_EXIT_STATUS (status);
-	return (status = 0);	//SM WHAT?????
+	return (status);
 }				/* ocfs_get_leaf_extent */
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Common/ocfsgencreate.c linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Common/ocfsgencreate.c
--- linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Common/ocfsgencreate.c	2003-07-30 13:51:50.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Common/ocfsgencreate.c	2003-07-30 10:28:53.000000000 +0200
@@ -43,6 +43,7 @@ int ocfs_verify_update_oin (ocfs_super *
 	ocfs_lock_res *pLockRes;
 	struct inode *inode = NULL;
         struct list_head *iter;
+        struct list_head *temp_iter;
         int disk_len;
 
 	/* We are setting the oin Updated flag in the end. */
@@ -84,7 +85,7 @@ int ocfs_verify_update_oin (ocfs_super *
 		}
 
                 status = -ENOENT;
-                list_for_each (iter, &(inode->i_dentry)) {
+                list_for_each_safe (iter, temp_iter, &(inode->i_dentry)) {
                         struct dentry *dentry = list_entry (iter, struct dentry, d_alias);
                         if (dentry->d_name.len == disk_len &&
                             strncmp(dentry->d_name.name, fe->filename, disk_len)==0)
@@ -99,12 +100,17 @@ int ocfs_verify_update_oin (ocfs_super *
 		}
 
 
-		if ((oin->alloc_size != (sb8) fe->alloc_size) ||
-		    (inode->i_size != (sb8) fe->file_size) ||
+		if ((oin->alloc_size != (__s64) fe->alloc_size) ||
+		    (inode->i_size != (__s64) fe->file_size) ||
 		    (oin->chng_seq_num != DISK_LOCK_SEQNUM (fe)) ||
 		    inode->i_uid != fe->uid ||
 		    inode->i_gid != fe->gid || inode->i_mode != fe->prot_bits) {
 
+			if (oin->alloc_size > (__s64)fe->alloc_size) {
+				ocfs_extent_map_destroy (&oin->map);
+				ocfs_extent_map_init (&oin->map);
+			}
+
 			LOG_TRACE_STR
 			    ("Allocsize, filesize or seq no did not match");
 			oin->alloc_size = fe->alloc_size;
@@ -115,7 +121,7 @@ int ocfs_verify_update_oin (ocfs_super *
 			inode->i_uid = fe->uid;
 			inode->i_gid = fe->gid;
 			inode->i_mode = fe->prot_bits;
-			inode->i_blksize = (ub4) osb->vol_layout.cluster_size;
+			inode->i_blksize = (__u32) osb->vol_layout.cluster_size;
 		        inode->i_ctime = fe->create_time;
         		inode->i_atime = fe->modify_time;
         		inode->i_mtime = fe->modify_time;
@@ -158,16 +164,16 @@ int ocfs_verify_update_oin (ocfs_super *
 				    break;
 			    }
 			    default:
-				    LOG_ERROR_STR ("invalid file type!\n");
+			    	    LOG_ERROR_ARGS ("attribs=%d", fe->attribs);
 				    inode->i_mode |= S_IFREG;
 				    break;
 			}
 
 			if (fe->local_ext) {
-				sb8 tempVbo;
-				sb8 tempLbo;
-				ub8 tempSize;
-				ub4 j;
+				__s64 tempVbo;
+				__s64 tempLbo;
+				__u64 tempSize;
+				__u32 j;
 
 				/* Add the Extents to extent map */
 				for (j = 0; j < fe->next_free_ext; j++) {
@@ -175,14 +181,16 @@ int ocfs_verify_update_oin (ocfs_super *
 					tempLbo = fe->extents[j].disk_off;
 					tempSize = fe->extents[j].num_bytes;
 
-					ocfs_add_extent_map_entry (osb, &oin->map,
-							       tempVbo, tempLbo,
-							       tempSize);
+					if (!ocfs_add_extent_map_entry (osb,
+							&oin->map, tempVbo, tempLbo,
+							tempSize))
+						goto leave;
 				}
 			}
 		}
 
 		pLockRes = oin->lock_res;
+		ocfs_get_lockres (pLockRes);
 
 		/* ??? we need to the lock resource before updating it */
 		if (pLockRes) {
@@ -195,19 +203,18 @@ int ocfs_verify_update_oin (ocfs_super *
 			pLockRes->writer_node_num = DISK_LOCK_WRITER_NODE (fe);
 		}
 
+		ocfs_put_lockres (pLockRes);
+
 		status = 0;
 	} else {
 		/* Update for the DIRECTORY */
 	}
 
       leave:
-	if (status == 0) {
+	if (status == 0)
 		OIN_UPDATED (oin);
-	}
 
-	if (fe != NULL) {
-		ocfs_release_file_entry (fe);
-	}
+	ocfs_release_file_entry (fe);
 
 	LOG_EXIT_STATUS (status);
 	return status;
@@ -227,18 +234,18 @@ int ocfs_verify_update_oin (ocfs_super *
  * Returns 0 on success, < 0 on error.
  */
 int ocfs_find_contiguous_space_from_bitmap (ocfs_super * osb,
-			       ub8 file_size,
-			       ub8 * cluster_off, ub8 * cluster_count, bool sysfile)
+			       __u64 file_size,
+			       __u64 * cluster_off, __u64 * cluster_count, bool sysfile)
 {
 	int status = 0, tmpstat;
-	ub4 size = 0, ByteOffset = 0, ClusterCount = 0;
-	ub8 ByteCount = 0;
-	ub4 LargeAlloc = 0;
-	static ub4 LargeAllocOffset = 0;
-	static ub4 SmallAllocOffset = 0;
-	ub8 startOffset = 0;
+	__u32 size = 0, ByteOffset = 0, ClusterCount = 0;
+	__u64 ByteCount = 0;
+	__u32 LargeAlloc = 0;
+	static __u32 LargeAllocOffset = 0;
+	static __u32 SmallAllocOffset = 0;
+	__u64 startOffset = 0;
 	bool bLockAcquired = false;
-	ocfs_lock_res *pLockResource;
+	ocfs_lock_res *pLockResource = NULL;
         ocfs_file_entry *fe = NULL;
         ocfs_bitmap_lock *bm_lock = NULL;
 
@@ -251,29 +258,30 @@ int ocfs_find_contiguous_space_from_bitm
 	/* Get the allocation lock here */
         fe = ocfs_allocate_file_entry();
         if (!fe) {
-                LOG_ERROR_STR ("failed to allocate file entry");
-                status = -ENOMEM;
+                LOG_ERROR_STATUS (status = -ENOMEM);
                 goto leave;
         }
         bm_lock = (ocfs_bitmap_lock *)fe;
 
-	status =
-	    ocfs_acquire_lock (osb, OCFS_BITMAP_LOCK_OFFSET,
-			     OCFS_DLM_ENABLE_CACHE_LOCK, 0, &pLockResource, fe);
+	status = ocfs_acquire_lock (osb, OCFS_BITMAP_LOCK_OFFSET,
+			     OCFS_DLM_EXCLUSIVE_LOCK, 0, &pLockResource,
+			     fe);
 	if (status < 0) {
-		LOG_ERROR_STATUS (status);
+		if (status != -EINTR)
+			LOG_ERROR_STATUS (status);
 		goto leave;
 	}
+
 	bLockAcquired = true;
 
 	ByteCount = file_size;
 
 	/* Calculate the size in Bytes */
-	size = (ub4) OCFS_SECTOR_ALIGN ((osb->cluster_bitmap.size) / 8);
+	size = (__u32) OCFS_SECTOR_ALIGN ((osb->cluster_bitmap.size) / 8);
 
 	startOffset = osb->vol_layout.bitmap_off;
-	status =
-	    ocfs_read_metadata (osb, osb->cluster_bitmap.buf, size, startOffset);
+	status = ocfs_read_metadata (osb, osb->cluster_bitmap.buf, size,
+				     startOffset);
 	if (status < 0) {
 		LOG_ERROR_STATUS (status);
 		goto leave;
@@ -291,7 +299,7 @@ int ocfs_find_contiguous_space_from_bitm
 	}
 
 	ClusterCount =
-	    (ub4) ((ub8) ByteCount / (ub8) osb->vol_layout.cluster_size);
+	    (__u32) ((__u64) ByteCount / (__u64) osb->vol_layout.cluster_size);
 
 	if (sysfile ? (ClusterCount > osb->vol_layout.num_clusters) :
 			(ClusterCount > (osb->vol_layout.num_clusters - 
@@ -324,9 +332,11 @@ int ocfs_find_contiguous_space_from_bitm
 
 	if (ByteOffset == -1 && LargeAlloc) {
 		osb->cluster_bitmap.failed++;
-		ByteOffset =
-		    ocfs_find_clear_bits (&osb->cluster_bitmap, ClusterCount, 0, 
-				    sysfile ? 0 :((8 * ONE_MEGA_BYTE) / osb->vol_layout.cluster_size));
+		ByteOffset = ocfs_find_clear_bits (&osb->cluster_bitmap,
+					ClusterCount, 0,
+					sysfile ? 0 :
+						((8 * ONE_MEGA_BYTE) /
+						 osb->vol_layout.cluster_size));
 	}
 
 	/* It returns -1 on failure, otherwise ByteOffset points at the */
@@ -334,9 +344,10 @@ int ocfs_find_contiguous_space_from_bitm
 	/* are free.  */
 
 	if (ByteOffset == -1) {
-		LOG_ERROR_ARGS
-		    ("Cannot allocate contiguous amount of clusters, want %u\n",
-		     ClusterCount);
+		if (sysfile)
+			LOG_ERROR_ARGS (
+				"Systemfile cannot allocate contiguously %u blocks",
+				ClusterCount);
 		status = -ENOSPC;
 		goto leave;
 	}
@@ -353,10 +364,10 @@ int ocfs_find_contiguous_space_from_bitm
 	}
 #endif
 
-	LOG_TRACE_ARGS ("The byte offset is %u\n", ByteOffset);
-
 	ocfs_set_bits (&osb->cluster_bitmap, ByteOffset, ClusterCount);
 
+	LOG_TRACE_ARGS("gb_s: bit=%d, len=%d\n", ByteOffset, ClusterCount);
+
 	startOffset = osb->vol_layout.bitmap_off;
 
 	status =
@@ -370,7 +381,8 @@ int ocfs_find_contiguous_space_from_bitm
         /* TODO: optimize by making this part of ocfs_release_lock 
          * for now, it will be back-to-back writes to same sector */
         bm_lock->used_bits = ocfs_count_bits(&osb->cluster_bitmap);
-        status = ocfs_write_force_disk(osb, bm_lock, OCFS_SECTOR_SIZE, OCFS_BITMAP_LOCK_OFFSET);
+        status = ocfs_write_force_disk(osb, bm_lock, OCFS_SECTOR_SIZE,
+				       OCFS_BITMAP_LOCK_OFFSET);
         if (status < 0) {
                 LOG_ERROR_STATUS (status);
                 goto leave;
@@ -383,19 +395,13 @@ int ocfs_find_contiguous_space_from_bitm
       leave:
 	ocfs_up_sem (&(osb->vol_alloc_lock));
 	if (bLockAcquired) {
-		tmpstat =
-		    ocfs_release_lock (osb, OCFS_BITMAP_LOCK_OFFSET,
-				     OCFS_DLM_EXCLUSIVE_LOCK, 0, pLockResource, fe);
-		if (tmpstat < 0) {
-			status = tmpstat;
-			LOG_ERROR_STATUS (status);
-			/* TODO FAIL VOLUME */
-		}
+		tmpstat = ocfs_release_lock (osb, OCFS_BITMAP_LOCK_OFFSET,
+				OCFS_DLM_EXCLUSIVE_LOCK, 0, pLockResource, fe);
+		if (tmpstat < 0)
+			LOG_ERROR_STATUS (tmpstat);
 	}
-        
-	if (fe)
-            ocfs_release_file_entry(fe);
-
+	ocfs_put_lockres (pLockResource);
+	ocfs_release_file_entry(fe);
 	LOG_EXIT_STATUS (status);
 	return status;
 }				/* ocfs_find_contiguous_space_from_bitmap */
@@ -407,17 +413,17 @@ int
 ocfs_create_oin_from_entry (ocfs_super * osb,
 		    ocfs_file_entry * fe,
 		    ocfs_inode ** new_oin,
-		    ub8 parent_dir_off, ocfs_inode * parent_oin)
+		    __u64 parent_dir_off, ocfs_inode * parent_oin)
 {
 	int status = 0;
-	ub8 allocSize = 0;
-	ub8 endofFile = 0;
+	__u64 allocSize = 0;
+	__u64 endofFile = 0;
 	ocfs_inode *oin;
-	ub8 lockId;
+	__u64 lockId;
 	int j;
-	sb8 tempVbo;
-	sb8 tempLbo;
-	ub8 tempSize;
+	__s64 tempVbo;
+	__s64 tempLbo;
+	__u64 tempSize;
 	ocfs_extent_group *buffer = NULL;
 	ocfs_extent_group *pOcfsExtent;
 	bool bRet;
@@ -441,23 +447,29 @@ ocfs_create_oin_from_entry (ocfs_super *
 	oin->alloc_size = fe->alloc_size;
 
 	if (fe->this_sector == 0)
-		OCFS_BREAKPOINT ();
+		LOG_ERROR_STR ("this_sector=0");
 
 	/* The oins gets Linked into the osb in this function */
 
 	if (fe->attribs & OCFS_ATTRIB_DIRECTORY) {
 		lockId = fe->extents[0].disk_off;
-		status = ocfs_initialize_oin (oin, osb, OCFS_OIN_DIRECTORY | OCFS_OIN_IN_USE,
-					    NULL, fe->this_sector, lockId);
+		status = ocfs_initialize_oin (oin, osb,
+				OCFS_OIN_DIRECTORY | OCFS_OIN_IN_USE, NULL,
+				fe->this_sector, lockId);
 		if (status < 0) {
+			if (status != -EINTR)
+				LOG_ERROR_STATUS (status);
 			goto leave;
 		}
 		oin->dir_disk_off = fe->extents[0].disk_off;
 	} else {
 		status = ocfs_initialize_oin (oin, osb, OCFS_OIN_IN_USE, NULL,
 					    fe->this_sector, fe->this_sector);
-		if (status < 0)
+		if (status < 0) {
+			if (status != -EINTR)
+				LOG_ERROR_STATUS (status);
 			goto leave;
+		}
 
 		if (fe->local_ext) {
 			for (j = 0; j < fe->next_free_ext; j++) {
@@ -466,19 +478,16 @@ ocfs_create_oin_from_entry (ocfs_super *
 				tempSize = fe->extents[j].num_bytes;
 
 				/* Add the Extent to extent map */
-				if (!ocfs_add_extent_map_entry (osb, &oin->map,
-							    tempVbo, tempLbo,
-							    tempSize)) {
-					LOG_TRACE_ARGS
-					    ("ocfs_add_extent_map_entry failed for offset (%d.%d), "
-					     "size (%u.%u)\n", HI (tempVbo),
-					     LO (tempVbo), HI (tempSize),
-					     LO (tempSize));
+				bRet = ocfs_add_extent_map_entry (osb, &oin->map,
+						tempVbo, tempLbo, tempSize);
+				if (!bRet) {
+					LOG_ERROR_STATUS (status = -ENOMEM);
+					goto leave;
 				}
 			}
 		} else {
-			ub4 alloSize;
-			ub4 length;
+			__u32 alloSize;
+			__u32 length;
 
 			/* Extents are branched and we are no longer using */
 			/* Local Extents for this File Entry. */
@@ -486,8 +495,7 @@ ocfs_create_oin_from_entry (ocfs_super *
 			    (NUM_SECTORS_IN_LEAF_NODE +
 			     fe->granularity) * OCFS_SECTOR_SIZE;
 
-			length = (ub4) OCFS_ALIGN (alloSize, PAGE_SIZE);
-
+			length = (__u32) OCFS_ALIGN (alloSize, osb->sect_size);
 			buffer = ocfs_malloc (length);
 			if (buffer == NULL) {
 				LOG_ERROR_STATUS (status = -ENOMEM);
@@ -509,13 +517,9 @@ ocfs_create_oin_from_entry (ocfs_super *
 				}
 
 				for (j = 0; j < pOcfsExtent->next_free_ext; j++) {
-					tempVbo =
-					    pOcfsExtent->extents[j].disk_off;
-					tempLbo =
-					    pOcfsExtent->extents[j].disk_off;
-					tempSize =
-					    pOcfsExtent->extents[j].
-					    num_bytes;
+					tempVbo = pOcfsExtent->extents[j].file_off;
+					tempLbo = pOcfsExtent->extents[j].disk_off;
+					tempSize = pOcfsExtent->extents[j].num_bytes;
 
 					/* Add the Extent to extent map */
 					bRet =
@@ -523,18 +527,19 @@ ocfs_create_oin_from_entry (ocfs_super *
 								   &oin->map,
 								   tempVbo,
 								   tempLbo,
-								   (ub4)
 								   tempSize);
 					if (!bRet) {
 						LOG_ERROR_STATUS (status =
 								  -ENOMEM);
-						return (status);
+						goto leave;
 					}
 				}
 
 				if (pOcfsExtent->next_data_ext > 0) {
-					OCFS_ASSERT (pOcfsExtent->
-						     next_data_ext);
+					if (!pOcfsExtent->next_data_ext) {
+						LOG_ERROR_STATUS (status = -EFAIL);
+						goto leave;
+					}
 
 					status =
 					    ocfs_read_sector (osb, pOcfsExtent,
@@ -552,6 +557,9 @@ ocfs_create_oin_from_entry (ocfs_super *
 
 	*new_oin = oin;
       leave:
+	if (!*new_oin)
+		ocfs_release_oin (oin, true);
+
 	ocfs_safefree (buffer);
 
 	LOG_EXIT_STATUS (status);
@@ -563,53 +571,53 @@ ocfs_create_oin_from_entry (ocfs_super *
  */
 int
 ocfs_find_files_on_disk (ocfs_super * osb,
-		 ub8 parent_off,
+		 __u64 parent_off,
 		 struct qstr * file_name,
 		 ocfs_file_entry * fe, ocfs_file * ofile)
 {
 	int status = -ENOENT;
 	ocfs_dir_node *pDirNode = NULL;
-	ub8 thisDirNode, lockId;
+	__u64 thisDirNode, lockId;
 	int tmpstat;
-	bool bRet, bLockAcquired = false;
-	ocfs_lock_res *pLockResource;
+	bool bRet;
+	ocfs_lock_res *lockres = NULL;
 	bool bReadDirNode = true;
 	ocfs_file_entry *dirfe = NULL;
 	bool icky_vmalloc = false;
+	bool lock_acq = false;
 
-	LOG_ENTRY_ARGS ("osb=%p, parent=%u.%u, fname=%p, entry=%p, ofile=%p\n",
-			osb, parent_off, file_name, fe, ofile);
+	LOG_ENTRY_ARGS ("(osb=0x%p, poff=%u.%u, fe=0x%p)\n",
+			osb, parent_off, fe);
 
 	lockId = parent_off;
 
 	dirfe = ocfs_allocate_file_entry();
-	if (dirfe==NULL) {
-		status = -ENOMEM;
-		LOG_ERROR_STATUS (status);
+	if (dirfe == NULL) {
+		LOG_ERROR_STATUS (status = -ENOMEM);
 		goto leave;
 	}
-		
+
 	/* Get a shared lock on the directory... */
-	tmpstat = ocfs_acquire_lock (osb, lockId, OCFS_DLM_SHARED_LOCK, 
-				     FLAG_DIR, &pLockResource, dirfe);
-	if (tmpstat < 0) {
-		/* Volume should be disabled in this case */
-		status = tmpstat;
+	status = ocfs_acquire_lock (osb, lockId, OCFS_DLM_SHARED_LOCK, FLAG_DIR,
+				    &lockres, dirfe);
+	if (status < 0) {
+		if (status != -EINTR)
+			LOG_ERROR_STATUS (status);
 		goto leave;
 	}
-	bLockAcquired = true;
+
+	lock_acq = true;
 
 	if ((ofile == NULL)
 	    || ((ofile != NULL) && (ofile->curr_dir_buf == NULL))) {
 		pDirNode = ocfs_malloc (osb->vol_layout.dir_node_size);
 		if (pDirNode == NULL) {
-                        pDirNode = vmalloc (osb->vol_layout.dir_node_size);
-                        icky_vmalloc = true;
-                }
-                if (pDirNode == NULL) {
-                        icky_vmalloc = false;
-			status = -ENOMEM;
-			LOG_ERROR_STATUS (status);
+			pDirNode = vmalloc (osb->vol_layout.dir_node_size);
+			icky_vmalloc = true;
+		}
+		if (pDirNode == NULL) {
+			icky_vmalloc = false;
+			LOG_ERROR_STATUS (status = -ENOMEM);
 			goto leave;
 		}
 
@@ -632,14 +640,16 @@ ocfs_find_files_on_disk (ocfs_super * os
 	}
 
 	if (bReadDirNode) {
-		tmpstat = ocfs_read_dir_node (osb, pDirNode, thisDirNode);
-		if (tmpstat < 0) {
+		status = ocfs_read_dir_node (osb, pDirNode, thisDirNode);
+		if (status < 0) {
 			/* Volume should be disabled in this case */
-			status = tmpstat;
+			LOG_ERROR_STATUS (status);
 			goto leave;
 		}
 	}
 
+	status = -ENOENT;
+
 	/* if file_name is null here, it means that we want to walk the */
 	/* directory for all files if it is not null, it means we want */
 	/* a particular file */
@@ -659,28 +669,23 @@ ocfs_find_files_on_disk (ocfs_super * os
 	}
 
       leave:
-	if (bLockAcquired) {
-		if (pLockResource)	// WIM
-		{
-			tmpstat =
-			    ocfs_release_lock (osb, lockId, OCFS_DLM_SHARED_LOCK,
-					     FLAG_DIR, pLockResource, dirfe);
-			if (tmpstat < 0) {
-				// status = tmpstat ?  
-				/* Volume should be disabled in this case */
-			}
+	if (lock_acq) {
+		tmpstat = ocfs_release_lock (osb, lockId, OCFS_DLM_SHARED_LOCK,
+					     FLAG_DIR, lockres, dirfe);
+		if (tmpstat < 0) {
+			LOG_ERROR_STATUS (tmpstat);
+			/* Volume should be disabled in this case */
 		}
 	}
 
-	if (dirfe)
-		ocfs_release_file_entry(dirfe);
-
-       if (ofile == NULL && pDirNode) {
-               if (icky_vmalloc)
-                       vfree(pDirNode);
-               else
-                       ocfs_safefree(pDirNode);
+	ocfs_release_file_entry(dirfe);
+	ocfs_put_lockres (lockres);
 
+	if (ofile == NULL && pDirNode) {
+		if (icky_vmalloc)
+			vfree(pDirNode);
+		else
+			ocfs_safefree(pDirNode);
 	}
 
 	LOG_EXIT_STATUS (status);
@@ -691,14 +696,14 @@ ocfs_find_files_on_disk (ocfs_super * os
  *
  */
 void ocfs_initialize_dir_node (ocfs_super * osb, ocfs_dir_node * dir_node,
-			       ub8 bitmap_off, ub8 file_off, ub4 node)
+			       __u64 bitmap_off, __u64 file_off, __u32 node)
 {
 	LOG_ENTRY ();
 
 	memset (dir_node, 0, sizeof (ocfs_dir_node));
 	strcpy (dir_node->signature, OCFS_DIR_NODE_SIGNATURE);
 
-	dir_node->num_ents = (ub1) osb->max_dir_node_ent;
+	dir_node->num_ents = (__u8) osb->max_dir_node_ent;
 	dir_node->node_disk_off = bitmap_off;
 	dir_node->alloc_file_off = file_off;
 	dir_node->alloc_node = node;
@@ -723,20 +728,20 @@ void ocfs_initialize_dir_node (ocfs_supe
  */
 int
 ocfs_delete_file_entry (ocfs_super * osb,
-		 ocfs_file_entry * fe, ub8 parent_off, sb4 log_node_num)
+		 ocfs_file_entry * fe, __u64 parent_off, __s32 log_node_num)
 {
 	int status = 0;
-	ub4 size;
+	__u32 size;
 	ocfs_cleanup_record *pCleanupLogRec = NULL;
 
 	LOG_ENTRY ();
 
 	size = sizeof (ocfs_cleanup_record);
-	size = (ub4) OCFS_ALIGN (size, PAGE_SIZE);
+	size = (__u32) OCFS_ALIGN (size, PAGE_SIZE);
 
 	pCleanupLogRec = ocfs_malloc (size);
 	if (pCleanupLogRec == NULL) {
-		status = -ENOMEM;
+		LOG_ERROR_STATUS (status = -ENOMEM);
 		goto leave;
 	}
 
@@ -784,11 +789,15 @@ ocfs_delete_file_entry (ocfs_super * osb
 		/* TODO Free the index nodes too. */
 
 		status = ocfs_free_directory_block (osb, fe, log_node_num);
+		if (status < 0)
+			LOG_ERROR_STATUS (status);
 		goto leave;
 	} else {
 		/* Write to the cleanup record which bits need to be freed for */
 		/* the cluster bitmap */
 		status = ocfs_free_file_extents (osb, fe, log_node_num);
+		if (status < 0)
+			LOG_ERROR_STATUS (status);
 		goto leave;
 	}
 
@@ -804,43 +813,34 @@ ocfs_delete_file_entry (ocfs_super * osb
  */
 int
 ocfs_rename_file (ocfs_super * osb,
-		ub8 parent_off, struct qstr * file_name, ub8 file_off)
+		__u64 parent_off, struct qstr * file_name, __u64 file_off)
 {
 	int status = 0;
+	int tmpstat;
 	ocfs_dir_node *pLockNode = NULL;
-	ocfs_file_entry *dir_fe = NULL;
 	ocfs_file_entry *fe = NULL;
-	ub8 changeSeqNum = 0;
+	ocfs_file_entry *lockfe = NULL;
+	__u64 changeSeqNum = 0;
 	bool bAcquiredLock = false;
-	ub4 lockFlags = 0;
-	ocfs_lock_res *pLockResource;
-	ub8 lockId = 0;
+	__u32 lockFlags = 0;
+	ocfs_lock_res *pLockResource = NULL;
+	__u64 lockId = 0;
 	bool bParentLockAcquired = false;
-	ub4 parentLockFlags;
-	ocfs_lock_res *pParentLockResource;
-	ub8 parentLockId;
-	ub4 index;
+	__u32 parentLockFlags;
+	ocfs_lock_res *pParentLockResource = NULL;
+	__u64 parentLockId;
+	__u32 index;
 
 	LOG_ENTRY ();
 
-
 	parentLockId = parent_off;
 	parentLockFlags = (FLAG_FILE_CREATE | FLAG_DIR);
-
-	dir_fe = ocfs_allocate_file_entry();
-	if (dir_fe == NULL) {
-		status = -ENOMEM;
-		LOG_ERROR_STATUS(status);
-		goto leave;
-	}
-	pLockNode = (ocfs_dir_node *)dir_fe;
-
 	status = ocfs_acquire_lock (osb, parentLockId, OCFS_DLM_EXCLUSIVE_LOCK,
-				    (ub4) parentLockFlags, &pParentLockResource,
-				    dir_fe);  
+				    (__u32) parentLockFlags, &pParentLockResource,
+				    NULL);
 	if (status < 0) {
-		LOG_ERROR_ARGS ("Status 0x%08x for LockId %u.%u\n", status,
-				HI (parentLockId), LO (parentLockId));
+		if (status != -EINTR)
+			LOG_ERROR_STATUS (status);
 		goto leave;
 	}
 
@@ -852,20 +852,26 @@ ocfs_rename_file (ocfs_super * osb,
 		goto leave;
 	}
 
+	/* lock file ent for a dir is out in the 1st extent, this_sector for file */
 	if (fe->attribs & OCFS_ATTRIB_DIRECTORY) {
 		lockId = fe->extents[0].disk_off;
 		lockFlags = (FLAG_DIR | FLAG_FILE_RENAME);
+		lockfe = ocfs_allocate_file_entry(); 
+		if (lockfe == NULL) {
+			LOG_ERROR_STATUS (status = -ENOMEM);
+			goto leave;
+		}
 	} else {
 		lockId = fe->this_sector;
 		lockFlags = FLAG_FILE_RENAME;
+		lockfe = fe;
 	}
 
-	status =
-	    ocfs_acquire_lock (osb, lockId, OCFS_DLM_EXCLUSIVE_LOCK, lockFlags,
-			     &pLockResource, fe);
+	status = ocfs_acquire_lock (osb, lockId, OCFS_DLM_EXCLUSIVE_LOCK,
+				    lockFlags, &pLockResource, lockfe);
 	if (status < 0) {
-		LOG_ERROR_ARGS ("Status 0x%08x for LockId %u.%u\n", status,
-				HI (lockId), LO (lockId));
+		if (status != -EINTR)
+			LOG_ERROR_STATUS (status);
 		goto leave;
 	}
 
@@ -882,24 +888,24 @@ ocfs_rename_file (ocfs_super * osb,
 	SET_VALID_BIT (fe->sync_flags);
 	fe->sync_flags &= ~(OCFS_SYNC_FLAG_CHANGE);
 
+	status = ocfs_get_file_entry (osb, (ocfs_file_entry **) & pLockNode,
+				      fe->dir_node_ptr);
 	pLockNode->index_dirty = 1;
-	pLockNode->bad_off = (fe->this_sector -
-			      fe->dir_node_ptr) / osb->sect_size;
+	pLockNode->bad_off = (fe->this_sector - fe->dir_node_ptr) / osb->sect_size;
 	pLockNode->bad_off -= 1;
 
 	for (index = 0; index < pLockNode->num_ent_used; index++) {
-		if (pLockNode->index[index] == pLockNode->bad_off) {
+		if (pLockNode->index[index] == pLockNode->bad_off)
 			break;
-		}
 	}
 
 	if (index < pLockNode->num_ent_used) {
 		memmove (&pLockNode->index[index], &pLockNode->index[index + 1],
 			 pLockNode->num_ent_used - (index + 1));
-		pLockNode->index[pLockNode->num_ent_used - 1] =
-		    pLockNode->bad_off;
+		pLockNode->index[pLockNode->num_ent_used - 1] = pLockNode->bad_off;
 
-		status = ocfs_write_file_entry (osb, dir_fe, fe->dir_node_ptr);
+		status = ocfs_write_file_entry (osb, (ocfs_file_entry *) pLockNode,
+						fe->dir_node_ptr);
 		if (status < 0) {
 			LOG_ERROR_STATUS (status);
 			goto leave;
@@ -908,61 +914,53 @@ ocfs_rename_file (ocfs_super * osb,
 
 	status = ocfs_write_file_entry (osb, fe, fe->this_sector);
 	if (status < 0) {
-		LOG_TRACE_STR ("ocfs_write_file_entry failed!!!");
+		LOG_ERROR_STATUS (status);
 		goto leave;
 	}
 
-	LOG_TRACE_ARGS ("Wrote to sector %u.%u, name written was \"%s\"\n",
-			HI (fe->this_sector), LO (fe->this_sector),
-			fe->filename);
+	LOG_TRACE_ARGS ("sector=%u.%u, name=%s\n", HI (fe->this_sector),
+			LO (fe->this_sector), fe->filename);
 
+	/* Update the disk as the other node will not see this file directory */
 	if (DISK_LOCK_FILE_LOCK (pLockNode) < OCFS_DLM_ENABLE_CACHE_LOCK) {
-		/* Update the disk as the other node will not see this file directory */
 		status = ocfs_force_put_file_entry (osb, fe, true);
 		if (status < 0) {
+			LOG_ERROR_STATUS (status);
 			goto leave;
 		}
 	}
 
 	if (index < pLockNode->num_ent_used) {
-		LOG_TRACE_STR ("ocfs_reindex_dir_node being called");
 		status = ocfs_reindex_dir_node (osb, fe->dir_node_ptr, NULL);
+		if (status < 0) {
+			LOG_ERROR_STATUS (status);
+			goto leave;
+		}
 	}
 
       leave:
 
-	/* Release the file lock if we acquired it */
 	if (bAcquiredLock) {
-		status =
-		    ocfs_release_lock (osb, lockId, OCFS_DLM_EXCLUSIVE_LOCK,
-				     lockFlags, pLockResource, fe);
-		if (status < 0) {
-			LOG_ERROR_ARGS ("Status 0x%08x for LockId %u.%u\n",
-					status, HI (lockId), LO (lockId));
-		}
+		tmpstat = ocfs_release_lock (osb, lockId, OCFS_DLM_EXCLUSIVE_LOCK,
+					    lockFlags, pLockResource, lockfe);
+		if (tmpstat < 0)
+			LOG_ERROR_STATUS (tmpstat);
 	}
 
-	/* Release the file lock if we acquired it */
 	if (bParentLockAcquired) {
-		status =
-		    ocfs_release_lock (osb, parentLockId, OCFS_DLM_EXCLUSIVE_LOCK,
-				     parentLockFlags, pParentLockResource, dir_fe);
-		if (status < 0) {
-			LOG_ERROR_ARGS ("Status 0x%08x for LockId %u.%u\n",
-					status, HI (parentLockId),
-					LO (parentLockId));
-		}
-	}
-
-	/* free up fileentry */
-	if (fe) {
-		ocfs_release_file_entry (fe);
-	}
-
-	if (dir_fe) {
-		ocfs_release_file_entry (dir_fe);
+		tmpstat = ocfs_release_lock (osb, parentLockId,
+				OCFS_DLM_EXCLUSIVE_LOCK, parentLockFlags,
+				pParentLockResource, NULL);
+		if (tmpstat < 0)
+			LOG_ERROR_STATUS (tmpstat);
 	}
 
+	if (lockfe != fe)
+		ocfs_release_file_entry (lockfe);
+	ocfs_release_file_entry (fe);
+	ocfs_release_file_entry ((ocfs_file_entry *) pLockNode);
+	ocfs_put_lockres (pLockResource);
+	ocfs_put_lockres (pParentLockResource);
 	LOG_EXIT_STATUS (status);
 	return status;
 }				/* ocfs_rename_file */
@@ -971,21 +969,23 @@ ocfs_rename_file (ocfs_super * osb,
  *
  */
 int
-ocfs_del_file (ocfs_super * osb, ub8 parent_off, ub4 flags, ub8 file_off)
+ocfs_del_file (ocfs_super * osb, __u64 parent_off, __u32 flags, __u64 file_off)
 {
 	int status = 0;
+	int tmpstat;
 	ocfs_file_entry *fe = NULL;
-	ub4 size = 0;
+	__u32 size = 0;
 	ocfs_dir_node *pLockNode = NULL;
-	ub4 lockFlags=0;
+	__u32 lockFlags = 0;
 	bool bAcquiredLock = false;
-	ocfs_lock_res *pLockResource;
+	ocfs_lock_res *pLockResource = NULL;
 	ocfs_cleanup_record *pCleanupLogRec = NULL;
 	ocfs_log_record *pOcfsLogRec;
-	ub8 lockId = 0;
-	sb4 log_node_num = -1;
+	__u64 lockId = 0;
+	__u32 log_node_num = OCFS_INVALID_NODE_NUM;
 
-	LOG_ENTRY ();
+	LOG_ENTRY_ARGS ("(osb=0x%p, poff=%u.%u, fl=%u, foff=%u.%u)\n",
+			osb, HILO(parent_off), flags, HILO(file_off));
 
 	status = ocfs_get_file_entry (osb, &fe, file_off);
 	if (status < 0) {
@@ -1006,23 +1006,22 @@ ocfs_del_file (ocfs_super * osb, ub8 par
 		lockFlags = (FLAG_FILE_DELETE);
 		pLockNode = (ocfs_dir_node *)fe;
 	}
-	status =
-	    ocfs_acquire_lock (osb, lockId, OCFS_DLM_EXCLUSIVE_LOCK, lockFlags,
-			     &pLockResource, (ocfs_file_entry *) pLockNode);
+	status = ocfs_acquire_lock (osb, lockId, OCFS_DLM_EXCLUSIVE_LOCK,
+			lockFlags, &pLockResource, (ocfs_file_entry *) pLockNode);
 	if (status < 0) {
-		LOG_ERROR_ARGS ("Status 0x%08x for LockId %u.%u\n", status,
-				HI (lockId), LO (lockId));
+		if (status != -EINTR)
+			LOG_ERROR_STATUS (status);
 		goto leave;
 	}
 
 	bAcquiredLock = true;
 
 	size = sizeof (ocfs_cleanup_record);
-	size = (ub4) OCFS_ALIGN (size, PAGE_SIZE);
+	size = (__u32) OCFS_ALIGN (size, PAGE_SIZE);
 
 	pCleanupLogRec = ocfs_malloc (size);
 	if (pCleanupLogRec == NULL) {
-		status = -ENOMEM;
+		LOG_ERROR_STATUS (status = -ENOMEM);
 		goto leave;
 	}
 
@@ -1040,10 +1039,11 @@ ocfs_del_file (ocfs_super * osb, ub8 par
 		pCleanupLogRec->rec.del.parent_dirnode_off = parent_off;
 		pCleanupLogRec->rec.del.flags = 0;
 
-		status =
-		    ocfs_write_node_log (osb, (ocfs_log_record *) pCleanupLogRec,
-				      log_node_num, LOG_CLEANUP);
+		status = ocfs_write_node_log (osb,
+				(ocfs_log_record *) pCleanupLogRec,
+				log_node_num, LOG_CLEANUP);
 		if (status < 0) {
+			LOG_ERROR_STATUS (status);
 			goto leave;
 		}
 		status = 0;
@@ -1093,26 +1093,20 @@ ocfs_del_file (ocfs_super * osb, ub8 par
         /* NEW: adding a fake release lock for the dead file entry here */
         /* need this to alert dentry-owners on other nodes */
         /* Release the file lock if we acquired it */
-	if (bAcquiredLock && lockFlags!=0 && lockId!=0) {
-		status = ocfs_release_lock (osb, lockId, OCFS_DLM_EXCLUSIVE_LOCK,
-				     lockFlags, pLockResource, 
-				     (ocfs_file_entry *)pLockNode);
-		if (status < 0) {
-			LOG_ERROR_ARGS ("Status 0x%08x for LockId %u.%u\n",
-					status, HI (lockId), LO (lockId));
-		}
+	if (bAcquiredLock && lockFlags != 0 && lockId != 0) {
+		tmpstat = ocfs_release_lock (osb, lockId, OCFS_DLM_EXCLUSIVE_LOCK,
+					    lockFlags, pLockResource,
+					    (ocfs_file_entry *)pLockNode);
+		if (tmpstat < 0)
+			LOG_ERROR_STATUS (tmpstat);
 	}
 
-	if ((fe != (ocfs_file_entry *) pLockNode) && (pLockNode)) {
+	if ((fe != (ocfs_file_entry *) pLockNode))
 		ocfs_release_file_entry ((ocfs_file_entry *) pLockNode);
-	}
-
-	if (fe) {
-		ocfs_release_file_entry (fe);
-	}
 
+	ocfs_release_file_entry (fe);
 	ocfs_safefree (pCleanupLogRec);
-
+	ocfs_put_lockres (pLockResource);
 	LOG_EXIT_STATUS (status);
 	return status;
 }				/* ocfs_del_file */
@@ -1120,41 +1114,36 @@ ocfs_del_file (ocfs_super * osb, ub8 par
 /* ocfs_extend_file()
  *
  */
-int ocfs_extend_file (ocfs_super * osb, ub8 parent_off,
-		ocfs_inode * oin, ub8 file_size, ub8 * file_off)
+int ocfs_extend_file (ocfs_super * osb, __u64 parent_off,
+		ocfs_inode * oin, __u64 file_size, __u64 * file_off)
 {
 	int status = 0;
 	int tmpstat;
 	ocfs_dir_node *pLockNode = NULL;
 	ocfs_file_entry *fileEntry = NULL;
-	ub8 tempOffset = 0;
-	ub8 allocSize = 0;
-	ub4 size;
-	ub8 bitmapOffset = 0;
-	ub8 numClustersAlloc = 0;
-	ub8 lockId = 0;
-	ub4 lockFlags = 0;
+	__u64 tempOffset = 0;
+	__u64 allocSize = 0;
+	__u32 size;
+	__u64 bitmapOffset = 0;
+	__u64 numClustersAlloc = 0;
+	__u64 lockId = 0;
+	__u32 lockFlags = 0;
 	bool bFileLockAcquired = false;
 	bool bAcquiredLock = false;
-	ocfs_lock_res *pLockResource;
-	ub8 changeSeqNum = 0;
-	ub8 actualDiskOffset = 0;
-	ub8 actualLength = 0;
+	ocfs_lock_res *pLockResource = NULL;
+	__u64 changeSeqNum = 0;
+	__u64 actualDiskOffset = 0;
+	__u64 actualLength = 0;
 	bool bCacheLock = false;
 
 	LOG_ENTRY ();
 
-	if (file_size == 0) {
+	if (file_size == 0)
 		goto leave;
-	}
-
-	LOG_TRACE_STR ("Extending File");
 
-	/* allocate memory for fileentry */
 	fileEntry = ocfs_allocate_file_entry ();
 	if (fileEntry == NULL) {
-		status = -ENOMEM;
-		LOG_ERROR_STATUS (status);
+		LOG_ERROR_STATUS (status = -ENOMEM);
 		goto leave;
 	}
 
@@ -1164,9 +1153,15 @@ int ocfs_extend_file (ocfs_super * osb, 
 		goto leave;
 	}
 
+	if (!IS_VALID_FILE_ENTRY(fileEntry)) {
+		LOG_ERROR_ARGS ("Invalid fe at offset %u.%u", HI(*file_off),
+				LO(*file_off));
+		status = -EFAIL;
+		goto leave;
+	}
+
 	/* Grab a lock on the entry found if we have more than 1 extents and */
 	/* also make this node the master*/
-	/* Acquire the Lock using ipc and disk based locking */
 
 	/* now we always take an EXTEND lock */
 	lockId = fileEntry->this_sector;
@@ -1179,19 +1174,14 @@ int ocfs_extend_file (ocfs_super * osb, 
 		bCacheLock = true;
 	}
 
-	if (bCacheLock)
-		status =
-		    ocfs_acquire_lock (osb, lockId, OCFS_DLM_ENABLE_CACHE_LOCK,
-				     lockFlags, &pLockResource,
-				     (ocfs_file_entry *) pLockNode);
-	else
-		status =
-		    ocfs_acquire_lock (osb, lockId, OCFS_DLM_EXCLUSIVE_LOCK,
-				     lockFlags, &pLockResource,
-				     (ocfs_file_entry *) pLockNode);
+	status = ocfs_acquire_lock (osb, lockId,
+				    (bCacheLock ? OCFS_DLM_ENABLE_CACHE_LOCK :
+				                  OCFS_DLM_EXCLUSIVE_LOCK),
+				    lockFlags, &pLockResource,
+				    (ocfs_file_entry *) pLockNode);
 	if (status < 0) {
-		LOG_ERROR_ARGS ("Status 0x%08x for LockId %u.%u\n", status,
-				HI (lockId), LO (lockId));
+		if (status != -EINTR)
+			LOG_ERROR_STATUS (status);
 		goto leave;
 	}
 
@@ -1202,7 +1192,7 @@ int ocfs_extend_file (ocfs_super * osb, 
 		DISK_LOCK_CURRENT_MASTER (fileEntry) = osb->node_num;
 	}
 
-	if (file_size > (sb8) fileEntry->alloc_size) {
+	if (file_size > (__s64) fileEntry->alloc_size) {
 		allocSize = file_size - fileEntry->alloc_size;
 
 		/* TODO: We can add something here so that after 2-3 allocations, */
@@ -1210,19 +1200,18 @@ int ocfs_extend_file (ocfs_super * osb, 
 		/* in order to try to use the Extents of File Entry only and ofcourse */
 		/* the file will have more contigous disk space. */
 		{
-			ub8 tempSize = fileEntry->alloc_size;
+			__u64 tempSize = fileEntry->alloc_size;
 
 			if (tempSize > ONE_MEGA_BYTE)
 				tempSize = ONE_MEGA_BYTE;
 			allocSize += (tempSize * 2);
 		}
 
-		status =
-		    ocfs_find_contiguous_space_from_bitmap (osb, allocSize,
-						   &bitmapOffset,
-						   &numClustersAlloc, false);
+		status = ocfs_find_contiguous_space_from_bitmap (osb, allocSize,
+					&bitmapOffset, &numClustersAlloc, false);
 		if (status < 0) {
-			LOG_ERROR_STATUS (status);
+			if (status != -ENOSPC)
+				LOG_ERROR_STATUS (status);
 			goto leave;
 		}
 
@@ -1230,25 +1219,25 @@ int ocfs_extend_file (ocfs_super * osb, 
 		    (bitmapOffset * osb->vol_layout.cluster_size) +
 		    osb->vol_layout.data_start_off;
 		actualLength =
-		    (ub8) (numClustersAlloc * osb->vol_layout.cluster_size);
+		    (__u64) (numClustersAlloc * osb->vol_layout.cluster_size);
 
 		/* note: ok if oin is null here, not used in ocfs_allocate_extent */
-		status =
-		    ocfs_allocate_extent (osb, oin, fileEntry, actualDiskOffset,
-					actualLength);
+		status = ocfs_allocate_extent (osb, oin, fileEntry,
+					actualDiskOffset, actualLength);
 		if (status < 0) {
-			/* Error ....or may be disk full */
+			LOG_ERROR_STATUS (status);
 			goto leave;
 		}
 
 		/* update the total allocation size here */
-		fileEntry->alloc_size +=
-		    (numClustersAlloc * osb->vol_layout.cluster_size);
+		fileEntry->alloc_size += actualLength;
+
 		if (oin) {
 			ocfs_down_sem (&(oin->main_res), true);
 			oin->alloc_size = fileEntry->alloc_size;
 			ocfs_up_sem (&(oin->main_res));
 		}
+
 		/* no need to do OCFS_SECTOR_ALIGN once the allocation size is correct. */
 		DISK_LOCK_SEQNUM (fileEntry) = changeSeqNum;
 	}
@@ -1263,10 +1252,10 @@ int ocfs_extend_file (ocfs_super * osb, 
 	fileEntry->modify_time = CURRENT_TIME;
 
 	tempOffset = fileEntry->this_sector;
-	size = (ub4) OCFS_ALIGN (sizeof (ocfs_file_entry), osb->sect_size);
+	size = (__u32) OCFS_ALIGN (sizeof (ocfs_file_entry), osb->sect_size);
 
-	status =
-	    ocfs_write_file_entry (osb, (ocfs_file_entry *) fileEntry, tempOffset);
+	status = ocfs_write_file_entry (osb, (ocfs_file_entry *) fileEntry,
+					tempOffset);
 	if (status < 0) {
 		LOG_ERROR_STATUS (status);
 		goto leave;
@@ -1278,30 +1267,18 @@ int ocfs_extend_file (ocfs_super * osb, 
 	/* He shd set the state */
 
       leave:
-	/* Release the file lock if we acquired it */
 	if (bAcquiredLock) {
-
-		if (bFileLockAcquired) {
+		if (bFileLockAcquired)
 			lockFlags |= FLAG_FILE_UPDATE_OIN;
-		}
-
-		tmpstat =
-		    ocfs_release_lock (osb, lockId, OCFS_DLM_EXCLUSIVE_LOCK,
-				     lockFlags, pLockResource, fileEntry);
-		if (tmpstat < 0) {
-			status = tmpstat;
-			LOG_ERROR_ARGS ("Status 0x%08x for LockId %u.%u\n",
-					status, HI (fileEntry->this_sector),
-					LO (fileEntry->this_sector));
-		}
-	}
 
-	/* free up fileentry */
-	if (fileEntry) {
-		ocfs_release_file_entry (fileEntry);
-		fileEntry = NULL;
+		tmpstat = ocfs_release_lock (osb, lockId, OCFS_DLM_EXCLUSIVE_LOCK,
+					     lockFlags, pLockResource, fileEntry);
+		if (tmpstat < 0)
+			LOG_ERROR_STATUS (tmpstat);
 	}
 
+	ocfs_release_file_entry (fileEntry);
+	ocfs_put_lockres (pLockResource);
 	LOG_EXIT_STATUS (status);
 	return status;
 }				/* ocfs_extend_file */
@@ -1310,30 +1287,29 @@ int ocfs_extend_file (ocfs_super * osb, 
  *
  */
 int ocfs_change_file_size (ocfs_super * osb,
-		    ub8 parent_off,
+		    __u64 parent_off,
 		    ocfs_inode * oin,
-		    ub8 file_size, ub8 * file_off, struct iattr *attr)
+		    __u64 file_size, __u64 * file_off, struct iattr *attr)
 {
 	int status = 0;
 	int tmpstat;
 	ocfs_dir_node *pLockNode = NULL;
 	ocfs_file_entry *fileEntry = NULL;
-	ub8 dirOffset = 0;
-	ub4 size;
+	__u64 dirOffset = 0;
+	__u32 size;
 	bool bFileLockAcquired = false;
 	bool bAcquiredLock = false;
-	ocfs_lock_res *pLockResource;
-	ub8 changeSeqNum = 0;
-	ub8 lockId = 0;
-	ub4 lockFlags = 0;
+	ocfs_lock_res *pLockResource = NULL;
+	__u64 changeSeqNum = 0;
+	__u64 lockId = 0;
+	__u32 lockFlags = 0;
 	bool bCacheLock = false;
 
 	LOG_ENTRY ();
 
 	fileEntry = ocfs_allocate_file_entry ();
 	if (fileEntry == NULL) {
-		status = -ENOMEM;
-		LOG_ERROR_STATUS (status);
+		LOG_ERROR_STATUS (status = -ENOMEM);
 		goto leave;
 	}
 
@@ -1343,6 +1319,13 @@ int ocfs_change_file_size (ocfs_super * 
 		goto leave;
 	}
 
+	if (!IS_VALID_FILE_ENTRY(fileEntry)) {
+		LOG_ERROR_ARGS ("Invalid fe at offset %u.%u", HI(*file_off),
+				LO(*file_off));
+		status = -EFAIL;
+		goto leave;
+	}
+
 	/* Acquire the Lock using TCP/IP and disk based locking */
 	if ((DISK_LOCK_FILE_LOCK (fileEntry) == OCFS_DLM_ENABLE_CACHE_LOCK) &&
 	    (DISK_LOCK_CURRENT_MASTER (fileEntry) == osb->node_num)) {
@@ -1355,20 +1338,14 @@ int ocfs_change_file_size (ocfs_super * 
 	bFileLockAcquired = true;
 	pLockNode = (ocfs_dir_node *)fileEntry;
 
-	if (bCacheLock)
-		status =
-		    ocfs_acquire_lock (osb, lockId, OCFS_DLM_ENABLE_CACHE_LOCK,
-				     lockFlags, &pLockResource,
-				     (ocfs_file_entry *) pLockNode);
-	else
-		status =
-		    ocfs_acquire_lock (osb, lockId, OCFS_DLM_EXCLUSIVE_LOCK,
-				     lockFlags, &pLockResource,
-				     (ocfs_file_entry *) pLockNode);
-	if (status < 0) {
-		LOG_ERROR_ARGS ("Status 0x%08x for LockId %u.%u\n", status,
-				HI (fileEntry->this_sector),
-				LO (fileEntry->this_sector));
+	status = ocfs_acquire_lock (osb, lockId,
+				    (bCacheLock ? OCFS_DLM_ENABLE_CACHE_LOCK :
+				    		  OCFS_DLM_EXCLUSIVE_LOCK),
+				    lockFlags, &pLockResource,
+				    (ocfs_file_entry *) pLockNode);
+	if (status < 0) {
+		if (status != -EINTR)
+			LOG_ERROR_STATUS (status);
 		goto leave;
 	}
 
@@ -1379,6 +1356,8 @@ int ocfs_change_file_size (ocfs_super * 
 		DISK_LOCK_CURRENT_MASTER (fileEntry) = osb->node_num;
 	}
 
+	fileEntry->modify_time = CURRENT_TIME;
+
 	DISK_LOCK_SEQNUM (fileEntry) = changeSeqNum;
 	if (attr->ia_valid & ATTR_SIZE)
 		fileEntry->file_size = attr->ia_size;
@@ -1388,6 +1367,10 @@ int ocfs_change_file_size (ocfs_super * 
 		fileEntry->gid = attr->ia_gid;
 	if (attr->ia_valid & ATTR_MODE)
 		fileEntry->prot_bits = attr->ia_mode & 0007777;
+	if (attr->ia_valid & ATTR_CTIME)
+		fileEntry->create_time = attr->ia_ctime;
+	if (attr->ia_valid & ATTR_MTIME)
+		fileEntry->modify_time = attr->ia_mtime;
 
 	/* Set the valid bit here */
 	SET_VALID_BIT (fileEntry->sync_flags);
@@ -1395,9 +1378,7 @@ int ocfs_change_file_size (ocfs_super * 
 
 	dirOffset = fileEntry->this_sector;
 
-	fileEntry->modify_time = CURRENT_TIME;
-
-	size = (ub4) OCFS_SECTOR_ALIGN (sizeof (ocfs_file_entry));
+	size = (__u32) OCFS_SECTOR_ALIGN (sizeof (ocfs_file_entry));
 	status =
 	    ocfs_write_file_entry (osb, (ocfs_file_entry *) fileEntry, dirOffset);
 	if (status < 0) {
@@ -1406,28 +1387,18 @@ int ocfs_change_file_size (ocfs_super * 
 	}
 
       leave:
-	/* Release the file lock if we acquired it */
 	if (bAcquiredLock) {
-		if (bFileLockAcquired) {
+		if (bFileLockAcquired)
 			lockFlags |= FLAG_FILE_UPDATE_OIN;
-		}
 
-		tmpstat =
-		    ocfs_release_lock (osb, lockId, OCFS_DLM_EXCLUSIVE_LOCK,
-				     lockFlags, pLockResource, fileEntry);
-		if (tmpstat < 0) {
-			status = tmpstat;
-			LOG_ERROR_ARGS ("Status 0x%08x for LockId %u.%u\n",
-					status, HI (fileEntry->this_sector),
-					LO (fileEntry->this_sector));
-		}
-	}
-
-	/* free up fileentry */
-	if (fileEntry) {
-		ocfs_release_file_entry (fileEntry);
+		tmpstat = ocfs_release_lock (osb, lockId, OCFS_DLM_EXCLUSIVE_LOCK,
+					     lockFlags, pLockResource, fileEntry);
+		if (tmpstat < 0)
+			LOG_ERROR_STATUS (tmpstat);
 	}
 
+	ocfs_release_file_entry (fileEntry);
+	ocfs_put_lockres (pLockResource);
 	LOG_EXIT_STATUS (status);
 	return status;
 }				/* ocfs_change_file_size */
@@ -1435,21 +1406,22 @@ int ocfs_change_file_size (ocfs_super * 
 /* ocfs_create_directory()
  *
  */
-int ocfs_create_directory (ocfs_super * osb, ub8 parent_off, ocfs_file_entry * fe)
+int ocfs_create_directory (ocfs_super * osb, __u64 parent_off, ocfs_file_entry * fe)
 {
 	int status = 0;
+	int tmpstat;
 	ocfs_file_entry *fileEntry = NULL;
 	ocfs_dir_node *PDirNode = NULL;
 	ocfs_dir_node *PNewDirNode = NULL;
 	ocfs_dir_node *pLockNode = NULL;
-	ub4 size;
-	ub8 allocSize = 0;
-	ub8 bitmapOffset;
-	ub8 numClustersAlloc = 0;
-	ub8 fileOffset = 0;
-	ub8 lockId = 0;
-	ocfs_lock_res *pLockResource;
-	ub4 lockFlags = 0;
+	__u32 size;
+	__u64 allocSize = 0;
+	__u64 bitmapOffset;
+	__u64 numClustersAlloc = 0;
+	__u64 fileOffset = 0;
+	__u64 lockId = 0;
+	ocfs_lock_res *pLockResource = NULL;
+	__u32 lockFlags = 0;
 	bool bAcquiredLock = false;
 
 	LOG_ENTRY ();
@@ -1458,21 +1430,19 @@ int ocfs_create_directory (ocfs_super * 
 
 	pLockNode = (ocfs_dir_node *) ocfs_allocate_file_entry ();
 	if (pLockNode == NULL) {
-		status = -ENOMEM;
-		LOG_ERROR_STATUS (status);
+		LOG_ERROR_STATUS (status = -ENOMEM);
 		goto leave;
 	}
 
 	lockId = parent_off;
 	lockFlags = FLAG_FILE_CREATE | FLAG_DIR;
 
-	/* acquire the lock */
-	status =
-	    ocfs_acquire_lock (osb, lockId, OCFS_DLM_EXCLUSIVE_LOCK, lockFlags,
-			     &pLockResource, (ocfs_file_entry *) pLockNode);
+	status = ocfs_acquire_lock (osb, lockId, OCFS_DLM_EXCLUSIVE_LOCK,
+				    lockFlags, &pLockResource,
+				    (ocfs_file_entry *) pLockNode);
 	if (status < 0) {
-		LOG_ERROR_ARGS ("Status 0x%08x for LockId %u.%u\n", status,
-				HI (lockId), LO (lockId));
+		if (status != -EINTR)
+			LOG_ERROR_STATUS (status);
 		goto leave;
 	}
 
@@ -1484,9 +1454,9 @@ int ocfs_create_directory (ocfs_super * 
 
 	allocSize = osb->vol_layout.dir_node_size;
 
-	status = ocfs_alloc_node_block (osb, allocSize, &bitmapOffset, &fileOffset,
-				 &numClustersAlloc, osb->node_num,
-				 DISK_ALLOC_DIR_NODE);
+	status = ocfs_alloc_node_block (osb, allocSize, &bitmapOffset,
+				&fileOffset, &numClustersAlloc, osb->node_num,
+				DISK_ALLOC_DIR_NODE);
 	if (status < 0) {
 		LOG_ERROR_STATUS (status);
 		goto leave;
@@ -1501,28 +1471,27 @@ int ocfs_create_directory (ocfs_super * 
 	if (DISK_LOCK_FILE_LOCK (pLockNode) != OCFS_DLM_ENABLE_CACHE_LOCK)
 		DISK_LOCK_FILE_LOCK (fileEntry) = OCFS_DLM_NO_LOCK;
 
-	size = (ub4) (osb->vol_layout.dir_node_size);
+	size = (__u32) (osb->vol_layout.dir_node_size);
 	PDirNode = ocfs_malloc (size);
 	if (PDirNode == NULL) {
-		status = -ENOMEM;
-		LOG_ERROR_STATUS (status);
+		LOG_ERROR_STATUS (status = -ENOMEM);
 		goto leave;
 	}
 
 	PNewDirNode = PDirNode;
-	size = (ub4) (osb->vol_layout.dir_node_size);
+	size = (__u32) (osb->vol_layout.dir_node_size);
 	memset (PNewDirNode, 0, size);
 
 	ocfs_initialize_dir_node (osb, PNewDirNode, bitmapOffset, fileOffset,
-			   osb->node_num);
+				  osb->node_num);
 
 	DISK_LOCK_CURRENT_MASTER (PNewDirNode) = osb->node_num;
 	DISK_LOCK_FILE_LOCK (PNewDirNode) = OCFS_DLM_ENABLE_CACHE_LOCK;
 	PNewDirNode->dir_node_flags |= DIR_NODE_FLAG_ROOT;
 
-	status =
-	    ocfs_write_metadata (osb, PNewDirNode, osb->vol_layout.dir_node_size,
-			       PNewDirNode->node_disk_off);
+	status = ocfs_write_metadata (osb, PNewDirNode,
+				      osb->vol_layout.dir_node_size,
+				      PNewDirNode->node_disk_off);
 	if (status < 0) {
 		LOG_ERROR_STATUS (status);
 		goto leave;
@@ -1548,16 +1517,15 @@ int ocfs_create_directory (ocfs_super * 
 	} else {
 		/* Goto the deleted tail or the free node pointer */
 		if (pLockNode->next_del_ent_node == -1) {
-			status =
-			    ocfs_read_dir_node (osb, PDirNode,
-					     pLockNode->free_node_ptr);
+			status = ocfs_read_dir_node (osb, PDirNode,
+						     pLockNode->free_node_ptr);
 			if (status < 0) {
 				LOG_ERROR_STATUS (status);
 				goto leave;
 			}
 		} else {
 			status = ocfs_read_dir_node (osb, PDirNode,
-						  pLockNode->next_del_ent_node);
+						     pLockNode->next_del_ent_node);
 			if (status < 0) {
 				LOG_ERROR_STATUS (status);
 				goto leave;
@@ -1569,13 +1537,13 @@ int ocfs_create_directory (ocfs_super * 
 		DISK_LOCK_FILE_LOCK (fileEntry) = OCFS_DLM_NO_LOCK;
 
 	OcfsQuerySystemTime (&DISK_LOCK_LAST_WRITE (fileEntry));
-	OcfsQuerySystemTime (&DISK_LOCK_LAST_WRITE (fileEntry));
+	OcfsQuerySystemTime (&DISK_LOCK_LAST_READ (fileEntry));
 
 	DISK_LOCK_WRITER_NODE (fileEntry) = osb->node_num;
 	DISK_LOCK_READER_NODE (fileEntry) = osb->node_num;
 
-	status =
-	    ocfs_insert_file (osb, PDirNode, fileEntry, pLockNode, pLockResource);
+	status = ocfs_insert_file (osb, PDirNode, fileEntry, pLockNode,
+				   pLockResource);
 	if (status < 0) {
 		LOG_ERROR_STATUS (status);
 		goto leave;
@@ -1585,18 +1553,15 @@ int ocfs_create_directory (ocfs_super * 
 
       leave:
 	if (bAcquiredLock) {
-		status =
-		    ocfs_release_lock (osb, lockId, OCFS_DLM_EXCLUSIVE_LOCK,
-				     lockFlags, pLockResource, 
-				     (ocfs_file_entry *) pLockNode);
-		if (status < 0) {
-			LOG_ERROR_ARGS ("Status 0x%08x for LockId %u.%u\n",
-					status, HI (lockId), LO (lockId));
-		}
+		tmpstat = ocfs_release_lock (osb, lockId, OCFS_DLM_EXCLUSIVE_LOCK,
+					     lockFlags, pLockResource,
+					     (ocfs_file_entry *) pLockNode);
+		if (tmpstat < 0)
+			LOG_ERROR_STATUS (tmpstat);
 	}
 	ocfs_safefree (PDirNode);
 	ocfs_release_file_entry ((ocfs_file_entry *) pLockNode);
-
+	ocfs_put_lockres (pLockResource);
 	LOG_EXIT_STATUS (status);
 	return status;
 }				/* ocfs_create_directory */
@@ -1604,16 +1569,17 @@ int ocfs_create_directory (ocfs_super * 
 /* ocfs_create_file()
  *
  */
-int ocfs_create_file (ocfs_super * osb, ub8 parent_off, ocfs_file_entry * fe)
+int ocfs_create_file (ocfs_super * osb, __u64 parent_off, ocfs_file_entry * fe)
 {
 	int status = 0;
+	int tmpstat;
 	ocfs_file_entry *fileEntry = NULL;
 	ocfs_dir_node *PDirNode = NULL;
 	ocfs_dir_node *pLockNode = NULL;
-	ub4 size;
-	ub8 lockId = 0;
-	ocfs_lock_res *pLockResource;
-	ub4 lockFlags = 0;
+	__u32 size;
+	__u64 lockId = 0;
+	ocfs_lock_res *pLockResource = NULL;
+	__u32 lockFlags = 0;
 	bool bAcquiredLock = false;
 
 	LOG_ENTRY ();
@@ -1623,21 +1589,19 @@ int ocfs_create_file (ocfs_super * osb, 
 	/* ent to mark this one as free now. */
 	pLockNode = (ocfs_dir_node *) ocfs_allocate_file_entry ();
 	if (pLockNode == NULL) {
-		status = -ENOMEM;
-		LOG_ERROR_STATUS (status);
+		LOG_ERROR_STATUS (status = -ENOMEM);
 		goto leave;
 	}
 
 	lockId = parent_off;
 	lockFlags = FLAG_FILE_CREATE | FLAG_DIR;
 
-	/* acquire the lock */
-	status =
-	    ocfs_acquire_lock (osb, lockId, OCFS_DLM_EXCLUSIVE_LOCK, lockFlags,
-			     &pLockResource, (ocfs_file_entry *) pLockNode);
+	status = ocfs_acquire_lock (osb, lockId, OCFS_DLM_EXCLUSIVE_LOCK,
+				    lockFlags, &pLockResource,
+				    (ocfs_file_entry *) pLockNode);
 	if (status < 0) {
-		LOG_ERROR_ARGS ("Status 0x%08x for LockId %u.%u\n", status,
-				HI (lockId), LO (lockId));
+		if (status != -EINTR)
+			LOG_ERROR_STATUS (status);
 		goto leave;
 	}
 
@@ -1646,11 +1610,10 @@ int ocfs_create_file (ocfs_super * osb, 
 	/* Change the name and write it back... */
 	fileEntry = fe;
 
-	size = (ub4) (osb->vol_layout.dir_node_size);
+	size = (__u32) (osb->vol_layout.dir_node_size);
 	PDirNode = ocfs_malloc (size);
 	if (PDirNode == NULL) {
-		status = -ENOMEM;
-		LOG_ERROR_STATUS (status);
+		LOG_ERROR_STATUS (status = -ENOMEM);
 		goto leave;
 	}
 
@@ -1663,16 +1626,15 @@ int ocfs_create_file (ocfs_super * osb, 
 	} else {
 		/* Goto the deleted tail or the free node pointer */
 		if (pLockNode->next_del_ent_node == -1) {
-			status =
-			    ocfs_read_dir_node (osb, PDirNode,
-					     pLockNode->free_node_ptr);
+			status = ocfs_read_dir_node (osb, PDirNode,
+						     pLockNode->free_node_ptr);
 			if (status < 0) {
 				LOG_ERROR_STATUS (status);
 				goto leave;
 			}
 		} else {
 			status = ocfs_read_dir_node (osb, PDirNode,
-						  pLockNode->next_del_ent_node);
+						pLockNode->next_del_ent_node);
 			if (status < 0) {
 				LOG_ERROR_STATUS (status);
 				goto leave;
@@ -1680,13 +1642,13 @@ int ocfs_create_file (ocfs_super * osb, 
 		}
 	}
 	OcfsQuerySystemTime (&DISK_LOCK_LAST_WRITE (fileEntry));
-	OcfsQuerySystemTime (&DISK_LOCK_LAST_WRITE (fileEntry));
+	OcfsQuerySystemTime (&DISK_LOCK_LAST_READ (fileEntry));
 
 	DISK_LOCK_WRITER_NODE (fileEntry) = osb->node_num;
 	DISK_LOCK_READER_NODE (fileEntry) = osb->node_num;
 
-	status =
-	    ocfs_insert_file (osb, PDirNode, fileEntry, pLockNode, pLockResource);
+	status = ocfs_insert_file (osb, PDirNode, fileEntry, pLockNode,
+				   pLockResource);
 	if (status < 0) {
 		LOG_ERROR_STATUS (status);
 		goto leave;
@@ -1696,18 +1658,15 @@ int ocfs_create_file (ocfs_super * osb, 
 
       leave:
 	if (bAcquiredLock) {
-		status =
-		    ocfs_release_lock (osb, lockId, OCFS_DLM_EXCLUSIVE_LOCK,
-				     lockFlags, pLockResource, 
-				     (ocfs_file_entry *) pLockNode);
-		if (status < 0) {
-			LOG_ERROR_ARGS ("Status 0x%08x for LockId %u.%u\n",
-					status, HI (lockId), LO (lockId));
-		}
+		tmpstat = ocfs_release_lock (osb, lockId, OCFS_DLM_EXCLUSIVE_LOCK,
+					     lockFlags, pLockResource,
+					     (ocfs_file_entry *) pLockNode);
+		if (tmpstat < 0)
+			LOG_ERROR_STATUS (tmpstat);
 	}
 	ocfs_safefree (PDirNode);
 	ocfs_release_file_entry ((ocfs_file_entry *) pLockNode);
-
+	ocfs_put_lockres (pLockResource);
 	LOG_EXIT_STATUS (status);
 	return status;
 }				/* ocfs_create_file */
@@ -1720,37 +1679,40 @@ int ocfs_create_file (ocfs_super * osb, 
  */
 int
 ocfs_create_modify_file (ocfs_super * osb,
-		  ub8 parent_off,
+		  __u64 parent_off,
 		  ocfs_inode * oin,
 		  struct qstr * file_name,
-		  ub8 file_size,
-		  ub8 * file_off, ub4 flags, ocfs_file_entry * fe, struct iattr *attr)
+		  __u64 file_size,
+		  __u64 * file_off, __u32 flags, ocfs_file_entry * fe, struct iattr *attr)
 {
 	int status = 0;
 	int tmpstat = 0;
 	ocfs_file_entry *newfe = NULL;
-	ub8 changeSeqNum = 0;
-        ub8 t;
+	__u64 changeSeqNum = 0;
+        __u64 t;
 
-	LOG_ENTRY ();
+	LOG_ENTRY_ARGS ("(osb=0x%p, poff=%u.%u, fe=0x%p)\n",
+			osb, HILO(parent_off), fe);
 
 	ocfs_start_trans (osb);
 
 	changeSeqNum = osb->curr_trans_id;
 	switch (flags) {
 	    case FLAG_FILE_EXTEND:
-		    status = ocfs_extend_file (osb, parent_off, oin, file_size, file_off);
+		    status = ocfs_extend_file (osb, parent_off, oin, file_size,
+					       file_off);
 		    if (status < 0) {
-			    LOG_ERROR_STATUS (status);
+			    if (status != -ENOSPC && status != -EINTR)
+			    	LOG_ERROR_STATUS (status);
 			    goto leave;
 		    }
 		    break;
 
 	    case FLAG_FILE_DELETE:
-		    status =
-			ocfs_del_file (osb, parent_off, 0, *file_off);
+		    status = ocfs_del_file (osb, parent_off, 0, *file_off);
 		    if (status < 0) {
-			    LOG_ERROR_STATUS (status);
+			    if (status != -EINTR && status != -ENOTEMPTY)
+				    LOG_ERROR_STATUS (status);
 			    goto leave;
 		    }
 		    break;
@@ -1759,8 +1721,7 @@ ocfs_create_modify_file (ocfs_super * os
 		    if (fe == NULL) {
 			    newfe = ocfs_allocate_file_entry ();
 			    if (newfe == NULL) {
-				    status = -ENOMEM;
-				    LOG_ERROR_STATUS (status);
+				    LOG_ERROR_STATUS (status = -ENOMEM);
 				    goto leave;
 			    }
 		    } else {
@@ -1793,14 +1754,18 @@ ocfs_create_modify_file (ocfs_super * os
 		    status = ocfs_create_directory (osb, parent_off, newfe);
 		    if (status >= 0) 
 			    *file_off = newfe->this_sector;
+		    else {
+			    if (status != -EINTR)
+			    	LOG_ERROR_STATUS (status);
+			    goto leave;
+		    }
 		    break;
 
 	    case FLAG_FILE_CREATE:
 		    if (fe == NULL) {
 			    newfe = ocfs_allocate_file_entry ();
 			    if (newfe == NULL) {
-				    status = -ENOMEM;
-				    LOG_ERROR_STATUS (status);
+				    LOG_ERROR_STATUS (status = -ENOMEM);
 				    goto leave;
 			    }
 		    } else {
@@ -1839,43 +1804,74 @@ ocfs_create_modify_file (ocfs_super * os
 		    status = ocfs_create_file (osb, parent_off, newfe);
 		    if (status >= 0) 
 			    *file_off = newfe->this_sector;
+		    else {
+			    if (status != -EINTR)
+			    	LOG_ERROR_STATUS (status);
+			    goto leave;
+		    }
 		    break;
 
 	    case FLAG_FILE_DELETE_CDSL:
 		    status = ocfs_delete_cdsl (osb, parent_off, fe);
 		    if (status < 0) {
-			    LOG_ERROR_STATUS (status);
+			    if (status != -EINTR)
+			    	LOG_ERROR_STATUS (status);
 			    goto leave;
 		    }
 		    break;
 
 	    case FLAG_FILE_CREATE_CDSL:
 		    status = ocfs_create_cdsl (osb, parent_off, fe);
+		    if (status < 0) {
+			    if (status != -EINTR)
+			    	LOG_ERROR_STATUS (status);
+			    goto leave;
+		    }
 		    break;
 
 	    case FLAG_FILE_CHANGE_TO_CDSL:
 		    status = ocfs_change_to_cdsl (osb, parent_off, fe);
+		    if (status < 0) {
+			    if (status != -EINTR)
+			    	LOG_ERROR_STATUS (status);
+			    goto leave;
+		    }
 		    break;
 
 	    case FLAG_FILE_TRUNCATE:
-		    status = ocfs_truncate_file (osb, *file_off, file_size);
+		    status = ocfs_truncate_file (osb, *file_off, file_size, oin);
+		    if (status < 0) {
+			    if (status != -EINTR)
+			    	LOG_ERROR_STATUS (status);
+			    goto leave;
+		    }
 		    break;
 
 	    case FLAG_FILE_UPDATE:
 		    status = ocfs_change_file_size (osb, parent_off, oin, 
 					    file_size, file_off, attr);
+		    if (status < 0) {
+			    if (status != -EINTR)
+			    	LOG_ERROR_STATUS (status);
+			    goto leave;
+		    }
 		    break;
 
 	    default:
 		    break;
 	}
 
-	ocfs_commit_trans (osb, osb->curr_trans_id);
+	status = ocfs_commit_trans (osb, osb->curr_trans_id);
+	if (status < 0) {
+		LOG_ERROR_STATUS (status);
+		goto leave;
+	}
 
       leave:
 	if (status < 0) {
 		tmpstat = ocfs_abort_trans (osb, osb->curr_trans_id);
 		if (tmpstat < 0) {
+			LOG_ERROR_STATUS (tmpstat);
 			/* VOL DISABLE TODO */
 			status = tmpstat;
 		}
@@ -1883,9 +1879,8 @@ ocfs_create_modify_file (ocfs_super * os
 
 	osb->trans_in_progress = false;
 
-	if ((newfe != fe) && (newfe)) {
+	if ((newfe != fe))
 		ocfs_release_file_entry (newfe);
-	}
 
 	LOG_EXIT_STATUS (status);
 	return status;
@@ -1901,7 +1896,7 @@ ocfs_create_modify_file (ocfs_super * os
 int
 ocfs_initialize_oin (ocfs_inode * oin,
 		   ocfs_super * osb,
-		   ub4 flags, struct file *file_obj, ub8 file_off, ub8 lock_id)
+		   __u32 flags, struct file *file_obj, __u64 file_off, __u64 lock_id)
 {
 	int status = 0;
 
@@ -1925,7 +1920,6 @@ ocfs_initialize_oin (ocfs_inode * oin,
 	ocfs_extent_map_init (&oin->map);
 
       leave:
-
 	LOG_EXIT_STATUS (status);
 	return status;
 }				/* ocfs_initialize_oin */
@@ -1935,21 +1929,21 @@ ocfs_initialize_oin (ocfs_inode * oin,
  * ocfs_create_delete_cdsl()
  *
  */
-int ocfs_create_delete_cdsl (struct inode *inode,
-		  struct file *filp, ocfs_super * osb, ocfs_cdsl * cdsl)
+int ocfs_create_delete_cdsl (struct inode *inode, struct file *filp,
+			     ocfs_super * osb, ocfs_cdsl * cdsl)
 {
 	int status = 0;
 	struct qstr fileName;
 	bool bAcquiredOSB = false;
 	ocfs_file_entry *fe = NULL;
-	ub8 tempSize = 0;
-	ub8 fileEntry = 0;
-	ub8 parent_off;
+	__u64 tempSize = 0;
+	__u64 fileEntry = 0;
+	__u64 parent_off;
 
 	LOG_ENTRY ();
 
 	if (cdsl->name[0] == '\0') {
-		status = -EINVAL;
+		LOG_ERROR_STATUS (status = -EINVAL);
 		goto leave;
 	}
 
@@ -1967,8 +1961,7 @@ int ocfs_create_delete_cdsl (struct inod
 
 	memset (fe, 0, sizeof (ocfs_file_entry));
 	if (!ocfs_linux_get_inode_offset (inode, &parent_off, NULL)) {
-		LOG_ERROR_STR ("Error getting parent offset for CDSL");
-		status = -EFAIL;
+		LOG_ERROR_STATUS (status = -EFAIL);
 		goto leave;
 	}
 
@@ -1996,17 +1989,18 @@ int ocfs_create_delete_cdsl (struct inod
 
 			fe->create_time = fe->modify_time;
 
-			status =
-			    ocfs_create_modify_file (osb, parent_off, NULL, NULL,
-					      tempSize, &fileEntry,
-					      FLAG_FILE_CHANGE_TO_CDSL, fe,
-					      NULL);
+			status = ocfs_create_modify_file (osb, parent_off, NULL,
+					NULL, tempSize, &fileEntry,
+					FLAG_FILE_CHANGE_TO_CDSL, fe, NULL);
+			if (status != -EINTR)
+				LOG_ERROR_STATUS (status);
 			goto leave;
 		} else if ((cdsl->operation & OCFS_CDSL_DELETE)) {
-			status =
-			    ocfs_create_modify_file (osb, parent_off, NULL, NULL,
-					      tempSize, &fileEntry,
-					      FLAG_FILE_DELETE_CDSL, fe, NULL);
+			status = ocfs_create_modify_file (osb, parent_off, NULL,
+					NULL, tempSize, &fileEntry,
+					FLAG_FILE_DELETE_CDSL, fe, NULL);
+			if (status == -EINTR)
+				LOG_ERROR_STATUS (status);
 			goto leave;
 		} else {
 			status = -EINVAL;
@@ -2052,24 +2046,22 @@ int ocfs_create_delete_cdsl (struct inod
 
 		fe->create_time = fe->modify_time;
 
-		status =
-		    ocfs_create_modify_file (osb, parent_off, NULL, NULL,
-				      tempSize, &fileEntry,
-				      FLAG_FILE_CREATE_CDSL, fe, NULL);
+		status = ocfs_create_modify_file (osb, parent_off, NULL, NULL,
+				tempSize, &fileEntry, FLAG_FILE_CREATE_CDSL,
+				fe, NULL);
 
+		if (status != -EINTR)
+			LOG_ERROR_STATUS (status);
 		goto leave;
 	}
 
       leave:
 	if (bAcquiredOSB) {
-		LOG_TRACE_STR ("RELEASE OSB LOCK");
 		ocfs_up_sem (&(osb->osb_res));
 		bAcquiredOSB = false;
 	}
 
-	if (fe) {
-		ocfs_release_file_entry (fe);
-	}
+	ocfs_release_file_entry (fe);
 
 	LOG_EXIT_STATUS (status);
 	return (status);
@@ -2083,65 +2075,61 @@ int ocfs_create_delete_cdsl (struct inod
 int ocfs_find_create_cdsl (ocfs_super * osb, ocfs_file_entry * fe)
 {
 	int status = 0;
-	ub1 *buffer = NULL;
-	ub8 cdslOffset;
-	ub8 *cdslInfo;
-	ocfs_file_entry *pNewFileEntry = NULL;
-	ub4 length;
-	ocfs_dir_node *PDirNode, *PNewDirNode;
+	__u8 *buffer = NULL;
+	__u64 cdslOffset;
+	__u64 *cdslInfo;
+	ocfs_file_entry *new_fe = NULL;
+	__u32 length;
+	ocfs_dir_node *dnode;
+	ocfs_dir_node *new_dnode;
 
 	LOG_ENTRY ();
 
 	/* Read and see if we have a relevant entry for this node */
 
-	pNewFileEntry = ocfs_allocate_file_entry ();
-	if (pNewFileEntry == NULL) {
+	new_fe = ocfs_allocate_file_entry ();
+	if (new_fe == NULL) {
 		LOG_ERROR_STATUS (status = -ENOMEM);
 		goto leave;
 	}
 
-	memcpy (pNewFileEntry, fe, sizeof (ocfs_file_entry));
+	memcpy (new_fe, fe, sizeof (ocfs_file_entry));
 
 	length = (8 * OCFS_MAXIMUM_NODES);
         length = OCFS_ALIGN (length, OCFS_SECTOR_SIZE);
 	status = ocfs_read_disk_ex (osb, (void **) &buffer, length, length,
 				    fe->extents[0].disk_off);
-        
 	if (status < 0) {
 		LOG_ERROR_STATUS (status);
 		goto leave;
 	}
 
-	cdslInfo = (ub8 *) buffer;
+	cdslInfo = (__u64 *) buffer;
 	cdslOffset = cdslInfo[osb->node_num];
 	if (cdslOffset == 0) {
-		ub8 physicalOffset, fileOffset, numSectorsAlloc, bitmapOffset,
+		__u64 physicalOffset, fileOffset, numSectorsAlloc, bitmapOffset,
 		    numClustersAlloc;
 
 		/* create the entry if one doesn't exist and modify the cdsl data */
-		LOG_TRACE_STR ("Calling ocfs_alloc_node_block from CDSL");
 
 		/* Allocate contiguous blocks on disk */
 		status = ocfs_alloc_node_block (osb, OCFS_SECTOR_SIZE,
-			&physicalOffset, &fileOffset, (ub8 *) & numSectorsAlloc,
+			&physicalOffset, &fileOffset, (__u64 *) & numSectorsAlloc,
 			osb->node_num, DISK_ALLOC_EXTENT_NODE);
 		if (status < 0) {
 			LOG_ERROR_STATUS (status);
 			goto leave;
 		}
 
-		LOG_TRACE_STR ("ocfs_alloc_node_block returned from CDSL");
-
 		if (fileOffset == 0) {
-			LOG_ERROR_ARGS ("File offset was 0 for file %s\n",
-					fe->filename);
+			LOG_TRACE_ARGS ("offset=0, file=%s\n", fe->filename);
 		}
 
-		pNewFileEntry->this_sector = physicalOffset;
+		new_fe->this_sector = physicalOffset;
 
 		cdslInfo[osb->node_num] = cdslOffset = physicalOffset;
 
-		if (pNewFileEntry->attribs & OCFS_ATTRIB_DIRECTORY) {
+		if (new_fe->attribs & OCFS_ATTRIB_DIRECTORY) {
 			status = ocfs_alloc_node_block (osb,
 				osb->vol_layout.dir_node_size, &bitmapOffset,
 				&fileOffset, &numClustersAlloc, osb->node_num,
@@ -2152,59 +2140,57 @@ int ocfs_find_create_cdsl (ocfs_super * 
 			}
 
 			/* update the total allocation size here */
-			pNewFileEntry->alloc_size =
-			    osb->vol_layout.dir_node_size;
-			pNewFileEntry->extents[0].disk_off = bitmapOffset;
-			pNewFileEntry->file_size =
-			    osb->vol_layout.dir_node_size;
-			pNewFileEntry->next_del = INVALID_DIR_NODE_INDEX;
+			new_fe->alloc_size = osb->vol_layout.dir_node_size;
+			new_fe->extents[0].disk_off = bitmapOffset;
+			new_fe->file_size = osb->vol_layout.dir_node_size;
+			new_fe->next_del = INVALID_DIR_NODE_INDEX;
 
-			PDirNode = ocfs_malloc (osb->vol_layout.dir_node_size);
-			if (PDirNode == NULL) {
+			dnode = ocfs_malloc (osb->vol_layout.dir_node_size);
+			if (dnode == NULL) {
 				LOG_ERROR_STATUS (status = -ENOMEM);
 				goto leave;
 			}
 
-			PNewDirNode = PDirNode;
-			memset (PNewDirNode, 0, osb->vol_layout.dir_node_size);
+			new_dnode = dnode;
+			memset (new_dnode, 0, osb->vol_layout.dir_node_size);
 
-			ocfs_initialize_dir_node (osb, PNewDirNode,
+			ocfs_initialize_dir_node (osb, new_dnode,
 				  bitmapOffset, fileOffset, osb->node_num);
 
-			DISK_LOCK_CURRENT_MASTER (PNewDirNode) = osb->node_num;
-			DISK_LOCK_FILE_LOCK (PNewDirNode) =
+			DISK_LOCK_CURRENT_MASTER (new_dnode) = osb->node_num;
+			DISK_LOCK_FILE_LOCK (new_dnode) =
 						OCFS_DLM_ENABLE_CACHE_LOCK;
-			PNewDirNode->dir_node_flags |= DIR_NODE_FLAG_ROOT;
+			new_dnode->dir_node_flags |= DIR_NODE_FLAG_ROOT;
 
-			status = ocfs_write_dir_node (osb, PNewDirNode, -1);
+			status = ocfs_write_dir_node (osb, new_dnode, -1);
 			if (status < 0) {
 				LOG_ERROR_STATUS (status);
 				goto leave;
 			}
 		} else {
 			/* This is a file */
-			pNewFileEntry->extents[0].disk_off = 0;
-			pNewFileEntry->alloc_size = 0;
-			pNewFileEntry->file_size = 0;
+			new_fe->extents[0].disk_off = 0;
+			new_fe->alloc_size = 0;
+			new_fe->file_size = 0;
 		}
 
-		status = ocfs_write_file_entry (osb, pNewFileEntry,
-						pNewFileEntry->this_sector);
+		status = ocfs_write_file_entry (osb, new_fe,
+						new_fe->this_sector);
 		if (status < 0) {
 			LOG_ERROR_STATUS (status);
 			goto leave;
 		}
 
-		status = ocfs_write_disk (osb, (sb1 *) buffer, length,
+		status = ocfs_write_disk (osb, (__s8 *) buffer, length,
 					  fe->extents[0].disk_off);
 		if (status < 0) {
 			LOG_ERROR_STATUS (status);
 			goto leave;
 		}
-		memcpy (fe, pNewFileEntry, OCFS_SECTOR_SIZE);
+		memcpy (fe, new_fe, OCFS_SECTOR_SIZE);
 
 	} else {
-		status = ocfs_read_disk (osb, (sb1 *) fe, OCFS_SECTOR_SIZE,
+		status = ocfs_read_disk (osb, (__s8 *) fe, OCFS_SECTOR_SIZE,
 					 cdslOffset);
 		if (status < 0) {
 			LOG_ERROR_STATUS (status);
@@ -2214,8 +2200,7 @@ int ocfs_find_create_cdsl (ocfs_super * 
 
       leave:
 	ocfs_safefree (buffer);
-	if (pNewFileEntry)
-		ocfs_release_file_entry (pNewFileEntry);
+	ocfs_release_file_entry (new_fe);
 	LOG_EXIT_STATUS (status);
 	return (status);
 }  /* ocfs_find_create_cdsl */
@@ -2226,7 +2211,8 @@ int ocfs_find_create_cdsl (ocfs_super * 
  * ocfs_update_file_entry_slot()
  *
  */
-int ocfs_update_file_entry_slot (ocfs_super * osb, ocfs_inode * oin, ocfs_rw_mode rw_mode)
+int ocfs_update_file_entry_slot (ocfs_super * osb, ocfs_inode * oin,
+				 ocfs_rw_mode rw_mode)
 {
 	int status = 0;
 	ocfs_file_entry *fe = NULL;
@@ -2241,6 +2227,7 @@ int ocfs_update_file_entry_slot (ocfs_su
 
 	status = ocfs_read_file_entry (osb, (void *) fe, oin->file_disk_off);
 	if (status < 0) {
+		LOG_ERROR_STATUS (status);
 		goto leave;
 	}
 
@@ -2254,17 +2241,15 @@ int ocfs_update_file_entry_slot (ocfs_su
 		DISK_LOCK_READER_NODE (fe) = osb->node_num;
 	}
 
-	status =
-	    ocfs_write_force_disk (osb, (void *) fe, osb->sect_size,
-				oin->file_disk_off);
+	status = ocfs_write_force_disk (osb, (void *) fe, osb->sect_size,
+					oin->file_disk_off);
 	if (status < 0) {
+		LOG_ERROR_STATUS (status);
 		goto leave;
 	}
+
       leave:
-	/* free up fileentry */
-	if (fe) {
-		ocfs_release_file_entry (fe);
-	}
+	ocfs_release_file_entry (fe);
 
 	LOG_EXIT_STATUS (status);
 	return (status);
@@ -2277,20 +2262,21 @@ int ocfs_update_file_entry_slot (ocfs_su
 void ocfs_check_lock_state (ocfs_super * osb, ocfs_inode * oin)
 {
 	int status = 0;
-	ocfs_lock_res *pLockRes;
-	ub8 readTimediff = 0;
-	ub8 writeTimediff = 0;
-	ub8 newTime = 0;
+	ocfs_lock_res *pLockRes = NULL;
+	__u64 readTimediff = 0;
+	__u64 writeTimediff = 0;
+	__u64 newTime = 0;
 
 	LOG_ENTRY ();
 
 	pLockRes = oin->lock_res;
 	OCFS_ASSERT (pLockRes);
+	ocfs_get_lockres (pLockRes);
 
 	OcfsQuerySystemTime (&newTime);
 
-	readTimediff = (ub8) (newTime - pLockRes->last_read_time);
-	writeTimediff = (ub8) (newTime - pLockRes->last_write_time);
+	readTimediff = (__u64) (newTime - pLockRes->last_read_time);
+	writeTimediff = (__u64) (newTime - pLockRes->last_write_time);
 
 	/* Check the lock Id for which we are doing a open if somebody owns */
 	/* a cache on it ask for a flush. If there is no cache but a master */
@@ -2308,13 +2294,10 @@ void ocfs_check_lock_state (ocfs_super *
 			ocfs_update_file_entry_slot (osb, oin, OCFS_WRITE);
 			goto leave;
 		} else {
-			LOG_TRACE_ARGS
-			    ("Calling NodeNum (%u) to break File Cache\n",
-			     pLockRes->master_node_num);
-
 			status = ocfs_break_cache_lock (osb, pLockRes);
 			if (status < 0) {
-				LOG_ERROR_STATUS (status);
+				if (status != -EINTR)
+					LOG_ERROR_STATUS (status);
 				goto leave;
 			}
 
@@ -2334,8 +2317,9 @@ void ocfs_check_lock_state (ocfs_super *
 		status = 0;
 		goto leave;
 	}
-      leave:
 
+      leave:
+	ocfs_put_lockres (pLockRes, osb);
 	LOG_EXIT ();
 	return;
 }				/* ocfs_check_lock_state */
@@ -2347,30 +2331,31 @@ void ocfs_check_lock_state (ocfs_super *
  * ocfs_delete_cdsl()
  *
  */
-int ocfs_delete_cdsl (ocfs_super * osb, ub8 parent_off, ocfs_file_entry * fe)
+int ocfs_delete_cdsl (ocfs_super * osb, __u64 parent_off, ocfs_file_entry * fe)
 {
 	int status = 0;
+	int tmpstat;
 	ocfs_file_entry *newfe = NULL;
 	ocfs_dir_node *pLockNode = NULL;
-	ub4 lockFlags = 0;
+	__u32 lockFlags = 0;
 	bool bAcquiredLock = false;
-	ocfs_lock_res *pLockResource;
-	ub8 lockId = 0;
+	ocfs_lock_res *pLockResource = NULL;
+	__u64 lockId = 0;
 	bool bParentLockAcquired = false;
-	ub4 parentLockFlags = 0;
-	ocfs_lock_res *pParentLockResource;
-	ub8 parentLockId = 0;
+	__u32 parentLockFlags = 0;
+	ocfs_lock_res *pParentLockResource = NULL;
+	__u64 parentLockId = 0;
 
 	LOG_ENTRY ();
 
 	newfe = fe;
 	if (newfe == NULL) {
-		status = -EINVAL;
+		LOG_ERROR_STATUS (status = -EINVAL);
 		goto leave;
 	}
 
 	if (newfe->link_cnt != 0) {
-		status = -ENOTEMPTY;
+		LOG_ERROR_STATUS (status = -ENOTEMPTY);
 		goto leave;
 	}
 
@@ -2382,15 +2367,12 @@ int ocfs_delete_cdsl (ocfs_super * osb, 
 
 	parentLockId = parent_off;
 	parentLockFlags = (FLAG_FILE_CREATE | FLAG_DIR);
-	status =
-	    ocfs_acquire_lock (osb, parentLockId, OCFS_DLM_EXCLUSIVE_LOCK,
-			     parentLockFlags, &pParentLockResource,
-			     (ocfs_file_entry *) pLockNode);
-	if (status < 0) {
-		LOG_ERROR_ARGS
-		    ("ocfs_acquire_lock() failed with status(0x%08x) for "
-		     "LockId (%u.%u)\n", status, HI (parentLockId),
-		     LO (parentLockId));
+	status = ocfs_acquire_lock (osb, parentLockId, OCFS_DLM_EXCLUSIVE_LOCK,
+				    parentLockFlags, &pParentLockResource,
+				    (ocfs_file_entry *) pLockNode);
+	if (status < 0) {
+		if (status != -EINTR)
+			LOG_ERROR_STATUS (status);
 		goto leave;
 	}
 
@@ -2399,13 +2381,11 @@ int ocfs_delete_cdsl (ocfs_super * osb, 
 	lockId = newfe->this_sector;
 	lockFlags = (FLAG_FILE_DELETE);
 
-	status =
-	    ocfs_acquire_lock (osb, lockId, OCFS_DLM_EXCLUSIVE_LOCK, lockFlags,
-			     &pLockResource, newfe);
+	status = ocfs_acquire_lock (osb, lockId, OCFS_DLM_EXCLUSIVE_LOCK,
+				    lockFlags, &pLockResource, newfe);
 	if (status < 0) {
-		LOG_ERROR_ARGS
-		    ("ocfs_acquire_lock() failed with status(0x%08x) for "
-		     "LockId (%u.%u)\n", status, HI (lockId), LO (lockId));
+		if (status != -EINTR)
+			LOG_ERROR_STATUS (status);
 		goto leave;
 	}
 
@@ -2439,34 +2419,25 @@ int ocfs_delete_cdsl (ocfs_super * osb, 
       leave:
 	/* Release the file lock if we acquired it */
 	if (bAcquiredLock) {
-		status =
-		    ocfs_release_lock (osb, lockId, OCFS_DLM_EXCLUSIVE_LOCK,
-				     lockFlags, pLockResource, newfe);
-		if (status < 0) {
-			LOG_ERROR_ARGS
-			    ("ocfs_release_lock() failed with status(0x%08x) "
-			     "for LockId (%u.%u)\n", status, HI (lockId),
-			     LO (lockId));
-		}
+		tmpstat = ocfs_release_lock (osb, lockId, OCFS_DLM_EXCLUSIVE_LOCK,
+					    lockFlags, pLockResource, newfe);
+		if (tmpstat < 0)
+			LOG_ERROR_STATUS (tmpstat);
 	}
 
 	/* Release the file lock if we acquired it */
 	if (bParentLockAcquired) {
-		status =
-		    ocfs_release_lock (osb, parentLockId, OCFS_DLM_EXCLUSIVE_LOCK,
-				     parentLockFlags, pParentLockResource, 
-				     (ocfs_file_entry *)pLockNode);
-		if (status < 0) {
-			LOG_ERROR_ARGS
-			    ("ocfs_release_lock() failed with status(0x%08x) for LockId (%u.%u)\n",
-			     status, HI (parentLockId), LO (parentLockId));
-		}
-	}
-
-	if (pLockNode) {
-		ocfs_release_file_entry ((ocfs_file_entry *) pLockNode);
+		tmpstat = ocfs_release_lock (osb, parentLockId,
+				OCFS_DLM_EXCLUSIVE_LOCK, parentLockFlags,
+				pParentLockResource,
+				(ocfs_file_entry *)pLockNode);
+		if (tmpstat < 0)
+			LOG_ERROR_STATUS (tmpstat);
 	}
 
+	ocfs_release_file_entry ((ocfs_file_entry *) pLockNode);
+	ocfs_put_lockres (pLockResource);
+	ocfs_put_lockres (pParentLockResource);
 	LOG_EXIT_STATUS (status);
 	return status;
 }
@@ -2476,19 +2447,20 @@ int ocfs_delete_cdsl (ocfs_super * osb, 
  * ocfs_change_to_cdsl()
  *
  */
-int ocfs_change_to_cdsl (ocfs_super * osb, ub8 parent_off, ocfs_file_entry * fe)
+int ocfs_change_to_cdsl (ocfs_super * osb, __u64 parent_off, ocfs_file_entry * fe)
 {
 	int status = 0, tmpstat = 0;
-	ocfs_file_entry *pNewFileEntry = NULL;
+	ocfs_file_entry *new_fe = NULL;
 	ocfs_dir_node *pLockNode = NULL;
-	ub4 length;
-	ub8 lockId = 0, bitmapOffset, numClustersAlloc;
-	ocfs_lock_res *pLockResource;
-	ub4 lockFlags = 0;
+	__u32 length;
+	__u64 lockId = 0;
+	__u64 offset;
+	__u64 numClustersAlloc;
+	ocfs_lock_res *lockres = NULL;
+	__u32 lockFlags = 0;
 	bool bAcquiredLock = false;
-	ub1 *buffer = NULL;
-	ub8 *cdslInfo;
-
+	__u8 *buffer = NULL;
+	__u64 *cdslInfo;
 	bool bCacheLock = false;
 
 	/* Zero out the entry for the file and rewrite it back to the disk */
@@ -2497,81 +2469,65 @@ int ocfs_change_to_cdsl (ocfs_super * os
 
 	LOG_ENTRY();
 
-
 	if (fe == NULL) {
-		LOG_ERROR_STR("fe is NULL");
-		status = -EINVAL;
+		LOG_ERROR_STATUS (status = -EINVAL);
 		goto leave;
 	}
 
-	pNewFileEntry = ocfs_allocate_file_entry ();
-	if (pNewFileEntry == NULL) {
+	new_fe = ocfs_allocate_file_entry ();
+	if (new_fe == NULL) {
 		LOG_ERROR_STATUS(status = -ENOMEM);
 		goto leave;
 	}
 
-	memcpy (pNewFileEntry, fe, sizeof (ocfs_file_entry));
+	memcpy (new_fe, fe, sizeof (ocfs_file_entry));
 
-	if ((DISK_LOCK_FILE_LOCK (pNewFileEntry) == OCFS_DLM_ENABLE_CACHE_LOCK)
-	    && (DISK_LOCK_CURRENT_MASTER (pNewFileEntry) == osb->node_num)) {
+	if ((DISK_LOCK_FILE_LOCK (new_fe) == OCFS_DLM_ENABLE_CACHE_LOCK)
+	    && (DISK_LOCK_CURRENT_MASTER (new_fe) == osb->node_num)) {
 		bCacheLock = true;
 	}
 
-	lockId = pNewFileEntry->this_sector;
+	lockId = new_fe->this_sector;
 	lockFlags = FLAG_FILE_CHANGE_TO_CDSL;
-	pLockNode = (ocfs_dir_node *) pNewFileEntry;
-
-	if (bCacheLock) {
-		status =
-		    ocfs_acquire_lock (osb, lockId, OCFS_DLM_ENABLE_CACHE_LOCK,
-				     lockFlags, &pLockResource,
-				     (ocfs_file_entry *) pLockNode);
-	} else {
-		status =
-		    ocfs_acquire_lock (osb, lockId, OCFS_DLM_EXCLUSIVE_LOCK,
-				     lockFlags, &pLockResource,
-				     (ocfs_file_entry *) pLockNode);
-	}
+	pLockNode = (ocfs_dir_node *) new_fe;
 
+	status = ocfs_acquire_lock (osb, lockId,
+				    (bCacheLock ? OCFS_DLM_ENABLE_CACHE_LOCK :
+				    		  OCFS_DLM_EXCLUSIVE_LOCK),
+				    lockFlags, &lockres,
+				    (ocfs_file_entry *) pLockNode);
 	if (status < 0) {
-		LOG_ERROR_ARGS("ocfs_acquire_lock failed with status(0x%08x) " \
-                               "for LockId (%u.%u)\n", status,
-			       HI (pNewFileEntry->this_sector),
-			       LO (pNewFileEntry->this_sector));
+		if (status != -EINTR)
+			LOG_ERROR_STATUS (status);
 		goto leave;
 	}
 
 	bAcquiredLock = true;
 
 	if (bCacheLock) {
-		DISK_LOCK_FILE_LOCK (pNewFileEntry) =
-		    OCFS_DLM_ENABLE_CACHE_LOCK;
-		DISK_LOCK_CURRENT_MASTER (pNewFileEntry) = osb->node_num;
+		DISK_LOCK_FILE_LOCK (new_fe) = OCFS_DLM_ENABLE_CACHE_LOCK;
+		DISK_LOCK_CURRENT_MASTER (new_fe) = osb->node_num;
 	}
 
 	length = (8 * OCFS_MAXIMUM_NODES);
 	length = OCFS_ALIGN (length, PAGE_SIZE);
 
-	status =
-	    ocfs_find_contiguous_space_from_bitmap (osb, length, &bitmapOffset,
-					   &numClustersAlloc, false);
+	status = ocfs_find_contiguous_space_from_bitmap (osb, length,
+				&offset, &numClustersAlloc, false);
 	if (status < 0) {
 		LOG_ERROR_STATUS(status);
 		goto leave;
-
 	}
 
-	pNewFileEntry->extents[0].disk_off =
-	    (bitmapOffset * osb->vol_layout.cluster_size)
-	    + osb->vol_layout.data_start_off;
-	pNewFileEntry->extents[0].num_bytes =
-	    numClustersAlloc * osb->vol_layout.cluster_size;
-	pNewFileEntry->extents[0].file_off = 0;
+	new_fe->extents[0].disk_off = (offset * osb->vol_layout.cluster_size) +
+					osb->vol_layout.data_start_off;
+	new_fe->extents[0].num_bytes = numClustersAlloc *
+					osb->vol_layout.cluster_size;
+	new_fe->extents[0].file_off = 0;
 
-	pNewFileEntry->alloc_size = pNewFileEntry->file_size =
-	    pNewFileEntry->extents[0].num_bytes;
+	new_fe->alloc_size = new_fe->file_size = new_fe->extents[0].num_bytes;
 
-	pNewFileEntry->attribs |= OCFS_ATTRIB_FILE_CDSL;
+	new_fe->attribs |= OCFS_ATTRIB_FILE_CDSL;
 
 	/* Initialize the table with 0 */
 	buffer = ocfs_malloc (length);
@@ -2581,19 +2537,19 @@ int ocfs_change_to_cdsl (ocfs_super * os
 	}
 
 	memset (buffer, 0, length);
-	cdslInfo = (ub8 *) buffer;
+	cdslInfo = (__u64 *) buffer;
 
 	/* Point entry for this node to the file entry we have */
 
 	{
-		ub8 physicalOffset, fileOffset, numSectorsAlloc;
+		__u64 physicalOffset, fileOffset, numSectorsAlloc;
 
 		/* create the entry if one doesn't exist and modify the cdsl data */
 
 		/* Allocate contiguous blocks on disk */
 		status =
 		    ocfs_alloc_node_block (osb, OCFS_SECTOR_SIZE, &physicalOffset,
-				    &fileOffset, (ub8 *) & numSectorsAlloc,
+				    &fileOffset, (__u64 *) & numSectorsAlloc,
 				    osb->node_num, DISK_ALLOC_EXTENT_NODE);
 		if (status < 0) {
 			LOG_ERROR_STATUS(status);
@@ -2613,21 +2569,20 @@ int ocfs_change_to_cdsl (ocfs_super * os
 	}
 
 	status =
-	    ocfs_write_disk (osb, (sb1 *) buffer, length,
-			   pNewFileEntry->extents[0].disk_off);
+	    ocfs_write_disk (osb, (__s8 *) buffer, length,
+			   new_fe->extents[0].disk_off);
 	if (status < 0) {
 		LOG_ERROR_STATUS(status);
 		goto leave;
 	}
 
-	OcfsQuerySystemTime (&DISK_LOCK_LAST_WRITE (pNewFileEntry));
-	OcfsQuerySystemTime (&DISK_LOCK_LAST_WRITE (pNewFileEntry));
-	DISK_LOCK_WRITER_NODE (pNewFileEntry) = osb->node_num;
-	DISK_LOCK_READER_NODE (pNewFileEntry) = osb->node_num;
+	OcfsQuerySystemTime (&DISK_LOCK_LAST_WRITE (new_fe));
+	OcfsQuerySystemTime (&DISK_LOCK_LAST_READ (new_fe));
+	DISK_LOCK_WRITER_NODE (new_fe) = osb->node_num;
+	DISK_LOCK_READER_NODE (new_fe) = osb->node_num;
 
 	/* Write the file entry with the cdsl back */
-	status =
-	    ocfs_write_file_entry (osb, pNewFileEntry, pNewFileEntry->this_sector);
+	status = ocfs_write_file_entry (osb, new_fe, new_fe->this_sector);
 	if (status < 0) {
 		LOG_ERROR_STATUS(status);
 		goto leave;
@@ -2635,25 +2590,15 @@ int ocfs_change_to_cdsl (ocfs_super * os
 
       leave:
 	if (bAcquiredLock) {
-		tmpstat =
-		    ocfs_release_lock (osb, lockId, OCFS_DLM_EXCLUSIVE_LOCK,
-				     lockFlags, pLockResource, pNewFileEntry);
-		if (tmpstat < 0) {
-			status = tmpstat;
-			LOG_ERROR_ARGS("ocfs_release_lock failed with " \
-                                       "status(0x%08x) for LockId (%u.%u)\n",
-				       tmpstat, HI (pNewFileEntry->this_sector),
-				       LO (pNewFileEntry->this_sector));
-		}
-	}
-
-	if (pNewFileEntry) {
-		ocfs_release_file_entry (pNewFileEntry);
-	}
-	if (buffer) {
-		ocfs_safefree (buffer);
+		tmpstat = ocfs_release_lock (osb, lockId, OCFS_DLM_EXCLUSIVE_LOCK,
+					     lockFlags, lockres, new_fe);
+		if (tmpstat < 0)
+			LOG_ERROR_STATUS (tmpstat);
 	}
 
+	ocfs_release_file_entry (new_fe);
+	ocfs_safefree (buffer);
+	ocfs_put_lockres (lockres);
 	LOG_EXIT_STATUS(status);
 	return status;
 }  /* ocfs_change_to_cdsl */
@@ -2663,17 +2608,17 @@ int ocfs_change_to_cdsl (ocfs_super * os
  * ocfs_create_cdsl()
  *
  */
-int ocfs_create_cdsl (ocfs_super * osb, ub8 parent_off, ocfs_file_entry * fe)
+int ocfs_create_cdsl (ocfs_super * osb, __u64 parent_off, ocfs_file_entry * fe)
 {
 	int status = 0, tmpstat = 0;
 	ocfs_file_entry *fileEntry = NULL;
 	ocfs_dir_node *PDirNode = NULL, *pLockNode = NULL;
-	ub4 size, length;
-	ub8 lockId = 0, bitmapOffset, numClustersAlloc;
-	ocfs_lock_res *pLockResource;
-	ub4 lockFlags = 0;
+	__u32 size, length;
+	__u64 lockId = 0, bitmapOffset, numClustersAlloc;
+	ocfs_lock_res *pLockResource = NULL;
+	__u32 lockFlags = 0;
 	bool bAcquiredLock = false;
-	ub1 *buffer = NULL;
+	__u8 *buffer = NULL;
 
 	LOG_ENTRY ();
 
@@ -2690,14 +2635,11 @@ int ocfs_create_cdsl (ocfs_super * osb, 
 	lockId = parent_off;
 	lockFlags = FLAG_FILE_CREATE | FLAG_DIR;
 
-	/* acquire the lock */
-	status =
-	    ocfs_acquire_lock (osb, lockId, OCFS_DLM_EXCLUSIVE_LOCK, lockFlags,
-			     &pLockResource, (ocfs_file_entry *) pLockNode);
+	status = ocfs_acquire_lock (osb, lockId, OCFS_DLM_EXCLUSIVE_LOCK,
+			lockFlags, &pLockResource, (ocfs_file_entry *) pLockNode);
 	if (status < 0) {
-		LOG_ERROR_ARGS ("ocfs_acquire_lock() failed with status(0x%08x) "
-				"for LockId (%u.%u)\n", status, HI (lockId),
-				LO (lockId));
+		if (status != -EINTR)
+			LOG_ERROR_STATUS (status);
 		goto leave;
 	}
 	bAcquiredLock = true;
@@ -2712,9 +2654,8 @@ int ocfs_create_cdsl (ocfs_super * osb, 
 	length = (8 * OCFS_MAXIMUM_NODES);
 	length = OCFS_ALIGN (length, PAGE_SIZE);
 
-	status =
-	    ocfs_find_contiguous_space_from_bitmap (osb, length, &bitmapOffset,
-					   &numClustersAlloc, false);
+	status = ocfs_find_contiguous_space_from_bitmap (osb, length,
+				&bitmapOffset, &numClustersAlloc, false);
 	if (status < 0) {
 		LOG_ERROR_STATUS (status);
 		goto leave;
@@ -2740,14 +2681,14 @@ int ocfs_create_cdsl (ocfs_super * osb, 
 	memset (buffer, 0, length);
 
 	status =
-	    ocfs_write_disk (osb, (sb1 *) buffer, length,
+	    ocfs_write_disk (osb, (__s8 *) buffer, length,
 			   fileEntry->extents[0].disk_off);
 	if (status < 0) {
 		LOG_ERROR_STATUS (status);
 		goto leave;
 	}
 
-	size = (ub4) (osb->vol_layout.dir_node_size);
+	size = (__u32) (osb->vol_layout.dir_node_size);
 	PDirNode = ocfs_malloc (size);
 	if (PDirNode == NULL) {
 		LOG_ERROR_STATUS (status = -ENOMEM);
@@ -2757,43 +2698,39 @@ int ocfs_create_cdsl (ocfs_super * osb, 
 	if (pLockNode->free_node_ptr == -1) {
 		status = ocfs_read_dir_node (osb, PDirNode, parent_off);
 		if (status < 0) {
+			LOG_ERROR_STATUS (status);
 			goto leave;
 		}
 
 	} else {
 		/* Goto the deleted tail or the free node pointer */
 		if (pLockNode->next_del_ent_node == -1) {
-			LOG_TRACE_STR ("Going to free_node_ptr");
-			status =
-			    ocfs_read_dir_node (osb, PDirNode,
-					     pLockNode->free_node_ptr);
+			status = ocfs_read_dir_node (osb, PDirNode,
+						     pLockNode->free_node_ptr);
 			if (status < 0) {
+				LOG_ERROR_STATUS (status);
 				goto leave;
 			}
 
 		} else {
-			LOG_TRACE_STR ("Going to pLockNode->next_del_ent_node");
-			status =
-			    ocfs_read_dir_node (osb, PDirNode,
-					     pLockNode->next_del_ent_node);
+			status = ocfs_read_dir_node (osb, PDirNode,
+						     pLockNode->next_del_ent_node);
 			if (status < 0) {
+				LOG_ERROR_STATUS (status);
 				goto leave;
 			}
-
 		}
-
 	}
 
 	OcfsQuerySystemTime (&DISK_LOCK_LAST_WRITE (fileEntry));
-	OcfsQuerySystemTime (&DISK_LOCK_LAST_WRITE (fileEntry));
+	OcfsQuerySystemTime (&DISK_LOCK_LAST_READ (fileEntry));
 	DISK_LOCK_WRITER_NODE (fileEntry) = osb->node_num;
 	DISK_LOCK_READER_NODE (fileEntry) = osb->node_num;
 
-	LOG_TRACE_ARGS ("PDirNode has a Lock = %d\n",
-			DISK_LOCK_FILE_LOCK (PDirNode));
+	LOG_TRACE_ARGS ("PDirNode has a Lock = %d\n", DISK_LOCK_FILE_LOCK (PDirNode));
 
-	status =
-	    ocfs_insert_file (osb, PDirNode, fileEntry, pLockNode, pLockResource);
+	status = ocfs_insert_file (osb, PDirNode, fileEntry, pLockNode,
+				   pLockResource);
 	if (status < 0) {
 		LOG_ERROR_STATUS(status);
 		goto leave;
@@ -2803,31 +2740,17 @@ int ocfs_create_cdsl (ocfs_super * osb, 
 
       leave:
 	if (bAcquiredLock) {
-		tmpstat =
-		    ocfs_release_lock (osb, lockId, OCFS_DLM_EXCLUSIVE_LOCK,
-				     lockFlags, pLockResource, 
-				     (ocfs_file_entry *) pLockNode);
-		if (tmpstat < 0) {
-			LOG_ERROR_ARGS
-			    ("ocfs_release_lock() failed with status(0x%08x) "
-			     "for LockId (%u.%u)", tmpstat, HI (lockId),
-			     LO (lockId));
-			status = tmpstat;
-		}
-	}
-
-	if (PDirNode) {
-		ocfs_safefree (PDirNode);
-	}
-
-	if (pLockNode) {
-		ocfs_release_file_entry ((ocfs_file_entry *) pLockNode);
-	}
-
-	if (buffer) {
-		ocfs_safefree (buffer);
+		tmpstat = ocfs_release_lock (osb, lockId, OCFS_DLM_EXCLUSIVE_LOCK,
+					     lockFlags, pLockResource,
+					     (ocfs_file_entry *) pLockNode);
+		if (tmpstat < 0)
+			LOG_ERROR_STATUS (tmpstat);
 	}
 
+	ocfs_safefree (PDirNode);
+	ocfs_release_file_entry ((ocfs_file_entry *) pLockNode);
+	ocfs_safefree (buffer);
+	ocfs_put_lockres (pLockResource);
 	LOG_EXIT_STATUS (status);
 	return status;
 }  /* ocfs_create_cdsl */
@@ -2837,20 +2760,20 @@ int ocfs_create_cdsl (ocfs_super * osb, 
  * ocfs_truncate_file()
  *
  */
-int ocfs_truncate_file (ocfs_super * osb, ub8 file_off, ub8 file_size)
+int ocfs_truncate_file (ocfs_super * osb, __u64 file_off, __u64 file_size, ocfs_inode * oin)
 {
 	int status = 0, tmpstat;
 	ocfs_file_entry *fe = NULL;
-	ub8 lockId = 0;
-	ub4 lockFlags = 0;
+	__u64 lockId = 0;
+	__u32 lockFlags = 0;
 	bool bFileLockAcquired = false;
 	bool bAcquiredLock = false;
-	ocfs_lock_res *pLockResource;
-	ub8 changeSeqNum = 0;
+	ocfs_lock_res *pLockResource = NULL;
+	__u64 changeSeqNum = 0;
 	bool bCacheLock = false;
 	ocfs_dir_node *pLockNode = NULL;
-        ub8 new_alloc_size;
-        ub4 csize = osb->vol_layout.cluster_size;
+        __u64 new_alloc_size;
+        __u32 csize = osb->vol_layout.cluster_size;
 
 	LOG_ENTRY ();
 
@@ -2858,15 +2781,20 @@ int ocfs_truncate_file (ocfs_super * osb
 
 	fe = ocfs_allocate_file_entry ();
 	if (fe == NULL) {
-		LOG_ERROR_STR ("ocfs_allocate_file_entry failed");
-		status = -ENOMEM;
+		LOG_ERROR_STATUS (status = -ENOMEM);
 		goto leave;
 	}
 
 	status = ocfs_read_file_entry (osb, fe, file_off);
 	if (status < 0) {
-		LOG_ERROR_ARGS ("ocfs_read_file_entry failed with status(%x)\n",
-				status);
+		LOG_ERROR_STATUS (status);
+		goto leave;
+	}
+
+	if (!IS_VALID_FILE_ENTRY(fe)) {
+		LOG_ERROR_ARGS ("Invalid fe at offset %u.%u", HI(file_off),
+				LO(file_off));
+		status = -EFAIL;
 		goto leave;
 	}
 
@@ -2881,14 +2809,13 @@ int ocfs_truncate_file (ocfs_super * osb
 	}
 
 	status = ocfs_acquire_lock (osb, lockId,
-			     bCacheLock ? OCFS_DLM_ENABLE_CACHE_LOCK :
-			     OCFS_DLM_EXCLUSIVE_LOCK, lockFlags, &pLockResource,
-			     (ocfs_file_entry *) pLockNode);
-
+				    (bCacheLock ? OCFS_DLM_ENABLE_CACHE_LOCK :
+				    		  OCFS_DLM_EXCLUSIVE_LOCK),
+				    lockFlags, &pLockResource,
+				    (ocfs_file_entry *) pLockNode);
 	if (status < 0) {
-		LOG_ERROR_ARGS
-		    ("ocfs_acquire_lock failed  with status(%x) for %u.%u\n",
-		     status, lockId);
+		if (status != -EINTR)
+			LOG_ERROR_STATUS (status);
 		goto leave;
 	}
 
@@ -2899,9 +2826,7 @@ int ocfs_truncate_file (ocfs_super * osb
 
 	status = ocfs_free_extents_for_truncate (osb, fe);
 	if (status < 0) {
-		LOG_ERROR_ARGS
-		    ("ocfs_free_extents_for_truncate failed with status (%x)\n",
-		     status);
+		LOG_ERROR_STATUS (status);
 		goto leave;
 	}
 
@@ -2917,33 +2842,30 @@ int ocfs_truncate_file (ocfs_super * osb
 
 	status = ocfs_write_file_entry (osb, fe, fe->this_sector);
 	if (status < 0) {
-		LOG_ERROR_ARGS ("ocfs_write_file_entry failed with status(%x)\n",
-				status);
+		LOG_ERROR_STATUS (status);
+		goto leave;
 	}
 
+	if (oin) {
+	/* if we updated correctly then we can update the OIN */
+		ocfs_down_sem (&(oin->main_res), true);
+		oin->alloc_size = new_alloc_size;
+		ocfs_up_sem (&(oin->main_res));
+	}
 
-leave:
-	/* Release the file lock if we acquired it */
+      leave:
 	if (bAcquiredLock) {
-		if (bFileLockAcquired) {
+		if (bFileLockAcquired)
 			lockFlags |= FLAG_FILE_UPDATE_OIN;
-		}
 
-		tmpstat =
-		    ocfs_release_lock (osb, lockId, OCFS_DLM_EXCLUSIVE_LOCK,
-				     lockFlags, pLockResource, fe);
-		if (tmpstat < 0) {
-			// status = tmpstat ?  
-			LOG_ERROR_ARGS
-			    ("ocfs_release_lock failed with status(%x) for %u.%u\n",
-			     tmpstat, fe->this_sector);
-		}
+		tmpstat = ocfs_release_lock (osb, lockId, OCFS_DLM_EXCLUSIVE_LOCK,
+					     lockFlags, pLockResource, fe);
+		if (tmpstat < 0)
+			LOG_ERROR_STATUS (tmpstat);
 	}
 
-	/* free up fileEntry */
-	if (fe)
-		ocfs_release_file_entry (fe);
-
+	ocfs_release_file_entry (fe);
+	ocfs_put_lockres (pLockResource);
 	LOG_EXIT_STATUS(status);
 	return status;
 }  /* ocfs_truncate_file */
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Common/ocfsgendirnode.c linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Common/ocfsgendirnode.c
--- linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Common/ocfsgendirnode.c	2003-07-30 13:51:50.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Common/ocfsgendirnode.c	2003-07-30 10:28:53.000000000 +0200
@@ -29,10 +29,6 @@
 /* Tracing */
 #define OCFS_DEBUG_CONTEXT   OCFS_DEBUG_CONTEXT_DIRINFO
 
-#define IS_VALID_DIR_NODE(PDirNode)    \
-                 (!strncmp((PDirNode)->signature, OCFS_DIR_NODE_SIGNATURE, \
-                           strlen(OCFS_DIR_NODE_SIGNATURE)))
-
 /*
  * ocfs_print_file_entry()
  *
@@ -51,9 +47,8 @@ void ocfs_print_dir_node (ocfs_super * o
 	int i;
 	ocfs_file_entry *pOrigFileEntry;
 
-	if (DirNode->dir_node_flags & DIR_NODE_FLAG_ROOT) {
-		LOG_ERROR_STR ("This is the Root of the BTree.\n");
-	}
+	if (DirNode->dir_node_flags & DIR_NODE_FLAG_ROOT)
+		LOG_TRACE_STR ("This is the Root of the BTree.");
 
 	LOG_TRACE_ARGS ("signature: %s\n", DirNode->signature);
 
@@ -74,42 +69,42 @@ void ocfs_print_dir_node (ocfs_super * o
  *
  */
 int ocfs_alloc_node_block (ocfs_super * osb,
-		ub8 FileSize,
-		ub8 * DiskOffset,
-		ub8 * file_off, ub8 * NumClusterAlloc, ub4 NodeNum, ub4 Type)
+		__u64 FileSize,
+		__u64 * DiskOffset,
+		__u64 * file_off, __u64 * NumClusterAlloc, __u32 NodeNum, __u32 Type)
 {
 	int status = 0;
 	int tmpstat;
-	ub8 fileSize = 0;
-	ub8 offset = 0;
-	ub8 length = 0;
-	ub8 lockId = 0;
-	ub8 numBytes = 0;
-	ub8 allocSize = 0;
-	ub8 prevFileSize = 0;
-	ub8 extent;
-	ub8 newFileSize;
-	ub8 bitMapSize;
-	ub1 *buffer = NULL;
+	__u64 fileSize = 0;
+	__u64 offset = 0;
+	__u64 length = 0;
+	__u64 lockId = 0;
+	__u64 numBytes = 0;
+	__u64 allocSize = 0;
+	__u64 prevFileSize = 0;
+	__u64 extent;
+	__u64 newFileSize;
+	__u64 bitMapSize;
+	__u8 *buffer = NULL;
 	ocfs_alloc_bm DirAllocBitMap;
-	ub4 numBits = 0;
-	ub4 foundBit = -1;
-	ub4 blockSize = 0;
+	__u32 numBits = 0;
+	__u32 foundBit = -1;
+	__u32 blockSize = 0;
 	bool bLockAcquired = false;
-	ocfs_lock_res *pLockResource;
-	ub4 fileId = 0;
-	ub4 extendFileId = 0;
+	ocfs_lock_res *pLockResource = NULL;
+	__u32 fileId = 0;
+	__u32 extendFileId = 0;
 	ocfs_log_record *pOcfsLogRec = NULL;
 	ocfs_file_entry *fe = NULL;
 
 	LOG_ENTRY ();
 
 	fe = ocfs_allocate_file_entry();
-	if (fe==NULL) {
-		status = -ENOMEM;
+	if (fe == NULL) {
+		LOG_ERROR_STATUS (status = -ENOMEM);
 		goto leave;
 	}
-	
+
 #ifdef PARANOID_LOCKS
 	ocfs_down_sem (&(osb->dir_alloc_lock), true);
 	ocfs_down_sem (&(osb->file_alloc_lock), true);
@@ -118,12 +113,12 @@ int ocfs_alloc_node_block (ocfs_super * 
 
 	if (Type == DISK_ALLOC_DIR_NODE) {
 		fileId = OCFS_FILE_DIR_ALLOC_BITMAP + NodeNum;
-		blockSize = (ub4) osb->vol_layout.dir_node_size;
+		blockSize = (__u32) osb->vol_layout.dir_node_size;
 		extendFileId = OCFS_FILE_DIR_ALLOC + NodeNum;
 	} else if (Type == DISK_ALLOC_EXTENT_NODE) {
 		fileId = OCFS_FILE_FILE_ALLOC_BITMAP + NodeNum;
 		extendFileId = OCFS_FILE_FILE_ALLOC + NodeNum;
-		blockSize = (ub4) osb->vol_layout.file_node_size;
+		blockSize = (__u32) osb->vol_layout.file_node_size;
 	}
 
 	/* Allocate a block of size blocksize from the relevant file/bitmap */
@@ -137,19 +132,19 @@ int ocfs_alloc_node_block (ocfs_super * 
 	    ocfs_acquire_lock (osb, lockId, OCFS_DLM_EXCLUSIVE_LOCK,
 			     FLAG_FILE_CREATE, &pLockResource, fe);
 	if (status < 0) {
+		LOG_ERROR_STATUS (status);
 		goto leave;
 	}
 
 	bLockAcquired = true;
 
 	numBytes = OCFS_ALIGN ((FileSize), blockSize);
-	numBits = (ub4) (numBytes / blockSize);
+	numBits = (__u32) (numBytes / blockSize);
 
 //    while(1)
 	{
 		/* Read in the bitmap file for the dir alloc and look for the required */
 		/* space, if found */
-
 		fileSize = fe->file_size;
 		allocSize = fe->alloc_size;
 
@@ -157,7 +152,6 @@ int ocfs_alloc_node_block (ocfs_super * 
 
 		if ((fileSize != 0) && (allocSize != 0)) {
 			/* Round this off to dirnodesize */
-			length = OCFS_ALIGN (allocSize, OCFS_SECTOR_SIZE);
 			length = OCFS_ALIGN (allocSize, PAGE_SIZE);
 
 			buffer = vmalloc (length);
@@ -170,18 +164,19 @@ int ocfs_alloc_node_block (ocfs_super * 
 			    ocfs_read_system_file (osb, fileId, buffer, allocSize,
 					    offset);
 			if (status < 0) {
+				LOG_ERROR_STATUS (status);
 				goto leave;
 			}
 
-			ocfs_initialize_bitmap (&DirAllocBitMap, (ub4 *) buffer,
-					      (ub4) (fileSize * 8));
+			ocfs_initialize_bitmap (&DirAllocBitMap, (__u32 *) buffer,
+					      (__u32) (fileSize * 8));
 
 			/* Find the requisite number of bits... */
 
 			/* This function will check for clear bits in the Bitmap for */
 			/* consective clear bits equal to ClusterCount */
 			foundBit =
-			    ocfs_find_clear_bits (&DirAllocBitMap, (ub4) numBits,
+			    ocfs_find_clear_bits (&DirAllocBitMap, (__u32) numBits,
 					       0, 0);
 		}
 
@@ -205,8 +200,12 @@ int ocfs_alloc_node_block (ocfs_super * 
 
 			extent = OCFS_ALIGN (extent, ONE_MEGA_BYTE);
 
-			ocfs_get_system_file_size (osb, (extendFileId), &newFileSize,
-					   &allocSize);
+			status = ocfs_get_system_file_size (osb, (extendFileId),
+						&newFileSize, &allocSize);
+			if (status < 0) {
+				LOG_ERROR_STATUS (status);
+				goto leave;
+			}
 
 			/* This is for OUI optimzation to allocate more disk space for */
 			/* directory allocations */
@@ -218,6 +217,7 @@ int ocfs_alloc_node_block (ocfs_super * 
 			    ocfs_extend_system_file (osb, (extendFileId),
 					      newFileSize + extent, NULL);
 			if (status < 0) {
+				LOG_ERROR_STATUS (status);
 				goto leave;
 			}
 
@@ -227,6 +227,7 @@ int ocfs_alloc_node_block (ocfs_super * 
 			/* Calculate the new bitmap size */
 			status = ocfs_extend_system_file (osb, fileId, bitMapSize, fe);
 			if (status < 0) {
+				LOG_ERROR_STATUS (status);
 				goto leave;
 			}
 
@@ -237,8 +238,6 @@ int ocfs_alloc_node_block (ocfs_super * 
 			fileSize = fe->file_size;
 			allocSize = fe->alloc_size;
 
-
-			length = OCFS_ALIGN (allocSize, osb->sect_size);
 			length = OCFS_ALIGN (allocSize, PAGE_SIZE);
 
 			buffer = vmalloc (length);
@@ -254,13 +253,11 @@ int ocfs_alloc_node_block (ocfs_super * 
 				LOG_ERROR_STATUS (status);
 				goto leave;
 			}
-		        printk("fileid filesize  = %u.%u\n", fileSize);
 
-			ocfs_initialize_bitmap (&DirAllocBitMap, (ub4 *) buffer,
-					      (ub4) (fileSize * 8));
+			ocfs_initialize_bitmap (&DirAllocBitMap, (__u32 *) buffer,
+					      (__u32) (fileSize * 8));
 
 			foundBit = prevFileSize * 8;
-			printk("foundbit = %d\n", foundBit);
 //        continue;
 
 		}
@@ -271,16 +268,16 @@ int ocfs_alloc_node_block (ocfs_super * 
 */
 	}
 
-	LOG_TRACE_ARGS ("The byte offset is (%d)\n", foundBit);
+	LOG_TRACE_ARGS ("byte offset=%d\n", foundBit);
 
-	ocfs_set_bits (&DirAllocBitMap, (ub4) foundBit, (ub4) numBits);
+	ocfs_set_bits (&DirAllocBitMap, (__u32) foundBit, (__u32) numBits);
 
 	/* Log the change under current transid, */
 	{
-		ub4 size;
+		__u32 size;
 
 		size = sizeof (ocfs_log_record);
-		size = (ub4) OCFS_ALIGN (size, PAGE_SIZE);
+		size = (__u32) OCFS_ALIGN (size, osb->sect_size);
 
 		if ((pOcfsLogRec = ocfs_malloc (size)) == NULL) {
 			LOG_ERROR_STATUS (status = -ENOMEM);
@@ -299,6 +296,7 @@ int ocfs_alloc_node_block (ocfs_super * 
 		/* info is stored */
 		status = ocfs_write_log (osb, pOcfsLogRec, LOG_RECOVER);
 		if (status < 0) {
+			LOG_ERROR_STATUS (status);
 			goto leave;
 		}
 	}
@@ -317,12 +315,11 @@ int ocfs_alloc_node_block (ocfs_super * 
 		goto leave;
 	}
 
-	*file_off = (ub8) ((ub8) foundBit * (ub8) blockSize);
+	*file_off = (__u64) ((__u64) foundBit * (__u64) blockSize);
 	/* this can just fall through */
 	if (*file_off == 0) {
-		LOG_TRACE_ARGS
-		    ("File offset was %u.%u for type (%x) blocksize=%u foundbit=%u\n",
-		     *file_off, Type, blockSize, foundBit);
+		LOG_TRACE_ARGS ("offset=%u.%u, type=%x, blksz=%u, foundbit=%u\n",
+			HI(*file_off), LO(*file_off), Type, blockSize, foundBit);
 	}
 
       leave:
@@ -337,20 +334,13 @@ int ocfs_alloc_node_block (ocfs_super * 
 		    ocfs_release_lock (osb, lockId, OCFS_DLM_EXCLUSIVE_LOCK,
 				     FLAG_FILE_CREATE, pLockResource, fe);
 		if (tmpstat < 0)
-			status = tmpstat;
-
-		bLockAcquired = false;
+			LOG_ERROR_STATUS (tmpstat);
 	}
 
-	if (buffer) {
-		vfree (buffer);
-		buffer = NULL;
-	}
-	if (fe)
-		ocfs_release_file_entry(fe);
-
+	ocfs_safevfree (buffer);
+	ocfs_release_file_entry (fe);
 	ocfs_safefree (pOcfsLogRec);
-
+	ocfs_put_lockres (pLockResource);
 	LOG_EXIT_STATUS (status);
 	return status;
 }				/* ocfs_alloc_node_block */
@@ -359,22 +349,22 @@ int ocfs_alloc_node_block (ocfs_super * 
  * ocfs_free_vol_block()
  *
  */
-int ocfs_free_vol_block (ocfs_super * osb, ocfs_free_log * FreeLog, ub4 NodeNum, ub4 Type)
+int ocfs_free_vol_block (ocfs_super * osb, ocfs_free_log * FreeLog, __u32 NodeNum, __u32 Type)
 {
 	int status = 0;
-	ub8 fileSize = 0;
-	ub8 offset = 0;
-	ub8 length = 0;
-	ub8 allocSize = 0;
-	ub4 foundBit = -1;	//SM... What???
-	ub4 blockSize = 0;
-	ub4 fileId = 0;
-	ub4 extendFileId = 0;
-	ub1 *buffer = NULL;
+	__u64 fileSize = 0;
+	__u64 offset = 0;
+	__u64 length = 0;
+	__u64 allocSize = 0;
+	__u32 foundBit = -1;
+	__u32 blockSize = 0;
+	__u32 fileId = 0;
+	__u32 extendFileId = 0;
+	__u8 *buffer = NULL;
 	ocfs_alloc_bm AllocBitMap;
 	ocfs_alloc_bm *pTempBitMap;
-	ub4 i;
-	ub4 size;
+	__u32 i;
+	__u32 size;
 
 	LOG_ENTRY ();
 
@@ -387,7 +377,7 @@ int ocfs_free_vol_block (ocfs_super * os
 	switch (Type) {
 	    case DISK_ALLOC_DIR_NODE:
 		    fileId = OCFS_FILE_DIR_ALLOC_BITMAP + NodeNum;
-		    blockSize = (ub4) osb->vol_layout.dir_node_size;
+		    blockSize = (__u32) osb->vol_layout.dir_node_size;
 		    extendFileId = OCFS_FILE_DIR_ALLOC + NodeNum;
 
 		    if (!IS_VALID_NODE_NUM (NodeNum)) {
@@ -399,7 +389,7 @@ int ocfs_free_vol_block (ocfs_super * os
 	    case DISK_ALLOC_EXTENT_NODE:
 		    fileId = OCFS_FILE_FILE_ALLOC_BITMAP + NodeNum;
 		    extendFileId = OCFS_FILE_FILE_ALLOC + NodeNum;
-		    blockSize = (ub4) osb->vol_layout.file_node_size;
+		    blockSize = (__u32) osb->vol_layout.file_node_size;
 
 		    if (!IS_VALID_NODE_NUM (NodeNum)) {
 			    LOG_ERROR_STATUS(status = -EINVAL);
@@ -415,7 +405,7 @@ int ocfs_free_vol_block (ocfs_super * os
 	}
 
 	if (Type == DISK_ALLOC_VOLUME) {
-		size = (ub4) OCFS_SECTOR_ALIGN ((osb->cluster_bitmap.size) / 8);
+		size = (__u32) OCFS_SECTOR_ALIGN ((osb->cluster_bitmap.size) / 8);
 		status = ocfs_read_metadata (osb, osb->cluster_bitmap.buf, size,
 					   osb->vol_layout.bitmap_off);
 		if (status < 0) {
@@ -434,7 +424,6 @@ int ocfs_free_vol_block (ocfs_super * os
 		}
 
 		/* Round this off to dirnodesize */
-		length = OCFS_ALIGN (allocSize, OCFS_SECTOR_SIZE);
 		length = OCFS_ALIGN (allocSize, PAGE_SIZE);
 
                 /* !!! vmalloc !!! */
@@ -450,33 +439,35 @@ int ocfs_free_vol_block (ocfs_super * os
 			goto leave;
 		}
 
-		ocfs_initialize_bitmap (&AllocBitMap, (ub4 *) buffer,
-				      (ub4) (fileSize * 8));
+		ocfs_initialize_bitmap (&AllocBitMap, (__u32 *) buffer,
+				      (__u32) (fileSize * 8));
 		pTempBitMap = &AllocBitMap;
 	}
 
 	for (i = 0; i < FreeLog->num_free_upds; i++) {
-		if (FreeLog->free_bitmap[i].file_off == 0) {
-			LOG_ERROR_ARGS
-			    ("File offset was 0 for type (%x) blk %d\n", Type,
-			     blockSize);
+		if (FreeLog->free_bitmap[i].file_off == 0 && Type == 0) {
+			LOG_ERROR_ARGS ("offset=0, type=%x, blksz=%d", Type,
+					blockSize);
 		}
 
 		if (Type == DISK_ALLOC_VOLUME)
-			foundBit = (ub4) FreeLog->free_bitmap[i].file_off;
+			foundBit = (__u32) FreeLog->free_bitmap[i].file_off;
 		else
 			foundBit =
-			    (ub4) (FreeLog->free_bitmap[i].file_off /
+			    (__u32) (FreeLog->free_bitmap[i].file_off /
 				   blockSize);
 
-		ocfs_clear_bits (pTempBitMap, (ub4) foundBit,
-			       (ub4) FreeLog->free_bitmap[i].length);
+		ocfs_clear_bits (pTempBitMap, (__u32) foundBit,
+			       (__u32) FreeLog->free_bitmap[i].length);
+
+		LOG_TRACE_ARGS("gb_c: bit=%d, len=%u, i=%d\n", foundBit,
+			       (__u32)FreeLog->free_bitmap[i].length, i);
 	}
 
 	/* Write a cleanup log here */
 
 	if (Type == DISK_ALLOC_VOLUME) {
-		size = (ub4) OCFS_SECTOR_ALIGN ((osb->cluster_bitmap.size) / 8);
+		size = (__u32) OCFS_SECTOR_ALIGN ((osb->cluster_bitmap.size) / 8);
 
 		/* I have absolutely no idea why this is done twice! */
 		status = ocfs_write_disk (osb, osb->cluster_bitmap.buf,
@@ -496,6 +487,7 @@ int ocfs_free_vol_block (ocfs_super * os
 		status =
 		    ocfs_write_system_file (osb, fileId, buffer, allocSize, offset);
 		if (status < 0) {
+			LOG_ERROR_STATUS (status);
 			goto leave;
 		}
 	}
@@ -516,40 +508,42 @@ int ocfs_free_vol_block (ocfs_super * os
  * ocfs_free_node_block()
  *
  */
-int ocfs_free_node_block (ocfs_super * osb, ub8 file_off, ub8 Length, ub4 NodeNum,
-	       ub4 Type)
+int ocfs_free_node_block (ocfs_super * osb, __u64 file_off, __u64 Length, __u32 NodeNum,
+	       __u32 Type)
 {
 	int status = 0;
-	ub8 fileSize = 0;
-	ub8 offset = 0;
-	ub8 length = 0;
-	ub8 lockId = 0;
-	ub8 allocSize = 0;
-	ub1 *buffer = NULL;
+	int tmpstat;
+	__u64 fileSize = 0;
+	__u64 offset = 0;
+	__u64 length = 0;
+	__u64 lockId = 0;
+	__u64 allocSize = 0;
+	__u8 *buffer = NULL;
 	ocfs_alloc_bm DirAllocBitMap;
-	ub4 foundBit = -1;
-	ub4 blockSize = 0;
+	__u32 foundBit = -1;
+	__u32 blockSize = 0;
 	bool bLockAcquired = false;
-	ocfs_lock_res *pLockResource;
-	ub4 fileId = 0;
-	ub4 extendFileId = 0;
+	ocfs_lock_res *pLockResource = NULL;
+	__u32 fileId = 0;
+	__u32 extendFileId = 0;
 	ocfs_file_entry *fe = NULL;
 
 	LOG_ENTRY ();
 
 	fe = ocfs_allocate_file_entry();
-	if (fe==NULL) {
-		status = -ENOMEM;
+	if (fe == NULL) {
+		LOG_ERROR_STATUS (status = -ENOMEM);
 		goto leave;
 	}
+
 	if (Type == DISK_ALLOC_DIR_NODE) {
 		fileId = OCFS_FILE_DIR_ALLOC_BITMAP + NodeNum;
-		blockSize = (ub4) osb->vol_layout.dir_node_size;
+		blockSize = (__u32) osb->vol_layout.dir_node_size;
 		extendFileId = OCFS_FILE_DIR_ALLOC + NodeNum;
 	} else if (Type == DISK_ALLOC_EXTENT_NODE) {
 		fileId = OCFS_FILE_FILE_ALLOC_BITMAP + NodeNum;
 		extendFileId = OCFS_FILE_FILE_ALLOC + NodeNum;
-		blockSize = (ub4) osb->vol_layout.file_node_size;
+		blockSize = (__u32) osb->vol_layout.file_node_size;
 	}
 
 	/* Allocate a block of size blocksize from the relevant file/bitmap */
@@ -557,10 +551,10 @@ int ocfs_free_node_block (ocfs_super * o
 	lockId = (fileId * OCFS_SECTOR_SIZE) + osb->vol_layout.root_int_off;
 
 	/* Get a lock on the file */
-	status =
-	    ocfs_acquire_lock (osb, lockId, OCFS_DLM_EXCLUSIVE_LOCK,
-			     FLAG_FILE_CREATE, &pLockResource, fe);
+	status = ocfs_acquire_lock (osb, lockId, OCFS_DLM_EXCLUSIVE_LOCK,
+				    FLAG_FILE_CREATE, &pLockResource, fe);
 	if (status < 0) {
+		LOG_ERROR_STATUS (status);
 		goto leave;
 	}
 
@@ -575,7 +569,6 @@ int ocfs_free_node_block (ocfs_super * o
 	}
 
 	/* Round this off to dirnodesize */
-	length = OCFS_ALIGN (allocSize, OCFS_SECTOR_SIZE);
 	length = OCFS_ALIGN (allocSize, PAGE_SIZE);
 
 	if ((buffer = ocfs_malloc (length)) == NULL) {
@@ -585,33 +578,33 @@ int ocfs_free_node_block (ocfs_super * o
 
 	status = ocfs_read_system_file (osb, fileId, buffer, allocSize, offset);
 	if (status < 0) {
+		LOG_ERROR_STATUS (status);
 		goto leave;
 	}
 
-	ocfs_initialize_bitmap (&DirAllocBitMap, (ub4 *) buffer,
-			      (ub4) (fileSize * 8));
+	ocfs_initialize_bitmap (&DirAllocBitMap, (__u32 *) buffer,
+			      (__u32) (fileSize * 8));
 
-	foundBit = (ub4) (file_off / blockSize);
-	ocfs_clear_bits (&DirAllocBitMap, (ub4) foundBit, (ub4) Length);
+	foundBit = (__u32) (file_off / blockSize);
+	ocfs_clear_bits (&DirAllocBitMap, (__u32) foundBit, (__u32) Length);
 
 	status = ocfs_write_system_file (osb, fileId, buffer, allocSize, offset);
 	if (status < 0) {
+		LOG_ERROR_STATUS (status);
 		goto leave;
 	}
+
       leave:
 	if (bLockAcquired) {
-		status =
-		    ocfs_release_lock (osb, lockId, OCFS_DLM_EXCLUSIVE_LOCK,
-				     FLAG_FILE_CREATE, pLockResource, fe);
-		if (status < 0) {
-			/* log failure */
-		}
-		bLockAcquired = false;
+		tmpstat = ocfs_release_lock (osb, lockId, OCFS_DLM_EXCLUSIVE_LOCK,
+					     FLAG_FILE_CREATE, pLockResource, fe);
+		if (tmpstat < 0)
+			LOG_ERROR_STATUS (tmpstat);
 	}
-	ocfs_safefree (buffer);
-	if (fe)
-		ocfs_release_file_entry(fe);
 
+	ocfs_safefree (buffer);
+	ocfs_release_file_entry (fe);
+	ocfs_put_lockres (pLockResource);
 	LOG_EXIT_STATUS (0);
 	return 0;
 }				/* ocfs_free_node_block */
@@ -620,20 +613,20 @@ int ocfs_free_node_block (ocfs_super * o
  * ocfs_free_directory_block()
  *
  */
-int ocfs_free_directory_block (ocfs_super * osb, ocfs_file_entry * fe, sb4 LogNodeNum)
+int ocfs_free_directory_block (ocfs_super * osb, ocfs_file_entry * fe, __s32 LogNodeNum)
 {
 	int status = 0;
         ocfs_file_entry *dir_hdr_fe = NULL;
 	ocfs_dir_node *PDirNode;
-	ub4 size;
-	ub4 numUpdt;
-	ub8 currentDirNode;
+	__u32 size;
+	__u32 numUpdt;
+	__u64 currentDirNode;
 	ocfs_cleanup_record *pCleanupLogRec = NULL;
 
 	LOG_ENTRY ();
 
 	size = sizeof (ocfs_cleanup_record);
-	size = (ub4) OCFS_ALIGN (size, PAGE_SIZE);
+	size = (__u32) OCFS_ALIGN (size, PAGE_SIZE);
 
 	if ((pCleanupLogRec = ocfs_malloc (size)) == NULL) {
 		LOG_ERROR_STATUS (status = -ENOMEM);
@@ -646,7 +639,6 @@ int ocfs_free_directory_block (ocfs_supe
 
 	size = OCFS_SECTOR_SIZE;
 
-        /* !!! I hate this stuff... */ 
 	status = ocfs_get_file_entry (osb, &dir_hdr_fe, currentDirNode);
 	if (status < 0 || dir_hdr_fe==NULL) {
                 if (status >= 0)
@@ -713,10 +705,8 @@ int ocfs_free_directory_block (ocfs_supe
 		}
 	}
       leave:
-        if (dir_hdr_fe!=NULL)
-        	ocfs_release_file_entry(dir_hdr_fe);
+       	ocfs_release_file_entry(dir_hdr_fe);
 	ocfs_safefree (pCleanupLogRec);
-
 	LOG_EXIT_STATUS (status);
 	return status;
 }				/* ocfs_free_directory_block */
@@ -725,8 +715,8 @@ int ocfs_free_directory_block (ocfs_supe
  * ocfs_recover_dir_node()
  *
  */
-int ocfs_recover_dir_node (ocfs_super * osb, ub8 OrigDirNodeOffset,
-			   ub8 SavedDirNodeOffset)
+int ocfs_recover_dir_node (ocfs_super * osb, __u64 OrigDirNodeOffset,
+			   __u64 SavedDirNodeOffset)
 {
 	LOG_ENTRY ();
 
@@ -739,7 +729,7 @@ int ocfs_recover_dir_node (ocfs_super * 
  *
  */
 int ocfs_read_dir_node (ocfs_super * osb, ocfs_dir_node * DirNode,
-			ub8 NodeDiskOffset)
+			__u64 NodeDiskOffset)
 {
 	int status = 0;
 
@@ -761,7 +751,7 @@ int ocfs_read_dir_node (ocfs_super * osb
  *
  */
 int ocfs_write_force_dir_node (ocfs_super * osb,
-		       ocfs_dir_node * DirNode, sb4 IndexFileEntry)
+		       ocfs_dir_node * DirNode, __s32 IndexFileEntry)
 {
 	int status = 0;
 
@@ -770,7 +760,7 @@ int ocfs_write_force_dir_node (ocfs_supe
 	if (IndexFileEntry != -1) {
 		/* Read in the Dir Node from the disk into the buffer supplied */
 		status = ocfs_write_disk (osb,
-					(ub1 *) (((ub1 *) DirNode) +
+					(__u8 *) (((__u8 *) DirNode) +
 						 ((IndexFileEntry +
 						   1) * osb->sect_size)),
 					osb->sect_size,
@@ -783,12 +773,10 @@ int ocfs_write_force_dir_node (ocfs_supe
 	}
 
 	/* Write the first sector last */
-	status =
-	    ocfs_write_disk (osb, DirNode, osb->sect_size,
-			   DirNode->node_disk_off);
-	if (status < 0) {
+	status = ocfs_write_disk (osb, DirNode, osb->sect_size,
+				  DirNode->node_disk_off);
+	if (status < 0)
 		LOG_ERROR_STATUS (status);
-	}
 
 	LOG_EXIT_STATUS (status);
 	return status;
@@ -798,12 +786,12 @@ int ocfs_write_force_dir_node (ocfs_supe
  * ocfs_write_dir_node()
  *
  */
-int ocfs_write_dir_node (ocfs_super * osb, ocfs_dir_node * DirNode, sb4 IndexFileEntry)
+int ocfs_write_dir_node (ocfs_super * osb, ocfs_dir_node * DirNode, __s32 IndexFileEntry)
 {
 	int status = 0;
-	ub8 offset;
-	ub4 size;
-	ub1 *buffer;
+	__u64 offset;
+	__u32 size;
+	__u8 *buffer;
 	bool bCacheWrite = false;
 	bool bFileCacheWrite = false;
 
@@ -821,8 +809,8 @@ int ocfs_write_dir_node (ocfs_super * os
 
 		offset = DirNode->node_disk_off +
 		    ((IndexFileEntry + 1) * osb->sect_size);
-		size = (ub4) osb->sect_size;
-		buffer = (ub1 *) (((ub1 *) DirNode) +
+		size = (__u32) osb->sect_size;
+		buffer = (__u8 *) (((__u8 *) DirNode) +
 				  ((IndexFileEntry + 1) * osb->sect_size));
 		fe = (ocfs_file_entry *) buffer;
 
@@ -854,7 +842,7 @@ int ocfs_write_dir_node (ocfs_super * os
 
 	/* Write the first sector last */
 	offset = DirNode->node_disk_off;
-	size = (ub4) OCFS_SECTOR_SIZE;
+	size = (__u32) OCFS_SECTOR_SIZE;
 
 	/* Write the dir node */
 	if (bCacheWrite) {
@@ -880,12 +868,11 @@ int ocfs_write_dir_node (ocfs_super * os
  * ocfs_walk_dir_node()
  *
  */
-bool ocfs_walk_dir_node (ocfs_super * osb,
-	       ocfs_dir_node * DirNode,
-	       ocfs_file_entry * found_fe, ocfs_file * OFile)
+bool ocfs_walk_dir_node (ocfs_super * osb, ocfs_dir_node * DirNode,
+			 ocfs_file_entry * found_fe, ocfs_file * OFile)
 {
-	ub4 start;
-	ub4 i;
+	__u32 start;
+	__u32 i;
 	ocfs_file_entry *fe;
 	int status;
 	bool bRet = false;
@@ -969,13 +956,12 @@ bool ocfs_walk_dir_node (ocfs_super * os
  * ocfs_search_dir_node()
  *
  */
-bool ocfs_search_dir_node (ocfs_super * osb,
-		 ocfs_dir_node * DirNode,
-		 struct qstr * SearchName,
-		 ocfs_file_entry * found_fe, ocfs_file * OFile)
+bool ocfs_search_dir_node (ocfs_super * osb, ocfs_dir_node * DirNode,
+			   struct qstr * SearchName, ocfs_file_entry * found_fe,
+			   ocfs_file * OFile)
 {
-	ub4 start;
-	ub4 index;
+	__u32 start;
+	__u32 index;
 	ocfs_file_entry *fe;
 	int status;
 	bool bRet = false;
@@ -1040,8 +1026,8 @@ bool ocfs_search_dir_node (ocfs_super * 
  * ocfs_find_index()
  *
  */
-bool ocfs_find_index (ocfs_super * osb, ocfs_dir_node * DirNode, struct qstr * FileName,
-	   int *Index)
+bool ocfs_find_index (ocfs_super * osb, ocfs_dir_node * DirNode,
+		      struct qstr * FileName, int *Index)
 {
 	int lowBnd, upBnd;
 	ocfs_file_entry *fe;
@@ -1139,20 +1125,20 @@ bool ocfs_find_index (ocfs_super * osb, 
  * ocfs_reindex_dir_node()
  *
  */
-int ocfs_reindex_dir_node (ocfs_super * osb, ub8 DirNodeOffset, ocfs_dir_node * DirNode)
+int ocfs_reindex_dir_node (ocfs_super * osb, __u64 DirNodeOffset, ocfs_dir_node * DirNode)
 {
 	int status = 0;
 	ocfs_dir_node *pDirNode = NULL;
 	ocfs_file_entry *pInsertEntry;
 	ocfs_file_entry *fe;
-	ub4 size, index;
-	ub1 offset = 0;
+	__u32 size, index;
+	__u8 offset = 0;
 	int res;
 
 	LOG_ENTRY ();
 
 	if (DirNode == NULL) {
-		size = (ub4) (osb->vol_layout.dir_node_size);
+		size = (__u32) (osb->vol_layout.dir_node_size);
 		pDirNode = ocfs_malloc (size);
 		if (pDirNode == NULL) {
 			LOG_ERROR_STATUS (status = -ENOMEM);
@@ -1161,6 +1147,7 @@ int ocfs_reindex_dir_node (ocfs_super * 
 
 		status = ocfs_read_dir_node (osb, pDirNode, DirNodeOffset);
 		if (status < 0) {
+			LOG_ERROR_STATUS (status);
 			goto leave;
 		}
 	} else {
@@ -1181,8 +1168,7 @@ int ocfs_reindex_dir_node (ocfs_super * 
 				continue;
 			}
 
-			res =
-			    strcmp (fe->filename, pInsertEntry->filename);
+			res = strcmp (fe->filename, pInsertEntry->filename);
 			if (res < 0) {
 				break;
 			}
@@ -1199,6 +1185,7 @@ int ocfs_reindex_dir_node (ocfs_super * 
 
 		status = ocfs_write_dir_node (osb, pDirNode, -1);
 		if (status < 0) {
+			LOG_ERROR_STATUS (status);
 			goto leave;
 		}
 
@@ -1218,7 +1205,7 @@ int ocfs_reindex_dir_node (ocfs_super * 
 int ocfs_insert_dir_node (ocfs_super * osb,
 	       ocfs_dir_node * DirNode,
 	       ocfs_file_entry * InsertEntry,
-	       ocfs_dir_node * LockNode, sb4 * IndexOffset)
+	       ocfs_dir_node * LockNode, __s32 * IndexOffset)
 {
 	int status = 0;
 	ocfs_file_entry *fe;
@@ -1226,8 +1213,8 @@ int ocfs_insert_dir_node (ocfs_super * o
 	int index = -1;
 	ocfs_file_entry *lastEntry;
 	ocfs_log_record *pLogRec = NULL;
-	ub4 size;
-	ub1 freeOffset;
+	__u32 size;
+	__u8 freeOffset;
         struct qstr q;
 
 	LOG_ENTRY ();
@@ -1239,8 +1226,10 @@ int ocfs_insert_dir_node (ocfs_super * o
 
 	if (DirNode->index_dirty) {
 		status = ocfs_reindex_dir_node (osb, DirNode->node_disk_off, DirNode);
-		if (status < 0)
+		if (status < 0) {
+			LOG_ERROR_STATUS (status);
 			goto bail;
+		}
 	}
 
 	if (DirNode->num_ent_used < osb->max_dir_node_ent) {
@@ -1256,9 +1245,7 @@ int ocfs_insert_dir_node (ocfs_super * o
 			if (index < DirNode->num_ent_used) {
 				fe = FILEENT (DirNode, index);
 
-				res =
-				    strcmp (fe->filename,
-					     InsertEntry->filename);
+				res = strcmp (fe->filename, InsertEntry->filename);
 				if (res > 0) {
 					/* We are greater than the entry in question we */
 					/* shd be less than the one next to it */
@@ -1326,7 +1313,7 @@ int ocfs_insert_dir_node (ocfs_super * o
 
 			/* Log into recovery that this name only needs to be deleted if we fail */
 			size = sizeof (ocfs_log_record);
-			size = (ub4) OCFS_ALIGN (size, PAGE_SIZE);
+			size = (__u32) OCFS_ALIGN (size, osb->sect_size);
 
 			if ((pLogRec = ocfs_malloc (size)) == NULL) {
 				LOG_ERROR_STATUS (status = -ENOMEM);
@@ -1372,12 +1359,12 @@ int ocfs_insert_dir_node (ocfs_super * o
  * ocfs_del_file_entry()
  *
  */
-int ocfs_del_file_entry (ocfs_super * osb,
-	      ocfs_file_entry * EntryToDel, ocfs_dir_node * LockNode)
+int ocfs_del_file_entry (ocfs_super * osb, ocfs_file_entry * EntryToDel,
+			 ocfs_dir_node * LockNode)
 {
 	int status = 0;
-	ub4 offset;
-	ub4 size;
+	__u32 offset;
+	__u32 size;
 	ocfs_dir_node *PDirNode = NULL;
 	ocfs_file_entry *fe;
 	int index = 0;
@@ -1385,7 +1372,7 @@ int ocfs_del_file_entry (ocfs_super * os
 
 	LOG_ENTRY ();
 
-	size = (ub4) (osb->vol_layout.dir_node_size);
+	size = (__u32) (osb->vol_layout.dir_node_size);
 
 	PDirNode = ocfs_malloc (size);
 	if (PDirNode == NULL) {
@@ -1395,11 +1382,12 @@ int ocfs_del_file_entry (ocfs_super * os
 
 	status = ocfs_read_dir_node (osb, PDirNode, EntryToDel->dir_node_ptr);
 	if (status < 0) {
+		LOG_ERROR_STATUS (status);
 		goto leave;
 	}
 
 	offset = (EntryToDel->this_sector - PDirNode->node_disk_off) /
-	    OCFS_SECTOR_SIZE;
+				OCFS_SECTOR_SIZE;
 
 	offset -= 1;
 	for (index = 0; index < PDirNode->num_ent_used; index++) {
@@ -1477,7 +1465,6 @@ int ocfs_del_file_entry (ocfs_super * os
 	}
       leave:
 	ocfs_safefree (PDirNode);
-
 	LOG_EXIT_STATUS (status);
 	return status;
 }				/* DelFreeEntry */
@@ -1486,25 +1473,23 @@ int ocfs_del_file_entry (ocfs_super * os
  * ocfs_insert_file()
  *
  */
-int ocfs_insert_file (ocfs_super * osb,
-	    ocfs_dir_node * DirNode,
-	    ocfs_file_entry * InsertEntry,
-	    ocfs_dir_node * LockNode, ocfs_lock_res * LockResource)
+int ocfs_insert_file (ocfs_super * osb, ocfs_dir_node * DirNode,
+		      ocfs_file_entry * InsertEntry, ocfs_dir_node * LockNode,
+		      ocfs_lock_res * LockResource)
 {
 	int status = 0;
-	ub8 bitmapOffset = 0;
-	ub8 numClustersAlloc = 0;
+	__u64 bitmapOffset = 0;
+	__u64 numClustersAlloc = 0;
 	ocfs_dir_node *pNewDirNode = NULL;
-	ub4 size;
-	sb4 indexOffset = -1;
+	__u32 size;
+	__s32 indexOffset = -1;
 
 	LOG_ENTRY ();
 
 	IF_TRACE (ocfs_print_dir_node (osb, DirNode));
 
 	if (!IS_VALID_DIR_NODE (DirNode)) {
-		LOG_ERROR_STR ("Invalid DirNode");
-		status = -EFAIL;
+		LOG_ERROR_STATUS (status = -EFAIL);
 		goto leave;
 	}
 
@@ -1520,7 +1505,7 @@ int ocfs_insert_file (ocfs_super * osb,
 			goto leave;
 		}
 	} else {
-		size = (ub4) (osb->vol_layout.dir_node_size);
+		size = (__u32) (osb->vol_layout.dir_node_size);
 		pNewDirNode = ocfs_malloc (size);
 		if (pNewDirNode == NULL) {
 			LOG_ERROR_STATUS (status = -ENOMEM);
@@ -1531,7 +1516,7 @@ int ocfs_insert_file (ocfs_super * osb,
 			ocfs_read_dir_node (osb, pNewDirNode,
 					 DirNode->next_node_ptr);
 		} else {
-			ub8 fileOffset = 0;
+			__u64 fileOffset = 0;
 
 			/* Allocate a new dir node */
 			status =
@@ -1559,7 +1544,7 @@ int ocfs_insert_file (ocfs_super * osb,
 		status = ocfs_insert_dir_node (osb, pNewDirNode, InsertEntry, LockNode,
 					&indexOffset);
 		if (status < 0) {
-			LOG_ERROR_STR ("ocfs_insert_dir_node failed");
+			LOG_ERROR_STATUS (status);
 			goto leave;
 		}
 
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Common/ocfsgendlm.c linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Common/ocfsgendlm.c
--- linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Common/ocfsgendlm.c	2003-07-30 13:51:50.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Common/ocfsgendlm.c	2003-07-30 10:28:53.000000000 +0200
@@ -26,6 +26,10 @@
 
 #include  <ocfs.h>
 
+extern __u32 comm_voting;
+
+#define WAIT_FOR_VOTE_INCREMENT  200
+
 /* Tracing */
 #define OCFS_DEBUG_CONTEXT OCFS_DEBUG_CONTEXT_DLM
 
@@ -52,30 +56,43 @@ int ocfs_insert_cache_link (ocfs_super *
  *
  */
 int ocfs_update_lock_state (ocfs_super * osb, ocfs_lock_res * lockres,
-			    ub4 flags)
+			    __u32 flags, bool *disk_vote)
 {
-	ub4 votemap;
+	__u32 votemap;
 	int status = 0;
 	int tmpstat;
-	ub8 lockseqno = 0;
+	__u64 lockseqno = 0;
+	unsigned long jif;
 
-	LOG_ENTRY_ARGS ("(0x%08x, 0x%08x, %u)\n", osb, lockres, flags);
+	LOG_ENTRY_ARGS ("(0x%p, 0x%p, %u)\n", osb, lockres, flags);
 
 	votemap = (1 << lockres->master_node_num);
+	jif = jiffies;
 
-	status = ocfs_prime_voting (osb, lockres->sector_num,
-				    lockres->lock_type, votemap);
-	if (status < 0) {
-		LOG_ERROR_STATUS (status);
-		goto finito;
+	if (comm_voting && !*disk_vote) {
+		LOG_TRACE_STR ("Network vote");
+		status = ocfs_send_dlm_request_msg (osb, lockres->sector_num,
+				lockres->lock_type, flags, lockres, votemap);
+		if (status >= 0) {
+//			if (flags & FLAG_CHANGE_MASTER)
+//				lockres->master_node_num = osb->node_num;
+			goto vote_success;
+		} else if (status == -ETIMEDOUT) {
+			LOG_TRACE_STR ("Network voting timed out");
+			lockres->vote_state = 0;
+		}
+		else
+			LOG_ERROR_STATUS (status);
 	}
 
-	/* Call Comm layer to broadcast to all nodes alive, that this node */
-	/* wants exclusive access to the lock */
+	LOG_TRACE_STR ("Disk vote");
+	*disk_vote = true;
+	jif = jiffies;
 	status = ocfs_request_vote (osb, lockres->sector_num,
 			lockres->lock_type, flags, votemap, &lockseqno);
 	if (status < 0) {
-		LOG_ERROR_STATUS (status);
+		if (status != -EAGAIN)
+			LOG_ERROR_STATUS (status);
 		goto finito;
 	}
 
@@ -83,22 +100,27 @@ int ocfs_update_lock_state (ocfs_super *
 				     lockres->lock_type, flags, votemap, 5000,
 				     lockseqno, lockres);
 	if (status < 0) {
-		LOG_ERROR_STATUS (status);
+		if (status != -EAGAIN)
+			LOG_ERROR_STATUS (status);
 		goto finito;
 	}
 
+      vote_success:
+	jif = jiffies - jif;
+	LOG_TRACE_ARGS ("Lock time: %u\n", jif);
+
 	/* Change the lock id on the disk and on the resource */
-	if (flags & FLAG_CHANGE_MASTER) {
+	if (flags & FLAG_CHANGE_MASTER)
 		lockres->master_node_num = osb->node_num;
-	}
 
 	/* Lock state should transition from no lock */
 
       finito:
-	tmpstat = ocfs_reset_voting (osb, lockres->sector_num,
-				     lockres->lock_type, votemap);
-	if (tmpstat < 0) {
-		LOG_ERROR_STATUS (status = tmpstat);
+	if (*disk_vote) {
+		tmpstat = ocfs_reset_voting (osb, lockres->sector_num,
+					     lockres->lock_type, votemap);
+		if (tmpstat < 0)
+			LOG_ERROR_STATUS (tmpstat);
 	}
 
 	LOG_EXIT_STATUS (status);
@@ -109,30 +131,37 @@ int ocfs_update_lock_state (ocfs_super *
  * ocfs_disk_request_vote()
  *
  */
-int ocfs_disk_request_vote (ocfs_super * osb, ub8 lock_id, ub4 lock_type,
-			    ub4 flags, ub8 vote_map, ub8 * lock_seq_num)
+int ocfs_disk_request_vote (ocfs_super * osb, __u64 lock_id, __u32 lock_type,
+			    __u32 flags, __u64 vote_map, __u64 * lock_seq_num)
 {
 	int status = 0;
-	ub8 offset = 0;
-	ub8 pub_off;
-	ub4 size = 0;
-	ub4 numnodes = 0;
-	ub4 i;
-	ub1 *buffer = NULL;
+	__u64 offset = 0;
+	__u64 pub_off;
+	__u32 size = 0;
+	__u32 numnodes = 0;
+	__u32 i;
+	__u8 *buffer = NULL;
 	ocfs_publish *pubsect = NULL;
-	ub8 largestseqno = 0;
-	ub8 pubmap = 0;
-	ub1 *p;
-
-	LOG_ENTRY_ARGS ("(0x%08x, %u.%u, %u, %u, 0x%08x.0x%08x, 0x%08x)\n", osb,
-			HI (lock_id), LO (lock_id), lock_type, flags,
-			HI (vote_map), LO (vote_map), lock_seq_num);
+	__u64 largestseqno = 0;
+	__u64 pubmap = 0;
+	__u8 *p;
+	__u32 wait;
+	bool publish_flag = false;
+
+	LOG_ENTRY_ARGS ("(osb=0x%p, id=%u.%u, ty=%u, fl=%u, vm=0x%08x)\n", osb,
+		 HI(lock_id), LO(lock_id), lock_type, flags, LO(vote_map));
+
+	LOG_TRACE_ARGS ("osb=0x%p, id=%u.%u, ty=%u, fl=%u, vm=0x%08x\n",
+		osb, HI(lock_id), LO(lock_id), lock_type, flags, LO(vote_map));
 
 	pubmap = osb->publ_map;
 	offset = osb->vol_layout.publ_sect_off;
 	numnodes = OCFS_MAXIMUM_NODES;
 	size = (numnodes * osb->sect_size);
 
+	/* take lock to prevent overwrites by vote_reset and nm thread */
+	down_with_flag (&(osb->publish_lock), publish_flag);
+
 	/* Read the Publish Sector of all nodes */
 	status = ocfs_read_disk_ex (osb, (void **)&buffer, size, size, offset);
 	if (status < 0) {
@@ -142,17 +171,23 @@ int ocfs_disk_request_vote (ocfs_super *
 
 	for (i = 0, p = buffer; i < numnodes; i++, p += osb->sect_size) {
 		pubsect = (ocfs_publish *) p;
-		if (pubsect->time == (ub8) 0)
+		if (pubsect->time == (__u64) 0)
 			continue;
 		if (pubsect->publ_seq_num <= largestseqno)
 			continue;
 		largestseqno = pubsect->publ_seq_num;
 		if (pubsect->dirty) {
+			up_with_flag (&(osb->publish_lock), publish_flag);
 			if (!IS_NODE_ALIVE (pubmap, i, numnodes)) {
 				LOG_TRACE_ARGS ("ocfs_recover_vol(%u)\n", i);
 				ocfs_recover_vol (osb, i);
-			} else
-				ocfs_sleep (500);
+			} else {
+				get_random_bytes(&wait, sizeof(wait));
+				wait %= 200;
+				wait += OCFS_NM_HEARTBEAT_TIME;
+				LOG_TRACE_ARGS ("wait: %d\n", wait);
+				ocfs_sleep (wait);
+			}
 			status = -EAGAIN;
 			goto finally;
 		}
@@ -162,8 +197,9 @@ int ocfs_disk_request_vote (ocfs_super *
 	/* write it in its own Publish Sector and set the Dirty Bit */
 	pubsect = (ocfs_publish *) (buffer + (osb->node_num * osb->sect_size));
 	largestseqno++;
+	LOG_TRACE_ARGS ("largestseqno : %u.%u\n", HI(largestseqno), LO(largestseqno));
 	pubsect->publ_seq_num = largestseqno;
-	pubsect->dirty = 1;
+	pubsect->dirty = true;
 	pubsect->vote = FLAG_VOTE_NODE;
 	pubsect->vote_map = vote_map;
 	pubsect->vote_type = flags;
@@ -172,17 +208,18 @@ int ocfs_disk_request_vote (ocfs_super *
 	pub_off = osb->vol_layout.publ_sect_off +
 			(osb->node_num * osb->sect_size);
 
-	LOG_TRACE_ARGS ("Writing Publish Sector (%d)\n", pubsect->vote);
-
 	status = ocfs_write_disk (osb, pubsect, osb->sect_size, pub_off);
 	if (status < 0) {
 		LOG_ERROR_STATUS (status);
 		goto finally;
 	}
 
+	atomic_set (&osb->node_req_vote, 1);
+
 	*lock_seq_num = largestseqno;
 
       finally:
+	up_with_flag (&(osb->publish_lock), publish_flag);
 	ocfs_safefree (buffer);
 
 	LOG_EXIT_STATUS (status);
@@ -199,12 +236,12 @@ int ocfs_disk_request_vote (ocfs_super *
  *
  * Returns 0 of success, < 0 if error.
  */
-int ocfs_wait_for_disk_lock_release (ocfs_super * osb, ub8 offset,
-				     ub4 time_to_wait, ub4 lock_type)
+int ocfs_wait_for_disk_lock_release (ocfs_super * osb, __u64 offset,
+				     __u32 time_to_wait, __u32 lock_type)
 {
 	int status = -ETIMEDOUT;
 	int tmpstat = -ETIMEDOUT;
-	ub4 timewaited = 0;
+	__u32 timewaited = 0;
 	ocfs_file_entry *fe = NULL;
 
 	LOG_ENTRY ();
@@ -254,14 +291,12 @@ int ocfs_wait_for_disk_lock_release (ocf
 			status = 0;
 			goto finally;
 		} else
-			ocfs_sleep (200);
-		timewaited += 200;
+			ocfs_sleep (WAIT_FOR_VOTE_INCREMENT);
+		timewaited += WAIT_FOR_VOTE_INCREMENT;
 	}
 
       finally:
-	if (fe != NULL)
-		ocfs_release_file_entry (fe);
-
+	ocfs_release_file_entry (fe);
 	LOG_EXIT_STATUS (status);
 	return status;
 }				/* ocfs_wait_for_disk_lock_release */
@@ -270,16 +305,16 @@ int ocfs_wait_for_disk_lock_release (ocf
  * ocfs_wait_for_lock_release()
  *
  */
-int ocfs_wait_for_lock_release (ocfs_super * osb, ub8 offset, ub4 time_to_wait,
-				ocfs_lock_res * lockres, ub4 lock_type)
+int ocfs_wait_for_lock_release (ocfs_super * osb, __u64 offset, __u32 time_to_wait,
+				ocfs_lock_res * lockres, __u32 lock_type)
 {
 	int status = -ETIMEDOUT;
 	int tmpstat = -ETIMEDOUT;
-	ub4 timewaited = 0;
+	__u32 timewaited = 0;
 	ocfs_file_entry *fe = NULL;
-	ub4 length = 0;
+	__u32 length = 0;
 
-	LOG_ENTRY_ARGS ("(0x%08x, %u.%u, %u, 0x%08x, %u)\n", osb,
+	LOG_ENTRY_ARGS ("(0x%p, %u.%u, %u, 0x%p, %u)\n", osb,
 			HI (offset), LO (offset), time_to_wait,
 			lockres, lock_type);
 
@@ -306,7 +341,7 @@ int ocfs_wait_for_lock_release (ocfs_sup
 
 		if (!IS_NODE_ALIVE (osb->publ_map, DISK_LOCK_CURRENT_MASTER(fe),
 				    OCFS_MAXIMUM_NODES)) {
-//			LOG_ERROR_ARGS ("ocfs_recover_vol(%u)\n",
+//			LOG_ERROR_ARGS ("ocfs_recover_vol(%u)",
 //					DISK_LOCK_CURRENT_MASTER (fe));
 //			ocfs_recover_vol(osb, DISK_LOCK_CURRENT_MASTER(fe));
 
@@ -322,9 +357,10 @@ int ocfs_wait_for_lock_release (ocfs_sup
 		if (DISK_LOCK_FILE_LOCK (fe) >= OCFS_DLM_ENABLE_CACHE_LOCK) {
 			lockres->lock_type = DISK_LOCK_FILE_LOCK (fe);
 			lockres->master_node_num = DISK_LOCK_CURRENT_MASTER (fe);
-			status = ocfs_break_cache_lock (osb, lockres);
+			status = ocfs_break_cache_lock (osb, lockres, fe);
 			if (status < 0) {
-				LOG_ERROR_STATUS (status);
+				if (status != -EINTR)
+					LOG_ERROR_STATUS (status);
 				goto finally;
 			}
 			DISK_LOCK_FILE_LOCK (fe) = lockres->lock_type;
@@ -334,10 +370,9 @@ int ocfs_wait_for_lock_release (ocfs_sup
 		if (DISK_LOCK_FILE_LOCK (fe) <= lock_type) {
 			status = 0;
 			goto finally;
-		} else {
-			ocfs_sleep (200);
-		}
-		timewaited += 200;
+		} else
+			ocfs_sleep (WAIT_FOR_VOTE_INCREMENT);
+		timewaited += WAIT_FOR_VOTE_INCREMENT;
 	}
 
       finally:
@@ -350,9 +385,7 @@ int ocfs_wait_for_lock_release (ocfs_sup
 		ocfs_release_lockres (lockres);
 	}
 
-	if (fe != NULL)
-		ocfs_release_file_entry (fe);
-
+	ocfs_release_file_entry (fe);
 	LOG_EXIT_STATUS (status);
 	return status;
 }				/* ocfs_wait_for_lock_release */
@@ -361,19 +394,19 @@ int ocfs_wait_for_lock_release (ocfs_sup
  * ocfs_get_vote_on_disk()
  *
  */
-int ocfs_get_vote_on_disk (ocfs_super * osb, ub8 lock_id, ub4 lock_type,
-			   ub4 flags, ub8 * got_vote_map, ub8 vote_map,
-			   ub8 lock_seq_num, ub8 * oin_open_map)
+int ocfs_get_vote_on_disk (ocfs_super * osb, __u64 lock_id, __u32 lock_type,
+			   __u32 flags, __u64 * got_vote_map, __u64 vote_map,
+			   __u64 lock_seq_num, __u64 * oin_open_map)
 {
 	int status = 0;
-	ub4 length = 0;
-	ub4 i;
-	ub4 numnodes;
-	ub1 *buffer = NULL;
+	__u32 length = 0;
+	__u32 i;
+	__u32 numnodes;
+	__u8 *buffer = NULL;
 	ocfs_vote *vote;
-	ub1 *p;
+	__u8 *p;
 
-	LOG_ENTRY_ARGS ("lockid=%u.%u, locktype=%u, votemap=0x%08x)\n",
+	LOG_ENTRY_ARGS ("(lockid=%u.%u, locktype=%u, votemap=0x%08x)\n",
 			HI (lock_id), LO (lock_id), lock_type, LO (vote_map));
 
 	numnodes = OCFS_MAXIMUM_NODES;
@@ -433,7 +466,6 @@ int ocfs_get_vote_on_disk (ocfs_super * 
 
       finally:
 	ocfs_safefree (buffer);
-
 	LOG_EXIT_STATUS (status);
 	return (status);
 }				/* ocfs_get_vote_on_disk */
@@ -442,15 +474,18 @@ int ocfs_get_vote_on_disk (ocfs_super * 
  * ocfs_disk_reset_voting()
  *
  */
-int ocfs_disk_reset_voting (ocfs_super * osb, ub8 lock_id, ub4 lock_type)
+int ocfs_disk_reset_voting (ocfs_super * osb, __u64 lock_id, __u32 lock_type)
 {
 	int status = 0;
 	ocfs_publish *pubsect = NULL;
-	ub8 offset = 0;
+	__u64 offset = 0;
 
-	LOG_ENTRY_ARGS ("(0x%08x, %u.%u, %u)\n", osb, HI (lock_id),
+	LOG_ENTRY_ARGS ("(0x%p, %u.%u, %u)\n", osb, HI (lock_id),
 			LO (lock_id), lock_type);
 
+	/* take lock to prevent publish overwrites by vote_req and nm thread */
+	down (&(osb->publish_lock));
+
 	/* Read node's publish sector */
 	offset = osb->vol_layout.publ_sect_off +
 		 (osb->node_num * osb->sect_size);
@@ -461,9 +496,11 @@ int ocfs_disk_reset_voting (ocfs_super *
 		goto finally;
 	}
 
-	pubsect->dirty = 0;
+	pubsect->dirty = false;
 	pubsect->vote = 0;
 	pubsect->vote_type = 0;
+	pubsect->vote_map = 0;
+	pubsect->dir_ent = 0;
 
 	/* Write it back */
 	status = ocfs_write_disk (osb, pubsect, osb->sect_size, offset);
@@ -472,9 +509,11 @@ int ocfs_disk_reset_voting (ocfs_super *
 		goto finally;
 	}
 
+	atomic_set (&osb->node_req_vote, 0);
+
       finally:
+	up (&(osb->publish_lock));
 	ocfs_safefree (pubsect);
-
 	LOG_EXIT_STATUS (status);
 	return (status);
 }				/* ocfs_disk_reset_voting */
@@ -483,34 +522,40 @@ int ocfs_disk_reset_voting (ocfs_super *
  * ocfs_wait_for_vote()
  *
  */
-int ocfs_wait_for_vote (ocfs_super * osb, ub8 lock_id, ub4 lock_type, ub4 flags,
-			ub8 vote_map, ub4 time_to_wait, ub8 lock_seq_num,
+int ocfs_wait_for_vote (ocfs_super * osb, __u64 lock_id, __u32 lock_type, __u32 flags,
+			__u64 vote_map, __u32 time_to_wait, __u64 lock_seq_num,
 			ocfs_lock_res * lockres)
 {
 	int status = -EAGAIN;
-	ub4 timewaited = 0;
-	ub8 gotvotemap = 0;
-	ub8 fileopenmap = 0;
+	__u32 timewaited = 0;
+	__u64 gotvotemap = 0;
+	__u64 fileopenmap = 0;
+
+	LOG_ENTRY_ARGS ("(osb=0x%p, id=%u.%u, ty=%u, fl=%u, vm=0x%08x, "
+		"sq:%u.%u)\n", osb, HI (lock_id), LO (lock_id), lock_type,
+		flags, LO (vote_map), HI(lock_seq_num), LO(lock_seq_num));
 
-	LOG_ENTRY_ARGS ("lockid=%u.%u, locktype=%u, votemap=0x%08x)\n",
-			HI (lock_id), LO (lock_id), lock_type, LO (vote_map));
-
-#define WAIT_FOR_VOTE_INCREMENT  200
 	while (time_to_wait > timewaited) {
 		ocfs_sleep (WAIT_FOR_VOTE_INCREMENT);
 
+		if (!atomic_read (&osb->node_req_vote)) {
+			LOG_TRACE_ARGS ("wait EAGAIN\n");
+			status = -EAGAIN;
+			goto bail;
+		}
+
 		gotvotemap |= (1 << osb->node_num);
 
 		status = ocfs_get_vote_on_disk (osb, lock_id, lock_type, flags,
 				&gotvotemap, vote_map, lock_seq_num, &fileopenmap);
 		if (status < 0) {
-			LOG_ERROR_STATUS (status);
+			if (status != -EAGAIN)
+				LOG_ERROR_STATUS (status);
 			goto bail;
 		}
 
 		if (!(gotvotemap & (1 << osb->node_num))) {
-			/* We need to bail out... */
-			LOG_ERROR_STATUS (status = -EAGAIN);
+			status = -EAGAIN;
 			goto bail;
 		}
 
@@ -530,20 +575,11 @@ int ocfs_wait_for_vote (ocfs_super * osb
 }				/* ocfs_wait_for_vote */
 
 /*
- * ocfs_prime_voting()
- *
- */
-int ocfs_prime_voting (ocfs_super * osb, ub8 lock_id, ub4 lock_type, ub8 vote_map)
-{
-	return 0;
-}				/* ocfs_prime_voting */
-
-/*
  * ocfs_reset_voting()
  *
  */
-int ocfs_reset_voting (ocfs_super * osb, ub8 lock_id, ub4 lock_type,
-		       ub8 vote_map)
+int ocfs_reset_voting (ocfs_super * osb, __u64 lock_id, __u32 lock_type,
+		       __u64 vote_map)
 {
 	int status;
 
@@ -559,8 +595,8 @@ int ocfs_reset_voting (ocfs_super * osb,
  * ocfs_request_vote()
  *
  */
-int ocfs_request_vote (ocfs_super * osb, ub8 lock_id, ub4 lock_type, ub4 flags,
-		       ub8 vote_map, ub8 * lock_seq_num)
+int ocfs_request_vote (ocfs_super * osb, __u64 lock_id, __u32 lock_type, __u32 flags,
+		       __u64 vote_map, __u64 * lock_seq_num)
 {
 	int status;
 
@@ -573,16 +609,18 @@ int ocfs_request_vote (ocfs_super * osb,
 	return status;
 }				/* ocfs_request_vote */
 
+#ifdef UNUSED
 /*
  * ocfs_comm_request_vote()
  *
  */
-int ocfs_comm_request_vote (ocfs_super * osb, ub8 lock_id, ub4 lock_type,
-			    ub4 flags, ocfs_file_entry * fe)
+int ocfs_comm_request_vote (ocfs_super * osb, __u64 lock_id, __u32 lock_type,
+			    __u32 flags, ocfs_file_entry * fe, __u32 attempts)
 {
-	ub8 votemap;
-	ocfs_lock_res *lockres;
+	__u64 votemap;
+	ocfs_lock_res *lockres = NULL;
 	int status = 0;
+	int i;
 
 	LOG_ENTRY ();
 
@@ -600,17 +638,19 @@ int ocfs_comm_request_vote (ocfs_super *
 
 	votemap &= ~(1 << osb->node_num);
 
-	status = 0;
-	if (votemap != 0)
-		status = ocfs_send_dlm_request_msg (osb, lock_id, lock_type,
-				flags, lockres, votemap, OCFS_DISK_VOTE_REQUEST);
-	if (status == -ETIMEDOUT) {
-		LOG_TRACE_STR ("IPC voting timed out");
-		status = -EFAIL;
-		goto bail;
-	} else {
-		if (lockres->vote_status >= 0) {
-			lockres->lock_type = (ub1) lock_type;
+	for (i = 0; i < attempts; ++i) {
+		status = 0;
+		if (votemap != 0) {
+			status = ocfs_send_dlm_request_msg (osb, lock_id, lock_type,
+					flags, lockres, votemap);
+			if (status == -ETIMEDOUT) {
+				LOG_TRACE_STR ("IPC voting timed out");
+				lockres->vote_state = 0;
+			}
+		}
+
+		if (status == 0 && lockres->vote_status == 0) {
+			lockres->lock_type = (__u8) lock_type;
 			lockres->master_node_num = osb->node_num;
 
 			status = ocfs_update_disk_lock (osb, lockres,
@@ -619,21 +659,25 @@ int ocfs_comm_request_vote (ocfs_super *
 				LOG_ERROR_STATUS (status);
 				goto bail;
 			}
+			status = 0;
+			goto bail;
 		}
-		status = lockres->vote_status;
-		goto bail;
 	}
 
+	status = -EBUSY;
+
       bail:
+	ocfs_put_lockres(lockres, osb);
 	LOG_EXIT_STATUS (status);
 	return (status);
 }				/* ocfs_comm_request_vote */
+#endif
 
 /*
  * ocfs_init_dlm_msg()
  *
  */
-void ocfs_init_dlm_msg (ocfs_super * osb, ocfs_dlm_msg * dlm_msg, ub4 msg_len)
+void ocfs_init_dlm_msg (ocfs_super * osb, ocfs_dlm_msg * dlm_msg, __u32 msg_len)
 {
 	LOG_ENTRY ();
 
@@ -652,16 +696,17 @@ void ocfs_init_dlm_msg (ocfs_super * osb
  * ocfs_send_dlm_request_msg()
  *
  */
-int ocfs_send_dlm_request_msg (ocfs_super * osb, ub8 lock_id, ub4 lock_type,
-			       ub4 flags, ocfs_lock_res * lockres,
-			       ub8 vote_map, ub4 msg_type)
+int ocfs_send_dlm_request_msg (ocfs_super * osb, __u64 lock_id, __u32 lock_type,
+			       __u32 flags, ocfs_lock_res * lockres,
+			       __u64 vote_map)
 {
 	int status = 0;
 	ocfs_dlm_msg *dlm_msg = NULL;
-	ub4 msg_len;
-	bool update_disk = true;		//SM ????
+	__u32 msg_len;
+	ocfs_dlm_msg_hdr *req;
 
-	LOG_ENTRY ();
+	LOG_ENTRY_ARGS ("(osb=0x%p, id:%u.%u, ty=%u, fl=%u, vm=0x%08x)\n", osb,
+			HI(lock_id), LO(lock_id), lock_type, flags, LO(vote_map));
 
 	msg_len = sizeof (ocfs_dlm_msg) - 1 + sizeof (ocfs_dlm_req_master);
 
@@ -672,32 +717,24 @@ int ocfs_send_dlm_request_msg (ocfs_supe
 	}
 
 	ocfs_acquire_lockres (lockres);
-	if (lockres->master_node_num == OCFS_INVALID_NODE_NUM) {
-		update_disk = true;
-		lockres->lock_state |= LOCK_STATE_IN_VOTING;
-		lockres->req_vote_map = vote_map;
-		lockres->got_vote_map = 0;
-	}
-	lockres->lock_state |= LOCK_STATE_IN_VOTING;
+	lockres->vote_state = LOCK_STATE_IN_VOTING;
+	lockres->req_vote_map = vote_map;
+	lockres->got_vote_map = 0;
+	lockres->tmp_openmap = 0;
+	spin_lock (&OcfsGlobalCtxt.comm_seq_lock);
+	OcfsGlobalCtxt.comm_seq_num++;
+	lockres->last_upd_seq_num = OcfsGlobalCtxt.comm_seq_num;
+	spin_unlock (&OcfsGlobalCtxt.comm_seq_lock);
 	ocfs_release_lockres (lockres);
 
 	ocfs_init_dlm_msg (osb, dlm_msg, msg_len);
 
-	dlm_msg->msg_type = msg_type;
+	dlm_msg->msg_type = OCFS_VOTE_REQUEST;
 
-	if (msg_type == OCFS_REQUEST_MAKE_MASTER) {
-		ocfs_dlm_req_master *req =
-		    (ocfs_dlm_req_master *) dlm_msg->msg_buf;
-		req->lock_id = lock_id;
-		req->flags = flags;
-		req->lock_seq_num = lockres->last_upd_seq_num;
-	} else if (msg_type == OCFS_DISK_VOTE_REQUEST) {
-		ocfs_dlm_disk_vote_req *req =
-		    (ocfs_dlm_disk_vote_req *) dlm_msg->msg_buf;
-		req->lock_id = lock_id;
-		req->flags = flags;
-		req->lock_seq_num = lockres->last_upd_seq_num;
-	}
+	req = (ocfs_dlm_msg_hdr *) dlm_msg->msg_buf;
+	req->lock_id = lock_id;
+	req->flags = flags;
+	req->lock_seq_num = lockres->last_upd_seq_num;
 
 	ocfs_send_bcast (osb, vote_map, dlm_msg);
 	status = ocfs_wait (lockres->voted_event,
@@ -710,58 +747,63 @@ int ocfs_send_dlm_request_msg (ocfs_supe
 	return status;
 }				/* ocfs_send_dlm_request_msg */
 
+#ifdef UNUSED
 /*
  * ocfs_comm_make_lock_master()
  *
  */
-int ocfs_comm_make_lock_master (ocfs_super * osb, ub8 lock_id, ub4 lock_type,
-				ub4 flags, ocfs_lock_res * lockres,
-				ocfs_file_entry * fe, ub8 vote_map)
+int ocfs_comm_make_lock_master (ocfs_super * osb, __u64 lock_id, __u32 lock_type,
+				__u32 flags, ocfs_lock_res * lockres,
+				ocfs_file_entry * fe, __u64 vote_map,
+				__u32 attempts)
 {
 	int status = 0;
+	int i;
 
 	LOG_ENTRY ();
 
-	status = ocfs_send_dlm_request_msg (osb, lock_id, lock_type, flags,
-					    lockres, vote_map,
-					    OCFS_REQUEST_MAKE_MASTER);
-	if (status == -ETIMEDOUT) {
-		LOG_TRACE_STR ("IPC voting timed out");
-		status = -EFAIL;
-	} else {
-		LOG_TRACE_STR ("Got vote on comm, updating disk");
-		if (lockres->vote_status >= 0) {
-			lockres->lock_type = (ub1) lock_type;
-			lockres->master_node_num = osb->node_num;
-
-			status = ocfs_update_disk_lock (osb, lockres,
-				 	DLOCK_FLAG_MASTER | DLOCK_FLAG_LOCK,
-				 	fe);
-			if (status < 0) {
-				LOG_ERROR_STATUS (status);
-				goto finally;
+	for (i = 0; i < attempts; ++i) {
+		status = ocfs_send_dlm_request_msg (osb, lock_id, lock_type,
+						    flags, lockres, vote_map);
+		if (status == -ETIMEDOUT) {
+			LOG_TRACE_STR ("Network voting timed out");
+			lockres->vote_state = 0;
+		} else {
+			if (lockres->vote_status >= 0) {
+				lockres->lock_type = (__u8) lock_type;
+				lockres->master_node_num = osb->node_num;
+
+				status = ocfs_update_disk_lock (osb, lockres,
+						DLOCK_FLAG_MASTER | DLOCK_FLAG_LOCK,
+					 	fe);
+				if (status < 0) {
+					LOG_ERROR_STATUS (status);
+					goto finally;
+				}
 			}
+			status = lockres->vote_status;
 		}
-		status = lockres->vote_status;
 	}
 
       finally:
 	LOG_EXIT_STATUS (status);
 	return status;
-}
+}				/* ocfs_comm_make_lock_master */
+#endif
 
 /*
  * ocfs_make_lock_master()
  *
  */
-int ocfs_make_lock_master (ocfs_super * osb, ub8 lock_id, ub4 lock_type,
-			   ub4 flags, ocfs_lock_res * lockres,
-			   ocfs_file_entry * fe)
+int ocfs_make_lock_master (ocfs_super * osb, __u64 lock_id, __u32 lock_type,
+			   __u32 flags, ocfs_lock_res * lockres,
+			   ocfs_file_entry * fe, bool *disk_vote)
 {
-	ub8 vote_map = 0;
+	__u64 vote_map = 0;
+	__u64 lockseqnum = 0;
 	int status = 0;
 	int tmpstat;
-	ub8 lockSeqNo = 0;
+	unsigned long jif;
 
 	LOG_ENTRY ();
 
@@ -771,61 +813,106 @@ int ocfs_make_lock_master (ocfs_super * 
 	    (!(flags & FLAG_DIR)) &&
 	    (DISK_LOCK_CURRENT_MASTER (fe) == osb->node_num)) {
 		vote_map = DISK_LOCK_OIN_MAP (fe);
+		vote_map &= osb->publ_map;	/* remove all dead nodes */
 	}
 
 	vote_map &= ~(1 << osb->node_num);
 
-#ifdef USE_COMM_MAKE_LOCK_MASTER
-	status = ocfs_comm_make_lock_master (osb, lock_id, lock_type, flags,
-					     lockres, fe, vote_map);
-	if (status >= 0)
-		goto finito;
-#endif
-
 	if (vote_map == 0) {
 		/* As this is the only node alive, make it master of the lock */
 		if (lockres->lock_type <= lock_type)
-			lockres->lock_type = (ub1) lock_type;
+			lockres->lock_type = (__u8) lock_type;
 		lockres->master_node_num = osb->node_num;
 
 		status = ocfs_update_disk_lock (osb, lockres,
 				DLOCK_FLAG_MASTER | DLOCK_FLAG_LOCK, fe);
 		if (status < 0) {
 			LOG_ERROR_STATUS (status);
-			goto finito;
+			goto bail;
 		}
-		goto finito;
+		goto bail;
 	}
 
-	LOG_TRACE_ARGS ("votemap 0x%08x, lockid %u.%u, masternode (%d)\n",
-			LO (vote_map), HI (lock_id), LO (lock_id),
-			DISK_LOCK_CURRENT_MASTER (fe));
+#if 0
+	status = -EAGAIN;
+	while (status == -EAGAIN) {
+		if (!IS_NODE_ALIVE (osb->publ_map, lockres->master_node_num,
+				    OCFS_MAXIMUM_NODES)) {
+			LOG_TRACE_ARGS ("Master (%u) dead, lockid %u.%u\n",
+				lockres->master_node_num,
+				HI (lockres->sector_num), LO (lockres->sector_num));
+			status = 0;
+			goto bail;
+		}
+
+		ocfs_acquire_lockres (lockres);
 
-	status = ocfs_prime_voting (osb, lock_id, lock_type, vote_map);
-	if (status < 0) {
-		LOG_ERROR_STATUS (status);
-		goto finito;
+		if (lockres->master_node_num == osb->node_num) {
+			lockres->oin_openmap |= (1 << osb->node_num);
+			status = ocfs_update_disk_lock (osb, lockres,
+						DLOCK_FLAG_OPEN_MAP, NULL);
+			if (status < 0) {
+				LOG_ERROR_STATUS (status);
+				ocfs_release_lockres (lockres);
+				goto bail;
+			}
+		} else {
+			status = ocfs_update_lock_state (osb, lockres,
+						 FLAG_ADD_OIN_MAP, &disk_vote);
+			if (status < 0) {
+				LOG_ERROR_STATUS (status);
+				ocfs_release_lockres (lockres);
+				if (status == -EAGAIN)
+					continue;
+				goto bail;
+			}
+		}
+		ocfs_release_lockres (lockres);
+	}
+#endif
+
+	jif = jiffies;
+
+	if (comm_voting && !*disk_vote) {
+		LOG_TRACE_STR ("Network vote");
+		status = ocfs_send_dlm_request_msg (osb, lock_id, lock_type,
+						    flags, lockres, vote_map);
+		if (status >= 0) {
+			goto vote_success;
+		} else if (status == -ETIMEDOUT) {
+			LOG_TRACE_STR ("Network voting timed out");
+			lockres->vote_state = 0;
+		}
+		else
+			LOG_ERROR_STATUS (status);
 	}
 
-	/* Call Comm layer to broadcast to all nodes alive, that this node */
-	/* wants exclusive access to the lock. */
+	LOG_TRACE_STR ("Disk vote");
+	*disk_vote = true;
+	jif = jiffies;
 	status = ocfs_request_vote (osb, lock_id, lock_type, flags, vote_map,
-				    &lockSeqNo);
+				    &lockseqnum);
 	if (status < 0) {
-		LOG_ERROR_STATUS (status);
-		goto finito;
+		if (status != -EAGAIN)
+			LOG_ERROR_STATUS (status);
+		goto bail;
 	}
 
 	status = ocfs_wait_for_vote (osb, lock_id, lock_type, flags, vote_map,
-				     5000, lockSeqNo, lockres);
+				     5000, lockseqnum, lockres);
 	if (status < 0) {
-		LOG_ERROR_STATUS (status);
-		goto finito;
+		if (status != -EAGAIN)
+			LOG_ERROR_STATUS (status);
+		goto bail;
 	}
 
+      vote_success:
+	jif = jiffies - jif;
+	LOG_TRACE_ARGS ("Lock time: %u\n", jif);
+
 	/* Make this node the master of this lock */
 	if (lockres->lock_type <= lock_type)
-		lockres->lock_type = (ub1) lock_type;
+		lockres->lock_type = (__u8) lock_type;
 
 	lockres->master_node_num = osb->node_num;
 
@@ -834,13 +921,14 @@ int ocfs_make_lock_master (ocfs_super * 
 		 DLOCK_FLAG_MASTER | DLOCK_FLAG_LOCK | DLOCK_FLAG_OPEN_MAP, fe);
 	if (status < 0) {
 		LOG_ERROR_STATUS (status);
-		goto finito;
+		goto bail;
 	}
 
-      finito:
-	tmpstat = ocfs_reset_voting (osb, lock_id, lock_type, vote_map);
-	if (tmpstat < 0) {
-		LOG_ERROR_STATUS (status = tmpstat);
+      bail:
+	if (*disk_vote) {
+		tmpstat = ocfs_reset_voting (osb, lock_id, lock_type, vote_map);
+		if (tmpstat < 0)
+			LOG_ERROR_STATUS (tmpstat);
 	}
 
 	LOG_EXIT_STATUS (status);
@@ -848,24 +936,45 @@ int ocfs_make_lock_master (ocfs_super * 
 }				/* ocfs_make_lock_master */
 
 /*
- * ocfs_acquire_lockres()
+ * ocfs_acquire_lockres_ex()
  *
+ * @lockres: lockres to acquire
+ * @timeout: timeout in ms, 0 == no timeout
  */
-void ocfs_acquire_lockres (ocfs_lock_res * lockres)
+int ocfs_acquire_lockres_ex (ocfs_lock_res * lockres, __u32 timeout)
 {
 	int mypid;
+	unsigned long jif = 0;
+	int status = 0;
+	int cnt = 0;
 
-	LOG_ENTRY_ARGS ("(0x%08x)\n", lockres);
+	LOG_ENTRY_ARGS ("(0x%p, %d)\n", lockres, timeout);
 
 	mypid = ocfs_getpid ();
 
+	if (timeout)
+		jif = jiffies + (timeout * HZ / 1000);
+
 	while (1) {
 		spin_lock (&lockres->lock_mutex);
 
 		if (lockres->in_use) {
 			if (lockres->thread_id != mypid) {
 				spin_unlock (&lockres->lock_mutex);
-				ocfs_sleep (1);	/* 1 ms, dangerously short! */
+				if (jif && jif < jiffies) {
+					LOG_TRACE_ARGS ("lockpid=%d, newpid=%d,"
+						" timedout\n",
+						lockres->thread_id, mypid);
+					status = -ETIMEDOUT;
+					goto bail;
+				}
+
+				if (++cnt == 10) {
+					LOG_TRACE_ARGS ("lockpid=%d, newpid=%d\n",
+						lockres->thread_id, mypid);
+					cnt = 0;
+				}
+				ocfs_sleep (OCFS_NM_HEARTBEAT_TIME / 10);
 			}
 			else {
 				lockres->in_use++;
@@ -880,9 +989,10 @@ void ocfs_acquire_lockres (ocfs_lock_res
 		}
 	}
 
-	LOG_EXIT ();
-	return;
-}				/* ocfs_acquire_lockres */
+      bail:
+	LOG_EXIT_STATUS (status);
+	return status;
+}				/* ocfs_acquire_lockres_ex */
 
 /*
  * ocfs_release_lockres()
@@ -890,11 +1000,11 @@ void ocfs_acquire_lockres (ocfs_lock_res
  */
 void ocfs_release_lockres (ocfs_lock_res * lockres)
 {
-	LOG_ENTRY_ARGS ("(0x%08x)\n", lockres);
+	LOG_ENTRY_ARGS ("(0x%p)\n", lockres);
 
 	if (lockres->in_use == 0) {
-		LOG_TRACE_ARGS("Releasing lock resource: %p inuse was zero, "
-			       "thread=%d\n", lockres, lockres->thread_id);
+		LOG_TRACE_ARGS("Releasing lockres with inuse 0: 0x%p\n",
+			       lockres);
 		lockres->thread_id = 0;
 		lockres->in_use = 0;
 	} else {
@@ -913,10 +1023,10 @@ void ocfs_release_lockres (ocfs_lock_res
  *
  */
 int ocfs_update_disk_lock (ocfs_super * osb, ocfs_lock_res * lockres,
-			   ub4 flags, ocfs_file_entry * fe)
+			   __u32 flags, ocfs_file_entry * fe)
 {
 	int status = 0;
-	ub8 offset = 0;
+	__u64 offset = 0;
 	ocfs_file_entry *tmp_fe = NULL;
 
 	LOG_ENTRY ();
@@ -927,7 +1037,7 @@ int ocfs_update_disk_lock (ocfs_super * 
 	else {
 		tmp_fe = fe;
 		status = ocfs_read_disk (osb, (void *) tmp_fe,
-					 (ub4) osb->sect_size, offset);
+					 (__u32) osb->sect_size, offset);
 	}
 	if (status < 0) {
 		LOG_ERROR_STATUS (status);
@@ -953,7 +1063,7 @@ int ocfs_update_disk_lock (ocfs_super * 
 	}
 
       finally:
-	if ((tmp_fe != fe) && (tmp_fe))
+	if ((tmp_fe != fe))
 		ocfs_release_file_entry (tmp_fe);
 
 	LOG_EXIT_STATUS (status);
@@ -967,6 +1077,7 @@ int ocfs_update_disk_lock (ocfs_super * 
 int ocfs_update_master_on_open (ocfs_super * osb, ocfs_lock_res * lockres)
 {
 	int status = -EAGAIN;
+	bool disk_vote = false;
 
 	LOG_ENTRY ();
 
@@ -996,14 +1107,23 @@ int ocfs_update_master_on_open (ocfs_sup
 			}
 			ocfs_release_lockres (lockres);
 		} else {
-			/* TODO we need to handle the case when thee master node is not alive */
 			status = ocfs_update_lock_state (osb, lockres,
-							 FLAG_ADD_OIN_MAP);
+						 FLAG_ADD_OIN_MAP, &disk_vote);
 			if (status < 0) {
-				LOG_ERROR_STATUS (status);
+				if (status != -EAGAIN)
+					LOG_ERROR_STATUS (status);
 				ocfs_release_lockres (lockres);
-				if (status == -EAGAIN)
+				if (status == -EAGAIN) {
+					ocfs_sleep (500);
+					if (ocfs_task_interruptible (osb)) {
+						LOG_TRACE_ARGS("interrupted... "
+							"lockid=%u.%u\n",
+							HILO(lockres->sector_num));
+						status = -EINTR;
+						goto bail;
+					}
 					continue;
+				}
 				goto bail;
 			}
 			ocfs_release_lockres (lockres);
@@ -1019,14 +1139,13 @@ int ocfs_update_master_on_open (ocfs_sup
  * ocfs_init_lockres()
  *
  */
-void ocfs_init_lockres (ocfs_super * osb, ocfs_lock_res * lockres, ub8 lock_id)
+void ocfs_init_lockres (ocfs_super * osb, ocfs_lock_res * lockres, __u64 lock_id)
 {
-	LOG_ENTRY_ARGS ("(0x%08x, 0x%08x, %u.%u)\n", osb, lockres,
+	LOG_ENTRY_ARGS ("(0x%p, 0x%p, %u.%u)\n", osb, lockres,
 			HI (lock_id), LO (lock_id));
 
 	lockres->signature = 0x55AA;
 	lockres->lock_type = OCFS_DLM_NO_LOCK;
-	lockres->ref_cnt = 0;
 	lockres->master_node_num = OCFS_INVALID_NODE_NUM;
 	lockres->last_upd_seq_num = 0;
 	lockres->oin_openmap = 0;
@@ -1034,11 +1153,14 @@ void ocfs_init_lockres (ocfs_super * osb
 	lockres->in_use = 0;
 	lockres->oin = NULL;
 	lockres->lock_state = 0;
+	lockres->vote_state = 0;
 	lockres->in_cache_list = false;
 
 	spin_lock_init (&lockres->lock_mutex);
 	init_waitqueue_head (&lockres->voted_event);
 	atomic_set (&lockres->voted_event_woken, 0);
+	atomic_set (&lockres->lr_ref_cnt, 0);
+	atomic_set (&lockres->lr_share_cnt, 0);
 
 	/* For read/write caching */
 	lockres->last_read_time = 0;
@@ -1054,15 +1176,15 @@ void ocfs_init_lockres (ocfs_super * osb
  * ocfs_create_update_lock()
  *
  */
-int ocfs_create_update_lock (ocfs_super * osb, ocfs_inode * oin, ub8 lock_id,
-			     ub4 flags)
+int ocfs_create_update_lock (ocfs_super * osb, ocfs_inode * oin, __u64 lock_id,
+			     __u32 flags)
 {
 	int status = 0;
 	ocfs_lock_res *lockres = NULL;
 	ocfs_lock_res *tmp_lockres = NULL;
 	bool is_dir = false;
 
-	LOG_ENTRY_ARGS ("(0x%08x, 0x%08x, %u.%u, %u)\n", osb, oin,
+	LOG_ENTRY_ARGS ("(0x%p, 0x%p, %u.%u, %u)\n", osb, oin,
 			HI (lock_id), LO (lock_id), flags);
 
 	is_dir = (flags & OCFS_OIN_DIRECTORY) ? true : false;
@@ -1070,29 +1192,28 @@ int ocfs_create_update_lock (ocfs_super 
 	/* Check the lock state on the disk / in our resource map */
 	status = ocfs_lookup_sector_node (osb, lock_id, &lockres);
 	if (status >= 0) {
-		if (lockres->signature != 0x55AA) {
-			LOG_ERROR_STATUS (status = -EFAIL);
-			goto bail;
-		}
-
 		ocfs_acquire_lockres (lockres);
 		if (lockres->oin) {
 			if (lockres->oin->obj_id.type != OCFS_TYPE_OIN) {
+				ocfs_release_lockres (lockres);
 				LOG_ERROR_STATUS (status = -EFAIL);
 				goto bail;
-			}
-			else
+			} else {
+				ocfs_put_lockres (lockres->oin->lock_res);
 				lockres->oin->lock_res = NULL;
+			}
 		}
 		lockres->oin = oin;
 		oin->oin_flags |= flags;
 		oin->lock_res = lockres;
+		ocfs_get_lockres (lockres);
 		ocfs_release_lockres (lockres);
 
 		status = ocfs_wait_for_lock_release (osb, lock_id, 30000, lockres,
 				(is_dir ? OCFS_DLM_EXCLUSIVE_LOCK : OCFS_DLM_NO_LOCK));
 		if (status < 0) {
-			LOG_ERROR_STR ("Lock owner is alive and taking too much time");
+			if (status != -EINTR)
+				LOG_ERROR_STATUS (status);
 			goto bail;
 		}
 	} else {
@@ -1105,10 +1226,13 @@ int ocfs_create_update_lock (ocfs_super 
 
 		ocfs_init_lockres (osb, lockres, lock_id);
 
+		ocfs_get_lockres (lockres);
+
 		status = ocfs_wait_for_lock_release (osb, lock_id, 30000, lockres,
 				(is_dir ? OCFS_DLM_EXCLUSIVE_LOCK : OCFS_DLM_NO_LOCK));
 		if (status < 0) {
-			LOG_ERROR_STR ("Lock owner is alive and taking too much time");
+			if (status != -EINTR)
+				LOG_ERROR_STATUS (status);
 			goto bail;
 		}
 
@@ -1120,13 +1244,14 @@ int ocfs_create_update_lock (ocfs_super 
 
 		/* Check if another process added a lockres after our lookup */
 		if (tmp_lockres) {
-			/* If so, delete the recently allocated lockres */
-			ocfs_free_lockres(lockres);
+			/* If so, put the recently allocated lockres */
+			ocfs_put_lockres (lockres);
 			lockres = tmp_lockres;
 			status = ocfs_wait_for_lock_release (osb, lock_id, 30000, lockres,
 					(is_dir ? OCFS_DLM_EXCLUSIVE_LOCK : OCFS_DLM_NO_LOCK));
 			if (status < 0) {
-				LOG_ERROR_STR ("Lock owner is alive and taking too much time");
+				if (status != -EINTR)
+					LOG_ERROR_STATUS (status);
 				goto bail;
 			}
 		} else {
@@ -1144,7 +1269,11 @@ int ocfs_create_update_lock (ocfs_super 
 
 	lockres->oin = oin;
 	oin->oin_flags |= flags;
-	oin->lock_res = lockres;
+	if (oin->lock_res != lockres) {
+		ocfs_put_lockres (oin->lock_res);
+		oin->lock_res = lockres;
+		ocfs_get_lockres (lockres);
+	}
 
 	LOG_TRACE_ARGS ("MasterNode=%d, ThisNode=%d\n",
 			lockres->master_node_num, osb->node_num);
@@ -1152,13 +1281,14 @@ int ocfs_create_update_lock (ocfs_super 
 	if ((!is_dir) && (lockres->master_node_num != OCFS_INVALID_NODE_NUM) &&
 	    ((!IS_NODE_ALIVE (lockres->oin_openmap, osb->node_num, OCFS_MAXIMUM_NODES)) ||
 	     (lockres->lock_state & FLAG_ALWAYS_UPDATE_OPEN))) {
-		ocfs_release_lockres (lockres);
 		/* Send a message to master so that he can send the oin update to */
 		/* this node also. If u are the master then update File_entry */
 		/* and set the bit that this node has a open */
 		status = ocfs_update_master_on_open (osb, lockres);
 		if (status < 0) {
-			LOG_ERROR_STATUS (status);
+			ocfs_release_lockres (lockres);
+			if (status != -EINTR)
+				LOG_ERROR_STATUS (status);
 			goto bail;
 		}
 	}
@@ -1166,6 +1296,7 @@ int ocfs_create_update_lock (ocfs_super 
 	ocfs_release_lockres (lockres);
 
       bail:
+	ocfs_put_lockres(lockres);
 	LOG_EXIT_STATUS (status);
 	return status;
 }				/* ocfs_create_update_lock */
@@ -1175,39 +1306,35 @@ int ocfs_create_update_lock (ocfs_super 
  * ocfs_get_x_for_del()
  *
  */
-int ocfs_get_x_for_del (ocfs_super * osb, ub8 lock_id, ub4 lock_type, ub4 flags,
+int ocfs_get_x_for_del (ocfs_super * osb, __u64 lock_id, __u32 lock_type, __u32 flags,
 			ocfs_lock_res * lockres, ocfs_file_entry * fe)
 {
-	bool lockres_acq = false;
 	int status = -EFAIL;
+	bool disk_vote = false;
 
 	LOG_ENTRY_ARGS ("(lockid=%u.%u, locktype=%u)\n", HI (lock_id),
 			LO (lock_id), lock_type);
 
 	while (1) {
-		if (lockres_acq == false) {
-			ocfs_acquire_lockres (lockres);
-			lockres_acq = true;
-		}
-
+		ocfs_acquire_lockres (lockres);
 		/* If I am master and I am the only one in the oin node map */
 		/* update the disk */
 		status = ocfs_make_lock_master (osb, lock_id, lock_type, flags,
-						lockres, fe);
+						lockres, fe, &disk_vote);
 		if (status >= 0) {
-			if (lockres_acq) {
-				ocfs_release_lockres (lockres);
-				lockres_acq = false;
-			}
+			ocfs_release_lockres (lockres);
 			status = 0;
 			goto finally;
 		} else if (status == -EAGAIN) {
-			if (lockres_acq) {
-				ocfs_release_lockres (lockres);
-				lockres_acq = false;
+			ocfs_release_lockres (lockres);
+			ocfs_sleep (500);
+			if (ocfs_task_interruptible (osb)) {
+				LOG_TRACE_ARGS("interrupted... lockid=%u.%u\n",
+					       HILO(lock_id));
+				status = -EINTR;
+				goto finally;
 			}
-
-			status = ocfs_disk_update_resource (osb, lockres, fe);
+			status = ocfs_disk_update_resource (osb, lockres, fe, 0);
 			if (status < 0) {
 				LOG_ERROR_STATUS (status);
 				osb->vol_state = VOLUME_DISABLED;
@@ -1215,20 +1342,12 @@ int ocfs_get_x_for_del (ocfs_super * osb
 			}
 			continue;
 		} else {
-			if (lockres_acq) {
-				ocfs_release_lockres (lockres);
-				lockres_acq = false;
-			}
+			ocfs_release_lockres (lockres);
 			goto finally;
 		}
 	}
 
       finally:
-	if (lockres_acq) {
-		ocfs_release_lockres (lockres);
-		lockres_acq = false;
-	}
-
 	LOG_EXIT_STATUS (status);
 	return status;
 }				/* ocfs_get_x_for_del */
@@ -1253,30 +1372,39 @@ int ocfs_get_x_for_del (ocfs_super * osb
  * ocfs_try_exclusive_lock()
  *
  */
-int ocfs_try_exclusive_lock(ocfs_super *osb, ocfs_lock_res *lockres, ub4 flags,
-			    ub4 updated, ocfs_file_entry *fe, ub8 lock_id,
-			    ub4 lock_type)
+int ocfs_try_exclusive_lock(ocfs_super *osb, ocfs_lock_res *lockres, __u32 flags,
+			    __u32 updated, ocfs_file_entry *fe, __u64 lock_id,
+			    __u32 lock_type)
 {
-    int status;
+    int status = 0;
     bool lockres_acq = false;
     bool make_lock_master;
+    bool disk_vote = false;
+
+    LOG_ENTRY_ARGS ("(osb=0x%p, lres=0x%p, fl=%u, up=%u, fe=0x%p, "
+		    "id=%u.%u ty=%u)\n", osb, lockres, flags, updated, fe,
+		    HILO(lock_id), lock_type);
 
+    ocfs_get_lockres(lockres);
     while (1) {
-        ACQUIRE_WITH_FLAG(lockres, lockres_acq);
+	ACQUIRE_WITH_FLAG(lockres, lockres_acq);
    
-        if (lockres->master_node_num != osb->node_num || !updated) {
-            status = ocfs_read_file_entry (osb, fe, lock_id);
-            if (status < 0) {
-                LOG_ERROR_STATUS (status);
-                goto finally;
-            }
-        }
+	if (lockres->master_node_num != osb->node_num || !updated) {
+		status = ocfs_read_file_entry (osb, fe, lock_id);
+		if (status < 0) {
+			LOG_ERROR_STATUS (status);
+			goto finally;
+		}
+	}
             
         if (lockres->master_node_num == osb->node_num) {
-            if ((flags & FLAG_FILE_DELETE) || (flags & FLAG_FILE_RENAME) ||
-		(flags & FLAG_FILE_TRUNCATE)) {
+            if ((flags & FLAG_FILE_DELETE) || (flags & FLAG_FILE_RENAME)) {
                 status = ocfs_get_x_for_del (osb, lock_id, lock_type, flags,
 					     lockres, fe);
+		if (status < 0) {
+			if (status != -EINTR)
+				LOG_ERROR_STATUS (status);
+		}
                 goto finally;
             }
             
@@ -1355,7 +1483,7 @@ int ocfs_try_exclusive_lock(ocfs_super *
                 RELEASE_WITH_FLAG(lockres, lockres_acq); 
 
                 status = ocfs_make_lock_master (osb, lock_id, lock_type, flags,
-						lockres, fe);
+						lockres, fe, &disk_vote);
                 if (status >= 0) {
                     RELEASE_WITH_FLAG(lockres, lockres_acq); 
                             
@@ -1383,7 +1511,14 @@ int ocfs_try_exclusive_lock(ocfs_super *
                     goto finally;
                 } else if (status == -EAGAIN) {
                     RELEASE_WITH_FLAG(lockres, lockres_acq); 
-                    status = ocfs_disk_update_resource (osb, lockres, fe);
+		    ocfs_sleep (500);
+		    if (ocfs_task_interruptible (osb)) {
+			LOG_TRACE_ARGS("interrupted... lockid=%u.%u\n",
+				       HILO(lock_id));
+			status = -EINTR;
+			goto finally;
+		    }
+                    status = ocfs_disk_update_resource (osb, lockres, fe, 0);
                     if (status < 0) {
                         LOG_ERROR_STATUS (status);
                         osb->vol_state = VOLUME_DISABLED;
@@ -1401,29 +1536,44 @@ int ocfs_try_exclusive_lock(ocfs_super *
                  * wait for release else change master.
 		 */
    
-                //if (lockres->lock_type >= 0) 
+#ifdef ENABLE_WAIT_FOR_LOCK_RELEASE
+		if (lockres->lock_type <= OCFS_DLM_SHARED_LOCK)
+#else
                 if (true)
+#endif
                 {
                     if ((flags & FLAG_FILE_DELETE) ||
-			(flags & FLAG_FILE_RENAME) ||
-			(flags & FLAG_FILE_TRUNCATE)) {
+			(flags & FLAG_FILE_RENAME)) {
                         status = ocfs_get_x_for_del (osb, lock_id, lock_type,
 						     flags, lockres, fe);
                         RELEASE_WITH_FLAG(lockres, lockres_acq); 
+			if (status < 0) {
+				if (status != -EINTR)
+					LOG_ERROR_STATUS (status);
+			}
                         goto finally;
                     }
-                                
+
                     /* Change Lock Master */
-                    status = ocfs_update_lock_state (osb, lockres, FLAG_CHANGE_MASTER);
+                    status = ocfs_update_lock_state (osb, lockres,
+						FLAG_CHANGE_MASTER, &disk_vote);
                     RELEASE_WITH_FLAG(lockres, lockres_acq); 
                             
                     if (status < 0) {
-                        if (status == -EAGAIN)
-                            continue;
+			if (status == -EAGAIN) {
+				ocfs_sleep (500);
+				if (ocfs_task_interruptible (osb)) {
+					LOG_TRACE_ARGS("interrupted... "
+						"lockid=%u.%u\n", HILO(lock_id));
+					status = -EINTR;
+					goto finally;
+				}
+				continue;
+			}
                         goto finally;
                     }
                                 
-                    status = ocfs_read_file_entry (osb, fe, lock_id);
+		    status = ocfs_read_file_entry (osb, fe, lock_id);
                     if (status < 0) {
                         LOG_ERROR_STATUS (status);
                         goto finally;
@@ -1436,7 +1586,7 @@ int ocfs_try_exclusive_lock(ocfs_super *
                         LOG_ERROR_STATUS (status);
                         goto finally;
                     }
-        
+       
                     /* Update our state... */
                     lockres-> master_node_num = DISK_LOCK_CURRENT_MASTER (fe);
                     lockres->lock_type = DISK_LOCK_FILE_LOCK (fe);
@@ -1449,8 +1599,13 @@ int ocfs_try_exclusive_lock(ocfs_super *
                     status = ocfs_wait_for_lock_release (osb, lock_id, 30000, lockres,
 			((flags & FLAG_DIR) ? OCFS_DLM_SHARED_LOCK : OCFS_DLM_NO_LOCK));
                     if (status < 0) {
-                        if (status == -ETIMEDOUT)
-                            continue;
+			if (status == -ETIMEDOUT) {
+				LOG_TRACE_ARGS("lock %u.%u, level %d, not being "
+					"freed by node %u\n", HILO(lock_id),
+				       	lockres->lock_type, lockres->master_node_num);
+				continue;
+			} else if (status == -EINTR)
+				goto finally;
                         else
                             goto finally;
                     }
@@ -1463,6 +1618,8 @@ int ocfs_try_exclusive_lock(ocfs_super *
     
 finally: 
     RELEASE_WITH_FLAG(lockres, lockres_acq); 
+    ocfs_put_lockres(lockres);
+    LOG_EXIT_STATUS (status);
     return status;
 }				/* ocfs_try_exclusive_lock */
 
@@ -1470,15 +1627,15 @@ finally: 
  * ocfs_acquire_lock()
  *
  */
-int ocfs_acquire_lock (ocfs_super * osb, ub8 lock_id, ub4 lock_type, ub4 flags,
+int ocfs_acquire_lock (ocfs_super * osb, __u64 lock_id, __u32 lock_type, __u32 flags,
 		       ocfs_lock_res ** lockres, ocfs_file_entry * lock_fe)
 {
 	int status = -EFAIL;
 	bool lockres_acq = false;
 	ocfs_file_entry *disklock = NULL;
-	ub4 updated = 0;
+	__u32 updated = 0;
 
-	LOG_ENTRY_ARGS ("(0x%08x, %u.%u, %u, %u, 0x%08x, 0x%08x)\n", osb,
+	LOG_ENTRY_ARGS ("(0x%p, %u.%u, %u, %u, 0x%p, 0x%p)\n", osb,
 			HI (lock_id), LO (lock_id), lock_type, flags, lockres,
 			lock_fe);
 
@@ -1492,7 +1649,8 @@ int ocfs_acquire_lock (ocfs_super * osb,
 		}
 	}
 
-	status = ocfs_find_update_res (osb, lock_id, lockres, disklock, &updated);
+	status = ocfs_find_update_res (osb, lock_id, lockres, disklock,
+				       &updated, 0);
 	if (status < 0) {
 		LOG_ERROR_STATUS (status);
 		goto finally;
@@ -1500,7 +1658,6 @@ int ocfs_acquire_lock (ocfs_super * osb,
 
 	switch (lock_type) {
 	    case OCFS_DLM_SHARED_LOCK:
-
 		    if (!(flags & FLAG_DIR)) {
 			    status = 0;
 			    goto finally;
@@ -1514,10 +1671,15 @@ int ocfs_acquire_lock (ocfs_super * osb,
 		    }
 		    if (((*lockres)->lock_type == OCFS_DLM_ENABLE_CACHE_LOCK) &&
 			((*lockres)->master_node_num != osb->node_num)) {
-			    ocfs_break_cache_lock (osb, *lockres);
+			    status = ocfs_break_cache_lock (osb, *lockres, disklock);
+			    if (status < 0) {
+				    if (status != -EINTR)
+					LOG_ERROR_STATUS (status);
+				    goto finally;
+			    }
 		    }
 
-		    (*lockres)->ref_cnt++;
+		    atomic_inc (&((*lockres)->lr_share_cnt));
 
 		    if (lockres_acq) {
 			    ocfs_release_lockres (*lockres);
@@ -1532,9 +1694,14 @@ int ocfs_acquire_lock (ocfs_super * osb,
 	    case OCFS_DLM_ENABLE_CACHE_LOCK:
 		    /* This will be called for vol, allocation, file and */
 		    /* directory from create modify */
-                    status = ocfs_try_exclusive_lock(osb, *lockres, flags,
+		    status = ocfs_try_exclusive_lock(osb, *lockres, flags,
 						     updated, disklock, lock_id,
 						     lock_type);
+		    if (status < 0) {
+			if (status != -EINTR)
+				LOG_ERROR_STATUS (status);
+			goto finally;
+		    }
 		    break;
 
 	    default:
@@ -1542,13 +1709,10 @@ int ocfs_acquire_lock (ocfs_super * osb,
 	}
 
       finally:
-	if ((lock_fe == NULL) && (disklock))
+	if ((lock_fe == NULL))
 		ocfs_release_file_entry (disklock);
-
-	if (lockres_acq) {
+	if (lockres_acq)
 		ocfs_release_lockres (*lockres);
-		lockres_acq = false;
-	}
 
 	LOG_EXIT_STATUS (status);
 	return status;
@@ -1558,21 +1722,25 @@ int ocfs_acquire_lock (ocfs_super * osb,
  * ocfs_disk_release_lock()
  *
  */
-int ocfs_disk_release_lock (ocfs_super * osb, ub8 lock_id, ub4 lock_type,
-			    ub4 flags, ocfs_lock_res * lockres, ocfs_file_entry *fe)
+int ocfs_disk_release_lock (ocfs_super * osb, __u64 lock_id, __u32 lock_type,
+			    __u32 flags, ocfs_lock_res * lockres, ocfs_file_entry *fe)
 {
-	ub4 votemap = 0;
-	ub4 tempmap = 0;
-	ub4 i;
+	__u32 votemap = 0;
+	__u32 tempmap = 0;
+	__u32 i;
 	int status = 0;
 	int tmpstat;
-	ub8 lockseqno;
-	bool cachelock = false, fe_alloc = false;
+	__u64 lockseqno;
+	bool cachelock = false;
+	bool disk_vote = false;
+	bool fe_alloc = false;
+	unsigned long jif;
+	bool disk_reset = true;
 
-	LOG_ENTRY_ARGS ("(0x%08x, %u.%u, %u, %u, 0x%08x)\n", osb, HI (lock_id),
+	LOG_ENTRY_ARGS ("(0x%p, %u.%u, %u, %u, 0x%p)\n", osb, HI (lock_id),
 			LO (lock_id), lock_type, flags, lockres);
 
-	if (fe==NULL) {
+	if (fe == NULL) {
 		status = ocfs_get_file_entry (osb, &fe, lock_id);
 		if (status < 0) {
 			LOG_ERROR_STATUS (status);
@@ -1581,14 +1749,13 @@ int ocfs_disk_release_lock (ocfs_super *
 		fe_alloc = true;
 	}
 
-
 	if (!IS_VALID_NODE_NUM (DISK_LOCK_CURRENT_MASTER (fe))) {
 		LOG_ERROR_STATUS(status = -EINVAL);
 		goto finito;
 	}
 
 	if (DISK_LOCK_CURRENT_MASTER (fe) != osb->node_num) {
-		LOG_ERROR_ARGS ("Current master is NOT this NODE (%d)\n",
+		LOG_ERROR_ARGS ("Current master is NOT this NODE (%d)",
 				DISK_LOCK_CURRENT_MASTER (fe));
 		status = 0;
 		goto finito;
@@ -1603,14 +1770,15 @@ int ocfs_disk_release_lock (ocfs_super *
 
 	/* Send an update to all nodes alive, can be optimized later TODO */
 	if ((flags & FLAG_FILE_RENAME) || (flags & FLAG_FILE_DELETE))
-		votemap = (ub4) (osb->publ_map);
+		votemap = (__u32) (osb->publ_map);
 
 	/* TODO: figure out how to properly handle inode updates w/no oin */
-	votemap = (ub4) (osb->publ_map);	// temporary hack, forces broadcast
+	votemap = (__u32) (osb->publ_map);	// temporary hack, forces broadcast
 
 	/* remove current node from the votemap */
 	tempmap = (1 << osb->node_num);
 	votemap &= (~tempmap);
+	jif = jiffies;
 
 	if (votemap == 0)
 		goto finally;
@@ -1618,63 +1786,75 @@ int ocfs_disk_release_lock (ocfs_super *
 	if (!(flags & FLAG_FILE_UPDATE_OIN) && !(flags & FLAG_FILE_DELETE))
 		goto finally;
 
-	/* Call Comm layer to broadcast to all nodes alive, that this node */
-	/* wants exclusive access to the lock. */
+	if (comm_voting) {
+		LOG_TRACE_STR ("Network vote");
+		status = ocfs_send_dlm_request_msg (osb, lock_id, lock_type,
+						    flags, lockres, votemap);
+		if (status >= 0)
+			goto finally;
+		if (status == -ETIMEDOUT) {
+			LOG_TRACE_STR ("Network voting timed out");
+			lockres->vote_state = 0;
+		}
+	}
 
-	LOG_TRACE_ARGS ("Update oin votemap 0x%08x, lockid %u.%u, flags "
-			"0x%08x\n", votemap, HI (lock_id), LO (lock_id), flags);
+	LOG_TRACE_STR ("Disk vote");
+	disk_vote = true;
+	jif = jiffies;
 	status = -EAGAIN;
 	while (status == -EAGAIN) {
-#if 0
-		/* SM - commenting out comm voting for the time being */
-		status = ocfs_comm_request_vote (osb, lock_id, lock_type,
-						 flags, fe);
-		if (status >= 0) {
-			LOG_TRACE_STR ("ocfs_comm_request_vote succeeded!");
-			break;
-		}
-#endif
+		disk_reset = false;
 		status = ocfs_request_vote (osb, lock_id, lock_type, flags,
 					    votemap, &lockseqno);
-		if (status == -EAGAIN) {
-			LOG_TRACE_ARGS ("ocfs_request_vote retrying votemap "
-				"0x%08x lockid %u.%u, status 0x%08x\n", votemap,
-				HI (lock_id), LO (lock_id), status);
-			if ((flags & FLAG_FILE_UPDATE_OIN)) {
-				// ?????
-			}
-			continue;
-		}
-
 		if (status < 0) {
-			LOG_TRACE_ARGS ("ocfs_request_vote failed votemap "
-				"0x%08x, lockid %u.%u, status 0x%08x\n",
-				votemap, HI (lock_id), LO (lock_id), status);
-			goto finally;
+			if (status == -EAGAIN) {
+				if ((flags & FLAG_FILE_UPDATE_OIN)) {
+					// ?????
+				}
+				goto reset;
+			}
+			LOG_ERROR_STATUS (status);
+			goto finito;
 		}
 
 		status = ocfs_wait_for_vote (osb, lock_id, lock_type,
 					     FLAG_FILE_UPDATE_OIN, votemap,
 					     5000, lockseqno, lockres);
 		if (status < 0) {
-			if (status == -EAGAIN) {
-				LOG_TRACE_ARGS ("ocfs_wait_for_vote retrying "
-					"votemap 0x%08x, lockid %u.%u, flags "
-					"0x%08x\n", votemap, HI (lock_id),
-					LO (lock_id), flags);
-				continue;
-			}
-			goto finally;
+			if (status == -EAGAIN)
+				goto reset;
+			LOG_ERROR_STATUS (status);
+			goto finito;
 		}
+
+              reset:
+		tmpstat = ocfs_reset_voting (osb, lock_id, lock_type,
+					     DISK_LOCK_OIN_MAP (fe));
+		if (tmpstat < 0) {
+			LOG_ERROR_STATUS (status = tmpstat);
+			goto finito;
+		}
+
+		disk_reset = true;
+
+		if (status != -EAGAIN)
+			break;
+
+		LOG_TRACE_ARGS ("id=%u.%u\n", HILO(lock_id));
+		ocfs_sleep (500);
 	}
 
       finally:
-	status = ocfs_reset_voting (osb, lock_id, lock_type,
-				    DISK_LOCK_OIN_MAP (fe));
-	if (status < 0)
-		LOG_ERROR_STATUS (status);
+	jif = jiffies - jif;
+	LOG_TRACE_ARGS ("Lock time: %u\n", jif);
+
+	if (disk_vote && !disk_reset) {
+		tmpstat = ocfs_reset_voting (osb, lock_id, lock_type,
+					    DISK_LOCK_OIN_MAP (fe));
+		if (tmpstat < 0)
+			LOG_ERROR_STATUS (tmpstat);
+	}
 
-      finito:
 	if (flags & FLAG_FILE_RELEASE_MASTER)
 		DISK_LOCK_CURRENT_MASTER (fe) = OCFS_INVALID_NODE_NUM;
 
@@ -1687,15 +1867,13 @@ int ocfs_disk_release_lock (ocfs_super *
 	/* Reset the lock on the disk */
 	if (!cachelock) {
 		tmpstat = ocfs_write_file_entry (osb, fe, lock_id);
-		if (tmpstat < 0) {
-			status = tmpstat;
-			LOG_ERROR_STATUS (status);
-		}
+		if (tmpstat < 0)
+			LOG_ERROR_STATUS (tmpstat);
 	}
 
-	if (fe_alloc && fe)
-		ocfs_release_file_entry(fe);
-
+      finito:
+	if (fe_alloc)
+		ocfs_release_file_entry (fe);
 	LOG_EXIT_STATUS (status);
 	return status;
 }				/* ocfs_disk_release_lock */
@@ -1704,13 +1882,13 @@ int ocfs_disk_release_lock (ocfs_super *
  * ocfs_release_lock()
  *
  */
-int ocfs_release_lock (ocfs_super * osb, ub8 lock_id, ub4 lock_type, ub4 flags,
+int ocfs_release_lock (ocfs_super * osb, __u64 lock_id, __u32 lock_type, __u32 flags,
 		       ocfs_lock_res * lockres, ocfs_file_entry *fe)
 {
 	int status = 0;
 	bool lock_acq = false;
 
-	LOG_ENTRY_ARGS ("(0x%08x, %u.%u, %u, %u, 0x%08x)\n", osb, HI (lock_id),
+	LOG_ENTRY_ARGS ("(0x%p, %u.%u, %u, %u, 0x%p)\n", osb, HI (lock_id),
 			LO (lock_id), lock_type, flags, lockres);
 
 	ocfs_acquire_lockres (lockres);
@@ -1718,11 +1896,9 @@ int ocfs_release_lock (ocfs_super * osb,
 
 	switch (lock_type) {
 	    case OCFS_DLM_SHARED_LOCK:
-		    lockres->ref_cnt--;
-		    if (lockres->lock_type == OCFS_DLM_SHARED_LOCK) {
-			    if (lockres->ref_cnt == 0) {
+		    if (atomic_dec_and_test (&lockres->lr_share_cnt)) {
+			    if (lockres->lock_type == OCFS_DLM_SHARED_LOCK)
 				    lockres->lock_type = OCFS_DLM_NO_LOCK;
-			    }
 		    }
 		    status = 0;
 		    goto finally;
@@ -1771,18 +1947,16 @@ do_release_lock:
 		lock_acq = false;
 	}
 
-	status = ocfs_disk_release_lock (osb, lock_id, lock_type, flags, lockres, fe);
+	status = ocfs_disk_release_lock (osb, lock_id, lock_type, flags,
+					 lockres, fe);
 	if (status < 0) {
-		/* Disable the vol */
 		LOG_ERROR_STATUS (status);
 		goto finally;
 	}
 
 finally:
-	if (lock_acq) {
+	if (lock_acq)
 		ocfs_release_lockres (lockres);
-		lock_acq = false;
-	}
 
 	LOG_EXIT_STATUS (status);
 	return (status);
@@ -1812,37 +1986,36 @@ int ocfs_add_lock_to_recovery (void)
 	return 0;
 }				/* ocfs_add_lock_to_recovery */
 
-#ifdef UNUSED
 /*
  * ocfs_create_log_extent_map()
  *
  */
 int ocfs_create_log_extent_map (ocfs_super * osb,
 		    ocfs_io_runs ** PTransRuns,
-		    ub4 * PNumTransRuns, ub8 diskOffset, ub8 ByteCount)
+		    __u32 * PNumTransRuns, __u64 diskOffset, __u64 ByteCount)
 {
 	int status = 0;
-	sb8 tempVbo = 0;
-	sb8 tempLbo = 0;
-	ub4 tempSize = 0;
-	ub4 numDataRuns = 0;
-	ub4 numTransRuns;
-	ub4 i;
-	ub4 numMetaDataRuns = 0;
-	ub4 ioRunSize;
+	__s64 tempVbo = 0;
+	__s64 tempLbo = 0;
+	__u32 tempSize = 0;
+	__u32 numDataRuns = 0;
+	__u32 numTransRuns;
+	__u32 i;
+	__u32 numMetaDataRuns = 0;
+	__u32 ioRunSize;
 	ocfs_io_runs *IoDataRuns = NULL;
 	ocfs_io_runs *IoMetaDataRuns = NULL;
 	ocfs_io_runs *IoTransRuns = NULL;
 	ocfs_io_runs *TransRuns = NULL;
-	ub8 file_size;
-	ub8 remainingLength;
+	__u64 file_size;
+	__u64 remainingLength;
 	bool bRet;
-	ub4 RunsInExtentMap = 0;
-	ub4 ExtentMapIndex;
-	ub4 length;
-	sb8 diskOffsetToFind = 0;
-	sb8 foundFileOffset = 0;
-	sb8 foundDiskOffset = 0;
+	__u32 RunsInExtentMap = 0;
+	__u32 ExtentMapIndex;
+	__u32 length;
+	__s64 diskOffsetToFind = 0;
+	__s64 foundFileOffset = 0;
+	__s64 foundDiskOffset = 0;
 
 	LOG_ENTRY ();
 
@@ -1881,7 +2054,7 @@ int ocfs_create_log_extent_map (ocfs_sup
 
 	for (ExtentMapIndex = 0; ExtentMapIndex < RunsInExtentMap;
 	     ExtentMapIndex++) {
-		ub4 tempLen;
+		__u32 tempLen;
 
 		if (!ocfs_get_next_extent_map_entry
 		    (osb, &osb->metadata_map, ExtentMapIndex, &foundFileOffset,
@@ -1980,7 +2153,8 @@ int ocfs_create_log_extent_map (ocfs_sup
 		file_size = osb->log_file_size;
 
 		if (file_size > (10 * ONE_MEGA_BYTE))
-			OCFS_BREAKPOINT ();
+			LOG_ERROR_ARGS ("file_size=%d.%d", HI(file_size),
+					LO(file_size));
 
 		tempVbo = IoMetaDataRuns[i].disk_off;	/* Actual Disk Offset */
 		tempLbo = file_size + osb->log_disk_off;	/* Log file disk Offset */
@@ -2020,7 +2194,7 @@ int ocfs_create_log_extent_map (ocfs_sup
 	file_size = osb->log_file_size;
 
 	if (file_size > (10 * ONE_MEGA_BYTE))
-		OCFS_BREAKPOINT ();
+		LOG_ERROR_ARGS ("file_size=%d.%d", HI(file_size), LO(file_size));
 
 	if (file_size >= (2 * ONE_MEGA_BYTE))
 		osb->needs_flush = true;
@@ -2036,19 +2210,18 @@ int ocfs_create_log_extent_map (ocfs_sup
 	LOG_EXIT_STATUS (status);
 	return status;
 }				/* ocfs_create_log_extent_map */
-#endif /* UNSED */
 
 /*
  * ocfs_lookup_cache_link()
  *
  */
-int ocfs_lookup_cache_link (ocfs_super * osb, ub1 * buf, ub8 actual_disk_off,
-			    ub8 length)
+int ocfs_lookup_cache_link (ocfs_super * osb, __u8 * buf, __u64 actual_disk_off,
+			    __u64 length)
 {
 	int status = 0;
 	ocfs_file_entry *fe = NULL;
 	ocfs_lock_res *lockres = NULL;
-	ub8 offset = 0;
+	__u64 offset = 0;
 	struct list_head *entry;
 	struct list_head *tmp_entry;
 	ocfs_inode *oin;
@@ -2074,7 +2247,7 @@ int ocfs_lookup_cache_link (ocfs_super *
 
 			/* Change Lock type */
 			fe = (ocfs_file_entry *)
-				((ub1 *) buf + (lockres->sector_num - actual_disk_off));
+				((__u8 *) buf + (lockres->sector_num - actual_disk_off));
 
 			/* Flush */
 			if (lockres->oin != NULL) {
@@ -2089,7 +2262,7 @@ int ocfs_lookup_cache_link (ocfs_super *
 					if (oin->open_hndl_cnt == 0)
 						lockres->lock_type =
 						    DISK_LOCK_FILE_LOCK (fe) =
-						        OCFS_DLM_NO_LOCK;
+						    OCFS_DLM_NO_LOCK;
 					else
 						ocfs_flush_cache (osb);
 				}
@@ -2120,15 +2293,15 @@ int ocfs_lookup_cache_link (ocfs_super *
 int ocfs_process_log_file (ocfs_super * osb, bool flag)
 {
 	int status = 0;
-	ub1 *meta_data_buf = NULL;
-	ub1 *tmp_buf = NULL;
-	ub4 size;
-	ub4 i = 0;
+	__u8 *meta_data_buf = NULL;
+	__u8 *tmp_buf = NULL;
+	__u32 size;
+	__u32 i = 0;
 	ocfs_offset_map *map_buf;
-	ub8 file_size;
-	ub8 meta_file_size;
-	ub8 meta_alloc_size;
-	ub8 offset;
+	__u64 file_size;
+	__u64 meta_file_size;
+	__u64 meta_alloc_size;
+	__u64 offset;
 
 	LOG_ENTRY ();
 
@@ -2223,18 +2396,44 @@ int ocfs_process_log_file (ocfs_super * 
  * ocfs_break_cache_lock()
  *
  */
-int ocfs_break_cache_lock (ocfs_super * osb, ocfs_lock_res * lockres)
+int ocfs_break_cache_lock (ocfs_super * osb, ocfs_lock_res * lockres,
+			   ocfs_file_entry *fe)
 {
-	int status = -EAGAIN;
+	int status;
 	int tmpstat;
-	ub4 votemap;
-	ub8 lockseqno = 0;
+	__u32 votemap;
+	__u64 lockseqno = 0;
+	bool disk_vote = false;
+	unsigned long jif;
+	bool disk_reset = true;
 
-	LOG_ENTRY ();
+	LOG_ENTRY_ARGS ("(osb=0x%p, lres=0x%p, fe=0x%p)\n", osb, lockres, fe);
 
 	/* Ask the node with cache to flush and revert to write thru on this file */
 	votemap = (1 << lockres->master_node_num);
 
+	jif = jiffies;
+
+	if (comm_voting) {
+		LOG_TRACE_STR ("Network vote");
+		status = ocfs_send_dlm_request_msg (osb, lockres->sector_num,
+						    lockres->lock_type,
+						    FLAG_FILE_RELEASE_CACHE,
+						    lockres, votemap);
+		if (status >= 0) {
+			lockres->lock_type = OCFS_DLM_NO_LOCK;
+			goto finally;
+		}
+		if (status == -ETIMEDOUT) {
+			LOG_TRACE_STR ("Network voting timed out");
+			lockres->vote_state = 0;
+		}
+	}
+
+	LOG_TRACE_STR ("Disk vote");
+	disk_vote = true;
+	jif = jiffies;
+	status = -EAGAIN;
 	while (status == -EAGAIN) {
 		if (!IS_NODE_ALIVE (osb->publ_map, lockres->master_node_num,
 				    OCFS_MAXIMUM_NODES)) {
@@ -2242,43 +2441,70 @@ int ocfs_break_cache_lock (ocfs_super * 
 				lockres->master_node_num, lockres->sector_num);
 			/* TODO recovery needs to be done here .....and then become master */
 			status = 0;
-			goto finito;
+			goto finally;
 		}
 
+		disk_reset = false;
 		status = ocfs_request_vote (osb, lockres->sector_num,
 					    lockres->lock_type,
 					    FLAG_FILE_RELEASE_CACHE, votemap,
 					    &lockseqno);
-		if (status == -EAGAIN)
-			continue;
-		else if (status < 0) {
+		if (status < 0) {
+			if (status == -EAGAIN)
+				goto reset;
 			LOG_ERROR_STATUS (status);
-			goto finito;
+			goto finally;
 		}
 
 		status = ocfs_wait_for_vote (osb, lockres->sector_num,
 					     lockres->lock_type,
 					     FLAG_FILE_RELEASE_CACHE, votemap,
 					     15000, lockseqno, lockres);
-		if (status == -EAGAIN)
-			continue;
-		else if (status < 0) {
+		if (status < 0) {
+			if (status == -EAGAIN)
+				goto reset;
 			LOG_ERROR_STATUS (status);
+			goto finally;
+		}
+
+              reset:
+		tmpstat = ocfs_reset_voting (osb, lockres->sector_num,
+					    lockres->lock_type, votemap);
+		if (tmpstat < 0) {
+			LOG_ERROR_STATUS (status = tmpstat);
+			goto finito;
+		}
+
+		disk_reset = true;
+
+		if (status != -EAGAIN)
+			break;
+
+		LOG_TRACE_ARGS ("id=%u.%u\n", HILO(lockres->sector_num));
+		ocfs_sleep (500);
+
+		if (ocfs_task_interruptible (osb)) {
+			LOG_TRACE_ARGS("interrupted.... lockid=%u.%u\n",
+				       HILO(lockres->sector_num));
+			status = -EINTR;
 			goto finito;
 		}
-		break;
 	}
 
-	lockres->lock_type = (ub1) OCFS_DLM_NO_LOCK;
-	LOG_TRACE_STR ("okie dokie... ocfs_break_cache_lock done\n");
+	lockres->lock_type = (__u8) OCFS_DLM_NO_LOCK;
 
-      finito:
-	tmpstat = ocfs_reset_voting (osb, lockres->sector_num,
-				    lockres->lock_type, votemap);
-	if (tmpstat < 0) {
-		LOG_ERROR_STATUS (status = tmpstat);
+      finally:
+	jif = jiffies - jif;
+	LOG_TRACE_ARGS ("Lock time: %u\n", jif);
+
+	if (disk_vote && !disk_reset) {
+		tmpstat = ocfs_reset_voting (osb, lockres->sector_num,
+					    lockres->lock_type, votemap);
+		if (tmpstat < 0)
+			LOG_ERROR_STATUS (tmpstat);
 	}
 
+      finito:
 	LOG_EXIT_STATUS (status);
 	return (status);
 }				/* ocfs_break_cache_lock */
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Common/ocfsgenmisc.c linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Common/ocfsgenmisc.c
--- linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Common/ocfsgenmisc.c	2003-07-30 13:51:50.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Common/ocfsgenmisc.c	2003-07-30 10:28:53.000000000 +0200
@@ -31,7 +31,7 @@
 
 /*  Global Sequence number for error log. */
 
-ub4 OcfsErrorLogSequence = 0;
+__u32 OcfsErrorLogSequence = 0;
 
 /*
  * ocfs_create_meta_log_files()
@@ -40,10 +40,10 @@ ub4 OcfsErrorLogSequence = 0;
 int ocfs_create_meta_log_files (ocfs_super * osb)
 {
 	int status = 0;
-	ub8 fileSize = 0;
-	ub8 allocSize = 0;
-	ub8 log_disk_off = 0;
-	ub4 logFileId;
+	__u64 fileSize = 0;
+	__u64 allocSize = 0;
+	__u64 log_disk_off = 0;
+	__u32 logFileId;
 
 	LOG_ENTRY ();
 
@@ -78,8 +78,13 @@ int ocfs_create_meta_log_files (ocfs_sup
 	status = ocfs_extend_system_file (osb, (OCFS_FILE_VOL_LOG_FILE +
 					 osb->node_num), (ONE_MEGA_BYTE * 10), NULL);
 	if (status < 0) {
-		LOG_ERROR_STATUS (status);
-		goto bail;
+		/* if that fails, fall back to smaller, for fragmented fs */
+		status = ocfs_extend_system_file (osb, (OCFS_FILE_VOL_LOG_FILE +
+					osb->node_num), 128 * 1024, NULL);
+		if (status < 0) {
+			LOG_ERROR_STATUS (status);
+			goto bail;
+		}
 	}
 
 	ocfs_extend_system_file (osb, (OCFS_FILE_VOL_LOG_FILE + osb->node_num), 0, NULL);
@@ -97,7 +102,7 @@ int ocfs_create_meta_log_files (ocfs_sup
 					 osb->node_num), ONE_MEGA_BYTE, NULL);
 	if (status < 0) {
 		LOG_ERROR_STATUS (status);
-		return (status);
+		goto bail;
 	}
 
 	ocfs_extend_system_file (osb, (OCFS_FILE_VOL_META_DATA + osb->node_num), 0, NULL);
@@ -122,8 +127,8 @@ int ocfs_create_meta_log_files (ocfs_sup
  * Create a new oin.
  */
 int ocfs_create_new_oin (ocfs_inode ** Returnedoin,
-		  ub8 * alloc_size,
-		  ub8 * EndOfFile, struct file *FileObject, ocfs_super * osb)
+		  __u64 * alloc_size,
+		  __u64 * EndOfFile, struct file *FileObject, ocfs_super * osb)
 {
 	int status = 0;
 	ocfs_inode *oin = NULL;
@@ -165,33 +170,34 @@ int ocfs_create_root_dir_node (ocfs_supe
 {
 	int status = 0, tempstat;
 	ocfs_dir_node *NewDirNode = NULL;
-	ub8 bitmapOffset, numClustersAlloc, fileOffset = 0;
-	ub4 size, i;
+	__u64 bitmapOffset, numClustersAlloc, fileOffset = 0;
+	__u32 size, i;
 	ocfs_vol_disk_hdr *volDiskHdr = NULL;
-	ocfs_lock_res *LockResource;
-	bool LockAcquired = false;
+	ocfs_lock_res *LockResource = NULL;
+	bool lock_acq = false;
+	char *buf = NULL;
 	ocfs_file_entry *fe = NULL;
+	ocfs_file_entry *sys_fe = NULL;
 
 	LOG_ENTRY ();
 
-	fe = ocfs_allocate_file_entry();
-	if (fe==NULL) {
-		status = -ENOMEM;
+	fe = ocfs_allocate_file_entry ();
+	if (fe == NULL) {
+		LOG_ERROR_STATUS (status = -ENOMEM);
 		goto bail;
 	}
+
 	/* Acquire volume Lock ...  */
-	status =
-	    ocfs_acquire_lock (osb, OCFS_VOLUME_LOCK_OFFSET,
-			     OCFS_DLM_EXCLUSIVE_LOCK, FLAG_FILE_CREATE,
-			     &LockResource, fe);
+	status = ocfs_acquire_lock (osb, OCFS_VOLUME_LOCK_OFFSET,
+				    OCFS_DLM_EXCLUSIVE_LOCK, FLAG_FILE_CREATE,
+				    &LockResource, fe);
 	if (status < 0) {
 		LOG_ERROR_STATUS (status);
 		goto bail;
-	}
+	} else
+		lock_acq = true;
 
-	LockAcquired = true;
-
-	size = (ub4) osb->vol_layout.dir_node_size;
+	size = (__u32) osb->vol_layout.dir_node_size;
 	NewDirNode = ocfs_malloc (size);
 	if (NewDirNode == NULL) {
 		LOG_ERROR_STATUS (status = -ENOMEM);
@@ -203,8 +209,8 @@ int ocfs_create_root_dir_node (ocfs_supe
 	size = (ONE_MEGA_BYTE > osb->vol_layout.cluster_size) ?
 	    ONE_MEGA_BYTE : osb->vol_layout.cluster_size;
 
-	status = ocfs_find_contiguous_space_from_bitmap (osb, size, &bitmapOffset,
-						&numClustersAlloc, false);
+	status = ocfs_find_contiguous_space_from_bitmap (osb, size,
+					&bitmapOffset, &numClustersAlloc, false);
 	if (status < 0) {
 		LOG_ERROR_STATUS (status);
 		goto bail;
@@ -212,21 +218,32 @@ int ocfs_create_root_dir_node (ocfs_supe
 
 	osb->vol_layout.root_int_off = (bitmapOffset *
 					osb->vol_layout.cluster_size) +
-	    osb->vol_layout.data_start_off;
+					osb->vol_layout.data_start_off;
+
+	sys_fe = ocfs_allocate_file_entry ();
+	if (sys_fe == NULL) {
+		LOG_ERROR_STATUS (status = -ENOMEM);
+		goto bail;
+	}
+
+	if ((buf = ocfs_malloc (OCFS_MAX_FILENAME_LENGTH)) == NULL) {
+		LOG_ERROR_STATUS (status = -ENOMEM);
+		goto bail;
+	}
 
 	/*  Create Files in root for directory, file node allocations */
 	/*  Create the dir alloc file now that we have a internal */
 	for (i = 0; i < OCFS_MAXIMUM_NODES; i++) {
-		ocfs_init_system_file (osb, OCFS_FILE_VOL_META_DATA + i);
-		ocfs_init_system_file (osb, OCFS_FILE_VOL_LOG_FILE + i);
-		ocfs_init_system_file (osb, OCFS_FILE_DIR_ALLOC + i);
-		ocfs_init_system_file (osb, OCFS_FILE_DIR_ALLOC_BITMAP + i);
-		ocfs_init_system_file (osb, OCFS_FILE_FILE_ALLOC + i);
-		ocfs_init_system_file (osb, OCFS_FILE_FILE_ALLOC_BITMAP + i);
-		ocfs_init_system_file (osb, LOG_FILE_BASE_ID + i);
-		ocfs_init_system_file (osb, CLEANUP_FILE_BASE_ID + i);
+		ocfs_init_system_file (osb, OCFS_FILE_VOL_META_DATA + i, buf, sys_fe);
+		ocfs_init_system_file (osb, OCFS_FILE_VOL_LOG_FILE + i, buf, sys_fe);
+		ocfs_init_system_file (osb, OCFS_FILE_DIR_ALLOC + i, buf, sys_fe);
+		ocfs_init_system_file (osb, OCFS_FILE_DIR_ALLOC_BITMAP + i, buf, sys_fe);
+		ocfs_init_system_file (osb, OCFS_FILE_FILE_ALLOC + i, buf, sys_fe);
+		ocfs_init_system_file (osb, OCFS_FILE_FILE_ALLOC_BITMAP + i, buf, sys_fe);
+		ocfs_init_system_file (osb, LOG_FILE_BASE_ID + i, buf, sys_fe);
+		ocfs_init_system_file (osb, CLEANUP_FILE_BASE_ID + i, buf, sys_fe);
 #ifdef LOCAL_ALLOC
-		ocfs_init_system_file (osb, OCFS_VOL_BITMAP_FILE + (2*i));
+		ocfs_init_system_file (osb, OCFS_VOL_BITMAP_FILE + (2*i), buf, sys_fe);
 #endif 
 	}
 
@@ -235,14 +252,14 @@ int ocfs_create_root_dir_node (ocfs_supe
 				 &numClustersAlloc, osb->node_num,
 				 DISK_ALLOC_DIR_NODE);
 	if (status < 0) {
-		status = -EFAIL;
+		LOG_ERROR_STATUS (status = -EFAIL);
 		goto bail;
 	}
 
 	osb->vol_layout.root_start_off = bitmapOffset;
 
 	ocfs_initialize_dir_node (osb, NewDirNode, bitmapOffset, fileOffset,
-			   osb->node_num);
+				  osb->node_num);
 	NewDirNode->dir_node_flags |= DIR_NODE_FLAG_ROOT;
 
 	status = ocfs_write_dir_node (osb, NewDirNode, -1);
@@ -262,7 +279,7 @@ int ocfs_create_root_dir_node (ocfs_supe
 	volDiskHdr->root_off = osb->vol_layout.root_start_off;
 	volDiskHdr->internal_off = osb->vol_layout.root_int_off;
 
-	status = ocfs_write_disk (osb, (sb1 *) volDiskHdr, size, 0);
+	status = ocfs_write_disk (osb, (__s8 *) volDiskHdr, size, 0);
 	if (status < 0) {
 		LOG_ERROR_STATUS (status);
 		goto bail;
@@ -275,22 +292,20 @@ int ocfs_create_root_dir_node (ocfs_supe
 	}
 
 	/*  Release Volume Lock */
-	if (LockAcquired) {
-		tempstat =
-		    ocfs_release_lock (osb, OCFS_VOLUME_LOCK_OFFSET,
-				     OCFS_DLM_EXCLUSIVE_LOCK, 0, LockResource, fe);
+	if (lock_acq) {
+		tempstat = ocfs_release_lock (osb, OCFS_VOLUME_LOCK_OFFSET,
+				OCFS_DLM_EXCLUSIVE_LOCK, 0, LockResource, fe);
 		if (tempstat < 0) {
+			LOG_ERROR_STATUS (tempstat);
 			osb->vol_state = VOLUME_DISABLED;
-			status = tempstat;
 		}
 	}
 	ocfs_safefree (NewDirNode);
 	ocfs_safefree (volDiskHdr);
-	NewDirNode = NULL;
-	volDiskHdr = NULL;
-	if (fe)
-		ocfs_release_file_entry(fe);
-
+	ocfs_safefree (buf);
+	ocfs_release_file_entry (sys_fe);
+	ocfs_release_file_entry (fe);
+	ocfs_put_lockres (LockResource);
 	LOG_EXIT_STATUS (status);
 	return status;
 }				/* ocfs_create_root_dir_node */
@@ -301,59 +316,63 @@ int ocfs_create_root_dir_node (ocfs_supe
 int ocfs_create_root_oin (ocfs_super * osb)
 {
 	int status = 0;
-	ub8 allocSize = 0, endofFile = 0;
-	ocfs_inode *oin;
+	int tmpstat;
+	__u64 allocSize = 0;
+	__u64 endofFile = 0;
+	ocfs_inode *oin = NULL;
 	ocfs_vol_disk_hdr *volDiskHdr = NULL;
-	ocfs_lock_res *LockResource;
+	ocfs_lock_res *LockResource = NULL;
+	bool vol_locked = false;
 	ocfs_file_entry *fe = NULL;
 
 	LOG_ENTRY ();
 
-	if (osb->vol_layout.root_start_off == 0) {
-		bool LockAcquired = false;
+	fe = ocfs_allocate_file_entry ();
+	if (fe == NULL) {
+		LOG_ERROR_STATUS (status = -ENOMEM);
+		goto finally;
+	}
 
-		fe = ocfs_allocate_file_entry();
-		if (fe == NULL) {
-			status = -ENOMEM;
+	if (osb->vol_layout.root_start_off == 0) {
+		status = ocfs_wait_for_disk_lock_release (osb, OCFS_VOLUME_LOCK_OFFSET,
+						 10000, OCFS_DLM_NO_LOCK);
+		if (status < 0) {
+			LOG_ERROR_STATUS (status);
 			goto finally;
 		}
 
-		ocfs_wait_for_disk_lock_release (osb, OCFS_VOLUME_LOCK_OFFSET,
-					10000 /* 10 sec */ , OCFS_DLM_NO_LOCK);
-
 		status = ocfs_acquire_lock (osb, OCFS_VOLUME_LOCK_OFFSET,
 				     OCFS_DLM_EXCLUSIVE_LOCK, FLAG_FILE_CREATE,
 				     &LockResource, fe);
 		if (status < 0) {
-			LOG_ERROR_STR ("ocfs_acquire_lock failed");
+			LOG_ERROR_STATUS (status);
 			goto finally;
-		}
-
-		LockAcquired = true;
+		} else
+			vol_locked = true;
 
 		status = ocfs_read_disk_ex (osb, (void **) &volDiskHdr,
 					OCFS_SECTOR_SIZE, OCFS_SECTOR_SIZE, 0);
 		if (status < 0) {
-			LOG_ERROR_STR ("ocfs_read_disk failed");
+			LOG_ERROR_STATUS (status);
 			goto finally;
 		}
 
-		if (LockAcquired) {
+		if (vol_locked) {
 			status = ocfs_release_lock (osb, OCFS_VOLUME_LOCK_OFFSET,
 						    OCFS_DLM_EXCLUSIVE_LOCK, 0,
 						    LockResource, fe);
 			if (status < 0) {
-				LOG_ERROR_STR
-				    ("ocfs_release_lock failed!  disabling volume!!!!");
+				LOG_ERROR_STATUS (status);
 				osb->vol_state = VOLUME_DISABLED;
 			}
+			vol_locked = false;
 		}
 
 		if (volDiskHdr->root_off != 0) {
-			ocfs_sleep (3000);	/* 3 sec */
-			ocfs_wait_for_disk_lock_release (osb, OCFS_VOLUME_LOCK_OFFSET,
-						30000 /* 30 sec */ ,
-						OCFS_DLM_NO_LOCK);
+//			ocfs_sleep (3000);
+			ocfs_wait_for_disk_lock_release (osb,
+							OCFS_VOLUME_LOCK_OFFSET,
+							30000, OCFS_DLM_NO_LOCK);
 			osb->vol_layout.root_start_off = volDiskHdr->root_off;
 			osb->vol_layout.root_int_off = volDiskHdr->internal_off;
 		}
@@ -367,7 +386,7 @@ int ocfs_create_root_oin (ocfs_super * o
 	} else {
 		status = ocfs_create_meta_log_files (osb);
 		if (status < 0) {
-			LOG_ERROR_STR ("ocfs_create_meta_log_files failed");
+			LOG_ERROR_STATUS (status);
 			goto finally;
 		}
 	}
@@ -382,9 +401,14 @@ int ocfs_create_root_oin (ocfs_super * o
 	}
 
 	/*  This is for root . */
-	ocfs_initialize_oin (oin, osb,
+	status = ocfs_initialize_oin (oin, osb,
 			   OCFS_OIN_DIRECTORY | OCFS_OIN_ROOT_DIRECTORY, NULL,
 			   0, osb->vol_layout.root_start_off);
+	if (status < 0) {
+		if (status != -EINTR)
+			LOG_ERROR_STATUS (status);
+		goto finally;
+	}
 
 	// oin->Parentoin = NULL; /*  Root has no parent */
 
@@ -395,10 +419,22 @@ int ocfs_create_root_oin (ocfs_super * o
 	oin->dir_disk_off = osb->vol_layout.root_start_off;
 
       finally:
-	ocfs_safefree (volDiskHdr);
-	if (fe)
-		ocfs_release_file_entry(fe);
+	if (status < 0 && oin)
+		ocfs_release_oin (oin, true);
+
+	if (vol_locked) {
+		tmpstat = ocfs_release_lock (osb, OCFS_VOLUME_LOCK_OFFSET,
+					     OCFS_DLM_EXCLUSIVE_LOCK, 0,
+					     LockResource, fe);
+		if (tmpstat < 0) {
+			LOG_ERROR_STATUS (tmpstat);
+			osb->vol_state = VOLUME_DISABLED;
+		}
+	}
 
+	ocfs_safefree (volDiskHdr);
+	ocfs_release_file_entry (fe);
+	ocfs_put_lockres (LockResource);
 	LOG_EXIT_STATUS (status);
 	return status;
 }				/* ocfs_create_root_oin */
@@ -411,9 +447,9 @@ int ocfs_create_root_oin (ocfs_super * o
  */
 void ocfs_delete_all_extent_maps (ocfs_inode * oin)
 {
-	ub4 RunsInExtentMap = 0, ExtentMapIndex, ByteCount = 0;
-	sb8 Vbo;
-	sb8 Lbo;
+	__u32 RunsInExtentMap = 0, ExtentMapIndex, ByteCount = 0;
+	__s64 Vbo;
+	__s64 Lbo;
 
 	LOG_ENTRY ();
 
@@ -440,36 +476,31 @@ void ocfs_delete_all_extent_maps (ocfs_i
  */
 void ocfs_release_oin (ocfs_inode * oin, bool FreeMemory)
 {
-	bool LockResourceAcquired = false;
-	ocfs_lock_res *lockResource = NULL;
-	ocfs_super *osb;
+	ocfs_lock_res *lockres = NULL;
+	ocfs_super *osb = NULL;
 	struct inode *inode;
 
 	LOG_ENTRY_ARGS ("oin = %p, free = %s\n", oin, FreeMemory? "yes" : "no");
 
 	if (!oin || !oin->osb)
-            goto bail;
+		goto bail;
 
 	osb = oin->osb;
-	lockResource = oin->lock_res;
 
-	if (lockResource != NULL) {
-		ocfs_acquire_lockres (lockResource);
-		LockResourceAcquired = true;
-		if (lockResource->oin == oin) {
-			lockResource->oin = NULL;
-		}
+	lockres = oin->lock_res;
 
-		if (LockResourceAcquired) {
-			ocfs_release_lockres (lockResource);
-			LockResourceAcquired = false;
-		}
+	if (lockres != NULL) {
+		ocfs_get_lockres (lockres);
+		ocfs_acquire_lockres (lockres);
+		if (lockres->oin == oin)
+			lockres->oin = NULL;
+		ocfs_release_lockres (lockres);
 	}
 
 	inode = (struct inode *) oin->inode;
 
 	if (inode) {
-		ub8 savedOffset = oin->file_disk_off;
+		__u64 savedOffset = oin->file_disk_off;
 
 		SET_INODE_OIN (inode, NULL);
 		SET_INODE_OFFSET (inode, savedOffset);
@@ -497,7 +528,10 @@ void ocfs_release_oin (ocfs_inode * oin,
 		kmem_cache_free (OcfsGlobalCtxt.oin_cache, oin);
 #endif
 		oin = NULL;
+		ocfs_put_lockres (lockres);
 	}
+
+	ocfs_put_lockres (lockres);
 bail:
 	LOG_EXIT ();
 	return;
@@ -508,13 +542,13 @@ bail:
  *
  */
 int ocfs_initialize_osb (ocfs_super * osb, ocfs_vol_disk_hdr * vdh,
-			 ocfs_vol_label * vol_label, ub4 sect_size)
+			 ocfs_vol_label * vol_label, __u32 sect_size)
 {
 	int status = 0;
 	ocfs_publish *publish = NULL;
-	ub4 bitmap_len, length;
+	__u32 bitmap_len, length;
 	void *bitmap_buf, *buffer = NULL;
-	ub8 offset;
+	__u64 offset;
 	ocfs_vol_layout *vol_layout;
 
 	LOG_ENTRY ();
@@ -528,13 +562,18 @@ int ocfs_initialize_osb (ocfs_super * os
 
 	vol_layout = &(osb->vol_layout);
 
-	vol_layout->cluster_size = (ub4) (vdh->cluster_size);
+	vol_layout->cluster_size = (__u32) (vdh->cluster_size);
 	osb->obj_id.type = OCFS_TYPE_OSB;
 	osb->obj_id.size = sizeof (ocfs_super);
 
-	if (!ocfs_hash_create (&(osb->root_sect_node), 12)) {
+#ifdef __LP64__
+#define HASHBITS	11
+#else
+#define HASHBITS	12
+#endif
+	if (!ocfs_hash_create (&(osb->root_sect_node), HASHBITS)) {
 		LOG_ERROR_STATUS (status = -ENOMEM);
-		goto finally;
+		goto bail;
 	}
 
 	ocfs_init_sem (&(osb->osb_res));
@@ -547,6 +586,9 @@ int ocfs_initialize_osb (ocfs_super * os
 #endif
 	ocfs_init_sem (&(osb->vol_alloc_lock));
 
+	init_MUTEX (&(osb->comm_lock));
+	init_MUTEX (&(osb->trans_lock));
+
 	osb->node_recovering = OCFS_INVALID_NODE_NUM;
 
 	osb->needs_flush = false;
@@ -555,6 +597,12 @@ int ocfs_initialize_osb (ocfs_super * os
 	osb->log_meta_disk_off = 0;
 	osb->trans_in_progress = false;
 
+	init_MUTEX (&(osb->publish_lock));
+	atomic_set (&osb->node_req_vote, 0);
+
+	init_waitqueue_head (&osb->nm_init_event);
+	atomic_set (&osb->nm_init, 0);
+
 	ocfs_extent_map_init (&osb->metadata_map);
 	ocfs_extent_map_init (&osb->trans_map);
 
@@ -565,17 +613,17 @@ int ocfs_initialize_osb (ocfs_super * os
 
 	memcpy (vol_layout->mount_point, vdh->mount_point, strlen (vdh->mount_point));
 	vol_layout->serial_num = vdh->serial_num;
-	vol_layout->size = (ub8) (vdh->device_size);
+	vol_layout->size = (__u64) (vdh->device_size);
 	vol_layout->start_off = vdh->start_off;
-	vol_layout->bitmap_off = (ub8) vdh->bitmap_off;
+	vol_layout->bitmap_off = (__u64) vdh->bitmap_off;
 	vol_layout->publ_sect_off = vdh->publ_off;
 	vol_layout->vote_sect_off = vdh->vote_off;
 	vol_layout->root_bitmap_off = vdh->root_bitmap_off;
 	vol_layout->root_start_off = vdh->root_off;
 	vol_layout->root_int_off = vdh->internal_off;
 	vol_layout->root_size = vdh->root_size;
-	vol_layout->cluster_size = (ub4) vdh->cluster_size;
-	vol_layout->num_nodes = (ub4) vdh->num_nodes;
+	vol_layout->cluster_size = (__u32) vdh->cluster_size;
+	vol_layout->num_nodes = (__u32) vdh->num_nodes;
 	vol_layout->data_start_off = vdh->data_start_off;
 	vol_layout->root_bitmap_size = vdh->root_bitmap_size;
 	vol_layout->num_clusters = vdh->num_clusters;
@@ -597,13 +645,13 @@ int ocfs_initialize_osb (ocfs_super * os
 		vol_layout->file_node_size = OCFS_DEFAULT_FILE_NODE_SIZE;
 
 	osb->max_dir_node_ent =
-		    (ub4) (vol_layout->dir_node_size / sect_size) - 2;
-	bitmap_len = (ub4) vol_layout->num_clusters;
+		    (__u32) (vol_layout->dir_node_size / sect_size) - 2;
+	bitmap_len = (__u32) vol_layout->num_clusters;
 
 	/* In the start one sector is for Volume header and second sector */
 	/* is for Global sequence Number and Directoy Entry. */
 	{
-		ub4 sz = OCFS_ALIGN ((bitmap_len + 7) / 8, PAGE_SIZE);
+		__u32 sz = OCFS_ALIGN ((bitmap_len + 7) / 8, PAGE_SIZE);
 
 		if ((bitmap_buf = vmalloc_32 (sz)) == NULL) {
 			LOG_ERROR_STR ("vmalloc failed");
@@ -612,36 +660,35 @@ int ocfs_initialize_osb (ocfs_super * os
 		}
 	}
 
-	ocfs_initialize_bitmap (&osb->cluster_bitmap, (ub4 *) bitmap_buf,
+	ocfs_initialize_bitmap (&osb->cluster_bitmap, (__u32 *) bitmap_buf,
 				bitmap_len);
 
-//SM We need to free all these mem blocks if this function fails...
-
-        osb->prealloc_lock = 0;        
-        osb->data_prealloc = ocfs_malloc (IORUN_ALLOC_SIZE);
+	osb->prealloc_lock = 0;
+	osb->data_prealloc = ocfs_malloc (IORUN_ALLOC_SIZE);
 	if (!osb->data_prealloc) {
 		LOG_ERROR_STATUS (status = -ENOMEM);
-		goto finally;
+		goto bail;
 	}
 
-        osb->md_prealloc = ocfs_malloc (IORUN_ALLOC_SIZE);
+	osb->md_prealloc = ocfs_malloc (IORUN_ALLOC_SIZE);
 	if (!osb->md_prealloc) {
 		LOG_ERROR_STATUS (status = -ENOMEM);
-		goto finally;
+		goto bail;
 	}
 
 	osb->cfg_len = (OCFS_MAXIMUM_NODES +
 			OCFS_VOLCFG_NEWCFG_SECTORS) * sect_size;
-        osb->cfg_prealloc = ocfs_malloc (osb->cfg_len);
+	osb->cfg_prealloc = ocfs_malloc (osb->cfg_len);
 	if (!osb->cfg_prealloc) {
 		LOG_ERROR_STATUS (status = -ENOMEM);
-		goto finally;
+		goto bail;
 	}
 
-        osb->log_prealloc = ocfs_malloc (OCFS_ALIGN(sizeof (ocfs_cleanup_record), PAGE_SIZE));
+	osb->log_prealloc = ocfs_malloc (OCFS_ALIGN(sizeof(ocfs_cleanup_record),
+						    PAGE_SIZE));
 	if (!osb->log_prealloc) {
 		LOG_ERROR_STATUS (status = -ENOMEM);
-		goto finally;
+		goto bail;
 	}
 
 	status = ocfs_get_config (osb);
@@ -678,7 +725,7 @@ int ocfs_initialize_osb (ocfs_super * os
 		goto finally;
 	}
 
-	ocfs_update_publish_map (osb, (ub1 *) buffer, true);
+	ocfs_update_publish_map (osb, (__u8 *) buffer, true);
 
 	/* We might need to add a variable in Global List of osb to */
 	/* delay any creation, if any other node is already creating a file */
@@ -692,6 +739,17 @@ int ocfs_initialize_osb (ocfs_super * os
 	/*  Mark the fact that this osb structure is initialized. */
 	OCFS_SET_FLAG (osb->osb_flags, OCFS_OSB_FLAGS_OSB_INITIALIZED);
 
+	/* skip the frees which happen on error only */
+	goto finally;
+
+      bail:
+	if (osb->root_sect_node.buckets)
+		ocfs_hash_destroy (&(osb->root_sect_node), NULL);
+	ocfs_safefree (osb->data_prealloc);
+	ocfs_safefree (osb->md_prealloc);
+	ocfs_safefree (osb->log_prealloc);
+	ocfs_safefree (osb->cfg_prealloc);
+
       finally:
 	ocfs_safefree (publish);
 	ocfs_safefree (buffer);
@@ -737,7 +795,7 @@ int ocfs_verify_volume (ocfs_vol_disk_hd
 	}
 
 	if (vdh->major_version != OCFS_MAJOR_VERSION) {
-		LOG_ERROR_ARGS ("Version number not compatible: %u.%u\n",
+		LOG_ERROR_ARGS ("Version number not compatible: %u.%u",
 				vdh->major_version, vdh->minor_version);
 		status = -EINVAL;
 		goto bail;
@@ -774,15 +832,13 @@ int ocfs_vol_member_reconfig (ocfs_super
 	/* volume, this should allow for them to detect our existance. */
 //    ocfs_nm_heart_beat(osb, HEARTBEAT_METHOD_IPC, 0);
 
-	/* WE should do an actual join of the cluster with the NM, IMPORTANT */
-	/* NmJoinCluster(osb); */
 	osb->publ_map |= (1 << osb->node_num);
 
 	/* what's happening here?  your guess is as good as mine :) */
 	osb->hbt = 20 + jiffies;
-	ocfs_sleep (5000);	/* 5 sec */
-	osb->hbt = 20 + jiffies;
-	ocfs_sleep (5000);	/* 5 sec */
+//	ocfs_sleep (5000);	/* 5 sec */
+//	osb->hbt = 20 + jiffies;
+//	ocfs_sleep (5000);	/* 5 sec */
 
 	/* Create the Rootdirectory oin. */
 	osb->vol_state = VOLUME_INIT;
@@ -807,10 +863,9 @@ int ocfs_vol_member_reconfig (ocfs_super
 int ocfs_check_volume (ocfs_super * osb)
 {
 	int status = 0;
-	ub8 offset = 0;
-	ub1 *buffer = NULL;
+	__u64 offset = 0;
+	__u8 *buffer = NULL;
 	ocfs_publish *publish;
-	bool osb_resAcquired = false;
 
 	LOG_ENTRY ();
 
@@ -826,15 +881,10 @@ int ocfs_check_volume (ocfs_super * osb)
 
 	publish = (ocfs_publish *) buffer;
 
-	LOG_TRACE_STR ("putting publishsector dirty check back in...");
 	if (publish->dirty) {
-		LOG_TRACE_STR ("publishsector IS dirty!!!");
-		LOG_TRACE_STR ("Acquiring osb lock");
 		ocfs_down_sem (&(osb->osb_res), true);
-		osb_resAcquired = true;
-		LOG_TRACE_STR ("Acquired osb lock");
-
 		status = ocfs_recover_vol (osb, osb->node_num);
+		ocfs_up_sem (&(osb->osb_res));
 		if (status < 0) {
 			LOG_ERROR_STATUS (status);
 			goto finally;
@@ -842,13 +892,7 @@ int ocfs_check_volume (ocfs_super * osb)
 	}
 
       finally:
-	if (osb_resAcquired) {
-		LOG_TRACE_STR ("Release osb Lock");
-		ocfs_up_sem (&(osb->osb_res));
-		osb_resAcquired = false;
-	}
 	ocfs_safefree (buffer);
-
 	LOG_EXIT_STATUS (status);
 	return status;
 }				/* ocfs_check_volume */
@@ -880,10 +924,10 @@ void ocfs_delete_osb (ocfs_super * osb)
 	ocfs_del_sem (&(osb->map_lock));
 	ocfs_extent_map_destroy (&osb->metadata_map);
 	ocfs_extent_map_destroy (&osb->trans_map);
-        ocfs_safefree(osb->data_prealloc);
-        ocfs_safefree(osb->md_prealloc);
-        ocfs_safefree(osb->cfg_prealloc);
-        ocfs_safefree(osb->log_prealloc);
+	ocfs_safefree(osb->data_prealloc);
+	ocfs_safefree(osb->md_prealloc);
+	ocfs_safefree(osb->cfg_prealloc);
+	ocfs_safefree(osb->log_prealloc);
 	memset (osb, 0, sizeof (ocfs_super));
 
 	LOG_EXIT ();
@@ -906,18 +950,23 @@ int ocfs_commit_cache (ocfs_super * osb,
 
 	status = ocfs_write_map_file (osb);
 	if (status >= 0) {
-		ocfs_process_log_file (osb, Flag);
+		status = ocfs_process_log_file (osb, Flag);
+		if (status < 0)
+			LOG_ERROR_STATUS (status);
+
+		status = ocfs_extend_system_file (osb,
+				(OCFS_FILE_VOL_LOG_FILE + osb->node_num),
+				0, NULL);
+		if (status < 0)
+			LOG_ERROR_STATUS (status);
 
-		status =
-		    ocfs_extend_system_file (osb,
-				      (OCFS_FILE_VOL_LOG_FILE + osb->node_num),
-				      0, NULL);
 		osb->log_file_size = 0;
 
-		status =
-		    ocfs_extend_system_file (osb,
-				      (OCFS_FILE_VOL_META_DATA + osb->node_num),
-				      0, NULL);
+		status = ocfs_extend_system_file (osb,
+				(OCFS_FILE_VOL_META_DATA + osb->node_num),
+				0, NULL);
+		if (status < 0)
+			LOG_ERROR_STATUS (status);
 
 		ocfs_extent_map_destroy (&osb->metadata_map);
 		ocfs_extent_map_destroy (&osb->trans_map);
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Common/ocfsgennm.c linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Common/ocfsgennm.c
--- linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Common/ocfsgennm.c	2003-07-30 13:51:50.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Common/ocfsgennm.c	2003-07-30 10:28:53.000000000 +0200
@@ -36,7 +36,6 @@
 int ocfs_flush_data (ocfs_inode * oin)
 {
 	int status = 0;
-	bool acq_oin = false;
 
 	LOG_ENTRY ();
 
@@ -44,10 +43,8 @@ int ocfs_flush_data (ocfs_inode * oin)
 		goto bail;
 
 	ocfs_down_sem (&(oin->main_res), true);
-	acq_oin = true;
 
 	oin->cache_enabled = false;
-
 	ocfs_flush_cache (oin->osb);
 
 	/* Grab and release PagingIo to serialize ourselves with the lazy writer. */
@@ -58,10 +55,7 @@ int ocfs_flush_data (ocfs_inode * oin)
 
 	ocfs_purge_cache_section (oin, NULL, 0);
 
-	if (acq_oin) {
-		ocfs_up_sem (&(oin->main_res));
-		acq_oin = false;
-	}
+	ocfs_up_sem (&(oin->main_res));
 
       bail:
 	LOG_EXIT_STATUS (status);
@@ -81,17 +75,14 @@ int ocfs_flush_data (ocfs_inode * oin)
  * Returns 0 if success, < 0 if error.
  */
 int ocfs_disk_update_resource (ocfs_super * osb, ocfs_lock_res * lock_res,
-			       ocfs_file_entry * file_ent)
+			       ocfs_file_entry * file_ent, __u32 timeout)
 {
 	int status = 0;
 	ocfs_file_entry *fe = NULL;
 
-	LOG_ENTRY_ARGS ("(0x%08x, 0x%08x, 0x%08x)\n", osb, lock_res,
+	LOG_ENTRY_ARGS ("(0x%p, 0x%p, 0x%p)\n", osb, lock_res,
 			file_ent);
 
-	LOG_TRACE_ARGS ("Reading sector: %u.%u\n", HI (lock_res->sector_num),
-			LO (lock_res->sector_num));
-
 	if (file_ent) {
 		fe = file_ent;
 		status = ocfs_read_file_entry (osb, fe, lock_res->sector_num);
@@ -102,7 +93,12 @@ int ocfs_disk_update_resource (ocfs_supe
 		goto finally;
 	}
 
-	ocfs_acquire_lockres (lock_res);
+	status = ocfs_acquire_lockres_ex (lock_res, timeout);
+	if (status < 0) {
+		LOG_TRACE_ARGS ("Timedout locking lockres for id: %u.%u\n",
+			HI(lock_res->sector_num), LO(lock_res->sector_num));
+		goto finally;
+	}
 
 	lock_res->lock_type = DISK_LOCK_FILE_LOCK (fe);
 	lock_res->master_node_num = DISK_LOCK_CURRENT_MASTER (fe);
@@ -111,10 +107,8 @@ int ocfs_disk_update_resource (ocfs_supe
 	ocfs_release_lockres (lock_res);
 
       finally:
-	if (file_ent == NULL) {
-		if (fe)
-			ocfs_release_file_entry (fe);
-	}
+	if (file_ent == NULL)
+		ocfs_release_file_entry (fe);
 
 	LOG_EXIT_STATUS (status);
 	return status;
@@ -136,14 +130,14 @@ int ocfs_disk_update_resource (ocfs_supe
  *
  * Returns 0 if success, < 0 if error.
  */
-int ocfs_find_update_res (ocfs_super * osb, ub8 lock_id,
+int ocfs_find_update_res (ocfs_super * osb, __u64 lock_id,
 			  ocfs_lock_res ** lockres, ocfs_file_entry * fe,
-			  ub4 * updated)
+			  __u32 * updated, __u32 timeout)
 {
 	int status = 0;
 	ocfs_lock_res *tmp_lockres = NULL;
 
-	LOG_ENTRY_ARGS ("(0x%08x, %u.%u, 0x%08x, 0x%08x, 0x%08x)\n", osb,
+	LOG_ENTRY_ARGS ("(0x%p, %u.%u, 0x%p, 0x%p, 0x%p)\n", osb,
 			HI (lock_id), LO (lock_id), lockres, fe,
 			updated);
 
@@ -157,15 +151,23 @@ int ocfs_find_update_res (ocfs_super * o
 
 		ocfs_init_lockres (osb, *lockres, lock_id);
 
-		status = ocfs_disk_update_resource (osb, *lockres, fe);
+		ocfs_get_lockres (*lockres);
+
+		status = ocfs_disk_update_resource (osb, *lockres, fe,
+						    timeout);
 		if (status < 0) {
-			LOG_ERROR_STR ("Disabling Volume");
-			osb->vol_state = VOLUME_DISABLED;
+			if (status != -ETIMEDOUT) {
+				LOG_ERROR_STR ("Disabling Volume");
+				osb->vol_state = VOLUME_DISABLED;
+			}
 			goto finally;
 		}
 
 		if (lock_id != (*lockres)->sector_num) {
-			LOG_ERROR_STATUS(status = -EFAIL);
+			LOG_ERROR_ARGS ("lockid=%u.%u != secnum=%u.%u",
+					HILO(lock_id),
+					HILO((*lockres)->sector_num));
+			status = -EFAIL;
 			goto finally;
 		}
 
@@ -181,27 +183,26 @@ int ocfs_find_update_res (ocfs_super * o
 		if (!tmp_lockres)
 			goto finally;
 		else {
-			ocfs_release_lockres (*lockres);
+			ocfs_put_lockres (*lockres);
 			*lockres = tmp_lockres;
 		}
 	}
 
-	/* sanity checks */
-	if ((*lockres)->signature != 0x55AA) {
-		LOG_ERROR_STATUS(status = -EFAIL);
-		goto finally;
-	}
-
 	if (lock_id != (*lockres)->sector_num) {
-		LOG_ERROR_STATUS(status = -EFAIL);
+		LOG_ERROR_ARGS ("lockid=%u.%u != secnum=%u.%u",
+				HILO(lock_id),
+				HILO((*lockres)->sector_num));
+		status = -EFAIL;
 		goto finally;
 	}
 
 	if ((*lockres)->master_node_num != osb->node_num) {
-		status = ocfs_disk_update_resource (osb, *lockres, fe);
+		status = ocfs_disk_update_resource (osb, *lockres, fe, timeout);
 		if (status < 0) {
-			LOG_ERROR_STR ("Disabling Volume");
-			osb->vol_state = VOLUME_DISABLED;
+			if (status != -ETIMEDOUT) {
+				LOG_ERROR_STR ("Disabling Volume");
+				osb->vol_state = VOLUME_DISABLED;
+			}
 			goto finally;
 		}
 		if (updated)
@@ -215,6 +216,8 @@ int ocfs_find_update_res (ocfs_super * o
 	return status;
 }				/* ocfs_find_update_res */
 
+#undef OCFS_DEBUG_CONTEXT
+#define OCFS_DEBUG_CONTEXT      OCFS_DEBUG_CONTEXT_DLM
 /*
  * ocfs_vote_for_del_ren()
  *
@@ -226,39 +229,43 @@ int ocfs_find_update_res (ocfs_super * o
  *
  */
 int ocfs_vote_for_del_ren (ocfs_super * osb, ocfs_publish * publish,
-			   ub4 node_num, ocfs_vote * vote,
+			   __u32 node_num, ocfs_vote * vote,
 			   ocfs_lock_res ** lockres)
 {
 	int status = 0;
-	ub4 flags = 0;
-	ub4 retry_cnt = 0;
+	int tmpstat = 0;
+	__u32 flags = 0;
+	__u32 retry_cnt = 0;
 	bool acq_oin = false;
 	ocfs_file_entry *fe = NULL;
 	bool rls_oin = true;
+	ocfs_inode *oin = NULL;
 	ocfs_sem *oin_sem = NULL;
 
-	LOG_ENTRY_ARGS ("(0x%08x, 0x%08x, %u, 0x%08x, 0x%08x)\n", osb, publish,
+	LOG_ENTRY_ARGS ("(0x%p, 0x%p, %u, 0x%p, 0x%p)\n", osb, publish,
 			node_num, vote, lockres);
 
 	flags = publish->vote_type;
 
 	ocfs_acquire_lockres (*lockres);
 
-	if ((*lockres)->oin) {
-		UPDATE_OIN ((*lockres)->oin);
+	oin = (*lockres)->oin;
+	if (oin) {
+		ocfs_down_sem (&oin->main_res, true);
+		oin->needs_verification = true;
+		tmpstat = ocfs_verify_update_oin(osb, oin);
+		if (tmpstat < 0)
+			LOG_ERROR_STATUS (tmpstat);
+		ocfs_up_sem (&oin->main_res);
 	}
 
-	LOG_TRACE_ARGS ("For node (%u) for lockid %u.%u and seq %u.%u\n",
+	LOG_TRACE_ARGS ("node=%u, lockid=%u.%u, seq=%u.%u\n",
 			node_num, HI (publish->dir_ent),
 			LO (publish->dir_ent), HI (publish->publ_seq_num),
 			LO (publish->publ_seq_num));
 
 	/* Check for oin */
-	if ((*lockres)->oin != NULL) {
-		ocfs_inode *oin;
-
-		oin = (*lockres)->oin;
-
+	if (oin) {
 		oin_sem = &(oin->main_res);
 		ocfs_down_sem (oin_sem, true);
 		acq_oin = true;
@@ -368,7 +375,7 @@ int ocfs_vote_for_del_ren (ocfs_super * 
 		/* Change the master if there is no lock */
 		if (((*lockres)->master_node_num == osb->node_num) &&
 		    ((*lockres)->lock_state <= OCFS_DLM_SHARED_LOCK)) {
-			ub8 tmp = publish->dir_ent;
+			__u64 tmp = publish->dir_ent;
 
 			/* Change the lock ownership to the node asking for vote */
 			/* and write new master on the disk */
@@ -389,13 +396,10 @@ int ocfs_vote_for_del_ren (ocfs_super * 
 	}
 
       finally:
-	if (fe)
-		ocfs_release_file_entry (fe);
+	ocfs_release_file_entry (fe);
 
-	if (acq_oin && oin_sem) {
+	if (acq_oin && oin_sem)
 		ocfs_up_sem (oin_sem);
-		acq_oin = false;
-	}
 
 	if (*lockres)
 		ocfs_release_lockres (*lockres);
@@ -408,7 +412,7 @@ int ocfs_vote_for_del_ren (ocfs_super * 
  * ocfs_get_inode_from_offset()
  *
  */
-struct inode * ocfs_get_inode_from_offset(ocfs_super * osb, ub8 fileoff)
+struct inode * ocfs_get_inode_from_offset(ocfs_super * osb, __u64 fileoff)
 {
         int status;
         struct inode *inode = NULL;
@@ -421,7 +425,7 @@ struct inode * ocfs_get_inode_from_offse
 	if (status >= 0) {
 		args.offset = fe->this_sector;
 		args.entry = fe;
-		inode = iget4 (osb->sb, (ub4) LO (fileoff),
+		inode = iget4 (osb->sb, (__u32) LO (fileoff),
 			       (find_inode_t) ocfs_find_inode,
 			       (void *) (&args));
                 if (inode != NULL && is_bad_inode (inode)) {
@@ -440,16 +444,14 @@ struct inode * ocfs_get_inode_from_offse
  * ocfs_process_update_inode_request()
  *
  * @osb:
- * @vote:
- * @publish:
+ * @lock_id:
  * @lockres:
  * @node_num: node asking for the vote
  *
  * get an inode just long enough to dump its pages
  */
-int ocfs_process_update_inode_request (ocfs_super * osb, ocfs_vote * vote,
-				       ocfs_publish * publish,
-				       ocfs_lock_res * lockres, ub4 node_num)
+int ocfs_process_update_inode_request (ocfs_super * osb, __u64 lock_id,
+				       ocfs_lock_res * lockres, __u32 node_num)
 {
 	struct inode *inode = NULL;
 	int status = 0;
@@ -463,7 +465,7 @@ int ocfs_process_update_inode_request (o
 		goto bail;
 	}
 
-	inode = ocfs_get_inode_from_offset(osb, publish->dir_ent);
+	inode = ocfs_get_inode_from_offset(osb, lock_id);
 	if (inode) {
 		truncate_inode_pages (inode->i_mapping, 0);
 		iput (inode);
@@ -471,13 +473,7 @@ int ocfs_process_update_inode_request (o
 	}
 
 	if (lockres)
-		ocfs_hash_del (&(osb->root_sect_node),
-			       &(lockres->sector_num), sizeof (ub8));
-
-	vote->dir_ent = publish->dir_ent;
-	vote->vote_seq_num = publish->publ_seq_num;
-	vote->vote[node_num] = FLAG_VOTE_OIN_UPDATED;
-	LOG_TRACE_STR ("Now doing a FLAG_VOTE_OIN_UPDATED vote!");
+		ocfs_remove_sector_node (osb, lockres);
 
       bail:
 	LOG_EXIT ();
@@ -492,19 +488,23 @@ int ocfs_process_update_inode_request (o
  * @node_num: node asking for the vote
  *
  */
-int ocfs_process_vote (ocfs_super * osb, ocfs_publish * publish, ub4 node_num)
+int ocfs_process_vote (ocfs_super * osb, ocfs_publish * publish, __u32 node_num)
 {
 	int status = 0;
+	int tmpstat = 0;
 	ocfs_lock_res *lockres = NULL;
-	ub4 flags;
-	ub4 num_nodes;
-	ub4 i;
-	ub8 offset;
-	bool acq_oin = false;
+	__u32 flags;
+	__u32 num_nodes;
+	__u32 i;
+	__u64 offset;
 	ocfs_file_entry *fe = NULL;
 	ocfs_vote *vote = NULL;
 
-	LOG_ENTRY_ARGS ("(0x%08x, 0x%08x, %u)\n", osb, publish, node_num);
+	LOG_ENTRY_ARGS ("(0x%p, 0x%p, %u)\n", osb, publish, node_num);
+
+	LOG_TRACE_ARGS ("node=%u, id=%u.%u, seq=%u.%u\n", node_num,
+		HI(publish->dir_ent), LO(publish->dir_ent),
+		HI(publish->publ_seq_num), LO(publish->publ_seq_num));
 
 	num_nodes = OCFS_MAXIMUM_NODES;
 	flags = publish->vote_type;
@@ -519,11 +519,20 @@ int ocfs_process_vote (ocfs_super * osb,
 
 	/* Exclusive vote for */
 	status = ocfs_find_update_res (osb, publish->dir_ent, &lockres, NULL,
-				       NULL);
+				       NULL, (OCFS_NM_HEARTBEAT_TIME/2));
 	if (status < 0) {
+		if (status == -ETIMEDOUT)
+			goto finito;
 		if (flags & FLAG_FILE_UPDATE_OIN) {
-			status = ocfs_process_update_inode_request (osb, vote,
-						publish, lockres, node_num);
+			status = ocfs_process_update_inode_request (osb,
+					publish->dir_ent, lockres, node_num);
+			if (status < 0) {
+				LOG_ERROR_STATUS (status);
+				goto finito;
+			}
+			vote->dir_ent = publish->dir_ent;
+			vote->vote_seq_num = publish->publ_seq_num;
+			vote->vote[node_num] = FLAG_VOTE_OIN_UPDATED;
 		} else
 			LOG_ERROR_STATUS (status);
 		goto finito;
@@ -536,22 +545,17 @@ int ocfs_process_vote (ocfs_super * osb,
 	if ((flags & FLAG_FILE_DELETE) || (flags & FLAG_FILE_RENAME)) {
 		status = ocfs_vote_for_del_ren (osb, publish, node_num, vote,
 						&lockres);
+		if (status < 0)
+			LOG_ERROR_STATUS (status);
 		goto finito;
 	}
 
 	if (flags & FLAG_FILE_RELEASE_CACHE) {
 		ocfs_file_entry *tmp_fe = NULL;
 
-		i = 0;
 		if (!osb->commit_cache_exec) {
 			osb->needs_flush = true;
-			while ((osb->trans_in_progress) && (i < 10)) {
-				ocfs_sleep (100);
-				i++;
-			}
-
-			status = -EFAIL;
-
+			ocfs_trans_in_progress(osb);
 			if (osb->trans_in_progress == false) {
 				osb->commit_cache_exec = true;
 				ocfs_commit_cache (osb, true);
@@ -574,7 +578,7 @@ int ocfs_process_vote (ocfs_super * osb,
 				/* no need to update cache, as there is */
 				/* nothing there */
 				if (DISK_LOCK_FILE_LOCK (tmp_fe) > OCFS_DLM_NO_LOCK) {
-					ub8 tmp = publish->dir_ent;
+					__u64 tmp = publish->dir_ent;
 
 					DISK_LOCK_FILE_LOCK (tmp_fe) = OCFS_DLM_NO_LOCK;
 
@@ -588,7 +592,10 @@ int ocfs_process_vote (ocfs_super * osb,
 				}
 				ocfs_release_file_entry (tmp_fe);
 				vote->vote[node_num] = FLAG_VOTE_NODE;
-				status = 0;
+			} else {
+				/* Ask for a retry as txn is in progress */
+				vote->vote[node_num] = FLAG_VOTE_UPDATE_RETRY;
+				vote->open_handle = false;
 			}
 			goto finito;
 		}
@@ -604,20 +611,25 @@ int ocfs_process_vote (ocfs_super * osb,
 		if (lockres->oin != NULL) {
 			oin = lockres->oin;
 			ocfs_down_sem (&(oin->main_res), true);
-			acq_oin = true;
-
-			UPDATE_OIN (lockres->oin);
-			if (acq_oin) {
-				ocfs_up_sem (&(oin->main_res));
-				acq_oin = false;
-			}
+			oin->needs_verification = true;
+			tmpstat = ocfs_verify_update_oin(osb, oin);
+			if (tmpstat < 0)
+				LOG_ERROR_STATUS (tmpstat);
+			ocfs_up_sem (&(oin->main_res));
 
 			vote->dir_ent = publish->dir_ent;
 			vote->vote_seq_num = publish->publ_seq_num;
 			vote->vote[node_num] = FLAG_VOTE_OIN_UPDATED;
 		} else {
-			status = ocfs_process_update_inode_request (osb, vote,
-						publish, lockres, node_num);
+			status = ocfs_process_update_inode_request (osb,
+					publish->dir_ent, lockres, node_num);
+			if (status < 0) {
+				LOG_ERROR_STATUS (status);
+				goto finito;
+			}
+			vote->dir_ent = publish->dir_ent;
+			vote->vote_seq_num = publish->publ_seq_num;
+			vote->vote[node_num] = FLAG_VOTE_OIN_UPDATED;
 		}
 		goto finito;
 	}
@@ -627,16 +639,9 @@ int ocfs_process_vote (ocfs_super * osb,
 			/* I am currently the master of the lock */
 			if (flags & FLAG_CHANGE_MASTER) {
 				osb->needs_flush = true;
-
-				while ((osb->trans_in_progress) && (i < 10)) {
-					ocfs_sleep (100);
-					i++;
-				}
-
-				status = -EFAIL;
-
+				ocfs_trans_in_progress(osb);
 				if (osb->trans_in_progress == false) {
-					ub8 tmp = publish->dir_ent;
+					__u64 tmp = publish->dir_ent;
 
 					ocfs_commit_cache (osb, true);
 					lockres->master_node_num = node_num;
@@ -667,7 +672,10 @@ int ocfs_process_vote (ocfs_super * osb,
 					}
 					lockres->master_node_num = node_num;
 					vote->vote[node_num] = FLAG_VOTE_NODE;
-					status = 0;
+				} else {
+					/* Ask for a retry as txn is in progress */
+					vote->vote[node_num] = FLAG_VOTE_UPDATE_RETRY;
+					vote->open_handle = false;
 				}
 			} else if (flags & FLAG_ADD_OIN_MAP) {
 				status = ocfs_get_file_entry (osb, &fe, publish->dir_ent);
@@ -681,7 +689,7 @@ int ocfs_process_vote (ocfs_super * osb,
 					vote->vote[node_num] = FLAG_VOTE_FILE_DEL;
 					vote->open_handle = false;
 				} else {
-					ub8 tmp = publish->dir_ent;
+					__u64 tmp = publish->dir_ent;
 
 					DISK_LOCK_OIN_MAP (fe) |= (1 << node_num);
 
@@ -742,152 +750,15 @@ int ocfs_process_vote (ocfs_super * osb,
 			LOG_ERROR_STATUS (status);
 	}
 
-	if (fe)
-		ocfs_release_file_entry (fe);
+	LOG_TRACE_ARGS ("vote:%d, status:%d tip:%d\n", vote->vote[node_num],
+			status, osb->trans_in_progress);
+
+	ocfs_release_file_entry (fe);
 
 	ocfs_safefree (vote);
 
-        if (lockres && lockres->oin==NULL) {
-        	ocfs_hash_del (&(osb->root_sect_node), &(lockres->sector_num),
-			       sizeof (ub8));
-                ocfs_free_lockres(lockres);
-        }
+	ocfs_put_lockres(lockres);
 
 	LOG_EXIT_STATUS (status);
 	return status;
 }				/* ocfs_process_vote */
-
-/*
- * ocfs_nm_thread()
- *
- */
-int ocfs_nm_thread (ocfs_super * mount_osb)
-{
-	int status;
-	ub1 *buffer = NULL;
-	ocfs_super *osb = NULL;
-	ocfs_publish *publish;
-	ocfs_publish *publish_to_vote = NULL;
-	ub4 i;
-	ub4 highest_vote_node = 0;
-	ub8 offset = 0;
-	ub4 num_nodes = 0;
-	ub4 vote_node = OCFS_INVALID_NODE_NUM;
-	int ret = 0;
-	ocfs_node_config_hdr *node_cfg_hdr = NULL;
-	ub1 *p;
-
-	LOG_ENTRY ();
-
-	/* For each mounted volume reiterate the time stamp on the publish sector */
-	if (!mount_osb) {
-		LOG_ERROR_STATUS (status = -EFAIL);
-		goto finally;
-	} else
-		osb = mount_osb;
-
-	/* Ensure that the volume is valid ... */
-	if (osb->obj_id.type != OCFS_TYPE_OSB)
-		goto finally;
-
-	/* ... and that it is mounted */
-	if (osb->osb_flags & OCFS_OSB_FLAGS_BEING_DISMOUNTED)
-		goto finally;
-
-	if (!time_after (jiffies, osb->hbt))
-		goto finally;
-
-	if (osb->vol_state == VOLUME_MOUNTED) {
-		if (osb->needs_flush) {
-			i = 0;
-			while ((osb->trans_in_progress) && (i < 10)) {
-				ocfs_sleep (100);
-				i++;
-			}
-
-			if (osb->trans_in_progress == false) {
-				ocfs_commit_cache (osb, false);
-				osb->needs_flush = false;
-			}
-		}
-	}
-
-	/* Get the Publish Sector start Offset */
-	offset = osb->vol_layout.new_cfg_off;
-
-	/* Read disk for Publish Sectors of all nodes */
-	status = ocfs_read_force_disk (osb, osb->cfg_prealloc, osb->cfg_len,
-				       offset);
-	if (status < 0) {
-		LOG_ERROR_STATUS (status);
-		goto finally;
-	}
-
-	/* If another node was added to the config read and update the cfg */
-	node_cfg_hdr = (ocfs_node_config_hdr *) (osb->cfg_prealloc + osb->sect_size);
-
-	if ((osb->cfg_seq_num != node_cfg_hdr->cfg_seq_num) ||
-	    (osb->num_cfg_nodes != node_cfg_hdr->num_nodes)) {
-		status = ocfs_chk_update_config (osb);
-		if (status < 0) {
-			LOG_ERROR_STATUS (status);
-			goto finally;
-		}
-	}
-
-	buffer = osb->cfg_prealloc +
-			(OCFS_VOLCFG_NEWCFG_SECTORS * osb->sect_size);
-
-	num_nodes = OCFS_MAXIMUM_NODES;
-
-	/* Refresh the publish map */
-	ocfs_update_publish_map (osb, buffer, false);
-
-	LOG_TRACE_ARGS ("Publish map: 0x%08x\n", LO (osb->publ_map));
-
-	/* Update the timestamp on disk to indicate that it is alive */
-	ocfs_nm_heart_beat (osb, HEARTBEAT_METHOD_DISK, false);
-
-	/* Check for the highest node looking for a vote, if anybody is looking */
-	for (i = 0, p = buffer; i < num_nodes; i++, p += osb->sect_size) {
-		publish = (ocfs_publish *) p;
-
-		if (publish->time == (ub8) 0)
-			continue;
-
-		if (publish->vote != FLAG_VOTE_NODE ||
-		    !(publish->vote_map & (1 << osb->node_num)))
-			continue;
-
-		LOG_TRACE_ARGS ("Node(%u): Vote=%d Dirty=%d Type=%u\n", i,
-				publish->vote, publish->dirty, publish->vote_type);
-
-		highest_vote_node = i;
-
-		/* Check if the node is alive or not */
-		if (IS_NODE_ALIVE (osb->publ_map, highest_vote_node, num_nodes)) {
-			vote_node = highest_vote_node;
-			publish_to_vote = publish;
-		} else {
-			status = ocfs_recover_vol (osb, highest_vote_node);
-			if (status < 0) {
-				LOG_ERROR_STATUS (status);
-				goto finally;
-			}
-		}
-	}
-
-	if ((vote_node != OCFS_INVALID_NODE_NUM) && (vote_node != osb->node_num)) {
-		publish = (ocfs_publish *)
-				(buffer + (osb->node_num * osb->sect_size));
-		if (publish->vote)
-			publish->vote = 0;
-
-		ocfs_process_vote (osb, publish_to_vote, vote_node);
-	}
-	osb->hbt = 50 + jiffies;
-
-      finally:
-	LOG_EXIT_STATUS (ret);
-	return ret;
-}				/* ocfs_nm_thread() */
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Common/ocfsgensysfile.c linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Common/ocfsgensysfile.c
--- linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Common/ocfsgensysfile.c	2003-07-30 13:51:50.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Common/ocfsgensysfile.c	2003-07-30 10:28:53.000000000 +0200
@@ -37,62 +37,56 @@
  * ocfs_init_system_file()
  *
  */
-int ocfs_init_system_file (ocfs_super * osb, ub4 FileId)
+int ocfs_init_system_file (ocfs_super * osb, __u32 file_id, char *filename,
+			   ocfs_file_entry *fe)
 {
 	int status = 0;
-	ub8 diskOffset = 0;
-	ocfs_file_entry *fe = NULL;
-	ub4 length = 0;
-	char fileName[OCFS_MAX_FILENAME_LENGTH];
+	__u64 offset = 0;
+	__u32 length = 0;
 
-	LOG_ENTRY_ARGS ("(FileId = %u)\n", FileId);
+	LOG_ENTRY_ARGS ("(file_id = %u)\n", file_id);
 
-	memset (fileName, 0, sizeof (OCFS_MAX_FILENAME_LENGTH));
+	memset (filename, 0, sizeof (OCFS_MAX_FILENAME_LENGTH));
 
-	if ((FileId >= OCFS_FILE_DIR_ALLOC) &&
-	    (FileId < (OCFS_FILE_DIR_ALLOC + 32))) {
-		sprintf (fileName, "%s%d", OCFS_DIR_FILENAME, FileId);
-	} else if ((FileId >= OCFS_FILE_DIR_ALLOC_BITMAP) &&
-		   (FileId < (OCFS_FILE_DIR_ALLOC_BITMAP + 32))) {
-		sprintf (fileName, "%s%d", OCFS_DIR_BITMAP_FILENAME, FileId);
-	} else if ((FileId >= OCFS_FILE_FILE_ALLOC) &&
-		   (FileId < (OCFS_FILE_FILE_ALLOC + 32))) {
-		sprintf (fileName, "%s%d", OCFS_FILE_EXTENT_FILENAME, FileId);
-	} else if ((FileId >= OCFS_FILE_FILE_ALLOC_BITMAP) &&
-		   (FileId < (OCFS_FILE_FILE_ALLOC_BITMAP + 32))) {
-		sprintf (fileName, "%s%d", OCFS_FILE_EXTENT_BITMAP_FILENAME,
-			 FileId);
-	} else if ((FileId >= LOG_FILE_BASE_ID)
-		   && (FileId < (LOG_FILE_BASE_ID + 32))) {
-		sprintf (fileName, "%s%d", OCFS_RECOVER_LOG_FILENAME, FileId);
-	} else if ((FileId >= CLEANUP_FILE_BASE_ID) &&
-		   (FileId < (CLEANUP_FILE_BASE_ID + 32))) {
-		sprintf (fileName, "%s%d", OCFS_CLEANUP_LOG_FILENAME, FileId);
-	} else if ((FileId >= OCFS_FILE_VOL_META_DATA) &&
-		   (FileId < (OCFS_FILE_VOL_META_DATA + 32))) {
-		sprintf (fileName, "%s", "VolMetaDataFile");
-	} else if ((FileId >= OCFS_FILE_VOL_LOG_FILE) &&
-		   (FileId < (OCFS_FILE_VOL_LOG_FILE + 32))) {
-		sprintf (fileName, "%s", "VolMetaDataLogFile");
+	if ((file_id >= OCFS_FILE_DIR_ALLOC) &&
+	    (file_id < (OCFS_FILE_DIR_ALLOC + 32))) {
+		sprintf (filename, "%s%d", OCFS_DIR_FILENAME, file_id);
+	} else if ((file_id >= OCFS_FILE_DIR_ALLOC_BITMAP) &&
+		   (file_id < (OCFS_FILE_DIR_ALLOC_BITMAP + 32))) {
+		sprintf (filename, "%s%d", OCFS_DIR_BITMAP_FILENAME, file_id);
+	} else if ((file_id >= OCFS_FILE_FILE_ALLOC) &&
+		   (file_id < (OCFS_FILE_FILE_ALLOC + 32))) {
+		sprintf (filename, "%s%d", OCFS_FILE_EXTENT_FILENAME, file_id);
+	} else if ((file_id >= OCFS_FILE_FILE_ALLOC_BITMAP) &&
+		   (file_id < (OCFS_FILE_FILE_ALLOC_BITMAP + 32))) {
+		sprintf (filename, "%s%d", OCFS_FILE_EXTENT_BITMAP_FILENAME,
+			 file_id);
+	} else if ((file_id >= LOG_FILE_BASE_ID)
+		   && (file_id < (LOG_FILE_BASE_ID + 32))) {
+		sprintf (filename, "%s%d", OCFS_RECOVER_LOG_FILENAME, file_id);
+	} else if ((file_id >= CLEANUP_FILE_BASE_ID) &&
+		   (file_id < (CLEANUP_FILE_BASE_ID + 32))) {
+		sprintf (filename, "%s%d", OCFS_CLEANUP_LOG_FILENAME, file_id);
+	} else if ((file_id >= OCFS_FILE_VOL_META_DATA) &&
+		   (file_id < (OCFS_FILE_VOL_META_DATA + 32))) {
+		sprintf (filename, "%s", "VolMetaDataFile");
+	} else if ((file_id >= OCFS_FILE_VOL_LOG_FILE) &&
+		   (file_id < (OCFS_FILE_VOL_LOG_FILE + 32))) {
+		sprintf (filename, "%s", "VolMetaDataLogFile");
 #ifdef LOCAL_ALLOC
-	} else if ((FileId >= OCFS_VOL_BITMAP_FILE) && 
-	      	   (FileId < (OCFS_FILE_VOL_LOG_FILE + 64))) {
-		sprintf (fileName, "%s", "VolBitMapFile");
+	} else if ((file_id >= OCFS_VOL_BITMAP_FILE) && 
+	      	   (file_id < (OCFS_FILE_VOL_LOG_FILE + 64))) {
+		sprintf (filename, "%s", "VolBitMapFile");
 #endif
 	} else {
-		sprintf (fileName, "%s", "UKNOWNSysFile");
+		sprintf (filename, "%s", "UKNOWNSysFile");
 	}
 
-	diskOffset = (FileId * osb->sect_size) + osb->vol_layout.root_int_off;
+	offset = (file_id * osb->sect_size) + osb->vol_layout.root_int_off;
 
 	length = osb->sect_size;
 
-	fe = ocfs_allocate_file_entry ();
-	if (fe == NULL) {
-		status = -ENOMEM;
-		goto leave;
-	}
-
+	memset (fe, 0, sizeof (ocfs_file_entry));
 	/*  Set the Flag to use the Local Extents */
 	fe->local_ext = true;
 	fe->granularity = -1;
@@ -101,26 +95,22 @@ int ocfs_init_system_file (ocfs_super * 
 	fe->next_free_ext = 0;
 
 	/*  Add a file Name  */
-	memcpy (fe->filename, fileName, strlen (fileName));
-	(fe->filename)[strlen (fileName)] = '\0';
+	memcpy (fe->filename, filename, strlen (filename));
+	(fe->filename)[strlen (filename)] = '\0';
 
 	/*  Set the Valid bit here  */
 	SET_VALID_BIT (fe->sync_flags);
 	fe->sync_flags &= ~(OCFS_SYNC_FLAG_CHANGE);
-	fe->this_sector = diskOffset;
+	fe->this_sector = offset;
 	fe->last_ext_ptr = 0;
 
-	status = ocfs_write_disk (osb, (void *) fe, osb->sect_size, diskOffset);
+	status = ocfs_write_disk (osb, (void *) fe, osb->sect_size, offset);
 	if (status < 0) {
 		LOG_ERROR_STATUS (status);
 		goto leave;
 	}
 
       leave:
-	if (fe) {
-		ocfs_release_file_entry (fe);
-	}
-
 	LOG_EXIT_STATUS (status);
 	return status;
 }				/* ocfs_init_system_file */
@@ -130,22 +120,22 @@ int ocfs_init_system_file (ocfs_super * 
  *
  */
 int ocfs_read_system_file (ocfs_super * osb,
-		ub4 FileId, void *Buffer, ub8 Length, ub8 Offset)
+		__u32 FileId, void *Buffer, __u64 Length, __u64 Offset)
 {
 	int status = 0;
 	ocfs_file_entry *fe = NULL;
 	void *extentBuffer = NULL;
-	ub4 numExts = 0, i;
+	__u32 numExts = 0, i;
 	ocfs_io_runs *IoRuns = NULL;
-	ub8 templength;
-	ub4 *tempBuffer;
-	ub8 tempOffset = 0;
+	__u64 templength;
+	__u32 *tempBuffer;
+	__u64 tempOffset = 0;
 	bool bWriteThru = false;
 
 	LOG_ENTRY_ARGS ("(FileId = %u)\n", FileId);
 
-	if ((FileId == (ub4) (OCFS_FILE_VOL_LOG_FILE + osb->node_num)) ||
-	    (FileId == (ub4) (OCFS_FILE_VOL_META_DATA + osb->node_num))) {
+	if ((FileId == (__u32) (OCFS_FILE_VOL_LOG_FILE + osb->node_num)) ||
+	    (FileId == (__u32) (OCFS_FILE_VOL_META_DATA + osb->node_num))) {
 		bWriteThru = true;
 	}
 
@@ -187,14 +177,14 @@ int ocfs_read_system_file (ocfs_super * 
 
 		if (bWriteThru) {
 			status = ocfs_read_disk (osb, (void *) tempBuffer,
-						 (ub4) templength, tempOffset);
+						 (__u32) templength, tempOffset);
 			if (status < 0) {
 				LOG_ERROR_STATUS (status);
 				goto leave;
 			}
 		} else {
 			status = ocfs_read_metadata (osb, (void *) tempBuffer,
-						(ub4) templength, tempOffset);
+						(__u32) templength, tempOffset);
 			if (status < 0) {
 				LOG_ERROR_STATUS (status);
 				goto leave;
@@ -203,10 +193,13 @@ int ocfs_read_system_file (ocfs_super * 
 	}
 
       leave:
-	if (fe) {
-		ocfs_release_file_entry (fe);
-	}
+	ocfs_release_file_entry (fe);
+#ifdef SYSFILE_EXTMAP_FIX
+	if (extentBuffer)
+		vfree(extentBuffer);
+#else
 	ocfs_safefree (extentBuffer);
+#endif
 
 	LOG_EXIT_STATUS (status);
 	return status;
@@ -218,16 +211,16 @@ int ocfs_read_system_file (ocfs_super * 
  *
  */
 int ocfs_write_system_file (ocfs_super * osb,
-		 ub4 FileId, void *Buffer, ub8 Length, ub8 Offset)
+		 __u32 FileId, void *Buffer, __u64 Length, __u64 Offset)
 {
 	int status = 0;
 	ocfs_file_entry *fe = NULL;
 	void *extentBuffer = NULL;
-	ub4 numExts = 0, i;
+	__u32 numExts = 0, i;
 	ocfs_io_runs *IoRuns = NULL;
-	ub8 templength;
-	ub4 *tempBuffer;
-	ub8 tempOffset = 0;
+	__u64 templength;
+	__u32 *tempBuffer;
+	__u64 tempOffset = 0;
 	bool bWriteThru = false;
 
 	LOG_ENTRY_ARGS ("(FileId = %u)\n", FileId);
@@ -276,7 +269,7 @@ int ocfs_write_system_file (ocfs_super *
 		if (bWriteThru) {
 			status =
 			    ocfs_write_force_disk (osb, (void *) tempBuffer,
-						(ub4) templength, tempOffset);
+						(__u32) templength, tempOffset);
 			if (status < 0) {
 				LOG_ERROR_STATUS (status);
 				goto leave;
@@ -284,7 +277,7 @@ int ocfs_write_system_file (ocfs_super *
 		} else {
 			status =
 			    ocfs_write_metadata (osb, (void *) tempBuffer,
-					       (ub4) templength, tempOffset);
+					       (__u32) templength, tempOffset);
 			if (status < 0) {
 				LOG_ERROR_STATUS (status);
 				goto leave;
@@ -293,10 +286,13 @@ int ocfs_write_system_file (ocfs_super *
 	}
 
       leave:
-	if (fe) {
-		ocfs_release_file_entry (fe);
-	}
+	ocfs_release_file_entry (fe);
+#ifdef SYSFILE_EXTMAP_FIX
+       if (extentBuffer)
+              vfree(extentBuffer);
+#else
 	ocfs_safefree (extentBuffer);
+#endif
 
 	LOG_EXIT_STATUS (status);
 	return status;
@@ -306,14 +302,14 @@ int ocfs_write_system_file (ocfs_super *
  * ocfs_file_to_disk_off()
  *
  */
-ub8 ocfs_file_to_disk_off (ocfs_super * osb, ub4 FileId, ub8 Offset)
+__u64 ocfs_file_to_disk_off (ocfs_super * osb, __u32 FileId, __u64 Offset)
 {
 	int status = 0;
-	ub8 StartOffset = 0;
+	__u64 StartOffset = 0;
 	void *Buffer = NULL;
 	ocfs_file_entry *fe = NULL;
 	ocfs_io_runs *IoRuns;
-	ub4 NumExts = 0;
+	__u32 NumExts = 0;
 	bool bWriteThru = false;
 
 	LOG_ENTRY_ARGS ("(FileId = %u)\n", FileId);
@@ -351,12 +347,15 @@ ub8 ocfs_file_to_disk_off (ocfs_super * 
 	StartOffset = (IoRuns[0].disk_off);
 
       leave:
-	if (fe) {
-		ocfs_release_file_entry (fe);
-	}
+	ocfs_release_file_entry (fe);
+#ifdef SYSFILE_EXTMAP_FIX
+	if (Buffer)
+		vfree(Buffer);
+#else
 	ocfs_safefree (Buffer);
+#endif
 
-	LOG_EXIT_ARGS ("%u.%u\n", HI (StartOffset), LO (StartOffset));
+	LOG_EXIT_ARGS ("%u.%u", HI (StartOffset), LO (StartOffset));
 	return StartOffset;
 }				/* ocfs_file_to_disk_off */
 
@@ -365,11 +364,12 @@ ub8 ocfs_file_to_disk_off (ocfs_super * 
  * ocfs_get_system_file_size()
  *
  */
-int ocfs_get_system_file_size (ocfs_super * osb, ub4 FileId, ub8 * Length, ub8 * AllocSize)
+int ocfs_get_system_file_size (ocfs_super * osb, __u32 FileId, __u64 * Length, __u64 * AllocSize)
 {
 	int status = 0;
 	ocfs_file_entry *fe = NULL;
 	bool bWriteThru = false;
+	__u64 offset;
 
 	LOG_ENTRY_ARGS ("(FileId = %u)\n", FileId);
 
@@ -379,27 +379,25 @@ int ocfs_get_system_file_size (ocfs_supe
 	}
 	*AllocSize = *Length = 0;
 
-	status = ocfs_force_get_file_entry (osb, &fe,
-					(FileId * osb->sect_size) +
-					osb->vol_layout.root_int_off,
-					bWriteThru);
+	offset = (FileId * osb->sect_size) + osb->vol_layout.root_int_off;
+
+	status = ocfs_force_get_file_entry (osb, &fe, offset, bWriteThru);
 	if (status < 0) {
 		LOG_ERROR_STATUS (status);
 		goto leave;
 	}
 
 	if (!IS_VALID_FILE_ENTRY (fe)) {
-		LOG_ERROR_STATUS(status = -EINVAL);
+		LOG_ERROR_ARGS("offset=%u.%u", HI(offset), LO(offset));
+		status = -EINVAL;
 		goto leave;
 	}
 
-	*Length = (ub8) (fe->file_size);
-	*AllocSize = (ub8) (fe->alloc_size);
+	*Length = (__u64) (fe->file_size);
+	*AllocSize = (__u64) (fe->alloc_size);
 
       leave:
-	if (fe) {
-		ocfs_release_file_entry (fe);
-	}
+	ocfs_release_file_entry (fe);
 
 	LOG_EXIT_STATUS (status);
 	return status;
@@ -410,10 +408,10 @@ int ocfs_get_system_file_size (ocfs_supe
  * ocfs_extend_system_file()
  *
  */
-int ocfs_extend_system_file (ocfs_super * osb, ub4 FileId, ub8 FileSize, ocfs_file_entry *fe)
+int ocfs_extend_system_file (ocfs_super * osb, __u32 FileId, __u64 FileSize, ocfs_file_entry *fe)
 {
 	int status = 0;
-	ub8 actualDiskOffset = 0, actualLength = 0;
+	__u64 actualDiskOffset = 0, actualLength = 0;
 	bool bWriteThru = false;
 	bool local_fe = false;
 
@@ -429,9 +427,9 @@ int ocfs_extend_system_file (ocfs_super 
 	if (!fe) {
 		local_fe = true;
 		status = ocfs_force_get_file_entry (osb, &fe,
-					(FileId * osb->sect_size) +
-					osb->vol_layout.root_int_off,
-					bWriteThru);
+						(FileId * osb->sect_size) +
+						osb->vol_layout.root_int_off,
+						bWriteThru);
 		if (status < 0) {
 			LOG_ERROR_STATUS (status);
 			goto leave;
@@ -447,7 +445,7 @@ int ocfs_extend_system_file (ocfs_super 
 		fe->file_size = FileSize;
 	} else {
 		/*  We need to allocate from bitmap */
-		ub8 numClusterAlloc = 0, BitmapOffset = 0;
+		__u64 numClusterAlloc = 0, BitmapOffset = 0;
 
 		status =
 		    ocfs_find_contiguous_space_from_bitmap (osb,
@@ -463,7 +461,7 @@ int ocfs_extend_system_file (ocfs_super 
 		    (BitmapOffset * osb->vol_layout.cluster_size) +
 		    osb->vol_layout.data_start_off;
 		actualLength =
-		    (ub8) (numClusterAlloc * osb->vol_layout.cluster_size);
+		    (__u64) (numClusterAlloc * osb->vol_layout.cluster_size);
 
 		status = ocfs_allocate_extent (osb, NULL, fe, actualDiskOffset,
 					     actualLength);
@@ -480,13 +478,16 @@ int ocfs_extend_system_file (ocfs_super 
 		DISK_LOCK_CURRENT_MASTER (fe) = osb->node_num;
 		DISK_LOCK_FILE_LOCK (fe) = OCFS_DLM_ENABLE_CACHE_LOCK;
 	}
+
 	status = ocfs_force_put_file_entry (osb, fe, bWriteThru);
+	if (status < 0) {
+		LOG_ERROR_STATUS (status);
+		goto leave;
+	}
 
       leave:
-	if (local_fe) {
+	if (local_fe)
 		ocfs_release_file_entry (fe);
-	}
-
 	LOG_EXIT_STATUS (status);
 	return status;
 }				/* ocfs_extend_system_file */
@@ -500,19 +501,19 @@ int ocfs_extend_system_file (ocfs_super 
  * file offset up to the length specified.
  */
 int ocfs_find_extents_of_system_file (ocfs_super * osb,
-			 ub8 file_off,
-			 ub8 Length,
-			 ocfs_file_entry * fe, void **Buffer, ub4 * NumEntries)
+			 __u64 file_off,
+			 __u64 Length,
+			 ocfs_file_entry * fe, void **Buffer, __u32 * NumEntries)
 {
-	int status;
-	ub4 allocSize = 0, size;
-	ub1 *buffer = NULL;
-	ub4 k = 0, j;
-	ub4 Runs, Runoffset;
-	ub4 length;
+	int status = -EFAIL;
+	__u32 allocSize = 0, size;
+	__u8 *buffer = NULL;
+	__u32 k = 0, j;
+	__u32 Runs, Runoffset;
+	__u32 length;
 	ocfs_extent_group *pOcfsExtent = NULL, *pOcfsExtentHeader = NULL;
 	ocfs_io_runs *IoRuns;
-	ub8 newOffset = 0, searchVbo, remainingLength = 0;
+	__u64 newOffset = 0, searchVbo, remainingLength = 0;
 
 	LOG_ENTRY ();
 
@@ -522,15 +523,47 @@ int ocfs_find_extents_of_system_file (oc
 		LOG_ERROR_STATUS(status = -EFAIL);
 		goto leave;
 	}
-
+#ifdef SYSFILE_EXTMAP_FIX
+      if (fe->local_ext)
+      {
+              size = OCFS_MAX_FILE_ENTRY_EXTENTS * sizeof (ocfs_io_runs);
+      }
+      else
+      {
+              int pow = fe->granularity + 1;
+              /* extent tree looks like
+               *             fe[0]        fe[1]    fe[2]
+               *        hdr[0]...hdr[17]  .....
+               * dat[0]..dat[17]
+               *
+               * granularity of fe is tree height
+               * so max runs (total of all leaves) is
+               * 3 x 18 ^ (granularity+1)
+               * (OCFS_MAX_DATA_EXTENTS = 18)
+               *
+               * g=0: 1296 bytes
+               * g=1: 23328 bytes
+               * g=2: 419904 bytes!
+               */
+              size = 3;
+              while (pow)
+              {
+                      size *= OCFS_MAX_DATA_EXTENTS;
+                      pow--;
+              }
+              size *= sizeof (ocfs_io_runs);
+      }
+      size = OCFS_ALIGN (size, osb->sect_size);
+      IoRuns = vmalloc(size);
+#else
 	/* ??? need to allocate accoordingly ...as number of runs can be more */
 	size = (OCFS_MAX_DATA_EXTENTS * sizeof (ocfs_io_runs));
-	size = OCFS_ALIGN (size, PAGE_SIZE);
+	size = OCFS_ALIGN (size, osb->sect_size);
 
 	IoRuns = ocfs_malloc (size);
+#endif
 	if (IoRuns == NULL) {
-		status = -ENOMEM;
-		LOG_ERROR_STATUS (status);
+		LOG_ERROR_STATUS (status = -ENOMEM);
 		goto leave;
 	}
 
@@ -541,7 +574,6 @@ int ocfs_find_extents_of_system_file (oc
 	Runoffset = 0;
 	newOffset = file_off;
 
-	status = -EFAIL;
 	if (fe->local_ext) {
 		for (j = 0; j < OCFS_MAX_FILE_ENTRY_EXTENTS; j++) {
 			if ((fe->extents[j].file_off +
@@ -550,13 +582,13 @@ int ocfs_find_extents_of_system_file (oc
 				    fe->extents[j].disk_off +
 				    (newOffset - fe->extents[j].file_off);
 				IoRuns[Runoffset].byte_cnt =
-				    (ub4) ((fe->extents[j].file_off +
+				    (__u32) ((fe->extents[j].file_off +
 					    fe->extents[j].num_bytes) -
 					   newOffset);
 				if (IoRuns[Runoffset].byte_cnt >=
 				    remainingLength) {
 					IoRuns[Runoffset].byte_cnt =
-					    (ub4) remainingLength;
+					    (__u32) remainingLength;
 					status = 0;
 					break;
 				} else {
@@ -579,12 +611,11 @@ int ocfs_find_extents_of_system_file (oc
 		allocSize = (NUM_SECTORS_IN_LEAF_NODE + fe->granularity) *
 		    OCFS_SECTOR_SIZE;
 
-		length = (ub4) OCFS_ALIGN (allocSize, PAGE_SIZE);
+		length = (__u32) OCFS_ALIGN (allocSize, osb->sect_size);
 
 		buffer = ocfs_malloc (length);
 		if (buffer == NULL) {
-			status = -ENOMEM;
-			LOG_ERROR_STATUS (status);
+			LOG_ERROR_STATUS (status = -ENOMEM);
 			goto leave;
 		}
 
@@ -592,7 +623,7 @@ int ocfs_find_extents_of_system_file (oc
 			/* Keep going downwards looking for the Entry, till we hit */
 			/* the last Data entry */
 			for (k = 0; k < OCFS_MAX_FILE_ENTRY_EXTENTS; k++) {
-				if ((sb8) (fe->extents[k].file_off +
+				if ((__s64) (fe->extents[k].file_off +
 					   fe->extents[k].num_bytes) >
 				    newOffset) {
 					break;
@@ -600,13 +631,13 @@ int ocfs_find_extents_of_system_file (oc
 			}
 
 			if (k == OCFS_MAX_FILE_ENTRY_EXTENTS) {
-				OCFS_BREAKPOINT ();
+				LOG_ERROR_STR ("data extents maxed");
 			}
 
 			memset (buffer, 0, length);
 
 			if (fe->extents[k].disk_off == 0) {
-				OCFS_BREAKPOINT ();
+				LOG_ERROR_STR ("disk_off=0");
 			}
 
 			status =
@@ -620,21 +651,21 @@ int ocfs_find_extents_of_system_file (oc
 
 			pOcfsExtent = (ocfs_extent_group *) buffer;
 			while (pOcfsExtent->type != OCFS_EXTENT_DATA) {
-				ub8 diskoffset;
+				__u64 diskoffset;
 
 				if (!IS_VALID_EXTENT_HEADER (pOcfsExtent)) {
 					LOG_ERROR_STATUS(status = -EFAIL);
 					goto leave;
 				}
 
-				OCFS_GET_EXTENT ((sb8) newOffset, pOcfsExtent,
+				OCFS_GET_EXTENT ((__s64) newOffset, pOcfsExtent,
 						 k);
 				if (k == OCFS_MAX_DATA_EXTENTS) {
-					OCFS_BREAKPOINT ();
+					LOG_ERROR_STR ("data extents maxed");
 				}
 
 				if (pOcfsExtent->extents[k].disk_off == 0) {
-					OCFS_BREAKPOINT ();
+					LOG_ERROR_STR ("disk_off=0");
 				}
 
 				diskoffset = pOcfsExtent->extents[k].disk_off;
@@ -675,7 +706,7 @@ int ocfs_find_extents_of_system_file (oc
 								extents[j].
 								file_off);
 						IoRuns[Runoffset].byte_cnt =
-						    (ub4) ((pOcfsExtent->
+						    (__u32) ((pOcfsExtent->
 							    extents[j].
 							    file_off +
 							    pOcfsExtent->
@@ -687,7 +718,7 @@ int ocfs_find_extents_of_system_file (oc
 						    byte_cnt >=
 						    remainingLength) {
 							IoRuns[Runoffset].
-							    byte_cnt = (ub4)
+							    byte_cnt = (__u32)
 							    remainingLength;
 							status = 0;
 							break;
@@ -703,8 +734,7 @@ int ocfs_find_extents_of_system_file (oc
 							if (Runs >=
 							    OCFS_MAX_DATA_EXTENTS)
 							{
-								LOG_ERROR_STR
-								    ("No of Runs are more");
+								LOG_ERROR_ARGS ("Runs=%d", Runs);
 							}
 						}
 					}
@@ -733,22 +763,22 @@ int ocfs_find_extents_of_system_file (oc
  * ocfs_free_file_extents()
  *
  */
-int ocfs_free_file_extents (ocfs_super * osb, ocfs_file_entry * fe, sb4 LogNodeNum)
+int ocfs_free_file_extents (ocfs_super * osb, ocfs_file_entry * fe, __s32 LogNodeNum)
 {
 	int status = 0;
-	ub4 i, size, numUpdt = 0;
-	ub4 numBitsAllocated = 0, bitmapOffset = 0;
+	__u32 i, size, numUpdt = 0;
+	__u32 numBitsAllocated = 0, bitmapOffset = 0;
 	ocfs_cleanup_record *pCleanupLogRec = NULL;
 	ocfs_extent_group *PAllocExtent = NULL;
 
 	LOG_ENTRY ();
 
 	size = sizeof (ocfs_cleanup_record);
-	size = (ub4) OCFS_ALIGN (size, PAGE_SIZE);
+	size = (__u32) OCFS_ALIGN (size, PAGE_SIZE);
 
 	pCleanupLogRec = ocfs_malloc (size);
 	if (pCleanupLogRec == NULL) {
-		status = -ENOMEM;
+		LOG_ERROR_STATUS (status = -ENOMEM);
 		goto leave;
 	}
 
@@ -758,12 +788,12 @@ int ocfs_free_file_extents (ocfs_super *
 
 	if (fe->local_ext) {
 		for (i = 0; i < fe->next_free_ext; i++) {
-			numBitsAllocated = (ub4) (fe->extents[i].num_bytes /
+			numBitsAllocated = (__u32) (fe->extents[i].num_bytes /
 						  (osb->vol_layout.
 						   cluster_size));
 
 			bitmapOffset =
-			    (ub4) ((fe->extents[i].disk_off -
+			    (__u32) ((fe->extents[i].disk_off -
 				    osb->vol_layout.data_start_off) /
 				   (osb->vol_layout.cluster_size));
 
@@ -781,169 +811,31 @@ int ocfs_free_file_extents (ocfs_super *
 			(pCleanupLogRec->rec.free.num_free_upds)++;
 		}
 	} else {
-		ub8 diskOffset = 0;
-
-		size = OCFS_ALIGN (sizeof (ocfs_extent_group), PAGE_SIZE);
+		size = OCFS_ALIGN (sizeof (ocfs_extent_group), osb->sect_size);
 
 		PAllocExtent = ocfs_malloc (size);
 		if (PAllocExtent == NULL) {
-			status = -ENOMEM;
-			LOG_ERROR_STATUS (status);
+			LOG_ERROR_STATUS (status = -ENOMEM);
 			goto leave;
 		}
 
 		memset (PAllocExtent, 0, size);
 
-		diskOffset = fe->last_ext_ptr;
-
-		while (diskOffset != 0) {
-			status =
-			    ocfs_read_metadata (osb, PAllocExtent,
-					      (ub4) osb->sect_size, diskOffset);
+		for (i = 0; i < fe->next_free_ext; i++) {
+			status = ocfs_read_extent (osb, PAllocExtent,
+						   fe->extents[i].disk_off,
+						   (fe->granularity ?
+						    EXTENT_HEADER : EXTENT_DATA));
 			if (status < 0) {
 				LOG_ERROR_STATUS (status);
 				goto leave;
 			}
 
-			if ((PAllocExtent->type != OCFS_EXTENT_DATA) &&
-			    (PAllocExtent->type != OCFS_EXTENT_HEADER)) {
-				LOG_ERROR_STATUS(status = -EFAIL);
+			status = ocfs_kill_this_tree(osb, PAllocExtent, pCleanupLogRec);
+			if (status < 0) {
+				LOG_ERROR_STATUS(status);
 				goto leave;
 			}
-
-			if (PAllocExtent->type == OCFS_EXTENT_DATA) {
-
-				if (!IS_VALID_EXTENT_DATA (PAllocExtent)) {
-					LOG_ERROR_STATUS(status = -EFAIL);
-					goto leave;
-				}
-
-				for (i = 0; i < PAllocExtent->next_free_ext;
-				     i++) {
-					numBitsAllocated =
-					    (ub4) (PAllocExtent->extents[i].
-						   num_bytes /
-						   (osb->vol_layout.
-						    cluster_size));
-					bitmapOffset =
-					    (ub4) ((PAllocExtent->extents[i].
-						    disk_off -
-						    osb->vol_layout.
-						    data_start_off) /
-						   (osb->vol_layout.
-						    cluster_size));
-
-					numUpdt =
-					    pCleanupLogRec->rec.free.
-					    num_free_upds;
-					if (numUpdt >= FREE_LOG_SIZE) {
-						status = ocfs_write_node_log (osb,
-									   (ocfs_log_record
-									    *)
-									   pCleanupLogRec,
-									   LogNodeNum,
-									   LOG_CLEANUP);
-						if (status < 0) {
-							LOG_ERROR_STATUS
-							    (status);
-							goto leave;
-						}
-						numUpdt =
-						    pCleanupLogRec->rec.free.
-						    num_free_upds = 0;
-					}
-
-					pCleanupLogRec->rec.free.
-					    free_bitmap[numUpdt].length =
-					    numBitsAllocated;
-					pCleanupLogRec->rec.free.
-					    free_bitmap[numUpdt].file_off =
-					    bitmapOffset;
-					pCleanupLogRec->rec.free.
-					    free_bitmap[numUpdt].type =
-					    DISK_ALLOC_VOLUME;
-					pCleanupLogRec->rec.free.
-					    free_bitmap[numUpdt].node_num = -1;
-					(pCleanupLogRec->rec.free.
-					 num_free_upds)++;
-				}
-
-				if (numUpdt >= FREE_LOG_SIZE) {
-					status = ocfs_write_node_log (osb,
-								   (ocfs_log_record
-								    *)
-								   pCleanupLogRec,
-								   LogNodeNum,
-								   LOG_CLEANUP);
-					if (status < 0) {
-						LOG_ERROR_STATUS (status);
-						goto leave;
-					}
-					numUpdt =
-					    pCleanupLogRec->rec.free.
-					    num_free_upds = 0;
-				}
-
-				pCleanupLogRec->rec.free.free_bitmap[numUpdt].
-				    length = 1;
-				pCleanupLogRec->rec.free.free_bitmap[numUpdt].
-				    file_off = PAllocExtent->alloc_file_off;
-				pCleanupLogRec->rec.free.free_bitmap[numUpdt].
-				    type = DISK_ALLOC_EXTENT_NODE;
-				pCleanupLogRec->rec.free.free_bitmap[numUpdt].
-				    node_num = PAllocExtent->alloc_node;
-				(pCleanupLogRec->rec.free.num_free_upds)++;
-
-				if (PAllocExtent->alloc_file_off == 0) {
-					LOG_ERROR_ARGS
-					    ("File offset was 0 for file %s "
-					     "type DISK_ALLOC_EXTENT_NODE blk 200\n",
-					     fe->filename);
-				}
-			} else {
-				OCFS_ASSERT (PAllocExtent->type ==
-					     OCFS_EXTENT_HEADER);
-
-				if (!IS_VALID_EXTENT_HEADER (PAllocExtent)) {
-					LOG_ERROR_STATUS(status = -EFAIL);
-					goto leave;
-				}
-
-				numUpdt =
-				    pCleanupLogRec->rec.free.num_free_upds;
-				if (numUpdt >= FREE_LOG_SIZE) {
-					status = ocfs_write_node_log (osb,
-								   (ocfs_log_record
-								    *)
-								   pCleanupLogRec,
-								   LogNodeNum,
-								   LOG_CLEANUP);
-					if (status < 0) {
-						LOG_ERROR_STATUS (status);
-						goto leave;
-					}
-					numUpdt =
-					    pCleanupLogRec->rec.free.
-					    num_free_upds = 0;
-				}
-
-				pCleanupLogRec->rec.free.free_bitmap[numUpdt].
-				    length = 1;
-
-				if (PAllocExtent->alloc_file_off == 0) {
-					OCFS_BREAKPOINT ();
-				}
-
-				pCleanupLogRec->rec.free.free_bitmap[numUpdt].
-				    file_off = PAllocExtent->alloc_file_off;
-				pCleanupLogRec->rec.free.free_bitmap[numUpdt].
-				    type = DISK_ALLOC_EXTENT_NODE;
-				pCleanupLogRec->rec.free.free_bitmap[numUpdt].
-				    node_num = PAllocExtent->alloc_node;
-				(pCleanupLogRec->rec.free.num_free_upds)++;
-			}
-
-			diskOffset = PAllocExtent->last_ext_ptr;
 		}
 	}
 
@@ -966,7 +858,7 @@ int ocfs_free_file_extents (ocfs_super *
 	return status;
 }				/* ocfs_free_file_extents */
 
-#if !defined(DEBUGOCFS)
+#if !defined(USERSPACE_TOOL)
 /*
  * ocfs_write_map_file()
  *
@@ -974,31 +866,31 @@ int ocfs_free_file_extents (ocfs_super *
 int ocfs_write_map_file (ocfs_super * osb)
 {
 	int status;
-	ub4 RunsInMap;
-	ub4 MapIndex;
-	ub4 length;
+	__u32 RunsInMap;
+	__u32 MapIndex;
+	__u32 length;
 	ocfs_offset_map *pMapBuffer = NULL;
-	ub8 fileSize;
-	ub8 allocSize;
-	ub8 neededSize;
-	sb8 foundVolOffset;
-	sb8 foundlogOffset;
-	ub4 numRec;
+	__u64 fileSize;
+	__u64 allocSize;
+	__u64 neededSize;
+	__s64 foundVolOffset;
+	__s64 foundlogOffset;
+	__u32 numRec;
 	ocfs_file_entry *fe = NULL;
 
 	LOG_ENTRY ();
 
 	RunsInMap = ocfs_extent_map_get_count (&osb->trans_map);
 
-	LOG_TRACE_ARGS ("NumRuns in trans_map (%u)\n", RunsInMap);
+	LOG_TRACE_ARGS ("NumRuns in trans_map=%u\n", RunsInMap);
 
 	if (RunsInMap == 0) {
-		status = -EFAIL;
+		status = -EFAIL; /* valid error */
 		goto leave;
 	}
 
 	neededSize =
-	    OCFS_ALIGN ((RunsInMap * sizeof (ocfs_offset_map)), PAGE_SIZE);
+	    OCFS_ALIGN ((RunsInMap * sizeof (ocfs_offset_map)), osb->sect_size);
 
 	status = ocfs_get_system_file_size (osb,
 				    (OCFS_FILE_VOL_META_DATA + osb->node_num),
@@ -1009,10 +901,16 @@ int ocfs_write_map_file (ocfs_super * os
 	}
 
 	if (allocSize < neededSize) {
-		LOG_TRACE_STR ("allocSize < neededSize");
-		ocfs_extend_system_file (osb,
+		LOG_TRACE_ARGS ("allocSize(%u.%u) < neededSize(%u.%u)",
+				HI(allocSize), LO(allocSize), HI(neededSize),
+				LO(neededSize));
+		status = ocfs_extend_system_file (osb,
 				  (OCFS_FILE_VOL_META_DATA + osb->node_num),
 				  neededSize, NULL);
+		if (status < 0) {
+			LOG_ERROR_STATUS (status);
+			goto leave;
+		}
 	}
 
 	pMapBuffer = ocfs_malloc (neededSize);
@@ -1046,13 +944,16 @@ int ocfs_write_map_file (ocfs_super * os
 	}
 
 	if (!IS_VALID_FILE_ENTRY (fe)) {
-		LOG_ERROR_STR ("Invalid File Entry");
-		status = -EINVAL;
+		LOG_ERROR_STATUS (status = -EINVAL);
 		goto leave;
 	}
 
-	ocfs_write_force_disk (osb, (void *) pMapBuffer, neededSize,
-			    osb->log_meta_disk_off);
+	status = ocfs_write_force_disk (osb, (void *) pMapBuffer, neededSize,
+					osb->log_meta_disk_off);
+	if (status < 0) {
+		LOG_ERROR_STATUS (status);
+		goto leave;
+	}
 
 	fe->file_size = (numRec * sizeof (ocfs_offset_map));
 
@@ -1063,8 +964,7 @@ int ocfs_write_map_file (ocfs_super * os
 	}
 
       leave:
-	if (fe)
-		ocfs_release_file_entry (fe);
+	ocfs_release_file_entry (fe);
 
 	ocfs_safefree (pMapBuffer);
 
@@ -1072,4 +972,4 @@ int ocfs_write_map_file (ocfs_super * os
 	return status;
 }				/* ocfs_write_map_file */
 
-#endif				/* ! DEBUGOCFS */
+#endif				/* ! USERSPACE_TOOL */
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Common/ocfsgentrans.c linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Common/ocfsgentrans.c
--- linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Common/ocfsgentrans.c	2003-07-30 13:51:50.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Common/ocfsgentrans.c	2003-07-30 10:28:53.000000000 +0200
@@ -39,23 +39,23 @@
 int ocfs_free_disk_bitmap (ocfs_super * osb, ocfs_cleanup_record * log_rec)
 {
 	int status = 0;
-	ub4 num_upd;
-	ub4 i;
-	ub4 node_num;
+	__u32 num_upd;
+	__u32 i;
+	__u32 node_num;
 	ocfs_free_log **free_dir_node = NULL;
 	ocfs_free_log **free_ext_node = NULL;
 	ocfs_free_log *free_vol_bits = NULL;
 	ocfs_lock_res **dirnode_lockres = NULL;
 	ocfs_lock_res **extnode_lockres = NULL;
-	ocfs_lock_res *vol_lockres;
+	ocfs_lock_res *vol_lockres = NULL;
 	ocfs_free_log *tmp_log;
 	ocfs_free_log *free_log;
-	ub4 tmp_indx;
-	ub8 lock_id;
+	__u32 tmp_indx;
+	__u64 lock_id;
         ocfs_file_entry *fe = NULL;
         ocfs_bitmap_lock *bm_lock = NULL;
 
-	LOG_ENTRY_ARGS ("(0x%08x, 0x%08x)\n", osb, log_rec);
+	LOG_ENTRY_ARGS ("(0x%p, 0x%p)\n", osb, log_rec);
 
 #define ALLOC_BLOCK(ptr, len, err)				\
 	do {							\
@@ -152,12 +152,12 @@ int ocfs_free_disk_bitmap (ocfs_super * 
 
 	/* Get all locks */
 	if (free_vol_bits != NULL) {
-                fe = ocfs_allocate_file_entry();
-                if (!fe) {
-                        LOG_ERROR_STR ("could not allocate file entry");
-                        goto finally;
-                }
-                bm_lock = (ocfs_bitmap_lock *)fe;
+		fe = ocfs_allocate_file_entry();
+		if (!fe) {
+			LOG_ERROR_STATUS (status = -ENOMEM);
+			goto finally;
+		}
+		bm_lock = (ocfs_bitmap_lock *)fe;
 		status = ocfs_acquire_lock (osb, OCFS_BITMAP_LOCK_OFFSET,
 					    OCFS_DLM_EXCLUSIVE_LOCK,
 					    FLAG_FILE_CREATE, &vol_lockres, fe);
@@ -264,6 +264,14 @@ int ocfs_free_disk_bitmap (ocfs_super * 
 
       finally:
 	for (i = 0; i < OCFS_MAXIMUM_NODES; i++) {
+		if (free_dir_node[i])
+			ocfs_put_lockres (dirnode_lockres[i]);
+		if (free_ext_node[i])
+			ocfs_put_lockres (extnode_lockres[i]);
+	}
+	ocfs_put_lockres (vol_lockres);
+
+	for (i = 0; i < OCFS_MAXIMUM_NODES; i++) {
 		ocfs_safefree (free_dir_node[i]);
 		ocfs_safefree (free_ext_node[i]);
 	}
@@ -274,8 +282,7 @@ int ocfs_free_disk_bitmap (ocfs_super * 
 	ocfs_safefree (extnode_lockres);
 
 	ocfs_safefree (free_vol_bits);
-        if (fe)
-            ocfs_release_file_entry(fe);
+	ocfs_release_file_entry(fe);
 
 	LOG_EXIT_STATUS (status);
 	return status;
@@ -294,19 +301,19 @@ int ocfs_process_record (ocfs_super * os
 	ocfs_cleanup_record *clean_rec;
 	ocfs_file_entry *fe = NULL;
 	ocfs_dir_node *lock_node = NULL;
-	ub1 *read_buf = NULL;
-	ub4 node_num;
-	ub4 index;
+	__u8 *read_buf = NULL;
+	__u32 node_num;
+	__u32 index;
 	ocfs_extent_group *alloc_ext;
-	ub8 disk_off = 0;
-	ub4 num_upd;
-	ub4 i;
-	ub8 lock_id;
+	__u64 disk_off = 0;
+	__u32 num_upd;
+	__u32 i;
+	__u64 lock_id;
 	ocfs_lock_res *lock_res;
 	ocfs_lock_res **lock_res_array = NULL;
 	ocfs_lock_res *tmp_lockres;
 
-	LOG_ENTRY_ARGS ("(0x%08x, 0x%08x)\n", osb, buffer);
+	LOG_ENTRY_ARGS ("(0x%p, 0x%p)\n", osb, buffer);
 
 	log_rec = (ocfs_log_record *) buffer;
 	clean_rec = (ocfs_cleanup_record *) buffer;
@@ -462,7 +469,7 @@ int ocfs_process_record (ocfs_super * os
 		    disk_off = log_rec->rec.extent.disk_off;
 
 		    status = ocfs_write_disk (osb, read_buf,
-					      (ub4) osb->sect_size, disk_off);
+					      (__u32) osb->sect_size, disk_off);
 		    if (status < 0) {
 			    LOG_ERROR_STATUS (status);
 			    goto finally;
@@ -525,22 +532,7 @@ int ocfs_process_record (ocfs_super * os
 			    status = ocfs_lookup_sector_node (osb, lock_id,
 							      &lock_res);
 			    if (status >= 0) {
-				    /*
-				       ** We should not be doing anything with
-				       ** this resource. Can lock the resource
-				       ** but then we need to look at the
-				       ** locking hierarchy between hash and
-				       ** the resource mutex
-				     */
-
-				    if (lock_res->signature != 0x55AA) {
-					    LOG_ERROR_STATUS(status = -EFAIL);
-					    goto finally;
-				    }
-
-				    ocfs_hash_del (&(osb->root_sect_node),
-						   &(lock_res->sector_num),
-						   sizeof (ub8));
+				    ocfs_remove_sector_node (osb, lock_res);
 				    lock_res->sector_num =
 					clean_rec->rec.lock.lock_upd[i].new_off;
 				    lock_res_array[i] = lock_res;
@@ -563,6 +555,8 @@ int ocfs_process_record (ocfs_super * os
 				    }
 				    if (tmp_lockres)
 					    LOG_ERROR_STR ("This too can happen");
+				    else
+					    ocfs_put_lockres (lock_res);
 			    }
 		    }
 		    break;
@@ -588,20 +582,20 @@ int ocfs_process_record (ocfs_super * os
  *
  * called by: ocfs_commit_trans(), ocfs_abort_trans(), ocfs_recover_vol()
  */
-int ocfs_process_log (ocfs_super * osb, ub8 trans_id, ub4 node_num, ub4 * type)
+int ocfs_process_log (ocfs_super * osb, __u64 trans_id, __u32 node_num, __u32 * type)
 {
 	int status = 0;
-	ub8 file_size;
-	ub8 offset;
-	ub8 alloc_size;
-	ub4 log_type;
-	ub4 log_rec_size;
-	ub4 size;
-	ub4 log_file_id;
+	__u64 file_size;
+	__u64 offset;
+	__u64 alloc_size;
+	__u32 log_type;
+	__u32 log_rec_size;
+	__u32 size;
+	__u32 log_file_id;
 	ocfs_log_record *log_rec = NULL;
         bool use_prealloc = false;
 
-	LOG_ENTRY_ARGS ("(0x%08x, %u.%u, %u, 0x%08x)\n", osb, HI (trans_id),
+	LOG_ENTRY_ARGS ("(0x%p, %u.%u, %u, 0x%p)\n", osb, HI (trans_id),
 			LO (trans_id), node_num, type);
 
 	log_type = *type;
@@ -612,14 +606,14 @@ int ocfs_process_log (ocfs_super * osb, 
 	} else if (log_type == LOG_CLEANUP) {
 		log_file_id = (CLEANUP_FILE_BASE_ID + node_num);
 		log_rec_size = sizeof (ocfs_cleanup_record);
-		log_rec_size = (ub4) OCFS_ALIGN (log_rec_size, osb->sect_size);
+		log_rec_size = (__u32) OCFS_ALIGN (log_rec_size, osb->sect_size);
 	} else {
-		/* Shouldn't be happening */
+		LOG_ERROR_ARGS ("logtype=%u is invalid", log_type);
 		goto finally;
 	}
 
 	size = log_rec_size;
-	size = (ub4) OCFS_ALIGN (size, PAGE_SIZE);
+	size = (__u32) OCFS_ALIGN (size, PAGE_SIZE);
 
         /* try to use prealloc log record if available */
         ocfs_down_sem (&osb->osb_res, true);
@@ -715,7 +709,9 @@ int ocfs_process_log (ocfs_super * osb, 
  */
 int ocfs_start_trans (ocfs_super * osb)
 {
-	LOG_ENTRY_ARGS ("(0x%08x)\n", osb);
+	LOG_ENTRY_ARGS ("(0x%p)\n", osb);
+
+	down (&osb->trans_lock);
 
 	osb->curr_trans_id = osb->vol_node_map.largest_seq_num;
 
@@ -736,13 +732,13 @@ int ocfs_start_trans (ocfs_super * osb)
  *
  * called by: ocfs_create_modify_file(), ocfs_set_rename_information()
  */
-int ocfs_commit_trans (ocfs_super * osb, ub8 trans_id)
+int ocfs_commit_trans (ocfs_super * osb, __u64 trans_id)
 {
 	int status = 0;
-	ub8 offset = 0;
-	ub4 log_type;
+	__u64 offset = 0;
+	__u32 log_type;
 
-	LOG_ENTRY_ARGS ("(0x%08x, %u.%u)\n", osb, HI (trans_id), LO (trans_id));
+	LOG_ENTRY_ARGS ("(0x%p, %u.%u)\n", osb, HI (trans_id), LO (trans_id));
 
 	/* Log to the file for multiple transactions... */
 	status = ocfs_extend_system_file (osb,
@@ -771,6 +767,7 @@ int ocfs_commit_trans (ocfs_super * osb,
 
       finally:
 	osb->trans_in_progress = false;
+	up (&osb->trans_lock);
 
 	LOG_EXIT_STATUS (status);
 	return status;
@@ -782,13 +779,13 @@ int ocfs_commit_trans (ocfs_super * osb,
  *
  * called by: ocfs_create_modify_file(), ocfs_set_rename_information()
  */
-int ocfs_abort_trans (ocfs_super * osb, ub8 trans_id)
+int ocfs_abort_trans (ocfs_super * osb, __u64 trans_id)
 {
 	int status = 0;
-	ub8 offset = 0;
-	ub4 log_type;
+	__u64 offset = 0;
+	__u32 log_type;
 
-	LOG_ENTRY_ARGS ("(0x%08x, %u.%u)\n", osb, HI (trans_id), LO (trans_id));
+	LOG_ENTRY_ARGS ("(0x%p, %u.%u)\n", osb, HI (trans_id), LO (trans_id));
 
 	/* Read the log file and free up stf... */
 	log_type = LOG_RECOVER;
@@ -817,6 +814,7 @@ int ocfs_abort_trans (ocfs_super * osb, 
 
       finally:
 	osb->trans_in_progress = false;
+	up (&osb->trans_lock);
 
 	LOG_EXIT_STATUS (status);
 	return status;
@@ -831,13 +829,13 @@ int ocfs_abort_trans (ocfs_super * osb, 
  * NOTE: This function is very similar to ocfs_disk_reset_voting().
  * This function should replace the other one.
  */
-int ocfs_reset_publish (ocfs_super * osb, ub8 node_num)
+int ocfs_reset_publish (ocfs_super * osb, __u64 node_num)
 {
 	int status = 0;
 	ocfs_publish *publish = NULL;
-	ub8 node_publ_off;
+	__u64 node_publ_off;
 
-	LOG_ENTRY_ARGS ("(0x%08x, %u.%u)\n", osb, HI (node_num), LO (node_num));
+	LOG_ENTRY_ARGS ("(0x%p, %u.%u)\n", osb, HI (node_num), LO (node_num));
 
 	/* Read the publish sector */
 	node_publ_off = osb->vol_layout.publ_sect_off +
@@ -849,7 +847,7 @@ int ocfs_reset_publish (ocfs_super * osb
 		goto finally;
 	}
 
-	publish->dirty = 0;
+	publish->dirty = false;
 	publish->vote = 0;
 	publish->vote_type = 0;
 
@@ -873,39 +871,37 @@ int ocfs_reset_publish (ocfs_super * osb
  * called by: ocfs_process_record(), ocfs_disk_request_vote(),
  *            ocfs_acquire_lock(), ocfs_check_volume(), ocfs_nm_thread()
  */
-int ocfs_recover_vol (ocfs_super * osb, ub8 node_num)
+int ocfs_recover_vol (ocfs_super * osb, __u64 node_num)
 {
 	int status = 0;
 	int tmpstat;
 	bool recovery_lock = false;
 	bool lock_acq = false;
-	ub8 lock_id = 0;
-	ub8 file_size = 0;
-	ub8 alloc_size = 0;
+	__u64 lock_id = 0;
+	__u64 file_size = 0;
+	__u64 alloc_size = 0;
 	ocfs_lock_res *lock_res = NULL;
 	ocfs_log_record *log_rec = NULL;
-	ub4 size;
-	ub4 log_type;
-	ub8 trans_id = 0;
-	ub8 cleanup_file_size = 0;
-	ub4 file_id;
+	__u32 size;
+	__u32 log_type;
+	__u64 trans_id = 0;
+	__u64 cleanup_file_size = 0;
+	__u32 file_id;
 	ocfs_file_entry *fe = NULL;
 
-	LOG_ENTRY_ARGS ("(0x%08x, %u.%u)\n", osb, HI (node_num), LO (node_num));
+	LOG_ENTRY_ARGS ("(0x%p, %u.%u)\n", osb, HI (node_num), LO (node_num));
 
-	fe = ocfs_allocate_file_entry();
+	fe = ocfs_allocate_file_entry ();
 	if (fe == NULL) {
-		status = -ENOMEM;
+		LOG_ERROR_STATUS (status = -ENOMEM);
 		goto finally;
 	}
-		
-	if ((node_num < 0) || (node_num > OCFS_MAXIMUM_NODES)) {
+
+	if (!IS_VALID_NODE_NUM(node_num)) {
 		LOG_ERROR_STATUS (status = -EINVAL);
 		goto finally;
 	}
 
-	LOG_TRACE_ARGS ("Called for node %u.%u\n", HI (node_num), LO (node_num));
-
 	/* Grab the local recovery resource to ensure no other thread comes */
 	/* in from this node for recovery */
 	ocfs_down_sem (&(osb->recovery_lock), true);
@@ -922,7 +918,7 @@ int ocfs_recover_vol (ocfs_super * osb, 
 		goto finally;
 	}
 
-	file_id = (ub4) (LOG_FILE_BASE_ID + node_num);
+	file_id = (__u32) (LOG_FILE_BASE_ID + node_num);
 
 	/* Read in the the recovery log */
 	status = ocfs_get_system_file_size (osb, file_id, &file_size,
@@ -932,7 +928,7 @@ int ocfs_recover_vol (ocfs_super * osb, 
 		goto finally;
 	}
 
-	file_id = (ub4) (CLEANUP_FILE_BASE_ID + node_num);
+	file_id = (__u32) (CLEANUP_FILE_BASE_ID + node_num);
 	status = ocfs_get_system_file_size (osb, file_id, &cleanup_file_size,
 					    &alloc_size);
 	if (status < 0) {
@@ -980,7 +976,7 @@ int ocfs_recover_vol (ocfs_super * osb, 
 		 */
 		size = max(sizeof (ocfs_log_record),
 			   sizeof (ocfs_cleanup_record));
-		size = (ub4) OCFS_ALIGN (size, PAGE_SIZE);
+		size = (__u32) OCFS_ALIGN (size, PAGE_SIZE);
 
 		if ((log_rec = ocfs_malloc (size)) == NULL) {
 			LOG_ERROR_STATUS (status = -ENOMEM);
@@ -1047,11 +1043,10 @@ int ocfs_recover_vol (ocfs_super * osb, 
 					     OCFS_DLM_EXCLUSIVE_LOCK,
 					     FLAG_FILE_CREATE, lock_res, fe);
 		if (tmpstat < 0)
-			status = tmpstat;
+			LOG_ERROR_STATUS (tmpstat);
 	}
-	if (fe)
-		ocfs_release_file_entry(fe);
-
+	ocfs_release_file_entry (fe);
+	ocfs_put_lockres (lock_res);
 	LOG_EXIT_STATUS (status);
 	return (status);
 }				/* ocfs_recover_vol */
@@ -1061,29 +1056,29 @@ int ocfs_recover_vol (ocfs_super * osb, 
  *
  * called by: ocfs_recover_vol(), ocfs_del_file(), ocfs_alloc_node_block()
  */
-int ocfs_write_log (ocfs_super * osb, ocfs_log_record * log_rec, ub4 type)
+int ocfs_write_log (ocfs_super * osb, ocfs_log_record * log_rec, __u32 type)
 {
 	int status = 0;
 	int tmpstat;
-	sb4 log_file_id = -1;
-	ub8 lock_id = 0;
-	ub8 file_size = 0;
-	ub8 offset = 0;
-	ub8 log_rec_size = 0;
-	ub8 alloc_size = 0;
-	ocfs_lock_res *lock_res;
+	__s32 log_file_id = -1;
+	__u64 lock_id = 0;
+	__u64 file_size = 0;
+	__u64 offset = 0;
+	__u64 log_rec_size = 0;
+	__u64 alloc_size = 0;
+	ocfs_lock_res *lock_res = NULL;
 	bool log_lock = false;
 	bool lock_acq = false;
 	ocfs_file_entry *fe = NULL;
 
-	LOG_ENTRY_ARGS ("(0x%08x, 0x%08x, %u)\n", osb, log_rec, type);
+	LOG_ENTRY_ARGS ("(0x%p, 0x%p, %u)\n", osb, log_rec, type);
 
-	fe = ocfs_allocate_file_entry();
- 	if (fe == NULL) {
-		status = -ENOMEM;
+	fe = ocfs_allocate_file_entry ();
+	if (!fe) {
+		LOG_ERROR_STATUS (status = -ENOMEM);
 		goto finally;
 	}
-	
+
 	/* Get the log lock */
 	ocfs_down_sem (&(osb->log_lock), true);
 	log_lock = true;
@@ -1096,7 +1091,7 @@ int ocfs_write_log (ocfs_super * osb, oc
 		log_rec_size = sizeof (ocfs_cleanup_record);
 		log_rec_size = OCFS_ALIGN (log_rec_size, osb->sect_size);
 	} else {
-		/* Shouldn't be happening */
+		LOG_ERROR_ARGS ("logtype=%u is invalid", type);
 		goto finally;
 	}
 
@@ -1153,11 +1148,10 @@ int ocfs_write_log (ocfs_super * osb, oc
 					     OCFS_DLM_EXCLUSIVE_LOCK,
 					     FLAG_FILE_CREATE, lock_res, fe);
 		if (tmpstat < 0)
-			status = tmpstat;
+			LOG_ERROR_STATUS (tmpstat);
 	}
-	if (fe)
-		ocfs_release_file_entry(fe);
-
+	ocfs_release_file_entry (fe);
+	ocfs_put_lockres (lock_res);
 	LOG_EXIT_STATUS (status);
 	return status;
 }				/* ocfs_write_log */
@@ -1170,29 +1164,30 @@ int ocfs_write_log (ocfs_super * osb, oc
  *            ocfs_insert_dir_node(), ocfs_free_file_extents()
  */
 int ocfs_write_node_log (ocfs_super * osb, ocfs_log_record * log_rec,
-			 ub4 node_num, ub4 type)
+			 __u32 node_num, __u32 type)
 {
 	int status = 0;
 	int tmpstat;
-	sb4 log_file_id = -1;
-	ub8 lock_id = 0;
-	ub8 file_size = 0;
-	ub8 offset = 0;
-	ub8 log_rec_size = 0;
-	ub8 alloc_size = 0;
-	ocfs_lock_res *lock_res;
+	__s32 log_file_id = -1;
+	__u64 lock_id = 0;
+	__u64 file_size = 0;
+	__u64 offset = 0;
+	__u64 log_rec_size = 0;
+	__u64 alloc_size = 0;
+	ocfs_lock_res *lock_res = NULL;
 	bool log_lock = false;
 	bool lock_acq = false;
 	ocfs_file_entry *fe = NULL;
 
-	LOG_ENTRY_ARGS ("(0x%08x, 0x%08x, %u, %u)\n", osb, log_rec, node_num,
+	LOG_ENTRY_ARGS ("(0x%p, 0x%p, %u, %u)\n", osb, log_rec, node_num,
 			type);
 
-	fe = ocfs_allocate_file_entry();
-	if (fe == NULL) {
-		status = -ENOMEM;
+	fe = ocfs_allocate_file_entry ();
+	if (!fe) {
+		LOG_ERROR_STATUS (status = -ENOMEM);
 		goto finally;
 	}
+
 	/* Get the log lock */
 	ocfs_down_sem (&(osb->log_lock), true);
 	log_lock = true;
@@ -1205,7 +1200,7 @@ int ocfs_write_node_log (ocfs_super * os
 		log_rec_size = sizeof (ocfs_cleanup_record);
 		log_rec_size = OCFS_ALIGN (log_rec_size, osb->sect_size);
 	} else {
-		/* Shouldn't be happening */
+		LOG_ERROR_ARGS ("logtype=%u is invalid", type);
 		goto finally;
 	}
 
@@ -1259,11 +1254,10 @@ int ocfs_write_node_log (ocfs_super * os
 		    ocfs_release_lock (osb, lock_id, OCFS_DLM_EXCLUSIVE_LOCK,
 				       FLAG_FILE_CREATE, lock_res, fe);
 		if (tmpstat < 0)
-			status = tmpstat;
+			LOG_ERROR_STATUS (tmpstat);
 	}
-	if (fe)
-		ocfs_release_file_entry(fe);
-
+	ocfs_release_file_entry (fe);
+	ocfs_put_lockres (lock_res);
 	LOG_EXIT_STATUS (status);
 	return status;
 }				/* ocfs_write_node_log */
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Common/ocfsgenutil.c linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Common/ocfsgenutil.c
--- linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Common/ocfsgenutil.c	2003-07-30 13:51:50.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Common/ocfsgenutil.c	2003-07-30 10:28:53.000000000 +0200
@@ -29,6 +29,10 @@
 /* Tracing */
 #define OCFS_DEBUG_CONTEXT     OCFS_DEBUG_CONTEXT_UTIL
 
+/*
+ * ocfs_compare_qstr()
+ *
+ */
 int ocfs_compare_qstr (struct qstr * s1, struct qstr * s2)
 {
         int s = strncmp ((const char *) s1->name, (const char *) s2->name,
@@ -42,18 +46,4 @@ int ocfs_compare_qstr (struct qstr * s1,
                 return -1;
         else
                 return s;
-}                             /* ocfs_compare_qstr */
-
-char *ocfs_strerror(int errno)
-{
-      int i;
-      if (errno==0)
-              return "OK";
-
-      for (i=0; i<ocfs_num_err; i++) {
-              if (errno == ocfs_error_strings[i].errno)
-                      return ocfs_error_strings[i].str;
-      }
-      return "Unknown error";
-}
-
+}				/* ocfs_compare_qstr */
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Common/ocfsgenvolcfg.c linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Common/ocfsgenvolcfg.c
--- linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Common/ocfsgenvolcfg.c	2003-07-30 13:51:50.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Common/ocfsgenvolcfg.c	2003-07-30 10:28:53.000000000 +0200
@@ -37,11 +37,11 @@
  */
 void ocfs_worker (void *Arg)
 {
-	ub4 length;
+	__u32 length;
 	char *buffer;
 	int status;
 	ocfs_super *osb;
-	ub8 offset;
+	__u64 offset;
 	ocfs_cfg_task *cfg_task;
 
 	LOG_ENTRY ();
@@ -79,7 +79,7 @@ void ocfs_worker (void *Arg)
  *
  * Routine called by a timer to reiterate the disk lock.
  */
-void ocfs_assert_lock_owned (ub4 Arg)
+void ocfs_assert_lock_owned (unsigned long Arg)
 {
 	ocfs_cfg_task *cfg_task;
 
@@ -101,17 +101,17 @@ void ocfs_assert_lock_owned (ub4 Arg)
  * ocfs_add_to_disk_config()
  *
  */
-int ocfs_add_to_disk_config (ocfs_super * osb, ub4 pref_node_num,
+int ocfs_add_to_disk_config (ocfs_super * osb, __u32 pref_node_num,
 			     ocfs_disk_node_config_info * new_disk_node)
 {
 	int status = 0;
-	ub8 offset;
+	__u64 offset;
 	ocfs_disk_node_config_info *disk_node = NULL;
-	ub1 *buffer = NULL;
-	ub1 *p;
-	ub4 node_num;
-	ub4 sect_size;
-	ub4 size;
+	__u8 *buffer = NULL;
+	__u8 *p;
+	__u32 node_num;
+	__u32 sect_size;
+	__u32 size;
 
 	LOG_ENTRY ();
 
@@ -191,8 +191,8 @@ int ocfs_write_volcfg_header (ocfs_super
 {
 	int status = 0;
 	ocfs_node_config_hdr *hdr;
-	ub1 *buffer = NULL;
-	ub8 offset;
+	__u8 *buffer = NULL;
+	__u64 offset;
 
 	LOG_ENTRY ();
 
@@ -256,8 +256,8 @@ int ocfs_write_volcfg_header (ocfs_super
  *
  * Returns 0 if success, < 0 if error.
  */
-int ocfs_config_with_disk_lock (ocfs_super * osb, ub8 LockOffset, ub1 * Buffer,
-				ub4 node_num, ocfs_volcfg_op op)
+int ocfs_config_with_disk_lock (ocfs_super * osb, __u64 LockOffset, __u8 * Buffer,
+				__u32 node_num, ocfs_volcfg_op op)
 {
 	int status = 0;
 	char *rd_buf = NULL;
@@ -266,8 +266,8 @@ int ocfs_config_with_disk_lock (ocfs_sup
 	bool BreakLock = false;
 	ocfs_disk_lock *DiskLock;
 	ocfs_cfg_task *cfg_task = NULL;
-	ub4 sect_size;
-	ub8 lock_node_num = OCFS_INVALID_NODE_NUM;
+	__u32 sect_size;
+	__u64 lock_node_num = OCFS_INVALID_NODE_NUM;
 
 	LOG_ENTRY ();
 
@@ -302,7 +302,7 @@ int ocfs_config_with_disk_lock (ocfs_sup
 	init_timer(&osb->lock_timer);
 	osb->lock_timer.function = ocfs_assert_lock_owned;
 	osb->lock_timer.expires = 0;
-	osb->lock_timer.data = (ub4) cfg_task;
+	osb->lock_timer.data = (unsigned long) cfg_task;
 
 	init_waitqueue_head (&osb->lock_event);
 	atomic_set (&osb->lock_event_woken, 0);
@@ -409,11 +409,11 @@ int ocfs_config_with_disk_lock (ocfs_sup
  *
  * Returns 0 if success, < 0 if error.
  */
-int ocfs_release_disk_lock (ocfs_super * osb, ub8 LockOffset)
+int ocfs_release_disk_lock (ocfs_super * osb, __u64 LockOffset)
 {
 	int status = 0;
-	sb1 *buffer = NULL;
-	ub4 sect_size = osb->sect_size;
+	__s8 *buffer = NULL;
+	__u32 sect_size = osb->sect_size;
 
 	LOG_ENTRY ();
 
@@ -456,8 +456,8 @@ int ocfs_add_node_to_config (ocfs_super 
 	int status = 0;
 	ocfs_disk_node_config_info *disk;
 	void *buffer = NULL;
-	ub8 offset;
-	ub4 sect_size = osb->sect_size;
+	__u64 offset;
+	__u32 sect_size = osb->sect_size;
 
 	LOG_ENTRY ();
 
@@ -475,7 +475,7 @@ int ocfs_add_node_to_config (ocfs_super 
 
 	/* Write this nodes config onto disk */
 	offset = osb->vol_layout.new_cfg_off;
-	status = ocfs_config_with_disk_lock (osb, offset, (ub1 *) disk,
+	status = ocfs_config_with_disk_lock (osb, offset, (__u8 *) disk,
 					     OcfsGlobalCtxt.pref_node_num,
 					     OCFS_VOLCFG_ADD);
 	if (status < 0) {
@@ -536,11 +536,11 @@ int ocfs_disknode_to_node (ocfs_node_con
  * ocfs_update_disk_config()
  *
  */
-int ocfs_update_disk_config (ocfs_super * osb, ub4 node_num,
+int ocfs_update_disk_config (ocfs_super * osb, __u32 node_num,
 			     ocfs_disk_node_config_info * disk)
 {
 	int status = 0;
-	ub8 offset;
+	__u64 offset;
 
 	LOG_ENTRY ();
 
@@ -635,11 +635,11 @@ int ocfs_chk_update_config (ocfs_super *
 	int status = 0;
 	ocfs_node_config_hdr *hdr = NULL;
 	ocfs_disk_node_config_info *disk = NULL;
-	ub1 *buffer = NULL;
-	ub8 offset;
-	sb4 i;
-	ub4 sect_size = osb->sect_size;
-	ub1 *p;
+	__u8 *buffer = NULL;
+	__u64 offset;
+	__s32 i;
+	__u32 sect_size = osb->sect_size;
+	__u8 *p;
 
 	LOG_ENTRY ();
 
@@ -666,7 +666,7 @@ int ocfs_chk_update_config (ocfs_super *
 	if  (hdr->version < NODE_MIN_SUPPORTED_VER ||
 	     hdr->version > NODE_CONFIG_VER) {
 		LOG_ERROR_ARGS ("Node config version mismatch, (%d) < minimum" \
-			        " (%d) or > current (%d)\n", hdr->version,
+			        " (%d) or > current (%d)", hdr->version,
 			        NODE_MIN_SUPPORTED_VER, NODE_CONFIG_VER);
 		status = -EINVAL;
 		goto finally;
@@ -843,8 +843,8 @@ int ocfs_refresh_node_config (ocfs_super
 {
 	ocfs_node_config_info *node;
 	ocfs_disk_node_config_info *disk;
-	ub8 offset;
-	ub1 *buffer = NULL;
+	__u64 offset;
+	__u8 *buffer = NULL;
 	int status = 0;
 
 	LOG_ENTRY ();
@@ -867,7 +867,7 @@ int ocfs_refresh_node_config (ocfs_super
 
 	/* Update the nodecfg on disk with the new info */
 	offset = osb->vol_layout.new_cfg_off;
-	status = ocfs_config_with_disk_lock (osb, offset, (ub1 *) disk,
+	status = ocfs_config_with_disk_lock (osb, offset, (__u8 *) disk,
 					     osb->node_num, OCFS_VOLCFG_UPD);
 	if (status < 0) {
 		LOG_ERROR_STATUS (status);
@@ -887,7 +887,7 @@ int ocfs_refresh_node_config (ocfs_super
 void ocfs_show_all_node_cfgs (ocfs_super * osb)
 {
 	ocfs_node_config_info *node;
-	ub4 i;
+	__u32 i;
 
 	for (i = 0; i < OCFS_MAXIMUM_NODES; i++) {
 		node = osb->node_cfg_info[i];
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Common/ocfsgenvote.c linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Common/ocfsgenvote.c
--- linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Common/ocfsgenvote.c	2003-07-30 13:51:50.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Common/ocfsgenvote.c	2003-07-30 10:28:53.000000000 +0200
@@ -34,34 +34,43 @@
  *
  */
 int ocfs_send_vote_reply (ocfs_super * osb, ocfs_dlm_msg * dlm_msg,
-			  ub4 vote_status, bool inode_open)
+			  __u32 vote_status, bool inode_open)
 {
-#define MSGLEN	(sizeof (ocfs_dlm_msg) - 1 + sizeof (ocfs_dlm_reply_master))
-	ub4 msg_len = MSGLEN;
 	ocfs_dlm_req_master *req_master;
 	ocfs_dlm_reply_master *reply_master;
 	ocfs_dlm_msg *send_dlm_msg;
-	ub8 vote_map;
+	__u64 vote_map;
 	int status = 0;
-        ub1 buf[MSGLEN];
-#undef MSGLEN
+	__u8 *buf = NULL;
+	__u32 msg_len;
 
 	LOG_ENTRY ();
 
+	msg_len = sizeof (ocfs_dlm_msg) - 1 + sizeof (ocfs_dlm_reply_master);
+
+	buf = ocfs_malloc (msg_len);
+	if (buf == NULL) {
+		LOG_ERROR_STATUS (status = -ENOMEM);
+		goto finally;
+	}
+
 	req_master = (ocfs_dlm_req_master *) dlm_msg->msg_buf;
 
 	send_dlm_msg = (ocfs_dlm_msg *)buf;
 	ocfs_init_dlm_msg (osb, send_dlm_msg, msg_len);
-	send_dlm_msg->msg_type = OCFS_REPLY_MAKE_MASTER;
+	send_dlm_msg->msg_type = OCFS_VOTE_REPLY;
 
 	reply_master = (ocfs_dlm_reply_master *) send_dlm_msg->msg_buf;
 	reply_master->h.lock_id = req_master->lock_id;
 	reply_master->status = vote_status;
 	reply_master->h.lock_seq_num = req_master->lock_seq_num;
+	reply_master->h.open_handle = inode_open;
 
 	vote_map = (1 << dlm_msg->src_node);
 	ocfs_send_bcast (osb, vote_map, send_dlm_msg);
 
+      finally:
+	ocfs_safefree (buf);
 	LOG_EXIT_STATUS (status);
 	return status;
 }				/* ocfs_send_vote_reply */
@@ -74,18 +83,20 @@ int ocfs_comm_vote_for_del_ren (ocfs_sup
 				ocfs_dlm_msg * dlm_msg)
 {
 	int status = 0;
+	int tmpstat = 0;
 	ocfs_dlm_req_master *req_master;
-	ub4 node_num;
-	ub4 flags;
-	ub4 retry_cnt = 0;
+	__u32 node_num;
+	__u32 flags;
+	__u32 retry_cnt = 0;
 	bool acq_oin = false;
 	ocfs_file_entry *fe = NULL;
+	ocfs_inode *oin = NULL;
 	ocfs_sem *oin_sem = NULL;
-        struct dentry *dentry;
-        struct list_head *iter;
-        struct inode *inode;
-        int refcount;
-
+	struct dentry *dentry;
+	struct list_head *iter;
+	struct list_head *temp_iter;
+	struct inode *inode;
+	int refcount;
 
 	LOG_ENTRY ();
 
@@ -94,21 +105,21 @@ int ocfs_comm_vote_for_del_ren (ocfs_sup
 	flags = req_master->flags;
 	node_num = dlm_msg->src_node;
 
-	if ((*lockres)->oin) {
-		UPDATE_OIN ((*lockres)->oin);
+	oin = (*lockres)->oin;
+	if (oin) {
+		ocfs_down_sem (&oin->main_res, true);
+		oin->needs_verification = true;
+		tmpstat = ocfs_verify_update_oin(osb, oin);
+		if (tmpstat < 0)
+			LOG_ERROR_STATUS (tmpstat);
+		ocfs_up_sem (&oin->main_res);
 	}
 
-	LOG_TRACE_ARGS ("Vote for del ren for node (%u) for lock 0x%08x.0x%08x "
-			" and seq %u.%u\n", node_num, HI (req_master->lock_id),
-			LO (req_master->lock_id), HI (req_master->lock_seq_num),
-			LO (req_master->lock_seq_num));
+	LOG_TRACE_ARGS ("node=%u, lockid=%u.%u, seq=%u.%u\n", node_num,
+		HILO (req_master->lock_id), HILO (req_master->lock_seq_num));
 
 	/* Check for oin */
-	if ((*lockres)->oin != NULL) {
-		ocfs_inode *oin;
-
-		oin = (*lockres)->oin;
-
+	if (oin) {
 		oin_sem = &(oin->main_res);
 		ocfs_down_sem (oin_sem, true);
 		acq_oin = true;
@@ -129,14 +140,14 @@ int ocfs_comm_vote_for_del_ren (ocfs_sup
 			}
 		}
 
-                refcount = 0;
-                inode = (*lockres)->oin->inode;
-                list_for_each (iter, &(inode->i_dentry)) {
-                        dentry = list_entry (iter, struct dentry, d_alias);
-                        refcount += atomic_read(&dentry->d_count);
-                }
-        
-                if (refcount == 0 && (!(oin->oin_flags & OCFS_OIN_IN_USE))) {
+		refcount = 0;
+		inode = (*lockres)->oin->inode;
+		list_for_each_safe (iter, temp_iter, &(inode->i_dentry)) {
+				dentry = list_entry (iter, struct dentry, d_alias);
+				refcount += atomic_read(&dentry->d_count);
+		}
+
+		if (refcount == 0 && (!(oin->oin_flags & OCFS_OIN_IN_USE))) {
 			if (!(oin->oin_flags & OCFS_OIN_IN_TEARDOWN)) {
 				if (acq_oin) {
 					ocfs_up_sem (oin_sem);
@@ -149,24 +160,19 @@ int ocfs_comm_vote_for_del_ren (ocfs_sup
 				ocfs_release_oin (oin, true);
 				(*lockres) = NULL;
 			}
-			ocfs_send_vote_reply (osb, dlm_msg, OCFS_DLM_VOTE_OK, false);
+			LOG_TRACE_STR ("vote=FLAG_VOTE_NODE");
+			ocfs_send_vote_reply (osb, dlm_msg, FLAG_VOTE_NODE, false);
 			goto finito;
 		} else {
-			LOG_TRACE_ARGS ("Vote for del ren returned in use (%u) "
-				"for Lock 0x%08x.0x%08x and Seq %u.%u\n", node_num,
-				HI (req_master->lock_id), LO (req_master->lock_id),
-				HI (req_master->lock_seq_num), LO (req_master->lock_seq_num));
+			LOG_TRACE_STR ("vote=FLAG_VOTE_OIN_ALREADY_INUSE");
 			ocfs_send_vote_reply (osb, dlm_msg,
-					OCFS_DLM_VOTE_OIN_ALREADY_INUSE, false);
+					FLAG_VOTE_OIN_ALREADY_INUSE, false);
 			ocfs_release_lockres (*lockres);
 			goto finito;
 		}
 	} else {
-		LOG_TRACE_ARGS ("Vote for del ren voted to del/ren (%u) for lock "
-			"0x%08x.0x%08x and Seq %u.%u\n", node_num, HI (req_master->lock_id),
-			LO (req_master->lock_id), HI (req_master->lock_seq_num),
-			LO (req_master->lock_seq_num));
-		ocfs_send_vote_reply (osb, dlm_msg, OCFS_DLM_VOTE_OK, false);
+		LOG_TRACE_STR ("vote=FLAG_VOTE_NODE");
+		ocfs_send_vote_reply (osb, dlm_msg, FLAG_VOTE_NODE, false);
 		ocfs_release_lockres (*lockres);
 		goto finito;
 	}
@@ -189,7 +195,7 @@ int ocfs_comm_vote_for_del_ren (ocfs_sup
 		/* Change the master if there is no lock */
 		if (((*lockres)->master_node_num == osb->node_num) &&
 		    ((*lockres)->lock_state <= OCFS_DLM_SHARED_LOCK)) {
-			ub8 tmp = req_master->lock_id;
+			__u64 tmp = req_master->lock_id;
 
 			/* Change the lock ownership to the node asking for vote */
 			status = ocfs_get_file_entry (osb, &fe, req_master->lock_id);
@@ -211,13 +217,10 @@ int ocfs_comm_vote_for_del_ren (ocfs_sup
 	}
 
       finally:
-	if (fe)
-		ocfs_release_file_entry (fe);
+	ocfs_release_file_entry (fe);
 
-	if (acq_oin && oin_sem) {
+	if (acq_oin && oin_sem)
 		ocfs_up_sem (oin_sem);
-		acq_oin = false;
-	}
 
 	if ((*lockres))
 		ocfs_release_lockres (*lockres);
@@ -226,29 +229,12 @@ int ocfs_comm_vote_for_del_ren (ocfs_sup
 	return status;
 }				/* ocfs_comm_vote_for_del_ren */
 
-/*
- * ocfs_find_lockres()
- *
- */
-int ocfs_find_lockres (ocfs_super * osb, ub8 lock_id, ocfs_lock_res ** lockres)
-{
-	int status;
-
-	LOG_ENTRY ();
-
-	status = ocfs_lookup_sector_node (osb, lock_id, lockres);
-	if (status < 0)
-		*lockres = NULL;
-
-	LOG_EXIT_STATUS (status);
-	return status;
-}				/* ocfs_find_lockres */
 
 /*
  * ocfs_check_ipc_msg()
  *
  */
-bool ocfs_check_ipc_msg (ub1 * msg, ub4 msg_len)
+bool ocfs_check_ipc_msg (__u8 * msg, __u32 msg_len)
 {
 	bool bret = false;
 	ocfs_dlm_msg *dlm_msg;
@@ -258,25 +244,26 @@ bool ocfs_check_ipc_msg (ub1 * msg, ub4 
 	dlm_msg = (ocfs_dlm_msg *) msg;
 
 	if (dlm_msg == NULL) {
-		LOG_ERROR_STR("Invalid IPC message");
+		LOG_TRACE_STR("Null netdlm message");
 		goto bail;
 	}
 
 	if (msg_len < sizeof(ocfs_dlm_msg)) {
-		LOG_ERROR_STR("IPC message too short");
+		LOG_TRACE_STR("Netdlm message too short");
 		goto bail;
 	}
 
 	/* Compute and Compare the checksum */
 	if (dlm_msg->magic != OCFS_DLM_MSG_MAGIC) {
-		LOG_ERROR_ARGS ("Magic number mismatch: 0x%08x != 0x%08x\n",
+		LOG_TRACE_ARGS ("Magic number mismatch in netdlm message: "
+				"0x%08x != 0x%08x\n",
 				dlm_msg->magic, OCFS_DLM_MSG_MAGIC);
 		goto bail;
 	}
 
 	if ((dlm_msg->src_node < 0) ||
 	    (dlm_msg->src_node > OCFS_MAXIMUM_NODES)) {
-		LOG_ERROR_ARGS ("Source node was invalid: %d\n",
+		LOG_TRACE_ARGS ("Invalid source node in netdlm message: %d\n",
 				dlm_msg->src_node);
 		goto bail;
 	}
@@ -292,15 +279,16 @@ bool ocfs_check_ipc_msg (ub1 * msg, ub4 
  * ocfs_find_osb()
  *
  */
-void ocfs_find_osb (sb1 * volume_id, ocfs_super ** osb)
+void ocfs_find_osb (__s8 * volume_id, ocfs_super ** osb)
 {
 	struct list_head *iter_osb;
+	struct list_head *temp_iter;
 
 	LOG_ENTRY ();
 
 	ocfs_down_sem (&(OcfsGlobalCtxt.res), true);
 
-	list_for_each (iter_osb, &(OcfsGlobalCtxt.osb_next)) {
+	list_for_each_safe (iter_osb, temp_iter, &(OcfsGlobalCtxt.osb_next)) {
 		*osb = list_entry (iter_osb, ocfs_super, osb_next);
 		if (!memcmp ((*osb)->vol_layout.vol_id, volume_id,
 			     MAX_VOL_ID_LENGTH))
@@ -319,7 +307,7 @@ void ocfs_find_osb (sb1 * volume_id, ocf
  * ocfs_find_create_lockres()
  *
  */
-int ocfs_find_create_lockres (ocfs_super * osb, ub8 lock_id,
+int ocfs_find_create_lockres (ocfs_super * osb, __u64 lock_id,
 			      ocfs_lock_res ** lockres)
 {
 	int status = 0;
@@ -331,22 +319,24 @@ int ocfs_find_create_lockres (ocfs_super
 
 	status = ocfs_lookup_sector_node (osb, lock_id, lockres);
 	if (status < 0) {
-                *lockres = ocfs_allocate_lockres();
+		*lockres = ocfs_allocate_lockres();
 		if (!*lockres) {
 			LOG_ERROR_STATUS (status = -ENOMEM);
 			goto bail;
 		}
 
 		ocfs_init_lockres (osb, *lockres, lock_id);
-		OCFS_SET_FLAG ((*lockres)->lock_state, LOCK_STATE_INIT);
+		ocfs_get_lockres (*lockres);
+//		OCFS_SET_FLAG ((*lockres)->vote_state, LOCK_STATE_INIT);
 
 		status = ocfs_insert_sector_node (osb, *lockres, &tmp_lockres);
 		if (status < 0) {
 			LOG_ERROR_STATUS (status);
 			goto bail;
 		}
+
 		if (tmp_lockres) {
-			ocfs_free_lockres (*lockres);
+			ocfs_put_lockres (*lockres);
 			*lockres = tmp_lockres;
 		}
 	}
@@ -363,16 +353,15 @@ int ocfs_find_create_lockres (ocfs_super
 int ocfs_comm_process_vote (ocfs_super * osb, ocfs_dlm_msg * dlm_msg)
 {
 	int status = 0;
+	int tmpstat = 0;
 	ocfs_lock_res *lockres = NULL;
 	ocfs_dlm_req_master *req_master;
-	ub4 node_num = OCFS_INVALID_NODE_NUM;
-	ub4 flags;
-	bool acq_oin = false;
-	ub8 offset;
-	ub4 length;
+	__u32 node_num = OCFS_INVALID_NODE_NUM;
+	__u32 flags;
+	__u64 offset;
+	__u32 length;
 	ocfs_file_entry *fe = NULL;
 	ocfs_file_entry *temp_fe = NULL;
-	ub4 i;
 	ocfs_inode *oin;
 	bool oin_exists;
 
@@ -380,31 +369,42 @@ int ocfs_comm_process_vote (ocfs_super *
 
 	req_master = (ocfs_dlm_req_master *) dlm_msg->msg_buf;
 
-	LOG_TRACE_ARGS ("Called from node (%u) for Lock 0x%08x.0x%08x, "
-			"Seq %u.%u\n", dlm_msg->src_node, HI (req_master->lock_id),
-			LO (req_master->lock_id), HI (req_master->lock_seq_num),
-			LO (req_master->lock_seq_num));
+	LOG_TRACE_ARGS("node=%d, lockid=%u.%u, seq=%u.%u\n", dlm_msg->src_node,
+		       HI(req_master->lock_id), LO(req_master->lock_id),
+		       HI(req_master->lock_seq_num), LO(req_master->lock_seq_num));
 
 	status = ocfs_find_create_lockres (osb, req_master->lock_id, &lockres);
 	if (status < 0) {
-		LOG_ERROR_STATUS (status);
+		if (req_master->flags & FLAG_FILE_UPDATE_OIN) {
+			status = ocfs_process_update_inode_request (osb,
+					req_master->lock_id, lockres,
+					dlm_msg->src_node);
+			if (status < 0) {
+				LOG_ERROR_STATUS (status);
+				goto finally;
+			}
+			LOG_TRACE_STR ("vote=FLAG_VOTE_OIN_UPDATED");
+			ocfs_send_vote_reply (osb, dlm_msg, FLAG_VOTE_OIN_UPDATED, false);
+			status = 0;
+		} else
+			LOG_ERROR_STATUS (status);
 		goto finally;
 	}
 
 	ocfs_acquire_lockres (lockres);
 
-	if (lockres->lock_state & LOCK_STATE_INIT) {
-		status = ocfs_send_vote_reply (osb, dlm_msg, OCFS_DLM_VOTE_OK, false);
-		ocfs_release_lockres (lockres);
+#if 0
+	if (lockres->vote_state & LOCK_STATE_INIT) {
+		status = ocfs_send_vote_reply (osb, dlm_msg, FLAG_VOTE_NODE, false);
 		goto finally;
 	}
 
 	if ((lockres->master_node_num == osb->node_num) &&
 	    (dlm_msg->src_node == osb->node_num)) {
-		status = ocfs_send_vote_reply (osb, dlm_msg, OCFS_DLM_VOTE_OK, false);
-		ocfs_release_lockres (lockres);
+		status = ocfs_send_vote_reply (osb, dlm_msg, FLAG_VOTE_NODE, false);
 		goto finally;
 	}
+#endif
 
 	flags = req_master->flags;
 	node_num = dlm_msg->src_node;
@@ -417,12 +417,7 @@ int ocfs_comm_process_vote (ocfs_super *
 	if (flags & FLAG_FILE_RELEASE_CACHE) {
 		if (!osb->commit_cache_exec) {
 			osb->needs_flush = true;
-
-			i = 0;
-			while ((osb->trans_in_progress) && (i < 10)) {
-				ocfs_sleep (100);
-				i++;
-			}
+			ocfs_trans_in_progress(osb);
 
 			if (osb->trans_in_progress == false) {
 				osb->commit_cache_exec = true;
@@ -459,8 +454,8 @@ int ocfs_comm_process_vote (ocfs_super *
 				temp_fe = NULL;
 			}
 
-			ocfs_send_vote_reply (osb, dlm_msg, OCFS_DLM_VOTE_OK, false);
-			ocfs_release_lockres (lockres);
+			LOG_TRACE_STR ("vote=FLAG_VOTE_NODE");
+			ocfs_send_vote_reply (osb, dlm_msg, FLAG_VOTE_NODE, false);
 			status = 0;
 			goto finally;
 		}
@@ -469,26 +464,31 @@ int ocfs_comm_process_vote (ocfs_super *
 	if (flags & FLAG_FILE_UPDATE_OIN) {
 		if (lockres->oin != NULL) {
 			oin = lockres->oin;
-
 			ocfs_down_sem (&(oin->main_res), true);
-			acq_oin = true;
-			UPDATE_OIN (lockres->oin);
-			if (acq_oin) {
-				ocfs_up_sem (&(oin->main_res));
-				acq_oin = false;
+			oin->needs_verification = true;
+			tmpstat = ocfs_verify_update_oin(osb, oin);
+			if (tmpstat < 0)
+				LOG_ERROR_STATUS (tmpstat);
+			ocfs_up_sem (&(oin->main_res));
+		} else {
+			status = ocfs_process_update_inode_request (osb,
+					req_master->lock_id, lockres,
+					dlm_msg->src_node);
+			if (status < 0) {
+				LOG_ERROR_STATUS (status);
+				goto finally;
 			}
 		}
-		ocfs_send_vote_reply (osb, dlm_msg, OCFS_DLM_VOTE_OK, false);
-		ocfs_release_lockres (lockres);
+		LOG_TRACE_STR ("vote=FLAG_VOTE_OIN_UPDATED");
+		ocfs_send_vote_reply (osb, dlm_msg, FLAG_VOTE_OIN_UPDATED, false);
+		status = 0;
 		goto finally;
 	}
 
-	/* If there is a masternode and it is alive ask the node */
-	/*   asking for vote to update its state */
 	if (lockres->master_node_num != OCFS_INVALID_NODE_NUM) {
 		if (lockres->master_node_num == osb->node_num) {
 			if (flags & FLAG_CHANGE_MASTER) {
-				ub8 tmp = req_master->lock_id;
+				__u64 tmp = req_master->lock_id;
 
 				ocfs_commit_cache (osb, true);
 				status = ocfs_get_file_entry (osb, &fe,
@@ -512,11 +512,11 @@ int ocfs_comm_process_vote (ocfs_super *
 				}
 
 				lockres->master_node_num = node_num;
-				ocfs_release_lockres (lockres);
-				ocfs_send_vote_reply (osb, dlm_msg, OCFS_DLM_VOTE_OK, false);
+				LOG_TRACE_STR ("vote=FLAG_VOTE_NODE");
+				ocfs_send_vote_reply (osb, dlm_msg, FLAG_VOTE_NODE, false);
 				goto finally;
 			} else if (flags & FLAG_ADD_OIN_MAP) {
-				ub8 tmp = req_master->lock_id;
+				__u64 tmp = req_master->lock_id;
 
 				status = ocfs_get_file_entry (osb, &fe, req_master->lock_id);
 				if (status < 0) {
@@ -526,9 +526,9 @@ int ocfs_comm_process_vote (ocfs_super *
 
 				if ((fe->sync_flags & OCFS_SYNC_FLAG_NAME_DELETED) ||
 				    (!(fe-> sync_flags & OCFS_SYNC_FLAG_VALID))) {
-					ocfs_release_lockres (lockres);
+					LOG_TRACE_STR ("vote=FLAG_VOTE_FILE_DEL");
 					ocfs_send_vote_reply (osb, dlm_msg,
-						OCFS_DLM_VOTE_FILE_DEL, false);
+						FLAG_VOTE_FILE_DEL, false);
 					goto finally;
 				} else {
 					DISK_LOCK_OIN_MAP (fe) |= (1 << node_num);
@@ -542,9 +542,9 @@ int ocfs_comm_process_vote (ocfs_super *
 
 					/* Add this node to the oin map on the file entry */
 					lockres->oin_openmap = DISK_LOCK_OIN_MAP (fe);
-					ocfs_release_lockres (lockres);
+					LOG_TRACE_STR ("vote=FLAG_VOTE_NODE");
 					ocfs_send_vote_reply (osb, dlm_msg,
-							OCFS_DLM_VOTE_OK, false);
+							FLAG_VOTE_NODE, false);
 					goto finally;
 				}
 			}
@@ -552,20 +552,22 @@ int ocfs_comm_process_vote (ocfs_super *
 			if (IS_NODE_ALIVE (osb->publ_map, lockres->master_node_num,
 					   OCFS_MAXIMUM_NODES)) {
 				/* We have no business voting on this lock */
+				LOG_TRACE_STR ("vote=FLAG_VOTE_UPDATE_RETRY");
 				ocfs_send_vote_reply (osb, dlm_msg,
-					OCFS_DLM_VOTE_UPDATE_RETRY, false);
+					FLAG_VOTE_UPDATE_RETRY, false);
 			} else {
 				oin_exists = false;
 
 				/* Master Node is dead and a vote is needed */
 				/* to create a new master */
 
-				if ((lockres->lock_state & LOCK_STATE_IN_VOTING) &&
+				if ((lockres->vote_state & LOCK_STATE_IN_VOTING) &&
 				    (node_num < osb->node_num)) {
 					/* If our node number is > his we win */
 					/* so send a mesg to him to retry */
+					LOG_TRACE_STR ("vote=FLAG_VOTE_UPDATE_RETRY");
 					ocfs_send_vote_reply (osb, dlm_msg,
-						OCFS_DLM_VOTE_UPDATE_RETRY, oin_exists);
+						FLAG_VOTE_UPDATE_RETRY, oin_exists);
 					goto finally;
 				} else {
 					if ((!(flags & FLAG_DIR)) &&
@@ -575,20 +577,22 @@ int ocfs_comm_process_vote (ocfs_super *
 							oin_exists = true;
 						}
 					}
+					LOG_TRACE_STR ("vote=FLAG_VOTE_NODE");
 					ocfs_send_vote_reply (osb, dlm_msg,
-						OCFS_DLM_VOTE_UPDATE_RETRY, oin_exists);
+						FLAG_VOTE_NODE, oin_exists);
 				}
 			}
 		}
 	} else {
 		oin_exists = false;
 
-		if ((lockres->lock_state & LOCK_STATE_IN_VOTING) &&
+		if ((lockres->vote_state & LOCK_STATE_IN_VOTING) &&
 		    (node_num < osb->node_num)) {
 			/* If our node number is > his we win so send a mesg */
 			/* to him to retry */
+			LOG_TRACE_STR ("vote=FLAG_VOTE_UPDATE_RETRY");
 			ocfs_send_vote_reply (osb, dlm_msg,
-					OCFS_DLM_VOTE_UPDATE_RETRY, oin_exists);
+					FLAG_VOTE_UPDATE_RETRY, oin_exists);
 			goto finally;
 		} else {
 			/* Vote for the node */
@@ -599,18 +603,17 @@ int ocfs_comm_process_vote (ocfs_super *
 				}
 			}
 
-			ocfs_send_vote_reply (osb, dlm_msg, OCFS_DLM_VOTE_OK,
-					      oin_exists);
+			LOG_TRACE_STR ("vote=FLAG_VOTE_NODE");
+			ocfs_send_vote_reply (osb, dlm_msg, FLAG_VOTE_NODE, oin_exists);
 			goto finally;
 		}
 	}
 
       finally:
-	if (fe)
-		ocfs_release_file_entry (fe);
-
+	ocfs_release_file_entry (fe);
 	if (lockres)
 		ocfs_release_lockres (lockres);
+	ocfs_put_lockres (lockres);
 
 	LOG_EXIT_STATUS (status);
 	return status;
@@ -625,47 +628,87 @@ int ocfs_comm_process_vote_reply (ocfs_s
 	int status = 0;
 	ocfs_lock_res *lockres = NULL;
 	ocfs_dlm_reply_master *reply;
+	ocfs_dlm_msg_hdr *reply_msg;
 
 	LOG_ENTRY ();
 
+	down (&(osb->comm_lock));
+
 	reply = (ocfs_dlm_reply_master *) dlm_msg->msg_buf;
+	reply_msg = &(reply->h);
 
-	/* Search for the resource on the recv list and */
-	/*   based on the vote do appropriate work */
-	status = ocfs_find_lockres (osb, reply->h.lock_id, &lockres);
+	status = ocfs_lookup_sector_node (osb, reply_msg->lock_id, &lockres);
 	if (status < 0) {
-		LOG_ERROR_STATUS (status);
+		LOG_TRACE_ARGS ("status=%d, id=%u.%u\n", status,
+			       	HILO(reply_msg->lock_id));
 		goto bail;
 	}
 
-	if ((lockres->lock_state & LOCK_STATE_IN_VOTING) &&
-	    (lockres->last_upd_seq_num == reply->h.lock_seq_num)) {
-		if (reply->status == OCFS_DLM_VOTE_OK) {
-			/* Accumalate all the votes... */
-			lockres->vote_status = OCFS_DLM_VOTE_OK;
-			lockres->got_vote_map |= (1 << dlm_msg->src_node);
-
-			LOG_TRACE_ARGS ("OCFS_DLM_VOTE_OK Src Node %u\n", dlm_msg->src_node);
-
-			if (lockres->got_vote_map == lockres->req_vote_map) {
-				LOG_TRACE_ARGS ("OCFS_DLM_VOTE_OK Vote from " \
-					"all Node (%u.%u)\n", HI(lockres->got_vote_map),
-					LO(lockres->got_vote_map));
-				lockres->vote_status = 0;
-				atomic_set (&lockres->voted_event_woken, 1);
-				wake_up (&lockres->voted_event);
-			}
-		} else {
-			LOG_TRACE_ARGS ("OCFS_DLM_VOTE_NOT OK status %d\n", reply->status);
-			lockres->vote_status = reply->status;
-			atomic_set (&lockres->voted_event_woken, 1);
-			wake_up (&lockres->voted_event);
-		}
-	} else {
-		LOG_ERROR_STR ("lock seq num did not match. Ignoring.");
+	if (!(lockres->vote_state & LOCK_STATE_IN_VOTING) ||
+	    (lockres->last_upd_seq_num != reply_msg->lock_seq_num)) {
+		LOG_TRACE_STR ("Ignoring netdlm message");
+		goto bail;
+	}
+
+	LOG_TRACE_ARGS("node=%u, lockid=%u.%u, seq=%u.%u, vote=%d\n",
+		       dlm_msg->src_node, HI(reply_msg->lock_id),
+		       LO(reply_msg->lock_id), HI(reply_msg->lock_seq_num),
+		       LO(reply_msg->lock_seq_num), reply->status);
+
+	switch (reply->status) {
+	case FLAG_VOTE_NODE:
+		lockres->vote_status = 0;
+		lockres->got_vote_map |= (1 << dlm_msg->src_node);
+
+		if ((reply_msg->flags & FLAG_FILE_EXTEND ||
+		     reply_msg->flags & FLAG_FILE_UPDATE) && reply_msg->open_handle)
+			lockres->tmp_openmap |=
+				(reply_msg->open_handle << dlm_msg->src_node);
+		break;
+
+	case FLAG_VOTE_OIN_ALREADY_INUSE:
+		lockres->got_vote_map |= (1 << dlm_msg->src_node);
+		lockres->vote_status = -EFAIL;
+		if (reply_msg->flags & FLAG_FILE_DELETE)
+			lockres->vote_status = -EBUSY;
+		break;
+
+	case FLAG_VOTE_OIN_UPDATED:
+		lockres->got_vote_map |= (1 << dlm_msg->src_node);
+		break;
+
+	case FLAG_VOTE_UPDATE_RETRY:
+		lockres->vote_status = -EAGAIN;
+		break;
+
+	case FLAG_VOTE_FILE_DEL:
+		lockres->vote_status = -ENOENT;
+		break;
+	}
+
+	if (lockres->vote_status != 0) {
+		lockres->vote_state = 0;
+		atomic_set (&lockres->voted_event_woken, 1);
+		wake_up (&lockres->voted_event);
+		goto bail;
+	}
+
+	if (lockres->got_vote_map == lockres->req_vote_map) {
+		if ((reply_msg->flags & FLAG_FILE_EXTEND) ||
+		    (reply_msg->flags & FLAG_FILE_UPDATE))
+			lockres->oin_openmap = lockres->tmp_openmap;
+		lockres->tmp_openmap = 0;
+		LOG_TRACE_ARGS ("OK vote, lockid=%u.%u, map=0x%08x\n",
+				HI(lockres->sector_num), LO(lockres->sector_num),
+				LO(lockres->got_vote_map));
+		lockres->vote_state = 0;
+		atomic_set (&lockres->voted_event_woken, 1);
+		wake_up (&lockres->voted_event);
 	}
 
       bail:
+	ocfs_put_lockres (lockres);
+	up (&(osb->comm_lock));
 	LOG_EXIT_STATUS (status);
 	return status;
 }				/* ocfs_comm_process_vote_reply */
@@ -677,18 +720,16 @@ int ocfs_comm_process_vote_reply (ocfs_s
 void ocfs_dlm_recv_msg (void *val)
 {
 	ocfs_recv_ctxt *recv_ctxt;
-	ub1 *dlm_packet;
+	__u8 *dlm_packet;
 
 	LOG_ENTRY ();
 
 	recv_ctxt = (ocfs_recv_ctxt *) val;
-	dlm_packet = (ub1 *) recv_ctxt->msg;
+	dlm_packet = (__u8 *) recv_ctxt->msg;
 
 	if (recv_ctxt->status >= 0) {
 		if (ocfs_check_ipc_msg (dlm_packet, recv_ctxt->msg_len))
 			ocfs_comm_process_msg (dlm_packet);
-		else
-			LOG_ERROR_STR ("Received an invalid packet");
 	}
 
 	ocfs_safefree (recv_ctxt);
@@ -701,12 +742,12 @@ void ocfs_dlm_recv_msg (void *val)
  * ocfs_comm_process_msg()
  *
  */
-int ocfs_comm_process_msg (ub1 * msg)
+int ocfs_comm_process_msg (__u8 * msg)
 {
 	int status = 0;
 	ocfs_super *osb;
 	ocfs_dlm_msg *dlm_msg;
-	ub8 nodemap;
+	__u64 nodemap;
 
 	LOG_ENTRY ();
 
@@ -714,36 +755,97 @@ int ocfs_comm_process_msg (ub1 * msg)
 
 	ocfs_find_osb (dlm_msg->vol_id, &osb);
 	if (osb == NULL) {
-		LOG_ERROR_STR("IPC message had invalid volume id");
+		LOG_TRACE_STR("Ignoring netdlm message with invalid volume id");
 		goto bail;
 	}
 
 	nodemap = (1 << dlm_msg->src_node);
 	if (!(osb->publ_map & nodemap)) {
-		LOG_ERROR_STR("IPC message from dead node");
+		LOG_TRACE_STR("Ignoring netdlm message from dead node");
 		goto bail;
 	}
 
 	switch (dlm_msg->msg_type) {
-	    case OCFS_REQUEST_MAKE_MASTER:
-		    ocfs_comm_process_vote (osb, dlm_msg);
-		    break;
-	    case OCFS_DISK_VOTE_REQUEST:
-		    ocfs_comm_process_vote (osb, dlm_msg);
-		    break;
-
-	    case OCFS_REPLY_MAKE_MASTER:
-		    ocfs_comm_process_vote_reply (osb, dlm_msg);
-		    break;
-	    case OCFS_DISK_VOTE_REPLY:
-		    ocfs_comm_process_vote_reply (osb, dlm_msg);
-		    break;
+	case OCFS_VOTE_REQUEST:
+		ocfs_comm_process_vote (osb, dlm_msg);
+		break;
+
+	case OCFS_VOTE_REPLY:
+		ocfs_comm_process_vote_reply (osb, dlm_msg);
+		break;
+	
+	case OCFS_INFO_DISMOUNT:
+		ocfs_comm_process_dismount (osb, dlm_msg);
+		break;
 
-	    default:
-		    break;
+	default:
+		break;
 	}
 
       bail:
 	LOG_EXIT_STATUS (status);
 	return status;
 }				/* ocfs_comm_process_msg */
+
+
+/*
+ * ocfs_send_dismount_msg()
+ *
+ */
+int ocfs_send_dismount_msg (ocfs_super * osb, __u64 vote_map)
+{
+	int status = 0;
+	ocfs_dlm_msg *dlm_msg = NULL;
+	__u32 msg_len;
+	ocfs_dlm_msg_hdr *req;
+
+	LOG_ENTRY_ARGS ("(osb=0x%08x, vm=0x%08x)\n", osb, LO(vote_map));
+
+	msg_len = sizeof (ocfs_dlm_msg) - 1 + sizeof (ocfs_dlm_req_master);
+
+	dlm_msg = ocfs_malloc (msg_len);
+	if (dlm_msg == NULL) {
+		LOG_ERROR_STATUS (status = -ENOMEM);
+		goto finally;
+	}
+
+	ocfs_init_dlm_msg (osb, dlm_msg, msg_len);
+
+	dlm_msg->msg_type = OCFS_INFO_DISMOUNT;
+
+	req = (ocfs_dlm_msg_hdr *) dlm_msg->msg_buf;
+	req->lock_id = 0;
+	req->flags = 0;
+	req->lock_seq_num = 0;
+	req->open_handle = 0;
+
+	ocfs_send_bcast (osb, vote_map, dlm_msg);
+
+      finally:
+	ocfs_safefree (dlm_msg);
+	LOG_EXIT_STATUS (status);
+	return status;
+}				/* ocfs_send_dismount_msg */
+
+
+/*
+ * ocfs_comm_process_dismount()
+ *
+ */
+void ocfs_comm_process_dismount (ocfs_super * osb, ocfs_dlm_msg * dlm_msg)
+{
+	ocfs_dlm_req_master *req_master;
+
+	LOG_ENTRY ();
+
+	req_master = (ocfs_dlm_req_master *) dlm_msg->msg_buf;
+
+	LOG_TRACE_ARGS("node=%d", dlm_msg->src_node);
+	printk ("ocfs: Received dismount message from node %d\n",
+		dlm_msg->src_node);
+
+	atomic_set (&(osb->vol_node_map.dismount[dlm_msg->src_node]), 1);
+
+	LOG_EXIT ();
+	return ;
+}				/* ocfs_comm_process_dismount */
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Common/ocfsheartbeat.c linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Common/ocfsheartbeat.c
--- linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Common/ocfsheartbeat.c	2003-07-30 13:51:50.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Common/ocfsheartbeat.c	2003-07-30 10:28:53.000000000 +0200
@@ -28,7 +28,7 @@
 #include <ocfs.h>
 #endif
 
-#if defined(FORMAT_UTIL)
+#if defined(USERSPACE_TOOL)
 #include <format.h>
 #endif
 
@@ -47,39 +47,41 @@
  *
  * Returns 0 if success, < 0 if error.
  */
-int ocfs_nm_heart_beat (ocfs_super * osb, ub4 flag, bool read_publish)
+int ocfs_nm_heart_beat (ocfs_super * osb, __u32 flag, bool read_publish)
 {
 	ocfs_publish *publish = NULL;
 	int status = 0;
-	ub8 node_publ_off = 0;
+	__u64 node_publ_off = 0;
 
-	LOG_ENTRY_ARGS ("(0x%08x, %u, %s)\n", osb, flag,
+	LOG_ENTRY_ARGS ("(0x%p, %u, %s)\n", osb, flag,
 			read_publish ? "true" : "false");
 
 	if (flag & HEARTBEAT_METHOD_DISK) {
 		node_publ_off = osb->vol_layout.publ_sect_off +
 			        (osb->node_num * osb->sect_size);
 
-                if (read_publish)
-                {
+		if (read_publish) {
 			status = ocfs_read_force_disk_ex (osb, (void **)&publish,
-				osb->sect_size, osb->sect_size, node_publ_off);
-		        if (status < 0) {
-			        LOG_ERROR_STATUS (status);
-			        goto finally;
-		        }
-                }
-                else
-                {
-                        publish = (ocfs_publish *)
-				  (osb->cfg_prealloc +
-				   ((4 + osb->node_num) * osb->sect_size));
-                }
+				  osb->sect_size, osb->sect_size, node_publ_off);
+			if (status < 0) {
+				LOG_ERROR_STATUS (status);
+				goto finally;
+			}
+		} else {
+			publish = (ocfs_publish *)
+				(osb->cfg_prealloc +
+				 ((OCFS_VOLCFG_NEWCFG_SECTORS + osb->node_num) *
+				  osb->sect_size));
+		}
 
 		OcfsQuerySystemTime (&publish->time);
 
 		publish->hbm[osb->node_num] = osb->hbm;
 
+		spin_lock (&OcfsGlobalCtxt.comm_seq_lock);
+		publish->comm_seq_num = OcfsGlobalCtxt.comm_seq_num;
+		spin_unlock (&OcfsGlobalCtxt.comm_seq_lock);
+
 		/* Write the current time in local node's publish sector */
 		status = ocfs_write_force_disk (osb, publish, osb->sect_size,
 						node_publ_off);
@@ -87,8 +89,6 @@ int ocfs_nm_heart_beat (ocfs_super * osb
 			LOG_ERROR_STATUS (status);
 			goto finally;
 		}
-		LOG_TRACE_ARGS ("Updating timestamp for node (%u)\n",
-				osb->node_num);
 	}
 
 	if (flag & HEARTBEAT_METHOD_IPC) {
@@ -96,12 +96,159 @@ int ocfs_nm_heart_beat (ocfs_super * osb
 	}
 
       finally:
-        if (read_publish)
-	        ocfs_safefree (publish);
+	if (read_publish)
+		ocfs_safefree (publish);
 
 	LOG_EXIT_STATUS (status);
 	return status;
 }				/* ocfs_nm_heart_beat */
+
+/*
+ * ocfs_nm_thread()
+ *
+ */
+int ocfs_nm_thread (ocfs_super * mount_osb)
+{
+	int status = 0;
+	__u8 *buffer = NULL;
+	ocfs_super *osb = NULL;
+	ocfs_publish *publish;
+	ocfs_publish *publish_to_vote = NULL;
+	__u32 i;
+	__u32 highest_vote_node = 0;
+	__u64 offset = 0;
+	__u32 num_nodes = 0;
+	__u32 vote_node = OCFS_INVALID_NODE_NUM;
+	int ret = 0;
+	ocfs_node_config_hdr *node_cfg_hdr = NULL;
+	__u8 *p;
+	__u64 curr_node_map;
+
+	LOG_ENTRY ();
+
+	/* For each mounted volume reiterate the time stamp on the publish sector */
+	if (!mount_osb) {
+		LOG_ERROR_STATUS (status = -EFAIL);
+		goto finally;
+	} else
+		osb = mount_osb;
+
+	/* Ensure that the volume is valid ... */
+	if (osb->obj_id.type != OCFS_TYPE_OSB)
+		goto finally;
+
+	/* ... and that it is mounted */
+	if (osb->osb_flags & OCFS_OSB_FLAGS_BEING_DISMOUNTED)
+		goto finally;
+
+	if (!time_after (jiffies, osb->hbt))
+		goto finally;
+
+	if (osb->vol_state == VOLUME_MOUNTED) {
+		if (osb->needs_flush) {
+			ocfs_trans_in_progress(osb);
+			if (osb->trans_in_progress == false) {
+				ocfs_commit_cache (osb, false);
+				osb->needs_flush = false;
+			}
+		}
+	}
+
+	/* lock publish to prevent overwrites from vote_req and vote_reset */
+	down (&(osb->publish_lock));
+
+	/* Get the Publish Sector start Offset */
+	offset = osb->vol_layout.new_cfg_off;
+
+	/* Read disk for Publish Sectors of all nodes */
+	status = ocfs_read_force_disk (osb, osb->cfg_prealloc, osb->cfg_len,
+				       offset);
+	if (status < 0) {
+		up (&(osb->publish_lock));
+		LOG_ERROR_STATUS (status);
+		goto finally;
+	}
+
+	/* Update the timestamp on disk to indicate that it is alive */
+	ocfs_nm_heart_beat (osb, HEARTBEAT_METHOD_DISK, false);
+
+	/* release publish lock */
+	up (&(osb->publish_lock));
+
+	/* If another node was added to the config read and update the cfg */
+	node_cfg_hdr = (ocfs_node_config_hdr *) (osb->cfg_prealloc + osb->sect_size);
+
+	if ((osb->cfg_seq_num != node_cfg_hdr->cfg_seq_num) ||
+	    (osb->num_cfg_nodes != node_cfg_hdr->num_nodes)) {
+		status = ocfs_chk_update_config (osb);
+		if (status < 0) {
+			LOG_ERROR_STATUS (status);
+			goto finally;
+		}
+	}
+
+	buffer = osb->cfg_prealloc +
+			(OCFS_VOLCFG_NEWCFG_SECTORS * osb->sect_size);
+
+	num_nodes = OCFS_MAXIMUM_NODES;
+
+	/* Refresh the publish map */
+	ocfs_update_publish_map (osb, buffer, false);
+
+	/* send signal to mount thread to continue */
+	if (atomic_read (&osb->nm_init) == 0) {
+		atomic_set (&osb->nm_init, 1);
+		wake_up (&osb->nm_init_event);
+	}
+
+	LOG_TRACE_ARGS ("Publish map: 0x%08x\n", LO (osb->publ_map));
+
+	/* map of local node */
+	curr_node_map = (__u64) ((__u64)1 << osb->node_num);
+
+	/* Check for the highest node looking for a vote, if anybody is looking */
+	for (i = 0, p = buffer; i < num_nodes; i++, p += osb->sect_size) {
+		publish = (ocfs_publish *) p;
+
+		if (publish->time == (__u64) 0)
+			continue;
+
+		if (publish->vote != FLAG_VOTE_NODE ||
+		    !(publish->vote_map & curr_node_map))
+			continue;
+
+		LOG_TRACE_ARGS ("node(%u): vote=%d dirty=%d type=%u\n", i,
+				publish->vote, publish->dirty, publish->vote_type);
+
+		highest_vote_node = i;
+
+		/* Check if the node is alive or not */
+		if (IS_NODE_ALIVE (osb->publ_map, highest_vote_node, num_nodes)) {
+			vote_node = highest_vote_node;
+			publish_to_vote = publish;
+		} else {
+			status = ocfs_recover_vol (osb, highest_vote_node);
+			if (status < 0) {
+				LOG_ERROR_STATUS (status);
+				goto finally;
+			}
+		}
+	}
+
+	if ((vote_node != OCFS_INVALID_NODE_NUM) && (vote_node != osb->node_num)) {
+		publish = (ocfs_publish *)
+				(buffer + (osb->node_num * osb->sect_size));
+		if (publish->vote)
+			publish->vote = 0;
+
+		ocfs_process_vote (osb, publish_to_vote, vote_node);
+	}
+	osb->hbt = 50 + jiffies;
+
+      finally:
+	LOG_EXIT_STATUS (ret);
+	return ret;
+}				/* ocfs_nm_thread() */
 #endif				/* !defined(USERPSPACE_TOOL) */
 
 
@@ -123,12 +270,12 @@ void ocfs_update_publish_map (ocfs_super
 {
 	ocfs_publish *publish;
 	ocfs_vol_node_map *node_map;
-	ub8 curr_time = 0;
-	ub4 i;
-	ub4 num_nodes;
-	ub1 *p;
+	__u64 curr_time = 0;
+	__u32 i;
+	__u32 num_nodes;
+	__u8 *p;
 
-	LOG_ENTRY_ARGS ("(0x%08x, 0x%08x, %u)\n", osb, buffer, first_time);
+	LOG_ENTRY_ARGS ("(0x%p, 0x%p, %u)\n", osb, buffer, first_time);
 
 	num_nodes = OCFS_MAXIMUM_NODES;
 	node_map = &(osb->vol_node_map);
@@ -138,7 +285,16 @@ void ocfs_update_publish_map (ocfs_super
 
 	/* First time thru, update buffer with timestamps for all nodes */
 	if (first_time) {
-		for (i = 0, p = (ub1 *) buffer; i < num_nodes;
+#if !defined(USERSPACE_TOOL)
+		/* Read the last comm_seq_num */
+		p = buffer + (osb->node_num * osb->sect_size);
+		publish = (ocfs_publish *) p;
+		spin_lock (&OcfsGlobalCtxt.comm_seq_lock);
+		OcfsGlobalCtxt.comm_seq_num = publish->comm_seq_num + 10;
+		spin_unlock (&OcfsGlobalCtxt.comm_seq_lock);
+#endif
+		/* Refresh local buffers */
+		for (i = 0, p = (__u8 *) buffer; i < num_nodes;
 		     i++, p += osb->sect_size) {
 			publish = (ocfs_publish *) p;
 			node_map->time[i] = publish->time;
@@ -148,30 +304,46 @@ void ocfs_update_publish_map (ocfs_super
 		goto bail;	/* exit */
 	}
 
-	for (i = 0, p = (ub1 *) buffer; i < num_nodes;
+	for (i = 0, p = (__u8 *) buffer; i < num_nodes;
 	    				 i++, p += osb->sect_size) {
 		publish = (ocfs_publish *) p;
 
 		/* Loop if slot is unused */
-		if (publish->time == (ub8) 0)
+		if (publish->time == (__u64) 0)
 			continue;
 
 		/* Check if the node is hung or not by comparing the disk */
 		/* and memory timestamp values */
 		if (node_map->time[i] == publish->time) {
 			if (IS_NODE_ALIVE(osb->publ_map, i, num_nodes)) {
-				(node_map->miss_cnt[i])++;
-				if (node_map->miss_cnt[i] > MISS_COUNT_VALUE)
+				if (atomic_read (&(node_map->dismount[i]))) {
+					node_map->miss_cnt[i] = MISS_COUNT_VALUE;
+					atomic_set (&(node_map->dismount[i]), 0);
+				} else
+					(node_map->miss_cnt[i])++;
+				if (node_map->miss_cnt[i] > MISS_COUNT_VALUE) {
+#if !defined(USERSPACE_TOOL)
+					printk ("ocfs: Removing device (%u,%u) in "
+						"node %d from cluster\n",
+					       	MAJOR(osb->sb->s_dev),
+					       	MINOR(osb->sb->s_dev), i);
+#endif
 					UPDATE_PUBLISH_MAP (osb->publ_map, i,
-							    OCFS_PUBLISH_CLEAR,
-							    num_nodes);
+					    OCFS_PUBLISH_CLEAR, num_nodes);
+				}
 			}
 		} else {
+#if !defined(USERSPACE_TOOL)
+			if (!IS_NODE_ALIVE(osb->publ_map, i, num_nodes) &&
+			    osb->node_num != i)
+				printk ("ocfs: Adding device (%u,%u) in node %d to "
+					"cluster\n", MAJOR(osb->sb->s_dev),
+				       	MINOR(osb->sb->s_dev), i);
+#endif
 			node_map->miss_cnt[i] = 0;
 			node_map->time[i] = publish->time;
 			UPDATE_PUBLISH_MAP (osb->publ_map, i, OCFS_PUBLISH_SET,
 					    num_nodes);
-
 #if !defined(USERSPACE_TOOL)
 			/* Update the multiple the other node wants us to beat */
 			if ((publish->hbm[osb->node_num] != DISK_HBEAT_INVALID)
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Common/ocfsver.c linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Common/ocfsver.c
--- linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Common/ocfsver.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Common/ocfsver.c	2003-07-30 10:28:53.000000000 +0200
@@ -0,0 +1,49 @@
+/*
+ * ocfsver.c
+ *
+ * prints the version string
+ *
+ * Copyright (C) 2003 Oracle Corporation.  All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ * 
+ * This program 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 this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 021110-1307, USA.
+ *
+ * Authors: Kurt Hackel, Sunil Mushran, Manish Singh, Wim Coekaerts
+ */
+
+#include <ocfs.h>
+
+/* added for SuSE build. fix when you update. */
+#define OCFS_BUILD_VERSION "1.0.9-pre" 
+#define OCFS_BUILD_DATE __DATE__
+#define OCFS_BUILD_MD5 "-" 
+
+MODULE_DESCRIPTION("The Oracle Cluster Filesystem (version "
+                   OCFS_BUILD_VERSION
+                   ")");
+
+char *ocfs_version = OCFS_BUILD_VERSION;
+
+/*
+ * ocfs_version_print()
+ * 
+ */
+void ocfs_version_print (void)
+{
+	printk(KERN_INFO "Oracle Cluster FileSystem "
+			 OCFS_BUILD_VERSION " "
+			 OCFS_BUILD_DATE " "
+			 "(build "  OCFS_BUILD_MD5 ")\n");
+}				/* ocfs_version_print */
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Cscope.make linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Cscope.make
--- linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Cscope.make	2003-07-30 13:51:50.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Cscope.make	1970-01-01 01:00:00.000000000 +0100
@@ -1,10 +0,0 @@
-cscope:
-	rm -f cscope.*
-	echo "-k" >> cscope.files
-	echo "-I Common/inc" >> cscope.files
-	echo "-I Linux/inc" >> cscope.files
-	find Common -name '*.c' -print >>cscope.files
-	find Linux -name '*.c' -print >>cscope.files
-	find Common -name '*.h' -print >>cscope.files
-	find Linux -name '*.h' -print >>cscope.files
-	cscope -b
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Linux/inc/ocfsbitmap.h linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Linux/inc/ocfsbitmap.h
--- linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Linux/inc/ocfsbitmap.h	2003-07-30 13:51:50.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Linux/inc/ocfsbitmap.h	2003-07-30 10:28:53.000000000 +0200
@@ -27,13 +27,13 @@
 #ifndef _OCFSBITMAP_H_
 #define _OCFSBITMAP_H_
 
-void ocfs_initialize_bitmap (ocfs_alloc_bm * bitmap, void *buf, ub4 sz);
-int ocfs_find_clear_bits (ocfs_alloc_bm * bitmap, ub4 numBits, ub4 offset, ub4 sysonly);
+void ocfs_initialize_bitmap (ocfs_alloc_bm * bitmap, void *buf, __u32 sz);
+int ocfs_find_clear_bits (ocfs_alloc_bm * bitmap, __u32 numBits, __u32 offset, __u32 sysonly);
 int ocfs_count_bits (ocfs_alloc_bm * bitmap);
 
 #if defined(__KERNEL__)
-void ocfs_set_bits (ocfs_alloc_bm * bitmap, ub4 start, ub4 num);
-void ocfs_clear_bits (ocfs_alloc_bm * bitmap, ub4 start, ub4 num);
+void ocfs_set_bits (ocfs_alloc_bm * bitmap, __u32 start, __u32 num);
+void ocfs_clear_bits (ocfs_alloc_bm * bitmap, __u32 start, __u32 num);
 #endif
 
 #endif				/* _OCFSBITMAP_H_ */
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Linux/inc/ocfsclose.h linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Linux/inc/ocfsclose.h
--- linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Linux/inc/ocfsclose.h	2003-07-30 13:51:50.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Linux/inc/ocfsclose.h	1970-01-01 01:00:00.000000000 +0100
@@ -1,32 +0,0 @@
-/*
- * ocfsclose.h
- *
- * Function prototypes for related 'C' file.
- *
- * Copyright (C) 2002 Oracle Corporation.  All rights reserved.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- * 
- * This program 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 recieved a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 021110-1307, USA.
- *
- * Authors: Neeraj Goyal, Suchit Kaura, Kurt Hackel, Sunil Mushran,
- *          Manish Singh, Wim Coekaerts
- */
-
-#ifndef _OCFSCLOSE_H_
-#define _OCFSCLOSE_H_
-
-int ocfs_common_close (struct inode *inode, struct file *file);
-
-#endif				/* _OCFSCLOSE_H_ */
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Linux/inc/ocfsdlmp.h linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Linux/inc/ocfsdlmp.h
--- linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Linux/inc/ocfsdlmp.h	2003-07-30 13:51:50.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Linux/inc/ocfsdlmp.h	2003-07-30 10:28:53.000000000 +0200
@@ -30,7 +30,9 @@
 int ocfs_insert_sector_node (ocfs_super * osb, ocfs_lock_res * lock_res,
 			     ocfs_lock_res ** found_lockres);
 
-int ocfs_lookup_sector_node (ocfs_super * osb, ub8 lock_id, ocfs_lock_res ** lock_res);
+int ocfs_lookup_sector_node (ocfs_super * osb, __u64 lock_id, ocfs_lock_res ** lock_res);
+
+void ocfs_remove_sector_node (ocfs_super * osb, ocfs_lock_res * lock_res);
 
 int ocfs_volume_thread (void *arg);
 
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Linux/inc/ocfshash.h linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Linux/inc/ocfshash.h
--- linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Linux/inc/ocfshash.h	2003-07-30 13:51:50.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Linux/inc/ocfshash.h	2003-07-30 10:28:53.000000000 +0200
@@ -31,21 +31,21 @@
 typedef struct _HASHBUCKET
 {
 	void *key;
-	ub4 keylen;
+	__u32 keylen;
 	void *val;
-	ub4 vallen;
+	__u32 vallen;
 	struct _HASHBUCKET *next;
 }
 HASHBUCKET;
 
 typedef struct
 {
-	ub4 size;
-	ub4 mask;
-	ub4 entries;
-	ub4 inithash;
-	ub4 newbuckets;		/* Used for statistics */
-	ub4 reusedbuckets;	/* Used for statistics */
+	__u32 size;
+	__u32 mask;
+	__u32 entries;
+	__u32 inithash;
+	__u32 newbuckets;		/* Used for statistics */
+	__u32 reusedbuckets;	/* Used for statistics */
 	ocfs_sem hashlock;
 	HASHBUCKET *lastfree;
 	HASHBUCKET *freelist;
@@ -54,22 +54,22 @@ typedef struct
 HASHTABLE;
 
 /* Function prototypes */
-int ocfs_hash_create (HASHTABLE * ht, ub4 noofbits);
+int ocfs_hash_create (HASHTABLE * ht, __u32 noofbits);
 
 void ocfs_hash_destroy (HASHTABLE * ht, void (*freefn) (const void *p));
 
-int ocfs_hash_add (HASHTABLE * ht, void *key, ub4 keylen, void *val, ub4 vallen,
-		   void **found, ub4 *foundlen);
+int ocfs_hash_add (HASHTABLE * ht, void *key, __u32 keylen, void *val, __u32 vallen,
+		   void **found, __u32 *foundlen);
 
-int ocfs_hash_del (HASHTABLE * ht, void *key, ub4 keylen);
+int ocfs_hash_del (HASHTABLE * ht, void *key, __u32 keylen);
 
-int ocfs_hash_get (HASHTABLE * ht, void *key, ub4 keylen, void **val, ub4 * vallen);
+int ocfs_hash_get (HASHTABLE * ht, void *key, __u32 keylen, void **val, __u32 * vallen);
 
-void ocfs_hash_stat (HASHTABLE * ht, char *data, ub4 datalen);
+void ocfs_hash_stat (HASHTABLE * ht, char *data, __u32 datalen);
 
 #define HASHSTAT_BUFLEN         2048
 
-#define hashsize(n)             ((ub4)1<<(n))
+#define hashsize(n)             ((__u32)1<<(n))
 #define hashmask(n)             (hashsize(n)-1)
 
 #define HASHTABLE_DESTROYED(h)  (((HASHTABLE *)h)->buckets==NULL)
@@ -120,7 +120,7 @@ void ocfs_hash_stat (HASHTABLE * ht, cha
  * h = (h & hashmask(10));
  * In which case, the hash table should have hashsize(10) elements.
  *
- * If you are hashing n strings (ub1 **)k, do it like this:
+ * If you are hashing n strings (__u8 **)k, do it like this:
  * for (i=0, h=0; i<n; ++i) h = hash( k[i], len[i], h);
  *
  * By Bob Jenkins, 1996.  bob_jenkins@burtleburtle.net.  You may use this
@@ -131,6 +131,6 @@ void ocfs_hash_stat (HASHTABLE * ht, cha
  * acceptable.  Do NOT use for cryptographic purposes.
  * --------------------------------------------------------------------
  * */
-ub4 hash (ub1 * k, ub4 length, ub4 initval);
+__u32 hash (__u8 * k, __u32 length, __u32 initval);
 
 #endif				/* _OCFSHASH_H_ */
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Linux/inc/ocfsioctl.h linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Linux/inc/ocfsioctl.h
--- linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Linux/inc/ocfsioctl.h	2003-07-30 13:51:50.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Linux/inc/ocfsioctl.h	2003-07-30 10:28:53.000000000 +0200
@@ -37,7 +37,7 @@ struct ocfs_ioc
 {
 	char name[255];		/* "OCFS" */
 	char version[255];	/* version */
-	ub2 nodenum;		/* node number */
+	__u16 nodenum;		/* node number */
 	char nodename[255];	/* node name */
 };
 
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Linux/inc/ocfsiosup.h linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Linux/inc/ocfsiosup.h
--- linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Linux/inc/ocfsiosup.h	2003-07-30 13:51:50.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Linux/inc/ocfsiosup.h	2003-07-30 10:28:53.000000000 +0200
@@ -27,36 +27,38 @@
 #ifndef _OCFSIOSUP_H_
 #define _OCFSIOSUP_H_
 
-int ocfs_write_sector (ocfs_super * osb, void *Buffer, ub8 Offset);
+#define ocfs_write_sector(osb, buf, off)	\
+			ocfs_write_disk(osb, buf, OCFS_SECTOR_SIZE, off)
 
-int ocfs_read_sector (ocfs_super * osb, void *Buffer, ub8 Offset);
+#define ocfs_read_sector(osb, buf, off)		\
+			ocfs_read_disk(osb, buf, OCFS_SECTOR_SIZE, off)
 
-int LinuxWriteForceDisk (ocfs_super * osb, void *Buffer, ub4 Length,
-			 ub8 Offset, bool Cached);
+int LinuxWriteForceDisk (ocfs_super * osb, void *Buffer, __u32 Length,
+			 __u64 Offset, bool Cached);
 
-int LinuxReadForceDisk (ocfs_super * osb, void *Buffer, ub4 Length,
-			ub8 Offset, bool Cached);
+int LinuxReadForceDisk (ocfs_super * osb, void *Buffer, __u32 Length,
+			__u64 Offset, bool Cached);
 
-int ocfs_write_metadata (ocfs_super * osb, void *Buffer, ub4 Length,
-			 ub8 Offset);
+int ocfs_write_metadata (ocfs_super * osb, void *Buffer, __u32 Length,
+			 __u64 Offset);
 
-int ocfs_read_metadata (ocfs_super * osb, void *Buffer, ub4 Length,
-			ub8 Offset);
+int ocfs_read_metadata (ocfs_super * osb, void *Buffer, __u32 Length,
+			__u64 Offset);
 
-int ocfs_write_force_disk (ocfs_super * osb, void *Buffer, ub4 Length,
-			   ub8 Offset);
+int ocfs_write_force_disk (ocfs_super * osb, void *Buffer, __u32 Length,
+			   __u64 Offset);
 
-int ocfs_write_disk (ocfs_super * osb, void *Buffer, ub4 Length, ub8 Offset);
+int ocfs_write_disk (ocfs_super * osb, void *Buffer, __u32 Length, __u64 Offset);
 
-int ocfs_read_force_disk (ocfs_super * osb, void *Buffer, ub4 Length,
-			  ub8 Offset);
+int ocfs_read_force_disk (ocfs_super * osb, void *Buffer, __u32 Length,
+			  __u64 Offset);
 
-int ocfs_read_force_disk_ex (ocfs_super * osb, void **Buffer, ub4 AllocLen,
-			     ub4 ReadLen, ub8 Offset);
+int ocfs_read_force_disk_ex (ocfs_super * osb, void **Buffer, __u32 AllocLen,
+			     __u32 ReadLen, __u64 Offset);
 
-int ocfs_read_disk (ocfs_super * osb, void *Buffer, ub4 Length, ub8 Offset);
+int ocfs_read_disk (ocfs_super * osb, void *Buffer, __u32 Length, __u64 Offset);
 
-int ocfs_read_disk_ex (ocfs_super * osb, void **Buffer, ub4 AllocLen,
-		       ub4 ReadLen, ub8 Offset);
+int ocfs_read_disk_ex (ocfs_super * osb, void **Buffer, __u32 AllocLen,
+		       __u32 ReadLen, __u64 Offset);
 
 #endif				/* _OCFSIOSUP_H_ */
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Linux/inc/ocfsipc.h linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Linux/inc/ocfsipc.h
--- linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Linux/inc/ocfsipc.h	2003-07-30 13:51:50.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Linux/inc/ocfsipc.h	2003-07-30 10:28:53.000000000 +0200
@@ -37,12 +37,12 @@ int ocfs_init_udp (void);
 
 int ocfs_init_ipc_dlm (ocfs_protocol protocol);
 
-int ocfs_send_udp_msg (ocfs_ipc_config_info * send, void *msg, ub4 msglen,
+int ocfs_send_udp_msg (ocfs_ipc_config_info * send, void *msg, __u32 msglen,
 		       wait_queue_head_t * event);
 
 int ocfs_recv_udp_msg (ocfs_recv_ctxt * recv_ctxt);
 
-int ocfs_send_bcast (ocfs_super * osb, ub8 votemap, ocfs_dlm_msg * dlm_msg);
+int ocfs_send_bcast (ocfs_super * osb, __u64 votemap, ocfs_dlm_msg * dlm_msg);
 
 void ocfs_dlm_send_msg (ocfs_super * osb, ocfs_ipc_config_info * send,
 			ocfs_dlm_msg * dlm_msg);
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Linux/inc/ocfsmain.h linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Linux/inc/ocfsmain.h
--- linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Linux/inc/ocfsmain.h	2003-07-30 13:51:50.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Linux/inc/ocfsmain.h	2003-07-30 10:28:53.000000000 +0200
@@ -46,13 +46,13 @@ int ocfs_remount (struct super_block *sb
 
 typedef struct _ocfs_find_inode_args
 {
-	ub8 offset;
+	__u64 offset;
 	ocfs_file_entry *entry;
 }
 ocfs_find_inode_args;
 
 #ifdef OCFSMAIN_PRIVATE_DECLS
-static int ocfs_parse_options (char *options, uid_t * uid, gid_t * gid,
+static int ocfs_parse_options (char *options, __u32 * uid, __u32 * gid,
 			       bool * cache, bool * reclaim_id);
 static struct super_block *ocfs_read_super (struct super_block *sb, void *data,
 					    int silent);
@@ -65,14 +65,8 @@ int ocfs_read_params(void);
 static void ocfs_memcheck (void);
 #endif
 
-static void ocfs_populate_inode (struct inode *inode,
-				 ub8 offset,
-				 umode_t mode,
-				 uid_t uid,
-				 gid_t gid,
-				 loff_t size,
-				 time_t atime,
-				 time_t mtime, time_t ctime, void *genptr);
+static void ocfs_populate_inode (struct inode *inode, ocfs_file_entry *fe,
+				 umode_t mode, void *genptr);
 
 static void ocfs_read_inode2 (struct inode *inode, void *opaque);
 
@@ -82,10 +76,10 @@ static struct dentry *ocfs_lookup (struc
 
 static int ocfs_statfs (struct super_block *sb, struct statfs *buf);
 
-static int ocfs_file_write (struct file *filp,
+static ssize_t ocfs_file_write (struct file *filp,
 		 const char *buf, size_t count, loff_t * ppos);
 
-static int ocfs_file_read (struct file *filp, char *buf, size_t count, loff_t * ppos);
+static ssize_t ocfs_file_read (struct file *filp, char *buf, size_t count, loff_t * ppos);
 
 static int ocfs_readpage (struct file *file, struct page *page);
 
@@ -146,14 +140,16 @@ static int ocfs_dentry_revalidate (struc
 
 static void ocfs_set_exclusive_mount_flag (struct super_block *sb, int val);
 
-#if LINUX_VERSION_CODE < LinuxVersionCode(2,4,10)
 static ssize_t ocfs_rw_direct (int rw, struct file *filp, char *buf,
 			       size_t size, loff_t * offp);
-#endif
 
 #if LINUX_VERSION_CODE >= LinuxVersionCode(2,4,10)
 static int ocfs_direct_IO (int rw,
+#ifdef SUSE
+		struct file *filp,
+#else
 		struct inode *inode,
+#endif
 		struct kiobuf *iobuf, unsigned long blocknr, int blocksize);
 #endif
 
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Linux/inc/ocfsmount.h linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Linux/inc/ocfsmount.h
--- linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Linux/inc/ocfsmount.h	2003-07-30 13:51:50.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Linux/inc/ocfsmount.h	2003-07-30 10:28:53.000000000 +0200
@@ -27,7 +27,7 @@
 #ifndef _OCFSMOUNT_H_
 #define _OCFSMOUNT_H_
 
-int ocfs_read_disk_header (ub1 ** buffer, struct super_block *sb);
+int ocfs_read_disk_header (__u8 ** buffer, struct super_block *sb);
 
 int ocfs_mount_volume (struct super_block *sb, bool reclaim_id);
 
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Linux/inc/ocfsport.h linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Linux/inc/ocfsport.h
--- linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Linux/inc/ocfsport.h	2003-07-30 13:51:50.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Linux/inc/ocfsport.h	2003-07-30 10:28:53.000000000 +0200
@@ -27,8 +27,9 @@
 #ifndef _OCFSPORT_H_
 #define _OCFSPORT_H_
 
-/* timeout structure taken from Ben's aio.c */
 
+/* timeout structure taken from Ben's aio.c */
+#ifndef USERSPACE_TOOL
 typedef struct _ocfs_timeout {
 	struct timer_list	timer;
 	int			timed_out;
@@ -53,9 +54,9 @@ static inline void ocfs_init_timeout(ocf
 	init_waitqueue_head(&to->wait);
 }
 
-static inline void ocfs_set_timeout(ocfs_timeout *to, ub4 timeout)
+static inline void ocfs_set_timeout(ocfs_timeout *to, __u32 timeout)
 {
-	ub4 how_long;
+	__u32 how_long;
 
 	if (!timeout) {
 		to->timed_out = 1;
@@ -63,7 +64,8 @@ static inline void ocfs_set_timeout(ocfs
 	}
 
 	how_long = (timeout * HZ / 1000);
-	how_long = (how_long < 1) ? 1 : how_long;
+	if (how_long < 1)
+		how_long = 1;
 
 	to->timer.expires = jiffies + how_long;
 	add_timer(&to->timer);
@@ -123,7 +125,7 @@ do {								\
                 __ocfs_wait(wq, condition, timeout, __ret);	\
         __ret;							\
 })
-
+#endif				/* !USERSPACE_TOOL */
 
 void ocfs_init_sem (ocfs_sem * res);
 
@@ -135,47 +137,50 @@ int ocfs_del_sem (ocfs_sem * res);
 
 void ocfs_daemonize (char *name, int len);
 
-bool ocfs_get_task (pid_t pid, struct task_struct **task);
-
-int ocfs_sleep (ub4 ms);
+int ocfs_sleep (__u32 ms);
 
+#if 0
 void ocfs_print_qstr (struct qstr *x);
+#endif
 
 void ocfs_extent_map_init (ocfs_extent_map * map);
 
 void ocfs_extent_map_destroy (ocfs_extent_map * map);
 
-ub4 ocfs_extent_map_get_count (ocfs_extent_map * map);
+__u32 ocfs_extent_map_get_count (ocfs_extent_map * map);
 
-bool ocfs_extent_map_add (ocfs_extent_map * map, sb8 virtual,
-			  sb8 physical, sb8 sectorcount);
+bool ocfs_extent_map_add (ocfs_extent_map * map, __s64 virtual,
+			  __s64 physical, __s64 sectorcount);
 
-void ocfs_extent_map_remove (ocfs_extent_map * map, sb8 virtual,
-			     sb8 sectorcount);
+void ocfs_extent_map_remove (ocfs_extent_map * map, __s64 virtual,
+			     __s64 sectorcount);
 
-bool ocfs_extent_map_lookup (ocfs_extent_map * map, sb8 virtual,
-			     sb8 * physical, sb8 * sectorcount, ub4 * index);
+bool ocfs_extent_map_lookup (ocfs_extent_map * map, __s64 virtual,
+			     __s64 * physical, __s64 * sectorcount, __u32 * index);
 
-bool ocfs_extent_map_next_entry (ocfs_extent_map * map, ub4 runindex,
-				 sb8 * virtual, sb8 * physical,
-				 sb8 * sectorcount);
+bool ocfs_extent_map_next_entry (ocfs_extent_map * map, __u32 runindex,
+				 __s64 * virtual, __s64 * physical,
+				 __s64 * sectorcount);
 
 void *ocfs_dbg_slab_alloc (kmem_cache_t *slab, char *file, int line);
 void ocfs_dbg_slab_free (kmem_cache_t *slab, void *m);
 
 void *ocfs_linux_dbg_alloc (int Size, char *file, int line);
 
+#ifndef USERSPACE_TOOL
 void ocfs_linux_dbg_free (const void *Buffer);
+#endif
 
-bool ocfs_linux_get_inode_offset (struct inode *inode, ub8 * off,
+bool ocfs_linux_get_inode_offset (struct inode *inode, __u64 * off,
 				  ocfs_inode ** oin);
-
-bool ocfs_linux_get_dir_entry_offset (ocfs_super * osb, ub8 * off,
-				      ub8 parentOff, struct qstr * fileName,
+#ifndef USERSPACE_TOOL
+bool ocfs_linux_get_dir_entry_offset (ocfs_super * osb, __u64 * off,
+				      __u64 parentOff, struct qstr * fileName,
 				      ocfs_file_entry ** fileEntry);
+#endif
 
 void ocfs_flush_cache (ocfs_super * osb);
 
-bool ocfs_purge_cache_section (ocfs_inode * oin, ub8 * file_off, ub4 Length);
+bool ocfs_purge_cache_section (ocfs_inode * oin, __u64 * file_off, __u32 Length);
 
 #endif				/* _OCFSPORT_H_ */
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Linux/inc/ocfsproc.h linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Linux/inc/ocfsproc.h
--- linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Linux/inc/ocfsproc.h	2003-07-30 13:51:50.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Linux/inc/ocfsproc.h	2003-07-30 10:28:53.000000000 +0200
@@ -44,6 +44,9 @@ static int ocfs_proc_memallocs (char *pa
 		   char **start, off_t off, int count, int *eof, void *data);
 #endif
 
+static int ocfs_proc_globalctxt(char *page, 
+		char **start, off_t off, int count, int *eof, void *data);
+
 static int ocfs_proc_version (char *page,
 		 char **start, off_t off, int count, int *eof, void *data);
 
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Linux/ocfsbitmap.c linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Linux/ocfsbitmap.c
--- linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Linux/ocfsbitmap.c	2003-07-30 13:51:50.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Linux/ocfsbitmap.c	2003-07-30 10:28:53.000000000 +0200
@@ -27,7 +27,7 @@
 #if defined(__KERNEL__)
 #include  <ocfs.h>
 #else
-#include  <asm/bitops.h>
+//#include  <asm/bitops.h>
 #include  <debugocfs.h>
 #endif
 
@@ -43,7 +43,7 @@
  * ocfs_initialize_bitmap()
  *
  */
-void ocfs_initialize_bitmap (ocfs_alloc_bm * bitmap, void *buf, ub4 sz)
+void ocfs_initialize_bitmap (ocfs_alloc_bm * bitmap, void *buf, __u32 sz)
 {
 	LOG_ENTRY ();
 
@@ -59,12 +59,12 @@ void ocfs_initialize_bitmap (ocfs_alloc_
 /*
  * ocfs_find_clear_bits()
  *
- * sysonly is passed # bits in bitmap that are rserved for system file space in case we have 
- * a disk full.
+ * sysonly is passed # bits in bitmap that are rserved for system file space
+ * in case we have a disk full.
  */
-int ocfs_find_clear_bits (ocfs_alloc_bm * bitmap, ub4 numBits, ub4 offset, ub4 sysonly)
+int ocfs_find_clear_bits (ocfs_alloc_bm * bitmap, __u32 numBits, __u32 offset, __u32 sysonly)
 {
-	ub4 next_zero, off, count, size, first_zero = -1; 
+	__u32 next_zero, off, count, size, first_zero = -1; 
 	void *buffer;
 
 	LOG_ENTRY ();
@@ -74,7 +74,8 @@ int ocfs_find_clear_bits (ocfs_alloc_bm 
 	count = 0;
 	off = offset;
 
-	while ((size - off + count >= numBits) && (next_zero = find_next_zero_bit (buffer, size, off)) != size) {
+	while ((size - off + count >= numBits) &&
+	       (next_zero = find_next_zero_bit (buffer, size, off)) != size) {
                 if (next_zero >= bitmap->size - sysonly)
                     break;
 
@@ -90,19 +91,18 @@ int ocfs_find_clear_bits (ocfs_alloc_bm 
 
 		count++;
 
-		if (count == numBits) {
+		if (count == numBits)
 			goto bail;
-		}
 	}
 	first_zero = -1;
 
       bail:
+	if (first_zero != -1 && first_zero > bitmap->size) {
+		LOG_ERROR_ARGS("um... first_zero>bitmap->size (%d > %d)",
+			       first_zero, bitmap->size);
+		first_zero = -1;
+	}
 	LOG_EXIT_LONG (first_zero);
-        if (first_zero != -1 && first_zero > bitmap->size) 
-        {
-            LOG_ERROR_ARGS("um... first_zero>bitmap->size (%d > %d)\n", first_zero, bitmap->size);
-            first_zero = -1;
-        }
 	return first_zero;
 }				/* ocfs_find_clear_bits */
 
@@ -112,9 +112,9 @@ int ocfs_find_clear_bits (ocfs_alloc_bm 
  */
 int ocfs_count_bits (ocfs_alloc_bm * bitmap)
 {
-	ub4 size, count = 0, off = 0;
+	__u32 size, count = 0, off = 0;
 	unsigned char tmp;
-	ub1 *buffer;
+	__u8 *buffer;
 
 	LOG_ENTRY ();
 
@@ -138,7 +138,7 @@ int ocfs_count_bits (ocfs_alloc_bm * bit
  * ocfs_set_bits()
  *
  */
-void ocfs_set_bits (ocfs_alloc_bm * bitmap, ub4 start, ub4 num)
+void ocfs_set_bits (ocfs_alloc_bm * bitmap, __u32 start, __u32 num)
 {
 	LOG_ENTRY ();
 
@@ -153,7 +153,7 @@ void ocfs_set_bits (ocfs_alloc_bm * bitm
  * ocfs_clear_bits()
  *
  */
-void ocfs_clear_bits (ocfs_alloc_bm * bitmap, ub4 start, ub4 num)
+void ocfs_clear_bits (ocfs_alloc_bm * bitmap, __u32 start, __u32 num)
 {
 	LOG_ENTRY ();
 
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Linux/ocfsdlm.c linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Linux/ocfsdlm.c
--- linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Linux/ocfsdlm.c	2003-07-30 13:51:50.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Linux/ocfsdlm.c	2003-07-30 10:28:53.000000000 +0200
@@ -28,7 +28,7 @@
 #include  <ocfs.h>
 
 /* Tracing */
-#define OCFS_DEBUG_CONTEXT OCFS_DEBUG_CONTEXT_DLM
+#define OCFS_DEBUG_CONTEXT OCFS_DEBUG_CONTEXT_NM
 
 /*
  * ocfs_insert_sector_node()
@@ -38,26 +38,40 @@ int ocfs_insert_sector_node (ocfs_super 
 			     ocfs_lock_res ** found_lock_res)
 {
 	int status = 0;
-	ub4 tmp;
+	__u32 tmp;
 
-	LOG_ENTRY_ARGS ("(0x%08x, 0x%08x)\n", osb, lock_res);
+	LOG_ENTRY_ARGS ("(0x%p, 0x%p)\n", osb, lock_res);
 
 	if (HASHTABLE_DESTROYED (&(osb->root_sect_node))) {
-		LOG_ERROR_STR ("root_sect_node has already been destroyed!");
-		status = -EFAIL;
+		LOG_TRACE_STATUS (status = -EFAIL);
+		goto bail;
+	}
+
+	if (lock_res->signature != 0x55AA) {
+		LOG_ERROR_STATUS (status = -EFAIL);
 		goto bail;
 	}
 
 	if (!ocfs_hash_add (&(osb->root_sect_node), &(lock_res->sector_num),
-			    sizeof (ub8), lock_res, sizeof (ocfs_lock_res *),
-			    (void **)found_lock_res, &tmp))
-	{
+			    sizeof (__u64), lock_res, sizeof (ocfs_lock_res *),
+			    (void **)found_lock_res, &tmp)) {
 		LOG_ERROR_STATUS(status = -EFAIL);
 		goto bail;
 	}
 
-	LOG_TRACE_ARGS ("HashAdd: %u.%u, 0x%08x\n", HI (lock_res->sector_num),
-			LO (lock_res->sector_num), lock_res);
+	if (*found_lock_res) {
+		ocfs_get_lockres (*found_lock_res);
+		LOG_TRACE_ARGS ("isn: fres=0x%p, ref=%d, lid=%u.%u\n",
+				*found_lock_res,
+				atomic_read (&((*found_lock_res)->lr_ref_cnt)),
+				HILO((*found_lock_res)->sector_num));
+	}
+	else {
+		ocfs_get_lockres (lock_res);
+		LOG_TRACE_ARGS ("isn: lres=0x%p, ref=%d, lid=%u.%u\n", lock_res,
+				atomic_read (&lock_res->lr_ref_cnt),
+				HILO(lock_res->sector_num));
+	}
 
       bail:
 	LOG_EXIT_STATUS (status);
@@ -68,26 +82,39 @@ int ocfs_insert_sector_node (ocfs_super 
  * ocfs_lookup_sector_node()
  *
  */
-int ocfs_lookup_sector_node (ocfs_super * osb, ub8 lock_id, ocfs_lock_res ** lock_res)
+int ocfs_lookup_sector_node (ocfs_super * osb, __u64 lock_id, ocfs_lock_res ** lock_res)
 {
-	int status = -ENOENT;
-	ub4 len = 0;
+	int status = 0;
+	__u32 len = 0;
 
-	LOG_ENTRY_ARGS ("(0x%08x, %u.%u, 0x%08x)\n", osb, HI (lock_id),
+	LOG_ENTRY_ARGS ("(0x%p, %u.%u, 0x%p)\n", osb, HI (lock_id),
 			LO (lock_id), lock_res);
 
 	if (HASHTABLE_DESTROYED (&(osb->root_sect_node))) {
-		LOG_ERROR_STR ("root_sect_node has already been destroyed!");
 		status = -EFAIL;
+		LOG_TRACE_STATUS (status);
 		goto bail;
 	}
 
-	if (ocfs_hash_get (&(osb->root_sect_node), &(lock_id), sizeof (ub8),
+	if (ocfs_hash_get (&(osb->root_sect_node), &(lock_id), sizeof (__u64),
 			 (void **) lock_res, &len)) {
-		status = ((len == sizeof (ocfs_lock_res *)) ? 0 : -ENOENT);
-		LOG_TRACE_ARGS ("HashGet: %u.%u, 0x%08x\n", HI (lock_id),
-				LO (lock_id), *lock_res);
-	}
+		if (len != sizeof (ocfs_lock_res *)) {
+			LOG_ERROR_STATUS (status = -EFAIL);
+			goto bail;
+		}
+
+		if ((*lock_res)->signature != 0x55AA) {
+			LOG_ERROR_STATUS (status = -EFAIL);
+			goto bail;
+		}
+
+		ocfs_get_lockres (*lock_res);
+		LOG_TRACE_ARGS ("lsn: lid=%u.%u, lres=0x%p, ref=%d\n",
+				HILO(lock_id), *lock_res,
+				atomic_read (&((*lock_res)->lr_ref_cnt)));
+	} else
+		status = -ENOENT;
+
 
       bail:
 	LOG_EXIT_STATUS (status);
@@ -95,6 +122,38 @@ int ocfs_lookup_sector_node (ocfs_super 
 }				/* ocfs_lookup_sector_node */
 
 /*
+ * ocfs_remove_sector_node()
+ *
+ */
+void ocfs_remove_sector_node (ocfs_super * osb, ocfs_lock_res * lock_res)
+{
+	LOG_ENTRY_ARGS ("(0x%p, 0x%p)\n", osb, lock_res);
+
+	if (HASHTABLE_DESTROYED (&(osb->root_sect_node))) {
+		LOG_TRACE_STATUS (-EFAIL);
+		goto bail;
+	}
+
+	if (lock_res->signature != 0x55AA) {
+		LOG_ERROR_STATUS (-EFAIL);
+		goto bail;
+	}
+
+	LOG_TRACE_ARGS ("rsn: lres=0x%p, ref=%d, lid=%u.%u\n", lock_res,
+			atomic_read (&lock_res->lr_ref_cnt),
+			HILO(lock_res->sector_num));
+
+	ocfs_hash_del (&(osb->root_sect_node), &(lock_res->sector_num),
+		       sizeof (__u64));
+
+	ocfs_put_lockres (lock_res);
+
+      bail:
+	LOG_EXIT ();
+	return ;
+}				/* ocfs_remove_sector_node */
+
+/*
  * ocfs_volume_thread()
  * 
  * Called by OcfsMountVolume(). This function is executed as a kernel thread
@@ -105,6 +164,7 @@ int ocfs_volume_thread (void *arg)
 	ocfs_super *osb;
 	char proc[16];
 	int status = 0;
+	int flush_counter = 0;
 
 	LOG_ENTRY ();
 
@@ -113,6 +173,8 @@ int ocfs_volume_thread (void *arg)
 	sprintf (proc, "ocfsnm-%d", osb->osb_id);
 	ocfs_daemonize (proc, strlen(proc));
 
+	osb->dlm_task = current;
+
 	/* The delay changes based on multiplier */
 	while (!(OcfsGlobalCtxt.flags & OCFS_FLAG_SHUTDOWN_VOL_THREAD) &&
 	       !(osb->osb_flags & OCFS_OSB_FLAGS_BEING_DISMOUNTED)) {
@@ -131,6 +193,12 @@ int ocfs_volume_thread (void *arg)
 			if (osb->osb_flags & OCFS_OSB_FLAGS_BEING_DISMOUNTED)
 				break;
 		}
+
+		/* do a syncdev every 2 mins currently that is 500ms per cycle */
+		if (flush_counter++ == 240) {
+			fsync_no_super (osb->sb->s_dev);
+			flush_counter = 0;
+		}
 	}
 
 	complete (&(osb->complete));
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Linux/ocfsfile.c linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Linux/ocfsfile.c
--- linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Linux/ocfsfile.c	2003-07-30 13:51:50.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Linux/ocfsfile.c	2003-07-30 10:28:53.000000000 +0200
@@ -43,7 +43,7 @@ int ocfs_set_disposition_information (st
 	ocfs_inode *OIN = NULL;
 	ocfs_super *osb = NULL;
 	struct inode *inode;
-	ub8 parentOff, fileOff;
+	__u64 parentOff, fileOff;
 
 	LOG_ENTRY ();
 
@@ -58,8 +58,13 @@ int ocfs_set_disposition_information (st
 	if (inode_data_is_oin (inode)) {
 		OIN = ((ocfs_inode *)inode->u.generic_ip);
 		if (OIN == NULL) {
-			LOG_ERROR_STR ("Bad oin");
-			status = -EFAIL;
+			LOG_ERROR_STATUS (status = -EFAIL);
+			goto finally;
+		}
+
+		if (OIN->open_hndl_cnt > 0) {
+			LOG_TRACE_STR ("Cannot remove an open file");
+			status = -EBUSY;
 			goto finally;
 		}
 
@@ -76,7 +81,7 @@ int ocfs_set_disposition_information (st
 		}
 
 		if (OIN->oin_flags & OCFS_OIN_ROOT_DIRECTORY) {
-			LOG_TRACE_STR ("you cannot delete the root directory");
+			LOG_TRACE_STR ("Cannot delete the root directory");
 			status = -EPERM;
 			goto finally;
 		}
@@ -107,7 +112,7 @@ int ocfs_set_disposition_information (st
 
 	if (status < 0) {
 		if (status != -ENOTEMPTY && status != -EPERM &&
-		    status != -EBUSY) 
+		    status != -EBUSY && status != -EINTR)
 			LOG_ERROR_STATUS(status);
 		if (OIN) {
 			ocfs_down_sem (&(OIN->main_res), true);
@@ -144,26 +149,24 @@ int ocfs_set_rename_information (struct 
 	ocfs_inode *oldOIN = NULL;
 	ocfs_file_entry *newfe = NULL;
 	ocfs_file_entry *oldfe = NULL;
-	ub8 oldOffset;
-	ub8 newDirOff;
-	ub8 oldDirOff;
+	__u64 oldOffset;
+	__u64 newDirOff;
+	__u64 oldDirOff;
 	ocfs_super *osb = NULL;
 	bool DeleteTargetOin = false;
-        ub8 t;
+        __u64 t;
 
 	LOG_ENTRY ();
 
 	newfe = ocfs_allocate_file_entry ();
 	if (newfe == NULL) {
-		LOG_ERROR_STR ("Could not allocate mem for newfe");
-		status = -ENOMEM;
+		LOG_ERROR_STATUS (status = -ENOMEM);
 		goto finally;
 	}
 
 	oldfe = ocfs_allocate_file_entry ();
 	if (oldfe == NULL) {
-		LOG_ERROR_STR ("Could not allocate mem for oldfe");
-		status = -ENOMEM;
+		LOG_ERROR_STATUS (status = -ENOMEM);
 		goto finally;
 	}
 
@@ -179,6 +182,13 @@ int ocfs_set_rename_information (struct 
 		ocfs_linux_get_dir_entry_offset (osb, &oldOffset, oldDirOff, &(old_dentry->d_name), NULL);
 	}
 
+	if (oldOIN) {
+		if (oldOIN->open_hndl_cnt != 0) {
+			status = -EBUSY;
+			goto finally;
+		}
+	}
+
 	/* new parent dir offset */
 	if (inode_data_is_oin (new_dir))
 		newDirOff = ((ocfs_inode *)new_dir->u.generic_ip)->dir_disk_off;
@@ -197,8 +207,10 @@ int ocfs_set_rename_information (struct 
 			/* OIN exists and it's not marked for deletion! */
 			ocfs_down_sem (&(newOIN->main_res), true);
 			OCFS_SET_FLAG (newOIN->oin_flags, OCFS_OIN_IN_USE);
-			ocfs_up_sem (&(newOIN->main_res));
 			status = ocfs_verify_update_oin (osb, newOIN);
+			if (status < 0)
+				LOG_ERROR_STATUS (status);
+			ocfs_up_sem (&(newOIN->main_res));
 			DeleteTargetOin = true;
 		}
 	}
@@ -252,6 +264,7 @@ int ocfs_set_rename_information (struct 
 
 		status = ocfs_del_file (osb, oldDirOff, FLAG_DEL_NAME, oldOffset);
 		if (status < 0) {
+			if (status != -ENOTEMPTY && status != -EINTR)
 			LOG_ERROR_STATUS (status);
 			goto finally;
 		}
@@ -272,21 +285,36 @@ int ocfs_set_rename_information (struct 
 		DISK_LOCK_LAST_READ (oldfe) = t;
 		DISK_LOCK_READER_NODE (oldfe) = osb->node_num;
 		DISK_LOCK_WRITER_NODE (oldfe) = osb->node_num;
-		oldfe->modify_time = t;
-		oldfe->create_time = t;
+		oldfe->modify_time = CURRENT_TIME;
+		// oldfe->create_time = t;
 
 		status = ocfs_create_file (osb, newDirOff, oldfe);
 		if (status < 0) {
+			if (status != -EINTR)
 			LOG_ERROR_STATUS (status);
 			goto finally;
 		}
 
-		ocfs_commit_trans (osb, osb->curr_trans_id);
+		status = ocfs_commit_trans (osb, osb->curr_trans_id);
+		if (status < 0) {
+			LOG_ERROR_STATUS (status);
+			goto finally;
+		}
 
 		if (oldOIN) {
-			OCFS_SET_FLAG (oldOIN->oin_flags,
-				     OCFS_OIN_DELETE_ON_CLOSE);
+			// OCFS_SET_FLAG (oldOIN->oin_flags, OCFS_OIN_DELETE_ON_CLOSE);
+			ocfs_release_cached_oin (osb, oldOIN);
+			ocfs_release_oin (oldOIN, true);
+			if (new_dentry->d_inode)
+				fsync_inode_buffers(old_dentry->d_inode);
+		}
+		/* move the inode offset over to the new entry */
+		if (S_ISDIR (old_dentry->d_inode->i_mode)) {
+		SET_INODE_OFFSET (old_dentry->d_inode, oldfe->extents[0].disk_off);
+		} else {
+		SET_INODE_OFFSET (old_dentry->d_inode, oldfe->this_sector);
 		}
+
 	} else {
 		/* Write the new file name to disk */
 		LOG_TRACE_STR ("Source & Target Directories are same");
@@ -296,7 +324,11 @@ int ocfs_set_rename_information (struct 
 			goto finally;
 		}
 
-		ocfs_commit_trans (osb, osb->curr_trans_id);
+		status = ocfs_commit_trans (osb, osb->curr_trans_id);
+		if (status < 0) {
+			LOG_ERROR_STATUS (status);
+			goto finally;
+		}
 	}
 
       finally:
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Linux/ocfshash.c linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Linux/ocfshash.c
--- linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Linux/ocfshash.c	2003-07-30 13:51:50.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Linux/ocfshash.c	2003-07-30 10:28:53.000000000 +0200
@@ -34,10 +34,10 @@
  * ocfs_hash_create()
  *
  */
-int ocfs_hash_create (HASHTABLE *ht, ub4 noofbits)
+int ocfs_hash_create (HASHTABLE *ht, __u32 noofbits)
 {
 	int ret = 0;
-	ub4 size = 0;
+	__u32 size = 0;
 
 	LOG_ENTRY ();
 
@@ -60,7 +60,7 @@ int ocfs_hash_create (HASHTABLE *ht, ub4
 	size = ht->size * sizeof (HASHBUCKET);
 	ht->buckets = (HASHBUCKET *) ocfs_malloc (size);
 	if (!ht->buckets) {
-		LOG_ERROR_ARGS ("unable to allocate %u bytes of memory\n", size);
+		LOG_ERROR_ARGS ("unable to allocate %u bytes of memory", size);
 		goto bail;
 	}
 
@@ -83,7 +83,7 @@ void ocfs_hash_destroy (HASHTABLE *ht, v
 {
 	HASHBUCKET *bucket;
 	HASHBUCKET *nxtbucket;
-	ub4 slot;
+	__u32 slot;
 
 	LOG_ENTRY ();
 
@@ -134,13 +134,13 @@ void ocfs_hash_destroy (HASHTABLE *ht, v
  * @vallen: length of value
  *
  */
-int ocfs_hash_add (HASHTABLE * ht, void *key, ub4 keylen, void *val, ub4 vallen,
-		   void **found, ub4 *foundlen)
+int ocfs_hash_add (HASHTABLE * ht, void *key, __u32 keylen, void *val, __u32 vallen,
+		   void **found, __u32 *foundlen)
 {
 	HASHBUCKET *bucket;
 	HASHBUCKET *prvbucket = NULL;
 	HASHBUCKET *lastbucket;
-	ub4 slot;
+	__u32 slot;
 	int ret = 1;
 	int lockacqrd = false;
 
@@ -165,7 +165,7 @@ int ocfs_hash_add (HASHTABLE * ht, void 
 		if (bucket->key) {
 			if (!memcmp (bucket->key, key, keylen)) {
 				/* return warning & val if key already exists */
-				LOG_ERROR_STR ("Duplicate key");
+				LOG_TRACE_STR ("Duplicate key");
 				*found = bucket->val;
 				*foundlen = bucket->vallen;
 				ret = 2;
@@ -217,7 +217,8 @@ int ocfs_hash_add (HASHTABLE * ht, void 
 
 	/* Create a new bucket and add to the end of list */
 	if ((bucket = (HASHBUCKET *) ocfs_malloc (sizeof (HASHBUCKET))) == NULL) {
-		LOG_ERROR_STR ("Error in mem alloc");
+		LOG_ERROR_ARGS ("unable to allocate %u bytes of memory",
+				sizeof (HASHBUCKET));
 		ret = 0;
 		goto bail;
 	}
@@ -250,11 +251,11 @@ int ocfs_hash_add (HASHTABLE * ht, void 
  * @keylen: length of key
  *
  */
-int ocfs_hash_del (HASHTABLE * ht, void *key, ub4 keylen)
+int ocfs_hash_del (HASHTABLE * ht, void *key, __u32 keylen)
 {
 	HASHBUCKET *bucket;
 	HASHBUCKET *prvbucket = NULL;
-	ub4 slot;
+	__u32 slot;
 	int ret = 0;
 	int lockacqrd = false;
 
@@ -317,10 +318,10 @@ int ocfs_hash_del (HASHTABLE * ht, void 
  * ocfs_hash_get()
  *
  */
-int ocfs_hash_get (HASHTABLE * ht, void *key, ub4 keylen, void **val, ub4 * vallen)
+int ocfs_hash_get (HASHTABLE * ht, void *key, __u32 keylen, void **val, __u32 * vallen)
 {
 	HASHBUCKET *bucket;
-	ub4 slot;
+	__u32 slot;
 	int ret = 0;
 	int lockacqrd = false;
 
@@ -362,15 +363,15 @@ int ocfs_hash_get (HASHTABLE * ht, void 
  * ocfs_hash_stat()
  *
  */
-void ocfs_hash_stat (HASHTABLE * ht, char *data, ub4 datalen)
+void ocfs_hash_stat (HASHTABLE * ht, char *data, __u32 datalen)
 {
 	HASHBUCKET *bucket;
-	ub4 slot;
-	ub4 i;
+	__u32 slot;
+	__u32 i;
 	char tmp[HASHSTAT_BUFLEN];
 	char *p;
-	ub4 len = 0;
-	ub4 stats[10] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+	__u32 len = 0;
+	__u32 stats[10] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
 	int lockacqrd = false;
 
 	LOG_ENTRY ();
@@ -435,7 +436,7 @@ void ocfs_hash_stat (HASHTABLE * ht, cha
  * h = (h & hashmask(10));
  * In which case, the hash table should have hashsize(10) elements.
  *
- * If you are hashing n strings (ub1 **)k, do it like this:
+ * If you are hashing n strings (__u8 **)k, do it like this:
  * for (i=0, h=0; i<n; ++i) h = hash( k[i], len[i], h);
  *
  * By Bob Jenkins, 1996.  bob_jenkins@burtleburtle.net.  You may use this
@@ -446,12 +447,12 @@ void ocfs_hash_stat (HASHTABLE * ht, cha
  * acceptable.  Do NOT use for cryptographic purposes.
  * --------------------------------------------------------------------
  */
-ub4 hash (k, length, initval)
-register ub1 *k;		/* the key */
-register ub4 length;		/* the length of the key */
-register ub4 initval;		/* the previous hash, or an arbitrary value */
+__u32 hash (k, length, initval)
+register __u8 *k;		/* the key */
+register __u32 length;		/* the length of the key */
+register __u32 initval;		/* the previous hash, or an arbitrary value */
 {
-	register ub4 a, b, c, len;
+	register __u32 a, b, c, len;
 
 	/* Set up the internal state */
 	len = length;
@@ -460,12 +461,12 @@ register ub4 initval;		/* the previous h
 
    /*---------------------------------------- handle most of the key */
 	while (len >= 12) {
-		a += (k[0] + ((ub4) k[1] << 8) + ((ub4) k[2] << 16) +
-		      ((ub4) k[3] << 24));
-		b += (k[4] + ((ub4) k[5] << 8) + ((ub4) k[6] << 16) +
-		      ((ub4) k[7] << 24));
-		c += (k[8] + ((ub4) k[9] << 8) + ((ub4) k[10] << 16) +
-		      ((ub4) k[11] << 24));
+		a += (k[0] + ((__u32) k[1] << 8) + ((__u32) k[2] << 16) +
+		      ((__u32) k[3] << 24));
+		b += (k[4] + ((__u32) k[5] << 8) + ((__u32) k[6] << 16) +
+		      ((__u32) k[7] << 24));
+		c += (k[8] + ((__u32) k[9] << 8) + ((__u32) k[10] << 16) +
+		      ((__u32) k[11] << 24));
 		mix (a, b, c);
 		k += 12;
 		len -= 12;
@@ -475,26 +476,26 @@ register ub4 initval;		/* the previous h
 	c += length;
 	switch (len) {		/* all the case statements fall through */
 	    case 11:
-		    c += ((ub4) k[10] << 24);
+		    c += ((__u32) k[10] << 24);
 	    case 10:
-		    c += ((ub4) k[9] << 16);
+		    c += ((__u32) k[9] << 16);
 	    case 9:
-		    c += ((ub4) k[8] << 8);
+		    c += ((__u32) k[8] << 8);
 		    /* the first byte of c is reserved for the length */
 	    case 8:
-		    b += ((ub4) k[7] << 24);
+		    b += ((__u32) k[7] << 24);
 	    case 7:
-		    b += ((ub4) k[6] << 16);
+		    b += ((__u32) k[6] << 16);
 	    case 6:
-		    b += ((ub4) k[5] << 8);
+		    b += ((__u32) k[5] << 8);
 	    case 5:
 		    b += k[4];
 	    case 4:
-		    a += ((ub4) k[3] << 24);
+		    a += ((__u32) k[3] << 24);
 	    case 3:
-		    a += ((ub4) k[2] << 16);
+		    a += ((__u32) k[2] << 16);
 	    case 2:
-		    a += ((ub4) k[1] << 8);
+		    a += ((__u32) k[1] << 8);
 	    case 1:
 		    a += k[0];
 		    /* case 0: nothing left to add */
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Linux/ocfsioctl.c linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Linux/ocfsioctl.c
--- linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Linux/ocfsioctl.c	2003-07-30 13:51:50.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Linux/ocfsioctl.c	2003-07-30 10:28:53.000000000 +0200
@@ -37,12 +37,12 @@ int ocfs_ioctl (struct inode *inode,
 	    struct file *filp, unsigned int cmd, unsigned long arg)
 {
 	struct ocfs_ioc data;
-	extern char *OcfsVersion;
+	extern char *ocfs_version;
 	int ret = 0;
 	ocfs_super *osb;
 	ocfs_cdsl cdsl;
 
-	LOG_ENTRY_ARGS ("(0x%08x, 0x%08x, %u, %lu)\n", inode, filp, cmd, arg);
+	LOG_ENTRY_ARGS ("(0x%p, 0x%p, %u, %lu)\n", inode, filp, cmd, arg);
 
 	if (_IOC_TYPE (cmd) != OCFS_IOC_MAGIC) {
 		ret = -ENOTTY;
@@ -52,7 +52,7 @@ int ocfs_ioctl (struct inode *inode,
 	switch (cmd) {
 	    case OCFS_IOC_GETTYPE:
 		    strncpy (data.name, OCFS_NAME, sizeof (data.name) - 1);
-		    strncpy (data.version, OcfsVersion,
+		    strncpy (data.version, ocfs_version,
 			     sizeof (data.version) - 1);
 		    strncpy (data.nodename, OcfsGlobalCtxt.node_name,
 			     sizeof (data.nodename) - 1);
@@ -67,8 +67,10 @@ int ocfs_ioctl (struct inode *inode,
 			copy_from_user (&cdsl, (void *) arg,
 					sizeof (ocfs_cdsl));
 		    if (!ret) {
-			    if (ocfs_create_delete_cdsl (inode, filp, osb, &cdsl) < 0) {
-				    ret = -EINVAL;
+			    ret = ocfs_create_delete_cdsl (inode, filp, osb, &cdsl);
+			    if (ret < 0) {
+				    if (ret != -EINTR)
+					ret = -EINVAL;
 			    }
 		    }
 		    break;
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Linux/ocfsiosup.c linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Linux/ocfsiosup.c
--- linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Linux/ocfsiosup.c	2003-07-30 13:51:50.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Linux/ocfsiosup.c	2003-07-30 10:28:53.000000000 +0200
@@ -26,105 +26,138 @@
 
 #include "ocfs.h"
 #include <linux/locks.h>
+#include <linux/pagemap.h>
 
 /* Tracing */
 #define OCFS_DEBUG_CONTEXT      OCFS_DEBUG_CONTEXT_IOSUP
 
 /*
- * ocfs_write_sector()
- *
- */
-int ocfs_write_sector (ocfs_super * osb, void *Buffer, ub8 Offset)
-{
-	int ret;
-
-	LOG_ENTRY ();
-
-	ret = ocfs_write_disk (osb, Buffer, OCFS_SECTOR_SIZE, Offset);
-
-	LOG_EXIT_STATUS (ret);
-	return ret;
-}				/* ocfs_write_sector */
-
-/*
- * ocfs_read_sector()
- *
- */
-int ocfs_read_sector (ocfs_super * osb, void *Buffer, ub8 Offset)
-{
-	int ret;
-
-	LOG_ENTRY ();
-
-	ret = ocfs_read_disk (osb, Buffer, OCFS_SECTOR_SIZE, Offset);
-
-	LOG_EXIT_STATUS (ret);
-	return ret;
-}				/* ocfs_read_sector */
-
-/*
  * LinuxWriteForceDisk()
  *
  */
 int LinuxWriteForceDisk (ocfs_super * osb,
-		     void *Buffer, ub4 Length, ub8 Offset, bool Cached)
+		     void *Buffer, __u32 Length, __u64 Offset, bool Cached)
 {
 	int status = 0;
+	int nr, i;
 	struct super_block *sb;
-	ub8 blocknum;
+	__u64 blocknum;
 	kdev_t dev;
 	struct buffer_head *bh;
+	struct buffer_head **bhs = NULL;
+	char *kaddr;
 
-	LOG_ENTRY_ARGS ("(0x%08x, 0x%08x, %u, %u.%u)\n", osb, Buffer, Length,
+	LOG_ENTRY_ARGS ("(0x%p, 0x%p, %u, %u.%u)\n", osb, Buffer, Length,
 			HI (Offset), LO (Offset));
 
+#ifdef NO_CACHE
+	Cached = false;
+#endif
+
+	if (Length % 512) {
+                LOG_ERROR_STATUS (status = -EFAIL);
+                goto bail;
+        }
+
 	if (osb == NULL || osb->sb == NULL) {
-		status = -EFAIL;
-		LOG_TRACE_STR ("Bad osb or superblock");
+		LOG_ERROR_STATUS (status = -EFAIL);
 		goto bail;
 	}
 
 	sb = osb->sb;
 	dev = sb->s_dev;
 
+	/* !!!! I don't really know where to put this... !!!! */
+	if (Cached) {
+		ocfs_io_runs *runs;
+		__u32 num_runs;
+
+		ocfs_create_log_extent_map(osb, &runs, &num_runs, Offset,
+				(__u64)Length);
+		// on NT they do the io straight off the io_runs
+		// but we do the buffer_head stuff below... just free?
+		ocfs_safefree(runs);
+		LOG_TRACE_ARGS("woo!  %d runs were just added to the trans_mcb!\n", num_runs);
+	}
+
+
+	nr = (Length + 511) >> 9;
+	if (nr > 256)
+		LOG_TRACE_ARGS("getting write for %d blocks\n", nr);
+	bhs = kmalloc (nr * sizeof(bh), GFP_KERNEL);
+	if (bhs == NULL) {
+		LOG_ERROR_STATUS (status = -ENOMEM);
+		goto bail;
+	}
+
 	blocknum = Offset >> sb->s_blocksize_bits;
 
 	if (blocknum == 0) {
+		ocfs_vol_disk_hdr *hdr;
 		LOG_TRACE_STR ("Blocknum is zero!!!");
+		hdr = (ocfs_vol_disk_hdr *)Buffer;
+		if (memcmp(hdr->signature, OCFS_VOLUME_SIGNATURE, strlen(OCFS_VOLUME_SIGNATURE)) != 0) {
+			status = -EIO;
+			LOG_ERROR_STR("WARNING! attempting to write non volume header to block 0");
+			goto bail;
+		}
 	}
 
-	do {
-		if (Length < sb->s_blocksize)
-			bh = bread (dev, blocknum++, Length);
-		else
-			bh = getblk (dev, blocknum++, sb->s_blocksize);
-
+	/* build an array of bh's and prepare them for submit */
+	for (i = 0 ; i < nr ; i++) {
+		bh = getblk (dev, blocknum++, sb->s_blocksize);
 		if (bh == NULL) {
-			status = -EFAIL;
+			LOG_ERROR_STATUS (status = -EFAIL);
 			goto bail;
 		}
 		lock_buffer(bh);
-		memcpy (bh->b_data, Buffer,
-			Length < sb->s_blocksize ? Length : sb->s_blocksize);
-		unlock_buffer(bh);
-		mark_buffer_dirty (bh);
-		ll_rw_block (WRITE, 1, &bh);
-		if ((osb->cache_fs || Cached) &&	/* either type of cache */
-			Offset > osb->vol_layout.data_start_off)
+
+		/* if the new buffer is the same as the old buffer then don't bother doing anything
+		 * this is only the case for locks that we rewrite to disk
+		 * and are awlays 1 sector sized writes coming in
+		 */
+		kaddr = kmap(bh->b_page);
+#ifdef NO_CACHE
+		if (nr == 1 && Offset >= osb->vol_layout.data_start_off &&
+		    (memcmp(kaddr + ((unsigned long)(bh)->b_data & ~PAGE_MASK), Buffer, 512) == 0))
+#else
+		if (Cached && nr == 1 && Offset >= osb->vol_layout.data_start_off &&
+		    (memcmp(kaddr + ((unsigned long)(bh)->b_data & ~PAGE_MASK), Buffer, 512) == 0))
+#endif
 		{
-			wait_on_buffer (bh);
-			put_bh (bh);
-		} else {
-			wait_on_buffer (bh);
-			bforget(bh);
-			bh = NULL;
+			kunmap(bh->b_page);
+			unlock_buffer(bh);
+			brelse(bh);
+			goto bail;
 		}
+		memcpy(kaddr + ((unsigned long)(bh)->b_data & ~PAGE_MASK), Buffer, 512);
+		kunmap(bh->b_page);
+		mark_buffer_uptodate(bh, true);
+		mark_buffer_dirty(bh);
+		unlock_buffer(bh);
+		bhs[i] = bh;
+		Buffer = (__u8 *) Buffer + sb->s_blocksize;
+	}
+
+	/* we do not do ll_rw_block if we are in Cached, 1 block, and above datastartoff */
+	/* otherwise we always call ll_rw_block */
+
+	if (!Cached || nr != 1 || Offset < osb->vol_layout.data_start_off)
+		ll_rw_block (WRITE, nr, bhs);
+
+	/* reap blocks */
+	for (i = 0 ; i < nr ; i++) {
+		bh = bhs[i];
+		if (!Cached || ( nr != 1 || Offset < osb->vol_layout.data_start_off)) 
+			wait_on_buffer(bh);
+		brelse(bh);
+	}
 
-		Buffer = (ub1 *) Buffer + sb->s_blocksize;
-		Length -= sb->s_blocksize;
-	} while (Length > 0);
 
       bail:
+      	if (bhs)
+		kfree(bhs);
+
 	LOG_EXIT_STATUS (status);
 	return status;
 }				/* LinuxWriteForceDisk */
@@ -134,79 +167,87 @@ int LinuxWriteForceDisk (ocfs_super * os
  *
  */
 int LinuxReadForceDisk (ocfs_super * osb,
-		    void *Buffer, ub4 Length, ub8 Offset, bool Cached)
+		    void *Buffer, __u32 Length, __u64 Offset, bool Cached)
 {
 	int status = 0;
 	struct super_block *sb;
-	ub4 numbuffers;
-	ub8 blocknum;
+	int nr, i;
+	__u64 blocknum;
 	kdev_t dev;
 	struct buffer_head *bh;
+	struct buffer_head **bhs = NULL;
+	char *kaddr;
 
-	LOG_ENTRY_ARGS ("(0x%08x, 0x%08x, %u, %u.%u)\n", osb, Buffer, Length,
+	LOG_ENTRY_ARGS ("(0x%p, 0x%p, %u, %u.%u)\n", osb, Buffer, Length,
 			HI (Offset), LO (Offset));
 
+#ifdef NO_CACHE
+	Cached = false;
+#endif
+
+	if (Length % 512) {
+		LOG_ERROR_STATUS (status = -EFAIL);
+		goto bail;
+	}
+
 	if (osb == NULL || osb->sb == NULL) {
-		status = -EFAIL;
-		LOG_TRACE_STR ("Bad osb or superblock");
+		LOG_ERROR_STATUS (status = -EFAIL);
 		goto bail;
 	}
 
 	sb = osb->sb;
 	dev = sb->s_dev;
 
-	if (Length > sb->s_blocksize)
-		numbuffers = Length >> sb->s_blocksize_bits;
-	else if (Length > 0)
-		numbuffers = 1;
-	else
-		numbuffers = 0;
+	nr = (Length + 511) >> 9;
+	bhs = kmalloc (nr * sizeof(bh), GFP_KERNEL);
+	if (bhs == NULL) {
+	        LOG_ERROR_STATUS (status = -ENOMEM);
+	        goto bail;
+	}
 
 	blocknum = Offset >> sb->s_blocksize_bits;
 
-	if (numbuffers < 1) {
+	if (nr == 0) {
 		LOG_TRACE_STR ("No buffers will be read!!!");
 		LOG_TRACE_ARGS
 		    ("Len=%u Off=%u.%u numbuffers=%u blocknum=%u.%u\n", Length,
-		     HI (Offset), LO (Offset), numbuffers, HI (blocknum),
+		     HI (Offset), LO (Offset), nr, HI (blocknum),
 		     LO (blocknum));
 	}
 
-	while (numbuffers--) {
-		bh = getblk (dev, blocknum++, sb->s_blocksize);
-		if (bh == NULL) {
-			status = -EFAIL;
-			LOG_TRACE_ARGS
-			    ("getblk failed for block %u.%u, size %u\n",
-			     HI (blocknum - 1), LO (blocknum - 1),
-			     sb->s_blocksize);
-			goto bail;
-		}
-		if ((!(osb->cache_fs || Cached)) || 
-				Offset < osb->vol_layout.data_start_off)
-		{
-			mark_buffer_uptodate(bh, false);
-			ll_rw_block (READ, 1, &bh);
-			wait_on_buffer (bh);
-			lock_buffer(bh);
-			memcpy (Buffer, bh->b_data, sb->s_blocksize);
-			unlock_buffer(bh);
-			put_bh(bh);
-			bh = NULL;
-		} else {
-			//mark_buffer_uptodate(bh, false);
-			ll_rw_block (READ, 1, &bh);
-			wait_on_buffer (bh);
+	for (i = 0 ; i < nr ; i++) {
+                bh = getblk (dev, blocknum++, sb->s_blocksize);
+                if (bh == NULL) {
+                        LOG_ERROR_STATUS (status = -EFAIL);
+                        goto bail;
+                }
+                bhs[i] = bh;
+		if (!Cached || Offset < osb->vol_layout.data_start_off) {
 			lock_buffer(bh);
-			memcpy (Buffer, bh->b_data, sb->s_blocksize);
+			if (!buffer_dirty(bh)) 
+				mark_buffer_uptodate(bh, false);
 			unlock_buffer(bh);
-			put_bh (bh);
 		}
+	}	
 
-		Buffer = (ub1 *) Buffer + sb->s_blocksize;
-	}
+	ll_rw_block(READ, nr, bhs);
+
+	for (i = 0; i < nr ; i++) {
+		bh = bhs[i];
+		wait_on_buffer(bh);
+                lock_buffer(bh);
+		kaddr = kmap(bh->b_page);
+                memcpy(Buffer, kaddr + ((unsigned long)(bh)->b_data & ~PAGE_MASK), 512);
+		kunmap(bh->b_page);
+                unlock_buffer(bh);
+                Buffer = (__u8 *) Buffer + sb->s_blocksize;
+		brelse(bh);
+        }
 
       bail:
+	if (bhs)
+		kfree(bhs);
+
 	LOG_EXIT_STATUS (status);
 	return status;
 
@@ -216,14 +257,14 @@ int LinuxReadForceDisk (ocfs_super * osb
  * ocfs_write_metadata()
  *
  */
-int ocfs_write_metadata (ocfs_super * osb, void *Buffer, ub4 Length, ub8 Offset)
+int ocfs_write_metadata (ocfs_super * osb, void *Buffer, __u32 Length, __u64 Offset)
 {
 	int status = 0;
-	sb8 tempVbo = 0;
-	sb8 tempLbo = 0;
+	__s64 tempVbo = 0;
+	__s64 tempLbo = 0;
 	bool bRet = false;
 
-	LOG_ENTRY_ARGS ("(0x%08x, 0x%08x, %u, %u.%u)\n", osb, Buffer, Length,
+	LOG_ENTRY_ARGS ("(0x%p, 0x%p, %u, %u.%u)\n", osb, Buffer, Length,
 			HI (Offset), LO (Offset));
 
 	tempLbo = tempVbo = Offset;
@@ -241,17 +282,20 @@ int ocfs_write_metadata (ocfs_super * os
 	ocfs_down_sem (&(osb->map_lock), true);
 	bRet =
 	    ocfs_add_extent_map_entry (osb, &osb->metadata_map, tempVbo, tempLbo,
-				   (ub4) Length);
+				   (__u32) Length);
 	if (!bRet) {
 		ocfs_remove_extent_map_entry (osb, &osb->metadata_map, tempVbo,
 					  Length);
 		bRet =
 		    ocfs_add_extent_map_entry (osb, &osb->metadata_map, tempVbo,
-					   tempLbo, (ub4) Length);
+					   tempLbo, (__u32) Length);
 	}
 	ocfs_up_sem (&(osb->map_lock));
 
 	status = LinuxWriteForceDisk (osb, Buffer, Length, Offset, true);
+	if (status < 0)
+		LOG_ERROR_STATUS (status);
+
 	LOG_EXIT_STATUS (status);
 	return status;
 }				/* ocfs_write_metadata */
@@ -261,18 +305,18 @@ int ocfs_write_metadata (ocfs_super * os
  * ocfs_read_metadata()
  *
  */
-int ocfs_read_metadata (ocfs_super * osb, void *Buffer, ub4 Length, ub8 Offset)
+int ocfs_read_metadata (ocfs_super * osb, void *Buffer, __u32 Length, __u64 Offset)
 {
 	int status = 0;
-	ub4 RunsInExtentMap = 0, ExtentMapIndex;
-	sb8 diskOffsetToFind = 0, foundFileOffset = 0;
-	sb8 foundDiskOffset = 0;
-	ub4 tempLen = 0, numMetaDataRuns = 0, numDataRuns = 0;
-	ub4 remainingLength, length, i = 0;
+	__u32 RunsInExtentMap = 0, ExtentMapIndex;
+	__s64 diskOffsetToFind = 0, foundFileOffset = 0;
+	__s64 foundDiskOffset = 0;
+	__u32 tempLen = 0, numMetaDataRuns = 0, numDataRuns = 0;
+	__u32 remainingLength, length, i = 0;
         bool free_data=false, free_md=false;
 	ocfs_io_runs *IoDataRuns = NULL, *IoMetaDataRuns = NULL;
 
-	LOG_ENTRY_ARGS ("(0x%08x, 0x%08x, %u, %u.%u)\n", osb, Buffer, Length,
+	LOG_ENTRY_ARGS ("(0x%p, 0x%p, %u, %u.%u)\n", osb, Buffer, Length,
 			HI (Offset), LO (Offset));
 
         /* try to use prealloc ioruns if available */
@@ -303,7 +347,7 @@ int ocfs_read_metadata (ocfs_super * osb
             free_md=true;
 	    IoMetaDataRuns = ocfs_malloc (IORUN_ALLOC_SIZE);
 	    if (IoMetaDataRuns == NULL) {
-		    LOG_ERROR_STATUS (status -ENOMEM);
+		    LOG_ERROR_STATUS (status = -ENOMEM);
 		    goto finally;
 	    }
         }
@@ -441,32 +485,37 @@ int ocfs_read_metadata (ocfs_super * osb
 	/* look for the specified offset in the map .if it exists then */
 	/* do the read from cache, else go to disk. */
 	for (i = 0; i < numDataRuns; i++) {
-		ub8 newOffset = 0;
-		ub4 newLength = IoDataRuns[i].byte_cnt;
-		ub4 diff;
+		__u64 newOffset = 0;
+		__u32 newLength = IoDataRuns[i].byte_cnt;
+		__u32 diff;
 
 		newOffset = IoDataRuns[i].disk_off;
-		diff = (ub4) (newOffset - Offset);
+		diff = (__u32) (newOffset - Offset);
 
 		status =
-		    ocfs_read_force_disk (osb, (void *) ((ub1 *) Buffer + diff),
+		    ocfs_read_force_disk (osb, (void *) ((__u8 *) Buffer + diff),
 				       newLength, newOffset);
 		if (status < 0) {
+			LOG_ERROR_STATUS (status);
 			goto finally;
 		}
 	}
 
 	for (i = 0; i < numMetaDataRuns; i++) {
-		ub8 newOffset = 0;
-		ub4 diff;
-		ub4 newLength = IoMetaDataRuns[i].byte_cnt;
+		__u64 newOffset = 0;
+		__u32 diff;
+		__u32 newLength = IoMetaDataRuns[i].byte_cnt;
 
 		newOffset = IoMetaDataRuns[i].disk_off;
 
-		diff = (ub4) (newOffset - Offset);
+		diff = (__u32) (newOffset - Offset);
 
-		LinuxReadForceDisk (osb, (void *) ((ub1 *) Buffer + diff),
+		status = LinuxReadForceDisk (osb, (void *) ((__u8 *) Buffer + diff),
 				    newLength, newOffset, true);
+		if (status < 0) {
+			LOG_ERROR_STATUS (status);
+			goto finally;
+		}
 	}
 
       finally:
@@ -500,7 +549,7 @@ int ocfs_read_metadata (ocfs_super * osb
  * ocfs_write_force_disk()
  *
  */
-int ocfs_write_force_disk (ocfs_super * osb, void *Buffer, ub4 Length, ub8 Offset)
+int ocfs_write_force_disk (ocfs_super * osb, void *Buffer, __u32 Length, __u64 Offset)
 {
 	return LinuxWriteForceDisk (osb, Buffer, Length, Offset, false);
 }				/* ocfs_write_force_disk */
@@ -509,7 +558,7 @@ int ocfs_write_force_disk (ocfs_super * 
  * ocfs_write_disk()
  *
  */
-int ocfs_write_disk (ocfs_super * osb, void *Buffer, ub4 Length, ub8 Offset)
+int ocfs_write_disk (ocfs_super * osb, void *Buffer, __u32 Length, __u64 Offset)
 {
 	return LinuxWriteForceDisk (osb, Buffer, Length, Offset, false);
 }				/* ocfs_write_disk */
@@ -518,7 +567,7 @@ int ocfs_write_disk (ocfs_super * osb, v
  * ocfs_read_force_disk()
  *
  */
-int ocfs_read_force_disk (ocfs_super * osb, void *Buffer, ub4 Length, ub8 Offset)
+int ocfs_read_force_disk (ocfs_super * osb, void *Buffer, __u32 Length, __u64 Offset)
 {
 	return LinuxReadForceDisk (osb, Buffer, Length, Offset, false);
 }				/* ocfs_read_force_disk */
@@ -527,8 +576,8 @@ int ocfs_read_force_disk (ocfs_super * o
  * ocfs_read_force_disk_ex()
  *
  */
-int ocfs_read_force_disk_ex (ocfs_super * osb, void **Buffer, ub4 AllocLen,
-			     ub4 ReadLen, ub8 Offset)
+int ocfs_read_force_disk_ex (ocfs_super * osb, void **Buffer, __u32 AllocLen,
+			     __u32 ReadLen, __u64 Offset)
 {
 	int status = 0;
 
@@ -557,7 +606,7 @@ int ocfs_read_force_disk_ex (ocfs_super 
  * ocfs_read_disk()
  *
  */
-int ocfs_read_disk (ocfs_super * osb, void *Buffer, ub4 Length, ub8 Offset)
+int ocfs_read_disk (ocfs_super * osb, void *Buffer, __u32 Length, __u64 Offset)
 {
 	if (Offset < osb->vol_layout.bitmap_off)
 		return LinuxReadForceDisk (osb, Buffer, Length, Offset, false);
@@ -568,8 +617,8 @@ int ocfs_read_disk (ocfs_super * osb, vo
  * ocfs_read_disk_ex()
  *
  */
-int ocfs_read_disk_ex (ocfs_super * osb, void **Buffer, ub4 AllocLen,
-		       ub4 ReadLen, ub8 Offset)
+int ocfs_read_disk_ex (ocfs_super * osb, void **Buffer, __u32 AllocLen,
+		       __u32 ReadLen, __u64 Offset)
 {
 	int status = 0;
 
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Linux/ocfsipc.c linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Linux/ocfsipc.c
--- linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Linux/ocfsipc.c	2003-07-30 13:51:50.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Linux/ocfsipc.c	2003-07-30 10:28:53.000000000 +0200
@@ -62,6 +62,7 @@ int ocfs_recv_thread (void *unused)
 
 #define LISTENER_PROCESS_NAME	"ocfslsnr"
 	ocfs_daemonize (LISTENER_PROCESS_NAME, strlen(LISTENER_PROCESS_NAME));
+	OcfsIpcCtxt.task = current;
 
 	while (1) {
 		recv_ctxt = ocfs_malloc (sizeof (ocfs_recv_ctxt));
@@ -130,12 +131,11 @@ int ocfs_init_udp (void)
 				   CLONE_FS | CLONE_FILES | CLONE_SIGHAND);
 	if (child_pid < 0) {
 		status = -EFAIL;
-		LOG_ERROR_ARGS ("unable to launch ipcdlm (%d)\n", child_pid);
+		LOG_ERROR_ARGS ("unable to launch ocfslsnr thread, error=%d",
+				child_pid);
 		goto bail;
 	} else {
 		init_completion (&(OcfsIpcCtxt.complete));
-		if (!ocfs_get_task (child_pid, &(OcfsIpcCtxt.task)))
-			OcfsIpcCtxt.task = NULL;
 	}
 
       bail:
@@ -180,7 +180,7 @@ int ocfs_init_ipc_dlm (ocfs_protocol pro
  * ocfs_send_udp_msg()
  *
  */
-int ocfs_send_udp_msg (ocfs_ipc_config_info * send, void *msg, ub4 msglen,
+int ocfs_send_udp_msg (ocfs_ipc_config_info * send, void *msg, __u32 msglen,
 		       wait_queue_head_t * event)
 {
 	struct sockaddr_in sin;
@@ -193,8 +193,13 @@ int ocfs_send_udp_msg (ocfs_ipc_config_i
 	sin.sin_addr.s_addr = in_aton(send->ip_addr);
 	sin.sin_port = htons(send->ip_port);
 
-	LOG_TRACE_ARGS ("about to send to %s:%u\n",
-			send->ip_addr, send->ip_port);
+	LOG_TRACE_ARGS ("about to send to %s:%u\n", send->ip_addr,
+			send->ip_port);
+
+	if (!OcfsIpcCtxt.send_sock) {
+		LOG_ERROR_STATUS (status = -EFAIL);
+		goto bail;
+	}
 
 	status = ocfs_send_to (OcfsIpcCtxt.send_sock, (struct sockaddr *) &sin,
 			       sizeof (sin), msg, msglen);
@@ -250,11 +255,11 @@ int ocfs_recv_udp_msg (ocfs_recv_ctxt * 
  * ocfs_send_bcast()
  *
  */
-int ocfs_send_bcast (ocfs_super * osb, ub8 votemap, ocfs_dlm_msg * dlm_msg)
+int ocfs_send_bcast (ocfs_super * osb, __u64 votemap, ocfs_dlm_msg * dlm_msg)
 {
 	int status = 0;
-	ub4 nodemap;
-	ub4 nodenum;
+	__u32 nodemap;
+	__u32 nodenum;
 	ocfs_node_config_info *node;
 
 	LOG_ENTRY_ARGS ("(votemap=0x%x)\n", LO(votemap));
@@ -309,7 +314,7 @@ int ocfs_init_udp_sock (struct socket **
 	/* Create Send Socket */
 	status = sock_create (PF_INET, SOCK_DGRAM, IPPROTO_UDP, send_sock);
 	if (status < 0) {
-		LOG_ERROR_ARGS ("unable to create socket, error=%d\n", status);
+		LOG_ERROR_ARGS ("unable to create socket, error=%d", status);
 		goto bail;
 	}
 
@@ -322,14 +327,14 @@ int ocfs_init_udp_sock (struct socket **
 	status = (*send_sock)->ops->bind (*send_sock, (struct sockaddr *) &sin,
 					 sizeof (sin));
 	if (status < 0) {
-		LOG_ERROR_ARGS ("unable to bind socket, error=%d\n", status);
+		LOG_ERROR_ARGS ("unable to bind socket, error=%d", status);
 		goto bail;
 	}
 
 	/* Create Receive Socket */
 	status = sock_create (PF_INET, SOCK_DGRAM, IPPROTO_UDP, recv_sock);
 	if (status < 0) {
-		LOG_ERROR_ARGS ("unable to create socket, error=%d\n", status);
+		LOG_ERROR_ARGS ("unable to create socket, error=%d", status);
 		goto bail;
 	}
 
@@ -344,7 +349,7 @@ int ocfs_init_udp_sock (struct socket **
 	status = (*recv_sock)->ops->bind (*recv_sock, (struct sockaddr *) &sin,
 					 sizeof (sin));
 	if (status < 0) {
-		LOG_ERROR_ARGS ("unable to bind socket, error=%d\n", status);
+		LOG_ERROR_ARGS ("unable to bind socket, error=%d", status);
 		goto bail;
 	}
 
@@ -384,7 +389,7 @@ int ocfs_send_to (struct socket *sock, s
 	set_fs (oldfs);
 
 	if (error < 0) {
-		LOG_ERROR_ARGS ("unable to sendmsg, error=%d\n", error);
+		LOG_ERROR_ARGS ("unable to sendmsg, error=%d", error);
 		status = -EFAIL;
 	}
 
@@ -427,7 +432,7 @@ int ocfs_recv_from (struct socket *sock,
 			LOG_TRACE_STR ("Shutting down ipcdlm");
 			goto bail;
 		} else {
-			LOG_ERROR_ARGS ("unable to recvmsg, error=%d\n", error);
+			LOG_ERROR_ARGS ("unable to recvmsg, error=%d", error);
 			goto bail;
 		}
 	} else {
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Linux/ocfsmain.c linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Linux/ocfsmain.c
--- linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Linux/ocfsmain.c	2003-07-30 13:51:50.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Linux/ocfsmain.c	2003-07-30 10:28:53.000000000 +0200
@@ -28,6 +28,7 @@
 
 #include <ocfs.h>
 #include <linux/iobuf.h>
+#include <linux/sysctl.h>
 
 /* Tracing */
 #define OCFS_DEBUG_CONTEXT      OCFS_DEBUG_CONTEXT_INIT
@@ -41,142 +42,161 @@
 ** Globals
 */
 ocfs_global_ctxt OcfsGlobalCtxt;
-char *OcfsVersion = "0.6";
-
-ocfs_errent ocfs_error_strings[] =
-        {{-EACCES, "Permission denied"},
-         {-EAGAIN, "Try again"},
-         {-EBADF, "Bad file number"},
-         {-EBADFD, "File descriptor in bad state"},
-         {-EBUSY, "Device or resource busy"},
-         {-EEXIST, "File exists"},
-         {-EINVAL, "Invalid argument"},
-         {-EIO, "I/O error"},
-         {-EMLINK, "Too many links"},
-         {-ENAMETOOLONG, "File name too long"},
-         {-ENOENT, "No such file or directory"},
-         {-ENOMEM, "Out of memory"},
-         {-ENOSPC, "No space left on device"},
-         {-ENOTDIR, "Not a directory"},
-         {-ENOTEMPTY, "Directory not empty"},
-         {-ENOTTY, "Not a typewriter"},
-         {-ENXIO, "No such device or address"},
-         {-EPERM, "Operation not permitted"},
-         {-ESTALE, "Stale NFS file handle"},
-         {-ETIMEDOUT, "Connection timed out"},
-         {-EFAIL, "Generic OCFS failure"}};
-int ocfs_num_err = sizeof(ocfs_error_strings)/sizeof(ocfs_errent);
-
-
-ub4 OcfsDebugCtxt;
-ub4 OcfsDebugLevel;
-
-
-spinlock_t ProtectOSBId;
-ub4 GlobalOSBId;		/* Keeps track of next available OSB Id */
-spinlock_t ProtectMountCount;
-ub4 GlobalMountCount;		/* Number of volumes currently mounted */
+spinlock_t osb_id_lock;
+__u32 osb_id;             /* Keeps track of next available OSB Id */
+spinlock_t mount_cnt_lock;
+__u32 mount_cnt;          /* Number of volumes currently mounted */
+
+#define KERN_OCFS 989 
+static ctl_table ocfs_dbg_table[] = {
+	{1, "debug_level", &debug_level, sizeof (__u32), 0644, NULL, &proc_dointvec, 
+	&sysctl_intvec, NULL, NULL, NULL},
+	{2, "debug_context", &debug_context, sizeof (__u32), 0644, NULL, &proc_dointvec, 
+	&sysctl_intvec, NULL, NULL, NULL},
+	{3, "debug_exclude", &debug_exclude, sizeof (__u32), 0644, NULL, &proc_dointvec, 
+	&sysctl_intvec, NULL, NULL, NULL},
+	{0}
+};
 
+static ctl_table ocfs_kern_table[] = {
+       	{KERN_OCFS, "ocfs", NULL, 0, 0555, ocfs_dbg_table}, 
+	{0} 
+};
+static ctl_table ocfs_root_table[] = {
+		{CTL_KERN, "kernel", NULL, 0, 0555, ocfs_kern_table},
+		{0}
+};
+static struct ctl_table_header *ocfs_table_header = NULL;
 
-int ocfs_get_block2 (struct inode *inode, long iblock, long *oblock);
+int ocfs_get_block2 (struct inode *inode, long iblock, long *oblock, int len);
 
-#define ocfs_rmdir ocfs_unlink
+#ifdef AIO_ENABLED
+int ocfs_kvec_read(struct file *filp, kvec_cb_t cb, size_t size, loff_t pos);
+int ocfs_kvec_write(struct file *filp, kvec_cb_t cb, size_t size, loff_t pos);
+#endif
 
 /*
 ** ops
 */
 static struct dentry_operations ocfs_dentry_ops = {
-	d_revalidate:ocfs_dentry_revalidate	// let's test it out!
+	.d_revalidate = ocfs_dentry_revalidate	// let's test it out!
 };
 
 static struct super_operations ocfs_sops = {
-	statfs:ocfs_statfs,
-	put_inode:ocfs_put_inode,
-	clear_inode:ocfs_clear_inode,
-	//put_inode:          force_delete,
-	//delete_inode:       ocfs_delete_inode, 
-	read_inode:ocfs_read_inode,
-	read_inode2:ocfs_read_inode2,
-	put_super:ocfs_put_super,
-	remount_fs:ocfs_remount,
+	.statfs = ocfs_statfs,
+	.put_inode = ocfs_put_inode,
+	.clear_inode = ocfs_clear_inode,
+	//put_inode =           force_delete,
+	//delete_inode =        ocfs_delete_inode, 
+	.read_inode = ocfs_read_inode,
+	.read_inode2 = ocfs_read_inode2,
+	.put_super = ocfs_put_super,
+#ifdef ALLOW_CACHE_FS
+	.remount_fs = ocfs_remount,
+#endif
 
 };
 
 static struct address_space_operations ocfs_aops = {
-	readpage:ocfs_readpage,
-	writepage:ocfs_writepage,
-	prepare_write:ocfs_prepare_write,
-	commit_write:ocfs_commit_write,
+	.readpage = ocfs_readpage,
+	.writepage = ocfs_writepage,
+	.prepare_write = ocfs_prepare_write,
+	.commit_write = ocfs_commit_write,
 #if LINUX_VERSION_CODE >= LinuxVersionCode(2,4,10)
-	direct_IO:ocfs_direct_IO
+	/*
+	 * we are only adding this here as a dummy basically, just need open with O_DIRECT
+	 * to succeed, we still call ocfs_rw_direct()
+	 */
+	.direct_IO = ocfs_direct_IO
 #endif
 };
 
 static struct file_operations ocfs_fops = {
-	read:ocfs_file_read,
-	write:ocfs_file_write,
-	mmap:generic_file_mmap,
-	fsync:ocfs_sync_file,
-	flush:ocfs_flush,
-	release:ocfs_file_release,
-	open:ocfs_file_open,
-	ioctl:ocfs_ioctl
+	.read = ocfs_file_read,
+	.write = ocfs_file_write,
+	.mmap = generic_file_mmap,
+	.fsync = ocfs_sync_file,
+	.flush = ocfs_flush,
+	.release = ocfs_file_release,
+	.open = ocfs_file_open,
+	.ioctl = ocfs_ioctl,
+#ifdef AIO_ENABLED
+	.kvec_read = ocfs_kvec_read,
+	.kvec_write = ocfs_kvec_write,
+	.aio_read = generic_file_aio_read,
+        .aio_write = generic_file_aio_write,
+#endif
+
 };
 
 static struct file_operations ocfs_dops = {
-	read:generic_read_dir,
-	readdir:ocfs_readdir,
-	fsync:ocfs_sync_file,
-	release:ocfs_file_release,
-	//open:               ocfs_file_open,
-	ioctl:ocfs_ioctl
+	.read = generic_read_dir,
+	.readdir = ocfs_readdir,
+	.fsync = ocfs_sync_file,
+	.release = ocfs_file_release,
+	//.open =                ocfs_file_open,
+	.ioctl = ocfs_ioctl
 };
 
 static struct inode_operations ocfs_dir_iops = {
-	create:ocfs_create,
-	lookup:ocfs_lookup,
-	link:ocfs_link,
-	unlink:ocfs_unlink,
-	symlink:ocfs_symlink,
-	mkdir:ocfs_mkdir,
-	rmdir:ocfs_rmdir,
-	mknod:ocfs_mknod,
-	rename:ocfs_rename,
-//    revalidate:         ocfs_inode_revalidate,
-	setattr:ocfs_setattr,
-	getattr:ocfs_getattr,
+	.create = ocfs_create,
+	.lookup = ocfs_lookup,
+	.link = ocfs_link,
+	.unlink = ocfs_unlink,
+	.rmdir = ocfs_unlink,
+	.symlink = ocfs_symlink,
+	.mkdir = ocfs_mkdir,
+	.mknod = ocfs_mknod,
+	.rename = ocfs_rename,
+//    .revalidate =          ocfs_inode_revalidate,
+	.setattr = ocfs_setattr,
+	.getattr = ocfs_getattr,
 };
 
 static struct inode_operations ocfs_file_iops = {
-	setattr:ocfs_setattr,
-	getattr:ocfs_getattr,
-//    revalidate:         ocfs_inode_revalidate,
+	.setattr = ocfs_setattr,
+	.getattr = ocfs_getattr,
+//    .revalidate =          ocfs_inode_revalidate,
 };
 
 char *node_name = NULL;
-ub4 node_number = OCFS_INVALID_NODE_NUM;
-ub4 debug_context = 0;
-ub4 debug_level = 0;
+__u32 node_number = OCFS_INVALID_NODE_NUM;
+__u32 debug_context = 0;
+__u32 debug_level = 0;
+__u32 debug_exclude = 0;
 char *ip_address = NULL;
-ub4 ip_port = 0;
+__u32 ip_port = 0;
 char *guid = NULL;
-ub4 cs = 0;
+__u32 cs = 0;
+__u32 comm_voting = 0;
 
 MODULE_PARM (node_name, "s");
+MODULE_PARM_DESC(node_name, "Name of this machine in the cluster");
 MODULE_PARM (node_number, "l");
+MODULE_PARM_DESC(node_number, "Slot number for this machine within volume");
 MODULE_PARM (debug_context, "l");
+MODULE_PARM_DESC(debug_context, "Debug context");
 MODULE_PARM (debug_level, "l");
+MODULE_PARM_DESC(debug_level, "Debug level");
+MODULE_PARM (debug_exclude, "l");
+MODULE_PARM_DESC(debug_exclude, "Process ID to exclude from tracing");
 MODULE_PARM (ip_address, "s");
+MODULE_PARM_DESC(ip_address, "IP address for the network dlm on this node");
 MODULE_PARM (ip_port, "l");
+MODULE_PARM_DESC(ip_port, "Port number for the network dlm on this node");
 MODULE_PARM (guid, "s");
+MODULE_PARM_DESC(guid, "GUID for this machine");
 MODULE_PARM (cs, "l");
+MODULE_PARM_DESC(cs, "Checksum");
+MODULE_PARM (comm_voting, "l");
+MODULE_PARM_DESC(comm_voting, "Enable/Disable network dlm");
 
 /*
  * ocfs_parse_options()
  *
  * e.g., gid=9999,uid=9999,[no]cache,reclaimid
  */
-static int ocfs_parse_options (char *options, uid_t * uid, gid_t * gid,
+static int ocfs_parse_options (char *options, __u32 * uid, __u32 * gid,
 			       bool * cache, bool * reclaim_id)
 {
 	char *c;
@@ -203,7 +223,7 @@ static int ocfs_parse_options (char *opt
 			}
 			*gid = simple_strtoul (value, &value, 0);
 			if (*value) {
-				LOG_ERROR_ARGS ("Invalid gid option: %s\n",
+				LOG_ERROR_ARGS ("Invalid gid option: %s",
 						value);
 				goto bail;
 			}
@@ -215,7 +235,7 @@ static int ocfs_parse_options (char *opt
 			}
 			*uid = simple_strtoul (value, &value, 0);
 			if (*value) {
-				LOG_ERROR_ARGS ("Invalid uid option: %s\n",
+				LOG_ERROR_ARGS ("Invalid uid option: %s",
 						value);
 				goto bail;
 			}
@@ -226,7 +246,7 @@ static int ocfs_parse_options (char *opt
 		} else if (!strcmp (c, "reclaimid")) {
 			*reclaim_id = true;
 		} else {
-			LOG_ERROR_ARGS ("Invalid mount option: %s\n", c);
+			LOG_ERROR_ARGS ("Invalid mount option: %s", c);
 			goto bail;
 		}
 	}
@@ -247,11 +267,11 @@ static struct super_block *ocfs_read_sup
 	struct dentry *root;
 	int status;
 	struct inode *inode = NULL;
-	uid_t uid = current->fsuid;
-	gid_t gid = current->fsgid;
+	__u32 uid = current->fsuid;
+	__u32 gid = current->fsgid;
 	bool c;
 	bool reclaim_id;
-        ocfs_super *osb;
+        ocfs_super *osb = NULL;
 
 	LOG_ENTRY ();
 
@@ -265,10 +285,19 @@ static struct super_block *ocfs_read_sup
 	/* TODO: fix this */
 	sb->s_blocksize = 512;
 	sb->s_blocksize_bits = 9;
+#if LINUX_VERSION_CODE >= LinuxVersionCode(2,4,18)
+	status = set_blocksize (sb->s_dev, 512);
+	if (status < 0) {
+		LOG_ERROR_STR ("ocfs_read_super: set_blocksize failed!");
+		goto read_super_error;
+	}
+#else
 	set_blocksize (sb->s_dev, 512);
+#endif
 
 	sb->s_magic = OCFS_MAGIC;
 	sb->s_op = &ocfs_sops;
+	sb->s_flags |= MS_NOATIME;
 
 	/* this is needed to support O_LARGE_FILE */
 	sb->s_maxbytes = OCFS_LINUX_MAX_FILE_SIZE;
@@ -276,19 +305,22 @@ static struct super_block *ocfs_read_sup
 	status = ocfs_mount_volume (sb, reclaim_id);
         osb = ((ocfs_super *)(sb->u.generic_sbp));
 	if (status < 0 || !osb)
+	if (status < 0 || !osb) {
+		LOG_ERROR_STR ("Error mounting volume");
 		goto read_super_error;
+	}
 
+#ifdef ALLOW_CACHE_MOUNT
 	osb->cache_fs = c;		/* set caching type */
+#else
+	osb->cache_fs = false;
+#endif
 
 	inode = iget4 (sb, OCFS_ROOT_INODE_NUMBER, 0, NULL);
 	if (!inode) {
 		LOG_ERROR_STATUS (status);
 		goto read_super_error;
 	}
-	inode->i_mode = osb->vol_layout.prot_bits;
-	inode->i_mode |= S_IFDIR;
-	inode->i_uid = osb->vol_layout.uid;
-	inode->i_gid = osb->vol_layout.gid;
 
 	root = d_alloc_root (inode);
 	if (!root) {
@@ -299,11 +331,16 @@ static struct super_block *ocfs_read_sup
 
 	sb->s_root = root;
 
+	printk ("ocfs: Mounting device (%u,%u) in node %d\n",
+		MAJOR(sb->s_dev), MINOR(sb->s_dev), osb->node_num);
+
 	LOG_EXIT_PTR (sb);
 	return sb;
 
       read_super_error:
-	/* TODO: cleanup */
+	if (osb)
+		ocfs_dismount_volume (sb);
+
 	MOD_DEC_USE_COUNT;
 	if (inode != NULL) {
 		iput (inode);
@@ -329,6 +366,12 @@ static int __init ocfs_driver_entry (voi
 
 	ocfs_version_print ();
 
+	ocfs_table_header = register_sysctl_table(ocfs_root_table, 0);
+	if (!ocfs_table_header) {
+		LOG_ERROR_STATUS(status = -ENOMEM);
+		goto leave;
+	}
+
 	memset (&OcfsGlobalCtxt, 0, sizeof (ocfs_global_ctxt));
 	memset (&OcfsIpcCtxt, 0, sizeof (ocfs_ipc_ctxt));
 
@@ -366,16 +409,21 @@ static int __init ocfs_driver_entry (voi
 
 	OcfsGlobalCtxt.hbm = DISK_HBEAT_COMM_ON;
 
-	spin_lock_init (&ProtectOSBId);
-	spin_lock (&ProtectOSBId);
-	GlobalOSBId = 0;
-	spin_unlock (&ProtectOSBId);
-
-	spin_lock_init (&ProtectMountCount);
-	spin_lock (&ProtectMountCount);
-	GlobalMountCount = 0;
-	spin_unlock (&ProtectMountCount);
-
+	spin_lock_init (&osb_id_lock);
+	spin_lock (&osb_id_lock);
+	osb_id = 0;
+	spin_unlock (&osb_id_lock);
+
+	spin_lock_init (&mount_cnt_lock);
+	spin_lock (&mount_cnt_lock);
+	mount_cnt = 0;
+	spin_unlock (&mount_cnt_lock);
+
+	spin_lock_init (&OcfsGlobalCtxt.comm_seq_lock);
+	spin_lock (&OcfsGlobalCtxt.comm_seq_lock);
+	OcfsGlobalCtxt.comm_seq_num = 0;
+	spin_unlock (&OcfsGlobalCtxt.comm_seq_lock);
+	
 	/* Initialize the proc interface */
 	ocfs_proc_init ();
 
@@ -386,10 +434,12 @@ static int __init ocfs_driver_entry (voi
 			ocfs_free_mem_lists ();
 
 		/* Delete the global context resource */
-		if (OcfsGlobalCtxt.
-		    flags & OCFS_FLAG_GLBL_CTXT_RESOURCE_INITIALIZED)
+		if (OcfsGlobalCtxt.flags & OCFS_FLAG_GLBL_CTXT_RESOURCE_INITIALIZED)
 			OCFS_CLEAR_FLAG (OcfsGlobalCtxt.flags,
 				       OCFS_FLAG_GLBL_CTXT_RESOURCE_INITIALIZED);
+
+		if (ocfs_table_header)
+        		unregister_sysctl_table(ocfs_table_header);
 	}
 
 	LOG_EXIT_STATUS (status);
@@ -408,7 +458,7 @@ static int __init ocfs_driver_entry (voi
 int ocfs_read_params(void)
 {
 	int status = 0;
-	ub4 check_sum = 0;
+	__u32 check_sum = 0;
 	int i;
 
 	/* Read remaining insmod params */
@@ -456,7 +506,7 @@ int ocfs_read_params(void)
 
 	if (status == 0) {
 		for (i = 0; i < GUID_LEN; ++i)
-			check_sum += (ub4) guid[i];
+			check_sum += (__u32) guid[i];
 		if (cs != check_sum) {
 			status = -EINVAL;
 			LOG_ERROR_STR ("load module using load_ocfs");
@@ -479,11 +529,12 @@ int ocfs_read_params(void)
 static void ocfs_memcheck (void)
 {
 	struct list_head *iter;
+	struct list_head *temp_iter;
 	alloc_item *item;
         char *memtype;
         char sizeinfo[20];
 
-	list_for_each (iter, &OcfsGlobalCtxt.item_list) {
+	list_for_each_safe (iter, temp_iter, &OcfsGlobalCtxt.item_list) {
 		item = list_entry (iter, alloc_item, list);
                 switch (item->type)
                 {
@@ -505,7 +556,7 @@ static void ocfs_memcheck (void)
                         snprintf(sizeinfo, 20, "size=%d", item->u.length);
                         break;
                 }
-                LOG_ERROR_ARGS ("unfreed %s mem %x: %s tag='%s'\n", memtype, 
+                LOG_ERROR_ARGS ("unfreed %s mem %x: %s tag='%s'", memtype, 
                                 item->address, sizeinfo, item->tag);
 	}
 }  /* ocfs_memcheck */
@@ -522,10 +573,12 @@ static void __exit ocfs_driver_exit (voi
 	ocfs_super *osb = NULL;
 	struct list_head *osb_entry;
 	struct list_head *osb_tmp;
-	ub4 i = 0;
 
 	LOG_ENTRY ();
 
+	if (ocfs_table_header)
+        	unregister_sysctl_table(ocfs_table_header);
+
 	/* Signal DLM thread to exit */
 	ocfs_down_sem (&(OcfsGlobalCtxt.res), true);
 	OCFS_SET_FLAG (OcfsGlobalCtxt.flags, OCFS_FLAG_SHUTDOWN_VOL_THREAD);
@@ -538,10 +591,7 @@ static void __exit ocfs_driver_exit (voi
 		ocfs_up_sem (&osb->osb_res);
 
 		osb->needs_flush = true;
-		while ((osb->trans_in_progress) && (i < 10)) {
-			ocfs_sleep (100);
-			i++;
-		}
+		ocfs_trans_in_progress(osb);
 		ocfs_commit_cache (osb, true);
 		osb->needs_flush = false;
 
@@ -562,6 +612,7 @@ static void __exit ocfs_driver_exit (voi
 	ocfs_memcheck ();
 #endif
 
+	printk("Unloaded OCFS Driver module\n");
 	LOG_EXIT ();
 	return;
 }				/* ocfs_driver_exit */
@@ -583,10 +634,10 @@ int ocfs_find_inode (struct inode *inode
 	ocfs_find_inode_args *args;
 	ocfs_inode *oin;
 	int ret = 0;
-	ub8 fileOff, parentOff;
+	__u64 fileOff, parentOff;
 	mode_t mode;
 
-	LOG_ENTRY_ARGS ("(0x%08x, %u, 0x%08x)\n", inode, ino, opaque);
+	LOG_ENTRY_ARGS ("(0x%p, %u, 0x%p)\n", inode, ino, opaque);
 
 	if (opaque == NULL || inode == NULL)
 		goto bail;
@@ -653,13 +704,7 @@ int ocfs_find_inode (struct inode *inode
 	oin = NULL;		/* set it back to our current OIN if we have one */
 	if (inode_data_is_oin (inode))
 		oin = ((ocfs_inode *)inode->u.generic_ip);
-	ocfs_populate_inode (inode,
-			     S_ISDIR (mode) ? args->entry->extents[0].
-			     disk_off : args->entry->this_sector, mode,
-			     args->entry->uid, args->entry->gid,
-			     args->entry->file_size, args->entry->modify_time,
-			     args->entry->modify_time, args->entry->create_time,
-			     (void *) oin);
+	ocfs_populate_inode (inode, args->entry, mode, oin);
 	ret = 1;
       bail:
 	LOG_EXIT_LONG (ret);
@@ -670,28 +715,31 @@ int ocfs_find_inode (struct inode *inode
  * ocfs_populate_inode()
  *
  */
-static void ocfs_populate_inode (struct inode *inode, ub8 offset,
-		     umode_t mode, uid_t uid, gid_t gid, loff_t size,
-		     time_t atime, time_t mtime, time_t ctime, void *genptr)
+static void ocfs_populate_inode (struct inode *inode, ocfs_file_entry *fe,
+				 umode_t mode, void *genptr)
 {
 	struct super_block *sb;
 	ocfs_super *osb;
+	__u64 offset;
 
-	LOG_ENTRY_ARGS ("(0x%08x, %u, size:%u)\n", inode, mode, size);
+	LOG_ENTRY_ARGS ("(0x%p, %u, size:%u)\n", inode, mode, fe->file_size);
 
 	sb = inode->i_sb;
 	osb = ((ocfs_super *)(sb->u.generic_sbp));
+	offset = S_ISDIR (mode) ? fe->extents[0].disk_off : fe->this_sector;
 
 	inode->i_dev = sb->s_dev;
 	inode->i_mode = mode;
-	inode->i_uid = uid;
-	inode->i_gid = gid;
-	inode->i_blksize = (ub4) osb->vol_layout.cluster_size;	// sb->s_blocksize;
-	inode->i_blocks = (size + sb->s_blocksize) >> sb->s_blocksize_bits;
+	inode->i_uid = fe->uid;
+	inode->i_gid = fe->gid;
+	inode->i_blksize = (__u32) osb->vol_layout.cluster_size;	// sb->s_blocksize;
+	inode->i_blocks = (fe->file_size + sb->s_blocksize) >> sb->s_blocksize_bits;
 	inode->i_mapping->a_ops = &ocfs_aops;
-	inode->i_atime = atime;
-	inode->i_mtime = mtime;
-	inode->i_ctime = ctime;
+	inode->i_attr_flags |= ATTR_FLAG_NOATIME;
+	inode->i_flags |= S_NOATIME;
+	inode->i_atime = fe->modify_time;
+	inode->i_mtime = fe->modify_time;
+	inode->i_ctime = fe->create_time;
 
 	if (genptr)
 		SET_INODE_OIN (inode, genptr);
@@ -702,7 +750,7 @@ static void ocfs_populate_inode (struct 
 	    case S_IFREG:
 		    inode->i_fop = &ocfs_fops;
 		    inode->i_op = &ocfs_file_iops;
-		    inode->i_size = size;
+		    inode->i_size = fe->file_size;
 		    inode->i_rdev = sb->s_dev;
 		    break;
 	    case S_IFDIR:
@@ -714,7 +762,7 @@ static void ocfs_populate_inode (struct 
 	    case S_IFLNK:
 		    inode->i_op = &page_symlink_inode_operations;
 		    //inode->i_fop = &ocfs_fops;
-		    inode->i_size = size;
+		    inode->i_size = fe->file_size;
 		    inode->i_rdev = sb->s_dev;
 		    break;
 	    default:
@@ -740,7 +788,7 @@ static void ocfs_read_inode2 (struct ino
 	ocfs_inode *newoin;
 	umode_t mode;
 
-	LOG_ENTRY_ARGS ("(0x%08x, 0x%08x)\n", inode, opaque);
+	LOG_ENTRY_ARGS ("(0x%p, 0x%p)\n", inode, opaque);
 
 	if (inode == NULL || inode->i_sb == NULL) {
 		LOG_ERROR_STR ("bad inode");
@@ -749,16 +797,21 @@ static void ocfs_read_inode2 (struct ino
 	sb = inode->i_sb;
 	osb = ((ocfs_super *)(sb->u.generic_sbp));
 	if (inode->i_ino == OCFS_ROOT_INODE_NUMBER) {
-		inode->i_mode = S_IFDIR | 0755;
-		inode->i_blksize = 512;	/* TODO: fix */
-		inode->i_blocks = 0;
+		inode->i_mode = S_IFDIR | osb->vol_layout.prot_bits;
+		inode->i_blksize = (__u32) osb->vol_layout.cluster_size;
+		inode->i_size = OCFS_DEFAULT_DIR_NODE_SIZE;
+		inode->i_blocks = OCFS_DEFAULT_DIR_NODE_SIZE;
 		inode->i_rdev = inode->i_dev;	/* is this correct?! */
 		inode->i_mapping->a_ops = &ocfs_aops;
+		inode->i_attr_flags |= ATTR_FLAG_NOATIME;
+		inode->i_flags |= S_NOATIME;
 		inode->i_atime = CURRENT_TIME;
 		inode->i_mtime = CURRENT_TIME;
 		inode->i_ctime = CURRENT_TIME;
 		inode->i_op = &ocfs_dir_iops;
 		inode->i_fop = &ocfs_dops;
+		inode->i_uid = osb->vol_layout.uid;
+		inode->i_gid = osb->vol_layout.gid;
 		SET_INODE_OIN (inode, osb->oin_root_dir);
 		goto bail;
 	}
@@ -801,13 +854,7 @@ static void ocfs_read_inode2 (struct ino
 		    mode |= S_IFREG;
 		    break;
 	}
-	ocfs_populate_inode (inode,
-			     S_ISDIR (mode) ? args->entry->extents[0].
-			     disk_off : args->entry->this_sector, mode,
-			     args->entry->uid, args->entry->gid,
-			     args->entry->file_size, args->entry->modify_time,
-			     args->entry->modify_time, args->entry->create_time,
-			     (void *) newoin);
+	ocfs_populate_inode (inode, args->entry, mode, newoin);
 
       bail:
 	LOG_EXIT ();
@@ -833,13 +880,13 @@ static struct dentry *ocfs_lookup (struc
 	ocfs_find_inode_args args;
 	ocfs_file_entry *fe = NULL;
 	ocfs_inode *parentOin = NULL;
-	ub8 parentOffset;
+	__u64 parentOffset;
 	struct inode *inode = NULL;
 	struct super_block *sb = dir->i_sb;
 	struct dentry *ret;
 	ocfs_super *osb = ((ocfs_super *)(sb->u.generic_sbp));
 
-	LOG_ENTRY_ARGS ("(0x%08x, 0x%08x, '%*s')\n", dir, dentry,
+	LOG_ENTRY_ARGS ("(0x%p, 0x%p, '%*s')\n", dir, dentry,
                         dentry->d_name.len, dentry->d_name.name);
 
 	atomic_inc (&dir->i_count);
@@ -899,18 +946,18 @@ static struct dentry *ocfs_lookup (struc
 static int ocfs_statfs (struct super_block *sb, struct statfs *buf)
 {
         ocfs_super *osb = NULL;
-        ub4 numbits, freebits = 0;
+        __u32 numbits, freebits = 0;
         // ocfs_lock_res *pLockResource;
         int status = 0;
-        ub1 lockbuf[512];
+        __u8 lockbuf[512];
         ocfs_bitmap_lock *bm_lock = (ocfs_bitmap_lock *)lockbuf;
 
-        LOG_ENTRY_ARGS ("(0x%08x, 0x%08x)\n", sb, buf);
+        LOG_ENTRY_ARGS ("(0x%p, 0x%p)\n", sb, buf);
 
         osb = ((ocfs_super *)(sb->u.generic_sbp));
         numbits = osb->cluster_bitmap.size;
         
-        status = ocfs_read_force_disk (osb, lockbuf, OCFS_SECTOR_SIZE, (ub8)OCFS_BITMAP_LOCK_OFFSET);
+        status = ocfs_read_force_disk (osb, lockbuf, OCFS_SECTOR_SIZE, (__u64)OCFS_BITMAP_LOCK_OFFSET);
 
         if (numbits >= bm_lock->used_bits)
             freebits = numbits - bm_lock->used_bits;
@@ -940,16 +987,24 @@ static int ocfs_statfs (struct super_blo
  */
 static int ocfs_block_symlink (struct inode *inode, const char *symname, int len)
 {
-	struct address_space *mapping = inode->i_mapping;
-	struct page *page = grab_cache_page (mapping, 0);
+	struct address_space *mapping;
+	struct page *page;
 	int err = -ENOMEM;
 	char *kaddr;
 
+	LOG_ENTRY ();
+
+	mapping = inode->i_mapping;
+	page = grab_cache_page (mapping, 0);
+
 	if (!page)
 		goto fail;
 	err = mapping->a_ops->prepare_write (NULL, page, 0, len - 1);
-	if (err)
+	if (err) {
+		LOG_ERROR_STATUS (err);
 		goto fail_map;
+	}
+
 	kaddr = page_address (page);
 	memset (kaddr, 0, PAGE_CACHE_SIZE);
 	memcpy (kaddr, symname, len - 1);
@@ -957,8 +1012,11 @@ static int ocfs_block_symlink (struct in
 	err = mapping->a_ops->readpage (NULL, page);
 	wait_on_page (page);
 	page_cache_release (page);
-	if (err < 0)
+	if (err < 0) {
+		LOG_ERROR_STATUS (err);
 		goto fail;
+	}
+
 	mark_inode_dirty (inode);
 	return 0;
 
@@ -966,6 +1024,7 @@ static int ocfs_block_symlink (struct in
 	UnlockPage (page);
 	page_cache_release (page);
       fail:
+	LOG_EXIT_STATUS (err);
 	return err;
 }				/* ocfs_block_symlink */
 
@@ -980,9 +1039,9 @@ int ocfs_symlink_get_block (struct inode
 	ocfs_super *osb;
 	int status;
 	ocfs_file_entry *fe = NULL;
-	ub8 entryOffset;
+	__u64 entryOffset;
 
-	LOG_ENTRY_ARGS ("(0x%08x, %d, 0x%08x, %d)\n", inode, iblock, bh_result,
+	LOG_ENTRY_ARGS ("(0x%p, %d, 0x%p, %d)\n", inode, iblock, bh_result,
 			create);
 
 	if (!inode) {
@@ -992,14 +1051,13 @@ int ocfs_symlink_get_block (struct inode
 	osb = ((ocfs_super *)(inode->i_sb->u.generic_sbp));
 
 	if ((iblock << 9) > PATH_MAX + 1) {
-		LOG_ERROR_ARGS ("file offset > PATH_MAX: %u.%u\n", iblock << 9);
+		LOG_ERROR_ARGS ("file offset > PATH_MAX: %u.%u", iblock << 9);
 		goto bail;
 	}
 
 	fe = ocfs_allocate_file_entry ();
 	if (fe == NULL) {
-		status = -ENOMEM;
-		LOG_ERROR_STATUS (status);
+		LOG_ERROR_STATUS (status = -ENOMEM);
 		goto bail;
 	}
 	if (!ocfs_linux_get_inode_offset (inode, &entryOffset, NULL)) {
@@ -1011,13 +1069,15 @@ int ocfs_symlink_get_block (struct inode
 		LOG_ERROR_STATUS (status);
 		goto bail;
 	}
+
 	if (!IS_VALID_FILE_ENTRY (fe)) {
-		LOG_ERROR_STR ("FileEntry Read from disk is invalid");
+		LOG_ERROR_ARGS ("Invalid fe at offset %u.%u", HI(entryOffset),
+				LO(entryOffset));
 		goto bail;
 	}
-	if ((iblock << 9) >= (sb8) fe->alloc_size) {
+	if ((iblock << 9) >= (__s64) fe->alloc_size) {
 		LOG_ERROR_ARGS
-		    ("file offset is outside the allocated size: %u.%u\n",
+		    ("file offset is outside the allocated size: %u.%u",
 		     iblock << 9);
 		goto bail;
 	}
@@ -1045,13 +1105,13 @@ int ocfs_get_block (struct inode *inode,
 	int err = -EIO;
 	ocfs_inode *oin;
 	ocfs_super *osb;
-	sb8 vbo;
-	sb8 lbo;
-	ub4 len, numExts;
+	__s64 vbo = 0;
+	__s64 lbo = 0;
+	__u32 len, numExts;
 	int status;
 	void *ioRuns = NULL;
 
-	LOG_ENTRY_ARGS ("(0x%08x, %d, 0x%08x, %d)\n", inode, iblock, bh_result,
+	LOG_ENTRY_ARGS ("(0x%p, %d, 0x%p, %d)\n", inode, iblock, bh_result,
 			create);
 
 	if (S_ISLNK (inode->i_mode)) {
@@ -1067,13 +1127,13 @@ int ocfs_get_block (struct inode *inode,
 	oin = ((ocfs_inode *)inode->u.generic_ip);
 	osb = (ocfs_super *) oin->osb;
 
-	vbo = (sb8) iblock << inode->i_sb->s_blocksize_bits;
+	vbo = (__s64) iblock << inode->i_sb->s_blocksize_bits;
 
 	len = 1;
 	status = ocfs_lookup_file_allocation (osb, oin, vbo, &lbo,
 					   len, &numExts, &ioRuns);
 	if (status < 0) {
-		LOG_ERROR_STR ("ocfs_lookup_file_allocation failed");
+		LOG_ERROR_STATUS (status);
 		goto bail;
 	}
 
@@ -1086,8 +1146,16 @@ int ocfs_get_block (struct inode *inode,
 	bh_result->b_dev = inode->i_dev;
 	bh_result->b_blocknr = lbo >> inode->i_sb->s_blocksize_bits;
 	bh_result->b_state |= (1UL << BH_Mapped);
+	if (create)
+		bh_result->b_state |= (1UL << BH_New);
 	err = 0;
 
+	if (bh_result->b_blocknr == 0) {
+		LOG_ERROR_ARGS("vbo:%u.%u, lbo:%u.%u, fe:%u.%u", HILO(vbo),
+			       HILO(lbo), HILO(oin->file_disk_off));
+		err = -EIO;
+	}
+
       bail:
 	ocfs_safefree (ioRuns);
 	LOG_EXIT_LONG (err);
@@ -1098,34 +1166,34 @@ int ocfs_get_block (struct inode *inode,
  * ocfs_get_block2()
  *
  */
-int ocfs_get_block2 (struct inode *inode, long iblock, long *oblock)
+int ocfs_get_block2 (struct inode *inode, long iblock, long *oblock, int len)
 {
 	int err = 0;
 	ocfs_inode *oin;
 	ocfs_super *osb;
-	sb8 vbo;
-	sb8 lbo;
-	ub4 len, numExts;
+	__s64 vbo = 0;
+	__s64 lbo = 0;
+	__u32 numExts;
 	int status;
 	void *ioRuns = NULL;
 
-	LOG_ENTRY_ARGS ("(0x%08x, %d)\n", inode, iblock);
+	LOG_ENTRY_ARGS ("(0x%p, %d)\n", inode, iblock);
 
 	if (!inode || !inode_data_is_oin (inode)) {
 		LOG_ERROR_STR ("bad inode or inode has no oin");
+		err = -1;
 		goto bail;
 	}
 	oin = ((ocfs_inode *)inode->u.generic_ip);
 	osb = (ocfs_super *) oin->osb;
 
-	vbo = (sb8) iblock << inode->i_sb->s_blocksize_bits;
-
+	vbo = (__s64) iblock << inode->i_sb->s_blocksize_bits;
 	len = 1;
 	status = ocfs_lookup_file_allocation (osb, oin, vbo, &lbo,
-					   len, &numExts, &ioRuns);
+					len, &numExts, &ioRuns);
 	if (status < 0) {
+		LOG_ERROR_STATUS (status);
 		err = -1;
-		LOG_ERROR_STR ("ocfs_lookup_file_allocation failed");
 		goto bail;
 	}
 
@@ -1142,7 +1210,7 @@ int ocfs_get_block2 (struct inode *inode
  * ocfs_file_write()
  *
  */
-static int ocfs_file_write (struct file *filp, const char *buf, size_t count,
+static ssize_t ocfs_file_write (struct file *filp, const char *buf, size_t count,
 		 loff_t * ppos)
 {
 	int ret = 0;
@@ -1151,9 +1219,10 @@ static int ocfs_file_write (struct file 
 	ocfs_super *osb = NULL;
 	struct inode *inode = filp->f_dentry->d_inode;
 	int status;
-	ub8 newsize;
+	__u64 newsize;
+	ocfs_lock_res *lockres = NULL;
 
-	LOG_ENTRY_ARGS ("(0x%08x, 0x%08x, %d, '%*s')\n", filp, buf, count,
+	LOG_ENTRY_ARGS ("(0x%p, 0x%p, %d, '%*s')\n", filp, buf, count,
                         filp->f_dentry->d_name.len, filp->f_dentry->d_name.name);
 
 	/* happy write of zero bytes */
@@ -1170,8 +1239,16 @@ static int ocfs_file_write (struct file 
 	oin = ((ocfs_inode *)inode->u.generic_ip);
 	osb = (ocfs_super *) oin->osb;
 
-	if ((oin->lock_res->master_node_num != osb->node_num) ||
-	    (oin->lock_res->lock_state != OCFS_DLM_ENABLE_CACHE_LOCK)) {
+	lockres = oin->lock_res;
+	if (lockres == NULL) {
+		ret = -EIO;
+		goto bail;
+	}
+
+	ocfs_get_lockres (lockres);
+
+	if ((lockres->master_node_num != osb->node_num) ||
+	    (lockres->lock_state != OCFS_DLM_ENABLE_CACHE_LOCK)) {
 		oin->cache_enabled = false;
 	} else {
 		oin->cache_enabled = true;
@@ -1217,6 +1294,12 @@ static int ocfs_file_write (struct file 
 			goto bail;
 		}
 	}
+
+	if (acquired) {
+		ocfs_up_sem (&(oin->main_res));
+		acquired = false;
+	}
+
 	if (filp->f_flags & O_APPEND) 
 		newsize = count + inode->i_size;
 	else
@@ -1237,43 +1320,31 @@ static int ocfs_file_write (struct file 
 		     HI (oin->alloc_size), LO (oin->alloc_size), HI (newsize),
 		     LO (newsize));
 
-		if (acquired) {
-			ocfs_up_sem (&(oin->main_res));
-			acquired = false;
-		}
-
 		status =
 		    ocfs_create_modify_file (osb, oin->parent_dirnode_off, oin,
 				      NULL, newsize, &oin->file_disk_off, 
                                       FLAG_FILE_EXTEND, NULL, NULL);
 		if (status < 0) {
-			LOG_TRACE_ARGS
-			    ("Failed to extend file from %u.%u to %u.%u !!!\n",
-			     HI (*ppos), LO (*ppos), HI (newsize),
-			     LO (newsize));
-			ret = -ENOSPC;
+			if (status != -EINTR && status != -ENOSPC) {
+				LOG_ERROR_STATUS (status);
+				ret = -ENOSPC;
+			} else
+				ret = status;
 			goto bail;
 		}
-
-		ocfs_down_sem (&(oin->main_res), true);
-		acquired = true;
 	}
-#if LINUX_VERSION_CODE < LinuxVersionCode(2,4,10)
-	if (filp->f_flags & O_DIRECT) {
+
+	if (filp->f_flags & O_DIRECT) 
 		ret = ocfs_rw_direct (WRITE, filp, (char *) buf, count, ppos);
-	} else
-#endif
+	else
 		ret = generic_file_write (filp, buf, count, ppos);
+
 	if (writingAtEOF && ret >= 0) {
 		struct iattr attr;
 
 		LOG_TRACE_STR
 		    ("Generic_file_write ok, asking for OIN update now");
 		inode->i_size = newsize;
-		if (acquired) {
-			ocfs_up_sem (&(oin->main_res));
-			acquired = false;
-		}
 		memset (&attr, 0, sizeof (struct iattr));
 		attr.ia_valid |= ATTR_SIZE;
 		attr.ia_size = newsize;
@@ -1283,13 +1354,11 @@ static int ocfs_file_write (struct file 
 				      &oin->file_disk_off, FLAG_FILE_UPDATE,
 				      NULL, &attr);
 		if (status < 0) {
-			/* 
-			 * WE NEED TO MAKE SURE THIS ALWAYS WORKS OR
-			 * WE NEED TO DO MORE HERE!!!!
-			 */
-			LOG_TRACE_STR
-			    ("Big problem, failed to update oin after writing!");
-			ret = -EIO;
+			if (status != -EINTR) {
+				LOG_ERROR_STATUS (status);
+				ret = -EIO;
+			} else
+				ret = status;
 		}
 	}
 
@@ -1305,6 +1374,8 @@ static int ocfs_file_write (struct file 
                 fsync_inode_buffers(inode);
         }
 
+	ocfs_put_lockres (lockres);
+
 	LOG_EXIT_LONG (ret);
 	return ret;
 }				/* ocfs_file_write */
@@ -1313,7 +1384,7 @@ static int ocfs_file_write (struct file 
  * ocfs_file_read()
  *
  */
-static int ocfs_file_read (struct file *filp, char *buf, size_t count, loff_t * ppos)
+static ssize_t ocfs_file_read (struct file *filp, char *buf, size_t count, loff_t * ppos)
 {
 	int ret = 0;
 	int acquired = false;
@@ -1322,7 +1393,7 @@ static int ocfs_file_read (struct file *
 	struct inode *inode = filp->f_dentry->d_inode;
 	int status;
 
-	LOG_ENTRY_ARGS ("(0x%08x, 0x%08x, %d, '%*s')\n", filp, buf, count,
+	LOG_ENTRY_ARGS ("(0x%p, 0x%p, %d, '%*s')\n", filp, buf, count,
                         filp->f_dentry->d_name.len, filp->f_dentry->d_name.name);
 
 
@@ -1357,14 +1428,10 @@ static int ocfs_file_read (struct file *
 		acquired = false;
 	}
 
-#if LINUX_VERSION_CODE < LinuxVersionCode(2,4,10)
-	if (filp->f_flags & O_DIRECT) {
+	if (filp->f_flags & O_DIRECT) 
 		ret = ocfs_rw_direct (READ, filp, buf, count, ppos);
-	} else
-#endif
-	{
+	else 
 		ret = generic_file_read (filp, buf, count, ppos);
-	}
 
 	if (ret == -EINVAL)
 		LOG_TRACE_STR ("Generic_file_read returned -EINVAL");
@@ -1385,7 +1452,7 @@ static int ocfs_readpage (struct file *f
 {
 	int ret;
 
-	LOG_ENTRY_ARGS ("(0x%08x, %u)\n", file, (page ? page->index : 0));
+	LOG_ENTRY_ARGS ("(0x%p, %u)\n", file, (page ? page->index : 0));
 
 	ret = block_read_full_page (page, ocfs_get_block);
 
@@ -1401,7 +1468,7 @@ static int ocfs_writepage (struct page *
 {
 	int ret;
 
-	LOG_ENTRY_ARGS ("(0x%08x)\n", page);
+	LOG_ENTRY_ARGS ("(0x%p)\n", page);
 
 	ret = block_write_full_page (page, ocfs_get_block);
 
@@ -1415,18 +1482,19 @@ static int ocfs_writepage (struct page *
  *
  */
 static int ocfs_direct_IO (int rw,
+#ifdef SUSE
+		struct file *filp,
+#else
 		struct inode *inode,
+#endif
 		struct kiobuf *iobuf, unsigned long blocknr, int blocksize)
 {
-	int ret;
-
-	LOG_ENTRY ();
-
-	ret = generic_direct_IO (rw, inode, iobuf, blocknr, blocksize,
-				 ocfs_get_block);
-
-	LOG_EXIT_LONG (ret);
-	return ret;
+        /* we are not using this function anymore, in fact
+	 * we should never get here any more
+	 * so let's just BUG(), hint from sct@redhat.com
+	 */
+	BUG();
+	return -1;
 }				/* ocfs_direct_IO */
 #endif
 
@@ -1439,7 +1507,7 @@ static int ocfs_prepare_write (struct fi
 {
 	int ret;
 
-	LOG_ENTRY_ARGS ("(0x%08x, 0x%08x, %u, %u)\n", file, page, from, to);
+	LOG_ENTRY_ARGS ("(0x%p, 0x%p, %u, %u)\n", file, page, from, to);
 
 	ret = block_prepare_write (page, from, to, ocfs_get_block);
 
@@ -1451,7 +1519,6 @@ static int ocfs_prepare_write (struct fi
 #define SECTOR_SIZE (1U << SECTOR_BITS)
 #define SECTOR_MASK (SECTOR_SIZE - 1)
 
-#if LINUX_VERSION_CODE < LinuxVersionCode(2,4,10)
 /*
  * ocfs_rw_direct()
  *
@@ -1461,23 +1528,43 @@ static ssize_t ocfs_rw_direct (int rw, s
 {
 	struct kiobuf *iobuf;
 	int err = 0;
-	unsigned long blocknr, blocks;
+	unsigned long blocknr, blocks, myiosize;
 	size_t transferred;
-	int iosize;
+	int iosize, clustersize;
 	int i;
 	struct inode *inode = filp->f_dentry->d_inode;
 	int max_sectors;
 	int nbhs;
 	int sector_size, sector_bits, sector_mask;
 	int ret = 0;
+	bool large_io = false;
+	bool inuse = false;
+	unsigned long blocks_end_cluster = 0;
+	loff_t saved_off;
+	size_t saved_size;
+
+        unsigned long firstlogic;
+        long firstphys;
+        long nextphys;
+        unsigned long nextlogic = 0;
+        unsigned long totalioblocks = 0;
+
+	saved_off = *offp;
+	saved_size = size;
 
 	#warning not all devices have 512 byte sectors
 	sector_size = 512;
 	sector_bits = SECTOR_BITS;
 	sector_mask = 511;
-	max_sectors = KIO_MAX_SECTORS >> (sector_bits - SECTOR_BITS);
+	/* max sectors is 1024 in 2.4.9
+	 * max data is 512kb  
+	 */
 
 	err = -EINVAL;
+	if (size == 0) {
+		printk("direct write of 0 byte\n");
+		return 0;
+	}
 
 	if (rw == READ) {
 	   if (inode->i_size < *offp) /* read past end of file */
@@ -1486,11 +1573,40 @@ static ssize_t ocfs_rw_direct (int rw, s
               size = inode->i_size - *offp;
         }
 
+	/* make sure we are aligned to either 4kb or 512 byte IO */
+#ifndef LARGEIOS
 	if ((*offp & 511) || (size & 511))
-		return -EINVAL;
+	   /* if not, then fail, we need either to do dio */
+           return err;
 
-	err = 0;
+        max_sectors = KIO_MAX_SECTORS;
+        large_io = false;
+#endif
+#ifdef LARGEIOS
+	if ((*offp & 4095) || (size & 4095)) {
+		/* if it's not 4kb, then 512 */
+		 if ((*offp & 511) || (size & 511))
+			 /* if not, then fail, we need either to do dio */
+	                 return err;
+		 max_sectors = KIO_MAX_SECTORS; /* for 2.4.9 - 1024 */
+	} /* ok we 're 4kb aligned, lets see if the buffer is */
+	else {
+		if (!((unsigned long) buf & 4095)) {
+			/* yippie we are .. we can do 4kb size io's */
+			large_io = true;
+			/* for 2.4.9 */
+			max_sectors = KIO_MAX_SECTORS / 8;
+		} else {
+			max_sectors = KIO_MAX_SECTORS;
+			large_io = false;
+		}
+
+	}	
+#endif
+
+	/* find out how far we are to the end of our cluster */
 
+	err = 0;
 	if (size)
 		err = -ENXIO;
 
@@ -1499,64 +1615,214 @@ static ssize_t ocfs_rw_direct (int rw, s
 
 	transferred = 0;
 	blocknr = *offp >> SECTOR_BITS;
-
-        nbhs = (size >> SECTOR_BITS);
-        if (nbhs > KIO_MAX_SECTORS)
-                nbhs = KIO_MAX_SECTORS;
-        err = alloc_kiovec_sz (1, &iobuf, &nbhs);
-        if (err)
+        clustersize = inode->i_blksize >> 9;
+        myiosize = size >> 9;
+        blocks_end_cluster = clustersize - (blocknr % clustersize);
+        firstlogic = blocknr;
+        totalioblocks = 0;
+
+        ret = ocfs_get_block2 (inode, blocknr, &firstphys, 512);
+        if (ret == -1) {
+            err = 0;
+            goto out;
+         }
+        while (myiosize > 0) {
+            if (blocks_end_cluster + 1 > myiosize) {
+                totalioblocks += myiosize;
+                myiosize = 0;
+                goto doio;
+            } else {
+                totalioblocks += blocks_end_cluster;
+                myiosize -= blocks_end_cluster;
+                nextlogic = firstlogic + blocks_end_cluster;
+            }
+again:
+            ret = ocfs_get_block2 (inode, nextlogic, &nextphys, 512);
+            if (ret == -1) {
+                err = 0;
                 goto out;
+            }
+            if (nextphys == (firstphys + totalioblocks)) {
+		// merge ok
+		blocks_end_cluster = clustersize - (nextlogic % clustersize);
+                if (blocks_end_cluster + 1 > myiosize) {
+                   totalioblocks += myiosize;
+                   myiosize = 0;
+                } else {
+                   totalioblocks += blocks_end_cluster;
+                   myiosize -= blocks_end_cluster;
+                   nextlogic = nextlogic + blocks_end_cluster;
+                   goto again;
+                }
+            }
+doio:
+                size = totalioblocks << 9;
+                if (large_io)
+                        nbhs = (size >> 12);
+                else
+                        nbhs = (size >> SECTOR_BITS);
+                if (nbhs > max_sectors)
+                        nbhs = max_sectors;
+                err = alloc_kiovec_sz (1, &iobuf, &nbhs);
+                inuse = true;
+                if (err)
+                        goto out;
+                totalioblocks = 0;
+                while (size > 0) {
+                        if (large_io) {
+                                blocks = size >> 12;
+                                if (blocks > max_sectors)
+                                        blocks = max_sectors;
+                                iosize = blocks << 12;
+                        } else {
+                                blocks = size >> SECTOR_BITS;
+                                if (blocks > max_sectors)
+                                        blocks = max_sectors;
+                                iosize = blocks << SECTOR_BITS;
+                        }
+                        if (!blocks)
+                                break;
+                        err = map_user_kiobuf (rw, iobuf, (unsigned long) buf, iosize);
+                        if (err) {
+				printk("error in mapping iobuf\n");
+                                break;
+			}
+			/* get the blocknr depending on io size for all blocks */
+                        /* since we are awlays within the extent we only need to get the first block */
+                        iobuf->blocks[0] = firstphys + totalioblocks;
+
+                        if (large_io) {
+                                blocknr+=8;
+                                iobuf->blocks[0]=iobuf->blocks[0] / 8;
+                        } else {
+                                blocknr++;
+                        }
 
-	while (size > 0) {
-		blocks = size >> SECTOR_BITS;
-		if (blocks > max_sectors)
-			blocks = max_sectors;
-		if (!blocks)
-			break;
-		iosize = blocks << SECTOR_BITS;
-		err = map_user_kiobuf (rw, iobuf, (unsigned long) buf, iosize);
-		if (err) {
+                        for (i = 1; i < blocks; i++) {
+                                if (large_io) {
+                                        blocknr+=8;
+                                } else {
+                                        blocknr++;
+                                }
+                                iobuf->blocks[i]=iobuf->blocks[0] + i;
+                        }
+                        err =
+                                brw_kiovec (rw, 1, &iobuf, inode->i_dev, iobuf->blocks,
+                                        large_io ? 4096 : 512);
+#ifdef SUSE
+			if (rw == READ &&  err > 0)
+				mark_dirty_kiobuf(iobuf, err);
+#endif
+                        if (err >= 0) {
+                                transferred += err;
+                                size -= err;
+                                buf += err;
+                                totalioblocks += blocks;
+                        } else {
+				printk(
+				       "ocfs_rw_direct : brw_kiovec() %d\n",
+				       err);	
+				unmap_kiobuf(iobuf);
+				break;
+			}
+			
+                        unmap_kiobuf (iobuf);
+                        if (err != iosize) {
+				printk("err is %d iosize = %u\n", err, iosize);
+                                break;
+			}
+                }
+		if (err < 0) {
+			printk("need to fail out\n");
 			break;
 		}
+                free_kiovec_sz(1, &iobuf, &nbhs);
+                inuse = false;
+        	totalioblocks = 0;
+        	firstlogic = nextlogic;
+        	firstphys = nextphys;
+           }
+           if (transferred) {
+                *offp += transferred;
+                err = transferred;
+        }
 
-		for (i = 0; i < blocks; i++) {
-			ret =
-			    ocfs_get_block2 (inode, blocknr++,
-					     &iobuf->blocks[i]);
-			// iobuf->blocks[i] = ocfs_get_block2(inode, blocknr++);
-			if (ret == -1)	//   || blocknr * 512 >= inode->i_size)
-			{
-				err = 0;
-				unmap_kiobuf (iobuf);
-				goto out;
-			}
-		}
-		err =
-		    brw_kiovec (rw, 1, &iobuf, inode->i_dev, iobuf->blocks,
-				512);
-		if (err >= 0) {
-			transferred += err;
-			size -= err;
-			buf += err;
-		}
+out:
+        if (inuse)
+           free_kiovec_sz (1, &iobuf, &nbhs);
+	return err;
+}				/* ocfs_rw_direct */
 
-		unmap_kiobuf (iobuf);
+#ifdef AIO_ENABLED
+static int ocfs_kvec_rw(struct file *filp, int rw, kvec_cb_t cb, size_t size, loff_t pos);
 
-		if (err != iosize)
-			break;
+int ocfs_kvec_read(struct file *file, kvec_cb_t cb, size_t size, loff_t pos) {
+	return ocfs_kvec_rw(file, READ, cb, size, pos);
+}
+
+int ocfs_kvec_write(struct file *file, kvec_cb_t cb, size_t size, loff_t pos) {
+	return ocfs_kvec_rw(file, WRITE, cb, size, pos);
+}
+
+int ocfs_kvec_rw(struct file *filp, int rw, kvec_cb_t cb, size_t size, loff_t pos) {
+	int 		err = 0;
+	int sector_bits = SECTOR_BITS;
+	int sector_mask = 511;
+        int max_sectors = KIO_MAX_SECTORS;	
+	struct inode *inode = filp->f_dentry->d_inode;
+	unsigned int i;
+	unsigned long blocknr, blocks, iosize;
+	long firstphys;
+	int clustersize;
+	unsigned long blocks_end_cluster = 0;	
+
+	if (!size || (pos == inode->i_size)) {
+		cb.fn(cb.data, cb.vec, err);
+		return err;
 	}
 
-	if (transferred) {
-		*offp += transferred;
-		err = transferred;
+	err = -ENXIO;
+	if (pos >= inode->i_size) {
+		return err;
 	}
 
-      out:
-	free_kiovec_sz (1, &iobuf, &nbhs);
+	err = -EINVAL;
+	if ((pos < 0) || (pos & 511) || (size & 511)) {
+		return err;
+	}
 
+	for (i=0; i<cb.vec->nr; i++)
+	 	if ((cb.vec->veclet[i].offset & sector_mask) ||
+	            (cb.vec->veclet[i].length & sector_mask)) {
+	              printk("veclet offset/length wrong");
+		      return err;
+		}
+	blocknr = pos >> SECTOR_BITS;
+
+	blocks = size >> SECTOR_BITS;;
+	if (blocks > max_sectors)
+		blocks = max_sectors;
+	if (!blocks) {
+		err = -ENXIO;
+		return err;;
+	}
+
+	iosize = blocks << SECTOR_BITS;
+	clustersize = inode->i_blksize >> 9;
+	blocks_end_cluster = clustersize - (blocknr % clustersize);
+	
+	err = ocfs_get_block2(inode, blocknr, &firstphys, 512);
+	if ( err == -1 ) {
+		err = 0;
+		return err;
+	}
+
+	blocks = blocks > blocks_end_cluster ? blocks_end_cluster : blocks;
+	
+	err = brw_kvec_async(rw, cb, inode->i_dev, blocks, firstphys, sector_bits);
 	return err;
-}				/* ocfs_rw_direct */
-#endif				/* LINUX_VERSION_CODE < LinuxVersionCode(2,4,10) */
+}
+#endif
 
 /*
  * ocfs_commit_write()
@@ -1567,7 +1833,7 @@ static int ocfs_commit_write (struct fil
 {
 	int ret;
 
-	LOG_ENTRY_ARGS ("(0x%08x, 0x%08x, %u, %u)\n", file, page, from, to);
+	LOG_ENTRY_ARGS ("(0x%p, 0x%p, %u, %u)\n", file, page, from, to);
 
 	ret = generic_commit_write (file, page, from, to);
 
@@ -1595,14 +1861,14 @@ static int ocfs_create_or_open_file (str
 	bool bClearInUse = false;
 	bool new_oin = false;
 	ocfs_file_entry *fe = NULL;
-	ub8 ParentDirNodeOffset;
-	ub8 parentDirCluster;
+	__u64 ParentDirNodeOffset;
+	__u64 parentDirCluster;
 	struct file *NewFileObject = NULL;
-	ub8 allocSize = 0;
-	ub8 endofFile = 0;
+	__u64 allocSize = 0;
+	__u64 endofFile = 0;
 	ocfs_sem *oin_sem = NULL;
 
-	LOG_ENTRY_ARGS ("%s request for '%*s'\n", create?"create":"open",
+	LOG_ENTRY_ARGS ("(%s '%*s')\n", create?"create":"open",
                         dentry->d_name.len, dentry->d_name.name);
 
 	OCFS_ASSERT (dir->i_sb);
@@ -1612,13 +1878,11 @@ static int ocfs_create_or_open_file (str
 	OCFS_ASSERT (osb->obj_id.type == OCFS_TYPE_OSB);
 
 	if (!ocfs_linux_get_inode_offset (dir, &ParentDirNodeOffset, &ParentOin)) {
-		LOG_ERROR_STR ("parent inode has bad oin");
-		status = -ENOENT;
+		LOG_ERROR_STATUS (status = -ENOENT);
 		goto leave;
 	}
 	parentDirCluster = ParentDirNodeOffset;
 
-	LOG_TRACE_STR ("Acquire OSB lock");
 	ocfs_down_sem (&(osb->osb_res), true);
 	bAcquiredOSB = true;
 
@@ -1632,8 +1896,7 @@ static int ocfs_create_or_open_file (str
 	bAcquiredOSB = false;
 
 	if ((fe = ocfs_allocate_file_entry ()) == NULL) {
-		LOG_ERROR_STR ("Could not allocate mem for fileEntry");
-		status = -ENOMEM;
+		LOG_ERROR_STATUS (status = -ENOMEM);
 		goto leave;
 	}
 
@@ -1657,9 +1920,9 @@ static int ocfs_create_or_open_file (str
 			}
 			if (status < 0) {
                                if (oin->oin_flags & OCFS_OIN_IN_TEARDOWN)
-                                       LOG_ERROR_ARGS ("oin (%p) in teardown\n", oin);
+                                       LOG_ERROR_ARGS ("oin (%p) in teardown", oin);
                                else
-                                       LOG_ERROR_ARGS ("oin (%p) deleted\n", oin);
+                                       LOG_ERROR_ARGS ("oin (%p) deleted", oin);
 			}
 		} else {
 			/* now it IS possible to have an inode but no OIN attached yet
@@ -1671,7 +1934,7 @@ static int ocfs_create_or_open_file (str
 
 	if (status < 0) {
 		if (status != -ENOENT) {
-			/*  This is an error case */
+			LOG_ERROR_STATUS (status);
 			goto leave;
 		}
 
@@ -1694,13 +1957,13 @@ static int ocfs_create_or_open_file (str
 			}
 
 			if (status < 0) {
-				if (status != -ENOENT) {
-					/*  This is an error case */
+				if (status != -ENOENT && status != -EINTR) {
+					LOG_ERROR_STATUS (status);
 					goto leave;
 				}
 			}
 		} else if (!create) {
-			LOG_ERROR_STR
+			LOG_TRACE_STR
 			    ("Open request made for nonexistent file!");
 			status = -ENOENT;
 			goto leave;
@@ -1709,7 +1972,7 @@ static int ocfs_create_or_open_file (str
 
 	if (status < 0) {	/* not found on disk or in mem */
 		if (!create || status != -ENOENT) {
-			/*  This is an error case */
+			LOG_ERROR_STATUS (status);
 			goto leave;
 		}
 	} else {
@@ -1717,12 +1980,11 @@ static int ocfs_create_or_open_file (str
 	}
 
 	if (status < 0) {	/* the CREATE case */
-		ub8 fileEntry = 0;
+		__u64 fileEntry = 0;
 		ocfs_file_entry *tempFileEnt;
 
 		if ((tempFileEnt = ocfs_allocate_file_entry ()) == NULL) {
-			status = -ENOMEM;
-			LOG_ERROR_STATUS (status);
+			LOG_ERROR_STATUS (status = -ENOMEM);
 			goto leave;
 		}
 
@@ -1769,10 +2031,8 @@ static int ocfs_create_or_open_file (str
 		ocfs_release_file_entry (tempFileEnt);
 
 		if (status < 0) {
-			LOG_ERROR_ARGS ("create file failed for %s "
-					"with status (0x%08x)\n",
-					S_ISDIR (mode) ? "dir" : "file",
-					status);
+			if (status != -EINTR)
+			LOG_ERROR_STATUS (status);
 			goto leave;
 		}
 
@@ -1788,9 +2048,7 @@ static int ocfs_create_or_open_file (str
 		/*  Create a new ofile here ... */
 		OFile = ocfs_allocate_ofile ();
 		if (OFile == NULL) {
-			LOG_ERROR_STR ("ocfs_allocate_ofile failed to allocate "
-				       "memory for OFile");
-			status = -ENOMEM;
+			LOG_ERROR_STATUS (status = -ENOMEM);
 			goto leave;
 		}
 
@@ -1801,18 +2059,24 @@ static int ocfs_create_or_open_file (str
 		if (status < 0) {
 			/*  Release the memory for the OFile we allocated above */
 			ocfs_release_ofile (OFile);
-
 			LOG_ERROR_STATUS (status);
 			goto leave;
 		}
 
-		ocfs_initialize_oin (OFile->oin, osb,
+		status = ocfs_initialize_oin (OFile->oin, osb,
 				   OCFS_OIN_CACHE_UPDATE | (S_ISDIR (mode) ?
 							    OCFS_OIN_DIRECTORY :
 							    0), NewFileObject,
 				   fileEntry,
 				   S_ISDIR (mode) ? fe->extents[0].
 				   disk_off : fileEntry);
+		if (status < 0) {
+			if (status != -EINTR)
+				LOG_ERROR_STATUS (status);
+			ocfs_release_ofile (OFile);
+			ocfs_release_oin (OFile->oin, true);
+			goto leave;
+		}
 
 		if (ParentOin)
 			OCFS_CLEAR_FLAG (ParentOin->oin_flags, OCFS_OIN_IN_USE);
@@ -1823,7 +2087,7 @@ static int ocfs_create_or_open_file (str
 			OFile->oin->lock_res->lock_state =
 			    DISK_LOCK_FILE_LOCK (fe);
 		}
-		
+
                 /*  Insert the OFile on the OIN list */
 		NewOIN = OFile->oin;
 
@@ -1857,23 +2121,13 @@ static int ocfs_create_or_open_file (str
                 /* of how many concurrent openers at this point */
                 /* so take the oin->main_res so we won't need the i_sem */
 
-
-		oin_sem = &(oin->main_res);
-
-                if (!ocfs_down_sem (oin_sem, false)) {
-                        // eek! we cannot sit around and wait for main_res while we're holding i_sem
-                        bAcquiredOIN = false;
-                } else {
-                        bAcquiredOIN = true;
-                }
-                up(&inode->i_sem);
+		up(&inode->i_sem);
  
-                /* is this still a race!?!? */
-                if (!bAcquiredOIN) {
-                        oin_sem = &(oin->main_res);
-                        ocfs_down_sem (oin_sem, true);
-                        bAcquiredOIN = true;
-                }
+		oin_sem = &(oin->main_res);
+		if (!bAcquiredOIN) {
+			ocfs_down_sem (oin_sem, true);
+			bAcquiredOIN = true;
+		}
 
 		if (oin->oin_flags & OCFS_OIN_DELETE_ON_CLOSE) {
 			LOG_TRACE_STR
@@ -1883,14 +2137,14 @@ static int ocfs_create_or_open_file (str
 		}
 
 		/* only call ocfs_verify_update_oin if there's a good inode */
-		if (oin->inode == inode) {
+		if (oin->inode == inode && OIN_NEEDS_VERIFICATION(oin)) {
 			status = ocfs_verify_update_oin (osb, oin);
 			if (status < 0) {
 				/*  disable VOLUME TODO */
+				LOG_ERROR_STATUS (status);
 				goto leave;
 			}
 		}
-
 		if (oin->open_hndl_cnt > 0) {
 			/*  The OIN is currently in use by some thread. */
 			/*  We must check whether the requested access/share access */
@@ -1899,7 +2153,7 @@ static int ocfs_create_or_open_file (str
 			LOG_TRACE_ARGS ("oin->open_hndl_cnt > 0! : %u\n",
 					oin->open_hndl_cnt);
                         if (!(mode & O_DIRECT)) {
-                                if (oin->oin_flags & OCFS_OIN_OPEN_FOR_DIRECTIO) {
+                                if ((oin->oin_flags & OCFS_OIN_OPEN_FOR_DIRECTIO) && !(mode & O_RDONLY)) {
                                         status = -EACCES;
                                         LOG_TRACE_STR("file is already open O_DIRECT, "
                                                       "cannot open non O_DIRECT");
@@ -1928,9 +2182,7 @@ static int ocfs_create_or_open_file (str
 		/*  Allocate a new OFile */
 		OFile = ocfs_allocate_ofile ();
 		if (OFile == NULL) {
-			LOG_ERROR_STR ("ocfs_allocate_ofile failed to allocate "
-				       "memory for OFile");
-			status = -ENOMEM;
+			LOG_ERROR_STATUS (status = -ENOMEM);
 			goto leave;
 		}
 
@@ -1986,14 +2238,11 @@ static int ocfs_create_or_open_file (str
 	}
 
 	if (bAcquiredOSB) {
-		LOG_TRACE_STR ("Release OSB lock");
 		ocfs_up_sem (&(osb->osb_res));
 		bAcquiredOSB = false;
 	}
 
-	if (fe != NULL) {
-		ocfs_release_file_entry (fe);
-	}
+	ocfs_release_file_entry (fe);
 
 	LOG_EXIT_STATUS (status);
 	return (status);
@@ -2011,43 +2260,31 @@ static int ocfs_file_open (struct inode 
 	int status;
 	int ret, err = 0;
 
-	LOG_ENTRY_ARGS ("(0x%08x, 0x%08x, '%*s')\n", inode, file, 
+	LOG_ENTRY_ARGS ("(0x%p, 0x%p, '%*s')\n", inode, file, 
                         file->f_dentry->d_name.len, file->f_dentry->d_name.name);
 
 	atomic_inc (&parent->i_count);
 	status = ocfs_create_or_open_file (inode, parent, dentry, file->f_flags,
 					   &ofile, NODEV);
 	if (status < 0) {
-		if (status == -ENOENT) {
-			LOG_ERROR_STR ("File not found while opening file");
-			ret = -ENOENT;
-			goto bail;
-		} else if (status == -ENOMEM) {
-			LOG_ERROR_STR ("Out of memory while opening file");
-			ret = -ENOMEM;
-			goto bail;
-		} else if (status == -EACCES) {
-			LOG_ERROR_STR ("Access denied while opening file");
-			ret = -EACCES;
-			goto bail;
-		} else {
+		if (status != -ENOENT && status != -ENOMEM &&
+		    status != -EACCES && status != -EINTR) {
 			LOG_ERROR_STATUS (status);
 			ret = -EACCES;
-			goto bail;
-		}
+		} else
+			ret = status;
+		goto bail;
 	}
 
 	file->private_data = (void *) ofile;
 	ofile->k_file = file;
-	ofile->f_iobuf_lock = 0;
-	ofile->f_iobuf = NULL;
 	ret = 0;
 
       bail:
 	if (ret != 0)
 		atomic_dec (&parent->i_count);
 	LOG_TRACE_ARGS
-	    ("exiting file_open: file=%p dentry=%p inode=%p oin=%p kiovec=%d\n",
+	    ("exiting: file=%p dentry=%p inode=%p oin=%p kiovec=%d\n",
 	     file, file->f_dentry, file->f_dentry->d_inode,
 	     ((ocfs_inode *)file->f_dentry->d_inode->u.generic_ip), err);
 	LOG_EXIT_LONG (ret);
@@ -2065,13 +2302,13 @@ static int ocfs_mknod (struct inode *dir
 	ocfs_file *newofile = NULL;
 	int error = -EACCES;
 
-	LOG_ENTRY_ARGS ("(0x%08x, 0x%08x, %d, %d, '%*s')\n", dir, dentry, mode, dev,
-                        dentry->d_name.len, dentry->d_name.name);
+	LOG_ENTRY_ARGS ("(0x%p, 0x%p, %d, %d, '%*s')", dir, dentry, mode,
+			dev, dentry->d_name.len, dentry->d_name.name);
 
 	atomic_inc (&dir->i_count);
 
-	status =
-	    ocfs_create_or_open_file (NULL, dir, dentry, mode, &newofile, dev);
+	status = ocfs_create_or_open_file (NULL, dir, dentry, mode, &newofile,
+					   dev);
 	if (status >= 0) {
 		ocfs_inode *oin;
 
@@ -2084,27 +2321,31 @@ static int ocfs_mknod (struct inode *dir
 		inode = new_inode (dir->i_sb);
 		error = PTR_ERR (inode);
 		if (!IS_ERR (inode)) {
+			ocfs_file_entry fe;
+
+			fe.extents[0].disk_off = fe.this_sector = 0;
+			fe.uid = current->fsuid;
+			fe.gid = current->fsgid;
+			fe.file_size = 0;
+			fe.modify_time = fe.create_time = CURRENT_TIME;
 			inode->i_rdev = dev;
 			inode->i_ino = LO (oin->file_disk_off);
 			oin->inode = inode;
-			ocfs_populate_inode (inode, (ub8) 0, mode,
-					     current->fsuid, current->fsgid,
-					     0, CURRENT_TIME,
-					     CURRENT_TIME, CURRENT_TIME,
-					     (void *) oin);
+
+			ocfs_populate_inode (inode, &fe, mode, oin);
 			insert_inode_hash (inode);
 			d_instantiate (dentry, inode);
 			error = 0;
 		} else {
-			LOG_ERROR_ARGS ("new_inode failed!!! error=%d\n",
-					error);
+			LOG_ERROR_ARGS ("new_inode failed! error=%d", error);
 		}
 	} else if (status == -ENOSPC) {
-		LOG_ERROR_STR ("Disk is full. TODO: cleanup");
+		LOG_ERROR_STR ("Disk is full");
 		error = -ENOSPC;
+	} else if (status == -EINTR) {
+		error = -EINTR;
 	} else {
-		LOG_ERROR_STR
-		    ("ocfs_create_or_open_file failed! TODO: cleanup!");
+		LOG_ERROR_STATUS (status);
 	}
 
       bail:
@@ -2126,7 +2367,7 @@ static int ocfs_mkdir (struct inode *dir
 {
 	int ret;
 
-	LOG_ENTRY_ARGS ("(0x%08x, 0x%08x, %d, '%*s')\n", dir, dentry, mode,
+	LOG_ENTRY_ARGS ("(0x%p, 0x%p, %d, '%*s')\n", dir, dentry, mode,
                         dentry->d_name.len, dentry->d_name.name);
 
 	ret = ocfs_mknod (dir, dentry, mode | S_IFDIR, NODEV);
@@ -2143,7 +2384,7 @@ static int ocfs_create (struct inode *di
 {
 	int ret;
 
-	LOG_ENTRY_ARGS ("(0x%08x, 0x%08x, %d, '%*s')\n", dir, dentry, mode,
+	LOG_ENTRY_ARGS ("(0x%p, 0x%p, %d, '%*s')\n", dir, dentry, mode,
                         dentry->d_name.len, dentry->d_name.name);
 
 	ret = ocfs_mknod (dir, dentry, mode | S_IFREG, NODEV);
@@ -2159,11 +2400,11 @@ static int ocfs_create (struct inode *di
 static int ocfs_link (struct dentry *old_dentry, struct inode *dir, struct dentry *dentry)
 {
 	int status;
-	ub8 off;
+	__u64 off;
 	ocfs_file_entry *fe;
 	struct inode *inode;
 
-	LOG_ENTRY_ARGS ("(0x%08x, 0x%08x, 0x%08x, old='%*s' new='%*s')\n", old_dentry, dir, dentry,
+	LOG_ENTRY_ARGS ("(0x%p, 0x%p, 0x%p, old='%*s' new='%*s')\n", old_dentry, dir, dentry,
                         old_dentry->d_name.len, old_dentry->d_name.name,
                         dentry->d_name.len, dentry->d_name.name);
 
@@ -2179,14 +2420,13 @@ static int ocfs_link (struct dentry *old
 		goto bail;
 	}
 
-
 	status = ocfs_read_file_entry (((ocfs_super *)(inode->i_sb->u.generic_sbp)), fe, off);
 	if (status < 0) {
 		LOG_ERROR_STATUS (status);
 		goto bail;
 	}
 	if (!IS_VALID_FILE_ENTRY (fe)) {
-		LOG_ERROR_STR ("fe Read from disk is invalid");
+		LOG_ERROR_ARGS ("Invalid fe at offset %u.%u", HI(off), LO(off));
 		goto bail;
 	}
 
@@ -2207,7 +2447,7 @@ static inline int ocfs_positive (struct 
 {
 	int ret;
 
-	LOG_ENTRY_ARGS ("(0x%08x, '%*s')\n", dentry, 
+	LOG_ENTRY_ARGS ("(0x%p, '%*s')\n", dentry, 
                         dentry->d_name.len, dentry->d_name.name);
 
 	ret = dentry->d_inode && !d_unhashed (dentry);
@@ -2225,7 +2465,7 @@ static int ocfs_empty (struct dentry *de
 	struct list_head *list;
 	int ret;
 
-	LOG_ENTRY_ARGS ("(0x%08x, '%*s')\n", dentry,
+	LOG_ENTRY_ARGS ("(0x%p, '%*s')\n", dentry,
                         dentry->d_name.len, dentry->d_name.name);
 
 	spin_lock (&dcache_lock);
@@ -2255,12 +2495,15 @@ static int ocfs_empty (struct dentry *de
  */
 static int ocfs_unlink (struct inode *dir, struct dentry *dentry)
 {
-	int status;
+	int status, tmpstat;
 	struct inode *inode;
 	ocfs_inode *oin = NULL;
-	int retval = -ENOTEMPTY;
+	int retval = -EBUSY;
+	__u64 off;
+	ocfs_lock_res *lockres;
+	ocfs_super *osb = NULL;
 
-	LOG_ENTRY_ARGS ("(0x%08x, 0x%08x, '%*s')\n", dir, dentry,
+	LOG_ENTRY_ARGS ("(0x%p, 0x%p, '%*s')\n", dir, dentry,
                         dentry->d_name.len, dentry->d_name.name);
 
 
@@ -2268,20 +2511,18 @@ static int ocfs_unlink (struct inode *di
 
 	if ((atomic_read (&inode->i_count) > 1)
 	    || (atomic_read (&dentry->d_count) > 2)) {
-		retval = -EBUSY;
 		goto bail;
 	}
 
 	if (ocfs_empty (dentry)) {
 		status = ocfs_set_disposition_information (dir, dentry);
 		if (status < 0) {
-
 			if (status != -ENOTEMPTY && status != -EPERM &&
-  	   		    status != -EBUSY) 
-				LOG_ERROR_STR ("ocfs_set_disposition_information failed!");
-			else
-				LOG_TRACE_STR ("ocfs_set_disposition_information failed!");
-			retval = -EBUSY;
+  	   		    status != -EBUSY && status != -EINTR) {
+				LOG_ERROR_STATUS (status);
+				retval = -EBUSY;
+			} else
+				retval = status;
 			goto bail;
 		}
 
@@ -2294,6 +2535,17 @@ static int ocfs_unlink (struct inode *di
 
 		if (oin)
 			ocfs_release_oin (oin, true);
+		else {
+                	osb = ((ocfs_super *)(inode->i_sb->u.generic_sbp));
+                	if (osb && ocfs_linux_get_inode_offset (inode, &off, NULL)) {
+                        	tmpstat = ocfs_lookup_sector_node (osb, off, &lockres);
+                        	if (tmpstat >= 0 && lockres) {
+                                	ocfs_remove_sector_node (osb, lockres);
+                        		ocfs_put_lockres (lockres);
+				} else 
+					LOG_TRACE_STR ("lookup sectornode failed");
+			}
+                }
 
 		inode->i_nlink--;
 		/* This probably is not needed, leavign it in as comment */
@@ -2321,15 +2573,25 @@ static int ocfs_rename (struct inode *ol
 	struct inode *new_inode = new_dentry->d_inode;
 	int error = 0;
 
-	LOG_ENTRY_ARGS ("(0x%08x, 0x%08x, 0x%08x, 0x%08x, from='%*s' to='%*s')\n",
+	LOG_ENTRY_ARGS ("(0x%p, 0x%p, 0x%p, 0x%p, from='%*s' to='%*s')\n",
 			old_dir, old_dentry, new_dir, new_dentry,
                         old_dentry->d_name.len, old_dentry->d_name.name,
                         new_dentry->d_name.len, new_dentry->d_name.name);
 
-	if ((atomic_read (&old_inode->i_count) > 1)
-	    || (atomic_read (&old_dentry->d_count) > 1)) {
+	if (atomic_read (&old_inode->i_count) > 1) {
+		error = -EBUSY;
+		goto bail;
+	} else if (atomic_read (&old_dentry->d_count) > 1) {
+#if LINUX_VERSION_CODE >= LinuxVersionCode(2,4,18)
+		shrink_dcache_parent (old_dentry);
+		if (atomic_read (&old_dentry->d_count) > 1) {
+			error = -EBUSY;
+			goto bail;
+		}
+#else
 		error = -EBUSY;
 		goto bail;
+#endif
 	}
 
 	if (new_inode) {
@@ -2342,8 +2604,11 @@ static int ocfs_rename (struct inode *ol
 		status = ocfs_set_rename_information (old_dir, old_dentry, new_dir,
 						   new_dentry);
 		if (status < 0) {
-			error = -ENOENT;
-			LOG_ERROR_STATUS (status);
+			if (status != -EINTR && status != -ENOENT) {
+				LOG_ERROR_STATUS (status);
+				error = -ENOENT;
+			} else
+				error = status;
 			goto bail;
 		}
 		old_inode->i_nlink++;
@@ -2361,8 +2626,11 @@ static int ocfs_rename (struct inode *ol
 		status = ocfs_set_rename_information (old_dir, old_dentry, new_dir,
 						   new_dentry);
 		if (status < 0) {
-			error = -ENOENT;
-			LOG_ERROR_STATUS (status);
+			if (status != -EINTR && status != -ENOENT) {
+				LOG_ERROR_STATUS (status);
+				error = -ENOENT;
+			} else
+				error = status;
 			goto bail;
 		}
 		old_inode->i_nlink++;
@@ -2394,11 +2662,11 @@ static int ocfs_symlink (struct inode *d
 	ocfs_super *osb = NULL;
 	ocfs_inode *oin = NULL;
 	struct inode *inode, *parentInode = NULL;
-	ub8 fileOff, parentOff;
-	ub8 newsize;
+	__u64 fileOff, parentOff;
+	__u64 newsize;
 	int status;
 
-	LOG_ENTRY_ARGS ("(0x%08x, 0x%08x, symname='%s' actual='%*s')\n", dir, dentry, symname,
+	LOG_ENTRY_ARGS ("(0x%p, 0x%p, symname='%s' actual='%*s')\n", dir, dentry, symname,
                         dentry->d_name.len, dentry->d_name.name);
 
 	atomic_inc (&dir->i_count);
@@ -2454,9 +2722,11 @@ static int ocfs_symlink (struct inode *d
 				      &fileOff, FLAG_FILE_EXTEND, NULL, NULL);
 
 		if (status < 0) {
-			LOG_TRACE_ARGS ("Failed to extend file to %u.%u !!!\n",
-					HI (newsize), LO (newsize));
-			error = -ENOSPC;
+			if (status != -EINTR && status != -ENOSPC) {
+				LOG_ERROR_STATUS (status);
+				error = -ENOSPC;
+			} else
+				error = status;
 			goto bail;
 		}
 
@@ -2466,6 +2736,8 @@ static int ocfs_symlink (struct inode *d
 			ocfs_up_sem (&(oin->main_res));
 		}
 		error = ocfs_block_symlink (inode, symname, l);
+		if (error < 0)
+			LOG_ERROR_STATUS (error);
 	}
 
       bail:
@@ -2487,7 +2759,7 @@ static int ocfs_file_release (struct ino
         struct dentry *dentry;
         struct inode *parent;
 
-	LOG_ENTRY_ARGS ("(0x%08x, 0x%08x, '%*s')\n", inode, file,
+	LOG_ENTRY_ARGS ("(0x%p, 0x%p, '%*s')\n", inode, file,
                         file->f_dentry->d_name.len, file->f_dentry->d_name.name);
 
 	dentry = file->f_dentry;
@@ -2576,9 +2848,10 @@ bail:
  */
 static int ocfs_flush (struct file *file)
 {
-	LOG_ENTRY_ARGS ("(0x%08x, '%*s')\n", file,
+	LOG_ENTRY_ARGS ("(0x%p, '%*s')\n", file,
                         file->f_dentry->d_name.len, file->f_dentry->d_name.name);
 
+	fsync_inode_buffers(file->f_dentry->d_inode);
 	LOG_EXIT_LONG (0);
 	return 0;
 }				/* ocfs_flush */
@@ -2589,9 +2862,9 @@ static int ocfs_flush (struct file *file
  */
 static int ocfs_sync_file (struct file *file, struct dentry *dentry, int datasync)
 {
-	LOG_ENTRY_ARGS ("(0x%08x, 0x%08x, %d, '%*s')\n", file, dentry, datasync,
+	LOG_ENTRY_ARGS ("(0x%p, 0x%p, %d, '%*s')\n", file, dentry, datasync,
                         dentry->d_name.len, dentry->d_name.name);
-
+	fsync_inode_buffers(dentry->d_inode);
 	LOG_EXIT_LONG (0);
 	return 0;
 }				/* ocfs_sync_file */
@@ -2602,7 +2875,7 @@ static int ocfs_sync_file (struct file *
  */
 static void ocfs_put_super (struct super_block *sb)
 {
-	LOG_ENTRY_ARGS ("(0x%08x)\n", sb);
+	LOG_ENTRY_ARGS ("(0x%p)\n", sb);
 
 	fsync_no_super (sb->s_dev);
 	LOG_TRACE_STR ("put super... do nothing!  DONE!!!!");
@@ -2625,10 +2898,10 @@ static int ocfs_readdir (struct file *fi
 	ocfs_inode *oin;
 	ocfs_file *ofile;
 	ocfs_file_entry *entry = NULL;
-	ub8 rootOff;
+	__u64 rootOff;
 	int ret = 0;
 
-	LOG_ENTRY_ARGS ("(0x%08x, 0x%08x, '%*s')\n", filp, dirent, 
+	LOG_ENTRY_ARGS ("(0x%p, 0x%p, '%*s')\n", filp, dirent, 
                         filp->f_dentry->d_name.len, filp->f_dentry->d_name.name);
 
 	if (!filp ||
@@ -2697,15 +2970,27 @@ static int ocfs_readdir (struct file *fi
 		    }
 		    ofile = (ocfs_file *) filp->private_data;
 		    while (1) {
-			    if (ocfs_find_files_on_disk (osb, rootOff, NULL, entry, ofile) < 0)
-				    break;
-
-			    if (filldir
-				(dirent, entry->filename,
-				 strlen (entry->filename), filp->f_pos,
-				 LO (entry->this_sector), DT_UNKNOWN) < 0) {
-				    goto bail;
-			    }
+                           int r;
+                            /* todo - find out if we need locking */
+                            if (ofile->filldir.ino != 0) {
+                                r=filldir (dirent, ofile->filldir.fname,
+                                    strlen (ofile->filldir.fname),
+                                    ofile->filldir.pos, ofile->filldir.ino,
+                                    DT_UNKNOWN);
+                                ofile->filldir.ino = 0;
+                            } else {
+                                if (ocfs_find_files_on_disk (osb, rootOff, NULL,
+                                    entry, ofile) < 0)
+                                     break;
+                              r=filldir (dirent, entry->filename, strlen (entry->filename), filp->f_pos,
+                                    LO (entry->this_sector), DT_UNKNOWN);
+                            }
+                            if (r < 0) {
+                                    memcpy(ofile->filldir.fname, entry->filename, OCFS_MAX_FILENAME_LENGTH);
+                                    ofile->filldir.pos = filp->f_pos;
+                                    ofile->filldir.ino = LO (entry->this_sector);
+                                    goto bail;
+                            }
 			    pos++;
 			    filp->f_pos++;
 		    }
@@ -2727,7 +3012,7 @@ static int ocfs_readdir (struct file *fi
  */
 static void ocfs_put_inode (struct inode *inode)
 {
-	LOG_ENTRY_ARGS ("(0x%08x)\n", inode);
+	LOG_ENTRY_ARGS ("(0x%p)\n", inode);
 	LOG_TRACE_ARGS ("put_inode: count=%d\n", inode->i_count);
 	if (inode_data_is_oin(inode) && (atomic_read (&inode->i_count) == 1) ) {
 	     ocfs_inode *oin;
@@ -2744,7 +3029,7 @@ static void ocfs_put_inode (struct inode
  */
 static void ocfs_clear_inode (struct inode *inode)
 {
-	LOG_ENTRY();
+	LOG_ENTRY_ARGS ("(ino=0x%p)\n", inode);
 
 	if (inode) {
 		if (inode_data_is_oin (inode)) {
@@ -2752,6 +3037,7 @@ static void ocfs_clear_inode (struct ino
 			ocfs_super *osb;
 			ocfs_file *ofile;
 			struct list_head *iter;
+			struct list_head *temp_iter;
 
 			LOG_TRACE_STR ("inode with oin : clear inode");
 
@@ -2767,7 +3053,7 @@ static void ocfs_clear_inode (struct ino
 				goto bail;
 			}
 
-			list_for_each (iter, &(oin->next_ofile)) {
+			list_for_each_safe (iter, temp_iter, &(oin->next_ofile)) {
 				ofile =
 				    list_entry (iter, ocfs_file, next_ofile);
 				ocfs_release_ofile (ofile);
@@ -2780,29 +3066,24 @@ static void ocfs_clear_inode (struct ino
 			oin = NULL;
 			LOG_TRACE_STR ("yeah! done with deallocs!");
 		} else {
-			ub8 fileOff;
-			ub4 len;
-			ocfs_lock_res *FoundResource;
+			__u64 fileOff;
+			ocfs_lock_res *lockres = NULL;
 			ocfs_super *osb;
 
 			osb = ((ocfs_super *)(inode->i_sb->u.generic_sbp));
 
 			if (ocfs_linux_get_inode_offset (inode, &fileOff, NULL)) {
-				if (!HASHTABLE_DESTROYED
-				    (&(osb->root_sect_node))) {
-					if (ocfs_hash_get
-					    (&(osb->root_sect_node), &(fileOff),
-					     sizeof (ub8),
-					     (void **) &FoundResource, &len)) {
-						FoundResource->oin = NULL;
-						LOG_TRACE_STR ("found lock");
-						ocfs_hash_del (&
-							     (osb->
-							      root_sect_node),
-							     &(fileOff),
-							     sizeof (ub8));
-                                                ocfs_free_lockres(FoundResource);
-					}
+				if (!ocfs_lookup_sector_node (osb, fileOff, &lockres)) {
+					if (lockres) {
+						if (lockres->oin) {
+							ocfs_put_lockres (lockres->oin->lock_res);
+							lockres->oin->lock_res = NULL;
+							lockres->oin = NULL;
+						}
+						ocfs_remove_sector_node (osb, lockres);
+						ocfs_put_lockres(lockres);
+					} else
+						LOG_TRACE_STR ("lockres in hash is null");
 				} else {
 					LOG_TRACE_STR
 					    ("hashtable has already been destroyed.  skipping.");
@@ -2842,15 +3123,14 @@ static int ocfs_setattr (struct dentry *
 	struct inode *parentInode;
 	struct inode *inode = dentry->d_inode;
 	int error = 0;
-	ub8 newsize;
+	__u64 newsize;
 	int status;
-	struct inode savedInode;
 	ocfs_inode *oin = NULL;
 	ocfs_super *osb = NULL;
-	ub8 parentOff, fileOff;
+	__u64 parentOff, fileOff;
         ocfs_file_entry *fe=NULL;
 
-	LOG_ENTRY_ARGS ("(0x%08x, '%*s')\n", dentry,
+	LOG_ENTRY_ARGS ("(0x%p, '%*s')\n", dentry,
                         dentry->d_name.len, dentry->d_name.name);
 
 	osb = ((ocfs_super *)(inode->i_sb->u.generic_sbp));
@@ -2898,7 +3178,7 @@ static int ocfs_setattr (struct dentry *
 	}
 
 	if (attr->ia_valid & ATTR_SIZE) {
-                ub4 flags;
+                __u32 flags;
 
 		if (oin != NULL) {
 			ocfs_down_sem (&(oin->main_res), true);
@@ -2906,8 +3186,7 @@ static int ocfs_setattr (struct dentry *
 				LOG_TRACE_STR ("OIN_NEEDS_VERIFICATION");
 				status = ocfs_verify_update_oin (osb, oin);
 				if (status < 0) {
-					LOG_TRACE_STR
-					    ("ocfs_verify_update_oin failed");
+					LOG_ERROR_STATUS (status);
 					LOG_TRACE_STR ("TODO: disable volume");
 					ocfs_up_sem (&(oin->main_res));
 					error = -EIO;
@@ -2923,15 +3202,17 @@ static int ocfs_setattr (struct dentry *
                 else 
 #endif
                     flags = FLAG_FILE_EXTEND;
-                
+
 		status = ocfs_create_modify_file (osb, parentOff, oin,
 				     NULL, newsize, &fileOff, 
 				     flags, NULL, NULL);
 
 		if (status < 0) {
-			LOG_TRACE_ARGS ("Failed to extend file to %u.%u !!!\n",
-					HI (newsize), LO (newsize));
+			if (status != -EINTR && status != -ENOSPC) {
+				LOG_ERROR_STATUS (status);
 			error = -ENOSPC;
+			} else
+				error = status;
 			goto bail;
 		}
 
@@ -2947,9 +3228,6 @@ static int ocfs_setattr (struct dentry *
 		}
 	}
 
-	savedInode = *inode;
-	inode_setattr (inode, attr);
-
 	/* if directory, put FILE_ENTRY ptr into fileOff */
 	if (S_ISDIR (inode->i_mode))
 		ocfs_linux_get_dir_entry_offset (osb, &fileOff, parentOff, &(dentry->d_name), &fe);
@@ -2960,18 +3238,20 @@ static int ocfs_setattr (struct dentry *
 		    ocfs_create_modify_file (osb, parentOff, NULL, NULL, newsize,
 				      &fileOff, FLAG_FILE_UPDATE, NULL, attr);
 	if (status < 0) {
-		LOG_ERROR_STR
-		    ("OcfsSetAttr failed!  restoring inode and aborting transaction");
-		*inode = savedInode;
-		// mark_inode_dirty(inode);
+		if (status != -EINTR) {
+		LOG_ERROR_STATUS (status);
 		error = -EIO;
+		} else
+			error = status;
+		goto bail;
 	}
 
+	inode_setattr (inode, attr);
+
       bail:
 	atomic_dec (&parentInode->i_count);
       bail2:
-        if (fe!=NULL)
-            ocfs_release_file_entry(fe);
+	ocfs_release_file_entry(fe);
 	LOG_EXIT_LONG (error);
 	return error;
 }				/* ocfs_setattr */
@@ -2985,8 +3265,9 @@ static int ocfs_getattr (struct dentry *
 	ocfs_inode *oin;
 	struct inode *inode;
         struct super_block *sb = dentry->d_inode->i_sb;
+	int status;
 
-	LOG_ENTRY_ARGS ("(0x%08x, 0x%08x, '%*s')\n", dentry, attr,
+	LOG_ENTRY_ARGS ("(0x%p, 0x%p, '%*s')\n", dentry, attr,
                         dentry->d_name.len, dentry->d_name.name);
 
 	inode = dentry->d_inode;
@@ -2995,8 +3276,13 @@ static int ocfs_getattr (struct dentry *
 	oin = ((ocfs_inode *)inode->u.generic_ip);
 	if (oin == ((ocfs_super *)(sb->u.generic_sbp))->oin_root_dir)
 		goto bail;
-	if (oin != NULL)
-		ocfs_verify_update_oin (oin->osb, oin);
+	if (oin != NULL) {
+		ocfs_down_sem (&(oin->main_res), true);
+		status = ocfs_verify_update_oin (oin->osb, oin);
+		if (status < 0)
+			LOG_ERROR_STATUS (status);
+		ocfs_up_sem (&(oin->main_res));
+	}
 
       bail:
 	LOG_EXIT_LONG (0);
@@ -3010,24 +3296,31 @@ static int ocfs_getattr (struct dentry *
 static int ocfs_dentry_revalidate (struct dentry *dentry, int flags)
 {
 	int ret = 0;    /* if all else fails, just return false */
+	int tmpstat = 0;
 	ocfs_file_entry *fe = NULL;
 	struct inode *inode;
 	ocfs_inode *oin;
 	ocfs_super *osb;
-	ub8 off;
+	__u64 off;
 	ocfs_find_inode_args args;
         struct qstr q;
 	
-        LOG_ENTRY_ARGS ("(0x%08x, %d, '%*s')\n", dentry, flags,
+        LOG_ENTRY_ARGS ("(0x%p, %d, '%*s')\n", dentry, flags,
                         dentry->d_name.len, dentry->d_name.name);
 
 	if ((inode = dentry->d_inode) == NULL ||
 	    (osb = (ocfs_super *)(inode->i_sb->u.generic_sbp)) == NULL)
                 goto bail;
 
+	if (osb->publ_map == (1 << osb->node_num)) {
+		LOG_TRACE_STR ("Only node alive.  revalidate=true.");
+		ret = 1;
+		goto bail;
+	}
+
         /* check for oin */
 	if (inode_data_is_oin (inode)) {
-                ocfs_lock_res *res;
+                ocfs_lock_res *res = NULL;
                 ret = 1;  /* with an oin we cannot fail revalidate */
 		oin = ((ocfs_inode *)inode->u.generic_ip);
 
@@ -3035,22 +3328,26 @@ static int ocfs_dentry_revalidate (struc
                         /* if I hold cache lock, no revalidate needed */
                         if (res->lock_type == OCFS_DLM_ENABLE_CACHE_LOCK &&
                             res->master_node_num == osb->node_num) {
+				ocfs_put_lockres (res);
                                 goto bail;
-                        }
+                        } else
+				ocfs_put_lockres (res);
                 }
                 /* hit the disk */
                 /* TODO: optimize */
 		ocfs_down_sem (&(oin->main_res), true);
 		oin->needs_verification = true;
+		tmpstat = ocfs_verify_update_oin(osb, oin);
+		if (tmpstat < 0)
+			LOG_ERROR_STATUS (tmpstat);
 		ocfs_up_sem (&(oin->main_res));
-		UPDATE_OIN (oin);
 		goto bail;
 	} 
         
         /* no oin for this dentry, must hit the disk */
         /* TODO: optimize */
         if (S_ISDIR (inode->i_mode)) {
-		ub8 parentOff;
+		__u64 parentOff;
                 struct inode *parent = dentry->d_parent->d_inode;
 
                 /* shouldn't be revalidating root dir, need offset to parent, and fe for this dir */
@@ -3101,7 +3398,7 @@ bail:
             ocfs_inode *oin;
             int status;
 
-            LOG_ENTRY_ARGS ("(0x%08x)\n", dentry);
+            LOG_ENTRY_ARGS ("(0x%p)\n", dentry);
 
             ret = 0;
             inode = dentry->d_inode;
@@ -3136,18 +3433,17 @@ void ocfs_release_cached_oin (ocfs_super
 {
 	bool bAcquiredOIN = false;
 	ocfs_lock_res *lockResource = NULL;
-	static spinlock_t lamelock = SPIN_LOCK_UNLOCKED;
-	ub4 vallen;
 	ocfs_lock_res *val=NULL;
         struct dentry *dentry;
-                struct list_head *iter;
+        struct list_head *iter;
+        struct list_head *temp_iter;
         struct inode *inode;
         int refcount = 0;
+	int status = 0;
 
 
-	LOG_ENTRY_ARGS ("(oin = 0x%08x)\n", oin);
+	LOG_ENTRY_ARGS ("(oin = 0x%p)\n", oin);
 
-	spin_lock (&lamelock);	/* TODO: figure out if this helps ;-) */
 	if (oin == NULL)
 		goto bail;
 
@@ -3156,7 +3452,7 @@ void ocfs_release_cached_oin (ocfs_super
         inode = oin->inode;
         
         if (inode) {
-                list_for_each (iter, &(inode->i_dentry)) {
+                list_for_each_safe (iter, temp_iter, &(inode->i_dentry)) {
                         dentry = list_entry (iter, struct dentry, d_alias);
                         refcount += atomic_read(&dentry->d_count);
                 }
@@ -3179,13 +3475,16 @@ void ocfs_release_cached_oin (ocfs_super
 		}
 
 		lockResource = (ocfs_lock_res *) oin->lock_res;
-		if (lockResource == NULL)
+		if (lockResource == NULL) {
+			LOG_ERROR_STR ("lockres=null");
 			goto bail;
+		}
 
 		if (lockResource->signature != 0x55AA) {
 			LOG_ERROR_STR("Invalid lock resource");
 			goto bail;
 		}
+		ocfs_get_lockres (lockResource);
 
 		if (lockResource->sector_num == 0 || lockResource->oin != oin)
 			goto bail;
@@ -3196,31 +3495,51 @@ void ocfs_release_cached_oin (ocfs_super
 			lockResource->in_cache_list = false;
 		}
 
-		if (HASHTABLE_DESTROYED(&(osb->root_sect_node))) {
-			LOG_TRACE_STR ("hashtable already destroyed! Continuing.");
-			oin->lock_res = NULL;
-			goto bail;
-		}
-
-		if (ocfs_hash_get(&(osb->root_sect_node),
-				  &(lockResource->sector_num), sizeof (ub8),
-				  (void **)&val, &vallen) && val==lockResource) {
-			ocfs_hash_del (&(osb->root_sect_node),
-				       &(val->sector_num), sizeof (ub8));
-			ocfs_free_lockres(val);
+		status = ocfs_lookup_sector_node (osb, lockResource->sector_num, &val);
+		if (status >= 0) {
+			if (val == lockResource)
+				ocfs_remove_sector_node (osb, val);
+			else
+				LOG_ERROR_ARGS("(lres=0x%p) != (val=0x%p)",
+					       lockResource, val);
+			ocfs_put_lockres (val);
 		} else {
-			LOG_ERROR_ARGS("lockres (0x%08x) is not in the hash! " \
-				       "(val=%p)\n", lockResource, val);
+			if (status == -EFAIL) {
+				ocfs_put_lockres (oin->lock_res);
+				oin->lock_res = NULL;
+				LOG_TRACE_ARGS ("hashtable already destroyed\n");
+				goto bail;
+			}
+			LOG_ERROR_ARGS("lres=0x%p is not in the hash!",
+				       lockResource);
 		}
+		ocfs_put_lockres (oin->lock_res);
 		oin->lock_res = NULL;
 	}
 
       bail:
-	spin_unlock (&lamelock);
+	ocfs_put_lockres (lockResource);
 	LOG_EXIT ();
 	return;
 }				/* ocfs_release_cached_oin */
 
+#ifdef CDTOR_FOR_SLAB
+static void lockres_ctor(void *p, kmem_cache_t *slab, unsigned long flags)
+{
+	ocfs_lock_res *lockres;
+	lockres = p;
+	lockres->signature = 0x55AA;
+}
+
+static void lockres_dtor(void *p, kmem_cache_t *slab, unsigned long flags)
+{
+	ocfs_lock_res *lockres;
+	lockres = p;
+	if (lockres->signature == 0x55AA)
+		ocfs_free_lockres((ocfs_lock_res *)p);
+}
+#endif
+
 /*
  * ocfs_initialize_mem_lists()
  *
@@ -3228,19 +3547,19 @@ void ocfs_release_cached_oin (ocfs_super
 int ocfs_initialize_mem_lists (void)
 {
 	OcfsGlobalCtxt.oin_cache = kmem_cache_create ("oin_cache",
-		sizeof (ocfs_inode) + OCFS_POINTER_SIZE, 0, SLAB_HWCACHE_ALIGN,
+		sizeof (ocfs_inode) + OCFS_POINTER_SIZE, 0, SLAB_NO_REAP | SLAB_HWCACHE_ALIGN,
 		NULL, NULL);
 
 	OcfsGlobalCtxt.ofile_cache = kmem_cache_create ("ofile_cache",
-		sizeof (ocfs_file) + OCFS_POINTER_SIZE, 0, SLAB_HWCACHE_ALIGN,
+		sizeof (ocfs_file) + OCFS_POINTER_SIZE, 0, SLAB_NO_REAP | SLAB_HWCACHE_ALIGN,
 		NULL, NULL);
 
 	OcfsGlobalCtxt.lockres_cache = kmem_cache_create ("lockres_cache",
-		sizeof (ocfs_lock_res) + OCFS_POINTER_SIZE, 0, SLAB_HWCACHE_ALIGN,
+		sizeof (ocfs_lock_res) + OCFS_POINTER_SIZE, 0, SLAB_NO_REAP | SLAB_HWCACHE_ALIGN,
 		NULL, NULL);
 
 	OcfsGlobalCtxt.fe_cache = kmem_cache_create ("fileentry_cache",
-		OCFS_SECTOR_SIZE, 0, SLAB_HWCACHE_ALIGN, NULL, NULL);
+		OCFS_SECTOR_SIZE, 0, SLAB_NO_REAP | SLAB_HWCACHE_ALIGN, NULL, NULL);
 
 	OCFS_SET_FLAG (OcfsGlobalCtxt.flags, OCFS_FLAG_MEM_LISTS_INITIALIZED);
 
@@ -3289,12 +3608,12 @@ static void ocfs_set_exclusive_mount_fla
 int ocfs_remount (struct super_block *sb, int *flags, char *data)
 {
 	int status;
-	ocfs_lock_res *lr;
+	ocfs_lock_res *lr = NULL;
 	ocfs_super *osb;
-	ub1 *buffer = NULL;
+	__u8 *buffer = NULL;
 	int ret = 0;
-	uid_t uid = current->fsuid;
-	gid_t gid = current->fsgid;
+	__u32 uid = current->fsuid;
+	__u32 gid = current->fsgid;
 	int length;
 	bool c;
 	bool reclaim_id;
@@ -3304,7 +3623,7 @@ int ocfs_remount (struct super_block *sb
 
 	fe = ocfs_allocate_file_entry();
 	if (fe == NULL) {
-		ret = -ENOMEM;
+		LOG_ERROR_STATUS (ret = -ENOMEM);
 		goto bail;
 	}
 
@@ -3323,8 +3642,7 @@ int ocfs_remount (struct super_block *sb
 	length = (OCFS_MAXIMUM_NODES * osb->sect_size);
 	buffer = ocfs_malloc (length);
 	if (buffer == NULL) {
-		LOG_ERROR_STR ("could not allocate memory!");
-		ret = -ENOMEM;
+		LOG_ERROR_STATUS (ret = -ENOMEM);
 		goto bail;
 	}
 
@@ -3332,7 +3650,7 @@ int ocfs_remount (struct super_block *sb
 				    OCFS_DLM_EXCLUSIVE_LOCK, FLAG_FILE_CREATE,
 				    &lr, fe);
 	if (status < 0) {
-		LOG_ERROR_STR ("failed to get lock on OCFS_VOLUME_LOCK_OFFSET");
+		LOG_ERROR_STATUS (status);
 		ret = -EBUSY;
 		goto bail;
 	}
@@ -3356,7 +3674,7 @@ int ocfs_remount (struct super_block *sb
 		for (i = 0; i < OCFS_MAXIMUM_NODES; i++) {
 			if (IS_NODE_ALIVE
 			    (osb->publ_map, i, OCFS_MAXIMUM_NODES))
-				LOG_ERROR_ARGS ("node #%d is alive\n", i);
+				LOG_ERROR_ARGS ("node #%d is alive", i);
 		}
 		LOG_TRACE_ARGS ("publishmap = %u.%u\n", osb->publ_map);
 		if (osb->publ_map == (1 << osb->node_num)) {
@@ -3377,9 +3695,8 @@ int ocfs_remount (struct super_block *sb
 	}
 
       bail:
-	if (fe)
-		ocfs_release_file_entry(fe);
-
+	ocfs_release_file_entry(fe);
+	ocfs_put_lockres (lr);
 	LOG_EXIT_LONG (ret);
 	return ret;
 }				/* ocfs_remount */
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Linux/ocfsmount.c linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Linux/ocfsmount.c
--- linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Linux/ocfsmount.c	2003-07-30 13:51:50.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Linux/ocfsmount.c	2003-07-30 10:28:53.000000000 +0200
@@ -32,17 +32,17 @@
 static bool is_exclusive_node_alive (struct super_block *sb,
 				     ocfs_vol_disk_hdr * hdr);
 
-extern spinlock_t ProtectOSBId;
-extern ub4 GlobalOSBId;		/* Keeps track of next available OSB Id */
-extern spinlock_t ProtectMountCount;
-extern ub4 GlobalMountCount;	/* Count of mounted volumes */
-static int errno;
+extern spinlock_t osb_id_lock;
+extern __u32 osb_id;		/* Keeps track of next available OSB Id */
+extern spinlock_t mount_cnt_lock;
+extern __u32 mount_cnt;		/* Count of mounted volumes */
+//static int errno;
 
 /*
  * ocfs_read_disk_header()
  *
  */
-int ocfs_read_disk_header (ub1 ** buffer, struct super_block *sb)
+int ocfs_read_disk_header (__u8 ** buffer, struct super_block *sb)
 {
 	int status = 0;
 	struct buffer_head *bh = NULL;
@@ -50,7 +50,7 @@ int ocfs_read_disk_header (ub1 ** buffer
 	LOG_ENTRY ();
 
 	if (buffer == NULL) {
-		status = -ENOMEM;
+		LOG_ERROR_STATUS (status = -ENOMEM);
 		goto leave;
 	}
 
@@ -62,7 +62,7 @@ int ocfs_read_disk_header (ub1 ** buffer
 
 	bh = bread (sb->s_dev, 0, 512);
 	if (!bh) {
-		status = -ENOMEM;
+		LOG_ERROR_STATUS (status = -ENOMEM);
 		goto leave;
 	}
 	memcpy (*buffer, bh->b_data, 512);
@@ -70,7 +70,7 @@ int ocfs_read_disk_header (ub1 ** buffer
 
 	bh = bread (sb->s_dev, 1, 512);
 	if (!bh) {
-		status = -ENOMEM;
+		LOG_ERROR_STATUS (status = -ENOMEM);
 		goto leave;
 	}
 	memcpy ((void *) (*buffer + 512), bh->b_data, 512);
@@ -92,18 +92,18 @@ static bool is_exclusive_node_alive (str
 {
 	struct buffer_head *bh = NULL;
 	bool ret = false;
-	ub8 off;
-	ub8 ts;
+	__u64 off;
+	__u64 ts;
 	ocfs_publish *pub;
 
 	/* get the blocknum of the publish sector in question */
-	off = (hdr->publ_off >> (ub8) 9);
-	off += (ub8) hdr->excl_mount;
+	off = (hdr->publ_off >> (__u64) 9);
+	off += (__u64) hdr->excl_mount;
 
 	/* get the timestamp from the publish sector */
-	bh = bread (sb->s_dev, (ub4) off, 512);
+	bh = bread (sb->s_dev, (__u32) off, 512);
 	if (!bh) {
-		LOG_ERROR_ARGS ("failed to read block: %u\n", (ub4) off);
+		LOG_ERROR_ARGS ("failed to read block: %u\n", (__u32) off);
 		return true;
 	}
 	pub = (ocfs_publish *) bh->b_data;
@@ -116,9 +116,9 @@ static bool is_exclusive_node_alive (str
 	ocfs_sleep (5000);	/* 5 seconds */
 
 	/* get the timestamp from the publish sector */
-	bh = bread (sb->s_dev, (ub4) off, 512);
+	bh = bread (sb->s_dev, (__u32) off, 512);
 	if (!bh) {
-		LOG_ERROR_ARGS ("failed to read block: %u\n", (ub4) off);
+		LOG_ERROR_ARGS ("failed to read block: %u\n", (__u32) off);
 		return true;
 	}
 	pub = (ocfs_publish *) bh->b_data;
@@ -149,7 +149,7 @@ int ocfs_mount_volume (struct super_bloc
 {
 	int status = 0;
 	ocfs_super *osb;
-	ub1 *buffer = NULL;
+	__u8 *buffer = NULL;
 	ocfs_vol_disk_hdr *volDiskHdr;
 	ocfs_vol_label *volLabel;
 	int sectsize;
@@ -168,6 +168,13 @@ int ocfs_mount_volume (struct super_bloc
 
 	volDiskHdr = (ocfs_vol_disk_hdr *) buffer;
 
+	LOG_TRACE_STR ("ocfs_verify_volume...");
+	status = ocfs_verify_volume (volDiskHdr);
+	if (status < 0) {
+		LOG_ERROR_STATUS (status);
+		goto leave;
+	}
+
 	if (volDiskHdr->excl_mount != NOT_MOUNTED_EXCLUSIVE) {
 		if (is_exclusive_node_alive (sb, volDiskHdr)) {
 			LOG_ERROR_ARGS ("Cannot mount. Node %d has this "
@@ -185,16 +192,6 @@ int ocfs_mount_volume (struct super_bloc
 		}
 	}
 
-	/* We found a volume with our signature on it. Now go ahead and read */
-	/* the root directory and other filesystem structures.... */
-
-	LOG_TRACE_STR ("ocfs_verify_volume...");
-	status = ocfs_verify_volume (volDiskHdr);
-	if (status < 0) {
-		LOG_ERROR_STATUS (status);
-		goto leave;
-	}
-
 	/* 2nd sector */
 	volLabel = (ocfs_vol_label *) (buffer + sectsize);
 
@@ -238,31 +235,30 @@ int ocfs_mount_volume (struct super_bloc
 
 	osb->sect_size = sectsize;
 
-	spin_lock (&ProtectOSBId);
-	osb->osb_id = GlobalOSBId;
-	if (GlobalOSBId < ULONG_MAX)
-		GlobalOSBId++;
+	spin_lock (&osb_id_lock);
+	osb->osb_id = osb_id;
+	if (osb_id < ULONG_MAX)
+		osb_id++;
 	else {
-		spin_unlock (&ProtectOSBId);
+		spin_unlock (&osb_id_lock);
 		LOG_ERROR_STR ("Too many volumes mounted");
 		status = -ENOMEM;
 		goto leave;
 	}
-	spin_unlock (&ProtectOSBId);
+	spin_unlock (&osb_id_lock);
 
-	/* Launch the DLM thread for the mounted volume */
+	/* Launch the NM thread for the mounted volume */
 	ocfs_down_sem (&(osb->osb_res), true);
 	child_pid = kernel_thread (ocfs_volume_thread, osb,
 				   CLONE_FS | CLONE_FILES | CLONE_SIGHAND);
 	if (child_pid < 0) {
-		LOG_ERROR_ARGS ("unable to launch dlm thread (%d)\n",
+		LOG_ERROR_ARGS ("unable to launch ocfsnm thread (error=%d)\n",
 				child_pid);
+		ocfs_up_sem (&(osb->osb_res));
 		status = -EFAIL;
 		goto leave;
 	} else {
 		init_completion (&osb->complete);
-		if (!ocfs_get_task (child_pid, &(osb->dlm_task)))
-			osb->dlm_task = NULL;
 	}
 	ocfs_up_sem (&(osb->osb_res));
 
@@ -270,14 +266,17 @@ int ocfs_mount_volume (struct super_bloc
 	ocfs_proc_add_volume (osb);
 
 	/* GlobalMountCount */
-	spin_lock (&ProtectMountCount);
-	GlobalMountCount++;
-	if (GlobalMountCount == 1) {
+	spin_lock (&mount_cnt_lock);
+	mount_cnt++;
+	if (mount_cnt == 1) {
 		/* Start the ipcdlm */
 		ocfs_init_ipc_dlm (OCFS_UDP);
 		OcfsIpcCtxt.init = true;
 	}
-	spin_unlock (&ProtectMountCount);
+	spin_unlock (&mount_cnt_lock);
+
+	/* wait for nm thread to be init */
+	ocfs_wait (osb->nm_init_event, atomic_read (&osb->nm_init), 0);
 
 	/*  Join or Form the cluster... */
 	LOG_TRACE_STR ("ocfs_vol_member_reconfig...");
@@ -285,7 +284,7 @@ int ocfs_mount_volume (struct super_bloc
 	status = ocfs_vol_member_reconfig (osb);
 	ocfs_up_sem (&(osb->osb_res));
 	if (status < 0) {
-		LOG_ERROR_STR ("ocfs_vol_member_reconfig failed");
+		LOG_ERROR_STATUS (status);
 		goto leave;
 	}
 
@@ -294,12 +293,11 @@ int ocfs_mount_volume (struct super_bloc
 	LOG_TRACE_STR ("ocfs_check_volume...");
 	ocfs_down_sem (&(osb->osb_res), true);
 	status = ocfs_check_volume (osb);
+	ocfs_up_sem (&(osb->osb_res));
 	if (status < 0) {
-		ocfs_up_sem (&(osb->osb_res));
 		LOG_ERROR_STATUS (status);
 		goto leave;
 	}
-	ocfs_up_sem (&(osb->osb_res));
 
 	osb->vol_state = VOLUME_MOUNTED;
 
@@ -310,11 +308,18 @@ int ocfs_mount_volume (struct super_bloc
 	return status;
 }				/* ocfs_mount_volume */
 
+
+/*
+ * lockres_hash_free_func()
+ *
+ */
 static void lockres_hash_free_func (const void *p)
 {
-       ocfs_free_lockres((ocfs_lock_res *)p);
+	/* Force remove the lockres */
+	ocfs_free_lockres((ocfs_lock_res *)p);
 }
 
+
 /*
  * ocfs_dismount_volume()
  *
@@ -325,36 +330,24 @@ int ocfs_dismount_volume (struct super_b
 	bool AcquiredOSB = false;
 	ocfs_super *osb = NULL;
 	ocfs_inode *rootoin;
+	__u32 nodemap;
+	__u32 tempmap;
 	int i;
 
-	LOG_ENTRY_ARGS ("(0x%08x)\n", sb);
+	LOG_ENTRY_ARGS ("(0x%p)\n", sb);
 
 	if (sb == NULL || sb->u.generic_sbp == NULL) {
-		status = -EFAIL;
+		LOG_ERROR_STATUS (status = -EFAIL);
 		goto leave;
 	}
 
 	osb = (ocfs_super *)(sb->u.generic_sbp);
 	rootoin = osb->oin_root_dir;
 
-	/* GlobalMountCount */
-	spin_lock (&ProtectMountCount);
-	GlobalMountCount--;
-	if (GlobalMountCount == 0) {
-		/* Shutdown ipcdlm */
-		if (OcfsIpcCtxt.task) {
-			LOG_TRACE_STR ("Waiting for ipcdlm to exit....");
-			send_sig (SIGINT, OcfsIpcCtxt.task, 0);
-			wait_for_completion (&(OcfsIpcCtxt.complete));
-			OcfsIpcCtxt.task = NULL;
-		}
-	}
-	spin_unlock (&ProtectMountCount);
-
-	LOG_TRACE_STR ("Acquire OSB lock");
 	ocfs_down_sem (&(osb->osb_res), true);
 	AcquiredOSB = true;
-
+	/* we shouldn't have to do the stuff below, vfs takes care of it */
+#ifdef UMOUNT_CHECK 
 	if (osb->file_open_cnt > 0) {
 		LOG_ERROR_ARGS ("Dismount failed... file_open_cnt(%d) > 0\n",
 				osb->file_open_cnt);
@@ -364,8 +357,8 @@ int ocfs_dismount_volume (struct super_b
 		status = -EBUSY;
 		goto leave;
 	}
-
-	LOG_TRACE_ARGS ("osb=0x%08x rootoin=0x%08x offset=%u.%u\n", osb,
+#endif
+	LOG_TRACE_ARGS ("osb=0x%p rootoin=0x%p offset=%u.%u\n", osb,
 			rootoin, rootoin->file_disk_off);
 
 	fsync_no_super (sb->s_dev);
@@ -384,12 +377,36 @@ int ocfs_dismount_volume (struct super_b
 
 	/* Wait for this volume's NM thread to exit */
 	if (osb->dlm_task) {
-		LOG_TRACE_STR ("Waiting for nmthread to exit....");
+		LOG_TRACE_STR ("Waiting for ocfsnm to exit....");
 		send_sig (SIGINT, osb->dlm_task, 0);
 		wait_for_completion (&(osb->complete));
 		osb->dlm_task = NULL;
 	}
 
+	/* create map of all active nodes except self */
+	nodemap = (__u32)osb->publ_map;
+	tempmap = (1 << osb->node_num);
+	nodemap &= (~tempmap);
+
+	/* send dismount msg to all */
+	status = ocfs_send_dismount_msg (osb, (__u64)nodemap);
+	if (status < 0)
+		LOG_ERROR_STATUS (status);
+
+	/* decrement mount count */
+	spin_lock (&mount_cnt_lock);
+	mount_cnt--;
+	if (mount_cnt == 0) {
+		/* Shutdown ocfslsnr */
+		if (OcfsIpcCtxt.task) {
+			LOG_TRACE_STR ("Waiting for ocfslsnr to exit....");
+			send_sig (SIGINT, OcfsIpcCtxt.task, 0);
+			wait_for_completion (&(OcfsIpcCtxt.complete));
+			OcfsIpcCtxt.task = NULL;
+		}
+	}
+	spin_unlock (&mount_cnt_lock);
+
 	ocfs_down_sem (&(OcfsGlobalCtxt.res), true);
 	vfree (osb->cluster_bitmap.buf);
 //    list_del(&osb->osb_next);  /* this has been moved into ocfs_delete_osb */
@@ -397,7 +414,6 @@ int ocfs_dismount_volume (struct super_b
 
 	osb->vol_state = VOLUME_DISMOUNTED;
 	if (AcquiredOSB) {
-		LOG_TRACE_STR ("Release OSB lock");
 		ocfs_up_sem (&(osb->osb_res));
 		AcquiredOSB = false;
 	}
@@ -410,13 +426,15 @@ int ocfs_dismount_volume (struct super_b
 		ocfs_safefree (p);
 	}
 
+	printk ("ocfs: Unmounting device (%u,%u) in node %d\n",
+	       	MAJOR(osb->sb->s_dev), MINOR(osb->sb->s_dev), osb->node_num);
+
 	ocfs_delete_osb (osb);
 	ocfs_safefree (osb);
 	sb->s_dev = 0;
 
       leave:
 	if (AcquiredOSB) {
-		LOG_TRACE_STR ("Release OSB lock");
 		ocfs_up_sem (&(osb->osb_res));
 		AcquiredOSB = false;
 	}
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Linux/ocfsport.c linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Linux/ocfsport.c
--- linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Linux/ocfsport.c	2003-07-30 13:51:50.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Linux/ocfsport.c	2003-07-30 10:28:53.000000000 +0200
@@ -33,10 +33,10 @@
 /* Tracing */
 #define OCFS_DEBUG_CONTEXT  OCFS_DEBUG_CONTEXT_PORT
 
-#ifndef DEBUGOCFS
-static int get_overlap_type (ub8 new, ub8 newend, ub8 exist, ub8 existend);
+#ifndef USERSPACE_TOOL
+static int get_overlap_type (__u64 new, __u64 newend, __u64 exist, __u64 existend);
 static bool OcfsCoalesceExtentMapEntry (ocfs_extent_map * map,
-			    sb8 virtual, sb8 physical, sb8 sectorcount);
+			    __s64 virtual, __s64 physical, __s64 sectorcount);
 
 /*
  * ocfs_init_sem()
@@ -44,7 +44,7 @@ static bool OcfsCoalesceExtentMapEntry (
  */
 void ocfs_init_sem (ocfs_sem * res)
 {
-	LOG_ENTRY_ARGS ("(0x%08x)\n", res);
+	LOG_ENTRY_ARGS ("(0x%p)\n", res);
 
 	memset (res, 0, sizeof (ocfs_sem));
 	init_MUTEX (&(res->sem));
@@ -68,7 +68,7 @@ bool ocfs_down_sem (ocfs_sem * res, bool
 {
 	bool ret = true;
 
-	LOG_ENTRY_ARGS ("(0x%08x, %u)\n", res, wait);
+	LOG_ENTRY_ARGS ("(0x%p, %u)\n", res, wait);
 
 	if (res->magic != OCFS_SEM_MAGIC) {
 		ret = false;
@@ -119,7 +119,7 @@ bool ocfs_down_sem (ocfs_sem * res, bool
  */
 void ocfs_up_sem (ocfs_sem * res)
 {
-	LOG_ENTRY_ARGS ("(0x%08x)\n", res);
+	LOG_ENTRY_ARGS ("(0x%p)\n", res);
 
 	if (res->magic != OCFS_SEM_MAGIC)
 		goto bail;
@@ -142,7 +142,7 @@ void ocfs_up_sem (ocfs_sem * res)
  */
 int ocfs_del_sem (ocfs_sem * res)
 {
-	LOG_ENTRY_ARGS ("(0x%08x)\n", res);
+	LOG_ENTRY_ARGS ("(0x%p)\n", res);
 
 	res->magic = OCFS_SEM_DELETED;
 
@@ -161,9 +161,12 @@ void ocfs_daemonize (char *name, int len
 	daemonize ();
 	reparent_to_init ();
 
-	if (len > 15)
-		BUG();
-	strncpy (current->comm, name, len);
+	if (len > 0) {
+		if (len > 15)
+			BUG();
+		strncpy (current->comm, name, len);
+		current->comm[len] = '\0';
+	}
 
 	/* Block all signals except SIGKILL, SIGSTOP, SIGHUP and SIGINT */
 	spin_lock_irq (&current->sigmask_lock);
@@ -175,30 +178,6 @@ void ocfs_daemonize (char *name, int len
 	return;
 }				/* ocfs_daemonize */
 
-/*
- * ocfs_get_task()
- *
- */
-bool ocfs_get_task (pid_t pid, struct task_struct ** task)
-{
-	struct task_struct *p;
-	int ret = false;
-
-	#warning This is slow.
-	#warning this needs to go in a cleanup
-	read_lock(&tasklist_lock);
-	for_each_task (p) {
-		if (p->pid == pid) {
-			*task = p;
-			ret = true;
-			break;
-		}
-	}
-	read_unlock(&tasklist_lock);
-
-	return ret;
-}				/* ocfs_get_task */
-
 
 /*
  * ocfs_sleep()
@@ -208,9 +187,9 @@ bool ocfs_get_task (pid_t pid, struct ta
  * This function needs to be removed.
  * Instead call schedule_timeout() directly and handle signals.
  */
-int ocfs_sleep (ub4 ms)
+int ocfs_sleep (__u32 ms)
 {
-	ub4 numJiffies;
+	__u32 numJiffies;
 
 	LOG_ENTRY ();
 
@@ -225,6 +204,7 @@ int ocfs_sleep (ub4 ms)
 	return 0;
 }				/* ocfs_sleep */
 
+#if 0
 /*
  * ocfs_print_qstr()
  *
@@ -239,6 +219,7 @@ void ocfs_print_qstr (struct qstr *x)
 	tmp[len] = '\0';
 	printk ("%s", tmp);
 }				/* ocfs_print_qstr */
+#endif
 
 
 #ifdef OCFS_LINUX_MEM_DEBUG
@@ -255,7 +236,7 @@ void *ocfs_dbg_slab_alloc (kmem_cache_t 
     m = kmem_cache_alloc(slab, GFP_NOFS);
 #ifdef OCFS_LINUX_MEM_DEBUG
     if (m == NULL) {
-        LOG_ERROR_ARGS("failed to alloc from slab = %p\n", slab);
+        LOG_ERROR_ARGS("failed to alloc from slab = %p", slab);
     } else {
 		alloc_item *new;
 		new = kmalloc (sizeof (alloc_item), GFP_NOFS);
@@ -282,10 +263,11 @@ void ocfs_dbg_slab_free (kmem_cache_t *s
 
 #ifdef OCFS_LINUX_MEM_DEBUG
 	struct list_head *iter;
+	struct list_head *temp_iter;
         alloc_item *item = NULL;
         bool do_free = false;
 
-	list_for_each (iter, &OcfsGlobalCtxt.item_list) {
+	list_for_each_safe (iter, temp_iter, &OcfsGlobalCtxt.item_list) {
 		item = list_entry (iter, alloc_item, list);
 
 		if (item->address == m && item->type == SLAB_ITEM) {
@@ -303,7 +285,7 @@ void ocfs_dbg_slab_free (kmem_cache_t *s
                 kfree (item);
                 return;
         }
-	LOG_ERROR_ARGS ("tried to free mem never allocated: %x\n", m);
+	LOG_ERROR_ARGS ("tried to free mem never allocated: %x", m);
 #endif
 #ifndef OCFS_LINUX_MEM_DEBUG
 	kmem_cache_free(slab, m);
@@ -323,7 +305,7 @@ void *ocfs_linux_dbg_alloc (int Size, ch
 	m = kmalloc (Size, GFP_NOFS);
 #ifdef OCFS_LINUX_MEM_DEBUG
 	if (m == NULL) {
-		LOG_ERROR_ARGS ("failed! (size=%d)\n", Size);
+		LOG_ERROR_ARGS ("failed! (size=%d)", Size);
 	} else {
 		alloc_item *new;
 		new = kmalloc (sizeof (alloc_item), GFP_NOFS);
@@ -350,10 +332,11 @@ void ocfs_linux_dbg_free (const void *Bu
 
 #ifdef OCFS_LINUX_MEM_DEBUG
 	struct list_head *iter;
+	struct list_head *temp_iter;
         alloc_item *item = NULL;
         bool do_free = false;
 
-	list_for_each (iter, &OcfsGlobalCtxt.item_list) {
+	list_for_each_safe (iter, temp_iter, &OcfsGlobalCtxt.item_list) {
 		item = list_entry (iter, alloc_item, list);
 
 		if (item->address == Buffer && item->type == KMALLOC_ITEM) {
@@ -371,7 +354,7 @@ void ocfs_linux_dbg_free (const void *Bu
                 kfree (item);
                 return;
         }
-	LOG_ERROR_ARGS ("tried to free mem never allocated: %x\n", Buffer);
+	LOG_ERROR_ARGS ("tried to free mem never allocated: %x", Buffer);
 #endif
 #ifndef OCFS_LINUX_MEM_DEBUG
 	kfree (Buffer);
@@ -383,7 +366,7 @@ void ocfs_linux_dbg_free (const void *Bu
  * ocfs_linux_get_inode_offset()
  *
  */
-bool ocfs_linux_get_inode_offset (struct inode * inode, ub8 * off, ocfs_inode ** oin)
+bool ocfs_linux_get_inode_offset (struct inode * inode, __u64 * off, ocfs_inode ** oin)
 {
 	if (off == NULL)
 		return false;
@@ -417,7 +400,7 @@ bool ocfs_linux_get_inode_offset (struct
  * ocfs_linux_get_dir_entry_offset()
  *
  */
-bool ocfs_linux_get_dir_entry_offset (ocfs_super * osb, ub8 * off, ub8 parentOff,
+bool ocfs_linux_get_dir_entry_offset (ocfs_super * osb, __u64 * off, __u64 parentOff,
 			    struct qstr * fileName, ocfs_file_entry ** fileEntry)
 {
 	int status;
@@ -457,7 +440,7 @@ void ocfs_flush_cache (ocfs_super * osb)
  * ocfs_purge_cache_section()
  *
  */
-bool ocfs_purge_cache_section (ocfs_inode * oin, ub8 * file_off, ub4 Length)
+bool ocfs_purge_cache_section (ocfs_inode * oin, __u64 * file_off, __u32 Length)
 {
 	if (oin != NULL && oin->inode != NULL) {
 		fsync_inode_buffers (oin->inode);
@@ -468,18 +451,19 @@ bool ocfs_purge_cache_section (ocfs_inod
 /* prefetch has been declared to allow to build in debug mode */
 #ifdef DEBUG
 #ifndef ARCH_HAS_PREFETCH
-inline void prefetch (const void *x)
-{;
-}
+inline void prefetch (const void *x) {;}
+#endif
+#ifndef ARCH_HAS_PREFETCHW
+inline void prefetchw(const void *x) {;}
 #endif
 #endif
 
-#endif				/* !DEBUGOCFS */
+#endif				/* !USERSPACE_TOOL */
 
 /* Crazy wacky extent map stuff */
 /* works ok in userland debugocfs stuff too */
 
-#define GET_EXTENT_MAP_ENTRY(map, i)    ((ocfs_extent *) ((ub1 *)map->buf + \
+#define GET_EXTENT_MAP_ENTRY(map, i)    ((ocfs_extent *) ((__u8 *)map->buf + \
 							  ((i) * sizeof(ocfs_extent))))
 
 /*
@@ -509,7 +493,9 @@ void ocfs_extent_map_destroy (ocfs_exten
 {
 	LOG_ENTRY ();
 
-	OCFS_ASSERT (map != NULL);
+	if (!map)
+		goto leave;
+	
 	if (map->initialized) {
                 spin_lock(&(map->lock));
 		#warning RACE! need to retest map->initialized here!
@@ -520,6 +506,7 @@ void ocfs_extent_map_destroy (ocfs_exten
                 spin_unlock(&(map->lock));
 	}
 
+leave:
 	LOG_EXIT ();
 	return;
 }				/* ocfs_extent_map_destroy */
@@ -528,9 +515,9 @@ void ocfs_extent_map_destroy (ocfs_exten
  * ocfs_extent_map_get_count()
  *
  */
-ub4 ocfs_extent_map_get_count (ocfs_extent_map * map)
+__u32 ocfs_extent_map_get_count (ocfs_extent_map * map)
 {
-	ub4 ret;
+	__u32 ret;
 
 	LOG_ENTRY ();
 
@@ -560,7 +547,7 @@ enum
  * get_overlap_type()
  *
  */
-static int get_overlap_type (ub8 new, ub8 newend, ub8 exist, ub8 existend)
+static int get_overlap_type (__u64 new, __u64 newend, __u64 exist, __u64 existend)
 {
 	OCFS_ASSERT (newend > new);
 	OCFS_ASSERT (existend > exist);
@@ -595,7 +582,7 @@ static int get_overlap_type (ub8 new, ub
  * Must call this with spinlock already held!
  */
 static bool OcfsCoalesceExtentMapEntry (ocfs_extent_map * map,
-			    sb8 virtual, sb8 physical, sb8 sectorcount)
+			    __s64 virtual, __s64 physical, __s64 sectorcount)
 {
 	ocfs_extent *tmp, *tmp2;
 	int i, voverlap, loverlap, newIdx;
@@ -675,10 +662,10 @@ static bool OcfsCoalesceExtentMapEntry (
 		    case RIGHT_OVERLAP:	/* should begin at old physical/virtual, end at new end */
 			    if ((virtual - tmp->virtual) ==
 				(physical - tmp->physical)) {
-				    virtual = tmp->virtual;
-				    physical = tmp->physical;
 				    sectorcount =
 					virtual + sectorcount - tmp->virtual;
+				    virtual = tmp->virtual;
+				    physical = tmp->physical;
 				    tmp->sectors = 0;	/* mark for deletion */
 				    ret = true;
 			    }
@@ -722,12 +709,12 @@ static bool OcfsCoalesceExtentMapEntry (
  * ocfs_extent_map_add()
  *
  */
-bool ocfs_extent_map_add (ocfs_extent_map * map, sb8 virtual, sb8 physical,
-			  sb8 sectorcount)
+bool ocfs_extent_map_add (ocfs_extent_map * map, __s64 virtual, __s64 physical,
+			  __s64 sectorcount)
 {
 	ocfs_extent *tmp;
 	void *newpool;
-	ub4 newmax;
+	__u32 newmax;
 	bool ret = false;
 
 	LOG_ENTRY ();
@@ -735,7 +722,7 @@ bool ocfs_extent_map_add (ocfs_extent_ma
 	OCFS_ASSERT (map != NULL);
 
 	if (!map->initialized) {
-		LOG_ERROR_STR ("ExtentMap is not initialized");
+		LOG_ERROR_STATUS (-EFAIL);
 		goto bail;
 	}
 	spin_lock(&(map->lock));
@@ -760,7 +747,7 @@ bool ocfs_extent_map_add (ocfs_extent_ma
 			newpool = ocfs_malloc (newmax * sizeof (ocfs_extent));
 		}
 		if (newpool == NULL) {
-			LOG_ERROR_STR ("failed to alloc new additional pool");
+			LOG_ERROR_STATUS (-ENOMEM);
 			goto release_spinlock;
 		}
 		if (map->buf && map->capacity)
@@ -789,10 +776,10 @@ bail:
 /* ocfs_extent_map_remove()
  *
  */
-void ocfs_extent_map_remove (ocfs_extent_map * map, sb8 virtual, sb8 sectorcount)
+void ocfs_extent_map_remove (ocfs_extent_map * map, __s64 virtual, __s64 sectorcount)
 {
 	ocfs_extent *tmp;
-	ub4 i;
+	__u32 i;
 	int voverlap;
 
 	LOG_ENTRY ();
@@ -842,12 +829,12 @@ bail:
  * ocfs_extent_map_lookup()
  *
  */
-bool ocfs_extent_map_lookup (ocfs_extent_map *map, sb8 virtual, sb8 *physical,
-			     sb8 *sectorcount, ub4 *index)
+bool ocfs_extent_map_lookup (ocfs_extent_map *map, __s64 virtual, __s64 *physical,
+			     __s64 *sectorcount, __u32 *index)
 {
 	ocfs_extent *tmp;
 	bool ret = false;
-	ub4 idx = 0;
+	__u32 idx = 0;
 
 	LOG_ENTRY ();
 
@@ -860,7 +847,7 @@ bool ocfs_extent_map_lookup (ocfs_extent
 	spin_lock(&(map->lock));
 
 	for (idx = 0; idx < map->count; idx++) {
-		sb8 hi, lo, delta;
+		__s64 hi, lo, delta;
 
 		tmp = GET_EXTENT_MAP_ENTRY (map, idx);
 
@@ -889,8 +876,8 @@ bail:
  * ocfs_extent_map_next_entry()
  *
  */
-bool ocfs_extent_map_next_entry (ocfs_extent_map *map, ub4 runindex,
-				 sb8 *virtual, sb8 *physical, sb8 *sectorcount)
+bool ocfs_extent_map_next_entry (ocfs_extent_map *map, __u32 runindex,
+				 __s64 *virtual, __s64 *physical, __s64 *sectorcount)
 {
 	ocfs_extent *tmp;
 	bool ret = false;
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Linux/ocfsproc.c linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Linux/ocfsproc.c
--- linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Linux/ocfsproc.c	2003-07-30 13:51:50.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Linux/ocfsproc.c	2003-07-30 10:28:53.000000000 +0200
@@ -47,6 +47,7 @@ int ocfs_proc_init (void)
 	{
 		{ "ocfs/version", NULL, ocfs_proc_version },
 		{ "ocfs/nodename", NULL, ocfs_proc_nodename },
+		{ "ocfs/globalctxt", NULL, ocfs_proc_globalctxt },
 #ifdef OCFS_LINUX_MEM_DEBUG
 		{ "ocfs/memallocs", NULL, ocfs_proc_memallocs },
 #endif
@@ -116,81 +117,131 @@ static int ocfs_proc_calc_metrics (char 
 static int ocfs_proc_memallocs (char *page, char **start, off_t off,
 				int count, int *eof, void *data)
 {
-	int ret, proc_overflow=0;
+	int ret = 0;
+	int proc_overflow = 0;
 	struct list_head *iter;
+	struct list_head *temp_iter;
 	alloc_item *item;
 	int len = 0;
         char *slabname;
+	char *tmpstr = NULL;
 
 	LOG_ENTRY ();
 
-	ret = sprintf ((char *) (page + len), "%8s %10s %30s\n", 
-                       "Pointer", "Size/Slab", "Line:File");
-        printk("%8s %10s %30s\n", "Pointer", "Size/Slab", "Line:File");
+#define	MEMDBG_LEN		255
+	tmpstr = ocfs_malloc(MEMDBG_LEN);
+	if (!tmpstr) {
+		LOG_ERROR_STATUS (-ENOMEM);
+		goto bail;
+	}
+
+	sprintf (tmpstr, "%-8s  %-9s  %s\n", "Pointer", "Size/Slab", "Line:File");
+	printk("%s", tmpstr);
+	ret = sprintf ((char *) (page + len), "%s", tmpstr);
 	len += ret;
 
-	list_for_each (iter, &OcfsGlobalCtxt.item_list) {
-		if (len >= 4096) {
+	list_for_each_safe (iter, temp_iter, &OcfsGlobalCtxt.item_list) {
+		if (len >= 4096)
                         proc_overflow = 1;
-			LOG_ERROR_STR ("proc file truncated!\n");
-		}
 		item = list_entry (iter, alloc_item, list);
-                switch (item->type)
-                {
-                    case SLAB_ITEM:
-                        if (item->u.slab==OcfsGlobalCtxt.oin_cache)
-                            slabname="oin";
-                        else if (item->u.slab==OcfsGlobalCtxt.ofile_cache)
-                            slabname="ofile";
-                        else if (item->u.slab==OcfsGlobalCtxt.lockres_cache)
-                            slabname="lockres";
-                        else if (item->u.slab==OcfsGlobalCtxt.fe_cache)
-                            slabname="fe";
-                        else
-                            slabname="unknown";
-                        if (!proc_overflow)
-        		        ret = snprintf ((char *) (page + len), (4096 - len),
-        			      "%08x %8s   %s\n", item->address, slabname, item->tag);
-                        printk("%08x %8s   %s\n", item->address, slabname, item->tag);
-                        break;
-                    case KMALLOC_ITEM: 
-                    case VMALLOC_ITEM:
+		switch (item->type) {
+		    case SLAB_ITEM:
+			if (item->u.slab == OcfsGlobalCtxt.oin_cache)
+				slabname = "oin";
+			else if (item->u.slab == OcfsGlobalCtxt.ofile_cache)
+				slabname = "ofile";
+			else if (item->u.slab == OcfsGlobalCtxt.lockres_cache)
+				slabname = "lockres";
+			else if (item->u.slab == OcfsGlobalCtxt.fe_cache)
+				slabname = "fe";
+			else
+				slabname = "unknown";
+
+			if (item->u.slab == OcfsGlobalCtxt.lockres_cache) {
+				ocfs_lock_res *p = item->address;
+				sprintf(tmpstr,
+				       	"%08x  %9s  %-40s  %5d  %u.%u\n",
+				       	item->address, slabname, item->tag,
+				       	atomic_read(&p->lr_ref_cnt),
+				       	HILO(p->sector_num));
+			} else
+				sprintf(tmpstr, "%08x  %9s  %-40s\n", item->address,
+				       	slabname, item->tag);
+
+			printk("%s", tmpstr);
+			if (!proc_overflow) {
+				ret = snprintf ((char *) (page + len),
+					       	(4096 - len), "%s", tmpstr);
+				len += ret;
+			}
+			break;
+		    case KMALLOC_ITEM: 
+		    case VMALLOC_ITEM:
                     default:
-                        if (!proc_overflow)
-        		        ret = snprintf ((char *) (page + len), (4096 - len),
-	        		      "%08x %8d   %s\n", item->address, item->u.length, item->tag);
-                        printk("%08x %8d   %s\n", item->address, item->u.length, item->tag);
-                        break;
-                }
-		if (ret < 0) {
-			LOG_ERROR_STR ("uh oh failed to sprintf!\n");
-			proc_overflow = 1;
+			sprintf(tmpstr, "%08x  %9d  %s\n", item->address,
+			       	item->u.length, item->tag);
+			printk("%s", tmpstr);
+			if (!proc_overflow) {
+				ret = snprintf ((char *) (page + len),
+					       	(4096 - len), "%s", tmpstr);
+				len += ret;
+			}
+
+			break;
 		}
-                if (!proc_overflow)
-        		len += ret;
+		if (ret < 0)
+			proc_overflow = 1;
 	}
 
+
+	if (proc_overflow)
+		LOG_ERROR_STR ("proc output truncated");
+
 	ret = ocfs_proc_calc_metrics (page, start, off, count, eof, len);
 
+bail:
+	ocfs_safefree (tmpstr);
 	LOG_EXIT_LONG (ret);
 	return ret;
 }				/* ocfs_proc_memallocs */
 #endif
 
 /*
+ * ocfs_proc_globalctxt()
+ *
+ */
+static int ocfs_proc_globalctxt(char *page, char **start, off_t off,
+				int count, int *eof, void *data)
+{
+	int len;
+	int ret;
+
+	LOG_ENTRY ();
+
+	sprintf (page, "lockres count: %d\n", atomic_read (&OcfsGlobalCtxt.cnt_lockres));
+	len = strlen (page);
+
+	ret = ocfs_proc_calc_metrics (page, start, off, count, eof, len);
+
+	LOG_EXIT_LONG (ret);
+	return ret;
+}				/* ocfs_proc_version */
+
+
+/*
  * ocfs_proc_version()
  *
  */
 static int ocfs_proc_version (char *page, char **start, off_t off,
 			      int count, int *eof, void *data)
 {
-	extern char *OcfsVersion;
+	extern char *ocfs_version;
 	int len;
 	int ret;
 
 	LOG_ENTRY ();
 
-	strcpy (page, OcfsVersion);
+	strcpy (page, ocfs_version);
 	strcat (page, "\n");
 	len = strlen (page);
 
@@ -372,7 +423,8 @@ static int ocfs_proc_statistics (char *p
   "Dir node size            : %u.%u\n"         \
   "File node size           : %u.%u\n"         \
   "Failed Large Allocs      : %u\n"            \
-  "Retry Large Allocs       : %u\n"
+  "Retry Large Allocs       : %u\n"		\
+  "Lockres count	    : %d\n"  
 
 	sprintf (tmp, PROC_STATS, HI (osb->file_open_cnt),
 		 LO (osb->file_open_cnt), pubmap, VolLayout->num_nodes,
@@ -380,7 +432,7 @@ static int ocfs_proc_statistics (char *p
 		 LO (VolLayout->size), HI (VolLayout->dir_node_size),
 		 LO (VolLayout->dir_node_size), HI (VolLayout->file_node_size),
 		 LO (VolLayout->file_node_size), osb->cluster_bitmap.failed,
-		 osb->cluster_bitmap.ok_retries);
+		 osb->cluster_bitmap.ok_retries, atomic_read (&OcfsGlobalCtxt.cnt_lockres));
 
 	strcpy (page, tmp);
 	len = strlen (page);
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Makefile linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Makefile
--- linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Makefile	2003-07-30 13:51:50.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Makefile	2003-07-30 10:28:53.000000000 +0200
@@ -1,73 +1,23 @@
 O_TARGET := ocfs.o
 
-VERFILE = Common/ocfsver.c
+obj-y := Common/ocfsgenalloc.o Common/ocfsgensysfile.o Common/ocfsgencreate.o \
+  Common/ocfsgenutil.o Common/ocfsgenmisc.o Common/ocfsgentrans.o \
+  Common/ocfsgendirnode.o Common/ocfsgenvolcfg.o Common/ocfsver.o \
+  Common/ocfsgennm.o Common/ocfsheartbeat.o Common/ocfsgenvote.o \
+  Common/ocfsgendlm.o Linux/ocfsiosup.o Linux/ocfsmount.o Linux/ocfsfile.o \
+  Linux/ocfsmain.o Linux/ocfsport.o Linux/ocfsbitmap.o Linux/ocfsproc.o \
+  Linux/ocfsioctl.o Linux/ocfshash.o Linux/ocfsipc.o Linux/ocfsdlm.o \
+  Support/divdi3.o
 
-CPARTNER = \
-	Common/ocfsgenalloc.c	\
-	Common/ocfsgensysfile.c	\
-	Common/ocfsgencreate.c	\
-	Common/ocfsgenutil.c	\
-	Common/ocfsgenmisc.c	\
-	Common/ocfsgentrans.c	\
-	Common/ocfsgendirnode.c	\
-	Common/ocfsgenvolcfg.c	\
-	Linux/ocfsiosup.c	\
-	Linux/ocfsmount.c	\
-	Linux/ocfsfile.c	\
-	Linux/ocfsmain.c	\
-	Linux/ocfsport.c	\
-	Linux/ocfsbitmap.c	\
-	Linux/ocfsproc.c	\
-	Linux/ocfsioctl.c	\
-	Linux/ocfshash.c	\
-	Linux/ocfsipc.c		\
-	Common/ocfsgennm.c	\
-	Common/ocfsheartbeat.c	\
-	Common/ocfsgenvote.c	\
-	Common/ocfsgendlm.c 
+obj-m := $(O_TARGET)
 
-CALONE = Linux/ocfsdlm.c
-
-SUPPORT = Support/divdi3.c
-
-CFILES = $(CPARTNER) $(CALONE) $(SUPPORT)
-
-HTEMP1 = $(subst .c,.h,$(CPARTNER))
-HTEMP2 = $(subst Common,Common/inc,$(HTEMP1))
-HPARTNER = $(subst Linux,Linux/inc,$(HTEMP2))
-
-HALONE = \
-	Common/inc/ocfs.h	\
-	Common/inc/ocfsdef.h	\
-	Common/inc/ocfserr.h	\
-	Common/inc/ocfstrace.h	\
-	Common/inc/ocfsvol.h	\
-	Common/inc/ocfscom.h	\
-	Common/inc/ocfsdisk.h	\
-	Common/inc/ocfstrans.h	\
-	Common/inc/ocfsconst.h	\
-	Common/inc/ocfsdlm.h	\
-	Common/inc/ocfsver.h	\
-	Linux/inc/ocfsdlmp.h
-
-HFILES = $(HPARTNER) $(HALONE)
-
-OBJS = $(subst .c,.o,$(CFILES))
-VEROBJ = $(subst .c,.o,$(VERFILE))
-
-obj-y    := $(OBJS) $(VEROBJ)
-obj-m    := $(O_TARGET)
-
-EXTRA_CFLAGS += -DALLOW_INODE_UPDATES_WITH_NO_OIN
+EXTRA_CFLAGS += -I Common/inc -I Linux/inc
+EXTRA_CFLAGS += -DLINUX
 EXTRA_CFLAGS += -DPARANOID_LOCKS
-EXTRA_CFLAGS += -ICommon/inc -ILinux/inc
+EXTRA_CFLAGS += -DRECLAIM_SPACE_ON_TRUNCATE
+EXTRA_CFLAGS += -DNO_CACHE
+EXTRA_CFLAGS += -DENABLE_WAIT_FOR_LOCK_RELEASE
+EXTRA_CFLAGS += -DSYSFILE_EXTMAP_FIX
+EXTRA_CFLAGS += -DSUSE
 
 include $(TOPDIR)/Rules.make
-
-$(CFILES): $(HFILES)
-
-$(VERFILE): ocfsver.sh $(CFILES) $(HFILES)
-	@/bin/sh ./ocfsver.sh $@ $(VERSION) $(CFILES) $(HFILES)
-
-clean:
-	rm -f Common/*.o Linux/*.o Common/*.p Linux/*.p Common/*.s Linux/*.s $(VERFILE)
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Support/divdi3.c linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Support/divdi3.c
--- linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/Support/divdi3.c	2003-07-30 13:51:50.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/Support/divdi3.c	2003-07-30 10:28:53.000000000 +0200
@@ -1,3 +1,4 @@
+#if !defined __x86_64__ && !defined __ia64__
 /*  Ripped from gcc-2.95.1/gcc/libgcc2.c  */
 
 /* Copyright (C) 1989, 92-98, 1999 Free Software Foundation, Inc.
@@ -86,7 +87,8 @@ typedef union
 
 #ifdef __i386__
 #define sub_ddmmss(sh, sl, ah, al, bh, bl) \
-  __asm__ ("subl %5,%1\nsbbl %3,%0"					\
+  __asm__ ("subl %5,%1\n"						\
+	"sbbl %3,%0"							\
 	   : "=r" ((USItype) (sh)),					\
 	     "=&r" ((USItype) (sl))					\
 	   : "0" ((USItype) (ah)),					\
@@ -589,4 +591,4 @@ __udivdi3 (UDItype n, UDItype d)
   return __udivmoddi4 (n, d, (UDItype *) 0);
 }
 
-
+#endif
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/ocfs.conf linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/ocfs.conf
--- linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/ocfs.conf	2003-07-30 13:51:50.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/ocfs.conf	1970-01-01 01:00:00.000000000 +0100
@@ -1,38 +0,0 @@
-#
-# ocfs config
-# Ensure this file exists in /etc
-#
-
-# node_name serves as a human readable node identifier.
-# Eventhough the value should be unique in a cluster, ocfs does
-# not require it as it does not use it to identify a node.
-node_name = <your node name>
-
-# node_number allows the admin to specify the preferred node
-# number for the node in the cluster. However, it works only
-# as a suggestion, because ocfs will not fail the mount if the
-# specified node number is already occupied. Note that the
-# node number of a node can vary across mounts.
-node_number = <preferred node number>
-
-# debug_context is used for debugging. It will work only if the
-# driver is built with -DTRACE
-debug_context = <debug context>
-
-# debug_level is used for debugging. It will work only if the
-# driver is built with -DTRACE
-debug_level = <debug level>
-
-# ip_address specifies the host's ip address used by ocfs listener.
-ip_address = <you ip address>
-
-# ip_port specifies the host's ip port used by ocfs listener.
-ip_port = <your listener port>
-
-# guid parameter is added by the ocfs_uid_gen script and is used
-# by ocfs to uniquely identify a node. The guid holds within it
-# the mac address for the interface identified by the ip address.
-# Run "ocfs_uid_gen -c" to generate the the guid the first time.
-# If the mac address changes, run "ocfs_uid_gen -r" to get a 
-# new number guid, followed by "mount -o reclaimid" to reclaim the
-# original node number for each volume.
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/ocfsver.sh linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/ocfsver.sh
--- linux-2.4.20-wolk4.3-fullkernel/fs/ocfs/ocfsver.sh	2003-07-30 13:51:50.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/ocfs/ocfsver.sh	1970-01-01 01:00:00.000000000 +0100
@@ -1,32 +0,0 @@
-#!/bin/sh
-
-echo -n "Making version file... "
-
-VERFILE=$1
-rm -f $VERFILE
-shift
-
-VERSION=$1
-if test "x$VERSION" = "x"; then
-    echo "ERROR: No version given"
-    exit 1
-fi
-shift
-
-MD5=`cat $@ | md5sum | sed -e 's/ .*//'`
-
-cat > $VERFILE <<OUTCODE
-#include <linux/kernel.h>
-
-#include <ocfsver.h>
-
-#define OCFS_VERSION_STR "$VERSION"
-#define OCFS_BUILD_STR   "$MD5"
-
-void ocfs_version_print (void)
-{
-	printk(KERN_INFO "Oracle Cluster FileSystem $VERSION (build $MD5)\n");
-}
-OUTCODE
-
-echo "done"
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/proc/base.c linux-2.4.20-wolk4.4-fullkernel/fs/proc/base.c
--- linux-2.4.20-wolk4.3-fullkernel/fs/proc/base.c	2003-07-30 13:51:50.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/proc/base.c	2003-07-30 11:25:07.000000000 +0200
@@ -232,11 +232,44 @@ static int proc_root_link(struct inode *
 	return result;
 }
 
+#define MAY_PTRACE(task) \
+	(task == current || \
+	(task->p_pptr == current && \
+	(task->ptrace & PT_PTRACED) && task->state == TASK_STOPPED))
+
+static int may_ptrace_attach(struct task_struct *task)
+{
+	int retval = 0;
+
+	task_lock(task);
+
+	if (((current->uid != task->euid) ||
+	    (current->uid != task->suid) ||
+	    (current->uid != task->uid) ||
+	    (current->gid != task->egid) ||
+	    (current->gid != task->sgid) ||
+	    (!cap_issubset(task->cap_permitted, current->cap_permitted)) ||
+	    (current->gid != task->gid)) && !capable(CAP_SYS_PTRACE))
+		goto out;
+	rmb();
+	if (!is_dumpable(task) && !capable(CAP_SYS_PTRACE))
+		goto out;
+
+	retval = 1;
+
+out:
+	task_unlock(task);
+	return retval;
+}
+
 static int proc_pid_environ(struct task_struct *task, char * buffer)
 {
 	struct mm_struct *mm;
 	int res = 0;
 
+	if (!may_ptrace_attach(task))
+		return -ESRCH;
+
         /* RSBAC */
         #ifdef CONFIG_RSBAC
         union rsbac_target_id_t       rsbac_target_id;
@@ -268,10 +301,12 @@ static int proc_pid_environ(struct task_
 		atomic_inc(&mm->mm_users);
 	task_unlock(task);
 	if (mm) {
-		int len = mm->env_end - mm->env_start;
+		unsigned int len = mm->env_end - mm->env_start;
 		if (len > PAGE_SIZE)
 			len = PAGE_SIZE;
 		res = access_process_vm(task, mm->env_start, buffer, len, 0);
+		if (!may_ptrace_attach(task))
+			res = -ESRCH;
 		mmput(mm);
 	}
 	return res;
@@ -550,10 +585,6 @@ static struct file_operations proc_ipv4r
 	write:		proc_ipv4root_write,
 };
 
-#define MAY_PTRACE(p) \
-(p==current||(p->p_pptr==current&&(p->ptrace & PT_PTRACED)&&p->state==TASK_STOPPED))
-
-
 static int mem_open(struct inode* inode, struct file* file)
 {
 	file->private_data = (void*)((long)current->self_exec_id);
@@ -569,8 +600,7 @@ static ssize_t mem_read(struct file * fi
 	int copied = 0;
 	struct mm_struct *mm;
 
-
-	if (!MAY_PTRACE(task))
+	if (!MAY_PTRACE(task) || !may_ptrace_attach(task))
 		return -ESRCH;
 
 	page = (char *)__get_free_page(GFP_USER);
@@ -599,7 +629,7 @@ static ssize_t mem_read(struct file * fi
 
 		this_len = (count > PAGE_SIZE) ? PAGE_SIZE : count;
 		retval = access_process_vm(task, src, page, this_len, 0);
-		if (!retval) {
+		if (!retval || !MAY_PTRACE(task) || !may_ptrace_attach(task)) {
 			if (!copied)
 				copied = -EIO;
 			break;
@@ -633,7 +663,7 @@ static ssize_t mem_write(struct file * f
 	struct task_struct *task = file->f_dentry->d_inode->u.proc_i.task;
 	unsigned long dst = *ppos;
 
-	if (!MAY_PTRACE(task))
+	if (!MAY_PTRACE(task) || !may_ptrace_attach(task))
 		return -ESRCH;
 
 	page = (char *)__get_free_page(GFP_USER);
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/proc/generic.c linux-2.4.20-wolk4.4-fullkernel/fs/proc/generic.c
--- linux-2.4.20-wolk4.3-fullkernel/fs/proc/generic.c	2003-07-30 13:52:53.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/proc/generic.c	2003-07-30 11:23:30.000000000 +0200
@@ -486,12 +486,12 @@ struct proc_dir_entry *proc_mknod(const 
 	return ent;
 }
 
-struct proc_dir_entry *proc_mkdir(const char *name, struct proc_dir_entry *parent)
+struct proc_dir_entry *proc_mkdir_mode(const char *name, mode_t mode,
+		struct proc_dir_entry *parent)
 {
 	struct proc_dir_entry *ent;
 
-	ent = proc_create(&parent,name,
-			  (S_IFDIR | S_IRUGO | S_IXUGO),2);
+	ent = proc_create(&parent, name, S_IFDIR | mode, 2);
 	if (ent) {
 		ent->proc_fops = &proc_dir_operations;
 		ent->proc_iops = &proc_dir_inode_operations;
@@ -527,6 +527,12 @@ struct proc_dir_entry *proc_priv_mkdir(c
 }
 #endif
 
+struct proc_dir_entry *proc_mkdir(const char *name,
+		struct proc_dir_entry *parent)
+{
+	return proc_mkdir_mode(name, S_IRUGO | S_IXUGO, parent);
+}
+
 struct proc_dir_entry *create_proc_entry(const char *name, mode_t mode,
 					 struct proc_dir_entry *parent)
 {
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/proc/proc_misc.c linux-2.4.20-wolk4.4-fullkernel/fs/proc/proc_misc.c
--- linux-2.4.20-wolk4.3-fullkernel/fs/proc/proc_misc.c	2003-07-30 13:52:53.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/proc/proc_misc.c	2003-07-30 11:25:07.000000000 +0200
@@ -510,7 +510,7 @@ static int kstat_read_proc(char *page, c
 		}
 	}
 
-	proc_sprintf(page, &off, &len,
+	len += sprintf(page + len,
 		"\nctxt %lu\n"
 		"btime %lu\n"
 		"processes %lu\n",
@@ -566,10 +566,10 @@ static int cmdline_read_proc(char *page,
 				 int count, int *eof, void *data)
 {
 	extern char saved_command_line[];
-	int len;
+	int len = 0;
 
-	len = snprintf(page, PAGE_SIZE, "%s\n", saved_command_line);
-	return proc_calc_metrics(page, start, off, count, eof, len > PAGE_SIZE ? PAGE_SIZE : len);
+	proc_sprintf(page, &off, &len, "%s\n", saved_command_line);
+	return proc_calc_metrics(page, start, off, count, eof, len);
 }
 
 #ifdef CONFIG_SGI_DS1286
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/proc/proc_tty.c linux-2.4.20-wolk4.4-fullkernel/fs/proc/proc_tty.c
--- linux-2.4.20-wolk4.3-fullkernel/fs/proc/proc_tty.c	2003-07-30 13:51:50.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/proc/proc_tty.c	2003-07-30 11:23:30.000000000 +0200
@@ -128,7 +128,7 @@ static int tty_ldiscs_read_proc(char *pa
 }
 
 /*
- * Thsi function is called by register_tty_driver() to handle
+ * This function is called by tty_register_driver() to handle
  * registering the driver's /proc handler into /proc/tty/driver/<foo>
  */
 void proc_tty_register_driver(struct tty_driver *driver)
@@ -151,7 +151,7 @@ void proc_tty_register_driver(struct tty
 }
 
 /*
- * This function is called by unregister_tty_driver()
+ * This function is called by tty_unregister_driver()
  */
 void proc_tty_unregister_driver(struct tty_driver *driver)
 {
@@ -174,10 +174,16 @@ void __init proc_tty_init(void)
 	if (!proc_mkdir("tty", 0))
 		return;
 	proc_tty_ldisc = proc_mkdir("tty/ldisc", 0);
+	/*
+	 * /proc/tty/driver/serial reveals the exact character counts for
+	 * serial links which is just too easy to abuse for inferring
+	 * password lengths and inter-keystroke timings during password
+	 * entry.
+	 */
 #ifdef CONFIG_GRKERNSEC_PROC
 	proc_tty_driver = proc_priv_mkdir("tty/driver", 0);
 #else
-	proc_tty_driver = proc_mkdir("tty/driver", 0);
+	proc_tty_driver = proc_mkdir_mode("tty/driver", S_IRUSR | S_IXUSR, 0);
 #endif
 
 	create_proc_read_entry("tty/ldiscs", 0, 0, tty_ldiscs_read_proc,NULL);
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/quota_v1.c linux-2.4.20-wolk4.4-fullkernel/fs/quota_v1.c
--- linux-2.4.20-wolk4.3-fullkernel/fs/quota_v1.c	2003-07-30 13:51:50.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/quota_v1.c	2003-07-30 11:18:53.000000000 +0200
@@ -46,6 +46,7 @@ static int v1_read_dqblk(struct dquot *d
 	if (filp == (struct file *)NULL)
 		return -EINVAL;
 
+	memset(&dqblk, 0, sizeof(dqblk));	/* Initialize buffer in case file is too short */
 	/* Now we are sure filp is valid */
 	offset = v1_dqoff(dquot->dq_id);
 	fs = get_fs();
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/reiserfs/journal.c linux-2.4.20-wolk4.4-fullkernel/fs/reiserfs/journal.c
--- linux-2.4.20-wolk4.3-fullkernel/fs/reiserfs/journal.c	2003-07-30 13:51:50.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/reiserfs/journal.c	2003-07-30 11:18:22.000000000 +0200
@@ -39,7 +39,9 @@
 */
 
 #define EXPORT_SYMTAB
-#include <linux/module.h>
+#if defined(CONFIG_MODULES)
+# include <linux/module.h>
+#endif
 #include <linux/config.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/reiserfs/stree.c linux-2.4.20-wolk4.4-fullkernel/fs/reiserfs/stree.c
--- linux-2.4.20-wolk4.3-fullkernel/fs/reiserfs/stree.c	2003-07-30 13:52:53.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/reiserfs/stree.c	2003-07-30 10:29:18.000000000 +0200
@@ -1893,8 +1893,7 @@ void reiserfs_do_truncate (struct reiser
 	  reiserfs_restart_transaction(th, jbegin_count) ;
 	  reiserfs_update_inode_transaction(p_s_inode) ;
 	}
-	if (current->need_resched)
-	  schedule() ;
+	cond_resched();
     } while ( n_file_size > ROUND_UP (n_new_file_size) &&
 	      search_for_position_by_key(p_s_inode->i_sb, &s_item_key, &s_search_path) == POSITION_FOUND )  ;
 
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/fs/super.c linux-2.4.20-wolk4.4-fullkernel/fs/super.c
--- linux-2.4.20-wolk4.3-fullkernel/fs/super.c	2003-07-30 13:52:44.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/fs/super.c	2003-07-30 11:18:30.000000000 +0200
@@ -444,7 +444,6 @@ static void remove_super(struct super_bl
 	up_write(&s->s_umount);
 	put_super(s);
 	put_filesystem(fs);
-	blk_print_stats(dev);
 	if (bdev)
 		blkdev_put(bdev, BDEV_FS);
 	else
@@ -858,7 +857,6 @@ restart:
 		goto Einval;
 	sb_limit_maxbytes(s);
 	s->s_flags |= MS_ACTIVE;
-	blk_reset_stats(dev);
 	path_release(&nd);
 	return s;
 
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/include/asm-i386/processor.h linux-2.4.20-wolk4.4-fullkernel/include/asm-i386/processor.h
--- linux-2.4.20-wolk4.3-fullkernel/include/asm-i386/processor.h	2003-07-30 13:52:44.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/include/asm-i386/processor.h	2003-07-30 11:25:07.000000000 +0200
@@ -502,7 +502,7 @@ struct microcode {
 /* REP NOP (PAUSE) is a good thing to insert into busy-wait loops. */
 static inline void rep_nop(void)
 {
-	__asm__ __volatile__("rep;nop");
+	__asm__ __volatile__("rep;nop" ::: "memory");
 }
 
 #define cpu_relax()	rep_nop()
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/include/asm-i386/system.h linux-2.4.20-wolk4.4-fullkernel/include/asm-i386/system.h
--- linux-2.4.20-wolk4.3-fullkernel/include/asm-i386/system.h	2003-07-30 13:52:44.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/include/asm-i386/system.h	2003-07-30 11:18:53.000000000 +0200
@@ -428,5 +428,6 @@ extern int is_sony_vaio_laptop;
 
 #define BROKEN_ACPI_Sx		0x0001
 #define BROKEN_INIT_AFTER_S1	0x0002
+#define BROKEN_PNP_BIOS		0x0004
 
 #endif
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/include/asm-i386/uaccess.h linux-2.4.20-wolk4.4-fullkernel/include/asm-i386/uaccess.h
--- linux-2.4.20-wolk4.3-fullkernel/include/asm-i386/uaccess.h	2003-05-22 23:45:15.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/include/asm-i386/uaccess.h	2003-07-30 10:28:59.000000000 +0200
@@ -31,6 +31,33 @@
 #define set_fs(x)	(current->addr_limit = (x))
 
 #define segment_eq(a,b)	((a).seg == (b).seg)
+/*
+ *  * movsl can be slow when source and dest are not both 8-byte aligned
+ *   */
+
+#if defined(CONFIG_M586MMX) || defined(CONFIG_M686) || \
+                defined(CONFIG_MPENTIUMIII) || defined(CONFIG_MPENTIUM4)
+#define CONFIG_X86_INTEL_USERCOPY  
+#endif
+
+#ifdef CONFIG_X86_INTEL_USERCOPY 
+	extern struct movsl_mask {
+		                int mask;
+	} ____cacheline_aligned_in_smp movsl_mask;
+#endif 
+
+static inline int movsl_is_ok(const void *a1, const void *a2, unsigned long n)
+{
+#ifdef CONFIG_X86_INTEL_USERCOPY 
+	           if (n >= 64 && (((const long)a1 ^ (const long)a2) & movsl_mask.mask))
+                                return 0;
+#endif 
+		                 return 1;
+}
+/* These are undefined on !CONFIG_X86_INTEL_USERCOPY. And they should be unrerefenced. */
+extern unsigned long __copy_user_int(void *, const void *, unsigned long);
+extern unsigned long __copy_user_zeroing_int(void *, const void *, unsigned long);
+		   
 
 extern int __verify_write(const void *, unsigned long);
 
@@ -308,18 +335,23 @@ do {									\
 static inline unsigned long
 __generic_copy_from_user_nocheck(void *to, const void *from, unsigned long n)
 {
-	__copy_user_zeroing(to,from,n);
-	return n;
+                if (movsl_is_ok(to, from, n))
+                        __copy_user_zeroing(to, from, n);
+                else
+                        n = __copy_user_zeroing_int(to, from, n);
+		       return n;
 }
 
 static inline unsigned long
 __generic_copy_to_user_nocheck(void *to, const void *from, unsigned long n)
 {
-	__copy_user(to,from,n);
-	return n;
+                if (movsl_is_ok(to, from, n)) 
+			 __copy_user(to, from, n);	
+	       else 
+	                n = __copy_user_int(to, from, n);
+		  return n;
 }
 
-
 /* Optimize just a little bit when we know the size of the move. */
 #define __constant_copy_user(to, from, size)			\
 do {								\
@@ -577,24 +609,16 @@ __constant_copy_from_user_nocheck(void *
 }
 
 #define copy_to_user(to,from,n)				\
-	(__builtin_constant_p(n) ?			\
-	 __constant_copy_to_user((to),(from),(n)) :	\
-	 __generic_copy_to_user((to),(from),(n)))
+	 __generic_copy_to_user((to),(from),(n))
 
 #define copy_from_user(to,from,n)			\
-	(__builtin_constant_p(n) ?			\
-	 __constant_copy_from_user((to),(from),(n)) :	\
-	 __generic_copy_from_user((to),(from),(n)))
+	 __generic_copy_from_user((to),(from),(n))
 
 #define __copy_to_user(to,from,n)			\
-	(__builtin_constant_p(n) ?			\
-	 __constant_copy_to_user_nocheck((to),(from),(n)) :	\
-	 __generic_copy_to_user_nocheck((to),(from),(n)))
+	 __generic_copy_to_user_nocheck((to),(from),(n))
 
 #define __copy_from_user(to,from,n)			\
-	(__builtin_constant_p(n) ?			\
-	 __constant_copy_from_user_nocheck((to),(from),(n)) :	\
-	 __generic_copy_from_user_nocheck((to),(from),(n)))
+	 __generic_copy_from_user_nocheck((to),(from),(n))
 
 long strncpy_from_user(char *dst, const char *src, long count);
 long __strncpy_from_user(char *dst, const char *src, long count);
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/include/asm-sparc64/irq.h linux-2.4.20-wolk4.4-fullkernel/include/asm-sparc64/irq.h
--- linux-2.4.20-wolk4.3-fullkernel/include/asm-sparc64/irq.h	2003-07-30 13:51:55.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/include/asm-sparc64/irq.h	2002-09-27 23:26:08.000000000 +0200
@@ -114,7 +114,7 @@ static __inline__ char *__irq_itoa(unsig
 extern void disable_irq(unsigned int);
 #define disable_irq_nosync disable_irq
 extern void enable_irq(unsigned int);
-extern void sparc_init_timers(void (*lvl10_irq)(int, void *, struct pt_regs *),
+extern void init_timers(void (*lvl10_irq)(int, void *, struct pt_regs *),
 			unsigned long *);
 extern unsigned int build_irq(int pil, int inofixup, unsigned long iclr, unsigned long imap);
 extern unsigned int sbus_build_irq(void *sbus, unsigned int ino);
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/include/linux/blkdev.h linux-2.4.20-wolk4.4-fullkernel/include/linux/blkdev.h
--- linux-2.4.20-wolk4.3-fullkernel/include/linux/blkdev.h	2003-07-30 13:52:44.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/include/linux/blkdev.h	2003-07-30 11:25:37.000000000 +0200
@@ -64,14 +64,9 @@ typedef int (make_request_fn) (request_q
 typedef void (plug_device_fn) (request_queue_t *q, kdev_t device);
 typedef void (unplug_device_fn) (void *q);
 
-/*
- * Default nr free requests per queue, ll_rw_blk will scale it down
- * according to available RAM at init time
- */
-#define QUEUE_NR_REQUESTS	8192
-
 struct request_list {
 	unsigned int count;
+	unsigned int pending[2];
 	struct list_head free;
 };
 
@@ -80,7 +75,7 @@ struct request_queue
 	/*
 	 * the queue request freelist, one for reads and one for writes
 	 */
-	struct request_list	rq[2];
+	struct request_list	rq;
 
 	/*
 	 * The total number of requests on each queue
@@ -93,6 +88,21 @@ struct request_queue
 	int batch_requests;
 
 	/*
+	 * The total number of 512byte blocks on each queue
+	 */
+	atomic_t nr_sectors;
+
+	/*
+	 * Batching threshold for sleep/wakeup decisions
+	 */
+	int batch_sectors;
+
+	/*
+	 * The max number of 512byte blocks on each queue
+	 */
+	int max_queue_sectors;
+
+	/*
 	 * Together with queue_head for cacheline sharing
 	 */
 	struct list_head	queue_head;
@@ -121,13 +131,34 @@ struct request_queue
 	/*
 	 * Boolean that indicates whether this queue is plugged or not.
 	 */
-	char			plugged;
+	int			plugged:1;
 
 	/*
 	 * Boolean that indicates whether current_request is active or
 	 * not.
 	 */
-	char			head_active;
+	int			head_active:1;
+
+	/*
+	 * Booleans that indicate whether the queue's free requests have
+	 * been exhausted and is waiting to drop below the batch_requests
+	 * threshold
+	 */
+	int			full:1;
+	
+	/*
+	 * Boolean that indicates you will use blk_started_sectors
+	 * and blk_finished_sectors in addition to blk_started_io
+	 * and blk_finished_io.  It enables the throttling code to 
+	 * help keep the sectors in flight to a reasonable value
+	 */
+	int			can_throttle:1;
+
+	/*
+	 * Boolean that indicates the queue should prefer low
+	 * latency over throughput.  This enables the q->full checks
+	 */
+	int			low_latency:1;
 
 	unsigned long		bounce_pfn;
 
@@ -140,18 +171,9 @@ struct request_queue
 	/*
 	 * Tasks wait here for free read and write requests
 	 */
-	wait_queue_head_t	wait_for_requests[2];
-	unsigned long           max_wait;
-	unsigned long           min_wait;
-	unsigned long           total_wait;
-	unsigned long           num_req;
-	unsigned long           num_wait;
-	unsigned long           deviation[5];
+	wait_queue_head_t	wait_for_requests;
 };
 
-void blk_reset_stats(kdev_t dev);
-void blk_print_stats(kdev_t dev);
-
 extern unsigned long blk_max_low_pfn, blk_max_pfn;
 
 #define BLK_BOUNCE_HIGH		(blk_max_low_pfn << PAGE_SHIFT)
@@ -221,7 +243,6 @@ extern void register_disk(struct gendisk
 extern void generic_make_request(int rw, struct buffer_head * bh);
 extern inline request_queue_t *blk_get_queue(kdev_t dev);
 extern void blkdev_release_request(struct request *);
-extern void blk_print_stats(kdev_t dev);
 
 extern spinlock_cacheline_t blk_atomic_lock_cacheline;
 #define blk_atomic_lock (blk_atomic_lock_cacheline.lock)
@@ -233,10 +254,11 @@ extern void FASTCALL(blk_refile_atomic_q
 /*
  * Access functions for manipulating queue properties
  */
-extern int blk_grow_request_list(request_queue_t *q, int nr_requests);
+extern int blk_grow_request_list(request_queue_t *q, int nr_requests, int max_queue_sectors);
 extern void blk_init_queue(request_queue_t *, request_fn_proc *);
 extern void blk_cleanup_queue(request_queue_t *);
 extern void blk_queue_headactive(request_queue_t *, int);
+extern void blk_queue_throttle_sectors(request_queue_t *, int);
 extern void blk_queue_make_request(request_queue_t *, make_request_fn *);
 extern void generic_unplug_device(void *);
 extern inline int blk_seg_merge_ok(struct buffer_head *, struct buffer_head *);
@@ -258,6 +280,32 @@ extern char * blkdev_varyio[MAX_BLKDEV];
 #define MAX_SEGMENTS 128
 #define MAX_SECTORS 255
 
+
+/* Max Throughput Elevator */
+
+#if defined (CONFIG_BLK_DEV_ELEVATOR_MAXSPEED)
+# warning INFO: You are using the Max Throughput I/O Elevator
+# define MAX_QUEUE_SECTORS (16 << (20 - 9)) /* 16 mbytes when full sized */
+# define MAX_NR_REQUESTS 512 /* 256k when in 512 units, normally min is 512k in 1k units */
+#endif
+
+/* Normal I/O Elevator */
+
+#if defined (CONFIG_BLK_DEV_ELEVATOR_NORMAL)
+# warning INFO: You are using the Normal I/O Elevator
+# define MAX_QUEUE_SECTORS (4 << (20 - 9)) /* 4 mbytes when full sized */
+# define MAX_NR_REQUESTS 512 /* 256k when in 512 units, normally min is 512k in 1k units */
+#endif
+
+/* Low Latency Elevator */
+
+#if defined (CONFIG_BLK_DEV_ELEVATOR_LOWLAT)
+# warning INFO: You are using the Low Latency I/O Elevator
+# define MAX_QUEUE_SECTORS (4 << (20 - 9)) /* 4 mbytes when full sized */
+# define MAX_NR_REQUESTS 16 /* 8k when in 16 units, normally min is 16k in 1k units */
+#endif
+
+
 #define PageAlignSize(size) (((size) + PAGE_SIZE -1) & PAGE_MASK)
 
 #define blkdev_entry_to_request(entry) list_entry((entry), struct request, queue)
@@ -283,9 +331,58 @@ static inline int get_hardsect_size(kdev
 	return retval;
 }
 
+static inline int blk_oversized_queue(request_queue_t * q)
+{
+	if (q->can_throttle)
+		return atomic_read(&q->nr_sectors) > q->max_queue_sectors;
+	return q->rq.count == 0;
+}
+
+static inline int blk_oversized_queue_reads(request_queue_t * q)
+{
+	if (q->can_throttle)
+		return atomic_read(&q->nr_sectors) > q->max_queue_sectors + q->batch_sectors;
+	return q->rq.count == 0;
+}
+
+static inline int blk_oversized_queue_batch(request_queue_t * q)
+{
+	return atomic_read(&q->nr_sectors) > q->max_queue_sectors - q->batch_sectors;
+}
+
 #define blk_finished_io(nsects)	do { } while (0)
 #define blk_started_io(nsects)	do { } while (0)
 
+static inline void blk_started_sectors(struct request *rq, int count)
+{
+	request_queue_t *q = rq->q;
+	if (q && q->can_throttle) {
+		atomic_add(count, &q->nr_sectors);
+		if (atomic_read(&q->nr_sectors) < 0) {
+			printk("nr_sectors is %d\n", atomic_read(&q->nr_sectors));
+			BUG();
+		}
+	}
+}
+
+static inline void blk_finished_sectors(struct request *rq, int count)
+{
+	request_queue_t *q = rq->q;
+	if (q && q->can_throttle) {
+		atomic_sub(count, &q->nr_sectors);
+		
+		smp_mb();
+		if (q->rq.count >= q->batch_requests && !blk_oversized_queue_batch(q)) {
+			if (waitqueue_active(&q->wait_for_requests))
+				wake_up(&q->wait_for_requests);
+		}
+		if (atomic_read(&q->nr_sectors) < 0) {
+			printk("nr_sectors is %d\n", atomic_read(&q->nr_sectors));
+			BUG();
+		}
+	}
+}
+
 static inline unsigned int blksize_bits(unsigned int size)
 {
 	unsigned int bits = 8;
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/include/linux/brlock.h linux-2.4.20-wolk4.4-fullkernel/include/linux/brlock.h
--- linux-2.4.20-wolk4.3-fullkernel/include/linux/brlock.h	2003-07-30 13:51:55.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/include/linux/brlock.h	2003-07-30 11:23:30.000000000 +0200
@@ -36,6 +36,7 @@ enum brlock_indices {
 	BR_NETPROTO_LOCK,
 	BR_AIO_REQ_LOCK,
 	BR_LRU_LOCK,
+	BR_HIPAC_LOCK,
 
 	__BR_END
 };
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/include/linux/elevator.h linux-2.4.20-wolk4.4-fullkernel/include/linux/elevator.h
--- linux-2.4.20-wolk4.3-fullkernel/include/linux/elevator.h	2003-07-30 13:52:44.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/include/linux/elevator.h	2003-07-30 11:25:36.000000000 +0200
@@ -1,9 +1,12 @@
 #ifndef _LINUX_ELEVATOR_H
 #define _LINUX_ELEVATOR_H
 
-typedef int (elevator_merge_fn)(request_queue_t *, struct request **,
-				struct list_head *, struct buffer_head *bh,
-				int rw, int max_sectors);
+typedef void (elevator_fn) (struct request *, elevator_t *,
+			    struct list_head *,
+			    struct list_head *, int);
+
+typedef int (elevator_merge_fn) (request_queue_t *, struct request **, struct list_head *,
+				 struct buffer_head *, int, int);
 
 typedef void (elevator_merge_cleanup_fn) (request_queue_t *, struct request *, int);
 
@@ -13,7 +16,6 @@ struct elevator_s
 {
 	int read_latency;
 	int write_latency;
-	int max_bomb_segments;
 
 	elevator_merge_fn *elevator_merge_fn;
 	elevator_merge_req_fn *elevator_merge_req_fn;
@@ -21,26 +23,31 @@ struct elevator_s
 	unsigned int queue_ID;
 };
 
-elevator_merge_fn		elevator_noop_merge;
-elevator_merge_cleanup_fn	elevator_noop_merge_cleanup;
-elevator_merge_req_fn		elevator_noop_merge_req;
-
-elevator_merge_fn		elevator_linus_merge;
-elevator_merge_cleanup_fn	elevator_linus_merge_cleanup;
-elevator_merge_req_fn		elevator_linus_merge_req;
+int elevator_noop_merge(request_queue_t *, struct request **, struct list_head *, struct buffer_head *, int, int);
+void elevator_noop_merge_cleanup(request_queue_t *, struct request *, int);
+void elevator_noop_merge_req(struct request *, struct request *);
+
+int elevator_linus_merge(request_queue_t *, struct request **, struct list_head *, struct buffer_head *, int, int);
+void elevator_linus_merge_cleanup(request_queue_t *, struct request *, int);
+void elevator_linus_merge_req(struct request *, struct request *);
 
 typedef struct blkelv_ioctl_arg_s {
 	int queue_ID;
 	int read_latency;
 	int write_latency;
+/*
+ * (max_bomb_segments & MAX_BOMB_LATENCY_MASK) == 1 indicates low latency
+ * mode.  We're using any odd number to indicate low latency is on.
+ */
+#define MAX_BOMB_LATENCY_MASK 1
 	int max_bomb_segments;
 } blkelv_ioctl_arg_t;
 
 #define BLKELVGET   _IOR(0x12,106,sizeof(blkelv_ioctl_arg_t))
 #define BLKELVSET   _IOW(0x12,107,sizeof(blkelv_ioctl_arg_t))
 
-extern int blkelvget_ioctl(elevator_t *, blkelv_ioctl_arg_t *);
-extern int blkelvset_ioctl(elevator_t *, const blkelv_ioctl_arg_t *);
+extern int blkelvget_ioctl(request_queue_t *, blkelv_ioctl_arg_t *);
+extern int blkelvset_ioctl(request_queue_t *, const blkelv_ioctl_arg_t *);
 
 extern void elevator_init(elevator_t *, elevator_t);
 
@@ -51,6 +58,22 @@ extern void elevator_init(elevator_t *, 
 #define ELEVATOR_FRONT_MERGE	1
 #define ELEVATOR_BACK_MERGE	2
 
+/*
+ * This is used in the elevator algorithm.  We don't prioritise reads
+ * over writes any more --- although reads are more time-critical than
+ * writes, by treating them equally we increase filesystem throughput.
+ * This turns out to give better overall performance.  -- sct
+ */
+#define IN_ORDER(s1,s2)				\
+	((((s1)->rq_dev == (s2)->rq_dev &&	\
+	   (s1)->sector < (s2)->sector)) ||	\
+	 (s1)->rq_dev < (s2)->rq_dev)
+
+#define BHRQ_IN_ORDER(bh, rq)			\
+	((((bh)->b_rdev == (rq)->rq_dev &&	\
+	   (bh)->b_rsector < (rq)->sector)) ||	\
+	 (bh)->b_rdev < (rq)->rq_dev)
+
 static inline int elevator_request_latency(elevator_t * elevator, int rw)
 {
 	int latency;
@@ -62,7 +85,7 @@ static inline int elevator_request_laten
 	return latency;
 }
 
-#define ELV_LINUS_SEEK_COST	16
+#define ELV_LINUS_SEEK_COST	1
 
 #define ELEVATOR_NOOP							\
 ((elevator_t) {								\
@@ -73,48 +96,17 @@ static inline int elevator_request_laten
 	elevator_noop_merge_req,	/* elevator_merge_req_fn */	\
 	})
 
-#if (!defined (CONFIG_BLK_DEV_ELEVATOR_LOWLAT) && defined (CONFIG_SCHED_SERVER)) || (!defined (CONFIG_BLK_DEV_ELEVATOR_LOWLAT) && !defined (CONFIG_SCHED_SERVER) && !defined (CONFIG_SCHED_DESKTOP))
-#define ELEVATOR_READ_LATENCY		2048
-#define ELEVATOR_WRITE_LATENCY		8192
-#define ELEVATOR_MAX_BOMB_SEGMENTS	6
 #define ELEVATOR_LINUS							\
 ((elevator_t) {								\
-	2048,				/* read passovers */		\
-	8192,				/* write passovers */		\
-	6,				/* max_bomb_segments */		\
+	128,				/* read passovers */		\
+	512,				/* write passovers */		\
 									\
 	elevator_linus_merge,		/* elevator_merge_fn */		\
 	elevator_linus_merge_req,	/* elevator_merge_req_fn */	\
 	})
 
-#elif (!defined (CONFIG_BLK_DEV_ELEVATOR_LOWLAT) && defined (CONFIG_SCHED_DESKTOP))
-#define ELEVATOR_READ_LATENCY		512
-#define ELEVATOR_WRITE_LATENCY		8192
-#define ELEVATOR_MAX_BOMB_SEGMENTS	4
-#define ELEVATOR_LINUS							\
-((elevator_t) {								\
-	512,				/* read passovers */		\
-	8192,				/* write passovers */		\
-	4,				/* max_bomb_segments */		\
-									\
-	elevator_linus_merge,		/* elevator_merge_fn */		\
-	elevator_linus_merge_req,	/* elevator_merge_req_fn */	\
-	})
+#endif
 
-#elif defined (CONFIG_BLK_DEV_ELEVATOR_LOWLAT)
 #define ELEVATOR_READ_LATENCY		128
 #define ELEVATOR_WRITE_LATENCY		256
-#define ELEVATOR_MAX_BOMB_SEGMENTS	2
-#define ELEVATOR_LINUS							\
-((elevator_t) {								\
-	128,				/* read passovers */		\
-	256,				/* write passovers */		\
-	2,				/* max_bomb_segments */		\
-									\
-	elevator_linus_merge,		/* elevator_merge_fn */		\
-	elevator_linus_merge_req,	/* elevator_merge_req_fn */	\
-	})
-
-#endif	/* CONFIG_BLK_DEV_ELEVATOR_LOWLAT */
-
-#endif	/* _LINUX_ELEVATOR_H */
+#define ELEVATOR_MAX_BOMB_SEGMENTS	0
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/include/linux/ethtool.h linux-2.4.20-wolk4.4-fullkernel/include/linux/ethtool.h
--- linux-2.4.20-wolk4.3-fullkernel/include/linux/ethtool.h	2002-12-18 01:04:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/include/linux/ethtool.h	2003-07-30 11:11:41.000000000 +0200
@@ -281,6 +281,8 @@ struct ethtool_stats {
 #define ETHTOOL_GSTRINGS	0x0000001b /* get specified string set */
 #define ETHTOOL_PHYS_ID		0x0000001c /* identify the NIC */
 #define ETHTOOL_GSTATS		0x0000001d /* get NIC-specific statistics */
+#define ETHTOOL_GTSO		0x0000001e /* Get TSO enable (ethtool_value) */
+#define ETHTOOL_STSO		0x0000001f /* Set TSO enable (ethtool_value) */
 
 /* compatibility with older code */
 #define SPARC_ETH_GSET		ETHTOOL_GSET
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/include/linux/fs.h linux-2.4.20-wolk4.4-fullkernel/include/linux/fs.h
--- linux-2.4.20-wolk4.3-fullkernel/include/linux/fs.h	2003-07-30 13:52:53.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/include/linux/fs.h	2003-07-30 11:25:06.000000000 +0200
@@ -243,6 +243,7 @@ enum bh_state_bits {
 	BH_Attached,	/* 1 if b_inode_buffers is linked into a list */
 	BH_JBD,		/* 1 if it has an attached journal_head */
 	BH_Delay,	/* 1 if the buffer is delayed allocate */
+	BH_Sync,	/* 1 if the buffer is a sync read */
 	BH_Atomic,	/* 1 if b_elv_sequence is valid */
 
 	BH_PrivateStart,/* not a state bit, but the first bit available
@@ -796,6 +797,7 @@ extern time_t lease_get_mtime(struct ino
 extern int lock_may_read(struct inode *, loff_t start, unsigned long count);
 extern int lock_may_write(struct inode *, loff_t start, unsigned long count);
 extern void send_sigio(struct fown_struct *fown, int fd, int band);
+extern void steal_locks(fl_owner_t from, fl_owner_t to);
 
 struct fasync_struct {
 	int	magic;
@@ -1759,6 +1761,9 @@ extern int generic_osync_inode(struct in
 extern int inode_change_ok(struct inode *, struct iattr *);
 extern int inode_setattr(struct inode *, struct iattr *);
 
+/* kernel/fork.c */
+extern int unshare_files(void);
+
 /*
  * Common dentry functions for inclusion in the VFS
  * or in other stackable file systems.  Some of these
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/include/linux/netdevice.h linux-2.4.20-wolk4.4-fullkernel/include/linux/netdevice.h
--- linux-2.4.20-wolk4.3-fullkernel/include/linux/netdevice.h	2003-07-30 13:51:58.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/include/linux/netdevice.h	2003-07-30 11:23:30.000000000 +0200
@@ -484,6 +484,12 @@ extern struct net_device	*dev_get_by_ind
 extern struct net_device	*__dev_get_by_index(int ifindex);
 extern int		dev_restart(struct net_device *dev);
 
+/* the veto function can prohibit a NETDEV_REGISTER, NETDEV_UNREGISTER and
+   NETDEV_CHANGENAME event by returning a value unequal to 0 */
+typedef int veto_func_t(unsigned long event, struct net_device *dev);
+extern int              register_netdevice_veto(veto_func_t *veto);
+extern int              unregister_netdevice_veto(veto_func_t *veto);
+
 typedef int gifconf_func_t(struct net_device * dev, char * bufptr, int len);
 extern int		register_gifconf(unsigned int family, gifconf_func_t * gifconf);
 static inline int unregister_gifconf(unsigned int family)
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/include/linux/netfilter.h linux-2.4.20-wolk4.4-fullkernel/include/linux/netfilter.h
--- linux-2.4.20-wolk4.3-fullkernel/include/linux/netfilter.h	2003-07-30 13:51:58.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/include/linux/netfilter.h	2003-07-30 11:23:30.000000000 +0200
@@ -86,9 +86,10 @@ struct nf_info
 	int (*okfn)(struct sk_buff *);
 };
                                                                                 
-/* Function to register/unregister hook points. */
+/* Function to register/unregister/modify hook points. */
 int nf_register_hook(struct nf_hook_ops *reg);
 void nf_unregister_hook(struct nf_hook_ops *reg);
+void nf_change_prio_hook(struct nf_hook_ops *reg, int new_prio);
 
 /* Functions to register get/setsockopt ranges (non-inclusive).  You
    need to check permissions yourself! */
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/include/linux/netfilter_ipv4/ip_tables.h linux-2.4.20-wolk4.4-fullkernel/include/linux/netfilter_ipv4/ip_tables.h
--- linux-2.4.20-wolk4.3-fullkernel/include/linux/netfilter_ipv4/ip_tables.h	2003-05-22 23:57:16.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/include/linux/netfilter_ipv4/ip_tables.h	2003-07-30 11:23:30.000000000 +0200
@@ -409,6 +409,11 @@ extern void ipt_unregister_target(struct
 extern int ipt_register_match(struct ipt_match *match);
 extern void ipt_unregister_match(struct ipt_match *match);
 
+extern int
+ipt_init_match(struct ipt_entry_match *match);
+extern int
+ipt_init_target(struct ipt_entry_target *target);
+
 /* Furniture shopping... */
 struct ipt_table
 {
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/include/linux/netlink.h linux-2.4.20-wolk4.4-fullkernel/include/linux/netlink.h
--- linux-2.4.20-wolk4.3-fullkernel/include/linux/netlink.h	2002-12-18 01:04:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/include/linux/netlink.h	2003-07-30 11:23:30.000000000 +0200
@@ -129,6 +129,8 @@ struct netlink_callback
 	int		(*done)(struct netlink_callback *cb);
 	int		family;
 	long		args[4];
+	struct sk_buff  *reply;
+	int             reply_len;
 };
 
 struct netlink_notify
@@ -161,6 +163,9 @@ extern int netlink_dump_start(struct soc
 			      int (*dump)(struct sk_buff *skb, struct netlink_callback*),
 			      int (*done)(struct netlink_callback*));
 
+extern int netlink_dump_start_cb(struct sock *ssk,
+				 const struct netlink_callback *c);
+
 #define NL_NONROOT_RECV 0x1
 #define NL_NONROOT_SEND 0x2
 extern void netlink_set_nonroot(int protocol, unsigned flag);
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/include/linux/pci_ids.h linux-2.4.20-wolk4.4-fullkernel/include/linux/pci_ids.h
--- linux-2.4.20-wolk4.3-fullkernel/include/linux/pci_ids.h	2003-07-30 13:52:44.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/include/linux/pci_ids.h	2003-07-30 11:18:37.000000000 +0200
@@ -1170,7 +1170,6 @@
 #define PCI_DEVICE_ID_SYSKONNECT_FP	0x4000
 #define PCI_DEVICE_ID_SYSKONNECT_TR	0x4200
 #define PCI_DEVICE_ID_SYSKONNECT_GE	0x4300
-#define PCI_DEVICE_ID_SYSKONNECT_YU	0x4320
 
 #define PCI_VENDOR_ID_VMIC		0x114a
 #define PCI_DEVICE_ID_VMIC_VME		0x7587
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/include/linux/quota.h linux-2.4.20-wolk4.4-fullkernel/include/linux/quota.h
--- linux-2.4.20-wolk4.3-fullkernel/include/linux/quota.h	2003-07-30 13:51:58.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/include/linux/quota.h	2003-07-30 11:18:53.000000000 +0200
@@ -251,6 +251,7 @@ struct dquot_operations {
 	void (*free_space) (struct inode *, qsize_t);
 	void (*free_inode) (const struct inode *, unsigned long);
 	int (*transfer) (struct inode *, struct iattr *);
+	int (*sync_dquot) (struct dquot *);
 };
 
 /* Operations handling requests from userspace */
@@ -312,6 +313,7 @@ static inline int is_enabled(struct quot
 
 int register_quota_format(struct quota_format_type *fmt);
 void unregister_quota_format(struct quota_format_type *fmt);
+void init_dquot_operations(struct dquot_operations *fsdqops);
 
 #else
 
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/include/net/pkt_sched.h linux-2.4.20-wolk4.4-fullkernel/include/net/pkt_sched.h
--- linux-2.4.20-wolk4.3-fullkernel/include/net/pkt_sched.h	2003-07-30 13:51:59.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/include/net/pkt_sched.h	2003-07-30 11:18:54.000000000 +0200
@@ -16,7 +16,7 @@
 #include <linux/pkt_sched.h>
 #include <net/pkt_cls.h>
 
-#ifdef CONFIG_X86_TSC
+#ifdef CONFIG_X86_HAS_TSC
 #include <asm/msr.h>
 #endif
 
@@ -257,7 +257,7 @@ extern int psched_clock_scale;
 
 #define PSCHED_US2JIFFIE(delay) (((delay)+psched_clock_per_hz-1)/psched_clock_per_hz)
 
-#ifdef CONFIG_X86_TSC
+#ifdef CONFIG_X86_HAS_TSC
 
 #define PSCHED_GET_TIME(stamp) \
 ({ u64 __cur; \
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/init/do_mounts.c linux-2.4.20-wolk4.4-fullkernel/init/do_mounts.c
--- linux-2.4.20-wolk4.3-fullkernel/init/do_mounts.c	2003-07-30 13:52:44.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/init/do_mounts.c	2003-07-30 11:18:53.000000000 +0200
@@ -377,6 +377,7 @@ retry:
 				flags |= MS_RDONLY;
 				goto retry;
 			case -EINVAL:
+		        case -EBUSY:
 				continue;
 		}
 	        /*
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/init/main.c linux-2.4.20-wolk4.4-fullkernel/init/main.c
--- linux-2.4.20-wolk4.3-fullkernel/init/main.c	2003-07-30 13:52:53.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/init/main.c	2003-07-30 13:58:34.000000000 +0200
@@ -612,8 +612,15 @@ asmlinkage void __init start_kernel(void
 		printk("ELEVATOR: You are using the NOOP Elevator. WARNING!!\n");
 	#endif
 	#ifdef CONFIG_BLK_DEV_ELEVATOR_LOWLAT
-		printk("ELEVATOR: You are using the Low Latency Elevator. Fasten your seat belt :)\n");
+		printk("ELEVATOR: You are using the Low Latency I/O Elevator.\n");
 	#endif
+	#ifdef CONFIG_BLK_DEV_ELEVATOR_NORMAL
+		printk("ELEVATOR: You are using the Normal I/O Elevator.\n");
+	#endif
+	#ifdef CONFIG_BLK_DEV_ELEVATOR_MAXSPEED
+		printk("ELEVATOR: You are using the Max Throughput I/O Elevator.\n");
+	#endif
+
 
 	/*
 	 *	We want to tell the user we are O(1) scheduling.
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/init/version.c linux-2.4.20-wolk4.4-fullkernel/init/version.c
--- linux-2.4.20-wolk4.3-fullkernel/init/version.c	2003-07-30 13:52:44.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/init/version.c	2003-07-30 11:21:16.000000000 +0200
@@ -26,7 +26,7 @@ struct new_utsname system_utsname = {
 };
 
 const char *wolk_banner =
-	"WOLK - Working Overloaded Linux Kernel - v4.2 - Server Edition""\n\n";
+	"WOLK - Working Overloaded Linux Kernel - v4.4 - Server Edition""\n\n";
 
 const char *linux_banner = 
 	"Linux version " UTS_RELEASE " (" LINUX_COMPILE_BY "@"
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/kernel/fork.c linux-2.4.20-wolk4.4-fullkernel/kernel/fork.c
--- linux-2.4.20-wolk4.3-fullkernel/kernel/fork.c	2003-07-30 13:52:38.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/kernel/fork.c	2003-07-30 11:25:07.000000000 +0200
@@ -23,6 +23,7 @@
 #include <linux/personality.h>
 #include <linux/compiler.h>
 #include <linux/grsecurity.h>
+#include <linux/mman.h>
 
 #include <asm/pgtable.h>
 #include <asm/pgalloc.h>
@@ -664,6 +665,33 @@ out_release:
 	goto out;
 }
 
+/*
+ *	Helper to unshare the files of the current task. 
+ *	We don't want to expose copy_files internals to 
+ *	the exec layer of the kernel.
+ */
+
+int unshare_files(void)
+{
+	struct files_struct *files  = current->files;
+	int rc;
+	
+	if(!files)
+		BUG();
+		
+	/* This can race but the race causes us to copy when we don't
+	   need to and drop the copy */
+	if(atomic_read(&files->count) == 1)
+	{
+		atomic_inc(&files->count);
+		return 0;
+	}
+	rc = copy_files(0, current);
+	if(rc)
+		current->files = files;
+	return rc;
+}		
+
 static inline int copy_sighand(unsigned long clone_flags, struct task_struct * tsk)
 {
 	struct signal_struct *sig;
@@ -892,7 +920,8 @@ int do_fork(unsigned long clone_flags, u
 		goto bad_fork_cleanup_fs;
 	if (copy_mm(clone_flags, p))
 		goto bad_fork_cleanup_sighand;
-	if (copy_namespace(clone_flags, p))
+	retval = copy_namespace(clone_flags, p);
+	if (retval)
 		goto bad_fork_cleanup_mm;
 	retval = copy_thread(0, clone_flags, stack_start, stack_size, p, regs);
 	if (retval)
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/kernel/ksyms.c linux-2.4.20-wolk4.4-fullkernel/kernel/ksyms.c
--- linux-2.4.20-wolk4.3-fullkernel/kernel/ksyms.c	2003-07-30 13:52:44.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/kernel/ksyms.c	2003-07-30 11:22:16.000000000 +0200
@@ -489,7 +489,7 @@ EXPORT_SYMBOL(alloc_kiovec_nobhs);
 EXPORT_SYMBOL(free_kiovec);
 EXPORT_SYMBOL(free_kiovec_nobhs);
 EXPORT_SYMBOL(expand_kiobuf);
-
+EXPORT_SYMBOL(mark_dirty_kiobuf);
 EXPORT_SYMBOL(map_user_kiobuf);
 EXPORT_SYMBOL(unmap_kiobuf);
 EXPORT_SYMBOL(lock_kiovec);
@@ -700,6 +700,7 @@ EXPORT_SYMBOL(set_fs_pwd);
 EXPORT_SYMBOL(set_fs_root);
 
 /* evfs */
+#ifdef CONFIG_EVFS_FS
 extern void sys_rename();
 extern void sys_readlink();
 extern void sys_unlink();
@@ -717,4 +718,4 @@ EXPORT_SYMBOL(sys_mknod);
 EXPORT_SYMBOL(sys_mkdir);
 EXPORT_SYMBOL(sys_rmdir);
 EXPORT_SYMBOL(sys_link);
-
+#endif
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/kernel/sched.c linux-2.4.20-wolk4.4-fullkernel/kernel/sched.c
--- linux-2.4.20-wolk4.3-fullkernel/kernel/sched.c	2003-07-30 13:52:53.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/kernel/sched.c	2003-07-30 11:25:36.000000000 +0200
@@ -60,7 +60,7 @@
 #warning INFO: Desktop Scheduler Tweaks will be used.
 
 int min_timeslice = (( 10 * HZ) / 1000 ?: 1);
-int max_timeslice = (( 40 * HZ) / 1000 ?: 1);
+int max_timeslice = (( 20 * HZ) / 1000 ?: 1);
 int child_penalty = 95;
 int parent_penalty = 100;
 int exit_weight = 3;
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/kernel/softirq.c linux-2.4.20-wolk4.4-fullkernel/kernel/softirq.c
--- linux-2.4.20-wolk4.3-fullkernel/kernel/softirq.c	2003-07-30 13:52:44.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/kernel/softirq.c	2003-07-30 11:18:43.000000000 +0200
@@ -77,7 +77,8 @@ static inline int softirqd_is_waken(unsi
  */
 #define MAX_SOFTIRQ_LOOPS 8
 
-asmlinkage void do_softirq()
+static void FASTCALL(__do_softirq(int ksoftirqd));
+static void __do_softirq(int ksoftirqd)
 {
 	int cpu;
 	__u32 pending;
@@ -92,7 +93,10 @@ asmlinkage void do_softirq()
 
 	cpu = smp_processor_id();
 
-	pending = softirq_pending(cpu);
+	if (!ksoftirqd && softirqd_is_waken(cpu))
+		pending = 0;
+	else
+		pending = softirq_pending(cpu);
 
 	loops = 0;
 	if (pending) {
@@ -139,6 +143,11 @@ restart:
 	local_irq_restore(flags);
 }
 
+asmlinkage void do_softirq()
+{
+	__do_softirq(0);
+}
+
 /*
  * This function must run with irq disabled!
  */
@@ -419,7 +428,7 @@ static int ksoftirqd(void * __bind_cpu)
 		__set_current_state(TASK_RUNNING);
 
 		while (softirq_pending(cpu)) {
-			do_softirq();
+			__do_softirq(1);
 			if (current->need_resched)
 				schedule();
 		}
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/kernel/sysctl.c linux-2.4.20-wolk4.4-fullkernel/kernel/sysctl.c
--- linux-2.4.20-wolk4.3-fullkernel/kernel/sysctl.c	2003-07-30 13:52:53.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/kernel/sysctl.c	2003-07-30 11:25:36.000000000 +0200
@@ -801,7 +801,8 @@ int do_sysctl_strategy (ctl_table *table
 	 * zero, proceed with automatic r/w */
 	if (table->data && table->maxlen) {
 		if (oldval && oldlenp) {
-			get_user(len, oldlenp);
+			if (get_user(len, oldlenp))
+				return -EFAULT;
 			if (len) {
 				if (len > table->maxlen)
 					len = table->maxlen;
@@ -1128,7 +1129,7 @@ int proc_dostring(ctl_table *table, int 
 		len = 0;
 		p = buffer;
 		while (len < *lenp) {
-			if(get_user(c, p++))
+			if (get_user(c, p++))
 				return -EFAULT;
 			if (c == 0 || c == '\n')
 				break;
@@ -1249,7 +1250,7 @@ static int do_proc_dointvec(ctl_table *t
 
 			while (left) {
 				char c;
-				if(get_user(c,(char *) buffer))
+				if (get_user(c, (char *) buffer))
 					return -EFAULT;
 				if (!isspace(c))
 					break;
@@ -1315,7 +1316,7 @@ static int do_proc_dointvec(ctl_table *t
 		p = (char *) buffer;
 		while (left) {
 			char c;
-			if(get_user(c, p++))
+			if (get_user(c, p++))
 				return -EFAULT;
 			if (!isspace(c))
 				break;
@@ -1457,7 +1458,7 @@ int proc_dointvec_minmax(ctl_table *tabl
 		if (write) {
 			while (left) {
 				char c;
-				if(get_user(c, (char *) buffer))
+				if (get_user(c, (char *) buffer))
 					return -EFAULT;
 				if (!isspace(c))
 					break;
@@ -1516,7 +1517,7 @@ int proc_dointvec_minmax(ctl_table *tabl
 		p = (char *) buffer;
 		while (left) {
 			char c;
-			if(get_user(c, p++))
+			if (get_user(c, p++))
 				return -EFAULT;
 			if (!isspace(c))
 				break;
@@ -1558,7 +1559,7 @@ static int do_proc_doulongvec_minmax(ctl
 		if (write) {
 			while (left) {
 				char c;
-				if(get_user(c, (char *) buffer))
+				if (get_user(c, (char *) buffer))
 					return -EFAULT;
 				if (!isspace(c))
 					break;
@@ -1621,7 +1622,7 @@ static int do_proc_doulongvec_minmax(ctl
 		p = (char *) buffer;
 		while (left) {
 			char c;
-			if(get_user(c, p++))
+			if (get_user(c, p++))
 				return -EFAULT;
 			if (!isspace(c))
 				break;
@@ -1775,7 +1776,7 @@ int sysctl_string(ctl_table *table, int 
 		return -ENOTDIR;
 	
 	if (oldval && oldlenp) {
-		if(get_user(len, oldlenp))
+		if (get_user(len, oldlenp))
 			return -EFAULT;
 		if (len) {
 			l = strlen(table->data);
@@ -1832,7 +1833,8 @@ int sysctl_intvec(ctl_table *table, int 
 
 		for (i = 0; i < length; i++) {
 			int value;
-			get_user(value, vec + i);
+			if (get_user(value, vec + i))
+				return -EFAULT;
 			if (min && value < min[i])
 				return -EINVAL;
 			if (max && value > max[i])
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/kernel/timer.c linux-2.4.20-wolk4.4-fullkernel/kernel/timer.c
--- linux-2.4.20-wolk4.3-fullkernel/kernel/timer.c	2003-07-30 13:52:00.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/kernel/timer.c	2003-07-30 11:18:25.000000000 +0200
@@ -142,17 +142,22 @@ void add_timer(timer_t *timer)
 
 	CHECK_BASE(base);
 	CHECK_BASE(timer->base);
-	spin_lock_irqsave(&base->lock, flags);
-	if (timer_pending(timer))
-		goto bug;
-	internal_add_timer(base, timer);
-	timer->base = base;
-	spin_unlock_irqrestore(&base->lock, flags);
-	return;
-bug:
-	spin_unlock_irqrestore(&base->lock, flags);
-	printk("bug: kernel timer added twice at %p.\n",
-			__builtin_return_address(0));
+
+	local_irq_save(flags);
+	while (unlikely(test_and_set_bit(0, &timer->lock)))
+		while (test_bit(0, &timer->lock));
+
+	spin_lock(&base->lock);
+	if (timer_pending(timer)) {
+		printk("bug: kernel timer added twice at %p.\n",
+				__builtin_return_address(0));
+	} else {
+		internal_add_timer(base, timer);
+		timer->base = base;
+	}
+	spin_unlock(&base->lock);
+	clear_bit(0, &timer->lock);
+	local_irq_restore(flags);
 }
 
 static inline int detach_timer(timer_t *timer)
@@ -242,16 +247,24 @@ int del_timer(timer_t * timer)
 	CHECK_BASE(timer->base);
 	if (!timer->base)
 		return 0;
+
+	local_irq_save(flags);
+	while (unlikely(test_and_set_bit(0, &timer->lock)))
+		while (test_bit(0, &timer->lock));
+
 repeat:
  	base = timer->base;
-	spin_lock_irqsave(&base->lock, flags);
+	spin_lock(&base->lock);
 	if (base != timer->base) {
-		spin_unlock_irqrestore(&base->lock, flags);
+		spin_unlock(&base->lock);
 		goto repeat;
 	}
 	ret = detach_timer(timer);
 	timer->list.next = timer->list.prev = NULL;
-	spin_unlock_irqrestore(&base->lock, flags);
+	spin_unlock(&base->lock);
+
+	clear_bit(0, &timer->lock);
+	local_irq_restore(flags);
 
 	return ret;
 }
@@ -272,34 +285,48 @@ void sync_timers(void)
 
 int del_timer_sync(timer_t * timer)
 {
+	unsigned long flags;
 	tvec_base_t * base;
 	int ret = 0;
 
 	CHECK_BASE(timer->base);
 	if (!timer->base)
 		return 0;
+
+	local_irq_save(flags);
+	while (unlikely(test_and_set_bit(0, &timer->lock)))
+		while (test_bit(0, &timer->lock));
+
 	for (;;) {
-		unsigned long flags;
 		int running;
-
 repeat:
 	 	base = timer->base;
-		spin_lock_irqsave(&base->lock, flags);
+		spin_lock(&base->lock);
 		if (base != timer->base) {
-			spin_unlock_irqrestore(&base->lock, flags);
+			spin_unlock(&base->lock);
 			goto repeat;
 		}
 		ret += detach_timer(timer);
 		timer->list.next = timer->list.prev = 0;
 		running = timer_is_running(base, timer);
-		spin_unlock_irqrestore(&base->lock, flags);
+		spin_unlock(&base->lock);
 
 		if (!running)
 			break;
 
+		clear_bit(0, &timer->lock);
+		local_irq_restore(flags);
+
 		timer_synchronize(base, timer);
+
+		local_irq_save(flags);
+		while (unlikely(test_and_set_bit(0, &timer->lock)))
+			while (test_bit(0, &timer->lock));
 	}
 
+	clear_bit(0, &timer->lock);
+	local_irq_restore(flags);
+
 	return ret;
 }
 #endif
@@ -782,7 +809,7 @@ void do_timer(struct pt_regs *regs)
 	/* SMP process accounting uses the local APIC timer */
 
 	update_process_times(user_mode(regs));
-#ifdef CONFIG_X86
+#if defined(CONFIG_X86) || defined(CONFIG_IA64) /* x86-64 is also included by CONFIG_X86 */
 	mark_bh(TIMER_BH);
 #endif
 #endif
@@ -790,7 +817,7 @@ void do_timer(struct pt_regs *regs)
 	 * Right now only x86-SMP calls run_local_timers() from a
 	 * per-CPU interrupt.
 	 */
-#ifndef CONFIG_X86
+#if !defined(CONFIG_X86) && !defined(CONFIG_IA64) /* x86-64 is also included by CONFIG_X86 */
 	mark_bh(TIMER_BH);
 #endif
 	update_times();
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/lib/bust_spinlocks.c linux-2.4.20-wolk4.4-fullkernel/lib/bust_spinlocks.c
--- linux-2.4.20-wolk4.3-fullkernel/lib/bust_spinlocks.c	2001-09-17 06:22:40.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/lib/bust_spinlocks.c	2003-07-30 10:27:56.000000000 +0200
@@ -14,11 +14,8 @@
 #include <linux/wait.h>
 #include <linux/vt_kern.h>
 
-extern spinlock_t timerlist_lock;
-
 void bust_spinlocks(int yes)
 {
-	spin_lock_init(&timerlist_lock);
 	if (yes) {
 		oops_in_progress = 1;
 	} else {
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/mm/filemap.c linux-2.4.20-wolk4.4-fullkernel/mm/filemap.c
--- linux-2.4.20-wolk4.3-fullkernel/mm/filemap.c	2003-07-30 13:52:53.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/mm/filemap.c	2003-07-30 11:12:45.000000000 +0200
@@ -4104,6 +4104,9 @@ int rw_kvec_core(struct iodesc *io)
 	unsigned long nr_pages;
 	int ret;
 
+	/* Use the mapping host inode to get block and CODA right */
+	inode = as->host;
+
 	if (io->rw == WRITE) {
 		unsigned long long tmp;
 		loff_t limit;
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/mm/page_alloc.c linux-2.4.20-wolk4.4-fullkernel/mm/page_alloc.c
--- linux-2.4.20-wolk4.3-fullkernel/mm/page_alloc.c	2003-07-30 13:52:53.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/mm/page_alloc.c	2003-07-30 11:25:07.000000000 +0200
@@ -336,19 +336,18 @@ static struct page * rmqueue(zone_t *zon
  * If we are able to directly reclaim pages, we move pages from the
  * inactive_clean list onto the free list until the zone has enough
  * free pages or until the inactive_clean pages are exhausted.
- * If we cannot do this work ourselves, call kswapd.
  */
 void FASTCALL(fixup_freespace(zone_t * zone, int direct_reclaim));
 void fixup_freespace(zone_t * zone, int direct_reclaim)
 {
 	if (direct_reclaim) {
 		struct page * page;
+		int worktodo = max_t(int, 64, zone->pages_min-zone->free_pages);
 		do {
 			if ((page = reclaim_page(zone)))
 				__free_pages_ok(page, 0);
-		} while (page && zone->free_pages <= zone->pages_min);
-	} else
-		wakeup_kswapd(GFP_ATOMIC);
+		} while (page && worktodo-- > 0);
+	}
 }
 
 #define PAGES_KERNEL	0
@@ -396,12 +395,11 @@ static struct page * __alloc_pages_limit
 
 		if (z->free_pages + z->inactive_clean_pages >= water_mark) {
 			struct page *page = NULL;
-			/* If possible, reclaim a page directly. */
-			if (direct_reclaim)
+
+			page = rmqueue(z, order);
+			/* Fall back to direct reclaim if possible */
+			if (!page && direct_reclaim)
 				page = reclaim_page(z);
-			/* If that fails, fall back to rmqueue. */
-			if (!page)
-				page = rmqueue(z, order);
 			if (page)
 				return page;
 		}
@@ -445,12 +443,13 @@ try_again:
 	 * First, see if we have any zones with lots of free memory.
 	 *
 	 * We allocate free memory first because it doesn't contain
-	 * any data we would want to cache.
+	 * any data we would want to cache.  Make sure to stay above
+	 * the watermark that triggers kswapd, otherwise we could
+	 * upset zone balancing.
 	 */
 	zone = zonelist->zones;
 	if (!*zone)
 		return NULL;
-	min = 1UL << order;
 	for (;;) {
 		zone_t *z = *(zone++);
 		if (!z)
@@ -458,8 +457,7 @@ try_again:
 		if (!z->size)
 			continue;
 
-		min += z->pages_min;
-		if (z->free_pages > min) {
+		if (z->free_pages > z->pages_low) {
 			page = rmqueue(z, order);
 			if (page)
 				return page;
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/mm/vmscan.c linux-2.4.20-wolk4.4-fullkernel/mm/vmscan.c
--- linux-2.4.20-wolk4.3-fullkernel/mm/vmscan.c	2003-07-30 13:52:53.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/mm/vmscan.c	2003-07-30 11:18:46.000000000 +0200
@@ -796,6 +796,7 @@ int rebalance_laundry_zone(struct zone_s
 				       	PageInactiveLaundry(page)) {
 				del_page_from_inactive_laundry_list(page);
 				add_page_to_inactive_dirty_list(page);
+				max_loop++;
 			}
 			continue;
 		}
@@ -807,6 +808,7 @@ int rebalance_laundry_zone(struct zone_s
 			del_page_from_inactive_laundry_list(page);
 			add_page_to_inactive_dirty_list(page);
 			UnlockPage(page);
+			max_loop++;
 			continue;
 		}
 		UnlockPage(page);
@@ -829,7 +831,8 @@ int rebalance_laundry_zone(struct zone_s
 	}
 
 	lru_unlock(zone);
-	return work_done;
+	/* The number of pages freed and those still freeable. */
+	return work_done + zone->inactive_laundry_pages;
 }
 
 /*
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/net/bridge/br_fdb.c linux-2.4.20-wolk4.4-fullkernel/net/bridge/br_fdb.c
--- linux-2.4.20-wolk4.3-fullkernel/net/bridge/br_fdb.c	2002-02-25 20:38:14.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/net/bridge/br_fdb.c	2003-07-30 11:23:31.000000000 +0200
@@ -292,21 +292,30 @@ void br_fdb_insert(struct net_bridge *br
 	write_lock_bh(&br->hash_lock);
 	fdb = br->hash[hash];
 	while (fdb != NULL) {
-		if (!fdb->is_local &&
-		    !memcmp(fdb->addr.addr, addr, ETH_ALEN)) {
+		if (!memcmp(fdb->addr.addr, addr, ETH_ALEN)) {
+			/* attempt to update an entry for a local interface */
+			if (fdb->is_local) {
+				if (is_local) 
+					printk(KERN_INFO "%s: attempt to add"
+					       " interface with same source address.\n",
+					       source->dev->name);
+				else if (net_ratelimit()) 
+					printk(KERN_WARNING "%s: received packet with "
+					       " own address as source address\n",
+					       source->dev->name);
+				goto out;
+			}
+
 			__fdb_possibly_replace(fdb, source, is_local);
-			write_unlock_bh(&br->hash_lock);
-			return;
+			goto out;
 		}
 
 		fdb = fdb->next_hash;
 	}
 
 	fdb = kmalloc(sizeof(*fdb), GFP_ATOMIC);
-	if (fdb == NULL) {
-		write_unlock_bh(&br->hash_lock);
-		return;
-	}
+	if (fdb == NULL) 
+		goto out;
 
 	memcpy(fdb->addr.addr, addr, ETH_ALEN);
 	atomic_set(&fdb->use_count, 1);
@@ -317,5 +326,6 @@ void br_fdb_insert(struct net_bridge *br
 
 	__hash_link(br, fdb, hash);
 
+ out:
 	write_unlock_bh(&br->hash_lock);
 }
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/net/bridge/br_if.c linux-2.4.20-wolk4.4-fullkernel/net/bridge/br_if.c
--- linux-2.4.20-wolk4.3-fullkernel/net/bridge/br_if.c	2002-12-18 01:04:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/net/bridge/br_if.c	2003-07-30 11:23:31.000000000 +0200
@@ -118,7 +118,7 @@ static struct net_bridge *new_nb(char *n
 	br->bridge_id.prio[1] = 0x00;
 	memset(br->bridge_id.addr, 0, ETH_ALEN);
 
-	br->stp_enabled = 1;
+	br->stp_enabled = 0;
 	br->designated_root = br->bridge_id;
 	br->root_path_cost = 0;
 	br->root_port = 0;
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/net/bridge/br_input.c linux-2.4.20-wolk4.4-fullkernel/net/bridge/br_input.c
--- linux-2.4.20-wolk4.3-fullkernel/net/bridge/br_input.c	2003-07-30 13:52:01.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/net/bridge/br_input.c	2003-07-30 11:23:31.000000000 +0200
@@ -209,7 +209,8 @@ int br_handle_frame(struct sk_buff *skb)
 
 handle_special_frame:
 	if (!dest[5]) {
-		br_stp_handle_bpdu(skb);
+		NF_HOOK(PF_BRIDGE, NF_BR_LOCAL_IN, skb, skb->dev,NULL,
+			br_stp_handle_bpdu);
 		read_unlock(&br->lock);
 		return 0;
 	}
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/net/bridge/br_private.h linux-2.4.20-wolk4.4-fullkernel/net/bridge/br_private.h
--- linux-2.4.20-wolk4.3-fullkernel/net/bridge/br_private.h	2003-07-30 13:52:01.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/net/bridge/br_private.h	2003-07-30 11:23:31.000000000 +0200
@@ -231,7 +231,7 @@ extern void br_stp_set_path_cost(struct 
 			  int path_cost);
 
 /* br_stp_bpdu.c */
-extern void br_stp_handle_bpdu(struct sk_buff *skb);
+extern int br_stp_handle_bpdu(struct sk_buff *skb);
 
 /* br_chash.c */
 extern aes_ctx * br_chash_get_enc(struct net_bridge *br, unsigned char *addr);
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/net/bridge/br_stp_bpdu.c linux-2.4.20-wolk4.4-fullkernel/net/bridge/br_stp_bpdu.c
--- linux-2.4.20-wolk4.3-fullkernel/net/bridge/br_stp_bpdu.c	2001-11-13 18:16:05.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/net/bridge/br_stp_bpdu.c	2003-07-30 11:23:31.000000000 +0200
@@ -16,6 +16,7 @@
 #include <linux/kernel.h>
 #include <linux/if_ether.h>
 #include <linux/if_bridge.h>
+#include <linux/netfilter_bridge.h>
 #include "br_private.h"
 #include "br_private_stp.h"
 
@@ -53,7 +54,8 @@ static void br_send_bpdu(struct net_brid
 	memcpy(skb->nh.raw, data, length);
 	memset(skb->nh.raw + length, 0xa5, size - length - 2*ETH_ALEN - 2);
 
-	dev_queue_xmit(skb);
+	NF_HOOK(PF_BRIDGE, NF_BR_LOCAL_OUT, skb, NULL, skb->dev,
+		dev_queue_xmit);
 }
 
 static __inline__ void br_set_ticks(unsigned char *dest, int jiff)
@@ -133,61 +135,65 @@ void br_send_tcn_bpdu(struct net_bridge_
 static unsigned char header[6] = {0x42, 0x42, 0x03, 0x00, 0x00, 0x00};
 
 /* called under bridge lock */
-void br_stp_handle_bpdu(struct sk_buff *skb)
+int br_stp_handle_bpdu(struct sk_buff *skb)
 {
 	unsigned char *buf;
 	struct net_bridge_port *p;
 
-	buf = skb->mac.raw + 14;
 	p = skb->dev->br_port;
-	if (!p->br->stp_enabled || memcmp(buf, header, 6)) {
-		kfree_skb(skb);
-		return;
-	}
 
-	if (buf[6] == BPDU_TYPE_CONFIG) {
+	if (!p->br->stp_enabled ||
+	    !pskb_may_pull(skb, sizeof(header)+1) ||
+	    memcmp(skb->data, header, sizeof(header)))
+		goto err;
+
+	buf = skb_pull(skb, sizeof(header));
+	if (buf[0] == BPDU_TYPE_CONFIG) {
 		struct br_config_bpdu bpdu;
 
-		bpdu.topology_change = (buf[7] & 0x01) ? 1 : 0;
-		bpdu.topology_change_ack = (buf[7] & 0x80) ? 1 : 0;
-		bpdu.root.prio[0] = buf[8];
-		bpdu.root.prio[1] = buf[9];
-		bpdu.root.addr[0] = buf[10];
-		bpdu.root.addr[1] = buf[11];
-		bpdu.root.addr[2] = buf[12];
-		bpdu.root.addr[3] = buf[13];
-		bpdu.root.addr[4] = buf[14];
-		bpdu.root.addr[5] = buf[15];
+		if (!pskb_may_pull(skb, 32))
+			goto err;
+
+		buf = skb->data;
+		bpdu.topology_change = (buf[1] & 0x01) ? 1 : 0;
+		bpdu.topology_change_ack = (buf[1] & 0x80) ? 1 : 0;
+
+		bpdu.root.prio[0] = buf[2];
+		bpdu.root.prio[1] = buf[3];
+		bpdu.root.addr[0] = buf[4];
+		bpdu.root.addr[1] = buf[5];
+		bpdu.root.addr[2] = buf[6];
+		bpdu.root.addr[3] = buf[7];
+		bpdu.root.addr[4] = buf[8];
+		bpdu.root.addr[5] = buf[9];
 		bpdu.root_path_cost =
-			(buf[16] << 24) |
-			(buf[17] << 16) |
-			(buf[18] << 8) |
-			buf[19];
-		bpdu.bridge_id.prio[0] = buf[20];
-		bpdu.bridge_id.prio[1] = buf[21];
-		bpdu.bridge_id.addr[0] = buf[22];
-		bpdu.bridge_id.addr[1] = buf[23];
-		bpdu.bridge_id.addr[2] = buf[24];
-		bpdu.bridge_id.addr[3] = buf[25];
-		bpdu.bridge_id.addr[4] = buf[26];
-		bpdu.bridge_id.addr[5] = buf[27];
-		bpdu.port_id = (buf[28] << 8) | buf[29];
-
-		bpdu.message_age = br_get_ticks(buf+30);
-		bpdu.max_age = br_get_ticks(buf+32);
-		bpdu.hello_time = br_get_ticks(buf+34);
-		bpdu.forward_delay = br_get_ticks(buf+36);
+			(buf[10] << 24) |
+			(buf[11] << 16) |
+			(buf[12] << 8) |
+			buf[13];
+		bpdu.bridge_id.prio[0] = buf[14];
+		bpdu.bridge_id.prio[1] = buf[15];
+		bpdu.bridge_id.addr[0] = buf[16];
+		bpdu.bridge_id.addr[1] = buf[17];
+		bpdu.bridge_id.addr[2] = buf[18];
+		bpdu.bridge_id.addr[3] = buf[19];
+		bpdu.bridge_id.addr[4] = buf[20];
+		bpdu.bridge_id.addr[5] = buf[21];
+		bpdu.port_id = (buf[22] << 8) | buf[23];
+
+		bpdu.message_age = br_get_ticks(buf+24);
+		bpdu.max_age = br_get_ticks(buf+26);
+		bpdu.hello_time = br_get_ticks(buf+28);
+		bpdu.forward_delay = br_get_ticks(buf+30);
 
-		kfree_skb(skb);
 		br_received_config_bpdu(p, &bpdu);
-		return;
 	}
 
-	if (buf[6] == BPDU_TYPE_TCN) {
+	else if (buf[0] == BPDU_TYPE_TCN) {
 		br_received_tcn_bpdu(p);
-		kfree_skb(skb);
-		return;
 	}
 
-	kfree_skb(skb);
+ err:
+	kfree(skb);
+	return 0;
 }
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/net/core/dev.c linux-2.4.20-wolk4.4-fullkernel/net/core/dev.c
--- linux-2.4.20-wolk4.3-fullkernel/net/core/dev.c	2003-07-30 13:52:01.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/net/core/dev.c	2003-07-30 11:23:30.000000000 +0200
@@ -188,6 +188,12 @@ static int net_run_sbin_hotplug(struct n
 static struct notifier_block *netdev_chain=NULL;
 
 /*
+ * Veto function and corresponding lock
+ */
+static veto_func_t *veto_fn = NULL;
+static rwlock_t veto_fn_lock = RW_LOCK_UNLOCKED;
+
+/*
  *	Device drivers call our routines to queue packets here. We empty the
  *	queue in the local softnet handler.
  */
@@ -932,6 +938,46 @@ int unregister_netdevice_notifier(struct
 	return notifier_chain_unregister(&netdev_chain,nb);
 }
 
+/**
+ *      register_netdevice_veto - register veto function
+ *      @veto: veto function pointer
+ *
+ *      Register the veto function which can prohibit a NETDEV_REGISTER,
+ *      NETDEV_UNREGISTER and NETDEV_CHANGENAME event by returning a value
+ *      unequal to 0. Note that only one veto function can be registered at
+ *      any time. A negative errno code	is returned on a failure.
+ */
+int register_netdevice_veto(veto_func_t *veto)
+{
+	write_lock_bh(&veto_fn_lock);
+	if (veto_fn) {
+		write_unlock_bh(&veto_fn_lock);
+		return -EBUSY;
+	}
+	veto_fn = veto;
+	write_unlock_bh(&veto_fn_lock);
+	return 0;
+}
+
+/**
+ *      unregister_netdevice_veto - unregister veto function
+ *      @veto: veto function pointer
+ *
+ *      Unregister the veto function previously registered by register_veto().
+ *      A negative errno code is returned on a failure.
+ */
+int unregister_netdevice_veto(veto_func_t *veto)
+{
+	write_lock_bh(&veto_fn_lock);
+	if (veto_fn == veto) {
+		veto_fn = NULL;
+		write_unlock_bh(&veto_fn_lock);
+		return 0;
+	}
+	write_unlock_bh(&veto_fn_lock);
+	return -EINVAL;
+}
+
 /*
  *	Support routine. Sends outgoing frames to any network
  *	taps currently in use.
@@ -2194,15 +2240,29 @@ static int dev_ifsioc(struct ifreq *ifr,
 			dev->tx_queue_len = ifr->ifr_qlen;
 			return 0;
 
-		case SIOCSIFNAME:
+		case SIOCSIFNAME: {
+			static char dev_oldname[IFNAMSIZ];
 			if (dev->flags&IFF_UP)
 				return -EBUSY;
 			if (__dev_get_by_name(ifr->ifr_newname))
 				return -EEXIST;
+			write_lock_bh(&dev_base_lock);
+			memcpy(dev_oldname, dev->name, IFNAMSIZ);
+			dev_oldname[IFNAMSIZ-1] = 0;
 			memcpy(dev->name, ifr->ifr_newname, IFNAMSIZ);
 			dev->name[IFNAMSIZ-1] = 0;
+			read_lock(&veto_fn_lock);
+			if (veto_fn && veto_fn(NETDEV_CHANGENAME, dev)) {
+				read_unlock(&veto_fn_lock);
+				memcpy(dev->name, dev_oldname, IFNAMSIZ-1);
+				write_unlock_bh(&dev_base_lock);
+				return -EPERM;
+			}
+			read_unlock(&veto_fn_lock);
+			write_unlock_bh(&dev_base_lock);
 			notifier_call_chain(&netdev_chain, NETDEV_CHANGENAME, dev);
 			return 0;
+		}
 
 		/*
 		 *	Unknown or private ioctl
@@ -2620,6 +2680,13 @@ int register_netdevice(struct net_device
 	dev->next = NULL;
 	dev_init_scheduler(dev);
 	write_lock_bh(&dev_base_lock);
+	read_lock(&veto_fn_lock);
+	if (veto_fn && veto_fn(NETDEV_REGISTER, dev)) {
+		read_unlock(&veto_fn_lock);
+		write_unlock_bh(&dev_base_lock);
+		return -EPERM;
+	}
+	read_unlock(&veto_fn_lock);
 	*dp = dev;
 	dev_hold(dev);
 	dev->deadbeaf = 0;
@@ -2691,6 +2758,13 @@ int unregister_netdevice(struct net_devi
 	for (dp = &dev_base; (d=*dp) != NULL; dp=&d->next) {
 		if (d == dev) {
 			write_lock_bh(&dev_base_lock);
+			read_lock(&veto_fn_lock);
+			if (veto_fn && veto_fn(NETDEV_UNREGISTER, dev)) {
+				read_unlock(&veto_fn_lock);
+				write_unlock_bh(&dev_base_lock);
+				return -EPERM;
+			}
+			read_unlock(&veto_fn_lock);
 			*dp = d->next;
 			write_unlock_bh(&dev_base_lock);
 			break;
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/net/core/netfilter.c linux-2.4.20-wolk4.4-fullkernel/net/core/netfilter.c
--- linux-2.4.20-wolk4.3-fullkernel/net/core/netfilter.c	2003-07-30 13:52:01.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/net/core/netfilter.c	2003-07-30 11:23:30.000000000 +0200
@@ -80,6 +80,23 @@ void nf_unregister_hook(struct nf_hook_o
 	br_write_unlock_bh(BR_NETPROTO_LOCK);
 }
 
+void nf_change_prio_hook(struct nf_hook_ops *reg, int new_prio)
+{
+	struct list_head *i;
+
+	br_write_lock_bh(BR_NETPROTO_LOCK);
+	list_del(&reg->list);
+	reg->priority = new_prio;
+	for (i = nf_hooks[reg->pf][reg->hooknum].next; 
+	     i != &nf_hooks[reg->pf][reg->hooknum]; 
+	     i = i->next) {
+		if (reg->priority < ((struct nf_hook_ops *)i)->priority)
+			break;
+	}
+	list_add(&reg->list, i->prev);
+	br_write_unlock_bh(BR_NETPROTO_LOCK);
+}
+
 /* Do exclusive ranges overlap? */
 static inline int overlap(int min1, int max1, int min2, int max2)
 {
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/net/ipsec/Makefile.ver linux-2.4.20-wolk4.4-fullkernel/net/ipsec/Makefile.ver
--- linux-2.4.20-wolk4.3-fullkernel/net/ipsec/Makefile.ver	2003-07-30 13:52:44.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/net/ipsec/Makefile.ver	2003-07-30 10:29:36.000000000 +0200
@@ -1 +1 @@
-IPSECVERSION=super-freeswan-1.99.7.2
+IPSECVERSION=super-freeswan-1.99.8
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/net/ipsec/ipsec_init.c linux-2.4.20-wolk4.4-fullkernel/net/ipsec/ipsec_init.c
--- linux-2.4.20-wolk4.3-fullkernel/net/ipsec/ipsec_init.c	2003-07-30 13:52:44.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/net/ipsec/ipsec_init.c	2003-07-30 10:29:37.000000000 +0200
@@ -135,7 +135,7 @@ ipsec_init(void)
 #endif /* CONFIG_IPSEC_ENC_3DES */
 
 	KLIPS_PRINT(1, "klips_info:ipsec_init: "
-		    "KLIPS startup, FreeS/WAN IPSec version: %s including X.509 Certificate Support v0.9.30\n",
+		    "KLIPS startup, FreeS/WAN IPSec version: %s including X.509 Certificate Support v0.9.32\n",
 		    ipsec_version_code());
 
 	error |= ipsec_proc_init();
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/net/ipsec/ipsec_rcv.c linux-2.4.20-wolk4.4-fullkernel/net/ipsec/ipsec_rcv.c
--- linux-2.4.20-wolk4.3-fullkernel/net/ipsec/ipsec_rcv.c	2003-07-30 13:52:01.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/net/ipsec/ipsec_rcv.c	2003-07-30 10:29:36.000000000 +0200
@@ -14,7 +14,7 @@
  * for more details.
  */
 
-char ipsec_rcv_c_version[] = "RCSID $Id: ipsec_rcv.c,v 1.14 2003/02/07 13:14:24 ken Exp $";
+char ipsec_rcv_c_version[] = "RCSID $Id: ipsec_rcv.c,v 1.15 2003/07/04 19:07:34 ken Exp $";
 
 #include <linux/config.h>
 #include <linux/version.h>
@@ -404,7 +404,7 @@ ipsec_rcv(struct sk_buff *skb, struct de
 	}
 	
 #endif /* NET_21 */
-
+		
 #if IP_FRAGMENT_LINEARIZE
 	/* In Linux 2.4.4, we may have to reassemble fragments. They are
 	   not assembled automatically to save TCP from having to copy
@@ -1991,6 +1991,9 @@ struct inet_protocol comp_protocol =
 
 /*
  * $Log: ipsec_rcv.c,v $
+ * Revision 1.15  2003/07/04 19:07:34  ken
+ * Added NAT-T 0.6 diff/patch from Tuomo
+ *
  * Revision 1.14  2003/02/07 13:14:24  ken
  * Pullin jjo's ALG 0.8.1rc branch
  *
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/net/ipsec/ipsec_tunnel.c linux-2.4.20-wolk4.4-fullkernel/net/ipsec/ipsec_tunnel.c
--- linux-2.4.20-wolk4.3-fullkernel/net/ipsec/ipsec_tunnel.c	2003-07-30 13:52:44.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/net/ipsec/ipsec_tunnel.c	2003-07-30 10:29:36.000000000 +0200
@@ -14,7 +14,7 @@
  * for more details.
  */
 
-char ipsec_tunnel_c_version[] = "RCSID $Id: ipsec_tunnel.c,v 1.13 2003/04/09 15:22:54 ken Exp $";
+char ipsec_tunnel_c_version[] = "RCSID $Id: ipsec_tunnel.c,v 1.14 2003/07/04 19:07:34 ken Exp $";
 
 #define __NO_VERSION__
 #include <linux/module.h>
@@ -1375,6 +1375,85 @@ ipsec_tunnel_start_xmit(struct sk_buff *
 		}
 #endif /* MSS_HACK */
 
+#ifdef CONFIG_IPSEC_NAT_TRAVERSAL
+	if ((natt_type) && (outgoing_said.proto != IPPROTO_IPIP)) {
+		/**
+		 * NAT-Traversal and Transport Mode:
+		 *   we need to correct TCP/UDP checksum
+		 *
+		 * If we've got NAT-OA, we can fix checksum without recalculation.
+		 * If we don't we can zero udp checksum.
+		 */
+		__u32 natt_oa = tdbp->ips_natt_oa ?
+			((struct sockaddr_in*)(tdbp->ips_natt_oa))->sin_addr.s_addr : 0;
+		__u16 pkt_len = skb->tail - (unsigned char *)iph;
+		__u16 data_len = pkt_len - (iph->ihl << 2);
+		switch (iph->protocol) {
+			case IPPROTO_TCP:
+				if (data_len >= sizeof(struct tcphdr)) {
+					struct tcphdr *tcp = (struct tcphdr *)((__u32 *)iph+iph->ihl);
+					if (natt_oa) {
+						__u32 buff[2] = { ~iph->daddr, natt_oa };
+						KLIPS_PRINT(debug_tunnel,
+							"klips_debug:ipsec_tunnel_start_xmit: "
+							"NAT-T & TRANSPORT: "
+							"fix TCP checksum using NAT-OA\n");
+						tcp->check = csum_fold(
+							csum_partial((unsigned char *)buff, sizeof(buff),
+							tcp->check^0xffff));
+					}
+					else {
+						KLIPS_PRINT(debug_tunnel,
+							"klips_debug:ipsec_tunnel_start_xmit: "
+							"NAT-T & TRANSPORT: do not recalc TCP checksum\n");
+					}
+				}
+				else {
+					KLIPS_PRINT(debug_tunnel,
+						"klips_debug:ipsec_tunnel_start_xmit: "
+						"NAT-T & TRANSPORT: can't fix TCP checksum\n");
+				}
+				break;
+			case IPPROTO_UDP:
+				if (data_len >= sizeof(struct udphdr)) {
+					struct udphdr *udp = (struct udphdr *)((__u32 *)iph+iph->ihl);
+					if (udp->check == 0) {
+						KLIPS_PRINT(debug_tunnel,
+							"klips_debug:ipsec_tunnel_start_xmit: "
+							"NAT-T & TRANSPORT: UDP checksum already 0\n");
+					}
+					else if (natt_oa) {
+						__u32 buff[2] = { ~iph->daddr, natt_oa };
+						KLIPS_PRINT(debug_tunnel,
+							"klips_debug:ipsec_tunnel_start_xmit: "
+							"NAT-T & TRANSPORT: "
+							"fix UDP checksum using NAT-OA\n");
+						udp->check = csum_fold(
+							csum_partial((unsigned char *)buff, sizeof(buff),
+							udp->check^0xffff));
+					}
+					else {
+						KLIPS_PRINT(debug_tunnel,
+							"klips_debug:ipsec_tunnel_start_xmit: "
+							"NAT-T & TRANSPORT: zero UDP checksum\n");
+						udp->check = 0;
+					}
+				}
+				else {
+					KLIPS_PRINT(debug_tunnel,
+						"klips_debug:ipsec_tunnel_start_xmit: "
+						"NAT-T & TRANSPORT: can't fix UDP checksum\n");
+				}
+				break;
+			default:
+				KLIPS_PRINT(debug_tunnel,
+					"klips_debug:ipsec_tunnel_start_xmit: "
+					"NAT-T & TRANSPORT: non TCP/UDP packet -- do nothing\n");
+				break;
+		}
+	}
+#endif /* CONFIG_IPSEC_NAT_TRAVERSAL */
+
 		if(!hard_header_stripped) {
 			if((saved_header = kmalloc(hard_header_len, GFP_ATOMIC)) == NULL) {
 				spin_unlock(&tdb_lock);
@@ -3222,6 +3301,9 @@ ipsec_tunnel_cleanup_devices(void)
 
 /*
  * $Log: ipsec_tunnel.c,v $
+ * Revision 1.14  2003/07/04 19:07:34  ken
+ * Added NAT-T 0.6 diff/patch from Tuomo
+ *
  * Revision 1.13  2003/04/09 15:22:54  ken
  * OE SNAT Fix (mcr)
  *
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/net/ipsec/libcrypto/libaes/Makefile linux-2.4.20-wolk4.4-fullkernel/net/ipsec/libcrypto/libaes/Makefile
--- linux-2.4.20-wolk4.3-fullkernel/net/ipsec/libcrypto/libaes/Makefile	2003-07-30 13:52:01.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/net/ipsec/libcrypto/libaes/Makefile	2003-07-30 10:29:36.000000000 +0200
@@ -1,4 +1,4 @@
-CFLAGS=-O3 -omit-frame-pointer -D__KERNEL__  -Wall  -Wcast-qual $(EXTRA_CFLAGS)
+CFLAGS=-O3 -fomit-frame-pointer -D__KERNEL__  -Wall  -Wcast-qual $(EXTRA_CFLAGS)
 INC=-I../include 
 
 AES_CORE_OBJ:=aes.o
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/net/ipsec/libcrypto/libserpent/Makefile linux-2.4.20-wolk4.4-fullkernel/net/ipsec/libcrypto/libserpent/Makefile
--- linux-2.4.20-wolk4.3-fullkernel/net/ipsec/libcrypto/libserpent/Makefile	2003-07-30 13:52:02.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/net/ipsec/libcrypto/libserpent/Makefile	2003-07-30 10:29:36.000000000 +0200
@@ -1,4 +1,4 @@
-CFLAGS=-O3 -omit-frame-pointer -D__KERNEL__  -Wall $(EXTRA_CFLAGS)
+CFLAGS=-O3 -fomit-frame-pointer -D__KERNEL__  -Wall $(EXTRA_CFLAGS)
 INC=-I../include 
 LIBOBJ=serpent.o serpent_cbc.o
 BLIB=libserpent.a
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/net/ipsec/libcrypto/libsha2/Makefile linux-2.4.20-wolk4.4-fullkernel/net/ipsec/libcrypto/libsha2/Makefile
--- linux-2.4.20-wolk4.3-fullkernel/net/ipsec/libcrypto/libsha2/Makefile	2003-07-30 13:52:03.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/net/ipsec/libcrypto/libsha2/Makefile	2003-07-30 10:29:36.000000000 +0200
@@ -1,4 +1,4 @@
-CFLAGS=-O3 -omit-frame-pointer -I../include $(EXTRA_CFLAGS)
+CFLAGS=-O3 -fomit-frame-pointer -I../include $(EXTRA_CFLAGS)
 
 LIBOBJ := hmac_sha2.o sha2.o
 
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/net/ipsec/libcrypto/libtwofish/Makefile linux-2.4.20-wolk4.4-fullkernel/net/ipsec/libcrypto/libtwofish/Makefile
--- linux-2.4.20-wolk4.3-fullkernel/net/ipsec/libcrypto/libtwofish/Makefile	2003-07-30 13:52:03.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/net/ipsec/libcrypto/libtwofish/Makefile	2003-07-30 10:29:36.000000000 +0200
@@ -1,4 +1,4 @@
-CFLAGS=-O3 -omit-frame-pointer -D__KERNEL__  -Wall $(EXTRA_CFLAGS)
+CFLAGS=-O3 -fomit-frame-pointer -D__KERNEL__  -Wall $(EXTRA_CFLAGS)
 INC=-I../include 
 
 LIBOBJ=twofish.o twofish_cbc.o
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/net/ipv4/netfilter/Config.in linux-2.4.20-wolk4.4-fullkernel/net/ipv4/netfilter/Config.in
--- linux-2.4.20-wolk4.3-fullkernel/net/ipv4/netfilter/Config.in	2003-07-30 13:52:04.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/net/ipv4/netfilter/Config.in	2003-07-30 11:23:30.000000000 +0200
@@ -20,7 +20,12 @@ if [ "$CONFIG_EXPERIMENTAL" = "y" ]; the
   tristate 'Userspace queueing via NETLINK (EXPERIMENTAL)' CONFIG_IP_NF_QUEUE
 fi
 tristate 'IP tables support (required for filtering/masq/NAT)' CONFIG_IP_NF_IPTABLES
-if [ "$CONFIG_IP_NF_IPTABLES" != "n" ]; then
+if [ "$CONFIG_IP_NF_IPTABLES" = "n" ]; then
+  define_tristate CONFIG_IP_NF_HIPAC n
+else
+  if [ "$CONFIG_IP_NF_IPTABLES" = "m" -a "$CONFIG_IP_NF_HIPAC" = "y" ]; then
+    define_tristate CONFIG_IP_NF_HIPAC m
+  fi
 # The simple matches.
   dep_tristate '  limit match support' CONFIG_IP_NF_MATCH_LIMIT $CONFIG_IP_NF_IPTABLES
   dep_tristate '  quota match support' CONFIG_IP_NF_MATCH_QUOTA $CONFIG_IP_NF_IPTABLES
@@ -136,6 +141,13 @@ fi
 
 # Backwards compatibility modules: only if you don't build in the others.
 if [ "$CONFIG_IP_NF_CONNTRACK" != "y" ]; then
+  if [ "$CONFIG_IP_NF_CONNTRACK" = "n" ]; then
+    define_tristate CONFIG_IP_NF_HIPAC_CTHELP n
+  else
+    if [ "$CONFIG_IP_NF_CONNTRACK" = "m" -a "$CONFIG_IP_NF_HIPAC_CTHELP" = "y" ]; then
+      define_tristate CONFIG_IP_NF_HIPAC_CTHELP m
+    fi
+  fi
   if [ "$CONFIG_IP_NF_IPTABLES" != "y" ]; then
     tristate 'ipchains (2.2-style) support' CONFIG_IP_NF_COMPAT_IPCHAINS
     if [ "$CONFIG_IP_NF_COMPAT_IPCHAINS" != "n" ]; then
@@ -150,3 +162,6 @@ if [ "$CONFIG_IP_NF_CONNTRACK" != "y" ];
   fi
 fi
 endmenu
+
+# nf-hipac config
+source net/ipv4/netfilter/nf-hipac/Config.in
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/net/ipv4/netfilter/Makefile linux-2.4.20-wolk4.4-fullkernel/net/ipv4/netfilter/Makefile
--- linux-2.4.20-wolk4.3-fullkernel/net/ipv4/netfilter/Makefile	2003-07-30 13:52:04.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/net/ipv4/netfilter/Makefile	2003-07-30 11:23:30.000000000 +0200
@@ -9,6 +9,8 @@
 
 O_TARGET := netfilter.o
 
+mod-subdirs := nf-hipac
+subdir-y    := nf-hipac
 export-objs = ip_conntrack_standalone.o ip_fw_compat.o ip_nat_standalone.o ip_tables.o arp_tables.o
 
 # Multipart objects.
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/net/ipv4/netfilter/ip_tables.c linux-2.4.20-wolk4.4-fullkernel/net/ipv4/netfilter/ip_tables.c
--- linux-2.4.20-wolk4.3-fullkernel/net/ipv4/netfilter/ip_tables.c	2003-07-30 13:52:04.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/net/ipv4/netfilter/ip_tables.c	2003-07-30 11:23:30.000000000 +0200
@@ -1551,6 +1551,48 @@ void ipt_unregister_table(struct ipt_tab
 	MOD_DEC_USE_COUNT;
 }
 
+int
+ipt_init_match(struct ipt_entry_match *match)
+{
+	struct ipt_match *m;
+	int ret;
+
+	if (!match)
+		return -EINVAL;
+	m = find_match_lock(match->u.user.name, &ret, &ipt_mutex);
+	if (!m) {
+		duprintf("ipt_init_match: `%s' not found\n",
+			 match->u.user.name);
+		return ret;
+	}
+	if (m->me)
+		__MOD_INC_USE_COUNT(m->me);
+	match->u.kernel.match = m;
+	up(&ipt_mutex);
+	return 0;
+}
+
+int
+ipt_init_target(struct ipt_entry_target *target)
+{
+	struct ipt_target *t;
+	int ret;
+
+	if (!target)
+		return -EINVAL;
+	t = find_target_lock(target->u.user.name, &ret, &ipt_mutex);
+	if (!t) {
+		duprintf("ipt_init_target: `%s' not found\n",
+			 target->u.user.name);
+		return ret;
+	}
+	if (t->me)
+		__MOD_INC_USE_COUNT(t->me);
+	target->u.kernel.target = t;
+	up(&ipt_mutex);
+	return 0;
+}
+
 /* Returns 1 if the port is matched by the range, 0 otherwise */
 static inline int
 port_match(u_int16_t min, u_int16_t max, u_int16_t port, int invert)
@@ -1883,6 +1925,8 @@ EXPORT_SYMBOL(ipt_unregister_match);
 EXPORT_SYMBOL(ipt_do_table);
 EXPORT_SYMBOL(ipt_register_target);
 EXPORT_SYMBOL(ipt_unregister_target);
+EXPORT_SYMBOL(ipt_init_match);
+EXPORT_SYMBOL(ipt_init_target);
 
 module_init(init);
 module_exit(fini);
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/net/ipv4/netfilter/nf-hipac/Config.in linux-2.4.20-wolk4.4-fullkernel/net/ipv4/netfilter/nf-hipac/Config.in
--- linux-2.4.20-wolk4.3-fullkernel/net/ipv4/netfilter/nf-hipac/Config.in	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/net/ipv4/netfilter/nf-hipac/Config.in	2003-07-30 11:23:30.000000000 +0200
@@ -0,0 +1,29 @@
+#
+# nf-hipac configuration
+#
+mainmenu_option next_comment
+comment '  IP: NF-HIPAC Configuration'
+
+tristate 'High Performance Packet Classification' CONFIG_IP_NF_HIPAC
+if [ "$CONFIG_IP_NF_HIPAC" != "n" ]; then
+  dep_tristate 'Connection tracking support for NF-HIPAC' CONFIG_IP_NF_HIPAC_CTHELP $CONFIG_IP_NF_HIPAC
+  if [ "$CONFIG_IP_NF_HIPAC_CTHELP" = "m" ]; then
+    if [ "$CONFIG_IP_NF_CONNTRACK" = "n" ]; then
+      define_tristate CONFIG_IP_NF_CONNTRACK m
+    fi
+  else
+    if [ "$CONFIG_IP_NF_HIPAC_CTHELP" = "y" ]; then
+      define_tristate CONFIG_IP_NF_CONNTRACK y
+    fi
+  fi
+  if [ "$CONFIG_IP_NF_HIPAC" = "m" ]; then
+    if [ "$CONFIG_IP_NF_IPTABLES" = "n" ]; then
+      define_tristate CONFIG_IP_NF_IPTABLES m
+    fi
+  else
+    # "$CONFIG_IP_NF_HIPAC" = "y"
+    define_tristate CONFIG_IP_NF_IPTABLES y
+  fi
+fi
+
+endmenu
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/net/ipv4/netfilter/nf-hipac/Makefile linux-2.4.20-wolk4.4-fullkernel/net/ipv4/netfilter/nf-hipac/Makefile
--- linux-2.4.20-wolk4.3-fullkernel/net/ipv4/netfilter/nf-hipac/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/net/ipv4/netfilter/nf-hipac/Makefile	2003-07-30 11:23:31.000000000 +0200
@@ -0,0 +1,38 @@
+#
+# Makefile for nf-hipac on top of IPv4.
+#
+
+O_TARGET := netfilter.o
+
+export-objs := nfhp_mod.o
+
+# multipart objects
+list-multi    := nf_hipac.o
+
+# objects for nf-hipac core
+nf_hipac-objs := ihash.o global.o btree.o dimtree.o hipac.o nfhp_dev.o nfhp_proc.o nfhp_mod.o
+
+# nf-hipac core
+obj-$(CONFIG_IP_NF_HIPAC)        += nf_hipac.o
+
+# nf-hipac conntrack helper
+obj-$(CONFIG_IP_NF_HIPAC_CTHELP) += nf_hipac_cthelp.o
+
+ifneq ($(ARCH), alpha)
+ifneq ($(ARCH), ia64)
+ifneq ($(ARCH), mips64)
+ifneq ($(ARCH), ppc64)
+ifneq ($(ARCH), s390x)
+ifneq ($(ARCH), sparc64)
+EXTRA_CFLAGS += -D BIT32_ARCH
+endif
+endif
+endif
+endif
+endif
+endif
+
+include $(TOPDIR)/Rules.make
+
+nf_hipac.o: $(nf_hipac-objs)
+	    $(LD) -r -o $@ $(nf_hipac-objs)
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/net/ipv4/netfilter/nf-hipac/btree.c linux-2.4.20-wolk4.4-fullkernel/net/ipv4/netfilter/nf-hipac/btree.c
--- linux-2.4.20-wolk4.3-fullkernel/net/ipv4/netfilter/nf-hipac/btree.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/net/ipv4/netfilter/nf-hipac/btree.c	2003-07-30 11:23:30.000000000 +0200
@@ -0,0 +1,1921 @@
+/*
+ * High performance packet classification - optimized btree
+ *
+ * Authors: Michael Bellion and Thomas Heinz
+ * (c) 2002-2003 by the hipac core team <nf@hipac.org>:
+ *      +-----------------------+----------------------+
+ *      |   Michael Bellion     |     Thomas Heinz     |
+ *      | <mbellion@hipac.org>  |  <creatix@hipac.org> |
+ *      +-----------------------+----------------------+
+ * Licenced under the GNU General Public Licence, version >= 2.
+ */
+
+
+#include "global.h"
+#include "btree.h"
+
+
+static inline __u32
+min_a_b(const __u32 a, const __u32 b)
+{
+	return a < b ? a : b;
+}
+
+
+static inline void 
+insert_leaf_8(void *old_leaf, const __u32 old_kpn, const __u32 old_offset,
+	      __u32 total_elem,
+	      void *new_leaf, const __u32 new_kpn, const __u32 new_offset,
+	      const __u8 ins_num, void *ins_pos[], const __u32 key[],
+	      struct gen_spec *nextseg[])
+{
+	/* size of one node in bytes */
+	const __u32 nodesize = old_kpn * (1 + PTRSIZE) + old_offset;
+	/* buckets left in current old_leaf */
+	__u32 old_free = old_kpn;
+	/* buckets left in current new_leaf */
+	__u32 new_free = new_kpn;
+	/* conditions to insert either 1. or 2. key */
+	__u8 insert_key1, insert_key2;
+	/* maintains wether or not key1/key2 has been inserted */
+	__u8 key_inserted[] = {0, 0};
+	/* buckets left in the leaf in which one key will be inserted */
+	__u32 ins_free = total_elem + 1;
+	/* ins_id = {0 - first key to be inserted,
+	             1 - second key to be inserted} */
+	__u8 ins_id = 0;
+	__u32 len;
+	struct gen_spec **newn;	
+	
+	if (old_kpn == new_kpn && ins_pos[0] > old_leaf) {
+		/* first part of the leaf can be copied since nothing 
+		   changes here */
+		len = (__u8 *) ins_pos[0] - (__u8 *) old_leaf;
+		memcpy(new_leaf, old_leaf, len);
+		old_leaf = ins_pos[0];
+		new_leaf = (__u8 *) new_leaf + len;
+		total_elem -= old_kpn * len / nodesize;
+	}
+	
+	while (total_elem > 0) {
+		insert_key1 = (old_leaf >= ins_pos[0] && !key_inserted[0]);
+		insert_key2 = (ins_num == 2 && old_leaf >= ins_pos[1] && 
+			       key_inserted[0] && !key_inserted[1]);
+		
+		if (insert_key1 || insert_key2) {
+			ins_id = insert_key1 ? 0 : 1;
+			for (ins_free = 0; 
+			     key[ins_id] > *((__u8 *) old_leaf + ins_free);
+			     ins_free++);
+		}
+		
+		/* copy elements until either old_leaf or new_leaf is full or
+		   total_elem == 0 or insertion position is reached */
+		len = min_a_b(ins_free, 
+			      min_a_b(total_elem, 
+				      min_a_b(old_free, new_free)));
+
+		if (len > 0) {
+			memcpy(new_leaf, old_leaf, len);
+			memcpy((__u8 *) new_leaf + new_free + 
+			       (new_kpn - new_free) * PTRSIZE,
+			       (__u8 *) old_leaf + old_free + 
+			       (old_kpn - old_free) * PTRSIZE, len * PTRSIZE);
+		}
+		
+		old_free -= len;
+		new_free -= len;
+		total_elem -= len;
+		ins_free -= len;
+		
+		old_leaf = (__u8 *) old_leaf + len;
+		new_leaf = (__u8 *) new_leaf + len;
+		
+		if (old_free == 0) {
+			/* goto next leaf in old leaf level */
+			old_leaf = (__u8 *) old_leaf + old_kpn * PTRSIZE + 
+				old_offset;
+			old_free = old_kpn;
+		} 
+		
+		if (new_free == 0) {
+			/* goto next leaf in new leaf level */
+			new_leaf = (__u8 *) new_leaf + new_kpn * PTRSIZE + 
+				new_offset;
+			new_free = new_kpn;
+		}
+		
+		if (ins_free == 0) {
+			/* insert new key in leaf */
+			*(__u8 *) new_leaf = key[ins_id];
+			newn = (struct gen_spec **)
+				((__u8 *) new_leaf + new_free +
+				 (new_kpn - new_free) * PTRSIZE);
+			*newn = nextseg[ins_id];
+			new_leaf = (__u8 *) new_leaf + 1;
+			new_free--;
+			ins_free = total_elem + 1;
+			key_inserted[ins_id] = 1;
+			
+			if (new_free == 0) {
+				/* goto next leaf in new leaf level */
+				new_leaf = (__u8 *) new_leaf + 
+					new_kpn * PTRSIZE + new_offset;
+				new_free = new_kpn;
+			}
+		}
+	}
+}
+
+
+static inline void 
+insert_leaf_16(void *old_leaf, const __u32 old_kpn, const __u32 old_offset, 
+	       __u32 total_elem,
+	       void *new_leaf, const __u32 new_kpn, const __u32 new_offset,
+	       const __u8 ins_num, void *ins_pos[], const __u32 key[],
+	       struct gen_spec *nextseg[])
+{
+	/* size of one node in bytes */
+	const __u32 nodesize = old_kpn * (2 + PTRSIZE) + old_offset;
+	/* buckets left in current old_leaf */
+	__u32 old_free = old_kpn;
+	/* buckets left in current new_leaf */
+	__u32 new_free = new_kpn;
+	/* conditions to insert either 1. or 2. key */
+	__u8 insert_key1, insert_key2;
+	/* maintains wether or not key1/key2 has been inserted */
+	__u8 key_inserted[] = {0, 0};
+	/* buckets left in the leaf in which one key will be inserted */
+	__u32 ins_free = total_elem + 1;
+	/* ins_id = {0 - first key to be inserted,
+	             1 - second key to be inserted} */
+	__u8 ins_id = 0;
+	__u32 len;
+	struct gen_spec **newn;
+	
+	
+	if (old_kpn == new_kpn && ins_pos[0] > old_leaf) {
+		/* first part of the leaf can be copied since nothing 
+		   changes here */
+		len = (__u8 *) ins_pos[0] - (__u8 *) old_leaf;
+		memcpy(new_leaf, old_leaf, len);
+		old_leaf = ins_pos[0];
+		new_leaf = (__u8 *) new_leaf + len;
+		total_elem -= old_kpn * len / nodesize;
+	}
+	
+	while (total_elem > 0) {
+		insert_key1 = (old_leaf >= ins_pos[0] && !key_inserted[0]);
+		insert_key2 = (ins_num == 2 && old_leaf >= ins_pos[1] && 
+			       key_inserted[0] && !key_inserted[1]);
+		
+		if (insert_key1 || insert_key2) {
+			ins_id = insert_key1 ? 0 : 1;
+			for (ins_free = 0;
+			     key[ins_id] > *((__u16 *) old_leaf + ins_free);
+			     ins_free++);
+		}
+		
+		/* copy elements until either old_leaf or new_leaf is full or 
+		   total_elem == 0 or insertion position is reached */
+		len = min_a_b(ins_free, 
+			      min_a_b(total_elem, 
+				      min_a_b(old_free, new_free)));
+		
+		if (len > 0) {
+			memcpy(new_leaf, old_leaf, 2 * len);
+			memcpy((__u16 *) new_leaf + new_free + 
+			       (new_kpn - new_free) * (PTRSIZE >> 1),
+			       (__u16 *) old_leaf + old_free + 
+			       (old_kpn - old_free) * (PTRSIZE >> 1), 
+			       len * PTRSIZE);
+		}
+
+		old_free -= len;
+		new_free -= len;
+		total_elem -= len;
+		ins_free -= len;
+		
+		old_leaf = (__u16 *) old_leaf + len;
+		new_leaf = (__u16 *) new_leaf + len;
+	
+		if (old_free == 0) {
+			/* goto next leaf in old leaf level */
+			old_leaf = (__u16 *) ((__u8 *) old_leaf + 
+					      old_kpn * PTRSIZE + old_offset);
+			old_free = old_kpn;
+		} 
+		
+		if (new_free == 0) {
+			/* goto next leaf in new leaf level */
+			new_leaf = (__u16 *) ((__u8 *) new_leaf + 
+					      new_kpn * PTRSIZE + new_offset);
+			new_free = new_kpn;
+		}
+		
+		if (ins_free == 0) {
+			/* insert new key in leaf */
+			*(__u16 *) new_leaf = key[ins_id];
+			newn = (struct gen_spec **) 
+				((__u16 *) new_leaf + new_free + 
+				 (new_kpn - new_free) * (PTRSIZE >> 1));
+			*newn = nextseg[ins_id];
+			new_leaf = (__u16 *) new_leaf + 1;
+			new_free--;
+			ins_free = total_elem + 1;
+			key_inserted[ins_id] = 1;
+			
+			if (new_free == 0) {
+				/* goto next leaf in new leaf level */
+				new_leaf = (__u16 *) 
+					((__u8 *) new_leaf 
+					 + new_kpn * PTRSIZE + new_offset);
+				new_free = new_kpn;
+			}
+		}
+	}
+}
+
+
+static inline void 
+insert_leaf_32(void *old_leaf, const __u32 old_kpn, const __u32 old_offset, 
+	       __u32 total_elem,
+	       void *new_leaf, const __u32 new_kpn, const __u32 new_offset,
+	       const __u8 ins_num, void *ins_pos[], const __u32 key[],
+	       struct gen_spec *nextseg[])
+{
+	/* size of one node in bytes */
+	const __u32 nodesize = old_kpn * (4 + PTRSIZE) + old_offset;
+	/* buckets left in current old_leaf */
+	__u32 old_free = old_kpn;
+	/* buckets left in current new_leaf */
+	__u32 new_free = new_kpn;
+	/* conditions to insert either 1. or 2. key */
+	__u8 insert_key1, insert_key2;
+	/* maintains wether or not key1/key2 has been inserted */
+	__u8 key_inserted[] = {0, 0};
+	/* buckets left in the leaf in which one key will be inserted */
+	__u32 ins_free = total_elem + 1;
+	/* ins_id = {0 - first key to be inserted,
+	             1 - second key to be inserted} */
+	__u8 ins_id = 0;
+	__u32 len;
+	struct gen_spec **newn;
+	
+	
+	if (old_kpn == new_kpn && ins_pos[0] > old_leaf) {
+		/* first part of the leaf can be copied since nothing 
+		   changes here */
+		len = (__u8 *) ins_pos[0] - (__u8 *) old_leaf;
+		memcpy(new_leaf, old_leaf, len);
+		old_leaf = ins_pos[0];
+		new_leaf = (__u8 *) new_leaf + len;
+		total_elem -= old_kpn * len / nodesize;
+	}
+	
+	while (total_elem > 0) {
+		insert_key1 = (old_leaf >= ins_pos[0] && !key_inserted[0]);
+		insert_key2 = (ins_num == 2 && old_leaf >= ins_pos[1] && 
+			       key_inserted[0] && !key_inserted[1]);
+		
+		if (insert_key1 || insert_key2) {
+			ins_id = insert_key1 ? 0 : 1;
+			for (ins_free = 0;
+			     key[ins_id] > *((__u32 *) old_leaf + ins_free);
+			     ins_free++);
+		}
+		
+		/* copy elements until either old_leaf or new_leaf is full or 
+		   total_elem == 0 or insertion position is reached */
+		len = min_a_b(ins_free, 
+			      min_a_b(total_elem, 
+				      min_a_b(old_free, new_free)));
+		
+		if (len > 0) {
+			memcpy(new_leaf, old_leaf, 4 * len);
+			memcpy((__u32 *) new_leaf + new_free +
+			       (new_kpn - new_free) * (PTRSIZE >> 2),
+			       (__u32 *) old_leaf + old_free +
+			       (old_kpn - old_free) * (PTRSIZE >> 2),
+			       len * PTRSIZE);
+		}
+		
+		old_free -= len;
+		new_free -= len;
+		total_elem -= len;
+		ins_free -= len;
+		
+		old_leaf = (__u32 *) old_leaf + len;
+		new_leaf = (__u32 *) new_leaf + len;
+		
+		if (old_free == 0) {
+			/* goto next leaf in old leaf level */
+			old_leaf = (__u32 *) ((__u8 *) old_leaf +
+					    old_kpn * PTRSIZE + old_offset);
+			old_free = old_kpn;
+		} 
+		
+		if (new_free == 0) {
+			/* goto next leaf in new leaf level */
+			new_leaf = (__u32 *) ((__u8 *) new_leaf +
+					    new_kpn * PTRSIZE + new_offset);
+			new_free = new_kpn;
+		}
+		
+		if (ins_free == 0) {
+			/* insert new key in leaf */
+			*(__u32 *) new_leaf = key[ins_id];
+			newn = (struct gen_spec **)
+				((__u32 *) new_leaf + new_free + 
+				 (new_kpn - new_free) * (PTRSIZE >> 2));
+			*newn = nextseg[ins_id];
+			new_leaf = (__u32 *) new_leaf + 1;
+			new_free--;
+			ins_free = total_elem + 1;
+			key_inserted[ins_id] = 1;
+			
+			if (new_free == 0) {
+				/* goto next leaf in new leaf level */
+				new_leaf = (__u32 *) 
+					((__u8 *) new_leaf + 
+					 new_kpn * PTRSIZE + new_offset);
+		new_free = new_kpn;
+	    }
+	}
+    }
+}
+
+
+static inline void 
+delete_leaf_8(void *old_leaf, const __u32 old_kpn, const __u32 old_offset,
+	      __u32 total_elem,
+	      void *new_leaf, const __u32 new_kpn, const __u32 new_offset,
+	      const __u8 del_num, void *del_pos[], const __u32 key[])
+{
+	/* size of one node in bytes */
+	const __u32 nodesize = old_kpn * (1 + PTRSIZE) + old_offset;
+	/* buckets left in current old_leaf */
+	__u32 old_free = old_kpn;
+	/* buckets left in current new_leaf */
+	__u32 new_free = new_kpn;
+	/* conditions to delete either 1. or 2. key */
+	__u8 delete_key1, delete_key2;
+	/* maintains wether or not key1/key2 has been deleted */
+	__u8 key_deleted[] = {0, 0};
+	/* buckets left in the leaf in which one key will be deleted */
+	__u32 del_free = total_elem + 1;
+	/* del_id = {0 - first key to be deleted,
+	             1 - second key to be deleted} */
+	__u8 del_id = 0;
+	__u32 len;
+
+	
+	if (old_kpn == new_kpn && del_pos[0] > old_leaf) {
+		/* first part of the leaf can be copied since nothing
+		   changes here */
+		len = (__u8 *) del_pos[0] - (__u8 *) old_leaf;
+		memcpy(new_leaf, old_leaf, len);
+		old_leaf = del_pos[0];
+		new_leaf = (__u8 *) new_leaf + len;
+		total_elem -= old_kpn * len / nodesize;
+	}
+	
+	while (total_elem > 0) {
+		delete_key1 = (old_leaf >= del_pos[0] && !key_deleted[0]);
+		delete_key2 = (del_num == 2 && old_leaf >= del_pos[1] && 
+			       key_deleted[0] && !key_deleted[1]);
+		
+		if (delete_key1 || delete_key2) {
+			del_id = delete_key1 ? 0 : 1;
+			for (del_free = 0; 
+			     key[del_id] > *((__u8 *) old_leaf + del_free);
+			     del_free++);
+		}
+		
+		/* copy elements until either old_leaf or new_leaf is full or 
+		   total_elem == 0 or deletion position is reached */
+		len = min_a_b(del_free, 
+			      min_a_b(total_elem, 
+				      min_a_b(old_free, new_free)));
+		
+		if (len > 0) {
+			memcpy(new_leaf, old_leaf, len);
+			memcpy((__u8 *) new_leaf + new_free +
+			       (new_kpn - new_free) * PTRSIZE,
+			       (__u8 *) old_leaf + old_free +
+			       (old_kpn - old_free) * PTRSIZE,
+			       len * PTRSIZE);
+		}			
+
+		old_free -= len;
+		new_free -= len;
+		total_elem -= len;
+		del_free -= len;
+		
+		old_leaf = (__u8 *) old_leaf + len;
+		new_leaf = (__u8 *) new_leaf + len;
+		
+		if (old_free == 0) {
+			/* goto next leaf in old leaf level */
+			old_leaf = (__u8 *) old_leaf + 
+				old_kpn * PTRSIZE + old_offset;
+			old_free = old_kpn;
+		} 
+		
+		if (new_free == 0) {
+			/* goto next leaf in new leaf level */
+			new_leaf = (__u8 *) new_leaf + 
+				new_kpn * PTRSIZE + new_offset;
+			new_free = new_kpn;
+		}
+		
+		if (del_free == 0) {
+			/* delete new key in leaf */
+			old_leaf = (__u8 *) old_leaf + 1;
+			old_free--;
+			total_elem--;
+			del_free = total_elem + 1;
+			key_deleted[del_id] = 1;
+			
+			if (old_free == 0) {
+				/* goto next leaf in new leaf level */
+				old_leaf = (__u8 *) old_leaf + 
+					old_kpn * PTRSIZE + old_offset;
+				old_free = old_kpn;
+			}
+		}
+	}
+}
+
+
+static inline void 
+delete_leaf_16(void *old_leaf, const __u32 old_kpn, const __u32 old_offset, 
+	       __u32 total_elem,
+	       void *new_leaf, const __u32 new_kpn, const __u32 new_offset,
+	       const __u8 del_num, void *del_pos[], const __u32 key[])
+{
+	/* size of one node in bytes */
+	const __u32 nodesize = old_kpn * (2 + PTRSIZE) + old_offset;
+	/* buckets left in current old_leaf */
+	__u32 old_free = old_kpn;
+	/* buckets left in current new_leaf */
+	__u32 new_free = new_kpn;
+	/* conditions to delete either 1. or 2. key */
+	__u8 delete_key1, delete_key2;
+	/* maintains wether or not key1/key2 has been deleted */
+	__u8 key_deleted[] = {0, 0};
+	/* buckets left in the leaf in which one key will be deleted */
+	__u32 del_free = total_elem + 1;
+	/* del_id = {0 - first key to be deleted,
+	             1 - second key to be deleted} */
+	__u8 del_id = 0;
+	__u32 len;
+
+
+	if (old_kpn == new_kpn && del_pos[0] > old_leaf) {
+		/* first part of the leaf can be copied since nothing 
+		   changes here */
+		len = (__u8 *) del_pos[0] - (__u8 *) old_leaf;
+		memcpy(new_leaf, old_leaf, len);
+		old_leaf = del_pos[0];
+		new_leaf = (__u8 *) new_leaf + len;
+		total_elem -= old_kpn * len / nodesize;
+	}
+	
+	while (total_elem > 0) {
+		delete_key1 = (old_leaf >= del_pos[0] && !key_deleted[0]);
+		delete_key2 = (del_num == 2 && old_leaf >= del_pos[1] && 
+			       key_deleted[0] && !key_deleted[1]);
+		
+		if (delete_key1 || delete_key2) {
+			del_id = delete_key1 ? 0 : 1;
+			for (del_free = 0;
+			     key[del_id] > *((__u16 *) old_leaf + del_free);
+			     del_free++);
+		}
+		
+		/* copy elements until either old_leaf or new_leaf is full or 
+		   total_elem == 0 or deletion position is reached */
+		len = min_a_b(del_free, 
+			      min_a_b(total_elem, 
+				      min_a_b(old_free, new_free)));
+		
+		if (len > 0) {
+			memcpy(new_leaf, old_leaf, 2 * len);
+			memcpy((__u16 *) new_leaf + new_free + 
+			       (new_kpn - new_free) * (PTRSIZE >> 1),
+			       (__u16 *) old_leaf + old_free +
+			       (old_kpn - old_free) * (PTRSIZE >> 1),
+			       len * PTRSIZE);
+		}
+
+		old_free -= len;
+		new_free -= len;
+		total_elem -= len;
+		del_free -= len;
+		
+		old_leaf = (__u16 *) old_leaf + len;
+		new_leaf = (__u16 *) new_leaf + len;
+		
+		if (old_free == 0) {
+			/* goto next leaf in old leaf level */
+			old_leaf = (__u16 *) ((__u8 *) old_leaf + 
+					    old_kpn * PTRSIZE + old_offset);
+			old_free = old_kpn;
+		} 
+		
+		if (new_free == 0) {
+			/* goto next leaf in new leaf level */
+			new_leaf = (__u16 *) ((__u8 *) new_leaf +
+					    new_kpn * PTRSIZE + new_offset);
+			new_free = new_kpn;
+		}
+		
+		if (del_free == 0) {
+			/* delete new key in leaf */
+			old_leaf = (__u16 *) old_leaf + 1;
+			old_free--;
+			total_elem--;
+			del_free = total_elem + 1;
+			key_deleted[del_id] = 1;
+			
+			if (old_free == 0) {
+				/* goto next leaf in new leaf level */
+				old_leaf = (__u16 *) 
+					((__u8 *) old_leaf + 
+					 old_kpn * PTRSIZE +
+					 old_offset);
+				old_free = old_kpn;
+			}
+		}
+	}
+}
+
+
+static inline void 
+delete_leaf_32(void *old_leaf, const __u32 old_kpn, const __u32 old_offset, 
+	       __u32 total_elem,
+	       void *new_leaf, const __u32 new_kpn, const __u32 new_offset,
+	       const __u8 del_num, void *del_pos[], const __u32 key[])
+{
+	/* size of one node in bytes */
+	const __u32 nodesize = old_kpn * (4 + PTRSIZE) + old_offset;
+	/* buckets left in current old_leaf */
+	__u32 old_free = old_kpn;
+	/* buckets left in current new_leaf */
+	__u32 new_free = new_kpn;
+	/* conditions to delete either 1. or 2. key */
+	__u8 delete_key1, delete_key2;
+	/* maintains wether or not key1/key2 has been deleted */
+	__u8 key_deleted[] = {0, 0};
+	/* buckets left in the leaf in which one key will be deleted */
+	__u32 del_free = total_elem + 1;
+	/* del_id = {0 - first key to be deleted,
+	             1 - second key to be deleted} */
+	__u8 del_id = 0;
+	__u32 len;
+
+
+	if (old_kpn == new_kpn && del_pos[0] > old_leaf) {
+		/* first part of the leaf can be copied since nothing 
+		   changes here */
+		len = (__u8 *) del_pos[0] - (__u8 *) old_leaf;
+		memcpy(new_leaf, old_leaf, len);
+		old_leaf = del_pos[0];
+		new_leaf = (__u8 *) new_leaf + len;
+		total_elem -= old_kpn * len / nodesize;
+	}
+	
+	while (total_elem > 0) {
+		delete_key1 = (old_leaf >= del_pos[0] && !key_deleted[0]);
+		delete_key2 = (del_num == 2 && old_leaf >= del_pos[1] && 
+			       key_deleted[0] && !key_deleted[1]);
+		
+		if (delete_key1 || delete_key2) {
+			del_id = delete_key1 ? 0 : 1;
+			for (del_free = 0;
+			     key[del_id] > *((__u32 *) old_leaf + del_free);
+			     del_free++);
+		}
+		
+		/* copy elements until either old_leaf or new_leaf is full or 
+		   total_elem == 0 or deletion position is reached */
+		len = min_a_b(del_free,
+			      min_a_b(total_elem, 
+				      min_a_b(old_free, new_free)));
+		
+		if (len > 0) {
+			memcpy(new_leaf, old_leaf, 4 * len);
+			memcpy((__u32 *) new_leaf + new_free + 
+			       (new_kpn - new_free) * (PTRSIZE >> 2),
+			       (__u32 *) old_leaf + old_free + 
+			       (old_kpn - old_free) * (PTRSIZE >> 2),
+			       len * PTRSIZE);
+		}
+			
+		old_free -= len;
+		new_free -= len;
+		total_elem -= len;
+		del_free -= len;
+		
+		old_leaf = (__u32 *) old_leaf + len;
+		new_leaf = (__u32 *) new_leaf + len;
+		
+		if (old_free == 0) {
+			/* goto next leaf in old leaf level */
+			old_leaf = (__u32 *) ((__u8 *) old_leaf + 
+					    old_kpn * PTRSIZE + old_offset);
+			old_free = old_kpn;
+		} 
+		
+		if (new_free == 0) {
+			/* goto next leaf in new leaf level */
+			new_leaf = (__u32 *) ((__u8 *) new_leaf + 
+					    new_kpn * PTRSIZE + new_offset);
+			new_free = new_kpn;
+		}
+		
+		if (del_free == 0) {
+			/* delete new key in leaf */
+			old_leaf = (__u32 *) old_leaf + 1;
+			old_free--;
+			total_elem--;
+			del_free = total_elem + 1;
+			key_deleted[del_id] = 1;
+			
+			if (old_free == 0) {
+				/* goto next leaf in new leaf level */
+				old_leaf = (__u32 *) 
+					((__u8 *) old_leaf + 
+					 old_kpn * PTRSIZE +
+					 old_offset);
+				old_free = old_kpn;
+			}
+		}
+	}
+}
+
+
+struct ptrblock **
+termrule(const struct btree_spec *spec)
+{
+	if (unlikely(!spec)){
+		ARG_MSG;
+		return NULL;
+	}
+
+	if (spec->btreetype == BT0){
+		__u8 wc = (spec->bittype == BIT_U32 ? PTRSIZE : 0);
+		//FIXME_ALIGN
+		return (struct ptrblock **)
+			((__u8*)spec + sizeof(__u32) + wc + 
+			 spec->num * (PTRSIZE + (1 << spec->bittype)));
+	}
+	return (struct ptrblock **)((__u8*)spec + spec->blocks * BLOCKSIZE 
+			      - PTRSIZE);
+}
+
+
+hipac_error
+btree_clone(const struct btree_spec *spec, struct btree_spec **clone)
+{
+	size_t size;
+	hipac_error error;
+		
+	if (unlikely(!spec || !clone))
+		ARG_ERR;
+
+	size = btree_size(spec);
+
+	if (!(*clone = hp_alloc(size, 1)))
+		return HE_LOW_MEMORY;
+
+	memcpy(*clone, spec, size);
+	(*clone)->newspec = 0;
+
+	if ((error = ptrblock_clone(*termrule(spec), termrule(*clone)))) {
+		hp_free(*clone);
+		return HE_LOW_MEMORY;
+	}
+	return HE_OK;
+}
+
+
+hipac_error
+btree_locate(const struct btree_spec *spec, struct locate_inf *inf, __u32 key)
+{
+	__u32* start = ROOT(spec);
+	
+	if (spec == NULL || inf == NULL) {
+		ARG_ERR;
+	}
+	
+       	if (spec->btreetype == BT0){
+		if (spec->bittype == BIT_U32){
+			__u32* keyptr = findkey_32(key, start);
+			inf->key = *keyptr;
+			inf->nextspec = (struct gen_spec**)
+				(start + spec->num +//FIXME_ALIGN
+				 (PTRSIZE >> 2) * (keyptr - start));
+		} 
+		else if (spec->bittype == BIT_U16){
+			__u16* keyptr = findkey_16(key, (__u16*)start);
+			inf->key = *keyptr;
+			inf->nextspec = (struct gen_spec**)
+				((__u16*)start + spec->num +//FIXME_ALIGN
+				 (PTRSIZE >> 1) * (keyptr - (__u16*)start));
+		} else {
+			__u8* keyptr = findkey_8(key, (__u8*)start);
+			inf->key = *keyptr;
+			inf->nextspec = (struct gen_spec**)
+				((__u8*)start + spec->num +//FIXME_ALIGN
+				 PTRSIZE  * (keyptr - (__u8*)start));
+		}
+	} 
+	else if (spec->btreetype == BT1){
+		if (spec->bittype == BIT_U32){
+			__u32* leaf = next_node1_32(key, spec, start,
+						  BT1_U32_LEAF_BLOCKS);
+			__u32* keyptr = findkey_32(key, leaf);
+			inf->key = *keyptr;
+			inf->nextspec = (struct gen_spec**)
+				(leaf + BT1_U32_LEAF +
+				 (PTRSIZE >> 2) * (keyptr - leaf));
+		}
+		else if (spec->bittype == BIT_U16){
+			__u16* leaf = next_node1_16(key, spec, (__u16*)start,
+						  BT1_U16_LEAF_BLOCKS);
+			__u16* keyptr = findkey_16(key, leaf);
+			inf->key = *keyptr;
+			inf->nextspec = (struct gen_spec**)
+				(leaf + BT1_U16_LEAF +
+				 (PTRSIZE >> 1) * (keyptr - leaf));
+		} else {
+			__u8* leaf = next_node1_8(key, spec, (__u8*)start,
+						BT1_U8_LEAF_BLOCKS);
+			__u8* keyptr = findkey_8(key, leaf);
+			inf->key = *keyptr;
+			inf->nextspec = (struct gen_spec**)
+				(leaf + BT1_U8_LEAF +
+				 PTRSIZE  * (keyptr - leaf));
+		}
+	}
+	else if (spec->btreetype == BT2){
+		if (spec->bittype == BIT_U32){
+			__u32 root_num = DIV(spec->num, 
+					   (BT2_U32_NODE * BT2_U32_LEAF));
+			__u32* leaf = next_node2_32(key, LEAF1(spec), root_num,
+						  next_node1_32(key, spec, 
+								(__u32*)start,
+							  BT2_U32_NODE_BLOCKS),
+						  BT2_U32_NODE_BLOCKS,
+						  BT2_U32_LEAF_BLOCKS);
+			__u32* keyptr = findkey_32(key, leaf);
+			inf->key = *keyptr;
+			inf->nextspec = (struct gen_spec**)
+				(leaf + BT2_U32_LEAF +
+				 (PTRSIZE >> 2) * (keyptr - leaf));
+		}
+		else if (spec->bittype == BIT_U16){
+			__u16* leaf = next_node1_16(key, spec, (__u16*)start, 
+						   BT2_U16_LEAF_BLOCKS);
+			__u16* keyptr = findkey_16(key, leaf);
+			inf->key = *keyptr;
+			inf->nextspec = (struct gen_spec**)
+				(leaf + BT2_U16_LEAF +
+				 (PTRSIZE >> 1) * (keyptr - leaf));
+		}
+	}
+	else {
+		if (spec->bittype == BIT_U32){
+			__u32 root_num = DIV(spec->num, 
+					   (BT3_U32_NODE * BT3_U32_LEAF));
+			__u32* leaf = next_node2_32(key, LEAF1(spec), root_num,
+						  next_node1_32(key, spec,
+								(__u32*)start, 
+							 BT3_U32_NODE_BLOCKS),
+						  BT3_U32_NODE_BLOCKS,
+						  BT3_U32_LEAF_BLOCKS);
+			__u32* keyptr = findkey_32(key, leaf);
+			inf->key = *keyptr;
+			inf->nextspec = (struct gen_spec**)
+				(leaf + BT3_U32_LEAF +
+				 (PTRSIZE >> 2) * (keyptr - leaf));
+		}
+		else if (spec->bittype == BIT_U16){
+			__u32 root_num = DIV(spec->num, 
+					   (BT3_U16_NODE * BT3_U16_LEAF));
+			__u16* leaf = next_node2_16(key, LEAF1(spec), root_num,
+						  next_node1_16(key, spec,
+								(__u16*)start,
+							 BT3_U16_NODE_BLOCKS),
+						  BT3_U16_NODE_BLOCKS,
+						  BT3_U16_LEAF_BLOCKS);
+			__u16* keyptr = findkey_16(key, leaf);
+			inf->key = *keyptr;
+			inf->nextspec = (struct gen_spec**)
+				(leaf + BT3_U16_LEAF +
+				 (PTRSIZE >> 1) * (keyptr - leaf));
+		}
+	}
+	return HE_OK;
+}
+
+
+struct btree_spec *
+new_segmentset_intern(__u32 num, __u8 bittype)
+{
+	struct btree_spec *result;
+	__u8 btreetype, blocks, root_num;
+	__u32 size;
+
+	if (!(num < 242688))
+		return NULL;
+	
+	if (bittype == BIT_U8){
+		if (num <= BT0_U8_MAX){
+			btreetype = BT0;
+			blocks = 1;
+			size = sizeof(__u32) + PTRSIZE 
+				+ num * (sizeof(__u8) + PTRSIZE);//FIXME_ALIGN
+			result = hp_alloc(size, 1);
+		}
+		else {
+			btreetype = BT1;
+			root_num = DIV(num, BT1_U8_LEAF);
+			blocks = 1;
+			size = (blocks + root_num * BT1_U8_LEAF_BLOCKS)
+				* BLOCKSIZE
+				- (root_num * BT1_U8_LEAF - num) * PTRSIZE
+				- OFFSET(BT1_U8_LEAF, BIT_U8);
+			result = hp_alloc(size, 1);
+		}
+	}
+	else if (bittype == BIT_U16){
+		if (num <= BT0_U16_MAX){
+			btreetype = BT0;
+			blocks = 0;
+			size = sizeof(__u32) + PTRSIZE
+				+ num * (sizeof(__u16) + PTRSIZE);//FIXME_ALIGN
+			result = hp_alloc(size, 1);
+		}
+		else if (num <= BT1_U16_MAX){
+			btreetype = BT1;
+			root_num = DIV(num, BT1_U16_LEAF);
+			blocks = 1;
+			size = (blocks + root_num * BT1_U16_LEAF_BLOCKS)
+				* BLOCKSIZE
+				- (root_num * BT1_U16_LEAF - num) * PTRSIZE
+				- OFFSET(BT1_U16_LEAF, BIT_U16);
+			result = hp_alloc(size, 1);
+		}
+		else if (num <= BT2_U16_MAX){
+			btreetype = BT2;
+			root_num = DIV(num, BT2_U16_LEAF);
+			blocks = BLOCKS_U16(root_num);
+			size = (blocks + root_num * BT2_U16_LEAF_BLOCKS)
+				* BLOCKSIZE
+				- (root_num * BT2_U16_LEAF - num) * PTRSIZE;
+			result = hp_alloc(size, 1);
+		}
+		else {
+			btreetype = BT3;
+			root_num = DIV(num, (BT3_U16_NODE * BT3_U16_LEAF));
+			blocks = BLOCKS_U16(root_num);
+			size = (blocks + root_num * BT3_U16_NODE_BLOCKS)
+				* BLOCKSIZE + num * (2 + PTRSIZE) + 
+				((BT3_U16_LEAF - (num % BT3_U16_LEAF)) 
+				 % BT3_U16_LEAF) * 2;
+			result = hp_alloc(size, 1);
+		}
+	}
+	else {
+		if (num <= BT0_U32_MAX){
+			btreetype = BT0;
+			blocks = 0;
+			size = sizeof(__u32) + 2 * PTRSIZE
+				+ num * (sizeof(__u32) + PTRSIZE);//FIXME_ALIGN
+			result = hp_alloc(size, 1);
+		}
+		else if (num <= BT1_U32_MAX){
+			btreetype = BT1;
+			root_num = DIV(num, BT1_U32_LEAF);
+			blocks =  BLOCKS_U32(root_num);
+			size = (blocks + root_num * BT1_U32_LEAF_BLOCKS)
+				* BLOCKSIZE 
+				- (root_num * BT1_U32_LEAF - num) * PTRSIZE;
+			result = hp_alloc(size, 1);
+		}
+		else if (num <= BT2_U32_MAX){
+			btreetype = BT2;
+			root_num = DIV(num, (BT2_U32_NODE * BT2_U32_LEAF));
+			blocks = BLOCKS_U32(root_num);
+			size = (blocks + root_num * BT2_U32_NODE_BLOCKS)
+				* BLOCKSIZE + num * (4 + PTRSIZE) +
+				((BT2_U32_LEAF - (num % BT2_U32_LEAF))
+				 % BT2_U32_LEAF) * 4;
+			result = hp_alloc(size, 1);
+		}
+		else {
+			btreetype = BT3;
+			root_num = DIV(num, (BT3_U32_NODE * BT3_U32_LEAF));
+			blocks = BLOCKS_U32(root_num);
+			size = (blocks + root_num * BT3_U32_NODE_BLOCKS)
+				* BLOCKSIZE + num * (4 + PTRSIZE) +
+				((BT3_U32_LEAF - (num % BT3_U32_LEAF))
+				 % BT3_U32_LEAF) * 4;
+			result = hp_alloc(size, 1);
+		}
+	}
+	if (!(result))
+		return NULL;
+	
+	result->bittype = bittype;
+	result->btreetype = btreetype;
+	result->blocks = blocks;
+	result->dimid = 0;
+	result->newspec = 0;
+	result->num = num;
+	//assert(size == btree_size(result));
+	return result;
+}
+
+
+__u32 
+btree_size(const struct btree_spec *spec)
+{
+	__u8 root_num;
+	
+	if (spec->num == 0){
+		return (sizeof(__u32) + PTRSIZE);
+	}
+
+	
+	if (spec->bittype == BIT_U8){
+		if (spec->btreetype == BT0){
+			return (sizeof(__u32) + PTRSIZE + 
+				spec->num * (sizeof(__u8) + PTRSIZE));//FIXME_ALIGN
+		}
+		else {
+			root_num = DIV(spec->num, BT1_U8_LEAF);
+			return ((spec->blocks + 
+				 root_num * BT1_U8_LEAF_BLOCKS) * BLOCKSIZE -
+				(root_num * BT1_U8_LEAF - spec->num) * PTRSIZE
+				- OFFSET(BT1_U8_LEAF, BIT_U8));
+		}
+	}
+	else if (spec->bittype == BIT_U16){
+		if (spec->btreetype == BT0){
+			return (sizeof(__u32) + PTRSIZE +
+				spec->num * (sizeof(__u16) + PTRSIZE));//FIXME_ALIGN
+		}
+		else if (spec->btreetype == BT1){
+			root_num = DIV(spec->num, BT1_U16_LEAF);
+			return ((spec->blocks + 
+				 root_num * BT1_U16_LEAF_BLOCKS) * BLOCKSIZE -
+				(root_num * BT1_U16_LEAF - spec->num) * PTRSIZE
+				- OFFSET(BT1_U16_LEAF, BIT_U16));
+		}
+		else if (spec->btreetype == BT2){
+			root_num = DIV(spec->num, BT2_U16_LEAF);
+			return ((spec->blocks +
+				 root_num * BT2_U16_LEAF_BLOCKS) * BLOCKSIZE -
+				(root_num * BT2_U16_LEAF - spec->num) 
+				* PTRSIZE);
+		}
+		else { 
+			__u8 blocks;
+			root_num = DIV(spec->num, 
+				       (BT3_U16_NODE * BT3_U16_LEAF));
+			blocks = BLOCKS_U16(root_num);
+			return  ((blocks +  
+				  root_num * BT3_U16_NODE_BLOCKS) * BLOCKSIZE +
+				 spec->num * (2 + PTRSIZE) +  
+				 ((BT3_U16_LEAF - (spec->num % BT3_U16_LEAF))
+				  % BT3_U16_LEAF) * 2);
+		}
+	}
+	else {
+		if (spec->btreetype == BT0){
+			return (sizeof(__u32) + 2 * PTRSIZE + 
+				spec->num * (sizeof(__u32) + PTRSIZE));//FIXME_ALIGN
+		}
+		else if (spec->btreetype == BT1){
+			root_num = DIV(spec->num, BT1_U32_LEAF);
+			return ((spec->blocks + 
+				 root_num * BT1_U32_LEAF_BLOCKS) * BLOCKSIZE -
+				(root_num * BT1_U32_LEAF - spec->num) 
+				* PTRSIZE);
+		}
+		else if (spec->btreetype == BT2){
+			__u8 blocks;
+			root_num = DIV(spec->num, 
+				       (BT2_U32_NODE * BT2_U32_LEAF));
+			blocks = BLOCKS_U32(root_num);
+			return ((blocks + 
+				 root_num * BT2_U32_NODE_BLOCKS) * BLOCKSIZE +
+				spec->num * (4 + PTRSIZE) +
+				((BT2_U32_LEAF - ( spec->num % BT2_U32_LEAF))
+				 % BT2_U32_LEAF) * 4);
+		}
+		else {
+			__u8 blocks;
+			root_num = DIV(spec->num, 
+				       (BT3_U32_NODE * BT3_U32_LEAF));
+			blocks = BLOCKS_U32(root_num);
+			return ((blocks + 
+				 root_num * BT3_U32_NODE_BLOCKS) * BLOCKSIZE +
+				spec->num * (4 + PTRSIZE) +
+				((BT3_U32_LEAF - ( spec->num % BT3_U32_LEAF))
+				 % BT3_U32_LEAF) * 4);
+		}
+	}
+}
+
+
+struct btree_spec *
+btree_new(__u8 bittype, __u8 dimid, __u8 ins_num, const __u32 key[],
+	  struct gen_spec *nextspec[])
+{
+	struct btree_spec *result;
+	void* start;
+	
+	assert((ins_num > 0) && (ins_num) <= 2);
+
+	result = new_segmentset_intern(ins_num, bittype);
+	if (!result)
+		return NULL;
+
+	*termrule(result) = NULL;
+	result->dimid = dimid;
+	start = ROOT(result);
+	
+	if (bittype == BIT_U8){
+		*(__u8*)start = key[0];
+		*(void**)((__u8*)start + ins_num) = (void*)nextspec[0];//FIXME_ALIGN
+		if (ins_num == 2){
+			*((__u8*)start + 1) = key[1];
+			*(void**)((__u8*)start + 2 + PTRSIZE) =
+				(void*)nextspec[1];
+		}	
+	}
+	else if (bittype == BIT_U16){
+		*(__u16*)start = key[0];
+		*(void**)((__u16*)start + ins_num) = (void*)nextspec[0];//FIXME_ALIGN
+		if (ins_num == 2){
+			*((__u16*)start + 1) = key[1];
+			*(void**)((__u8*)start + 4 + PTRSIZE) =
+				(void*)nextspec[1];
+		}
+	}
+	else {
+		*WILDCARD(result) = NULL;
+		*(__u32*)start = key[0];
+		*(void**)((__u32*)start + ins_num) = (void*)nextspec[0];//FIXME_ALIGN
+		if (ins_num == 2){
+			*((__u32*)start + 1) = key[1];
+			*(void**)((__u8*)start + 8 + PTRSIZE) =
+				(void*)nextspec[1];
+		}
+	}
+	return result;
+}
+
+
+static inline void 
+build_8(__u8* start, const __u32 num, const __u8* leaf_start,
+	const __u8 leaf_size, const __u8 leaf_blocks)
+{
+	int i;
+	for(i = 0; i < num - 1; i++){
+		*(start + i) = *(leaf_start + 
+				 i * leaf_blocks * BLOCKSIZE + leaf_size - 1);
+	}
+	*(start + i) = 255;
+}
+
+
+static inline void 
+build_16(__u16* start, const __u32 num, const __u8* leaf_start,
+	 const __u8 leaf_size, const __u8 leaf_blocks)
+{
+	int i;
+	for(i = 0; i < num - 1; i++){
+		*(start + i) = *((__u16*)(leaf_start + 
+					i * leaf_blocks * BLOCKSIZE) +
+				 leaf_size - 1);
+	}
+	*(start + i) = 65535;    
+}
+
+
+static inline void 
+build_32(__u32* start, const __u32 num, const __u8* leaf_start,
+	 const __u8 leaf_size, const __u8 leaf_blocks)
+{
+	int i;
+	for(i = 0; i < num - 1; i++){
+		*(start + i) = *((__u32*)(leaf_start + 
+					i * leaf_blocks * BLOCKSIZE) +
+				 leaf_size - 1);
+	}
+	*(start + i) = 4294967295U;
+}
+
+
+hipac_error
+btree_insert(const struct btree_spec *spec, __u8 ins_num, const __u32 key[],
+	     struct gen_spec *nextspec[], struct btree_spec **res)
+{
+	void* ins_pos[2];
+	hipac_error error;
+	struct btree_spec *result;
+
+	if (unlikely(!spec || !key || !nextspec || !res ||
+		     !(ins_num == 1 || ins_num == 2) ||
+		     (ins_num == 2 && key[0] >= key[1])))
+		ARG_ERR;
+	
+	result = new_segmentset_intern(spec->num + ins_num, spec->bittype);
+	if (!(result))
+		return HE_LOW_MEMORY;
+	
+	if ((error = ptrblock_clone(*termrule(spec), termrule(result)))){
+		hp_free(result);
+		return HE_LOW_MEMORY;
+	}
+
+	result->dimid = spec->dimid;
+	
+	if (spec->bittype == BIT_U8){
+		if (spec->btreetype == BT0){
+			ins_pos[0] = ROOT(spec);
+			if (ins_num == 2) {
+				ins_pos[1] = ROOT(spec);
+			}
+			if (result->btreetype == BT0){
+				insert_leaf_8(ROOT(spec), spec->num, 0,
+					      spec->num,
+					      ROOT(result), result->num, 0,
+					      ins_num, ins_pos, key, nextspec);
+			}
+			else {
+				insert_leaf_8(ROOT(spec), spec->num, 0,//FIXME_ALIGN
+					      spec->num,
+					      LEAF1(result), BT1_U8_LEAF, 
+					      OFFSET(BT1_U8_LEAF, BIT_U8),
+					      ins_num, ins_pos, key, nextspec);
+				build_8((__u8*)ROOT(result),
+					DIV(result->num, BT1_U8_LEAF),
+					LEAF1(result), BT1_U8_LEAF, 
+					BT1_U8_LEAF_BLOCKS);
+			}
+		}
+		else {
+			ins_pos[0] = next_node1_8(key[0], spec, 
+						  (__u8*)ROOT(spec),
+						  BT1_U8_LEAF_BLOCKS);
+			if (ins_num == 2) {
+				ins_pos[1] = next_node1_8(key[1], spec,
+							  (__u8*)ROOT(spec),
+							  BT1_U8_LEAF_BLOCKS);
+			}
+			insert_leaf_8(LEAF1(spec), BT1_U8_LEAF,
+				      OFFSET(BT1_U8_LEAF, BIT_U8), spec->num,
+				      LEAF1(result), BT1_U8_LEAF, 
+				      OFFSET(BT1_U8_LEAF, BIT_U8),
+				      ins_num, ins_pos, key, nextspec);
+			build_8((__u8*)ROOT(result), 
+				DIV(result->num, BT1_U8_LEAF),
+				LEAF1(result), BT1_U8_LEAF, 
+				BT1_U8_LEAF_BLOCKS);
+		}
+	}
+	else if (spec->bittype == BIT_U16){
+		if (spec->btreetype == BT0){
+			ins_pos[0] = ROOT(spec);
+			if (ins_num == 2) {
+				ins_pos[1] = ROOT(spec);
+			}
+			if (result->btreetype == BT0){
+				insert_leaf_16(ROOT(spec), spec->num, 0,//FIXME_ALIGN
+					       spec->num,
+					       ROOT(result), result->num, 0,
+					       ins_num, ins_pos, 
+					       key, nextspec);
+			}
+			else {
+				insert_leaf_16(ROOT(spec), spec->num, 0,
+					       spec->num,
+					       LEAF1(result), BT1_U16_LEAF,
+					       OFFSET(BT1_U16_LEAF, BIT_U16),
+					       ins_num, ins_pos,
+					       key, nextspec);
+				build_16((__u16*)ROOT(result),
+					 DIV(result->num, BT1_U16_LEAF),
+					 LEAF1(result), BT1_U16_LEAF,
+					 BT1_U16_LEAF_BLOCKS);
+			}
+		}
+		else if (spec->btreetype == BT1){
+			ins_pos[0] = next_node1_16(key[0], spec, 
+						   (__u16*)ROOT(spec),
+						   BT1_U16_LEAF_BLOCKS);
+			if (ins_num == 2) {
+				ins_pos[1] = next_node1_16(key[1], spec,
+							  (__u16*)ROOT(spec),
+							  BT1_U16_LEAF_BLOCKS);
+			}
+			if (result->btreetype == BT1){
+				insert_leaf_16(LEAF1(spec), BT1_U16_LEAF,
+					       OFFSET(BT1_U16_LEAF, BIT_U16),
+					       spec->num,
+					       LEAF1(result), BT1_U16_LEAF,
+					       OFFSET(BT1_U16_LEAF, BIT_U16),
+					       ins_num, ins_pos,
+					       key, nextspec);
+				build_16((__u16*)ROOT(result),
+					 DIV(result->num, BT1_U16_LEAF),
+					 LEAF1(result), BT1_U16_LEAF,
+					 BT1_U16_LEAF_BLOCKS);
+			}
+			else {
+				insert_leaf_16(LEAF1(spec), BT1_U16_LEAF,
+					       OFFSET(BT1_U16_LEAF, BIT_U16),
+					       spec->num,
+					       LEAF1(result), BT2_U16_LEAF,
+					       OFFSET(BT2_U16_LEAF, BIT_U16),
+					       ins_num, ins_pos,
+					       key, nextspec);
+				build_16((__u16*)ROOT(result), 
+					 DIV(result->num, BT2_U16_LEAF),
+					 LEAF1(result), BT2_U16_LEAF,
+					 BT2_U16_LEAF_BLOCKS);
+			}
+		}
+		else if (spec->btreetype == BT2){
+			ins_pos[0] = next_node1_16(key[0], spec, 
+						   (__u16*)ROOT(spec),
+						   BT2_U16_LEAF_BLOCKS);
+			if (ins_num == 2) {
+				ins_pos[1] = next_node1_16(key[1], spec,
+							  (__u16*)ROOT(spec),
+							  BT2_U16_LEAF_BLOCKS);
+			}
+			if (result->btreetype == BT2){
+				insert_leaf_16(LEAF1(spec), BT2_U16_LEAF,
+					       OFFSET(BT2_U16_LEAF, BIT_U16), 
+					       spec->num,
+					       LEAF1(result), BT2_U16_LEAF,
+					       OFFSET(BT2_U16_LEAF, BIT_U16),
+					       ins_num, ins_pos,
+					       key, nextspec);
+				build_16((__u16*)ROOT(result), 
+					 DIV(result->num, BT2_U16_LEAF),
+					 LEAF1(result), BT2_U16_LEAF,
+					 BT2_U16_LEAF_BLOCKS);
+			}
+			else {
+				insert_leaf_16(LEAF1(spec), BT2_U16_LEAF,
+					       OFFSET(BT2_U16_LEAF, BIT_U16),
+					       spec->num,
+					       LEAF2(result, BT3_U16_NODE, 
+						     BT3_U16_NODE_BLOCKS, 
+						     BT3_U16_LEAF), 
+					       BT3_U16_LEAF, 
+					       OFFSET(BT3_U16_LEAF, BIT_U16),
+					       ins_num, ins_pos,
+					       key, nextspec);
+				build_16((__u16*)LEAF1(result), 
+					 DIV(result->num, BT3_U16_LEAF),
+					 LEAF2(result, BT3_U16_NODE, 
+					       BT3_U16_NODE_BLOCKS, 
+					       BT3_U16_LEAF),
+					 BT3_U16_LEAF, BT3_U16_LEAF_BLOCKS);
+				build_16((__u16*)ROOT(result), 
+					 DIV(result->num, 
+					     (BT3_U16_NODE * BT3_U16_LEAF)),
+					 LEAF1(result), BT3_U16_NODE, 
+					 BT3_U16_NODE_BLOCKS);
+			}
+		}
+		else { 
+			__u32 root_num = DIV(spec->num, 
+					   (BT3_U16_NODE * BT3_U16_LEAF));
+			ins_pos[0] = next_node2_16(key[0], LEAF1(spec), 
+						   root_num, 
+						   next_node1_16(key[0], spec,
+							  (__u16*)ROOT(spec),
+							  BT3_U16_NODE_BLOCKS),
+						   BT3_U16_NODE_BLOCKS,
+						   BT3_U16_LEAF_BLOCKS);
+			if (ins_num == 2) {
+				ins_pos[1] = next_node2_16(key[1], LEAF1(spec),
+							  root_num, 
+							  next_node1_16(key[1],
+							   spec,
+							   (__u16*)ROOT(spec),
+							  BT3_U16_NODE_BLOCKS),
+							   BT3_U16_NODE_BLOCKS,
+							  BT3_U16_LEAF_BLOCKS);
+			}
+			insert_leaf_16(LEAF2(spec, BT3_U16_NODE, 
+					     BT3_U16_NODE_BLOCKS,
+					     BT3_U16_LEAF), 
+				       BT3_U16_LEAF, 
+				       OFFSET(BT3_U16_LEAF, BIT_U16), 
+				       spec->num,
+				       LEAF2(result, BT3_U16_NODE, 
+					     BT3_U16_NODE_BLOCKS,
+					     BT3_U16_LEAF), 
+				       BT3_U16_LEAF, 
+				       OFFSET(BT3_U16_LEAF, BIT_U16),
+				       ins_num, ins_pos, key, nextspec);
+			build_16((__u16*)LEAF1(result), 
+				 DIV(result->num, BT3_U16_LEAF),
+				 LEAF2(result, BT3_U16_NODE, 
+				       BT3_U16_NODE_BLOCKS, BT3_U16_LEAF),
+				 BT3_U16_LEAF, BT3_U16_LEAF_BLOCKS);
+			build_16((__u16*)ROOT(result), 
+				 DIV(result->num, 
+				     (BT3_U16_NODE * BT3_U16_LEAF)),
+				 LEAF1(result), BT3_U16_NODE, 
+				 BT3_U16_NODE_BLOCKS);
+		}
+	}
+	else {
+		*WILDCARD(result) = *WILDCARD(spec);
+		if (spec->btreetype == BT0){
+			ins_pos[0] = ROOT(spec);
+			if (ins_num == 2) {
+				ins_pos[1] = ROOT(spec);
+			}
+			if (result->btreetype == BT0){
+				insert_leaf_32(ROOT(spec), spec->num, 0,//FIXME_ALIGN
+					       spec->num,
+					       ROOT(result), result->num, 0,
+					       ins_num, ins_pos,
+					       key, nextspec);
+			}
+			else {
+				insert_leaf_32(ROOT(spec), spec->num, 0,
+					       spec->num,
+					       LEAF1(result), BT1_U32_LEAF,
+					       OFFSET(BT1_U32_LEAF, BIT_U32),
+					       ins_num, ins_pos,
+					       key, nextspec);
+				build_32((__u32*)ROOT(result), 
+					 DIV(result->num, BT1_U32_LEAF),
+					 LEAF1(result), BT1_U32_LEAF,
+					 BT1_U32_LEAF_BLOCKS);
+			}
+		}
+		else if (spec->btreetype == BT1){
+			ins_pos[0] = next_node1_32(key[0], spec,
+						   (__u32*)ROOT(spec), 
+						   BT1_U32_LEAF_BLOCKS);
+			if (ins_num == 2) {
+				ins_pos[1] = next_node1_32(key[1], spec,
+							  (__u32*)ROOT(spec),
+							  BT1_U32_LEAF_BLOCKS);
+			}
+			if (result->btreetype == BT1){
+				insert_leaf_32(LEAF1(spec), BT1_U32_LEAF,
+					       OFFSET(BT1_U32_LEAF, BIT_U32),
+					       spec->num,
+					       LEAF1(result), BT1_U32_LEAF,
+					       OFFSET(BT1_U32_LEAF, BIT_U32),
+					       ins_num, ins_pos,
+					       key, nextspec);
+				build_32((__u32*)ROOT(result),
+					 DIV(result->num, BT1_U32_LEAF),
+					 LEAF1(result), BT1_U32_LEAF, 
+					 BT1_U32_LEAF_BLOCKS);
+			}
+			else {
+				insert_leaf_32(LEAF1(spec), BT1_U32_LEAF,
+					       OFFSET(BT1_U32_LEAF, BIT_U32),
+					       spec->num,
+					       LEAF2(result, BT2_U32_NODE,
+						     BT2_U32_NODE_BLOCKS,
+						     BT2_U32_LEAF),
+					       BT2_U32_LEAF, 
+					       OFFSET(BT2_U32_LEAF, BIT_U32),
+					       ins_num, ins_pos,
+					       key, nextspec);
+				build_32((__u32*)LEAF1(result),
+					 DIV(result->num, BT2_U32_LEAF),
+					 LEAF2(result, BT2_U32_NODE, 
+					       BT2_U32_NODE_BLOCKS, 
+					       BT2_U32_LEAF),
+					 BT2_U32_LEAF, BT2_U32_LEAF_BLOCKS);
+				build_32((__u32*)ROOT(result),
+					 DIV(result->num, 
+					     (BT2_U32_NODE * BT2_U32_LEAF)),
+					 LEAF1(result), BT2_U32_NODE, 
+					 BT2_U32_NODE_BLOCKS);
+			}
+		}
+		else if (spec->btreetype == BT2){
+			__u32 root_num = DIV(spec->num, 
+					   (BT2_U32_NODE * BT2_U32_LEAF));
+			ins_pos[0] = next_node2_32(key[0], LEAF1(spec),
+						   root_num, 
+						   next_node1_32(key[0],
+								 spec,
+								 ROOT(spec),
+							  BT2_U32_NODE_BLOCKS),
+						   BT2_U32_NODE_BLOCKS, 
+						   BT2_U32_LEAF_BLOCKS);
+			if (ins_num == 2) {
+				ins_pos[1] = next_node2_32(key[1], LEAF1(spec),
+						      root_num, 
+						      next_node1_32(key[1],
+								    spec,
+								    ROOT(spec),
+							  BT2_U32_NODE_BLOCKS),
+						      BT2_U32_NODE_BLOCKS,
+						      BT2_U32_LEAF_BLOCKS);
+			}
+			if (result->btreetype == BT2){
+				insert_leaf_32(LEAF2(spec, BT2_U32_NODE,
+						     BT2_U32_NODE_BLOCKS,
+						     BT2_U32_LEAF), 
+					       BT2_U32_LEAF, 
+					       OFFSET(BT2_U32_LEAF, BIT_U32),
+					       spec->num,
+					       LEAF2(result, BT2_U32_NODE,
+						     BT2_U32_NODE_BLOCKS,
+						     BT2_U32_LEAF), 
+					       BT2_U32_LEAF,
+					       OFFSET(BT2_U32_LEAF, BIT_U32),
+					       ins_num, ins_pos,
+					       key, nextspec);
+				build_32((__u32*)LEAF1(result),
+					 DIV(result->num, BT2_U32_LEAF),
+					 LEAF2(result, BT2_U32_NODE,
+					       BT2_U32_NODE_BLOCKS,
+					       BT2_U32_LEAF),
+					 BT2_U32_LEAF, BT2_U32_LEAF_BLOCKS);
+				build_32((__u32*)ROOT(result),
+					 DIV(result->num, 
+					     (BT2_U32_NODE * BT2_U32_LEAF)),
+					 LEAF1(result), BT2_U32_NODE,
+					 BT2_U32_NODE_BLOCKS);
+			}
+			else {
+				insert_leaf_32(LEAF2(spec, BT2_U32_NODE,
+						     BT2_U32_NODE_BLOCKS,
+						     BT2_U32_LEAF),
+					       BT2_U32_LEAF,
+					       OFFSET(BT2_U32_LEAF, BIT_U32),
+					       spec->num,
+					       LEAF2(result, BT3_U32_NODE,
+						     BT3_U32_NODE_BLOCKS,
+						     BT3_U32_LEAF), 
+					       BT3_U32_LEAF,
+					       OFFSET(BT3_U32_LEAF, BIT_U32),
+					       ins_num, ins_pos,
+					       key, nextspec);
+				build_32((__u32*)LEAF1(result),
+					 DIV(result->num, BT3_U32_LEAF),
+					 LEAF2(result, BT3_U32_NODE, 
+					       BT3_U32_NODE_BLOCKS,
+					       BT3_U32_LEAF),
+					 BT3_U32_LEAF, BT3_U32_LEAF_BLOCKS);
+				build_32((__u32*)ROOT(result), 
+					 DIV(result->num, 
+					     (BT3_U32_NODE * BT3_U32_LEAF)),
+					 LEAF1(result), BT3_U32_NODE,
+					 BT3_U32_NODE_BLOCKS);
+			}
+		}
+		else { 
+			__u32 root_num = DIV(spec->num, 
+					   (BT3_U32_NODE * BT3_U32_LEAF));
+			ins_pos[0] = next_node2_32(key[0], LEAF1(spec),
+						   root_num, 
+						   next_node1_32(key[0], spec,
+								 ROOT(spec),
+							 BT3_U32_NODE_BLOCKS),
+						   BT3_U32_NODE_BLOCKS,
+						   BT3_U32_LEAF_BLOCKS);
+			if (ins_num == 2) {
+				ins_pos[1] = next_node2_32(key[1], LEAF1(spec),
+						     root_num, 
+						     next_node1_32(key[1],
+								  spec,
+								  ROOT(spec),
+							 BT3_U32_NODE_BLOCKS),
+						     BT3_U32_NODE_BLOCKS,
+						     BT3_U32_LEAF_BLOCKS);
+			}
+			insert_leaf_32(LEAF2(spec, BT3_U32_NODE,
+					     BT3_U32_NODE_BLOCKS,
+					     BT3_U32_LEAF), 
+				       BT3_U32_LEAF,
+				       OFFSET(BT3_U32_LEAF, BIT_U32),
+				       spec->num,
+				       LEAF2(result, BT3_U32_NODE,
+					     BT3_U32_NODE_BLOCKS,
+					     BT3_U32_LEAF), 
+				       BT3_U32_LEAF,
+				       OFFSET(BT3_U32_LEAF, BIT_U32),
+				       ins_num, ins_pos, key, nextspec);
+			build_32((__u32*)LEAF1(result),
+				 DIV(result->num, BT3_U32_LEAF),
+				 LEAF2(result, BT3_U32_NODE,
+				       BT3_U32_NODE_BLOCKS, BT3_U32_LEAF),
+				 BT3_U32_LEAF, BT3_U32_LEAF_BLOCKS);
+			build_32((__u32*)ROOT(result),
+				 DIV(result->num, 
+				     (BT3_U32_NODE * BT3_U32_LEAF)),
+				 LEAF1(result), BT3_U32_NODE,
+				 BT3_U32_NODE_BLOCKS);
+		}
+	}
+	*res = result;
+	return HE_OK;
+}
+
+
+hipac_error
+btree_delete(const struct btree_spec *spec, __u8 del_num, const __u32 key[],
+	     struct btree_spec **res)
+{
+	struct btree_spec *result;
+	void* del_pos[2];
+	hipac_error error;
+
+	if (unlikely(!spec || !key || !res ||
+		     !(del_num == 1 || del_num == 2) ||
+		     (del_num == 2 && key[0] >= key[1])))
+		ARG_ERR;
+	
+	result = new_segmentset_intern(spec->num - del_num, spec->bittype);
+	if (!result)
+		return HE_LOW_MEMORY;
+
+	if ((error = ptrblock_clone(*termrule(spec), termrule(result)))) {
+		hp_free(result);
+		return HE_LOW_MEMORY;
+	}
+	
+	result->dimid = spec->dimid;
+	
+	if (spec->bittype == BIT_U8){
+		if (spec->btreetype == BT0){
+			del_pos[0] = ROOT(spec);
+			if (del_num == 2) {
+				del_pos[1] = ROOT(spec);
+			}
+			//think harder
+			delete_leaf_8(ROOT(spec), spec->num, 0, spec->num,//FIXME_ALIGN
+				      ROOT(result), result->num, 0,
+				      del_num, del_pos, key);
+		}
+		else {
+			del_pos[0] = next_node1_8(key[0], spec,
+						  (__u8*)ROOT(spec),
+						  BT1_U8_LEAF_BLOCKS);
+			if (del_num == 2) {
+				del_pos[1] = next_node1_8(key[1], spec,
+							  (__u8*)ROOT(spec),
+							  BT1_U8_LEAF_BLOCKS);
+			}
+			if (result->btreetype == BT1){
+				delete_leaf_8(LEAF1(spec), BT1_U8_LEAF,
+					      OFFSET(BT1_U8_LEAF, BIT_U8),
+					      spec->num,
+					      LEAF1(result), BT1_U8_LEAF,
+					      OFFSET(BT1_U8_LEAF, BIT_U8),
+					      del_num, del_pos, key);
+				build_8((__u8*)ROOT(result),
+					DIV(result->num, BT1_U8_LEAF),
+					LEAF1(result), BT1_U8_LEAF,
+					BT1_U8_LEAF_BLOCKS);
+			}
+			else {
+				delete_leaf_8(LEAF1(spec), BT1_U8_LEAF,
+					      OFFSET(BT1_U8_LEAF, BIT_U8),
+					      spec->num,
+					      ROOT(result), result->num, 0,//FIXME_ALIGN
+					      del_num, del_pos, key);
+			}
+		}
+	}
+	else if (spec->bittype == BIT_U16){
+		if (spec->btreetype == BT0){
+			del_pos[0] = ROOT(spec);
+			if (del_num == 2) {
+				del_pos[1] = ROOT(spec);
+			}
+			//think harder
+			delete_leaf_16(ROOT(spec), spec->num, 0, spec->num,//FIXME_ALIGN
+				       ROOT(result), result->num, 0,
+				       del_num, del_pos, key);
+		}
+		else if (spec->btreetype == BT1){
+			del_pos[0] = next_node1_16(key[0], spec,
+						   (__u16*)ROOT(spec),
+						   BT1_U16_LEAF_BLOCKS);
+			if (del_num == 2) {
+				del_pos[1] = next_node1_16(key[1], spec,
+							 (__u16*)ROOT(spec),
+							 BT1_U16_LEAF_BLOCKS);
+			}
+			if (result->btreetype == BT1){
+				delete_leaf_16(LEAF1(spec), BT1_U16_LEAF,
+					       OFFSET(BT1_U16_LEAF, BIT_U16),
+					       spec->num,
+					       LEAF1(result), BT1_U16_LEAF,
+					       OFFSET(BT1_U16_LEAF, BIT_U16),
+					       del_num, del_pos, key);
+				build_16((__u16*)ROOT(result),
+					 DIV(result->num, BT1_U16_LEAF),
+					 LEAF1(result), BT1_U16_LEAF,
+					 BT1_U16_LEAF_BLOCKS);
+			}
+			else {
+				delete_leaf_16(LEAF1(spec), BT1_U16_LEAF,//FIXME_ALIGN
+					       OFFSET(BT1_U16_LEAF, BIT_U16),
+					       spec->num,
+					       ROOT(result), result->num, 0,
+					       del_num, del_pos, key);
+			}
+		}
+		else if (spec->btreetype == BT2){
+			del_pos[0] = next_node1_16(key[0], spec,
+						   (__u16*)ROOT(spec),
+						   BT2_U16_LEAF_BLOCKS);
+			if (del_num == 2) {
+				del_pos[1] = next_node1_16(key[1], spec, 
+							  (__u16*)ROOT(spec),
+							  BT2_U16_LEAF_BLOCKS);
+			}
+			if (result->btreetype == BT2){
+				delete_leaf_16(LEAF1(spec), BT2_U16_LEAF,
+					       OFFSET(BT2_U16_LEAF, BIT_U16),
+					       spec->num,
+					       LEAF1(result), BT2_U16_LEAF,
+					       OFFSET(BT2_U16_LEAF, BIT_U16),
+					       del_num, del_pos, key);
+				build_16((__u16*)ROOT(result),
+					 DIV(result->num, BT2_U16_LEAF),
+					 LEAF1(result), BT2_U16_LEAF,
+					 BT2_U16_LEAF_BLOCKS);
+			}
+			else {
+				delete_leaf_16(LEAF1(spec), BT2_U16_LEAF,
+					       OFFSET(BT2_U16_LEAF, BIT_U16),
+					       spec->num,
+					       LEAF1(result), BT1_U16_LEAF,
+					       OFFSET(BT1_U16_LEAF, BIT_U16),
+					       del_num, del_pos, key);
+				build_16((__u16*)ROOT(result),
+					 DIV(result->num, BT1_U16_LEAF),
+					 LEAF1(result), BT1_U16_LEAF, 
+					 BT1_U16_LEAF_BLOCKS);
+			}
+		}
+		else { 
+			__u32 root_num = DIV(spec->num, 
+					   (BT3_U16_NODE * BT3_U16_LEAF));
+			del_pos[0] = next_node2_16(key[0], LEAF1(spec),
+						   root_num, 
+						   next_node1_16(key[0], spec,
+							    (__u16*)ROOT(spec),
+							 BT3_U16_NODE_BLOCKS),
+						   BT3_U16_NODE_BLOCKS,
+						   BT3_U16_LEAF_BLOCKS);
+			if (del_num == 2) {
+				del_pos[1] = next_node2_16(key[1],
+						      LEAF1(spec),
+						      root_num, 
+						      next_node1_16(key[1],
+								      spec,
+							    (__u16*)ROOT(spec),
+							 BT3_U16_NODE_BLOCKS),
+						      BT3_U16_NODE_BLOCKS,
+						      BT3_U16_LEAF_BLOCKS);
+			}
+			if (result->btreetype == BT3){
+				delete_leaf_16(LEAF2(spec, BT3_U16_NODE,
+						     BT3_U16_NODE_BLOCKS,
+						     BT3_U16_LEAF), 
+					       BT3_U16_LEAF, 
+					       OFFSET(BT3_U16_LEAF, BIT_U16),
+					       spec->num,
+					       LEAF2(result, BT3_U16_NODE,
+						     BT3_U16_NODE_BLOCKS,
+						     BT3_U16_LEAF), 
+					       BT3_U16_LEAF, 
+					       OFFSET(BT3_U16_LEAF, BIT_U16),
+					       del_num, del_pos, key);
+				build_16((__u16*)LEAF1(result),
+					 DIV(result->num, BT3_U16_LEAF),
+					 LEAF2(result, BT3_U16_NODE,
+					       BT3_U16_NODE_BLOCKS,
+					       BT3_U16_LEAF),
+					 BT3_U16_LEAF, BT3_U16_LEAF_BLOCKS);
+				build_16((__u16*)ROOT(result),
+					 DIV(result->num, 
+					     (BT3_U16_NODE * BT3_U16_LEAF)),
+					 LEAF1(result), BT3_U16_NODE,
+					 BT3_U16_NODE_BLOCKS);
+			}
+			else {
+				delete_leaf_16(LEAF2(spec, BT3_U16_NODE,
+						     BT3_U16_NODE_BLOCKS,
+						     BT3_U16_LEAF), 
+					       BT3_U16_LEAF,
+					       OFFSET(BT3_U16_LEAF, BIT_U16),
+					       spec->num,
+					       LEAF1(result), BT2_U16_LEAF,
+					       OFFSET(BT2_U16_LEAF, BIT_U16),
+					       del_num, del_pos, key);
+				build_16((__u16*)ROOT(result),
+					 DIV(result->num, BT2_U16_LEAF),
+					 LEAF1(result), BT2_U16_LEAF,
+					 BT2_U16_LEAF_BLOCKS);
+			}
+		}
+	}
+	else {
+		*WILDCARD(result) = *WILDCARD(spec);
+		if (spec->btreetype == BT0){
+			del_pos[0] = ROOT(spec);
+			if (del_num == 2) {
+				del_pos[1] = ROOT(spec);
+			}
+			//think harder
+			delete_leaf_32(ROOT(spec), spec->num, 0, spec->num,//FIXME_ALIGN
+				       ROOT(result), result->num, 0,
+				       del_num, del_pos, key);
+			
+		}
+		else if (spec->btreetype == BT1){
+			del_pos[0] = next_node1_32(key[0], spec, ROOT(spec),
+						   BT1_U32_LEAF_BLOCKS);
+			if (del_num == 2) {
+				del_pos[1] = next_node1_32(key[1], spec,
+							 ROOT(spec),
+							 BT1_U32_LEAF_BLOCKS);
+			}
+			if (result->btreetype == BT1){
+				delete_leaf_32(LEAF1(spec), BT1_U32_LEAF, 
+					       OFFSET(BT1_U32_LEAF, BIT_U32),
+					       spec->num,
+					       LEAF1(result), BT1_U32_LEAF,
+					       OFFSET(BT1_U32_LEAF, BIT_U32),
+					       del_num, del_pos, key);
+				build_32((__u32*)ROOT(result), 
+					 DIV(result->num, BT1_U32_LEAF),
+					 LEAF1(result), BT1_U32_LEAF,
+					 BT1_U32_LEAF_BLOCKS);
+			}
+			else {
+				delete_leaf_32(LEAF1(spec), BT1_U32_LEAF,//FIXME_ALIGN
+					       OFFSET(BT1_U32_LEAF, BIT_U32),
+					       spec->num,
+					       ROOT(result), result->num, 0,
+					       del_num, del_pos, key);
+			}
+		}
+		else if (spec->btreetype == BT2){
+			__u32 root_num = DIV(spec->num, 
+					   (BT2_U32_NODE * BT2_U32_LEAF));
+			del_pos[0] = next_node2_32(key[0], LEAF1(spec),
+						   root_num, 
+						   next_node1_32(key[0], spec,
+							 ROOT(spec),
+							 BT2_U32_NODE_BLOCKS),
+						   BT2_U32_NODE_BLOCKS,
+						   BT2_U32_LEAF_BLOCKS);
+			if (del_num == 2) {
+				del_pos[1] = next_node2_32(key[1], 
+						     LEAF1(spec),
+						     root_num, 
+						     next_node1_32(key[1],
+								   spec,
+								   ROOT(spec),
+							 BT2_U32_NODE_BLOCKS),
+						     BT2_U32_NODE_BLOCKS,
+						     BT2_U32_LEAF_BLOCKS);
+			}
+			if (result->btreetype == BT2){
+				delete_leaf_32(LEAF2(spec, BT2_U32_NODE,
+						     BT2_U32_NODE_BLOCKS,
+						     BT2_U32_LEAF), 
+					       BT2_U32_LEAF, 
+					       OFFSET(BT2_U32_LEAF, BIT_U32),
+					       spec->num,
+					       LEAF2(result, BT2_U32_NODE,
+						     BT2_U32_NODE_BLOCKS,
+						     BT2_U32_LEAF), 
+					       BT2_U32_LEAF, 
+					       OFFSET(BT2_U32_LEAF, BIT_U32),
+					       del_num, del_pos, key);
+				build_32((__u32*)LEAF1(result), 
+					 DIV(result->num, BT2_U32_LEAF),
+					 LEAF2(result, BT2_U32_NODE, 
+					       BT2_U32_NODE_BLOCKS, 
+					       BT2_U32_LEAF),
+					 BT2_U32_LEAF, BT2_U32_LEAF_BLOCKS);
+				build_32((__u32*)ROOT(result), 
+					 DIV(result->num, 
+					     (BT2_U32_NODE * BT2_U32_LEAF)),
+					 LEAF1(result), BT2_U32_NODE, 
+					 BT2_U32_NODE_BLOCKS);
+			}
+			else {
+				delete_leaf_32(LEAF2(spec, BT2_U32_NODE,
+						     BT2_U32_NODE_BLOCKS,
+						     BT2_U32_LEAF), 
+					       BT2_U32_LEAF, 
+					       OFFSET(BT2_U32_LEAF, BIT_U32),
+					       spec->num,
+					       LEAF1(result), BT1_U32_LEAF,
+					       OFFSET(BT1_U32_LEAF, BIT_U32),
+					       del_num, del_pos, key);
+				build_32((__u32*)ROOT(result), 
+					 DIV(result->num, BT1_U32_LEAF),
+					 LEAF1(result), BT1_U32_LEAF, 
+					 BT1_U32_LEAF_BLOCKS);
+			}
+		}
+		else { 
+			__u32 root_num = DIV(spec->num, 
+					   (BT3_U32_NODE * BT3_U32_LEAF));
+			del_pos[0] = next_node2_32(key[0], LEAF1(spec), 
+						   root_num, 
+						   next_node1_32(key[0], spec,
+								 ROOT(spec),
+							 BT3_U32_NODE_BLOCKS),
+						   BT3_U32_NODE_BLOCKS, 
+						   BT3_U32_LEAF_BLOCKS);
+			if (del_num == 2) {
+				del_pos[1] = next_node2_32(key[1], 
+						     LEAF1(spec), root_num,
+						     next_node1_32(key[1], 
+								   spec, 
+								   ROOT(spec),
+							 BT3_U32_NODE_BLOCKS),
+						     BT3_U32_NODE_BLOCKS,
+						     BT3_U32_LEAF_BLOCKS);
+			}
+			if (result->btreetype == BT3){
+				delete_leaf_32(LEAF2(spec, BT3_U32_NODE, 
+						     BT3_U32_NODE_BLOCKS, 
+						     BT3_U32_LEAF), 
+					       BT3_U32_LEAF, 
+					       OFFSET(BT3_U32_LEAF, BIT_U32), 
+					       spec->num,
+					       LEAF2(result, BT3_U32_NODE, 
+						     BT3_U32_NODE_BLOCKS, 
+						     BT3_U32_LEAF), 
+					       BT3_U32_LEAF, 
+					       OFFSET(BT3_U32_LEAF, BIT_U32),
+					       del_num, del_pos, key);
+				build_32((__u32*)LEAF1(result), 
+					 DIV(result->num, BT3_U32_LEAF),
+					 LEAF2(result, BT3_U32_NODE, 
+					       BT3_U32_NODE_BLOCKS, 
+					       BT3_U32_LEAF),
+					 BT3_U32_LEAF, BT3_U32_LEAF_BLOCKS);
+				build_32((__u32*)ROOT(result), 
+					 DIV(result->num, 
+					     (BT3_U32_NODE * BT3_U32_LEAF)),
+					 LEAF1(result), BT3_U32_NODE, 
+					 BT3_U32_NODE_BLOCKS);
+			}
+			else {
+				delete_leaf_32(LEAF2(spec, BT3_U32_NODE, 
+						     BT3_U32_NODE_BLOCKS, 
+						     BT3_U32_LEAF), 
+					       BT3_U32_LEAF, 
+					       OFFSET(BT3_U32_LEAF, BIT_U32),
+					       spec->num,
+					       LEAF2(result, BT2_U32_NODE, 
+						     BT2_U32_NODE_BLOCKS, 
+						     BT2_U32_LEAF), 
+					       BT2_U32_LEAF, 
+					       OFFSET(BT2_U32_LEAF, BIT_U32),
+					       del_num, del_pos, key);
+				build_32((__u32*)LEAF1(result), 
+					 DIV(result->num, BT2_U32_LEAF),
+					 LEAF2(result, BT2_U32_NODE, 
+					       BT2_U32_NODE_BLOCKS, 
+					       BT2_U32_LEAF),
+					 BT2_U32_LEAF, BT2_U32_LEAF_BLOCKS);
+				build_32((__u32*)ROOT(result), 
+					 DIV(result->num, 
+					     (BT2_U32_NODE * BT2_U32_LEAF)),
+					 LEAF1(result), BT2_U32_NODE, 
+					 BT2_U32_NODE_BLOCKS);
+			}
+		}
+	}
+	*res = result;
+	return HE_OK;
+}
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/net/ipv4/netfilter/nf-hipac/btree.h linux-2.4.20-wolk4.4-fullkernel/net/ipv4/netfilter/nf-hipac/btree.h
--- linux-2.4.20-wolk4.3-fullkernel/net/ipv4/netfilter/nf-hipac/btree.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/net/ipv4/netfilter/nf-hipac/btree.h	2003-07-30 11:23:30.000000000 +0200
@@ -0,0 +1,495 @@
+/*
+ * High performance packet classification - optimized btree
+ *
+ * Authors: Michael Bellion and Thomas Heinz
+ * (c) 2002-2003 by the hipac core team <nf@hipac.org>:
+ *      +-----------------------+----------------------+
+ *      |   Michael Bellion     |     Thomas Heinz     |
+ *      | <mbellion@hipac.org>  |  <creatix@hipac.org> |
+ *      +-----------------------+----------------------+
+ * Licenced under the GNU General Public Licence, version >= 2.
+ */
+
+
+#ifndef _BTREE_H
+#define _BTREE_H
+
+#include "global.h"
+
+/* wildcard pointer to the next btree spec */
+#define WILDCARD(b) ((struct gen_spec **) ((__u8 *) (b) + sizeof(*(b))))
+#define IS_BTREE(b) (((struct gen_spec *) (b))->bittype != BIT_RULE)
+
+
+/* btree header */
+struct btree_spec
+{
+	unsigned bittype   :  2; // {BIT_U8, BIT_U16, BIT_U32}
+	unsigned btreetype :  2; // number to distinguish different btrees
+	                         // of the same bit type
+	unsigned blocks    :  4; // number of 64 byte blocks occupied by root
+	unsigned dimid     :  4; // dimension id
+	unsigned newspec   :  1; // indicates whether the btree is contained
+                              	 // in newspec
+	unsigned num       : 19; // number of elements in the btree
+};
+
+/* key and nextspec pointer found by btree_locate */
+struct locate_inf
+{
+	__u32 key;
+	struct gen_spec **nextspec;
+};
+
+
+/* return address of termrule pointer */
+struct ptrblock **
+termrule(const struct btree_spec *spec);
+
+/* return new btree with ins_num (1 or 2) elements inserted; the elements
+   are (key[i], nextspec[i]) where 0 <= i < ins_num; if ins_num == 2 then
+   key[1] > key[0] */
+struct btree_spec *
+btree_new(__u8 bittype, __u8 dimid, __u8 ins_num, const __u32 key[],
+	  struct gen_spec *nextspec[]);
+
+/* return the size of the btree */
+__u32
+btree_size(const struct btree_spec *spec);
+
+static inline void
+btree_free(struct btree_spec *spec)
+{
+	struct ptrblock *term;
+	
+	if (spec == NULL) {
+		ARG_MSG;
+		return;
+	}
+	term = *termrule(spec);
+	if (term != NULL) {
+		hp_free(term);
+	}
+	hp_free(spec);
+}
+
+static inline int
+btree_spec_eq(const struct btree_spec *spec1, const struct btree_spec *spec2)
+{
+	if (spec1 == NULL || spec2 == NULL || !IS_BTREE(spec1) ||
+	    !IS_BTREE(spec2)) {
+		ARG_MSG;
+		return 0;
+	}
+	return spec1->bittype == spec2->bittype &&
+		spec1->btreetype == spec2->btreetype &&
+		spec1->blocks == spec2->blocks &&
+		spec1->dimid == spec2->dimid &&
+		spec1->num == spec2->num;
+}
+
+/* clone btree (not recursively);
+   possible errors: HE_LOW_MEMORY, HE_IMPOSSIBLE_CONDITION */
+hipac_error
+btree_clone(const struct btree_spec *spec, struct btree_spec **clone);
+
+/* insert (key[i], nextspec[i]) where 0 <= i < ins_num into the btree
+   and store the new btree in result; if ins_num == 2 then key[1] must
+   be > key[0];
+   possible errors: HE_LOW_MEMORY, HE_IMPOSSIBLE_CONDITION */
+hipac_error
+btree_insert(const struct btree_spec *spec, __u8 ins_num, const __u32 key[],
+	     struct gen_spec *nextspec[], struct btree_spec **result);
+
+/* delete (key[i], nextspec[i]) from the btree where 0 <= i < del_num
+   and nextspec[i] is associated with key[i] and store the new btree in
+   result; if ins_num == 2 then key[1] must be > key[0];
+   possible errors: HE_LOW_MEMORY, HE_IMPOSSIBLE_CONDITION */
+hipac_error
+btree_delete(const struct btree_spec *spec, __u8 del_num, const __u32 key[],
+	     struct btree_spec **result);
+
+/* return (key', nextspec) where key' = min{k : k >= key} and nextspec
+   is associated with key';
+   possible errors: HE_LOW_MEMORY, HE_IMPOSSIBLE_CONDITION */
+hipac_error
+btree_locate(const struct btree_spec *spec, struct locate_inf *inf,
+	     __u32 key);
+
+static inline void
+btree_set_iteratevals(const struct btree_spec *spec, __u16 *leaves,
+		      __u16 *num, __u16 *jump, __u16 *last_leaf,
+		      struct gen_spec ***nextspec);
+
+
+
+/***************************************************************************
+ **      **********************************************************       **
+ ***    ********                                                 ****    ***
+ *************      B T R E E   A P I   E N D S   H E R E      *************
+ ***    ****                                                 ********    ***
+ **      ***********************************************************      **
+ ***************************************************************************/
+
+
+
+/* btree nodes always consume k * BLOCKSIZE bytes where k >= 1 */
+#define BLOCKSIZE 64
+
+/* btree type encoding the shape of the btree depending on the bit type */
+#define BT0 0
+#define BT1 1
+#define BT2 2
+#define BT3 3
+
+
+/*
+ * x_y_ROOT        - maximum number of elements in root
+ * x_y_LEAF        - maximum number of elements in a leaf
+ * x_y_NODE_BLOCKS - number of blocks a full internal node occupies
+ * x_y_LEAF_BLOCKS - number of blocks a full leaf occupies
+ *
+ * all values depend on x (btree type) and y (bit type)
+ */
+
+#define BT1_U8_ROOT           56
+#define BT1_U8_LEAF           12
+
+#define BT1_U16_ROOT          28
+#define BT1_U16_LEAF          10
+#define BT2_U16_LEAF          32
+#define BT3_U16_NODE          32
+#define BT3_U16_NODE_BLOCKS    1
+#define BT3_U16_LEAF          32
+
+#define BT1_U32_LEAF          16
+#define BT2_U32_NODE          16
+#define BT2_U32_NODE_BLOCKS    1
+#define BT2_U32_LEAF          16
+#define BT3_U32_NODE          32
+#define BT3_U32_NODE_BLOCKS    2
+#define BT3_U32_LEAF          32
+
+#ifdef BIT32_ARCH
+#  define BT1_U8_LEAF_BLOCKS   1
+#  define BT1_U16_LEAF_BLOCKS  1
+#  define BT2_U16_LEAF_BLOCKS  3
+#  define BT3_U16_LEAF_BLOCKS  3
+#  define BT1_U32_LEAF_BLOCKS  2
+#  define BT2_U32_LEAF_BLOCKS  2
+#  define BT3_U32_LEAF_BLOCKS  4
+#else
+#  define BT1_U8_LEAF_BLOCKS   2
+#  define BT1_U16_LEAF_BLOCKS  2
+#  define BT2_U16_LEAF_BLOCKS  5
+#  define BT3_U16_LEAF_BLOCKS  5
+#  define BT1_U32_LEAF_BLOCKS  3
+#  define BT2_U32_LEAF_BLOCKS  3
+#  define BT3_U32_LEAF_BLOCKS  6
+#endif
+
+
+/*
+ * x_y_MAX - maximum number of elements allowed for a btree of type x
+ *           and bit type y
+ */
+
+#define BT0_U8_MAX  62
+
+#define BT0_U16_MAX 41
+#define BT1_U16_MAX 150
+#define BT2_U16_MAX 2944
+
+#define BT0_U32_MAX 41
+#define BT1_U32_MAX 1232
+#define BT2_U32_MAX 6656
+
+
+/* number of bytes missing to let a node of bit type bittype with kpn keys
+   occupy a multiple of BLOCKSIZE bytes */
+#define OFFSET(kpn, bittype)                                                 \
+((BLOCKSIZE - ((kpn) * ((1 << (bittype)) + PTRSIZE)) % BLOCKSIZE) % BLOCKSIZE)
+
+/* number of blocks that root occupies;
+   num is the number of elements in root */
+#define BLOCKS_U16(num) (DIV(((num) + 2 + (PTRSIZE >> 1)), 32))
+#define BLOCKS_U32(num) (DIV(((num) + 1 + (PTRSIZE >> 1)), 16))
+
+/* DIV(num, div) == ceil(num / div) */
+#define DIV(num, div)     \
+((((num) % (div)) == 0) ? \
+ ((num) / (div)) :        \
+ (((num) / (div)) + 1))
+
+/* pointer to the beginning of the btree-keys */
+#define ROOT(spec) ((__u32 *) ((__u8 *) (spec) + sizeof(__u32) + \
+		     ((spec)->bittype >> 1) * PTRSIZE))
+
+/* pointer to the leftmost leaf in a btree of depth 1 */
+#define LEAF1(spec) ((__u8 *) (spec) + (spec)->blocks * BLOCKSIZE)
+
+/* pointer to the leftmost leaf in a btree of depth 2 */
+#define LEAF2(spec, node_size, node_blocks, leaf_size)               \
+((__u8 *) (spec) + BLOCKSIZE *                                       \
+ ((spec)->blocks + (DIV((spec)->num, ((node_size) * (leaf_size)))) * \
+  (node_blocks)))
+
+
+static inline void
+btree_set_iteratevals(const struct btree_spec *spec, __u16 *leaves,
+		      __u16 *num, __u16 *jump, __u16 *last_leaf,
+		      struct gen_spec ***nextspec)
+{
+	assert(spec != NULL);
+	assert(IS_BTREE(spec));
+	assert(leaves != NULL);
+	assert(num != NULL);
+	assert(jump != NULL);
+	assert(last_leaf != NULL);
+	assert(nextspec != NULL);
+
+	switch (spec->btreetype) {
+	    case BT0:
+		    *leaves = 0;
+		    *nextspec = (struct gen_spec **)
+			    ((__u8 *) ROOT(spec) + 
+			     (spec->num * (1 << spec->bittype)));
+		    *num = 0;
+		    *jump = 0;
+		    *last_leaf = spec->num;
+		    break;
+		    
+	    case BT1:
+		    switch (spec->bittype) {
+			case BIT_U32:
+				*leaves = spec->num / BT1_U32_LEAF;
+				*nextspec = (struct gen_spec **)
+					((__u32 *) LEAF1(spec) + BT1_U32_LEAF);
+				*num = BT1_U32_LEAF;
+				*jump = BT1_U32_LEAF_BLOCKS * BLOCKSIZE;
+				*last_leaf = ((spec->num % BT1_U32_LEAF == 0) ?
+					      0 : spec->num % BT1_U32_LEAF);
+				break;
+
+			case BIT_U16:
+				*leaves = spec->num / BT1_U16_LEAF;
+				*nextspec = (struct gen_spec **)
+					((__u16 *) LEAF1(spec) + BT1_U16_LEAF);
+				*num = BT1_U16_LEAF;
+				*jump = BT1_U16_LEAF_BLOCKS * BLOCKSIZE;
+				*last_leaf = ((spec->num % BT1_U16_LEAF == 0) ?
+					      0 : spec->num % BT1_U16_LEAF);
+				break;
+
+			default:
+				assert(spec->bittype == BIT_U8);
+				*leaves = spec->num / BT1_U8_LEAF;
+				*nextspec = (struct gen_spec **)
+					((__u8 *) LEAF1(spec) + BT1_U8_LEAF);
+				*num = BT1_U8_LEAF;
+				*jump = BT1_U8_LEAF_BLOCKS * BLOCKSIZE;
+				*last_leaf = ((spec->num % BT1_U8_LEAF == 0) ?
+					      0 : spec->num % BT1_U8_LEAF);
+				break;
+		    }
+		    break;
+
+	    case BT2: 
+		    if (spec->bittype == BIT_U32) {
+			    *leaves = spec->num / BT2_U32_LEAF;
+			    *nextspec = (struct gen_spec **)
+				    ((__u32 *) LEAF2(spec, BT2_U32_NODE,
+						     BT2_U32_NODE_BLOCKS,
+						     BT2_U32_LEAF)
+				     + BT2_U32_LEAF);
+			    *num = BT2_U32_LEAF;
+			    *jump = BT2_U32_LEAF_BLOCKS * BLOCKSIZE;
+			    *last_leaf = ((spec->num % BT2_U32_LEAF == 0) ?
+					  0 : spec->num % BT2_U32_LEAF);
+		    } else {
+			    *leaves = spec->num / BT2_U16_LEAF;
+			    *nextspec = (struct gen_spec **)
+				    ((__u16 *) LEAF1(spec) + BT2_U16_LEAF);
+			    *num = BT2_U16_LEAF;
+			    *jump = BT2_U16_LEAF_BLOCKS * BLOCKSIZE;
+			    *last_leaf = ((spec->num % BT2_U16_LEAF == 0) ?
+					  0 : spec->num % BT2_U16_LEAF);
+		    }
+		    break;
+
+	    default:
+		    assert(spec->btreetype == BT3);
+		    if (spec->bittype == BIT_U32) {
+			    *leaves = spec->num / BT3_U32_LEAF;
+			    *nextspec = (struct gen_spec **)
+				    ((__u32 *) LEAF2(spec, BT3_U32_NODE,
+						     BT3_U32_NODE_BLOCKS,
+						     BT3_U32_LEAF)
+				     + BT3_U32_LEAF);
+			    *num = BT3_U32_LEAF;
+			    *jump = BT3_U32_LEAF_BLOCKS * BLOCKSIZE;
+			    *last_leaf = ((spec->num % BT3_U32_LEAF == 0) ?
+					  0 : spec->num % BT3_U32_LEAF);
+		    } else {
+			    *leaves = spec->num / BT3_U16_LEAF;
+			    *nextspec = (struct gen_spec **)
+				    ((__u16 *) LEAF2(spec, BT3_U16_NODE,
+						     BT3_U16_NODE_BLOCKS,
+						     BT3_U16_LEAF)
+				     + BT3_U16_LEAF);
+			    *num = BT3_U16_LEAF;
+			    *jump = BT3_U16_LEAF_BLOCKS * BLOCKSIZE;
+			    *last_leaf = ((spec->num % BT3_U16_LEAF == 0) ?
+					  0 : spec->num % BT3_U16_LEAF);
+		    }
+		    break;
+	}
+}
+
+static inline __u32 *
+findkey_32(__u32 key, const __u32 *start)
+{
+	__u32 *p = (__u32 *) start;
+	while (*p < key) {
+		p++;
+	}
+	return p;
+}
+
+static inline __u16 *
+findkey_16(__u16 key, const __u16 *start)
+{
+	__u16 *p = (__u16 *) start;
+	while (*p < key) {
+		p++;
+	}
+	return p;
+}
+
+static inline __u8 *
+findkey_8(__u8 key, const __u8 *start)
+{
+	__u8 *p = (__u8 *) start;
+	while (*p < key) {
+		p++;
+	}
+	return p;
+}
+
+static inline struct gen_spec *
+next_spec_32(__u32 key, const __u32 *start, __u32 num)
+{
+	return (struct gen_spec *)
+		*(void **) (start + num + (PTRSIZE >> 2) *
+			    (findkey_32(key, start) - start));
+}
+
+static inline struct gen_spec *
+next_spec_16(__u32 key, const __u16 *start, __u32 num)
+{
+	return (struct gen_spec *)
+		*(void **) (start + num +(PTRSIZE >> 1) * 
+			    (findkey_16(key, start) - start));
+}
+
+static inline struct gen_spec *
+next_spec_8(__u32 key, const __u8 *start, __u32 num)
+{
+	return (struct gen_spec *)
+		*(void **) (start + num + PTRSIZE * 
+			    (findkey_8(key, start) - start));
+}
+
+static inline __u32 *
+next_node1_32(__u32 key, const struct btree_spec *spec, const __u32 *start,
+	      __u32 blocks)
+{
+	return (__u32 *)
+		((__u8 *) spec + BLOCKSIZE *
+		 (spec->blocks + (findkey_32(key, start) - start) * blocks));
+}
+
+static inline __u16 *
+next_node1_16(__u32 key, const struct btree_spec *spec, const __u16 *start,
+	      __u32 blocks)
+{
+	return (__u16 *)
+		((__u8 *) spec + BLOCKSIZE * 
+		 (spec->blocks + (findkey_16(key, start) - start) * blocks));
+}
+
+static inline __u8 *
+next_node1_8(__u32 key, const struct btree_spec *spec, const __u8 *start,
+	     __u32 blocks)
+{
+	return (__u8 *)
+		((__u8 *) spec + BLOCKSIZE * 
+		 (spec->blocks + (findkey_8(key, start) - start) * blocks));
+}
+
+static inline __u32 *
+next_node2_32(__u32 key, const __u8 *leaf1_start, __u32 root_num,
+	      const __u32 *node_start, __u32 node_blocks, __u32 leaf_blocks)
+{
+	return (__u32 *)
+		(leaf1_start + BLOCKSIZE *
+		 (root_num * node_blocks +
+		  (findkey_32(key, node_start) -
+		   (__u32 *) leaf1_start) * leaf_blocks));
+}
+
+static inline __u16 *
+next_node2_16(__u32 key, const __u8 *leaf1_start, __u32 root_num,
+	      const __u16 *node_start, __u32 node_blocks, __u32 leaf_blocks)
+{
+	return (__u16 *)
+		(leaf1_start + BLOCKSIZE *
+		 (root_num * node_blocks +
+		  (findkey_16(key, node_start) -
+		   (__u16 *) leaf1_start) * leaf_blocks));
+}
+
+static inline struct gen_spec *
+btree_match_32_next(const struct btree_spec *spec, const __u32 key)
+{
+	__u32 *start = (__u32 *) ((__u8 *) spec + sizeof(__u32) + PTRSIZE);
+
+	switch (spec->btreetype) {
+		
+	    case BT0:
+		    return next_spec_32(key, start, spec->num);
+		    
+	    case BT1:
+		    return next_spec_32(
+			    key, next_node1_32(key, spec, start,
+					       BT1_U32_LEAF_BLOCKS),
+			    BT1_U32_LEAF);
+	
+	    case BT2: {
+		    __u32 root_num = DIV(spec->num, (BT2_U32_NODE *
+						     BT2_U32_LEAF));
+		    return next_spec_32(
+			    key, next_node2_32(
+				    key, LEAF1(spec), root_num,
+				    next_node1_32(key, spec, start,
+						  BT2_U32_NODE_BLOCKS),
+				    BT2_U32_NODE_BLOCKS, BT2_U32_LEAF_BLOCKS),
+			    BT2_U32_LEAF);
+	    }
+	
+	    default: {
+		    __u32 root_num = DIV(spec->num, (BT3_U32_NODE *
+						     BT3_U32_LEAF));
+		    assert(spec->btreetype == BT3);
+		    return next_spec_32(
+			    key, next_node2_32(
+				    key, LEAF1(spec), root_num, 
+				    next_node1_32(key, spec, start,
+						  BT3_U32_NODE_BLOCKS),
+				    BT3_U32_NODE_BLOCKS, BT3_U32_LEAF_BLOCKS),
+			    BT3_U32_LEAF);
+	    }
+	}
+}
+
+#endif
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/net/ipv4/netfilter/nf-hipac/dimtree.c linux-2.4.20-wolk4.4-fullkernel/net/ipv4/netfilter/nf-hipac/dimtree.c
--- linux-2.4.20-wolk4.3-fullkernel/net/ipv4/netfilter/nf-hipac/dimtree.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/net/ipv4/netfilter/nf-hipac/dimtree.c	2003-07-30 11:23:30.000000000 +0200
@@ -0,0 +1,4541 @@
+/*
+ * High performance packet classification - dimension tree
+ *
+ * Authors: Michael Bellion and Thomas Heinz
+ * (c) 2002-2003 by the hipac core team <nf@hipac.org>:
+ *      +-----------------------+----------------------+
+ *      |   Michael Bellion     |     Thomas Heinz     |
+ *      | <mbellion@hipac.org>  |  <creatix@hipac.org> |
+ *      +-----------------------+----------------------+
+ * Licenced under the GNU General Public Licence, version >= 2.
+ */
+
+
+#include "global.h"
+#include "ihash.h"
+#include "btree.h"
+#include "dimtree.h"
+
+#define HAS_DT_MATCH(rule)      ((rule)->dt_match_len > 0)
+#define ITH_DT_MATCH(rule, i)   ((rule)->first_dt_match + (i))
+#define LAST_DT_MATCH(rule)     ITH_DT_MATCH(rule, (rule)->dt_match_len - 1)
+#define HAS_WILDCARD_SPEC(spec) ((spec)->bittype == BIT_U32)
+#define HAS_WILDCARD_DIM(dimid) (dim2btype[dimid] == BIT_U32)
+#define LEN(array)              (sizeof(array) / sizeof(*(array)))
+
+/*
+ * newspec keeps track of the btrees and elementary intervals that have been
+ * newly allocated during a series of dimtree operations;
+ * orgspec keeps track of the btrees and elementary intervals that can be
+ * freed after the series of dimtree operations has been successfully finished
+ */
+static struct ptrlist orgspec = {LIST_HEAD_INIT(orgspec.head), 0};
+static struct ihash *newspec  = NULL;
+
+
+
+/* forward declaration */
+static inline void
+elem_free(struct dt_elem *e);
+
+/* free s which can be an elemtary interval or a btree */
+static inline void
+btree_elem_free(struct gen_spec *s)
+{
+	if (unlikely(s == NULL)) {
+		ARG_MSG;
+		return;
+	}
+	if (IS_BTREE(s)) {
+		btree_free((struct btree_spec *) s);
+	} else {
+		/* s must be elemtary interval */
+		assert(IS_ELEM(s));
+		elem_free((struct dt_elem *) s);
+	}
+}
+
+/* set newspec bit of s which can be an elementary interval or a btree to 0 */
+static inline void
+btree_elem_newspec_set(struct gen_spec *s, int newspec_set)
+{
+	if (unlikely(s == NULL)) {
+		ARG_MSG;
+		return;
+	}
+	if (IS_BTREE(s)) {
+		((struct btree_spec *) s)->newspec = !!newspec_set;
+	} else {
+		/* s must be elemtary interval */
+		assert(IS_ELEM(s));
+		((struct dt_elem_spec *) s)->newspec = !!newspec_set;
+	}
+}
+
+/* call btree_elem_free for each member of orgspec and empty orgspec */
+static inline void
+orgspec_dofree(void)
+{
+	struct list_head *lh;
+	struct ptrlist_entry* e;
+
+	for (lh = orgspec.head.next; lh != &orgspec.head;) {
+		e = list_entry(lh, struct ptrlist_entry, head);
+		lh = lh->next;
+		assert((IS_BTREE(e->p) &&
+			!((struct btree_spec *) e->p)->newspec) ||
+		       (IS_ELEM(e->p) &&
+			!((struct dt_elem_spec *) e->p)->newspec));
+		btree_elem_free(e->p);
+		mini_free(e);
+	}
+	INIT_LIST_HEAD(&orgspec.head);
+	orgspec.len = 0;
+}
+
+/* call btree_elem_free for each member of newspec and empty newspec */
+static inline void
+newspec_dofree(void)
+{
+	if (unlikely(newspec == NULL)) {
+		return;
+	}
+	IHASH_KEY_ITERATE(newspec, struct gen_spec *, btree_elem_free);
+	ihash_free(newspec);
+	newspec = NULL;
+}
+
+/* add s to orgspec;
+   possible errors: HE_LOW_MEMORY, HE_IMPOSSIBLE_CONDITION */
+static inline hipac_error
+orgspec_add(struct gen_spec *s)
+{
+	if (unlikely(s == NULL)) {
+		ARG_ERR;
+	}
+	assert((IS_BTREE(s) && !((struct btree_spec *) s)->newspec) ||
+	       (IS_ELEM(s) && !((struct dt_elem_spec *) s)->newspec));
+#ifdef DEBUG
+	return ptrlist_add(&orgspec, s, 1);
+#else
+	return ptrlist_add(&orgspec, s, 0);
+#endif
+}
+
+/* empty orgspec */
+static inline void
+orgspec_flush(void)
+{
+	ptrlist_flush(&orgspec);
+}
+
+/* empty newspec; if newspec_reset is not 0 the newspec bit is set
+   to 0 for each element of newspec */
+static inline void
+newspec_flush(int newspec_reset)
+{
+	if (unlikely(newspec == NULL)) {
+		return;
+	}
+	if (newspec_reset) {
+		IHASH_KEY_ITERATE(newspec, struct gen_spec *,
+				  btree_elem_newspec_set, 0);
+	}
+	ihash_free(newspec);
+	newspec = NULL;
+}
+
+
+/*
+ * history operations
+ */
+
+static void
+history_undo(void)
+{
+	newspec_dofree();
+	orgspec_flush();
+}
+
+static void
+history_commit(int newspec_set)
+{
+	orgspec_dofree();
+	newspec_flush(newspec_set);
+}
+
+#ifdef DEBUG
+/* return 1 if orgspec and newspec are empty and 0 otherwise */
+static int
+history_is_empty(void)
+{
+	return newspec == NULL && list_empty(&orgspec.head);
+}
+#endif
+
+/* s is a new btree or elementary interval layer which does __not__
+   replace another */
+static hipac_error
+history_new(struct gen_spec *s, int newspec_set)
+{
+	int stat;
+
+	if (unlikely(s == NULL)) {
+		ARG_ERR;
+	}
+
+	assert((IS_BTREE(s) || IS_ELEM(s)));
+	if (unlikely(newspec == NULL)) {
+		newspec = ihash_new(INITIAL_NEWSPEC_LEN, 0,
+				    NEWSPEC_AVRG_ELEM_PER_BUCKET,
+				    ihash_func_val, eq_val);
+		if (newspec == NULL) {
+			return HE_LOW_MEMORY;
+		}
+	}
+	stat = ihash_insert(&newspec, s, NULL);
+	if (stat < 0) {
+		return stat;
+	}
+	if (newspec_set) {
+		btree_elem_newspec_set(s, 1);
+	}
+	return stat;
+}
+
+static hipac_error
+history_replace(struct gen_spec *old, struct gen_spec *new, int newspec_set)
+{
+	int stat;
+
+	if (unlikely(old == NULL || new == NULL)) {
+		ARG_ERR;
+	}
+
+	assert((IS_BTREE(old) && IS_BTREE(new)) ||
+	       (IS_ELEM(old) && IS_ELEM(new)));
+	assert(newspec_set ||
+	       (IS_BTREE(old) && !((struct btree_spec *) old)->newspec) ||
+	       (IS_ELEM(old) && !((struct dt_elem_spec *) old)->newspec));
+	assert(newspec_set ||
+	       (IS_BTREE(new) && !((struct btree_spec *) new)->newspec) ||
+	       (IS_ELEM(new) && !((struct dt_elem_spec *) new)->newspec));
+	if (unlikely(newspec == NULL)) {
+		if (newspec_set &&
+		    ((IS_BTREE(old) &&
+		      ((struct btree_spec *) old)->newspec) ||
+		     (IS_ELEM(old) &&
+		      ((struct dt_elem_spec *) old)->newspec))) {
+			IMPOSSIBLE_CONDITION("old must be contained in new"
+					     "spec but newspec is empty");
+		}
+		newspec = ihash_new(INITIAL_NEWSPEC_LEN, 0,
+				    NEWSPEC_AVRG_ELEM_PER_BUCKET,
+				    ihash_func_val, eq_val);
+		if (newspec == NULL) {
+			return HE_LOW_MEMORY;
+		}
+	}
+	if (newspec_set &&
+	    ((IS_BTREE(old) && ((struct btree_spec *) old)->newspec) ||
+	     (IS_ELEM(old) && ((struct dt_elem_spec *) old)->newspec))) {
+		
+		stat = ihash_replace(&newspec, old, NULL, new, NULL);
+		if (stat == HE_OK) {
+			btree_elem_newspec_set(new, 1);
+			btree_elem_free(old);
+		}
+	} else {
+		stat = orgspec_add(old);
+		if (stat < 0) {
+			return stat;
+		}
+		stat = ihash_insert(&newspec, new, NULL);
+		if (stat < 0) {
+			return stat;
+		}
+		if (newspec_set) {
+			btree_elem_newspec_set(new, 1);
+		}
+	}
+	return stat;
+}
+
+/* s is an obsolete btree or elementary interval layer */
+static hipac_error
+history_obsolete(struct gen_spec *s, int newspec_set)
+{
+	if (unlikely(s == NULL)) {
+		ARG_ERR;
+	}
+
+	assert((IS_BTREE(s) || IS_ELEM(s)));
+	assert(newspec_set ||
+	       (IS_BTREE(s) && !((struct btree_spec *) s)->newspec) ||
+	       (IS_ELEM(s) && !((struct dt_elem_spec *) s)->newspec));
+	if (unlikely(newspec == NULL && newspec_set &&
+		     ((IS_BTREE(s) && ((struct btree_spec *) s)->newspec) ||
+		      (IS_ELEM(s) && ((struct dt_elem_spec *) s)->newspec)))) {
+		IMPOSSIBLE_CONDITION("s is obsolete, newspec_set is not 0 and"
+				     " the newspec bit of s is set __but__ s "
+				     "is not contained in newspec");
+	}
+	if (newspec_set &&
+	    ((IS_BTREE(s) && ((struct btree_spec *) s)->newspec) ||
+	     (IS_ELEM(s) && ((struct dt_elem_spec *) s)->newspec))) {
+		if (ihash_delete(newspec, s, NULL) < 0) {
+			IMPOSSIBLE_CONDITION("unable to remove s from "
+					     "newspec");
+		}
+		btree_elem_free(s);
+		return HE_OK;
+	}
+	return orgspec_add(s);
+}
+
+/* hp_realloc can result in a pointer becoming invalid; this function is used
+   to apply this fact to the history */
+static void
+history_del_invalid(struct gen_spec *s)
+{
+	if (unlikely(s == NULL)) {
+		ARG_MSG;
+		return;
+	}
+	if (ihash_delete(newspec, s, NULL) < 0) {
+		ERR("unable to remove invalid pointer from newspec");
+	}
+}
+
+
+
+/*
+ * termrule operations
+ */
+
+/* insert 'rule' in 'term' in sorted order (sorted after pointer addresses);
+   'term' must be sorted before */
+static inline hipac_error
+termrule_insert(struct ptrblock **term, struct dt_rule *rule)
+{
+	__u32 i;
+
+	if (unlikely(term == NULL || rule == NULL)) {
+		ARG_ERR;
+	}
+
+	if (*term == NULL) {
+		*term = ptrblock_new(rule, 1);
+		if (*term == NULL) {
+			return HE_LOW_MEMORY;
+		}
+		return HE_OK;
+	}
+
+#ifdef BIT32_ARCH
+	for (i = 0; i < (*term)->len && 
+		     (__u32) (*term)->p[i] < (__u32) rule; i++);
+#else
+	for (i = 0; i < (*term)->len && 
+		     (__u64) (*term)->p[i] < (__u64) rule; i++);
+#endif
+	if (i < (*term)->len && (*term)->p[i] == rule) {
+		IMPOSSIBLE_CONDITION("rule is already contained in term");
+	}
+	return ptrblock_insert(term, rule, i);
+}
+
+/* delete 'rule' from 'term' which must be in sorted order (sorted after
+   pointer addresses) */
+static inline hipac_error
+termrule_delete(struct ptrblock **term, const struct dt_rule *rule)
+{
+	__u32 i;
+
+	if (unlikely(term == NULL || rule == NULL)) {
+		ARG_ERR;
+	}
+	if (*term == NULL) {
+		/* rule is not in term */
+		return HE_OK;
+	}
+
+#ifdef BIT32_ARCH
+	for (i = 0; i < (*term)->len && 
+		     (__u32) (*term)->p[i] < (__u32) rule; i++);
+#else
+	for (i = 0; i < (*term)->len && 
+		     (__u64) (*term)->p[i] < (__u64) rule; i++);
+#endif
+	
+	if (i >= (*term)->len || (*term)->p[i] != rule) {
+		/* rule is not in term */
+		return HE_OK;
+	}
+	return ptrblock_delete_pos(term, i);
+}
+
+/* delete those rules from 'term' whose match boundaries in dimension 'dimid'
+   lie completely within ['left', 'right'] */
+static inline hipac_error
+termrule_delete_ovl(struct ptrblock **term, __u32 left, __u32 right,
+		    __u8 dimid)
+{
+	__u32 i, curleft, curight;
+	struct dt_match *match;
+	int stat;
+
+	if (unlikely(term == NULL || left > right ||
+		     left > MAXKEY(dim2btype[dimid]) ||
+		     right > MAXKEY(dim2btype[dimid]))) {
+		ARG_ERR;
+	}
+	if (*term == NULL) {
+		return HE_OK;
+	}
+
+       	for (i = 0; i < (*term)->len;) {
+		match = HAS_DT_MATCH((struct dt_rule *) (*term)->p[i]) ?
+			LAST_DT_MATCH((struct dt_rule *) (*term)->p[i]) : NULL;
+		if (match != NULL && match->dimid == dimid) {
+			assert(match->left > 0 ||
+			       match->right < MAXKEY(dim2btype[dimid]));
+			curleft = match->left;
+			curight = match->right;
+		} else {
+			curleft = 0;
+			curight = MAXKEY(dim2btype[dimid]);
+		}
+		if (curleft >= left && curight <= right) {
+			stat = ptrblock_delete_pos(term, i);
+			if (stat < 0) {
+				return stat;
+			}
+			if (*term == NULL) {
+				return HE_OK;
+			}
+		} else {
+			i++;
+		}
+	}
+	return HE_OK;
+}
+
+/* returns 1 if there is a rule in 'term' whose last match m produces the
+   interval represented by 'right' and dimid(m) == 'dimid' */
+static inline int
+termrule_exists(const struct ptrblock *term, __u8 dimid, __u32 right)
+{
+	struct dt_match *match;
+	struct dt_rule **rule;
+	__u32 i;
+	
+	if (unlikely(right > MAXKEY(dim2btype[dimid]))) {
+		ARG_MSG;
+		return 0;
+	}
+	if (term == NULL) {
+		return 0;
+	}
+
+	rule = (struct dt_rule **) term->p;
+	for (i = 0; i < term->len; i++) {
+		match = HAS_DT_MATCH(*rule) ? LAST_DT_MATCH(*rule) : NULL;
+		if (match != NULL && match->dimid == dimid &&
+		    (match->right == right ||
+		     (match->left > 0 && match->left - 1 == right))) {
+			return 1;
+		}
+		rule++;
+	}
+	return 0;
+}
+
+/* return 1 if 'rule' terminates in the elementary interval described by 
+   'right' resp. 'wildcard' and 'dimid'; otherwise 0 is returned */
+static inline int
+rule_term(const struct dt_rule *rule, __u32 right, __u8 wildcard, __u8 dimid)
+{
+	__u32 lbound, ubound;
+	const struct dt_match *match;
+	__u8 match_wc, match_nwc1, match_nwc2;
+
+	if (unlikely(rule == NULL || (wildcard && !HAS_WILDCARD_DIM(dimid)))) {
+		ARG_MSG;
+		return 0;
+	}
+
+	match = HAS_DT_MATCH(rule) ? LAST_DT_MATCH(rule) : NULL;
+	if (match != NULL && match->dimid == dimid) {
+		assert(match->left > 0 ||
+		       match->right < MAXKEY(dim2btype[dimid]));
+		lbound = match->left;
+		ubound = match->right;
+	} else if (match == NULL || match->dimid < dimid) {
+		lbound = 0;
+		ubound = MAXKEY(dim2btype[dimid]);
+	} else {
+		return 0;
+	}
+	
+	match_wc   = wildcard && (match == NULL || match->dimid < dimid);
+	
+	match_nwc1 = !wildcard && HAS_WILDCARD_DIM(dimid) &&
+		match != NULL && match->dimid == dimid && ubound >= right &&
+		lbound <= right;
+	
+	match_nwc2 = !wildcard && !HAS_WILDCARD_DIM(dimid) &&
+		ubound >= right && lbound <= right;
+	
+	return match_wc || match_nwc1 || match_nwc2;
+}
+
+/* store the subset of rules from 'term' that terminate in the elemtary
+   interval represented by 'right' resp. 'wildcard' in dimension 'dimid'
+   in 'subterm' */
+static inline hipac_error
+termrule_subset(const struct ptrblock *term, struct ptrblock **subterm,
+		__u32 right, __u8 wildcard, __u8 dimid)
+{
+	struct dt_rule **rule;
+	int stat;
+	__u32 i;
+
+	if (unlikely(subterm == NULL)) {
+		ARG_ERR;
+	}
+
+	*subterm = NULL;
+	if (term == NULL) {
+		return HE_OK;
+	}
+
+	rule = (struct dt_rule **) term->p;
+	for (i = 0; i < term->len; i++, rule++) {
+		if (rule_term(*rule, right, wildcard, dimid)) {
+			stat = ptrblock_insert(
+				subterm, *rule, *subterm == NULL ? 0 :
+				(*subterm)->len);
+			if (stat < 0) {
+				if (*subterm != NULL) {
+					ptrblock_free(*subterm);
+				}
+				*subterm = NULL;
+				return stat;
+			}
+		}
+	}
+	return HE_OK;
+}
+
+/* merge 'tmpterm' into 'term' so that there are no duplicates;
+   'tmpterm' is freed even if termrule_merge fails */
+static inline hipac_error
+termrule_merge(struct ptrblock **term, struct ptrlist *tmpterm)
+{
+	struct ptrlist_entry *e;
+	struct list_head *lh;
+	int stat;
+	__u32 i;
+	
+	if (unlikely(term == NULL || tmpterm == NULL)) {
+		ARG_ERR;
+	}
+
+	if (ptrlist_is_empty(tmpterm)) {
+		ptrlist_free(tmpterm);
+		return HE_OK;
+	}
+
+	for (lh = tmpterm->head.next, i = 0; lh != &tmpterm->head;) {
+		e = list_entry(lh, struct ptrlist_entry, head);
+#ifdef BIT32_ARCH
+		for (; *term != NULL && i < (*term)->len &&
+			     (__u32) (*term)->p[i] < (__u32) e->p; i++);
+#else
+		for (; *term != NULL && i < (*term)->len &&
+			     (__u64) (*term)->p[i] < (__u64) e->p; i++);
+#endif
+		if (*term == NULL || i == (*term)->len) {
+			/* append rest of tmpterm to term */
+			do {
+				stat = ptrblock_insert(
+					term, e->p, *term == NULL ? 0 :
+					(*term)->len);
+				if (stat < 0) {
+					goto error;
+				}
+				lh = lh->next;
+				ptrlist_free_entry(e);
+				e = list_entry(lh, struct ptrlist_entry, head);
+			} while (lh != &tmpterm->head);
+			break;
+		}
+		if (e->p != (*term)->p[i]) {
+			stat = ptrblock_insert(term, e->p, i++);
+			if (stat < 0) {
+				goto error;
+			}
+		}
+		lh = lh->next;
+		ptrlist_free_entry(e);
+	}
+	ptrlist_free(tmpterm);
+	return HE_OK;
+
+ error:
+	ptrlist_free(tmpterm);
+	return stat;
+}
+
+/* remove all elements of 'delterm' from 'term'; 'delterm' must be completely
+   contained in 'term' */
+static inline hipac_error
+termrule_cut(struct ptrblock **term, struct ptrblock *delterm)
+{
+	__u32 i, j;
+	int stat;
+	
+	if (unlikely(term == NULL)) {
+		ARG_ERR;
+	}
+
+	if (delterm == NULL) {
+		return HE_OK;
+	}
+	if (unlikely(*term == NULL)) {
+		IMPOSSIBLE_CONDITION("unable to cut elements from empty "
+				     "termrule block");
+	}
+
+	for (i = 0, j = 0; *term != NULL && i < (*term)->len &&
+		     j < delterm->len; j++) {
+#ifdef BIT32_ARCH
+		for (; i < (*term)->len &&
+			     (__u32) (*term)->p[i] < (__u32) delterm->p[j];
+		     i++);
+#else
+		for (; i < (*term)->len &&
+			     (__u64) (*term)->p[i] < (__u64) delterm->p[j];
+		     i++);
+#endif
+		if (i >= (*term)->len || (*term)->p[i] != delterm->p[j]) {
+			goto error;
+		}
+		stat = ptrblock_delete_pos(term, i);
+		if (stat < 0) {
+			return stat;
+		}
+	}
+	if (j >= delterm->len) {
+		return HE_OK;
+	}
+
+ error:
+	IMPOSSIBLE_CONDITION("delterm contains elements which are not "
+			     "contained in term");
+}
+
+/* return the terminal rule (terminal target + no function based matches)
+   from 'term' which dominates the elementary interval represented by 'right'
+   resp. 'wildcard' in the dimension specified by 'dimid' and which does not
+   equal 'rule' */
+static inline struct dt_rule *
+termrule_find_best_term(const struct ptrblock *term,
+			const struct dt_rule *rule,
+			__u32 right, __u8 wildcard, __u8 dimid)
+{
+	struct dt_rule *best = NULL;
+	__u32 nextpos = (__u32) ULONG_MAX;
+	struct dt_rule *tr;
+	__u32 i;
+
+	if (unlikely(term == NULL || rule == NULL ||
+		     right > MAXKEY(dim2btype[dimid]) ||
+		     (wildcard && !HAS_WILDCARD_DIM(dimid)))) {
+		ARG_MSG;
+		return NULL;
+	}
+	
+	for (i = 0; i < term->len; i++) {
+		tr = term->p[i];
+		if (!IS_RULE_TERM(tr) || tr == rule) {
+			continue;
+		}
+		if (rule_term(tr, right, wildcard, dimid) &&
+		    tr->spec.pos < nextpos) {
+			nextpos = tr->spec.pos;
+			best = tr;
+		}
+	}
+	return best;
+}
+
+/* return the number(*) of non-terminal rules (non-terminal target or function
+   based matches) in 'term' not equal to 'rule' which terminate in the
+   elementary interval represented by 'right' resp. 'wildcard' in the
+   dimension specified by 'dimid' and whose position is < term_rule->spec.pos
+   if term_rule != NULL; if there is exactly one such non-terminal rule it is
+   stored in 'ntm_rule';
+   (*) the return value ret is 0, 1 or 2; ret == 0 || ret == 1 means there are
+       exactly ret non-terminal rules; ret == 2 means there are >= 2
+       non-terminal rules */
+static inline __u32
+termrule_num_ntm(struct dt_rule **ntm_rule, const struct ptrblock *term,
+		 const struct dt_rule *term_rule, const struct dt_rule *rule,
+		 __u32 right, __u8 wildcard, __u8 dimid)
+{
+	__u32 num = 0;
+	struct dt_rule *tr;
+	__u32 i;
+
+	if (unlikely(ntm_rule == NULL || term == NULL || rule == NULL ||
+		     right > MAXKEY(dim2btype[dimid]) ||
+		     (wildcard && !HAS_WILDCARD_DIM(dimid)))) {
+		ARG_MSG;
+		return 0;
+	}
+	
+	*ntm_rule = NULL;
+	for (i = 0; i < term->len; i++) {
+		tr = term->p[i];
+		if (IS_RULE_TERM(tr) || tr == rule ||
+		    (term_rule != NULL &&
+		     tr->spec.pos >= term_rule->spec.pos)) {
+			continue;
+		}
+		if (rule_term(tr, right, wildcard, dimid)) {
+			*ntm_rule = tr;
+			if (++num == 2) {
+				/* there are at least 2 non-terminal rules
+				   => stop searching */
+				*ntm_rule = NULL;
+				return num;
+			}
+		}
+	}
+	if (num > 1) {
+		*ntm_rule = NULL;
+	}
+	return num;
+}
+
+/* store all non-terminating rules (non-terminal target or function based
+   matches) from 'term' not equal to rule in 'e' which terminate in the
+   elementary interval represented by 'right' resp. 'wildcard' in the
+   dimension specified by 'dimid' and whose position is < max_rule->spec.pos
+   if max_rule != NULL and > min_rule->spec.pos if min_rule != NULL;
+   the rules are stored in e->ntm_rules in sorted order (sorted after their
+   positions) */
+static inline hipac_error
+termrule_insert_ntm(struct dt_elem **e, const struct ptrblock *term,
+		    const struct dt_rule *min_rule,
+		    const struct dt_rule *max_rule,
+		    const struct dt_rule *rule,
+		    __u32 right, __u8 wildcard, __u8 dimid)
+{
+	struct dt_rule *tr;
+	__u32 i, j, stat;
+
+	if (unlikely(e == NULL || *e == NULL || term == NULL ||
+		     right > MAXKEY(dim2btype[dimid]) ||
+		     (wildcard && !HAS_WILDCARD_DIM(dimid)))) {
+		ARG_ERR;
+	}
+	
+	for (i = 0; i < term->len; i++) {
+		tr = term->p[i];
+		if (IS_RULE_TERM(tr) || tr == rule ||
+		    (min_rule != NULL &&
+		     (tr->spec.pos <= min_rule->spec.pos)) ||
+		    (max_rule != NULL &&
+		     (tr->spec.pos >= max_rule->spec.pos))) {
+			continue;
+		}
+		if (rule_term(tr, right, wildcard, dimid)) {
+			for (j = 0; j < (*e)->ntm_rules.len &&
+				     ((struct dt_rule *)
+				      (*e)->ntm_rules.p[j])->spec.pos <
+				     tr->spec.pos; j++);
+			stat = ptrblock_insert_embed((void **) e,
+						     offsetof(struct dt_elem,
+							      ntm_rules),
+						     tr, j);
+			if (stat < 0) {
+				return stat;
+			}
+		}
+	}
+	return HE_OK;
+}
+
+
+
+/*
+ * tmp_termrule operations
+ */
+
+static inline struct ptrlist *
+tmp_termrule_new(void)
+{
+	return ptrlist_new();
+}
+
+static inline void
+tmp_termrule_free(struct ptrlist *tmpterm)
+{
+	return ptrlist_free(tmpterm);
+}
+
+/* merge 'term' into 'tmpterm' so that there are no duplicates */
+static inline hipac_error
+tmp_termrule_merge(struct ptrlist *tmpterm, struct ptrblock *term)
+{
+	struct ptrlist_entry *e;
+	struct list_head *lh;
+	int stat;
+	__u32 i;
+	
+	if (unlikely(tmpterm == NULL)) {
+		ARG_ERR;
+	}
+
+	if (term == NULL) {
+		return HE_OK;
+	}
+
+	for (i = 0, lh = tmpterm->head.next; i < term->len; i++) {
+#ifdef BIT32_ARCH
+		for (; lh != &tmpterm->head &&
+			     (__u32) list_entry(lh, struct ptrlist_entry,
+						head)->p <
+			     (__u32) term->p[i]; lh = lh->next);
+#else
+		for (; lh != &tmpterm->head &&
+			     (__u64) list_entry(lh, struct ptrlist_entry,
+						head)->p <
+			     (__u64) term->p[i]; lh = lh->next);
+#endif
+		if (lh == &tmpterm->head) {
+			/* append rest of term to tmpterm */
+			for (; i < term->len; i++) {
+				stat = ptrlist_add(tmpterm, term->p[i], 0);
+				if (stat < 0) {
+					return stat;
+				}
+			}
+			break;
+		}
+		e = list_entry(lh, struct ptrlist_entry, head);
+		if (e->p != term->p[i]) {
+			e = ptrlist_new_entry(term->p[i]);
+			if (e == NULL) {
+				return HE_LOW_MEMORY;
+			}
+			list_add_tail(&e->head, lh);
+			tmpterm->len++;
+		}
+	}
+	return HE_OK;
+}
+
+
+
+/*
+ * elementary interval operations
+ */
+
+/* create new elementary interval layer with ntm_len non-terminal rules
+   which are stored in ntm_rules sorted after their positions */
+static inline struct dt_elem *
+elem_new(struct dt_rule *term_rule, struct dt_rule *ntm_rules[], __u32 ntm_len)
+{
+	struct dt_elem *e;
+	__u32 i;
+
+	if (unlikely(ntm_len == 0 || ntm_rules == NULL || *ntm_rules == NULL ||
+		     (termrule == NULL && ntm_len <= 1))) {
+		ARG_MSG;
+		return NULL;
+	}
+
+	e = hp_alloc(sizeof(*e) + ntm_len * sizeof(*e->ntm_rules.p), 1);
+	if (e == NULL) {
+		return NULL;
+	}
+	e->spec.bittype = BIT_RULE;
+	e->spec.rtype = RT_ELEM;
+	e->spec.newspec = 0;
+	e->term_rule = term_rule;
+	e->ntm_rules.len = ntm_len;
+	for (i = 0; i < ntm_len; i++) {
+		e->ntm_rules.p[i] = ntm_rules[i];
+	}
+	return e;
+}
+
+/* create new elementary interval layer with 0 non-terminal rules; notice that
+   the resulting elementary interval is not valid because it __must__ contain
+   at least one non-terminal rule */
+static inline struct dt_elem *
+elem_new_empty(struct dt_rule *term_rule)
+{
+	struct dt_elem *e;
+	
+	e = hp_alloc(sizeof(*e), 1);
+	if (e == NULL) {
+		return NULL;
+	}
+	e->spec.bittype = BIT_RULE;
+	e->spec.rtype = RT_ELEM;
+	e->spec.newspec = 0;
+	e->term_rule = term_rule;
+	e->ntm_rules.len = 0;
+	return e;
+}
+
+static inline void
+elem_free(struct dt_elem *e)
+{
+	if (unlikely(e == NULL)) {
+		ARG_MSG;
+		return;
+	}
+	hp_free(e);
+}
+
+static inline int
+elem_eq(const struct dt_elem *e1, const struct dt_elem *e2)
+{
+	if (e1 == NULL || e2 == NULL || !IS_ELEM(e1) || !IS_ELEM(e2)) {
+		ARG_MSG;
+		return 0;
+	}
+	if (e1->term_rule != e2->term_rule ||
+	    !ptrblock_eq(&e1->ntm_rules, &e2->ntm_rules)) {
+		return 0;
+	}
+	return 1;
+}
+
+static inline hipac_error
+elem_clone(struct dt_elem *e, struct dt_elem **clone)
+{
+	if (e == NULL || clone == NULL) {
+		ARG_ERR;
+	}
+
+	*clone = hp_alloc(sizeof(*e) + e->ntm_rules.len *
+			  sizeof(*e->ntm_rules.p), 1);
+	if (*clone == NULL) {
+		return HE_LOW_MEMORY;
+	}
+	memcpy(*clone, e, sizeof(*e) + e->ntm_rules.len *
+	       sizeof(*e->ntm_rules.p));
+	return HE_OK;
+}
+
+/* forward declaration */
+static int 
+btree_eq_rec(const struct btree_spec *spec1, const struct btree_spec *spec2);
+
+/* return 1 if g1 and g2 are equal and rules;
+   return 2 if g1 and g2 are equal and elementary intervals;
+   return 3 if g1 and g2 are equal and btrees;
+   return 0 otherwise */
+static inline int
+btree_rule_elem_eq(const struct gen_spec *g1, const struct gen_spec *g2)
+{
+	if (g1 == NULL || g2 == NULL ||
+	    (IS_RULE(g1) && IS_RULE(g2))) {
+		return g1 == g2;
+	} else if (IS_ELEM(g1) && IS_ELEM(g2)) {
+		struct dt_elem *e1 = (struct dt_elem *) g1;
+		struct dt_elem *e2 = (struct dt_elem *) g2;
+
+		if (e1->ntm_rules.len != e2->ntm_rules.len) {
+			return 0;
+		}
+		return elem_eq(e1, e2) ? 2 : 0;
+	} else if (IS_BTREE(g1) && IS_BTREE(g2)) {
+		struct btree_spec *b1 = (struct btree_spec *) g1;
+		struct btree_spec *b2 = (struct btree_spec *) g2;
+
+		return (btree_spec_eq(b1, b2) && btree_eq_rec(b1, b2)) ? 3 : 0;
+	}
+	return 0;
+}
+
+/* insert rule into rule_elem which can be a rule or an elementary interval
+   layer; the result which can be a rule or an elementary interval layer
+   is directly written to rule_elem */
+static inline hipac_error
+rule_elem_insert(struct dt_rule_elem_spec **rule_elem, struct dt_rule *rule,
+		 int newspec_set)
+{
+	int stat;
+
+	if (unlikely(rule_elem == NULL || rule == NULL)) {
+		ARG_ERR;
+	}
+
+	if (*rule_elem == NULL) {
+		*rule_elem = (struct dt_rule_elem_spec *) rule;
+		return HE_OK;
+	}
+
+	assert(IS_RULE(*rule_elem) || IS_ELEM(*rule_elem));
+	assert(!IS_ELEM(*rule_elem) ||
+	       ((struct dt_elem *) *rule_elem)->ntm_rules.len > 0);
+	assert(!IS_ELEM(*rule_elem) ||
+	       ((struct dt_elem *) *rule_elem)->term_rule != NULL ||
+	       ((struct dt_elem *) *rule_elem)->ntm_rules.len > 1);
+
+	if (IS_RULE(*rule_elem)) {
+		struct dt_rule *r = (struct dt_rule *) *rule_elem;
+		
+		if (IS_RULE_TERM(rule) && IS_RULE_TERM(r)) {
+			if (rule->spec.pos < r->spec.pos) {
+				*rule_elem = (struct dt_rule_elem_spec *) rule;
+			}
+			return HE_OK;
+		
+		} else if (!IS_RULE_TERM(rule) && !IS_RULE_TERM(r)) {
+			struct dt_rule *ntm[2];
+			struct dt_elem *e;
+			if (r->spec.pos < rule->spec.pos) {
+				ntm[0] = r;
+				ntm[1] = rule;
+			} else {
+				ntm[0] = rule;
+				ntm[1] = r;
+			}
+			e = elem_new(NULL, ntm, sizeof(ntm) / sizeof(*ntm));
+			if (e == NULL) {
+				return HE_LOW_MEMORY;
+			}
+			stat = history_new((struct gen_spec *) e, newspec_set);
+			if (stat < 0) {
+				elem_free(e);
+				return stat;
+			}
+			*rule_elem = (struct dt_rule_elem_spec *) e;
+			return HE_OK;
+			
+		} else {
+			struct dt_rule *term_rule, *ntm_rule;
+			struct dt_elem *e;
+			if (IS_RULE_TERM(rule)) {
+				term_rule = rule;
+				ntm_rule = r;
+			} else {
+				term_rule = r;
+				ntm_rule = rule;
+			}
+			if (term_rule->spec.pos < ntm_rule->spec.pos) {
+				*rule_elem = (struct dt_rule_elem_spec *)
+					term_rule;
+				return HE_OK;
+			}
+			e = elem_new(term_rule, &ntm_rule, 1);
+			if (e == NULL) {
+				return HE_LOW_MEMORY;
+			}
+			stat = history_new((struct gen_spec *) e, newspec_set);
+			if (stat < 0) {
+				elem_free(e);
+				return stat;
+			}
+			*rule_elem = (struct dt_rule_elem_spec *) e;
+			return HE_OK;
+		}
+	} else {
+		/* IS_ELEM(*rule_elem) */
+		struct dt_elem *e = (struct dt_elem *) *rule_elem;
+		__u32 i;
+		
+		if (e->term_rule != NULL && 
+		    rule->spec.pos > e->term_rule->spec.pos) {
+			/* rule is never matched */
+			return HE_OK;
+		}
+		if (IS_RULE_TERM(rule)) {
+			/* find still matching rules if any */
+			if (((struct dt_rule *) e->ntm_rules.p[0])->spec.pos >
+			    rule->spec.pos) {
+				stat = history_obsolete((struct gen_spec *) e,
+							newspec_set);
+				if (stat < 0) {
+					return stat;
+				}
+				*rule_elem = (struct dt_rule_elem_spec *) rule;
+				return HE_OK;
+			}
+			e->term_rule = rule;
+			i = e->ntm_rules.len;
+			do {
+				i--;
+				if (((struct dt_rule *)
+				     e->ntm_rules.p[i])->spec.pos <
+				    rule->spec.pos) {
+					break;
+				}
+			} while (i > 0);
+			assert(((struct dt_rule *)
+				e->ntm_rules.p[i])->spec.pos < rule->spec.pos);
+			if (i < e->ntm_rules.len - 1) {
+				struct dt_elem *e2;
+				e2 = hp_realloc(e, sizeof(*e) + (i + 1) *
+						sizeof(*e->ntm_rules.p));
+				if (e2 == NULL) {
+					/* this should never happen as we
+					   shrink e */
+					return HE_LOW_MEMORY;
+				}
+				if (e != e2) {
+					history_del_invalid(
+						(struct gen_spec *) e);
+					stat = history_new(
+						(struct gen_spec *) e2,
+						newspec_set);
+					if (stat < 0) {
+						elem_free(e2);
+						return stat;
+					}
+				}
+				e2->ntm_rules.len = i + 1;
+				*rule_elem = (struct dt_rule_elem_spec *) e2;
+			}
+			return HE_OK;
+
+		} else {
+			/* !IS_RULE_TERM(rule) */
+			for (i = 0; i < e->ntm_rules.len &&
+				     ((struct dt_rule *)
+				      e->ntm_rules.p[i])->spec.pos <
+				     rule->spec.pos; i++);
+			stat = ptrblock_insert_embed((void **) rule_elem,
+						     offsetof(struct dt_elem,
+							      ntm_rules),
+						     rule, i);
+			if (stat < 0) {
+				return stat;
+			}
+			if (e != (struct dt_elem *) *rule_elem) {
+				history_del_invalid((struct gen_spec *) e);
+				stat = history_new((struct gen_spec *)
+						   *rule_elem, newspec_set);
+				if (stat < 0) {
+					elem_free((struct dt_elem *)
+						  *rule_elem);
+					return stat;
+				}
+			}
+			return HE_OK;
+		}
+	}
+}
+
+/* delete rule from rule_elem which can be a rule or an elementary interval
+   layer; if rule is not contained in rule_elem nothing happens;
+   the result which can be a rule or an elementary interval layer is directly
+   written to rule_elem; term, right, wildcard and dimid must be given to
+   find the next best rule(s) if necessary */
+static inline hipac_error
+rule_elem_delete(struct dt_rule_elem_spec **rule_elem,
+		 const struct dt_rule *rule, const struct ptrblock *term,
+		 __u32 right, __u8 wildcard, __u8 dimid, int newspec_set)
+{
+	int stat;
+
+	if (unlikely(rule_elem == NULL || rule == NULL || term == NULL ||
+		     right > MAXKEY(dim2btype[dimid]) ||
+		     (wildcard && !HAS_WILDCARD_DIM(dimid)))) {
+		ARG_ERR;
+	}
+
+	if (*rule_elem == NULL) {
+		/* rule is not contained in rule_elem */
+		return HE_OK;
+	}
+
+	assert(IS_RULE(*rule_elem) || IS_ELEM(*rule_elem));
+	assert(!IS_ELEM(*rule_elem) ||
+	       ((struct dt_elem *) *rule_elem)->ntm_rules.len > 0);
+	assert(!IS_ELEM(*rule_elem) ||
+	       ((struct dt_elem *) *rule_elem)->term_rule != NULL ||
+	       ((struct dt_elem *) *rule_elem)->ntm_rules.len > 1);
+
+	if (IS_RULE(*rule_elem)) {
+		struct dt_rule *r = (struct dt_rule *) *rule_elem;
+		struct dt_rule *term_rule, *ntm_rule = NULL;
+		__u32 ntm_num;
+
+		if (r != rule) {
+			/* rule is not contained in rule_elem */
+			return HE_OK;
+		}
+
+		/* in fact it would suffice to call termrule_find_best_term
+		   only if IS_RULE_TERM(r) */
+		term_rule = termrule_find_best_term(term, rule, right,
+						    wildcard, dimid);
+		ntm_num = termrule_num_ntm(&ntm_rule, term, term_rule, rule,
+					   right, wildcard, dimid);
+		if (term_rule == NULL && ntm_num <= 1) {
+			*rule_elem = (struct dt_rule_elem_spec *) ntm_rule;
+			return HE_OK;
+		} else if (term_rule != NULL && ntm_num == 0) {
+			*rule_elem = (struct dt_rule_elem_spec *) term_rule;
+			return HE_OK;
+		} else {
+			struct dt_elem *e = elem_new_empty(term_rule);
+			if (e == NULL) {
+				return HE_LOW_MEMORY;
+			}
+			stat = termrule_insert_ntm(&e, term, NULL, term_rule,
+						   rule, right, wildcard,
+						   dimid);
+			if (stat < 0) {
+				hp_free(e);
+				return stat;
+			}
+			assert(e->ntm_rules.len > 0);
+			stat = history_new((struct gen_spec *) e, newspec_set);
+			if (stat < 0) {
+				elem_free(e);
+				return stat;
+			}
+			*rule_elem = (struct dt_rule_elem_spec *) e;
+			return HE_OK;
+		}
+	} else {
+		/* IS_ELEM(*rule_elem) */
+		struct dt_elem *e = (struct dt_elem *) *rule_elem;
+		__u32 i;
+		
+		if (e->term_rule == rule) {
+			struct dt_rule *term_rule;
+			term_rule = termrule_find_best_term(
+				term, rule, right, wildcard, dimid);
+			stat = termrule_insert_ntm(
+				(struct dt_elem **) rule_elem, term,
+				e->ntm_rules.p[e->ntm_rules.len - 1],
+				term_rule, rule, right, wildcard, dimid);
+			if (stat < 0) {
+				/* we only care about rule_elem if its address
+				   has changed; otherwise rule_elem is 
+				   handled by the history */
+				if (e != (struct dt_elem *) *rule_elem) {
+					history_del_invalid((struct gen_spec *)
+							    e);
+					elem_free((struct dt_elem *)
+						  *rule_elem);
+				}
+				return stat;
+			}
+			if (e != (struct dt_elem *) *rule_elem) {
+				history_del_invalid((struct gen_spec *) e);
+				stat = history_new((struct gen_spec *)
+						   *rule_elem, newspec_set);
+				if (stat < 0) {
+					elem_free((struct dt_elem *)
+						  *rule_elem);
+					return stat;
+				}
+			}
+			e = (struct dt_elem *) *rule_elem;
+			if (term_rule == NULL && e->ntm_rules.len == 1) {
+				struct dt_rule_elem_spec *ntm =
+					e->ntm_rules.p[0];
+				stat = history_obsolete((struct gen_spec *) e,
+							newspec_set);
+				if (stat < 0) {
+					return stat;
+				}
+				*rule_elem = ntm;
+				return HE_OK;
+			}
+			e->term_rule = term_rule;
+			return HE_OK;
+		} else {
+			for (i = 0; i < e->ntm_rules.len &&
+				     ((struct dt_rule *)
+				      e->ntm_rules.p[i])->spec.pos <
+				     rule->spec.pos; i++);
+			if (i >= e->ntm_rules.len ||
+			    e->ntm_rules.p[i] != rule) {
+				/* rule is not contained in rule_elem */
+				return HE_OK;
+			}
+			if (e->ntm_rules.len == 1) {
+				struct dt_rule_elem_spec *tm =
+					(struct dt_rule_elem_spec *)
+					e->term_rule;
+				stat = history_obsolete((struct gen_spec *) e,
+							newspec_set);
+				if (stat < 0) {
+					return stat;
+				}
+				*rule_elem = tm;
+				return HE_OK;
+			} else if (e->term_rule == NULL &&
+				   e->ntm_rules.len == 2) {
+				struct dt_rule_elem_spec *ntm =
+					(struct dt_rule_elem_spec *)
+					e->ntm_rules.p[(i + 1) % 2];
+				stat = history_obsolete((struct gen_spec *) e,
+							newspec_set);
+				if (stat < 0) {
+					return stat;
+				}
+				*rule_elem = ntm;
+				return HE_OK;
+			} else {
+				stat = ptrblock_delete_pos_embed(
+					(void **) rule_elem,
+					offsetof(struct dt_elem, ntm_rules),
+					i);
+				if (stat < 0) {
+					return stat;
+				}
+				if (e != (struct dt_elem *) *rule_elem) {
+					history_del_invalid(
+						(struct gen_spec *) e);
+					stat = history_new((struct gen_spec *)
+							   *rule_elem,
+							   newspec_set);
+					if (stat < 0) {
+						elem_free((struct dt_elem *)
+							  *rule_elem);
+						return stat;
+					}
+				}
+				return HE_OK;
+			}
+		}
+	}
+}
+
+
+
+/*
+ * recursive btree operations
+ */
+
+/* necessary forward declaration */
+static hipac_error
+btree_clone_rec(const struct btree_spec *spec, struct btree_spec **clone,
+		int newspec_set);
+
+static inline hipac_error
+btree_clone_help(struct gen_spec **g, int newspec_set)
+{
+	int stat = HE_OK;
+
+	if (*g == NULL) {
+		return HE_OK;
+	}
+	if (IS_BTREE(*g)) {
+		stat = btree_clone_rec((struct btree_spec *) *g,
+				       (struct btree_spec **) g,
+				       newspec_set);
+		if (stat < 0) {
+			return stat;
+		}
+	} else if (IS_ELEM(*g)) {
+		struct dt_elem *clone;
+		stat = elem_clone((struct dt_elem *) *g, &clone);
+		if (stat < 0) {
+			return stat;
+		}
+		stat = history_new((struct gen_spec *) clone,
+				   newspec_set);
+		if (stat < 0) {
+			elem_free(clone);
+			return stat;
+		}
+		*g = (struct gen_spec *) clone;
+	}
+	return HE_OK;
+}
+
+/* clone spec including the elementary interval layers recursively and call
+   history_new for each clone;
+   possible errors: HE_LOW_MEMORY, HE_IMPOSSIBLE_CONDITION */
+static hipac_error
+btree_clone_rec(const struct btree_spec *spec, struct btree_spec **clone,
+		int newspec_set)
+{
+	struct gen_spec **nextspec = NULL;
+	__u16 leaves, jump, last_leaf;
+	__u16 i, n, num;
+	__u32 size;
+	int stat;
+
+	if (unlikely(spec == NULL || clone == NULL)) {
+		ARG_ERR;
+	}
+	
+	size = btree_size(spec);
+	*clone = hp_alloc(size, 1);
+	if (*clone == NULL) {
+		return HE_LOW_MEMORY;
+	}
+	
+	memcpy(*clone, spec, size);
+	stat = ptrblock_clone(*termrule(spec), termrule(*clone));
+	if (stat < 0) {
+		hp_free(*clone);
+		return stat;
+	}
+	
+	stat = history_new((struct gen_spec *) *clone, newspec_set);
+	if (stat < 0) {
+		hp_free(*termrule(*clone));
+		hp_free(*clone);
+		return stat;
+	}
+	
+	btree_set_iteratevals(*clone, &leaves, &num, &jump, &last_leaf,
+			      &nextspec);
+	assert(nextspec != NULL);
+	
+	for (i = 0; i < leaves ; i++) {
+		for (n = 0; n < num; n++) {
+			stat = btree_clone_help(nextspec + n, newspec_set);
+			if (stat < 0) {
+				return stat;
+			}
+		}
+		nextspec = (struct gen_spec **) ((__u8 *) nextspec + jump);
+	}
+	
+	for (n = 0; n < last_leaf; n++) {
+		stat = btree_clone_help(nextspec + n, newspec_set);
+		if (stat < 0) {
+			return stat;
+		}
+	}
+	
+	if (HAS_WILDCARD_SPEC(*clone)) {
+		stat = btree_clone_help(WILDCARD(*clone), newspec_set);
+		if (stat < 0) {
+			return stat;
+		}
+	}
+	return HE_OK;
+}
+
+/* necessary forward declaration */
+static hipac_error
+btree_free_rec(struct btree_spec *spec, int newspec_set, int direct_free);
+
+static inline hipac_error
+btree_free_help(struct gen_spec *g, int newspec_set, int direct_free)
+{
+	int stat;
+
+	if (g == NULL) {
+		return HE_OK;
+	}
+	if (IS_BTREE(g)) {
+		stat = btree_free_rec((struct btree_spec *) g, newspec_set,
+				      direct_free);
+		if (stat < 0) {
+			return stat;
+		}
+	} else if (IS_ELEM(g)) {
+		if (direct_free) {
+			btree_elem_free(g);
+		} else {
+			stat = history_obsolete(g, newspec_set);
+			if (stat < 0) {
+				return stat;
+			}
+		}
+	}
+	return HE_OK;
+}
+
+/* 'free' spec including the elementary interval layers recursively;
+   if direct_free is 0 'free' means to call history_obsolete for each element;
+   otherwise the elements are directly freed by btree_elem_free;
+   possible errors: HE_LOW_MEMORY, HE_IMPOSSIBLE_CONDITION */
+static hipac_error
+btree_free_rec(struct btree_spec *spec, int newspec_set, int direct_free)
+{
+	struct gen_spec **nextspec = NULL;
+	__u16 leaves, jump, last_leaf;
+	__u16 i, n, num;
+	int stat;
+	
+	if (unlikely(spec == NULL)) {
+		ARG_ERR;
+	}
+	
+	btree_set_iteratevals(spec, &leaves, &num, &jump, &last_leaf,
+			      &nextspec);
+	assert(nextspec != NULL);
+
+	for (i = 0; i < leaves; i++) {
+		for (n = 0; n < num; n++) {
+			stat = btree_free_help(*(nextspec + n), newspec_set,
+					       direct_free);
+			if (stat < 0) {
+				return stat;
+			}
+		}
+		nextspec = (struct gen_spec **) ((__u8 *) nextspec + jump);
+	}
+	
+	for (n = 0; n < last_leaf; n++) {
+		stat = btree_free_help(*(nextspec + n), newspec_set,
+				       direct_free);
+		if (stat < 0) {
+			return stat;
+		}
+	}
+
+	if (HAS_WILDCARD_SPEC(spec)) {
+		stat = btree_free_help(*WILDCARD(spec), newspec_set,
+				       direct_free);
+		if (stat < 0) {
+			return stat;
+		}
+	}
+
+	if (direct_free) {
+		btree_elem_free((struct gen_spec *) spec);
+		return HE_OK;
+	}
+	return history_obsolete((struct gen_spec *) spec, newspec_set);
+}
+
+/* return 1 if spec1 and spec2 are recursively equal; the headers spec1 and
+   spec2 are assumed to be equal */
+static int
+btree_eq_rec(const struct btree_spec *spec1, const struct btree_spec *spec2)
+{
+	struct gen_spec **nextspec1 = NULL, **nextspec2 = NULL;
+	__u16 leaves, jump, last_leaf;
+	__u16 i, n, num;
+	
+	if (unlikely(spec1 == NULL || spec2 == NULL)) {
+		ARG_ERR;
+	}
+
+	assert(IS_BTREE(spec1));
+	assert(IS_BTREE(spec2));
+	assert(btree_spec_eq(spec1, spec2));
+
+	if (!ptrblock_eq(*termrule(spec1), *termrule(spec2))) {
+		return 0;
+	}
+	
+	btree_set_iteratevals(spec1, &leaves, &num, &jump, &last_leaf,
+			      &nextspec1);
+	assert(nextspec1 != NULL);
+	btree_set_iteratevals(spec2, &leaves, &num, &jump, &last_leaf,
+			      &nextspec2);
+	assert(nextspec2 != NULL);
+
+	/* we don't need to compare the keys of spec1 and spec2 because for
+	   each corresponding btree pair the termrule blocks are compared
+	   which means that if btree_eq_rec finally returns 1 the same rules
+	   terminate in the subtree rooted by the top level btree spec1 and in
+	   the subtree rooted by the top level btree spec2; since all leaves
+	   of the subtrees are terminal (NULL, rule or elementary interval
+	   layer) we can conclude that there is no other rule except those in
+	   the termrule blocks that have created keys in the btrees */
+	for (i = 0; i < leaves; i++) {
+		for (n = 0; n < num; n++) {
+			if (!btree_rule_elem_eq(*(nextspec1 + n),
+						*(nextspec2 + n))) {
+				return 0;
+			}
+		}
+		nextspec1 = (struct gen_spec **) ((__u8 *) nextspec1 + jump);
+		nextspec2 = (struct gen_spec **) ((__u8 *) nextspec2 + jump);
+	}
+
+	for (n = 0; n < last_leaf; n++) {
+		if (!btree_rule_elem_eq(*(nextspec1 + n), 
+					*(nextspec2 + n))) {
+			return 0;
+		}
+	}
+
+	if (HAS_WILDCARD_SPEC(spec1) &&
+	    !btree_rule_elem_eq(*WILDCARD(spec1), *WILDCARD(spec2))) {
+		return 0;
+	}
+	return 1;
+}
+
+
+
+/*
+ * internal dimtree operations
+ */
+
+static inline hipac_error
+btree_clone_ifneeded(struct btree_spec *b, struct btree_spec **newb,
+		     int newspec_set)
+{
+	int stat;
+
+	if (unlikely(b == NULL || newb == NULL)) {
+		ARG_ERR;
+	}
+
+	if (b->newspec == 0) {
+		/* we must clone because b is visible for packet matching */
+		stat = btree_clone(b, newb);
+		if (stat < 0) {
+			return stat;
+		}
+		stat = history_replace((struct gen_spec *) b,
+				       (struct gen_spec *) *newb, newspec_set);
+		if (stat < 0) {
+			btree_free(*newb);
+			return stat;
+		}
+	} else {
+		/* b can be modified directly */
+		*newb = b;
+	}
+	return HE_OK;
+}
+
+static inline hipac_error
+elem_clone_ifneeded(struct dt_elem *e, struct dt_elem **newe,
+		    int newspec_set)
+{
+	int stat;
+
+	if (unlikely(e == NULL || newe == NULL)) {
+		ARG_ERR;
+	}
+
+	if (e->spec.newspec == 0) {
+		/* we must clone because e is visible for packet matching */
+		stat = elem_clone(e, newe);
+		if (stat < 0) {
+			return stat;
+		}
+		stat = history_replace((struct gen_spec *) e,
+				       (struct gen_spec *) *newe, newspec_set);
+		if (stat < 0) {
+			elem_free(*newe);
+			return stat;
+		}
+	} else {
+		/* e can be modified directly */
+		*newe = e;
+	}
+	return HE_OK;
+}
+
+#ifdef DEBUG
+static void
+print_elem(struct dt_elem *e)
+{
+	int i;
+
+	DPRINT(DEBUG_DIMTREE, "term_rule: %p, ntm_rules:", e->term_rule);
+	if (e->ntm_rules.len == 0) {
+		DPRINT(DEBUG_DIMTREE, " <none> => BUG");
+		return;
+	}
+	for (i = 0; i < e->ntm_rules.len; i++) {
+		DPRINT(DEBUG_DIMTREE, " %p", e->ntm_rules.p[i]);
+	}
+}
+
+static void
+print_btree(struct btree_spec *btree)
+{
+	__u32 key = 0;
+	struct locate_inf inf;
+	int i;
+
+	if (btree == NULL) {
+		DPRINT(DEBUG_DIMTREE, "btree: %p (this might not be what you "
+		       "expected)\n", btree);
+		return;
+	}
+	if (!IS_BTREE(btree)) {
+		DPRINT(DEBUG_DIMTREE, "btree: %p is __NOT__ a btree => FATAL "
+		       "ERROR\n", btree);
+		return;
+	}
+	DPRINT(DEBUG_DIMTREE, "btree: %p  -  bittype: %d, btreetype: %d, "
+	       "blocks: %d, dimid: %d, newspec: %d, num: %d\n", btree,
+	       btree->bittype, btree->btreetype, btree->blocks, btree->dimid,
+	       btree->newspec, btree->num);
+	DPRINT(DEBUG_DIMTREE, "   content:");
+	if (HAS_WILDCARD_DIM(btree->dimid)) {
+		if (*WILDCARD(btree) != NULL && IS_RULE(*WILDCARD(btree))) {
+			DPRINT(DEBUG_DIMTREE, " (wc, %p: rule)",
+			       *WILDCARD(btree));
+		} else if (*WILDCARD(btree) != NULL && 
+			   IS_ELEM(*WILDCARD(btree))) {
+			DPRINT(DEBUG_DIMTREE, " (wc, %p: ", *WILDCARD(btree));
+			print_elem((struct dt_elem *) *WILDCARD(btree));
+			DPRINT(DEBUG_DIMTREE, ")");
+		} else {
+			DPRINT(DEBUG_DIMTREE, " (wc, %p)", *WILDCARD(btree));
+		}
+	}
+	do {
+		if (btree_locate(btree, &inf, key) < 0) {
+			DPRINT(DEBUG_DIMTREE, "\n%s: no memory for locate "
+			       "info\n", __FUNCTION__);
+			return;
+		}
+		if (*inf.nextspec != NULL && IS_RULE(*inf.nextspec)) {
+			DPRINT(DEBUG_DIMTREE, " (%u, %p: rule)", inf.key,
+			       *inf.nextspec);
+		} else if (*inf.nextspec != NULL && 
+			   IS_ELEM(*inf.nextspec)) {
+			DPRINT(DEBUG_DIMTREE, " (%u, %p: ", inf.key,
+			       *inf.nextspec);
+			print_elem((struct dt_elem *) *inf.nextspec);
+			DPRINT(DEBUG_DIMTREE, ")");
+		} else {
+			DPRINT(DEBUG_DIMTREE, " (%u, %p)", inf.key,
+			       *inf.nextspec);
+		}
+		key = inf.key + 1;
+	} while (inf.key < MAXKEY(dim2btype[btree->dimid]));
+	DPRINT(DEBUG_DIMTREE, "\n   term:");
+	if (*termrule(btree) == NULL) {
+		DPRINT(DEBUG_DIMTREE, " <empty>\n");
+	} else {
+		for (i = 0; i < (*termrule(btree))->len; i++) {
+			DPRINT(DEBUG_DIMTREE, " %p", (*termrule(btree))->p[i]);
+		}
+		DPRINT(DEBUG_DIMTREE, "\n");
+	}
+}
+#endif
+
+static inline hipac_error
+segment_insert_help(struct locate_inf *inf, __u8 *ins_num,
+		    struct gen_spec* new_nextspec[], int newspec_set)
+{
+	int stat;
+
+	if (*inf->nextspec == NULL || IS_RULE(*inf->nextspec)) {
+		new_nextspec[*ins_num] = *inf->nextspec;
+	} else if (IS_ELEM(*inf->nextspec)) {
+		struct dt_elem *e;
+		stat = elem_clone((struct dt_elem *) *inf->nextspec, &e);
+		if (stat < 0) {
+			return stat;
+		}
+		stat = history_new((struct gen_spec *) e, newspec_set);
+		if (stat < 0) {
+			elem_free(e);
+			return stat;
+		}
+		new_nextspec[*ins_num] = (struct gen_spec *) e;
+	} else {
+		assert(IS_BTREE(*inf->nextspec));
+		stat = btree_clone_rec(
+			(struct btree_spec *) *inf->nextspec,
+			(struct btree_spec **) &new_nextspec[*ins_num],
+			newspec_set);
+		if (stat < 0) {
+			return stat;
+		}
+	}
+	(*ins_num)++;
+	return HE_OK;
+}
+
+/* segment [left, right] is inserted into spec which causes at most two new
+   elementary intervals being created; for every new elementary interval
+   the neighbour interval is cloned recursively */
+static inline hipac_error
+segment_insert(struct btree_spec **spec, __u32 left, __u32 right,
+	       int newspec_set)
+{  	
+	__u8 ins_num = 0;
+	struct gen_spec* new_nextspec[2];
+	struct locate_inf inf;
+	__u32 new_key[2];
+	int stat;
+
+	DPRINT(DEBUG_DIMTREE,
+	       "----------------------------------------------------------\n");
+	DPRINT(DEBUG_DIMTREE, "%s: left: %u, right: %u, newspec_set: %d\n",
+	       __FUNCTION__, left, right, newspec_set);
+#ifdef DEBUG
+	print_btree(*spec);
+#endif
+	if (left > 0) {
+		stat = btree_locate(*spec, &inf, left - 1);
+		if (stat < 0) {
+			return stat;
+		}
+		if (inf.key != left - 1) {
+			new_key[ins_num] = left - 1;
+			stat = segment_insert_help(&inf, &ins_num,
+						   new_nextspec, newspec_set);
+			if (stat < 0) {
+				return stat;
+			}
+		}
+	}
+	
+	stat = btree_locate(*spec, &inf, right);
+	if (stat < 0) {
+		return stat;
+	}
+	if (inf.key != right) {
+		new_key[ins_num] = right;
+		stat = segment_insert_help(&inf, &ins_num, new_nextspec,
+					   newspec_set);
+		if (stat < 0) {
+			return stat;
+		}
+	}
+
+	if (ins_num > 0) {
+		struct btree_spec *b;
+		assert(ins_num == 1 || new_key[0] != new_key[1]);
+		if (ins_num == 1) {
+			DPRINT(DEBUG_DIMTREE, "new key: %u\n", new_key[0]);
+		} else {
+			DPRINT(DEBUG_DIMTREE, "new keys: %u, %u\n", new_key[0],
+			       new_key[1]);
+		}
+		stat = btree_insert(*spec, ins_num, new_key, new_nextspec, &b);
+		if (stat < 0) {
+			return stat;
+		}
+		stat = history_replace((struct gen_spec *) *spec,
+				       (struct gen_spec *) b, newspec_set);
+		if (stat < 0) {
+			btree_free(b);
+			return stat;
+		}
+		*spec = b;
+#ifdef DEBUG
+		print_btree(*spec);
+#endif
+	} else {
+		/* we clone the btree anyway if necessary */
+		struct btree_spec *b;
+		stat = btree_clone_ifneeded(*spec, &b, newspec_set);
+		if (stat < 0) {
+			return stat;
+		}
+		*spec = b;
+	}
+	return HE_OK;
+}
+
+/* forward declaration */
+static hipac_error
+dimtree_insrec(struct btree_spec **spec, struct dt_rule *rule,
+	       __u8 match_num, int newspec_set);
+
+static hipac_error
+dimtree_insrec_null(struct btree_spec **spec, struct dt_rule *rule,
+		    __u8 match_num, int newspec_set)
+{
+	const struct dt_match *match = ITH_DT_MATCH(rule, match_num);
+	__u8 bittype = dim2btype[match->dimid];
+	struct gen_spec *nextspec[] = {NULL};
+	__u32 key = MAXKEY(bittype);
+	struct locate_inf inf;
+	int stat;
+
+	/* create new btree that defaults to policy and insert match
+	   recursively */
+	assert(spec != NULL && *spec == NULL);
+	DPRINT(DEBUG_DIMTREE,
+	       "----------------------------------------------------------\n");
+	DPRINT(DEBUG_DIMTREE, "%s: match_num: %d, newspec_set: %d, match: "
+	       "(dimid: %d, left: %u, right: %u)\n", __FUNCTION__, match_num,
+	       newspec_set, match->dimid, match->left, match->right);
+	DPRINT(DEBUG_DIMTREE, "%s: new btree: bittype: %d, dimid: %d, key: "
+	       "%u, nextspec: %p\n", __FUNCTION__, bittype, match->dimid, key,
+	       *nextspec);
+	*spec = btree_new(bittype, match->dimid, 1, &key, nextspec);
+	if (*spec == NULL) {
+		return HE_LOW_MEMORY;
+	}
+	stat = history_new((struct gen_spec *) *spec, newspec_set);
+	if (stat < 0) {
+		btree_free(*spec);
+		return stat;
+	}
+
+	/* match must be non-wildcard */
+	assert(match->left > 0 || match->right < MAXKEY((*spec)->bittype));
+	stat = segment_insert(spec, match->left, match->right, newspec_set);
+	if (stat < 0) {
+		return stat;
+	}
+	stat = btree_locate(*spec, &inf, match->right);
+	if (stat < 0) {
+		return stat;
+	}
+	if (match_num == rule->dt_match_len - 1) {
+		/* final match of rule -> insert rule into termrule block */
+		struct ptrblock **term = termrule(*spec);
+		stat = termrule_insert(term, rule);
+		if (stat < 0) {
+			return stat;
+		}
+		*inf.nextspec = (struct gen_spec *) rule;
+	} else {
+		/* before final match -> insert next match by recursion */
+		stat = dimtree_insrec_null((struct btree_spec **)
+					   inf.nextspec, rule, match_num + 1,
+					   newspec_set);
+		if (stat < 0) {
+			return stat;
+		}
+	}
+	return HE_OK;
+}
+
+static hipac_error
+dimtree_insrec_rule_elem(struct dt_rule_elem_spec **spec, struct dt_rule *rule,
+			 __u8 match_num, struct ptrblock *term_prop,
+			 int newspec_set)
+{
+	struct dt_match *match = ITH_DT_MATCH(rule, match_num);
+	__u8 bittype = dim2btype[match->dimid];
+	__u32 key = MAXKEY(bittype);
+	struct gen_spec *nextspec[1];
+	struct btree_spec *newspec;
+	struct ptrblock **term;
+	struct locate_inf inf;
+	int stat;
+
+	assert(spec != NULL);
+	assert(*spec != NULL);
+	assert(IS_RULE(*spec) || IS_ELEM(*spec));
+	assert(match->left > 0 || match->right < MAXKEY(bittype));
+
+	/* create new btree and insert match recursively; term_prop propagates
+	   through all dimension while remaining in each dimension as
+	   termrule block; if anything goes wrong before term_prop is
+	   attached to newspec term_prop will be freed; later it is treated
+	   by the history */
+	DPRINT(DEBUG_DIMTREE,
+	       "----------------------------------------------------------\n");
+	DPRINT(DEBUG_DIMTREE, "%s: match_num: %d, newspec_set: %d, match: "
+	       "(dimid: %d, left: %u, right: %u)\n", __FUNCTION__, match_num,
+	       newspec_set, match->dimid, match->left, match->right);
+	if (HAS_WILDCARD_DIM(match->dimid)) {
+		nextspec[0] = NULL;
+		DPRINT(DEBUG_DIMTREE, "%s: new btree: bittype: %d, dimid: %d,"
+		       " key: %u, nextspec: %p\n", __FUNCTION__, bittype,
+		       match->dimid, key, *nextspec);
+		newspec = btree_new(bittype, match->dimid, 1, &key, nextspec);
+		if (newspec == NULL) {
+			if (term_prop != NULL) {
+				ptrblock_free(term_prop);
+			}
+			return HE_LOW_MEMORY;
+		}
+		*WILDCARD(newspec) = (struct gen_spec *) *spec;
+	} else {
+		nextspec[0] = (struct gen_spec *) *spec;
+		DPRINT(DEBUG_DIMTREE, "%s: new btree: bittype: %d, dimid: %d,"
+		       " key: %u, nextspec: %p\n", __FUNCTION__, bittype,
+		       match->dimid, key, *nextspec);
+		newspec = btree_new(bittype, match->dimid, 1, &key, nextspec);
+		if (newspec == NULL) {
+			if (term_prop != NULL) {
+				ptrblock_free(term_prop);
+			}
+			return HE_LOW_MEMORY;
+		}
+	}
+	stat = history_new((struct gen_spec *) newspec, newspec_set);
+	if (stat < 0) {
+		btree_free(newspec);
+		if (term_prop != NULL) {
+			ptrblock_free(term_prop);
+		}
+		return stat;
+	}
+	stat = segment_insert(&newspec, match->left, match->right,
+			      newspec_set);
+	if (stat < 0) {
+		if (term_prop != NULL) {
+			ptrblock_free(term_prop);
+		}
+		return stat;
+	}
+	/* attach term_prop to newspec -> if anything goes wrong from now on
+	   term_prop must not be freed here */
+	term = termrule(newspec);
+	*term = term_prop;
+	stat = btree_locate(newspec, &inf, match->right);
+	if (stat < 0) {
+		return stat;
+	}
+
+	if (match_num == rule->dt_match_len - 1) {
+		/* final match of rule -> insert rule into termrule block */
+		stat = termrule_insert(term, rule);
+		if (stat < 0) {
+			return stat;
+		}
+		if (HAS_WILDCARD_DIM(match->dimid)) {
+			assert(*inf.nextspec == NULL);
+			*inf.nextspec = (struct gen_spec *) rule;
+		} else {
+			stat = rule_elem_insert((struct dt_rule_elem_spec **)
+						inf.nextspec, rule,
+						newspec_set);
+			if (stat < 0) {
+				return stat;
+			}
+		}
+	} else {
+		/* before final match -> insert next match by recursion */
+		if (*inf.nextspec == NULL) {
+                        stat = dimtree_insrec_null((struct btree_spec **)
+						   inf.nextspec, rule,
+						   match_num + 1, newspec_set);
+			if (stat < 0) {
+				return stat;
+			}
+                } else {
+			struct ptrblock *term_prop_clone = NULL;
+			if (term_prop != NULL) {
+				stat = ptrblock_clone(term_prop,
+						      &term_prop_clone);
+				if (stat < 0) {
+					return stat;
+				}
+			}
+			stat = dimtree_insrec_rule_elem(
+				(struct dt_rule_elem_spec **) inf.nextspec,
+				rule, match_num + 1, term_prop_clone,
+				newspec_set);
+			if (stat < 0) {
+				return stat;
+			}
+		}
+	}
+	/* newspec is a btree (not struct dt_rule_elem_spec *); the cast is
+	   anyway necessary because of spec */
+	*spec = (struct dt_rule_elem_spec *) newspec;
+	return HE_OK;
+}
+
+static inline hipac_error
+dimtree_insrec_curdimid_sm_help(struct btree_spec *spec, struct gen_spec **g,
+				struct dt_rule *rule, __u8 match_num,
+				__u32 right, __u8 wildcard, int newspec_set,
+				int do_cut)
+{
+	int stat;
+
+	if (*g == NULL) {
+		/* insert rule into policy interval */
+		stat = dimtree_insrec_null((struct btree_spec **) g, rule,
+					   match_num, newspec_set);
+		if (stat < 0) {
+			return stat;
+		}
+	} else if (IS_BTREE(*g)) {
+		/* non-terminal case */
+		struct btree_spec *b = (struct btree_spec *) *g;
+
+		/* we don't have to clone if dimtree_insrec_curdimid_eq is
+		   called by dimtree_insrec because segment_insert clones
+		   the btree anyway if necessary */
+		if ((b->dimid != ITH_DT_MATCH(rule, match_num)->dimid)) {
+			stat = btree_clone_ifneeded(b, &b, newspec_set);
+			if (stat < 0) {
+				return stat;
+			}
+		}
+		stat = dimtree_insrec(&b, rule, match_num, newspec_set);
+		if (stat < 0) {
+			return stat;
+		}
+		*g = (struct gen_spec *) b;
+	} else {
+		/* the rules that terminate in g will propagate to termrule
+		   blocks in below dimensions */
+		struct dt_rule_elem_spec **re;
+		struct ptrblock *term_prop;
+		assert(IS_ELEM(*g) || IS_RULE(*g));
+		stat = termrule_subset(*termrule(spec), &term_prop, right,
+				       wildcard, spec->dimid);
+		if (stat < 0) {
+			return stat;
+		}
+		if (do_cut && *termrule(spec) != NULL && term_prop != NULL) {
+			/* remove all rules in term_prop from current
+			   termrule block */
+			stat = termrule_cut(termrule(spec), term_prop);
+			if (stat < 0) {
+				ptrblock_free(term_prop);
+				return stat;
+			}
+		}
+
+		re = (struct dt_rule_elem_spec **) g;
+		if (IS_ELEM(*re)) {
+			struct dt_elem *e;
+			stat = elem_clone_ifneeded((struct dt_elem *) *re, &e,
+						   newspec_set);
+			if (stat < 0) {
+				if (term_prop != NULL) {
+					ptrblock_free(term_prop);
+				}
+				return stat;
+			}
+			*re = (struct dt_rule_elem_spec *) e;
+		}
+		stat = dimtree_insrec_rule_elem(re, rule, match_num,
+						term_prop, newspec_set);
+		if (stat < 0) {
+			/* term_prop was freed by
+			   dimtree_insrec_rule_elem */
+			return stat;
+		}
+	}
+	return HE_OK;
+}
+
+static hipac_error
+dimtree_insrec_curdimid_sm(struct btree_spec **spec, struct dt_rule *rule,
+			   __u8 match_num, int newspec_set)
+{
+	__u32 key = 0;
+	__u32 maxkey = MAXKEY((*spec)->bittype);
+	struct locate_inf inf;
+	int stat;
+
+	assert(spec != NULL);
+	assert(*spec != NULL);
+	assert(IS_BTREE(*spec));
+	assert(match_num < rule->dt_match_len);
+	/* insert it into every elementary interval respectively the wildcard
+	   pointer */
+	DPRINT(DEBUG_DIMTREE,
+	       "----------------------------------------------------------\n");
+	DPRINT(DEBUG_DIMTREE, "%s: match_num: %d, newspec_set: %d\n",
+	       __FUNCTION__, match_num, newspec_set);
+#ifdef DEBUG
+	print_btree(*spec);
+#endif
+	if (HAS_WILDCARD_SPEC(*spec)) {
+		return dimtree_insrec_curdimid_sm_help(
+			*spec, WILDCARD(*spec), rule, match_num, 0, 1,
+			newspec_set, 1);
+	}
+
+	do {
+		stat = btree_locate(*spec, &inf, key);
+		if (stat < 0) {
+			return stat;
+		}
+		key  = inf.key + 1;
+		stat = dimtree_insrec_curdimid_sm_help(
+			*spec, inf.nextspec, rule, match_num, inf.key, 0,
+			newspec_set, 0);
+		if (stat < 0) {
+			return stat;
+		}
+	} while (inf.key < maxkey);
+	
+	if (*termrule(*spec) != NULL) {
+		/* by inserting rule into every elementary interval the
+		   dimension becomes completely nonterminating */
+		ptrblock_free(*termrule(*spec));
+		*termrule(*spec) = NULL;
+	}
+	return HE_OK;
+}
+
+/* necessary forward declaration */
+static hipac_error
+dimtree_insrec_curdimid_eq_tm(struct btree_spec **spec, struct dt_rule *rule,
+			      __u32 left, __u32 right, int newspec_set);
+
+static inline hipac_error
+dimtree_insrec_curdimid_eq_tm_help(struct gen_spec **g, struct dt_rule *rule,
+				   struct ptrblock **term, __u8 *ins_termrule,
+				   int newspec_set)
+{
+	int stat;
+
+	if (*g != NULL && IS_BTREE(*g)) {
+		/* non-terminal case */
+		struct btree_spec *b;
+
+		stat = btree_clone_ifneeded((struct btree_spec *) *g, &b,
+					    newspec_set);
+		if (stat < 0) {
+			return stat;
+		}
+		stat = dimtree_insrec_curdimid_eq_tm(
+			&b, rule, 0, MAXKEY(b->bittype), newspec_set);
+		if (stat < 0) {
+			return stat;
+		}
+		*g = (struct gen_spec *) b;
+	} else {
+		/* beyond final match of rule -> insert rule into
+		   termrule block if not already inserted */
+		struct dt_rule_elem_spec **re;
+		if (*ins_termrule) {
+			stat = termrule_insert(term, rule);
+			if (stat < 0) {
+				return stat;
+			}
+			*ins_termrule = 0;
+		}
+		
+		re = (struct dt_rule_elem_spec **) g;
+		if (*re != NULL && IS_ELEM(*re)) {
+			struct dt_elem *e;
+			stat = elem_clone_ifneeded((struct dt_elem *) *re, &e,
+						   newspec_set);
+			if (stat < 0) {
+				return stat;
+			}
+			*re = (struct dt_rule_elem_spec *) e;
+		}
+		stat = rule_elem_insert(re, rule, newspec_set);
+		if (stat < 0) {
+			return stat;
+		}
+	}
+	return HE_OK;
+}
+
+static hipac_error
+dimtree_insrec_curdimid_eq_tm(struct btree_spec **spec, struct dt_rule *rule,
+			      __u32 left, __u32 right, int newspec_set)
+{
+	__u8 ins_termrule = 1;
+	struct ptrblock **term = termrule(*spec);
+	struct locate_inf inf;
+	__u32 key = left;
+	int stat;
+
+	DPRINT(DEBUG_DIMTREE,
+	       "----------------------------------------------------------\n");
+	DPRINT(DEBUG_DIMTREE, "%s: left: %u, right: %u, newspec_set: %d\n",
+	       __FUNCTION__, left, right, newspec_set);
+#ifdef DEBUG
+	print_btree(*spec);
+#endif
+	if (HAS_WILDCARD_SPEC(*spec) && left == 0 &&
+	    right == MAXKEY((*spec)->bittype)) {
+		/* insert wildcard match into wildcard dimension */
+		return dimtree_insrec_curdimid_eq_tm_help(
+			WILDCARD(*spec), rule, term, &ins_termrule,
+			newspec_set);
+	}
+
+	/* iterate over every elementary interval between left and right
+	   and check if rule is better than the current or recurse if
+	   elementary interval is non-terminating */
+	do {
+		stat = btree_locate(*spec, &inf, key);
+		if (stat < 0) {
+			return stat;
+		}
+		key  = inf.key + 1;
+		stat = dimtree_insrec_curdimid_eq_tm_help(
+			inf.nextspec, rule, term, &ins_termrule,
+			newspec_set);
+		if (stat < 0) {
+			return stat;
+		}
+	} while (inf.key < right);
+	return HE_OK;
+}
+
+static hipac_error
+dimtree_insrec_curdimid_eq(struct btree_spec **spec, struct dt_rule *rule,
+			   const struct dt_match *match, __u8 match_num,
+			   int newspec_set)
+{
+	__u32 key = match->left;
+	struct locate_inf inf;
+	int stat;
+
+	/* match must be non-wildcard */
+	assert(match->left > 0 || match->right < MAXKEY((*spec)->bittype));
+	DPRINT(DEBUG_DIMTREE,
+	       "----------------------------------------------------------\n");
+	DPRINT(DEBUG_DIMTREE, "%s: match_num: %d, newspec_set: %d, match: "
+	       "(dimid: %d, left: %u, right: %u)\n", __FUNCTION__, match_num,
+	       newspec_set, match->dimid, match->left, match->right);
+#ifdef DEBUG
+	print_btree(*spec);
+#endif
+	stat = segment_insert(spec, match->left, match->right, newspec_set);
+	if (stat < 0) {
+		return stat;
+	}
+
+	/* insert match and iterate over every overlapped interval */
+	if (match_num == rule->dt_match_len - 1) {
+		/* final match of rule */
+		stat = dimtree_insrec_curdimid_eq_tm(
+			spec, rule, match->left, match->right, newspec_set);
+		if (stat < 0) {
+			return stat;
+		}
+	} else {
+		/* before final match of rule */
+		do {
+			stat = btree_locate(*spec, &inf, key);
+			if (stat < 0) {
+				return stat;
+			}
+			key = inf.key + 1;
+			
+			if (*inf.nextspec == NULL) {
+				/* insert rule into policy interval */
+				stat = dimtree_insrec_null(
+					(struct btree_spec **) inf.nextspec,
+					rule, match_num + 1, newspec_set);
+				if (stat < 0) {
+					return stat;
+				}
+			} else if (IS_BTREE(*inf.nextspec)) {
+				/* non-terminal case */
+				struct btree_spec *b = (struct btree_spec *)
+					*inf.nextspec;
+				
+				/* we don't have to clone if
+				   dimtree_insrec_curdimid_eq is called by
+				   dimtree_insrec because segment_insert
+				   clones the btree anyway if necessary */
+				if (b->dimid !=
+				    ITH_DT_MATCH(rule, match_num + 1)->dimid) {
+					stat = btree_clone_ifneeded(
+						(struct btree_spec *)
+						*inf.nextspec, &b,
+						newspec_set);
+					if (stat < 0) {
+						return stat;
+					}
+				}
+				stat = dimtree_insrec(
+					&b, rule, match_num + 1, newspec_set);
+				if (stat < 0) {
+					return stat;
+				}
+				*inf.nextspec = (struct gen_spec *) b;
+			} else {
+				/* the rules that terminate in the current
+				   elementary interval will propagate to
+				   termrule blocks in below dimensions */
+				struct dt_rule_elem_spec **re;
+				struct ptrblock *term_prop;
+				stat = termrule_subset(
+					*termrule(*spec), &term_prop, inf.key,
+					0, (*spec)->dimid);
+				if (stat < 0) {
+					if (term_prop != NULL) {
+						ptrblock_free(term_prop);
+					}
+					return stat;
+				}
+				re = (struct dt_rule_elem_spec **)
+					inf.nextspec;
+				if (IS_ELEM(*re)) {
+					struct dt_elem *e;
+					stat = elem_clone_ifneeded(
+						(struct dt_elem *) *re, &e,
+						newspec_set);
+					if (stat < 0) {
+						if (term_prop != NULL) {
+							ptrblock_free(
+							      term_prop);
+						}
+						return stat;
+					}
+					*re = (struct dt_rule_elem_spec *) e;
+				}
+				stat = dimtree_insrec_rule_elem(
+					re, rule, match_num + 1, term_prop,
+					newspec_set);
+				if (stat < 0) {
+					/* term_prop was freed by
+					   dimtree_insrec_rule_elem */
+					return stat;
+				}
+			}
+		} while (inf.key < match->right);
+
+		/* as the rule continues we can be sure that every terminating
+		   rule whose match in the current dimension is completely
+		   overlapped by match can be removed from the termrule block;
+		   we possibly forget to remove rules with partially overlapped
+		   matches but this does NOT cause any harm and the case should
+		   be very rare */
+		stat = termrule_delete_ovl(termrule(*spec), match->left,
+					   match->right, (*spec)->dimid);
+		if (stat < 0) {
+			return stat;
+		}
+	}
+	return HE_OK;
+}
+
+static hipac_error
+dimtree_insrec_curdimid_gr(struct btree_spec **spec, struct dt_rule *rule,
+			   const struct dt_match *match, __u8 match_num,
+			   int newspec_set)
+{
+	__u8 bittype = dim2btype[match->dimid];
+	__u32 key = MAXKEY(bittype);	
+	struct gen_spec *nextspec[1];
+	struct btree_spec *newspec;
+	int stat;
+
+	/* create missing dimension and insert current match by recursion */
+	DPRINT(DEBUG_DIMTREE,
+	       "----------------------------------------------------------\n");
+	DPRINT(DEBUG_DIMTREE, "%s: match_num: %d, newspec_set: %d, match: "
+	       "(dimid: %d, left: %u, right: %u)\n", __FUNCTION__, match_num,
+	       newspec_set, match->dimid, match->left, match->right);
+#ifdef DEBUG
+	print_btree(*spec);
+#endif
+	if (HAS_WILDCARD_DIM(match->dimid)) {
+		nextspec[0] = NULL;
+		DPRINT(DEBUG_DIMTREE, "%s: new btree: bittype: %d, dimid: %d,"
+		       " key: %u, nextspec: %p\n", __FUNCTION__, bittype,
+		       match->dimid, key, *nextspec);
+		newspec = btree_new(bittype, match->dimid, 1, &key, nextspec);
+		if (newspec == NULL) {
+			return HE_LOW_MEMORY;
+		}
+		*WILDCARD(newspec) = (struct gen_spec *) *spec;
+	} else {
+		nextspec[0] = (struct gen_spec *) *spec;
+		DPRINT(DEBUG_DIMTREE, "%s: new btree: bittype: %d, dimid: %d,"
+		       " key: %u, nextspec: %p\n", __FUNCTION__, bittype,
+		       match->dimid, key, *nextspec);
+		newspec = btree_new(bittype, match->dimid, 1, &key, nextspec);
+		if (newspec == NULL) {
+			return HE_LOW_MEMORY;
+		}
+	}
+	stat = history_new((struct gen_spec *) newspec, newspec_set);
+	if (stat < 0) {
+		btree_free(newspec);
+		return stat;
+	}
+	*spec = newspec;
+	return dimtree_insrec(spec, rule, match_num, newspec_set);
+}
+
+static hipac_error
+dimtree_insrec(struct btree_spec **spec, struct dt_rule *rule,
+	       __u8 match_num, int newspec_set)
+{
+	struct dt_match *match;
+
+	/* spec non-terminating	*/
+	assert(spec != NULL);
+	assert(*spec != NULL);
+	assert(IS_BTREE(*spec));
+
+	/* rule is not finished yet */
+	assert(match_num < rule->dt_match_len);
+
+	match = ITH_DT_MATCH(rule, match_num);
+
+	DPRINT(DEBUG_DIMTREE,
+	       "----------------------------------------------------------\n");
+	DPRINT(DEBUG_DIMTREE, "%s: match_num: %d, newspec_set: %d, match: "
+	       "(dimid: %d,  left: %u, right: %u)\n", __FUNCTION__, match_num,
+	       newspec_set, match->dimid, match->left, match->right);
+#ifdef DEBUG
+	print_btree(*spec);
+#endif
+	if ((*spec)->dimid < match->dimid) {
+		/* match in current dimension treated as wildcard because there
+		   is no match for the current dimension */
+		return dimtree_insrec_curdimid_sm(spec, rule, match_num,
+						  newspec_set);
+	} else if ((*spec)->dimid == match->dimid) {
+		/* there is a match in the current dimension which is per
+		   default no wildcard */
+		return dimtree_insrec_curdimid_eq(spec, rule, match,
+						  match_num, newspec_set);
+		
+	} else {
+		/* the dimension of the current match has not yet been
+		   created */
+		return dimtree_insrec_curdimid_gr(spec, rule, match,
+						  match_num, newspec_set);
+	}
+}
+
+static inline hipac_error
+segment_delete_help(struct btree_spec *spec, struct locate_inf *bound1,
+		    __u32 lkey, __u32 dkey, __u32 del_key[], __u8 *del_num,
+		    int newspec_set)
+{
+	struct gen_spec *current1, *current2;
+	struct locate_inf bound2;
+	int stat;
+
+	stat = btree_locate(spec, &bound2, lkey);
+	if (stat < 0) {
+		return stat;
+	}
+	current1 = *bound1->nextspec;
+	current2 = *bound2.nextspec;
+	switch (btree_rule_elem_eq(current1, current2)) {
+	    case 1:
+		    if (current1 == NULL ||
+			!termrule_exists(*termrule(spec), spec->dimid, dkey)) {
+			    del_key[(*del_num)++] = dkey;
+		    }
+		    break;
+	    case 2:
+		    if (!termrule_exists(*termrule(spec), spec->dimid, dkey)) {
+			    history_obsolete(current1, newspec_set);
+			    del_key[(*del_num)++] = dkey;
+		    }
+		    break;
+	    case 3:
+		    del_key[(*del_num)++] = dkey;
+		    stat = btree_free_rec((struct btree_spec *) current1,
+					  newspec_set, 0);
+		    if (stat < 0) {
+			    return stat;
+		    }
+		    break;
+	    default:
+		    break;
+	}
+	return HE_OK;
+}
+
+/* segment [left, right] is deleted from spec if the neighbours of left and
+   right point to the same spec; at most two elementary intervals can be
+   deleted */
+static inline hipac_error
+segment_delete(struct btree_spec **spec, __u32 left, __u32 right,
+	       int newspec_set)
+{
+	__u8 del_num = 0;
+	__u32 maxkey = MAXKEY((*spec)->bittype);
+	__u32 del_key[2] = {0, 0};
+	struct locate_inf bound1;
+	int stat;
+	
+	DPRINT(DEBUG_DIMTREE,
+	       "----------------------------------------------------------\n");
+	DPRINT(DEBUG_DIMTREE, "%s: left: %u, right: %u, newspec_set: %d\n",
+	       __FUNCTION__, left, right, newspec_set);
+#ifdef DEBUG
+	print_btree(*spec);
+#endif
+	if (left > 0) {
+		stat = btree_locate(*spec, &bound1, left - 1);
+		if (stat < 0) {
+			return stat;
+		}
+		assert(bound1.key == left - 1);
+		stat = segment_delete_help(*spec, &bound1, left, left - 1,
+					   del_key, &del_num, newspec_set);
+		if (stat < 0) {
+			return stat;
+		}
+	}
+
+	if (right < maxkey) {
+		stat = btree_locate(*spec, &bound1, right);
+		if (stat < 0) {
+			return stat;
+		}
+		assert(bound1.key == right);
+		stat = segment_delete_help(*spec, &bound1, right + 1, right,
+					   del_key, &del_num, newspec_set);
+		if (stat < 0) {
+			return stat;
+		}
+	}
+	
+	if (del_num > 0) {
+		struct btree_spec *b;
+		assert(del_num == 1 || del_key[0] < del_key[1]);
+		if (del_num == 1) {
+			DPRINT(DEBUG_DIMTREE, "del key: %u\n", del_key[0]);
+		} else {
+			DPRINT(DEBUG_DIMTREE, "del keys: %u, %u\n",
+			       del_key[0], del_key[1]);
+		}
+		stat = btree_delete(*spec, del_num, del_key, &b);
+		if (stat < 0) {
+			return stat;
+		}
+		stat = history_replace((struct gen_spec *) *spec,
+				       (struct gen_spec *) b, newspec_set);
+		if (stat < 0) {
+			btree_free(b);
+			return stat;
+		}
+		*spec = b;
+	}
+	return HE_OK;
+}
+
+/* forward declaration needed for dimtree_delrec_interval */
+static hipac_error
+dimtree_delrec(struct btree_spec **spec, const struct dt_rule *rule,
+	       __u8 match_num, struct ptrlist *term_prop, int newspec_set);
+
+static inline hipac_error
+dimtree_delrec_interval(struct gen_spec **spec, const struct dt_rule *rule,
+			__u8 match_num, struct ptrlist *tmpterm,
+			struct ptrblock **term, __u32 right, __u8 wildcard,
+			__u8 dimid, int newspec_set)
+{
+	int stat;
+
+	assert(*spec != NULL);
+	if (IS_BTREE(*spec)) {
+		/* non-terminal case */
+		struct btree_spec *b;
+
+		stat = btree_clone_ifneeded((struct btree_spec *) *spec, &b,
+					    newspec_set);
+		if (stat < 0) {
+			return stat;
+		}
+		stat = dimtree_delrec(&b, rule, match_num, tmpterm,
+				      newspec_set);
+		if (stat < 0) {
+			return stat;
+		}
+		*spec = (struct gen_spec *) b;
+	} else {
+		struct dt_rule_elem_spec **re =
+			(struct dt_rule_elem_spec **) spec;
+
+		if (IS_ELEM(*re)) {
+			struct dt_elem *e;
+			stat = elem_clone_ifneeded((struct dt_elem *) *re, &e,
+						   newspec_set);
+			if (stat < 0) {
+				return stat;
+			}
+			*re = (struct dt_rule_elem_spec *) e;
+		}
+		stat = rule_elem_delete(re, rule, *term, right, wildcard,
+					dimid, newspec_set);
+		if (stat < 0) {
+			return stat;
+		}
+	}
+	return HE_OK;
+}
+
+static hipac_error
+dimtree_delrec(struct btree_spec **spec, const struct dt_rule *rule,
+	       __u8 match_num, struct ptrlist *term_prop, int newspec_set)
+{	
+	/* current match is initialized as wildcard */
+	__u32 left   = 0;	
+	__u32 key    = 0;
+	__u32 maxkey = MAXKEY((*spec)->bittype);
+	__u8 match_is_wildcard = 1;
+
+	/* collects all terminating specs from the below dimension */
+	struct ptrlist *tmpterm;
+	struct ptrblock **term;
+	struct locate_inf inf;
+	int stat;
+	
+#ifdef DEBUG
+	DPRINT(DEBUG_DIMTREE,
+	       "----------------------------------------------------------\n");
+	if (match_num < rule->dt_match_len) {
+		const struct dt_match *match = ITH_DT_MATCH(rule, match_num);
+		DPRINT(DEBUG_DIMTREE, "%s: match_num: %d, newspec_set: %d, "
+		       "le: %p, match: (dimid: %d, left: %u, right: %u)\n",
+		       __FUNCTION__, match_num, newspec_set, rule,
+		       match->dimid, match->left, match->right);
+	} else {
+		DPRINT(DEBUG_DIMTREE, "%s: match_num: %d, newspec_set: %d, "
+		       "rule: %p, match: <none>\n", __FUNCTION__, match_num,
+		       newspec_set, rule);
+	}
+	print_btree(*spec);
+#endif
+	tmpterm = tmp_termrule_new();
+	if (tmpterm == NULL) {
+		return HE_LOW_MEMORY;
+	}
+	term = termrule(*spec);
+
+	/* dimtree_delrec is never called for terminal cases */
+	assert(*spec != NULL);
+	assert(IS_BTREE(*spec));
+
+	if (match_num < rule->dt_match_len) {
+		/* rule is not finished yet */
+		const struct dt_match *match = ITH_DT_MATCH(rule, match_num);
+		
+		if ((*spec)->dimid == match->dimid) {
+			/* match must be non-wildcard */
+			assert(match->left > 0 ||
+			       match->right < MAXKEY((*spec)->bittype));
+			key = left = match->left;
+			maxkey = match->right;
+			match_is_wildcard = 0;
+			match_num++;
+		}
+	}
+	
+	if (HAS_WILDCARD_SPEC(*spec) && match_is_wildcard) {
+		assert(*WILDCARD(*spec) != NULL);
+		stat = dimtree_delrec_interval(
+			WILDCARD(*spec), rule, match_num, tmpterm, term,
+			0, 1, (*spec)->dimid, newspec_set);
+		if (stat < 0) {
+			goto error;
+		}
+	} else {
+		do {
+			stat = btree_locate(*spec, &inf, key);
+			if (stat < 0) {
+				goto error;
+			}
+			key = inf.key + 1;
+			assert(*inf.nextspec != NULL);
+			stat = dimtree_delrec_interval(
+				inf.nextspec, rule, match_num, tmpterm, term,
+				inf.key, 0, (*spec)->dimid, newspec_set);
+			if (stat < 0) {
+				goto error;
+			}
+		} while (inf.key < maxkey);
+	}
+		
+	/* delete rule from termrule block if it is there */
+	stat = termrule_delete(term, rule);
+	if (stat < 0) {
+		goto error;
+	}
+
+	/* merge temporary termrule list with termrule block */
+	stat = termrule_merge(term, tmpterm);
+	if (stat < 0) {
+		return stat;
+	}
+
+	if (!match_is_wildcard) {
+		/* remove surrounding elementary intervals represented by left
+		   and maxkey if necessary */
+		stat = segment_delete(spec, left, maxkey, newspec_set);
+		if (stat < 0) {
+			/* tmpterm is already freed */
+			return stat;
+		}
+		term = termrule(*spec);
+	}
+	
+	if ((*spec)->num == 1) {
+		/* spec is empty => drop it */
+		struct gen_spec *nextspec;
+
+		if (HAS_WILDCARD_SPEC(*spec)) {
+			assert((stat = btree_locate(*spec, &inf, 0),
+				stat < 0 ? 1 : *inf.nextspec == NULL));
+			nextspec = *WILDCARD(*spec);
+		} else {
+			stat = btree_locate(*spec, &inf, 0);
+			if (stat < 0) {
+				/* tmpterm is already freed */
+				return stat;
+			}
+			nextspec = *inf.nextspec;
+		}
+		
+		if (*term != NULL && term_prop != NULL) {
+			stat = tmp_termrule_merge(term_prop, *term);
+			if (stat < 0) {
+				/* tmpterm is already freed */
+				return stat;
+			}
+		}
+		stat = history_obsolete((struct gen_spec *) *spec,
+					newspec_set);
+		if (stat < 0) {
+			/* tmpterm is already freed */
+			return stat;
+		}
+
+		if (nextspec == NULL || IS_RULE(nextspec)) {
+			*spec = (struct btree_spec *) nextspec;
+		} else if (IS_BTREE(nextspec)) {
+			struct btree_spec *b;
+
+			stat = btree_clone_ifneeded((struct btree_spec *)
+						    nextspec, &b, newspec_set);
+			if (stat < 0) {
+				return stat;
+			}
+			*spec = (struct btree_spec *) b;
+		} else {
+			struct dt_elem *e;
+			assert(IS_ELEM(nextspec));
+			stat = elem_clone_ifneeded((struct dt_elem *)
+						   nextspec, &e, newspec_set);
+			if (stat < 0) {
+				return stat;
+			}
+			*spec = (struct btree_spec *) e;
+		}
+	}
+	return HE_OK;
+
+ error:
+	tmp_termrule_free(tmpterm);
+	return stat;
+}
+
+
+
+/*
+ * public dimtree operations
+ */
+
+hipac_error
+dimtree_new(struct dimtree **newdt, __u32 origin, const char *chain_name,
+	    struct dt_rule *dummy, struct dt_rule *policy)
+{
+	struct dt_chain *chain;
+
+	if (unlikely(newdt == NULL || chain_name == NULL || dummy == NULL ||
+		     policy == NULL || dummy->spec.action != TARGET_DUMMY ||
+		     !IS_RULE_TERM(policy) || policy->dt_match_len != 0)) {
+		ARG_ERR;
+	}
+	*newdt = hp_alloc(sizeof(**newdt), 1);
+	if (*newdt == NULL) {
+		return HE_LOW_MEMORY;
+	}
+	chain = hp_alloc(sizeof(*chain), 1);
+	if (chain == NULL) {
+		hp_free(*newdt);
+		*newdt = NULL;
+		return HE_LOW_MEMORY;
+	}
+	INIT_LIST_HEAD(&chain->head);
+	strncpy(chain->name, chain_name, sizeof(chain->name));
+	chain->name[sizeof(chain->name) - 1] = '\0';
+	chain->first = policy;
+	chain->len = 2;
+	list_add(&policy->head, &chain->head);
+	list_add(&dummy->head, &chain->head);
+
+	(*newdt)->origin = origin;
+	(*newdt)->ctindex = 0;
+	(*newdt)->top = (struct gen_spec *) policy;
+	(*newdt)->top_new = NULL;
+	(*newdt)->need_commit = 0;
+	(*newdt)->chain = chain;
+	return HE_OK;
+}
+
+void
+dimtree_free(struct dimtree *dt)
+{
+	struct list_head *lh;
+	struct dt_rule *rule;
+
+	if (unlikely(dt == NULL)) {
+		ARG_MSG;
+		return;
+	}
+	if (dt->top != NULL) {
+		if (IS_BTREE(dt->top)) {
+			btree_free_rec((struct btree_spec *) dt->top, 0, 1);
+		} else if (IS_ELEM(dt->top)) {
+			elem_free((struct dt_elem *) dt->top);
+		}
+	}
+	for (lh = dt->chain->head.next; lh != &dt->chain->head;) {
+		rule = list_entry(lh, struct dt_rule, head);
+		lh = lh->next;
+		if (rule->exec_match != NULL) {
+			ptrblock_free(rule->exec_match);
+		}
+		hp_free(rule);
+	}
+	hp_free(dt->chain);
+	hp_free(dt);
+}
+
+void
+dimtree_flush(struct dimtree *dt)
+{
+	struct gen_spec *top;
+	struct list_head *lh;
+	struct dt_rule *rule;
+
+	if (unlikely(dt == NULL)) {
+		ARG_MSG;
+		return;
+	}
+	assert(dt->chain->len >= 2);
+	assert(list_entry(dt->chain->head.next,
+			  struct dt_rule, head)->spec.action == TARGET_DUMMY);
+	br_write_lock_bh(BR_HIPAC_LOCK);
+	top = dt->top;
+	dt->top = (struct gen_spec *) list_entry(dt->chain->head.prev,
+						 struct dt_rule, head);
+	((struct dt_rule *) dt->top)->spec.pos = 1;
+	br_write_unlock_bh(BR_HIPAC_LOCK);
+	dt->need_commit = 0;
+	if (top != NULL) {
+		if (IS_BTREE(top)) {
+			btree_free_rec((struct btree_spec *) top, 0, 1);
+		} else  if (IS_ELEM(top)) {
+			elem_free((struct dt_elem *) top);
+		}
+	}
+	for (lh = dt->chain->head.next->next; lh != dt->chain->head.prev;) {
+		rule = list_entry(lh, struct dt_rule, head);
+		lh = lh->next;
+		list_del(lh->prev);
+		if (rule->exec_match != NULL) {
+			ptrblock_free(rule->exec_match);
+		}
+		hp_free(rule);
+	}
+	dt->chain->first = list_entry(dt->chain->head.prev, struct dt_rule,
+				      head);
+	dt->chain->len = 2;
+}
+
+const char *
+dimtree_get_chain_name(const struct dimtree *dt)
+{
+	if (unlikely(dt == NULL)) {
+		ARG_MSG;
+		return NULL;
+	}
+	return dt->chain->name;
+}
+
+static hipac_error
+dimtree_insert_intern(struct dimtree *dt, struct dt_rule *rule, __u32 origin,
+		      int inc, int insert_chain, int commit)
+{
+	struct gen_spec *top;
+	struct list_head *lh;
+	struct dt_rule *r;
+	int stat;
+	
+	if (unlikely(dt == NULL || rule == NULL ||
+		     rule->spec.pos <= 0 ||
+		     rule->spec.pos >
+		     list_entry(dt->chain->head.prev,
+				struct dt_rule, head)->spec.pos ||
+		     (IS_TARGET_DUMMY(rule) && !insert_chain))) {
+		ARG_ERR;
+	}
+	
+	/* insert rule into dt_chain */
+	assert(!rule->deleted);
+	if (insert_chain) {
+		if (likely(inc)) {
+			for (lh = dt->chain->head.prev; lh != &dt->chain->head;
+			     lh = lh->prev) {
+				r = list_entry(lh, struct dt_rule, head);
+				if (r->spec.pos < rule->spec.pos) {
+					break;
+				}
+				r->spec.pos++;
+			}
+			list_add(&rule->head, lh);
+		} else {
+			__u32 maxpos = list_entry(dt->chain->head.prev,
+						  struct dt_rule,
+						  head)->spec.pos;
+			if (((maxpos + 1) * rule->spec.pos) / dt->chain->len <
+			    dt->chain->len >> 1) {
+				list_for_each (lh, &dt->chain->head) {
+					r = list_entry(lh, struct dt_rule,
+						       head);
+					if (r->spec.pos > rule->spec.pos) {
+						break;
+					}
+				}
+				list_add_tail(&rule->head, lh);
+			} else {
+				for (lh = dt->chain->head.prev;
+				     lh != &dt->chain->head; lh = lh->prev) {
+					r = list_entry(lh, struct dt_rule,
+						       head);
+					if (r->spec.pos <= rule->spec.pos) {
+						break;
+					}
+				}
+				list_add(&rule->head, lh);
+			}
+		}
+		dt->chain->len++;
+		if (IS_TARGET_DUMMY(rule)) {
+			return HE_OK;
+		}
+	}
+
+	/* origin check */
+	if (!(dt->origin & origin)) {
+		return HE_RULE_ORIGIN_MISMATCH;
+	}
+
+	if (!dt->need_commit) {
+		/* first operation in a series => clone top level structure
+		   if necessary */
+		if (dt->top == NULL) {
+			top = NULL;
+		} else if (IS_BTREE(dt->top)) {
+			stat = btree_clone((struct btree_spec *) dt->top,
+					   (struct btree_spec **) &top);
+			if (stat < 0) {
+				return stat;
+			}
+			stat = history_replace(dt->top, top, !commit);
+			if (stat < 0) {
+				btree_free((struct btree_spec *) top);
+				history_undo();
+				return stat;
+			}
+		} else if (IS_ELEM(dt->top)) {
+			stat = elem_clone((struct dt_elem *) dt->top,
+					  (struct dt_elem **) &top);
+			if (stat < 0) {
+				return stat;
+			}
+			stat = history_replace(dt->top, top, !commit);
+			if (stat < 0) {
+				elem_free((struct dt_elem *) top);
+				history_undo();
+				return stat;
+			}
+		} else {
+			assert(IS_RULE(dt->top));
+			top = dt->top;
+		}
+	} else {
+		top = dt->top_new;
+	}
+
+	/* insert rule into btree */
+	if (rule->dt_match_len == 0) {
+		/* rule has no native matches at all */
+		if (top != NULL && IS_BTREE(top)) {
+			stat = dimtree_insrec_curdimid_eq_tm(
+				(struct btree_spec **) &top, rule, 0,
+				MAXKEY(dim2btype[((struct btree_spec *)
+						  top)->dimid]), !commit);
+		} else {
+			stat = rule_elem_insert((struct dt_rule_elem_spec **)
+						&top, rule, !commit);
+		}
+	} else {
+		/* rule has at least one native match */
+		if (top == NULL) {
+			stat = dimtree_insrec_null((struct btree_spec **) &top,
+						   rule, 0, !commit);
+		} else if (IS_BTREE(top)) {
+			stat = dimtree_insrec((struct btree_spec **) &top,
+					      rule, 0, !commit);
+		} else {
+			/* construct termrule block containing all
+			   non TARGET_DUMMY rules except the inserted rule
+			   from dt->chain */
+			struct ptrblock *term_prop = NULL;
+			struct list_head *lh;
+			struct dt_rule *r;
+			
+			stat = HE_OK;
+			list_for_each (lh, &dt->chain->head) {
+				r = list_entry(lh, struct dt_rule, head);
+				if (r->spec.action == TARGET_DUMMY ||
+				    r == rule || r->deleted) {
+					continue;
+				}
+				assert(r->dt_match_len == 0);
+				stat = termrule_insert(&term_prop, r);
+				if (stat < 0) {
+					if (term_prop != NULL) {
+						ptrblock_free(term_prop);
+					}
+					break;
+				}
+			}
+			if (stat == HE_OK) {
+				stat = dimtree_insrec_rule_elem(
+					(struct dt_rule_elem_spec **) &top,
+					rule, 0, term_prop, !commit);
+			}
+		}
+	}
+	if (stat < 0) {
+		history_undo();
+		dt->top_new = NULL;
+		return stat;
+	}
+	if (commit) {
+#ifdef DEBUG
+		if (rule_occur(dt->top, rule, 1)) {
+			DPRINT(DEBUG_DIMTREE, "rule present in original"
+			       "structure\n");
+			return HE_IMPOSSIBLE_CONDITION;
+		}
+#endif
+		br_write_lock_bh(BR_HIPAC_LOCK);
+		dt->top = top;
+		br_write_unlock_bh(BR_HIPAC_LOCK);
+		dt->top_new = NULL;
+		history_commit(0);
+		assert(history_is_empty());
+	} else {
+		assert((IS_RULE(top) && IS_RULE(dt->top)) ||
+		       !history_is_empty());
+		dt->need_commit = 1;
+		dt->top_new = top;
+	}
+	return HE_OK;
+}
+
+#ifdef DEBUG
+void
+dt_rule_print(const struct dt_rule *rule);
+#endif
+
+hipac_error
+dimtree_insert(struct dimtree *dt, struct dt_rule *rule, __u32 origin,
+	       int inc, int commit)
+{
+	DPRINT(DEBUG_DIMTREE,
+	       "----------------------------------------------------------\n");
+	DPRINT(DEBUG_DIMTREE, "%s: origin: %X, inc: %d, commit: %d\n",
+	       __FUNCTION__, origin, inc, commit);
+	DPRINT(DEBUG_DIMTREE, "dt: origin: %X, ctindex: %u:, need_commit: %u,"
+	       " chain: %s (len: %u)\n", dt->origin, dt->ctindex,
+	       dt->need_commit, dt->chain->name, dt->chain->len);
+#ifdef DEBUG
+	if (dt->top_new == NULL) {
+		if (dt->top != NULL) {
+			if (IS_BTREE(dt->top)) {
+				print_btree((struct btree_spec *) dt->top);
+			} else if (IS_ELEM(dt->top)) {
+				print_elem((struct dt_elem *) dt->top);
+				DPRINT(DEBUG_DIMTREE, "\n");
+			} else {
+				DPRINT(DEBUG_DIMTREE, "top level rule: %p\n",
+				       dt->top);
+			}
+		}
+	} else {
+		if (IS_BTREE(dt->top_new)) {
+			print_btree((struct btree_spec *) dt->top_new);
+		} else if (IS_ELEM(dt->top_new)) {
+				print_elem((struct dt_elem *) dt->top_new);
+				DPRINT(DEBUG_DIMTREE, "\n");
+		} else {
+			DPRINT(DEBUG_DIMTREE, "top level rule: %p\n",
+			       dt->top_new);
+		}
+	}
+	if (hipac_debug & DEBUG_DIMTREE) {
+		dt_rule_print(rule);
+	}
+#endif
+	return dimtree_insert_intern(dt, rule, origin, inc, 1, commit);
+}
+
+static struct dt_rule *
+dimtree_delete_find_best_term(struct dimtree *dt,
+			      const struct dt_rule *term_rule, __u32 *ntm_num)
+{
+	struct list_head *lh;
+	struct dt_rule *cr;
+	
+	if (unlikely(dt == NULL || term_rule == NULL || ntm_num == NULL)) {
+		ARG_MSG;
+		return NULL;
+	}
+
+	*ntm_num = 0;
+	for (lh = term_rule->head.next; lh != &dt->chain->head;
+	     lh = lh->next) {
+		cr = list_entry(lh, struct dt_rule, head);
+		if (cr->deleted) {
+			continue;
+		}
+		if (IS_RULE_TERM(cr)) {
+			return cr;
+		} else if (cr->spec.action != TARGET_DUMMY) {
+			(*ntm_num)++;
+		}
+	}
+	return NULL;
+}
+
+/* from and to are exclusive */
+static hipac_error
+dimtree_delete_insert_ntm(struct dimtree *dt, struct dt_elem **e,
+			  const struct dt_rule *from, const struct dt_rule *to)
+{
+	struct list_head *lh;
+	struct dt_rule *cr;
+	int stat;
+	
+	if (unlikely(dt == NULL || e == NULL || *e == NULL || to == NULL)) {
+		ARG_ERR;
+	}
+
+	for (lh = (from == NULL ? dt->chain->head.next : from->head.next);
+	     lh != &to->head; lh = lh->next) {
+		cr = list_entry(lh, struct dt_rule, head);
+		if (cr->deleted || cr->spec.action == TARGET_DUMMY) {
+			continue;
+		}
+		assert(cr->spec.pos < to->spec.pos);
+		assert(!IS_RULE_TERM(cr));
+		stat = ptrblock_insert_embed((void **) e,
+					     offsetof(struct dt_elem,
+						      ntm_rules), cr,
+					     (*e)->ntm_rules.len);
+		if (stat < 0) {
+			return stat;
+		}
+	}
+	return HE_OK;
+}
+
+static hipac_error
+dimtree_delete_rule_elem(struct dt_rule_elem_spec **rule_elem,
+			 const struct dt_rule *rule, struct dimtree *dt,
+			 int newspec_set)
+{
+	struct dt_elem *e;
+	int stat;
+	__u32 i;
+	
+	if (IS_RULE(*rule_elem)) {
+		struct dt_rule *r = (struct dt_rule *) *rule_elem;
+		struct dt_rule *term_rule;
+		__u32 ntm_num;
+		
+		if (r != rule) {
+			/* deleted rule must have a higher position than r */
+			return HE_OK;
+		}
+		term_rule = dimtree_delete_find_best_term(dt, rule, &ntm_num);
+		if (term_rule == NULL) {
+			IMPOSSIBLE_CONDITION("attempt to delete the only "
+					     "terminal rule");
+		}
+		if (ntm_num == 0) {
+			*rule_elem = (struct dt_rule_elem_spec *) term_rule;
+			return HE_OK;
+		} else {
+			struct dt_elem *e = elem_new_empty(term_rule);
+			if (e == NULL) {
+				return HE_LOW_MEMORY;
+			}
+			stat = dimtree_delete_insert_ntm(dt, &e, rule,
+							 term_rule);
+			if (stat < 0) {
+				elem_free(e);
+				return stat;
+			}
+			assert(e->ntm_rules.len > 0);
+			stat = history_new((struct gen_spec *) e, newspec_set);
+			if (stat < 0) {
+				elem_free(e);
+				return stat;
+			}
+			*rule_elem = (struct dt_rule_elem_spec *) e;
+			return HE_OK;
+		}
+	}
+
+	assert(IS_ELEM(*rule_elem));
+	e = (struct dt_elem *) *rule_elem;
+	assert(e->term_rule != NULL);
+	if (IS_RULE_TERM(rule)) {
+		struct dt_rule *term_rule;
+		__u32 ntm_num;
+
+		if (e->term_rule != rule) {
+			/* deleted rule must have a higher position than
+			   e->term_rule */
+			assert(rule->spec.pos > e->term_rule->spec.pos);
+			return HE_OK;
+		}
+		term_rule = dimtree_delete_find_best_term(dt, rule, &ntm_num);
+		if (term_rule == NULL) {
+			IMPOSSIBLE_CONDITION("attempt to delete the only "
+					     "terminal rule");
+		}
+		stat = dimtree_delete_insert_ntm(
+			 dt, (struct dt_elem **) rule_elem, rule, term_rule);
+		if (stat < 0) {
+			/* we only care about rule_elem if its address has
+			   changed; otherwise rule_elem is handled by the
+			   history */
+			if (e != (struct dt_elem *) *rule_elem) {
+				history_del_invalid((struct gen_spec *) e);
+				elem_free((struct dt_elem *) *rule_elem);
+			}
+			return stat;
+		}
+		if (e != (struct dt_elem *) *rule_elem) {
+			history_del_invalid((struct gen_spec *) e);
+			stat = history_new((struct gen_spec *)
+					   *rule_elem, newspec_set);
+			if (stat < 0) {
+				elem_free((struct dt_elem *) *rule_elem);
+				return stat;
+			}
+		}
+		(*(struct dt_elem **) rule_elem)->term_rule = term_rule;
+		return HE_OK;
+	} else {
+		for (i = 0; i < e->ntm_rules.len &&
+			     ((struct dt_rule *)
+			      e->ntm_rules.p[i])->spec.pos <
+			     rule->spec.pos; i++);
+		if (i >= e->ntm_rules.len || e->ntm_rules.p[i] != rule) {
+			/* deleted rule must have a higher position than
+			   e->ntm_rules.p[e->ntm_rules.len - 1] */
+			return HE_OK;
+		}
+		if (e->ntm_rules.len == 1) {
+			struct dt_rule_elem_spec *tm =
+				(struct dt_rule_elem_spec *)
+				e->term_rule;
+			stat = history_obsolete((struct gen_spec *) e,
+						newspec_set);
+			if (stat < 0) {
+				return stat;
+			}
+			*rule_elem = tm;
+			return HE_OK;
+		} else {
+			stat = ptrblock_delete_pos_embed(
+				 (void **) rule_elem,
+				 offsetof(struct dt_elem, ntm_rules),
+				 i);
+			if (stat < 0) {
+				/* we only care about rule_elem if its address
+				   has changed; otherwise rule_elem is 
+				   handled by the history */
+				if (e != (struct dt_elem *) *rule_elem) {
+					history_del_invalid((struct gen_spec *)
+							    e);
+					elem_free((struct dt_elem *)
+						  *rule_elem);
+				}
+				return stat;
+			}
+			if (e != (struct dt_elem *) *rule_elem) {
+				history_del_invalid((struct gen_spec *) e);
+				stat = history_new((struct gen_spec *)
+						   *rule_elem, newspec_set);
+				if (stat < 0) {
+					elem_free((struct dt_elem *)
+						  *rule_elem);
+					return stat;
+				}
+			}
+			return HE_OK;
+		}
+	}
+}
+
+hipac_error
+dimtree_delete(struct dimtree *dt, struct dt_rule *rule, int commit)
+{
+	struct gen_spec *top;
+	int stat;
+
+	if (unlikely(dt == NULL || rule == NULL || rule->deleted ||
+		     rule == list_entry(dt->chain->head.next,
+					struct dt_rule, head) ||
+		     rule == list_entry(dt->chain->head.prev,
+					struct dt_rule, head))) {
+		ARG_ERR;
+	}
+
+	assert(dt->top != NULL);
+	DPRINT(DEBUG_DIMTREE,
+	       "----------------------------------------------------------\n");
+	DPRINT(DEBUG_DIMTREE, "%s: commit: %d\n", __FUNCTION__, commit);
+	DPRINT(DEBUG_DIMTREE, "dt: origin: %X, ctindex: %u:, need_commit: %u,"
+	       " chain: %s (len: %u)\n", dt->origin, dt->ctindex,
+	       dt->need_commit, dt->chain->name, dt->chain->len);
+#ifdef DEBUG
+	if (dt->top_new == NULL) {
+		if (dt->top != NULL) {
+			if (IS_BTREE(dt->top)) {
+				print_btree((struct btree_spec *) dt->top);
+			} else if (IS_ELEM(dt->top)) {
+				print_elem((struct dt_elem *) dt->top);
+				DPRINT(DEBUG_DIMTREE, "\n");
+			} else {
+				DPRINT(DEBUG_DIMTREE, "top level rule: %p\n",
+				       dt->top);
+			}
+		}
+	} else {
+		if (IS_BTREE(dt->top_new)) {
+			print_btree((struct btree_spec *) dt->top_new);
+		} else if (IS_ELEM(dt->top_new)) {
+				print_elem((struct dt_elem *) dt->top_new);
+				DPRINT(DEBUG_DIMTREE, "\n");
+		} else {
+			DPRINT(DEBUG_DIMTREE, "top level rule: %p\n",
+			       dt->top_new);
+		}
+	}
+	if (hipac_debug & DEBUG_DIMTREE) {
+		dt_rule_print(rule);
+	}
+#endif
+
+	if (!dt->need_commit) {
+		/* first operation in a series => clone top level structure
+		   if necessary */
+		if (IS_BTREE(dt->top)) {
+			stat = btree_clone((struct btree_spec *) dt->top,
+					   (struct btree_spec **) &top);
+			if (stat < 0) {
+				return stat;
+			}
+			stat = history_replace(dt->top, top, !commit);
+			if (stat < 0) {
+				btree_free((struct btree_spec *) top);
+				history_undo();
+				return stat;
+			}
+		} else if (IS_ELEM(dt->top)) {
+			stat = elem_clone((struct dt_elem *) dt->top,
+					  (struct dt_elem **) &top);
+			if (stat < 0) {
+				return stat;
+			}
+			stat = history_replace(dt->top, top, !commit);
+			if (stat < 0) {
+				elem_free((struct dt_elem *) top);
+				history_undo();
+				return stat;
+			}
+		} else {
+			assert(IS_RULE(dt->top));
+			top = dt->top;
+		}
+	} else {
+		top = dt->top_new;
+	}
+
+	/* delete rule from btree / elementary interval */
+	if (IS_BTREE(top)) {
+		stat = dimtree_delrec((struct btree_spec **) &top, rule,
+				      0, NULL, !commit);
+	} else {
+		stat = dimtree_delete_rule_elem((struct dt_rule_elem_spec **)
+						&top, rule, dt, !commit);
+	}
+	if (stat < 0) {
+		history_undo();
+		return stat;
+	}
+	
+	if (commit) {
+#ifdef DEBUG
+		if (dt->top != NULL && IS_BTREE(dt->top) &&
+		    !rule_occur(dt->top, rule, 0)) {
+			/* this check only works if the top level structure is
+			   a btree */
+			DPRINT(DEBUG_DIMTREE, "rule %p not present in "
+			       "original btree\n", rule);
+			return HE_IMPOSSIBLE_CONDITION;
+		}
+#endif
+		br_write_lock_bh(BR_HIPAC_LOCK);
+		dt->top = top;
+		br_write_unlock_bh(BR_HIPAC_LOCK);
+		dt->top_new = NULL;
+		history_commit(0);
+		assert(history_is_empty());
+	} else {
+		assert((IS_RULE(top) && IS_RULE(dt->top)) ||
+		       !history_is_empty());
+		dt->need_commit = 1;
+		dt->top_new = top;
+		rule->deleted = 1;
+	}
+	return HE_OK;
+}
+
+static inline void
+dimtree_substitute_help(struct dt_rule *r, const __u32 val[], __u32 len,
+			const __u8 dimid[2], int pos[2], __u32 cs[2],
+			__u32 ind[2])
+{
+	__u32 left, right, i, j, k;
+
+	pos[0] = pos[1] = -1;
+	for (i = 0, j = 0; j < 2; j++) {
+		for (; i < r->dt_match_len &&
+			     r->first_dt_match[i].dimid < dimid[j]; i++);
+		if (i >= r->dt_match_len ||
+		    r->first_dt_match[i].dimid != dimid[j]) {
+			continue;
+		}
+		left = r->first_dt_match[i].left;
+		right = r->first_dt_match[i].right;
+		if (left == right) {
+			for (k = 0; k < len; k++) {
+				if (left == val[k]) {
+					pos[j] = i;
+					cs[j] = 0;
+					ind[j] = k;
+					break;
+				}
+			}
+		} else {
+			for (k = 0; k < len; k++) {
+				if (left == val[k] + 1) {
+					assert(right == MAXKEY(dim2btype[
+						dimid[j]]));
+					pos[j] = i;
+					cs[j] = 1;
+					ind[j] = k;
+					break;
+				} else if (right == val[k] - 1) {
+					assert(left == 0);
+					pos[j] = i;
+					cs[j] = 2;
+					ind[j] = k;
+					break;
+				}
+			}
+		}
+	}
+}
+
+static inline void
+dimtree_substitute_change(struct dt_rule *r, const __u32 val[],
+			  int pos[2], __u32 cs[2], __u32 ind[2])
+{
+	__u32 i, *left, *right;
+
+	for (i = 0; i < 2; i++) {
+		if (pos[i] != -1) {
+			left = &r->first_dt_match[pos[i]].left;
+			right = &r->first_dt_match[pos[i]].right;
+			switch (cs[i]) {
+			    case 0:
+				    *left = val[ind[i]];
+				    *right = val[ind[i]];
+				    break;
+			    case 1:
+				    *left = val[ind[i]] + 1;
+				    break;
+			    case 2: 
+				    *right = val[ind[i]] - 1;
+				    break;
+			}
+		}
+	}
+}
+
+hipac_error
+dimtree_substitute(struct ptrblock *dt_block, const __u8 dimid[2],
+		   const __u32 org[], const __u32 new[], const __u32 len)
+{
+	struct list_head *lh;
+	struct dimtree *dt;
+	struct dt_rule *r;
+	__u32 cs[2], ind[2];
+	int pos[2];
+		__u32 i, j;
+	int stat;
+
+	if (dt_block == NULL || dimid == NULL || dimid[0] >= dimid[1] ||
+	    MAXKEY(dim2btype[dimid[0]]) != MAXKEY(dim2btype[dimid[1]]) ||
+	    org == NULL || new == NULL || len == 0) {
+		ARG_ERR;
+	}
+	for (i = 0; i < len; i++) {
+		if (org[i] >= MAXKEY(dim2btype[dimid[0]]) || org[i] == 0 ||
+		    new[i] >= MAXKEY(dim2btype[dimid[0]]) || new[i] == 0) {
+			ARG_ERR;
+		}
+	}
+
+	for (i = 0; i < dt_block->len; i++) {
+		dt = (struct dimtree *) dt_block->p[i];
+		list_for_each(lh, &dt->chain->head) {
+			r = list_entry(lh, struct dt_rule, head);
+			dimtree_substitute_help(r, org, len, dimid, pos, cs,
+						ind);
+			if (pos[0] == -1 && pos[1] == -1) {
+				continue;
+			}
+			stat = dimtree_delete(dt, r, 0);
+			if (stat < 0) {
+				lh = lh->prev;
+				goto error;
+			}
+			r->deleted = 0;
+			dimtree_substitute_change(r, new, pos, cs, ind);
+			stat = dimtree_insert_intern(dt, r, dt->origin, 0, 0, 0);
+			if (stat < 0) {
+				goto error;
+			}
+		}
+	}
+	dimtree_commit(dt_block);
+	return HE_OK;
+
+ error:
+	dimtree_failed(dt_block);
+	/* undo rules in last dimtree */
+	for (; lh != &((struct dimtree *) dt_block->p[i])->chain->head;
+	     lh = lh->prev) {
+		r = list_entry(lh, struct dt_rule, head);
+		dimtree_substitute_help(r, new, len, dimid, pos, cs, ind);
+		dimtree_substitute_change(r, org, pos, cs, ind);
+	}
+	/* undo the rest */
+	for (j = 0; j < i; j++) {
+		dt = (struct dimtree *) dt_block->p[i];
+		list_for_each(lh, &dt->chain->head) {
+			r = list_entry(lh, struct dt_rule, head);
+			dimtree_substitute_help(r, new, len, dimid, pos, cs,
+						ind);
+			dimtree_substitute_change(r, org, pos, cs, ind);
+		}
+	}
+	return stat;
+}
+
+void
+dimtree_commit(struct ptrblock *dt_block)
+{
+	struct dimtree *dt;
+	__u32 i;
+	
+	if (unlikely(dt_block == NULL)) {
+		ARG_MSG;
+		return;
+	}
+
+	for (i = 0; i < dt_block->len; i++) {
+		dt = (struct dimtree *) dt_block->p[i];
+		if (dt->need_commit) {
+			br_write_lock_bh(BR_HIPAC_LOCK);
+			dt->top = dt->top_new;
+			br_write_unlock_bh(BR_HIPAC_LOCK);
+			dt->top_new = NULL;
+			dt->need_commit = 0;
+		}
+	}
+	history_commit(1);
+	assert(history_is_empty());
+}
+
+void
+dimtree_failed(struct ptrblock *dt_block)
+{
+	struct list_head *lh;
+	struct dimtree *dt;
+	__u32 i;
+	
+	if (unlikely(dt_block == NULL)) {
+		ARG_MSG;
+		return;
+	}
+
+	for (i = 0; i < dt_block->len; i++) {
+		dt = (struct dimtree *) dt_block->p[i];
+		if (dt->need_commit) {
+			dt->need_commit = 0;
+			dt->top_new = NULL;
+			list_for_each (lh, &dt->chain->head) {
+				list_entry(lh, struct dt_rule,
+					   head)->deleted = 0;
+			}
+		}
+		assert(dt->need_commit || dt->top_new == NULL);
+	}
+	history_undo();
+}
+
+void
+dimtree_chain_fix(struct ptrblock *dt_block)
+{
+	struct list_head *lh;
+	struct dt_rule *rule;
+	__u32 i, prevpos_new, prevpos_org;
+	struct dimtree *dt;
+	
+	if (unlikely(dt_block == NULL)) {
+		ARG_MSG;
+		return;
+	}
+	
+	for (i = 0; i < dt_block->len; i++) {
+		dt = (struct dimtree *) dt_block->p[i];
+		assert(!list_empty(&dt->chain->head));
+		if (dt->chain->first == NULL) {
+			lh = dt->chain->head.next;
+			prevpos_org = list_entry(lh, struct dt_rule,
+						 head)->spec.pos;
+			prevpos_new = list_entry(lh, struct dt_rule,
+						 head)->spec.pos = 0;
+			lh = lh->next;
+		} else {
+			lh = dt->chain->first->head.next;
+			prevpos_org = prevpos_new = dt->chain->first->spec.pos;
+		}
+		dt->chain->first = list_entry(dt->chain->head.prev,
+					      struct dt_rule, head);
+		for (; lh != &dt->chain->head; lh = lh->next) {
+			rule = list_entry(lh, struct dt_rule, head);
+			if (unlikely(rule->spec.pos == prevpos_org)) {
+				rule->spec.pos = prevpos_new;
+			} else {
+				prevpos_org = rule->spec.pos;
+				rule->spec.pos = ++prevpos_new;
+			}
+		}
+	}
+}
+
+void
+dimtree_finish_snapshot(struct dimtree *dt)
+{
+	struct list_head *lh;
+	struct dt_rule *rule;
+	struct counter_t *ct;
+	__u32 i;
+
+	if (unlikely(dt == NULL)) {
+		ARG_MSG;
+		return;
+	}
+	br_write_lock_bh(BR_HIPAC_LOCK);
+	if (dt->ctindex == 0) {
+		br_write_unlock_bh(BR_HIPAC_LOCK);
+		return;
+	}
+	dt->ctindex = 0;
+	br_write_unlock_bh(BR_HIPAC_LOCK);
+	list_for_each (lh, &dt->chain->head) {
+		rule = list_entry(lh, struct dt_rule, head);
+		ct = COUNTER(rule, 0);
+		for (i = 0; i < smp_num_cpus; i++, ct++) {
+			spin_lock_bh(&ct->lock);
+			ct->packet_ct[0] += ct->packet_ct[1];
+			ct->byte_ct[0] += ct->byte_ct[1];
+			spin_unlock_bh(&ct->lock);
+			ct->packet_ct[1] = ct->byte_ct[1] = 0;
+		}
+	}
+}
+
+static hipac_error
+hipac_get_btree_stat_rec(struct gen_spec *g, struct hipac_btree_stat *stat,
+			 __u8 depth, __u8 parent_dimid)
+{
+	struct gen_spec **nextspec = NULL;
+	__u16 leaves, jump, last_leaf, i, n, num;
+	struct btree_spec *btree;
+	int ret;
+
+	if (g == NULL) {
+		return HE_OK;
+	}
+	if (IS_RULE(g) || IS_ELEM(g)) {
+		if (depth < 1) {
+			return HE_OK;
+		}
+		stat->termptr_num++;
+		if (parent_dimid >= LEN(stat->termptr_dimid_num)) {
+			IMPOSSIBLE_CONDITION("termptr_dimid_num too small");
+		}
+		stat->termptr_dimid_num[parent_dimid]++;
+		if (depth - 1 >= LEN(stat->termptr_depth_num)) {
+			IMPOSSIBLE_CONDITION("termptr_depth_num too small");
+		}
+		stat->termptr_depth_num[depth - 1]++;
+		if (IS_ELEM(g)) {
+			struct dt_elem *e = (struct dt_elem *) g;
+			__u32 ptr_num;
+			stat->dt_elem_num++;
+			ptr_num = e->ntm_rules.len +
+				(e->term_rule == NULL ? 0 : 1);
+			stat->dt_elem_ptr_num += ptr_num;
+			stat_distribution_add(stat->dt_elem_stat,
+					      LEN(stat->dt_elem_stat),
+					      ptr_num);
+		}
+		return HE_OK;
+	}
+	
+	/* btree statistics */
+	btree = (struct btree_spec *) g;
+	if (hp_size(btree, &stat->btree_mem_real,
+		    &stat->btree_mem_tight) < 0) {
+		return HE_IMPOSSIBLE_CONDITION;
+	}
+	if (hp_size(*termrule(btree), &stat->termrule_mem_real,
+		    &stat->termrule_mem_tight) < 0) {
+		return HE_IMPOSSIBLE_CONDITION;
+	}
+	stat->btree_num++;
+	if (btree->dimid >= LEN(stat->btree_dimid_num)) {
+		IMPOSSIBLE_CONDITION("btree_dimid_num too small");
+	}
+	stat->btree_dimid_num[btree->dimid]++;
+	if (depth >= LEN(stat->btree_depth_num)) {
+		IMPOSSIBLE_CONDITION("btree_depth_num too small");
+	}
+	stat->btree_depth_num[depth]++;
+	if (*termrule(btree) != NULL) {
+		stat->termrule_num++;
+		stat->termrule_ptr_num += (*termrule(btree))->len;
+	}
+	stat->keys_num += btree->num;
+		if (btree->dimid >= LEN(stat->btree_dimid_keys_stat)) {
+		IMPOSSIBLE_CONDITION("btree_dimid_keys_stat too small");
+	}
+	stat_distribution_add(stat->btree_dimid_keys_stat[btree->dimid],
+			      LEN(*stat->btree_dimid_keys_stat), btree->num);
+	if (depth > 0) {
+		stat->nontermptr_num++;
+		if (parent_dimid >= LEN(stat->nontermptr_dimid_num)) {
+			IMPOSSIBLE_CONDITION("nontermptr_dimid_num too small");
+		}
+		stat->nontermptr_dimid_num[parent_dimid]++;
+		if (depth - 1 >= LEN(stat->nontermptr_depth_num)) {
+			IMPOSSIBLE_CONDITION("nontermptr_depth_num too small");
+		}
+		stat->nontermptr_depth_num[depth - 1]++;
+	}
+
+	/* recursion */
+	btree_set_iteratevals(btree, &leaves, &num, &jump, &last_leaf,
+			      &nextspec);
+	assert(nextspec != NULL);
+	for (i = 0; i < leaves; i++) {
+		for (n = 0; n < num; n++) {
+			ret = hipac_get_btree_stat_rec(*(nextspec + n), stat,
+						       depth + 1,
+						       btree->dimid);
+			if (ret < 0) {
+				return ret;
+			}
+		}
+		nextspec = (struct gen_spec **) ((__u8 *) nextspec + jump);
+	}
+	for (n = 0; n < last_leaf; n++) {
+		ret = hipac_get_btree_stat_rec(*(nextspec + n), stat,
+					       depth + 1, btree->dimid);
+		if (ret < 0) {
+			return ret;
+		}
+	}
+	if (HAS_WILDCARD_SPEC(btree)) {
+		ret = hipac_get_btree_stat_rec(*WILDCARD(btree), stat,
+					       depth + 1, btree->dimid);
+		if (ret < 0) {
+			return ret;
+		}
+	}
+	return HE_OK;
+}
+
+hipac_error
+hipac_get_btree_stat(void *hipac, struct hipac_btree_stat *stat)
+{
+	struct dimtree *dt = hipac;
+
+	if (dt == NULL || stat == NULL) {
+		ARG_ERR;
+	}
+
+	memset(stat, 0, sizeof(*stat));
+	stat->total_mem_tight = mem_current_tight;
+	stat->total_mem_real = mem_current_real;
+	if (dt->top == NULL) {
+		IMPOSSIBLE_CONDITION("top level btree NULL");
+	}
+	return hipac_get_btree_stat_rec(dt->top, stat, 0, 0);
+}
+
+hipac_error
+hipac_get_dimtree_stat(void *hipac, struct hipac_dimtree_stat *stat)
+{
+	struct dimtree *dt = hipac;
+	struct list_head *lh;
+	struct dt_rule *r;
+	__u32 pos, num;
+
+	if (dt == NULL || stat == NULL) {
+		ARG_ERR;
+	}
+
+	memset(stat, 0, sizeof(*stat));
+	if (hp_size(dt->chain, &stat->chain_mem_real,
+		    &stat->chain_mem_tight) < 0) {
+		return HE_IMPOSSIBLE_CONDITION;
+	}
+	stat->rule_num = dt->chain->len;
+	pos = num = 0;
+	list_for_each (lh, &dt->chain->head) {
+		r = list_entry(lh, struct dt_rule, head);
+		if (r->spec.pos == pos) {
+			num++;
+		} else {
+			if (num > 1) {
+				stat_distribution_add(
+				      stat->rules_same_pos_stat,
+				      LEN(stat->rules_same_pos_stat), num);
+			}
+			num = 1;
+			pos = r->spec.pos;
+		}
+		if (hp_size(r, &stat->chain_mem_real,
+			    &stat->chain_mem_tight) < 0) {
+			return HE_IMPOSSIBLE_CONDITION;
+		}
+		if (HAS_EXEC_MATCH(r)) {
+			stat->rules_with_exec_matches++;
+		}
+		if (IS_TARGET_EXEC(r)) {
+			stat->rules_with_exec_target++;
+		}
+		if (r->dt_match_len >= LEN(stat->dt_match_stat)) {
+			IMPOSSIBLE_CONDITION("dt_match_stat too small");
+		}
+		stat->dt_match_stat[r->dt_match_len]++;
+	}
+	if (num > 1) {
+		stat_distribution_add(stat->rules_same_pos_stat,
+				      LEN(stat->rules_same_pos_stat), num);
+	}
+	return HE_OK;
+}
+
+
+
+/*
+ * hipac matching algorithm
+ */
+
+#define INC_COUNTER(dt, rule, size)           \
+do {                                          \
+	struct counter_t *ct;                 \
+	ct = COUNTER(rule, CURRENT_CPU);      \
+	 spin_lock(&ct->lock);                 \
+	ct->packet_ct[(dt)->ctindex]++;       \
+	ct->byte_ct[(dt)->ctindex] += (size); \
+	spin_unlock(&ct->lock);               \
+} while (0)
+
+static inline void
+btree_find_leaves_help(struct gen_spec **spec, const void *packet,
+		       void *start)
+{
+	struct btree_spec *b = (struct btree_spec *) *spec;
+
+	switch (b->btreetype) {
+	    case BT0:
+		    if (b->bittype == BIT_U16) {
+			    *spec = next_spec_16(extract_fn[b->dimid](packet),
+						 start, b->num);
+		    } else {
+			    *spec = next_spec_8(extract_fn[b->dimid](packet),
+						start, b->num);
+		    }
+		    break;
+		       
+	    case BT1:
+		    if (b->bittype == BIT_U16) {
+			    *spec = next_spec_16(
+				    extract_fn[b->dimid](packet),
+				    next_node1_16(extract_fn[b->dimid](packet),
+						  b, start,
+						  BT1_U16_LEAF_BLOCKS),
+				    BT1_U16_LEAF);
+		    } else {
+			    *spec = next_spec_8(
+				    extract_fn[b->dimid](packet), 
+				    next_node1_8(extract_fn[b->dimid](packet),
+						 b, start, 
+						 BT1_U8_LEAF_BLOCKS),
+				    BT1_U8_LEAF);
+		    }
+		    break;
+
+	    case BT2:
+		    *spec = next_spec_16(
+			    extract_fn[b->dimid](packet),
+			    next_node1_16(extract_fn[b->dimid](packet), b,
+					  start, BT2_U16_LEAF_BLOCKS),
+			    BT2_U16_LEAF);
+		    break;
+			
+	    default: {
+			    __u32 root_num = DIV(b->num, BT3_U16_NODE *
+						 BT3_U16_LEAF);
+			    *spec = next_spec_16(
+				    extract_fn[b->dimid](packet),
+				    next_node2_16(
+					    extract_fn[b->dimid](packet),
+					    LEAF1(b), root_num, 
+					    next_node1_16(
+						    extract_fn[b->dimid]
+						    (packet), b, start,
+						    BT3_U16_NODE_BLOCKS),
+					    BT3_U16_NODE_BLOCKS,
+					    BT3_U16_LEAF_BLOCKS),
+				    BT3_U16_LEAF);
+			    break;
+		    }
+	}
+}
+
+static inline __u8
+btree_find_leaves(struct btree_spec *btree, const void *packet,
+		  struct gen_spec *rule_elem[], __u32 *term_pos,
+		  struct dt_rule **term_rule, __u32 *nonterm_pos)
+{
+	struct gen_spec *spec = (struct gen_spec *) btree;
+	__u8 spec_count = 0;
+	__u8 res_count = 0;
+	__u8 i;
+
+	assert(btree != NULL);
+	
+	/* the tree has at most 4 leaves and as an additional property the
+	   tree branches only at the top level, i.e. if we have either
+	   dimension 0 or 1 we have exactly 2 leaves, if we have both 
+	   dimension 0 and 1 we have exactly 4 leaves and if the tree
+	   starts with a dimension > 1 we have exactly 1 leaf */
+	switch (btree->dimid) {
+		case 0: {
+			spec = btree_match_32_next(
+				btree, extract_fn[btree->dimid](packet));
+			if (spec != NULL) {
+				if (!IS_BTREE(spec) ||
+				    ((struct btree_spec *) spec)->dimid > 1) {
+					rule_elem[spec_count++] = spec;
+				} else {
+					struct btree_spec *b =
+						(struct btree_spec *) spec;
+					rule_elem[spec_count++] = 
+						btree_match_32_next(
+							b, extract_fn[b->dimid]
+							(packet));
+					rule_elem[spec_count++] =
+						*WILDCARD(b);
+				}
+			}
+			spec = *WILDCARD(btree);
+			if (spec != NULL) {
+				if (!IS_BTREE(spec) ||
+				    ((struct btree_spec *) spec)->dimid > 1) {
+					rule_elem[spec_count++] = spec;
+				} else {
+					struct btree_spec *b =
+						(struct btree_spec *) spec;
+					rule_elem[spec_count++] = 
+						btree_match_32_next(
+							b, extract_fn[b->dimid]
+							(packet));
+					rule_elem[spec_count++] =
+						*WILDCARD(b);
+				}
+			}
+			break;
+		}
+
+	    case 1:
+		    rule_elem[spec_count++] = btree_match_32_next(
+			    btree, extract_fn[btree->dimid](packet));
+		    rule_elem[spec_count++] = *WILDCARD(btree);
+		    break;
+
+	    default:
+		    rule_elem[spec_count++] = spec;
+		    break;
+	}
+	
+	for (i = 0; i < spec_count; i++) {
+		spec = rule_elem[i];
+		while (spec != NULL && IS_BTREE(spec)) {
+			btree_find_leaves_help(&spec, packet, (__u8 *) spec +
+					       sizeof(__u32));
+		}
+		if (spec != NULL) {
+			/* found rule or elementary interval -> update
+			   term_pos, term_rule and nonterm_pos */
+			rule_elem[res_count++] = spec;
+			if (likely(IS_RULE(spec))) {
+				struct dt_rule *r = (struct dt_rule *) spec;
+				if (likely(IS_RULE_TERM(r))) {
+					if (r->spec.pos < *term_pos) {
+						*term_pos = r->spec.pos;
+						*term_rule = r;
+					}
+				} else if (r->spec.pos < *nonterm_pos) {
+					*nonterm_pos = r->spec.pos;
+				}
+			} else {
+				struct dt_elem *e = (struct dt_elem *) spec;
+				if (e->term_rule != NULL &&
+				    e->term_rule->spec.pos < *term_pos) {
+					*term_rule = e->term_rule;
+					*term_pos = (*term_rule)->spec.pos;
+					assert(IS_RULE_TERM(*term_rule));
+				}
+				assert(e->ntm_rules.len > 0);
+				if (((struct dt_rule *)
+				     *e->ntm_rules.p)->spec.pos <
+				    *nonterm_pos) {
+					*nonterm_pos =
+						((struct dt_rule *)
+						 *e->ntm_rules.p)->spec.pos;
+				}
+			}
+		}
+	}
+	return res_count;
+}
+
+static inline hipac_target_t
+match_packet(const struct dimtree *dt, const void *packet, __u32 pkt_size,
+	     struct dt_rule *rule)
+{
+	__u32 i;
+
+	if (HAS_EXEC_MATCH(rule)) {
+		assert(!(rule->exec_match->len & 1));
+		for (i = 0; i < rule->exec_match->len; i += 2) {
+			switch (match_fn(packet, rule->exec_match->p[i],
+					 rule->exec_match->p[i + 1])) {
+			    case MATCH_YES:
+				    break;
+
+			    case MATCH_NO:
+				    return TARGET_NONE;
+
+			    case MATCH_HOTDROP: 
+				    /* counter is not increased */
+				    return TARGET_DROP;
+			}
+		}
+	}
+	INC_COUNTER(dt, rule, pkt_size);
+	return IS_TARGET_EXEC(rule) ?
+		target_fn(packet, rule->exec_target) : rule->spec.action;
+}
+
+/* match packet against the btree in dt and return the terminal action
+   (TARGET_ACCEPT or TARGET_DROP) of the highest priority terminal rule or
+   the policy if there is no such rule */
+hipac_target_t
+hipac_match(void *hipac, const void *packet, __u32 pkt_size)
+{
+#       define NUM_LEAVES 4
+	struct dimtree *dt = hipac;
+	struct dt_rule_elem_spec *rule_elem[NUM_LEAVES] = {NULL, NULL,
+							   NULL, NULL};
+	__u32 nonterm_pos = UINT_MAX;
+	/* UINT_MAX - 1 is required because of
+	   if (likely(term_pos < nonterm_pos)) {...} optimization */
+	__u32 term_pos = UINT_MAX - 1;
+	struct dt_rule *term_rule = NULL;
+	struct dt_rule **ntm_rule[NUM_LEAVES];
+	struct dt_rule **ntm_end[NUM_LEAVES];
+	__u32 ntm_next_pos, new_next;
+	__u8 ntm_rule_sz, ntm_cur_ind;
+	__u8 action, len, i;
+
+	assert(packet != NULL);
+	assert(dt->top != NULL);
+	br_read_lock(BR_HIPAC_LOCK);
+	
+	if (likely(IS_BTREE(dt->top))) {
+		/* find the terminal rule (no function based matches and
+		   terminal target) with smallest position if existent and the
+		   non-terminal rule (function based matches or no terminal
+		   target) with smallest position if existent; the function
+		   returns the number of leaves (<= NUM_LEAVES) in rule_elem
+		   which are not NULL */
+		len = btree_find_leaves(
+			(struct btree_spec *) dt->top, packet,
+			(struct gen_spec **) rule_elem, &term_pos,
+			&term_rule, &nonterm_pos);
+	} else if (IS_ELEM(dt->top)) {
+		rule_elem[0] = (struct dt_rule_elem_spec *) dt->top;
+		len = 1;
+		term_rule = ((struct dt_elem *) dt->top)->term_rule;
+		assert(term_rule != NULL);
+		assert(IS_RULE_TERM(term_rule));
+		term_pos = term_rule->spec.pos;
+		nonterm_pos = ((struct dt_rule *)
+			       ((struct dt_elem *)
+				dt->top)->ntm_rules.p[0])->spec.pos;
+	} else {
+		assert(IS_RULE(dt->top));
+		rule_elem[0] = (struct dt_rule_elem_spec *) dt->top;
+		len = 1;
+		term_rule = (struct dt_rule *) dt->top;
+		term_pos = term_rule->spec.pos;
+		assert(IS_RULE_TERM(term_rule));
+	}
+	assert(len <= NUM_LEAVES);
+
+	/* optimization for the ideal case that no non-terminal rules
+	   (function based matches or no terminal target) exist */
+	if (likely(term_pos < nonterm_pos)) {
+		if (term_rule == NULL) {
+			/* this should never happen */
+			ERR("terminal rule is NULL");
+			action = TARGET_DROP;
+			goto exit;
+		}
+		INC_COUNTER(dt, term_rule, pkt_size);
+		action = term_rule->spec.action;
+		goto exit;
+	}
+
+	/* initialize ntm_rule, ntm_end, ntm_rule_sz, ntm_cur_ind and
+	   ntm_next_pos now that term_pos is given */
+	ntm_rule_sz = ntm_cur_ind = 0;
+	ntm_next_pos = UINT_MAX;
+	for (i = 0; i < len; i++) {
+		assert(rule_elem[i] != NULL);
+		if (likely(IS_RULE(rule_elem[i]))) {
+			struct dt_rule **r = (struct dt_rule **) &rule_elem[i];
+			__u32 pos = (*r)->spec.pos;
+			if (!IS_RULE_TERM(*r) && pos < term_pos) {
+				if (pos == nonterm_pos) {
+					ntm_cur_ind = ntm_rule_sz;
+				} else if (pos < ntm_next_pos) {
+					ntm_next_pos = pos;
+				}
+				ntm_rule[ntm_rule_sz] = r;
+				ntm_end[ntm_rule_sz++] = r;
+			}
+		} else {
+			struct dt_elem *e = (struct dt_elem *) rule_elem[i];
+			__u32 pos = ((struct dt_rule *)
+				     *e->ntm_rules.p)->spec.pos;
+			if (pos < term_pos) {
+				if (pos == nonterm_pos) {
+					ntm_cur_ind = ntm_rule_sz;
+				} else if (pos < ntm_next_pos) {
+					ntm_next_pos = pos;
+				}
+				ntm_rule[ntm_rule_sz] =
+					(struct dt_rule **) e->ntm_rules.p;
+				ntm_end[ntm_rule_sz++] = (struct dt_rule **)
+					&e->ntm_rules.p[e->ntm_rules.len - 1];
+			}
+		}
+	}
+	assert(ntm_rule_sz > 0);
+	
+	/* process non-terminal rules in order up to term_pos */
+	ntm_next_pos = ntm_next_pos < term_pos ? ntm_next_pos : term_pos;
+	while (ntm_rule_sz > 0 &&
+	       (*ntm_rule[ntm_cur_ind])->spec.pos < ntm_next_pos) {
+		
+		/* match packet against current block of rules */
+		for (; (ntm_rule[ntm_cur_ind] <= ntm_end[ntm_cur_ind] &&
+			(*ntm_rule[ntm_cur_ind])->spec.pos < ntm_next_pos);
+		     ntm_rule[ntm_cur_ind]++) {
+
+			switch (action =
+				match_packet(dt, packet, pkt_size,
+					     *ntm_rule[ntm_cur_ind])) {
+			    case TARGET_NONE:
+				    break;
+			    default:
+				    assert(action == TARGET_ACCEPT ||
+					   action == TARGET_DROP);
+				    goto exit;
+			}
+		}
+
+		/* remove current block of rules if no rule is left that may
+		   be matched */
+		if (ntm_rule[ntm_cur_ind] > ntm_end[ntm_cur_ind] ||
+		    (*ntm_rule[ntm_cur_ind])->spec.pos >= term_pos) {
+			ntm_rule_sz--;
+			for (i = ntm_cur_ind; i < ntm_rule_sz; i++) {
+				ntm_rule[i] = ntm_rule[i + 1];
+				ntm_end[i] = ntm_end[i + 1];
+			}
+		}
+
+		/* set ntm_cur_ind and ntm_next_pos for next run */
+		new_next = term_pos;
+		for (i = 0; i < ntm_rule_sz; i++) {
+			if ((*ntm_rule[i])->spec.pos == ntm_next_pos) {
+				ntm_cur_ind = i;
+			} else if ((*ntm_rule[i])->spec.pos < new_next) {
+				new_next = (*ntm_rule[i])->spec.pos;
+			}
+		}
+		ntm_next_pos = new_next;
+	}
+
+	/* terminal rule or policy matches */
+	if (term_rule == NULL) {
+		/* this should never happen */
+		ERR("terminal rule is NULL");
+		action = TARGET_DROP;
+		goto exit;
+	}
+	INC_COUNTER(dt, term_rule, pkt_size);
+	action = term_rule->spec.action;
+
+ exit:
+	br_read_unlock(BR_HIPAC_LOCK);
+	return action;
+}
+
+/*
+ * DEBUG FUNCTIONS
+ */
+
+#ifdef DEBUG
+/* for verification purposes only */
+static inline hipac_target_t
+match_packet_debug(struct ptrblock **b, const struct dimtree *dt,
+		   const void *packet, __u32 pkt_size, struct dt_rule *rule)
+{
+	__u32 i;
+
+	if (HAS_EXEC_MATCH(rule)) {
+		assert(!(rule->exec_match->len & 1));
+		for (i = 0; i < rule->exec_match->len; i += 2) {
+			switch (match_fn(packet, rule->exec_match->p[i],
+					 rule->exec_match->p[i + 1])) {
+			    case MATCH_YES:
+				    break;
+
+			    case MATCH_NO:
+				    return TARGET_NONE;
+
+			    case MATCH_HOTDROP: 
+				    /* counter is not increased */
+				    return TARGET_DROP;
+			}
+		}
+	}
+	INC_COUNTER(dt, rule, pkt_size);
+	if (ptrblock_append(b, rule) < 0) {
+		ERR("ptrblock_append failed");
+	}
+	return IS_TARGET_EXEC(rule) ?
+		target_fn(packet, rule->exec_target) : rule->spec.action;
+}
+
+/* return the matched rules in order - for verification purposes only */
+struct ptrblock *
+hipac_match_debug(struct dimtree *dt, const void *packet, __u32 pkt_size)
+{
+#       define NUM_LEAVES 4
+	struct dt_rule_elem_spec *rule_elem[NUM_LEAVES] = {NULL, NULL,
+							   NULL, NULL};
+	struct ptrblock *b = NULL;
+	__u32 nonterm_pos = UINT_MAX;
+	/* UINT_MAX - 1 is required because of
+	   if (likely(term_pos < nonterm_pos)) {...} optimization */
+	__u32 term_pos = UINT_MAX - 1;
+	struct dt_rule *term_rule = NULL;
+	struct dt_rule **ntm_rule[NUM_LEAVES];
+	struct dt_rule **ntm_end[NUM_LEAVES];
+	__u32 ntm_next_pos, new_next;
+	__u8 ntm_rule_sz, ntm_cur_ind;
+	__u8 action, len, i;
+
+	assert(packet != NULL);
+	assert(dt->top != NULL);
+	br_read_lock(BR_HIPAC_LOCK);
+	
+	if (likely(IS_BTREE(dt->top))) {
+		/* find the terminal rule (no function based matches and
+		   terminal target) with smallest position if existent and the
+		   non-terminal rule (function based matches or no terminal
+		   target) with smallest position if existent; the function
+		   returns the number of leaves (<= NUM_LEAVES) in rule_elem
+		   which are not NULL */
+		len = btree_find_leaves(
+			(struct btree_spec *) dt->top, packet,
+			(struct gen_spec **) rule_elem, &term_pos,
+			&term_rule, &nonterm_pos);
+	} else if (IS_ELEM(dt->top)) {
+		rule_elem[0] = (struct dt_rule_elem_spec *) dt->top;
+		len = 1;
+		term_rule = ((struct dt_elem *) dt->top)->term_rule;
+		assert(term_rule != NULL);
+		assert(IS_RULE_TERM(term_rule));
+		term_pos = term_rule->spec.pos;
+		nonterm_pos = ((struct dt_rule *)
+			       ((struct dt_elem *)
+				dt->top)->ntm_rules.p[0])->spec.pos;
+	} else {
+		assert(IS_RULE(dt->top));
+		rule_elem[0] = (struct dt_rule_elem_spec *) dt->top;
+		len = 1;
+		term_rule = (struct dt_rule *) dt->top;
+		term_pos = term_rule->spec.pos;
+		assert(IS_RULE_TERM(term_rule));
+	}
+	assert(len <= NUM_LEAVES);
+
+	/* optimization for the ideal case that no non-terminal rules
+	   (function based matches or no terminal target) exist */
+	if (likely(term_pos < nonterm_pos)) {
+		if (term_rule == NULL) {
+			/* this should never happen */
+			ERR("terminal rule is NULL");
+			goto exit;
+		}
+		INC_COUNTER(dt, term_rule, pkt_size);
+		if (ptrblock_append(&b, term_rule) < 0) {
+			ERR("ptrblock_append failed");
+		}
+		goto exit;
+	}
+
+	/* initialize ntm_rule, ntm_end, ntm_rule_sz, ntm_cur_ind and
+	   ntm_next_pos now that term_pos is given */
+	ntm_rule_sz = ntm_cur_ind = 0;
+	ntm_next_pos = UINT_MAX;
+	for (i = 0; i < len; i++) {
+		assert(rule_elem[i] != NULL);
+		if (likely(IS_RULE(rule_elem[i]))) {
+			struct dt_rule **r = (struct dt_rule **) &rule_elem[i];
+			__u32 pos = (*r)->spec.pos;
+			if (!IS_RULE_TERM(*r) && pos < term_pos) {
+				if (pos == nonterm_pos) {
+					ntm_cur_ind = ntm_rule_sz;
+				} else if (pos < ntm_next_pos) {
+					ntm_next_pos = pos;
+				}
+				ntm_rule[ntm_rule_sz] = r;
+				ntm_end[ntm_rule_sz++] = r;
+			}
+		} else {
+			struct dt_elem *e = (struct dt_elem *) rule_elem[i];
+			__u32 pos = ((struct dt_rule *)
+				     *e->ntm_rules.p)->spec.pos;
+			if (pos < term_pos) {
+				if (pos == nonterm_pos) {
+					ntm_cur_ind = ntm_rule_sz;
+				} else if (pos < ntm_next_pos) {
+					ntm_next_pos = pos;
+				}
+				ntm_rule[ntm_rule_sz] =
+					(struct dt_rule **) e->ntm_rules.p;
+				ntm_end[ntm_rule_sz++] = (struct dt_rule **)
+					&e->ntm_rules.p[e->ntm_rules.len - 1];
+			}
+		}
+	}
+	assert(ntm_rule_sz > 0);
+	
+	/* process non-terminal rules in order up to term_pos */
+	ntm_next_pos = ntm_next_pos < term_pos ? ntm_next_pos : term_pos;
+	while (ntm_rule_sz > 0 &&
+	       (*ntm_rule[ntm_cur_ind])->spec.pos < ntm_next_pos) {
+		
+		/* match packet against current block of rules */
+		for (; (ntm_rule[ntm_cur_ind] <= ntm_end[ntm_cur_ind] &&
+			(*ntm_rule[ntm_cur_ind])->spec.pos < ntm_next_pos);
+		     ntm_rule[ntm_cur_ind]++) {
+
+			switch (action =
+				match_packet_debug(&b, dt, packet, pkt_size,
+						   *ntm_rule[ntm_cur_ind])) {
+			    case TARGET_NONE:
+				    break;
+			    default:
+				    assert(action == TARGET_ACCEPT ||
+					   action == TARGET_DROP);
+				    goto exit;
+			}
+		}
+
+		/* remove current block of rules if no rule is left that may
+		   be matched */
+		if (ntm_rule[ntm_cur_ind] > ntm_end[ntm_cur_ind] ||
+		    (*ntm_rule[ntm_cur_ind])->spec.pos >= term_pos) {
+			ntm_rule_sz--;
+			for (i = ntm_cur_ind; i < ntm_rule_sz; i++) {
+				ntm_rule[i] = ntm_rule[i + 1];
+				ntm_end[i] = ntm_end[i + 1];
+			}
+		}
+
+		/* set ntm_cur_ind and ntm_next_pos for next run */
+		new_next = term_pos;
+		for (i = 0; i < ntm_rule_sz; i++) {
+			if ((*ntm_rule[i])->spec.pos == ntm_next_pos) {
+				ntm_cur_ind = i;
+			} else if ((*ntm_rule[i])->spec.pos < new_next) {
+				new_next = (*ntm_rule[i])->spec.pos;
+			}
+		}
+		ntm_next_pos = new_next;
+	}
+
+	/* terminal rule or policy matches */
+	if (term_rule == NULL) {
+		/* this should never happen */
+		ERR("terminal rule is NULL");
+		goto exit;
+	}
+	INC_COUNTER(dt, term_rule, pkt_size);
+	if (ptrblock_append(&b, term_rule) < 0) {
+		ERR("ptrblock_append failed");
+	}
+
+ exit:
+	br_read_unlock(BR_HIPAC_LOCK);
+	return b;
+}
+
+#endif
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/net/ipv4/netfilter/nf-hipac/dimtree.h linux-2.4.20-wolk4.4-fullkernel/net/ipv4/netfilter/nf-hipac/dimtree.h
--- linux-2.4.20-wolk4.3-fullkernel/net/ipv4/netfilter/nf-hipac/dimtree.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/net/ipv4/netfilter/nf-hipac/dimtree.h	2003-07-30 11:23:30.000000000 +0200
@@ -0,0 +1,399 @@
+/*
+ * High performance packet classification - dimension tree
+ *
+ * Authors: Michael Bellion and Thomas Heinz
+ * (c) 2002-2003 by the hipac core team <nf@hipac.org>:
+ *      +-----------------------+----------------------+
+ *      |   Michael Bellion     |     Thomas Heinz     |
+ *      | <mbellion@hipac.org>  |  <creatix@hipac.org> |
+ *      +-----------------------+----------------------+
+ * Licenced under the GNU General Public Licence, version >= 2.
+ */
+
+
+#ifndef _DIMTREE_H
+#define _DIMTREE_H
+
+#include "global.h"
+#include "btree.h"
+
+/* upper bound for matches of the given bit type */
+#define MAXKEY(bittype) \
+((bittype) == BIT_U8 ? 0xff : ((bittype) == BIT_U16 ? 0xffff : 0xffffffff))
+
+/* used to distinguish a rule from an elementary interval */
+#define RT_RULE 0
+#define RT_ELEM 1
+
+
+/* header for dimtree rules and elementary intervals */
+struct dt_rule_elem_spec
+{
+	unsigned bittype : 2; // must be BIT_RULE	
+	unsigned rtype   : 1; // {RT_RULE, RT_ELEM}
+};
+
+/* header for dimtree rules */
+struct dt_rule_spec
+{
+	unsigned bittype :  2; // must be BIT_RULE	
+	unsigned rtype   :  1; // must be RT_RULE
+	unsigned action  :  4; // packet action
+	unsigned pos     : 25; // position of the rule in the chain
+};
+
+/* dt_match represents the native interval match [left, right] associated
+   with dimension dimid whereby [left, right] may not be a wildcard match */
+struct dt_match
+{
+	__u8 dimid;
+	__u32 left, right;
+	char next_match[0];
+};
+
+/* lock is used to implement a very fine grained locking mechanism which
+   synchronizes the race between hipac_match() and dimtree_finish_snapshot() */
+struct counter_t
+{
+	__u64 packet_ct[2], byte_ct[2];
+	spinlock_t lock;
+} __cacheline_aligned;
+
+/* dt_rule is an entry in the dt_chain; at the end of the struct we have
+   dt_match_len >= 0 dt_matches and smp_num_cpus structs counter_t;
+   if the rule has a function based target then exec_target points to the
+   target's data which is handled by target_fn;
+   the rule's exec_match pointer block references >= 0 blocks each of >= 1
+   function based matches, called fblocks;
+   the (2 * i)-th pointer of exec_match points to the beginning of the i-th
+   fblock;
+   the (2 * i + 1)-th pointer of exec_match points to the end of the i-th
+   fblock;
+   the start and end pointers are handed to match_fn */
+struct dt_rule
+{
+	struct dt_rule_spec spec;
+	struct list_head head;
+	struct ptrblock *exec_match;
+	void *exec_target;
+	__u32 exec_target_size;
+	__u8 deleted;
+	__u8 dt_match_len;
+	struct dt_match first_dt_match[0];
+};
+
+#define IS_RULE(r) (((struct dt_rule_elem_spec *) (r))->bittype == BIT_RULE \
+		    && ((struct dt_rule_elem_spec *) (r))->rtype == RT_RULE)
+#define COUNTER(rule, cpu) ((struct counter_t *)                             \
+			    ((char *) rule + SMP_CACHE_ALIGN(                \
+				    sizeof(*(rule)) + (rule)->dt_match_len * \
+				    sizeof(*(rule)->first_dt_match)) +       \
+			     (cpu) * sizeof(struct counter_t)))
+#define HAS_EXEC_MATCH(r)  ((r)->exec_match != NULL)
+#define IS_TARGET_DUMMY(r) ((r)->spec.action == TARGET_DUMMY)
+#define IS_TARGET_NONE(r)  ((r)->spec.action == TARGET_NONE)
+#define IS_TARGET_EXEC(r)  ((r)->spec.action == TARGET_EXEC)
+#define IS_TARGET_TERM(r)  ((r)->spec.action == TARGET_ACCEPT || \
+			    (r)->spec.action == TARGET_DROP)
+#define IS_RULE_TERM(r)    (IS_TARGET_TERM(r) && !HAS_EXEC_MATCH(r))
+
+/* return the size of a dt_rule with dt_match_len dt_matches */
+static inline __u32
+dt_rule_size(__u8 dt_match_len)
+{
+	return SMP_CACHE_ALIGN(sizeof(struct dt_rule) + dt_match_len *
+			       sizeof(struct dt_match)) +
+		smp_num_cpus * sizeof(struct counter_t);
+}
+
+/* initialize the counter block of rule with packet_ct and byte_ct */
+static inline void
+dt_rule_init_counters(struct dt_rule *rule, __u64 packet_ct, __u64 byte_ct)
+{
+	struct counter_t *ct;
+	int i;
+	
+	if (rule == NULL) {
+		return;
+	}
+	ct = COUNTER(rule, 0);
+	memset(ct, 0, smp_num_cpus * sizeof(struct counter_t));
+	ct->packet_ct[0] = packet_ct;
+	ct->byte_ct[0] = byte_ct;
+	for (i = 0; i < smp_num_cpus; i++, ct++) {
+		spin_lock_init(&ct->lock);
+	}
+}
+
+/* head of the list of rules */
+struct dt_chain
+{
+	struct list_head head;
+	char name[HIPAC_CHAIN_NAME_MAX_LEN];
+	struct dt_rule *first; // optimization of dimtree_chain_fix
+	__u32 len;
+};
+
+
+
+/* header for elementary intervals */
+struct dt_elem_spec
+{
+	unsigned bittype : 2; // must be BIT_RULE
+	unsigned rtype   : 1; // must be RT_ELEM
+	unsigned newspec : 1; // indicates whether the elementary interval is
+	                      // contained in newspec
+};
+
+/* elementary interval */
+struct dt_elem
+{
+	struct dt_elem_spec spec;
+	/* terminating target (TARGET_ACCEPT, TARGET_DROP) without function
+	   based matches */
+	struct dt_rule *term_rule;
+	/* block of non-terminating rules (function based matches or no
+	   terminal target) whose position is < term_rule->spec.pos */
+	struct ptrblock ntm_rules;
+};
+
+#define IS_ELEM(e) (((struct dt_rule_elem_spec *) (e))->bittype == BIT_RULE \
+		    && ((struct dt_rule_elem_spec *) (e))->rtype == RT_ELEM)
+
+
+
+/* main dimtree struct: ctindex and top are protected by BR_HIPAC_LOCK */
+struct dimtree
+{
+	__u32 origin;
+	unsigned ctindex : 1;
+	struct gen_spec *top;
+	struct gen_spec *top_new;    // new not yet active top level structure
+	int need_commit;             // 1 if top_new is valid
+	struct dt_chain *chain;
+};
+
+
+
+/* create new dimtree and store it in *newdt; chain_name is copied to
+   dt->chain->name; memory for newdt is allocated within dimtree_new;
+   origin is a bit vector where exactly one bit is set; it is used to
+   uniquely define the "origin property" of newdt; dummy and policy
+   define the base ruleset; dummy must have TARGET_DUMMY as target,
+   policy must be a terminal rule without any dt_matches;
+   possible errors: HE_LOW_MEMORY, HE_IMPOSSIBLE_CONDITION */
+hipac_error
+dimtree_new(struct dimtree **newdt, __u32 origin, const char *chain_name,
+	    struct dt_rule *dummy, struct dt_rule *policy);
+
+/* free memory for dt and all embedded structures; make sure that no packet
+   matching occurs on dt any more */
+void
+dimtree_free(struct dimtree *dt);
+
+/* remove all rules except the first and the last one from dt->chain and
+   free them; set dt->top to the last rule in the chain */
+void
+dimtree_flush(struct dimtree *dt);
+
+const char *
+dimtree_get_chain_name(const struct dimtree *dt);
+
+/* insert rule into the dt_chain and the btree; inc indicates whether all
+   rule positions >= rule->spec.pos should be incremented by 1;
+   if commit is not 0 then the top level structure in dt is replaced by the
+   new one and the old btrees and elementary intervals are freed;
+   in case of a fault all newly created btrees and elementary intervals
+   are freed; origin is a bit vector describing the allowed dimtrees
+   into which rule may be inserted; if rule must not be inserted into dt
+   it is anyway inserted into dt->chain (so take care to remove it from
+   there);
+   NOTICE: if commit is not 0 it is assumed that this operation is the
+           first one (at all or directly after a previously committed
+           operation or series of operations (-> dimtree_commit))
+   possible errors: HE_LOW_MEMORY, HE_IMPOSSIBLE_CONDITION,
+                    HE_RULE_ORIGIN_MISMATCH */
+hipac_error
+dimtree_insert(struct dimtree *dt, struct dt_rule *rule, __u32 origin,
+	       int inc, int commit);
+
+/* delete rule from btree, _NOT_ from the dt_chain; 'rule' must point to a
+   rule in dt->chain; if commit is not 0 then the top level structure in dt
+   is replaced by the new one and the old btrees and elementary intervals
+   are freed; in case of a fault all newly created btrees and elementary
+   intervals are freed;
+   NOTICE: if commit is not 0 it is assumed that this operation is the
+           first one (at all or directly after a previously committed
+           operation or series of operations (-> dimtree_commit))
+   possible errors: HE_LOW_MEMORY, HE_IMPOSSIBLE_CONDITION */
+hipac_error
+dimtree_delete(struct dimtree *dt, struct dt_rule *rule, int commit);
+
+/* for each rule r contained in the chains of the dimtrees in dt_block the
+   following operation is performed:
+   if r has a match (l, r) in dimid[k] (k \in {0, 1}): for all 0 <= i <= len:
+   - if l == r == org[i] then l = r = new[i]
+   - if l == org[i] + 1  then l = new[i] + 1 (assuming that
+                                              r == MAXKEY(dimid[k]))
+   - if r == org[i] - 1  then r = new[i] - 1 (assuming that l == 0)
+   the original rule r is replaced by the modified r;
+   org[i] and new[i] must be > 0 and < MAXKEY(dimid[k]) and MAXKEY(dimid[0]) must
+   be == MAXKEY(dimid[1]);
+   possible errors: HE_LOW_MEMORY, HE_IMPOSSIBLE_CONDITION */
+hipac_error
+dimtree_substitute(struct ptrblock *dt_block, const __u8 dimid[2],
+		   const __u32 org[], const __u32 new[], const __u32 len);
+
+/* called at the end of a successful series of dimtree_insert and/or
+   dimtree_delete operation(s) to make the result visible, i.e. set dt->top
+   to dt->top_new for each dimtree dt in dt_block and free the old btrees
+   and elementary intervals */
+void
+dimtree_commit(struct ptrblock *dt_block);
+
+/* called at the end of an unsuccessful series of dimtree_insert and/or
+   dimtree_delete operation(s) to undo the changes, i.e. set dt->top_new
+   to NULL and need_commit to 0 for each dimtree dt in dt_block and free the
+   new btrees and elementary intervals */
+void
+dimtree_failed(struct ptrblock *dt_block);
+
+#ifdef DEBUG
+int
+rule_occur(struct gen_spec *g, struct dt_rule *rule, int print);
+#endif
+
+/* remove all rules between start and the rule(s) r with position end_pos inc.
+   start and r themselves; the positions of the rules behind r are not
+   changed */
+static inline void
+dimtree_chain_delete(struct dimtree *dt, struct dt_rule *start, __u32 end_pos)
+{
+	struct dt_rule *rule;
+		struct list_head *lh;
+
+	if (unlikely(dt == NULL || start == NULL ||
+		     start->spec.pos > end_pos)) {
+		ARG_MSG;
+		return;
+	}
+
+	assert(dt->need_commit == 0);
+	if (start->head.prev == &dt->chain->head) {
+		/* start is the first element => dt->chain->first stays
+		   NULL until dimtree_chain_fix has been called */
+		dt->chain->first = NULL;
+	} else if (dt->chain->first != NULL &&
+		   dt->chain->first->spec.pos >= start->spec.pos) {
+		dt->chain->first = list_entry(start->head.prev,
+					      struct dt_rule, head);
+	}
+	for (lh = &start->head, rule = start; lh != &dt->chain->head &&
+		     rule->spec.pos <= end_pos;) {
+		lh = lh->next;
+		list_del(lh->prev);
+#ifdef DEBUG
+		if (rule_occur(dt->top, rule, 1)) {
+			ERR("rule present in original structure");
+			return;
+		}
+#endif
+		if (rule->exec_match != NULL) {
+			ptrblock_free(rule->exec_match);
+		}
+		hp_free(rule);
+		dt->chain->len--;
+		rule = list_entry(lh, struct dt_rule, head);
+	}
+}
+
+/* iterate over the dt_chain in dt and tighten the position numbers */
+void
+dimtree_chain_fix(struct ptrblock *dt_block);
+
+/* required for calculating a counter snapshot; packet_ct[0] and byte_ct[0]
+   remain unchanged after this function until dimtree_finish_snapshot
+   is called */
+static inline void
+dimtree_request_snapshot(struct dimtree *dt)
+{
+	if (unlikely(dt == NULL)) {
+		ARG_MSG;
+		return;
+	}
+	br_write_lock_bh(BR_HIPAC_LOCK);
+	dt->ctindex = 1;
+	br_write_unlock_bh(BR_HIPAC_LOCK);
+}
+
+void
+dimtree_finish_snapshot(struct dimtree *dt);
+
+/* add the counters of all rules between start and the rule(s) r with position
+   end_pos inc. start and r themselves to packet_ct respectively byte_ct;
+   NOTICE: the function may only be called during a counter snapshot */
+static inline void
+dimtree_get_counters(struct dimtree *dt, struct dt_rule *start, __u32 end_pos,
+		     __u64 *packet_ct, __u64 *byte_ct)
+{
+	struct list_head *lh;
+	struct dt_rule *rule;
+	struct counter_t *ct;
+	__u32 i;
+
+	if (unlikely(dt == NULL || start == NULL || packet_ct == NULL ||
+		     byte_ct == NULL || start->spec.pos > end_pos)) {
+		ARG_MSG;
+		return;
+	}
+
+	for (lh = &start->head, rule = start; lh != &dt->chain->head &&
+		     rule->spec.pos <= end_pos;) {
+		ct = COUNTER(rule, 0);
+		for (i = 0; i < smp_num_cpus; i++, ct++) {
+			*packet_ct += ct->packet_ct[0];
+			*byte_ct += ct->byte_ct[0];
+		}
+		lh = lh->next;
+		rule = list_entry(lh, struct dt_rule, head);
+	}
+}
+
+/* clear the counters of all rules between start and the rule(s) r with
+   position end_pos inc. start and r themselves;
+   NOTICE: the function may only be called during a counter snapshot */
+static inline void
+dimtree_zero_counters(struct dimtree *dt, struct dt_rule *start, __u32 end_pos)
+{
+	struct list_head *lh;
+	struct dt_rule *rule;
+	struct counter_t *ct;
+	__u32 i;
+
+	if (unlikely(dt == NULL || start == NULL ||
+		     start->spec.pos > end_pos)) {
+		ARG_MSG;
+		return;
+	}
+
+	for (lh = &start->head, rule = start; lh != &dt->chain->head &&
+		     rule->spec.pos <= end_pos;) {
+		ct = COUNTER(rule, 0);
+		for (i = 0; i < smp_num_cpus; i++, ct++) {
+			ct->packet_ct[0] = ct->byte_ct[0] = 0;
+		}
+		lh = lh->next;
+		rule = list_entry(lh, struct dt_rule, head);
+	}
+}
+
+#ifdef DEBUG
+/* matching algorithm used for correctness checks; the returned ptrblock
+   contains the rules matching the packet ordered after their positions;
+   the last rule should always have TARGET_ACCEPT or TARGET_DROP as action
+   and may not contain exec_matches */
+struct ptrblock *
+hipac_match_debug(struct dimtree *dt, const void *packet, __u32 pkt_size);
+#endif
+
+#endif
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/net/ipv4/netfilter/nf-hipac/global.c linux-2.4.20-wolk4.4-fullkernel/net/ipv4/netfilter/nf-hipac/global.c
--- linux-2.4.20-wolk4.3-fullkernel/net/ipv4/netfilter/nf-hipac/global.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/net/ipv4/netfilter/nf-hipac/global.c	2003-07-30 11:23:30.000000000 +0200
@@ -0,0 +1,963 @@
+/*
+ * High performance packet classification
+ *
+ * Authors: Michael Bellion and Thomas Heinz
+ * (c) 2002-2003 by the hipac core team <nf@hipac.org>:
+ *      +-----------------------+----------------------+
+ *      |   Michael Bellion     |     Thomas Heinz     |
+ *      | <mbellion@hipac.org>  |  <creatix@hipac.org> |
+ *      +-----------------------+----------------------+
+ * Licenced under the GNU General Public Licence, version >= 2.
+ */
+
+
+#include "global.h"
+#include "ihash.h"
+
+#define LEN(array) (sizeof(array) / sizeof(*(array)))
+
+
+__u64 mem_max = 0;
+__u64 mem_current_tight = 0;
+__u64 mem_current_real = 0;
+static struct ihash *memhash = NULL;
+
+
+void *
+hp_alloc(__u32 size, int do_add)
+{
+	__u32 sz_real;
+	void *p;
+
+	if (unlikely(size == 0 || size >= 0x80000000)) {
+		ARG_MSG;
+		return NULL;
+	}
+	if (unlikely(memhash == NULL)) {
+		memhash = ihash_new(INITIAL_MEMHASH_LEN, 1,
+				    MEMHASH_AVRG_ELEM_PER_BUCKET,
+				    ihash_func_val, eq_val);
+		if (memhash == NULL) {
+			ERR("unable to create memhash");
+			return NULL;
+		}
+	}
+	if (size <= PAGE_SIZE) {
+		sz_real = mini_alloc_size(size);
+		if (unlikely(do_add && mem_current_real + sz_real > mem_max)) {
+			goto mem_max_reached;
+		}
+		p = mini_alloc(size);
+	} else {
+		sz_real = big_alloc_size(size);
+		if (unlikely(do_add && mem_current_real + sz_real > mem_max)) {
+			goto mem_max_reached;
+		}
+		p = big_alloc(size);
+	}
+	if (p == NULL) {
+		return NULL;
+	}
+	if (ihash_insert(&memhash, p,
+			 val_to_ptr(((!!do_add) << 31) | size)) < 0) {
+		if (size <= PAGE_SIZE) {
+			mini_free(p);
+		} else {
+			big_free(p);
+		}
+		return NULL;
+	}
+	if (do_add) {
+		mem_current_tight += size;
+		mem_current_real += sz_real;
+	}
+	return p;
+	
+ mem_max_reached:
+	return NULL;
+}
+
+void
+hp_free(void *p)
+{
+	__u32 size, sz_real, do_add;
+	void *inf;
+
+	if (unlikely(p == NULL)) {
+		ARG_MSG;
+		return;
+	}
+	if (unlikely(memhash == NULL)) {
+		ERR("hp_free called before hp_alloc");
+		return;
+	}
+	inf = ihash_lookup_val(memhash, p);
+	if (unlikely(inf == NULL)) {
+		ERR("pointer %p not in memhash", p);
+		return;
+	}
+	size = ptr_to_val(inf);
+	do_add = size & 0x80000000;
+	size &= 0x7FFFFFFF;
+	if (size <= PAGE_SIZE) {
+		mini_free(p);
+		if (unlikely(ihash_delete(memhash, p, NULL) < 0)) {
+			goto hashdel_failed;
+		}
+		if (!do_add) {
+			return;
+		}
+		sz_real = mini_alloc_size(size);
+	} else {
+		big_free(p);
+		if (unlikely(ihash_delete(memhash, p, NULL) < 0)) {
+			goto hashdel_failed;
+		}
+		if (!do_add) {
+			return;
+		}
+		sz_real = big_alloc_size(size);
+	}
+	mem_current_tight -= size;
+	mem_current_real -= sz_real;
+	return;
+
+ hashdel_failed:
+	ERR("memhash delete failed");
+	return;
+}
+
+void *
+hp_realloc(void *p, __u32 newsize)
+{
+	__u32 sz, sz_real, newsz_real, do_add;
+	void *inf, *newp;
+
+	if (unlikely(newsize == 0 || newsize >= 0x80000000 || p == NULL)) {
+		ARG_MSG;
+		return NULL;
+	}
+	if (unlikely(memhash == NULL)) {
+		ERR("hp_realloc called before hp_alloc");
+		return NULL;
+	}
+	inf = ihash_lookup_val(memhash, p);
+	if (unlikely(inf == NULL)) {
+		ERR("pointer %p not in memhash\n", p);
+		return NULL;
+	}
+	sz = ptr_to_val(inf);
+	do_add = sz & 0x80000000;
+	sz &= 0x7FFFFFFF;
+	sz_real = sz <= PAGE_SIZE ? mini_alloc_size(sz) : big_alloc_size(sz);
+	if (newsize <= PAGE_SIZE) {
+		newsz_real = mini_alloc_size(newsize);
+		if (sz_real == newsz_real) {
+			goto only_size_change;
+		}
+		if (unlikely(do_add && mem_current_real + newsz_real >
+			     mem_max + sz_real)) {
+			if (newsize <= sz) {
+				goto only_size_change;
+			}
+			goto mem_max_reached;
+		}
+		newp = mini_alloc(newsize);
+	} else {
+		newsz_real = big_alloc_size(newsize);
+		if (sz_real == newsz_real) {
+			goto only_size_change;
+		}
+		if (unlikely(do_add && mem_current_real + newsz_real >
+			     mem_max + sz_real)) {
+			if (newsize <= sz) {
+				goto only_size_change;
+			}
+			goto mem_max_reached;
+		}
+		newp = big_alloc(newsize);
+	}
+	if (newp == NULL) {
+		if (newsize <= sz) {
+			goto only_size_change;
+		}
+		return NULL;
+	}
+	if (unlikely(ihash_replace(&memhash, p, NULL, newp,
+				   val_to_ptr(((!!do_add) << 31) |
+					      newsize)) < 0)) {
+		if (newsize <= PAGE_SIZE) {
+			mini_free(newp);
+		} else {
+			big_free(newp);
+		}
+		if (newsize <= sz) {
+			goto only_size_change;
+		}
+		return NULL;
+	}
+	memcpy(newp, p, sz < newsize ? sz : newsize);
+	if (sz <= PAGE_SIZE) {
+		mini_free(p);
+	} else {
+		big_free(p);
+	}
+	if (do_add) {
+		mem_current_tight += newsize;
+		mem_current_tight -= sz;
+		mem_current_real += newsz_real;
+		mem_current_real -= sz_real;
+	}
+	return newp;
+
+ mem_max_reached:
+	return NULL;
+
+ only_size_change:
+	if (unlikely(ihash_replace(&memhash, p, NULL, p,
+				   val_to_ptr(((!!do_add) << 31) |
+					      newsize)) < 0)) {
+		ERR("unable to replace memhash entry");
+		return NULL;
+	}
+	if (do_add) {
+		mem_current_tight += newsize;
+		mem_current_tight -= sz;
+	} 
+	return p;
+}
+
+hipac_error
+hp_size(void *p, __u64 *size_real, __u64 *size_tight)
+{
+	void *inf;
+	__u32 size;
+	
+	if (unlikely(size_real == NULL || size_tight == NULL)) {
+		ARG_ERR;
+	}
+	if (unlikely(p == NULL)) {
+		return HE_OK;
+	}
+	inf = ihash_lookup_val(memhash, p);
+	if (unlikely(inf == NULL)) {
+		IMPOSSIBLE_CONDITION("size request for unkown pointer");
+	}
+	size = ((__u32) ptr_to_val(inf)) & 0x7FFFFFFF;
+	*size_tight += size;
+	*size_real += size <= PAGE_SIZE ? mini_alloc_size(size) :
+		big_alloc_size(size);
+	return HE_OK;
+}
+
+void
+hp_mem_exit(void)
+{
+	if (unlikely(memhash == NULL)) {
+		return;
+	}
+	if (unlikely(memhash->elem_ct != 0)) {
+		WARN("memhash still contains unfreed pointers");
+	}
+	if (unlikely(mem_current_tight != 0)) {
+		WARN("mem_current_tight is not 0");
+	}
+	if (unlikely(mem_current_real != 0)) {
+		WARN("mem_current_real is not 0");
+	}
+	ihash_free(memhash);
+	memhash = NULL;
+}
+
+hipac_error
+hipac_get_mem_stat(struct hipac_mem_stat *stat)
+{
+	struct ihash_stat istat;
+
+	if (stat == NULL) {
+		ARG_ERR;
+	}
+	if (sizeof(istat.bucket_dist) != sizeof(stat->memhash_bucket_stat)) {
+		IMPOSSIBLE_CONDITION("struct ihash_stat and struct "
+				     "hipac_mem_stat incompatible");
+	}
+	if (ihash_stat(memhash, &istat) < 0) {
+		IMPOSSIBLE_CONDITION("ihash_stat failed");
+	}
+	
+	stat->total_mem_tight = mem_current_tight;
+	stat->total_mem_real = mem_current_real;
+	stat->memhash_elem_num = istat.elem_ct;
+	stat->memhash_len = istat.bucket_len;
+	stat->memhash_smallest_bucket_len = istat.small_bucket_len;
+	stat->memhash_biggest_bucket_len = istat.big_bucket_len;
+	memcpy(stat->memhash_bucket_stat, istat.bucket_dist,
+	       sizeof(istat.bucket_dist));
+	return HE_OK;
+}
+
+
+
+/*
+ * statistical distributions
+ */
+
+void
+stat_distribution_add(__u32 dist[], __u32 len, __u32 val)
+{
+	__u32 i;
+
+	if (unlikely(dist == NULL || len == 0)) {
+		ARG_MSG;
+		return;
+	}
+	
+	for (i = 0; i < len - 1; i++) {
+		if (val <= (1 << i) - 1) {
+			dist[i]++;
+			return;
+		}
+	}
+	dist[i]++;
+}
+
+
+
+/*
+ * pointer block
+ */
+
+struct ptrblock *
+ptrblock_new(void *p, int do_add)
+{
+	struct ptrblock *new;
+	
+	if (unlikely(p == NULL)) {
+		ARG_MSG;
+		return NULL;
+	}
+	new = hp_alloc(sizeof(*new) + sizeof(*new->p), do_add);
+	if (new == NULL) {
+		return NULL;
+	}
+	new->len = 1;
+	new->p[0] = p;
+	return new;
+}
+
+int
+ptrblock_eq(const struct ptrblock *b1, const struct ptrblock *b2)
+{
+	__u32 i;
+	
+	if (b1 == b2) {
+		return 1;
+	}
+	if (b1 == NULL || b2 == NULL || b1->len != b2->len) {
+		return 0;
+	}
+	/* b1->len == 0 is valid if b1 and b2 are embedded ptrblocks */
+	for (i = 0; i < b1->len; i++) {
+		if (b1->p[i] != b2->p[i]) {
+			return 0;
+		}
+	}
+	return 1;
+}
+
+hipac_error
+ptrblock_clone(struct ptrblock *b, struct ptrblock **clone)
+{
+	__u32 sz;
+
+	if (unlikely(clone == NULL)) {
+		ARG_ERR;
+	}
+
+	if (b == NULL) {
+		*clone = NULL;
+		return HE_OK;
+	}
+	sz = ptrblock_size(b);
+	*clone = hp_alloc(sz, 1);
+	if (*clone == NULL) {
+		return HE_LOW_MEMORY;
+	}
+	memcpy(*clone, b, sz);
+	return HE_OK;
+}
+
+hipac_error
+ptrblock_insert(struct ptrblock **b, void *p, __u32 pos)
+{
+	struct ptrblock *new;
+
+	if (unlikely(p == NULL || b == NULL || (*b == NULL && pos > 0) ||
+		     (*b != NULL && pos > (*b)->len))) {
+		ARG_ERR;
+	}
+
+	if (*b == NULL) {
+		new = ptrblock_new(p, 1);
+		if (new == NULL) {
+			return HE_LOW_MEMORY;
+		}
+		*b = new;
+		return HE_OK;
+	}
+	new = hp_realloc(*b, sizeof(**b) + ((*b)->len + 1) * sizeof(*(*b)->p));
+	if (new == NULL) {
+		return HE_LOW_MEMORY;
+	}
+	if (new->len > pos) {
+		memmove(&new->p[pos + 1], &new->p[pos], (new->len - pos) *
+			sizeof(*new->p));
+	}
+	new->len++;
+	new->p[pos] = p;
+	*b = new;
+	return HE_OK;
+}
+
+hipac_error
+ptrblock_insert_embed(void **o, __u32 ptrblock_offset, void *p, __u32 pos)
+{
+	struct ptrblock *b;
+	void *new;
+
+	if (unlikely(o == NULL || *o == NULL || p == NULL ||
+		     pos > ((struct ptrblock *)
+			    ((char *) *o + ptrblock_offset))->len)) {
+		ARG_ERR;
+	}
+	b = (struct ptrblock *) ((char *) *o + ptrblock_offset);
+	new = hp_realloc(*o, ptrblock_offset + sizeof(*b) +
+			 (b->len + 1) * sizeof(*b->p));
+	if (new == NULL) {
+		return HE_LOW_MEMORY;
+	}
+	b = (struct ptrblock *) ((char *) new + ptrblock_offset);
+	if (b->len > pos) {
+		memmove(&b->p[pos + 1], &b->p[pos], (b->len - pos) *
+			sizeof(*b->p));
+	}
+	b->len++;
+	b->p[pos] = p;
+	*o = new;
+	return HE_OK;
+}
+
+hipac_error
+ptrblock_append(struct ptrblock **b, void *p)
+{
+	struct ptrblock *new;
+
+	if (unlikely(p == NULL || b == NULL)) {
+		ARG_ERR;
+	}
+
+	if (*b == NULL) {
+		new = ptrblock_new(p, 1);
+		if (new == NULL) {
+			return HE_LOW_MEMORY;
+		}
+		*b = new;
+		return HE_OK;
+	}
+	new = hp_realloc(*b, sizeof(**b) + ((*b)->len + 1) * sizeof(*(*b)->p));
+	if (new == NULL) {
+		return HE_LOW_MEMORY;
+	}
+#ifdef DEBUG
+	{
+		__u32 i;
+		for (i = 0; i < new->len; i++) {
+			if (new->p[i] == p) {
+				IMPOSSIBLE_CONDITION("ptrblock contains "
+						     "duplicated pointer");
+			}
+		}
+	}
+#endif
+	new->p[new->len++] = p;
+	*b = new;
+	return HE_OK;
+}
+
+hipac_error
+ptrblock_delete_pos(struct ptrblock **b, __u32 pos)
+{
+	struct ptrblock *new;
+
+	if (unlikely(b == NULL || *b == NULL || pos >= (*b)->len)) {
+		ARG_ERR;
+	}
+
+	if ((*b)->len == 1) {
+		ptrblock_free(*b);
+		*b = NULL;
+		return HE_OK;
+	}
+	(*b)->len--;
+	if ((*b)->len > pos) {
+		memmove(&(*b)->p[pos], &(*b)->p[pos + 1],
+			((*b)->len - pos) * sizeof(*(*b)->p));
+	}
+	new = hp_realloc(*b, sizeof(**b) + (*b)->len * sizeof(*(*b)->p));
+	if (new == NULL) {
+		WARN("hp_realloc returns NULL although less memory was "
+		     "requested");
+	} else {
+		*b = new;
+	}
+	return HE_OK;
+}
+
+hipac_error
+ptrblock_delete_pos_embed(void **o, __u32 ptrblock_offset, __u32 pos)
+{
+	struct ptrblock *new;
+	struct ptrblock *b;
+
+	if (unlikely(o == NULL || *o == NULL ||
+		     pos >= ((struct ptrblock *)
+			     ((char *) *o + ptrblock_offset))->len)) {
+		ARG_ERR;
+	}
+	b = (struct ptrblock *) ((char *) *o + ptrblock_offset);
+	b->len--;
+	if (b->len > pos) {
+		memmove(&b->p[pos], &b->p[pos + 1],
+			(b->len - pos) * sizeof(*b->p));
+	}
+	new = hp_realloc(*o, ptrblock_offset + sizeof(*b) +
+			 b->len * sizeof(*b->p));
+	if (new == NULL) {
+		WARN("hp_realloc returns NULL although less memory was "
+		     "requested");
+	} else {
+		*o = new;
+	}
+	return HE_OK;
+}
+
+hipac_error
+ptrblock_delete(struct ptrblock **b, void *p)
+{
+	__u32 i;
+
+	if (unlikely(b == NULL || *b == NULL)) {
+		ARG_ERR;
+	}
+	for (i = 0; i < (*b)->len; i++) {
+		if ((*b)->p[i] == p) {
+			return ptrblock_delete_pos(b, i);
+		}
+	}
+	IMPOSSIBLE_CONDITION("pointer %p not in ptrblock", p);
+}
+
+hipac_error
+ptrblock_delete_tail(struct ptrblock **b)
+{
+	struct ptrblock *new;
+
+	if (unlikely(b == NULL || *b == NULL)) {
+		ARG_ERR;
+	}
+
+	if ((*b)->len == 1) {
+		ptrblock_free(*b);
+		*b = NULL;
+		return HE_OK;
+	}
+	(*b)->len--;
+	new = hp_realloc(*b, sizeof(**b) + (*b)->len * sizeof(*(*b)->p));
+	if (new == NULL) {
+		WARN("hp_realloc returns NULL although less memory was "
+		     "requested");
+	} else {
+		*b = new;
+	}
+	return HE_OK;
+}
+
+hipac_error
+ptrblock_delete_multi(struct ptrblock **b, const struct ptrblock *mark)
+{
+	struct ptrblock *new;
+	__u32 first, last, i;
+
+	if (unlikely(b == NULL || mark == NULL ||
+		     (*b != NULL && mark->len < (*b)->len))) {
+		ARG_ERR;
+	}
+
+	if (*b == NULL) {
+		return HE_OK;
+	}
+	for (first = 0; first < (*b)->len && mark->p[first] != NULL; first++);
+	if (first == (*b)->len) {
+		/* nothing to delete */
+		return HE_OK;
+	}
+	for (last = first + 1, i = 0; last < (*b)->len; last++) {
+		if (mark->p[last] != NULL) {
+			continue;
+		}
+		if (last > first + 1) {
+			memmove(&(*b)->p[first - i], &(*b)->p[first + 1],
+				(last - first - 1) * sizeof(*(*b)->p));
+		}
+		i++;
+		first = last;
+	}
+	if ((*b)->len > first + 1) {
+		memmove(&(*b)->p[first - i], &(*b)->p[first + 1],
+			((*b)->len - first - 1) * sizeof(*(*b)->p));
+	}
+	(*b)->len -= i + 1;
+	if ((*b)->len == 0) {
+		ptrblock_free(*b);
+		*b = NULL;
+		return HE_OK;
+	}
+	new = hp_realloc(*b, sizeof(**b) + (*b)->len * sizeof(*(*b)->p));
+	if (new == NULL) {
+		WARN("hp_realloc returns NULL although less memory was "
+		     "requested");
+	} else {
+		*b = new;
+	}
+	return HE_OK;
+}
+
+hipac_error
+ptrblock_delete_null(struct ptrblock **b)
+{
+	struct ptrblock *new;
+	__u32 first, last, i;
+
+	if (unlikely(b == NULL)) {
+		ARG_ERR;
+	}
+
+	if (*b == NULL) {
+		return HE_OK;
+	}
+	for (first = 0; first < (*b)->len && (*b)->p[first] != NULL; first++);
+	if (first == (*b)->len) {
+		/* nothing to delete */
+		return HE_OK;
+	}
+	for (last = first + 1, i = 0; last < (*b)->len; last++) {
+		if ((*b)->p[last] != NULL) {
+			continue;
+		}
+		if (last > first + 1) {
+			memmove(&(*b)->p[first - i], &(*b)->p[first + 1],
+				(last - first - 1) * sizeof(*(*b)->p));
+		}
+		i++;
+		first = last;
+	}
+	if ((*b)->len > first + 1) {
+		memmove(&(*b)->p[first - i], &(*b)->p[first + 1],
+			((*b)->len - first - 1) * sizeof(*(*b)->p));
+	}
+	(*b)->len -= i + 1;
+	if ((*b)->len == 0) {
+		ptrblock_free(*b);
+		*b = NULL;
+		return HE_OK;
+	}
+	new = hp_realloc(*b, sizeof(**b) + (*b)->len * sizeof(*(*b)->p));
+	if (new == NULL) {
+		WARN("hp_realloc returns NULL although less memory was "
+		     "requested");
+	} else {
+		*b = new;
+	}
+	return HE_OK;
+}
+
+
+
+/*
+ * block of structs
+ */
+struct strblock *
+strblock_new(const void *s, __u32 size, int do_add)
+{
+	struct strblock *new;
+	
+	if (unlikely(s == NULL || size == 0)) {
+		ARG_MSG;
+		return NULL;
+	}
+	new = hp_alloc(sizeof(*new) + size, do_add);
+	if (new == NULL) {
+		return NULL;
+	}
+	new->len = 1;
+	new->size = size;
+	memcpy(new->d, s, size);
+	return new;
+}
+
+int
+strblock_eq(const struct strblock *b1, const struct strblock *b2,
+	    int (* eq) (void *, void *))
+{
+	__u32 i;
+
+	if (b1 == b2) {
+		return 1;
+	}
+	if (b1 == NULL || b2 == NULL || b1->len != b2->len ||
+	    b1->size != b2->size) {
+		return 0;
+	}
+	assert(b1->len > 0);
+	for (i = 0; i < b1->len; i++) {
+		if (!eq(STRBLOCK_ITH(b1, i, void *),
+			STRBLOCK_ITH(b2, i, void *))) {
+			return 0;
+		}
+	}
+	return 1;
+}
+
+hipac_error
+strblock_clone(struct strblock *b, struct strblock **clone)
+{
+	__u32 sz;
+
+	if (unlikely(clone == NULL)) {
+		ARG_ERR;
+	}
+
+	if (b == NULL) {
+		*clone = NULL;
+		return HE_OK;
+	}
+	sz = strblock_size(b);
+	*clone = hp_alloc(sz, 1);
+	if (*clone == NULL) {
+		return HE_LOW_MEMORY;
+	}
+	memcpy(*clone, b, sz);
+	return HE_OK;
+}
+
+hipac_error
+strblock_insert(struct strblock **b, const void *s, __u32 size, __u32 pos)
+{
+	struct strblock *new;
+
+	if (unlikely(s == NULL || b == NULL ||
+		     (*b == NULL && (pos > 0 || size == 0)) ||
+		     (*b != NULL && (pos > (*b)->len ||
+				     (*b)->size != size)))) {
+		ARG_ERR;
+	}
+
+	if (*b == NULL) {
+		new = strblock_new(s, size, 1);
+		if (new == NULL) {
+			return HE_LOW_MEMORY;
+		}
+		*b = new;
+		return HE_OK;
+	}
+	new = hp_realloc(*b, sizeof(**b) + ((*b)->len + 1) * size);
+	if (new == NULL) {
+		return HE_LOW_MEMORY;
+	}
+	if (new->len > pos) {
+		memmove(STRBLOCK_ITH(new, pos + 1, void *),
+			STRBLOCK_ITH(new, pos, void *),
+			(new->len - pos) * size);
+	}
+	new->len++;
+	memcpy(STRBLOCK_ITH(new, pos, void *), s, size);
+	*b = new;
+	return HE_OK;
+}
+
+hipac_error
+strblock_append(struct strblock **b, const void *s, __u32 size)
+{
+	struct strblock *new;
+
+	if (unlikely(s == NULL || b == NULL || (*b == NULL && size == 0) ||
+		     (*b != NULL && (*b)->size != size))) {
+		ARG_ERR;
+	}
+
+	if (*b == NULL) {
+		new = strblock_new(s, size, 1);
+		if (new == NULL) {
+			return HE_LOW_MEMORY;
+		}
+		*b = new;
+		return HE_OK;
+	}
+	new = hp_realloc(*b, sizeof(**b) + ((*b)->len + 1) * size);
+	if (new == NULL) {
+		return HE_LOW_MEMORY;
+	}
+	memcpy(STRBLOCK_ITH(new, new->len, void *), s, size);
+	new->len++;
+	*b = new;
+	return HE_OK;
+}
+
+hipac_error
+strblock_delete_pos(struct strblock **b, __u32 pos)
+{
+	struct strblock *new;
+
+	if (unlikely(b == NULL || *b == NULL || pos >= (*b)->len)) {
+		ARG_ERR;
+	}
+
+	if ((*b)->len == 1) {
+		strblock_free(*b);
+		*b = NULL;
+		return HE_OK;
+	}
+	(*b)->len--;
+	if ((*b)->len > pos) {
+		memmove(STRBLOCK_ITH(*b, pos, void *),
+			STRBLOCK_ITH(*b, pos + 1, void *),
+			((*b)->len - pos) * (*b)->size);
+	}
+	new = hp_realloc(*b, sizeof(**b) + (*b)->len * (*b)->size);
+	if (new == NULL) {
+		WARN("hp_realloc returns NULL although less memory was "
+		     "requested");
+	} else {
+		*b = new;
+	}
+	return HE_OK;
+}
+
+hipac_error
+strblock_delete_tail(struct strblock **b)
+{
+	struct strblock *new;
+
+	if (unlikely(b == NULL || *b == NULL)) {
+		ARG_ERR;
+	}
+
+	if ((*b)->len == 1) {
+		strblock_free(*b);
+		*b = NULL;
+		return HE_OK;
+	}
+	(*b)->len--;
+	new = hp_realloc(*b, sizeof(**b) + (*b)->len * (*b)->size);
+	if (new == NULL) {
+		WARN("hp_realloc returns NULL although less memory was "
+		     "requested");
+	} else {
+		*b = new;
+	}
+	return HE_OK;
+}
+
+
+
+/*
+ * pointer list
+ */
+
+struct ptrlist *
+ptrlist_new(void)
+{
+	struct ptrlist *new;
+
+	new = mini_alloc(sizeof(*new));
+	if (new == NULL) {
+		return NULL;
+	}
+	new->len = 0;
+	INIT_LIST_HEAD(&new->head);
+	return new;
+}
+
+struct ptrlist_entry *
+ptrlist_new_entry(void *p)
+{
+	struct ptrlist_entry *new;
+
+	new = mini_alloc(sizeof(*new));
+	if (new == NULL) {
+		return NULL;
+	}
+	new->p = p;
+	return new;
+}
+
+void
+ptrlist_flush(struct ptrlist *l)
+{
+	struct list_head *lh;
+
+	if (unlikely(l == NULL)) {
+		ARG_MSG;
+		return;
+	}
+	for (lh = l->head.next; lh != &l->head;) {
+		lh = lh->next;
+		mini_free(list_entry(lh->prev, struct ptrlist_entry, head));
+	}
+	INIT_LIST_HEAD(&l->head);
+	l->len = 0;
+}
+
+void
+ptrlist_free(struct ptrlist *l)
+{
+	struct list_head *lh;
+
+	if (unlikely(l == NULL)) {
+		ARG_MSG;
+		return;
+	}
+	for (lh = l->head.next; lh != &l->head;) {
+		lh = lh->next;
+		mini_free(list_entry(lh->prev, struct ptrlist_entry, head));
+	}
+	mini_free(l);
+}
+
+hipac_error
+ptrlist_add(struct ptrlist *l, void *p, int check_dup)
+{
+	struct list_head *lh;
+	struct ptrlist_entry* e;
+
+	if (unlikely(l == NULL || p == NULL)) {
+		ARG_ERR;
+	}
+	if (unlikely(check_dup)) {
+		list_for_each(lh, &l->head) {
+			e = list_entry(lh, struct ptrlist_entry, head);
+			if (e->p == p) {
+				IMPOSSIBLE_CONDITION("pointer %p already in "
+						     "ptrlist", p);
+			}
+		}
+	}
+	e = mini_alloc(sizeof(*e));
+	if (e == NULL) {
+		return HE_LOW_MEMORY;
+	}
+	e->p = p;
+	list_add_tail(&e->head, &l->head);
+	l->len++;
+	return HE_OK;
+}
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/net/ipv4/netfilter/nf-hipac/global.h linux-2.4.20-wolk4.4-fullkernel/net/ipv4/netfilter/nf-hipac/global.h
--- linux-2.4.20-wolk4.3-fullkernel/net/ipv4/netfilter/nf-hipac/global.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/net/ipv4/netfilter/nf-hipac/global.h	2003-07-30 11:23:30.000000000 +0200
@@ -0,0 +1,381 @@
+/*
+ * High performance packet classification - common declarations
+ *
+ * Authors: Michael Bellion and Thomas Heinz
+ * (c) 2002-2003 by the hipac core team <nf@hipac.org>:
+ *      +-----------------------+----------------------+
+ *      |   Michael Bellion     |     Thomas Heinz     |
+ *      | <mbellion@hipac.org>  |  <creatix@hipac.org> |
+ *      +-----------------------+----------------------+
+ * Licenced under the GNU General Public Licence, version >= 2.
+ */
+
+
+#ifndef _GLOBAL_H
+#define _GLOBAL_H
+
+#include "mode.h"
+#include "hipac.h"  // hipac_error
+
+#define PTRSIZE                      (sizeof(void *))
+#define INITIAL_MEMHASH_LEN          64
+#define MEMHASH_AVRG_ELEM_PER_BUCKET 15
+#define INITIAL_NEWSPEC_LEN          1024
+#define NEWSPEC_AVRG_ELEM_PER_BUCKET 3
+
+#ifdef DEBUG
+#  define DPRINT(type, str, args...) if ((type) & hipac_debug)  \
+                                          printk(str , ## args)
+#else
+#  define DPRINT(type, str, args...) do {} while (0)
+#endif
+
+/* the single space before the last ',' is vital to make this macro work the
+   expected way because of some idiosyncrasy of gcc */
+#ifdef DEBUG
+#  define MSG(type, str, args...)                                           \
+   printk(type "%-15s : %-30s : %6d :   " str "\n", __FILE__, __FUNCTION__, \
+	  __LINE__ , ## args)
+#else
+#  define MSG(type, str, args...)                             \
+   printk(type "%s:%s:%d: " str "\n", __FILE__, __FUNCTION__, \
+	  __LINE__ , ## args)
+#endif
+
+#define ERR(str, args...)    MSG(KERN_ERR, str , ## args)
+#define WARN(str, args...)   MSG(KERN_WARNING, str , ## args)
+#define NOTICE(str, args...) MSG(KERN_NOTICE, str , ## args)
+#define DBG(str, args...)    MSG(KERN_DEBUG, str , ## args)
+#define ARG_MSG              MSG(KERN_ERR, "function arguments invalid")
+
+#define ARG_ERR                                      \
+do {                                                 \
+	MSG(KERN_ERR, "function arguments invalid"); \
+	return HE_IMPOSSIBLE_CONDITION;              \
+} while (0)
+
+#define IMPOSSIBLE_CONDITION(str, args...) \
+do {                                       \
+	MSG(KERN_ERR, str , ## args);      \
+	return HE_IMPOSSIBLE_CONDITION;    \
+} while (0)
+
+
+
+/* generic header for dimtree rules, elementary intervals and btrees */
+struct gen_spec
+{
+	unsigned bittype : 2;
+};
+
+/* dimid to bittype array */
+extern __u8 *dim2btype;
+
+/* match executor function */
+extern hipac_match_exec_t match_fn;
+
+/* target executor function */
+extern hipac_target_exec_t target_fn;
+
+/* dimension extractor function */
+extern hipac_extract_t *extract_fn;
+
+
+
+/*
+ * memory management wrappers
+ */
+
+/* upper bound for memory consumption in bytes */
+extern __u64 mem_max;
+
+/* current memory consumption in bytes in terms of how much
+   has been requested */
+extern __u64 mem_current_tight;
+
+/* current memory consumption in bytes in terms of how much
+   has actually been allocated */
+extern __u64 mem_current_real;
+
+/* do_add indicates whether mem_current_tight and mem_current_real 
+   should be updated or not */
+void *
+hp_alloc(__u32 size, int do_add);
+
+void
+hp_free(void *p);
+
+void *
+hp_realloc(void *p, __u32 newsize);
+
+/* add the number of bytes requested for p to *size_tight and the number
+   of bytes allocated for p to *size_real; if p is NULL, size_tight and
+   size_real are not modified;
+   possible errors: HE_IMPOSSIBLE_CONDITION */
+hipac_error
+hp_size(void *p, __u64 *size_real, __u64 *size_tight);
+
+/* internal memhash is freed; if it is not empty a warning is printed */
+void
+hp_mem_exit(void);
+
+
+
+/*
+ * statistical distributions
+ */
+
+/* initialize statistical distribution dist of length len, i.e. set it to 0 */
+static inline void
+stat_distribution_init(__u32 dist[], __u32 len)
+{
+	if (unlikely(dist == NULL || len == 0)) {
+		ARG_MSG;
+		return;
+	}
+	memset(dist, 0, len * sizeof(*dist));
+}
+
+/* dist is an array of length len representing a statistical distribution;
+   val is added to dist */
+void
+stat_distribution_add(__u32 dist[], __u32 len, __u32 val);
+
+
+
+/*
+ * pointer block
+ */
+struct ptrblock
+{
+	__u32 len;
+	void *p[0];
+};
+
+/* return new pointer block with p as the only element; do_add indicates
+   whether mem_current_tight and mem_current_real should be updated or not */
+struct ptrblock *
+ptrblock_new(void *p, int do_add);
+
+static inline void
+ptrblock_free(struct ptrblock *b)
+{
+	hp_free(b);
+}
+
+static inline __u32
+ptrblock_size(const struct ptrblock *b)
+{
+	if (unlikely(b == NULL)) {
+		ARG_MSG;
+		return 0;
+	}
+	return sizeof(*b) + b->len * sizeof(*b->p);
+}
+
+/* returns 1 if b1 and b2 are equal and 0 otherwise; b1->len or b2->len might
+   be 0 in order allow equality test on embedded ptrblocks */
+int
+ptrblock_eq(const struct ptrblock *b1, const struct ptrblock *b2);
+
+/* clone b and store the result in clone; the memory for clone is allocated
+   via hp_alloc if necessary and do_add is 1; b might be NULL;
+   possible errors: HE_LOW_MEMORY, HE_IMPOSSIBLE_CONDITION */
+hipac_error
+ptrblock_clone(struct ptrblock *b, struct ptrblock **clone);
+
+/* insert p into b at position pos; if *b is NULL and pos is 0
+   ptrblock_new(p, 1) is called and the result is assigned to b;
+   possible errors: HE_LOW_MEMORY, HE_IMPOSSIBLE_CONDITION */
+hipac_error
+ptrblock_insert(struct ptrblock **b, void *p, __u32 pos);
+
+/* insert p into (struct ptrblock *) ((char *) *o + ptrblock_offset)
+   at position pos; o is assumed to end after the embedded ptrblock;
+   hp_realloc is used to resize o;
+   possible errors: HE_LOW_MEMORY, HE_IMPOSSIBLE_CONDITION */
+hipac_error
+ptrblock_insert_embed(void **o, __u32 ptrblock_offset, void *p, __u32 pos);
+
+/* append p to b; if *b is NULL ptrblock_new(p, 1) is called and the result
+   is assigned to b;
+   possible errors: HE_LOW_MEMORY, HE_IMPOSSIBLE_CONDITION */
+hipac_error
+ptrblock_append(struct ptrblock **b, void *p);
+
+/* delete pointer at position pos in b; if b contains only one element and
+   pos is 0 then *b is freed and NULL is assigned to *b;
+   possible errors: HE_IMPOSSIBLE_CONDITION */
+hipac_error
+ptrblock_delete_pos(struct ptrblock **b, __u32 pos);
+
+/* delete pointer at position pos in
+   (struct ptrblock *) ((char *) *o + ptrblock_offset); o is assumed to end
+   after the embedded ptrblock; hp_realloc is used to resize o;
+   possible errors: HE_LOW_MEMORY, HE_IMPOSSIBLE_CONDITION */
+hipac_error
+ptrblock_delete_pos_embed(void **o, __u32 ptrblock_offset, __u32 pos);
+
+/* delete p in b; if p is the only element in b then *b is freed and NULL
+   is assigned to *b;
+   possible errors: HE_IMPOSSIBLE_CONDITION */
+hipac_error
+ptrblock_delete(struct ptrblock **b, void *p);
+
+/* delete trailing pointer in b; if b contains only one element then *b is
+   freed and NULL is assigned to *b;
+   possible errors: HE_IMPOSSIBLE_CONDITION */
+hipac_error
+ptrblock_delete_tail(struct ptrblock **b);
+
+/* for all mark->p[i] == NULL: delete the pointer at the position i fom b;
+   if b is empty after the delete operation NULL is assigned to *b;
+   note that mark->len must be >= (*b)->len;
+   possible errors: HE_IMPOSSIBLE_CONDITION */
+hipac_error
+ptrblock_delete_multi(struct ptrblock **b, const struct ptrblock *mark);
+
+/* similar to ptrblock_delete_multi: the pointers in b which are NULL are
+   deleted;
+   possible errors: HE_IMPOSSIBLE_CONDITION */
+hipac_error
+ptrblock_delete_null(struct ptrblock **b);
+
+
+
+/*
+ * block of structs
+ */
+struct strblock
+{
+	__u32 len, size;
+	char d[0];
+};
+
+#define STRBLOCK_ITH(b, i, cast) ((cast) ((b)->d + (i) * (b)->size))
+
+/* return new struct block with s as the only element; size is the size of 
+   the struct pointed to by s in bytes; do_add indicates whether
+   mem_current_tight and mem_current_real should be updated or not */
+struct strblock *
+strblock_new(const void *s, __u32 size, int do_add);
+
+static inline void
+strblock_free(struct strblock *b)
+{
+	hp_free(b);
+}
+
+static inline __u32
+strblock_size(const struct strblock *b)
+{
+	if (unlikely(b == NULL)) {
+		ARG_MSG;
+		return 0;
+	}
+	return sizeof(*b) + b->len * b->size;
+}
+
+/* returns 1 if b1 and b2 are equal and 0 otherwise; eq is an equality test
+   function for the embedded structs; eq(a, b) returns 1 if a equals to b
+   and 0 otherwise */
+int
+strblock_eq(const struct strblock *b1, const struct strblock *b2,
+	    int (* eq) (void *, void *));
+
+/* clone b and store the result in clone; the memory for clone is allocated
+   via hp_alloc if necessary and do_add is 1; b might be NULL;
+   possible errors: HE_LOW_MEMORY, HE_IMPOSSIBLE_CONDITION */
+hipac_error
+strblock_clone(struct strblock *b, struct strblock **clone);
+
+/* insert struct s into b at position pos; if *b is NULL and pos is 0
+   strblock_new(s, size, 1) is called and the result is assigned to b;
+   possible errors: HE_LOW_MEMORY, HE_IMPOSSIBLE_CONDITION */
+hipac_error
+strblock_insert(struct strblock **b, const void *s, __u32 size, __u32 pos);
+
+/* append struct s to b; if *b is NULL then strblock_new(s, size, 1) is
+   called and the result is assigned to b;
+   possible errors: HE_LOW_MEMORY, HE_IMPOSSIBLE_CONDITION */
+hipac_error
+strblock_append(struct strblock **b, const void *s, __u32 size);
+
+/* delete struct at position pos in b; if b contains only one element and
+   pos is 0 then *b is freed and NULL is assigned to *b;
+   possible errors: HE_IMPOSSIBLE_CONDITION */
+hipac_error
+strblock_delete_pos(struct strblock **b, __u32 pos);
+
+/* delete trailing struct in b; if b contains only one element then *b is
+   freed and NULL is assigned to *b;
+   possible errors: HE_IMPOSSIBLE_CONDITION */
+hipac_error
+strblock_delete_tail(struct strblock **b);
+
+
+
+/*
+ * pointer list
+ */
+struct ptrlist
+{
+	struct list_head head;
+	__u32 len;
+};
+
+struct ptrlist_entry
+{
+	struct list_head head;
+	void *p;
+};
+
+/* return new empty pointer list or NULL if allocation fails */
+struct ptrlist *
+ptrlist_new(void);
+
+/* return new pointer list entry containing p or NULL if allocation fails */
+struct ptrlist_entry *
+ptrlist_new_entry(void *p);
+
+/* free all entries from the pointer list l */
+void
+ptrlist_flush(struct ptrlist *l);
+
+/* free all entries from the pointer list l and l itself */
+void
+ptrlist_free(struct ptrlist *l);
+
+/* free ptrlist entry */
+static inline void
+ptrlist_free_entry(struct ptrlist_entry *e)
+{
+	if (unlikely(e == NULL)) {
+		ARG_MSG;
+		return;
+	}
+	list_del(&e->head);
+	mini_free(e);
+}
+
+/* return 1 if l is empty and 0 otherwise */
+static inline int
+ptrlist_is_empty(const struct ptrlist *l)
+{
+	if (unlikely(l == NULL)) {
+		ARG_MSG;
+		return 0;
+	}
+	assert((l->len != 0 || l->head.next == &l->head) &&
+	       (l->head.next != &l->head || l->len == 0));
+	return l->len == 0;
+}
+
+/* add a new pointer list entry containing p to l; if check_dup is not 0 
+   the new entry is only added if p is not already contained in a list
+   entry;
+   possible errors: HE_LOW_MEMORY, HE_IMPOSSIBLE_CONDITION */
+hipac_error
+ptrlist_add(struct ptrlist *l, void *p, int check_dup);
+
+#endif
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/net/ipv4/netfilter/nf-hipac/hipac.c linux-2.4.20-wolk4.4-fullkernel/net/ipv4/netfilter/nf-hipac/hipac.c
--- linux-2.4.20-wolk4.3-fullkernel/net/ipv4/netfilter/nf-hipac/hipac.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/net/ipv4/netfilter/nf-hipac/hipac.c	2003-07-30 11:23:31.000000000 +0200
@@ -0,0 +1,4111 @@
+/*
+ * High performance packet classification - hipac layer
+ *
+ * Authors: Michael Bellion and Thomas Heinz
+ * (c) 2002-2003 by the hipac core team <nf@hipac.org>:
+ *      +-----------------------+----------------------+
+ *      |   Michael Bellion     |     Thomas Heinz     |
+ *      | <mbellion@hipac.org>  |  <creatix@hipac.org> |
+ *      +-----------------------+----------------------+
+ * Licenced under the GNU General Public Licence, version >= 2.
+ */
+
+
+#include "hipac.h"
+#include "global.h"
+#include "ihash.h"
+#include "dimtree.h"
+
+
+static struct hipac_chain *current_chain = NULL;
+static struct ihash* chain_hash = NULL;
+static struct ptrblock* native_dts = NULL;
+
+__u8 *dim2btype;
+__u8 d2blen;
+hipac_extract_t *extract_fn;
+static hipac_copy_constructor_t copy_fn;
+static hipac_destroy_exec_t destroy_fn;
+hipac_match_exec_t match_fn;
+hipac_target_exec_t target_fn;
+static hipac_eq_exec_t eq_fn;
+
+
+
+/* 
+ * Some helpful defines in order to make code more readable
+ */
+
+#define DONT_COMMIT    0
+#define COMMIT         1
+#define DONT_INC       0
+#define INC            1
+#define DONT_ADD       0
+#define ADD            1
+#define ORIGIN_ALL     0xffff
+
+#define CHAIN_IS_REFERENCED(chain) ((chain)->ref_count != 0)
+#define CHAIN_NOT_CONNECTED(chain) ((chain)->start == NULL)
+#define IS_ROOT_CHAIN(chain)       ((chain)->dimtree != NULL)
+#define IS_NOT_JUMP_RULE(rule)     ((rule)->r.action != TARGET_CHAIN)
+#define IS_JUMP_RULE(rule)         ((rule)->r.action == TARGET_CHAIN)
+
+#define P_ELEM(x, i)         (STRBLOCK_ITH(x, i, struct path *))
+#define P_ELEM_DIMTREE(x, i) (STRBLOCK_ITH(x, i, struct path *)->dimtree)
+#define P_ELEM_PREV(x, i)    (STRBLOCK_ITH(x, i, struct path *)->prev)
+#define P_ELEM_RULE(x, i)    (STRBLOCK_ITH(x, i, struct path *)->rule)
+
+
+#define CHAIN_HASH_LEN         16
+#define CHAIN_HASH_AVR_BUCKET   3
+#define HIPAC_REC_LIMIT        10
+
+
+#ifdef DEBUG
+#       define LOW_MEM(args...) do { NOTICE(args); return HE_LOW_MEMORY; \
+                                   } while (0)
+#       define CHECK_ERROR(func) \
+                if (error == HE_LOW_MEMORY) { \
+	                NOTICE(func " returned LOW_MEMORY error!"); \
+        } else if (error == HE_IMPOSSIBLE_CONDITION) {  \
+	        ERR(func " returned IMPOSSIBLE_CONDITION error!"); \
+	}
+
+	static inline hipac_error
+	strblock_append_check(struct strblock **b, const void *s, __u32 size){
+		__u32 i;
+		if (*b)
+			for (i = 0; i < (*b)->len; i++){
+				if (!(memcmp(STRBLOCK_ITH(*b, i, void *), 
+					     s, size)))
+					IMPOSSIBLE_CONDITION(
+						"already in strblock");
+			}
+		return strblock_append(b, s, size);
+	}
+
+#else
+#       define LOW_MEM(args...) return HE_LOW_MEMORY
+#       define CHECK_ERROR(func) \
+                if (error == HE_IMPOSSIBLE_CONDITION) {  \
+                        ERR(func " returned IMPOSSIBLE_CONDITION error!"); \
+                }
+
+	static inline hipac_error
+	strblock_append_check(struct strblock **b, const void *s, __u32 size){
+		return strblock_append(b, s, size);
+	}
+#endif
+
+
+
+
+/* element in strblock next_chain in struct hipac_chain
+   means that current chain contains 'count' >= 1 rules 
+   that jump to chain 'chain'                                         */
+struct next_chain_elem
+{
+	__u32 count;
+	struct hipac_chain *chain;
+};
+
+
+/* the combined rule of all the chain_rules on the path
+   from a ROOT_CHAIN to the current chain                             */
+struct prefix_rule
+{
+	__u32 origin;
+	struct ptrblock *exec_matches;
+	__u8  native_mct;
+	struct hipac_match first_match[0];
+};
+
+
+/* the path from a ROOT_CHAIN to the current chain;
+   dimtree:   the dimtree corresponding to the ROOT of that path
+   prev:      the previous chain_rule on that path
+   rule:      the combined rule of all the chain_rules on that path   */
+struct path
+{
+	struct dimtree *dimtree;
+	struct chain_rule *prev;
+	struct prefix_rule *rule;
+};
+
+
+/* hipac_chain is the 'head' of the doubly linked list of chain_rules;
+   name:           the name of the chain
+   ref_count:      the number of rules that jump to this chain
+   packet_ct:      number of packets that matched the policy of this chain
+   byte_ct:        number of bytes that matched the policy of this chain
+   next_chains:    block of next_chain_elem structs; each chain that is
+                   jumped to from a rule in this chain has its own 
+		   next_chain_elem in this block with its 'count' field set to
+		   the number of rules that jump to that chain
+   paths:          block of all the paths from any ROOT_CHAIN to this chain
+   start:          contains pointers to dt_rules that mark the beginning
+                   of this chain in the internal dt_chain
+   end:            the same for the ending of the chain
+   dimtree:        points to a dimtree if chain is a ROOT_CHAIN,
+                   otherwise it's NULL                                */
+struct hipac_chain
+{
+	struct list_head head;
+	char name[HIPAC_CHAIN_NAME_MAX_LEN];
+	__u32 list_pos;
+	__u32 ref_count;
+	__u64 packet_ct, byte_ct;
+	struct strblock *next_chains; 
+	struct strblock *paths;
+	struct ptrblock *start;
+	struct ptrblock *end;   
+	struct dimtree *dimtree;
+};
+
+/* chain_rule is contained in a cyclic doubly linked list of rules where the
+   'head' of the list is of type struct hipac_chain;
+   dtr:  contains pointers to dt_rules in the internal dt_chain that correspond
+         to this chain_rule                                           */
+struct chain_rule
+{
+	struct list_head head;
+	struct ptrblock *dtr;
+	struct hipac_rule r;
+};
+
+
+
+
+
+/* 
+ * Several functions to free certain structs.
+ * The functions recursively free all other data structures that
+ * are pointed to from within the structs.  
+ */
+
+static inline void
+dt_rule_free(struct dt_rule *rule)
+{
+	if (rule->exec_match)
+		ptrblock_free(rule->exec_match);
+	hp_free(rule);
+}
+
+static inline void
+hipac_rule_free(struct hipac_rule *rule)
+{
+	destroy_fn(rule);
+	hp_free(rule);
+}
+
+static inline void
+chain_rule_free(struct chain_rule *rule)
+{
+	if (rule->dtr)
+		ptrblock_free(rule->dtr);
+	hp_free(rule);
+}
+
+static inline void
+chain_rule_destroy(struct chain_rule *rule)
+{
+	if (rule->dtr)
+		ptrblock_free(rule->dtr);
+	destroy_fn(&rule->r);
+	hp_free(rule);
+}
+
+static inline void
+prefix_rule_free(struct prefix_rule *p)
+{
+	if (p->exec_matches)
+		ptrblock_free(p->exec_matches);
+	hp_free(p);
+}
+
+static inline void
+path_free(struct path *p)
+{
+	if (p->rule)
+		prefix_rule_free(p->rule);
+	hp_free(p);
+}
+
+static inline void
+paths_free(struct strblock *paths)
+{
+	__u32 i;
+	for (i = 0; i < paths->len; i++)
+		prefix_rule_free(P_ELEM_RULE(paths, i));
+	strblock_free(paths);
+}
+
+/* End of free functions */
+
+
+
+
+
+
+
+
+/*
+ * chain_hash_* functions
+ */
+
+
+/* insert 'chain' into the global hash of all chains ('chain_hash') 
+   possible errors: HE_LOW_MEMORY, HE_IMPOSSIBLE_CONDITION            */
+static inline hipac_error
+chain_hash_insert(struct hipac_chain* chain)
+{
+	return ihash_insert(&chain_hash, chain->name, chain);//IS_THIS_CORRECT?
+}
+
+
+
+/* remove 'chain' from the global hash of all chains ('chain_hash')
+   the removed chain is not freed                                     */
+static inline void
+chain_hash_remove(struct hipac_chain* chain)
+{
+	if (current_chain && current_chain == chain)
+		current_chain = NULL;
+	ihash_delete(chain_hash, chain, NULL);
+}
+
+
+
+/* replace 'org' with 'new' in global hash of all chains
+   the replaced chain is not freed                                    */
+static inline hipac_error
+chain_hash_replace(struct hipac_chain *org, struct hipac_chain *new)
+{
+	if (current_chain && current_chain == org)
+		current_chain = NULL;
+	return ihash_replace(&chain_hash, org->name, NULL, new->name, new);
+}
+
+
+
+/* lookup 'chain' with name 'name' in global 'chain_hash',
+   the hash of all chains. 
+   possible errors: HE_CHAIN_NOT_EXISTENT, HE_IMPOSSIBLE_CONDITION    */
+static inline hipac_error
+chain_hash_lookup(const char* name, struct hipac_chain **chain)
+{
+	if (unlikely(!name || !chain))
+		ARG_ERR;
+	if ((current_chain) &&
+	    (!strcmp(name, current_chain->name))){
+		*chain = current_chain;
+		return HE_OK;
+	}
+	*chain = (struct hipac_chain*) ihash_lookup(chain_hash, name);
+	if (*chain != NULL) {
+		current_chain = *chain;
+		return HE_OK;
+	}
+	return HE_CHAIN_NOT_EXISTENT;
+}
+
+
+/* End of chain_hash_* functions */
+
+
+
+
+
+/* get previous dt_rules of the internal dt_rule representations of
+   chain_rule 'rule'.
+   if previous chain_rule 'prev' is not a jump rule return pointer to 
+   'prev->dtr' and set 'free_needed' to 0. otherwise a new ptrblock
+   with pointers to the previous dt_rules has to be computed from the
+   'chain->end' block of the chain 'prev' is pointing to and 
+   'free_needed' is set to 1.
+   possible errors: HE_LOW_MEMORY, HE_IMPOSSIBLE_CONDITION            */
+static inline hipac_error
+get_prev_dt_rules(const struct hipac_chain *chain, 
+		  const struct chain_rule *rule, 
+		  __u8 *free_needed, struct ptrblock **p)
+{			     
+	struct chain_rule *prev;
+	
+	if (unlikely(CHAIN_NOT_CONNECTED(chain)))
+		return HE_IMPOSSIBLE_CONDITION;
+	
+	if (unlikely(rule->head.prev == &chain->head)){
+		*p = chain->start;
+		*free_needed = 0;
+		return HE_OK;
+	}
+	
+	prev = list_entry(rule->head.prev, struct chain_rule, head);
+	*free_needed = IS_JUMP_RULE(prev);
+	if (!(*free_needed)){
+		*p = prev->dtr;
+	} else {
+		struct hipac_chain *c;
+		hipac_error error;
+		__u32 i;
+		chain_hash_lookup((void *) &prev->r 
+				  + prev->r.target_offset, &c);
+		*p = NULL;
+		for (i = 0; i < c->paths->len; i++){
+			if (prev == P_ELEM_PREV(c->paths, i)){
+				if ((error = 
+				     ptrblock_append(p, c->end->p[i]))){
+					CHECK_ERROR("ptrblock_append");
+					if (*p)
+						ptrblock_free(*p);
+					*p = NULL;
+					return error;
+				}
+			}
+		}
+	}
+	return HE_OK;
+}
+
+
+
+/* get next dt_rules of the internal dt_rule representations of 
+   chain_rule 'rule'.
+   if next chain_rule 'next' is not a jump rule return pointer to
+   'next->dtr' and set 'free_needed' to 0. otherwise a new ptrblock
+   with pointers to the next dt_rules has to be computed from the
+   'chain->start' block of the chain 'next' is pointing to and 
+   'free_needed' is set to 1. 
+   possible errors: HE_LOW_MEMORY, HE_IMPOSSIBLE_CONDITION            */
+static inline hipac_error
+get_next_dt_rules(const struct hipac_chain *chain, 
+		  const struct chain_rule *rule, 
+		  __u8 *free_needed, struct ptrblock **p)
+{			     
+	struct chain_rule *next;
+	
+	if (unlikely(CHAIN_NOT_CONNECTED(chain)))
+		return HE_IMPOSSIBLE_CONDITION;
+	
+	if (unlikely(rule->head.next == &chain->head)){
+		*p = chain->end;
+		*free_needed = 0;
+		return HE_OK;
+	}
+	
+	next = list_entry(rule->head.next, struct chain_rule, head);
+	*free_needed = IS_JUMP_RULE(next);
+	if (!(*free_needed)){
+		*p = next->dtr;
+	} else {
+		struct hipac_chain *c;
+		hipac_error error;
+		__u32 i;
+		chain_hash_lookup((void *) &next->r + 
+				  next->r.target_offset, &c);
+		*p = NULL;
+		for (i = 0; i < c->paths->len; i++){
+			if (next == P_ELEM_PREV(c->paths, i)){
+				if ((error = 
+				     ptrblock_append(p, c->start->p[i]))){
+					CHECK_ERROR("ptrblock_append");
+					if (*p)
+						ptrblock_free(*p);
+					*p = NULL;
+					return error;
+				}
+			}
+		}
+	}
+	return HE_OK;
+}
+
+
+
+
+
+/*
+ * chain_* functions
+ */
+
+
+/* create new hipac_chain with name 'name' and initialize all fields 
+   in struct hipac_chain 'result'. 'list_pos' is used to initialize
+   the list_pos member of 'result'
+   hipac_chain 'result' is not inserted into 'chain_hash'.
+   possible errors: HE_LOW_MEMORY, HE_CHAIN_EXISTS,
+                    HE_IMPOSSIBLE_CONDITION                           */
+static inline hipac_error
+chain_new(const char *name, struct hipac_chain **result, __u32 list_pos)
+{	
+	struct hipac_chain *chain;
+	hipac_error error;
+
+	if (unlikely(!name || !result))
+		ARG_ERR;
+	
+	if (unlikely(!(error = chain_hash_lookup(name, &chain))))
+		return HE_CHAIN_EXISTS;
+		
+	*result = chain = hp_alloc(sizeof(*chain), ADD);
+	if (!chain)
+		LOW_MEM("chain alloc failed!");
+	INIT_LIST_HEAD(&chain->head);
+	strncpy(chain->name, name, HIPAC_CHAIN_NAME_MAX_LEN);
+	chain->name[HIPAC_CHAIN_NAME_MAX_LEN - 1] = '\0';
+	chain->list_pos = list_pos;
+	chain->ref_count = 0;
+	chain->packet_ct = 0;
+	chain->byte_ct = 0;
+	chain->next_chains = NULL;
+	chain->paths = NULL;
+	chain->start = NULL;
+	chain->end = NULL;
+	chain->dimtree = NULL;
+	return HE_OK;
+}
+
+
+
+/* free hipac_chain 'chain' and recursively all other data 
+   structures that are pointed to from within this struct.
+   also free all rules in this chain.
+   attention: make sure 'chain' is NOT in the global 
+              'chain_hash' anymore!                                   */
+static inline void
+chain_free(struct hipac_chain* chain)
+{
+	struct list_head *lh;
+	struct chain_rule *rule;
+	
+	if (unlikely(!chain)){
+		ARG_MSG;
+		return;
+	}
+	
+	lh = chain->head.next;
+	while (lh != &chain->head) {
+		rule = list_entry(lh, struct chain_rule, head);
+		lh = lh->next;
+		list_del(lh->prev);
+		chain_rule_destroy(rule);
+	} 
+	if (chain->next_chains)
+		strblock_free(chain->next_chains);
+	if (chain->paths)
+		paths_free(chain->paths);
+	if (chain->start)
+		ptrblock_free(chain->start);
+	if (chain->end)
+		ptrblock_free(chain->end);
+		hp_free(chain);
+}
+
+
+
+/* flush hipac_chain 'chain'
+   free all rules in this chain and all other data structures
+   that are pointed to from within this struct.                       */
+static inline void
+chain_flush(struct hipac_chain* chain)
+{
+	struct list_head *lh;
+	struct chain_rule *rule;
+	
+	if (unlikely(!chain)){
+		ARG_MSG;
+		return;
+	}
+	
+	lh = chain->head.next;
+	while (lh != &chain->head) {
+		rule = list_entry(lh, struct chain_rule, head);
+		lh = lh->next;
+		list_del(lh->prev);
+		chain_rule_destroy(rule);
+	}
+	if (chain->next_chains){
+		strblock_free(chain->next_chains);
+		chain->next_chains = NULL;
+	}
+	if (chain->paths){
+		paths_free(chain->paths);
+		chain->paths = NULL;
+	}
+	if (chain->start){
+		ptrblock_free(chain->start);
+		chain->start = NULL;
+	}
+	if (chain->end){
+		ptrblock_free(chain->end);
+		chain->end = NULL;
+	}
+	chain->ref_count = 0;
+	
+}
+
+
+
+/* insert chain_rule 'rule' into 'chain' at position rule->r.pos;
+   if chain is empty, rule->r.pos is set to 1;
+   if rule->r.pos is larger than maxpos, rule->r.pos is set to maxpos;
+   'do_inc': when not 0 the pos field of all rules with 
+             pos >= rule->r.pos is incremented by 1                   */
+static inline void
+chain_insert(struct hipac_chain* chain, struct chain_rule *rule,
+	     const __u8 do_inc)
+{
+	struct list_head *lh;
+	__u32 rulepos;
+	struct chain_rule *curule;
+	
+	if (unlikely(!chain || !rule)){
+		ARG_MSG;
+		return;
+	}
+
+	if (list_empty(&chain->head)) {
+		list_add(&rule->head, &chain->head);
+		rule->r.pos = 1;
+		return;
+	}
+
+	if (rule->r.pos == 0)
+		rule->r.pos = 1;
+
+	lh = chain->head.prev;
+	rulepos = rule->r.pos;
+	curule = list_entry(lh, struct chain_rule, head);
+	
+	if (rulepos > curule->r.pos) {
+		list_add_tail(&rule->head, &chain->head);
+		rule->r.pos = curule->r.pos + 1;
+		return;
+	}
+
+	if (do_inc) {
+		do {
+			curule->r.pos++;
+			lh = lh->prev;
+			curule = list_entry(lh, struct chain_rule, head);
+		} while (lh != &chain->head && curule->r.pos >= rulepos);
+	} else {
+		do {
+			lh = lh->prev;
+			curule = list_entry(lh, struct chain_rule, head);
+		} while (lh != &chain->head && curule->r.pos >= rulepos);
+	}
+
+	if (lh == &chain->head) {
+		assert(rulepos == 1);
+		assert(!do_inc || 
+		       list_entry(chain->head.next,
+				  struct chain_rule, head)->r.pos == 2);
+		assert(do_inc ||
+		       list_entry(chain->head.next,
+				  struct chain_rule, head)->r.pos == 1);
+		
+		list_add(&rule->head, &chain->head);
+	} else {
+		assert(curule->r.pos < rulepos);
+		assert(!do_inc ||
+		       list_entry(curule->head.next,
+				  struct chain_rule,
+				  head)->r.pos == rulepos + 1);
+		assert(do_inc ||
+		       list_entry(curule->head.next,
+				  struct chain_rule,
+				  head)->r.pos == rulepos);
+		
+		list_add(&rule->head, &curule->head);
+	}
+}
+
+
+
+/* delete and all rules in 'chain' with position == 'rulepos';
+   attention: you must NOT call chain_delete with an empty chain!
+              does not free the rules!                                */
+static void
+chain_delete(const struct hipac_chain* chain, const __u32 rulepos)
+{
+	struct chain_rule *current_rule;
+	
+	if (unlikely(!chain)){
+		ARG_MSG;
+		return;
+	}
+	current_rule = list_entry(chain->head.prev, struct chain_rule, head);
+	
+	while (current_rule->r.pos > rulepos) {
+		current_rule->r.pos--;
+		current_rule = list_entry(current_rule->head.prev, 
+					  struct chain_rule, head);
+	}	
+		list_del(&current_rule->head);
+}
+
+
+
+/* find rule in hipac_chain 'chain' that equals hipac_rule 'rule'.
+   possible errors: HE_RULE_NOT_EXISTENT, HE_IMPOSSIBLE_CONDITION     */
+static inline hipac_error
+chain_find_rule(const struct hipac_chain *chain, const struct hipac_rule *rule,
+		struct chain_rule **result)
+{
+	struct list_head *lh;
+	struct chain_rule *currule;
+
+	if (!chain || !rule || !result)
+		ARG_ERR;
+			
+	list_for_each(lh, &chain->head) {
+		currule = list_entry(lh, struct chain_rule, head);
+		if (eq_fn(rule, &currule->r)){
+			*result = currule;
+			return HE_OK;
+		}
+	}
+	return HE_RULE_NOT_EXISTENT;
+}
+
+
+
+/* find rule in hipac_chain 'chain' with position 'pos'
+   possible errors: HE_RULE_NOT_EXISTENT, HE_IMPOSSIBLE_CONDITION     */
+static inline hipac_error
+chain_find_rule_with_pos(const struct hipac_chain *chain, const __u32 pos,
+			 struct chain_rule **result)
+{
+	struct list_head *lh;
+	struct chain_rule *currule;
+
+	if (!chain || !result)
+		ARG_ERR;
+			
+	list_for_each(lh, &chain->head) {
+		currule = list_entry(lh, struct chain_rule, head);
+		if (currule->r.pos == pos){
+			*result = currule;
+			return HE_OK;
+		}
+	}
+	return HE_RULE_NOT_EXISTENT;
+}
+
+
+
+/* set counters of chain_rule 'rule'.
+   attention: the function may only be called during a 
+              counter snapshot
+   possible errors: HE_LOW_MEMORY, HE_IMPOSSIBLE_CONDITION            */
+static inline hipac_error
+chain_rule_set_counters(const struct hipac_chain *chain,
+			struct chain_rule *rule)
+{
+	__u32 i;
+	
+	rule->r.packet_ct = 0;
+	rule->r.byte_ct = 0;
+	
+	if (CHAIN_NOT_CONNECTED(chain))
+		return HE_OK;
+	
+	if (IS_NOT_JUMP_RULE(rule)){
+		for (i = 0; i < rule->dtr->len; i++){
+			dimtree_get_counters(P_ELEM_DIMTREE(chain->paths, i),
+					     (struct dt_rule *) rule->dtr->p[i],
+					     ((struct dt_rule *) 
+					      rule->dtr->p[i])->spec.pos,
+					     &rule->r.packet_ct, 
+					     &rule->r.byte_ct);
+		}
+	} else {
+		hipac_error error;
+		struct ptrblock *prev, *next;
+		__u8 prev_free, next_free;
+		struct dt_rule *start;
+		
+		if ((error = get_prev_dt_rules(chain, rule, &prev_free, &prev))){
+			CHECK_ERROR("get_prev_dt_rules");
+			return error;
+		}
+		if ((error = get_next_dt_rules(chain, rule, 
+					       &next_free, &next))){
+			if (prev_free)
+				ptrblock_free(prev);
+			CHECK_ERROR("get_next_dt_rules");
+			return error;
+		}
+		for (i = 0; i < prev->len; i++){
+			start = list_entry(((struct dt_rule *) 
+					    prev->p[i])->head.next,
+					   struct dt_rule, head);
+		
+			while (start->spec.pos == ((struct dt_rule *) 
+						   prev->p[i])->spec.pos){
+				start = list_entry(start->head.next, 
+						   struct dt_rule, head);
+			}
+			dimtree_get_counters(P_ELEM_DIMTREE(chain->paths, i),
+					     start,
+					     ((struct dt_rule *) 
+					      next->p[i])->spec.pos - 1,
+					     &rule->r.packet_ct, 
+					     &rule->r.byte_ct);
+		}
+		if (prev_free)
+			ptrblock_free(prev);
+		if (next_free)
+			ptrblock_free(next);
+	}
+	return HE_OK;
+}
+
+
+	
+/* set counters of hipac_chain 'chain' including all rules
+   in this chain. if 'chain' is NULL set counters of all hipac_chains.
+   attention: the function may only be called during a 
+              counter snapshot
+   possible errors: HE_LOW_MEMORY, HE_IMPOSSIBLE_CONDITION            */
+static inline hipac_error
+chain_set_counters(struct hipac_chain *chain)
+{
+	hipac_error error;
+	struct list_head *lh;
+	struct chain_rule *rule;
+	__u32 i, j;
+	
+	if (!chain){
+		struct hipac_chain *c;
+		for (i = 0; i < chain_hash->len; i++) {
+			if (chain_hash->bucket[i] == NULL) {
+				continue;
+			}
+			for (j = 0; j < chain_hash->bucket[i]->len; j++) {
+				c = chain_hash->bucket[i]->kv[j].val;
+				if (c->dimtree){
+					dimtree_get_counters(c->dimtree,
+							     (struct dt_rule *)
+							     c->end->p[0],
+							     ((struct dt_rule *)
+							      c->end->p[0])
+							     ->spec.pos,
+							     &c->packet_ct,
+							     &c->byte_ct);
+				} else {
+					c->packet_ct = 0;
+					c->byte_ct = 0;
+				}
+				list_for_each(lh, &c->head) {
+					rule = list_entry(lh, 
+							  struct chain_rule,
+							  head);
+					if ((error =
+					     chain_rule_set_counters(c,
+								     rule))){
+						CHECK_ERROR(
+						 "chain_rule_set_counters");
+						return error;
+					}
+				}
+			}
+		}	
+		return HE_OK;
+	}
+	if (chain->dimtree){
+		dimtree_get_counters(chain->dimtree,
+				     (struct dt_rule *) chain->end->p[0],
+				     ((struct dt_rule *) 
+				      chain->end->p[0])->spec.pos,
+				     &chain->packet_ct, &chain->byte_ct);
+	} else {
+		chain->packet_ct = 0;
+		chain->byte_ct = 0;
+	}
+	lh = chain->head.next;
+	list_for_each(lh, &chain->head) {
+		rule = list_entry(lh, struct chain_rule, head);
+		if ((error = chain_rule_set_counters(chain, rule))){
+			CHECK_ERROR("chain_rule_set_counters");
+			return error;
+		}
+	}
+	return HE_OK;
+}
+
+
+
+/* End of chain_* functions */
+
+
+
+
+
+
+/* build chain_rule 'result' from hipac_rule 'rule'.        
+   possible errors: HE_LOW_MEMORY, HE_IMPOSSIBLE_CONDITION            */
+hipac_error
+build_chain_rule_from_hipac_rule(const struct hipac_rule *rule, 
+				 struct chain_rule **result)
+{
+	if (unlikely(!rule || !result))
+		ARG_ERR;
+
+	*result = hp_alloc(sizeof(**result) - sizeof(struct hipac_rule)
+	                   + rule->size, ADD);
+	if (!(*result))
+		LOW_MEM("chain_rule alloc failed!");
+	
+	(*result)->dtr = NULL;
+	copy_fn(rule, &(*result)->r);
+		return HE_OK;
+}
+
+
+
+/* build hipac_rule 'result' from dt_rule 'dt_rule'.
+   possible errors: HE_LOW_MEMORY, HE_IMPOSSIBLE_CONDITION            */
+hipac_error
+build_hipac_rule_from_dt_rule(const struct dt_rule *dt_rule,
+			      struct hipac_rule **result)
+{
+	__u32 size, exec_match_size = 0;
+	__u32 i;
+
+	if (unlikely(!dt_rule || !result))
+		ARG_ERR;
+
+	size = sizeof(**result) 
+		+ dt_rule->dt_match_len * sizeof(struct hipac_match)
+		+ dt_rule->exec_target_size;
+	
+	if (dt_rule->exec_match){
+		for (i = 0; i < dt_rule->exec_match->len; i += 2){ 
+			exec_match_size += (void *) 
+				dt_rule->exec_match->p[i + 1]
+				- dt_rule->exec_match->p[i];
+		}
+	}
+	size += exec_match_size;
+
+	*result = hp_alloc(size, ADD);
+	if (!(*result))
+		LOW_MEM("hipac_rule alloc failed!");
+	
+	(*result)->pos = dt_rule->spec.pos;
+	(*result)->packet_ct = 0;
+	(*result)->byte_ct = 0;
+	(*result)->size = size;
+	(*result)->origin = 0;
+	(*result)->action = dt_rule->spec.action;
+	(*result)->native_mct = dt_rule->dt_match_len;
+	if (dt_rule->exec_match)
+		(*result)->match_offset = sizeof(**result)
+			+ dt_rule->dt_match_len * sizeof(struct hipac_match);
+	else (*result)->match_offset = 0;
+	(*result)->target_offset = sizeof(**result)
+		+ dt_rule->dt_match_len * sizeof(struct hipac_match)
+		+ exec_match_size;
+	
+	for (i = 0; i < dt_rule->dt_match_len; i++){
+		(*result)->first_match[i].dimid =
+			dt_rule->first_dt_match[i].dimid;
+		(*result)->first_match[i].invert = 0;
+		(*result)->first_match[i].left =
+			dt_rule->first_dt_match[i].left;
+		(*result)->first_match[i].right =
+			dt_rule->first_dt_match[i].right;
+	}
+	if (dt_rule->exec_match){
+		void *pos = (void *) (*result) + (*result)->match_offset;
+		for (i = 0; i < dt_rule->exec_match->len; i += 2){ 
+			size = dt_rule->exec_match->p[i + 1]
+				- dt_rule->exec_match->p[i];
+			memcpy(pos, dt_rule->exec_match->p[i], size);
+			pos += size;
+		}
+	}
+	if (dt_rule->exec_target_size){
+		memcpy((void *) (*result) + (*result)->target_offset, 
+		       dt_rule->exec_target, dt_rule->exec_target_size);
+	}
+	return HE_OK;
+}
+
+
+
+/* if hipac_rule 'r' contains exec_matches, add a pointer to the beginning
+   and a pointer to the end of that exec_matches to the ptrblock '*p'  
+   possible errors: HE_LOW_MEMORY, HE_IMPOSSIBLE_CONDITION            */
+static inline hipac_error
+add_exec_matches(struct ptrblock **p, const struct hipac_rule *r)
+{
+	hipac_error error;
+
+	if (unlikely(!p || !r))
+		ARG_ERR;
+
+	if (r->match_offset == 0)
+		return HE_OK;
+	
+	if ((error = ptrblock_append(p, (void *) r + r->match_offset))){
+		CHECK_ERROR("ptrblock_append");
+		return error;
+	}
+	if ((error = ptrblock_append(p, (void *) r + r->target_offset))){
+		CHECK_ERROR("ptrblock_append");
+		ptrblock_delete_tail(p);
+		return error;
+	}
+	return HE_OK;
+}
+
+
+
+/* build new dt_rule from prefix_rule and/or hipac_rule.
+   prefix_rule and/or hipac_rule can be NULL.
+   pos:      the position of the new dt_rule; is written to result->spec.pos
+   action:   the action of the new dt_rule;   is written to result->spec.action
+   the exec_matches from prefix and hipac_rule are merged into
+   result->exec_match.
+   if the hipac_rule contains a exec_target it is written to 
+   result->exec_target.
+   attention: does NOT copy the native matches, this must be done externally!
+              allocs space for prefix->native_mct + rule->native_mct matches!
+              when merging the native matches externally, remember to do a
+              'hipac_realloc' when prefix and rule contain the same dimids!
+	       does NOT init dt_rule counters; remember to call
+	       dt_rule_init_counters() externally!
+   possible errors: HE_LOW_MEMORY, HE_IMPOSSIBLE_CONDITION            */
+static inline hipac_error
+build_dt_rule(struct prefix_rule *prefix, const struct hipac_rule *rule, 
+	      const __u32 pos, const __u32 action, struct dt_rule **result)
+{
+	hipac_error error;
+	struct dt_rule *new_dt_rule;
+	__u8 mct = 0;
+
+	if (unlikely(!result))
+		ARG_ERR;
+	
+	if (prefix)
+		mct += prefix->native_mct;
+	if (rule) 
+		mct += rule->native_mct;
+	
+	new_dt_rule = hp_alloc(dt_rule_size(mct), ADD);
+	if (!new_dt_rule)
+		LOW_MEM("dt_rule alloc failed!");
+	new_dt_rule->spec.bittype = BIT_RULE;
+	new_dt_rule->spec.rtype = RT_RULE;
+	new_dt_rule->spec.action = action;
+	new_dt_rule->spec.pos = pos;
+	new_dt_rule->exec_match = NULL;
+	new_dt_rule->exec_target = NULL;
+	new_dt_rule->exec_target_size = 0;
+	new_dt_rule->deleted = 0;
+	
+	if (prefix){
+		if ((error = ptrblock_clone(prefix->exec_matches, 
+					    &new_dt_rule->exec_match))){
+			dt_rule_free(new_dt_rule);
+			CHECK_ERROR("ptrblock_clone");
+			return error;
+		}
+	}
+	if (rule){
+		if ((error = add_exec_matches(&new_dt_rule->exec_match,
+						  rule))){
+			dt_rule_free(new_dt_rule);
+			CHECK_ERROR("add_exec_matches");
+			return error;
+		}
+	}
+	if (action == TARGET_EXEC){
+		new_dt_rule->exec_target = (void *) rule + rule->target_offset;
+		new_dt_rule->exec_target_size = ((void *) rule + rule->size)
+			- ((void *) rule + rule->target_offset);
+	}
+	new_dt_rule->dt_match_len = mct;
+	*result = new_dt_rule;
+	return HE_OK;
+}
+
+
+
+/* Remove last element from strblock 'paths' and also free the data
+   structures that are pointed to from within this element            */
+static inline void
+paths_delete_tail(struct strblock **paths)
+{
+	struct prefix_rule *p = P_ELEM_RULE(*paths, (*paths)->len - 1);
+	if (p)
+		prefix_rule_free(p);
+	strblock_delete_tail(paths);
+}
+
+
+
+/* Remove element with position 'pos' from strblock 'paths' and also free
+   the data structures that are pointed to from within this element.  */
+static inline void
+paths_delete_pos(struct strblock **paths, __u32 pos)
+{
+	struct prefix_rule *p = P_ELEM_RULE(*paths, pos);
+	if (p)
+		prefix_rule_free(p);
+	strblock_delete_pos(paths, pos);
+}
+
+
+
+/* substitute 'org' matches with 'new' matches in hipac_match array   */
+static inline void
+match_substitute(struct hipac_match *first_match, const __u8 match_cnt,
+		 const __u8 dimid[2], const __u32 *org, const __u32 *new,
+		 const __u8 len)
+{
+	__u32 i, j = 0, k;
+	for (i = 0; i < 2; i++) {
+		for (; j < match_cnt && first_match[j].dimid < dimid[i]; j++);
+		if (j < match_cnt && first_match[j].dimid == dimid[i]){
+			for (k = 0; k < len; k++){
+				if (first_match[j].left == org[k]){
+					first_match[j].left = 
+						first_match[j].right = new[k];
+				}
+			}
+		}
+	}
+}
+
+
+
+/* count number of negations/inverted matches in hipac_match array    */
+static inline __u8
+count_inv_matches(const struct hipac_match *first_match, const __u8 match_cnt)
+{
+	__u8 i, result = 0;
+	for (i = 0; i < match_cnt; i++)
+		if (first_match[i].invert)
+			result++;
+	return result;
+}	 
+
+
+
+/* count number of negations/inverted matches in both rules, but
+   without counting matches in the same dimid twice                   */
+static inline __u8
+count_inv_matches_2(const struct hipac_rule *hipac_rule, 
+		    const struct prefix_rule *prefix_rule)
+{
+	__u8 i, j, result = 0;
+
+	for (i = 0, j = 0; i < prefix_rule->native_mct; i++){
+			while ((j < hipac_rule->native_mct)
+			       && (hipac_rule->first_match[j].dimid 
+				   < prefix_rule->first_match[i].dimid)){
+				if (hipac_rule->first_match[j].invert)
+					result++;
+				j++;
+			}
+			if ((j < hipac_rule->native_mct)
+			    && (hipac_rule->first_match[j].dimid 
+				== prefix_rule->first_match[i].dimid)){
+				if (hipac_rule->first_match[j].invert)
+					result++;
+				j++;
+				continue;
+			}
+			if (prefix_rule->first_match[i].invert)
+				result++;
+	}
+	while (j < hipac_rule->native_mct){
+		if (hipac_rule->first_match[j].invert)
+			result++;	
+		j++;
+	}	
+	return result;
+}	 
+
+
+
+/* merge hipac_match 's' into dt_match 'new' while keeping negation
+   in mind.                                                           */
+static inline void
+merge_dimension(struct hipac_match *s, struct dt_match *new,
+		__u32 inv, __u16 *inv_match, __u8 *not_valid)
+{
+	if (!(s->invert)){
+		new->dimid = s->dimid;
+		new->left = s->left;
+		new->right = s->right;
+		return;
+	}
+	if (inv & (1 << *inv_match)){
+		if (s->right < 
+		    MAXKEY(dim2btype[s->dimid])){
+			new->dimid = s->dimid;
+			new->left = s->right + 1;
+			new->right = MAXKEY(dim2btype[s->dimid]);
+			(*inv_match)++;
+		} else {
+			*not_valid = 1;
+		}
+	} else {
+		if (s->left){	
+			new->dimid = s->dimid;
+			new->left = 0;
+			new->right = s->left - 1;
+			(*inv_match)++;
+		} else {
+			*not_valid = 1;
+		}
+	}
+}
+
+
+
+/* insert new dt_rule(s) at position 'pos' into dimtree 'path->dimtree'.
+   the new dt_rule is created from information found in 'path->rule'
+   and 'rule'. if 'path->rule' or 'rule' contain negation solve this by
+   adding several new dt_rules to the dimtree. append the (first) new 
+   dt_rule to the 'rule->dtr' pointer block.
+   if commit is not 0 commit the changes.
+   in case of an error undo all changes.
+   attention: in case of an error already inserted rules are not removed
+              from the internal dimtree chain. those rules have to be
+              removed externally.  
+   possible errors: HE_LOW_MEMORY, HE_RULE_ORIGIN_MISMATCH,
+                    HE_RULE_PREFIX_MISMATCH, HE_IMPOSSIBLE_CONDITION  */
+hipac_error
+insert_into_dt(const struct path *path,
+	       struct chain_rule *rule,
+	       const __u32 pos, const __u8 commit)
+{
+	struct dt_rule *new_dt_rule;
+	hipac_error error;
+	__u32 i, j, inv;
+	__u8 first = 1;
+	__u8 num;
+	struct dt_match *new;
+	__u32 mct = 0;
+	
+	if (unlikely(!path || !path->rule || !rule))
+		ARG_ERR;
+
+	num = count_inv_matches_2(&rule->r, path->rule);
+	
+	mct = rule->r.native_mct + path->rule->native_mct;
+	
+	if (!(num)){
+		__u32 new_mct = 0;
+		struct hipac_match *p = path->rule->first_match;
+		struct hipac_match *r = rule->r.first_match;
+		
+
+		if ((error = build_dt_rule(path->rule, &rule->r, pos, 
+					   rule->r.action, &new_dt_rule))){
+			CHECK_ERROR("build_dt_rule");
+			return error;
+		}
+
+		new = new_dt_rule->first_dt_match;
+
+		for (i = 0, j = 0; i < path->rule->native_mct; i++){
+			while ((j < rule->r.native_mct)
+			       && (r[j].dimid < p[i].dimid)){
+				new[new_mct].dimid = r[j].dimid;
+				new[new_mct].left = r[j].left;
+				new[new_mct].right = r[j].right;
+				j++;
+				new_mct++;
+				
+			}
+			if ((j < rule->r.native_mct)
+			    && (r[j].dimid == p[i].dimid)){
+				if (p[i].invert){
+					if (!(r[j].right < p[i].left
+					      || r[j].left > p[i].right)){
+						dt_rule_free(new_dt_rule);
+						return HE_RULE_PREFIX_MISMATCH;
+					}
+				} else if (r[j].left < p[i].left
+					   || r[j].right > p[i].right){
+					dt_rule_free(new_dt_rule);
+					return HE_RULE_PREFIX_MISMATCH;
+				}
+				new[new_mct].dimid = r[j].dimid;
+				new[new_mct].left = r[j].left;
+				new[new_mct].right = r[j].right;
+				j++;
+				new_mct++;
+				continue;
+			}
+			new[new_mct].dimid = p[i].dimid;
+			new[new_mct].left = p[i].left;
+			new[new_mct].right = p[i].right;
+			new_mct++;
+		}
+		
+		while (j < rule->r.native_mct){
+			new[new_mct].dimid = r[j].dimid;
+			new[new_mct].left = r[j].left;
+			new[new_mct].right = r[j].right;
+			j++;
+			new_mct++;
+		}
+  	
+		if (new_mct < mct){
+			new_dt_rule->dt_match_len = new_mct;
+			new_dt_rule = hp_realloc(new_dt_rule, 
+						 dt_rule_size(new_mct));
+			if (!new_dt_rule){
+				dt_rule_free(new_dt_rule);
+				IMPOSSIBLE_CONDITION("new_dt_rule is NULL");
+			}
+		}
+		
+		if (unlikely(commit && rule->r.packet_ct))
+			dt_rule_init_counters(new_dt_rule, 
+					      rule->r.packet_ct, 
+					      rule->r.byte_ct);
+		else dt_rule_init_counters(new_dt_rule, 0, 0);
+					      		
+		if ((error = ptrblock_append(&rule->dtr,
+					     (void *) new_dt_rule))){
+			CHECK_ERROR("ptrblock_append");
+			dt_rule_free(new_dt_rule);
+			return error;
+		}
+		if ((error = dimtree_insert(path->dimtree, new_dt_rule,
+					    rule->r.origin, INC, commit))){
+			CHECK_ERROR("dimtree_insert");
+			return error;
+		}
+		return HE_OK;
+	} 
+	//else we have a rule containing negation
+	
+		for (inv = 0; inv < (1 << num); inv++){
+		__u16 j;
+		__u8 not_valid = 0;
+		__u16 inv_match = 0;
+		__u32 new_mct = 0;
+		struct hipac_match *p = path->rule->first_match;
+		struct hipac_match *r = rule->r.first_match;
+	
+		if ((error = build_dt_rule(path->rule, &rule->r, pos, 
+					   rule->r.action, &new_dt_rule))){
+			CHECK_ERROR("build_dt_rule");
+			if (!first)
+				dimtree_failed(native_dts);
+			return error;
+		}
+		
+		new = new_dt_rule->first_dt_match;
+
+		for (i = 0, j = 0; i < path->rule->native_mct; i++){
+			while ((j < rule->r.native_mct)
+			       && (r[j].dimid < p[i].dimid)){
+				merge_dimension(&r[j], &new[new_mct], inv, 
+						&inv_match, &not_valid);
+				if (not_valid)
+					break;
+				j++;
+				new_mct++;
+			}
+			if (not_valid)
+				break;
+			if ((j < rule->r.native_mct)
+			    && (r[j].dimid == p[i].dimid)){
+				if (!r[j].invert && !p[i].invert){
+					if (r[j].left < p[i].left
+					    || r[j].right > p[i].right){
+						dt_rule_free(new_dt_rule);
+						if (!first)
+							dimtree_failed(
+								native_dts);
+						return HE_RULE_PREFIX_MISMATCH;
+					}
+				} else if (r[j].invert && !p[i].invert){
+					dt_rule_free(new_dt_rule);
+					if (!first)
+						dimtree_failed(native_dts);
+					return HE_RULE_PREFIX_MISMATCH;
+				} else if (!r[j].invert && p[i].invert){
+					if (!(r[j].right < p[i].left
+					      || r[j].left > p[i].right)){
+						dt_rule_free(new_dt_rule);
+						if (!first)
+							dimtree_failed(
+								native_dts);
+						return HE_RULE_PREFIX_MISMATCH;
+					}
+				} else if(r[j].invert && p[i].invert){
+					if (r[j].left > p[i].left
+					    || r[j].right < p[i].right){
+						dt_rule_free(new_dt_rule);
+						if (!first)
+							dimtree_failed(
+								native_dts);
+						return HE_RULE_PREFIX_MISMATCH;
+					}
+				}
+
+				merge_dimension(&r[j], &new[new_mct], inv, 
+						&inv_match, &not_valid);
+				if (not_valid)
+					break;
+				j++;
+				new_mct++;
+				continue;
+				
+			}
+			merge_dimension(&p[i], &new[new_mct], inv, 
+					&inv_match, &not_valid);
+			if (not_valid)
+				break;
+			new_mct++;
+		}
+		if (not_valid){
+			dt_rule_free(new_dt_rule);
+			continue;
+		}
+		while (j < rule->r.native_mct){
+			merge_dimension(&r[j], &new[new_mct], inv, 
+					&inv_match, &not_valid);
+			if (not_valid)
+				break;
+			j++;
+			new_mct++;
+		}			
+		if (not_valid){
+			dt_rule_free(new_dt_rule);
+			continue;
+		}
+		
+		if (new_mct < mct){
+			new_dt_rule->dt_match_len = new_mct;
+			new_dt_rule = hp_realloc(new_dt_rule, 
+						 dt_rule_size(new_mct));
+			if (!new_dt_rule){
+				dt_rule_free(new_dt_rule);
+				IMPOSSIBLE_CONDITION("new_dt_rule is NULL");
+			}
+		}
+
+		if (first){
+			if (unlikely(commit && rule->r.packet_ct))
+				dt_rule_init_counters(new_dt_rule, 
+						      rule->r.packet_ct, 
+						      rule->r.byte_ct);
+			else dt_rule_init_counters(new_dt_rule, 0, 0);
+			if ((error = ptrblock_append(&rule->dtr,
+						     (void *) new_dt_rule))){
+				CHECK_ERROR("ptrblock_append");
+				dt_rule_free(new_dt_rule);
+				return error;
+			}
+		} else {
+			dt_rule_init_counters(new_dt_rule, 0, 0);
+		}
+		if ((error = dimtree_insert(path->dimtree, new_dt_rule,
+					    rule->r.origin, first, 
+					    DONT_COMMIT))){
+			CHECK_ERROR("dimtree_insert");
+			return error;
+		}
+		if (first)
+			first = 0;
+	}	
+	if (commit)
+		dimtree_commit(native_dts);
+	return HE_OK;
+}	
+
+
+
+/* detect loop in hipac_chains.
+   if any rule in hipac_chain 'chain' (or recursively in any other
+   hipac_chain any rule in 'chain' jumps to) jumps to hipac_chain 'org'
+   a loop is detected.
+   possible errors: HE_LOOP_DETECTED, HE_REC_LIMIT                    */
+hipac_error
+detect_loop(const struct hipac_chain *chain, 
+	    const struct hipac_chain *org, __u32 depth)
+{
+	if (unlikely(!chain || !org))
+		ARG_ERR;
+	
+	if (depth > HIPAC_REC_LIMIT)
+		return HE_REC_LIMIT;
+
+	if (chain->next_chains){
+		__u32 i;
+		hipac_error error;
+		struct hipac_chain *next;
+		for (i = 0; i < chain->next_chains->len; i++){
+			next = STRBLOCK_ITH(chain->next_chains, i,
+					    struct next_chain_elem *)->chain;
+			if (next == org)
+				return HE_LOOP_DETECTED;
+			if ((error = detect_loop(next, org, depth + 1)))
+				return error;
+		}
+	}
+	return HE_OK;
+}
+
+
+
+/* add new path to the paths block of hipac_chain 'chain'.
+   the new path is computed from the path 'path' and the chain_rule 'rule'.
+   possible errors: HE_LOW_MEMORY, HE_RULE_PREFIX_MISMATCH, 
+                    HE_IMPOSSIBLE_CONDITION                           */
+hipac_error
+add_path(struct hipac_chain *chain, const struct path *path,
+	 struct chain_rule *rule)
+{
+	hipac_error error;
+	struct path *new_path;
+	struct prefix_rule *new_prefix;
+	struct hipac_match *r, *p, *new;
+	__u8 mct, i, j = 0, new_mct = 0;
+
+	if (!chain || !path || !path->rule || !rule)
+		ARG_ERR;
+	
+	mct = rule->r.native_mct + path->rule->native_mct;
+	
+	new_prefix = hp_alloc(sizeof(*new_prefix) 
+			      + mct * sizeof(struct hipac_match), ADD);
+	if (!new_prefix){
+		LOW_MEM("new_prefix alloc failed!");
+	}
+	new_path = hp_alloc(sizeof(*new_path), ADD);
+	if (!new_path){
+		hp_free(new_prefix);
+		LOW_MEM("new_path alloc failed!");
+	}
+
+	new_path->dimtree = path->dimtree;
+	new_path->prev = rule;
+	new_path->rule = new_prefix;
+	
+	new_prefix->origin = path->rule->origin & rule->r.origin;
+	new_prefix->exec_matches = NULL;
+	if ((error = ptrblock_clone(path->rule->exec_matches, 
+				    &new_prefix->exec_matches))){
+		CHECK_ERROR("ptrblock_clone");
+		path_free(new_path);
+		return error;
+	}
+	if ((error = add_exec_matches(&new_prefix->exec_matches, 
+				      &rule->r))){
+		CHECK_ERROR("add_exec_matches");
+		path_free(new_path);
+		return error;
+	}
+	r = rule->r.first_match;
+	p = path->rule->first_match;
+	new = new_prefix->first_match;
+	
+	for (i = 0; i < path->rule->native_mct; i++){
+		while ((j < rule->r.native_mct)
+		       && (r[j].dimid < p[i].dimid)){
+			new[new_mct].dimid = r[j].dimid;
+			new[new_mct].invert = r[j].invert;
+			new[new_mct].left = r[j].left;
+			new[new_mct].right = r[j].right;
+			j++;
+			new_mct++;
+		}
+		if ((j < rule->r.native_mct)
+		    && (r[j].dimid == p[i].dimid)){
+			if (!r[j].invert && !p[i].invert){
+				if (r[j].left < p[i].left
+				    || r[j].right > p[i].right){
+					path_free(new_path);
+					return HE_RULE_PREFIX_MISMATCH;
+				}
+			} else if (r[j].invert && !p[i].invert){
+				path_free(new_path);
+				return HE_RULE_PREFIX_MISMATCH;
+			} else if (!r[j].invert && p[i].invert){
+				if (!(r[j].right < p[i].left
+				      || r[j].left > p[i].right)){
+					path_free(new_path);
+					return HE_RULE_PREFIX_MISMATCH;
+				}
+			} else if(r[j].invert && p[i].invert){
+				if (r[j].left > p[i].left
+				    || r[j].right < p[i].right){
+					path_free(new_path);
+					return HE_RULE_PREFIX_MISMATCH;
+				}
+			}
+			
+			new[new_mct].dimid = r[j].dimid;
+			new[new_mct].invert = r[j].invert;
+			new[new_mct].left = r[j].left;
+			new[new_mct].right = r[j].right;
+			j++;
+			new_mct++;
+			continue;
+		}
+		new[new_mct].dimid = p[i].dimid;
+		new[new_mct].invert = p[i].invert;
+		new[new_mct].left = p[i].left;
+		new[new_mct].right = p[i].right;
+		new_mct++;
+	}
+
+	while (j < rule->r.native_mct){
+		new[new_mct].dimid = r[j].dimid;
+		new[new_mct].invert = r[j].invert;
+		new[new_mct].left = r[j].left;
+		new[new_mct].right = r[j].right;
+		j++;
+		new_mct++;
+	}
+	
+	if (new_mct < mct){
+		new_prefix = hp_realloc(new_prefix, sizeof(*new_prefix)
+					+ new_mct
+					* sizeof(struct hipac_match));
+		if (!new_prefix){
+			path_free(new_path);
+			IMPOSSIBLE_CONDITION("new_prefix is NULL");
+		}
+		new_path->rule = new_prefix;
+	}
+
+	new_prefix->native_mct = new_mct;
+	
+	if ((error = strblock_append_check(&chain->paths, new_path, 
+					   sizeof(*new_path)))){
+		CHECK_ERROR("strblock_append");
+		path_free(new_path);
+		return error;
+	}
+	hp_free(new_path);
+	return HE_OK;
+
+}
+
+
+
+/* add a dt_rule marking the beginning of the hipac_chain 'chain'
+   in the internal dimtree chain to 'path->dimtree' and add a pointer
+   to that new dt_rule to the 'chain->start' ptrblock.
+   the dt_rule is added with TARGET_DUMMY, so that it is not inserted
+   into the internal dimtree only into the internal dimtree chain.
+   possible errors: HE_LOW_MEMORY, HE_IMPOSSIBLE_CONDITION            */
+static inline hipac_error
+add_chain_start(struct hipac_chain *chain, const struct path *path,
+		const __u32 pos)
+{
+	hipac_error error;
+	struct dt_rule *start;
+
+	if ((error = build_dt_rule(NULL, NULL, pos, 
+				   TARGET_DUMMY, &start))){
+		CHECK_ERROR("build_dt_rule");
+		return error;
+	}
+	dt_rule_init_counters(start, 0, 0);
+	if ((error = ptrblock_append(&chain->start, start))){
+		CHECK_ERROR("ptrblock_append");
+		dt_rule_free(start);
+		return error;
+	}
+	if ((error = dimtree_insert(path->dimtree, start, 
+				    ORIGIN_ALL, INC, DONT_COMMIT))){
+		CHECK_ERROR("dimtree_insert");
+		ptrblock_delete_tail(&chain->start);
+		dt_rule_free(start);
+		return error;
+	}
+	return HE_OK;
+}
+
+
+
+/* add a dt_rule marking the end of the hipac_chain 'chain'
+   in the internal dimtree chain to 'path->dimtree' and add a pointer
+   to that new dt_rule to the 'chain->end' ptrblock.
+   the dt_rule added to the internal dimtree corresponds to 'path->rule'.
+   possible errors: HE_LOW_MEMORY, HE_IMPOSSIBLE_CONDITION            */
+hipac_error
+add_chain_end(struct hipac_chain *chain, struct path *path,
+	      const __u32 pos)
+{
+	struct dt_rule *new_dt_rule;
+	hipac_error error;
+	__u32 i;
+	__u8 first = 1;
+	__u8 num;
+	struct hipac_match *old;
+	struct dt_match *new;
+		
+		
+	num = count_inv_matches((struct hipac_match *) path->rule->first_match,
+				path->rule->native_mct);
+
+	if (!(num)){
+		if ((error = build_dt_rule(path->rule, NULL, pos, 
+					   TARGET_NONE, &new_dt_rule))){
+			CHECK_ERROR("build_dt_rule");
+			return error;
+		}
+		dt_rule_init_counters(new_dt_rule, 0, 0);
+		for (i = 0; i < path->rule->native_mct; i++){
+			new_dt_rule->first_dt_match[i].dimid = 
+				path->rule->first_match[i].dimid;
+			new_dt_rule->first_dt_match[i].left = 
+				path->rule->first_match[i].left;
+			new_dt_rule->first_dt_match[i].right = 
+				path->rule->first_match[i].right;
+		}
+		if ((error = ptrblock_append(&chain->end,
+					     (void *) new_dt_rule))){
+			CHECK_ERROR("ptrblock_append");
+			dt_rule_free(new_dt_rule);
+			return error;
+		}
+		if ((error = dimtree_insert(path->dimtree, new_dt_rule, 
+					    ORIGIN_ALL, INC, DONT_COMMIT))){
+			CHECK_ERROR("dimtree_insert");
+			return error;
+		}
+		return HE_OK;
+	} 
+	//else we have a rule containing negation
+	
+		for (i = 0; i < (1 << num); i++){
+		__u16 j;
+		__u8 not_valid = 0;
+		__u16 inv_match = 0;
+	
+	
+		if ((error = build_dt_rule(path->rule, NULL, pos, 
+					   TARGET_NONE, &new_dt_rule))){
+			CHECK_ERROR("build_dt_rule");
+			if (!first)
+				dimtree_failed(native_dts);
+			return error;
+		}
+		dt_rule_init_counters(new_dt_rule, 0, 0);
+		old = path->rule->first_match;
+		new = new_dt_rule->first_dt_match;
+		for (j = 0; j < path->rule->native_mct; j++){
+			if (!(old[j].invert)){
+				new[j].dimid = old[j].dimid;
+				new[j].left = old[j].left;
+				new[j].right = old[j].right;
+				continue;
+			}
+			if (i & (1 << inv_match)){
+				if (old[j].right < 
+				    MAXKEY(dim2btype[old[j].dimid])){
+					new[j].dimid = old[j].dimid;
+					new[j].left = old[j].right + 1;
+					new[j].right = 
+						MAXKEY(dim2btype[new[j].dimid]);
+				} else {
+					not_valid = 1;
+					break;
+				}
+			} else {
+				if (old[j].left){
+					new[j].dimid = old[j].dimid;
+					new[j].left = 0;
+					new[j].right = old[j].left - 1;
+				} else {
+					not_valid = 1;
+					break;
+				}
+			}
+			inv_match++;
+		}
+		if (not_valid){
+			dt_rule_free(new_dt_rule);
+			continue;
+		}	
+		if (first){
+			if ((error = ptrblock_append(&chain->end,
+						     (void *) new_dt_rule))){
+				CHECK_ERROR("ptrblock_append");
+				dt_rule_free(new_dt_rule);
+				return error;
+			}
+		}
+		if ((error = dimtree_insert(path->dimtree, new_dt_rule,
+					    ORIGIN_ALL, first, DONT_COMMIT))){
+			CHECK_ERROR("dimtree_insert");
+			return error;
+		}
+		if (first)
+			first = 0;
+	}
+	return HE_OK;
+}
+
+
+
+/* add hipac_chain 'to' to the next_chain block of hipac_chain 'from'.
+   if 'from' already contains a reference to hipac_chain 'to' then the
+   corresponding count field is incremented by 1, otherwise a new
+   next_chain_elem with its count field set to 1 is added to the
+   next_chain block.
+   possible errors: HE_LOW_MEMORY, HE_IMPOSSIBLE_CONDITION            */
+static inline hipac_error
+add_next_chain(struct hipac_chain *from, struct hipac_chain *to)
+{
+	hipac_error error;
+	struct next_chain_elem *nc;
+
+	if (from->next_chains){
+		__u32 i;
+		for (i = 0; i < from->next_chains->len; i++){
+			nc = STRBLOCK_ITH(from->next_chains, i,
+					  struct next_chain_elem *);
+			if (nc->chain == to){
+				nc->count++;
+				return HE_OK;
+			}
+		}
+	}
+
+	nc = hp_alloc(sizeof(*nc), ADD);
+	if (!nc)
+		LOW_MEM("next_chain alloc failed!");
+	nc->count = 1;
+	nc->chain = to;
+	error = strblock_append_check(&from->next_chains, nc, sizeof(*nc));
+	hp_free(nc);
+	CHECK_ERROR("strblock_append");
+	return error;
+}
+
+
+
+/* remove one reference to hipac_chain 'to' from the next_chain block
+   of hipac_chain 'from'.                                             */
+static inline void
+delete_next_chain(struct hipac_chain *from, const struct hipac_chain *to)
+{
+	struct next_chain_elem *nc;
+	
+	if (from->next_chains){
+		__u32 i;
+		for (i = 0; i < from->next_chains->len; i++){
+			nc = STRBLOCK_ITH(from->next_chains, i,
+					  struct next_chain_elem *);
+			if (nc->chain == to){
+				if (nc->count > 1){
+					nc->count--;
+				} else {
+					strblock_delete_pos(&from->next_chains,
+							    i);
+				}
+				break;
+			}
+		}
+	}
+}
+
+
+
+/* recursively insert jump rule 'rule' into hipac data structures
+   and dimtrees. in case of an error changes must be undone 
+   externally via delete_jump_from_hipac_layer(),
+   delete_dt_rules_from_dt_chains() and dimtree_chain_fix().
+   attention: in case of an success does NOT commit the changes.
+              don't forget to eventually commit the modifications
+	      externally via dimtree_commit().
+   possible errors: HE_LOW_MEMORY, HE_LOOP_DETECTED, HE_REC_LIMIT,
+                    HE_RULE_ORIGIN_MISMATCH, HE_RULE_RREFIX_MISMATCH,
+		    HE_IMPOSSIBLE_CONDITION                           */
+hipac_error
+insert_jump_rec(const struct hipac_chain *org, const struct ptrblock *next,
+		const struct path *path, const __u32 ins_num,
+		struct chain_rule *rule, __u32 depth)
+{
+	hipac_error error;
+	struct list_head *lh;
+	struct chain_rule *currule;
+	struct path *new_path;
+	struct hipac_chain *chain;
+	__u32 i;
+
+	if (depth > HIPAC_REC_LIMIT)
+		return HE_REC_LIMIT;
+
+	chain_hash_lookup((void *) &rule->r + rule->r.target_offset, &chain);
+		
+	if (org == chain)
+		return HE_LOOP_DETECTED;
+	
+	for (i = 0; i < ins_num; i++){
+		if ((error = add_path(chain, path + i, rule))){
+			CHECK_ERROR("add_path");
+			for (; i > 0; i--){
+				paths_delete_tail(&chain->paths);
+				ptrblock_delete_tail(&chain->start);
+			}
+			return error;
+		}
+		if ((error = add_chain_start(chain, 
+					     P_ELEM(chain->paths,
+						    chain->paths->len - 1),
+					     ((struct dt_rule *)
+					      next->p[i])->spec.pos))){
+			CHECK_ERROR("add_chain_start");
+			paths_delete_tail(&chain->paths);
+			for (; i > 0; i--){
+				paths_delete_tail(&chain->paths);
+				ptrblock_delete_tail(&chain->start);
+			}
+			return error;
+		}
+	}
+
+	new_path = P_ELEM(chain->paths, chain->paths->len - ins_num);
+		
+	list_for_each(lh, &chain->head){
+		currule = list_entry(lh, struct chain_rule, head);
+		if (IS_JUMP_RULE(currule)){
+			if ((error = insert_jump_rec(org, next,
+						     new_path, ins_num,
+						     currule, depth + 1))){
+				CHECK_ERROR("insert_jump_rec");
+				return error;
+			}
+		} else for (i = 0; i < ins_num; i++){
+				if ((error = insert_into_dt(new_path + i, currule,
+							    ((struct dt_rule *)
+							     next->p[i])->spec.pos, 
+							    DONT_COMMIT))){
+					CHECK_ERROR("insert_into_dt");
+					return error;
+				}
+		}
+	}   
+	for (i = 0; i < ins_num; i++){
+		if ((error = add_chain_end(chain, new_path + i, 
+					   ((struct dt_rule *) 
+					    next->p[i])->spec.pos))){
+			CHECK_ERROR("add_chain_end");
+			return error;
+		}
+	}
+		
+	return HE_OK;
+}	
+
+
+
+/* delete all entries in the hipac layer data structures corresponding to
+   jump rule 'rule'. all entries in hipac_chain path, start and end blocks
+   pointing to dt_rules with positions > prev and < next are deleted.
+   attention: be sure that those rules have been deleted from the dimtrees
+              before and that those changes have been commited. there must NOT
+	      be any intervall in any dimtree anymore pointing to one of those
+	      rules! BUT the corresponding dt_rules must NOT yet have been
+	      deleted from the internal dimtree chains!               */
+static void
+delete_jump_from_hipac_layer(const struct hipac_chain *org,
+			     const struct ptrblock *prev, 
+			     const struct ptrblock *next,
+			     const struct chain_rule *rule)
+{
+	struct list_head *lh;
+	struct hipac_chain *chain;
+	struct chain_rule *currule;
+	__u32 i, j , finished = 0, del_num = 0;
+	
+	chain_hash_lookup((void *) &rule->r + rule->r.target_offset, 
+			  &chain);
+	
+	if (!chain->start)
+		return;
+	
+	for (i = chain->start->len; i > 0; i--){
+		for (j = 0; j < prev->len; j++){
+			if (!chain->paths){
+				finished = 1;
+				break;
+			}
+			if ((P_ELEM_DIMTREE(chain->paths, i - 1)
+			     == P_ELEM_DIMTREE(org->paths, j))
+			    && (((struct dt_rule *)
+				 chain->start->p[i - 1])->spec.pos
+				> ((struct dt_rule *) prev->p[j])->spec.pos)
+			    && (((struct dt_rule *) 
+				 chain->start->p[i - 1])->spec.pos
+				< ((struct dt_rule *) next->p[j])->spec.pos)){
+				
+				chain->start->p[i - 1] = NULL;
+				paths_delete_pos(&chain->paths, i - 1);
+				del_num++;
+				break;
+			}
+		}
+		if (finished)
+			break;
+	}
+
+	if (!del_num)
+		return;
+	
+	ptrblock_delete_multi(&chain->end, chain->start);
+		
+	list_for_each(lh, &chain->head){
+		currule = list_entry(lh, 
+				     struct chain_rule, head);
+		if (IS_JUMP_RULE(currule)){
+			delete_jump_from_hipac_layer(org, prev, next, currule);
+		} else {
+			if (!currule->dtr)
+				break;
+			if (chain->end
+			    && chain->end->len == currule->dtr->len)
+				break;
+			ptrblock_delete_multi(&currule->dtr, chain->start);
+		}
+	}		
+	
+	for (i = chain->start->len; i > 0; i--){
+		if (!chain->start->p[i - 1])
+			ptrblock_delete_pos(&chain->start, i - 1);
+	}
+}							   
+							   
+
+      
+/* delete all dt_rules between prev and next from the internal dimtrees.
+   all rules with positions > prev and < next are deleted.
+   in case of an error undo all made changes.
+   attention: does NOT commit the changes. don't forget to eventually commit
+              the modifications externally via dimtree_commit().
+   possible errors: HE_LOW_MEMORY, HE_IMPOSSIBLE_CONDITION            */
+static inline hipac_error
+delete_dt_rules_from_dimtrees(const struct hipac_chain *chain,
+			      const struct ptrblock *prev,
+			      const struct ptrblock *next)
+{
+	hipac_error error;
+	__u32 i;
+	struct dt_rule *rule;
+	
+	if (!chain || !prev || !next)
+		ARG_ERR;
+	
+	for (i = 0; i < prev->len; i++){
+		rule = list_entry(((struct dt_rule *) prev->p[i])->head.next, 
+				  struct dt_rule, head);
+		
+		while (rule->spec.pos == 
+		       ((struct dt_rule *) prev->p[i])->spec.pos){
+			rule = list_entry(rule->head.next, 
+					  struct dt_rule, head);
+		}
+		while (rule != ((struct dt_rule *) next->p[i])){
+			if ((error = dimtree_delete(P_ELEM_DIMTREE(chain->paths,
+								   i),
+						    rule, DONT_COMMIT))){
+				CHECK_ERROR("dimtree_delete");
+				return error;
+			}
+			rule = list_entry(rule->head.next,
+					  struct dt_rule, head);
+		}
+	}
+	return HE_OK;
+}
+
+
+
+/* delete all dt_rules between prev and next from the internal dimtree chains.
+   all rules with positions > prev and < next are deleted.
+   attention: be sure that those rules have been deleted from the dimtrees
+              before and that those changes have been commited. there must NOT
+	      be any intervall in any dimtree anymore pointing to one of those
+	      rules!                                                  */
+static inline void
+delete_dt_rules_from_dt_chains(const struct hipac_chain *chain,
+			       const struct ptrblock *prev,
+			       const struct ptrblock *next)
+{
+	__u32 i, end_pos;
+	struct dt_rule *start;
+	
+	if (!chain || !prev || !next)
+		ARG_MSG;
+	
+	for (i = 0; i < prev->len; i++){
+		end_pos = ((struct dt_rule *) next->p[i])->spec.pos - 1;
+		if (((struct dt_rule *) prev->p[i])->spec.pos == end_pos){
+			continue;
+		}
+		start = list_entry(((struct dt_rule *) prev->p[i])->head.next, 
+				   struct dt_rule, head);
+		while (start->spec.pos == 
+		       ((struct dt_rule *) prev->p[i])->spec.pos){
+			start = list_entry(start->head.next, 
+					   struct dt_rule, head);
+		}
+		dimtree_chain_delete(P_ELEM_DIMTREE(chain->paths, i), start, 
+				     end_pos);
+	}
+}
+
+
+
+/* insert chain_rule 'rule' into hipac_chain 'chain' and 
+   commit the changes. in case of an error undo all made changes.
+   possible errors: HE_LOW_MEMORY, HE_LOOP_DETECTED, HE_REC_LIMIT,
+                    HE_RULE_ORIGIN_MISMATCH, HE_RULE_PREFIX_MISMATCH,
+		    HE_TARGET_CHAIN_IS_NATIVE, 
+		    HE_TARGET_CHAIN_NOT_EXISTENT,
+		    HE_IMPOSSIBLE_CONDITION                           */
+static inline hipac_error
+insert(struct hipac_chain *chain, struct chain_rule *rule)
+{
+     	hipac_error error;
+	struct ptrblock *prev, *next;
+	__u8 prev_free, next_free;
+	
+	if (CHAIN_NOT_CONNECTED(chain)){
+		if (IS_JUMP_RULE(rule)){
+			struct hipac_chain *target_chain;
+			if ((error = chain_hash_lookup((void *) &rule->r 
+						       + rule->r.target_offset,
+						       &target_chain))){
+				chain_rule_free(rule);
+				return HE_TARGET_CHAIN_NOT_EXISTENT;
+			}
+			if (target_chain == chain){
+				chain_rule_free(rule);
+				return HE_LOOP_DETECTED;
+			}
+			if (IS_ROOT_CHAIN(target_chain)){
+				chain_rule_free(rule);
+				return HE_TARGET_CHAIN_IS_NATIVE;
+			}
+			if ((error = detect_loop(target_chain, chain, 1))){
+				chain_rule_free(rule);
+				return error;
+			}
+			if ((error = add_next_chain(chain, target_chain))){
+				chain_rule_free(rule);
+				return error;
+			}
+			target_chain->ref_count++;
+		}
+		chain_insert(chain, rule, INC);
+		return HE_OK;
+	}
+
+	chain_insert(chain, rule, INC);
+	if ((error = get_prev_dt_rules(chain, rule, &prev_free, &prev))){
+		CHECK_ERROR("get_prev_dt_rules");
+		chain_delete(chain, rule->r.pos);
+		chain_rule_free(rule);
+		return error;
+	}
+	if ((error = get_next_dt_rules(chain, rule, &next_free, &next))){
+		CHECK_ERROR("get_next_dt_rules");
+		chain_delete(chain, rule->r.pos);
+		chain_rule_free(rule);
+		if (prev_free)
+			ptrblock_free(prev);
+		return error;
+	}
+
+
+	if (likely(IS_NOT_JUMP_RULE(rule))){
+		__u32 i;
+		__u8 commit = DONT_COMMIT;
+		if (next->len == 1)
+			commit = COMMIT;
+		for (i = 0; i < next->len; i++){
+			if ((error = 
+			     insert_into_dt(P_ELEM(chain->paths, i), rule,
+					    ((struct dt_rule *) 
+					     next->p[i])->spec.pos, commit))){
+				CHECK_ERROR("insert_into_dt");
+				dimtree_failed(native_dts);
+				delete_dt_rules_from_dt_chains(chain, 
+							       prev, next);
+				dimtree_chain_fix(native_dts);
+				chain_delete(chain, rule->r.pos);
+				chain_rule_free(rule);
+				if (prev_free)
+					ptrblock_free(prev);
+				if (next_free)
+					ptrblock_free(next);
+				return error;
+			}
+		}
+		if (!commit){
+			if (unlikely(rule->r.packet_ct))
+				dt_rule_init_counters((struct dt_rule *) 
+						      rule->dtr->p[0], 
+						      rule->r.packet_ct, 
+						      rule->r.byte_ct);
+			dimtree_commit(native_dts);
+		}
+	} else {
+		struct hipac_chain *target_chain;
+		if ((error = chain_hash_lookup((void *) &rule->r 
+					       + rule->r.target_offset,
+					       &target_chain))){
+			CHECK_ERROR("chain_hash_lookup");
+			chain_delete(chain, rule->r.pos);
+			chain_rule_free(rule);
+			if (prev_free)
+				ptrblock_free(prev);
+			if (next_free)
+				ptrblock_free(next);
+			return HE_TARGET_CHAIN_NOT_EXISTENT;
+		}
+		if (target_chain == chain){
+			chain_delete(chain, rule->r.pos);
+			chain_rule_free(rule);
+			if (prev_free)
+				ptrblock_free(prev);
+			if (next_free)
+				ptrblock_free(next);
+			return HE_LOOP_DETECTED;
+		}
+		if (IS_ROOT_CHAIN(target_chain)){
+			chain_delete(chain, rule->r.pos);
+			chain_rule_free(rule);
+			if (prev_free)
+				ptrblock_free(prev);
+			if (next_free)
+				ptrblock_free(next);
+			return HE_TARGET_CHAIN_IS_NATIVE;
+		}
+		if ((error = add_next_chain(chain, target_chain))){
+			CHECK_ERROR("add_next_chain");
+			chain_delete(chain, rule->r.pos);
+			chain_rule_free(rule);
+			if (prev_free)
+				ptrblock_free(prev);
+			if (next_free)
+				ptrblock_free(next);
+			return error;
+		}
+		if ((error = insert_jump_rec(chain, next, 
+					     P_ELEM(chain->paths, 0),
+					     chain->paths->len, rule, 1))){
+			CHECK_ERROR("insert_jump_rec");
+			dimtree_failed(native_dts);
+			delete_jump_from_hipac_layer(chain, prev, next, rule);
+			delete_dt_rules_from_dt_chains(chain, prev, next);
+			dimtree_chain_fix(native_dts);
+			delete_next_chain(chain, target_chain);
+			chain_delete(chain, rule->r.pos);
+			chain_rule_free(rule);
+			if (prev_free)
+				ptrblock_free(prev);
+			if (next_free)
+				ptrblock_free(next);
+			return error;
+		}
+		if (unlikely(rule->r.packet_ct))
+			dt_rule_init_counters(
+				(struct dt_rule *) 
+				target_chain->start->p[
+					target_chain->start->len - 1],
+				rule->r.packet_ct, 
+				rule->r.byte_ct);
+		dimtree_commit(native_dts);
+		target_chain->ref_count++;
+	}
+      	if (prev_free)
+		ptrblock_free(prev);
+	if (next_free)
+		ptrblock_free(next);
+	return HE_OK;
+}
+
+
+
+/* delete chain_rule 'rule' from hipac_chain 'chain' and commit
+   the changes. all representations of that rule in the internal 
+   dimtrees are removed. 
+   in case of an error undo all made changes.
+   possible errors: HE_LOW_MEMORY, HE_IMPOSSIBLE_CONDITION            */
+static inline hipac_error
+delete(struct hipac_chain* chain, struct chain_rule* rule)
+{
+	hipac_error error;
+	__u8 inv;
+	
+	if (unlikely(CHAIN_NOT_CONNECTED(chain))){
+		if (unlikely(IS_JUMP_RULE(rule))){
+			struct hipac_chain *target_chain;
+			chain_hash_lookup((void *) &rule->r 
+					  + rule->r.target_offset,
+					  &target_chain);
+			delete_next_chain(chain, target_chain);
+			target_chain->ref_count--;
+		}
+		chain_delete(chain, rule->r.pos);
+		chain_rule_destroy(rule);
+		return HE_OK;
+	}
+	
+	inv = count_inv_matches(rule->r.first_match, 
+				rule->r.native_mct);
+	
+	if (likely(!inv && IS_NOT_JUMP_RULE(rule))){
+      		__u32 i;
+		__u8 commit = 0;
+		if (rule->dtr->len == 1){
+			commit = 1;
+		}
+		for (i = 0; i < rule->dtr->len; i++){
+			if ((error = 
+			     dimtree_delete(P_ELEM_DIMTREE(chain->paths, i),
+					    (struct dt_rule *) rule->dtr->p[i],
+					    commit))){
+				CHECK_ERROR("dimtree_delete");
+				if (!commit)
+					dimtree_failed(native_dts);
+				return error;
+			}
+		}
+		if (!commit)
+			dimtree_commit(native_dts);
+		for (i = 0; i < rule->dtr->len; i++){
+			dimtree_chain_delete(P_ELEM_DIMTREE(chain->paths, i),
+					     (struct dt_rule *) rule->dtr->p[i],
+					     ((struct dt_rule *) 
+					      rule->dtr->p[i])->spec.pos);
+		}
+	} else {
+		struct ptrblock *prev, *next;
+		__u8 prev_free, next_free;
+		
+		if ((error = get_prev_dt_rules(chain, rule, 
+					       &prev_free, &prev))){
+			CHECK_ERROR("get_prev_dt_rules");
+			return error;
+		}
+		if ((error = get_next_dt_rules(chain, rule, 
+					       &next_free, &next))){
+			CHECK_ERROR("get_next_dt_rules");
+			if (prev_free)
+				ptrblock_free(prev);
+			return error;
+		}
+		if ((error = delete_dt_rules_from_dimtrees(chain, 
+							   prev, next))){
+			CHECK_ERROR("delete_dt_rules_from_dimtrees");
+			dimtree_failed(native_dts);
+			if (prev_free)
+				ptrblock_free(prev);
+			if (next_free)
+				ptrblock_free(next);
+			return error;
+		}
+		dimtree_commit(native_dts);
+		if (unlikely(IS_JUMP_RULE(rule))){
+			struct hipac_chain *target_chain;
+			chain_hash_lookup((void *) &rule->r + rule->r.target_offset,
+					  &target_chain);
+			delete_next_chain(chain, target_chain);
+			target_chain->ref_count--;
+			delete_jump_from_hipac_layer(chain, prev, next, rule);
+		}
+		delete_dt_rules_from_dt_chains(chain, prev, next);
+		if (prev_free)
+			ptrblock_free(prev);
+		if (next_free)
+			ptrblock_free(next);
+	}
+	dimtree_chain_fix(native_dts);
+	chain_delete(chain, rule->r.pos);
+	chain_rule_destroy(rule);
+	return HE_OK;
+}
+
+
+
+/* replace chain_rule 'old_rule' in hipac_chain 'chain' with 
+   chain_rule 'new_rule' and commit the changes.
+   in case of an error undo all made changes.
+   possible errors: HE_LOW_MEMORY, HE_LOOP_DETECTED, HE_REC_LIMIT,
+                    HE_RULE_ORIGIN_MISMATCH, HE_RULE_PREFIX_MISMATCH,
+		    HE_TARGET_CHAIN_IS_NATIVE,
+                    HE_TARGET_CHAIN_NOT_EXISTENT,
+		    HE_IMPOSSIBLE_CONDITION                           */
+static inline hipac_error
+replace(struct hipac_chain *chain, struct chain_rule *old_rule,
+	struct chain_rule *new_rule)
+{
+     	hipac_error error;
+	struct ptrblock *prev_old, *prev_new, *next_old, *next_new;
+	__u8 prev_free_old, prev_free_new, next_free_old, next_free_new;
+	struct hipac_chain *target_chain;
+	
+	if (CHAIN_NOT_CONNECTED(chain)){
+		if (IS_JUMP_RULE(new_rule)){
+			if ((error = 
+			     chain_hash_lookup((void *) &new_rule->r 
+					       + new_rule->r.target_offset,
+					       &target_chain))){
+				chain_rule_free(new_rule);
+				return HE_TARGET_CHAIN_NOT_EXISTENT;
+			}
+			if (target_chain == chain){
+				chain_rule_free(new_rule);
+				return HE_LOOP_DETECTED;
+			}
+			if (IS_ROOT_CHAIN(target_chain)){
+				chain_rule_free(new_rule);
+				return HE_TARGET_CHAIN_IS_NATIVE;
+			}
+			if ((error = detect_loop(target_chain, chain, 1))){
+				chain_rule_free(new_rule);
+				return error;
+			}
+			if ((error = add_next_chain(chain, target_chain))){
+				chain_rule_free(new_rule);
+				return error;
+			}
+			target_chain->ref_count++;
+		}
+		if (IS_JUMP_RULE(old_rule)){
+			chain_hash_lookup((void *) &old_rule->r 
+					  + old_rule->r.target_offset,
+					  &target_chain);
+			delete_next_chain(chain, target_chain);
+			target_chain->ref_count--;
+		}
+		chain_delete(chain, old_rule->r.pos);
+		chain_rule_destroy(old_rule);
+		chain_insert(chain, new_rule, INC);
+		return HE_OK;
+	}
+
+	if ((error = get_prev_dt_rules(chain, old_rule, 
+				       &prev_free_new, &prev_new))){
+		CHECK_ERROR("get_prev_dt_rules");
+		chain_rule_free(new_rule);
+		return error;
+	}
+	if ((error = get_next_dt_rules(chain, old_rule, 
+				       &next_free_old, &next_old))){
+		CHECK_ERROR("get_next_dt_rules");
+		chain_rule_free(new_rule);
+		if (prev_free_new)
+			ptrblock_free(prev_new);
+		return error;
+	}
+	if ((error = delete_dt_rules_from_dimtrees(chain, 
+						   prev_new, next_old))){
+		CHECK_ERROR("delete_dt_rules_from_dimtrees");
+		dimtree_failed(native_dts);
+		chain_rule_free(new_rule);
+		if (prev_free_new)
+			ptrblock_free(prev_new);
+		if (next_free_old)
+			ptrblock_free(next_old);
+		return error;
+	}
+	
+	chain_insert(chain, new_rule, INC);
+	
+	if ((error = get_next_dt_rules(chain, new_rule, 
+				       &next_free_new, &next_new))){
+		CHECK_ERROR("get_next_dt_rules");
+		chain_delete(chain, new_rule->r.pos);
+		chain_rule_free(new_rule);
+		dimtree_failed(native_dts);
+		if (prev_free_new)
+			ptrblock_free(prev_new);
+		if (next_free_old)
+			ptrblock_free(next_old);
+		return error;
+	}	
+
+	if (likely(IS_NOT_JUMP_RULE(new_rule))){
+		__u32 i;
+		for (i = 0; i < next_new->len; i++){
+			if ((error = insert_into_dt(P_ELEM(chain->paths, i),
+						    new_rule, 
+						    ((struct dt_rule *)
+						     next_new->p[i])->spec.pos, 
+						    DONT_COMMIT))){
+				CHECK_ERROR("insert_into_dt");
+				dimtree_failed(native_dts);
+				delete_dt_rules_from_dt_chains(chain, 
+							       prev_new, 
+							       next_new);
+				dimtree_chain_fix(native_dts);
+				chain_delete(chain, new_rule->r.pos);
+				chain_rule_free(new_rule);
+				if (prev_free_new)
+					ptrblock_free(prev_new);
+				if (next_free_old)
+					ptrblock_free(next_old);
+				if (next_free_new)
+					ptrblock_free(next_new);
+				return error;
+			}
+			if (unlikely(new_rule->r.packet_ct))
+				dt_rule_init_counters((struct dt_rule *) 
+						      new_rule->dtr->p[0], 
+						      new_rule->r.packet_ct, 
+						      new_rule->r.byte_ct);
+		}
+		if ((error = get_prev_dt_rules(chain, old_rule, 
+				       &prev_free_old, &prev_old))){
+			CHECK_ERROR("get_prev_dt_rules");
+			dimtree_failed(native_dts);
+			delete_dt_rules_from_dt_chains(chain, prev_new, 
+						       next_new);
+			dimtree_chain_fix(native_dts);
+			chain_delete(chain, new_rule->r.pos);
+			chain_rule_free(new_rule);
+			if (prev_free_new)
+				ptrblock_free(prev_new);
+			if (next_free_old)
+				ptrblock_free(next_old);
+			if (next_free_new)
+				ptrblock_free(next_new);
+			return error;
+		}
+	} else {
+		if ((error = chain_hash_lookup((void *) &new_rule->r 
+					       + new_rule->r.target_offset,
+					       &target_chain))){
+			CHECK_ERROR("chain_hash_lookup");
+			chain_delete(chain, new_rule->r.pos);
+			chain_rule_free(new_rule);
+			dimtree_failed(native_dts);
+			if (prev_free_new)
+				ptrblock_free(prev_new);
+			if (next_free_old)
+				ptrblock_free(next_old);
+			if (next_free_new)
+				ptrblock_free(next_new);
+			return HE_TARGET_CHAIN_NOT_EXISTENT;
+		}
+		if (target_chain == chain){
+			chain_delete(chain, new_rule->r.pos);
+			chain_rule_free(new_rule);
+			dimtree_failed(native_dts);
+			if (prev_free_new)
+				ptrblock_free(prev_new);
+			if (next_free_old)
+				ptrblock_free(next_old);
+			if (next_free_new)
+				ptrblock_free(next_new);
+			return HE_LOOP_DETECTED;
+		}
+		if (IS_ROOT_CHAIN(target_chain)){
+			chain_delete(chain, new_rule->r.pos);
+			chain_rule_free(new_rule);
+			dimtree_failed(native_dts);
+			if (prev_free_new)
+				ptrblock_free(prev_new);
+			if (next_free_old)
+				ptrblock_free(next_old);
+			if (next_free_new)
+				ptrblock_free(next_new);
+			return HE_TARGET_CHAIN_IS_NATIVE;
+		}
+		if ((error = add_next_chain(chain, target_chain))){
+			CHECK_ERROR("add_next_chain");
+			chain_delete(chain, new_rule->r.pos);
+			chain_rule_free(new_rule);
+			dimtree_failed(native_dts);
+			if (prev_free_new)
+				ptrblock_free(prev_new);
+			if (next_free_old)
+				ptrblock_free(next_old);
+			if (next_free_new)
+				ptrblock_free(next_new);
+			return error;
+		}
+		if ((error = insert_jump_rec(chain, next_new, 
+					     P_ELEM(chain->paths, 0),
+					     chain->paths->len, new_rule, 1))){
+			CHECK_ERROR("insert_jump_rec");
+			dimtree_failed(native_dts);
+			delete_jump_from_hipac_layer(chain, prev_new, 
+						     next_new, new_rule);
+			delete_dt_rules_from_dt_chains(chain, prev_new, 
+						       next_new);
+			dimtree_chain_fix(native_dts);
+			delete_next_chain(chain, target_chain);
+			chain_delete(chain, new_rule->r.pos);
+			chain_rule_free(new_rule);
+			if (prev_free_new)
+				ptrblock_free(prev_new);
+			if (next_free_old)
+				ptrblock_free(next_old);
+			if (next_free_new)
+				ptrblock_free(next_new);
+			return error;
+		}
+		if ((error = get_prev_dt_rules(chain, old_rule, 
+					       &prev_free_old, &prev_old))){
+			CHECK_ERROR("get_prev_dt_rules");
+			dimtree_failed(native_dts);
+			delete_jump_from_hipac_layer(chain, prev_new, 
+						     next_new, new_rule);
+			delete_dt_rules_from_dt_chains(chain, prev_new, 
+						       next_new);
+			dimtree_chain_fix(native_dts);
+			delete_next_chain(chain, target_chain);
+			chain_delete(chain, new_rule->r.pos);
+			chain_rule_free(new_rule);
+			if (prev_free_new)
+				ptrblock_free(prev_new);
+			if (next_free_old)
+				ptrblock_free(next_old);
+			if (next_free_new)
+				ptrblock_free(next_new);
+			return error;
+		}
+		if (unlikely(new_rule->r.packet_ct))
+			dt_rule_init_counters(
+				(struct dt_rule *) 
+				target_chain->start->p[
+					target_chain->start->len - 1],
+				new_rule->r.packet_ct, 
+				new_rule->r.byte_ct);
+		target_chain->ref_count++;
+	}
+	dimtree_commit(native_dts);
+	
+	if (likely(IS_JUMP_RULE(old_rule))){
+		chain_hash_lookup((void *) &old_rule->r 
+				  + old_rule->r.target_offset,
+				  &target_chain);
+		delete_next_chain(chain, target_chain);
+		target_chain->ref_count--;
+		delete_jump_from_hipac_layer(chain, prev_old, next_old, 
+					     old_rule);
+	}
+	delete_dt_rules_from_dt_chains(chain, prev_old, next_old);
+	dimtree_chain_fix(native_dts);
+	chain_delete(chain, old_rule->r.pos);
+	chain_rule_destroy(old_rule);
+	if (prev_free_old)
+		ptrblock_free(prev_old);
+	if (prev_free_new)
+		ptrblock_free(prev_new);
+	if (next_free_old)
+		ptrblock_free(next_old);
+	if (next_free_new)
+		ptrblock_free(next_new);
+	return HE_OK;
+}
+
+
+
+
+
+/*
+ * hipac_* functions
+ */
+
+
+/* init hipac data structures;
+   MUST be called once at the beginning in order to let the other
+   operations work properly!
+   dimid_to_bittype: assigns dimids to bit types.
+                     i-th element of the array contains the bit type
+		     of dimension id i
+   extract:          functions to extract certain fields from a packet. 
+                     the function at position i of the array returns
+		     the entry in a packet that corresponds to 
+		     dimension id i (i.e. the source ip of the packet)
+   len:              length of the dim2btype and extract array
+   copycon:          constructor function
+   destroy:          destructor function
+   match:            match executor function
+   target:           target executor function
+   eq:               equality function to compare rules
+   maxmem:           maximum allowed memory consumption  
+   possible errors: HE_LOW_MEMORY, HE_IMPOSSIBLE_CONDITION            */  
+hipac_error
+hipac_init(const __u8 dimid_to_bittype[], const hipac_extract_t extract[],
+	   const __u8 len, hipac_copy_constructor_t copycon,
+	   hipac_destroy_exec_t destroy, hipac_match_exec_t match,
+	   hipac_target_exec_t target, hipac_eq_exec_t eq, 
+	   const __u64 maxmem)
+{
+        
+	if (unlikely(!dimid_to_bittype || !extract || !copycon || !destroy ||
+		     !match || !target || !eq ))
+	ARG_ERR;
+	
+	mem_max = maxmem;
+	d2blen = len;
+	current_chain = NULL;
+	chain_hash = NULL;
+	native_dts = NULL;
+	dim2btype = hp_alloc(len, ADD);
+	if (!dim2btype)
+		LOW_MEM("dim2btype alloc failed!");
+	extract_fn = hp_alloc(len * PTRSIZE, ADD);
+	if (!extract_fn){
+		hp_free(dim2btype);
+		LOW_MEM("extract_fn alloc failed!");
+	}
+	chain_hash = ihash_new(CHAIN_HASH_LEN, ADD, CHAIN_HASH_AVR_BUCKET,
+			       ihash_func_str, eq_str);
+	if (!chain_hash){
+		hp_free(dim2btype);
+		hp_free(extract_fn);
+		LOW_MEM("ihash_new failed!");
+	}
+	memcpy(dim2btype, dimid_to_bittype, len);
+	memcpy(extract_fn, extract, len * PTRSIZE);
+	copy_fn = copycon;
+	destroy_fn = destroy;
+	match_fn = match;
+	target_fn = target;
+	eq_fn = eq;
+	return HE_OK;
+}
+
+
+
+/* free all hipac data structures;
+   MUST be called once in the end
+   attention: make sure there are no external accesses to hipac
+              data structures taking place anymore!                   */
+void
+hipac_exit(void)
+{
+	if (native_dts){
+		__u8 i;
+		for(i = 0; i < native_dts->len; i++){
+			dimtree_free((struct dimtree*) native_dts->p[i]);
+		}
+		ptrblock_free(native_dts);
+	} 
+	hp_free(dim2btype);
+	hp_free(extract_fn);
+	IHASH_VAL_ITERATE(chain_hash, struct hipac_chain *, chain_free);
+	ihash_free(chain_hash);
+	hp_mem_exit();
+}
+
+
+
+/* return new hipac data structure
+   name:        name of the public chain
+   name_intern: name of the internal dimtree chain
+   policy:      initial policy
+   origin:      bitvector uniq to this data structure
+   hipac:       pointer to a pointer to the resulting hipac data
+                structure. use as first argument to hipac_match()
+   possible errors: HE_LOW_MEMORY, HE_NATIVE_CHAIN_EXISTS,
+                    HE_CHAIN_EXISTS, HE_IMPOSSIBLE_CONDITION          */
+hipac_error
+hipac_new(const char *name, const char* name_intern, const __u8 policy, 
+	  const __u32 origin, void **hipac)
+{
+	hipac_error error;
+	struct hipac_chain *chain;
+	struct dt_rule *start, *end;
+	struct prefix_rule *prefix_rule;
+	struct path *new_path;
+	__u32 i, j, list_pos = 0;
+
+	if (unlikely(!name || !name_intern || !hipac))
+		ARG_ERR;
+
+	for (i = 0; i < chain_hash->len; i++) {
+		if (chain_hash->bucket[i] == NULL) {
+			continue;
+		}
+		for (j = 0; j < chain_hash->bucket[i]->len; j++) {
+			struct hipac_chain *c;
+			c = chain_hash->bucket[i]->kv[j].val;
+			if (c->dimtree && list_pos <= c->list_pos) {
+				list_pos = c->list_pos + 1;
+			}
+		}
+	}
+	
+	if (native_dts){
+		__u32 i = 0;
+		for (i = 0; i < native_dts->len; i++)
+			if (!strcmp(((struct dimtree *)native_dts->p[i])
+				    ->chain->name, name_intern))
+				return HE_NATIVE_CHAIN_EXISTS;
+	}
+
+	if ((error = chain_new(name, &chain, list_pos))){
+		CHECK_ERROR("chain_new");
+		return error;
+	}
+
+	if ((error = build_dt_rule(NULL, NULL, 0, TARGET_DUMMY, &start))){
+		CHECK_ERROR("build_dt_rule");
+		chain_free(chain);
+		return error;
+	}
+	dt_rule_init_counters(start, 0, 0);
+
+	if ((error = ptrblock_append(&chain->start, start))){
+		CHECK_ERROR("ptrblock_append");
+		chain_free(chain);
+		dt_rule_free(start);
+		return error;
+	}
+	if ((error = build_dt_rule(NULL, NULL, 1, policy, &end))){
+		CHECK_ERROR("build_dt_rule");
+		chain_free(chain);
+		dt_rule_free(start);
+		return error;
+	}
+	dt_rule_init_counters(end, 0, 0);
+	
+        if ((error = ptrblock_append(&chain->end, end))){
+		CHECK_ERROR("ptrblock_append");
+		chain_free(chain);
+		dt_rule_free(start);
+		dt_rule_free(end);
+		return error;
+	}
+	if ((error = dimtree_new((struct dimtree **)hipac, 
+				 origin, name_intern,
+				 start, end))){
+		CHECK_ERROR("dimtree_new");
+		chain_free(chain);
+		dt_rule_free(start);
+		dt_rule_free(end);
+		return error;
+	}
+
+	if ((error = ptrblock_append(&native_dts, 
+				     *(struct dimtree**) hipac))){
+		CHECK_ERROR("ptrblock_append");
+		dimtree_free(*(struct dimtree**) hipac);
+		chain_free(chain);
+		return error;
+	}
+
+	prefix_rule = hp_alloc(sizeof(*prefix_rule), ADD);
+	if (!prefix_rule){
+		dimtree_free(*(struct dimtree**) hipac);
+		chain_free(chain);
+		ptrblock_delete_tail(&native_dts);
+		LOW_MEM("prefix rule alloc failed");
+	}
+	new_path = hp_alloc(sizeof(*new_path), ADD);
+	if (!new_path){
+		hp_free(prefix_rule);
+		dimtree_free(*(struct dimtree**) hipac);
+		chain_free(chain);
+		ptrblock_delete_tail(&native_dts);
+		LOW_MEM("new_path alloc failed");
+	}
+	new_path->dimtree = *(struct dimtree**) hipac;
+	new_path->prev = NULL;
+	new_path->rule = prefix_rule;
+	prefix_rule->origin = ORIGIN_ALL;
+	prefix_rule->exec_matches = NULL;
+	prefix_rule->native_mct = 0;
+	if ((error = strblock_append_check(&chain->paths, new_path, 
+					   sizeof(*new_path)))){
+		CHECK_ERROR("strblock_append");
+		path_free(new_path);
+		dimtree_free(*(struct dimtree**) hipac);
+		chain_free(chain);
+		ptrblock_delete_tail(&native_dts);
+		return error;
+	}
+	hp_free(new_path);
+
+	if ((error = chain_hash_insert(chain))){
+		CHECK_ERROR("chain_hash_insert");
+		chain_free(chain);
+		dimtree_free(*(struct dimtree**) hipac);
+		ptrblock_delete_tail(&native_dts);
+		return error;
+	}
+	chain->dimtree = *(struct dimtree**) hipac;
+	return HE_OK;
+}
+
+
+
+/* set maximum amount of memory the hipac data structures are 
+   allowed to occupy. return LOW_MEMORY if 'mem' is lower than
+   currently allocated memory
+   possible errors: HE_LOW_MEMORY                                     */  
+hipac_error
+hipac_set_maxmem(const __u64 mem)
+{
+	if (mem_current_real > mem){
+		LOW_MEM();
+	}
+	mem_max = mem;
+	return HE_OK;
+}
+
+
+
+/* get maximum amount of memory the hipac data structures are 
+   allowed to occupy.                                                 */  
+__u64
+hipac_get_maxmem(void)
+{
+	return mem_max;
+}
+
+
+
+/* set policy of chain with name 'name' to 'policy'.
+   possible errors: HE_CHAIN_NOT_EXISTENT, HE_CHAIN_IS_USERDEFINED,
+                    HE_IMPOSSIBLE_CONDITION                           */
+hipac_error
+hipac_set_policy(const char *name, const __u8 policy)
+{
+	hipac_error error;
+	struct hipac_chain *chain;
+	
+        if (unlikely(!name))
+		ARG_ERR;
+	if (unlikely(error = chain_hash_lookup(name, &chain))){
+		CHECK_ERROR("chain_hash_lookup");
+		return error;
+	}
+	if (!chain->dimtree)
+		return HE_CHAIN_IS_USERDEFINED;
+	((struct dt_rule *)(chain->end->p[0]))->spec.action = policy;
+	return HE_OK;
+}
+
+
+
+/* get policy of chain with name 'name' and write it to 'result'.
+   possible errors: HE_CHAIN_NOT_EXISTENT, HE_CHAIN_IS_USERDEFINED,
+                    HE_IMPOSSIBLE_CONDITION                           */
+hipac_error
+hipac_get_policy(const char *name, __u8 *result)
+{
+	hipac_error error;
+	struct hipac_chain *chain;
+	
+	if (unlikely(!name || !result))
+		ARG_ERR;
+	if (unlikely(error = chain_hash_lookup(name, &chain))){
+		CHECK_ERROR("chain_hash_lookup");
+		return error;
+	}
+	if (!chain->dimtree)
+		return HE_CHAIN_IS_USERDEFINED;
+	*result = ((struct dt_rule *)(chain->end->p[0]))->spec.action;
+	return HE_OK;
+}
+
+
+
+/* create new user-defined chain with name 'name'.
+   possible errors: HE_LOW_MEMORY, HE_CHAIN_EXISTS, 
+                    HE_IMPOSSIBLE_CONDITION                           */
+hipac_error
+hipac_new_chain(const char* name)
+{
+	hipac_error error;
+	struct hipac_chain *chain;
+	__u32 i, j, list_pos;
+
+	if (unlikely(!name))
+		ARG_ERR;
+	
+	list_pos = chain_hash->elem_ct - (native_dts ? native_dts->len : 0);
+	if ((error = chain_new(name, &chain, list_pos))){
+		CHECK_ERROR("chain_new");
+		return error;
+	}
+	if ((error = chain_hash_insert(chain))){
+		CHECK_ERROR("chain_hash_insert");
+		chain_free(chain);
+		return error;
+	}
+	for (i = 0; i < chain_hash->len; i++) {
+		if (chain_hash->bucket[i] == NULL) {
+			continue;
+		}
+		for (j = 0; j < chain_hash->bucket[i]->len; j++) {
+			struct hipac_chain *c;
+			c = chain_hash->bucket[i]->kv[j].val;
+			if (c->dimtree) {
+				continue;
+			}
+			if (strcmp(c->name, name) > 0) {
+				if (c->list_pos < list_pos) {
+					list_pos = c->list_pos;
+				}
+				c->list_pos++;
+			}
+		}
+	}
+	chain->list_pos = list_pos;
+
+	return HE_OK;
+}
+
+
+
+/* delete all rules in chain with name 'name'.
+   if 'name' is NULL all rules in all chains are deleted.
+   possible errors: HE_LOW_MEMORY, HE_CHAIN_NOT_EXISTENT,
+                    HE_IMPOSSIBLE_CONDITION                           */
+hipac_error 
+hipac_flush_chain(const char *name)
+{
+	hipac_error error;
+	struct hipac_chain *chain;
+	struct list_head *lh;
+	struct chain_rule *rule;
+	struct next_chain_elem *n_elem;
+	__u32 i, j;
+	
+	if (!name){
+		//flushing all chains	
+		for (i = 0; i < chain_hash->len; i++) {
+			if (chain_hash->bucket[i] == NULL) {
+				continue;
+			}
+			for (j = 0; j < chain_hash->bucket[i]->len; j++) {
+				chain = chain_hash->bucket[i]->kv[j].val;
+				if (chain->dimtree){
+					dimtree_flush(chain->dimtree);
+					lh = chain->head.next;
+					while (lh != &chain->head) {
+						rule = list_entry(
+							lh, struct chain_rule,
+							head);
+						lh = lh->next;
+						list_del(lh->prev);
+						chain_rule_destroy(rule);
+					}
+					if (chain->next_chains){
+						strblock_free(
+							chain->next_chains);
+						chain->next_chains = NULL;
+					}
+				} else {
+					chain_flush(chain);
+				}
+			}                                                         
+		}
+		return HE_OK;
+	}
+
+	if (unlikely(error = chain_hash_lookup(name, &chain)))
+		return error;
+
+
+	if (unlikely(CHAIN_NOT_CONNECTED(chain))){			
+		if (chain->next_chains){
+			for (i = 0; i < chain->next_chains->len; i++){
+				n_elem = STRBLOCK_ITH(chain->next_chains, i,
+						      struct next_chain_elem *);
+				n_elem->chain->ref_count -= n_elem->count;
+			}
+			strblock_free(chain->next_chains);
+			chain->next_chains = NULL;
+		}
+		lh = chain->head.next;
+		while (lh != &chain->head) {
+			rule = list_entry(lh, struct chain_rule, head);
+			lh = lh->next;
+			list_del(lh->prev);
+			chain_rule_destroy(rule);
+		}
+		return HE_OK;
+	}
+
+	
+	if (!chain->dimtree){
+		if ((error = delete_dt_rules_from_dimtrees(chain, 
+							   chain->start,
+							   chain->end))){
+			CHECK_ERROR("delete_dt_rules_from_dimtrees");
+			dimtree_failed(native_dts);
+			return error;
+		}
+		dimtree_commit(native_dts);
+	}
+	
+	if (chain->next_chains){
+		for (i = 0; i < chain->next_chains->len; i++){
+			n_elem = STRBLOCK_ITH(chain->next_chains, i,
+					      struct next_chain_elem *);
+			n_elem->chain->ref_count -= n_elem->count;
+		}
+		strblock_free(chain->next_chains);
+		chain->next_chains = NULL;
+	}
+
+	lh = chain->head.next;
+	while (lh != &chain->head) {
+		rule = list_entry(lh, struct chain_rule, head);
+		lh = lh->next;
+		list_del(lh->prev);
+		if (IS_JUMP_RULE(rule)){
+			delete_jump_from_hipac_layer(chain, chain->start,
+						     chain->end, rule);
+		}
+		chain_rule_destroy(rule);
+	}
+	
+	if (chain->dimtree){
+		dimtree_flush(chain->dimtree);
+	} else {
+		delete_dt_rules_from_dt_chains(chain, 
+					       chain->start, chain->end);
+		dimtree_chain_fix(native_dts);
+	}
+	return HE_OK;
+}
+
+
+
+/* delete user-defined chain with name 'name'.
+   if 'name' is NULL delete all chains that are empty 
+   and not referenced from other chains.
+   possible errors: HE_CHAIN_NOT_EXISTENT, HE_CHAIN_IS_NATIVE,
+                    HE_CHAIN_NOT_EMPTY, HE_CHAIN_IS_REFERENCED        */   
+hipac_error
+hipac_delete_chain(const char *name)
+{
+	hipac_error error;
+	struct hipac_chain *chain;
+	__u32 i, j;
+	
+	if (!name){
+		//delete all empty and not referenced user-defined chains
+		for (i = 0; i < chain_hash->len; i++) {
+			if (chain_hash->bucket[i] == NULL) {
+				continue;
+			}
+			for (j = 0; j < chain_hash->bucket[i]->len;) {
+				__u32 k, l;
+				chain = chain_hash->bucket[i]->kv[j].val;
+				if (chain->dimtree
+				    || !list_empty(&chain->head)
+				    || CHAIN_IS_REFERENCED(chain)) {
+					j++;
+					continue;
+				}
+				ihash_delete(chain_hash, chain->name, NULL);
+				for (k = 0; k < chain_hash->len; k++) {
+					if (!chain_hash->bucket[k]) {
+						continue;
+					}
+					for (l = 0; l < chain_hash->
+						     bucket[k]->len; l++) {
+						struct hipac_chain *c;
+						c = chain_hash->bucket[k]->
+							kv[l].val;
+						if (!c->dimtree &&
+						    c->list_pos >
+						    chain->list_pos) {
+							c->list_pos--;
+						}
+					}
+				}
+				chain_free(chain);
+			}                                                         
+		}
+		return HE_OK;
+	}
+
+	if (unlikely(error = chain_hash_lookup(name, &chain)))
+		return HE_CHAIN_NOT_EXISTENT;
+
+	if (chain->dimtree)
+		return HE_CHAIN_IS_NATIVE;
+	
+	if (!list_empty(&chain->head))
+		return HE_CHAIN_NOT_EMPTY;
+
+	if (CHAIN_IS_REFERENCED(chain))
+		return HE_CHAIN_IS_REFERENCED;
+	
+	ihash_delete(chain_hash, chain->name, NULL);
+	for (i = 0; i < chain_hash->len; i++) {
+		struct hipac_chain *c;
+		if (chain_hash->bucket[i] == NULL) {
+			continue;
+		}
+		for (j = 0; j < chain_hash->bucket[i]->len; j++) {
+			c = chain_hash->bucket[i]->kv[j].val;
+			if (!c->dimtree && c->list_pos > chain->list_pos) {
+				c->list_pos--;
+			}
+		}                                                         
+	}
+	chain_free(chain);
+	return HE_OK;
+}
+
+
+
+/* rename chain with name 'name' to 'new_name'.
+   possible errors: HE_LOW_MEMORY, HE_CHAIN_EXISTS, 
+                    HE_CHAIN_NOT_EXISTENT, HE_CHAIN_IS_NATIVE,
+		    HE_IMPOSSIBLE_CONDITION                           */
+hipac_error
+hipac_rename_chain(const char *name, const char *new_name)
+{
+	hipac_error error;
+	struct hipac_chain *old_chain, *new_chain;
+	struct list_head *lh;
+	struct chain_rule *rule;
+	int new_is_larger;
+	char *old;
+	__u32 i, j, k, list_pos;
+
+	if (unlikely(!name || !new_name))
+		ARG_ERR;
+	
+	if (unlikely(!(error = chain_hash_lookup(new_name, &old_chain))))
+		return HE_CHAIN_EXISTS;
+
+	if (unlikely(error = chain_hash_lookup(name, &old_chain)))
+		return error;
+	
+	if (old_chain->dimtree)
+		return HE_CHAIN_IS_NATIVE;
+
+	new_chain = hp_alloc(sizeof(*new_chain), ADD);
+	if (!new_chain)
+		return HE_LOW_MEMORY;
+
+	memcpy(new_chain, old_chain, sizeof(*new_chain));
+
+	strncpy(new_chain->name, new_name, HIPAC_CHAIN_NAME_MAX_LEN);
+	new_chain->name[HIPAC_CHAIN_NAME_MAX_LEN - 1] = '\0';
+
+	if ((error = chain_hash_replace(old_chain, new_chain))) {
+		CHECK_ERROR("chain_hash_replace");
+		hp_free(new_chain);
+		return error;
+	}
+	current_chain = NULL;
+	
+	if (list_empty(&old_chain->head)) {
+		INIT_LIST_HEAD(&new_chain->head);
+	} else {
+		lh = old_chain->head.next;
+		list_del(&old_chain->head);
+		list_add_tail(&new_chain->head, lh);
+	}
+	
+	new_is_larger = (strcmp(new_name, name) > 0);
+	list_pos = old_chain->list_pos;
+	if (!CHAIN_IS_REFERENCED(old_chain)) {
+		for (i = 0; i < chain_hash->len; i++) {
+			struct hipac_chain *chain;
+			if (chain_hash->bucket[i] == NULL) {
+				continue;
+			}
+			for (j = 0; j < chain_hash->bucket[i]->len; j++) {
+				chain = chain_hash->bucket[i]->kv[j].val;
+				if (chain->dimtree)
+					continue;
+				if (new_is_larger) {
+					if (chain->list_pos >
+					    old_chain->list_pos &&
+					    strcmp(chain->name,
+						   new_name) < 0) {
+						if (list_pos <
+						    chain->list_pos) {
+							list_pos = chain->
+								list_pos;
+						}
+						chain->list_pos--;
+					}
+				} else {
+					if (chain->list_pos <
+					    old_chain->list_pos &&
+					    strcmp(chain->name,
+						   new_name) > 0) {
+						if (list_pos >
+						    chain->list_pos) {
+							list_pos = chain->
+								list_pos;
+						}
+						chain->list_pos++;
+					}
+				}
+			}
+		}
+		new_chain->list_pos = list_pos;
+		hp_free(old_chain);
+		return HE_OK;
+	}
+	
+	for (i = 0; i < chain_hash->len; i++) {
+		struct hipac_chain *chain, **next;
+		if (chain_hash->bucket[i] == NULL) {
+			continue;
+		}
+		for (j = 0; j < chain_hash->bucket[i]->len; j++) {
+			chain = chain_hash->bucket[i]->kv[j].val;
+
+			if (chain->next_chains){
+				for (k = 0; k < chain->next_chains->len; k++){
+					next = &STRBLOCK_ITH(
+						chain->next_chains, k,
+						struct next_chain_elem *)
+						->chain;
+					if (*next == old_chain)
+						*next = new_chain;
+				}
+			}
+
+			list_for_each(lh, &chain->head) {
+				rule = list_entry(lh, struct chain_rule, head);
+				if (IS_JUMP_RULE(rule)){
+					old = (void *) &rule->r 
+						+ rule->r.target_offset;
+					if (!strcmp(old, name)){
+						strncpy(old, new_name,
+						    HIPAC_CHAIN_NAME_MAX_LEN);
+						old[HIPAC_CHAIN_NAME_MAX_LEN
+						    - 1] = '\0';
+					}
+				}
+			}	
+
+			if (chain->dimtree)
+				continue;
+				
+			if (new_is_larger) {
+				if (chain->list_pos > old_chain->list_pos &&
+				    strcmp(chain->name, new_name) < 0) {
+					if (list_pos < chain->list_pos) {
+						list_pos = chain->list_pos;
+					}
+					chain->list_pos--;
+				}
+			} else {
+				if (chain->list_pos < old_chain->list_pos &&
+				    strcmp(chain->name, new_name) > 0) {
+					if (list_pos > chain->list_pos) {
+						list_pos = chain->list_pos;
+					}
+					chain->list_pos++;
+				}
+			}
+		}
+	}
+	new_chain->list_pos = list_pos;
+	hp_free(old_chain);
+	return HE_OK;
+}
+
+
+
+/* get an array of hipac_chain_info structs containing required infos
+   for a rule listing of chain with name 'name'. if 'name' is NULL
+   return infos for all chains. in order to request a rule listing with
+   valid counter fields, set 'request_counters' to 1. 'len' specifies
+   the length of the returned struct hipac_chain_info array.
+   attention: don't forget to free the struct hipac_chain_info array
+              after the rule listing via hipac_free_chain_infos()!
+   possible errors: HE_LOW_MEMORY, HE_CHAIN_NOT_EXISTENT,
+                    HE_IMPOSSIBLE_CONDITION                           */
+hipac_error
+hipac_get_chain_infos(const char *name, const __u8 request_counters,
+		      struct hipac_chain_info **inf, __u32 *len)
+{
+	hipac_error error;
+	struct hipac_chain *chain;
+
+	if (unlikely(!inf || !len))
+		ARG_ERR;
+	
+	if (!name){
+		__u32 i, j, e;
+		if (request_counters)
+			if ((error = chain_set_counters(NULL)))
+				return error;
+		*len = chain_hash->elem_ct;
+		*inf = hp_alloc(*len * sizeof(**inf), ADD);
+		if (!(*inf)){
+			LOW_MEM("hipac_chain_info alloc failed!");
+		}
+		for (i = 0; i < chain_hash->len; i++) {
+		        if (!chain_hash->bucket[i])
+				continue;
+			for (j = 0; j < chain_hash->bucket[i]->len; j++) {
+				chain = chain_hash->bucket[i]->kv[j].val;
+				if (chain->dimtree) {
+					e = chain->list_pos;
+					(*inf)[e].policy = ((struct dt_rule *)
+							    (chain->end->p[0]))
+						->spec.action;
+				} else {
+					e = chain->list_pos +
+						(native_dts ?
+						 native_dts->len : 0);
+					(*inf)[e].policy = 0;
+				}
+				(*inf)[e].label = chain->name;
+				(*inf)[e].is_internal_chain = 0;
+				if (list_empty(&chain->head)){
+					(*inf)[e].rule_num = 0;
+				} else {
+					(*inf)[e].rule_num =
+						list_entry(chain->head.prev,
+							   struct chain_rule, 
+							   head)->r.pos;
+				}
+				if (request_counters){
+					(*inf)[e].packet_ct = chain->packet_ct;
+					(*inf)[e].byte_ct = chain->byte_ct;
+				} else {
+					(*inf)[e].packet_ct = 0;
+					(*inf)[e].byte_ct = 0;
+				}
+				(*inf)[e].chain_head = &chain->head;
+			}                                                       
+		}
+		return HE_OK;
+	}
+		
+
+	if (unlikely(error = chain_hash_lookup(name, &chain))){
+		// it's not a user-defined chain
+		// check if it's a internal dimtree chain
+		__u32 i;
+		struct dimtree *dt;
+		if (!native_dts) 
+			return  HE_CHAIN_NOT_EXISTENT;
+		for (i = 0; i < native_dts->len; i++){
+			dt = (struct dimtree *) native_dts->p[i];
+			if (!strcmp(name, dt->chain->name)){
+				*len = 1;
+				*inf = hp_alloc(sizeof(**inf), ADD);
+				if (!(*inf))
+					LOW_MEM();
+				(*inf)[0].label = dt->chain->name;
+				(*inf)[0].policy = 
+					list_entry(dt->chain->head.prev,
+						   struct dt_rule, 
+						   head)->spec.action;
+				(*inf)[0].is_internal_chain = 1;
+				(*inf)[0].rule_num = dt->chain->len;
+				(*inf)[0].packet_ct = 0;
+				(*inf)[0].byte_ct = 0;
+				(*inf)[0].chain_head = &dt->chain->head;
+				return HE_OK;
+			}
+		}
+		return HE_CHAIN_NOT_EXISTENT;
+	}
+	
+	if (request_counters)
+		if ((error = chain_set_counters(chain)))
+			return error;
+	*len = 1;
+	*inf = hp_alloc(sizeof(**inf), ADD);
+	if (!(*inf))
+		LOW_MEM("hipac_chain_info alloc failed!");
+	(*inf)[0].label = chain->name;
+	if (chain->dimtree)
+		(*inf)[0].policy = ((struct dt_rule *)
+				    (chain->end->p[0]))->spec.action;
+	else (*inf)[0].policy = 0;
+	(*inf)[0].is_internal_chain = 0;
+	if (list_empty(&chain->head)){
+		(*inf)[0].rule_num = 0;
+	} else {
+		(*inf)[0].rule_num = list_entry(
+			chain->head.prev,
+			struct chain_rule, head)->r.pos;
+	} 
+	if (request_counters){
+		(*inf)[0].packet_ct = chain->packet_ct;
+		(*inf)[0].byte_ct = chain->byte_ct;
+	} else {
+		(*inf)[0].packet_ct = 0;
+		(*inf)[0].byte_ct = 0;
+	}
+	(*inf)[0].chain_head = &chain->head;
+	return HE_OK;
+}
+
+
+
+/* free array of hipac_chain_info structs that has been allocated
+   before via hipac_get_chain_infos(). 
+   possible errors: HE_IMPOSSIBLE_CONDITION                           */
+hipac_error
+hipac_free_chain_infos(struct hipac_chain_info *inf)
+{
+	if (unlikely(!inf))
+		ARG_ERR;
+	hp_free(inf);
+	return HE_OK;
+}
+
+
+
+/* get next hipac_rule 'next' of previous hipac_rule 'prev'.
+   with this function you can walk over the chain during rule listing.
+   to get the first hipac_rule of a chain, set 'prev_rule' to NULL.
+   when the end of the chain is reached or the chain is empty the
+   hipac_error HE_RULE_NOT_EXISTENT is returned.
+   attention: during rule listing of a chain hipac_get_next_rule() 
+              must always be called until finally HE_RULE_NOT_EXISTENT 
+	      is returned!
+   possible errors: HE_LOW_MEMORY, HE_RULE_NOT_EXISTENT,
+                    IMPOSSIBLE_CONDITION                              */
+hipac_error
+hipac_get_next_rule(const struct hipac_chain_info *inf,
+		    struct hipac_rule *prev, 
+		    struct hipac_rule **next)
+{
+	hipac_error error;
+	static struct dt_rule *dt_rule = NULL;
+
+	if (unlikely(!inf || !next))
+		ARG_ERR;
+
+	if (unlikely(!prev)){
+		if (!inf->is_internal_chain){
+			if (unlikely(list_empty(inf->chain_head))){
+				*next = NULL;
+				return HE_RULE_NOT_EXISTENT;
+			} else {
+				*next = &list_entry(inf->chain_head->next,
+						    struct chain_rule, 
+						    head)->r;
+			}
+		} else {
+			if (dt_rule)
+				IMPOSSIBLE_CONDITION("dt_rule is defined!");
+			dt_rule = list_entry(inf->chain_head->next,
+					     struct dt_rule, head);
+			if ((error = build_hipac_rule_from_dt_rule(dt_rule, 
+								   next))){
+				CHECK_ERROR("build_hipac_rule_from_dt_rule");
+				dt_rule = NULL;
+				*next = NULL;
+				return error;
+			}
+		}
+		return HE_OK;
+	}
+       
+	if (!inf->is_internal_chain){
+		struct chain_rule *prev_chain_rule;
+		prev_chain_rule = list_entry(prev, 
+					     struct chain_rule, r);
+		if (prev_chain_rule->head.next == inf->chain_head){
+			*next = NULL;
+			return HE_RULE_NOT_EXISTENT;
+		}
+		*next = &list_entry(prev_chain_rule->head.next,
+				    struct chain_rule, head)->r;
+	} else {
+		hp_free(prev);
+		if (!dt_rule)
+			IMPOSSIBLE_CONDITION("dt_rule not defined!");
+		if (dt_rule->head.next == inf->chain_head){
+			dt_rule = NULL;
+			*next = NULL;
+			return HE_RULE_NOT_EXISTENT;
+		}
+		dt_rule = list_entry(dt_rule->head.next,
+				     struct dt_rule, head);
+		if ((error = build_hipac_rule_from_dt_rule(dt_rule, 
+							   next))){
+			CHECK_ERROR("build_hipac_rule_from_dt_rule");
+			dt_rule = NULL;
+			*next = NULL;
+			return error;
+		}
+	}
+	return HE_OK;
+}
+
+
+
+/* zero counters of all rules in chain with name 'name'.
+   if 'name' is NULL zero counters of all rules in all chains.
+   possible errors: HE_CHAIN_NOT_EXISTENT, HE_IMPOSSIBLE_CONDITION    */
+hipac_error
+hipac_zero_counters(const char *name)
+{
+	hipac_error error;
+	struct hipac_chain *chain;
+	__u32 i;
+
+	if (!name){
+		// zero counters in all dt_chains
+		struct dt_chain *dt_chain;
+		struct dt_rule *start;
+		__u32 end_pos;
+		if (!native_dts)
+			return HE_OK;
+		for (i = 0; i < native_dts->len; i++){
+			dimtree_request_snapshot((struct dimtree *) 
+						 native_dts->p[i]);
+		}
+		for (i = 0; i < native_dts->len; i++){
+			dt_chain = ((struct dimtree *) 
+				    native_dts->p[i])->chain;
+			start =  list_entry(dt_chain->head.next,
+					    struct dt_rule, head);
+			end_pos = list_entry(dt_chain->head.prev,
+					    struct dt_rule, head)->spec.pos;
+			dimtree_zero_counters((struct dimtree *) 
+					      native_dts->p[i], start, end_pos);
+		}
+		for (i = 0; i < native_dts->len; i++){
+			dimtree_finish_snapshot((struct dimtree *) 
+						native_dts->p[i]);
+		}
+		return HE_OK;
+	}
+
+	if (unlikely(error = chain_hash_lookup(name, &chain)))
+		return HE_CHAIN_NOT_EXISTENT;
+
+	if (chain->paths){
+		for (i = 0; i < chain->paths->len; i++){
+			dimtree_request_snapshot(P_ELEM_DIMTREE(chain->paths,
+								i)); 
+		}
+		for (i = 0; i < chain->paths->len; i++){
+			dimtree_zero_counters(P_ELEM_DIMTREE(chain->paths, i),
+					      chain->start->p[i],
+					      ((struct dt_rule *)
+					       chain->end->p[i])->spec.pos);
+		}
+		for (i = 0; i < chain->paths->len; i++){
+			dimtree_finish_snapshot(P_ELEM_DIMTREE(chain->paths,
+							       i));
+		}
+	}
+	return HE_OK;
+}
+
+
+
+/* substitute 'org' matches with 'new' matches in dimids 'dimid[2]'
+   of all rules in all chains. 'len' is the number of 'org' -> 'new' 
+   mappings and consequently the length of 'org[]' and 'new[]'.
+   attention: assumes no ranges are allowed in dimids 'dimid[2]'.
+   possible errors: HE_LOW_MEMORY, HE_IMPOSSIBLE_CONDITION            */
+hipac_error
+hipac_substitute(const __u8 dimid[2], const __u32 org[], const __u32 new[],
+		 const __u32 len)
+{
+	hipac_error error;
+	struct hipac_chain *chain;
+	struct chain_rule *rule;
+	struct prefix_rule *prefix;
+	struct list_head *lh;
+	__u32 i, j, k;
+	
+	if (unlikely(!dimid || !org ||!new || len > 2))
+		ARG_ERR;
+
+	if ((error = dimtree_substitute(native_dts, dimid, org, new, len))){
+		CHECK_ERROR("dimtree_substitute");
+		return error;
+	}
+
+	for (i = 0; i < chain_hash->len; i++) {
+		if (!chain_hash->bucket[i]) {
+			continue;
+		}
+		for (j = 0; j < chain_hash->bucket[i]->len; j++) {
+			chain = chain_hash->bucket[i]->kv[j].val;
+			if (chain->paths){
+				for (k = 0; k < chain->paths->len; k++){
+					prefix = P_ELEM_RULE(chain->paths, k);
+					if (prefix){
+						match_substitute(prefix
+								 ->first_match,
+								 prefix
+								 ->native_mct,
+								 dimid, org,
+								 new, len);
+					}
+				}
+			}
+			list_for_each(lh, &chain->head) {
+				rule = list_entry(lh, struct chain_rule, head);
+				match_substitute(rule->r.first_match, 
+						 rule->r.native_mct,
+						 dimid, org, new, len);
+			}
+		}
+	}
+	return HE_OK;
+}
+
+
+
+/* append hipac_rule 'rule' to chain with name 'name'.
+   'rule->pos' is set to the position of the last rule
+   in the chain + 1.  
+   possible errors: HE_LOW_MEMORY, HE_CHAIN_NOT_EXISTENT, 
+                    HE_LOOP_DETECTED, HE_REC_LIMIT,
+		    HE_RULE_ORIGIN_MISMATCH, HE_RULE_PREFIX_MISMATCH,
+		    HE_TARGET_CHAIN_NOT_EXISTENT,
+		    HE_TARGET_CHAIN_IS_NATIVE, 
+		    HE_IMPOSSIBLE_CONDITION                           */
+hipac_error
+hipac_append(const char *name, const struct hipac_rule *rule)
+{
+	hipac_error error;
+	struct hipac_chain *chain;
+	struct chain_rule *new_rule;
+	
+	if (unlikely(!name || !rule))
+		ARG_ERR;
+	
+	if (unlikely(error = chain_hash_lookup(name, &chain)))
+		return error;
+
+	if (unlikely(error = build_chain_rule_from_hipac_rule(rule, &new_rule)))
+		return error;
+
+	new_rule->r.pos = (list_empty(&chain->head)) ?
+		1 : (list_entry(chain->head.prev,
+				struct chain_rule, head)->r.pos + 1);
+	return insert(chain, new_rule);
+}	
+
+
+
+/* insert hipac_rule 'rule' at position 'rule->pos' into chain
+   with name 'name'.
+   possible errors: HE_LOW_MEMORY, HE_CHAIN_NOT_EXISTENT,
+                    HE_LOOP_DETECTED, HE_REC_LIMIT,
+		    HE_RULE_ORIGIN_MISMATCH, HE_RULE_PREFIX_MISMATCH,
+		    HE_TARGET_CHAIN_NOT_EXISTENT,
+		    HE_TARGET_CHAIN_IS_NATIVE, 
+		    HE_IMPOSSIBLE_CONDITION                           */
+hipac_error
+hipac_insert(const char *name, const struct hipac_rule *rule)
+{
+	hipac_error error;
+	struct hipac_chain *chain;
+	struct chain_rule *new_rule;
+
+	if (unlikely(!name || !rule))
+		ARG_ERR;
+	
+	if (unlikely(error = chain_hash_lookup(name, &chain)))
+		return error;
+
+	if (unlikely(error = build_chain_rule_from_hipac_rule(rule, &new_rule)))
+		return error;
+
+	return insert(chain, new_rule);
+}
+
+
+
+/* delete hipac_rule with position 'pos' from chain with name 'name'.
+   possible errors: HE_LOW_MEMORY, HE_CHAIN_NOT_EXISTENT, 
+                    HE_RULE_NOT_EXISTENT, HE_IMPOSSIBLE_CONDITION     */
+hipac_error
+hipac_delete_pos(const char *name, const __u32 pos)
+{
+	hipac_error error;
+	struct hipac_chain *chain;
+	struct chain_rule *del_rule;
+	
+	if (unlikely(!name))
+		ARG_ERR;
+	
+	if (unlikely(error = chain_hash_lookup(name, &chain)))
+		return error;
+	
+	if (unlikely(error = chain_find_rule_with_pos(chain, pos, &del_rule)))
+		return error;
+
+	return delete(chain, del_rule);
+}
+
+
+
+/* find the first rule in chain with name 'name' that equals to
+   hipac_rule 'rule' and delete it.
+   possible errors: HE_LOW_MEMORY, HE_CHAIN_NOT_EXISTENT, 
+                    HE_RULE_NOT_EXISTENT, HE_IMPOSSIBLE_CONDITION     */
+hipac_error
+hipac_delete(const char *name, const struct hipac_rule *rule)
+{
+	hipac_error error;
+	struct hipac_chain *chain;
+	struct chain_rule *del_rule;
+
+	if (unlikely(!name || !rule))
+		ARG_ERR;
+	
+	if (unlikely(error = chain_hash_lookup(name, &chain)))
+		return error;
+	
+	if (unlikely(error = chain_find_rule(chain, rule, &del_rule)))
+		return error;
+	
+	return delete(chain, del_rule);
+}
+
+
+
+/* replace rule with position 'rule->pos' in chain with name 'name'
+   with hipac_rule 'rule'.
+   possible errors: HE_LOW_MEMORY, HE_CHAIN_NOT_EXISTENT,
+                    HE_RULE_NOT_EXISTENT, HE_LOOP_DETECTED,
+		    HE_REC_LIMIT, HE_RULE_ORIGIN_MISMATCH,
+		    HE_RULE_PREFIX_MISMATCH,
+		    HE_TARGET_CHAIN_NOT_EXISTENT,
+		    HE_TARGET_CHAIN_IS_NATIVE, 
+		    HE_IMPOSSIBLE_CONDITION                           */
+hipac_error
+hipac_replace(const char *name, const struct hipac_rule *rule)
+{
+	hipac_error error;
+	struct hipac_chain *chain;
+	struct chain_rule *del_rule, *new_rule;
+		
+	if (unlikely(!name || !rule))
+		ARG_ERR;
+	
+	if (unlikely(error = chain_hash_lookup(name, &chain)))
+		return error;
+	
+	if (unlikely(error = chain_find_rule_with_pos(chain, rule->pos, 
+						      &del_rule)))
+		return error;
+	
+	if (unlikely(error = build_chain_rule_from_hipac_rule(rule, &new_rule)))
+		return error;
+	
+	return replace(chain, del_rule, new_rule);
+}
+
+
+
+
+
+/*
+ * hipac statistic functions
+ */
+
+
+
+/* get hipac chain statistics
+   possible errors: HE_IMPOSSIBLE_CONDITION                           */
+hipac_error
+hipac_get_chain_stat(struct hipac_chain_stat *stat)
+{
+	hipac_error error;
+	struct hipac_chain *chain;
+	struct prefix_rule *prefix;
+	struct list_head *lh;
+	struct chain_rule *rule;
+	__u32 i, j, k;
+	
+	if (unlikely(!stat))
+		ARG_ERR;
+	
+	stat->mem_tight = 0;
+	stat->mem_real = 0;
+	stat->chain_num = chain_hash->elem_ct;
+	stat->rule_num = 0;
+	stat_distribution_init(stat->prefix_stat, 16);
+	stat_distribution_init(stat->incoming_stat, 16);
+	stat_distribution_init(stat->outgoing_stat, 16);
+	
+	for (i = 0; i < chain_hash->len; i++) {
+		if (chain_hash->bucket[i] == NULL) {
+			continue;
+		}
+		for (j = 0; j < chain_hash->bucket[i]->len; j++) {
+			chain = chain_hash->bucket[i]->kv[j].val;
+			if ((error = hp_size(chain, 
+					     &stat->mem_real,
+					     &stat->mem_tight)))
+				return error;
+			if ((error = hp_size(chain->next_chains, 
+					     &stat->mem_real,
+					     &stat->mem_tight)))
+				return error;
+			if ((error = hp_size(chain->paths, 
+					     &stat->mem_real,
+					     &stat->mem_tight)))
+				return error;
+			if (chain->paths){
+				for (k = 0; k < chain->paths->len; k++){
+					prefix = P_ELEM_RULE(chain->paths, k);
+					if ((error = 
+					     hp_size(prefix, 
+						     &stat->mem_real,
+						     &stat->mem_tight)))
+					       	return error;
+					if (prefix
+					    && (error = 
+						hp_size(prefix->exec_matches, 
+							&stat->mem_real,
+							&stat->mem_tight)))
+						return error;
+				}
+			}
+			if ((error = hp_size(chain->start, 
+					     &stat->mem_real,
+					     &stat->mem_tight)))
+				return error;
+			if ((error = hp_size(chain->end, 
+					     &stat->mem_real,
+					     &stat->mem_tight)))
+				return error;
+
+			if (!list_empty(&chain->head)){
+				stat->rule_num += 
+					list_entry(chain->head.prev,
+						   struct chain_rule, 
+						   head)->r.pos;
+			}   
+			
+			if (chain->paths)
+				stat_distribution_add(stat->prefix_stat, 16, 
+						      chain->paths->len);
+			else stat_distribution_add(stat->prefix_stat, 16, 0);
+			stat_distribution_add(stat->incoming_stat, 16,
+					      chain->ref_count);
+			if (chain->next_chains)
+				stat_distribution_add(stat->outgoing_stat, 16,
+						      chain->next_chains->len);
+			else stat_distribution_add(stat->outgoing_stat, 16, 0);
+			
+			list_for_each(lh, &chain->head) {
+				rule = list_entry(lh, struct chain_rule, head);
+				if ((error = hp_size(rule, 
+						     &stat->mem_real,
+						     &stat->mem_tight)))
+					return error;
+				if ((error = hp_size(rule->dtr, 
+						     &stat->mem_real,
+						     &stat->mem_tight)))
+					return error;
+			}
+		}
+	}
+	return HE_OK;
+}
+
+
+
+/* get hipac rule statistics
+   returned statistic constains all rules of those chains that are
+   reachable from the root chain represented by the 'hipac' pointer.
+   possible errors: HE_IMPOSSIBLE_CONDITION                           */
+hipac_error
+hipac_get_rule_stat(void *hipac, struct hipac_rule_stat *stat)
+{
+	struct hipac_chain *chain;
+	struct list_head *lh;
+	struct chain_rule *rule;
+	__u32 i, j, k, inv;
+	__u8 found;
+	
+	if (unlikely(!hipac || !stat))
+		ARG_ERR;
+	
+	stat->rule_num = 0;
+	stat->exec_match_num = 0;
+	stat->exec_target_num = 0;
+	stat->jump_target_num = 0;
+	stat->return_target_num = 0;
+	stat_distribution_init(stat->hipac_match_stat, 16);
+	stat_distribution_init(stat->inv_rules_stat, 16);
+	
+	for (i = 0; i < chain_hash->len; i++) {
+		if (chain_hash->bucket[i] == NULL) {
+			continue;
+		}
+		for (j = 0; j < chain_hash->bucket[i]->len; j++) {
+			chain = chain_hash->bucket[i]->kv[j].val;
+			found = 0;
+			if (chain->paths){
+				for (k = 0; k < chain->paths->len; k++){
+					if (hipac ==
+					    P_ELEM_DIMTREE(chain->paths, k)){
+						found = 1;
+						break;
+					}
+				}
+			}
+			if (!found)
+				continue;
+			if (!list_empty(&chain->head)){
+				stat->rule_num += 
+					list_entry(chain->head.prev,
+						   struct chain_rule, 
+						   head)->r.pos;
+			}   
+			
+			list_for_each(lh, &chain->head) {
+				rule = list_entry(lh, struct chain_rule, head);
+				if (rule->r.match_offset)
+					stat->exec_match_num++;
+				if (rule->r.action == TARGET_EXEC)
+					stat->exec_target_num++;
+				if (rule->r.action == TARGET_CHAIN)
+					stat->jump_target_num++;
+				if (rule->r.action == TARGET_RETURN)
+					stat->return_target_num++;
+				stat->hipac_match_stat[rule->r.native_mct]++;
+				inv = count_inv_matches(rule->r.first_match, 
+							rule->r.native_mct);
+				stat->inv_rules_stat[inv]++;
+			}
+		}
+	}
+	return HE_OK;
+}
+	
+
+
+/* get hipac user statistics
+   possible errors: HE_IMPOSSIBLE_CONDITION                           */
+hipac_error
+hipac_get_user_stat(struct hipac_user_stat *stat)
+{
+	struct hipac_chain *chain;
+	__u32 i, j;
+	
+	if (unlikely(!stat))
+		ARG_ERR;
+
+	stat->total_mem_tight = mem_current_tight;
+	stat->total_mem_real = mem_current_real;
+	stat->chain_num = chain_hash->elem_ct;
+	stat->rule_num = 0;
+	
+	for (i = 0; i < chain_hash->len; i++) {
+		if (chain_hash->bucket[i] == NULL) {
+			continue;
+		}
+		for (j = 0; j < chain_hash->bucket[i]->len; j++) {
+			chain = chain_hash->bucket[i]->kv[j].val;
+			if (!list_empty(&chain->head)){
+				stat->rule_num += 
+					list_entry(chain->head.prev,
+						   struct chain_rule, 
+						   head)->r.pos;
+			}                 
+		}
+	}
+	return HE_OK;
+}
+
+
+
+const char *
+hipac_get_error_message(void)
+{
+	return NULL;
+}
+
+
+
+#ifdef DEBUG
+hipac_error
+hipac_get_dt_rule_ptrs(const char *name, const __u32 pos, 
+		       void **res)
+{
+	hipac_error error;
+	struct hipac_chain *chain;
+	struct chain_rule *rule;
+	
+	if (unlikely(!name || !res))
+		ARG_ERR;
+	
+	if (unlikely(error = chain_hash_lookup(name, &chain)))
+		return error;
+       
+	if (list_empty(&chain->head)){
+		*res = chain->end;
+		return HE_OK;
+	}
+	rule = list_entry(chain->head.prev, struct chain_rule, head);
+	if (pos > rule->r.pos){
+		if (pos == rule->r.pos + 1){
+			*res = chain->end;
+			return HE_OK;
+		} else {
+			return HE_RULE_NOT_EXISTENT;
+		}
+	}
+
+	if (unlikely(error = chain_find_rule_with_pos(chain, pos, &rule)))
+		return error;
+
+	*res = rule->dtr;
+	return HE_OK;
+}
+
+
+
+__u8
+dt_rules_have_same_position(void *hipac, void *dt_start, void *dt_rule)
+{
+	struct dt_rule *rule = (struct dt_rule *) dt_start;
+	
+	if (!hipac || !dt_start || !dt_rule){
+		 ARG_MSG;
+		 return 0;
+	}
+	if (rule->head.prev != &((struct dimtree *) hipac)->chain->head) {
+	        if (rule->spec.pos ==
+		    list_entry(rule->head.prev, struct dt_rule, head)
+		    ->spec.pos){
+			ERR("previous rule with same position found");
+			return 0;
+		}
+	}
+	while (rule->spec.pos == ((struct dt_rule *) dt_rule)->spec.pos) {
+		if (rule == dt_rule)
+			return 1;
+		if (rule->head.next == 
+		    &((struct dimtree *) hipac)->chain->head)
+			return 0;
+		rule = list_entry(rule->head.next, struct dt_rule, head);
+	}
+	return 0;
+}
+
+
+#endif
+
+
+
+/* End of hipac_* functions */
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/net/ipv4/netfilter/nf-hipac/hipac.h linux-2.4.20-wolk4.4-fullkernel/net/ipv4/netfilter/nf-hipac/hipac.h
--- linux-2.4.20-wolk4.3-fullkernel/net/ipv4/netfilter/nf-hipac/hipac.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/net/ipv4/netfilter/nf-hipac/hipac.h	2003-07-30 11:23:31.000000000 +0200
@@ -0,0 +1,650 @@
+/*
+ * High performance packet classification API
+ *
+ * Authors: Michael Bellion and Thomas Heinz
+ * (c) 2002-2003 by the hipac core team <nf@hipac.org>:
+ *      +-----------------------+----------------------+
+ *      |   Michael Bellion     |     Thomas Heinz     |
+ *      | <mbellion@hipac.org>  |  <creatix@hipac.org> |
+ *      +-----------------------+----------------------+
+ * Licenced under the GNU General Public Licence, version >= 2.
+ */
+
+
+#ifndef _HIPAC_H
+#define _HIPAC_H
+
+#include "mode.h"
+
+/* values of bittype in specification header */
+#define BIT_U8   0
+#define BIT_U16  1
+#define BIT_U32  2
+#define BIT_RULE 3
+
+/* maximum length of a hipac chain name (including terminating '\0') */
+#define HIPAC_CHAIN_NAME_MAX_LEN 32
+
+
+
+/* representation of the match [left, right] associated with a dimension id;
+   [left, right] must not be a wildcard match */
+struct hipac_match
+{
+        unsigned dimid  : 4;
+	unsigned invert : 1;
+        __u32 left;
+        __u32 right;
+	char next_match[0];
+};
+
+struct hipac_rule
+{
+	__u32 pos;
+	__u64 packet_ct, byte_ct;
+	char  cmp_start[0];
+	__u32 size;
+	__u32 origin;
+	__u8  action;
+	__u8  native_mct;
+	__u16 match_offset;
+	__u32 target_offset;
+	struct hipac_match first_match[0];
+};
+
+struct hipac_chain_info
+{
+	char *label;
+	__u8 policy;
+	__u8 is_internal_chain;
+	__u32 rule_num;
+	__u64 packet_ct, byte_ct;
+	struct list_head *chain_head;
+};
+
+
+
+/* return values of function based match executor */
+typedef enum
+{
+	MATCH_YES,
+	MATCH_NO,
+	MATCH_HOTDROP
+} hipac_match_t;
+
+
+/* hipac_rule action value; TARGET_DUMMY is reserved for internal usage only;
+   the function based target exectutor may return TARGET_ACCEPT, TARGET_DROP
+   or TARGET_NONE */
+typedef enum
+{
+	TARGET_ACCEPT,
+	TARGET_DROP,
+	TARGET_NONE,
+	TARGET_RETURN,
+	TARGET_DUMMY,
+	TARGET_EXEC,
+	TARGET_CHAIN
+} hipac_target_t;
+
+
+/* function based match and target executor function types */
+typedef hipac_match_t (* hipac_match_exec_t) (const void *packet,
+					      void *first_match, void *end);
+typedef hipac_target_t (* hipac_target_exec_t) (const void *packet,
+						void *target);
+
+
+/* dimension extractor function type */
+typedef __u32 (* hipac_extract_t) (const void *packet);
+
+
+/* equality function type */
+typedef int (* hipac_eq_exec_t) (const struct hipac_rule *r1,
+				 const struct hipac_rule *r2);
+
+
+/* constructor/destructor function type */
+typedef void (* hipac_copy_constructor_t) (const struct hipac_rule *r_org,
+					   struct hipac_rule *r_new);
+typedef void (* hipac_destroy_exec_t) (struct hipac_rule *r);
+
+
+/* hipac error codes */
+typedef enum
+{
+	HE_OK                        =  0,
+	HE_IMPOSSIBLE_CONDITION      = -1,
+	HE_LOW_MEMORY                = -2,
+	HE_CHAIN_EXISTS              = -3,
+    	HE_CHAIN_NOT_EXISTENT        = -4,
+	HE_CHAIN_IS_EMPTY            = -5,
+	HE_CHAIN_NOT_EMPTY           = -6,
+	HE_CHAIN_IS_USERDEFINED      = -7,
+	HE_CHAIN_IS_CONNECTED        = -8,
+	HE_CHAIN_IS_REFERENCED       = -9,
+	HE_CHAIN_NOT_NATIVE          = -10,
+	HE_CHAIN_IS_NATIVE           = -11,
+	HE_RULE_NOT_EXISTENT         = -12,
+	HE_RULE_ORIGIN_MISMATCH      = -13,
+	HE_RULE_PREFIX_MISMATCH      = -14,
+	HE_LOOP_DETECTED             = -15,
+	HE_REC_LIMIT                 = -16,
+	HE_TARGET_CHAIN_NOT_EXISTENT = -17,
+	HE_TARGET_CHAIN_IS_NATIVE    = -18,
+	HE_NATIVE_CHAIN_EXISTS       = -19,
+	HE_NEXT_ERROR                = -100  // shouldn't be changed
+} hipac_error;
+
+
+
+/* return maximum key of a dimension with the given bittype */
+static inline __u32
+hipac_maxkey(__u8 bittype)
+{
+	switch (bittype) {
+	    case BIT_U8:  return 0xff;
+	    case BIT_U16: return 0xffff;
+	    default:      return 0xffffffff;
+	}
+}
+
+
+/* return failure description if available after an error occured;
+   otherwise NULL is returned                                         */
+const char *
+hipac_get_error_message(void);
+
+
+/* init hipac data structures;
+   MUST be called once at the beginning in order to let the other
+   operations work properly!
+   dimid_to_bittype: assigns dimids to bit types. 
+                     i-th element of the array contains the bit type
+		     of dimension id i
+   extract:          functions to extract certain fields from a packet. 
+                     the function at position i of the array returns
+		     the entry in a packet that corresponds to 
+		     dimension id i (i.e. the source ip of the packet)
+   len:              length of the dim2btype and extract array
+   copycon:          constructor function
+   destroy:          destructor function
+   match:            match executor function
+   target:           target executor function
+   eq:               equality function to compare rules
+   maxmem:           maximum allowed memory consumption  
+   possible errors: HE_LOW_MEMORY, HE_IMPOSSIBLE_CONDITION            */  
+hipac_error
+hipac_init(const __u8 dimid_to_bittype[], const hipac_extract_t extract[],
+	   const __u8 len, hipac_copy_constructor_t copycon,
+	   hipac_destroy_exec_t destroy, hipac_match_exec_t match,
+	   hipac_target_exec_t target, hipac_eq_exec_t eq, 
+	   const __u64 maxmem);
+
+
+/* free all hipac data structures;
+   MUST be called once in the end
+   attention: make sure there are no external accesses to hipac 
+              data structures taking place anymore!                   */
+void
+hipac_exit(void);
+
+
+/* return new hipac data structure
+   name:        name of the public chain
+   name_intern: name of the internal dimtree chain
+   policy:      initial policy
+   origin:      bitvector uniq to this data structure
+   hipac:       pointer to a pointer to the resulting hipac data
+                structure. use as first argument to hipac_match()
+   possible errors: HE_LOW_MEMORY, HE_NATIVE_CHAIN_EXISTS,
+                    HE_CHAIN_EXISTS, HE_IMPOSSIBLE_CONDITION          */
+hipac_error
+hipac_new(const char *name, const char* name_intern, const __u8 policy, 
+	  const __u32 origin, void **hipac);  
+
+
+/* set maximum amount of memory the hipac data structures are 
+   allowed to occupy. return LOW_MEMORY if 'mem' is lower than
+   currently allocated memory
+   possible errors: HE_LOW_MEMORY                                     */  
+hipac_error
+hipac_set_maxmem(const __u64 mem);
+
+
+/* get maximum amount of memory the hipac data structures are 
+   allowed to occupy.                                                 */  
+__u64
+hipac_get_maxmem(void);
+
+
+/* set policy of chain with name 'name' to 'policy'.
+   possible errors: HE_CHAIN_NOT_EXISTENT, HE_CHAIN_IS_USERDEFINED,
+                    HE_IMPOSSIBLE_CONDITION                           */
+hipac_error 
+hipac_set_policy(const char *name, const __u8 policy);
+
+
+/* get policy of chain with name 'name' and write it to 'result'.
+   possible errors: HE_CHAIN_NOT_EXISTENT, HE_CHAIN_IS_USERDEFINED,
+                    HE_IMPOSSIBLE_CONDITION                           */
+hipac_error
+hipac_get_policy(const char *name, __u8 *result);
+
+
+/* create new user-defined chain with name 'name'.
+   possible errors: HE_LOW_MEMORY, HE_CHAIN_EXISTS, 
+                    HE_IMPOSSIBLE_CONDITION                           */
+hipac_error
+hipac_new_chain(const char* name);
+
+
+/* delete all rules in chain with name 'name'.
+   if 'name' is NULL all rules in all chains are deleted
+   possible errors: HE_LOW_MEMORY, HE_CHAIN_NOT_EXISTENT,
+                    HE_IMPOSSIBLE_CONDITION                           */
+hipac_error
+hipac_flush_chain(const char *name);
+
+
+/* delete user-defined chain with name 'name'.
+   if 'name' is NULL delete all chains that are empty 
+   and not referenced from other chains.
+   possible errors: HE_CHAIN_NOT_EXISTENT, HE_CHAIN_IS_NATIVE,
+                    HE_CHAIN_NOT_EMPTY, HE_CHAIN_IS_REFERENCED        */   
+hipac_error
+hipac_delete_chain(const char *name);
+
+
+/* rename chain with name 'name' to 'new_name'.
+   possible errors: HE_LOW_MEMORY, HE_CHAIN_EXISTS, 
+                    HE_CHAIN_NOT_EXISTENT, HE_CHAIN_IS_NATIVE,
+		    HE_IMPOSSIBLE_CONDITION                           */
+hipac_error
+hipac_rename_chain(const char *name, const char *new_name);
+
+
+/* get an array of hipac_chain_info structs containing required infos
+   for a rule listing of chain with name 'name'. if 'name' is NULL
+   return infos for all chains. in order to request a rule listing with
+   valid counter fields, set 'request_counters' to 1. 'len' specifies
+   the length of the returned struct hipac_chain_info array.
+   attention: don't forget to free the struct hipac_chain_info array
+              after the rule listing via hipac_free_chain_infos()!
+   possible errors: HE_LOW_MEMORY, HE_CHAIN_NOT_EXISTENT,
+                    HE_IMPOSSIBLE_CONDITION                           */
+hipac_error
+hipac_get_chain_infos(const char *name, const __u8 request_counters,
+		      struct hipac_chain_info **inf, __u32 *len);
+
+
+/* free array of hipac_chain_info structs that has been allocated
+   before via hipac_get_chain_infos(). 
+   possible errors: HE_IMPOSSIBLE_CONDITION                           */
+hipac_error
+hipac_free_chain_infos(struct hipac_chain_info *inf);
+
+
+/* get next hipac_rule 'next' of previous hipac_rule 'prev'.
+   with this function you can walk over the chain during rule listing.
+   to get the first hipac_rule of a chain, set 'prev' to NULL.
+   when the end of the chain is reached or the chain is empty the
+   hipac_error HE_RULE_NOT_EXISTENT is returned.
+   attention: during rule listing of a chain hipac_get_next_rule() 
+              must always be called until finally HE_RULE_NOT_EXISTENT 
+	      is returned!
+   possible errors: HE_LOW_MEMORY, HE_RULE_NOT_EXISTENT,
+                    IMPOSSIBLE_CONDITION                              */
+hipac_error
+hipac_get_next_rule(const struct hipac_chain_info *inf,
+		    struct hipac_rule *prev,
+		    struct hipac_rule **next);
+
+
+/* zero counters of all rules in chain with name 'name'.
+   if 'name' is NULL zero counters of all rules in all chains.
+   possible errors: HE_CHAIN_NOT_EXISTENT, HE_IMPOSSIBLE_CONDITION    */
+hipac_error
+hipac_zero_counters(const char *name);
+
+
+/* substitute 'org' matches with 'new' matches in dimids 'dimid[2]'
+   of all rules in all chains. 'len' is the number of 'org' -> 'new' 
+   mappings and consequently the length of 'org[]' and 'new[]'.
+   attention: assumes no ranges are allowed in dimids 'dimid[2]'.
+   possible errors: HE_LOW_MEMORY, HE_IMPOSSIBLE_CONDITION            */
+hipac_error
+hipac_substitute(const __u8 dimid[2], const __u32 org[], 
+		 const __u32 new[], const __u32 len);
+
+
+/* append hipac_rule 'rule' to chain with name 'name'.
+   'rule->pos' is set to the position of the last rule
+   in the chain + 1.  
+   possible errors: HE_LOW_MEMORY, HE_CHAIN_NOT_EXISTENT, 
+                    HE_LOOP_DETECTED, HE_REC_LIMIT,
+		    HE_RULE_ORIGIN_MISMATCH, HE_RULE_PREFIX_MISMATCH,
+		    HE_TARGET_CHAIN_NOT_EXISTENT,
+		    HE_TARGET_CHAIN_IS_NATIVE, 
+		    HE_IMPOSSIBLE_CONDITION                           */
+hipac_error
+hipac_append(const char *name, const struct hipac_rule *rule);
+
+
+/* insert hipac_rule 'rule' at position 'rule->pos' into chain
+   with name 'name'.
+   possible errors: HE_LOW_MEMORY, HE_CHAIN_NOT_EXISTENT,
+                    HE_LOOP_DETECTED, HE_REC_LIMIT,
+		    HE_RULE_ORIGIN_MISMATCH, HE_RULE_PREFIX_MISMATCH,
+		    HE_TARGET_CHAIN_NOT_EXISTENT,
+		    HE_TARGET_CHAIN_IS_NATIVE, 
+		    HE_IMPOSSIBLE_CONDITION                           */
+hipac_error
+hipac_insert(const char *name, const struct hipac_rule *rule);
+
+
+/* delete hipac_rule with position 'pos' from chain with name 'name'.
+   possible errors: HE_LOW_MEMORY, HE_CHAIN_NOT_EXISTENT, 
+                    HE_RULE_NOT_EXISTENT, HE_IMPOSSIBLE_CONDITION     */
+hipac_error
+hipac_delete_pos(const char *name, const __u32 pos);
+
+
+/* find the first rule in chain with name 'name' that equals to
+   hipac_rule 'rule' and delete it.
+   possible errors: HE_LOW_MEMORY, HE_CHAIN_NOT_EXISTENT, 
+                    HE_RULE_NOT_EXISTENT, HE_IMPOSSIBLE_CONDITION     */
+hipac_error
+hipac_delete(const char *name, const struct hipac_rule *rule);
+
+
+/* replace rule with position 'rule->pos' in chain with name 'name'
+   with hipac_rule 'rule'.
+   possible errors: HE_LOW_MEMORY, HE_CHAIN_NOT_EXISTENT,
+                    HE_RULE_NOT_EXISTENT, HE_LOOP_DETECTED,
+		    HE_REC_LIMIT, HE_RULE_ORIGIN_MISMATCH,
+		    HE_RULE_PREFIX_MISMATCH,
+		    HE_TARGET_CHAIN_NOT_EXISTENT,
+		    HE_TARGET_CHAIN_IS_NATIVE, 
+		    HE_IMPOSSIBLE_CONDITION                           */
+hipac_error
+hipac_replace(const char *name, const struct hipac_rule *rule);
+
+
+/* match packet and return the terminal packet action which is either
+   TARGET_ACCEPT or TARGET_DROP; note that this is the only function
+   that may be used in parallel with other functions of the hipac API */
+hipac_target_t
+hipac_match(void *hipac, const void *packet, __u32 pkt_size);
+
+
+
+/*
+ * hipac statistics: data structures
+ */
+
+/* btree statistics
+   total_mem_tight:       current overall memory consumption in bytes
+                          in terms of how much has been requested
+   total_mem_real:        current overall memory consumption in bytes
+                          in terms of how much has actually been
+                          allocated
+   btree_mem_tight:       current memory consumption in bytes of all
+                          btrees (not including termrule blocks) in
+                          terms of how much has been requested
+   btree_mem_real:        current memory consumption in bytes of all
+                          btrees (not including termrule blocks) in
+                          terms of how much has actually been
+			  allocated
+   termrule_mem_tight:    current memory consumption in bytes of all
+                          termrule blocks in terms of how much has
+			  been requested
+   termrule_mem_real:     current memory consumption in bytes of all
+                          termrule blocks in terms of how much has
+			  actually been allocated
+   btree_num:             number of btrees
+   btree_dimid_num:       mapping with [i] containing the number of
+                          btrees in dimension i
+   btree_depth_num:       mapping with [i] containing the number of
+                          btrees in depth i
+   termrule_num:          number of termrule blocks
+   termrule_ptr_num:      number of entries in all termrule blocks
+   keys_num:              number of keys in all btrees
+   btree_dimid_keys_stat: array of distributions with [i][j]
+                          containing the number of btrees in
+			  dimension i with 2^(i - 1) <= keys < 2^i
+   termptr_num:           number of terminal pointers (of all btrees)
+   termptr_dimid_num:     mapping with [i] containing the number of
+                          terminal pointers in dimension i
+   termptr_depth_num:     mapping with [i] containing the number of
+                          terminal pointers in depth i
+   nontermptr_num:        number of non-terminal pointers (of all
+                          btrees)
+   nontermptr_dimid_num:  mapping with [i] containing the number of
+                          non-terminal pointers in dimension i
+   nontermptr_depth_num:  mapping with [i] containing the number of
+                          non-terminal pointers in depth i
+   dt_elem_num:           number of elementary interval structures
+   dt_elem_ptr_num:       number of rules in all elementary interval
+                          structures
+   dt_elem_stat:          distribution with [i] containing the number
+                          of elementary interval structures with
+			  2^(i - 1) <= rules < 2^i                    */
+struct hipac_btree_stat
+{
+	__u64 total_mem_tight;
+	__u64 total_mem_real;
+	__u64 btree_mem_tight;
+	__u64 btree_mem_real;
+	__u64 termrule_mem_tight;
+	__u64 termrule_mem_real;
+	__u32 btree_num;
+	__u32 btree_dimid_num[16];
+	__u32 btree_depth_num[16];
+	__u32 termrule_num;
+	__u32 termrule_ptr_num;
+	__u32 keys_num;
+	__u32 btree_dimid_keys_stat[16][18];
+	__u32 termptr_num;
+	__u32 termptr_dimid_num[16];
+	__u32 termptr_depth_num[16];
+	__u32 nontermptr_num;
+	__u32 nontermptr_dimid_num[16];
+	__u32 nontermptr_depth_num[16];
+	__u32 dt_elem_num;
+	__u32 dt_elem_ptr_num;
+	__u32 dt_elem_stat[16];
+};
+
+/* dimtree statistics
+   chain_mem_tight:         current memory consumption in bytes of
+                            a dimtree chain including the rules in
+                            terms of how much has been requested
+   chain_mem_real:          current memory consumption in bytes of
+                            a dimtree chain including the rules in
+                            terms of how much has actually been
+                            allocated
+   rule_num:                number of dimtree rules
+   rules_with_exec_matches: number of dimtree rules containing at
+                            least one function based match
+   rules_with_exec_target:  number of dimtree rules containing
+                            a function based target
+   rules_same_pos_stat:     distribution with [i] containing number
+                            of dimtree rule series of length
+                            >= 2^(i - 1) and < 2^i where all rules
+                            share the same position 
+   dt_match_stat:           mapping with [i] containing the number
+                            of dimtree rules having i non-wildcard
+                            matches                                   */
+struct hipac_dimtree_stat
+{
+	__u64 chain_mem_tight;
+	__u64 chain_mem_real;
+	__u32 rule_num;
+	__u32 rules_with_exec_matches;
+	__u32 rules_with_exec_target;
+	__u32 rules_same_pos_stat[16];
+	__u32 dt_match_stat[16];
+};
+
+/* hipac memory statistics
+   total_mem_tight:             current overall memory consumption in
+                                bytes in terms of how much has been
+                                requested
+   total_mem_real:              current overall memory consumption in
+                                bytes in terms of how much has
+                                actually been allocated
+   memhash_elem_num:            number of objects for which memory
+                                has been requested
+   memhash_len:                 number of buckets in the memory hash
+   memhash_smallest_bucket_len: number of objects in the smallest
+                                bucket of the memory hash
+   memhash_biggest_bucket_len:  number of objects in the biggest
+                                bucket of the memory hash
+   memhash_bucket_stat:         distribution with [i] containing the
+                                number of buckets with
+                                2^(i - 1) <= objects < 2^i            */
+struct hipac_mem_stat
+{
+	__u64 total_mem_tight;
+	__u64 total_mem_real;
+	__u32 memhash_elem_num;
+	__u32 memhash_len;
+	__u32 memhash_smallest_bucket_len;
+	__u32 memhash_biggest_bucket_len;
+	__u32 memhash_bucket_stat[16];
+	
+};
+
+
+/* hipac chain statistics
+   mem_tight:     current memory consumption in bytes of all
+                  hipac chains including the rules in terms of 
+		  how much has been requested
+   mem_real:      current memory consumption in bytes of all
+                  hipac chains including the rules in terms of
+		  how much has actually been allocated
+   chain_num:     number of chains
+   rule_num:      number of rules in all chains
+   paths_stat:    distribution with [i] containing the number of 
+                  chains with 2^(i - 1) <= paths < 2^i
+   incoming_stat: distribution with [i] containing the number of
+                  chains with 2^(i - 1) <= incoming edges < 2^i
+   outgoing_stat: distribution with [i] containing the number of
+                  chains with 2^(i - 1) <= outgoing edges < 2^i       */
+struct hipac_chain_stat
+{	
+	__u64 mem_tight;
+	__u64 mem_real;
+	__u32 chain_num;
+	__u32 rule_num;
+	__u32 prefix_stat[16];
+	__u32 incoming_stat[16];
+	__u32 outgoing_stat[16];
+};
+
+
+/* hipac rule statistics
+   rule_num:          number of rules 
+   exec_match_num:    number of rules with exec_matches
+   exec_target_num:   number of rules with exec_target
+   jump_target_num:   number of rules with jump target
+   return_target_num: number of rules with return target
+   hipac_match_stat:  mapping with [i] containing the number
+                      of rules with i hipac_matches
+   inv_rules_stat:    mapping with [i] containing the number
+                      of rules with i inversion flags                 */
+struct hipac_rule_stat
+{
+	__u32 rule_num;
+	__u32 exec_match_num;
+	__u32 exec_target_num;
+	__u32 jump_target_num;
+	__u32 return_target_num;
+	__u32 hipac_match_stat[16];
+	__u32 inv_rules_stat[16];
+};
+
+
+/* hipac user statistics
+   total_mem_tight: current memory consumption in bytes in terms 
+                    of how much has been requested
+   total_mem_real:  current memory consumption in bytes in terms
+                    of how much has actually been allocated
+   chain_num:       number of chains
+   rule_num:        number of rules in all chains                     */
+struct hipac_user_stat
+{
+	__u64 total_mem_tight;
+	__u64 total_mem_real;	
+	__u32 chain_num;
+	__u32 rule_num;
+};
+
+
+
+/*
+ * hipac statistics: functions
+ */
+
+/* get btree statistics, i.e. the statistics of the internal
+   btree representation of all rules reachable from the root chain
+   represented by the 'hipac' pointer
+   possible errors: HE_IMPOSSIBLE_CONDITION                           */
+hipac_error
+hipac_get_btree_stat(void *hipac, struct hipac_btree_stat *stat);
+
+
+/* get dimtree statistics, i.e. the statistics of the internal
+   chain representation of all rules reachable from the root chain
+   represented by the 'hipac' pointer
+   possible errors: HE_IMPOSSIBLE_CONDITION                           */
+hipac_error
+hipac_get_dimtree_stat(void *hipac, struct hipac_dimtree_stat *stat);
+
+
+/* get hipac memory statistics
+   possible errors: HE_IMPOSSIBLE_CONDITION                           */
+hipac_error
+hipac_get_mem_stat(struct hipac_mem_stat *stat);
+
+
+/* get hipac chain statistics
+   possible errors: HE_IMPOSSIBLE_CONDITION                           */
+hipac_error
+hipac_get_chain_stat(struct hipac_chain_stat *stat);
+
+
+/* get hipac rule statistics
+   returned statistics constains all rules of those chains that are
+   reachable from the root chain represented by the 'hipac' pointer
+   possible errors: HE_IMPOSSIBLE_CONDITION                           */
+hipac_error
+hipac_get_rule_stat(void *hipac, struct hipac_rule_stat *stat);
+
+
+/* get hipac user statistics
+   possible errors: HE_IMPOSSIBLE_CONDITION                           */
+hipac_error
+hipac_get_user_stat(struct hipac_user_stat *stat);
+
+
+
+#ifdef DEBUG
+/* per object debugging: selection is done by an externally defined variable
+   hipac_debug which is a bit vector of DEBUG_* */
+#  define DEBUG_HIPAC   0x01
+#  define DEBUG_DIMTREE 0x02
+#  define DEBUG_BTREE   0x04
+#  define DEBUG_IHASH   0x08
+#  define DEBUG_GLOBAL  0x10
+   extern unsigned hipac_debug;
+
+hipac_error
+hipac_get_dt_rule_ptrs(const char *name, const __u32 pos, void **res);
+
+__u8
+dt_rules_have_same_position(void *hipac, void *dt_start, void *dt_rule);
+#endif
+
+#endif
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/net/ipv4/netfilter/nf-hipac/ihash.c linux-2.4.20-wolk4.4-fullkernel/net/ipv4/netfilter/nf-hipac/ihash.c
--- linux-2.4.20-wolk4.3-fullkernel/net/ipv4/netfilter/nf-hipac/ihash.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/net/ipv4/netfilter/nf-hipac/ihash.c	2003-07-30 11:23:31.000000000 +0200
@@ -0,0 +1,456 @@
+/*
+ * High performance packet classification - incremental hash table
+ *
+ * Authors: Michael Bellion and Thomas Heinz
+ * (c) 2002-2003 by the hipac core team <nf@hipac.org>:
+ *      +-----------------------+----------------------+
+ *      |   Michael Bellion     |     Thomas Heinz     |
+ *      | <mbellion@hipac.org>  |  <creatix@hipac.org> |
+ *      +-----------------------+----------------------+
+ * Licenced under the GNU General Public Licence, version >= 2.
+ */
+
+
+#include "global.h"
+#include "ihash.h"
+
+#define MAX_BUCKETS_MINI_ALLOC    (MINI_ALLOC_MAX / PTRSIZE)
+#define INC_POSSIBLE(ihash, len)  (!(ihash)->use_mini_alloc ||     \
+				   (len) <= MAX_BUCKETS_MINI_ALLOC)
+#define BUCKET_SIZE(len)          (sizeof(struct ihash_bucket) + (len) * \
+				   sizeof(struct ihash_keyval))
+#define LEN(array)                (sizeof(array) / sizeof(*(array)))
+
+
+int
+eq_val(const void *key1, const void *key2)
+{
+	return key1 == key2;
+}
+
+__u32
+ihash_func_val(const void *key)
+{
+#ifdef BIT32_ARCH
+	/* 32 bit mix function */
+	__u32 h = (__u32) key;
+	
+	h += ~(h << 15);
+	h ^=  (h >> 10);
+	h +=  (h << 3);
+	h ^=  (h >> 6);
+	h += ~(h << 11);
+	h ^=  (h >> 16);
+#else
+	/* 64 bit mix function */
+	__u64 h = (__u64) key;
+
+	h += ~(h << 32);
+	h ^=  (h >> 22);
+	h += ~(h << 13);
+	h ^=  (h >> 8);
+	h +=  (h << 3);
+	h ^=  (h >> 15);
+	h += ~(h << 27);
+	h ^=  (h >> 31);
+#endif
+	return h;
+}
+
+int
+eq_str(const void *key1, const void *key2)
+{
+	return !strcmp(key1, key2);
+}
+
+__u32
+ihash_func_str(const void *key)
+{
+	__u32 high, h = 0;
+	const char *c = key;
+
+	if (unlikely(key == NULL)) {
+		ERR("key is NULL");
+		return 0;
+	}
+	for (; *c != '\0'; c++) {
+		/* CRC variant */
+		high = h & 0xf8000000;
+		h <<= 5;
+		h ^= high >> 27;
+		h ^= *c;
+	}
+	return h;
+}
+
+static inline __u32
+near_pow2(__u32 n)
+{
+	if (n == 0 || n > 0x80000000) {
+		return 1;
+	}
+	n--;
+	n |= n >> 1;
+	n |= n >> 2;
+	n |= n >> 4;
+	n |= n >> 8;
+	n |= n >> 16;
+	return ++n;
+}
+
+struct ihash *
+ihash_new(__u32 len, int use_mini_alloc, __u32 avrg_elem_per_bucket,
+	  ihash_func_t hash_fn, eq_t eq_fn)
+{
+	struct ihash *h;
+	struct ihash_bucket **b;
+	__u32 i;
+
+	if (unlikely(hash_fn == NULL || eq_fn == NULL)) {
+		ARG_MSG;
+		return NULL;
+	}
+	h = mini_alloc(sizeof(*h));
+	if (h == NULL) {
+		return NULL;
+	}
+	if (use_mini_alloc && len > MAX_BUCKETS_MINI_ALLOC) {
+		len = MAX_BUCKETS_MINI_ALLOC;
+	} else {
+		len = near_pow2(len);
+	}
+	b = use_mini_alloc ? mini_alloc(len * sizeof(*b)) :
+		hp_alloc(len * sizeof(*b), 1);
+	if (b == NULL) {
+		mini_free(h);
+		return NULL;
+	}
+	h->hash_fn = hash_fn;
+	h->eq_fn = eq_fn;
+	h->use_mini_alloc = use_mini_alloc;
+	h->avrg_elem_per_bucket = avrg_elem_per_bucket;
+	h->len = len;
+	h->elem_ct = 0;
+	h->bucket = b;
+	/* strictly speaking memset(b, 0, len * sizeof(*b)) would be wrong
+	   here because there are architectures where the machine
+	   representation of the NULL pointer is not 0x0 */
+	for (i = 0; i < len; i++) {
+		b[i] = NULL;
+	}
+	return h;
+}
+
+void
+ihash_free(struct ihash *h)
+{
+	__u32 i;
+
+	if (unlikely(h == NULL)) {
+		ARG_MSG;
+		return;
+	}
+	for (i = 0; i < h->len; i++) {
+		if (h->bucket[i] != NULL) {
+			mini_free(h->bucket[i]);
+		}
+	}
+	if (h->use_mini_alloc) {
+		mini_free(h->bucket);
+	} else {
+		hp_free(h->bucket);
+	}
+	mini_free(h);
+}
+
+/* return values:  0 : ok
+                  -1 : low memory
+                  -2 : bucket cannot be enlarged further */
+static inline int
+insert(struct ihash *h, void *key, void *val)
+{
+	struct ihash_bucket *b;
+	__u32 i;
+
+	i = HASH(h->hash_fn, key, h->len);
+	if (h->bucket[i] == NULL) {
+		/* first element in bucket */
+		b = mini_alloc(BUCKET_SIZE(1));
+		if (b == NULL) {
+			return -1;
+		}
+		b->len = 1;
+		b->kv[0].key = key;
+		b->kv[0].val = val;
+		h->elem_ct++;
+		h->bucket[i] = b;
+		return 0;
+	}
+	if (unlikely(BUCKET_SIZE(h->bucket[i]->len + 1) > MINI_ALLOC_MAX)) {
+		/* bucket cannot be enlarged further */
+		return -2;
+	}
+	if (unlikely(near_pow2(BUCKET_SIZE(h->bucket[i]->len)) !=
+		     near_pow2(BUCKET_SIZE(h->bucket[i]->len + 1)))) {
+		/* bucket must be enlarged */
+		b = mini_alloc(BUCKET_SIZE(h->bucket[i]->len + 1));
+		if (b == NULL) {
+			return -1;
+		}
+		b->len = h->bucket[i]->len + 1;
+		b->kv[0].key = key;
+		b->kv[0].val = val;
+		memcpy(&b->kv[1], &h->bucket[i]->kv[0],
+		       h->bucket[i]->len * sizeof(*b->kv));
+		h->elem_ct++;
+		mini_free(h->bucket[i]);
+		h->bucket[i] = b;
+		return 0;
+	}
+
+	h->bucket[i]->kv[h->bucket[i]->len].key = key;
+	h->bucket[i]->kv[h->bucket[i]->len].val = val;
+	h->bucket[i]->len++;
+	h->elem_ct++;
+	return 0;
+}
+
+/* return values like insert */
+static inline int
+rehash(struct ihash *h_old, struct ihash *h_new)
+{
+	__u32 i, j;
+	int stat;
+
+	for (i = 0; i < h_old->len; i++) {
+		if (h_old->bucket[i] == NULL) {
+			continue;
+		}
+		for (j = 0; j < h_old->bucket[i]->len; j++) {
+			stat = insert(
+				h_new, h_old->bucket[i]->kv[j].key,
+				h_old->bucket[i]->kv[j].val);
+			if (stat < 0) {
+				return stat;
+			}
+		}
+	}
+	return 0;
+}
+
+hipac_error
+ihash_insert(struct ihash **h, void *key, void *val)
+{
+	int shift = 1;
+	int do_inc = 0;
+	int stat;
+	__u32 len;
+	
+	if (unlikely(h == NULL || *h == NULL || key == NULL)) {
+		ARG_ERR;
+	}
+	len = (*h)->len;
+	while (1) {
+		if (unlikely((do_inc || (*h)->elem_ct >=
+			      len * (*h)->avrg_elem_per_bucket) &&
+			     INC_POSSIBLE(*h, len << shift))) {
+			/* increase hash table */
+			struct ihash *new;
+			
+			new = ihash_new(len << shift, (*h)->use_mini_alloc,
+					(*h)->avrg_elem_per_bucket,
+					(*h)->hash_fn, (*h)->eq_fn);
+			if (new == NULL) {
+				return HE_LOW_MEMORY;
+			}
+			stat = rehash(*h, new);
+			if (stat < 0) {
+				ihash_free(new);
+				if (stat == -2 &&
+				    INC_POSSIBLE(*h, len << ++shift)) {
+					WARN("ihash bucket full after rehash "
+					     "-> try again with more buckets");
+					continue;
+				}
+				return HE_LOW_MEMORY;
+			}
+			ihash_free(*h);
+			*h = new;
+			do_inc = 0;
+		}
+		stat = insert(*h, key, val);
+		if (stat < 0) {
+			if (stat == -2 &&
+			    (((*h)->elem_ct <
+			      len * (*h)->avrg_elem_per_bucket &&
+			      INC_POSSIBLE(*h, len << shift)) ||
+			     INC_POSSIBLE(*h, len << ++shift))) {
+				WARN("ihash bucket full after rehash -> try "
+				     "again with more buckets");
+				do_inc = 1;
+				continue;
+			}
+			return HE_LOW_MEMORY;
+		}
+		return HE_OK;
+	}
+}
+
+static inline void
+delete(struct ihash *h, int i, int j, void **val)
+{
+	struct ihash_bucket *b;
+	
+	if (unlikely(near_pow2(BUCKET_SIZE(h->bucket[i]->len)) !=
+		     near_pow2(BUCKET_SIZE(h->bucket[i]->len - 1)))) {
+		/* shrink bucket */
+		b = mini_alloc(BUCKET_SIZE(h->bucket[i]->len - 1));
+		if (b != NULL) {
+			b->len = h->bucket[i]->len - 1;
+			if (j > 0) {
+				memcpy(b->kv, h->bucket[i]->kv,
+				       j * sizeof(*b->kv));
+			}
+			if (h->bucket[i]->len > j + 1) {
+				memcpy(&b->kv[j], &h->bucket[i]->kv[j+1],
+				       (h->bucket[i]->len - j - 1) *
+				       sizeof(*b->kv));
+			}
+			if (val != NULL) {
+				*val = h->bucket[i]->kv[j].val;
+			}
+			mini_free(h->bucket[i]);
+			h->bucket[i] = b;
+			h->elem_ct--;
+			return;
+		} else {
+			WARN("unable to shrink ihash bucket");
+		}
+	}
+	
+ 	if (val != NULL) {
+		*val = h->bucket[i]->kv[j].val;
+	}
+	if (h->bucket[i]->len > j + 1) {
+		memmove(&h->bucket[i]->kv[j], &h->bucket[i]->kv[j + 1],
+			(h->bucket[i]->len - j - 1) * sizeof(*b->kv));
+	}
+	h->bucket[i]->len--;
+	h->elem_ct--;
+}
+
+hipac_error
+ihash_delete(struct ihash *h, const void *key, void **val)
+{
+	int i, j;
+
+	if (unlikely(h == NULL || key == NULL)) {
+		ARG_ERR;
+	}
+	i = HASH(h->hash_fn, key, h->len);
+	if (unlikely(h->bucket[i] == NULL)) {
+		goto not_contained;
+	}
+	for (j = h->bucket[i]->len - 1; j >= 0; j--) {
+		if (h->eq_fn(h->bucket[i]->kv[j].key, key)) {
+			delete(h, i, j, val);
+			return HE_OK;
+		}
+	}
+	
+ not_contained:
+	IMPOSSIBLE_CONDITION("key not contained in ihash");
+}
+
+hipac_error
+ihash_replace(struct ihash **h, const void *oldkey, void **oldval,
+	      void *newkey, void *newval)
+{
+	int i, j, stat;
+	
+	if (unlikely(h == NULL || *h == NULL || oldkey == NULL ||
+		     newkey == NULL)) {
+		ARG_ERR;
+	}
+	i = HASH((*h)->hash_fn, oldkey, (*h)->len);
+	if (unlikely((*h)->bucket[i] == NULL)) {
+		goto not_contained;
+	}
+	if (i != HASH((*h)->hash_fn, newkey, (*h)->len)) {
+		stat = ihash_insert(h, newkey, newval);
+		if (unlikely(stat < 0)) {
+			if (stat != HE_LOW_MEMORY) {
+				IMPOSSIBLE_CONDITION("ihash insert failed for"
+						     " another reason than "
+						     "low memory");
+			}
+			return stat;
+		}
+		/* a rehash might have occured so i must be recomputed */
+		i = HASH((*h)->hash_fn, oldkey, (*h)->len);
+		for (j = (*h)->bucket[i]->len - 1; j >= 0; j--) {
+			if ((*h)->eq_fn((*h)->bucket[i]->kv[j].key, oldkey)) {
+				delete(*h, i, j, oldval);
+				return HE_OK;
+			}
+		}
+		/* oldkey is not contained in h */
+		i = HASH((*h)->hash_fn, newkey, (*h)->len);
+		for (j = (*h)->bucket[i]->len - 1; j >= 0; j--) {
+			if ((*h)->eq_fn((*h)->bucket[i]->kv[j].key, newkey)) {
+				delete(*h, i, j, NULL);
+				goto not_contained;
+			}
+		}
+		IMPOSSIBLE_CONDITION("newkey not contained in ihash although "
+				     "it has been inserted");
+	}
+	for (j = (*h)->bucket[i]->len - 1; j >= 0; j--) {
+		if ((*h)->eq_fn((*h)->bucket[i]->kv[j].key, oldkey)) {
+			if (oldval != NULL) {
+				*oldval = (*h)->bucket[i]->kv[j].val;
+			}
+			(*h)->bucket[i]->kv[j].key = newkey;
+			(*h)->bucket[i]->kv[j].val = newval;
+			return HE_OK;
+		}
+	}
+
+ not_contained:
+	IMPOSSIBLE_CONDITION("oldkey not contained in ihash");
+}
+
+hipac_error
+ihash_stat(struct ihash *h, struct ihash_stat *stat)
+{
+	__u32 i;
+
+	if (unlikely(h == NULL || stat == NULL)) {
+		ARG_ERR;
+	}
+
+	stat->elem_ct = h->elem_ct;
+	stat->bucket_len = h->len;
+	stat->small_bucket_len = 0xffffffff;
+	stat->big_bucket_len = 0;
+	stat_distribution_init(stat->bucket_dist, LEN(stat->bucket_dist));
+
+	for (i = 0; i < h->len; i++) {
+		if (h->bucket[i] == NULL) {
+			stat->small_bucket_len = 0;
+			stat_distribution_add(stat->bucket_dist,
+					      LEN(stat->bucket_dist), 0);
+			continue;
+		}
+		if (h->bucket[i]->len < stat->small_bucket_len) {
+			stat->small_bucket_len = h->bucket[i]->len;
+		}
+		if (h->bucket[i]->len > stat->big_bucket_len) {
+			stat->big_bucket_len = h->bucket[i]->len;
+		}
+		stat_distribution_add(stat->bucket_dist,
+				      LEN(stat->bucket_dist),
+				      h->bucket[i]->len);
+	}
+	return HE_OK;
+}
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/net/ipv4/netfilter/nf-hipac/ihash.h linux-2.4.20-wolk4.4-fullkernel/net/ipv4/netfilter/nf-hipac/ihash.h
--- linux-2.4.20-wolk4.3-fullkernel/net/ipv4/netfilter/nf-hipac/ihash.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/net/ipv4/netfilter/nf-hipac/ihash.h	2003-07-30 11:23:31.000000000 +0200
@@ -0,0 +1,284 @@
+/*
+ * High performance packet classification - incremental hash table
+ *
+ * Authors: Michael Bellion and Thomas Heinz
+ * (c) 2002-2003 by the hipac core team <nf@hipac.org>:
+ *      +-----------------------+----------------------+
+ *      |   Michael Bellion     |     Thomas Heinz     |
+ *      | <mbellion@hipac.org>  |  <creatix@hipac.org> |
+ *      +-----------------------+----------------------+
+ * Licenced under the GNU General Public Licence, version >= 2.
+ */
+
+
+#ifndef _IHASH_H
+#define _IHASH_H
+
+#include "mode.h"
+#include "global.h"  // hipac_error and error message macros
+
+#define HASH(fn, key, len) (fn(key) & ((len) - 1))
+
+typedef __u32 (*ihash_func_t) (const void *key);
+typedef int (*eq_t) (const void *key1, const void *key2);
+
+struct ihash_keyval
+{
+	void *key, *val;
+};
+
+struct ihash_bucket
+{
+	__u32 len;
+	struct ihash_keyval kv[0];
+};
+
+struct ihash
+{
+	ihash_func_t hash_fn;
+	eq_t eq_fn;
+	int use_mini_alloc;
+	__u32 len, elem_ct, avrg_elem_per_bucket;
+	struct ihash_bucket **bucket;
+};
+
+struct ihash_stat
+{
+	__u32 elem_ct;
+	__u32 bucket_len, small_bucket_len, big_bucket_len;
+	/* bucket_dist[i] (0 <= i <= 14) contains the number of buckets
+	   with <= 2^i - 1 (and >= 2^(i-1) if i > 0) elements; 
+	   bucket_dist[15] contains the number of buckets with >= 2^14
+	   elements */
+	__u32 bucket_dist[16];
+};
+
+
+/* equality and hash function for strings as keys */
+int
+eq_str(const void *key1, const void *key2);
+
+__u32
+ihash_func_str(const void *key);
+
+
+/* equality and hash function for values as keys */
+int
+eq_val(const void *key1, const void *key2);
+
+__u32
+ihash_func_val(const void *key);
+
+/* if the value of the (key, val) pair is not a pointer but a value ptr_to_val
+   and val_to_ptr serve as a conversion functions */
+static inline __u64
+ptr_to_val(const void *p)
+{
+#ifdef BIT32_ARCH
+	return (__u32) p;
+#else
+	return (__u64) p;
+#endif
+}
+
+static inline void *
+val_to_ptr(__u64 v)
+{
+#ifdef BIT32_ARCH
+	return (void *) (__u32) v;
+#else
+	return (void *) v;
+#endif
+}
+
+
+/* create new hash table with len' buckets whereby len' is the nearest power
+   of two >= len; if use_mini_alloc is not 0 then mini_alloc is used to
+   allcate the bucket pointer array, otherwise hp_alloc is used;
+   avrg_elem_per_bucket indicates how many elements per bucket are allowed
+   at maximum assuming that they are equally distributed; in the case
+   use_mini_alloc is not 0 and the bucket pointer array cannot be further
+   enlarged the average number of elements per bucket may be larger */
+struct ihash *
+ihash_new(__u32 len, int use_mini_alloc, __u32 avrg_elem_per_bucket,
+	  ihash_func_t hash_fn, eq_t eq_fn);
+
+void
+ihash_free(struct ihash *h);
+
+/* key must not be contained in h (this is not checked);
+   possible errors: HE_LOW_MEMORY, HE_IMPOSSIBLE_CONDITION */
+hipac_error
+ihash_insert(struct ihash **h, void *key, void *val);
+
+/* delete key and the corresponding value v from h; v stored in *val if val
+   is not NULL; key must be contained in h;
+   possible errors: HE_IMPOSSIBLE_CONDITION */
+hipac_error
+ihash_delete(struct ihash *h, const void *key, void **val);
+
+/* replace oldkey and the corresponding value v by newkey and newval; v is
+   stored in *oldval if oldval is not NULL; oldkey must be contained in h;
+   possible errors: HE_LOW_MEMORY, HE_IMPOSSIBLE_CONDITION */
+hipac_error
+ihash_replace(struct ihash **h, const void *oldkey, void **oldval,
+	      void *newkey, void *newval);
+
+/* compute statistical info about h;
+   possible errors: HE_IMPOSSIBLE_CONDITION */
+hipac_error
+ihash_stat(struct ihash *h, struct ihash_stat *stat);
+
+/* generic lookup function */
+static inline void *
+ihash_lookup(const struct ihash *h, const void *key)
+{
+	__u32 i;
+	struct ihash_keyval *kv, *end;
+
+	if (unlikely(h == NULL || key == NULL)) {
+		ARG_MSG;
+		return NULL;
+	}
+	i = HASH(h->hash_fn, key, h->len);
+	if (h->bucket[i] == NULL) {
+		return NULL;
+	}
+	end = h->bucket[i]->kv + h->bucket[i]->len;
+	for (kv = h->bucket[i]->kv; kv < end; kv++) {
+		if (h->eq_fn(kv->key, key)) {
+			return kv->val;
+		}
+	}
+	return NULL;
+}
+
+/* optimized lookup function if keys are values */
+static inline void *
+ihash_lookup_val(const struct ihash *h, const void *key)
+{
+	__u32 i;
+	struct ihash_keyval *kv, *end;
+
+	if (unlikely(h == NULL || key == NULL)) {
+		ARG_MSG;
+		return NULL;
+	}
+	i = HASH(ihash_func_val, key, h->len);
+	if (h->bucket[i] == NULL) {
+		return NULL;
+	}
+	end = h->bucket[i]->kv + h->bucket[i]->len;
+	for (kv = h->bucket[i]->kv; kv < end; kv++) {
+		if (kv->key == key) {
+			return kv->val;
+		}
+	}
+	return NULL;
+}
+
+/* optimized lookup function if keys are strings */
+static inline void *
+ihash_lookup_str(const struct ihash *h, const void *key)
+{
+	__u32 i;
+	struct ihash_keyval *kv, *end;
+
+	if (unlikely(h == NULL || key == NULL)) {
+		ARG_MSG;
+		return NULL;
+	}
+	i = HASH(ihash_func_str, key, h->len);
+	if (i < 0 || i >= h->len || h->bucket[i] == NULL) {
+		return NULL;
+	}
+	end = h->bucket[i]->kv + h->bucket[i]->len;
+	for (kv = h->bucket[i]->kv; kv < end; kv++) {
+		if (!strcmp(kv->key, key)) {
+			return kv->val;
+		}
+	}
+	return NULL;
+}
+
+/* call fn(key) for all keys of h */
+#define IHASH_KEY_ITERATE(h, cast, fn, args...)                           \
+do {                                                                      \
+	__u32 i, j;                                                       \
+                                                                          \
+	if (unlikely((h) == NULL)) {                                      \
+		ARG_MSG;                                                  \
+		break;                                                    \
+	}                                                                 \
+	for (i = 0; i < (h)->len; i++) {                                  \
+                if ((h)->bucket[i] == NULL) {                             \
+                        continue;                                         \
+                }                                                         \
+		for (j = 0; j < (h)->bucket[i]->len; j++) {               \
+			(fn)((cast) (h)->bucket[i]->kv[j].key , ## args); \
+		}                                                         \
+	}                                                                 \
+} while (0)
+
+/* call fn(val) for all values of h */
+#define IHASH_VAL_ITERATE(h, cast, fn, args...)                           \
+do {                                                                      \
+	__u32 i, j;                                                       \
+                                                                          \
+	if (unlikely((h) == NULL)) {                                      \
+		ARG_MSG;                                                  \
+		break;                                                    \
+	}                                                                 \
+	for (i = 0; i < (h)->len; i++) {                                  \
+                if ((h)->bucket[i] == NULL) {                             \
+                        continue;                                         \
+                }                                                         \
+		for (j = 0; j < (h)->bucket[i]->len; j++) {               \
+			(fn)((cast) (h)->bucket[i]->kv[j].val , ## args); \
+		}                                                         \
+	}                                                                 \
+} while (0)
+
+/* use the following macros to iterate over all (key, val) pairs in hash:
+   IHASH_FOR_EACH(hash, key, val) {
+           // do something with key, val
+           IHASH_FOR_EACH_END;
+   }
+   IHASH_FOR_EACH_KEY and IHASH_FOR_EACH_VAL are used similarly */
+#define IHASH_FOR_EACH(h, hkey, hval)                                     \
+{                                                                         \
+	__u32 _ihash_i, _ihash_j;                                         \
+	for (_ihash_i = 0; _ihash_i < (h)->len; _ihash_i++) {             \
+		if ((h)->bucket[_ihash_i] == NULL) {                      \
+			continue;                                         \
+		}                                                         \
+		for (_ihash_j = 0; _ihash_j < (h)->bucket[_ihash_i]->len; \
+		     _ihash_j++) {                                        \
+			(hkey) = (h)->bucket[_ihash_i]->kv[_ihash_j].key; \
+			(hval) = (h)->bucket[_ihash_i]->kv[_ihash_j].val;
+
+#define IHASH_FOR_EACH_KEY(h, hkey)                                       \
+{                                                                         \
+	__u32 _ihash_i, _ihash_j;                                         \
+	for (_ihash_i = 0; _ihash_i < (h)->len; _ihash_i++) {             \
+		if ((h)->bucket[_ihash_i] == NULL) {                      \
+			continue;                                         \
+		}                                                         \
+		for (_ihash_j = 0; _ihash_j < (h)->bucket[_ihash_i]->len; \
+		     _ihash_j++) {                                        \
+			(hkey) = (h)->bucket[_ihash_i]->kv[_ihash_j].key;
+
+#define IHASH_FOR_EACH_VAL(h, hval)                                       \
+{                                                                         \
+	__u32 _ihash_i, _ihash_j;                                         \
+	for (_ihash_i = 0; _ihash_i < (h)->len; _ihash_i++) {             \
+		if ((h)->bucket[_ihash_i] == NULL) {                      \
+			continue;                                         \
+		}                                                         \
+		for (_ihash_j = 0; _ihash_j < (h)->bucket[_ihash_i]->len; \
+		     _ihash_j++) {                                        \
+			(hval) = (h)->bucket[_ihash_i]->kv[_ihash_j].val;
+
+#define IHASH_FOR_EACH_END }}} do {} while (0)
+
+#endif
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/net/ipv4/netfilter/nf-hipac/mode.h linux-2.4.20-wolk4.4-fullkernel/net/ipv4/netfilter/nf-hipac/mode.h
--- linux-2.4.20-wolk4.3-fullkernel/net/ipv4/netfilter/nf-hipac/mode.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/net/ipv4/netfilter/nf-hipac/mode.h	2003-07-30 11:23:31.000000000 +0200
@@ -0,0 +1,249 @@
+/*
+ * High performance packet classification - user/kernel mode compatibility
+ *
+ * Authors: Michael Bellion and Thomas Heinz
+ * (c) 2002-2003 by the hipac core team <nf@hipac.org>:
+ *      +-----------------------+----------------------+
+ *      |   Michael Bellion     |     Thomas Heinz     |
+ *      | <mbellion@hipac.org>  |  <creatix@hipac.org> |
+ *      +-----------------------+----------------------+
+ * Licenced under the GNU General Public Licence, version >= 2.
+ */
+
+
+#ifndef _MODE_H
+#define _MODE_H
+
+#include <linux/stddef.h> // offsetof
+#include <asm/page.h>
+
+/* maximal number of bytes allocatable by mini_alloc */
+#define MINI_ALLOC_MAX 131072
+
+
+
+/*
+ * NEVER use big_alloc and big_free. Use hp_alloc and hp_free instead.
+ * The only exceptions to this rule is the implementation of hp_alloc,
+ * hp_realloc and hp_free.
+ *
+ * mini_alloc and mini_free can be used for small (<= MINI_ALLOC_MAX bytes)
+ * data structures if one wants to avoid the overhead of hp_alloc and hp_free
+ */
+
+static inline unsigned
+mini_alloc_size(unsigned size)
+{
+	if (size > 0 && size <= MINI_ALLOC_MAX) {
+		/* round size up to the closest power of 2 */
+		size--;
+		size |= size >> 1;
+		size |= size >> 2;
+		size |= size >> 4;
+		size |= size >> 8;
+		size |= size >> 16;
+		size++;
+#if PAGE_SIZE == 4096
+		return size <= 32 ? 32 : size;
+#else
+		return size <= 64 ? 64 : size;
+#endif
+	}
+	return 0;
+}
+
+static inline unsigned
+big_alloc_size(unsigned size)
+{
+	return size == 0 ? 0 : (((size - 1) + PAGE_SIZE) & ~(PAGE_SIZE - 1));
+}
+
+
+#ifdef __KERNEL__
+/*
+ * Kernel space
+ */
+#include <linux/config.h>
+#include <linux/slab.h>
+#include <linux/interrupt.h>
+#include <linux/kernel.h>   // ULONG_MAX
+#include <linux/compiler.h> // likely, unlikely
+#include <linux/smp.h>      // smp_num_cpus, cpu_number_map, smp_processor_id
+#include <linux/brlock.h>   // BR_HIPAC_LOCK, br_lock
+#include <linux/spinlock.h> // spin_lock
+#include <linux/cache.h>    // __cacheline_aligned
+#include <linux/highmem.h>
+#include <linux/vmalloc.h>
+#include <linux/types.h>
+#include <linux/list.h>
+
+#define assert(as)           do {} while (0)
+#define printf(str, args...) printk(str , ## args)
+#define CURRENT_CPU          (cpu_number_map(smp_processor_id()))
+#define SMP_CACHE_ALIGN(x)   ((((x) - 1) + SMP_CACHE_BYTES) & \
+			      ~(SMP_CACHE_BYTES - 1))
+
+/* with the linux pre-emptible patch applied we don't have to care about
+   scheduling issues */
+#ifdef CONFIG_PREEMPT
+#  define SCHEDULE do {} while (0)
+#else
+#  define SCHEDULE schedule()
+#endif
+
+/* for small amounts of memory only (up to 128 KB) */
+static inline void *
+mini_alloc(unsigned size)
+{
+	if (size > 0 && size <= MINI_ALLOC_MAX) {
+		return kmalloc(size, GFP_KERNEL);
+	}
+	return NULL;
+}
+
+static inline void
+mini_free(void *p)
+{
+	kfree(p);
+}
+
+/* memory is allocated in amounts of multiples of PAGE_SIZE */
+static inline void *
+big_alloc(unsigned size)
+{
+	return vmalloc(size);
+}
+
+static inline void
+big_free(void *p)
+{
+	vfree(p);
+}
+
+/* dirty hack to make stuff work with uml (otherwise high_physmem and end_vm
+   are not defined) */
+#ifdef  CONFIG_UML_NET
+#  undef  TOP
+#  ifdef  CONFIG_HOST_2G_2G
+#    define TOP 0x80000000
+#  else
+#    define TOP 0xc0000000
+#  endif
+#  undef  SIZE
+#  define SIZE  ((CONFIG_NEST_LEVEL + CONFIG_KERNEL_HALF_GIGS) * 0x20000000)
+#  undef  START
+#  define START (TOP - SIZE)
+#  undef  VMALLOC_OFFSET
+#  define VMALLOC_OFFSET (8 * 1024 * 1024)
+#  undef  VMALLOC_START
+#  define VMALLOC_START (((unsigned long) (START + 32 * 1024 * 1024) + \
+ 	VMALLOC_OFFSET) & ~(VMALLOC_OFFSET - 1))
+static unsigned long high_physmem = START + 32 * 1024 * 1024;
+static unsigned long end_vm       = VMALLOC_START + 32 * 1024 * 1024;
+#endif  /* CONFIG_UML_NET */
+
+
+
+
+#else /* __KERNEL__ */
+/*
+ * User space
+ */
+#include <features.h>
+#if defined(__GLIBC__) && __GLIBC__ == 2
+#  include <asm/types.h>
+#else /* libc5 */
+#  include <linux/types.h>
+#endif
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <limits.h>  // ULONG_MAX
+#include <assert.h>
+#ifndef WITH_MPATROL
+#  include <malloc.h>
+#endif
+#ifdef INCLUDE_LIST_H
+#  include "list.h"
+#endif
+
+/* no assertions if not debugging */
+#ifndef DEBUG
+#  undef  assert
+#  define assert(as) do {} while (0)
+#endif
+
+/* single processor in user space */
+#define smp_num_cpus        1
+#define CURRENT_CPU         0
+
+/* locking unnecessary in user space */
+typedef struct {} spinlock_t;
+#define spin_lock_init(x)     do {} while (0)
+#define spin_lock(x)          do {} while (0)
+#define spin_unlock(x)        do {} while (0)
+#define spin_lock_bh(x)       do {} while (0)
+#define spin_unlock_bh(x)     do {} while (0)
+#define BR_HIPAC_LOCK         0
+#define br_read_lock(x)       do {} while (0)
+#define br_read_unlock(x)     do {} while (0)
+#define br_write_lock_bh(x)   do {} while (0)
+#define br_write_unlock_bh(x) do {} while (0)
+
+/* not needed in user space */
+#undef  __cacheline_aligned
+#define __cacheline_aligned
+#undef  SMP_CACHE_ALIGN
+#define SMP_CACHE_ALIGN(x)    (x)
+
+/* printk compatibility */
+#define KERN_EMERG    "KERN_EMERG: "
+#define KERN_ALERT    "KERN_ALERT: "
+#define KERN_CRIT     "KERN_CRIT: "
+#define KERN_ERR      "KERN_ERR: "
+#define KERN_WARNING  "KERN_WARNING: "
+#define KERN_NOTICE   "KERN_NOTICE: "
+#define KERN_INFO     "KERN_INFO: "
+#define KERN_DEBUG    "KERN_DEBUG: "
+#define printk(str, args...) printf(str , ## args)
+
+/* scheduling unnecessary in user space */
+#define SCHEDULE do {} while (0)
+
+/* macro to annotate likely branch directions which results in the
+   blocks being reordered appropriately */
+#if __GNUC__ == 2 && __GNUC_MINOR__ < 96
+#  define __builtin_expect(x, expected_value) (x)
+#endif
+#define likely(x)   __builtin_expect((x), 1)
+#define unlikely(x) __builtin_expect((x), 0)
+
+/* for small amounts of memory only (up to 128 KB) */
+static inline void *
+mini_alloc(unsigned size)
+{
+	return malloc(mini_alloc_size(size));
+}
+
+static inline void
+mini_free(void *p)
+{
+	free(p);
+}
+
+/* memory is allocated in amounts of multiples of PAGE_SIZE */
+static inline void *
+big_alloc(unsigned size)
+{
+	return malloc(big_alloc_size(size));
+}
+
+static inline void
+big_free(void *p)
+{
+	free(p);
+}
+
+#endif /* __KERNEL__ */
+
+#endif
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/net/ipv4/netfilter/nf-hipac/nf_hipac_cthelp.c linux-2.4.20-wolk4.4-fullkernel/net/ipv4/netfilter/nf-hipac/nf_hipac_cthelp.c
--- linux-2.4.20-wolk4.3-fullkernel/net/ipv4/netfilter/nf-hipac/nf_hipac_cthelp.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/net/ipv4/netfilter/nf-hipac/nf_hipac_cthelp.c	2003-07-30 11:23:31.000000000 +0200
@@ -0,0 +1,48 @@
+/*
+ * Connection tracking dependency helper module
+ *
+ * Authors: Michael Bellion and Thomas Heinz
+ * (c) 2002-2003 by the hipac core team <nf@hipac.org>:
+ *      +-----------------------+----------------------+
+ *      |   Michael Bellion     |     Thomas Heinz     |
+ *      | <mbellion@hipac.org>  |  <creatix@hipac.org> |
+ *      +-----------------------+----------------------+
+ * Licenced under the GNU General Public Licence, version >= 2.
+ */
+
+
+#include <linux/module.h>
+#include <linux/version.h>
+#include <linux/types.h>
+#include <linux/sched.h>
+#include <linux/netfilter_ipv4/ip_conntrack.h>
+#include "nfhp_mod.h"
+
+static int
+__init init(void)
+{
+	if (nfhp_register_cthelp(THIS_MODULE)) {
+		return -EINVAL;
+	}
+	if (ip_conntrack_module != NULL) {
+		__MOD_INC_USE_COUNT(ip_conntrack_module);
+	}
+	return 0;
+}
+
+static void
+__exit fini(void)
+{
+	nfhp_unregister_cthelp(THIS_MODULE);
+	if (ip_conntrack_module != NULL) {
+		__MOD_DEC_USE_COUNT(ip_conntrack_module);
+	}
+}
+
+module_init(init);
+module_exit(fini);
+MODULE_AUTHOR("Michael Bellion and Thomas Heinz");
+MODULE_DESCRIPTION("NF-HIPAC - connection tracking dependency helper module");
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 10)
+MODULE_LICENSE("GPL");
+#endif
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/net/ipv4/netfilter/nf-hipac/nfhp_com.h linux-2.4.20-wolk4.4-fullkernel/net/ipv4/netfilter/nf-hipac/nfhp_com.h
--- linux-2.4.20-wolk4.3-fullkernel/net/ipv4/netfilter/nf-hipac/nfhp_com.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/net/ipv4/netfilter/nf-hipac/nfhp_com.h	2003-07-30 11:23:31.000000000 +0200
@@ -0,0 +1,334 @@
+/*
+ * Kernel-user netlink communication data structures
+ *
+ * Authors: Michael Bellion and Thomas Heinz
+ * (c) 2002-2003 by the hipac core team <nf@hipac.org>:
+ *      +-----------------------+----------------------+
+ *      |   Michael Bellion     |     Thomas Heinz     |
+ *      | <mbellion@hipac.org>  |  <creatix@hipac.org> |
+ *      +-----------------------+----------------------+
+ * Licenced under the GNU General Public Licence, version >= 2.
+ */
+
+
+#ifndef _NFHP_COM_H
+#define _NFHP_COM_H
+
+#ifdef __KERNEL__
+#  include <linux/if.h>
+#  include <linux/in.h>
+#  include <linux/types.h>
+#endif
+#include <linux/netfilter_ipv4/ip_tables.h>
+#include <linux/netlink.h>
+#include "hipac.h"
+
+
+/* the next line will hopefully make its way to netlink.h */
+#define NETLINK_NFHIPAC	    7
+#define NLHP_PROTO          NETLINK_NFHIPAC
+#define NLHP_TYPE           0xFADE
+
+/* dimension id's */
+#define DIMID_SRC_IP     0
+#define DIMID_DEST_IP    1
+#define DIMID_INIFACE    2
+#define DIMID_OUTIFACE   3
+#define DIMID_PROTO      4
+#define DIMID_FRAGMENT   5
+#define DIMID_TCP_DPORT  6
+#define DIMID_TCP_SPORT  7
+#define DIMID_TCP_FLAGS  8
+#define DIMID_UDP_DPORT  9
+#define DIMID_UDP_SPORT 10
+#define DIMID_ICMP_TYPE 11
+#define DIMID_STATE     12
+#define DIMID_TTL       13
+#define NUMBER_OF_DIM   14
+
+/* bit types */
+#define BIT_SRC_IP    BIT_U32
+#define BIT_DEST_IP   BIT_U32
+#define BIT_INIFACE   BIT_U16
+#define BIT_OUTIFACE  BIT_U16
+#define BIT_PROTO     BIT_U8
+#define BIT_FRAGMENT  BIT_U8
+#define BIT_TCP_DPORT BIT_U16
+#define BIT_TCP_SPORT BIT_U16
+#define BIT_TCP_FLAGS BIT_U8
+#define BIT_UDP_DPORT BIT_U16
+#define BIT_UDP_SPORT BIT_U16
+#define BIT_ICMP_TYPE BIT_U16
+#define BIT_STATE     BIT_U8
+#define BIT_TTL       BIT_U8
+
+/* origin bits */
+#define NFHP_ORIGIN_INPUT   0x1
+#define NFHP_ORIGIN_FORWARD 0x2
+#define NFHP_ORIGIN_OUTPUT  0x4
+
+/* hipac_error and nfhipac_error together form the netlink error messages */
+typedef enum
+{
+	NFHE_INDEX  = HE_NEXT_ERROR,      // Unable to retrieve unused ifindex
+	NFHE_NOMSG  = HE_NEXT_ERROR - 1,  // Incorrect message format
+	NFHE_CMD    = HE_NEXT_ERROR - 2,  // Invalid command
+	NFHE_LABEL  = HE_NEXT_ERROR - 3,  // Empty chain label
+	NFHE_NLABEL = HE_NEXT_ERROR - 4,  // Empty new chain label
+	NFHE_POLICY = HE_NEXT_ERROR - 5,  // Invalid policy
+	NFHE_ACTION = HE_NEXT_ERROR - 6,  // Invalid action
+	NFHE_NMCT   = HE_NEXT_ERROR - 7,  // Invalid native match count
+	NFHE_IEOFF  = HE_NEXT_ERROR - 8,  // Invalid target_offset/next_offset
+	                                  // in ipt_entry
+	NFHE_SORT   = HE_NEXT_ERROR - 9,  // Native matches not sorted or 
+	                                  // dimid duplicate
+        NFHE_MINT   = HE_NEXT_ERROR - 10, // Invalid interval in native match
+	NFHE_DEVA   = HE_NEXT_ERROR - 11, // Native interface match but no 
+                                          // corresponding interface name
+	NFHE_DEVB   = HE_NEXT_ERROR - 12, // Interface name but no corres-
+	                                  // ponding native interface match
+	NFHE_PROTO  = HE_NEXT_ERROR - 13, // Invalid protocol match
+	NFHE_FRAG   = HE_NEXT_ERROR - 14, // Invalid fragment match
+        NFHE_TFLAGS = HE_NEXT_ERROR - 15, // Invalid tcp flags match
+	NFHE_STATE  = HE_NEXT_ERROR - 16, // Invalid state match
+	NFHE_TCP    = HE_NEXT_ERROR - 17, // tcp match dependency failure
+	NFHE_UDP    = HE_NEXT_ERROR - 18, // udp match dependency failure
+	NFHE_ICMP   = HE_NEXT_ERROR - 19, // icmp match dependency failure
+	NFHE_CMPMIS = HE_NEXT_ERROR - 20, // Missing cmp_len array
+	NFHE_CMPSH  = HE_NEXT_ERROR - 21, // cmp_len array too short
+	NFHE_CMPLA  = HE_NEXT_ERROR - 22, // cmp_len array contains a value
+	                                  // larger than the corresponding
+	                                  // ipt match/target size
+	NFHE_ORIGIN = HE_NEXT_ERROR - 23, // Illegal combination of matches
+                                       	  // (no valid origin)
+	NFHE_IPTMSZ = HE_NEXT_ERROR - 24, // Invalid ipt match size
+	NFHE_IPTMCH = HE_NEXT_ERROR - 25, // checkentry fails for ipt match
+	NFHE_IPTTMI = HE_NEXT_ERROR - 26, // Missing ipt target
+	NFHE_IPTTSZ = HE_NEXT_ERROR - 27, // Invalid ipt target size
+	NFHE_IPTTCH = HE_NEXT_ERROR - 28, // checkentry fails for ipt target
+	NFHE_TOFF   = HE_NEXT_ERROR - 29, // Invalid target_offset
+	NFHE_CHAINE = HE_NEXT_ERROR - 30, // Empty chain name
+	NFHE_CHAINL = HE_NEXT_ERROR - 31, // Chain name too long
+	NFHE_CTHELP = HE_NEXT_ERROR - 32, // Unable to load connection tracking
+	                                  // helper module (nf_hipac_cthelp.o)
+	NFHE_ILL    = HE_NEXT_ERROR - 33, // Illegal condition
+	NFHE_IMPL   = HE_NEXT_ERROR - 34, // Feature not yet implemented
+	NFHE_SYSOFF = HE_NEXT_ERROR - 35  // - offset for system errno's -
+} nfhipac_error;
+
+/* errno is positive */
+#define ERRNO_TO_NFHE(e) (NFHE_SYSOFF - e)
+#define NFHE_TO_ERRNO(e) (NFHE_SYSOFF - e)
+
+/* connection tracking states */
+typedef enum
+{
+	NFHP_STATE_ESTABLISHED,
+	NFHP_STATE_RELATED,
+	NFHP_STATE_NEW,
+	NFHP_STATE_INVALID,
+	NFHP_STATE_NUM_VALID = NFHP_STATE_INVALID
+} nfhp_state;
+
+/* netlink commands */
+#define CMD_NONE           0
+#define CMD_MIN            1
+#define CMD_APPEND         1
+#define CMD_INSERT         2
+#define CMD_DELETE_RULE    3
+#define CMD_DELETE_POS     4 
+#define CMD_REPLACE        5
+#define CMD_ZERO_COUNTERS  6
+#define CMD_FLUSH          7
+#define CMD_NEW_CHAIN      8
+#define CMD_DELETE_CHAIN   9
+#define CMD_RENAME_CHAIN  10
+#define CMD_SET_POLICY    11
+#define CMD_LIST          12
+#define CMD_LIST_COUNTER  13
+#define CMD_MAX           13
+
+struct nfhp_rule
+{
+	char indev[IFNAMSIZ];
+	char outdev[IFNAMSIZ];
+	struct hipac_rule r;
+	struct hipac_match m[NUMBER_OF_DIM];  // == r.first_match
+	/* we cannot use aligned(__alignof__(u_int64_t)) instead of
+	   aligned(8) because of incompatibilities in gcc versions */
+	struct ipt_entry e[0] __attribute__((aligned(8)));
+};
+
+struct nfhp_chain
+{
+	char label[HIPAC_CHAIN_NAME_MAX_LEN];
+	char newlabel[HIPAC_CHAIN_NAME_MAX_LEN];
+	u_int8_t policy;
+};
+
+/* universal macros which can be used for USER <-> KERNEL (both directions) */
+#define HAS_IPT_MATCH(r)      ((r)->match_offset > 0)
+#define HAS_IPT_TARGET(r)     ((r)->action == TARGET_EXEC)
+#define HAS_CHAIN_TARGET(r)   ((r)->action == TARGET_CHAIN)
+#define NEXT_IPT_MATCH(m)     ((struct ipt_entry_match *)          \
+			       ((char *) (m) + (m)->u.match_size))
+
+
+/*
+ * netlink communication: USER -> KERNEL
+ */
+
+/* command sent to kernel; only the necessary parts (depending on the command
+   type) must be filled in;
+
+  this is how a nfhp_cmd really looks like:
+  --------------------------------------------
+  |              nfhp_cmd struct             |
+  |------------------------------------------|
+  |                ipt_entry                 |
+  |------------------------------------------|
+  |             ipt_entry_match 1            |
+  |------------------------------------------|
+  |                  . . .                   |
+  |------------------------------------------|
+  |             ipt_entry_match m            |
+  |------------------------------------------|
+  |             ipt_entry_target             |
+  |                    or                    |
+  |                chain label               |
+  |------------------------------------------|
+  |          cmp_len array of size m         |
+  |  or m + 1 if ipt_entry_target available  |
+  --------------------------------------------
+
+  ipt_entry, ipt_entry_matches, ipt_entry_target / chain label and cmp_len are
+  optional; here are the rules defining their presence:
+  1) if the rule action is TARGET_EXEC there is an ipt_entry_target
+  2) if the rule action is TARGET_CHAIN there is a chain label
+  3) if there is an ipt_entry_match or ipt_entry_target or chain label there
+     is an ipt_entry
+  4) if there is an ipt_entry and cmd is CMD_DELETE_RULE there is cmp_len
+
+  => the smallest command simply consists of the nfhp_cmd struct
+
+  struct nfhp_cmd contains an embedded struct hipac_rule; set its member
+  match_offset to a value > 0 if there is at least one ipt_entry_match;
+  otherwise it must be 0; you don't have to specify the following members:
+                           size, origin, target_offset
+
+  if ipt_entry exists you only have to specify the following members:
+                           target_offset, next_offset
+
+  note: - the iptables_matches and the iptables_target must be aligned with
+          the IPT_ALIGN macro
+*/
+struct nfhp_cmd
+{
+	u_int32_t cmd;
+	struct nfhp_chain chain;
+	struct nfhp_rule rule;
+};
+
+/* macros to access nfhp_cmd; hr is a pointer to the embedded hipac_rule */
+#define HAS_IPT_ENTRY(hr)      (HAS_IPT_MATCH(hr) || HAS_IPT_TARGET(hr) || \
+			        HAS_CHAIN_TARGET(hr))
+#define HAS_CMP_LEN(cmd, hr)   ((cmd) == CMD_DELETE_RULE && HAS_IPT_ENTRY(hr))
+#define NFHP_RULE(hr)          ((struct nfhp_rule *)              \
+			        ((char *) (hr) - (unsigned long)  \
+			 	 (&((struct nfhp_rule *) 0)->r)))
+#define IPT_ENTRY(hr)          (NFHP_RULE(hr)->e)
+#define FIRST_IPT_MATCH_IE(hr) ((struct ipt_entry_match *) \
+				NFHP_RULE(hr)->e->elems)
+#define IPT_ENTRY_END(hr)      FIRST_IPT_MATCH_IE(hr)
+#define IPT_TARGET_IE(hr)      ((struct ipt_entry_target *)        \
+			        ((char *) NFHP_RULE(hr)->e +       \
+				 NFHP_RULE(hr)->e->target_offset))
+#define IPT_MATCH_END_IE(r)    ((struct ipt_entry_match *) IPT_TARGET_IE(r))
+#define CHAIN_TARGET_IE(hr)    ((char *) IPT_TARGET_IE(hr))
+#define CMP_LEN(hr)            ((u16 *) ((char *) IPT_ENTRY(hr) +     \
+					 IPT_ENTRY(hr)->next_offset))
+
+
+
+/*
+ * netlink communication: KERNEL -> USER
+ */
+
+/* kernel reply to all commands but CMD_LIST and CMD_LIST_COUNTER;
+   data contains an optional string describing the error; size stores
+   the total size of the struct nfhp_err including the optional string */
+struct nfhp_err
+{
+	int32_t err;    // hipac_error and nfhipac_error
+	u_int32_t size;
+	char data[0];
+};
+
+/*
+  in reply to a CMD_LIST and CMD_LIST_COUNTER command the kernel sends a
+  series of packets to the userspace; each packet is filled as much as
+  possible so that the number of packets being transfered is reduced to a
+  minimum; in case of an error which can happen sometime during the
+  transmission a packet containing the error number is sent (int32_t);
+  the data sent to the userspace is organized in the following way:
+  |struct nfhp_list_chain (chain 1)|rule 1|padding|...|rule n_1|padding|
+  |                   .   .   .   .                                    |
+  |struct nfhp_list_chain (chain k)|rule 1|padding|...|rule n_k|padding|
+  the rules are of the type struct nfhp_rule;
+  
+  this is how a nfhp_list_rule really looks like:
+  --------------------------------------------
+  |           nfhp_list_rule struct          |
+  |------------------------------------------|
+  |               hipac_match 1              |
+  |------------------------------------------|
+  |                  . . .                   |
+  |------------------------------------------|
+  |               hipac_match n              |
+  |------------------------------------------|
+  |             ipt_entry_match 1            |
+  |------------------------------------------|
+  |                  . . .                   |
+  |------------------------------------------|
+  |             ipt_entry_match m            |
+  |------------------------------------------|
+  |             ipt_entry_target             |
+  |                    or                    |
+  |                chain label               |
+  --------------------------------------------
+
+  the number of hipac_matches depends on native_mct (member of hipac_rule);
+  there is neither ipt_entry nor cmp_len;
+
+  IMPORTANT: - there might be a padding between two consecutive rules
+               in order to meet the alignment requirements for rules which
+	       contain 64 bit members; so you have to use the IPT_ALIGN
+               macro to jump to the next rule; note that there is no padding
+               after a chain because it contains 64 bit members which
+	       enforce the strictest alignment on the system
+*/
+struct nfhp_list_chain
+{
+	char label[HIPAC_CHAIN_NAME_MAX_LEN];
+	u_int8_t policy;
+	u_int32_t rule_num;
+	u_int64_t packet_ct, byte_ct;
+};
+
+struct nfhp_list_rule
+{
+        char indev[IFNAMSIZ];
+        char outdev[IFNAMSIZ];
+        struct hipac_rule r;
+};
+
+/* these macros together with the universal macros can be used to access
+   nfhp_list_rule */
+#define FIRST_IPT_MATCH(r) ((struct ipt_entry_match *)          \
+			    ((char *) (r) + (r)->match_offset))
+#define IPT_TARGET(r)      ((struct ipt_entry_target *)          \
+			    ((char *) (r) + (r)->target_offset))
+#define IPT_MATCH_END(r)   ((struct ipt_entry_match *) IPT_TARGET(r))
+#define CHAIN_TARGET(r)    ((char *) IPT_TARGET(r))
+
+#endif
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/net/ipv4/netfilter/nf-hipac/nfhp_dev.c linux-2.4.20-wolk4.4-fullkernel/net/ipv4/netfilter/nf-hipac/nfhp_dev.c
--- linux-2.4.20-wolk4.3-fullkernel/net/ipv4/netfilter/nf-hipac/nfhp_dev.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/net/ipv4/netfilter/nf-hipac/nfhp_dev.c	2003-07-30 11:23:31.000000000 +0200
@@ -0,0 +1,501 @@
+/*
+ * Interface handling module
+ *
+ * Authors: Michael Bellion and Thomas Heinz
+ * (c) 2002-2003 by the hipac core team <nf@hipac.org>:
+ *      +-----------------------+----------------------+
+ *      |   Michael Bellion     |     Thomas Heinz     |
+ *      | <mbellion@hipac.org>  |  <creatix@hipac.org> |
+ *      +-----------------------+----------------------+
+ * Licenced under the GNU General Public Licence, version >= 2.
+ */
+
+#include <linux/kernel.h>
+#include <linux/list.h>
+#include <linux/types.h>
+#include <linux/spinlock.h>
+#include <linux/netdevice.h>
+#include "nfhp_com.h"
+#include "nfhp_mod.h"
+#include "nfhp_dev.h"
+#include "hipac.h"
+
+#define MIN_INDEX_START (BIT_INIFACE == BIT_U32 ? INT_MAX : 65535)
+#define MAX_INDEX_START 1
+
+struct dev_list
+{
+	struct list_head head;
+	char ifname[IFNAMSIZ];
+	int ifindex;
+};
+
+/* list of used but non-existing device names and their mapping to
+   an unused ifindex */
+static struct dev_list nex_dev = {LIST_HEAD_INIT(nex_dev.head), {0}, 0};
+static int min_index = MIN_INDEX_START;
+static rwlock_t nex_dev_lock = RW_LOCK_UNLOCKED;
+
+/* list existing device names and their corresponding interface indexes */
+static struct dev_list xdev = {LIST_HEAD_INIT(xdev.head), {0}, 0};
+static int max_index = MAX_INDEX_START;
+static rwlock_t xdev_lock = RW_LOCK_UNLOCKED;
+
+
+
+/*
+ * helper function
+ */
+
+static inline int
+dev_add_tail(const char *ifname, int ifindex, struct dev_list *dl)
+{
+	struct dev_list *d;
+
+	if (ifindex <= 0 || ifindex >= hipac_maxkey(BIT_INIFACE)) {
+		printk(KERN_ERR "%s: invalid ifindex\n", __FUNCTION__);
+		return -EINVAL;
+	}
+	d = kmalloc(sizeof(*d), GFP_KERNEL);
+	if (d == NULL) {
+		return -ENOMEM;
+	}
+	strncpy(d->ifname, ifname, sizeof(d->ifname));
+	d->ifindex = ifindex;
+	list_add_tail(&d->head, &dl->head);
+	return ifindex;
+}
+
+
+/*
+ * functions for manipulating existing device list
+ */
+
+static int
+xdev_add_tail(const char *ifname, int ifindex)
+{
+	int ifind;
+
+	if (ifindex >= min_index) {
+		printk(KERN_WARNING "%s: ifindex already in use\n",
+		       __FUNCTION__);
+		return -EINVAL;
+	}
+	ifind = dev_add_tail(ifname, ifindex, &xdev);
+	if (ifind > max_index) {
+		max_index = ifind;
+	}
+	return ifind;
+}
+
+static void
+xdev_del_entry(struct dev_list *e)
+{
+	int recomp = e->ifindex == max_index;
+	struct list_head *lh;
+	struct dev_list *d;
+
+	list_del(&e->head);
+	kfree(e);
+	if (recomp) {
+		max_index = MAX_INDEX_START;
+		list_for_each(lh, &xdev.head) {
+			d = list_entry(lh, struct dev_list, head);
+			if (d->ifindex > max_index) {
+				max_index = d->ifindex;
+			}
+		}
+	}
+}
+
+static void
+xdev_del_tail(void)
+{
+	struct dev_list *d;
+	
+	if (list_empty(&xdev.head)) {
+		return;
+	}
+	d = list_entry(xdev.head.prev, struct dev_list, head);
+	xdev_del_entry(d);
+}
+
+static struct dev_list *
+xdev_get_by_name(const char *ifname)
+{
+	struct list_head *lh;
+	struct dev_list *d;
+
+	list_for_each(lh, &xdev.head) {
+		d = list_entry(lh, struct dev_list, head);
+		if (strncmp(d->ifname, ifname, sizeof(d->ifname)) == 0) {
+			return d;
+		}
+	}
+	return NULL;
+}
+
+static struct dev_list *
+xdev_get_by_index(int ifindex)
+{
+	struct list_head *lh;
+	struct dev_list *d;
+
+	list_for_each (lh, &xdev.head) {
+		d = list_entry(lh, struct dev_list, head);
+		if (d->ifindex == ifindex) {
+			return d;
+		}
+	}
+	return NULL;
+}
+
+
+/*
+ * functions for manipulating non-existing device list
+ */
+
+static int
+nex_dev_add_tail(const char *ifname, int ifindex)
+{
+	int ifind;
+
+	if (ifindex > 0 && ifindex <= max_index) {
+		printk(KERN_WARNING "%s: ifindex already in use\n",
+		       __FUNCTION__);
+		return -EINVAL;
+	}
+	ifind = dev_add_tail(ifname, ifindex, &nex_dev);
+	if (ifind > 0 && ifind < min_index) {
+		min_index = ifind;
+	}
+	return ifind;
+}
+
+static void
+nex_dev_del_entry(struct dev_list *e)
+{
+	int recomp = e->ifindex == min_index;
+	struct list_head *lh;
+	struct dev_list *d;
+
+	list_del(&e->head);
+	kfree(e);
+	if (recomp) {
+		min_index = MIN_INDEX_START;
+		list_for_each(lh, &nex_dev.head) {
+			d = list_entry(lh, struct dev_list, head);
+			if (d->ifindex < min_index) {
+				min_index = d->ifindex;
+			}
+		}
+	}
+}
+
+static void
+nex_dev_del_tail(void)
+{
+	struct dev_list *d;
+
+	if (list_empty(&nex_dev.head)) {
+		return;
+	}
+	d = list_entry(nex_dev.head.prev, struct dev_list, head);
+	nex_dev_del_entry(d);
+}
+
+static struct dev_list *
+nex_dev_get_by_name(const char *ifname)
+{
+	struct list_head *lh;
+	struct dev_list *d;
+
+	list_for_each (lh, &nex_dev.head) {
+		d = list_entry(lh, struct dev_list, head);
+		if (strncmp(d->ifname, ifname, sizeof(d->ifname)) == 0) {
+			return d;
+		}
+	}
+	return NULL;
+}
+
+
+
+/*
+ * veto function and interface functions
+ */
+
+/* we need to be aware of interface changes because we are matching against
+   ifindex which might change although the device name remains the same
+   (e.g. after reload of the device driver) */
+static int
+dev_veto_event(unsigned long event, struct net_device *dev)
+{
+	int stat = 0;
+	u8 dimid[] = {DIMID_INIFACE <= DIMID_OUTIFACE ?
+		      DIMID_INIFACE : DIMID_OUTIFACE,
+		      DIMID_INIFACE <= DIMID_OUTIFACE ?
+		      DIMID_OUTIFACE : DIMID_INIFACE};
+	int len = 1;
+	int ifi_org[2], ifi_new[2];
+	struct dev_list *d1, *d2;
+
+	switch (event) {
+	    case NETDEV_REGISTER:
+		    write_lock(&nex_dev_lock);
+		    write_lock(&xdev_lock);
+		    ifi_new[0] = xdev_add_tail(dev->name, dev->ifindex);
+		    if (ifi_new[0] < 0) {
+			    stat = ifi_new[0];
+			    goto veto_exit;
+		    }
+		    d1 = nex_dev_get_by_name(dev->name);
+		    if (d1 != NULL) {
+			    ifi_org[0] = d1->ifindex;
+			    HIPAC_LOCK;
+			    if (hipac_substitute(dimid, ifi_org,
+						 ifi_new, len) < 0) {
+				    printk(KERN_WARNING "%s: unable to fix "
+					   "ruleset (ruleset is still "
+					   "consistent)\n", __FUNCTION__);
+				    xdev_del_tail();
+				    stat = -1;
+			    }
+			    HIPAC_UNLOCK;
+			    nex_dev_del_entry(d1);
+		    }
+		    break;
+
+	    case NETDEV_UNREGISTER:
+		    write_lock(&nex_dev_lock);
+		    write_lock(&xdev_lock);
+		    ifi_new[0] = nex_dev_add_tail(dev->name, min_index - 1);
+		    if (ifi_new[0] < 0) {
+			    stat = ifi_new[0];
+			    goto veto_exit;
+		    }
+		    d1 = xdev_get_by_name(dev->name);
+		    if (d1 != NULL) {
+			    ifi_org[0] = d1->ifindex;
+			    HIPAC_LOCK;
+			    if (hipac_substitute(dimid, ifi_org,
+						 ifi_new, len) < 0) {
+				    printk(KERN_WARNING "%s: unable to fix "
+					   "ruleset (ruleset is still "
+					   "consistent)\n", __FUNCTION__);
+				    nex_dev_del_tail();
+				    stat = -1;
+			    }
+			    HIPAC_UNLOCK;
+			    xdev_del_entry(d1);
+		    } else {
+			    /* this should never happen */
+			    printk(KERN_ERR "%s: unable to find existing "
+				   "device %s in xdev\n", __FUNCTION__,
+				   dev->name);
+			    goto veto_exit;
+		    }
+		    break;
+
+	    case NETDEV_CHANGENAME:
+		    write_lock(&nex_dev_lock);
+		    write_lock(&xdev_lock);
+
+		    /* get old interface name and move it into nex_dev */
+		    ifi_org[0] = dev->ifindex;
+		    d1 = xdev_get_by_index(ifi_org[0]);
+		    if (d1 != NULL) {
+			    ifi_new[0] = nex_dev_add_tail(d1->ifname,
+							  min_index - 1);
+			    if (ifi_new[0] < 0) {
+				    stat = ifi_new[0];
+				    goto veto_exit;
+			    }
+		    } else {
+			    printk(KERN_ERR "%s: unable to find existing "
+				   "device in xdev\n", __FUNCTION__);
+			    stat = -1;
+			    goto veto_exit;
+		    }
+
+		    /* insert new interface name into xdev; if the new name 
+		       is contained in nex_dev it must be deleted there */
+		    ifi_new[1] = xdev_add_tail(dev->name, dev->ifindex);
+		    if (ifi_new[1] < 0) {
+			    nex_dev_del_tail();
+			    stat = ifi_new[1];
+			    goto veto_exit;
+		    }
+		    d2 = nex_dev_get_by_name(dev->name);
+		    if (d2 != NULL) {
+			    len++;
+			    ifi_org[1] = d2->ifindex;
+		    }
+		    
+		    HIPAC_LOCK;
+		    if (hipac_substitute(dimid, ifi_org, ifi_new, len) < 0) {
+			    printk(KERN_WARNING "%s: unable to fix ruleset "
+				   "(ruleset is still consistent)\n",
+				   __FUNCTION__);
+			    nex_dev_del_tail();
+			    xdev_del_tail();
+			    stat = -1;
+			    goto veto_exit;
+		    }
+		    HIPAC_UNLOCK;
+		    xdev_del_entry(d1);
+		    if (d2 != NULL) {
+			    nex_dev_del_entry(d2);
+		    }
+		    break;
+	    
+	    default:
+		    return 0;
+	}
+
+ veto_exit:
+	write_unlock(&nex_dev_lock);
+	write_unlock(&xdev_lock);
+	return stat;
+}
+
+int
+hpdev_get_name(int ifindex, char ifname[])
+{
+	const struct dev_list *dl[] = {&xdev, &nex_dev};
+	rwlock_t *lock[] = {&xdev_lock, &nex_dev_lock};
+	struct list_head *lh;
+	struct dev_list *d;
+	int i;
+
+	for (i = 0; i < 2; i++) {
+		read_lock(lock[i]);
+		list_for_each(lh, &dl[i]->head) {
+			d = list_entry(lh, struct dev_list, head);
+			if (d->ifindex == ifindex) {
+				strncpy(ifname, d->ifname, sizeof(d->ifname));
+				read_unlock(lock[i]);
+				return 0;
+			}
+		}
+		read_unlock(lock[i]);
+	}
+	return -1;
+}
+
+int
+hpdev_get_index(const char *ifname)
+{
+	const struct dev_list *dl[] = {&xdev, &nex_dev};
+	rwlock_t *lock[] = {&xdev_lock, &nex_dev_lock};
+	struct list_head *lh;
+	struct dev_list *d;
+	int i, ifindex;
+
+	/* search xdev and nex_dev */
+	for (i = 0; i < 2; i++) {
+		read_lock(lock[i]);
+		list_for_each(lh, &dl[i]->head) {
+			d = list_entry(lh, struct dev_list, head);
+			if (strncmp(d->ifname, ifname,
+				    sizeof(d->ifname)) == 0) {
+				ifindex = d->ifindex;
+				read_unlock(lock[i]);
+				return ifindex;
+			}
+		}
+		read_unlock(lock[i]);
+	}
+
+	if (min_index <= max_index + 1) {
+		return NFHE_INDEX;
+	}
+
+	/* device does not exist => associate it with a non-existing index */
+	write_lock(&nex_dev_lock);
+	ifindex = nex_dev_add_tail(ifname, min_index - 1);
+	write_unlock(&nex_dev_lock);
+	if (ifindex < 0) {
+		return ERRNO_TO_NFHE(-ifindex);
+	}
+	return ifindex;
+}
+
+int
+hpdev_init(void)
+{
+	struct net_device *dev;
+	struct list_head *lh;
+	struct dev_list *d;	
+	int stat;
+
+	/* the interface list cannot change until we release the read lock;
+	   since we register the veto function during the lock we never
+	   miss a relevant event; note that as long as the lock is taken
+	   dev_veto_event cannot be called since the callback mechanism 
+	   is embedded in a write lock of dev_base_lock */
+	read_lock(&dev_base_lock);
+
+	/* register veto function */
+	stat = register_netdevice_veto(dev_veto_event);
+	if (stat < 0) {
+		goto exit_init;
+	}
+
+	/* init xdev list */
+	write_lock(&xdev_lock);
+	for (dev = dev_base; dev != NULL; dev = dev->next) {
+		stat = xdev_add_tail(dev->name, dev->ifindex);
+		if (stat < 0) {
+			for (lh = xdev.head.next; lh != &xdev.head;) {
+				d = list_entry(lh, struct dev_list, head);
+				lh = lh->next;
+				list_del(lh->prev);
+				kfree(d);
+			}
+			min_index = MIN_INDEX_START;
+			max_index = MAX_INDEX_START;
+			write_unlock(&xdev_lock);
+			if (unregister_netdevice_veto(dev_veto_event) < 0) {
+				/* this should never happen */
+				printk(KERN_ERR "%s: unregister_netdevice_"
+				       "veto failed\n", __FUNCTION__);
+			}
+			goto exit_init;
+		}
+	}
+	write_unlock(&xdev_lock);
+	stat = 0;
+
+ exit_init:
+	read_unlock(&dev_base_lock);
+	return stat;
+}
+
+void
+hpdev_exit(void)
+{
+	const struct dev_list *dl[] = {&xdev, &nex_dev};
+	rwlock_t *lock[] = {&xdev_lock, &nex_dev_lock};
+	struct list_head *lh;
+	struct dev_list *d;	
+	int i;
+
+	if (unregister_netdevice_veto(dev_veto_event) < 0) {
+		/* this should never happen */
+		printk(KERN_ERR "%s: unregister_netdevice_veto "
+		       "failed\n", __FUNCTION__);
+	}
+	for (i = 0; i < 2; i++) {
+		write_lock(lock[i]);
+		for (lh = dl[i]->head.next; lh != &dl[i]->head;) {
+			d = list_entry(lh, struct dev_list, head);
+			lh = lh->next;
+			list_del(lh->prev);
+			kfree(d);
+		}
+		min_index = MIN_INDEX_START;
+		max_index = MAX_INDEX_START;
+		write_unlock(lock[i]);
+	}
+}
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/net/ipv4/netfilter/nf-hipac/nfhp_dev.h linux-2.4.20-wolk4.4-fullkernel/net/ipv4/netfilter/nf-hipac/nfhp_dev.h
--- linux-2.4.20-wolk4.3-fullkernel/net/ipv4/netfilter/nf-hipac/nfhp_dev.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/net/ipv4/netfilter/nf-hipac/nfhp_dev.h	2003-07-30 11:23:31.000000000 +0200
@@ -0,0 +1,48 @@
+/*
+ * Interface handling module
+ *
+ * Interfaces are uniquely indentified by their corresponding interface
+ * index (ifindex). This index may change after reloading a device driver
+ * or it may be assigned to another device after renaming a device's name etc.
+ *
+ * Moreover the user is allowed to use non-existing device names as matches 
+ * so we have to maintain a unique assignment from device names to interface
+ * indexes.
+ *
+ * Authors: Michael Bellion and Thomas Heinz
+ * (c) 2002-2003 by the hipac core team <nf@hipac.org>:
+ *      +-----------------------+----------------------+
+ *      |   Michael Bellion     |     Thomas Heinz     |
+ *      | <mbellion@hipac.org>  |  <creatix@hipac.org> |
+ *      +-----------------------+----------------------+
+ * Licenced under the GNU General Public Licence, version >= 2.
+ */
+
+
+#ifndef _NFHP_DEV_H
+#define _NFHP_DEV_H
+
+/* call init during module initialization; if something fails a negative 
+   errno is returned, otherwise 0 is returned */
+int
+hpdev_init(void);
+
+/* call exit during module finalization */
+void
+hpdev_exit(void);
+
+/* copies the device name corresponding to ifindex to ifname which should
+   be at least IFNAMSIZ bytes large and return 0;
+   if ifindex cannot be found a value < 0 is returned */
+int
+hpdev_get_name(int ifindex, char ifname[]);
+
+/* return the corresponding interface index if the interface exists either
+   as known non-existing device or as existing device;
+   otherwise the interface is added to the list of known non-existing
+   interfaces and a new interface index is returned;
+   if something fails a nfhipac_error is returned */
+int
+hpdev_get_index(const char *ifname);
+
+#endif
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/net/ipv4/netfilter/nf-hipac/nfhp_mod.c linux-2.4.20-wolk4.4-fullkernel/net/ipv4/netfilter/nf-hipac/nfhp_mod.c
--- linux-2.4.20-wolk4.3-fullkernel/net/ipv4/netfilter/nf-hipac/nfhp_mod.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/net/ipv4/netfilter/nf-hipac/nfhp_mod.c	2003-07-30 11:23:31.000000000 +0200
@@ -0,0 +1,1778 @@
+/*
+ * High performance packet classification module for netfilter
+ *
+ * Authors: Michael Bellion and Thomas Heinz
+ * (c) 2002-2003 by the hipac core team <nf@hipac.org>:
+ *      +-----------------------+----------------------+
+ *      |   Michael Bellion     |     Thomas Heinz     |
+ *      | <mbellion@hipac.org>  |  <creatix@hipac.org> |
+ *      +-----------------------+----------------------+
+ * Licenced under the GNU General Public Licence, version >= 2.
+ */
+
+
+#include <linux/module.h>
+#include <linux/version.h>
+#include <linux/init.h>
+#include <linux/kmod.h>
+#include <linux/skbuff.h>
+#include <linux/netlink.h>
+#include <net/sock.h>
+#include <linux/types.h>
+#include <linux/netfilter_ipv4.h>
+#include <net/ip.h>
+#include <linux/spinlock.h>
+#include <linux/netfilter.h>
+#include <linux/udp.h>
+#include <linux/netfilter_ipv4/ip_conntrack.h>
+#include "nfhp_mod.h"
+#include "nfhp_com.h"
+#include "nfhp_dev.h"
+#include "nfhp_proc.h"
+#include "hipac.h"
+
+#define MAX(a, b)  ((a) >= (b) ? (a) : (b))
+#define MIN(a, b)  ((a) >= (b) ? (b) : (a))
+#define SKB_LEN(s) (((s)->end - (s)->tail) - NLMSG_LENGTH(0))
+
+/* hook match functions */
+static nf_hookfn input_match;
+static nf_hookfn forward_match;
+static nf_hookfn output_match;
+
+/* hipac data structures for INPUT, FORWARD and OUPUT hook plus
+   their corresponding netfilter ops and rwlocks */
+void *hipac_input   = NULL;
+void *hipac_forward = NULL;
+void *hipac_output  = NULL;
+struct nf_hook_ops input_op   = { LIST_HEAD_INIT(input_op.list),
+				  input_match, PF_INET, NF_IP_LOCAL_IN,
+				  NF_IP_PRI_FILTER + 1 };
+struct nf_hook_ops forward_op = { LIST_HEAD_INIT(forward_op.list),
+				  forward_match, PF_INET, NF_IP_FORWARD,
+				  NF_IP_PRI_FILTER + 1 };
+struct nf_hook_ops output_op  = { LIST_HEAD_INIT(output_op.list),
+				  output_match, PF_INET, NF_IP_LOCAL_OUT,
+				  NF_IP_PRI_FILTER + 1 };
+
+/* used to serialize hipac modifications caused by netlink commands and
+   the interface handling module */
+DECLARE_MUTEX(nlhp_lock);
+
+/* protects listing operations (callback based) */
+DECLARE_MUTEX(nlhp_listing_lock);
+
+static struct sock *nfhp_sock = NULL;
+static int peerpid = 0;
+
+/* connection tracking dependency helper module */
+static DECLARE_MUTEX(cthelp_lock);
+static struct module *nfhp_cthelp_module = NULL;
+
+/* size of reply skb in bytes */
+static const int reply_skb_size = 130048;
+
+/* used to increment ip_tables' module counter */
+static struct ipt_target nfhp_dummy_target =
+{
+	{ NULL, NULL }, "NF_HIPAC_DUMMY_TARGET", NULL, NULL, NULL, THIS_MODULE
+};
+
+/* latest hipac_get_chain_info snapshot */
+struct list_info
+{
+	struct hipac_chain_info *inf;
+	u32 len;
+};
+static struct list_info linfo = {NULL, 0};
+
+struct packet
+{
+	int hook;
+	struct sk_buff **skbuff;
+	const struct net_device *indev, *outdev;
+};
+
+
+
+/*
+ * dimension extractor functions
+ */
+
+static u32
+get_src_ip(const void *pkt)
+{
+	const struct sk_buff *sk = *((struct packet *) pkt)->skbuff;
+	return ntohl(sk->nh.iph->saddr);
+}
+
+static u32
+get_dst_ip(const void *pkt)
+{
+	const struct sk_buff *sk = *((struct packet *) pkt)->skbuff;
+	return ntohl(sk->nh.iph->daddr);
+}
+
+static u32
+get_iniface(const void *pkt)
+{
+	return ((struct packet*) pkt)->indev->ifindex;
+}
+
+static u32
+get_outiface(const void *pkt)
+{
+	return ((struct packet*) pkt)->outdev->ifindex;
+}
+
+static u32
+get_proto(const void *pkt)
+{
+	const struct sk_buff *sk = *((struct packet *) pkt)->skbuff;
+	return sk->nh.iph->protocol;
+}
+
+static u32
+get_fragment(const void *pkt)
+{
+	const struct sk_buff *sk = *((struct packet *) pkt)->skbuff;
+	return !!(ntohs(sk->nh.iph->frag_off) & IP_OFFSET);
+}
+
+static u32
+get_tcp_dport(const void *pkt)
+{
+	const struct sk_buff *sk = *((struct packet *) pkt)->skbuff;
+	return ntohs(((struct tcphdr *) 
+		      (((u32 *) sk->nh.iph) + sk->nh.iph->ihl))->dest);
+}
+
+static u32
+get_tcp_sport(const void *pkt)
+{
+	const struct sk_buff *sk = *((struct packet *) pkt)->skbuff;
+	return ntohs(((struct tcphdr *) 
+		      (((u32 *) sk->nh.iph) + sk->nh.iph->ihl))->source);
+}
+
+static u32
+get_tcp_flags(const void *pkt)
+{
+	const struct sk_buff *sk = *((struct packet *) pkt)->skbuff;
+	struct tcphdr *tcp = (struct tcphdr *)
+		(((u32 *) sk->nh.iph) + sk->nh.iph->ihl);
+	if (tcp->syn && !tcp->ack && !tcp->fin && !tcp->rst) {
+		return 0;
+	}
+	return 1;
+}
+
+static u32
+get_udp_dport(const void *pkt)
+{
+	const struct sk_buff *sk = *((struct packet *) pkt)->skbuff;
+	return ntohs(((struct udphdr *) 
+		      (((u32 *) sk->nh.iph) + sk->nh.iph->ihl))->dest);
+}
+
+static u32
+get_udp_sport(const void *pkt)
+{
+	const struct sk_buff *sk = *((struct packet *) pkt)->skbuff;
+	return ntohs(((struct udphdr *) 
+		      (((u32 *) sk->nh.iph) + sk->nh.iph->ihl))->source);
+}
+
+static u32
+get_icmptypes(const void *pkt)
+{
+	const struct sk_buff *sk = *((struct packet *) pkt)->skbuff;
+	return (((struct icmphdr *) 
+		 (((u32 *) sk->nh.iph) + sk->nh.iph->ihl))->type << 8) +
+		(((struct icmphdr *) 
+		  (((u32 *) sk->nh.iph) + sk->nh.iph->ihl))->code);
+}
+
+static u32
+get_state(const void *pkt)
+{
+	const struct sk_buff *sk = *((struct packet *) pkt)->skbuff;
+	if (sk->nfct == NULL) {
+		return NFHP_STATE_INVALID;
+	}
+	return ((sk->nfct - 
+		 ((struct ip_conntrack *) sk->nfct->master)->infos) %
+		NFHP_STATE_NUM_VALID);
+}
+
+static u32
+get_ttl(const void *pkt)
+{
+	const struct sk_buff *sk = *((struct packet *) pkt)->skbuff;
+	return sk->nh.iph->ttl;
+}
+
+
+/*
+ * conntrack dependency helper module counter management :-)
+ */
+
+int
+nfhp_register_cthelp(struct module *cthelp)
+{
+	int ret;
+
+	MOD_INC_USE_COUNT;
+	ret = down_interruptible(&cthelp_lock);
+	if (ret != 0) {
+		MOD_DEC_USE_COUNT;
+		return ret;
+	}
+	if (nfhp_cthelp_module != NULL) {
+		printk(KERN_ERR "nfhp_register_cthelp: module already "
+		       "registered\n");
+		MOD_DEC_USE_COUNT;
+		ret = -EINVAL;
+	}
+	nfhp_cthelp_module = cthelp;
+	up(&cthelp_lock);
+	return ret;
+}
+
+void
+nfhp_unregister_cthelp(struct module *cthelp)
+{
+	 down(&cthelp_lock);
+	 if (nfhp_cthelp_module != cthelp) {
+		 printk(KERN_ERR "nfhp_unregister_cthelp: unregistered "
+			"module tries to unregister\n");
+		 up(&cthelp_lock);
+		 return;
+	 }
+	 nfhp_cthelp_module = NULL;
+	 up(&cthelp_lock);
+	 MOD_DEC_USE_COUNT;
+}
+
+static inline int
+cthelp_use(void)
+{
+	int ret;
+	
+	/* check whether the conntrack dependency helper is registered */
+	ret = down_interruptible(&cthelp_lock);
+	if (ret < 0) {
+		return ERRNO_TO_NFHE(-ret);
+	}
+	if (nfhp_cthelp_module != NULL) {
+		__MOD_INC_USE_COUNT(nfhp_cthelp_module);
+		up(&cthelp_lock);
+		return 0;
+	}
+
+	/* try to load the module */
+	up(&cthelp_lock);
+	request_module("nf_hipac_cthelp");
+	
+	/* did we succeed? */
+	ret = down_interruptible(&cthelp_lock);
+	if (ret < 0) {
+		return ERRNO_TO_NFHE(-ret);
+	}
+	if (nfhp_cthelp_module != NULL) {
+		__MOD_INC_USE_COUNT(nfhp_cthelp_module);
+		up(&cthelp_lock);
+		return 0;
+	}
+	up(&cthelp_lock);
+	return NFHE_CTHELP;
+}
+
+static inline void
+cthelp_unuse(void)
+{
+	if (nfhp_cthelp_module == NULL) {
+		printk(KERN_ERR "%s: conntrack dependency helper "
+		       "module not registered\n", __FUNCTION__);
+		return;
+	}
+	__MOD_DEC_USE_COUNT(nfhp_cthelp_module);
+}
+
+
+/*
+ * functions and data structures necessary for hipac initialization
+ */
+
+/* dimension id to bit type mapping */
+static const u8 dim2btype[] =
+{
+	BIT_SRC_IP,    BIT_DEST_IP,   BIT_INIFACE,   BIT_OUTIFACE,
+	BIT_PROTO,     BIT_FRAGMENT,  BIT_TCP_DPORT, BIT_TCP_SPORT,
+	BIT_TCP_FLAGS, BIT_UDP_DPORT, BIT_UDP_SPORT, BIT_ICMP_TYPE,
+	BIT_STATE,     BIT_TTL
+};
+
+/* dimension extractor functions */
+static const hipac_extract_t extract[] =
+{
+	get_src_ip,    get_dst_ip,    get_iniface,   get_outiface,
+	get_proto,     get_fragment,  get_tcp_dport, get_tcp_sport,
+	get_tcp_flags, get_udp_dport, get_udp_sport, get_icmptypes,
+	get_state,     get_ttl
+};
+
+/* iptables_match executor */
+static hipac_match_t
+hipac_match_exec(const void *packet, void *first_match, void *end)
+{
+	const struct packet *p = packet;
+	hipac_match_t match = MATCH_YES;
+	struct ipt_entry_match *m = first_match;
+	int hotdrop = 0;
+	struct iphdr *ip;
+	u16 offset, datalen;
+	void *protohdr;
+
+	ip = (*p->skbuff)->nh.iph;
+	protohdr = (u32 *) ip + ip->ihl;
+	datalen = (*p->skbuff)->len - ip->ihl * 4;
+	offset = ntohs(ip->frag_off) & IP_OFFSET;
+	for (; m < (struct ipt_entry_match *) end; m = NEXT_IPT_MATCH(m)) {
+		if (!m->u.kernel.match->match(*p->skbuff, p->indev,
+					      p->outdev, m->data, offset,
+					      protohdr, datalen, &hotdrop)) {
+			match = MATCH_NO;
+			break;
+		}
+	}
+	if (hotdrop) {
+		return MATCH_HOTDROP;
+	}
+	return match;
+}
+
+/* iptables_target executor */
+static hipac_target_t
+hipac_target_exec(const void *packet, void *target)
+{
+	const struct packet *p = packet;
+	struct ipt_entry_target *t = target;
+
+	switch (t->u.kernel.target->target(p->skbuff, p->hook, p->indev,
+					   p->outdev, t->data, NULL)) {
+	    case NF_ACCEPT:    return TARGET_ACCEPT;
+	    case NF_DROP:      return TARGET_DROP;
+	    case IPT_CONTINUE: return TARGET_NONE;
+	}
+	
+	/* this should never be reached */
+	printk(KERN_ERR "%s: unkown verdict => packet dropped\n",
+	       __FUNCTION__);
+	return TARGET_DROP;
+}
+
+/* equality test - rnl is the hipac_rule in netlink format which implies
+   that it contains ipt_entry and cmp_len if the rule has an ipt_entry_match
+   or ipt_entry_target or chain label; rhp is in hipac format which means
+   that it does not contain ipt_entry and cmp_len */
+static int
+hipac_eq_exec(const struct hipac_rule *rnl, const struct hipac_rule *rhp)
+{
+	u32 cmp_len_ind = 0;
+	u16 *cmp_len;
+
+	if (rnl == rhp) {
+		printk(KERN_ERR "%s: rnl == rhp error\n", __FUNCTION__);
+		return 0;
+	}
+	if (rnl == NULL || rhp == NULL || rnl->size != rhp->size ||
+	    rnl->native_mct != rhp->native_mct ||
+	    memcmp(rnl->cmp_start, rhp->cmp_start,
+		   sizeof(*rnl) - offsetof(struct hipac_rule, cmp_start) +
+		   rnl->native_mct * sizeof(*rnl->first_match))) {
+		return 0;
+	}
+	cmp_len = CMP_LEN(rnl);
+	if (HAS_IPT_MATCH(rnl)) {
+		struct ipt_entry_match *mnl, *mhp, *endhp;
+		mnl = FIRST_IPT_MATCH_IE(rnl);
+		mhp = FIRST_IPT_MATCH(rhp);
+		endhp = IPT_MATCH_END(rhp);
+		for (; mhp < endhp;
+		     mnl = NEXT_IPT_MATCH(mnl), mhp = NEXT_IPT_MATCH(mhp),
+		     cmp_len_ind++) {
+			if (strncmp(mnl->u.user.name,
+				    mhp->u.kernel.match->name,
+				    sizeof(mnl->u.user.name)) ||
+			    mnl->u.match_size != mhp->u.match_size ||
+			    memcmp(&mnl->data, &mhp->data,
+				   cmp_len[cmp_len_ind])) {
+				return 0;
+			}
+		}
+	}
+	if (HAS_IPT_TARGET(rnl)) {
+		struct ipt_entry_target *tnl, *thp;
+		tnl = IPT_TARGET_IE(rnl);
+		thp = IPT_TARGET(rhp);
+		if (strncmp(tnl->u.user.name, thp->u.kernel.target->name,
+			    sizeof(tnl->u.user.name)) ||
+		    tnl->u.target_size != thp->u.target_size ||
+		    memcmp(&tnl->data, &thp->data,
+			   cmp_len[cmp_len_ind])) {
+			return 0;
+		}
+	} else if (HAS_CHAIN_TARGET(rnl)) {
+		char *tnl, *thp;
+		tnl = CHAIN_TARGET_IE(rnl);
+		thp = CHAIN_TARGET(rhp);
+		/* strlen(tnl) < HIPAC_CHAIN_NAME_MAX_LEN */
+		if (strcmp(tnl, thp)) {
+			return 0;
+		}
+	}
+	return 1;
+}
+
+/* r is constructed by copying rnl to the exclusion of ipt_entry and
+   cmp_len (if present); rnl->size already states the size of r _but_
+   rnl may be smaller than rnl->size if it has a chain target */
+static void
+hipac_copy_constructor(const struct hipac_rule *rnl, struct hipac_rule *r)
+{
+	if (HAS_IPT_ENTRY(rnl)) {
+		u32 size = rnl->size;
+		if (HAS_CHAIN_TARGET(rnl)) {
+			size -= HIPAC_CHAIN_NAME_MAX_LEN -
+				strlen(CHAIN_TARGET_IE(rnl)) - 1;
+		}
+		memcpy(r, rnl, sizeof(*rnl) + rnl->native_mct *
+		       sizeof(*rnl->first_match));
+		if (HAS_IPT_MATCH(rnl)) {
+			memcpy(FIRST_IPT_MATCH(r), IPT_ENTRY_END(rnl),
+			       size - rnl->match_offset);
+		} else {
+			memcpy(IPT_TARGET(r), IPT_ENTRY_END(rnl),
+			       size - rnl->target_offset);
+		}
+	} else {
+		memcpy(r, rnl, rnl->size);
+	}
+}
+
+/* destructor for iptables matches/target */
+static void
+hipac_destroy_exec(struct hipac_rule *r)
+{
+	int i;
+
+	if (r == NULL) {
+		return;
+	}
+	for (i = 0; i < r->native_mct &&
+		     r->first_match[i].dimid < DIMID_STATE; i++);
+	if (i < r->native_mct && r->first_match[i].dimid == DIMID_STATE) {
+		cthelp_unuse();
+	}
+	if (HAS_IPT_MATCH(r)) {
+		struct ipt_entry_match *m, *end;
+		m = FIRST_IPT_MATCH(r);
+		end = IPT_MATCH_END(r);
+		for (; m < end; m = NEXT_IPT_MATCH(m)) {
+			if (m->u.kernel.match->destroy) {
+				m->u.kernel.match->destroy(
+					m->data, m->u.match_size - sizeof(*m));
+			}
+			if (m->u.kernel.match->me) {
+				__MOD_DEC_USE_COUNT(m->u.kernel.match->me);
+			}
+		}
+	}
+	if (HAS_IPT_TARGET(r)) {
+		struct ipt_entry_target *t;
+		t = IPT_TARGET(r);
+		if (t->u.kernel.target->destroy) {
+			t->u.kernel.target->destroy(
+				t->data, t->u.target_size - sizeof(*t));
+		}
+		if (t->u.kernel.target->me) {
+			__MOD_DEC_USE_COUNT(t->u.kernel.target->me);
+		}
+	}
+}
+
+/* destructor for iptables matches/target (rnl is the hipac_rule in
+   netlink format) */
+static void
+hipac_destroy_exec_nl(struct hipac_rule *rnl)
+{
+	int i;
+
+	if (rnl == NULL) {
+		return;
+	}
+	for (i = 0; i < rnl->native_mct &&
+		     rnl->first_match[i].dimid < DIMID_STATE; i++);
+	if (i < rnl->native_mct && rnl->first_match[i].dimid == DIMID_STATE) {
+		cthelp_unuse();
+	}
+	if (HAS_IPT_MATCH(rnl)) {
+		struct ipt_entry_match *m, *end;
+		m = FIRST_IPT_MATCH_IE(rnl);
+		end = IPT_MATCH_END_IE(rnl);
+		for (; m < end; m = NEXT_IPT_MATCH(m)) {
+			if (m->u.kernel.match->destroy) {
+				m->u.kernel.match->destroy(
+					m->data, m->u.match_size - sizeof(*m));
+			}
+			if (m->u.kernel.match->me) {
+				__MOD_DEC_USE_COUNT(m->u.kernel.match->me);
+			}
+		}
+	}
+	if (HAS_IPT_TARGET(rnl)) {
+		struct ipt_entry_target *t;
+		t = IPT_TARGET_IE(rnl);
+		if (t->u.kernel.target->destroy) {
+			t->u.kernel.target->destroy(
+				t->data, t->u.target_size - sizeof(*t));
+		}
+		if (t->u.kernel.target->me) {
+			__MOD_DEC_USE_COUNT(t->u.kernel.target->me);
+		}
+	}
+}
+
+static inline int
+skb_ok(const struct sk_buff *skb)
+{
+	const struct iphdr *ip = skb->nh.iph;
+	u16 datalen = skb->len - ip->ihl * 4;
+	
+	/* make sure that tcp/udp/icmp headers can be accessed properly
+	   (if available) within the dimid extractor functions */
+	switch (ntohs(ip->frag_off) & IP_OFFSET) {
+	    case 0:
+		    switch (ip->protocol) {
+			case IPPROTO_TCP:
+				if (datalen < sizeof(struct tcphdr)) {
+					printk(KERN_NOTICE "Dropping evil "
+					       "TCP tinygram.\n");
+					return 0;
+				}
+			case IPPROTO_UDP:
+				if (datalen < sizeof(struct udphdr)) {
+					printk(KERN_NOTICE "Dropping evil "
+					       "UDP tinygram.\n");
+					return 0;
+				}
+			case IPPROTO_ICMP:
+				if (datalen < 2) {
+					printk(KERN_NOTICE "Dropping evil "
+					       "ICMP tinygram.\n");
+					return 0;
+				}
+		    }
+		    return 1;
+	    case 1:
+		    if (ip->protocol == IPPROTO_TCP) {
+			    printk(KERN_NOTICE "Dropping evil TCP offset=1 "
+				   "fragment.\n");
+			    return 0;
+		    }
+	    default:
+		    /* fragment => tcp/udp/icmp match never occurs */
+		    return 1;
+	}
+}
+
+static unsigned int
+input_match(unsigned int hooknum,
+	    struct sk_buff **skb,
+	    const struct net_device *in,
+	    const struct net_device *out,
+	    int (*okfn) (struct sk_buff *))
+{
+	const struct packet pkt = {hooknum, skb, in, out};
+
+	if (likely(skb_ok(*skb))) {
+		switch (hipac_match(hipac_input, &pkt,
+				    ntohs((*skb)->nh.iph->tot_len))) {
+		    case TARGET_ACCEPT: return NF_ACCEPT;
+		    case TARGET_DROP:   return NF_DROP;
+		    default:           
+			    printk(KERN_ERR "%s: unkown verdict (packet "
+				   "dropped)\n", __FUNCTION__);
+			    return NF_DROP;
+		}
+	}
+	return NF_DROP;
+}
+
+static unsigned int
+forward_match(unsigned int hooknum,
+	      struct sk_buff **skb,
+	      const struct net_device *in,
+	      const struct net_device *out,
+	      int (*okfn) (struct sk_buff *))
+{
+	const struct packet pkt = {hooknum, skb, in, out};
+
+	if (likely(skb_ok(*skb))) {
+		switch (hipac_match(hipac_forward, &pkt,
+				    ntohs((*skb)->nh.iph->tot_len))) {
+		    case TARGET_ACCEPT: return NF_ACCEPT;
+		    case TARGET_DROP:   return NF_DROP;
+		    default:           
+			    printk(KERN_ERR "%s: unkown verdict (packet "
+				   "dropped)\n", __FUNCTION__);
+			    return NF_DROP;
+		}
+	}
+	return NF_DROP;
+}
+
+static unsigned int
+output_match(unsigned int hooknum,
+	     struct sk_buff **skb,
+	     const struct net_device *in,
+	     const struct net_device *out,
+	     int (*okfn) (struct sk_buff *))
+{
+	const struct packet pkt = {hooknum, skb, in, out};
+
+	if (likely(skb_ok(*skb))) {
+		switch (hipac_match(hipac_output, &pkt,
+				    ntohs((*skb)->nh.iph->tot_len))) {
+		    case TARGET_ACCEPT: return NF_ACCEPT;
+		    case TARGET_DROP:   return NF_DROP;
+		    default:           
+			    printk(KERN_ERR "%s: unkown verdict (packet "
+				   "dropped)\n", __FUNCTION__);
+			    return NF_DROP;
+		}
+	}
+	return NF_DROP;
+}
+
+
+/*
+ * kernel-user netlink communication
+ */
+
+static struct sk_buff *
+nlhp_new_reply(void)
+{
+	struct sk_buff *skb;
+
+	skb = alloc_skb(reply_skb_size, GFP_KERNEL);
+	if (skb == NULL) {
+		/* maybe we can get a smaller skb */
+		int sz = MAX(sizeof(int32_t), sizeof(struct nfhp_err));
+		skb = alloc_skb(NLMSG_SPACE(sz), GFP_KERNEL);
+		if (skb == NULL) {
+			return NULL;
+		}
+		return skb;
+	}
+	return skb;
+}
+
+static inline void *
+nlhp_reply_data(struct sk_buff *skb)
+{
+	if (skb == NULL) {
+		return NULL;
+	}
+	return ((struct nfhp_err *) NLMSG_DATA(skb->data))->data;
+}
+
+static void
+nlhp_send_list_err(struct sk_buff *reply, int err)
+{
+	struct nlmsghdr *nlh;
+
+	nlh = NLMSG_PUT(reply, 0, 0, NLMSG_ERROR, sizeof(int32_t));
+	*(int32_t *) NLMSG_DATA(nlh) = err;
+	if (!NLMSG_OK(nlh, NLMSG_LENGTH(sizeof(int32_t)))) {
+		printk(KERN_ERR "netlink message not ok\n");
+		return;
+	}
+	if (netlink_unicast(nfhp_sock, reply, peerpid, MSG_DONTWAIT) <= 0) {
+		printk(KERN_ERR "netlink_unicast failed\n");
+		return;
+	}
+	return;
+	
+ nlmsg_failure:
+	printk(KERN_ERR "NLMSG_PUT failed\n");
+}
+
+static void
+nlhp_send_reply(struct sk_buff *reply, int err, const char *data)
+{
+	struct nlmsghdr *nlh;
+	struct nfhp_err *hpr;
+	u32 size;
+
+	if (data != NULL) {
+		size = sizeof(*hpr) + strlen(data);
+		size = MIN(size, SKB_LEN(reply));
+	} else {
+		size = sizeof(*hpr);
+	}
+	nlh = NLMSG_PUT(reply, 0, 0, NLMSG_ERROR, size);
+	hpr = NLMSG_DATA(nlh);
+	hpr->err = err;
+	hpr->size = size;
+	if (data != NULL && hpr->size > sizeof(*hpr)) {
+		strncpy(hpr->data, data, hpr->size - sizeof(*hpr));
+	}
+	if (!NLMSG_OK(nlh, NLMSG_LENGTH(hpr->size))) {
+		printk(KERN_ERR "netlink message not ok\n");
+		return;
+	}
+	if (netlink_unicast(nfhp_sock, reply, peerpid, MSG_DONTWAIT) <= 0) {
+		printk(KERN_ERR "netlink_unicast failed\n");
+		return;
+	}
+	return;
+
+ nlmsg_failure:
+	printk(KERN_ERR "NLMSG_PUT failed\n");
+}
+
+static inline void *
+nlhp_list_rule(struct nfhp_list_rule *r, struct hipac_rule *rule, int *len)
+{
+	int size = IPT_ALIGN(offsetof(struct nfhp_list_rule, r) + rule->size);
+	u32 i;
+
+	if (*len < size) {
+		return NULL;
+	}
+	r->indev[0] = '\0';
+	r->outdev[0] = '\0';
+	memcpy(&r->r, rule, rule->size);
+
+	/* TEMPORARY FIX: the current implementation produces incorrect
+	                  counter values for jump rules; therefore we set
+	                  the counters to 0 here to avoid confusion */
+	if (HAS_CHAIN_TARGET(&r->r)) {
+		r->r.packet_ct = r->r.byte_ct = 0;
+	}
+	
+	/* fill in interface names if necessary */
+	for (i = 0; i < r->r.native_mct; i++) {
+		switch (r->r.first_match[i].dimid) {
+		    case DIMID_INIFACE:
+			    if (hpdev_get_name(r->r.first_match[i].left,
+					       r->indev) < 0) {
+				    printk(KERN_ERR "%s: interface name look"
+					   "up failed\n", __FUNCTION__);
+			    }
+			    break;
+		    case DIMID_OUTIFACE:
+			    if (hpdev_get_name(r->r.first_match[i].left,
+					       r->outdev) < 0) {
+				    printk(KERN_ERR "%s: interface name look"
+					   "up failed\n", __FUNCTION__);
+			    }
+			    break;
+		}
+	}
+
+	/* prepare iptables matches/target for userspace */
+	if (HAS_IPT_MATCH(&r->r)) {
+		struct ipt_entry_match *m, *end;
+		m = FIRST_IPT_MATCH(&r->r);
+		end = IPT_MATCH_END(&r->r);
+		for (; m < end; m = NEXT_IPT_MATCH(m)) {
+			strncpy(m->u.user.name, m->u.kernel.match->name,
+				sizeof(m->u.user.name));
+		}
+	}
+	if (HAS_IPT_TARGET(&r->r)) {
+		struct ipt_entry_target *t;
+		t = IPT_TARGET(&r->r);
+		strncpy(t->u.user.name, t->u.kernel.target->name,
+			sizeof(t->u.user.name));
+	}
+
+	*len -= size;
+	return (char *) r + size;
+}
+
+static inline void *
+nlhp_list_chain(struct nfhp_list_chain *c, int pos, int *len)
+{
+	if (*len < sizeof(*c)) {
+		return NULL;
+	}
+	strncpy(c->label, linfo.inf[pos].label, sizeof(c->label));
+	c->label[sizeof(c->label) - 1] = '\0';
+	c->policy = linfo.inf[pos].policy;
+	c->rule_num = linfo.inf[pos].rule_num;
+	/* TEMPORARY FIX: the current implementation produces incorrect
+	                  counter values for chains; therefore we set
+	                  the counters to 0 here to avoid confusion;
+			  once the issue is fixed we replace the lines
+			  by:
+			  c->packet_ct = linfo.inf[pos].packet_ct;
+			  c->byte_ct = linfo.inf[pos].byte_ct; */
+	c->packet_ct = 0;
+	c->byte_ct = 0;
+	*len -= sizeof(*c);
+	return c + 1;
+}
+
+static inline int
+nlhp_list_next_rule(struct sk_buff *skb, struct hipac_rule *prev,
+		    struct hipac_rule **rule, int pos)
+{
+	int stat;
+
+	stat = hipac_get_next_rule(&linfo.inf[pos], prev, rule);
+	switch (stat) {
+	case HE_OK:
+		return 0;
+	case HE_RULE_NOT_EXISTENT:
+		*rule = NULL;
+		return 0;
+	default:
+		if (unlikely(stat > 0)) {
+			/* this should never happen */
+			printk(KERN_ERR "%s: hipac_get_next_rule returned "
+			       "status > 0\n", __FUNCTION__);
+			stat = -stat;
+		}
+		return stat;
+	}
+}
+
+/* callback function for CMD_LIST and CMD_LIST_COUNTER command */
+static int
+nlhp_list(struct sk_buff *skb, struct netlink_callback *cb)
+{
+	static u32 pos;
+	static struct hipac_rule *rule;
+	struct nlmsghdr *nlh;
+	int len, total, stat;
+	void *data;
+
+	total = skb_tailroom(skb) - NLMSG_SPACE(0);
+	switch (cb->args[0]) {
+	    case 0:
+		    /* first callback in the series */
+		    down(&nlhp_listing_lock);
+		    pos = 0;
+		    rule = NULL;
+		    data = NLMSG_DATA(skb->data);
+		    len = total;
+		    cb->args[0] = 1;
+		    break;
+	    case 1:
+		    /* pos, rule represent the current state */
+		    data = NLMSG_DATA(skb->data);
+		    len = total;
+		    break;
+	    default:
+		    return 0;
+	}
+
+	while (1) {
+		if (rule == NULL) {
+			/* send chain info */
+			data = nlhp_list_chain(data, pos, &len);
+			if (data == NULL) {
+				/* skb full - chain sent next time */
+				break;
+			}
+			stat = nlhp_list_next_rule(skb, NULL, &rule, pos);
+			if (stat < 0) {
+				/* rule listing aborted due to error */
+				return stat;
+			}
+		} else {
+			/* send next rule */
+			data = nlhp_list_rule(data, rule, &len);
+			if (data == NULL) {
+				/* skb full - rule sent next time */
+				break;
+			}
+			stat = nlhp_list_next_rule(skb, rule, &rule, pos);
+			if (stat < 0) {
+				/* rule listing aborted due to error */
+				return stat;
+			}
+		}
+		if (rule == NULL) {
+			if (++pos == linfo.len) {
+				/* we are done */
+				cb->args[0] = 2;
+				break;
+			}
+		}
+	}
+	nlh = NLMSG_PUT(skb, peerpid, 0, NLHP_TYPE, total - len);
+	nlh->nlmsg_flags |= NLM_F_MULTI;
+	return NLMSG_SPACE(total - len);
+
+ nlmsg_failure:
+	skb_trim(skb, skb->tail - skb->data);
+	return NFHE_ILL;
+}
+
+static int
+nlhp_done(struct netlink_callback *cb)
+{
+	if (hipac_free_chain_infos(linfo.inf) != HE_OK) {
+		/* this should never happen */
+		printk(KERN_ERR "%s: hipac_free_chain_info failed\n",
+		       __FUNCTION__);
+	}
+	linfo.inf = NULL;
+	linfo.len = 0;
+	if (cb->args[0]) {
+		up(&nlhp_listing_lock);
+	}
+	return 0;
+}
+
+static void
+do_cmd(struct sk_buff *skb, int msg_len, struct sk_buff *reply);
+
+static inline void
+nlhp_chk_user_skb(struct sk_buff *skb, struct sk_buff *reply)
+{
+	struct nlmsghdr *nlh = (struct nlmsghdr *) skb->data;
+
+	if (skb->len < sizeof(struct nlmsghdr) ||
+	    nlh->nlmsg_len < sizeof(struct nlmsghdr) ||
+	    skb->len < nlh->nlmsg_len ||
+	    nlh->nlmsg_pid <= 0 ||
+	    nlh->nlmsg_type != NLHP_TYPE ||
+	    nlh->nlmsg_flags & NLM_F_MULTI ||
+	    !(nlh->nlmsg_flags & NLM_F_REQUEST) ||
+	    !(nlh->nlmsg_flags & NLM_F_ACK)) {
+		nlhp_send_reply(reply, NFHE_NOMSG, NULL);
+		return;
+	}
+	if (nlh->nlmsg_flags & MSG_TRUNC) {
+		nlhp_send_reply(reply, ERRNO_TO_NFHE(ECOMM), NULL);
+		return;
+	}
+	if(!cap_raised(NETLINK_CB(skb).eff_cap, CAP_NET_ADMIN)) {
+		nlhp_send_reply(reply, ERRNO_TO_NFHE(EPERM), NULL);
+		return;
+	}
+	peerpid = nlh->nlmsg_pid;
+	do_cmd(skb, skb->len - NLMSG_LENGTH(0), reply);
+}
+
+static void
+nlhp_recv_user_skb(struct sock *sk, int len)
+{
+	struct sk_buff *skb, *reply;
+	
+	down(&nlhp_lock);
+	while ((skb = skb_dequeue(&sk->receive_queue)) != NULL) {
+		reply = nlhp_new_reply();
+		if (reply == NULL) {
+			printk(KERN_ERR "reply skb cannot be allocated\n");
+		} else {
+			down(&nlhp_listing_lock);
+			up(&nlhp_listing_lock);
+			/* now we can be sure that we don't compete with
+			   an ongoing listing operation */
+			nlhp_chk_user_skb(skb, reply);
+		}
+		kfree_skb(skb);
+	}
+	up(&nlhp_lock);
+}
+
+
+/*
+ * request handling
+ */
+
+static int
+cmd_check_init_native_matches(struct nfhp_rule *rule, int inc_modct,
+			      int *inc_cthelp)
+{
+	u32 dimbitv = 0;
+	u8 frag_match = 0;
+	u16 proto_match = 0;
+	struct ipt_entry *e = NULL;
+	struct hipac_rule *r = &rule->r;
+	int i, ifindex, stat;
+	u8 dimid, inv, devbf;
+	u32 left, right;
+	
+	devbf = (rule->indev[0] != '\0');
+	devbf |= (rule->outdev[0] != '\0') << 1;
+	if (HAS_IPT_ENTRY(r)) {
+		/* as nf-hipac does not care about ipt_entry we just fill in
+		   the info needed by the existing modules */
+		e = IPT_ENTRY(r);
+		memset(&e->ip, 0, sizeof(e->ip));
+		if (devbf & 1) {
+			strncpy(e->ip.iniface, rule->indev,
+				sizeof(e->ip.iniface));
+			memset(e->ip.iniface_mask, 0xff,
+			       strlen(rule->indev) + 1);
+		}
+		if (devbf & 2) {
+			strncpy(e->ip.outiface, rule->outdev,
+				sizeof(e->ip.outiface));
+			memset(e->ip.outiface_mask, 0xff,
+			       strlen(rule->outdev) + 1);
+		}
+		e->nfcache = 0;
+		e->comefrom = 0;
+		memset(&e->counters, 0, sizeof(e->counters));
+	}
+	for (i = 0; i < r->native_mct; i++) {
+		r->first_match[i].invert = !!r->first_match[i].invert;
+		dimid = r->first_match[i].dimid;
+		inv = r->first_match[i].invert;
+		left = r->first_match[i].left;
+		right = r->first_match[i].right;
+		if (i > 0 && dimid <= r->first_match[i - 1].dimid) {
+			return NFHE_SORT;
+		}
+		if (left > right || right > hipac_maxkey(dim2btype[dimid])) {
+			return NFHE_MINT;
+		}
+		dimbitv |= 1 << dimid;
+		switch (dimid) {
+		    case DIMID_INIFACE:
+			    if (!(devbf & 1)) {
+				    return NFHE_DEVA;
+			    }
+			    ifindex = hpdev_get_index(rule->indev);
+			    if (ifindex < 0) {
+				    return ifindex;
+			    }
+			    if (e != NULL && inv) {
+				    e->ip.invflags |= IPT_INV_VIA_IN;
+			    }
+			    devbf &= 0xfe;
+			    r->origin &= NFHP_ORIGIN_INPUT |
+				    NFHP_ORIGIN_FORWARD;
+			    /* initialize interface match */
+			    r->first_match[i].left = ifindex;
+			    r->first_match[i].right = ifindex;
+			    break;
+		    case DIMID_OUTIFACE:
+			    if (!(devbf & 2)) {
+				    return NFHE_DEVA;
+			    }
+			    ifindex = hpdev_get_index(rule->outdev);
+			    if (ifindex < 0) {
+				    return ifindex;
+			    }
+			    if (e != NULL && inv) {
+				    e->ip.invflags |= IPT_INV_VIA_OUT;
+			    }
+			    devbf &= 0xfd;
+			    r->origin &= NFHP_ORIGIN_OUTPUT |
+				    NFHP_ORIGIN_FORWARD;
+			    /* initialize interface match */
+			    r->first_match[i].left = ifindex;
+			    r->first_match[i].right = ifindex;
+			    break;
+		    case DIMID_PROTO:
+			    if (left != right) {
+				    return NFHE_PROTO;
+			    }
+			    if (!inv) {
+				    proto_match = left;
+			    }
+			    if (e != NULL) {
+				    e->ip.proto = r->first_match[i].left;
+				    if (inv) {
+					    e->ip.invflags |= IPT_INV_PROTO;
+				    }
+			    }
+			    break;
+		    case DIMID_FRAGMENT:
+			    if (inv || (left != right && left == 0)) {
+				    return NFHE_FRAG;
+			    }
+			    if (e != NULL) {
+				    e->ip.flags = IPT_F_FRAG;
+			    }
+			    if (left > 0) {
+				    r->first_match[i].left = 1;
+				    r->first_match[i].right =
+					    hipac_maxkey(dim2btype[dimid]);
+			    } else {
+				    frag_match = 1;
+				    if (e != NULL) {
+					    e->ip.invflags |= IPT_INV_FRAG;
+				    }
+			    }
+			    break;
+		    case DIMID_TCP_FLAGS:
+			    if (inv || (left != right && left == 0)) {
+				    return NFHE_TFLAGS;
+			    }
+			    if (left > 0) {
+				    r->first_match[i].left = 1;
+				    r->first_match[i].right =
+					    hipac_maxkey(dim2btype[dimid]);
+			    }
+			    break;
+		    case DIMID_STATE:
+			    if (left != right ||
+				left > NFHP_STATE_NUM_VALID + 1) {
+				    return NFHE_STATE;
+			    }
+			    if (inc_modct) {
+				    stat = cthelp_use();
+				    if (stat < 0) {
+					    return stat;
+				    }
+				    (*inc_cthelp)++;
+			    }
+			    break;
+		}
+	}
+	if (devbf != 0) {
+		return NFHE_DEVB;
+	}
+
+	/* check inter-match dependencies */
+	if (dimbitv & (1 << DIMID_TCP_DPORT) ||
+	    dimbitv & (1 << DIMID_TCP_SPORT) ||
+	    dimbitv & (1 << DIMID_TCP_FLAGS)) {
+		if (proto_match != IPPROTO_TCP || !frag_match ||
+		    dimbitv & (1 << DIMID_UDP_DPORT) || 
+		    dimbitv & (1 << DIMID_UDP_SPORT) ||
+		    dimbitv & (1 << DIMID_ICMP_TYPE)) {
+			return NFHE_TCP;
+		}
+	} else if (dimbitv & (1 << DIMID_UDP_DPORT) ||
+		   dimbitv & (1 << DIMID_UDP_SPORT)) {
+		if (proto_match != IPPROTO_UDP || !frag_match ||
+		    dimbitv & (1 << DIMID_ICMP_TYPE)) {
+			return NFHE_UDP;
+		}
+	} else if (dimbitv & (1 << DIMID_ICMP_TYPE) &&
+		   (proto_match != IPPROTO_ICMP || !frag_match)) {
+		return NFHE_ICMP;
+	}
+	return 0;
+}
+
+static inline u32
+origin_to_hookmask(u32 origin)
+{
+	return (origin & NFHP_ORIGIN_INPUT ? 1 << NF_IP_LOCAL_IN : 0) |
+	       (origin & NFHP_ORIGIN_FORWARD ? 1 << NF_IP_FORWARD : 0) |
+	       (origin & NFHP_ORIGIN_OUTPUT ? 1 << NF_IP_LOCAL_OUT : 0);
+}
+
+static int
+cmd_check_init_ipt_matches(struct hipac_rule *r, int len, u16 **cmp,
+			   int *cmp_len, int inc_modct, int *num_done)
+{
+	struct ipt_entry_match *match;
+	int stat;
+	
+	match = FIRST_IPT_MATCH_IE(r);
+	while (len >= sizeof(*match) && len >= match->u.match_size) {
+		if (match->u.match_size != IPT_ALIGN(match->u.match_size)) {
+			return NFHE_IPTMSZ;
+		}
+		if (*cmp != NULL) {
+			if (*cmp_len < sizeof(**cmp)) {
+				return NFHE_CMPSH;
+			}
+			if (**cmp > match->u.match_size - sizeof(*match)) {
+				return NFHE_CMPLA;
+			}
+		}
+
+		/* this is really ugly but we have to hardcode the maximum
+		   allowed origin bit vector since the actual origin of this
+		   rule might change after another rule has been inserted;
+		   in order to dynamically handle this setting a module would
+		   be required to be asked for its maximum allowed origin bit
+		   vector */
+		if (!strcmp(match->u.user.name, "mac")) {
+			r->origin &= NFHP_ORIGIN_FORWARD | NFHP_ORIGIN_INPUT;
+		} else if (!strcmp(match->u.user.name, "owner")) {
+			r->origin &= NFHP_ORIGIN_OUTPUT;
+		} else if (!strcmp(match->u.user.name, "owner-socketlookup")) {
+			r->origin &= NFHP_ORIGIN_INPUT | NFHP_ORIGIN_OUTPUT;
+		}
+		if (r->origin == 0) {
+			return NFHE_ORIGIN;
+		}
+		
+		if (inc_modct) {
+			if (r->action == TARGET_CHAIN) {
+				/* TEMPORARY FIX: since hipac currently treats
+				     jump rules in a way that leads to problems
+				     with stateful ipt_matches we restrict
+				     ourselves to certain known stateless
+				     ipt_matches; if you absolutely need a jump
+				     rule with another stateless ipt_match you
+				     are free to add its name here after but
+				     make sure that it is __really__
+				     stateless */
+				if (strcmp(match->u.user.name, "ah") &&
+				    strcmp(match->u.user.name, "dscp") &&
+				    strcmp(match->u.user.name, "ecn") &&
+				    strcmp(match->u.user.name, "esp") &&
+				    strcmp(match->u.user.name, "length") &&
+				    strcmp(match->u.user.name, "mac") &&
+				    strcmp(match->u.user.name, "owner") &&
+				    strcmp(match->u.user.name, "pkttype") &&
+				    strcmp(match->u.user.name, "tcpmss") &&
+				    strcmp(match->u.user.name, "tos") &&
+				    strcmp(match->u.user.name, "unclean")) {
+					return NFHE_IMPL;
+				}
+			}
+			stat = ipt_init_match(match);
+			if (stat < 0) {
+				return ERRNO_TO_NFHE(-stat);
+			}
+			if (match->u.kernel.match->checkentry &&
+			    !match->u.kernel.match->checkentry(
+				    "filter", &IPT_ENTRY(r)->ip, match->data,
+				    match->u.match_size - sizeof(*match),
+				    origin_to_hookmask(r->origin))) {
+				if (match->u.kernel.match->me) {
+					__MOD_DEC_USE_COUNT(
+						match->u.kernel.match->me);
+				}
+				return NFHE_IPTMCH;
+			}
+		}
+		(*num_done)++;
+		len -= match->u.match_size;
+		match = NEXT_IPT_MATCH(match);
+		if (*cmp != NULL) {
+			(*cmp_len) -= sizeof(**cmp);
+			(*cmp)++;
+		}
+	}
+	if (len > 0) {
+		return NFHE_TOFF;
+	}
+	return 0;
+}
+
+static int
+cmd_check_init_ipt_target(struct hipac_rule *r, int len, u16 *cmp,
+			  int cmp_len, int inc_modct, int *done)
+{
+	struct ipt_entry_target *target;
+	int stat;
+	
+	target = IPT_TARGET_IE(r);
+	if (len < sizeof(*target) || len < target->u.target_size ||
+	    target->u.target_size != IPT_ALIGN(target->u.target_size)) {
+		return NFHE_IPTTSZ;
+	}
+	if (cmp != NULL) {
+		if (cmp_len < sizeof(*cmp)) {
+			return NFHE_CMPSH;
+		}
+		if (*cmp > target->u.target_size - sizeof(*target)) {
+			return NFHE_CMPLA;
+		}
+	}
+
+	/* this is really ugly but we have to hardcode the maximum allowed
+	   origin bit vector since the actual origin of this rule might
+	   change after another rule has been inserted;
+	   in order to dynamically handle this setting a module would be 
+	   required to be asked for its maximum allowed origin bit vector */
+	if (!strcmp(target->u.user.name, "MIRROR")) {
+		r->origin &= NFHP_ORIGIN_FORWARD | NFHP_ORIGIN_INPUT;
+	} else if (!strcmp(target->u.user.name, "TCPMSS")) {
+		r->origin &= NFHP_ORIGIN_FORWARD | NFHP_ORIGIN_OUTPUT;
+	} else if (!strcmp(target->u.user.name, "TARPIT")) {
+		r->origin &= NFHP_ORIGIN_FORWARD | NFHP_ORIGIN_INPUT;
+	}
+	if (r->origin == 0) {
+		return NFHE_ORIGIN;
+	}
+
+	if (inc_modct) {
+		stat = ipt_init_target(target);
+		if (stat < 0) {
+			return ERRNO_TO_NFHE(-stat);
+		}
+		if (target->u.kernel.target->checkentry &&
+		    !target->u.kernel.target->checkentry(
+			    "filter", IPT_ENTRY(r), target->data,
+			    target->u.target_size - sizeof(*target),
+			    origin_to_hookmask(r->origin))) {
+			if (target->u.kernel.target->me) {
+				__MOD_DEC_USE_COUNT(
+					target->u.kernel.target->me);
+			}
+			return NFHE_IPTTCH;
+		}
+	}
+	(*done)++;
+	len -= target->u.target_size;
+	if (len > 0) {
+		/* netlink message contains unnecessary padding between the
+		   end of the ipt target and the beginning of the cmp_len
+		   array */
+		r->size -= len;
+	}
+	return 0;
+}
+
+static void
+cmd_cleanup(struct hipac_rule *r, int inc_cthelp, int num_matches, int target)
+{
+	struct ipt_entry_match *m;
+	struct ipt_entry_target *t;
+	int i;
+
+	if (inc_cthelp) {
+		cthelp_unuse();
+	}
+	for (m = FIRST_IPT_MATCH_IE(r), i = 0; i < num_matches;
+	     m = NEXT_IPT_MATCH(m), i++) {
+		if (m->u.kernel.match->destroy) {
+			m->u.kernel.match->destroy(m->data, m->u.match_size -
+						   sizeof(*m));
+		}
+		if (m->u.kernel.match->me) {
+			__MOD_DEC_USE_COUNT(m->u.kernel.match->me);
+		}
+	}
+	if (target) {
+		t = IPT_TARGET_IE(r);
+		if (t->u.kernel.target->destroy) {
+			t->u.kernel.target->destroy(
+				t->data, t->u.target_size - sizeof(*t));
+		}
+		if (t->u.kernel.target->me) {
+			__MOD_DEC_USE_COUNT(t->u.kernel.target->me);
+		}
+	}
+}
+
+static int
+cmd_check_init(struct nfhp_cmd *cmd, int msg_len)
+{
+	u16 *cmp = NULL;
+	int inc_cthelp = 0, num_matches = 0, target = 0, cmp_len = 0;
+	int stat, len, inc_modct;
+	struct hipac_rule *r;
+	u32 c;
+	
+	if (msg_len < sizeof(*cmd)) {
+		return NFHE_NOMSG;
+	}
+
+	/* basic checks */
+	c = cmd->cmd;
+	inc_modct = (c == CMD_APPEND || c == CMD_INSERT || c == CMD_REPLACE);
+	if (c < CMD_MIN || c > CMD_MAX) {
+		return NFHE_CMD;
+	}
+	cmd->chain.label[HIPAC_CHAIN_NAME_MAX_LEN - 1] = '\0';
+	cmd->chain.newlabel[HIPAC_CHAIN_NAME_MAX_LEN - 1] = '\0';
+	if (cmd->chain.label[0] == '\0' &&
+	    !(c == CMD_ZERO_COUNTERS || c == CMD_FLUSH ||
+	      c == CMD_DELETE_CHAIN || c == CMD_LIST ||
+	      c == CMD_LIST_COUNTER)) {
+		return NFHE_LABEL;
+	}
+	if (c == CMD_RENAME_CHAIN && cmd->chain.newlabel[0] == '\0') {
+		return NFHE_NLABEL;
+	}
+	if (c == CMD_SET_POLICY && cmd->chain.policy != TARGET_ACCEPT &&
+	    cmd->chain.policy != TARGET_DROP) {
+		return NFHE_POLICY;
+	}
+	if (!(c == CMD_APPEND || c == CMD_INSERT || c == CMD_DELETE_RULE ||
+	      c == CMD_DELETE_POS || c == CMD_REPLACE)) {
+		/* we are finished since cmd->rule is irrelevant */
+		return 0;
+	}
+
+	/* rule checks */
+	r = &cmd->rule.r;
+	cmd->rule.indev[IFNAMSIZ - 1] = '\0';
+	cmd->rule.outdev[IFNAMSIZ - 1] = '\0';
+	/* r->packet_ct and r->byte_ct may be set freely */
+	r->origin = NFHP_ORIGIN_INPUT | NFHP_ORIGIN_FORWARD |
+		NFHP_ORIGIN_OUTPUT;
+	/* TEMPORARY FIX: TARGET_RETURN is not yet implemented */
+	if (r->action == TARGET_RETURN) {
+		return NFHE_IMPL;
+	}
+	if (!(r->action == TARGET_ACCEPT || r->action == TARGET_DROP ||
+	      r->action == TARGET_NONE || r->action == TARGET_RETURN ||
+	      r->action == TARGET_EXEC || r->action == TARGET_CHAIN)) {
+		return NFHE_ACTION;
+	}
+	if (r->native_mct > NUMBER_OF_DIM) {
+		return NFHE_NMCT;
+	}
+	if (HAS_IPT_ENTRY(r)) {
+		struct ipt_entry *e = IPT_ENTRY(r);
+		if (e->target_offset > e->next_offset ||
+		    e->target_offset < sizeof(*e) ||
+		    offsetof(struct nfhp_cmd, rule.e) + 
+		    e->next_offset > msg_len) {
+			return NFHE_IEOFF;
+		}
+		/* assume target_offset/next_offset are correct; if they prove
+		   to be wrong we reject the packet anyway;
+		   the values are chosen to be correct for the target of 
+		   hipac_copy_constructor */
+		if (HAS_IPT_MATCH(r)) {
+			r->match_offset = IPT_ALIGN(sizeof(*r) +
+						    r->native_mct *
+						    sizeof(*r->first_match));
+			r->target_offset = (e->target_offset - sizeof(*e)) +
+				r->match_offset;
+		} else {
+			if (e->target_offset != sizeof(*e)) {
+				return NFHE_IEOFF;
+			}
+			r->match_offset = 0;
+			if (HAS_CHAIN_TARGET(r)) {
+				r->target_offset = sizeof(*r) + r->native_mct *
+					sizeof(*r->first_match);
+			} else {
+				r->target_offset =
+					IPT_ALIGN(sizeof(*r) +
+						  r->native_mct *
+						  sizeof(*r->first_match));
+			}
+		}
+		r->size = (e->next_offset - sizeof(*e)) + r->target_offset;
+	} else {
+		/* no iptables matches/target, no chain target */
+		r->size = sizeof(*r) + r->native_mct * sizeof(*r->first_match);
+		r->match_offset = r->target_offset = 0;
+	}
+
+       	/* check the native matches */
+	stat = cmd_check_init_native_matches(&cmd->rule, inc_modct,
+					     &inc_cthelp);
+	if (stat < 0) {
+		goto error;
+	}
+
+	/* set maximum size of cmp_len based on r->size */
+	if (HAS_CMP_LEN(c, r)) {
+		cmp = CMP_LEN(r);
+		cmp_len = msg_len - ((char *) cmp - (char *) cmd);
+		if (cmp_len <= 0) {
+			stat = NFHE_CMPMIS;
+			goto error;
+		}
+	}
+
+	/* check and initialize ipt matches */
+	if (HAS_IPT_MATCH(r)) {
+		len = r->target_offset - r->match_offset;
+		stat = cmd_check_init_ipt_matches(r, len, &cmp, &cmp_len,
+						  inc_modct, &num_matches);
+		if (stat < 0) {
+			goto error;
+		}
+	}
+
+	/* check and initialize ipt target / chain target */
+	if (HAS_IPT_TARGET(r)) {
+		len = r->size - r->target_offset;
+		if (len <= 0) {
+			stat = NFHE_IPTTMI;
+			goto error;
+		}
+		stat = cmd_check_init_ipt_target(r, len, cmp, cmp_len,
+						 inc_modct, &target);
+		if (stat < 0) {
+			goto error;
+		}
+	} else if (HAS_CHAIN_TARGET(r)) {
+		char *chain = CHAIN_TARGET_IE(r);
+		u32 real_len;
+		len = r->size - r->target_offset;
+		if (len <= 0 || chain[0] == '\0') {
+			stat = NFHE_CHAINE;
+			goto error;
+		}
+		real_len = strnlen(chain, len);
+		if (len > HIPAC_CHAIN_NAME_MAX_LEN || real_len == len) {
+			stat = NFHE_CHAINL;
+			goto error;
+		}
+		/* we have to reserve HIPAC_CHAIN_NAME_MAX_LEN bytes for
+		   the chain label */
+		r->size += HIPAC_CHAIN_NAME_MAX_LEN - len;
+	}
+
+	/* rule _syntactically_ correct; it might still be invalid because
+	   of a violation of the hipac semantics */
+	return 0;
+
+ error:
+	cmd_cleanup(r, inc_cthelp, num_matches, target);
+	return stat;
+}
+
+static void
+do_cmd(struct sk_buff *skb, int msg_len, struct sk_buff *reply)
+{
+	struct nlmsghdr *nlh = (struct nlmsghdr *) skb->data;
+	struct nfhp_cmd *cmd = (struct nfhp_cmd *) NLMSG_DATA(nlh);
+	char *chain_label;
+	int stat;
+
+	stat = cmd_check_init(cmd, msg_len);
+	if (stat < 0) {
+		nlhp_send_reply(reply, stat, NULL);
+		return;
+	}
+	if (cmd->chain.label[0] == '\0') {
+		chain_label = NULL;
+	} else {
+		chain_label = cmd->chain.label;
+	}
+
+	switch (cmd->cmd) {
+	    case CMD_APPEND:
+		    stat = hipac_append(chain_label, &cmd->rule.r);
+		    if (stat != HE_OK) {
+			    hipac_destroy_exec_nl(&cmd->rule.r);
+		    }
+		    nlhp_send_reply(reply, stat, hipac_get_error_message());
+		    break;
+	    case CMD_INSERT:
+		    stat = hipac_insert(chain_label, &cmd->rule.r);
+		    if (stat != HE_OK) {
+			    hipac_destroy_exec_nl(&cmd->rule.r);
+		    }
+		    nlhp_send_reply(reply, stat, hipac_get_error_message());
+		    break;
+	    case CMD_DELETE_RULE:
+		    stat = hipac_delete(chain_label, &cmd->rule.r);
+		    nlhp_send_reply(reply, stat, hipac_get_error_message());
+		    break;
+	    case CMD_DELETE_POS:
+		    stat = hipac_delete_pos(chain_label, cmd->rule.r.pos);
+		    nlhp_send_reply(reply, stat, hipac_get_error_message());
+		    break;
+	    case CMD_REPLACE:
+		    stat = hipac_replace(chain_label, &cmd->rule.r);
+		    if (stat != HE_OK) {
+			    hipac_destroy_exec_nl(&cmd->rule.r);
+		    }
+		    nlhp_send_reply(reply, stat, hipac_get_error_message());
+		    break;
+	    case CMD_ZERO_COUNTERS:
+		    stat = hipac_zero_counters(chain_label);
+		    nlhp_send_reply(reply, stat, hipac_get_error_message());
+		    break;
+	    case CMD_FLUSH:
+		    stat = hipac_flush_chain(chain_label);
+		    nlhp_send_reply(reply, stat, hipac_get_error_message());
+		    break;
+	    case CMD_NEW_CHAIN:
+		    stat = hipac_new_chain(chain_label);
+		    nlhp_send_reply(reply, stat, hipac_get_error_message());
+		    break;
+	    case CMD_DELETE_CHAIN:
+		    stat = hipac_delete_chain(chain_label);
+		    nlhp_send_reply(reply, stat, hipac_get_error_message());
+		    break;
+	    case CMD_RENAME_CHAIN:
+		    stat = hipac_rename_chain(chain_label,
+					      cmd->chain.newlabel);
+		    nlhp_send_reply(reply, stat, hipac_get_error_message());
+		    break;
+	    case CMD_SET_POLICY:
+		    stat = hipac_set_policy(chain_label, cmd->chain.policy);
+		    nlhp_send_reply(reply, stat, hipac_get_error_message());
+		    break;
+	    case CMD_LIST:
+	    case CMD_LIST_COUNTER: {
+		    struct netlink_callback cb = {skb, nlh, nlhp_list,
+						  nlhp_done, PF_NETLINK, {0},
+						  reply, reply_skb_size};
+		    stat = hipac_get_chain_infos(chain_label,
+						 cmd->cmd == CMD_LIST_COUNTER,
+						 &linfo.inf, &linfo.len);
+		    if (stat < 0) {
+			    nlhp_send_list_err(reply, stat);
+			    return;
+		    }
+		    if (SKB_LEN(reply) < reply_skb_size - NLMSG_LENGTH(0)) {
+			    cb.reply = NULL;
+			    kfree_skb(reply);
+		    }
+		    if (netlink_dump_start_cb(nfhp_sock, &cb) < 0) {
+			    printk(KERN_ERR "netlink_dump_start_cb failed\n");
+			    kfree_skb(reply);
+		    }
+		    break;
+	    }
+	    default:
+		    printk(KERN_ERR "invalid command type although "
+			   "cmd_check_init reported a valid command\n");
+		    nlhp_send_reply(reply, NFHE_NOMSG, NULL);
+		    break;
+	}
+}
+
+
+/*
+ * initialization, finalization
+ */
+
+static int
+__init init(void)
+{
+	struct sysinfo sys;
+	u64 total_mem;
+	int ret;
+
+	si_meminfo(&sys);
+	total_mem = (u64) sys.totalram << PAGE_SHIFT;
+
+	/* initialize hipac layer */
+	if (hipac_init(dim2btype, extract,
+		       sizeof(dim2btype) / sizeof(*dim2btype),
+		       hipac_copy_constructor, hipac_destroy_exec,
+		       hipac_match_exec, hipac_target_exec, hipac_eq_exec,
+		       total_mem >> 1) != HE_OK) {
+		printk(KERN_ERR "nf_hipac: initialization failed: unable to "
+		       "initialize hipac algorithm\n");
+		return -ENOMEM;
+	}
+	if (hipac_new("INPUT", "__/INPUT_INTERN\\__", TARGET_ACCEPT,
+		      NFHP_ORIGIN_INPUT, &hipac_input) != HE_OK) {
+		printk(KERN_ERR "nf_hipac: initialization failed: unable to "
+		       "create hipac data structure for input hook\n");
+		ret = -ENOMEM;
+		goto cleanup_hipac;
+	}
+	if (hipac_new("FORWARD", "__/FORWARD_INTERN\\__", TARGET_ACCEPT,
+		      NFHP_ORIGIN_FORWARD, &hipac_forward) != HE_OK) {
+		printk(KERN_ERR "nf_hipac: initialization failed: unable to "
+		       "create hipac data structure for forward hook\n");
+		ret = -ENOMEM;
+		goto cleanup_hipac;
+	}
+	if (hipac_new("OUTPUT", "__/OUTPUT_INTERN\\__", TARGET_ACCEPT,
+		      NFHP_ORIGIN_OUTPUT, &hipac_output) != HE_OK) {
+		printk(KERN_ERR "nf_hipac: initialization failed: unable to "
+		       "create hipac data structure for output hook\n");
+		ret = -ENOMEM;
+		goto cleanup_hipac;
+	}
+
+	/* register to netfilter */
+	if ((ret = nf_register_hook(&input_op)) < 0) {
+		printk(KERN_ERR "nf_hipac: initialization failed: unable to "
+		       "register input hook\n");
+		goto cleanup_hipac;
+	}
+	if ((ret = nf_register_hook(&forward_op)) < 0) {
+		printk(KERN_ERR "nf_hipac: initialization failed: unable to "
+		       "register forward hook\n");
+		goto cleanup_input;
+	}
+	if ((ret = nf_register_hook(&output_op)) < 0) {
+		printk(KERN_ERR "nf_hipac: initialization failed: unable to "
+		       "register output hook\n");
+		goto cleanup_forward;
+	}
+
+	/* initialize interface manager */
+	if ((ret = hpdev_init()) != 0) {
+		printk(KERN_ERR "nf_hipac: initialization failed: unable to "
+		       "initialize device management\n");
+		goto cleanup_output;
+	}
+
+	/* initialize proc interface */
+	hpproc_init(total_mem);
+
+	/* increment ip_tables' module counter */
+	ret = ipt_register_target(&nfhp_dummy_target);
+	if (ret < 0) {
+		goto cleanup_hpproc;
+	}
+
+	/* enable netlink user communication */
+	nfhp_sock = netlink_kernel_create(NLHP_PROTO, nlhp_recv_user_skb);
+	if (nfhp_sock == NULL) {
+		printk(KERN_ERR "nf_hipac: initialization failed: unable to "
+		       "create kernel netlink socket\n");
+		ret = -ENOMEM;
+		goto cleanup_ipt;
+	}
+
+	printk(KERN_INFO "nf_hipac: (C) 2002-2003 HIPAC core team "
+	       "(Michael Bellion, Thomas Heinz)\n");
+	return 0;
+
+ cleanup_ipt:
+	ipt_unregister_target(&nfhp_dummy_target);
+ cleanup_hpproc:
+	hpproc_exit();
+	hpdev_exit();
+ cleanup_output:
+	nf_unregister_hook(&output_op);
+ cleanup_forward:
+	nf_unregister_hook(&forward_op);
+ cleanup_input:
+	nf_unregister_hook(&input_op);
+ cleanup_hipac:
+	hipac_exit();
+	return ret;	
+}
+
+static void
+__exit fini(void)
+{
+	if (nfhp_sock == NULL ||
+	    nfhp_sock->socket == NULL) {
+		/* this should never happen but in fact it did once on a
+		   sparc64 */
+		printk(KERN_ERR "nfhp_sock is broken\n");
+	} else {
+		sock_release(nfhp_sock->socket);
+	}
+	ipt_unregister_target(&nfhp_dummy_target);
+	hpproc_exit();
+	hpdev_exit();
+	nf_unregister_hook(&input_op);
+	nf_unregister_hook(&forward_op);
+	nf_unregister_hook(&output_op);
+	hipac_exit();
+}
+
+
+module_init(init);
+module_exit(fini);
+MODULE_AUTHOR("Michael Bellion and Thomas Heinz");
+MODULE_DESCRIPTION("NF-HIPAC - netfilter high performance "
+		   "packet classification");
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 10)
+MODULE_LICENSE("GPL");
+#endif
+
+EXPORT_SYMBOL(nfhp_register_cthelp);
+EXPORT_SYMBOL(nfhp_unregister_cthelp);
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/net/ipv4/netfilter/nf-hipac/nfhp_mod.h linux-2.4.20-wolk4.4-fullkernel/net/ipv4/netfilter/nf-hipac/nfhp_mod.h
--- linux-2.4.20-wolk4.3-fullkernel/net/ipv4/netfilter/nf-hipac/nfhp_mod.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/net/ipv4/netfilter/nf-hipac/nfhp_mod.h	2003-07-30 11:23:31.000000000 +0200
@@ -0,0 +1,53 @@
+/*
+ * High performance packet classification module for netfilter
+ *
+ * Authors: Michael Bellion and Thomas Heinz
+ * (c) 2002-2003 by the hipac core team <nf@hipac.org>:
+ *      +-----------------------+----------------------+
+ *      |   Michael Bellion     |     Thomas Heinz     |
+ *      | <mbellion@hipac.org>  |  <creatix@hipac.org> |
+ *      +-----------------------+----------------------+
+ * Licenced under the GNU General Public Licence, version >= 2.
+ */
+
+
+#ifndef _NFHP_MOD_H
+#define _NFHP_MOD_H
+
+#include <linux/module.h>
+#include <asm/semaphore.h>
+
+/* use these macros to protect hipac api calls */
+#define HIPAC_LOCK                \
+do {                              \
+	down(&nlhp_lock);         \
+	down(&nlhp_listing_lock); \
+	up(&nlhp_listing_lock);   \
+} while (0)
+
+#define HIPAC_UNLOCK up(&nlhp_lock)
+
+/* hipac data structures for INPUT, FORWARD and OUTPUT hook and the
+   corresponding netfilter hook ops */
+extern void *hipac_input;
+extern struct nf_hook_ops input_op;
+
+extern void *hipac_forward;
+extern struct nf_hook_ops forward_op;
+
+extern void *hipac_output;
+extern struct nf_hook_ops output_op;
+
+/* netlink mutex */
+extern struct semaphore nlhp_lock;
+
+/* listing mutex */
+extern struct semaphore nlhp_listing_lock;
+
+int
+nfhp_register_cthelp(struct module *nfhp_cthelp_module);
+
+void
+nfhp_unregister_cthelp(struct module *nfhp_cthelp_module);
+
+#endif
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/net/ipv4/netfilter/nf-hipac/nfhp_proc.c linux-2.4.20-wolk4.4-fullkernel/net/ipv4/netfilter/nf-hipac/nfhp_proc.c
--- linux-2.4.20-wolk4.3-fullkernel/net/ipv4/netfilter/nf-hipac/nfhp_proc.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/net/ipv4/netfilter/nf-hipac/nfhp_proc.c	2003-07-30 11:23:31.000000000 +0200
@@ -0,0 +1,855 @@
+/*
+ * proc interface
+ *
+ * Authors: Michael Bellion and Thomas Heinz
+ * (c) 2002-2003 by the hipac core team <nf@hipac.org>:
+ *      +-----------------------+----------------------+
+ *      |   Michael Bellion     |     Thomas Heinz     |
+ *      | <mbellion@hipac.org>  |  <creatix@hipac.org> |
+ *      +-----------------------+----------------------+
+ * Licenced under the GNU General Public Licence, version >= 2.
+ */
+
+
+#include <linux/module.h>
+#include <linux/version.h>
+#include <linux/init.h>
+#include <linux/types.h>
+#include <linux/netfilter_ipv4.h>
+#include <linux/spinlock.h>
+#include <linux/netfilter.h>
+#include <linux/proc_fs.h>
+#include <asm/uaccess.h>
+#include "nfhp_mod.h"
+#include "hipac.h"
+
+#define BT_I "btree_input"
+#define BT_F "btree_forward"
+#define BT_O "btree_output"
+#define DT_I "dimtree_input"
+#define DT_F "dimtree_forward"
+#define DT_O "dimtree_output"
+#define HP_I "hipac_rules_input"
+#define HP_F "hipac_rules_forward"
+#define HP_O "hipac_rules_output"
+#define HP_C "hipac_chains"
+#define MEM  "mem"
+#define INF  "info"
+
+#define INF_M    S_IRUGO | S_IWUSR
+#define OTH_M    S_IRUSR
+
+struct proc_data
+{
+	char *text;
+	void *stat;
+	u32 len, valid_len;
+	rwlock_t lock;
+	void *hipac;
+	char *hipac_name;
+};
+
+struct nfhp_proc_entry
+{
+	const char *name;
+	struct proc_dir_entry *entry;
+	struct proc_dir_entry *parent;
+	mode_t mode;
+	read_proc_t *read_fn;
+	write_proc_t *write_fn;
+	void *hipac;
+	char *hipac_name;
+	u32 text_mem_required;
+	u32 stat_mem_required;
+};
+
+static const char proc_nfhipac_dir[] = "net/nf-hipac";
+static const char proc_stat_dir[]    = "net/nf-hipac/statistics";
+
+static write_proc_t info_write;
+static read_proc_t info_read;
+static read_proc_t mem_read;
+static read_proc_t btree_read;
+static read_proc_t dimtree_read;
+static read_proc_t hipac_r_read;
+static read_proc_t hipac_c_read;
+
+/* the non constant members are initialized by init_nfhp_proc() */
+static struct nfhp_proc_entry nfhp_proc[] =
+{
+	{ INF,   NULL, NULL, INF_M, info_read,    info_write, NULL, NULL,
+	  1000,  sizeof(struct hipac_user_stat)    },
+
+	{ MEM,   NULL, NULL, OTH_M, mem_read,     NULL,       NULL, NULL,
+	  2000,  sizeof(struct hipac_mem_stat)     },
+
+	{ BT_I,  NULL, NULL, OTH_M, btree_read,   NULL,       NULL, "INPUT",
+	  25000, sizeof(struct hipac_btree_stat)   },
+
+	{ BT_F,  NULL, NULL, OTH_M, btree_read,   NULL,       NULL, "FORWARD",
+	  25000, sizeof(struct hipac_btree_stat)   },
+
+	{ BT_O,  NULL, NULL, OTH_M, btree_read,   NULL,       NULL, "OUTPUT",
+	  25000, sizeof(struct hipac_btree_stat)   },
+
+	{ DT_I,  NULL, NULL, OTH_M, dimtree_read, NULL,       NULL, "INPUT",
+	  3000,  sizeof(struct hipac_dimtree_stat) },
+
+	{ DT_F,  NULL, NULL, OTH_M, dimtree_read, NULL,       NULL, "FORWARD",
+	  3000,  sizeof(struct hipac_dimtree_stat) },
+
+	{ DT_O,  NULL, NULL, OTH_M, dimtree_read, NULL,       NULL, "OUTPUT",
+	  3000,  sizeof(struct hipac_dimtree_stat) },
+
+	{ HP_I,  NULL, NULL, OTH_M, hipac_r_read, NULL,       NULL, "INPUT",
+	  3000,  sizeof(struct hipac_rule_stat)    },
+
+	{ HP_F,  NULL, NULL, OTH_M, hipac_r_read, NULL,       NULL, "FORWARD",
+	  3000,  sizeof(struct hipac_rule_stat)    },
+
+	{ HP_O,  NULL, NULL, OTH_M, hipac_r_read, NULL,       NULL, "OUTPUT",
+	  3000,  sizeof(struct hipac_rule_stat)    },
+
+	{ HP_C,  NULL, NULL, OTH_M, hipac_c_read, NULL,       NULL, NULL,
+	  4000,  sizeof(struct hipac_chain_stat)   }
+};
+
+static const char indent_spc[] = "    ";
+static u64 nfhp_total_mem = 0;
+
+
+
+/*
+ * helpers
+ */
+
+static inline void
+init_nfhp_proc(struct proc_dir_entry *nfhipac_dir,
+	       struct proc_dir_entry *stat_dir)
+{
+	int i;
+
+	for (i = 0; i < sizeof(nfhp_proc) / sizeof(*nfhp_proc); i++) {
+		if (nfhp_proc[i].write_fn == info_write) {
+			nfhp_proc[i].parent = nfhipac_dir;
+		} else {
+			nfhp_proc[i].parent = stat_dir;
+		}
+		if (nfhp_proc[i].hipac_name == NULL) {
+			continue;
+		}
+		if (strcmp(nfhp_proc[i].hipac_name, "INPUT") == 0) {
+			nfhp_proc[i].hipac = hipac_input;
+		} else if (strcmp(nfhp_proc[i].hipac_name, "FORWARD") == 0) {
+			nfhp_proc[i].hipac = hipac_forward;
+		} else {
+			nfhp_proc[i].hipac = hipac_output;
+		}
+	}
+}
+
+static inline int
+init_data(struct proc_data *data, const struct nfhp_proc_entry *e)
+{
+	data->text = kmalloc(e->text_mem_required, GFP_KERNEL);
+	if (data->text == NULL) {
+		return -1;
+	}
+	data->stat = kmalloc(e->stat_mem_required, GFP_KERNEL);
+	if (data->stat == NULL) {
+		kfree(data->text);
+		return -1;
+	}
+	data->len = e->text_mem_required;
+	data->valid_len = 0;
+	data->lock = RW_LOCK_UNLOCKED;
+	data->hipac = e->hipac;
+	data->hipac_name = e->hipac_name;
+	return 0;
+}
+
+static inline void
+free_data(struct proc_data *data)
+{
+	if (data == NULL) {
+		return;
+	}
+	if (data->text != NULL) {
+		kfree(data->text);
+	}
+	if (data->stat != NULL) {
+		kfree(data->stat);
+	}
+	kfree(data);
+}
+
+static inline void
+print_inline(struct proc_data *data, int indent)
+{
+	int i;
+
+	for (i = 0; i < indent; i++) {
+		data->valid_len += sprintf(data->text + data->valid_len,
+					   indent_spc);
+	}
+}
+
+static int
+print_desc(struct proc_data *data, int indent, const char *desc)
+{
+	if (data->len < data->valid_len + indent * strlen(indent_spc) +
+	    strlen(desc)) {
+		/* this should never happen */
+		printk(KERN_ERR "%s: too little memory reserved\n",
+		       __FUNCTION__);
+		return -1;
+	}
+	print_inline(data, indent);
+	data->valid_len += sprintf(data->text + data->valid_len, desc);
+	return 0;
+}
+
+static int
+print_scalar(struct proc_data *data, int indent, const char *desc, u64 val)
+{
+	if (data->len < data->valid_len + indent * strlen(indent_spc) +
+	    strlen(desc) + 22) {
+		/* this should never happen */
+		printk(KERN_ERR "%s: too little memory reserved\n",
+		       __FUNCTION__);
+		return -1;
+	}
+	print_inline(data, indent);
+	data->valid_len += sprintf(data->text + data->valid_len, desc);
+	data->valid_len += sprintf(data->text + data->valid_len,
+				   " %9llu\n", val);
+	return 0;
+}
+
+static int
+print_map(struct proc_data *data, int indent, const char *desc,
+	  u32 map[], int len)
+{
+	int i, empty = 1;
+
+	if (data->len < data->valid_len + (1 + len) * indent *
+	    strlen(indent_spc) + strlen(desc) + 1 + len * 25) {
+		/* this should never happen */
+		printk(KERN_ERR "%s: too little memory reserved\n",
+		       __FUNCTION__);
+		return -1;
+	}
+	for (i = 0; i < len; i++) {
+		if (map[i] == 0) {
+			continue;
+		}
+		if (empty) {
+			empty = 0;
+			print_inline(data, indent);
+			data->valid_len += sprintf(data->text +
+						   data->valid_len, desc);
+			data->valid_len += sprintf(data->text +
+						   data->valid_len, "\n");
+		}
+		print_inline(data, indent);
+		data->valid_len += sprintf(data->text + data->valid_len,
+					   "  %2u: %9u\n", i, map[i]);
+	}
+	return 0;
+}
+
+static int
+print_dist(struct proc_data *data, int indent, const char *desc,
+	   u32 dist[], u32 len)
+{
+	int i, empty = 1;
+
+	if (data->len < data->valid_len + (1 + len) * indent *
+	    strlen(indent_spc) + strlen(desc) + 1 + (len - 1) * 39 + 38) {
+		/* this should never happen */
+		printk(KERN_ERR "%s: too little memory reserved\n",
+		       __FUNCTION__);
+		return -1;
+	}
+	if (len == 0) {
+		return 0;
+	}
+	for (i = 0; i < len - 1; i++) {
+		if (dist[i] == 0) {
+			continue;
+		}
+		if (empty) {
+			empty = 0;
+			print_inline(data, indent);
+			data->valid_len += sprintf(data->text +
+						   data->valid_len, desc);
+			data->valid_len += sprintf(data->text +
+						   data->valid_len, "\n");
+		}
+		print_inline(data, indent);
+		data->valid_len +=
+			sprintf(data->text + data->valid_len,
+				"  [%9u, %9u]: %9u\n",
+				i == 0 ? 0 : 1 << (i - 1), (1 << i) - 1,
+				dist[i]);
+	}
+	if (dist[i] == 0) {
+		return 0;
+	}
+	if (empty) {
+		print_inline(data, indent);
+		data->valid_len += sprintf(data->text + data->valid_len, desc);
+		data->valid_len += sprintf(data->text + data->valid_len, "\n");
+	}
+	print_inline(data, indent);
+	data->valid_len += sprintf(data->text + data->valid_len,
+				   "  [%9u,  infinity[: %9u\n", 1 << (i - 1),
+				   dist[i]);
+	return 0;
+}
+
+static int
+write_stat(char *buf, char **start, off_t off, int count, int *eof,
+	   struct proc_data *d)
+{
+	int len = d->valid_len - off;
+
+	if (len <= 0) {
+		*eof = 1;
+		return 0;
+	}
+	if (len <= count) {
+		*eof = 1;
+	} else {
+		len = count;
+	}
+	read_lock(&d->lock);
+	memcpy(buf, d->text + off, len);
+	read_unlock(&d->lock);
+	*start = buf;
+	return len;
+}
+
+
+
+/*
+ * i/o functions
+ */
+
+static int
+info_write(struct file *file, const char *buffer, unsigned long count,
+	   void *data)
+{
+	static const char nfhp_first[] = "nf-hipac-first\n";
+	static const char ipt_first[]  = "iptables-first\n";
+	static char buf[32] = {0};
+	int len = count > sizeof(buf) - 1 ? sizeof(buf) - 1 : count;
+	u64 new_max_mem;
+	
+	if (copy_from_user(buf, buffer, len)) {
+		return -EFAULT;
+        }
+
+	/* strings don't have to contain \n at the end */
+	if (!(count == sizeof(nfhp_first) - 1 ||
+	      count == sizeof(ipt_first) - 1 ||
+	      count == sizeof(nfhp_first) - 2 ||
+	      count == sizeof(ipt_first) - 2)) {
+		if (count >= 9 && !(count == 10 && buf[9] != '\n')) {
+			/* input definitely too large */
+			return -EINVAL;
+		}
+
+		/* interpret as number */
+		new_max_mem = simple_strtoul(buf, NULL, 10) << 20;
+		if (new_max_mem > nfhp_total_mem) {
+			new_max_mem = nfhp_total_mem;
+		}
+		if (new_max_mem == hipac_get_maxmem()) {
+			return len;
+		}
+		HIPAC_LOCK;
+		switch (hipac_set_maxmem(new_max_mem)) {
+		    case HE_LOW_MEMORY:
+			    HIPAC_UNLOCK;
+			    printk(KERN_NOTICE "nf_hipac: actual memory "
+				   "consumption larger than memory bound "
+				   "written to " INF "\n");
+			    return -EINVAL;
+		    case HE_OK:
+			    HIPAC_UNLOCK;
+			    return len;
+		    default:
+			    /* this should never happen */
+			    HIPAC_UNLOCK;
+			    printk(KERN_ERR "%s: unexpected return value\n",
+				   __FUNCTION__);
+			    return -EINVAL;
+		}
+	}
+
+	/* change order */
+	if (strncmp(buf, nfhp_first, len) == 0) {
+		if (input_op.priority >= NF_IP_PRI_FILTER) {
+			nf_change_prio_hook(&input_op, NF_IP_PRI_FILTER - 1);
+			nf_change_prio_hook(&forward_op, NF_IP_PRI_FILTER - 1);
+			nf_change_prio_hook(&output_op, NF_IP_PRI_FILTER - 1);
+		}
+	} else if (strncmp(buf, ipt_first, len) == 0) {
+		if (input_op.priority <= NF_IP_PRI_FILTER) {
+			nf_change_prio_hook(&input_op, NF_IP_PRI_FILTER + 1);
+			nf_change_prio_hook(&forward_op, NF_IP_PRI_FILTER + 1);
+			nf_change_prio_hook(&output_op, NF_IP_PRI_FILTER + 1);
+		}
+	}
+	return len;
+}
+
+/*
+  the statistics are being rebuilt if the proc entry is read from its
+  beginning; if you modify the ruleset while at the same time reading
+  a proc file with a pager strange things might happen to your pager
+  output ;-)
+  nonetheless this is the best we can do ... at least I think so :-)
+*/
+
+#define NEED_REBUILD (off == 0 || d->valid_len == 0)
+#define LEN(x)       (sizeof(x) / sizeof(*(x)))
+#define EXEC(fn)            \
+do {                        \
+	if (fn < 0) {       \
+                goto error; \
+	}                   \
+} while (0)
+
+static int
+info_read(char *page, char **start, off_t off, int count, int *eof,
+	  void *data)
+{
+	struct proc_data *d = data;
+	struct hipac_user_stat *stat = d->stat;
+
+	if (!NEED_REBUILD) {
+		return write_stat(page, start, off, count, eof, d);
+	}
+
+	/* (re)compute statistics */
+	HIPAC_LOCK;
+	if (hipac_get_user_stat(stat) != HE_OK) {
+		/* this should never happen */
+		HIPAC_UNLOCK;
+		printk(KERN_ERR "%s: hipac_get_user_stat failed\n",
+		       __FUNCTION__);
+		*eof = 1;
+		return 0;
+	}
+	HIPAC_UNLOCK;
+
+	/* (re)build text */
+	write_lock(&d->lock);
+	d->valid_len = 0;
+	EXEC(print_scalar(d, 0, "maximum memory bound:    ",
+			  hipac_get_maxmem()));
+	EXEC(print_scalar(d, 0, "total memory (used):     ",
+			  stat->total_mem_tight));
+	EXEC(print_scalar(d, 0, "total memory (allocated):",
+			  stat->total_mem_real));
+	EXEC(print_scalar(d, 0, "total number of chains:  ",
+			  stat->chain_num));
+	EXEC(print_scalar(d, 0, "total number of rules:   ",
+			  stat->rule_num));
+	if (input_op.priority < NF_IP_PRI_FILTER) {
+		EXEC(print_desc(d, 0, "nf-hipac is invoked before "
+				"iptables\n"));
+	} else {
+		EXEC(print_desc(d, 0, "iptables is invoked before "
+				"nf-hipac\n"));
+	}
+	write_unlock(&d->lock);
+	return write_stat(page, start, off, count, eof, d);
+
+ error:
+	write_unlock(&d->lock);
+	*eof = 1;
+	return 0;
+}
+
+static int
+mem_read(char *page, char **start, off_t off, int count, int *eof,
+	 void *data)
+{
+	struct proc_data *d = data;
+	struct hipac_mem_stat *stat = d->stat;
+
+	if (!NEED_REBUILD) {
+		return write_stat(page, start, off, count, eof, d);
+	}
+
+	/* (re)compute statistics */
+	HIPAC_LOCK;
+	if (hipac_get_mem_stat(stat) != HE_OK) {
+		/* this should never happen */
+		HIPAC_UNLOCK;
+		printk(KERN_ERR "%s: hipac_get_mem_stat failed\n",
+		       __FUNCTION__);
+		*eof = 1;
+		return 0;
+	}
+	HIPAC_UNLOCK;
+
+	/* (re)build text */
+	write_lock(&d->lock);
+	d->valid_len = 0;
+	EXEC(print_scalar(d, 0, "total memory (used):     ",
+			  stat->total_mem_tight));
+	EXEC(print_scalar(d, 0, "total memory (allocated):",
+			  stat->total_mem_real));
+	EXEC(print_desc(d, 0, "memhash:\n"));
+	EXEC(print_scalar(d, 1, "number of entries:                    ",
+			  stat->memhash_elem_num));
+	EXEC(print_scalar(d, 1, "number of buckets:                    ",
+			  stat->memhash_len));
+	EXEC(print_scalar(d, 1, "number of entries in smallest bucket: ",
+			  stat->memhash_smallest_bucket_len));
+	EXEC(print_scalar(d, 1, "number of entries in largest bucket:  ",
+			  stat->memhash_biggest_bucket_len));
+	EXEC(print_dist(d, 1, "number of buckets with [x, y] entries:",
+			stat->memhash_bucket_stat,
+			LEN(stat->memhash_bucket_stat)));
+	write_unlock(&d->lock);
+	return write_stat(page, start, off, count, eof, d);
+
+ error:
+	write_unlock(&d->lock);
+	*eof = 1;
+	return 0;
+}
+
+static int
+btree_read(char *page, char **start, off_t off, int count, int *eof,
+	   void *data)
+{
+	static char buf[100] = {0};
+	struct proc_data *d = data;
+	struct hipac_btree_stat *stat = d->stat;
+	int i;
+	
+	if (!NEED_REBUILD) {
+		return write_stat(page, start, off, count, eof, d);
+	}
+
+	/* (re)compute statistics */
+	HIPAC_LOCK;
+	if (hipac_get_btree_stat(d->hipac, stat) != HE_OK) {
+		/* this should never happen */
+		HIPAC_UNLOCK;
+		printk(KERN_ERR "%s: hipac_get_btree_stat failed\n",
+		       __FUNCTION__);
+		*eof = 1;
+		return 0;
+	}
+	HIPAC_UNLOCK;
+
+	/* (re)build text */
+	write_lock(&d->lock);
+	d->valid_len = 0;
+	EXEC(print_desc(d, 0, "root chain: "));
+	EXEC(print_desc(d, 0, d->hipac_name));
+	EXEC(print_desc(d, 0, "\n"));
+	EXEC(print_scalar(d, 0, "total memory (used):             ",
+			  stat->total_mem_tight));
+	EXEC(print_scalar(d, 0, "total memory (allocated):        ",
+			  stat->total_mem_real));
+	EXEC(print_scalar(d, 1, "btree memory (used):        ",
+			  stat->btree_mem_tight));
+	EXEC(print_scalar(d, 1, "btree memory (allocated):   ",
+			  stat->btree_mem_real));
+	EXEC(print_scalar(d, 1, "termrule memory (used):     ",
+			  stat->termrule_mem_tight));
+	EXEC(print_scalar(d, 1, "termrule memory (allocated):",
+			  stat->termrule_mem_real));
+	EXEC(print_scalar(d, 0, "number of btrees:                ",
+			  stat->btree_num));
+	EXEC(print_map(d, 1, "number of btrees in dimid x:",
+		       stat->btree_dimid_num, LEN(stat->btree_dimid_num)));
+	EXEC(print_map(d, 1, "number of btrees in depth x:",
+		       stat->btree_depth_num, LEN(stat->btree_depth_num)));
+	EXEC(print_scalar(d, 0, "number of termrule blocks:       ",
+			  stat->termrule_num));
+	EXEC(print_scalar(d, 0, "total number of termrule entries:",
+			  stat->termrule_ptr_num));
+	EXEC(print_scalar(d, 0, "number of keys:                  ",
+			  stat->keys_num));
+	for (i = 0; i < LEN(stat->btree_dimid_keys_stat); i++) {
+		if (snprintf(buf, sizeof(buf) - 1, "number of btrees in dimid"
+			     " %d with [x, y] keys:", i) < 0) {
+			printk(KERN_ERR "%s: static buffer too small\n",
+			       __FUNCTION__);
+			break;
+		}
+		EXEC(print_dist(d, 1, buf, stat->btree_dimid_keys_stat[i],
+				LEN(*stat->btree_dimid_keys_stat)));
+	}
+	EXEC(print_scalar(d, 0, "number of terminal pointers:     ",
+			  stat->termptr_num));
+	EXEC(print_map(d, 1, "number of terminal pointers in dimid x:",
+		       stat->termptr_dimid_num,
+		       LEN(stat->termptr_dimid_num)));
+	EXEC(print_map(d, 1, "number of terminal pointers in depth x:",
+		       stat->termptr_depth_num,
+		       LEN(stat->termptr_depth_num)));
+	EXEC(print_scalar(d, 0, "number of non-terminal pointers: ",
+			  stat->nontermptr_num));
+	EXEC(print_map(d, 1, "number of non-terminal pointers in dimid x:",
+		       stat->nontermptr_dimid_num,
+		       LEN(stat->nontermptr_dimid_num)));
+	EXEC(print_map(d, 1, "number of non-terminal pointers in depth x:",
+		       stat->nontermptr_depth_num,
+		       LEN(stat->nontermptr_depth_num)));
+	EXEC(print_scalar(d, 0, "number of dt_elem structs:       ",
+			  stat->dt_elem_num));
+	EXEC(print_scalar(d, 1, "total number of dt_elem entries:"
+			  "              ", stat->dt_elem_ptr_num));
+	EXEC(print_dist(d, 1, "number of dt_elem structs with [x, y] entries:",
+			stat->dt_elem_stat, LEN(stat->dt_elem_stat)));
+	write_unlock(&d->lock);
+	return write_stat(page, start, off, count, eof, d);
+
+ error:
+	write_unlock(&d->lock);
+	*eof = 1;
+	return 0;
+}
+
+static int
+dimtree_read(char *page, char **start, off_t off, int count, int *eof,
+	     void *data)
+{
+	struct proc_data *d = data;
+	struct hipac_dimtree_stat *stat = d->stat;
+
+	if (!NEED_REBUILD) {
+		return write_stat(page, start, off, count, eof, d);
+	}
+
+	/* (re)compute statistics */
+	HIPAC_LOCK;
+	if (hipac_get_dimtree_stat(d->hipac, stat) != HE_OK) {
+		/* this should never happen */
+		HIPAC_UNLOCK;
+		printk(KERN_ERR "%s: hipac_get_dimtree_stat failed\n",
+		       __FUNCTION__);
+		*eof = 1;
+		return 0;
+	}
+	HIPAC_UNLOCK;
+
+	/* (re)build text */
+	write_lock(&d->lock);
+	d->valid_len = 0;
+	EXEC(print_desc(d, 0, "root chain: "));
+	EXEC(print_desc(d, 0, d->hipac_name));
+	EXEC(print_desc(d, 0, "\n"));
+	EXEC(print_scalar(d, 0, "chain memory (used):           ",
+			  stat->chain_mem_tight));
+	EXEC(print_scalar(d, 0, "chain memory (allocated):      ",
+			  stat->chain_mem_real));
+	EXEC(print_scalar(d, 0, "number of rules:               ",
+			  stat->rule_num));
+	EXEC(print_scalar(d, 1, "number of rules with ipt matches:      "
+			  "            ", stat->rules_with_exec_matches));
+	EXEC(print_scalar(d, 1, "number of rules with ipt target:       "
+			  "            ", stat->rules_with_exec_target));
+	EXEC(print_dist(d, 1, "number of \"same pos rules\" series of "
+			"length [x, y]:", stat->rules_same_pos_stat,
+			LEN(stat->rules_same_pos_stat)));
+	EXEC(print_map(d, 0, "number of rules with x dt_matches:",
+		       stat->dt_match_stat, LEN(stat->dt_match_stat)));
+	write_unlock(&d->lock);
+	return write_stat(page, start, off, count, eof, d);
+
+ error:
+	write_unlock(&d->lock);
+	*eof = 1;
+	return 0;
+}
+
+static int
+hipac_r_read(char *page, char **start, off_t off, int count, int *eof,
+	     void *data)
+{
+	struct proc_data *d = data;
+	struct hipac_rule_stat *stat = d->stat;
+
+	if (!NEED_REBUILD) {
+		return write_stat(page, start, off, count, eof, d);
+	}
+
+	/* (re)compute statistics */
+	HIPAC_LOCK;
+	if (hipac_get_rule_stat(d->hipac, stat) != HE_OK) {
+		/* this should never happen */
+		HIPAC_UNLOCK;
+		printk(KERN_ERR "%s: hipac_get_rule_stat failed\n",
+		       __FUNCTION__);
+		*eof = 1;
+		return 0;
+	}
+	HIPAC_UNLOCK;
+
+	/* (re)build text */
+	write_lock(&d->lock);
+	d->valid_len = 0;
+	EXEC(print_desc(d, 0, "root chain: "));
+	EXEC(print_desc(d, 0, d->hipac_name));
+	EXEC(print_desc(d, 0, "\n"));
+	EXEC(print_scalar(d, 0, "number of rules:                        ",
+			  stat->rule_num));
+	EXEC(print_scalar(d, 1, "number of rules with ipt matches:  ",
+			  stat->exec_match_num));
+	EXEC(print_scalar(d, 1, "number of rules with ipt target:   ",
+			  stat->exec_target_num));
+	EXEC(print_scalar(d, 1, "number of rules with jump target:  ",
+			  stat->jump_target_num));
+	EXEC(print_scalar(d, 1, "number of rules with return target:",
+			  stat->return_target_num));
+	EXEC(print_map(d, 0, "number of rules with x hipac_matches:   ",
+		       stat->hipac_match_stat, LEN(stat->hipac_match_stat)));
+	EXEC(print_map(d, 0, "number of rules with x inverted matches:",
+		       stat->inv_rules_stat, LEN(stat->inv_rules_stat)));
+	write_unlock(&d->lock);
+	return write_stat(page, start, off, count, eof, d);
+
+ error:
+	write_unlock(&d->lock);
+	*eof = 1;
+	return 0;
+}
+
+static int
+hipac_c_read(char *page, char **start, off_t off, int count, int *eof,
+	     void *data)
+{
+	struct proc_data *d = data;
+	struct hipac_chain_stat *stat = d->stat;
+
+	if (!NEED_REBUILD) {
+		return write_stat(page, start, off, count, eof, d);
+	}
+
+	/* (re)compute statistics */
+	HIPAC_LOCK;
+	if (hipac_get_chain_stat(stat) != HE_OK) {
+		/* this should never happen */
+		HIPAC_UNLOCK;
+		printk(KERN_ERR "%s: hipac_get_chain_stat failed\n",
+		       __FUNCTION__);
+		*eof = 1;
+		return 0;
+	}
+	HIPAC_UNLOCK;
+
+	/* (re)build text */
+	write_lock(&d->lock);
+	d->valid_len = 0;
+	EXEC(print_scalar(d, 0, "chain memory (used):     ", stat->mem_tight));
+	EXEC(print_scalar(d, 0, "chain memory (allocated):", stat->mem_real));
+	EXEC(print_scalar(d, 0, "number of chains:        ", stat->chain_num));
+	EXEC(print_scalar(d, 0, "number of rules:         ", stat->rule_num));
+	EXEC(print_dist(d, 1, "number of chains with [x, y] prefixes:     ",
+			stat->prefix_stat, LEN(stat->prefix_stat)));
+	EXEC(print_dist(d, 1, "number of chains with [x, y] incoming arcs:",
+			stat->incoming_stat, LEN(stat->incoming_stat)));
+	EXEC(print_dist(d, 1, "number of chains with [x, y] outgoing arcs:",
+			stat->outgoing_stat, LEN(stat->outgoing_stat)));
+	write_unlock(&d->lock);
+	return write_stat(page, start, off, count, eof, d);
+
+ error:
+	write_unlock(&d->lock);
+	*eof = 1;
+	return 0;
+}
+
+void
+hpproc_init(u64 total_mem)
+{
+	struct proc_dir_entry *nfhipac_dir, *stat_dir;
+	struct proc_data *data;
+	int i, j;
+
+	nfhp_total_mem = total_mem;
+
+	/* create proc directories */
+	nfhipac_dir = proc_mkdir(proc_nfhipac_dir, NULL);
+	if (nfhipac_dir == NULL) {
+		printk(KERN_NOTICE "nf_hipac: unable to create proc "
+		       "directory\n");
+		return;
+	}
+	nfhipac_dir->owner = THIS_MODULE;
+	stat_dir = proc_mkdir(proc_stat_dir, NULL);
+	if (stat_dir == NULL) {
+		printk(KERN_NOTICE "nf_hipac: unable to create proc "
+		       "directory\n");
+		goto cleanup_nfhipac_dir;
+	}
+	stat_dir->owner = THIS_MODULE;
+
+	/* create statistics entries */
+	init_nfhp_proc(nfhipac_dir, stat_dir);
+	for (i = 0; i < sizeof(nfhp_proc) / sizeof(*nfhp_proc); i++) {
+		data = kmalloc(sizeof(*data), GFP_KERNEL);
+		if (data == NULL) {
+			printk(KERN_NOTICE "nf_hipac: unable to create "
+			       "proc infrastructure because of low memory\n");
+			goto cleanup;
+		}
+		if (init_data(data, &nfhp_proc[i]) < 0) {
+			printk(KERN_NOTICE "nf_hipac: unable to create "
+			       "proc infrastructure because of low memory\n");
+			goto cleanup;
+		}
+		nfhp_proc[i].entry = create_proc_entry(nfhp_proc[i].name,
+						       nfhp_proc[i].mode,
+						       nfhp_proc[i].parent);
+		if (nfhp_proc[i].entry == NULL) {
+			printk(KERN_NOTICE "nf_hipac: unable to create proc "
+			       "entry\n");
+			goto cleanup;
+		}
+		nfhp_proc[i].entry->owner = THIS_MODULE;
+		nfhp_proc[i].entry->data = data;
+		nfhp_proc[i].entry->read_proc = nfhp_proc[i].read_fn;
+		nfhp_proc[i].entry->write_proc = nfhp_proc[i].write_fn;
+	}
+	return;
+
+ cleanup:
+	for (j = 0; j <= i; j++) {
+		/* it does not hurt if nfhp_proc[j].name does not exist */
+		remove_proc_entry(nfhp_proc[j].name, NULL);
+		if (nfhp_proc[i].entry != NULL) {
+			free_data(nfhp_proc[j].entry->data);
+		}
+	}
+	remove_proc_entry(proc_stat_dir, NULL);
+ cleanup_nfhipac_dir:
+	remove_proc_entry(proc_nfhipac_dir, NULL);
+	return;
+}
+
+void
+hpproc_exit(void)
+{
+	int i;
+
+	for (i = 0; i < sizeof(nfhp_proc) / sizeof(*nfhp_proc); i++) {
+		remove_proc_entry(nfhp_proc[i].name, NULL);
+		if (nfhp_proc[i].entry != NULL) {
+			free_data(nfhp_proc[i].entry->data);
+		}
+	}
+	remove_proc_entry(proc_stat_dir, NULL);
+	remove_proc_entry(proc_nfhipac_dir, NULL);
+}
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/net/ipv4/netfilter/nf-hipac/nfhp_proc.h linux-2.4.20-wolk4.4-fullkernel/net/ipv4/netfilter/nf-hipac/nfhp_proc.h
--- linux-2.4.20-wolk4.3-fullkernel/net/ipv4/netfilter/nf-hipac/nfhp_proc.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-wolk4.4-fullkernel/net/ipv4/netfilter/nf-hipac/nfhp_proc.h	2003-07-30 11:23:31.000000000 +0200
@@ -0,0 +1,23 @@
+/*
+ * proc interface
+ *
+ * Authors: Michael Bellion and Thomas Heinz
+ * (c) 2002-2003 by the hipac core team <nf@hipac.org>:
+ *      +-----------------------+----------------------+
+ *      |   Michael Bellion     |     Thomas Heinz     |
+ *      | <mbellion@hipac.org>  |  <creatix@hipac.org> |
+ *      +-----------------------+----------------------+
+ * Licenced under the GNU General Public Licence, version >= 2.
+ */
+
+
+#ifndef _NFHP_PROC_H
+#define _NFHP_PROC_H
+
+void
+hpproc_init(u64 total_mem);
+
+void
+hpproc_exit(void);
+
+#endif
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/net/netlink/af_netlink.c linux-2.4.20-wolk4.4-fullkernel/net/netlink/af_netlink.c
--- linux-2.4.20-wolk4.3-fullkernel/net/netlink/af_netlink.c	2003-07-30 13:52:04.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/net/netlink/af_netlink.c	2003-07-30 11:23:31.000000000 +0200
@@ -757,19 +757,26 @@ static int netlink_dump(struct sock *sk)
 	struct nlmsghdr *nlh;
 	int len;
 	
-	skb = sock_rmalloc(sk, NLMSG_GOODSIZE, 0, GFP_KERNEL);
-	if (!skb)
-		return -ENOBUFS;
-
 	spin_lock(&sk->protinfo.af_netlink->cb_lock);
-
 	cb = sk->protinfo.af_netlink->cb;
 	if (cb == NULL) {
 		spin_unlock(&sk->protinfo.af_netlink->cb_lock);
-		kfree_skb(skb);
 		return -EINVAL;
 	}
 
+	if (cb->reply) {
+		skb = cb->reply;
+		skb_set_owner_r(skb, sk);
+		cb->reply = NULL;
+	} else {
+		spin_unlock(&sk->protinfo.af_netlink->cb_lock);
+		skb = sock_rmalloc(sk, cb->reply_len <= 0 ? NLMSG_GOODSIZE :
+				   cb->reply_len, 0, GFP_KERNEL);
+		if (!skb)
+			return -ENOBUFS;
+		spin_lock(&sk->protinfo.af_netlink->cb_lock);
+	}
+
 	len = cb->dump(skb, cb);
 
 	if (len > 0) {
@@ -810,6 +817,7 @@ int netlink_dump_start(struct sock *ssk,
 	cb->dump = dump;
 	cb->done = done;
 	cb->nlh = nlh;
+	cb->reply = NULL;
 	atomic_inc(&skb->users);
 	cb->skb = skb;
 
@@ -833,6 +841,36 @@ int netlink_dump_start(struct sock *ssk,
 	return 0;
 }
 
+int netlink_dump_start_cb(struct sock *ssk, const struct netlink_callback *c)
+{
+	struct netlink_callback *cb;
+	struct sock *sk;
+	
+	cb = kmalloc(sizeof(*cb), GFP_KERNEL);
+	if (cb == NULL)
+		return -ENOBUFS;
+
+	atomic_inc(&c->skb->users);
+	memcpy(cb, c, sizeof(*c));
+	sk = netlink_lookup(ssk->protocol, NETLINK_CB(cb->skb).pid);
+	if (sk == NULL) {
+		netlink_destroy_callback(cb);
+		return -ECONNREFUSED;
+	}
+	/* A dump is in progress... */
+	spin_lock(&sk->protinfo.af_netlink->cb_lock);
+	if (sk->protinfo.af_netlink->cb) {
+		spin_unlock(&sk->protinfo.af_netlink->cb_lock);
+		netlink_destroy_callback(cb);
+		sock_put(sk);
+		return -EBUSY;
+	}
+	sk->protinfo.af_netlink->cb = cb;
+	spin_unlock(&sk->protinfo.af_netlink->cb_lock);
+
+	return netlink_dump(sk);
+}
+
 void netlink_ack(struct sk_buff *in_skb, struct nlmsghdr *nlh, int err)
 {
 	struct sk_buff *skb;
diff -Naurp linux-2.4.20-wolk4.3-fullkernel/net/netsyms.c linux-2.4.20-wolk4.4-fullkernel/net/netsyms.c
--- linux-2.4.20-wolk4.3-fullkernel/net/netsyms.c	2003-07-30 13:52:04.000000000 +0200
+++ linux-2.4.20-wolk4.4-fullkernel/net/netsyms.c	2003-07-30 11:23:31.000000000 +0200
@@ -424,6 +424,7 @@ EXPORT_SYMBOL(netlink_broadcast);
 EXPORT_SYMBOL(netlink_unicast);
 EXPORT_SYMBOL(netlink_kernel_create);
 EXPORT_SYMBOL(netlink_dump_start);
+EXPORT_SYMBOL(netlink_dump_start_cb);
 EXPORT_SYMBOL(netlink_ack);
 EXPORT_SYMBOL(netlink_set_nonroot);
 EXPORT_SYMBOL(netlink_register_notifier);
@@ -477,6 +478,10 @@ EXPORT_SYMBOL(tr_type_trans);
 EXPORT_SYMBOL(register_netdevice_notifier);
 EXPORT_SYMBOL(unregister_netdevice_notifier);
 
+/* Device veto function registration */
+EXPORT_SYMBOL(register_netdevice_veto);
+EXPORT_SYMBOL(unregister_netdevice_veto);
+
 /* support for loadable net drivers */
 #ifdef CONFIG_NET
 EXPORT_SYMBOL(loopback_dev);
@@ -582,6 +587,7 @@ EXPORT_SYMBOL(unregister_tcf_proto_ops);
 #include <linux/netfilter.h>
 EXPORT_SYMBOL(nf_register_hook);
 EXPORT_SYMBOL(nf_unregister_hook);
+EXPORT_SYMBOL(nf_change_prio_hook);
 EXPORT_SYMBOL(nf_register_sockopt);
 EXPORT_SYMBOL(nf_unregister_sockopt);
 EXPORT_SYMBOL(nf_reinject);